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>

1 files changed, 1 insertions, 32 deletions

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++;