Remove duplicated chemplant recipemap (#702)

3 files changed, 2 insertions, 120 deletions

diff --git a/src/main/java/gregtech/api/util/GTPP_Recipe.java b/src/main/java/gregtech/api/util/GTPP_Recipe.java
index 9fd12eee05..07290aeb54 100644
--- a/src/main/java/gregtech/api/util/GTPP_Recipe.java
+++ b/src/main/java/gregtech/api/util/GTPP_Recipe.java
@@ -487,7 +487,7 @@ public class GTPP_Recipe extends GT_Recipe {
                 4,
                 4,
                 0,
-                2,
+                0,
                 1,
                 "Tier: ",
                 1,
@@ -675,23 +675,6 @@ public class GTPP_Recipe extends GT_Recipe {
                 true).setProgressBar(GT_UITextures.PROGRESSBAR_EXTRACT).setUsualFluidInputCount(6)
                         .setUsualFluidOutputCount(6);
 
-        // internal copy of sChemicalPlantRecipes
-        public static final GT_Recipe_Map sChemicalPlant_GT = new GT_Recipe_Map(
-                new HashSet<>(2000),
-                "gtpp.recipe.temp4",
-                "temp4",
-                null,
-                "",
-                1,
-                0,
-                0,
-                0,
-                1,
-                "",
-                0,
-                "",
-                false,
-                false);
         public static final GT_Recipe_Map sMultiblockMixerRecipes_GT = new GT_Recipe_Map_LargeNEI(
                 new HashSet<>(2000),
                 "gtpp.recipe.multimixer",
diff --git a/src/main/java/gtPlusPlus/GTplusplus.java b/src/main/java/gtPlusPlus/GTplusplus.java
index 4b48a97305..a326a3d050 100644
--- a/src/main/java/gtPlusPlus/GTplusplus.java
+++ b/src/main/java/gtPlusPlus/GTplusplus.java
@@ -61,7 +61,6 @@ import gtPlusPlus.plugin.manager.Core_Manager;
 import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtTools;
-import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.chemplant.GregtechMTE_ChemicalPlant;
 import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_BlastSmelterGT_GTNH;
 import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_MultisUsingFluidInsteadOfCells;
 import gtPlusPlus.xmod.thaumcraft.commands.CommandDumpAspects;
@@ -289,7 +288,6 @@ public class GTplusplus implements ActionListener {
         FishPondFakeRecipe.generateFishPondRecipes();
         // GregtechMiniRaFusion.generateSlowFusionrecipes();
         SemiFluidFuelHandler.generateFuels();
-        GregtechMTE_ChemicalPlant.generateRecipes();
 
         mInvalidCount[0] = RecipeGen_MultisUsingFluidInsteadOfCells.generateRecipesNotUsingCells(
                 GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes,
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java
index 42f17d8474..b6917f0bd3 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java
@@ -170,41 +170,6 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt
         return checkCoil;
     }
 
-    public int coilTier(int meta) {
-        switch (meta) {
-            case 0:
-                return 1;
-            case 1:
-                return 2;
-            case 2:
-                return 3;
-            case 3:
-                return 4;
-            case 4:
-                return 5;
-            case 5:
-                return 7;
-            case 6:
-                return 8;
-            case 7:
-                return 10;
-            case 8:
-                return 11;
-            case 9:
-                return 6;
-            case 10:
-                return 9;
-            case 11:
-                return 12;
-            case 12:
-                return 13;
-            case 13:
-                return 14;
-            default:
-                return 0;
-        }
-    }
-
     @Override
     public IStructureDefinition<GregtechMTE_ChemicalPlant> getStructureDefinition() {
         if (STRUCTURE_DEFINITION == null) {
@@ -453,16 +418,7 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt
 
     @Override
     public GT_Recipe.GT_Recipe_Map getRecipeMap() {
-        if (GTPP_Recipe.GTPP_Recipe_Map.sChemicalPlant_GT.mRecipeList.size() == 0) {
-            generateRecipes();
-        }
-        return GTPP_Recipe.GTPP_Recipe_Map.sChemicalPlant_GT;
-    }
-
-    public static void generateRecipes() {
-        for (GT_Recipe i : GTPP_Recipe.GTPP_Recipe_Map.sChemicalPlantRecipes.mRecipeList) {
-            GTPP_Recipe.GTPP_Recipe_Map.sChemicalPlant_GT.add(i);
-        }
+        return GTPP_Recipe.GTPP_Recipe_Map.sChemicalPlantRecipes;
     }
 
     @Override
@@ -683,61 +639,6 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt
         }
     }
 
-    private static final HashMap<Long, AutoMap<GT_Recipe>> mTieredRecipeMap = new HashMap<Long, AutoMap<GT_Recipe>>();
-    private static final AutoMap<GT_Recipe> aTier0Recipes = new AutoMap<GT_Recipe>();
-    private static final AutoMap<GT_Recipe> aTier1Recipes = new AutoMap<GT_Recipe>();
-    private static final AutoMap<GT_Recipe> aTier2Recipes = new AutoMap<GT_Recipe>();
-    private static final AutoMap<GT_Recipe> aTier3Recipes = new AutoMap<GT_Recipe>();
-    private static final AutoMap<GT_Recipe> aTier4Recipes = new AutoMap<GT_Recipe>();
-    private static final AutoMap<GT_Recipe> aTier5Recipes = new AutoMap<GT_Recipe>();
-    private static final AutoMap<GT_Recipe> aTier6Recipes = new AutoMap<GT_Recipe>();
-    private static final AutoMap<GT_Recipe> aTier7Recipes = new AutoMap<GT_Recipe>();
-    private static boolean mInitRecipeCache = false;
-
-    private static void initRecipeCaches() {
-        if (!mInitRecipeCache) {
-            mTieredRecipeMap.put((long) 0, aTier0Recipes);
-            mTieredRecipeMap.put((long) 1, aTier1Recipes);
-            mTieredRecipeMap.put((long) 2, aTier2Recipes);
-            mTieredRecipeMap.put((long) 3, aTier3Recipes);
-            mTieredRecipeMap.put((long) 4, aTier4Recipes);
-            mTieredRecipeMap.put((long) 5, aTier5Recipes);
-            mTieredRecipeMap.put((long) 6, aTier6Recipes);
-            mTieredRecipeMap.put((long) 7, aTier7Recipes);
-            for (GT_Recipe aRecipe : GTPP_Recipe.GTPP_Recipe_Map.sChemicalPlant_GT.mRecipeList) {
-                if (aRecipe != null) {
-                    switch (aRecipe.mSpecialValue) {
-                        case 0:
-                            aTier0Recipes.add(aRecipe);
-                            continue;
-                        case 1:
-                            aTier1Recipes.add(aRecipe);
-                            continue;
-                        case 2:
-                            aTier2Recipes.add(aRecipe);
-                            continue;
-                        case 3:
-                            aTier3Recipes.add(aRecipe);
-                            continue;
-                        case 4:
-                            aTier4Recipes.add(aRecipe);
-                            continue;
-                        case 5:
-                            aTier5Recipes.add(aRecipe);
-                            continue;
-                        case 6:
-                            aTier6Recipes.add(aRecipe);
-                            continue;
-                        case 7:
-                            aTier7Recipes.add(aRecipe);
-                            continue;
-                    }
-                }
-            }
-            mInitRecipeCache = true;
-        }
-    }
-
     private int getCatalysts(ItemStack[] aItemInputs, ItemStack aRecipeCatalyst, int aMaxParallel) {
         if (!isCatalystDamageable()) {
             return getMaxParallelRecipes();