Start fixing compat recipes

KyaniteMods · Feb 5, 2025 · fc554a1 · fc554a1
1 parent b55cdb2
commit fc554a1
Show file tree

Hide file tree

Showing 14 changed files with 60 additions and 67 deletions.
diff --git a/src/main/resources/data/farmersdelight/recipe/cutting/echo_door.json b/src/main/resources/data/farmersdelight/recipe/cutting/echo_door.json
@@ -7,17 +7,14 @@
   ],
   "result": [
     {
-      "item": "deeperdarker:echo_planks"
+      "item": {
+        "count": 1,
+        "id": "deeperdarker:echo_planks"
+      }
     }
   ],
   "tool": {
     "type": "farmersdelight:tool_action",
     "action": "axe_dig"
-  },
-  "neoforge:conditions": [
-    {
-      "type": "neoforge:mod_loaded",
-      "modid": "farmersdelight"
-    }
-  ]
+  }
 }
diff --git a/src/main/resources/data/farmersdelight/recipe/cutting/echo_hanging_sign.json b/src/main/resources/data/farmersdelight/recipe/cutting/echo_hanging_sign.json
@@ -7,17 +7,14 @@
   ],
   "result": [
     {
-      "item": "deeperdarker:echo_planks"
+      "item": {
+        "count": 1,
+        "id": "deeperdarker:echo_planks"
+      }
     }
   ],
   "tool": {
     "type": "farmersdelight:tool_action",
     "action": "axe_dig"
-  },
-  "neoforge:conditions": [
-    {
-      "type": "neoforge:mod_loaded",
-      "modid": "farmersdelight"
-    }
-  ]
+  }
 }
diff --git a/src/main/resources/data/farmersdelight/recipe/cutting/echo_log.json b/src/main/resources/data/farmersdelight/recipe/cutting/echo_log.json
@@ -7,21 +7,21 @@
   ],
   "result": [
     {
-      "item": "deeperdarker:stripped_echo_log"
+      "item": {
+        "count": 1,
+        "id": "deeperdarker:stripped_echo_log"
+      }
     },
     {
-      "item": "farmersdelight:tree_bark"
+      "item": {
+        "count": 1,
+        "id": "farmersdelight:tree_bark"
+      }
     }
   ],
   "sound": "minecraft:item.axe.strip",
   "tool": {
     "type": "farmersdelight:tool_action",
     "action": "axe_strip"
-  },
-  "neoforge:conditions": [
-    {
-      "type": "neoforge:mod_loaded",
-      "modid": "farmersdelight"
-    }
-  ]
+  }
 }
diff --git a/src/main/resources/data/farmersdelight/recipe/cutting/echo_sign.json b/src/main/resources/data/farmersdelight/recipe/cutting/echo_sign.json
@@ -7,17 +7,14 @@
   ],
   "result": [
     {
-      "item": "deeperdarker:echo_planks"
+      "item": {
+        "count": 1,
+        "id": "deeperdarker:echo_planks"
+      }
     }
   ],
   "tool": {
     "type": "farmersdelight:tool_action",
     "action": "axe_dig"
-  },
-  "neoforge:conditions": [
-    {
-      "type": "neoforge:mod_loaded",
-      "modid": "farmersdelight"
-    }
-  ]
+  }
 }
diff --git a/src/main/resources/data/farmersdelight/recipe/cutting/echo_trapdoor.json b/src/main/resources/data/farmersdelight/recipe/cutting/echo_trapdoor.json
@@ -7,17 +7,14 @@
   ],
   "result": [
     {
-      "item": "deeperdarker:echo_planks"
+      "item": {
+        "count": 1,
+        "id": "deeperdarker:echo_planks"
+      }
     }
   ],
   "tool": {
     "type": "farmersdelight:tool_action",
     "action": "axe_dig"
-  },
-  "neoforge:conditions": [
-    {
-      "type": "neoforge:mod_loaded",
-      "modid": "farmersdelight"
-    }
-  ]
+  }
 }
diff --git a/src/main/resources/data/farmersdelight/recipe/cutting/echo_wood.json b/src/main/resources/data/farmersdelight/recipe/cutting/echo_wood.json
@@ -7,21 +7,21 @@
   ],
   "result": [
     {
-      "item": "deeperdarker:stripped_echo_wood"
+      "item": {
+        "count": 1,
+        "id": "deeperdarker:stripped_echo_wood"
+      }
     },
     {
-      "item": "farmersdelight:tree_bark"
+      "item": {
+        "count": 1,
+        "id": "farmersdelight:tree_bark"
+      }
     }
   ],
   "sound": "minecraft:item.axe.strip",
   "tool": {
     "type": "farmersdelight:tool_action",
     "action": "axe_strip"
-  },
-  "neoforge:conditions": [
-    {
-      "type": "neoforge:mod_loaded",
-      "modid": "farmersdelight"
-    }
-  ]
+  }
 }
diff --git a/src/main/resources/data/mekanism/recipe/sawing/boat/echo.json b/src/main/resources/data/mekanism/recipe/sawing/boat/echo.json
@@ -4,7 +4,7 @@
     "count": 1,
     "item": "deeperdarker:echo_boat"
   },
-  "mainOutput": {
+  "main_output": {
     "count": 5,
     "id": "deeperdarker:echo_planks"
   },

diff --git a/src/main/resources/data/mekanism/recipe/sawing/chest_boat/echo.json b/src/main/resources/data/mekanism/recipe/sawing/chest_boat/echo.json
@@ -4,12 +4,12 @@
     "count": 1,
     "item": "deeperdarker:echo_chest_boat"
   },
-  "mainOutput": {
+  "main_output": {
     "count": 1,
     "id": "deeperdarker:echo_boat"
   },
-  "secondaryChance": 1.0,
-  "secondaryOutput": {
+  "secondary_chance": 1.0,
+  "secondary_output": {
     "count": 1,
     "id": "minecraft:chest"
   },

diff --git a/src/main/resources/data/mekanism/recipe/sawing/door/echo.json b/src/main/resources/data/mekanism/recipe/sawing/door/echo.json
@@ -4,7 +4,7 @@
     "count": 1,
     "item": "deeperdarker:echo_door"
   },
-  "mainOutput": {
+  "main_output": {
     "count": 2,
     "id": "deeperdarker:echo_planks"
   },

diff --git a/src/main/resources/data/mekanism/recipe/sawing/fence_gate/echo.json b/src/main/resources/data/mekanism/recipe/sawing/fence_gate/echo.json
@@ -4,12 +4,12 @@
     "count": 1,
     "item": "deeperdarker:echo_fence_gate"
   },
-  "mainOutput": {
+  "main_output": {
     "count": 2,
     "id": "deeperdarker:echo_planks"
   },
-  "secondaryChance": 1.0,
-  "secondaryOutput": {
+  "secondary_chance": 1.0,
+  "secondary_output": {
     "count": 4,
     "id": "minecraft:stick"
   },

diff --git a/src/main/resources/data/mekanism/recipe/sawing/hanging_sign/echo.json b/src/main/resources/data/mekanism/recipe/sawing/hanging_sign/echo.json
@@ -4,12 +4,12 @@
     "count": 1,
     "item": "deeperdarker:echo_hanging_sign"
   },
-  "mainOutput": {
+  "main_output": {
     "count": 2,
     "id": "deeperdarker:echo_planks"
   },
-  "secondaryChance": 0.5,
-  "secondaryOutput": {
+  "secondary_chance": 0.5,
+  "secondary_output": {
     "count": 1,
     "id": "mekanism:sawdust"
   },

diff --git a/src/main/resources/data/mekanism/recipe/sawing/log/echo.json b/src/main/resources/data/mekanism/recipe/sawing/log/echo.json
@@ -4,12 +4,12 @@
     "count": 1,
     "tag": "deeperdarker:echo_logs"
   },
-  "mainOutput": {
+  "main_output": {
     "count": 6,
     "id": "deeperdarker:echo_planks"
   },
-  "secondaryChance": 0.25,
-  "secondaryOutput": {
+  "secondary_chance": 0.25,
+  "secondary_output": {
     "count": 1,
     "id": "mekanism:sawdust"
   },

diff --git a/src/main/resources/data/mekanism/recipe/sawing/pressure_plate/echo.json b/src/main/resources/data/mekanism/recipe/sawing/pressure_plate/echo.json
@@ -4,10 +4,15 @@
     "count": 1,
     "item": "deeperdarker:echo_pressure_plate"
   },
-  "mainOutput": {
-    "count": 2,
+  "main_output": {
+    "count": 1,
     "id": "deeperdarker:echo_planks"
   },
+  "secondary_chance": 0.25,
+  "secondary_output": {
+    "count": 2,
+    "id": "mekanism:sawdust"
+  },
   "neoforge:conditions": [
     {
       "type": "neoforge:mod_loaded",

diff --git a/src/main/resources/data/mekanism/recipe/sawing/trapdoor/echo.json b/src/main/resources/data/mekanism/recipe/sawing/trapdoor/echo.json
@@ -4,7 +4,7 @@
     "count": 1,
     "item": "deeperdarker:echo_trapdoor"
   },
-  "mainOutput": {
+  "main_output": {
     "count": 3,
     "id": "deeperdarker:echo_planks"
   },