Combatify 1.2.0 1.21 Fabric - Recipe changes

Alexandra-Myers · Jul 21, 2024 · d47baa1 · d47baa1
1 parent 212418c
commit d47baa1
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/src/main/resources/resourcepacks/combatify_extras/data/combatify/recipe/diamond_shield.json b/src/main/resources/resourcepacks/combatify_extras/data/combatify/recipe/diamond_shield.json
@@ -2,13 +2,16 @@
   "type": "minecraft:crafting_shaped",
   "category": "equipment",
   "pattern": [
-    "XXX",
+    "X#X",
     "XXX",
     " X "
   ],
   "key": {
     "X": {
       "item": "minecraft:diamond"
+    },
+    "#": {
+      "item": "minecraft:diamond_block"
     }
   },
   "result": {

diff --git a/src/main/resources/resourcepacks/combatify_extras/data/combatify/recipe/golden_shield.json b/src/main/resources/resourcepacks/combatify_extras/data/combatify/recipe/golden_shield.json
@@ -2,13 +2,16 @@
   "type": "minecraft:crafting_shaped",
   "category": "equipment",
   "pattern": [
-    "XXX",
+    "X#X",
     "XXX",
     " X "
   ],
   "key": {
     "X": {
       "item": "minecraft:gold_ingot"
+    },
+    "#": {
+      "item": "minecraft:gold_block"
     }
   },
   "result": {

diff --git a/.../resourcepacks/wooden_shield_recipe/data/minecraft/advancement/recipes/combat/shield.json b/.../resourcepacks/wooden_shield_recipe/data/minecraft/advancement/recipes/combat/shield.json
@@ -1,11 +1,11 @@
 {
   "parent": "minecraft:recipes/root",
   "criteria": {
-    "has_iron_ingot": {
+    "has_stone": {
       "conditions": {
         "items": [
           {
-            "items": "minecraft:cobblestone"
+            "tag": "minecraft:stone_tool_materials"
           }
         ]
       },
@@ -21,7 +21,7 @@
   "requirements": [
     [
       "has_the_recipe",
-      "has_iron_ingot"
+      "has_stone"
     ]
   ],
   "rewards": {

diff --git a/src/main/resources/resourcepacks/wooden_shield_recipe/data/minecraft/recipe/shield.json b/src/main/resources/resourcepacks/wooden_shield_recipe/data/minecraft/recipe/shield.json
@@ -11,7 +11,7 @@
       "tag": "minecraft:planks"
     },
     "#": {
-      "item": "minecraft:cobblestone"
+      "tag": "minecraft:stone_tool_materials"
     }
   },
   "result": {