diff --git a/common/src/main/generated/resources/data/generations_structures/worldgen/processor_list/meowth_balloon_processor_list.json b/common/src/main/generated/resources/data/generations_structures/worldgen/processor_list/meowth_balloon_processor_list.json new file mode 100644 index 0000000..a5205e5 --- /dev/null +++ b/common/src/main/generated/resources/data/generations_structures/worldgen/processor_list/meowth_balloon_processor_list.json @@ -0,0 +1,31 @@ +{ + "processors": [ + { + "processor_type": "moreprocessors:same_state_rule", + "rules": [ + { + "input_predicate": { + "block": "generations_core:wing_ball_loot", + "predicate_type": "minecraft:random_block_match", + "probability": 0.33 + }, + "location_predicate": { + "predicate_type": "minecraft:always_true" + }, + "output_location": "generations_core:level_ball_loot" + }, + { + "input_predicate": { + "block": "generations_core:wing_ball_loot", + "predicate_type": "minecraft:random_block_match", + "probability": 0.5 + }, + "location_predicate": { + "predicate_type": "minecraft:always_true" + }, + "output_location": "generations_core:jet_ball_loot" + } + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/generated/resources/data/generations_structures/worldgen/template_pool/loot_balloon/meowth.json b/common/src/main/generated/resources/data/generations_structures/worldgen/template_pool/loot_balloon/meowth.json index 15a062f..c1e1203 100644 --- a/common/src/main/generated/resources/data/generations_structures/worldgen/template_pool/loot_balloon/meowth.json +++ b/common/src/main/generated/resources/data/generations_structures/worldgen/template_pool/loot_balloon/meowth.json @@ -4,7 +4,7 @@ "element": { "element_type": "minecraft:single_pool_element", "location": "generations_structures:loot_balloon/meowth", - "processors": "minecraft:empty", + "processors": "generations_structures:meowth_balloon_processor_list", "projection": "rigid" }, "weight": 1 diff --git a/common/src/main/java/generations/gg/generations/structures/generationsstructures/processors/GenerationsProcessorLists.java b/common/src/main/java/generations/gg/generations/structures/generationsstructures/processors/GenerationsProcessorLists.java index 52e4077..9d20441 100644 --- a/common/src/main/java/generations/gg/generations/structures/generationsstructures/processors/GenerationsProcessorLists.java +++ b/common/src/main/java/generations/gg/generations/structures/generationsstructures/processors/GenerationsProcessorLists.java @@ -3,6 +3,8 @@ import biomesoplenty.api.block.BOPBlocks; import com.google.common.collect.ImmutableList; import generations.gg.generations.core.generationscore.common.world.level.block.GenerationsBlocks; +import generations.gg.generations.core.generationscore.common.world.level.block.GenerationsDecorationBlocks; +import generations.gg.generations.core.generationscore.common.world.level.block.GenerationsUtilityBlocks; import generations.gg.generations.core.generationscore.common.world.level.block.GenerationsWood; import generations.gg.generations.structures.generationsstructures.GenerationsStructures; import it.unimi.dsi.fastutil.objects.Reference2ObjectOpenHashMap; @@ -212,6 +214,15 @@ public class GenerationsProcessorLists { ) ))); + public static final ResourceKey MEOWTH_BALLOON_PROCESSOR_LIST = register("meowth_balloon", context -> new StructureProcessorList(ImmutableList.of( + new SameStateRuleProcessor( + ImmutableList.of( + new SameStateProcessorRule(new RandomBlockMatchTest(GenerationsUtilityBlocks.WING_BALL_LOOT.getOrNull(), 0.33f), AlwaysTrueTest.INSTANCE, GenerationsUtilityBlocks.LEVEL_BALL_LOOT.getOrNull()), + new SameStateProcessorRule(new RandomBlockMatchTest(GenerationsUtilityBlocks.WING_BALL_LOOT.getOrNull(), 0.5f), AlwaysTrueTest.INSTANCE, GenerationsUtilityBlocks.JET_BALL_LOOT.getOrNull()) + ) + ) + ))); + private static StructureProcessorList createProcessorList(ProcessorRule... processors) { return new StructureProcessorList(ImmutableList.of(new RuleProcessor(ImmutableList.copyOf(processors)))); } diff --git a/common/src/main/java/generations/gg/generations/structures/generationsstructures/worldgen/template_pool/GenerationsTemplatePools.java b/common/src/main/java/generations/gg/generations/structures/generationsstructures/worldgen/template_pool/GenerationsTemplatePools.java index fb47fd7..5e38caa 100644 --- a/common/src/main/java/generations/gg/generations/structures/generationsstructures/worldgen/template_pool/GenerationsTemplatePools.java +++ b/common/src/main/java/generations/gg/generations/structures/generationsstructures/worldgen/template_pool/GenerationsTemplatePools.java @@ -30,7 +30,7 @@ public class GenerationsTemplatePools { public static final ResourceKey BEAST_BALLOON = registerSimple("loot_balloon/beast", GenerationsStructureSettings.BEAST_BALLOON); public static final ResourceKey GREAT_BALLOON = registerSimple("loot_balloon/great", GenerationsStructureSettings.GREAT_BALLOON); public static final ResourceKey MASTER_BALLOON = registerSimple("loot_balloon/master", GenerationsStructureSettings.MASTER_BALLOON); - public static final ResourceKey MEOWTH_BALLOON = registerSimple("loot_balloon/meowth", GenerationsStructureSettings.MEOWTH_BALLOON); + public static final ResourceKey MEOWTH_BALLOON = registerSimple("loot_balloon/meowth", GenerationsStructureSettings.MEOWTH_BALLOON, GenerationsProcessorLists.MEOWTH_BALLOON_PROCESSOR_LIST); public static final ResourceKey POKE_BALLOON = registerSimple("loot_balloon/poke", GenerationsStructureSettings.POKE_BALLOON); public static final ResourceKey ULTRA_BALLOON = registerSimple("loot_balloon/ultra", GenerationsStructureSettings.ULTRA_BALLOON); diff --git a/gradle.properties b/gradle.properties index eb4a940..7f33b8f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ archives_base_name=Generations-Structures mod_version=1.1.2-Beta-SNAPSHOT maven_group=generations.gg.generations.structures.generationsstructures -fabric_loader_version=0.16.7 +fabric_loader_version=0.16.9 fabric_api_version=0.92.2 forge_version=47.3.11 @@ -16,7 +16,7 @@ use_neoforge=false parchment=2023.09.03 -generations-core_version=4.0.2-Beta +generations-core_version=4.1.2-Beta-SNAPSHOT architectury_version=9.2.14 botarium_version=2.3.4 devauth_version=1.2.1 @@ -26,7 +26,7 @@ moreprocessors_version=1.2.0 terrablender_version=3.0.1.7 BOP_version=19.0.0.91 GlitchCore_version=0.0.1.1 -BWG_version=1.3.3 +BWG_version=1.4.2 # Publishing github_token=xxx \ No newline at end of file