Merge pull request #23 from nullTheCoder

Fixed recipe issues on 1.21
Noaaan · Aug 27, 2024 · 0780481 · 0780481
2 parents 4bc50f6 + d115457
commit 0780481
Show file tree

Hide file tree

Showing 84 changed files with 107 additions and 86 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -6,7 +6,7 @@ minecraft_version=1.21
 yarn_mappings=1.21+build.2
 loader_version=0.15.11
 # Mod Properties
-mod_version=0.7.0+1.21
+mod_version=0.7.1+1.21
 maven_group=nourl
 archives_base_name=mythicmetals-decorations
 # Dependencies

diff --git a/...rces/data/c/tags/items/wooden_chests.json → ...urces/data/c/tags/item/wooden_chests.json b/...rces/data/c/tags/items/wooden_chests.json → ...urces/data/c/tags/item/wooden_chests.json
diff --git a/...ry/forge_hydrargym_ingot_from_ingots.json → ...ry/forge_hydrargym_ingot_from_ingots.json b/...ry/forge_hydrargym_ingot_from_ingots.json → ...ry/forge_hydrargym_ingot_from_ingots.json
@@ -2,10 +2,10 @@
   "type": "alloy_forgery:forging",
   "inputs": [
     {
-      "tag": "c:silver_ingots"
+      "tag": "c:ingots/silver"
     },
     {
-      "item": "mythicmetals:mythril_ingot"
+      "tag": "c:ingots/mythril"
     }
   ],
   "output": {

diff --git a/...gery/forge_hydrargym_ingot_from_ores.json → ...gery/forge_hydrargym_ingot_from_ores.json b/...gery/forge_hydrargym_ingot_from_ores.json → ...gery/forge_hydrargym_ingot_from_ores.json
@@ -2,10 +2,10 @@
   "type": "alloy_forgery:forging",
   "inputs": [
     {
-      "tag": "c:silver_ores"
+      "tag": "mythicmetals:ores/silver"
     },
     {
-      "tag": "mythicmetals:mythril_ores"
+      "tag": "mythicmetals:ores/mythril"
     }
   ],
   "output": {

diff --git a/.../forge_hydrargym_ingot_from_raw_ores.json → .../forge_hydrargym_ingot_from_raw_ores.json b/.../forge_hydrargym_ingot_from_raw_ores.json → .../forge_hydrargym_ingot_from_raw_ores.json
@@ -2,10 +2,10 @@
   "type": "alloy_forgery:forging",
   "inputs": [
     {
-      "tag": "c:raw_silver_ores"
+      "tag": "mythicmetals:raw_materials/silver"
     },
     {
-      "tag": "c:raw_mythril_ores"
+      "tag": "mythicmetals:raw_materials/mythril"
     }
   ],
   "output": {

diff --git a/...ations/recipes/armor/hydrargym_boots.json → ...rations/recipe/armor/hydrargym_boots.json b/...ations/recipes/armor/hydrargym_boots.json → ...rations/recipe/armor/hydrargym_boots.json
@@ -10,7 +10,7 @@
     }
   },
   "result": {
-    "item": "mythicmetals_decorations:hydrargym_boots",
+    "id": "mythicmetals_decorations:hydrargym_boots",
     "count": 1
   }
 }
diff --git a/...s/recipes/armor/hydrargym_chestplate.json → ...ns/recipe/armor/hydrargym_chestplate.json b/...s/recipes/armor/hydrargym_chestplate.json → ...ns/recipe/armor/hydrargym_chestplate.json
@@ -11,7 +11,7 @@
     }
   },
   "result": {
-    "item": "mythicmetals_decorations:hydrargym_chestplate",
+    "id": "mythicmetals_decorations:hydrargym_chestplate",
     "count": 1
   }
 }
diff --git a/...ations/recipes/armor/hydrargym_crown.json → ...rations/recipe/armor/hydrargym_crown.json b/...ations/recipes/armor/hydrargym_crown.json → ...rations/recipe/armor/hydrargym_crown.json
@@ -13,7 +13,7 @@
     }
   },
   "result": {
-    "item": "mythicmetals_decorations:hydrargym_crown",
+    "id": "mythicmetals_decorations:hydrargym_crown",
     "count": 1
   },
   "owo:remainders": {

diff --git a/...ons/recipes/armor/hydrargym_leggings.json → ...ions/recipe/armor/hydrargym_leggings.json b/...ons/recipes/armor/hydrargym_leggings.json → ...ions/recipe/armor/hydrargym_leggings.json
@@ -11,7 +11,7 @@
     }
   },
   "result": {
-    "item": "mythicmetals_decorations:hydrargym_leggings",
+    "id": "mythicmetals_decorations:hydrargym_leggings",
     "count": 1
   }
 }
diff --git a/...rations/recipes/armor/platinum_boots.json → ...orations/recipe/armor/platinum_boots.json b/...rations/recipes/armor/platinum_boots.json → ...orations/recipe/armor/platinum_boots.json
@@ -10,7 +10,7 @@
     }
   },
   "result": {
-    "item": "mythicmetals_decorations:platinum_boots",
+    "id": "mythicmetals_decorations:platinum_boots",
     "count": 1
   }
 }
diff --git a/...ns/recipes/armor/platinum_chestplate.json → ...ons/recipe/armor/platinum_chestplate.json b/...ns/recipes/armor/platinum_chestplate.json → ...ons/recipe/armor/platinum_chestplate.json
@@ -11,7 +11,7 @@
     }
   },
   "result": {
-    "item": "mythicmetals_decorations:platinum_chestplate",
+    "id": "mythicmetals_decorations:platinum_chestplate",
     "count": 1
   }
 }
diff --git a/...rations/recipes/armor/platinum_crown.json → ...orations/recipe/armor/platinum_crown.json b/...rations/recipes/armor/platinum_crown.json → ...orations/recipe/armor/platinum_crown.json
@@ -13,7 +13,7 @@
     }
   },
   "result": {
-    "item": "mythicmetals_decorations:platinum_crown",
+    "id": "mythicmetals_decorations:platinum_crown",
     "count": 1
   },
   "owo:remainders": {

diff --git a/...ions/recipes/armor/platinum_leggings.json → ...tions/recipe/armor/platinum_leggings.json b/...ions/recipes/armor/platinum_leggings.json → ...tions/recipe/armor/platinum_leggings.json
@@ -11,7 +11,7 @@
     }
   },
   "result": {
-    "item": "mythicmetals_decorations:platinum_leggings",
+    "id": "mythicmetals_decorations:platinum_leggings",
     "count": 1
   }
 }
diff --git a/...ions/recipes/chains/adamantite_chain.json → ...tions/recipe/chains/adamantite_chain.json b/...ions/recipes/chains/adamantite_chain.json → ...tions/recipe/chains/adamantite_chain.json
@@ -14,7 +14,7 @@
     }
   },
   "result": {
-    "item": "mythicmetals_decorations:adamantite_chain",
+    "id": "mythicmetals_decorations:adamantite_chain",
     "count": 1
   },
   "group": "mm_chains",

diff --git a/...ations/recipes/chains/aquarium_chain.json → ...rations/recipe/chains/aquarium_chain.json b/...ations/recipes/chains/aquarium_chain.json → ...rations/recipe/chains/aquarium_chain.json
@@ -14,7 +14,7 @@
     }
   },
   "result": {
-    "item": "mythicmetals_decorations:aquarium_chain",
+    "id": "mythicmetals_decorations:aquarium_chain",
     "count": 1
   },
   "group": "mm_chains",

diff --git a/...rations/recipes/chains/banglum_chain.json → ...orations/recipe/chains/banglum_chain.json b/...rations/recipes/chains/banglum_chain.json → ...orations/recipe/chains/banglum_chain.json
@@ -14,7 +14,7 @@
     }
   },
   "result": {
-    "item": "mythicmetals_decorations:banglum_chain",
+    "id": "mythicmetals_decorations:banglum_chain",
     "count": 1
   },
   "group": "mm_chains",

diff --git a/...orations/recipes/chains/bronze_chain.json → ...corations/recipe/chains/bronze_chain.json b/...orations/recipes/chains/bronze_chain.json → ...corations/recipe/chains/bronze_chain.json
@@ -14,7 +14,7 @@
     }
   },
   "result": {
-    "item": "mythicmetals_decorations:bronze_chain",
+    "id": "mythicmetals_decorations:bronze_chain",
     "count": 1
   },
   "group": "mm_chains",

diff --git a/...orations/recipes/chains/carmot_chain.json → ...corations/recipe/chains/carmot_chain.json b/...orations/recipes/chains/carmot_chain.json → ...corations/recipe/chains/carmot_chain.json
@@ -14,7 +14,7 @@
     }
   },
   "result": {
-    "item": "mythicmetals_decorations:carmot_chain",
+    "id": "mythicmetals_decorations:carmot_chain",
     "count": 1
   },
   "group": "mm_chains",

diff --git a/...tions/recipes/chains/celestium_chain.json → ...ations/recipe/chains/celestium_chain.json b/...tions/recipes/chains/celestium_chain.json → ...ations/recipe/chains/celestium_chain.json
@@ -14,7 +14,7 @@
     }
   },
   "result": {
-    "item": "mythicmetals_decorations:celestium_chain",
+    "id": "mythicmetals_decorations:celestium_chain",
     "count": 1
   },
   "group": "mm_chains",

diff --git a/...tions/recipes/chains/durasteel_chain.json → ...ations/recipe/chains/durasteel_chain.json b/...tions/recipes/chains/durasteel_chain.json → ...ations/recipe/chains/durasteel_chain.json
@@ -14,7 +14,7 @@
     }
   },
   "result": {
-    "item": "mythicmetals_decorations:durasteel_chain",
+    "id": "mythicmetals_decorations:durasteel_chain",
     "count": 1
   },
   "group": "mm_chains",

diff --git a/...ations/recipes/chains/hallowed_chain.json → ...rations/recipe/chains/hallowed_chain.json b/...ations/recipes/chains/hallowed_chain.json → ...rations/recipe/chains/hallowed_chain.json
@@ -14,7 +14,7 @@
     }
   },
   "result": {
-    "item": "mythicmetals_decorations:hallowed_chain",
+    "id": "mythicmetals_decorations:hallowed_chain",
     "count": 1
   },
   "group": "mm_chains",

diff --git a/...tions/recipes/chains/hydrargym_chain.json → ...ations/recipe/chains/hydrargym_chain.json b/...tions/recipes/chains/hydrargym_chain.json → ...ations/recipe/chains/hydrargym_chain.json
@@ -14,7 +14,7 @@
     }
   },
   "result": {
-    "item": "mythicmetals_decorations:hydrargym_chain",
+    "id": "mythicmetals_decorations:hydrargym_chain",
     "count": 1
   },
   "group": "mm_chains",

diff --git a/...corations/recipes/chains/kyber_chain.json → ...ecorations/recipe/chains/kyber_chain.json b/...corations/recipes/chains/kyber_chain.json → ...ecorations/recipe/chains/kyber_chain.json
@@ -14,7 +14,7 @@
     }
   },
   "result": {
-    "item": "mythicmetals_decorations:kyber_chain",
+    "id": "mythicmetals_decorations:kyber_chain",
     "count": 1
   },
   "group": "mm_chains",

diff --git a/...tions/recipes/chains/manganese_chain.json → ...ations/recipe/chains/manganese_chain.json b/...tions/recipes/chains/manganese_chain.json → ...ations/recipe/chains/manganese_chain.json
@@ -14,7 +14,7 @@
     }
   },
   "result": {
-    "item": "mythicmetals_decorations:manganese_chain",
+    "id": "mythicmetals_decorations:manganese_chain",
     "count": 1
   },
   "group": "mm_chains",

diff --git a/...ns/recipes/chains/metallurgium_chain.json → ...ons/recipe/chains/metallurgium_chain.json b/...ns/recipes/chains/metallurgium_chain.json → ...ons/recipe/chains/metallurgium_chain.json
@@ -14,7 +14,7 @@
     }
   },
   "result": {
-    "item": "mythicmetals_decorations:metallurgium_chain",
+    "id": "mythicmetals_decorations:metallurgium_chain",
     "count": 1
   },
   "group": "mm_chains",

diff --git a/...ions/recipes/chains/midas_gold_chain.json → ...tions/recipe/chains/midas_gold_chain.json b/...ions/recipes/chains/midas_gold_chain.json → ...tions/recipe/chains/midas_gold_chain.json
@@ -14,7 +14,7 @@
     }
   },
   "result": {
-    "item": "mythicmetals_decorations:midas_gold_chain",
+    "id": "mythicmetals_decorations:midas_gold_chain",
     "count": 1
   },
   "group": "mm_chains",

diff --git a/...rations/recipes/chains/mythril_chain.json → ...orations/recipe/chains/mythril_chain.json b/...rations/recipes/chains/mythril_chain.json → ...orations/recipe/chains/mythril_chain.json
@@ -14,7 +14,7 @@
     }
   },
   "result": {
-    "item": "mythicmetals_decorations:mythril_chain",
+    "id": "mythicmetals_decorations:mythril_chain",
     "count": 1
   },
   "group": "mm_chains",

diff --git a/...ions/recipes/chains/orichalcum_chain.json → ...tions/recipe/chains/orichalcum_chain.json b/...ions/recipes/chains/orichalcum_chain.json → ...tions/recipe/chains/orichalcum_chain.json
@@ -14,7 +14,7 @@
     }
   },
   "result": {
-    "item": "mythicmetals_decorations:orichalcum_chain",
+    "id": "mythicmetals_decorations:orichalcum_chain",
     "count": 1
   },
   "group": "mm_chains",

diff --git a/...orations/recipes/chains/osmium_chain.json → ...corations/recipe/chains/osmium_chain.json b/...orations/recipes/chains/osmium_chain.json → ...corations/recipe/chains/osmium_chain.json
@@ -14,7 +14,7 @@
     }
   },
   "result": {
-    "item": "mythicmetals_decorations:osmium_chain",
+    "id": "mythicmetals_decorations:osmium_chain",
     "count": 1
   },
   "group": "mm_chains",

diff --git a/...tions/recipes/chains/palladium_chain.json → ...ations/recipe/chains/palladium_chain.json b/...tions/recipes/chains/palladium_chain.json → ...ations/recipe/chains/palladium_chain.json
@@ -14,7 +14,7 @@
     }
   },
   "result": {
-    "item": "mythicmetals_decorations:palladium_chain",
+    "id": "mythicmetals_decorations:palladium_chain",
     "count": 1
   },
   "group": "mm_chains",

diff --git a/...ations/recipes/chains/platinum_chain.json → ...rations/recipe/chains/platinum_chain.json b/...ations/recipes/chains/platinum_chain.json → ...rations/recipe/chains/platinum_chain.json
@@ -14,7 +14,7 @@
     }
   },
   "result": {
-    "item": "mythicmetals_decorations:platinum_chain",
+    "id": "mythicmetals_decorations:platinum_chain",
     "count": 1
   },
   "group": "mm_chains",

diff --git a/...ions/recipes/chains/prometheum_chain.json → ...tions/recipe/chains/prometheum_chain.json b/...ions/recipes/chains/prometheum_chain.json → ...tions/recipe/chains/prometheum_chain.json
@@ -14,7 +14,7 @@
     }
   },
   "result": {
-    "item": "mythicmetals_decorations:prometheum_chain",
+    "id": "mythicmetals_decorations:prometheum_chain",
     "count": 1
   },
   "group": "mm_chains",

diff --git a/...ions/recipes/chains/quadrillum_chain.json → ...tions/recipe/chains/quadrillum_chain.json b/...ions/recipes/chains/quadrillum_chain.json → ...tions/recipe/chains/quadrillum_chain.json
@@ -14,7 +14,7 @@
     }
   },
   "result": {
-    "item": "mythicmetals_decorations:quadrillum_chain",
+    "id": "mythicmetals_decorations:quadrillum_chain",
     "count": 1
   },
   "group": "mm_chains",

diff --git a/...orations/recipes/chains/runite_chain.json → ...corations/recipe/chains/runite_chain.json b/...orations/recipes/chains/runite_chain.json → ...corations/recipe/chains/runite_chain.json
@@ -14,7 +14,7 @@
     }
   },
   "result": {
-    "item": "mythicmetals_decorations:runite_chain",
+    "id": "mythicmetals_decorations:runite_chain",
     "count": 1
   },
   "group": "mm_chains",

diff --git a/...orations/recipes/chains/silver_chain.json → ...corations/recipe/chains/silver_chain.json b/...orations/recipes/chains/silver_chain.json → ...corations/recipe/chains/silver_chain.json
@@ -14,7 +14,7 @@
     }
   },
   "result": {
-    "item": "mythicmetals_decorations:silver_chain",
+    "id": "mythicmetals_decorations:silver_chain",
     "count": 1
   },
   "group": "mm_chains",

diff --git a/...s/recipes/chains/star_platinum_chain.json → ...ns/recipe/chains/star_platinum_chain.json b/...s/recipes/chains/star_platinum_chain.json → ...ns/recipe/chains/star_platinum_chain.json
@@ -7,14 +7,14 @@
   ],
   "key": {
     "#": {
-      "tag": "mythicmetals:star_platinum_nuggets"
+      "item": "mythicmetals:star_platinum_nugget"
     },
     "R": {
       "item": "mythicmetals:star_platinum"
     }
   },
   "result": {
-    "item": "mythicmetals_decorations:star_platinum_chain",
+    "id": "mythicmetals_decorations:star_platinum_chain",
     "count": 1
   },
   "group": "mm_chains",

diff --git a/...corations/recipes/chains/steel_chain.json → ...ecorations/recipe/chains/steel_chain.json b/...corations/recipes/chains/steel_chain.json → ...ecorations/recipe/chains/steel_chain.json
@@ -14,7 +14,7 @@
     }
   },
   "result": {
-    "item": "mythicmetals_decorations:steel_chain",
+    "id": "mythicmetals_decorations:steel_chain",
     "count": 1
   },
   "group": "mm_chains",

diff --git a/...rations/recipes/chains/stormyx_chain.json → ...orations/recipe/chains/stormyx_chain.json b/...rations/recipes/chains/stormyx_chain.json → ...orations/recipe/chains/stormyx_chain.json
@@ -14,7 +14,7 @@
     }
   },
   "result": {
-    "item": "mythicmetals_decorations:stormyx_chain",
+    "id": "mythicmetals_decorations:stormyx_chain",
     "count": 1
   },
   "group": "mm_chains",

diff --git a/...ions/recipes/chests/adamantite_chest.json → ...tions/recipe/chests/adamantite_chest.json b/...ions/recipes/chests/adamantite_chest.json → ...tions/recipe/chests/adamantite_chest.json
@@ -14,7 +14,7 @@
     }
   },
   "result": {
-    "item": "mythicmetals_decorations:adamantite_chest",
+    "id": "mythicmetals_decorations:adamantite_chest",
     "count": 1
   },
   "group": "mm_chests"

diff --git a/...ations/recipes/chests/aquarium_chest.json → ...rations/recipe/chests/aquarium_chest.json b/...ations/recipes/chests/aquarium_chest.json → ...rations/recipe/chests/aquarium_chest.json
@@ -14,7 +14,7 @@
     }
   },
   "result": {
-    "item": "mythicmetals_decorations:aquarium_chest",
+    "id": "mythicmetals_decorations:aquarium_chest",
     "count": 1
   },
   "group": "mm_chests"

diff --git a/...rations/recipes/chests/banglum_chest.json → ...orations/recipe/chests/banglum_chest.json b/...rations/recipes/chests/banglum_chest.json → ...orations/recipe/chests/banglum_chest.json
@@ -14,7 +14,7 @@
     }
   },
   "result": {
-    "item": "mythicmetals_decorations:banglum_chest",
+    "id": "mythicmetals_decorations:banglum_chest",
     "count": 1
   },
   "group": "mm_chests"

diff --git a/...orations/recipes/chests/bronze_chest.json → ...corations/recipe/chests/bronze_chest.json b/...orations/recipes/chests/bronze_chest.json → ...corations/recipe/chests/bronze_chest.json
@@ -14,7 +14,7 @@
     }
   },
   "result": {
-    "item": "mythicmetals_decorations:bronze_chest",
+    "id": "mythicmetals_decorations:bronze_chest",
     "count": 1
   },
   "group": "mm_chests"