Migrate to new RecipeMap (#788)

* Remove reference to GTPP_Recipe itself

* Remove GTPP_Recipe_Map_Internal

* Move recipemaps to separated class

* Remove unused recipemaps

* Migrate GT++ recipemaps
Remove sElementalDuplicatorRecipes in favor of GT replicatorRecipes supporting findRecipe

* Migrate the rest

* Adjust catalyst priorities

* Add ABS non-alloy recipe category

* Remove s prefixes from recipemaps

* Adapt to GT_StreamUtil rename

* Adjust recipe catalysts

* Fix build

* update gradle+bs+deps

(cherry picked from commit 8b185c7a4d881d38580cc98456265ebb751b6d93)

* update deps

---------

Co-authored-by: Martin Robertz <dream-master@gmx.net>

4 files changed, 100 insertions, 176 deletions

diff --git a/src/main/java/gtPlusPlus/nei/GT_NEI_LFTR_Sparging.java b/src/main/java/gtPlusPlus/nei/GT_NEI_LFTR_Sparging.java
index f140045a4b..01d35de155 100644
--- a/src/main/java/gtPlusPlus/nei/GT_NEI_LFTR_Sparging.java
+++ b/src/main/java/gtPlusPlus/nei/GT_NEI_LFTR_Sparging.java
@@ -43,7 +43,7 @@ public class GT_NEI_LFTR_Sparging extends TemplateRecipeHandler {
                         new Rectangle(65, 13, 36, 18),
                         this.getOverlayIdentifier(),
                         new Object[0]));
-        if (!NEI_GT_Config.sIsAdded) {
+        if (!NEI_GTPP_Config.sIsAdded) {
             FMLInterModComms.sendRuntimeMessage(
                     GT_Values.GT,
                     "NEIPlugins",
diff --git a/src/main/java/gtPlusPlus/nei/NEI_GTPP_Config.java b/src/main/java/gtPlusPlus/nei/NEI_GTPP_Config.java
new file mode 100644
index 0000000000..17695a4bf7
--- /dev/null
+++ b/src/main/java/gtPlusPlus/nei/NEI_GTPP_Config.java
@@ -0,0 +1,99 @@
+package gtPlusPlus.nei;
+
+import java.util.Arrays;
+
+import net.minecraft.item.ItemStack;
+
+import codechicken.nei.api.API;
+import codechicken.nei.api.IConfigureNEI;
+import codechicken.nei.event.NEIRegisterHandlerInfosEvent;
+import codechicken.nei.recipe.HandlerInfo;
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import gregtech.api.enums.Mods;
+import gregtech.api.recipe.RecipeMaps;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.recipe.GTPPRecipeMaps;
+import gtPlusPlus.core.block.ModBlocks;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
+
+public class NEI_GTPP_Config implements IConfigureNEI {
+
+    public static boolean sIsAdded = true;
+
+    @Override
+    public synchronized void loadConfig() {
+        sIsAdded = false;
+
+        Logger.INFO("NEI Registration: Registering NEI handler for " + DecayableRecipeHandler.mNEIName);
+        API.registerRecipeHandler(new DecayableRecipeHandler());
+        API.registerUsageHandler(new DecayableRecipeHandler());
+        API.addRecipeCatalyst(new ItemStack(ModBlocks.blockDecayablesChest, 1), "GTPP_Decayables");
+
+        Logger.INFO("NEI Registration: Registering NEI handler for " + GT_NEI_LFTR_Sparging.mNEIName);
+        new GT_NEI_LFTR_Sparging();
+        API.addRecipeCatalyst(GregtechItemList.Controller_Sparge_Tower.get(1), "gtpp.recipe.lftr.sparging");
+
+        for (GregtechItemList item : Arrays.asList(
+                GregtechItemList.GT4_Electric_Auto_Workbench_LV,
+                GregtechItemList.GT4_Electric_Auto_Workbench_MV,
+                GregtechItemList.GT4_Electric_Auto_Workbench_HV,
+                GregtechItemList.GT4_Electric_Auto_Workbench_EV,
+                GregtechItemList.GT4_Electric_Auto_Workbench_IV,
+                GregtechItemList.GT4_Electric_Auto_Workbench_LuV,
+                GregtechItemList.GT4_Electric_Auto_Workbench_ZPM,
+                GregtechItemList.GT4_Electric_Auto_Workbench_UV)) {
+            API.addRecipeCatalyst(item.get(1), "crafting", -10);
+        }
+        // Bronze workbench
+        API.removeRecipeCatalyst(ItemUtils.getItemStackFromFQRN("gregtech:gt.blockmachines:31081", 1), "crafting");
+        API.removeRecipeCatalyst(ItemUtils.getItemStackFromFQRN("gregtech:gt.blockmachines:31082", 1), "crafting");
+
+        // Moved to its own handler
+        API.removeRecipeCatalyst(
+                GregtechItemList.Controller_Vacuum_Furnace.get(1),
+                GTPPRecipeMaps.chemicalDehydratorRecipes.unlocalizedName);
+
+        // ULV simple washer
+        API.removeRecipeCatalyst(
+                ItemUtils.getItemStackFromFQRN("gregtech:gt.blockmachines:767", 1),
+                GTPPRecipeMaps.simpleWasherRecipes.unlocalizedName);
+
+        // ULV combustion generator
+        API.removeRecipeCatalyst(
+                ItemUtils.getItemStackFromFQRN("gregtech:gt.blockmachines:960", 1),
+                RecipeMaps.dieselFuels.unlocalizedName);
+
+        // ULV gas turbine
+        API.removeRecipeCatalyst(
+                ItemUtils.getItemStackFromFQRN("gregtech:gt.blockmachines:961", 1),
+                RecipeMaps.gasTurbineFuels.unlocalizedName);
+
+        // Hide Flasks
+        if (Utils.isClient()) {
+            API.addItemListEntry(GregtechItemList.VOLUMETRIC_FLASK_8k.get(1));
+            API.addItemListEntry(GregtechItemList.VOLUMETRIC_FLASK_32k.get(1));
+        }
+        sIsAdded = true;
+    }
+
+    @SubscribeEvent
+    public void registerHandlerInfo(NEIRegisterHandlerInfosEvent event) {
+        event.registerHandlerInfo(
+                new HandlerInfo.Builder("gtpp.recipe.lftr.sparging", CORE.name, Mods.GTPlusPlus.ID)
+                        .setDisplayStack(GregtechItemList.Controller_Sparge_Tower.get(1)).setShiftY(6).setHeight(135)
+                        .setMaxRecipesPerPage(1).build());
+    }
+
+    @Override
+    public String getName() {
+        return "GT++ NEI Plugin";
+    }
+
+    @Override
+    public String getVersion() {
+        return "(1.12)";
+    }
+}
diff --git a/src/main/java/gtPlusPlus/nei/NEI_GT_Config.java b/src/main/java/gtPlusPlus/nei/NEI_GT_Config.java
deleted file mode 100644
index 92d19b3630..0000000000
--- a/src/main/java/gtPlusPlus/nei/NEI_GT_Config.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package gtPlusPlus.nei;
-
-import codechicken.nei.api.API;
-import codechicken.nei.api.IConfigureNEI;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-
-public class NEI_GT_Config implements IConfigureNEI {
-
-    public static boolean sIsAdded = true;
-
-    @Override
-    public synchronized void loadConfig() {
-        sIsAdded = false;
-
-        Logger.INFO("NEI Registration: Registering NEI handler for " + DecayableRecipeHandler.mNEIName);
-        API.registerRecipeHandler(new DecayableRecipeHandler());
-        API.registerUsageHandler(new DecayableRecipeHandler());
-
-        Logger.INFO("NEI Registration: Registering NEI handler for " + GT_NEI_LFTR_Sparging.mNEIName);
-        new GT_NEI_LFTR_Sparging();
-
-        // Hide Flasks
-        if (Utils.isClient()) {
-            codechicken.nei.api.API.addItemListEntry(GregtechItemList.VOLUMETRIC_FLASK_8k.get(1));
-            codechicken.nei.api.API.addItemListEntry(GregtechItemList.VOLUMETRIC_FLASK_32k.get(1));
-        }
-        sIsAdded = true;
-    }
-
-    @Override
-    public String getName() {
-        return "GT++ NEI Plugin";
-    }
-
-    @Override
-    public String getVersion() {
-        return "(1.12)";
-    }
-}
diff --git a/src/main/java/gtPlusPlus/nei/NEI_IMC_Sender.java b/src/main/java/gtPlusPlus/nei/NEI_IMC_Sender.java
deleted file mode 100644
index b7058889a1..0000000000
--- a/src/main/java/gtPlusPlus/nei/NEI_IMC_Sender.java
+++ /dev/null
@@ -1,134 +0,0 @@
-package gtPlusPlus.nei;
-
-import static gregtech.api.enums.Mods.AdvancedSolarPanel;
-import static gregtech.api.enums.Mods.GTPlusPlus;
-import static gregtech.api.enums.Mods.NotEnoughItems;
-
-import net.minecraft.nbt.NBTTagCompound;
-
-import cpw.mods.fml.common.event.FMLInterModComms;
-
-public class NEI_IMC_Sender {
-
-    public static void IMCSender() {
-        // NEI jar is using some outdated handler names
-        sendHandler("gtpp.recipe.alloyblastsmelter", "gregtech:gt.blockmachines:810", 2);
-        sendCatalyst("gtpp.recipe.alloyblastsmelter", "gregtech:gt.blockmachines:31150");
-        sendHandler("gtpp.recipe.rocketenginefuel", "gregtech:gt.blockmachines:793");
-        sendHandler("gtpp.recipe.cyclotron", "gregtech:gt.blockmachines:828");
-        sendHandler("gtpp.recipe.chemicaldehydrator", "gregtech:gt.blockmachines:911");
-        sendHandler("gtpp.recipe.slowfusionreactor", "gregtech:gt.blockmachines:31015");
-        sendHandler("gtpp.recipe.RTGgenerators", "gregtech:gt.blockmachines:869");
-        sendHandler("gtpp.recipe.cokeoven", "gregtech:gt.blockmachines:791");
-        sendHandler("gtpp.recipe.semifluidgeneratorfuels", "gregtech:gt.blockmachines:837");
-        sendHandler("gtpp.recipe.fishpond", "gregtech:gt.blockmachines:829", 1);
-        sendHandler("gtpp.recipe.multimixer", "gregtech:gt.blockmachines:811");
-        sendHandler("gtpp.recipe.advanced.mixer", "gregtech:gt.blockmachines:811");
-        sendHandler("gtpp.recipe.cryogenicfreezer", "gregtech:gt.blockmachines:910");
-        sendHandler("gtpp.recipe.matterfab2", "gregtech:gt.blockmachines:799");
-        sendHandler("gtpp.recipe.multicentrifuge", "gregtech:gt.blockmachines:790", 1);
-        sendHandler("gtpp.recipe.multielectro", "gregtech:gt.blockmachines:796", 1);
-        sendHandler("gtpp.recipe.simplewasher", "gregtech:gt.blockmachines:767");
-        sendHandler("gtpp.recipe.vacfurnace", "gregtech:gt.blockmachines:995", 1);
-        sendHandler("gtpp.recipe.fissionfuel", "gregtech:gt.blockmachines:835", 1);
-        sendHandler("gtpp.recipe.lftr", "gregtech:gt.blockmachines:751", 1);
-        sendHandler("gtpp.recipe.lftr.sparging", "gregtech:gt.blockmachines:31035", 1);
-        sendHandler("gtpp.recipe.oremill", "gregtech:gt.blockmachines:31027", 1);
-        sendHandler("gtpp.recipe.flotationcell", "gregtech:gt.blockmachines:31028", 1);
-        sendHandler("gtpp.recipe.fluidchemicaleactor", "gregtech:gt.blockmachines:998");
-
-        sendCatalyst("GTPP_Decayables", "miscutils:blockDecayablesChest");
-
-        sendHandler("gtpp.recipe.geothermalfuel", "gregtech:gt.blockmachines:830");
-        sendCatalyst("gtpp.recipe.geothermalfuel", "gregtech:gt.blockmachines:830");
-
-        sendHandler("gtpp.recipe.thermalgeneratorfuel", "gregtech:gt.blockmachines:875", 1);
-        sendCatalyst("gtpp.recipe.thermalgeneratorfuel", "gregtech:gt.blockmachines:875");
-
-        sendHandler("gtpp.recipe.solartower", "gregtech:gt.blockmachines:863", 1);
-        sendCatalyst("gtpp.recipe.solartower", "gregtech:gt.blockmachines:863");
-
-        sendHandler("gtpp.recipe.coldtrap", "gregtech:gt.blockmachines:31034");
-        sendCatalyst("gtpp.recipe.coldtrap", "gregtech:gt.blockmachines:31033");
-        sendCatalyst("gtpp.recipe.coldtrap", "gregtech:gt.blockmachines:31034");
-
-        sendHandler("gtpp.recipe.reactorprocessingunit", "gregtech:gt.blockmachines:31032");
-        sendCatalyst("gtpp.recipe.reactorprocessingunit", "gregtech:gt.blockmachines:31031");
-        sendCatalyst("gtpp.recipe.reactorprocessingunit", "gregtech:gt.blockmachines:31032");
-
-        sendHandler("gtpp.recipe.nuclearsaltprocessingplant", "gregtech:gt.blockmachines:749");
-        sendCatalyst("gtpp.recipe.nuclearsaltprocessingplant", "gregtech:gt.blockmachines:749");
-
-        sendHandler("gtpp.recipe.treefarm", "gregtech:gt.blockmachines:836");
-        sendCatalyst("gtpp.recipe.treefarm", "gregtech:gt.blockmachines:836");
-
-        sendHandler("gtpp.recipe.quantumforcesmelter", "gregtech:gt.blockmachines:31151");
-        sendCatalyst("gtpp.recipe.quantumforcesmelter", "gregtech:gt.blockmachines:31151");
-
-        if (AdvancedSolarPanel.isModLoaded()) {
-            sendHandler("gtpp.recipe.moleculartransformer", "AdvancedSolarPanel:BlockMolecularTransformer");
-            sendCatalyst("gtpp.recipe.moleculartransformer", "gregtech:gt.blockmachines:31072");
-        }
-
-        sendCatalyst("gt.recipe.replicator", "gregtech:gt.blockmachines:31050");
-        sendCatalyst("gt.recipe.gasturbinefuel", "gregtech:gt.blockmachines:31073", -20);
-        sendCatalyst("gt.recipe.plasmageneratorfuels", "gregtech:gt.blockmachines:31074", -20);
-        sendCatalyst("gt.recipe.hammer", "gregtech:gt.blockmachines:31075");
-        sendCatalyst("gt.recipe.fluidheater", "gregtech:gt.blockmachines:31077");
-        sendCatalyst("gt.recipe.compressor", "gregtech:gt.blockmachines:31078");
-
-        sendCatalyst("crafting", "gregtech:gt.blockmachines:31081", -10);
-        sendCatalyst("crafting", "gregtech:gt.blockmachines:31082", -10);
-        sendCatalyst("crafting", "gregtech:gt.blockmachines:31091", -10);
-        sendCatalyst("crafting", "gregtech:gt.blockmachines:31092", -10);
-        sendCatalyst("crafting", "gregtech:gt.blockmachines:31093", -10);
-        sendCatalyst("crafting", "gregtech:gt.blockmachines:31094", -10);
-        sendCatalyst("crafting", "gregtech:gt.blockmachines:31095", -10);
-        sendCatalyst("crafting", "gregtech:gt.blockmachines:31096", -10);
-        sendCatalyst("crafting", "gregtech:gt.blockmachines:31097", -10);
-        sendCatalyst("crafting", "gregtech:gt.blockmachines:31098", -10);
-
-        sendHandler("gtpp.recipe.multidehydrator", "gregtech:gt.blockmachines:995");
-        sendCatalyst("gtpp.recipe.multidehydrator", "gregtech:gt.blockmachines:995");
-        sendRemoveCatalyst("gtpp.recipe.chemicaldehydrator", "gregtech:gt.blockmachines:995");
-
-        sendCatalyst("gt.recipe.fusionreactor", "gregtech:gt.blockmachines:975");
-    }
-
-    private static void sendHandler(String aRecipeName, String aBlock) {
-        sendHandler(aRecipeName, aBlock, 2);
-    }
-
-    private static void sendHandler(String aRecipeName, String aBlock, int aRecipesPerPage) {
-        NBTTagCompound aNBT = new NBTTagCompound();
-        aNBT.setString("handler", aRecipeName);
-        aNBT.setString("modName", "GT++");
-        aNBT.setString("modId", GTPlusPlus.ID);
-        aNBT.setBoolean("modRequired", true);
-        aNBT.setString("itemName", aBlock);
-        aNBT.setInteger("yShift", 6);
-        aNBT.setInteger("handlerHeight", 135);
-        aNBT.setInteger("handlerWidth", 166);
-        aNBT.setInteger("maxRecipesPerPage", aRecipesPerPage);
-        FMLInterModComms.sendMessage(NotEnoughItems.ID, "registerHandlerInfo", aNBT);
-    }
-
-    private static void sendCatalyst(String aName, String aStack, int aPriority) {
-        NBTTagCompound aNBT = new NBTTagCompound();
-        aNBT.setString("handlerID", aName);
-        aNBT.setString("itemName", aStack);
-        aNBT.setInteger("priority", aPriority);
-        FMLInterModComms.sendMessage(NotEnoughItems.ID, "registerCatalystInfo", aNBT);
-    }
-
-    private static void sendCatalyst(String aName, String aStack) {
-        sendCatalyst(aName, aStack, 0);
-    }
-
-    private static void sendRemoveCatalyst(String aName, String aStack) {
-        NBTTagCompound aNBT = new NBTTagCompound();
-        aNBT.setString("handlerID", aName);
-        aNBT.setString("itemName", aStack);
-        FMLInterModComms.sendMessage(NotEnoughItems.ID, "removeCatalystInfo", aNBT);
-    }
-}