Merge branch 'master' into 1.21.2

FrozenBlock · Nov 26, 2024 · ff6f0a6 · ff6f0a6
2 parents 5da06c2 + 59bf0f9
commit ff6f0a6
Show file tree

Hide file tree

Showing 35 changed files with 297 additions and 44 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,9 +3,10 @@ Thank you!
 Put the changelog BELOW the dashes. ANYTHING ABOVE IS IGNORED
 hi
 -----------------
-- Added 27 new rooms for the Catacombs.
-- Chains new generate more commonly in Catacombs.
+- Added 42 new rooms for Catacombs.
+- Chains now generate more commonly in Catacombs.
 - Fixed a vanilla bug where Powered Rails, Activator Rails, and Detector Rails wouldn't rotate properly in structure generation.
 - Cracked and Chiseled Purpur Blocks can now be broken faster with a pickaxe. ([#10](https://github.com/FrozenBlock/TrailierTales/issues/10))
 - Fixed a crash where modded boats that aren't implemented the same way as vanilla cause a crash. ([#9](https://github.com/FrozenBlock/TrailierTales/issues/9))
+- Fixed the Polished Calcite Wall not being craftable with a Stonecutter. ([#11](https://github.com/FrozenBlock/TrailierTales/issues/11))
 - Removed the leftover `TRAILIER TALES` subtitle from the main menu.
diff --git a/...lcite_wall_from_calcite_stonecutting.json → ...lcite_wall_from_calcite_stonecutting.json b/...lcite_wall_from_calcite_stonecutting.json → ...lcite_wall_from_calcite_stonecutting.json
diff --git a/.../advancement/recipes/building_blocks/polished_calcite_wall_from_calcite_stonecutting.json b/.../advancement/recipes/building_blocks/polished_calcite_wall_from_calcite_stonecutting.json
@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_calcite": {
+      "conditions": {
+        "items": [
+          {
+            "items": "minecraft:calcite"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "minecraft:polished_calcite_wall_from_calcite_stonecutting"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_calcite"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "minecraft:polished_calcite_wall_from_calcite_stonecutting"
+    ]
+  }
+}
diff --git a/...ent/recipes/building_blocks/polished_calcite_wall_from_polished_calcite_stonecutting.json b/...ent/recipes/building_blocks/polished_calcite_wall_from_polished_calcite_stonecutting.json
@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_polished_calcite": {
+      "conditions": {
+        "items": [
+          {
+            "items": "trailiertales:polished_calcite"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "minecraft:polished_calcite_wall_from_polished_calcite_stonecutting"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_polished_calcite"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "minecraft:polished_calcite_wall_from_polished_calcite_stonecutting"
+    ]
+  }
+}
diff --git a/.../generated/data/trailiertales/recipe/polished_calcite_wall_from_calcite_stonecutting.json b/.../generated/data/trailiertales/recipe/polished_calcite_wall_from_calcite_stonecutting.json
@@ -0,0 +1,8 @@
+{
+  "type": "minecraft:stonecutting",
+  "ingredient": "minecraft:calcite",
+  "result": {
+    "count": 1,
+    "id": "trailiertales:polished_calcite_wall"
+  }
+}
diff --git a/...d/data/trailiertales/recipe/polished_calcite_wall_from_polished_calcite_stonecutting.json b/...d/data/trailiertales/recipe/polished_calcite_wall_from_polished_calcite_stonecutting.json
@@ -0,0 +1,8 @@
+{
+  "type": "minecraft:stonecutting",
+  "ingredient": "trailiertales:polished_calcite",
+  "result": {
+    "count": 1,
+    "id": "trailiertales:polished_calcite_wall"
+  }
+}
diff --git a/...ain/generated/data/trailiertales/worldgen/template_pool/catacombs/corridor_connector.json b/...ain/generated/data/trailiertales/worldgen/template_pool/catacombs/corridor_connector.json
@@ -792,6 +792,15 @@
       },
       "weight": 2
     },
+    {
+      "element": {
+        "element_type": "minecraft:single_pool_element",
+        "location": "trailiertales:catacombs/tomb/corridor_pit",
+        "processors": "trailiertales:catacombs_tomb",
+        "projection": "rigid"
+      },
+      "weight": 2
+    },
     {
       "element": {
         "element_type": "minecraft:single_pool_element",
@@ -999,6 +1008,15 @@
       },
       "weight": 2
     },
+    {
+      "element": {
+        "element_type": "minecraft:single_pool_element",
+        "location": "trailiertales:catacombs/tomb/hallway",
+        "processors": "trailiertales:catacombs_tomb",
+        "projection": "rigid"
+      },
+      "weight": 2
+    },
     {
       "element": {
         "element_type": "minecraft:single_pool_element",
@@ -1116,6 +1134,15 @@
       },
       "weight": 2
     },
+    {
+      "element": {
+        "element_type": "minecraft:single_pool_element",
+        "location": "trailiertales:catacombs/tomb/layered4",
+        "processors": "trailiertales:catacombs_tomb",
+        "projection": "rigid"
+      },
+      "weight": 2
+    },
     {
       "element": {
         "element_type": "minecraft:single_pool_element",
@@ -1164,7 +1191,7 @@
     {
       "element": {
         "element_type": "minecraft:single_pool_element",
-        "location": "trailiertales:catacombs/tomb/mob_delivery",
+        "location": "trailiertales:catacombs/tomb/mob_delivery1",
         "processors": "trailiertales:catacombs_mineshaft",
         "projection": "rigid"
       },
@@ -1173,7 +1200,34 @@
     {
       "element": {
         "element_type": "minecraft:single_pool_element",
-        "location": "trailiertales:catacombs/tomb/mob_drop",
+        "location": "trailiertales:catacombs/tomb/mob_delivery2",
+        "processors": "trailiertales:catacombs_tomb",
+        "projection": "rigid"
+      },
+      "weight": 2
+    },
+    {
+      "element": {
+        "element_type": "minecraft:single_pool_element",
+        "location": "trailiertales:catacombs/tomb/mob_delivery3",
+        "processors": "trailiertales:catacombs_tomb",
+        "projection": "rigid"
+      },
+      "weight": 2
+    },
+    {
+      "element": {
+        "element_type": "minecraft:single_pool_element",
+        "location": "trailiertales:catacombs/tomb/mob_drop1",
+        "processors": "trailiertales:catacombs_tomb",
+        "projection": "rigid"
+      },
+      "weight": 2
+    },
+    {
+      "element": {
+        "element_type": "minecraft:single_pool_element",
+        "location": "trailiertales:catacombs/tomb/mob_drop2",
         "processors": "trailiertales:catacombs_tomb",
         "projection": "rigid"
       },
@@ -1278,6 +1332,15 @@
       },
       "weight": 2
     },
+    {
+      "element": {
+        "element_type": "minecraft:single_pool_element",
+        "location": "trailiertales:catacombs/tomb/ritual_flood",
+        "processors": "trailiertales:catacombs_tomb",
+        "projection": "rigid"
+      },
+      "weight": 2
+    },
     {
       "element": {
         "element_type": "minecraft:single_pool_element",
@@ -1449,6 +1512,15 @@
       },
       "weight": 2
     },
+    {
+      "element": {
+        "element_type": "minecraft:single_pool_element",
+        "location": "trailiertales:catacombs/tomb/small_fancy_tomb11",
+        "processors": "trailiertales:catacombs_tomb",
+        "projection": "rigid"
+      },
+      "weight": 2
+    },
     {
       "element": {
         "element_type": "minecraft:single_pool_element",
@@ -1584,6 +1656,15 @@
       },
       "weight": 2
     },
+    {
+      "element": {
+        "element_type": "minecraft:single_pool_element",
+        "location": "trailiertales:catacombs/tomb/waterworks",
+        "processors": "trailiertales:catacombs_tomb",
+        "projection": "rigid"
+      },
+      "weight": 2
+    },
     {
       "element": {
         "element_type": "minecraft:single_pool_element",
@@ -1602,6 +1683,15 @@
       },
       "weight": 1
     },
+    {
+      "element": {
+        "element_type": "minecraft:single_pool_element",
+        "location": "trailiertales:catacombs/corridor/gallery",
+        "processors": "trailiertales:catacombs_corridor",
+        "projection": "rigid"
+      },
+      "weight": 1
+    },
     {
       "element": {
         "element_type": "minecraft:single_pool_element",

diff --git a/src/main/generated/data/trailiertales/worldgen/template_pool/catacombs/decoration/chain.json b/src/main/generated/data/trailiertales/worldgen/template_pool/catacombs/decoration/chain.json
@@ -4,7 +4,7 @@
       "element": {
         "element_type": "minecraft:empty_pool_element"
       },
-      "weight": 60
+      "weight": 75
     },
     {
       "element": {
@@ -26,7 +26,7 @@
         },
         "projection": "rigid"
       },
-      "weight": 1
+      "weight": 2
     },
     {
       "element": {
@@ -37,7 +37,7 @@
         },
         "projection": "rigid"
       },
-      "weight": 1
+      "weight": 3
     },
     {
       "element": {
@@ -48,7 +48,7 @@
         },
         "projection": "rigid"
       },
-      "weight": 1
+      "weight": 4
     },
     {
       "element": {
@@ -59,7 +59,7 @@
         },
         "projection": "rigid"
       },
-      "weight": 1
+      "weight": 5
     }
   ],
   "fallback": "minecraft:empty"

diff --git a/...ain/generated/data/trailiertales/worldgen/template_pool/catacombs/decoration/chain_1.json b/...ain/generated/data/trailiertales/worldgen/template_pool/catacombs/decoration/chain_1.json
@@ -4,7 +4,7 @@
       "element": {
         "element_type": "minecraft:empty_pool_element"
       },
-      "weight": 60
+      "weight": 75
     },
     {
       "element": {
@@ -15,7 +15,7 @@
         },
         "projection": "rigid"
       },
-      "weight": 1
+      "weight": 12
     }
   ],
   "fallback": "minecraft:empty"

diff --git a/...ain/generated/data/trailiertales/worldgen/template_pool/catacombs/decoration/chain_2.json b/...ain/generated/data/trailiertales/worldgen/template_pool/catacombs/decoration/chain_2.json
@@ -4,7 +4,7 @@
       "element": {
         "element_type": "minecraft:empty_pool_element"
       },
-      "weight": 60
+      "weight": 75
     },
     {
       "element": {
@@ -15,7 +15,7 @@
         },
         "projection": "rigid"
       },
-      "weight": 1
+      "weight": 6
     },
     {
       "element": {
@@ -26,7 +26,7 @@
         },
         "projection": "rigid"
       },
-      "weight": 1
+      "weight": 6
     }
   ],
   "fallback": "minecraft:empty"

diff --git a/...ain/generated/data/trailiertales/worldgen/template_pool/catacombs/decoration/chain_3.json b/...ain/generated/data/trailiertales/worldgen/template_pool/catacombs/decoration/chain_3.json
@@ -4,7 +4,7 @@
       "element": {
         "element_type": "minecraft:empty_pool_element"
       },
-      "weight": 60
+      "weight": 75
     },
     {
       "element": {
@@ -15,7 +15,7 @@
         },
         "projection": "rigid"
       },
-      "weight": 1
+      "weight": 4
     },
     {
       "element": {
@@ -26,7 +26,7 @@
         },
         "projection": "rigid"
       },
-      "weight": 1
+      "weight": 4
     },
     {
       "element": {
@@ -37,7 +37,7 @@
         },
         "projection": "rigid"
       },
-      "weight": 1
+      "weight": 4
     }
   ],
   "fallback": "minecraft:empty"