refactor: Remove CountedIngredient in favor of NeoForge's SizedIngred…

…ient.
Team-EnderIO · May 18, 2024 · d80f870 · d80f870
1 parent c74d7e2
commit d80f870
Show file tree

Hide file tree

Showing 96 changed files with 378 additions and 745 deletions.
diff --git a/src/core/java/com/enderio/core/common/recipes/CountedIngredient.java b/src/core/java/com/enderio/core/common/recipes/CountedIngredient.java
diff --git a/src/generated/resources/data/enderio/recipes/alloy_smelting/cake_base.json b/src/generated/resources/data/enderio/recipes/alloy_smelting/cake_base.json
@@ -4,16 +4,12 @@
   "experience": 0.3,
   "inputs": [
     {
-      "Count": 3,
-      "Ingredient": {
-        "item": "enderio:flour"
-      }
+      "count": 3,
+      "item": "enderio:flour"
     },
     {
-      "Count": 1,
-      "Ingredient": {
-        "item": "minecraft:egg"
-      }
+      "count": 1,
+      "item": "minecraft:egg"
     }
   ],
   "result": {

diff --git a/src/generated/resources/data/enderio/recipes/alloy_smelting/clayed_glowstone.json b/src/generated/resources/data/enderio/recipes/alloy_smelting/clayed_glowstone.json
@@ -4,16 +4,12 @@
   "experience": 0.3,
   "inputs": [
     {
-      "Count": 1,
-      "Ingredient": {
-        "tag": "c:dusts/glowstone"
-      }
+      "count": 1,
+      "tag": "c:dusts/glowstone"
     },
     {
-      "Count": 1,
-      "Ingredient": {
-        "item": "minecraft:clay_ball"
-      }
+      "count": 1,
+      "item": "minecraft:clay_ball"
     }
   ],
   "result": {

diff --git a/src/generated/resources/data/enderio/recipes/alloy_smelting/clear_glass.json b/src/generated/resources/data/enderio/recipes/alloy_smelting/clear_glass.json
@@ -4,10 +4,8 @@
   "experience": 0.3,
   "inputs": [
     {
-      "Count": 1,
-      "Ingredient": {
-        "tag": "c:glass_blocks/colorless"
-      }
+      "count": 1,
+      "tag": "c:glass_blocks/colorless"
     }
   ],
   "result": {

diff --git a/src/generated/resources/data/enderio/recipes/alloy_smelting/clear_glass_d_from_base.json b/src/generated/resources/data/enderio/recipes/alloy_smelting/clear_glass_d_from_base.json
@@ -4,16 +4,12 @@
   "experience": 0.3,
   "inputs": [
     {
-      "Count": 1,
-      "Ingredient": {
-        "item": "enderio:clear_glass"
-      }
+      "count": 1,
+      "item": "enderio:clear_glass"
     },
     {
-      "Count": 4,
-      "Ingredient": {
-        "tag": "c:gems/amethyst"
-      }
+      "count": 4,
+      "tag": "c:gems/amethyst"
     }
   ],
   "result": {

diff --git a/src/generated/resources/data/enderio/recipes/alloy_smelting/clear_glass_d_from_base_alt.json b/src/generated/resources/data/enderio/recipes/alloy_smelting/clear_glass_d_from_base_alt.json
@@ -4,16 +4,12 @@
   "experience": 0.3,
   "inputs": [
     {
-      "Count": 1,
-      "Ingredient": {
-        "item": "enderio:clear_glass"
-      }
+      "count": 1,
+      "item": "enderio:clear_glass"
     },
     {
-      "Count": 1,
-      "Ingredient": {
-        "tag": "c:storage_blocks/amethyst"
-      }
+      "count": 1,
+      "tag": "c:storage_blocks/amethyst"
     }
   ],
   "result": {

diff --git a/src/generated/resources/data/enderio/recipes/alloy_smelting/clear_glass_d_from_main.json b/src/generated/resources/data/enderio/recipes/alloy_smelting/clear_glass_d_from_main.json
@@ -4,16 +4,12 @@
   "experience": 0.3,
   "inputs": [
     {
-      "Count": 1,
-      "Ingredient": {
-        "tag": "c:glass_blocks/colorless"
-      }
+      "count": 1,
+      "tag": "c:glass_blocks/colorless"
     },
     {
-      "Count": 4,
-      "Ingredient": {
-        "tag": "c:gems/amethyst"
-      }
+      "count": 4,
+      "tag": "c:gems/amethyst"
     }
   ],
   "result": {

diff --git a/src/generated/resources/data/enderio/recipes/alloy_smelting/clear_glass_d_from_main_alt.json b/src/generated/resources/data/enderio/recipes/alloy_smelting/clear_glass_d_from_main_alt.json
@@ -4,16 +4,12 @@
   "experience": 0.3,
   "inputs": [
     {
-      "Count": 1,
-      "Ingredient": {
-        "tag": "c:glass_blocks/colorless"
-      }
+      "count": 1,
+      "tag": "c:glass_blocks/colorless"
     },
     {
-      "Count": 1,
-      "Ingredient": {
-        "tag": "c:storage_blocks/amethyst"
-      }
+      "count": 1,
+      "tag": "c:storage_blocks/amethyst"
     }
   ],
   "result": {

diff --git a/src/generated/resources/data/enderio/recipes/alloy_smelting/clear_glass_e_from_base.json b/src/generated/resources/data/enderio/recipes/alloy_smelting/clear_glass_e_from_base.json
@@ -4,16 +4,12 @@
   "experience": 0.3,
   "inputs": [
     {
-      "Count": 1,
-      "Ingredient": {
-        "item": "enderio:clear_glass"
-      }
+      "count": 1,
+      "item": "enderio:clear_glass"
     },
     {
-      "Count": 4,
-      "Ingredient": {
-        "tag": "c:dusts/glowstone"
-      }
+      "count": 4,
+      "tag": "c:dusts/glowstone"
     }
   ],
   "result": {

diff --git a/src/generated/resources/data/enderio/recipes/alloy_smelting/clear_glass_e_from_base_alt.json b/src/generated/resources/data/enderio/recipes/alloy_smelting/clear_glass_e_from_base_alt.json
@@ -4,16 +4,12 @@
   "experience": 0.3,
   "inputs": [
     {
-      "Count": 1,
-      "Ingredient": {
-        "item": "enderio:clear_glass"
-      }
+      "count": 1,
+      "item": "enderio:clear_glass"
     },
     {
-      "Count": 1,
-      "Ingredient": {
-        "item": "minecraft:glowstone"
-      }
+      "count": 1,
+      "item": "minecraft:glowstone"
     }
   ],
   "result": {

diff --git a/src/generated/resources/data/enderio/recipes/alloy_smelting/clear_glass_e_from_main.json b/src/generated/resources/data/enderio/recipes/alloy_smelting/clear_glass_e_from_main.json
@@ -4,16 +4,12 @@
   "experience": 0.3,
   "inputs": [
     {
-      "Count": 1,
-      "Ingredient": {
-        "tag": "c:glass_blocks/colorless"
-      }
+      "count": 1,
+      "tag": "c:glass_blocks/colorless"
     },
     {
-      "Count": 4,
-      "Ingredient": {
-        "tag": "c:dusts/glowstone"
-      }
+      "count": 4,
+      "tag": "c:dusts/glowstone"
     }
   ],
   "result": {

diff --git a/src/generated/resources/data/enderio/recipes/alloy_smelting/clear_glass_e_from_main_alt.json b/src/generated/resources/data/enderio/recipes/alloy_smelting/clear_glass_e_from_main_alt.json
@@ -4,16 +4,12 @@
   "experience": 0.3,
   "inputs": [
     {
-      "Count": 1,
-      "Ingredient": {
-        "tag": "c:glass_blocks/colorless"
-      }
+      "count": 1,
+      "tag": "c:glass_blocks/colorless"
     },
     {
-      "Count": 1,
-      "Ingredient": {
-        "item": "minecraft:glowstone"
-      }
+      "count": 1,
+      "item": "minecraft:glowstone"
     }
   ],
   "result": {

diff --git a/src/generated/resources/data/enderio/recipes/alloy_smelting/conductive_alloy_ingot.json b/src/generated/resources/data/enderio/recipes/alloy_smelting/conductive_alloy_ingot.json
@@ -4,22 +4,16 @@
   "experience": 0.3,
   "inputs": [
     {
-      "Count": 1,
-      "Ingredient": {
-        "tag": "c:ingots/copper_alloy"
-      }
+      "count": 1,
+      "tag": "c:ingots/copper_alloy"
     },
     {
-      "Count": 1,
-      "Ingredient": {
-        "tag": "c:ingots/iron"
-      }
+      "count": 1,
+      "tag": "c:ingots/iron"
     },
     {
-      "Count": 1,
-      "Ingredient": {
-        "tag": "c:dusts/redstone"
-      }
+      "count": 1,
+      "tag": "c:dusts/redstone"
     }
   ],
   "result": {

diff --git a/src/generated/resources/data/enderio/recipes/alloy_smelting/cookie.json b/src/generated/resources/data/enderio/recipes/alloy_smelting/cookie.json
@@ -4,16 +4,12 @@
   "experience": 0.3,
   "inputs": [
     {
-      "Count": 1,
-      "Ingredient": {
-        "item": "enderio:flour"
-      }
+      "count": 1,
+      "item": "enderio:flour"
     },
     {
-      "Count": 1,
-      "Ingredient": {
-        "item": "minecraft:cocoa_beans"
-      }
+      "count": 1,
+      "item": "minecraft:cocoa_beans"
     }
   ],
   "result": {

diff --git a/src/generated/resources/data/enderio/recipes/alloy_smelting/copper_alloy_ingot.json b/src/generated/resources/data/enderio/recipes/alloy_smelting/copper_alloy_ingot.json
@@ -4,16 +4,12 @@
   "experience": 0.3,
   "inputs": [
     {
-      "Count": 1,
-      "Ingredient": {
-        "tag": "c:ingots/copper"
-      }
+      "count": 1,
+      "tag": "c:ingots/copper"
     },
     {
-      "Count": 1,
-      "Ingredient": {
-        "tag": "c:silicon"
-      }
+      "count": 1,
+      "tag": "c:silicon"
     }
   ],
   "result": {