remove EnumHelper usage towards OrePrefixes (#561)

* remove EnumHelper usage towards OrePrefixes

* fix up dependency

* spotless

10 files changed, 5 insertions, 145 deletions

diff --git a/dependencies.gradle b/dependencies.gradle
index f0439b3bff..5fee32896d 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -1,5 +1,5 @@
 dependencies {
-    api('com.github.GTNewHorizons:GT5-Unofficial:5.09.41.297-pre:dev')
+    api('com.github.GTNewHorizons:GT5-Unofficial:5.09.41.314:dev')
     api("com.github.GTNewHorizons:bartworks:0.5.155:dev")
     api("com.github.GTNewHorizons:TecTech:5.0.88:dev")
 
diff --git a/src/main/java/gtPlusPlus/core/common/CommonProxy.java b/src/main/java/gtPlusPlus/core/common/CommonProxy.java
index 6d1d7bbf08..eae55eccec 100644
--- a/src/main/java/gtPlusPlus/core/common/CommonProxy.java
+++ b/src/main/java/gtPlusPlus/core/common/CommonProxy.java
@@ -66,7 +66,6 @@ public class CommonProxy {
         }
 
         AddToCreativeTab.initialiseTabs();
-        EnumHelperHandler.init();
 
         // Moved from Init after Debug Loading.
         // 29/01/18 - Alkalus
diff --git a/src/main/java/gtPlusPlus/core/handler/EnumHelperHandler.java b/src/main/java/gtPlusPlus/core/handler/EnumHelperHandler.java
deleted file mode 100644
index 746b2bb814..0000000000
--- a/src/main/java/gtPlusPlus/core/handler/EnumHelperHandler.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package gtPlusPlus.core.handler;
-
-import gtPlusPlus.xmod.gregtech.HANDLER_GT;
-import gtPlusPlus.xmod.ic2.CustomInternalName;
-
-public class EnumHelperHandler {
-
-    public static void init() {
-        CustomInternalName.init();
-        HANDLER_GT.addNewOrePrefixes();
-    }
-}
diff --git a/src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java b/src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java
index 18f277a1f4..48725e951c 100644
--- a/src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java
+++ b/src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java
@@ -25,7 +25,6 @@ import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.EntityUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.xmod.gregtech.api.enums.CustomOrePrefix;
 
 public class BaseOreComponent extends Item {
 
@@ -91,7 +90,7 @@ public class BaseOreComponent extends Item {
         } else if (componentType == ComponentTypes.DUSTPURE) {
             aKey = OrePrefixes.dustPure.name();
         } else if (componentType == ComponentTypes.MILLED) {
-            aKey = CustomOrePrefix.milled.get().name();
+            aKey = OrePrefixes.milled.name();
         }
 
         ItemStack x = aMap.get(aKey);
diff --git a/src/main/java/gtPlusPlus/core/material/Material.java b/src/main/java/gtPlusPlus/core/material/Material.java
index 00f5139b60..0dd0dc99cf 100644
--- a/src/main/java/gtPlusPlus/core/material/Material.java
+++ b/src/main/java/gtPlusPlus/core/material/Material.java
@@ -32,7 +32,6 @@ import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.MaterialUtils;
-import gtPlusPlus.xmod.gregtech.api.enums.CustomOrePrefix;
 import gtPlusPlus.xmod.thaumcraft.objects.wrapper.aspect.TC_Aspect_Wrapper;
 import gtPlusPlus.xmod.tinkers.material.BaseTinkersMaterial;
 
@@ -1197,7 +1196,7 @@ public class Material {
     }
 
     public final ItemStack getMilled(final int stacksize) {
-        return getComponentByPrefix(CustomOrePrefix.milled.get(), stacksize);
+        return getComponentByPrefix(OrePrefixes.milled, stacksize);
     }
 
     public final boolean hasSolidForm() {
diff --git a/src/main/java/gtPlusPlus/core/util/Utils.java b/src/main/java/gtPlusPlus/core/util/Utils.java
index 2155535acc..d157fac536 100644
--- a/src/main/java/gtPlusPlus/core/util/Utils.java
+++ b/src/main/java/gtPlusPlus/core/util/Utils.java
@@ -518,34 +518,6 @@ public class Utils {
         return null;
     }
 
-    public static ItemStack createInternalNameAndFluidCellNoOreDict(final String s) {
-        Logger.WARNING("1");
-        final InternalName yourName = EnumHelper.addEnum(InternalName.class, s, new Class[0], new Object[0]);
-        Logger.WARNING("2 " + yourName.name());
-        final ItemCell item = (ItemCell) Ic2Items.cell.getItem();
-        Logger.WARNING("3 " + item.getUnlocalizedName());
-        try {
-            Logger.WARNING("4");
-            final Class<? extends ItemCell> clz = item.getClass();
-            Logger.WARNING("5 " + clz.getSimpleName());
-            final Method methode = clz.getDeclaredMethod("addCell", int.class, InternalName.class, Block[].class);
-            Logger.WARNING("6 " + methode.getName());
-            methode.setAccessible(true);
-            Logger.WARNING("7 " + methode.isAccessible());
-            final ItemStack temp = (ItemStack) methode.invoke(item, cellID++, yourName, new Block[0]);
-            Logger.WARNING("Successfully created " + temp.getDisplayName() + "s.");
-            FluidContainerRegistry.registerFluidContainer(
-                    FluidUtils.getFluidStack(s.toLowerCase(), 1000),
-                    temp.copy(),
-                    Ic2Items.cell.copy());
-            // ItemUtils.addItemToOreDictionary(temp.copy(), "cell"+s);
-            return temp;
-        } catch (final Exception e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
     public static String sanitizeString(final String input, final char[] aDontRemove) {
 
         String output;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java b/src/main/java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java
index 5eb536fa85..0d83b88b8c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java
@@ -48,7 +48,6 @@ import gtPlusPlus.core.util.minecraft.MaterialUtils;
 import gtPlusPlus.core.util.minecraft.RecipeUtils;
 import gtPlusPlus.core.util.reflect.AddGregtechRecipe;
 import gtPlusPlus.everglades.gen.gt.WorldGen_GT;
-import gtPlusPlus.xmod.gregtech.api.enums.CustomOrePrefix;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
 import gtPlusPlus.xmod.gregtech.api.util.GTPP_Config;
@@ -162,13 +161,6 @@ public class HANDLER_GT {
         }
     }
 
-    public static void addNewOrePrefixes() {
-        for (CustomOrePrefix aPrefixTest : CustomOrePrefix.values()) {
-            Logger.INFO("Adding " + aPrefixTest.name() + " to OrePrefixes Enum.");
-            Logger.INFO("Injecting: " + aPrefixTest.addToEnum());
-        }
-    }
-
     private static void generateElementalDuplicatorRecipes() {
         for (GT_Recipe aRecipe : GT_Recipe_Map.sReplicatorFakeRecipes.mRecipeList) {
             Object aDataOrb = aRecipe.mSpecialItems;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/CustomOrePrefix.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/CustomOrePrefix.java
deleted file mode 100644
index fcbbd019a9..0000000000
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/CustomOrePrefix.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package gtPlusPlus.xmod.gregtech.api.enums;
-
-import static gregtech.api.enums.GT_Values.B;
-
-import net.minecraftforge.common.util.EnumHelper;
-
-import gregtech.api.enums.OrePrefixes;
-
-public enum CustomOrePrefix {
-
-    milled("Milled Ores", "Milled ", " Ore", true, true, false, false, false, false, false, false, false, true, B[3],
-            -1, 64, -1);
-
-    private final String mRegularLocalName;
-    private final String mLocalizedMaterialPre;
-    private final String mLocalizedMaterialPost;
-    private final boolean mIsUnificatable;
-    private final boolean mIsMaterialBased;
-    private final boolean mIsSelfReferencing;
-    private final boolean mIsContainer;
-    private final boolean mDontUnificateActively;
-    private final boolean mIsUsedForBlocks;
-    private final boolean mAllowNormalRecycling;
-    private final boolean mGenerateDefaultItem;
-    private final boolean mIsEnchantable;
-    private final boolean mIsUsedForOreProcessing;
-    private final int mMaterialGenerationBits;
-    private final long mMaterialAmount;
-    private final int mDefaultStackSize;
-    private final int mTextureindex;
-
-    private OrePrefixes mSelfReference;
-
-    private CustomOrePrefix(String aRegularLocalName, String aLocalizedMaterialPre, String aLocalizedMaterialPost,
-            boolean aIsUnificatable, boolean aIsMaterialBased, boolean aIsSelfReferencing, boolean aIsContainer,
-            boolean aDontUnificateActively, boolean aIsUsedForBlocks, boolean aAllowNormalRecycling,
-            boolean aGenerateDefaultItem, boolean aIsEnchantable, boolean aIsUsedForOreProcessing,
-            int aMaterialGenerationBits, long aMaterialAmount, int aDefaultStackSize, int aTextureindex) {
-
-        mRegularLocalName = aRegularLocalName;
-        mLocalizedMaterialPre = aLocalizedMaterialPre;
-        mLocalizedMaterialPost = aLocalizedMaterialPost;
-        mIsUnificatable = aIsUnificatable;
-        mIsMaterialBased = aIsMaterialBased;
-        mIsSelfReferencing = aIsSelfReferencing;
-        mIsContainer = aIsContainer;
-        mDontUnificateActively = aDontUnificateActively;
-        mIsUsedForBlocks = aIsUsedForBlocks;
-        mAllowNormalRecycling = aAllowNormalRecycling;
-        mGenerateDefaultItem = aGenerateDefaultItem;
-        mIsEnchantable = aIsEnchantable;
-        mIsUsedForOreProcessing = aIsUsedForOreProcessing;
-        mMaterialGenerationBits = aMaterialGenerationBits;
-        mMaterialAmount = aMaterialAmount;
-        mDefaultStackSize = aDefaultStackSize;
-        mTextureindex = aTextureindex;
-    }
-
-    public final boolean addToEnum() {
-
-        mSelfReference = EnumHelper.addEnum(
-                OrePrefixes.class,
-                this.name(),
-                new Class[] { String.class, String.class, String.class, boolean.class, boolean.class, boolean.class,
-                        boolean.class, boolean.class, boolean.class, boolean.class, boolean.class, boolean.class,
-                        boolean.class, int.class, long.class, int.class, int.class },
-                new Object[] { mRegularLocalName, mLocalizedMaterialPre, mLocalizedMaterialPost, mIsUnificatable,
-                        mIsMaterialBased, mIsSelfReferencing, mIsContainer, mDontUnificateActively, mIsUsedForBlocks,
-                        mAllowNormalRecycling, mGenerateDefaultItem, mIsEnchantable, mIsUsedForOreProcessing,
-                        mMaterialGenerationBits, mMaterialAmount, mDefaultStackSize, mTextureindex });
-
-        return mSelfReference != null;
-    }
-
-    public static final boolean checkEntryWasAdded(CustomOrePrefix aCustomPrefixObject) {
-        return aCustomPrefixObject.mSelfReference != null;
-    }
-
-    public OrePrefixes get() {
-        return mSelfReference;
-    }
-}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java
index ed3254921c..be77280550 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/fluid/GregtechFluidHandler.java
@@ -187,11 +187,4 @@ public class GregtechFluidHandler {
         return null;
     }
 
-    private static ItemStack generateIC2FluidCellNoOreDict(final String fluidNameWithCaps) {
-        Logger.INFO("Adding a Cell for " + fluidNameWithCaps);
-        if (!LoadedMods.IndustrialCraft2Classic) {
-            return Utils.createInternalNameAndFluidCellNoOreDict(fluidNameWithCaps);
-        }
-        return null;
-    }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/FlotationRecipeHandler.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/FlotationRecipeHandler.java
index 58a4aba71c..616475b66b 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/FlotationRecipeHandler.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/FlotationRecipeHandler.java
@@ -5,11 +5,11 @@ import java.util.HashMap;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;
 
+import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.util.sys.Log;
-import gtPlusPlus.xmod.gregtech.api.enums.CustomOrePrefix;
 
 public class FlotationRecipeHandler {
 
@@ -52,7 +52,7 @@ public class FlotationRecipeHandler {
         for (ItemStack aStack : aInputs) {
             for (int oredictID : OreDictionary.getOreIDs(aStack)) {
                 String oredict = OreDictionary.getOreName(oredictID);
-                if (oredict.startsWith(CustomOrePrefix.milled.toString())) {
+                if (oredict.startsWith(OrePrefixes.milled.toString())) {
                     return aStack;
                 }
             }