Skyris Fletcher House and Armorer Updates

Signed-off-by: Joseph T. McQuigg <[email protected]>
Potion-Studios · Aug 21, 2024 · 3927e53 · 3927e53
1 parent c558f5d
commit 3927e53
Show file tree

Hide file tree

Showing 8 changed files with 99 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,7 @@
 # 1.1.2-Beta
 - Set getBucketItemStack in ManOWar.java to correct Item
-- Update Skyris Mason and Weaponsmith to non-legacy
-- Use Processor on Skyris Mason
+- Update Skyris Mason, Weaponsmith, Fletcher House and Armorer to non-legacy
+- Use Processor on Skyris Mason, Skyris Fletcher House
 - Remove Duplicate Skyris Butcher Shop Entry from Template Pool
 - Update Chinese Language File (ZH_CN)
 

diff --git a/...enerated/resources/data/biomeswevegone/worldgen/processor_list/skyris_fletcher_house.json b/...enerated/resources/data/biomeswevegone/worldgen/processor_list/skyris_fletcher_house.json
@@ -0,0 +1,71 @@
+{
+  "processors": [
+    {
+      "processor_type": "minecraft:rule",
+      "rules": [
+        {
+          "input_predicate": {
+            "block": "minecraft:podzol",
+            "predicate_type": "minecraft:random_block_match",
+            "probability": 0.25
+          },
+          "location_predicate": {
+            "predicate_type": "minecraft:always_true"
+          },
+          "output_state": {
+            "Name": "minecraft:coarse_dirt"
+          }
+        }
+      ]
+    },
+    {
+      "processor_type": "minecraft:rule",
+      "rules": [
+        {
+          "input_predicate": {
+            "block": "minecraft:podzol",
+            "predicate_type": "minecraft:random_block_match",
+            "probability": 0.1
+          },
+          "location_predicate": {
+            "predicate_type": "minecraft:always_true"
+          },
+          "output_state": {
+            "Name": "minecraft:gravel"
+          }
+        }
+      ]
+    },
+    {
+      "processor_type": "minecraft:rule",
+      "rules": [
+        {
+          "input_predicate": {
+            "block": "minecraft:podzol",
+            "predicate_type": "minecraft:random_block_match",
+            "probability": 0.1
+          },
+          "location_predicate": {
+            "predicate_type": "minecraft:always_true"
+          },
+          "output_state": {
+            "Name": "minecraft:andesite"
+          }
+        },
+        {
+          "input_predicate": {
+            "block": "minecraft:podzol",
+            "predicate_type": "minecraft:random_block_match",
+            "probability": 0.1
+          },
+          "location_predicate": {
+            "predicate_type": "minecraft:always_true"
+          },
+          "output_state": {
+            "Name": "minecraft:polished_andesite"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/...generated/resources/data/biomeswevegone/worldgen/template_pool/village/skyris/houses.json b/...generated/resources/data/biomeswevegone/worldgen/template_pool/village/skyris/houses.json
@@ -95,11 +95,9 @@
     },
     {
       "element": {
-        "element_type": "minecraft:legacy_single_pool_element",
+        "element_type": "minecraft:single_pool_element",
         "location": "biomeswevegone:village/skyris/houses/skyris_fletcher_house_1",
-        "processors": {
-          "processors": []
-        },
+        "processors": "biomeswevegone:skyris_fletcher_house",
         "projection": "rigid"
       },
       "weight": 2
@@ -117,7 +115,7 @@
     },
     {
       "element": {
-        "element_type": "minecraft:legacy_single_pool_element",
+        "element_type": "minecraft:single_pool_element",
         "location": "biomeswevegone:village/skyris/houses/skyris_armorer_1",
         "processors": {
           "processors": []

diff --git a/.../potionstudios/biomeswevegone/world/level/levelgen/structure/BWGVillageTemplatePools.java b/.../potionstudios/biomeswevegone/world/level/levelgen/structure/BWGVillageTemplatePools.java
@@ -77,9 +77,9 @@ public class BWGVillageTemplatePools {
                     singlePoolElement("skyris/houses/skyris_medium_house_1", 2, templatePoolFactoryContext, BWGStructureProcessorLists.SKYRIS_STREETS),
                     singlePoolElement("skyris/houses/skyris_tool_smith_1", 2, templatePoolFactoryContext, BWGStructureProcessorLists.SKYRIS_STREETS),
                     singlePoolElement("skyris/houses/skyris_butcher_shop_1",2, templatePoolFactoryContext, BWGStructureProcessorLists.SKYRIS_STREETS),
-                    legacyPoolElement("skyris/houses/skyris_fletcher_house_1", 2),
+                    singlePoolElement("skyris/houses/skyris_fletcher_house_1", 2, templatePoolFactoryContext, BWGStructureProcessorLists.SKYRIS_FLETCHER_HOUSE),
                     legacyPoolElement("skyris/houses/skyris_forager_1", 2),
-                    legacyPoolElement("skyris/houses/skyris_armorer_1"),
+                    singlePoolElement("skyris/houses/skyris_armorer_1"),
                     singlePoolElement("skyris/houses/skyris_fisher_1", 2),
                     singlePoolElement("skyris/houses/skyris_cartographer_house_1", 2, templatePoolFactoryContext, BWGStructureProcessorLists.SKYRIS_STREETS),
                     singlePoolElement("skyris/houses/skyris_library_1", 2, templatePoolFactoryContext, BWGStructureProcessorLists.SKYRIS_LIBRARY),

diff --git a/...ionstudios/biomeswevegone/world/level/levelgen/structure/processor/BWGRuleProcessors.java b/...ionstudios/biomeswevegone/world/level/levelgen/structure/processor/BWGRuleProcessors.java
@@ -165,6 +165,19 @@ protected static RuleProcessor lushDirtToCoarseDirt(float chance) {
 			createAlwaysTrueRandomBlockMatchTest(Blocks.STONE_BRICKS, 0.3f, BWGBlocks.MOSSY_STONE_SET.getBase())
 	);
 
+	protected static RuleProcessor PODZOL_25_PERCENT_COARSE_DIRT = createRuleProcessor(
+			createAlwaysTrueRandomBlockMatchTest(Blocks.PODZOL, 0.25f, Blocks.COARSE_DIRT)
+	);
+
+	protected static RuleProcessor PODZOL_10_PERCENT_GRAVEL = createRuleProcessor(
+			createAlwaysTrueRandomBlockMatchTest(Blocks.PODZOL, 0.1f, Blocks.GRAVEL)
+	);
+
+	protected static RuleProcessor PODZOL_10_PERCENT_ANDESITE = createRuleProcessor(
+			createAlwaysTrueRandomBlockMatchTest(Blocks.PODZOL, 0.1f, Blocks.ANDESITE),
+			createAlwaysTrueRandomBlockMatchTest(Blocks.PODZOL, 0.1f, Blocks.POLISHED_ANDESITE)
+	);
+
 	protected static RuleProcessor skyrisLeavesToGreenAppleLeaves(float chance) {
 		return createRuleProcessor(createAlwaysTrueRandomBlockMatchTest(BWGWood.SKYRIS.leaves(), chance, BWGWood.SKYRIS_LEAVES_GREEN_APPLE.get()));
 	}

diff --git a/...s/biomeswevegone/world/level/levelgen/structure/processor/BWGStructureProcessorLists.java b/...s/biomeswevegone/world/level/levelgen/structure/processor/BWGStructureProcessorLists.java
@@ -67,6 +67,14 @@ public class BWGStructureProcessorLists {
             )
     ));
 
+    public static final ResourceKey<StructureProcessorList> SKYRIS_FLETCHER_HOUSE = register("skyris_fletcher_house", structureProcessorListHolderGetter -> new StructureProcessorList(
+            ImmutableList.of(
+                BWGRuleProcessors.PODZOL_25_PERCENT_COARSE_DIRT,
+                BWGRuleProcessors.PODZOL_10_PERCENT_GRAVEL,
+                BWGRuleProcessors.PODZOL_10_PERCENT_ANDESITE
+            )
+    ));
+
     public static final ResourceKey<StructureProcessorList> SKYRIS_TOWN_CENTERS = register("skyris_town_centers", structureProcessorListHolderGetter -> new StructureProcessorList(
             ImmutableList.of(
                     BWGRuleProcessors.POLISHED_ANDESITE_RANDOM_ANDESITE_GRAVEL,

diff --git a/.../main/resources/data/biomeswevegone/structures/village/skyris/houses/skyris_armorer_1.nbt b/.../main/resources/data/biomeswevegone/structures/village/skyris/houses/skyris_armorer_1.nbt
diff --git a/...esources/data/biomeswevegone/structures/village/skyris/houses/skyris_fletcher_house_1.nbt b/...esources/data/biomeswevegone/structures/village/skyris/houses/skyris_fletcher_house_1.nbt