diff --git a/Common/src/main/generated/resources/data/biomeswevegone/worldgen/processor_list/pumpkin_patch_house.json b/Common/src/main/generated/resources/data/biomeswevegone/worldgen/processor_list/pumpkin_patch_house.json index 01a19515e..46eb59e3d 100644 --- a/Common/src/main/generated/resources/data/biomeswevegone/worldgen/processor_list/pumpkin_patch_house.json +++ b/Common/src/main/generated/resources/data/biomeswevegone/worldgen/processor_list/pumpkin_patch_house.json @@ -106,22 +106,35 @@ "rules": [ { "input_predicate": { - "block": "minecraft:stone", + "block": "minecraft:stone_bricks", "predicate_type": "minecraft:random_block_match", - "probability": 0.5 + "probability": 0.3 }, "location_predicate": { "predicate_type": "minecraft:always_true" }, "output_state": { - "Name": "biomeswevegone:mossy_stone" + "Name": "biomeswevegone:rocky_stone" } }, { "input_predicate": { - "block": "minecraft:cobblestone", + "block": "minecraft:stone_bricks", "predicate_type": "minecraft:random_block_match", - "probability": 0.5 + "probability": 0.15 + }, + "location_predicate": { + "predicate_type": "minecraft:always_true" + }, + "output_state": { + "Name": "minecraft:cobblestone" + } + }, + { + "input_predicate": { + "block": "minecraft:stone_bricks", + "predicate_type": "minecraft:random_block_match", + "probability": 0.15 }, "location_predicate": { "predicate_type": "minecraft:always_true" @@ -134,13 +147,13 @@ "input_predicate": { "block": "minecraft:stone_bricks", "predicate_type": "minecraft:random_block_match", - "probability": 0.5 + "probability": 0.05 }, "location_predicate": { "predicate_type": "minecraft:always_true" }, "output_state": { - "Name": "minecraft:mossy_stone_bricks" + "Name": "minecraft:chiseled_stone_bricks" } } ] diff --git a/Common/src/main/generated/resources/data/biomeswevegone/worldgen/processor_list/pumpkin_patch_meeting_point_1.json b/Common/src/main/generated/resources/data/biomeswevegone/worldgen/processor_list/pumpkin_patch_meeting_point_1.json new file mode 100644 index 000000000..ac348080b --- /dev/null +++ b/Common/src/main/generated/resources/data/biomeswevegone/worldgen/processor_list/pumpkin_patch_meeting_point_1.json @@ -0,0 +1,173 @@ +{ + "processors": [ + { + "processor_type": "minecraft:rule", + "rules": [ + { + "input_predicate": { + "block": "minecraft:cobblestone", + "predicate_type": "minecraft:random_block_match", + "probability": 0.5 + }, + "location_predicate": { + "predicate_type": "minecraft:always_true" + }, + "output_state": { + "Name": "minecraft:dirt_path" + } + } + ] + }, + { + "processor_type": "minecraft:rule", + "rules": [ + { + "input_predicate": { + "block": "minecraft:cobblestone", + "predicate_type": "minecraft:random_block_match", + "probability": 0.2 + }, + "location_predicate": { + "predicate_type": "minecraft:always_true" + }, + "output_state": { + "Name": "minecraft:grass_block", + "Properties": { + "snowy": "false" + } + } + }, + { + "input_predicate": { + "block": "minecraft:cobblestone", + "predicate_type": "minecraft:random_block_match", + "probability": 0.2 + }, + "location_predicate": { + "predicate_type": "minecraft:always_true" + }, + "output_state": { + "Name": "biomeswevegone:lush_grass_block", + "Properties": { + "snowy": "false" + } + } + } + ] + }, + { + "processor_type": "minecraft:rule", + "rules": [ + { + "input_predicate": { + "block": "minecraft:stone_bricks", + "predicate_type": "minecraft:random_block_match", + "probability": 0.3 + }, + "location_predicate": { + "predicate_type": "minecraft:always_true" + }, + "output_state": { + "Name": "minecraft:mossy_stone_bricks" + } + }, + { + "input_predicate": { + "block": "minecraft:stone_bricks", + "predicate_type": "minecraft:random_block_match", + "probability": 0.3 + }, + "location_predicate": { + "predicate_type": "minecraft:always_true" + }, + "output_state": { + "Name": "minecraft:cracked_stone_bricks" + } + }, + { + "input_predicate": { + "block": "minecraft:stone_bricks", + "predicate_type": "minecraft:random_block_match", + "probability": 0.3 + }, + "location_predicate": { + "predicate_type": "minecraft:always_true" + }, + "output_state": { + "Name": "biomeswevegone:mossy_stone" + } + } + ] + }, + { + "processor_type": "minecraft:rule", + "rules": [ + { + "input_predicate": { + "block": "minecraft:cobblestone", + "predicate_type": "minecraft:random_block_match", + "probability": 0.3 + }, + "location_predicate": { + "predicate_type": "minecraft:always_true" + }, + "output_state": { + "Name": "minecraft:mossy_cobblestone" + } + }, + { + "input_predicate": { + "block": "minecraft:cobblestone", + "predicate_type": "minecraft:random_block_match", + "probability": 0.3 + }, + "location_predicate": { + "predicate_type": "minecraft:always_true" + }, + "output_state": { + "Name": "biomeswevegone:mossy_stone" + } + }, + { + "input_predicate": { + "block": "minecraft:cobblestone", + "predicate_type": "minecraft:random_block_match", + "probability": 0.3 + }, + "location_predicate": { + "predicate_type": "minecraft:always_true" + }, + "output_state": { + "Name": "biomeswevegone:rocky_stone" + } + }, + { + "input_predicate": { + "block": "minecraft:cobblestone", + "predicate_type": "minecraft:random_block_match", + "probability": 0.15 + }, + "location_predicate": { + "predicate_type": "minecraft:always_true" + }, + "output_state": { + "Name": "minecraft:cracked_stone_bricks" + } + }, + { + "input_predicate": { + "block": "minecraft:cobblestone", + "predicate_type": "minecraft:random_block_match", + "probability": 0.15 + }, + "location_predicate": { + "predicate_type": "minecraft:always_true" + }, + "output_state": { + "Name": "minecraft:stone" + } + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/main/generated/resources/data/biomeswevegone/worldgen/processor_list/pumpkin_patch_meeting_point_2.json b/Common/src/main/generated/resources/data/biomeswevegone/worldgen/processor_list/pumpkin_patch_meeting_point_2.json new file mode 100644 index 000000000..32735440f --- /dev/null +++ b/Common/src/main/generated/resources/data/biomeswevegone/worldgen/processor_list/pumpkin_patch_meeting_point_2.json @@ -0,0 +1,74 @@ +{ + "processors": [ + { + "processor_type": "minecraft:rule", + "rules": [ + { + "input_predicate": { + "block": "minecraft:cobblestone", + "predicate_type": "minecraft:random_block_match", + "probability": 0.3 + }, + "location_predicate": { + "predicate_type": "minecraft:always_true" + }, + "output_state": { + "Name": "minecraft:mossy_cobblestone" + } + }, + { + "input_predicate": { + "block": "minecraft:cobblestone", + "predicate_type": "minecraft:random_block_match", + "probability": 0.3 + }, + "location_predicate": { + "predicate_type": "minecraft:always_true" + }, + "output_state": { + "Name": "biomeswevegone:mossy_stone" + } + }, + { + "input_predicate": { + "block": "minecraft:cobblestone", + "predicate_type": "minecraft:random_block_match", + "probability": 0.3 + }, + "location_predicate": { + "predicate_type": "minecraft:always_true" + }, + "output_state": { + "Name": "biomeswevegone:rocky_stone" + } + }, + { + "input_predicate": { + "block": "minecraft:cobblestone", + "predicate_type": "minecraft:random_block_match", + "probability": 0.15 + }, + "location_predicate": { + "predicate_type": "minecraft:always_true" + }, + "output_state": { + "Name": "minecraft:cracked_stone_bricks" + } + }, + { + "input_predicate": { + "block": "minecraft:cobblestone", + "predicate_type": "minecraft:random_block_match", + "probability": 0.15 + }, + "location_predicate": { + "predicate_type": "minecraft:always_true" + }, + "output_state": { + "Name": "minecraft:stone" + } + } + ] + } + ] +} \ No newline at end of file diff --git a/Common/src/main/generated/resources/data/biomeswevegone/worldgen/template_pool/village/pumpkin_patch/town_centers.json b/Common/src/main/generated/resources/data/biomeswevegone/worldgen/template_pool/village/pumpkin_patch/town_centers.json index 1fd32a75f..f309492d7 100644 --- a/Common/src/main/generated/resources/data/biomeswevegone/worldgen/template_pool/village/pumpkin_patch/town_centers.json +++ b/Common/src/main/generated/resources/data/biomeswevegone/worldgen/template_pool/village/pumpkin_patch/town_centers.json @@ -2,33 +2,27 @@ "elements": [ { "element": { - "element_type": "minecraft:legacy_single_pool_element", + "element_type": "minecraft:single_pool_element", "location": "biomeswevegone:village/pumpkin_patch/town_centers/pumpkin_patch_meeting_point_1", - "processors": { - "processors": [] - }, + "processors": "biomeswevegone:pumpkin_patch_meeting_point_1", "projection": "rigid" }, "weight": 1 }, { "element": { - "element_type": "minecraft:legacy_single_pool_element", + "element_type": "minecraft:single_pool_element", "location": "biomeswevegone:village/pumpkin_patch/town_centers/pumpkin_patch_meeting_point_2", - "processors": { - "processors": [] - }, + "processors": "biomeswevegone:pumpkin_patch_meeting_point_2", "projection": "rigid" }, "weight": 1 }, { "element": { - "element_type": "minecraft:legacy_single_pool_element", + "element_type": "minecraft:single_pool_element", "location": "biomeswevegone:village/pumpkin_patch/town_centers/pumpkin_patch_meeting_point_3", - "processors": { - "processors": [] - }, + "processors": "biomeswevegone:pumpkin_patch_house", "projection": "rigid" }, "weight": 1 diff --git a/Common/src/main/java/net/potionstudios/biomeswevegone/world/level/levelgen/structure/BWGVillageTemplatePools.java b/Common/src/main/java/net/potionstudios/biomeswevegone/world/level/levelgen/structure/BWGVillageTemplatePools.java index b424f558c..d50e0958b 100644 --- a/Common/src/main/java/net/potionstudios/biomeswevegone/world/level/levelgen/structure/BWGVillageTemplatePools.java +++ b/Common/src/main/java/net/potionstudios/biomeswevegone/world/level/levelgen/structure/BWGVillageTemplatePools.java @@ -293,9 +293,9 @@ public class BWGVillageTemplatePools { public static final ResourceKey PUMPKIN_PATCH_TOWN_CENTERS = register("pumpkin_patch/town_centers", templatePoolFactoryContext -> createTemplatePool(getEmptyPool(templatePoolFactoryContext), ImmutableList.of( - legacyPoolElement("pumpkin_patch/town_centers/pumpkin_patch_meeting_point_1"), - legacyPoolElement("pumpkin_patch/town_centers/pumpkin_patch_meeting_point_2"), - legacyPoolElement("pumpkin_patch/town_centers/pumpkin_patch_meeting_point_3") + singlePoolElement("pumpkin_patch/town_centers/pumpkin_patch_meeting_point_1", templatePoolFactoryContext, BWGStructureProcessorLists.PUMPKIN_PATCH_MEETING_POINT_1), + singlePoolElement("pumpkin_patch/town_centers/pumpkin_patch_meeting_point_2", templatePoolFactoryContext, BWGStructureProcessorLists.PUMPKIN_PATCH_MEETING_POINT_2), + singlePoolElement("pumpkin_patch/town_centers/pumpkin_patch_meeting_point_3", templatePoolFactoryContext, BWGStructureProcessorLists.PUMPKIN_PATCH_HOUSE) ), StructureTemplatePool.Projection.RIGID)); private static final ResourceKey PUMPKIN_PATCH_DECOR = register("pumpkin_patch/decor", templatePoolFactoryContext -> diff --git a/Common/src/main/java/net/potionstudios/biomeswevegone/world/level/levelgen/structure/processor/BWGRuleProcessors.java b/Common/src/main/java/net/potionstudios/biomeswevegone/world/level/levelgen/structure/processor/BWGRuleProcessors.java index 8663caed1..4e7d8b63e 100644 --- a/Common/src/main/java/net/potionstudios/biomeswevegone/world/level/levelgen/structure/processor/BWGRuleProcessors.java +++ b/Common/src/main/java/net/potionstudios/biomeswevegone/world/level/levelgen/structure/processor/BWGRuleProcessors.java @@ -171,6 +171,31 @@ protected static RuleProcessor lushDirtToCoarseDirt(float chance) { createAlwaysTrueRandomBlockMatchTest(Blocks.STONE_BRICKS, 0.3f, BWGBlocks.MOSSY_STONE_SET.getBase()) ); + protected static final RuleProcessor STONEBRICKS_MORE_VARIANTS = createRuleProcessor( + createAlwaysTrueRandomBlockMatchTest(Blocks.STONE_BRICKS, 0.3f, BWGBlocks.ROCKY_STONE_SET.getBase()), + createAlwaysTrueRandomBlockMatchTest(Blocks.STONE_BRICKS, 0.15f, Blocks.COBBLESTONE), + createAlwaysTrueRandomBlockMatchTest(Blocks.STONE_BRICKS, 0.15f, Blocks.MOSSY_COBBLESTONE), + createAlwaysTrueRandomBlockMatchTest(Blocks.STONE_BRICKS, 0.05f, Blocks.CHISELED_STONE_BRICKS) + ); + + protected static final RuleProcessor COBBLESTONE_VARIANTS = createRuleProcessor( + createAlwaysTrueRandomBlockMatchTest(Blocks.COBBLESTONE, 0.3f, Blocks.MOSSY_COBBLESTONE), + createAlwaysTrueRandomBlockMatchTest(Blocks.COBBLESTONE, 0.3f, BWGBlocks.MOSSY_STONE_SET.getBase()), + createAlwaysTrueRandomBlockMatchTest(Blocks.COBBLESTONE, 0.3f, BWGBlocks.ROCKY_STONE_SET.getBase()), + createAlwaysTrueRandomBlockMatchTest(Blocks.COBBLESTONE, 0.15f, Blocks.CRACKED_STONE_BRICKS), + createAlwaysTrueRandomBlockMatchTest(Blocks.COBBLESTONE, 0.15f, Blocks.STONE) + ); + + protected static final RuleProcessor COBBLESTONE_50_PERCENT_DIRT_PATH = createRuleProcessor( + createAlwaysTrueRandomBlockMatchTest(Blocks.COBBLESTONE, 0.5f, Blocks.DIRT_PATH) + ); + + protected static final RuleProcessor COBBLESTONE_20_PERCENT_GRASS = createRuleProcessor( + createAlwaysTrueRandomBlockMatchTest(Blocks.COBBLESTONE, 0.2f, Blocks.GRASS_BLOCK), + createAlwaysTrueRandomBlockMatchTest(Blocks.COBBLESTONE, 0.2f, BWGBlocks.LUSH_GRASS_BLOCK.get()) + ); + + protected static final RuleProcessor PODZOL_25_PERCENT_COARSE_DIRT = createRuleProcessor( createAlwaysTrueRandomBlockMatchTest(Blocks.PODZOL, 0.25f, Blocks.COARSE_DIRT) ); diff --git a/Common/src/main/java/net/potionstudios/biomeswevegone/world/level/levelgen/structure/processor/BWGStructureProcessorLists.java b/Common/src/main/java/net/potionstudios/biomeswevegone/world/level/levelgen/structure/processor/BWGStructureProcessorLists.java index d5ebd03e8..e2a0c3dfe 100644 --- a/Common/src/main/java/net/potionstudios/biomeswevegone/world/level/levelgen/structure/processor/BWGStructureProcessorLists.java +++ b/Common/src/main/java/net/potionstudios/biomeswevegone/world/level/levelgen/structure/processor/BWGStructureProcessorLists.java @@ -170,7 +170,22 @@ public class BWGStructureProcessorLists { BWGRuleProcessors.packedMudToBlock(0.35f, BWGBlocks.PEAT.get()), BWGRuleProcessors.packedMudToBlock(0.1f, Blocks.COARSE_DIRT), BWGRuleProcessors.STONEBRICKS_VARIANTS, - BWGRuleProcessors.MOSSIFY_50_PERCENT + BWGRuleProcessors.STONEBRICKS_MORE_VARIANTS + ) + )); + + public static final ResourceKey PUMPKIN_PATCH_MEETING_POINT_2 = register("pumpkin_patch_meeting_point_2", structureProcessorListHolderGetter -> new StructureProcessorList( + ImmutableList.of( + BWGRuleProcessors.COBBLESTONE_VARIANTS + ) + )); + + public static final ResourceKey PUMPKIN_PATCH_MEETING_POINT_1 = register("pumpkin_patch_meeting_point_1", structureProcessorListHolderGetter -> new StructureProcessorList( + ImmutableList.of( + BWGRuleProcessors.COBBLESTONE_50_PERCENT_DIRT_PATH, + BWGRuleProcessors.COBBLESTONE_20_PERCENT_GRASS, + BWGRuleProcessors.STONEBRICKS_VARIANTS, + BWGRuleProcessors.COBBLESTONE_VARIANTS ) )); diff --git a/Common/src/main/resources/data/biomeswevegone/structure/village/pumpkin_patch/houses/pumpkin_patch_medium_house_1.nbt b/Common/src/main/resources/data/biomeswevegone/structure/village/pumpkin_patch/houses/pumpkin_patch_medium_house_1.nbt index a90fa276d..14d86a556 100644 Binary files a/Common/src/main/resources/data/biomeswevegone/structure/village/pumpkin_patch/houses/pumpkin_patch_medium_house_1.nbt and b/Common/src/main/resources/data/biomeswevegone/structure/village/pumpkin_patch/houses/pumpkin_patch_medium_house_1.nbt differ diff --git a/Common/src/main/resources/data/biomeswevegone/structure/village/pumpkin_patch/houses/pumpkin_patch_medium_house_2.nbt b/Common/src/main/resources/data/biomeswevegone/structure/village/pumpkin_patch/houses/pumpkin_patch_medium_house_2.nbt index dd2abfeaf..f6e3fa44f 100644 Binary files a/Common/src/main/resources/data/biomeswevegone/structure/village/pumpkin_patch/houses/pumpkin_patch_medium_house_2.nbt and b/Common/src/main/resources/data/biomeswevegone/structure/village/pumpkin_patch/houses/pumpkin_patch_medium_house_2.nbt differ diff --git a/Common/src/main/resources/data/biomeswevegone/structure/village/pumpkin_patch/houses/pumpkin_patch_medium_house_3.nbt b/Common/src/main/resources/data/biomeswevegone/structure/village/pumpkin_patch/houses/pumpkin_patch_medium_house_3.nbt index d63ac19e4..69126e937 100644 Binary files a/Common/src/main/resources/data/biomeswevegone/structure/village/pumpkin_patch/houses/pumpkin_patch_medium_house_3.nbt and b/Common/src/main/resources/data/biomeswevegone/structure/village/pumpkin_patch/houses/pumpkin_patch_medium_house_3.nbt differ diff --git a/Common/src/main/resources/data/biomeswevegone/structure/village/pumpkin_patch/houses/pumpkin_patch_small_house_1.nbt b/Common/src/main/resources/data/biomeswevegone/structure/village/pumpkin_patch/houses/pumpkin_patch_small_house_1.nbt index 5a6edbfe6..5691a7766 100644 Binary files a/Common/src/main/resources/data/biomeswevegone/structure/village/pumpkin_patch/houses/pumpkin_patch_small_house_1.nbt and b/Common/src/main/resources/data/biomeswevegone/structure/village/pumpkin_patch/houses/pumpkin_patch_small_house_1.nbt differ diff --git a/Common/src/main/resources/data/biomeswevegone/structure/village/pumpkin_patch/houses/pumpkin_patch_small_house_2.nbt b/Common/src/main/resources/data/biomeswevegone/structure/village/pumpkin_patch/houses/pumpkin_patch_small_house_2.nbt index 376a14698..9972a7fc2 100644 Binary files a/Common/src/main/resources/data/biomeswevegone/structure/village/pumpkin_patch/houses/pumpkin_patch_small_house_2.nbt and b/Common/src/main/resources/data/biomeswevegone/structure/village/pumpkin_patch/houses/pumpkin_patch_small_house_2.nbt differ diff --git a/Common/src/main/resources/data/biomeswevegone/structure/village/pumpkin_patch/houses/pumpkin_patch_small_house_3.nbt b/Common/src/main/resources/data/biomeswevegone/structure/village/pumpkin_patch/houses/pumpkin_patch_small_house_3.nbt index aff15144e..c2ac21b36 100644 Binary files a/Common/src/main/resources/data/biomeswevegone/structure/village/pumpkin_patch/houses/pumpkin_patch_small_house_3.nbt and b/Common/src/main/resources/data/biomeswevegone/structure/village/pumpkin_patch/houses/pumpkin_patch_small_house_3.nbt differ diff --git a/Common/src/main/resources/data/biomeswevegone/structure/village/pumpkin_patch/houses/pumpkin_patch_small_house_4.nbt b/Common/src/main/resources/data/biomeswevegone/structure/village/pumpkin_patch/houses/pumpkin_patch_small_house_4.nbt index 7a0ad7e68..178b1912f 100644 Binary files a/Common/src/main/resources/data/biomeswevegone/structure/village/pumpkin_patch/houses/pumpkin_patch_small_house_4.nbt and b/Common/src/main/resources/data/biomeswevegone/structure/village/pumpkin_patch/houses/pumpkin_patch_small_house_4.nbt differ diff --git a/Common/src/main/resources/data/biomeswevegone/structure/village/pumpkin_patch/town_centers/pumpkin_patch_meeting_point_1.nbt b/Common/src/main/resources/data/biomeswevegone/structure/village/pumpkin_patch/town_centers/pumpkin_patch_meeting_point_1.nbt index 9158b3f04..2656459a4 100644 Binary files a/Common/src/main/resources/data/biomeswevegone/structure/village/pumpkin_patch/town_centers/pumpkin_patch_meeting_point_1.nbt and b/Common/src/main/resources/data/biomeswevegone/structure/village/pumpkin_patch/town_centers/pumpkin_patch_meeting_point_1.nbt differ diff --git a/Common/src/main/resources/data/biomeswevegone/structure/village/pumpkin_patch/town_centers/pumpkin_patch_meeting_point_2.nbt b/Common/src/main/resources/data/biomeswevegone/structure/village/pumpkin_patch/town_centers/pumpkin_patch_meeting_point_2.nbt index e4762c41b..94a981a25 100644 Binary files a/Common/src/main/resources/data/biomeswevegone/structure/village/pumpkin_patch/town_centers/pumpkin_patch_meeting_point_2.nbt and b/Common/src/main/resources/data/biomeswevegone/structure/village/pumpkin_patch/town_centers/pumpkin_patch_meeting_point_2.nbt differ diff --git a/Common/src/main/resources/data/biomeswevegone/structure/village/pumpkin_patch/town_centers/pumpkin_patch_meeting_point_3.nbt b/Common/src/main/resources/data/biomeswevegone/structure/village/pumpkin_patch/town_centers/pumpkin_patch_meeting_point_3.nbt index bdf677ab9..6eca690cf 100644 Binary files a/Common/src/main/resources/data/biomeswevegone/structure/village/pumpkin_patch/town_centers/pumpkin_patch_meeting_point_3.nbt and b/Common/src/main/resources/data/biomeswevegone/structure/village/pumpkin_patch/town_centers/pumpkin_patch_meeting_point_3.nbt differ