Remove a bunch of reflections against GT (#531)

* Remove a bunch of reflections against GT

* missed this one

13 files changed, 46 insertions, 543 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/BaseCustomTileEntity.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/BaseCustomTileEntity.java
index aae4494f88..60ccb1ae37 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/BaseCustomTileEntity.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/BaseCustomTileEntity.java
@@ -18,7 +18,6 @@ import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils;
 import gtPlusPlus.xmod.gregtech.api.interfaces.IBaseCustomMetaTileEntity;
-import gtPlusPlus.xmod.gregtech.common.StaticFields59;
 import ic2.api.Direction;
 
 public class BaseCustomTileEntity extends BaseMetaTileEntity implements IBaseCustomMetaTileEntity {
@@ -109,13 +108,7 @@ public class BaseCustomTileEntity extends BaseMetaTileEntity implements IBaseCus
             this.mMetaTileEntity.onExplosion();
             int i;
 
-            boolean aExplosionDropItem = false;
-            Object aProxyField = StaticFields59.getFieldFromGregtechProxy(false, "mExplosionItemDrop");
-            if (boolean.class.isInstance(aProxyField) || Boolean.class.isInstance(aProxyField)) {
-                aExplosionDropItem = (boolean) aProxyField;
-            }
-
-            if (aExplosionDropItem) {
+            if (GT_Mod.gregtechproxy.mExplosionItemDrop) {
                 for (i = 0; i < this.getSizeInventory(); ++i) {
                     ItemStack tItem = this.getStackInSlot(i);
                     if (tItem != null && tItem.stackSize > 0 && this.isValidSlot(i)) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ControlCore.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ControlCore.java
index 5e1f0ab055..b1d0731521 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ControlCore.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ControlCore.java
@@ -19,7 +19,6 @@ import gregtech.api.util.GT_Utility;
 import gtPlusPlus.api.objects.minecraft.BlockPos;
 import gtPlusPlus.core.item.general.ItemControlCore;
 import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.xmod.gregtech.common.StaticFields59;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
 public class GT_MetaTileEntity_Hatch_ControlCore extends GT_MetaTileEntity_Hatch {
@@ -84,11 +83,7 @@ public class GT_MetaTileEntity_Hatch_ControlCore extends GT_MetaTileEntity_Hatch
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Hatch_ControlCore(
-                mName,
-                mTier,
-                StaticFields59.getDescriptionArray(this),
-                mTextures);
+        return new GT_MetaTileEntity_Hatch_ControlCore(mName, mTier, mDescriptionArray, mTextures);
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Energy_RTG.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Energy_RTG.java
index ef5711769d..d5f10a01fa 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Energy_RTG.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Energy_RTG.java
@@ -17,6 +17,7 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy;
+import gregtech.api.util.GT_Utility;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.minecraft.InventoryUtils;
@@ -235,7 +236,7 @@ public class GT_MetaTileEntity_Hatch_Energy_RTG extends GT_MetaTileEntity_Hatch_
         for (ItemStack o : aTile.mInventory) {
             if (o != null) {
                 for (ItemStack i : mFuelInstanceMap.values()) {
-                    if (ItemUtils.areItemsEqual(o, i)) {
+                    if (GT_Utility.areStacksEqual(o, i)) {
                         return true;
                     }
                 }
@@ -264,7 +265,7 @@ public class GT_MetaTileEntity_Hatch_Energy_RTG extends GT_MetaTileEntity_Hatch_
         for (ItemStack o : aTile.mInventory) {
             if (o != null) {
                 for (ItemStack i : mFuelInstanceMap.values()) {
-                    if (ItemUtils.areItemsEqual(o, i)) {
+                    if (GT_Utility.areStacksEqual(o, i)) {
                         return o;
                     }
                 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler_Adv.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler_Adv.java
index 7897dda8bc..a78892a692 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler_Adv.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler_Adv.java
@@ -9,6 +9,7 @@ import com.gtnewhorizons.modularui.api.screen.ModularWindow;
 import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
 import com.gtnewhorizons.modularui.common.widget.SlotWidget;
 
+import gregtech.GT_Mod;
 import gregtech.api.enums.GT_Values;
 import gregtech.api.gui.modularui.GT_UIInfos;
 import gregtech.api.gui.modularui.GUITextureSet;
@@ -24,7 +25,6 @@ import gtPlusPlus.core.item.general.ItemAirFilter;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils;
 import gtPlusPlus.xmod.gregtech.api.gui.GTPP_UITextures;
-import gtPlusPlus.xmod.gregtech.common.StaticFields59;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
 public class GT_MetaTileEntity_Hatch_Muffler_Adv extends GT_MetaTileEntity_Hatch_Muffler implements IAddGregtechLogo {
@@ -35,8 +35,8 @@ public class GT_MetaTileEntity_Hatch_Muffler_Adv extends GT_MetaTileEntity_Hatch
     public void onConfigLoad(GT_Config aConfig) {
         super.onConfigLoad(aConfig);
         try {
-            Integer a1 = (int) StaticFields59.getFieldFromGregtechProxy("mPollutionSmogLimit");
-            if (a1 != null && a1 > 0) {
+            int a1 = GT_Mod.gregtechproxy.mPollutionSmogLimit;
+            if (a1 > 0) {
                 mPollutionSmogLimit = a1;
             }
         } catch (Throwable t) {
@@ -56,17 +56,17 @@ public class GT_MetaTileEntity_Hatch_Muffler_Adv extends GT_MetaTileEntity_Hatch
     }
 
     public String[] getDescription() {
-        String[] mDescArray = StaticFields59.getDescriptionArray(this);
-        String[] desc = new String[mDescArray.length + 7];
-        System.arraycopy(mDescArray, 0, desc, 0, mDescArray.length);
-        desc[mDescArray.length] = "DO NOT OBSTRUCT THE OUTPUT!";
-        desc[mDescArray.length + 1] = "Requires 3 Air on the exhaust face";
-        desc[mDescArray.length + 2] = "Requires Air Filters";
-        desc[mDescArray.length + 3] = "Mufflers require T2 Filters from IV-" + GT_Values.VN[9];
-        desc[mDescArray.length + 4] = "Reduces Pollution to " + this.calculatePollutionReductionForTooltip(100) + "%";
-        desc[mDescArray.length + 5] = "Recovers " + (105 - this.calculatePollutionReductionForTooltip(100))
+        String[] desc = new String[mDescriptionArray.length + 7];
+        System.arraycopy(mDescriptionArray, 0, desc, 0, mDescriptionArray.length);
+        desc[mDescriptionArray.length] = "DO NOT OBSTRUCT THE OUTPUT!";
+        desc[mDescriptionArray.length + 1] = "Requires 3 Air on the exhaust face";
+        desc[mDescriptionArray.length + 2] = "Requires Air Filters";
+        desc[mDescriptionArray.length + 3] = "Mufflers require T2 Filters from IV-" + GT_Values.VN[9];
+        desc[mDescriptionArray.length + 4] = "Reduces Pollution to " + this.calculatePollutionReductionForTooltip(100)
+                + "%";
+        desc[mDescriptionArray.length + 5] = "Recovers " + (105 - this.calculatePollutionReductionForTooltip(100))
                 + "% of CO2/CO/SO2";
-        desc[mDescArray.length + 6] = CORE.GT_Tooltip.get();
+        desc[mDescriptionArray.length + 6] = CORE.GT_Tooltip.get();
         return desc;
     }
 
@@ -83,11 +83,7 @@ public class GT_MetaTileEntity_Hatch_Muffler_Adv extends GT_MetaTileEntity_Hatch
     }
 
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Hatch_Muffler_Adv(
-                this.mName,
-                this.mTier,
-                StaticFields59.getDescriptionArray(this),
-                this.mTextures);
+        return new GT_MetaTileEntity_Hatch_Muffler_Adv(this.mName, this.mTier, mDescriptionArray, this.mTextures);
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Naquadah.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Naquadah.java
index 041c5635c5..0317518c5d 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Naquadah.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Naquadah.java
@@ -18,7 +18,6 @@ import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Utility;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.xmod.gregtech.common.StaticFields59;
 
 public class GT_MetaTileEntity_Hatch_Naquadah extends GT_MetaTileEntity_Hatch_Input {
 
@@ -184,7 +183,7 @@ public class GT_MetaTileEntity_Hatch_Naquadah extends GT_MetaTileEntity_Hatch_In
         byte texturePointer = (byte) (a1 & 127);
 
         if (aSide == 1 || aSide == 0) {
-            ITexture g = textureIndex > 0 ? StaticFields59.getCasingTexturePages(a2, texturePointer)
+            ITexture g = textureIndex > 0 ? BlockIcons.casingTexturePages[a2][texturePointer]
                     : BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1];
 
             return new ITexture[] { g,
@@ -192,11 +191,11 @@ public class GT_MetaTileEntity_Hatch_Naquadah extends GT_MetaTileEntity_Hatch_In
         }
 
         return aSide != aFacing
-                ? (textureIndex > 0 ? new ITexture[] { StaticFields59.getCasingTexturePages(a2, texturePointer) }
+                ? (textureIndex > 0 ? new ITexture[] { BlockIcons.casingTexturePages[a2][texturePointer] }
                         : new ITexture[] { BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1] })
                 : (textureIndex > 0
-                        ? (aActive ? this.getTexturesActive(StaticFields59.getCasingTexturePages(a2, texturePointer))
-                                : this.getTexturesInactive(StaticFields59.getCasingTexturePages(a2, texturePointer)))
+                        ? (aActive ? this.getTexturesActive(BlockIcons.casingTexturePages[a2][texturePointer])
+                                : this.getTexturesInactive(BlockIcons.casingTexturePages[a2][texturePointer]))
                         : (aActive ? this.getTexturesActive(BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1])
                                 : this.getTexturesInactive(BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1])));
     }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Plasma.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Plasma.java
index 969694aad9..1c9f092fc8 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Plasma.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Plasma.java
@@ -19,7 +19,6 @@ import gregtech.api.util.GT_Utility;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.xmod.gregtech.common.StaticFields59;
 
 public class GT_MetaTileEntity_Hatch_Plasma extends GT_MetaTileEntity_Hatch_Output {
 
@@ -197,18 +196,18 @@ public class GT_MetaTileEntity_Hatch_Plasma extends GT_MetaTileEntity_Hatch_Outp
         byte texturePointer = (byte) (a1 & 127);
 
         if (aSide == 1 || aSide == 0) {
-            ITexture g = textureIndex > 0 ? StaticFields59.getCasingTexturePages(a2, texturePointer)
+            ITexture g = textureIndex > 0 ? BlockIcons.casingTexturePages[a2][texturePointer]
                     : BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1];
 
             return new ITexture[] { g };
         }
 
         return aSide != aFacing
-                ? (textureIndex > 0 ? new ITexture[] { StaticFields59.getCasingTexturePages(a2, texturePointer) }
+                ? (textureIndex > 0 ? new ITexture[] { BlockIcons.casingTexturePages[a2][texturePointer] }
                         : new ITexture[] { BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1] })
                 : (textureIndex > 0
-                        ? (aActive ? this.getTexturesActive(StaticFields59.getCasingTexturePages(a2, texturePointer))
-                                : this.getTexturesInactive(StaticFields59.getCasingTexturePages(a2, texturePointer)))
+                        ? (aActive ? this.getTexturesActive(BlockIcons.casingTexturePages[a2][texturePointer])
+                                : this.getTexturesInactive(BlockIcons.casingTexturePages[a2][texturePointer]))
                         : (aActive ? this.getTexturesActive(BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1])
                                 : this.getTexturesInactive(BlockIcons.MACHINE_CASINGS[this.mTier][aColorIndex + 1])));
     }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Turbine.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Turbine.java
index ae8dc12077..4323cfb5e2 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Turbine.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Turbine.java
@@ -29,7 +29,6 @@ import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
-import gtPlusPlus.xmod.gregtech.common.StaticFields59;
 import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.turbines.GregtechMetaTileEntity_LargerTurbineBase;
 
 @SuppressWarnings("deprecation")
@@ -126,7 +125,7 @@ public class GT_MetaTileEntity_Hatch_Turbine extends GT_MetaTileEntity_Hatch {
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Hatch_Turbine(mName, mTier, StaticFields59.getDescriptionArray(this), mTextures);
+        return new GT_MetaTileEntity_Hatch_Turbine(mName, mTier, mDescriptionArray, mTextures);
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntityFluid.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntityFluid.java
index 26ed6b2bcd..d49d06c1e6 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntityFluid.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntityFluid.java
@@ -11,18 +11,10 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Fluid;
 import gregtech.api.render.TextureFactory;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
-import gtPlusPlus.xmod.gregtech.common.StaticFields59;
 
 public class GregtechMetaPipeEntityFluid extends GT_MetaPipeEntity_Fluid {
 
-    public static final boolean mGt6Pipe;
-
-    static {
-        mGt6Pipe = StaticFields59.mGT6StylePipes;
-    }
-
     public final GT_Materials mMaterial;
-    private boolean mCheckConnections;
 
     public GregtechMetaPipeEntityFluid(int aID, String aName, String aNameRegional, float aThickNess,
             GT_Materials aMaterial, int aCapacity, int aHeatResistance, boolean aGasProof) {
@@ -39,7 +31,6 @@ public class GregtechMetaPipeEntityFluid extends GT_MetaPipeEntity_Fluid {
         super(aID, aName, aNameRegional, aThickNess, null, aCapacity, aHeatResistance, aGasProof);
         this.mLastReceivedFrom = 0;
         this.oLastReceivedFrom = 0;
-        this.mCheckConnections = !mGt6Pipe;
         this.mMaterial = aMaterial;
     }
 
@@ -48,7 +39,6 @@ public class GregtechMetaPipeEntityFluid extends GT_MetaPipeEntity_Fluid {
         super(aName, aThickNess, null, aCapacity, aHeatResistance, aGasProof);
         this.mLastReceivedFrom = 0;
         this.oLastReceivedFrom = 0;
-        this.mCheckConnections = !mGt6Pipe;
         this.mMaterial = aMaterial;
     }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
index 88215b7f44..775a2a50a7 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
@@ -89,41 +89,6 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
 
     public static final boolean DEBUG_DISABLE_CORES_TEMPORARILY = true;
 
-    static {
-        Method a08 = findRecipe08 = ReflectionUtils.getMethod(
-                GT_Recipe_Map.class,
-                "findRecipe",
-                IHasWorldObjectAndCoords.class,
-                GT_Recipe.class,
-                boolean.class,
-                long.class,
-                FluidStack[].class,
-                ItemStack.class,
-                ItemStack[].class);
-        Method a09 = findRecipe09 = ReflectionUtils.getMethod(
-                GT_Recipe_Map.class,
-                "findRecipe",
-                IHasWorldObjectAndCoords.class,
-                GT_Recipe.class,
-                boolean.class,
-                boolean.class,
-                long.class,
-                FluidStack[].class,
-                ItemStack.class,
-                ItemStack[].class);
-        Logger.MACHINE_INFO("Found .08 findRecipe method? " + (a08 != null));
-        Logger.MACHINE_INFO("Found .09 findRecipe method? " + (a09 != null));
-
-        try {
-            calculatePollutionReduction = GT_MetaTileEntity_Hatch_Muffler.class
-                    .getDeclaredMethod("calculatePollutionReduction", int.class);
-        } catch (NoSuchMethodException | SecurityException e) {}
-    }
-
-    // Find Recipe Methods
-    private static final Method findRecipe08;
-    private static final Method findRecipe09;
-
     public GT_Recipe mLastRecipe;
     private boolean mInternalCircuit = false;
     protected long mTotalRunTime = 0;
@@ -1885,21 +1850,15 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
                     "Invalid recipe, Fallback lookup. " + this.getRecipeMap().mRecipeList.size()
                             + " | "
                             + this.getRecipeMap().mNEIName);
-            try {
-                return (GT_Recipe) findRecipe09.invoke(
-                        getRecipeMap(),
-                        aTileEntity,
-                        aRecipe,
-                        aNotUnificated,
-                        aDontCheckStackSizes,
-                        aVoltage,
-                        aFluids,
-                        aSpecialSlot,
-                        aInputs);
-            } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
-                e.printStackTrace();
-                return null;
-            }
+            return getRecipeMap().findRecipe(
+                    aTileEntity,
+                    aRecipe,
+                    aNotUnificated,
+                    aDontCheckStackSizes,
+                    aVoltage,
+                    aFluids,
+                    aSpecialSlot,
+                    aInputs);
         } else {
             return mRecipeResult;
         }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_Catalysts.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_Catalysts.java
index 16d65ca889..a2cfdd4e86 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_Catalysts.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_Catalysts.java
@@ -3,6 +3,8 @@ package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.nbthandlers;
 import net.minecraft.item.ItemStack;
 
 import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.objects.GT_RenderedTexture;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.lib.CORE;
@@ -44,8 +46,8 @@ public class GT_MetaTileEntity_Hatch_Catalysts extends GT_MetaTileEntity_Hatch_N
     }
 
     @Override
-    public Class<? extends GT_MetaTileEntity_Hatch_NbtConsumable> getHatchEntityClass() {
-        return GT_MetaTileEntity_Hatch_Catalysts.class;
+    public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
+        return new GT_MetaTileEntity_Hatch_Catalysts(mName, mDescriptionArray, mTextures);
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_MillingBalls.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_MillingBalls.java
index 300e631cd0..c4550f3f42 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_MillingBalls.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_MillingBalls.java
@@ -3,6 +3,8 @@ package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.nbthandlers;
 import net.minecraft.item.ItemStack;
 
 import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.objects.GT_RenderedTexture;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.lib.CORE;
@@ -44,8 +46,8 @@ public class GT_MetaTileEntity_Hatch_MillingBalls extends GT_MetaTileEntity_Hatc
     }
 
     @Override
-    public Class<? extends GT_MetaTileEntity_Hatch_NbtConsumable> getHatchEntityClass() {
-        return GT_MetaTileEntity_Hatch_MillingBalls.class;
+    public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
+        return new GT_MetaTileEntity_Hatch_MillingBalls(mName, mDescriptionArray, mTextures);
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java
index 5bfe3f21f6..a39d3ede8a 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java
@@ -1,7 +1,5 @@
 package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.nbthandlers;
 
-import java.lang.reflect.Constructor;
-
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 
@@ -22,8 +20,6 @@ import gregtech.api.util.GT_Utility;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.xmod.gregtech.common.StaticFields59;
 
 public abstract class GT_MetaTileEntity_Hatch_NbtConsumable extends GT_MetaTileEntity_Hatch
         implements IAddGregtechLogo {
@@ -86,21 +82,7 @@ public abstract class GT_MetaTileEntity_Hatch_NbtConsumable extends GT_MetaTileE
     }
 
     @Override
-    public final MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        Constructor<?> aConstructor = ReflectionUtils.getConstructor(
-                getHatchEntityClass(),
-                new Class[] { String.class, String[].class, ITexture[][][].class });
-        GT_MetaTileEntity_Hatch_NbtConsumable aInstance = ReflectionUtils.createNewInstanceFromConstructor(
-                aConstructor,
-                new Object[] { mName, StaticFields59.getDescriptionArray(this), mTextures });
-        if (aInstance instanceof GT_MetaTileEntity_Hatch_NbtConsumable) {
-            GT_MetaTileEntity_Hatch_NbtConsumable aMetaTile = (GT_MetaTileEntity_Hatch_NbtConsumable) aInstance;
-            return aMetaTile;
-        }
-        return null;
-    }
-
-    public abstract Class<? extends GT_MetaTileEntity_Hatch_NbtConsumable> getHatchEntityClass();
+    public abstract MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity);
 
     @Override
     public final boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/util/GregtechOreDictUnificator.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/util/GregtechOreDictUnificator.java
deleted file mode 100644
index 52950e1ae0..0000000000
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/util/GregtechOreDictUnificator.java
+++ /dev/null
@@ -1,414 +0,0 @@
-package gtPlusPlus.xmod.gregtech.api.util;
-
-import static gregtech.api.enums.GT_Values.*;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.oredict.OreDictionary;
-
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.Dyes;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.enums.SubTag;
-import gregtech.api.objects.GT_HashSet;
-import gregtech.api.objects.GT_ItemStack;
-import gregtech.api.objects.ItemData;
-import gregtech.api.objects.MaterialStack;
-import gregtech.api.util.*;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.xmod.gregtech.common.StaticFields59;
-
-public class GregtechOreDictUnificator {
-
-    private static final Map<String, ItemStack> sName2StackMap = new HashMap<String, ItemStack>();
-    private static final Map<GT_ItemStack, ItemData> sItemStack2DataMap = new HashMap<GT_ItemStack, ItemData>();
-    private static final Map<GT_ItemStack, List<ItemStack>> sUnificationTable = new HashMap<GT_ItemStack, List<ItemStack>>();
-    private static final GT_HashSet<GT_ItemStack> sNoUnificationList = new GT_HashSet<GT_ItemStack>();
-
-    private static int isRegisteringOre = 0, isAddingOre = 0;
-    private static boolean mRunThroughTheList = true;
-
-    static {
-        if (ReflectionUtils.getField(GT_OreDictUnificator.class, "sUnificationTable") == null) {
-            GregTech_API.sItemStackMappings.add(sUnificationTable);
-        }
-    }
-
-    /**
-     * The Blacklist just prevents the Item from being unificated into something else. Useful if you have things like
-     * the Industrial Diamond, which is better than regular Diamond, but also usable in absolutely all Diamond Recipes.
-     */
-    public static void addToBlacklist(ItemStack aStack) {
-        if (GT_Utility.isStackValid(aStack) && !GT_Utility.isStackInList(aStack, sNoUnificationList))
-            sNoUnificationList.add(aStack);
-    }
-
-    public static boolean isBlacklisted(ItemStack aStack) {
-        return GT_Utility.isStackInList(aStack, sNoUnificationList);
-    }
-
-    public static void add(OrePrefixes aPrefix, Materials aMaterial, ItemStack aStack) {
-        set(aPrefix, aMaterial, aStack, false, false);
-    }
-
-    public static void set(OrePrefixes aPrefix, Materials aMaterial, ItemStack aStack) {
-        set(aPrefix, aMaterial, aStack, true, false);
-    }
-
-    public static void set(OrePrefixes aPrefix, Materials aMaterial, ItemStack aStack, boolean aOverwrite,
-            boolean aAlreadyRegistered) {
-        if (aMaterial == null || aPrefix == null
-                || GT_Utility.isStackInvalid(aStack)
-                || Items.feather.getDamage(aStack) == W)
-            return;
-        isAddingOre++;
-        aStack = GT_Utility.copyAmount(1, aStack);
-        if (!aAlreadyRegistered) registerOre(aPrefix.get(aMaterial), aStack);
-        addAssociation(aPrefix, aMaterial, aStack, isBlacklisted(aStack));
-        if (aOverwrite || GT_Utility.isStackInvalid(sName2StackMap.get(aPrefix.get(aMaterial).toString())))
-            sName2StackMap.put(aPrefix.get(aMaterial).toString(), aStack);
-        isAddingOre--;
-    }
-
-    public static ItemStack getFirstOre(Object aName, long aAmount) {
-        if (GT_Utility.isStringInvalid(aName)) return null;
-        ItemStack tStack = sName2StackMap.get(aName.toString());
-        if (GT_Utility.isStackValid(tStack)) return GT_Utility.copyAmount(aAmount, tStack);
-        return GT_Utility.copyAmount(aAmount, getOres(aName).toArray());
-    }
-
-    public static ItemStack get(Object aName, long aAmount) {
-        return get(aName, null, aAmount, true, true);
-    }
-
-    public static ItemStack get(Object aName, ItemStack aReplacement, long aAmount) {
-        return get(aName, aReplacement, aAmount, true, true);
-    }
-
-    public static ItemStack get(OrePrefixes aPrefix, Object aMaterial, long aAmount) {
-        return get(aPrefix, aMaterial, null, aAmount);
-    }
-
-    public static ItemStack get(OrePrefixes aPrefix, Object aMaterial, ItemStack aReplacement, long aAmount) {
-        // if (Materials.mDefaultComponents.contains(aPrefix) && !aPrefix.mDynamicItems.contains((Materials)aMaterial))
-        // aPrefix.mDynamicItems.add((Materials) aMaterial);
-        if (StaticFields59.geOrePrefixesBooleanPreventableComponents().contains(aPrefix)
-                && StaticFields59.getOrePrefixesBooleanDisabledItems().contains(aMaterial))
-            return aReplacement;
-        return get(aPrefix.get(aMaterial), aReplacement, aAmount, false, true);
-    }
-
-    public static ItemStack get(Object aName, ItemStack aReplacement, long aAmount, boolean aMentionPossibleTypos,
-            boolean aNoInvalidAmounts) {
-        if (aNoInvalidAmounts && aAmount < 1) return null;
-        if (!sName2StackMap.containsKey(aName.toString()) && aMentionPossibleTypos)
-            GT_Log.err.println("Unknown Key for Unification, Typo? " + aName);
-        return GT_Utility
-                .copyAmount(aAmount, sName2StackMap.get(aName.toString()), getFirstOre(aName, aAmount), aReplacement);
-    }
-
-    public static ItemStack[] setStackArray(boolean aUseBlackList, ItemStack... aStacks) {
-        for (int i = 0; i < aStacks.length; i++) aStacks[i] = get(aUseBlackList, GT_Utility.copy(aStacks[i]));
-        return aStacks;
-    }
-
-    public static ItemStack[] getStackArray(boolean aUseBlackList, Object... aStacks) {
-        ItemStack[] rStacks = new ItemStack[aStacks.length];
-        for (int i = 0; i < aStacks.length; i++) rStacks[i] = get(aUseBlackList, GT_Utility.copy(aStacks[i]));
-        return rStacks;
-    }
-
-    public static ItemStack setStack(ItemStack aStack) {
-        return setStack(true, aStack);
-    }
-
-    public static ItemStack setStack(boolean aUseBlackList, ItemStack aStack) {
-        if (GT_Utility.isStackInvalid(aStack)) return aStack;
-        ItemStack tStack = get(aUseBlackList, aStack);
-        if (GT_Utility.areStacksEqual(aStack, tStack)) return aStack;
-        aStack.func_150996_a(tStack.getItem());
-        Items.feather.setDamage(aStack, Items.feather.getDamage(tStack));
-        return aStack;
-    }
-
-    public static ItemStack get(ItemStack aStack) {
-        return get(true, aStack);
-    }
-
-    public static ItemStack get(boolean aUseBlackList, ItemStack aStack) {
-        return get(aUseBlackList, aStack, false);
-    }
-
-    public static ItemStack get(boolean aUseBlackList, ItemStack aStack, boolean aOnUnificationTableCreation) {
-        if (GT_Utility.isStackInvalid(aStack)) return null;
-        ItemData tPrefixMaterial = getAssociation(aStack);
-        ItemStack rStack = null;
-        if (tPrefixMaterial == null || !tPrefixMaterial.hasValidPrefixMaterialData()
-                || (aUseBlackList && tPrefixMaterial.mBlackListed))
-            return GT_Utility.copy(aStack);
-        if (aUseBlackList && !GregTech_API.sUnificationEntriesRegistered && isBlacklisted(aStack)) {
-            tPrefixMaterial.mBlackListed = true;
-            return GT_Utility.copy(aStack);
-        }
-        if (tPrefixMaterial.mUnificationTarget == null) {
-            tPrefixMaterial.mUnificationTarget = sName2StackMap.get(tPrefixMaterial.toString());
-            if (!aOnUnificationTableCreation) sUnificationTable.clear();
-        }
-        rStack = tPrefixMaterial.mUnificationTarget;
-        if (GT_Utility.isStackInvalid(rStack)) return GT_Utility.copy(aStack);
-        assert rStack != null;
-        rStack.setTagCompound(aStack.getTagCompound());
-        return GT_Utility.copyAmount(aStack.stackSize, rStack);
-    }
-
-    public static List<ItemStack> getNonUnifiedStacks(Object obj) {
-        synchronized (sUnificationTable) {
-            if (sUnificationTable.isEmpty() && !sItemStack2DataMap.isEmpty()) {
-                for (GT_ItemStack tGTStack0 : sItemStack2DataMap.keySet()) {
-                    ItemStack tStack0 = tGTStack0.toStack();
-                    ItemStack tStack1 = get(false, tStack0, true);
-                    if (tStack0 != null && tStack1 != null && !GT_Utility.areStacksEqual(tStack0, tStack1)) {
-                        GT_ItemStack tGTStack1 = new GT_ItemStack(tStack1);
-                        List<ItemStack> list = sUnificationTable.get(tGTStack1);
-                        if (list == null) sUnificationTable.put(tGTStack1, list = new ArrayList<ItemStack>());
-                        if (!list.contains(tStack0)) list.add(tStack0);
-                    }
-                }
-            }
-        }
-        ItemStack[] aStacks = {};
-        if (obj instanceof ItemStack) aStacks = new ItemStack[] { (ItemStack) obj };
-        else if (obj instanceof ItemStack[]) aStacks = (ItemStack[]) obj;
-        else if (obj instanceof List) aStacks = (ItemStack[]) ((List) obj).toArray(new ItemStack[0]);
-        List<ItemStack> rList = new ArrayList<ItemStack>();
-        for (ItemStack aStack : aStacks) {
-            rList.add(aStack);
-            List<ItemStack> tList = sUnificationTable.get(new GT_ItemStack(aStack));
-            if (tList != null) {
-                for (ItemStack tStack : tList) {
-                    ItemStack tStack1 = GT_Utility.copyAmount(aStack.stackSize, tStack);
-                    tStack1.setTagCompound(aStack.getTagCompound());
-                    rList.add(tStack1);
-                }
-            }
-        }
-        return rList;
-    }
-
-    public static void addItemData(ItemStack aStack, ItemData aData) {
-        if (GT_Utility.isStackValid(aStack) && getItemData(aStack) == null && aData != null) setItemData(aStack, aData);
-    }
-
-    public static void setItemData(ItemStack aStack, ItemData aData) {
-        if (GT_Utility.isStackInvalid(aStack) || aData == null) return;
-        ItemData tData = getItemData(aStack);
-        if (tData == null || !tData.hasValidPrefixMaterialData()) {
-            if (tData != null) for (Object tObject : tData.mExtraData)
-                if (!aData.mExtraData.contains(tObject)) aData.mExtraData.add(tObject);
-            if (aStack.stackSize > 1) {
-                if (aData.mMaterial != null) aData.mMaterial.mAmount /= aStack.stackSize;
-                for (MaterialStack tMaterial : aData.mByProducts) tMaterial.mAmount /= aStack.stackSize;
-                aStack = GT_Utility.copyAmount(1, aStack);
-            }
-            sItemStack2DataMap.put(new GT_ItemStack(aStack), aData);
-            if (aData.hasValidMaterialData()) {
-                long tValidMaterialAmount = aData.mMaterial.mMaterial.contains(SubTag.NO_RECYCLING) ? 0
-                        : aData.mMaterial.mAmount >= 0 ? aData.mMaterial.mAmount : M;
-                for (MaterialStack tMaterial : aData.mByProducts)
-                    tValidMaterialAmount += tMaterial.mMaterial.contains(SubTag.NO_RECYCLING) ? 0
-                            : tMaterial.mAmount >= 0 ? tMaterial.mAmount : M;
-                if (tValidMaterialAmount < M) GT_ModHandler.addToRecyclerBlackList(aStack);
-            }
-            if (mRunThroughTheList) {
-                if (GregTech_API.sLoadStarted) {
-                    mRunThroughTheList = false;
-                    for (Entry<GT_ItemStack, ItemData> tEntry : sItemStack2DataMap.entrySet())
-                        if (!tEntry.getValue().hasValidPrefixData() || tEntry.getValue().mPrefix.mAllowNormalRecycling)
-                            GT_RecipeRegistrator
-                                    .registerMaterialRecycling(tEntry.getKey().toStack(), tEntry.getValue());
-                }
-            } else {
-                if (!aData.hasValidPrefixData() || aData.mPrefix.mAllowNormalRecycling)
-                    GT_RecipeRegistrator.registerMaterialRecycling(aStack, aData);
-            }
-        } else {
-            for (Object tObject : aData.mExtraData)
-                if (!tData.mExtraData.contains(tObject)) tData.mExtraData.add(tObject);
-        }
-    }
-
-    public static void addAssociation(OrePrefixes aPrefix, Materials aMaterial, ItemStack aStack,
-            boolean aBlackListed) {
-        if (aPrefix == null || aMaterial == null || GT_Utility.isStackInvalid(aStack)) return;
-        if (Items.feather.getDamage(aStack) == W) for (byte i = 0; i < 16; i++)
-            setItemData(GT_Utility.copyAmountAndMetaData(1, i, aStack), new ItemData(aPrefix, aMaterial, aBlackListed));
-        setItemData(aStack, new ItemData(aPrefix, aMaterial, aBlackListed));
-    }
-
-    public static ItemData getItemData(ItemStack aStack) {
-        if (GT_Utility.isStackInvalid(aStack)) return null;
-        ItemData rData = sItemStack2DataMap.get(new GT_ItemStack(aStack));
-        if (rData == null) rData = sItemStack2DataMap.get(new GT_ItemStack(GT_Utility.copyMetaData(W, aStack)));
-        return rData;
-    }
-
-    public static ItemData getAssociation(ItemStack aStack) {
-        ItemData rData = getItemData(aStack);
-        return rData != null && rData.hasValidPrefixMaterialData() ? rData : null;
-    }
-
-    public static boolean isItemStackInstanceOf(ItemStack aStack, Object aName) {
-        if (GT_Utility.isStringInvalid(aName) || GT_Utility.isStackInvalid(aStack)) return false;
-        for (ItemStack tOreStack : getOres(aName.toString()))
-            if (GT_Utility.areStacksEqual(tOreStack, aStack, true)) return true;
-        return false;
-    }
-
-    public static boolean isItemStackDye(ItemStack aStack) {
-        if (GT_Utility.isStackInvalid(aStack)) return false;
-        for (Dyes tDye : Dyes.VALUES) if (isItemStackInstanceOf(aStack, tDye.toString())) return true;
-        return false;
-    }
-
-    public static boolean registerOre(OrePrefixes aPrefix, Object aMaterial, ItemStack aStack) {
-        return registerOre(aPrefix.get(aMaterial), aStack);
-    }
-
-    public static boolean registerOre(Object aName, ItemStack aStack) {
-        if (aName == null || GT_Utility.isStackInvalid(aStack)) return false;
-        String tName = aName.toString();
-        if (GT_Utility.isStringInvalid(tName)) return false;
-        ArrayList<ItemStack> tList = getOres(tName);
-        for (int i = 0; i < tList.size(); i++) if (GT_Utility.areStacksEqual(tList.get(i), aStack, true)) return false;
-        isRegisteringOre++;
-        OreDictionary.registerOre(tName, GT_Utility.copyAmount(1, aStack));
-        isRegisteringOre--;
-        return true;
-    }
-
-    public static boolean isRegisteringOres() {
-        return isRegisteringOre > 0;
-    }
-
-    public static boolean isAddingOres() {
-        return isAddingOre > 0;
-    }
-
-    public static void resetUnificationEntries() {
-        for (ItemData tPrefixMaterial : sItemStack2DataMap.values()) tPrefixMaterial.mUnificationTarget = null;
-        sUnificationTable.clear();
-    }
-
-    public static ItemStack getGem(MaterialStack aMaterial) {
-        return aMaterial == null ? null : getGem(aMaterial.mMaterial, aMaterial.mAmount);
-    }
-
-    public static ItemStack getGem(Materials aMaterial, OrePrefixes aPrefix) {
-        return aMaterial == null ? null : getGem(aMaterial, aPrefix.mMaterialAmount);
-    }
-
-    public static ItemStack getGem(Materials aMaterial, long aMaterialAmount) {
-        ItemStack rStack = null;
-        if (((aMaterialAmount >= M))) rStack = get(OrePrefixes.gem, aMaterial, aMaterialAmount / M);
-        if (rStack == null) {
-            if ((((aMaterialAmount * 2) % M == 0) || aMaterialAmount >= M * 16))
-                rStack = get(OrePrefixes.gemFlawed, aMaterial, (aMaterialAmount * 2) / M);
-            if ((((aMaterialAmount * 4) >= M)))
-                rStack = get(OrePrefixes.gemChipped, aMaterial, (aMaterialAmount * 4) / M);
-        }
-        return rStack;
-    }
-
-    public static ItemStack getDust(MaterialStack aMaterial) {
-        return aMaterial == null ? null : getDust(aMaterial.mMaterial, aMaterial.mAmount);
-    }
-
-    public static ItemStack getDust(Materials aMaterial, OrePrefixes aPrefix) {
-        return aMaterial == null ? null : getDust(aMaterial, aPrefix.mMaterialAmount);
-    }
-
-    public static ItemStack getDust(Materials aMaterial, long aMaterialAmount) {
-        if (aMaterialAmount <= 0) return null;
-        ItemStack rStack = null;
-        if (((aMaterialAmount % M == 0) || aMaterialAmount >= M * 16))
-            rStack = get(OrePrefixes.dust, aMaterial, aMaterialAmount / M);
-        if (rStack == null && (((aMaterialAmount * 4) % M == 0) || aMaterialAmount >= M * 8))
-            rStack = get(OrePrefixes.dustSmall, aMaterial, (aMaterialAmount * 4) / M);
-        if (rStack == null && (((aMaterialAmount * 9) >= M)))
-            rStack = get(OrePrefixes.dustTiny, aMaterial, (aMaterialAmount * 9) / M);
-        return rStack;
-    }
-
-    public static ItemStack getIngot(MaterialStack aMaterial) {
-        return aMaterial == null ? null : getIngot(aMaterial.mMaterial, aMaterial.mAmount);
-    }
-
-    public static ItemStack getIngot(Materials aMaterial, OrePrefixes aPrefix) {
-        return aMaterial == null ? null : getIngot(aMaterial, aPrefix.mMaterialAmount);
-    }
-
-    public static ItemStack getIngot(Materials aMaterial, long aMaterialAmount) {
-        if (aMaterialAmount <= 0) return null;
-        ItemStack rStack = null;
-        if (((aMaterialAmount % (M * 9) == 0 && aMaterialAmount / (M * 9) > 1) || aMaterialAmount >= M * 72))
-            rStack = get(OrePrefixes.block, aMaterial, aMaterialAmount / (M * 9));
-        if (rStack == null && ((aMaterialAmount % M == 0) || aMaterialAmount >= M * 8))
-            rStack = get(OrePrefixes.ingot, aMaterial, aMaterialAmount / M);
-        if (rStack == null && (((aMaterialAmount * 9) >= M)))
-            rStack = get(OrePrefixes.nugget, aMaterial, (aMaterialAmount * 9) / M);
-        return rStack;
-    }
-
-    public static ItemStack getIngotOrDust(Materials aMaterial, long aMaterialAmount) {
-        if (aMaterialAmount <= 0) return null;
-        ItemStack rStack = getIngot(aMaterial, aMaterialAmount);
-        if (rStack == null) rStack = getDust(aMaterial, aMaterialAmount);
-        return rStack;
-    }
-
-    public static ItemStack getIngotOrDust(MaterialStack aMaterial) {
-        ItemStack rStack = getIngot(aMaterial);
-        if (aMaterial != null && aMaterial.mMaterial != null
-                && (aMaterial.mMaterial == Materials.Naquadah || aMaterial.mMaterial == Materials.NaquadahEnriched))
-            rStack = getDust(aMaterial);
-        if (rStack == null) rStack = getDust(aMaterial);
-        return rStack;
-    }
-
-    public static ItemStack getDustOrIngot(Materials aMaterial, long aMaterialAmount) {
-        if (aMaterialAmount <= 0) return null;
-        ItemStack rStack = getDust(aMaterial, aMaterialAmount);
-        if (rStack == null) rStack = getIngot(aMaterial, aMaterialAmount);
-        return rStack;
-    }
-
-    public static ItemStack getDustOrIngot(MaterialStack aMaterial) {
-        ItemStack rStack = getDust(aMaterial);
-        if (rStack == null) rStack = getIngot(aMaterial);
-        return rStack;
-    }
-
-    /**
-     * @return a Copy of the OreDictionary.getOres() List
-     */
-    public static ArrayList<ItemStack> getOres(OrePrefixes aPrefix, Object aMaterial) {
-        return getOres(aPrefix.get(aMaterial));
-    }
-
-    /**
-     * @return a Copy of the OreDictionary.getOres() List
-     */
-    public static ArrayList<ItemStack> getOres(Object aOreName) {
-        String aName = aOreName == null ? E : aOreName.toString();
-        ArrayList<ItemStack> rList = new ArrayList<ItemStack>();
-        if (GT_Utility.isStringValid(aName)) rList.addAll(OreDictionary.getOres(aName));
-        return rList;
-    }
-}