Update terrain ladders and bookshelves to use the appropriate CommonR… (

#638) - Bookshelves now use CommonRecipes.bookshelfRecipe() - The previous recipes would create the Vanilla bookshelf rather than the specific wood. This update allows the set-specific shelves to be crafted. - Ladders now use CommonRecipes.ladderRecipe() - The previous recipes worked, and there is no change on the user's end, so this has not been mentioned in the CHANGELOG Co-authored-by: kirderf1 <[email protected]>
lunar-sway · Oct 6, 2024 · 8430947 · 8430947
1 parent 4dda5a0
commit 8430947
Show file tree

Hide file tree

Showing 34 changed files with 117 additions and 100 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -32,6 +32,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 - Lotus Flowers no longer push entities inside of them away
 - Ogres and Basilisks no longer slide around when idling
 - Cruxite button now uses raw cruxite instead of cruxite block, which resolves a conflict with storage block breakdown
+- Bookshelves for terrain woods can now be crafted, resolving a conflict with the vanilla bookshelf recipe
 - Fixed right-clicking on an Area Effect Block with a Potion not properly updating its settings
 - Fixed right-clicking on a Summoner Block with a Spawn Egg not properly updating its settings
 

diff --git a/...ted/resources/data/minestuck/advancements/recipes/building_blocks/cindered_bookshelf.json b/...ted/resources/data/minestuck/advancements/recipes/building_blocks/cindered_bookshelf.json
@@ -1,7 +1,7 @@
 {
   "parent": "minecraft:recipes/root",
   "criteria": {
-    "has_planks": {
+    "has_cindered_planks": {
       "conditions": {
         "items": [
           {
@@ -23,7 +23,7 @@
   "requirements": [
     [
       "has_the_recipe",
-      "has_planks"
+      "has_cindered_planks"
     ]
   ],
   "rewards": {

diff --git a/...nerated/resources/data/minestuck/advancements/recipes/building_blocks/dead_bookshelf.json b/...nerated/resources/data/minestuck/advancements/recipes/building_blocks/dead_bookshelf.json
@@ -1,7 +1,7 @@
 {
   "parent": "minecraft:recipes/root",
   "criteria": {
-    "has_planks": {
+    "has_dead_planks": {
       "conditions": {
         "items": [
           {
@@ -23,7 +23,7 @@
   "requirements": [
     [
       "has_the_recipe",
-      "has_planks"
+      "has_dead_planks"
     ]
   ],
   "rewards": {

diff --git a/...enerated/resources/data/minestuck/advancements/recipes/building_blocks/end_bookshelf.json b/...enerated/resources/data/minestuck/advancements/recipes/building_blocks/end_bookshelf.json
@@ -1,7 +1,7 @@
 {
   "parent": "minecraft:recipes/root",
   "criteria": {
-    "has_planks": {
+    "has_end_planks": {
       "conditions": {
         "items": [
           {
@@ -23,7 +23,7 @@
   "requirements": [
     [
       "has_the_recipe",
-      "has_planks"
+      "has_end_planks"
     ]
   ],
   "rewards": {

diff --git a/...erated/resources/data/minestuck/advancements/recipes/building_blocks/frost_bookshelf.json b/...erated/resources/data/minestuck/advancements/recipes/building_blocks/frost_bookshelf.json
@@ -1,7 +1,7 @@
 {
   "parent": "minecraft:recipes/root",
   "criteria": {
-    "has_planks": {
+    "has_frost_planks": {
       "conditions": {
         "items": [
           {
@@ -23,7 +23,7 @@
   "requirements": [
     [
       "has_the_recipe",
-      "has_planks"
+      "has_frost_planks"
     ]
   ],
   "rewards": {

diff --git a/...ated/resources/data/minestuck/advancements/recipes/building_blocks/glowing_bookshelf.json b/...ated/resources/data/minestuck/advancements/recipes/building_blocks/glowing_bookshelf.json
@@ -1,7 +1,7 @@
 {
   "parent": "minecraft:recipes/root",
   "criteria": {
-    "has_planks": {
+    "has_glowing_planks": {
       "conditions": {
         "items": [
           {
@@ -23,7 +23,7 @@
   "requirements": [
     [
       "has_the_recipe",
-      "has_planks"
+      "has_glowing_planks"
     ]
   ],
   "rewards": {

diff --git a/...ated/resources/data/minestuck/advancements/recipes/building_blocks/rainbow_bookshelf.json b/...ated/resources/data/minestuck/advancements/recipes/building_blocks/rainbow_bookshelf.json
@@ -1,7 +1,7 @@
 {
   "parent": "minecraft:recipes/root",
   "criteria": {
-    "has_planks": {
+    "has_rainbow_planks": {
       "conditions": {
         "items": [
           {
@@ -23,7 +23,7 @@
   "requirements": [
     [
       "has_the_recipe",
-      "has_planks"
+      "has_rainbow_planks"
     ]
   ],
   "rewards": {

diff --git a/...ed/resources/data/minestuck/advancements/recipes/building_blocks/shadewood_bookshelf.json b/...ed/resources/data/minestuck/advancements/recipes/building_blocks/shadewood_bookshelf.json
@@ -1,7 +1,7 @@
 {
   "parent": "minecraft:recipes/root",
   "criteria": {
-    "has_planks": {
+    "has_shadewood_planks": {
       "conditions": {
         "items": [
           {
@@ -23,7 +23,7 @@
   "requirements": [
     [
       "has_the_recipe",
-      "has_planks"
+      "has_shadewood_planks"
     ]
   ],
   "rewards": {

diff --git a/...ated/resources/data/minestuck/advancements/recipes/building_blocks/treated_bookshelf.json b/...ated/resources/data/minestuck/advancements/recipes/building_blocks/treated_bookshelf.json
@@ -1,7 +1,13 @@
 {
   "parent": "minecraft:recipes/root",
   "criteria": {
-    "has_planks": {
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "minestuck:treated_bookshelf"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    },
+    "has_treated_planks": {
       "conditions": {
         "items": [
           {
@@ -12,18 +18,12 @@
         ]
       },
       "trigger": "minecraft:inventory_changed"
-    },
-    "has_the_recipe": {
-      "conditions": {
-        "recipe": "minestuck:treated_bookshelf"
-      },
-      "trigger": "minecraft:recipe_unlocked"
     }
   },
   "requirements": [
     [
       "has_the_recipe",
-      "has_planks"
+      "has_treated_planks"
     ]
   ],
   "rewards": {

diff --git a/.../generated/resources/data/minestuck/advancements/recipes/decorations/cindered_ladder.json b/.../generated/resources/data/minestuck/advancements/recipes/decorations/cindered_ladder.json
@@ -1,7 +1,7 @@
 {
   "parent": "minecraft:recipes/root",
   "criteria": {
-    "has_planks": {
+    "has_cindered_planks": {
       "conditions": {
         "items": [
           {
@@ -23,7 +23,7 @@
   "requirements": [
     [
       "has_the_recipe",
-      "has_planks"
+      "has_cindered_planks"
     ]
   ],
   "rewards": {

diff --git a/...main/generated/resources/data/minestuck/advancements/recipes/decorations/dead_ladder.json b/...main/generated/resources/data/minestuck/advancements/recipes/decorations/dead_ladder.json
@@ -1,7 +1,7 @@
 {
   "parent": "minecraft:recipes/root",
   "criteria": {
-    "has_planks": {
+    "has_dead_planks": {
       "conditions": {
         "items": [
           {
@@ -23,7 +23,7 @@
   "requirements": [
     [
       "has_the_recipe",
-      "has_planks"
+      "has_dead_planks"
     ]
   ],
   "rewards": {

diff --git a/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/end_ladder.json b/src/main/generated/resources/data/minestuck/advancements/recipes/decorations/end_ladder.json
@@ -1,7 +1,7 @@
 {
   "parent": "minecraft:recipes/root",
   "criteria": {
-    "has_planks": {
+    "has_end_planks": {
       "conditions": {
         "items": [
           {
@@ -23,7 +23,7 @@
   "requirements": [
     [
       "has_the_recipe",
-      "has_planks"
+      "has_end_planks"
     ]
   ],
   "rewards": {

diff --git a/...ain/generated/resources/data/minestuck/advancements/recipes/decorations/frost_ladder.json b/...ain/generated/resources/data/minestuck/advancements/recipes/decorations/frost_ladder.json
@@ -1,7 +1,7 @@
 {
   "parent": "minecraft:recipes/root",
   "criteria": {
-    "has_planks": {
+    "has_frost_planks": {
       "conditions": {
         "items": [
           {
@@ -23,7 +23,7 @@
   "requirements": [
     [
       "has_the_recipe",
-      "has_planks"
+      "has_frost_planks"
     ]
   ],
   "rewards": {

diff --git a/...n/generated/resources/data/minestuck/advancements/recipes/decorations/glowing_ladder.json b/...n/generated/resources/data/minestuck/advancements/recipes/decorations/glowing_ladder.json
@@ -1,7 +1,7 @@
 {
   "parent": "minecraft:recipes/root",
   "criteria": {
-    "has_planks": {
+    "has_glowing_planks": {
       "conditions": {
         "items": [
           {
@@ -23,7 +23,7 @@
   "requirements": [
     [
       "has_the_recipe",
-      "has_planks"
+      "has_glowing_planks"
     ]
   ],
   "rewards": {

diff --git a/...n/generated/resources/data/minestuck/advancements/recipes/decorations/rainbow_ladder.json b/...n/generated/resources/data/minestuck/advancements/recipes/decorations/rainbow_ladder.json
@@ -1,7 +1,7 @@
 {
   "parent": "minecraft:recipes/root",
   "criteria": {
-    "has_planks": {
+    "has_rainbow_planks": {
       "conditions": {
         "items": [
           {
@@ -23,7 +23,7 @@
   "requirements": [
     [
       "has_the_recipe",
-      "has_planks"
+      "has_rainbow_planks"
     ]
   ],
   "rewards": {

diff --git a/...generated/resources/data/minestuck/advancements/recipes/decorations/shadewood_ladder.json b/...generated/resources/data/minestuck/advancements/recipes/decorations/shadewood_ladder.json
@@ -1,7 +1,7 @@
 {
   "parent": "minecraft:recipes/root",
   "criteria": {
-    "has_planks": {
+    "has_shadewood_planks": {
       "conditions": {
         "items": [
           {
@@ -23,7 +23,7 @@
   "requirements": [
     [
       "has_the_recipe",
-      "has_planks"
+      "has_shadewood_planks"
     ]
   ],
   "rewards": {

diff --git a/...n/generated/resources/data/minestuck/advancements/recipes/decorations/treated_ladder.json b/...n/generated/resources/data/minestuck/advancements/recipes/decorations/treated_ladder.json
@@ -1,7 +1,13 @@
 {
   "parent": "minecraft:recipes/root",
   "criteria": {
-    "has_planks": {
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "minestuck:treated_ladder"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    },
+    "has_treated_planks": {
       "conditions": {
         "items": [
           {
@@ -12,18 +18,12 @@
         ]
       },
       "trigger": "minecraft:inventory_changed"
-    },
-    "has_the_recipe": {
-      "conditions": {
-        "recipe": "minestuck:treated_ladder"
-      },
-      "trigger": "minecraft:recipe_unlocked"
     }
   },
   "requirements": [
     [
       "has_the_recipe",
-      "has_planks"
+      "has_treated_planks"
     ]
   ],
   "rewards": {

diff --git a/src/main/generated/resources/data/minestuck/recipes/cindered_bookshelf.json b/src/main/generated/resources/data/minestuck/recipes/cindered_bookshelf.json
@@ -1,19 +1,21 @@
 {
   "type": "minecraft:crafting_shaped",
   "category": "building",
-  "group": "bookshelf",
   "key": {
     "b": {
       "item": "minecraft:book"
     },
     "p": {
       "item": "minestuck:cindered_planks"
+    },
+    "s": {
+      "item": "minestuck:cindered_slab"
     }
   },
   "pattern": [
-    "ppp",
-    "bpb",
-    "ppp"
+    "psp",
+    "bbb",
+    "psp"
   ],
   "result": {
     "item": "minestuck:cindered_bookshelf"

diff --git a/src/main/generated/resources/data/minestuck/recipes/cindered_ladder.json b/src/main/generated/resources/data/minestuck/recipes/cindered_ladder.json
@@ -1,7 +1,7 @@
 {
   "type": "minecraft:crafting_shaped",
   "category": "misc",
-  "group": "ladder",
+  "group": "terrain_ladder",
   "key": {
     "p": {
       "item": "minestuck:cindered_planks"

diff --git a/src/main/generated/resources/data/minestuck/recipes/dead_bookshelf.json b/src/main/generated/resources/data/minestuck/recipes/dead_bookshelf.json
@@ -1,19 +1,21 @@
 {
   "type": "minecraft:crafting_shaped",
   "category": "building",
-  "group": "bookshelf",
   "key": {
     "b": {
       "item": "minecraft:book"
     },
     "p": {
       "item": "minestuck:dead_planks"
+    },
+    "s": {
+      "item": "minestuck:dead_planks_slab"
     }
   },
   "pattern": [
-    "ppp",
-    "bpb",
-    "ppp"
+    "psp",
+    "bbb",
+    "psp"
   ],
   "result": {
     "item": "minestuck:dead_bookshelf"

diff --git a/src/main/generated/resources/data/minestuck/recipes/dead_ladder.json b/src/main/generated/resources/data/minestuck/recipes/dead_ladder.json
@@ -1,7 +1,7 @@
 {
   "type": "minecraft:crafting_shaped",
   "category": "misc",
-  "group": "ladder",
+  "group": "terrain_ladder",
   "key": {
     "p": {
       "item": "minestuck:dead_planks"