Fix errors in MI compat recipes (#116)

Technici4n · Jul 12, 2024 · c1e66bc · c1e66bc
1 parent 0ea3c77
commit c1e66bc
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 17 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -20,22 +20,22 @@ curseforge_project = 552758
 modrinth_project = fMpvLrnF
 
 # Dependencies
-neoforge_version=21.0.24-beta
+neoforge_version=21.0.37-beta
 
 #########################################################
 # Parchment                                             #
 #########################################################
-neoForge.parchment.minecraftVersion=1.20.6
-neoForge.parchment.mappingsVersion=2024.06.16
+neoForge.parchment.minecraftVersion=1.21
+neoForge.parchment.mappingsVersion=2024.07.07
 
 # In-dev runtime mods
 rei_version=16.0.729
 
 jei_minecraft_version=1.21
-jei_version=19.0.0.1
+jei_version=19.5.0.30
 
 emi_minecraft_version=1.21
-emi_version=1.1.7
+emi_version=1.1.10
 
 # Set to emi, jei, or rei to pick which tooltip mod gets picked at runtime
 # for the dev environment.

diff --git a/src/generated/resources/data/moderndynamics/recipe/cable/ev_from_mi.json b/src/generated/resources/data/moderndynamics/recipe/cable/ev_from_mi.json
@@ -6,7 +6,7 @@
     }
   ],
   "result": {
-    "item": "moderndynamics:ev_cable",
+    "id": "moderndynamics:ev_cable",
     "count": 4
   },
   "neoforge:conditions": [

diff --git a/src/generated/resources/data/moderndynamics/recipe/cable/ev_to_mi.json b/src/generated/resources/data/moderndynamics/recipe/cable/ev_to_mi.json
@@ -10,7 +10,7 @@
     }
   },
   "result": {
-    "item": "modern_industrialization:annealed_copper_cable"
+    "id": "modern_industrialization:annealed_copper_cable"
   },
   "neoforge:conditions": [
     {

diff --git a/src/generated/resources/data/moderndynamics/recipe/cable/hv_from_mi.json b/src/generated/resources/data/moderndynamics/recipe/cable/hv_from_mi.json
@@ -6,7 +6,7 @@
     }
   ],
   "result": {
-    "item": "moderndynamics:hv_cable",
+    "id": "moderndynamics:hv_cable",
     "count": 4
   },
   "neoforge:conditions": [

diff --git a/src/generated/resources/data/moderndynamics/recipe/cable/hv_to_mi.json b/src/generated/resources/data/moderndynamics/recipe/cable/hv_to_mi.json
@@ -10,7 +10,7 @@
     }
   },
   "result": {
-    "item": "modern_industrialization:aluminum_cable"
+    "id": "modern_industrialization:aluminum_cable"
   },
   "neoforge:conditions": [
     {

diff --git a/src/generated/resources/data/moderndynamics/recipe/cable/lv_from_mi.json b/src/generated/resources/data/moderndynamics/recipe/cable/lv_from_mi.json
@@ -6,7 +6,7 @@
     }
   ],
   "result": {
-    "item": "moderndynamics:lv_cable",
+    "id": "moderndynamics:lv_cable",
     "count": 4
   },
   "neoforge:conditions": [

diff --git a/src/generated/resources/data/moderndynamics/recipe/cable/lv_to_mi.json b/src/generated/resources/data/moderndynamics/recipe/cable/lv_to_mi.json
@@ -10,7 +10,7 @@
     }
   },
   "result": {
-    "item": "modern_industrialization:tin_cable"
+    "id": "modern_industrialization:tin_cable"
   },
   "neoforge:conditions": [
     {

diff --git a/src/generated/resources/data/moderndynamics/recipe/cable/mv_from_mi.json b/src/generated/resources/data/moderndynamics/recipe/cable/mv_from_mi.json
@@ -6,7 +6,7 @@
     }
   ],
   "result": {
-    "item": "moderndynamics:mv_cable",
+    "id": "moderndynamics:mv_cable",
     "count": 4
   },
   "neoforge:conditions": [

diff --git a/src/generated/resources/data/moderndynamics/recipe/cable/mv_to_mi.json b/src/generated/resources/data/moderndynamics/recipe/cable/mv_to_mi.json
@@ -10,7 +10,7 @@
     }
   },
   "result": {
-    "item": "modern_industrialization:electrum_cable"
+    "id": "modern_industrialization:electrum_cable"
   },
   "neoforge:conditions": [
     {

diff --git a/src/generated/resources/data/moderndynamics/recipe/cable/superconductor_from_mi.json b/src/generated/resources/data/moderndynamics/recipe/cable/superconductor_from_mi.json
@@ -6,7 +6,7 @@
     }
   ],
   "result": {
-    "item": "moderndynamics:superconductor_cable",
+    "id": "moderndynamics:superconductor_cable",
     "count": 4
   },
   "neoforge:conditions": [

diff --git a/src/generated/resources/data/moderndynamics/recipe/cable/superconductor_to_mi.json b/src/generated/resources/data/moderndynamics/recipe/cable/superconductor_to_mi.json
@@ -10,7 +10,7 @@
     }
   },
   "result": {
-    "item": "modern_industrialization:superconductor_cable"
+    "id": "modern_industrialization:superconductor_cable"
   },
   "neoforge:conditions": [
     {

diff --git a/src/main/java/dev/technici4n/moderndynamics/data/RecipesProvider.java b/src/main/java/dev/technici4n/moderndynamics/data/RecipesProvider.java
@@ -161,7 +161,7 @@ private void generateMiCableRecipes(String cableName, String miCable, CachedOutp
                         ImmutableMap.of(
                                 "item", miCableItemId)),
                 "result", ImmutableMap.of(
-                        "item", mdCableItemId,
+                        "id", mdCableItemId,
                         "count", 4)),
                 condition);
 
@@ -171,7 +171,7 @@ private void generateMiCableRecipes(String cableName, String miCable, CachedOutp
                 "key", ImmutableMap.of(
                         "c", ImmutableMap.of("item", mdCableItemId)),
                 "result", ImmutableMap.of(
-                        "item", miCableItemId)),
+                        "id", miCableItemId)),
                 condition);
     }