Remove IC2 recipe maps for good (#2971)

* Changed conflicting recipe in mass fabricator to a new circuit

* Added circuit 1 to assembler recipes for vanilla tools

* Removed redundant windmill shaft recipes in gt++. These are loaded in coremod already

* Remove redundant canner registration by bartworks

* IC2 thermal centrifuge recipes added to GT

* IC2 compressor recipes added to GT

* IC2 extractor recipes added to GT

* IC2 macerator recipes added to GT

* /cofh killall ic2 recipes

* Revert "Remove redundant canner registration by bartworks"

This reverts commit bb032ad728f147b82d67ea68e2df5c1ce5e3e149.

* Fixed typo in comment

---------

Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com>

8 files changed, 260 insertions, 56 deletions

diff --git a/src/main/java/gregtech/GT_Mod.java b/src/main/java/gregtech/GT_Mod.java
index 4f1297bd81..1467000877 100644
--- a/src/main/java/gregtech/GT_Mod.java
+++ b/src/main/java/gregtech/GT_Mod.java
@@ -64,7 +64,6 @@ import gregtech.api.interfaces.internal.IGT_Mod;
 import gregtech.api.metatileentity.BaseMetaPipeEntity;
 import gregtech.api.objects.ItemData;
 import gregtech.api.objects.XSTR;
-import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.registries.LHECoolantRegistry;
 import gregtech.api.threads.GT_Runnable_MachineBlockUpdate;
 import gregtech.api.util.GT_Assemblyline_Server;
@@ -659,21 +658,7 @@ public class GT_Mod implements IGT_Mod {
         }
 
         gregtechproxy.onServerStarting();
-        // Check for more IC2 recipes on ServerStart to also catch MineTweaker additions
-        GT_ModHandler
-            .addIC2RecipesToGT(GT_ModHandler.getMaceratorRecipeList(), RecipeMaps.maceratorRecipes, true, true, true);
-        GT_ModHandler
-            .addIC2RecipesToGT(GT_ModHandler.getCompressorRecipeList(), RecipeMaps.compressorRecipes, true, true, true);
-        GT_ModHandler
-            .addIC2RecipesToGT(GT_ModHandler.getExtractorRecipeList(), RecipeMaps.extractorRecipes, true, true, true);
-        GT_ModHandler
-            .addIC2RecipesToGT(GT_ModHandler.getOreWashingRecipeList(), RecipeMaps.oreWasherRecipes, false, true, true);
-        GT_ModHandler.addIC2RecipesToGT(
-            GT_ModHandler.getThermalCentrifugeRecipeList(),
-            RecipeMaps.thermalCentrifugeRecipes,
-            true,
-            true,
-            true);
+        GT_ModHandler.removeAllIC2Recipes();
         GT_Log.out.println("GT_Mod: Unificating outputs of all known Recipe Types.");
         ArrayList<ItemStack> tStacks = new ArrayList<>(10000);
         GT_Log.out.println("GT_Mod: IC2 Machines");
diff --git a/src/main/java/gregtech/api/util/GT_ModHandler.java b/src/main/java/gregtech/api/util/GT_ModHandler.java
index dabdbbc56b..b5c7c6fb6e 100644
--- a/src/main/java/gregtech/api/util/GT_ModHandler.java
+++ b/src/main/java/gregtech/api/util/GT_ModHandler.java
@@ -559,8 +559,26 @@ public class GT_ModHandler {
     }
 
     /**
-     * Adds GT versions of the IC2 recipes from the supplied IC2RecipeList.
+     * Removes IC2 recipes.
      */
+    public static void removeAllIC2Recipes() {
+        getMaceratorRecipeList().entrySet()
+            .clear();
+        getCompressorRecipeList().entrySet()
+            .clear();
+        getExtractorRecipeList().entrySet()
+            .clear();
+        getOreWashingRecipeList().entrySet()
+            .clear();
+        getThermalCentrifugeRecipeList().entrySet()
+            .clear();
+    }
+
+    /**
+     * Adds GT versions of the IC2 recipes from the supplied IC2RecipeList. Deprecated because all IC2 recipes
+     * have been manually added to GT.
+     */
+    @Deprecated
     public static void addIC2RecipesToGT(Map<IRecipeInput, RecipeOutput> aIC2RecipeList, RecipeMap<?> aGTRecipeMap,
         boolean aAddGTRecipe, boolean aRemoveIC2Recipe, boolean aExcludeGTIC2Items) {
         Map<ItemStack, ItemStack> aRecipesToRemove = new HashMap<>();
diff --git a/src/main/java/gregtech/common/GT_Client.java b/src/main/java/gregtech/common/GT_Client.java
index cdd21a13d4..66e042a051 100644
--- a/src/main/java/gregtech/common/GT_Client.java
+++ b/src/main/java/gregtech/common/GT_Client.java
@@ -78,7 +78,6 @@ import gregtech.api.multitileentity.multiblock.base.MultiBlockPart;
 import gregtech.api.net.GT_Packet_ClientPreference;
 import gregtech.api.objects.GT_ItemStack;
 import gregtech.api.recipe.RecipeCategory;
-import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.util.ColorsMetadataSection;
 import gregtech.api.util.ColorsMetadataSectionSerializer;
 import gregtech.api.util.GT_ClientPreference;
@@ -754,37 +753,7 @@ public class GT_Client extends GT_Proxy implements Runnable {
 
                 if (!Minecraft.getMinecraft()
                     .isSingleplayer()) {
-                    // Check for more IC2 recipes to also catch MineTweaker additions
-                    GT_ModHandler.addIC2RecipesToGT(
-                        GT_ModHandler.getMaceratorRecipeList(),
-                        RecipeMaps.maceratorRecipes,
-                        true,
-                        true,
-                        true);
-                    GT_ModHandler.addIC2RecipesToGT(
-                        GT_ModHandler.getCompressorRecipeList(),
-                        RecipeMaps.compressorRecipes,
-                        true,
-                        true,
-                        true);
-                    GT_ModHandler.addIC2RecipesToGT(
-                        GT_ModHandler.getExtractorRecipeList(),
-                        RecipeMaps.extractorRecipes,
-                        true,
-                        true,
-                        true);
-                    GT_ModHandler.addIC2RecipesToGT(
-                        GT_ModHandler.getOreWashingRecipeList(),
-                        RecipeMaps.oreWasherRecipes,
-                        false,
-                        true,
-                        true);
-                    GT_ModHandler.addIC2RecipesToGT(
-                        GT_ModHandler.getThermalCentrifugeRecipeList(),
-                        RecipeMaps.thermalCentrifugeRecipes,
-                        true,
-                        true,
-                        true);
+                    GT_ModHandler.removeAllIC2Recipes();
                 }
             }
             afterSomeTime++;
diff --git a/src/main/java/gregtech/loaders/postload/GT_PostLoad.java b/src/main/java/gregtech/loaders/postload/GT_PostLoad.java
index 5f0310a21e..4dae7d5313 100644
--- a/src/main/java/gregtech/loaders/postload/GT_PostLoad.java
+++ b/src/main/java/gregtech/loaders/postload/GT_PostLoad.java
@@ -99,13 +99,8 @@ public class GT_PostLoad {
                         .isItemEqual(iridiumOre))
             .findAny()
             .ifPresent(e -> aCompressorRecipeList.remove(e.getKey()));
-        // Add default IC2 recipe to GT
-        GT_ModHandler.addIC2RecipesToGT(aMaceratorRecipeList, RecipeMaps.maceratorRecipes, true, true, true);
-        GT_ModHandler.addIC2RecipesToGT(aCompressorRecipeList, RecipeMaps.compressorRecipes, true, true, true);
-        GT_ModHandler.addIC2RecipesToGT(aExtractorRecipeList, RecipeMaps.extractorRecipes, true, true, true);
-        GT_ModHandler.addIC2RecipesToGT(aOreWashingRecipeList, RecipeMaps.oreWasherRecipes, false, true, true);
-        GT_ModHandler
-            .addIC2RecipesToGT(aThermalCentrifugeRecipeList, RecipeMaps.thermalCentrifugeRecipes, true, true, true);
+        // Remove all IC2
+        GT_ModHandler.removeAllIC2Recipes();
         // noinspection UnstableApiUsage// Stable enough for this project
         GT_Mod.GT_FML_LOGGER.info("IC2 Removal (" + stopwatch.stop() + "). Have a Cake.");
     }
diff --git a/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java
index ac462e4d50..78d8319907 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/CompressorRecipes.java
@@ -25,6 +25,104 @@ public class CompressorRecipes implements Runnable {
     @Override
     public void run() {
         GT_Values.RA.stdBuilder()
+            .itemInputs(ItemList.Cell_Empty.get(1))
+            .itemOutputs(ItemList.Cell_Air.get(1))
+            .duration(15 * SECONDS)
+            .eut(2)
+            .addTo(compressorRecipes);
+
+        GT_Values.RA.stdBuilder()
+            .itemInputs(new ItemStack(Blocks.sand, 4))
+            .itemOutputs(new ItemStack(Blocks.sandstone, 1))
+            .duration(15 * SECONDS)
+            .eut(2)
+            .addTo(compressorRecipes);
+
+        GT_Values.RA.stdBuilder()
+            .itemInputs(GT_ModHandler.getIC2Item("iridiumShard", 9))
+            .itemOutputs(GT_ModHandler.getIC2Item("iridiumOre", 1))
+            .duration(15 * SECONDS)
+            .eut(2)
+            .addTo(compressorRecipes);
+
+        GT_Values.RA.stdBuilder()
+            .itemInputs(new ItemStack(Items.clay_ball, 4))
+            .itemOutputs(new ItemStack(Blocks.clay, 1))
+            .duration(15 * SECONDS)
+            .eut(2)
+            .addTo(compressorRecipes);
+
+        GT_Values.RA.stdBuilder()
+            .itemInputs(new ItemStack(Items.brick, 4))
+            .itemOutputs(new ItemStack(Blocks.brick_block, 1))
+            .duration(15 * SECONDS)
+            .eut(2)
+            .addTo(compressorRecipes);
+
+        GT_Values.RA.stdBuilder()
+            .itemInputs(new ItemStack(Items.netherbrick, 4))
+            .itemOutputs(new ItemStack(Blocks.nether_brick, 1))
+            .duration(15 * SECONDS)
+            .eut(2)
+            .addTo(compressorRecipes);
+
+        GT_Values.RA.stdBuilder()
+            .itemInputs(GT_ModHandler.getIC2Item("smallPlutonium", 9))
+            .itemOutputs(GT_ModHandler.getIC2Item("Plutonium", 1))
+            .duration(15 * SECONDS)
+            .eut(2)
+            .addTo(compressorRecipes);
+
+        GT_Values.RA.stdBuilder()
+            .itemInputs(GT_ModHandler.getIC2Item("smallUran235", 9))
+            .itemOutputs(GT_ModHandler.getIC2Item("Uran235", 1))
+            .duration(15 * SECONDS)
+            .eut(2)
+            .addTo(compressorRecipes);
+
+        GT_Values.RA.stdBuilder()
+            .itemInputs(new ItemStack(Items.water_bucket, 1))
+            .itemOutputs(new ItemStack(Blocks.snow, 1))
+            .duration(15 * SECONDS)
+            .eut(2)
+            .addTo(compressorRecipes);
+
+        GT_Values.RA.stdBuilder()
+            .itemInputs(new ItemStack(Items.snowball, 4))
+            .itemOutputs(new ItemStack(Blocks.snow, 1))
+            .duration(15 * SECONDS)
+            .eut(2)
+            .addTo(compressorRecipes);
+
+        GT_Values.RA.stdBuilder()
+            .itemInputs(ItemList.Cell_Water.get(1))
+            .itemOutputs(new ItemStack(Blocks.snow, 1))
+            .duration(15 * SECONDS)
+            .eut(2)
+            .addTo(compressorRecipes);
+
+        GT_Values.RA.stdBuilder()
+            .itemInputs(new ItemStack(Blocks.snow, 1))
+            .itemOutputs(new ItemStack(Blocks.ice, 1))
+            .duration(15 * SECONDS)
+            .eut(2)
+            .addTo(compressorRecipes);
+
+        GT_Values.RA.stdBuilder()
+            .itemInputs(GT_ModHandler.getIC2Item("carbonMesh", 1))
+            .itemOutputs(GT_ModHandler.getIC2Item("carbonPlate", 1))
+            .duration(15 * SECONDS)
+            .eut(2)
+            .addTo(compressorRecipes);
+
+        GT_Values.RA.stdBuilder()
+            .itemInputs(GT_ModHandler.getIC2Item("coalBall", 1))
+            .itemOutputs(ItemList.IC2_Compressed_Coal_Ball.get(1))
+            .duration(15 * SECONDS)
+            .eut(2)
+            .addTo(compressorRecipes);
+
+        GT_Values.RA.stdBuilder()
             .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 8L))
             .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Wood, 1L))
             .duration(15 * SECONDS)
diff --git a/src/main/java/gregtech/loaders/postload/recipes/ExtractorRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ExtractorRecipes.java
index b47efc2e08..06ad1fa994 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/ExtractorRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/ExtractorRecipes.java
@@ -34,6 +34,11 @@ public class ExtractorRecipes implements Runnable {
             GT_OreDictUnificator.get(OrePrefixes.dust, Materials.RawRubber, 1L));
 
         addExtractionRecipe(ItemList.Cell_Air.get(1L), ItemList.Cell_Empty.get(1L));
+        addExtractionRecipe(getIC2Item("filledTinCan", 1), getIC2Item("tinCan", 1));
+        addExtractionRecipe(new ItemStack(Blocks.clay, 1), new ItemStack(Items.clay_ball, 4));
+        addExtractionRecipe(new ItemStack(Blocks.brick_block, 1), new ItemStack(Items.brick, 4));
+        addExtractionRecipe(new ItemStack(Blocks.nether_brick, 1), new ItemStack(Items.netherbrick, 4));
+        addExtractionRecipe(new ItemStack(Blocks.snow, 1), new ItemStack(Items.snowball, 4));
 
         GT_Values.RA.stdBuilder()
             .itemInputs(ItemList.Battery_SU_LV_SulfuricAcid.get(1L))
diff --git a/src/main/java/gregtech/loaders/postload/recipes/Pulverizer.java b/src/main/java/gregtech/loaders/postload/recipes/Pulverizer.java
index 14bebd9f56..75a81448e0 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/Pulverizer.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/Pulverizer.java
@@ -5,6 +5,7 @@ import static gregtech.api.enums.Mods.HardcoreEnderExpansion;
 import static gregtech.api.enums.Mods.Railcraft;
 import static gregtech.api.enums.Mods.Thaumcraft;
 import static gregtech.api.recipe.RecipeMaps.maceratorRecipes;
+import static gregtech.api.util.GT_ModHandler.getIC2Item;
 import static gregtech.api.util.GT_ModHandler.getModItem;
 import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
 import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
@@ -505,6 +506,48 @@ public class Pulverizer implements Runnable {
             .addTo(maceratorRecipes);
 
         GT_Values.RA.stdBuilder()
+            .itemInputs(new ItemStack(Items.poisonous_potato, 1))
+            .itemOutputs(ItemList.IC2_Grin_Powder.get(1L))
+            .duration(15 * SECONDS)
+            .eut(TierEU.RECIPE_LV)
+            .addTo(maceratorRecipes);
+
+        GT_Values.RA.stdBuilder()
+            .itemInputs(new ItemStack(Items.spider_eye, 1))
+            .itemOutputs(ItemList.IC2_Grin_Powder.get(1L))
+            .duration(15 * SECONDS)
+            .eut(TierEU.RECIPE_LV)
+            .addTo(maceratorRecipes);
+
+        GT_Values.RA.stdBuilder()
+            .itemInputs(new ItemStack(Items.bone, 1))
+            .itemOutputs(new ItemStack(Items.dye, 4, 15))
+            .duration(15 * SECONDS)
+            .eut(TierEU.RECIPE_LV)
+            .addTo(maceratorRecipes);
+
+        GT_Values.RA.stdBuilder()
+            .itemInputs(ItemList.IC2_EnergyCrystal.get(1))
+            .itemOutputs(getIC2Item("energiumDust", 9))
+            .duration(15 * SECONDS)
+            .eut(TierEU.RECIPE_LV)
+            .addTo(maceratorRecipes);
+
+        GT_Values.RA.stdBuilder()
+            .itemInputs(getIC2Item("biochaff", 1))
+            .itemOutputs(new ItemStack(Blocks.dirt, 1))
+            .duration(15 * SECONDS)
+            .eut(TierEU.RECIPE_LV)
+            .addTo(maceratorRecipes);
+
+        GT_Values.RA.stdBuilder()
+            .itemInputs(new ItemStack(Blocks.quartz_stairs, 1))
+            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.NetherQuartz, 6))
+            .duration(15 * SECONDS)
+            .eut(TierEU.RECIPE_LV)
+            .addTo(maceratorRecipes);
+
+        GT_Values.RA.stdBuilder()
             .itemInputs(new ItemStack(Items.item_frame, 1, 32767))
             .itemOutputs(
                 new ItemStack(Items.leather, 1),
diff --git a/src/main/java/gregtech/loaders/postload/recipes/ThermalCentrifugeRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ThermalCentrifugeRecipes.java
index 7e10d2a1fc..8e06eec1e0 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/ThermalCentrifugeRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/ThermalCentrifugeRecipes.java
@@ -1,8 +1,10 @@
 package gregtech.loaders.postload.recipes;
 
 import static gregtech.api.recipe.RecipeMaps.thermalCentrifugeRecipes;
+import static gregtech.api.util.GT_ModHandler.getIC2Item;
 import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
 
+import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 
@@ -26,5 +28,94 @@ public class ThermalCentrifugeRecipes implements Runnable {
             .duration(25 * SECONDS)
             .eut(TierEU.RECIPE_LV)
             .addTo(thermalCentrifugeRecipes);
+
+        // Recipes from the old ic2 recipe maps
+        GT_Values.RA.stdBuilder()
+            .itemInputs(getIC2Item("reactorDepletedMOXSimple", 1))
+            .itemOutputs(
+                getIC2Item("smallPlutonium", 1),
+                getIC2Item("Plutonium", 3),
+                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1))
+            .duration(25 * SECONDS)
+            .eut(TierEU.RECIPE_LV)
+            .addTo(thermalCentrifugeRecipes);
+
+        GT_Values.RA.stdBuilder()
+            .itemInputs(getIC2Item("reactorDepletedMOXDual", 1))
+            .itemOutputs(
+                getIC2Item("smallPlutonium", 2),
+                getIC2Item("Plutonium", 6),
+                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 3))
+            .duration(25 * SECONDS)
+            .eut(TierEU.RECIPE_LV)
+            .addTo(thermalCentrifugeRecipes);
+
+        GT_Values.RA.stdBuilder()
+            .itemInputs(getIC2Item("reactorDepletedMOXQuad", 1))
+            .itemOutputs(
+                getIC2Item("smallPlutonium", 4),
+                getIC2Item("Plutonium", 12),
+                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 6))
+            .duration(25 * SECONDS)
+            .eut(TierEU.RECIPE_LV)
+            .addTo(thermalCentrifugeRecipes);
+
+        GT_Values.RA.stdBuilder()
+            .itemInputs(getIC2Item("reactorDepletedUraniumSimple", 1))
+            .itemOutputs(
+                getIC2Item("smallPlutonium", 1),
+                getIC2Item("Uran238", 4),
+                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1))
+            .duration(25 * SECONDS)
+            .eut(TierEU.RECIPE_LV)
+            .addTo(thermalCentrifugeRecipes);
+
+        GT_Values.RA.stdBuilder()
+            .itemInputs(getIC2Item("reactorDepletedUraniumDual", 1))
+            .itemOutputs(
+                getIC2Item("smallPlutonium", 2),
+                getIC2Item("Uran238", 8),
+                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 3))
+            .duration(25 * SECONDS)
+            .eut(TierEU.RECIPE_LV)
+            .addTo(thermalCentrifugeRecipes);
+
+        GT_Values.RA.stdBuilder()
+            .itemInputs(getIC2Item("reactorDepletedUraniumQuad", 1))
+            .itemOutputs(
+                getIC2Item("smallPlutonium", 4),
+                getIC2Item("Uran238", 16),
+                GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 6))
+            .duration(25 * SECONDS)
+            .eut(TierEU.RECIPE_LV)
+            .addTo(thermalCentrifugeRecipes);
+
+        GT_Values.RA.stdBuilder()
+            .itemInputs(getIC2Item("RTGPellets", 1))
+            .itemOutputs(getIC2Item("Plutonium", 3), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 54))
+            .duration(25 * SECONDS)
+            .eut(TierEU.RECIPE_LV)
+            .addTo(thermalCentrifugeRecipes);
+
+        GT_Values.RA.stdBuilder()
+            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.NetherQuartz, 2))
+            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Lithium, 1))
+            .duration(25 * SECONDS)
+            .eut(TierEU.RECIPE_LV)
+            .addTo(thermalCentrifugeRecipes);
+
+        GT_Values.RA.stdBuilder()
+            .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Clay, 4))
+            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1))
+            .duration(25 * SECONDS)
+            .eut(TierEU.RECIPE_LV)
+            .addTo(thermalCentrifugeRecipes);
+
+        GT_Values.RA.stdBuilder()
+            .itemInputs(new ItemStack(Blocks.cobblestone, 1))
+            .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1))
+            .duration(25 * SECONDS)
+            .eut(TierEU.RECIPE_LV)
+            .addTo(thermalCentrifugeRecipes);
     }
 }