From 00aea6dfa13e3945dc4f23d1fd8435c715aa3f94 Mon Sep 17 00:00:00 2001 From: Mary <33456283+FourIsTheNumber@users.noreply.github.com> Date: Tue, 27 Aug 2024 17:52:06 -0400 Subject: 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 Co-authored-by: Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com> --- src/main/java/gregtech/api/util/GT_ModHandler.java | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) (limited to 'src/main/java/gregtech/api/util') 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 aIC2RecipeList, RecipeMap aGTRecipeMap, boolean aAddGTRecipe, boolean aRemoveIC2Recipe, boolean aExcludeGTIC2Items) { Map aRecipesToRemove = new HashMap<>(); -- cgit