From 27bbb51c837704e2ff380276858483b6e42d06da Mon Sep 17 00:00:00 2001
From: chochem <40274384+chochem@users.noreply.github.com>
Date: Tue, 30 Apr 2024 08:09:47 +0100
Subject: GT recipe.cfg cleanup (#2579)

* ichorium block fixes

* alu ingot fix

* iridium ore fix

* gt vanilla assembling fixes

* ic2 assembler recipe fix

* forestry assembler recipe fixes

* spotless

* electrolyzer

* more iridium ore fixes

* another ichorium block fix

* obsidian stick fix

* remove unused railcraft obsidian recipes

* remove disabled melon recipe

* bring custom plasma fuel values to code

* spotless

* remove most recipe config uses

* fully remove recipe.cfg

* dont change recipemapbackend for now
---
 .../common/items/GT_MetaGenerated_Item_02.java     |  8 ----
 .../common/items/GT_MetaGenerated_Tool_01.java     | 51 +++++++++-------------
 2 files changed, 21 insertions(+), 38 deletions(-)

(limited to 'src/main/java/gregtech/common/items')

diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java
index 786764a3b2..875c4e9861 100644
--- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java
+++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_02.java
@@ -2669,14 +2669,6 @@ public class GT_MetaGenerated_Item_02 extends GT_MetaGenerated_Item_X32 {
             .eut(2)
             .addTo(maceratorRecipes);
 
-        GT_Values.RA.stdBuilder()
-            .itemInputs(new ItemStack(Blocks.melon_block, 1, 0))
-            .itemOutputs(new ItemStack(Items.melon, 8, 0), new ItemStack(Items.melon_seeds, 1))
-            .outputChances(10000, 8000)
-            .duration(20 * SECONDS)
-            .eut(2)
-            .addTo(maceratorRecipes);
-
         GT_Values.RA.stdBuilder()
             .itemInputs(new ItemStack(Blocks.pumpkin, 1, 0))
             .itemOutputs(new ItemStack(Items.pumpkin_seeds, 4, 0))
diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java
index 14af94d70e..309507f2a9 100644
--- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java
+++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java
@@ -798,36 +798,27 @@ public class GT_MetaGenerated_Tool_01 extends GT_MetaGenerated_Tool {
                 new Object[] { "  S", " I ", "S f", 'I', OrePrefixes.ingot.get(Materials.IronWood), 'S',
                     OrePrefixes.stick.get(Materials.IronWood) });
 
-            if (GregTech_API.sRecipeFile.get(ConfigCategories.Tools.mortar, "Coal", true)) {
-                GT_ModHandler.addShapelessCraftingRecipe(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1L),
-                    GT_ModHandler.RecipeBits.NOT_REMOVABLE,
-                    new Object[] { ToolDictNames.craftingToolMortar, new ItemStack(Items.coal, 1) });
-            }
-            if (GregTech_API.sRecipeFile.get(ConfigCategories.Tools.mortar, "Clay", true)) {
-                GT_ModHandler.addShapelessCraftingRecipe(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Clay, 1L),
-                    GT_ModHandler.RecipeBits.NOT_REMOVABLE,
-                    new Object[] { ToolDictNames.craftingToolMortar, new ItemStack(Blocks.clay, 1) });
-            }
-            if (GregTech_API.sRecipeFile.get(ConfigCategories.Tools.mortar, "Wheat", true)) {
-                GT_ModHandler.addShapelessCraftingRecipe(
-                    GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wheat, 1L),
-                    GT_ModHandler.RecipeBits.NOT_REMOVABLE,
-                    new Object[] { ToolDictNames.craftingToolMortar, new ItemStack(Items.wheat, 1) });
-            }
-            if (GregTech_API.sRecipeFile.get(ConfigCategories.Tools.mortar, "Flint", true)) {
-                GT_ModHandler.addShapelessCraftingRecipe(
-                    new ItemStack(Items.flint, 1),
-                    GT_ModHandler.RecipeBits.NOT_REMOVABLE,
-                    new Object[] { ToolDictNames.craftingToolMortar, new ItemStack(Blocks.gravel, 1) });
-            }
-            if (GregTech_API.sRecipeFile.get(ConfigCategories.Tools.mortar, "Blaze", true)) {
-                GT_ModHandler.addShapelessCraftingRecipe(
-                    new ItemStack(Items.blaze_powder, 2),
-                    GT_ModHandler.RecipeBits.NOT_REMOVABLE,
-                    new Object[] { ToolDictNames.craftingToolMortar, new ItemStack(Items.blaze_rod, 1) });
-            }
+            GT_ModHandler.addShapelessCraftingRecipe(
+                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1L),
+                GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+                new Object[] { ToolDictNames.craftingToolMortar, new ItemStack(Items.coal, 1) });
+            GT_ModHandler.addShapelessCraftingRecipe(
+                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Clay, 1L),
+                GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+                new Object[] { ToolDictNames.craftingToolMortar, new ItemStack(Blocks.clay, 1) });
+            GT_ModHandler.addShapelessCraftingRecipe(
+                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wheat, 1L),
+                GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+                new Object[] { ToolDictNames.craftingToolMortar, new ItemStack(Items.wheat, 1) });
+            GT_ModHandler.addShapelessCraftingRecipe(
+                new ItemStack(Items.flint, 1),
+                GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+                new Object[] { ToolDictNames.craftingToolMortar, new ItemStack(Blocks.gravel, 1) });
+            GT_ModHandler.addShapelessCraftingRecipe(
+                new ItemStack(Items.blaze_powder, 2),
+                GT_ModHandler.RecipeBits.NOT_REMOVABLE,
+                new Object[] { ToolDictNames.craftingToolMortar, new ItemStack(Items.blaze_rod, 1) });
+
         }
     }
 }
-- 
cgit