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 77cadf4c3..01a19515e 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 @@ -7,7 +7,7 @@ "input_predicate": { "block": "minecraft:packed_mud", "predicate_type": "minecraft:random_block_match", - "probability": 0.4 + "probability": 0.5 }, "location_predicate": { "predicate_type": "minecraft:always_true" @@ -28,7 +28,7 @@ "input_predicate": { "block": "minecraft:packed_mud", "predicate_type": "minecraft:random_block_match", - "probability": 0.3 + "probability": 0.35 }, "location_predicate": { "predicate_type": "minecraft:always_true" @@ -39,6 +39,68 @@ } ] }, + { + "processor_type": "minecraft:rule", + "rules": [ + { + "input_predicate": { + "block": "minecraft:packed_mud", + "predicate_type": "minecraft:random_block_match", + "probability": 0.1 + }, + "location_predicate": { + "predicate_type": "minecraft:always_true" + }, + "output_state": { + "Name": "minecraft:coarse_dirt" + } + } + ] + }, + { + "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": [ diff --git a/Common/src/main/generated/resources/data/biomeswevegone/worldgen/template_pool/village/pumpkin_patch/houses.json b/Common/src/main/generated/resources/data/biomeswevegone/worldgen/template_pool/village/pumpkin_patch/houses.json index 3467bc44b..a0f72a035 100644 --- a/Common/src/main/generated/resources/data/biomeswevegone/worldgen/template_pool/village/pumpkin_patch/houses.json +++ b/Common/src/main/generated/resources/data/biomeswevegone/worldgen/template_pool/village/pumpkin_patch/houses.json @@ -20,55 +20,45 @@ }, { "element": { - "element_type": "minecraft:legacy_single_pool_element", + "element_type": "minecraft:single_pool_element", "location": "biomeswevegone:village/pumpkin_patch/houses/pumpkin_patch_small_house_3", - "processors": { - "processors": [] - }, + "processors": "biomeswevegone:pumpkin_patch_house", "projection": "rigid" }, "weight": 3 }, { "element": { - "element_type": "minecraft:legacy_single_pool_element", + "element_type": "minecraft:single_pool_element", "location": "biomeswevegone:village/pumpkin_patch/houses/pumpkin_patch_small_house_4", - "processors": { - "processors": [] - }, + "processors": "biomeswevegone:pumpkin_patch_house", "projection": "rigid" }, "weight": 3 }, { "element": { - "element_type": "minecraft:legacy_single_pool_element", + "element_type": "minecraft:single_pool_element", "location": "biomeswevegone:village/pumpkin_patch/houses/pumpkin_patch_medium_house_1", - "processors": { - "processors": [] - }, + "processors": "biomeswevegone:pumpkin_patch_house", "projection": "rigid" }, "weight": 3 }, { "element": { - "element_type": "minecraft:legacy_single_pool_element", + "element_type": "minecraft:single_pool_element", "location": "biomeswevegone:village/pumpkin_patch/houses/pumpkin_patch_medium_house_2", - "processors": { - "processors": [] - }, + "processors": "biomeswevegone:pumpkin_patch_house", "projection": "rigid" }, "weight": 2 }, { "element": { - "element_type": "minecraft:legacy_single_pool_element", + "element_type": "minecraft:single_pool_element", "location": "biomeswevegone:village/pumpkin_patch/houses/pumpkin_patch_medium_house_3", - "processors": { - "processors": [] - }, + "processors": "biomeswevegone:pumpkin_patch_house", "projection": "rigid" }, "weight": 3 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 aa3a90e1d..b424f558c 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 @@ -325,11 +325,11 @@ public class BWGVillageTemplatePools { createTemplatePool(getPool(templatePoolFactoryContext, PUMPKIN_PATCH_TERMINATOR), ImmutableList.of( singlePoolElement("pumpkin_patch/houses/pumpkin_patch_small_house_1", 3, templatePoolFactoryContext, BWGStructureProcessorLists.PUMPKIN_PATCH_HOUSE), singlePoolElement("pumpkin_patch/houses/pumpkin_patch_small_house_2", 3, templatePoolFactoryContext, BWGStructureProcessorLists.PUMPKIN_PATCH_HOUSE), - legacyPoolElement("pumpkin_patch/houses/pumpkin_patch_small_house_3", 3), - legacyPoolElement("pumpkin_patch/houses/pumpkin_patch_small_house_4", 3), - legacyPoolElement("pumpkin_patch/houses/pumpkin_patch_medium_house_1", 3), - legacyPoolElement("pumpkin_patch/houses/pumpkin_patch_medium_house_2", 2), - legacyPoolElement("pumpkin_patch/houses/pumpkin_patch_medium_house_3", 3), + singlePoolElement("pumpkin_patch/houses/pumpkin_patch_small_house_3", 3, templatePoolFactoryContext, BWGStructureProcessorLists.PUMPKIN_PATCH_HOUSE), + singlePoolElement("pumpkin_patch/houses/pumpkin_patch_small_house_4", 3, templatePoolFactoryContext, BWGStructureProcessorLists.PUMPKIN_PATCH_HOUSE), + singlePoolElement("pumpkin_patch/houses/pumpkin_patch_medium_house_1", 3, templatePoolFactoryContext, BWGStructureProcessorLists.PUMPKIN_PATCH_HOUSE), + singlePoolElement("pumpkin_patch/houses/pumpkin_patch_medium_house_2", 2, templatePoolFactoryContext, BWGStructureProcessorLists.PUMPKIN_PATCH_HOUSE), + singlePoolElement("pumpkin_patch/houses/pumpkin_patch_medium_house_3", 3, templatePoolFactoryContext, BWGStructureProcessorLists.PUMPKIN_PATCH_HOUSE), legacyPoolElement("pumpkin_patch/houses/pumpkin_patch_small_farm_1", 2, templatePoolFactoryContext, ProcessorLists.FARM_TAIGA), legacyPoolElement("pumpkin_patch/houses/pumpkin_patch_small_farm_2", 3, templatePoolFactoryContext, ProcessorLists.FARM_TAIGA), legacyPoolElement("pumpkin_patch/houses/pumpkin_patch_small_farm_3", 2, templatePoolFactoryContext, ProcessorLists.FARM_TAIGA), 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 4a8baa825..d5ebd03e8 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 @@ -166,8 +166,10 @@ public class BWGStructureProcessorLists { public static final ResourceKey PUMPKIN_PATCH_HOUSE = register("pumpkin_patch_house", structureProcessorListHolderGetter -> new StructureProcessorList( ImmutableList.of( - BWGRuleProcessors.packedMudToBlock(0.4f, BWGBlocks.LUSH_GRASS_BLOCK.get()), - BWGRuleProcessors.packedMudToBlock(0.3f, BWGBlocks.PEAT.get()), + BWGRuleProcessors.packedMudToBlock(0.5f, BWGBlocks.LUSH_GRASS_BLOCK.get()), + BWGRuleProcessors.packedMudToBlock(0.35f, BWGBlocks.PEAT.get()), + BWGRuleProcessors.packedMudToBlock(0.1f, Blocks.COARSE_DIRT), + BWGRuleProcessors.STONEBRICKS_VARIANTS, BWGRuleProcessors.MOSSIFY_50_PERCENT ) )); 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 f129567a8..a90fa276d 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 a44b982e2..dd2abfeaf 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 c9ddfc459..d63ac19e4 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_3.nbt b/Common/src/main/resources/data/biomeswevegone/structure/village/pumpkin_patch/houses/pumpkin_patch_small_house_3.nbt index 4dbeae889..aff15144e 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 91606b0cc..7a0ad7e68 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