Change from multipleCookingRecipeBuilder to SimpleCookingRecipeBuilder

Team-EnderIO · Jul 24, 2023 · cdbc49d · cdbc49d
1 parent c76dbe2
commit cdbc49d
Show file tree

Hide file tree

Showing 13 changed files with 24 additions and 42 deletions.
diff --git a/...enerated/resources/data/enderio/advancements/recipes/misc/copper_ingot_from_blasting.json b/...enerated/resources/data/enderio/advancements/recipes/misc/copper_ingot_from_blasting.json
@@ -31,5 +31,5 @@
       "enderio:copper_ingot_from_blasting"
     ]
   },
-  "sends_telemetry_event": true
+  "sends_telemetry_event": false
 }
diff --git a/...enerated/resources/data/enderio/advancements/recipes/misc/copper_ingot_from_smelting.json b/...enerated/resources/data/enderio/advancements/recipes/misc/copper_ingot_from_smelting.json
@@ -31,5 +31,5 @@
       "enderio:copper_ingot_from_smelting"
     ]
   },
-  "sends_telemetry_event": true
+  "sends_telemetry_event": false
 }
diff --git a/src/generated/resources/data/enderio/advancements/recipes/misc/gold_ingot_from_blasting.json b/src/generated/resources/data/enderio/advancements/recipes/misc/gold_ingot_from_blasting.json
@@ -31,5 +31,5 @@
       "enderio:gold_ingot_from_blasting"
     ]
   },
-  "sends_telemetry_event": true
+  "sends_telemetry_event": false
 }
diff --git a/src/generated/resources/data/enderio/advancements/recipes/misc/gold_ingot_from_smelting.json b/src/generated/resources/data/enderio/advancements/recipes/misc/gold_ingot_from_smelting.json
@@ -31,5 +31,5 @@
       "enderio:gold_ingot_from_smelting"
     ]
   },
-  "sends_telemetry_event": true
+  "sends_telemetry_event": false
 }
diff --git a/src/generated/resources/data/enderio/advancements/recipes/misc/iron_ingot_from_blasting.json b/src/generated/resources/data/enderio/advancements/recipes/misc/iron_ingot_from_blasting.json
@@ -31,5 +31,5 @@
       "enderio:iron_ingot_from_blasting"
     ]
   },
-  "sends_telemetry_event": true
+  "sends_telemetry_event": false
 }
diff --git a/src/generated/resources/data/enderio/advancements/recipes/misc/iron_ingot_from_smelting.json b/src/generated/resources/data/enderio/advancements/recipes/misc/iron_ingot_from_smelting.json
@@ -31,5 +31,5 @@
       "enderio:iron_ingot_from_smelting"
     ]
   },
-  "sends_telemetry_event": true
+  "sends_telemetry_event": false
 }
diff --git a/src/generated/resources/data/enderio/recipes/copper_ingot_from_blasting.json b/src/generated/resources/data/enderio/recipes/copper_ingot_from_blasting.json
@@ -6,8 +6,5 @@
   "ingredient": {
     "item": "enderio:powdered_copper"
   },
-  "result": {
-    "count": 1,
-    "item": "minecraft:copper_ingot"
-  }
+  "result": "minecraft:copper_ingot"
 }
diff --git a/src/generated/resources/data/enderio/recipes/copper_ingot_from_smelting.json b/src/generated/resources/data/enderio/recipes/copper_ingot_from_smelting.json
@@ -6,8 +6,5 @@
   "ingredient": {
     "item": "enderio:powdered_copper"
   },
-  "result": {
-    "count": 1,
-    "item": "minecraft:copper_ingot"
-  }
+  "result": "minecraft:copper_ingot"
 }
diff --git a/src/generated/resources/data/enderio/recipes/gold_ingot_from_blasting.json b/src/generated/resources/data/enderio/recipes/gold_ingot_from_blasting.json
@@ -6,8 +6,5 @@
   "ingredient": {
     "item": "enderio:powdered_gold"
   },
-  "result": {
-    "count": 1,
-    "item": "minecraft:gold_ingot"
-  }
+  "result": "minecraft:gold_ingot"
 }
diff --git a/src/generated/resources/data/enderio/recipes/gold_ingot_from_smelting.json b/src/generated/resources/data/enderio/recipes/gold_ingot_from_smelting.json
@@ -6,8 +6,5 @@
   "ingredient": {
     "item": "enderio:powdered_gold"
   },
-  "result": {
-    "count": 1,
-    "item": "minecraft:gold_ingot"
-  }
+  "result": "minecraft:gold_ingot"
 }
diff --git a/src/generated/resources/data/enderio/recipes/iron_ingot_from_blasting.json b/src/generated/resources/data/enderio/recipes/iron_ingot_from_blasting.json
@@ -6,8 +6,5 @@
   "ingredient": {
     "item": "enderio:powdered_iron"
   },
-  "result": {
-    "count": 1,
-    "item": "minecraft:iron_ingot"
-  }
+  "result": "minecraft:iron_ingot"
 }
diff --git a/src/generated/resources/data/enderio/recipes/iron_ingot_from_smelting.json b/src/generated/resources/data/enderio/recipes/iron_ingot_from_smelting.json
@@ -6,8 +6,5 @@
   "ingredient": {
     "item": "enderio:powdered_iron"
   },
-  "result": {
-    "count": 1,
-    "item": "minecraft:iron_ingot"
-  }
+  "result": "minecraft:iron_ingot"
 }
diff --git a/src/main/java/com/enderio/base/data/recipe/MaterialRecipes.java b/src/main/java/com/enderio/base/data/recipe/MaterialRecipes.java
@@ -127,33 +127,33 @@ private void addAlloys(Consumer<FinishedRecipe> recipeConsumer) {
     }
 
     private void addIngots(Consumer<FinishedRecipe> recipeConsumer) {
-        MultipleCookingRecipeBuilder
-            .smelting(Ingredient.of(EIOItems.POWDERED_IRON.get()), RecipeCategory.MISC, new ItemStack(Items.IRON_INGOT, 1), 0, 200)
+        SimpleCookingRecipeBuilder
+            .smelting(Ingredient.of(EIOItems.POWDERED_IRON.get()), RecipeCategory.MISC, Items.IRON_INGOT, 0, 200)
             .unlockedBy("has_ingredient", InventoryChangeTrigger.TriggerInstance.hasItems(EIOItems.POWDERED_IRON.get()))
             .save(recipeConsumer, EnderIO.loc(Items.IRON_INGOT + "_from_smelting"));
 
-        MultipleCookingRecipeBuilder
-            .blasting(Ingredient.of(EIOItems.POWDERED_IRON.get()), RecipeCategory.MISC, new ItemStack(Items.IRON_INGOT, 1), 0, 100)
+        SimpleCookingRecipeBuilder
+            .blasting(Ingredient.of(EIOItems.POWDERED_IRON.get()), RecipeCategory.MISC, Items.IRON_INGOT, 0, 100)
             .unlockedBy("has_ingredient", InventoryChangeTrigger.TriggerInstance.hasItems(EIOItems.POWDERED_IRON.get()))
             .save(recipeConsumer, EnderIO.loc(Items.IRON_INGOT + "_from_blasting"));
 
-        MultipleCookingRecipeBuilder
-            .smelting(Ingredient.of(EIOItems.POWDERED_GOLD.get()), RecipeCategory.MISC, new ItemStack(Items.GOLD_INGOT, 1), 0, 200)
+        SimpleCookingRecipeBuilder
+            .smelting(Ingredient.of(EIOItems.POWDERED_GOLD.get()), RecipeCategory.MISC, Items.GOLD_INGOT, 0, 200)
             .unlockedBy("has_ingredient", InventoryChangeTrigger.TriggerInstance.hasItems(EIOItems.POWDERED_GOLD.get()))
             .save(recipeConsumer, EnderIO.loc(Items.GOLD_INGOT + "_from_smelting"));
 
-        MultipleCookingRecipeBuilder
-            .blasting(Ingredient.of(EIOItems.POWDERED_GOLD.get()), RecipeCategory.MISC, new ItemStack(Items.GOLD_INGOT, 1), 0, 100)
+        SimpleCookingRecipeBuilder
+            .blasting(Ingredient.of(EIOItems.POWDERED_GOLD.get()), RecipeCategory.MISC, Items.GOLD_INGOT, 0, 100)
             .unlockedBy("has_ingredient", InventoryChangeTrigger.TriggerInstance.hasItems(EIOItems.POWDERED_GOLD.get()))
             .save(recipeConsumer, EnderIO.loc(Items.GOLD_INGOT + "_from_blasting"));
 
-        MultipleCookingRecipeBuilder
-            .smelting(Ingredient.of(EIOItems.POWDERED_COPPER.get()), RecipeCategory.MISC, new ItemStack(Items.COPPER_INGOT, 1), 0, 200)
+        SimpleCookingRecipeBuilder
+            .smelting(Ingredient.of(EIOItems.POWDERED_COPPER.get()), RecipeCategory.MISC, Items.COPPER_INGOT,  0, 200)
             .unlockedBy("has_ingredient", InventoryChangeTrigger.TriggerInstance.hasItems(EIOItems.POWDERED_COPPER.get()))
             .save(recipeConsumer, EnderIO.loc(Items.COPPER_INGOT + "_from_smelting"));
 
-        MultipleCookingRecipeBuilder
-            .blasting(Ingredient.of(EIOItems.POWDERED_COPPER.get()), RecipeCategory.MISC, new ItemStack(Items.COPPER_INGOT, 1), 0, 100)
+        SimpleCookingRecipeBuilder
+            .blasting(Ingredient.of(EIOItems.POWDERED_COPPER.get()), RecipeCategory.MISC, Items.COPPER_INGOT, 0, 100)
             .unlockedBy("has_ingredient", InventoryChangeTrigger.TriggerInstance.hasItems(EIOItems.POWDERED_COPPER.get()))
             .save(recipeConsumer, EnderIO.loc(Items.COPPER_INGOT + "_from_blasting"));
     }