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>

1 files changed, 16 insertions, 21 deletions

diff --git a/src/main/java/gtPlusPlus/GTplusplus.java b/src/main/java/gtPlusPlus/GTplusplus.java
index b9a1ce86b8..69078ee499 100644
--- a/src/main/java/gtPlusPlus/GTplusplus.java
+++ b/src/main/java/gtPlusPlus/GTplusplus.java
@@ -28,11 +28,11 @@ import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.Materials;
+import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.util.FishPondFakeRecipe;
-import gregtech.api.util.GTPP_Recipe;
-import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.SemiFluidFuelHandler;
 import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.recipe.GTPPRecipeMaps;
 import gtPlusPlus.core.commands.CommandEnableDebugWhileRunning;
 import gtPlusPlus.core.commands.CommandMath;
 import gtPlusPlus.core.common.CommonProxy;
@@ -44,7 +44,6 @@ import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.data.LocaleUtils;
-import gtPlusPlus.nei.NEI_IMC_Sender;
 import gtPlusPlus.plugin.manager.Core_Manager;
 import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
@@ -175,7 +174,6 @@ public class GTplusplus implements ActionListener {
         proxy.registerNetworkStuff();
         Meta_GT_Proxy.init();
         Core_Manager.init();
-        NEI_IMC_Sender.IMCSender();
         // Used by foreign players to generate .lang files for translation.
         if (CORE.ConfigSwitches.dumpItemAndBlockData) {
             LocaleUtils.generateFakeLocaleFile();
@@ -259,27 +257,24 @@ public class GTplusplus implements ActionListener {
         FishPondFakeRecipe.generateFishPondRecipes();
         SemiFluidFuelHandler.generateFuels();
 
-        mInvalidCount[0] = RecipeGen_MultisUsingFluidInsteadOfCells.generateRecipesNotUsingCells(
-                GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes,
-                GTPP_Recipe.GTPP_Recipe_Map.sMultiblockCentrifugeRecipes_GT);
+        mInvalidCount[0] = RecipeGen_MultisUsingFluidInsteadOfCells
+                .generateRecipesNotUsingCells(RecipeMaps.centrifugeRecipes, GTPPRecipeMaps.centrifugeNonCellRecipes);
         mInvalidCount[1] = RecipeGen_MultisUsingFluidInsteadOfCells.generateRecipesNotUsingCells(
-                GT_Recipe.GT_Recipe_Map.sElectrolyzerRecipes,
-                GTPP_Recipe.GTPP_Recipe_Map.sMultiblockElectrolyzerRecipes_GT);
-        mInvalidCount[2] = RecipeGen_MultisUsingFluidInsteadOfCells.generateRecipesNotUsingCells(
-                GT_Recipe.GT_Recipe_Map.sVacuumRecipes,
-                GTPP_Recipe.GTPP_Recipe_Map.sAdvFreezerRecipes_GT);
-        mInvalidCount[3] = RecipeGen_MultisUsingFluidInsteadOfCells.generateRecipesNotUsingCells(
-                GT_Recipe.GT_Recipe_Map.sMixerRecipes,
-                GTPP_Recipe.GTPP_Recipe_Map.sMultiblockMixerRecipes_GT);
+                RecipeMaps.electrolyzerRecipes,
+                GTPPRecipeMaps.electrolyzerNonCellRecipes);
+        mInvalidCount[2] = RecipeGen_MultisUsingFluidInsteadOfCells
+                .generateRecipesNotUsingCells(RecipeMaps.vacuumFreezerRecipes, GTPPRecipeMaps.advancedFreezerRecipes);
+        mInvalidCount[3] = RecipeGen_MultisUsingFluidInsteadOfCells
+                .generateRecipesNotUsingCells(RecipeMaps.mixerRecipes, GTPPRecipeMaps.mixerNonCellRecipes);
         mInvalidCount[4] = RecipeGen_MultisUsingFluidInsteadOfCells.generateRecipesNotUsingCells(
-                GTPP_Recipe.GTPP_Recipe_Map.sChemicalDehydratorRecipes,
-                GTPP_Recipe.GTPP_Recipe_Map.sMultiblockChemicalDehydratorRecipes);
+                GTPPRecipeMaps.chemicalDehydratorRecipes,
+                GTPPRecipeMaps.chemicalDehydratorNonCellRecipes);
         mInvalidCount[5] = RecipeGen_MultisUsingFluidInsteadOfCells.generateRecipesNotUsingCells(
-                GTPP_Recipe.GTPP_Recipe_Map.sColdTrapRecipes,
-                GTPP_Recipe.GTPP_Recipe_Map.sNuclearSaltProcessingPlantRecipes);
+                GTPPRecipeMaps.coldTrapRecipes,
+                GTPPRecipeMaps.nuclearSaltProcessingPlantRecipes);
         mInvalidCount[6] = RecipeGen_MultisUsingFluidInsteadOfCells.generateRecipesNotUsingCells(
-                GTPP_Recipe.GTPP_Recipe_Map.sReactorProcessingUnitRecipes,
-                GTPP_Recipe.GTPP_Recipe_Map.sNuclearSaltProcessingPlantRecipes);
+                GTPPRecipeMaps.reactorProcessingUnitRecipes,
+                GTPPRecipeMaps.nuclearSaltProcessingPlantRecipes);
     }
 
     private static void setupMaterialBlacklist() {