Remove a bunch more reflection (#3074)

Co-authored-by: boubou19 <miisterunknown@gmail.com>

12 files changed, 73 insertions, 192 deletions

diff --git a/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java
index b0ee1c0c77..7ba3e7e474 100644
--- a/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java
+++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java
@@ -1,6 +1,5 @@
 package gtPlusPlus.core.block.base;
 
-import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Random;
 
@@ -21,7 +20,6 @@ import cpw.mods.fml.common.registry.GameRegistry;
 import gregtech.GTMod;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.Textures;
-import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.util.GTOreDictUnificator;
 import gtPlusPlus.api.interfaces.ITexturedBlock;
@@ -30,7 +28,6 @@ import gtPlusPlus.core.item.base.itemblock.ItemBlockOre;
 import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.xmod.gregtech.api.objects.GTPPCopiedBlockTexture;
 import gtPlusPlus.xmod.gregtech.api.objects.GTPPRenderedTexture;
 
@@ -100,13 +97,6 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock {
         return Blocks.stone.getIcon(0, 0);
     }
 
-    /**
-     * GT Texture Handler
-     */
-
-    // .08 compat
-    public static IIconContainer[] hiddenTextureArray;
-
     @Override
     public ITexture[] getTexture(ForgeDirection side) {
         return getTexture(null, side);
@@ -120,21 +110,8 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock {
                 this.blockMaterial.getRGBA());
             return new ITexture[] { new GTPPCopiedBlockTexture(Blocks.stone, 0, 0), aIconSet };
         }
-
-        if (hiddenTextureArray == null) {
-            try {
-                Field o = ReflectionUtils.getField(Textures.BlockIcons.class, "STONES");
-                if (o != null) {
-                    hiddenTextureArray = (IIconContainer[]) o.get(Textures.BlockIcons.class);
-                }
-                if (hiddenTextureArray == null) {
-                    hiddenTextureArray = new IIconContainer[6];
-                }
-            } catch (IllegalArgumentException | IllegalAccessException e) {
-                hiddenTextureArray = new IIconContainer[6];
-            }
-        }
-        return new ITexture[] { new GTPPRenderedTexture(hiddenTextureArray[0], new short[] { 240, 240, 240, 0 }) };
+        return new ITexture[] {
+            new GTPPRenderedTexture(Textures.BlockIcons.STONES[0], new short[] { 240, 240, 240, 0 }) };
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/core/gui/widget/GuiValueField.java b/src/main/java/gtPlusPlus/core/gui/widget/GuiValueField.java
index 26e7d907d3..8f549364c1 100644
--- a/src/main/java/gtPlusPlus/core/gui/widget/GuiValueField.java
+++ b/src/main/java/gtPlusPlus/core/gui/widget/GuiValueField.java
@@ -31,13 +31,7 @@ public class GuiValueField extends GuiTextField {
     }
 
     public boolean isBackgroundDrawingEnabled() {
-        Field enableBackgroundDrawing = ReflectionUtils.getField(
-            GuiTextField.class,
-            !PreloaderCore.DEV_ENVIRONMENT ? "field_146215_m" : "enableBackgroundDrawing");
-        if (enableBackgroundDrawing != null) {
-            return ReflectionUtils.getFieldValue(enableBackgroundDrawing, this);
-        }
-        return true;
+        return this.getEnableBackgroundDrawing();
     }
 
     public int getLineScrollOffset() {
diff --git a/src/main/java/gtPlusPlus/core/handler/PacketHandler.java b/src/main/java/gtPlusPlus/core/handler/PacketHandler.java
index 735d381706..9c5d6b25d2 100644
--- a/src/main/java/gtPlusPlus/core/handler/PacketHandler.java
+++ b/src/main/java/gtPlusPlus/core/handler/PacketHandler.java
@@ -22,7 +22,7 @@ public class PacketHandler {
 
     private static final SimpleNetworkWrapper INSTANCE = NetworkRegistry.INSTANCE.newSimpleChannel(GTPlusPlus.ID);
 
-    public static final void init() {
+    public static void init() {
         registerMessage(PacketVolumetricFlaskGui.class, PacketVolumetricFlaskGui.class);
         registerMessage(PacketVolumetricFlaskGui2.class, PacketVolumetricFlaskGui2.class);
     }
@@ -50,30 +50,29 @@ public class PacketHandler {
     /**
      * Send this message to the specified player. See {@link SimpleNetworkWrapper#sendTo(IMessage, EntityPlayerMP)}
      */
-    public static final void sendTo(IMessage message, EntityPlayerMP player) {
+    public static void sendTo(IMessage message, EntityPlayerMP player) {
         INSTANCE.sendTo(message, player);
     }
 
     /**
      * Send this message to everyone within a certain range of a point. See
-     * {@link SimpleNetworkWrapper#sendToDimension(IMessage, NetworkRegistry.TargetPoint)}
+     * {@link SimpleNetworkWrapper#sendToAllAround(IMessage, NetworkRegistry.TargetPoint)}
      */
-    public static final void sendToAllAround(IMessage message, NetworkRegistry.TargetPoint point) {
+    public static void sendToAllAround(IMessage message, NetworkRegistry.TargetPoint point) {
         INSTANCE.sendToAllAround(message, point);
     }
 
     /**
      * Sends a message to everyone within a certain range of the coordinates in the same dimension.
      */
-    public static final void sendToAllAround(IMessage message, int dimension, double x, double y, double z,
-        double range) {
+    public static void sendToAllAround(IMessage message, int dimension, double x, double y, double z, double range) {
         sendToAllAround(message, new NetworkRegistry.TargetPoint(dimension, x, y, z, range));
     }
 
     /**
      * Sends a message to everyone within a certain range of the player provided.
      */
-    public static final void sendToAllAround(IMessage message, EntityPlayer player, double range) {
+    public static void sendToAllAround(IMessage message, EntityPlayer player, double range) {
         sendToAllAround(message, player.worldObj.provider.dimensionId, player.posX, player.posY, player.posZ, range);
     }
 
@@ -81,14 +80,14 @@ public class PacketHandler {
      * Send this message to everyone within the supplied dimension. See
      * {@link SimpleNetworkWrapper#sendToDimension(IMessage, int)}
      */
-    public static final void sendToDimension(IMessage message, int dimensionId) {
+    public static void sendToDimension(IMessage message, int dimensionId) {
         INSTANCE.sendToDimension(message, dimensionId);
     }
 
     /**
      * Send this message to the server. See {@link SimpleNetworkWrapper#sendToServer(IMessage)}
      */
-    public static final void sendToServer(IMessage message) {
+    public static void sendToServer(IMessage message) {
         INSTANCE.sendToServer(message);
     }
 }
diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java
index 4bbf29c88f..4c7dc05804 100644
--- a/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java
+++ b/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java
@@ -1,7 +1,6 @@
 package gtPlusPlus.core.item.chemistry;
 
 import static gregtech.api.enums.Mods.BiomesOPlenty;
-import static gregtech.api.enums.Mods.Forestry;
 import static gregtech.api.enums.Mods.TinkerConstruct;
 import static gregtech.api.recipe.RecipeMaps.centrifugeRecipes;
 import static gregtech.api.recipe.RecipeMaps.compressorRecipes;
@@ -12,7 +11,6 @@ import static gregtech.api.util.GTRecipeConstants.UniversalChemical;
 import static gtPlusPlus.api.recipe.GTPPRecipeMaps.chemicalDehydratorRecipes;
 import static gtPlusPlus.api.recipe.GTPPRecipeMaps.semiFluidFuels;
 
-import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -23,8 +21,12 @@ import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.oredict.OreDictionary;
 
+import forestry.core.items.ItemForestryBonemeal;
+import forestry.core.items.ItemRegistryCore;
+import forestry.plugins.PluginCore;
 import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Materials;
+import gregtech.api.enums.Mods;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.TierEU;
 import gregtech.api.util.GTOreDictUnificator;
@@ -37,7 +39,6 @@ import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.plugin.agrichem.BioRecipes;
 import gtPlusPlus.plugin.agrichem.item.algae.ItemAgrichemBase;
 import gtPlusPlus.plugin.agrichem.item.algae.ItemAlgaeBase;
@@ -543,33 +544,19 @@ public class AgriculturalChem extends ItemPackage {
         ItemStack aManureByprod = ItemUtils.getSimpleStack(dustManureByproducts, 1);
 
         // Dehydrate Organise Fert to Normal Fert.
+        if (Mods.Forestry.isModLoaded()) {
+            ItemRegistryCore aItemRegInstance = PluginCore.items;
+            if (aItemRegInstance != null) {
+                ItemForestryBonemeal fertilizerCompound = aItemRegInstance.fertilizerCompound;
+                aFertForestry = ItemUtils.getSimpleStack(fertilizerCompound);
 
-        /*
-         * Forestry Support
-         */
-        if (Forestry.isModLoaded()) {
-            Field aItemField = ReflectionUtils
-                .getField(ReflectionUtils.getClass("forestry.plugins.PluginCore"), "items");
-            try {
-                Object aItemRegInstance = aItemField != null ? aItemField.get(aItemField) : null;
-                if (aItemRegInstance != null) {
-                    Field aFertField = ReflectionUtils.getField(aItemRegInstance.getClass(), "fertilizerCompound");
-                    Object aItemInstance = aFertField.get(aItemRegInstance);
-                    if (aItemInstance instanceof Item aForestryFert) {
-                        aFertForestry = ItemUtils.getSimpleStack((Item) aItemInstance);
-
-                        GTValues.RA.stdBuilder()
-                            .itemInputs(
-                                GTUtility.getIntegratedCircuit(11),
-                                ItemUtils.getSimpleStack(aDustOrganicFert, 4))
-                            .itemOutputs(ItemUtils.getSimpleStack(aForestryFert, 3), aManureByprod, aManureByprod)
-                            .outputChances(100_00, 20_00, 20_00)
-                            .eut(240)
-                            .duration(20 * SECONDS)
-                            .addTo(chemicalDehydratorRecipes);
-                    }
-                }
-            } catch (IllegalArgumentException | IllegalAccessException e) {
+                GTValues.RA.stdBuilder()
+                    .itemInputs(GTUtility.getIntegratedCircuit(11), ItemUtils.getSimpleStack(aDustOrganicFert, 4))
+                    .itemOutputs(ItemUtils.getSimpleStack(fertilizerCompound, 3), aManureByprod, aManureByprod)
+                    .outputChances(100_00, 20_00, 20_00)
+                    .eut(240)
+                    .duration(20 * SECONDS)
+                    .addTo(chemicalDehydratorRecipes);
 
             }
         }
diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java b/src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java
index 078dcdee88..4909d269cc 100644
--- a/src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java
+++ b/src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java
@@ -14,6 +14,8 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.Fluid;
 
+import biomesoplenty.api.content.BOPCBlocks;
+import biomesoplenty.api.content.BOPCItems;
 import gregtech.api.enums.GTValues;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.TierEU;
@@ -33,7 +35,6 @@ import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.MaterialUtils;
 import gtPlusPlus.core.util.minecraft.NBTUtils;
-import gtPlusPlus.xmod.bop.BiomesOPlentyHandler;
 import gtPlusPlus.xmod.bop.blocks.BOPBlockRegistrator;
 import gtPlusPlus.xmod.gregtech.common.helpers.FlotationRecipeHandler;
 
@@ -654,10 +655,10 @@ public class MilledOreProcessing extends ItemPackage {
         aPinecones.add(ItemUtils.getSimpleStack(AgriculturalChem.mPinecone, 1));
 
         if (BiomesOPlenty.isModLoaded()) {
-            aLogs.add(BiomesOPlentyHandler.getStack(BiomesOPlentyHandler.logs4, 0, 1));
-            aLeaves.add(BiomesOPlentyHandler.getStack(BiomesOPlentyHandler.colorizedLeaves2, 1, 1));
-            aSaplings.add(BiomesOPlentyHandler.getStack(BiomesOPlentyHandler.colorizedSaplings, 5, 1));
-            aPinecones.add(ItemUtils.simpleMetaStack(BiomesOPlentyHandler.mPineCone, 13, 1));
+            aLogs.add(ItemUtils.simpleMetaStack(BOPCBlocks.logs4, 0, 1));
+            aLeaves.add(ItemUtils.simpleMetaStack(BOPCBlocks.colorizedLeaves2, 1, 1));
+            aSaplings.add(ItemUtils.simpleMetaStack(BOPCBlocks.colorizedSaplings, 5, 1));
+            aPinecones.add(ItemUtils.simpleMetaStack(BOPCItems.misc, 13, 1));
         }
         if (Forestry.isModLoaded()) {
             ItemStack aForestryLog = ItemUtils.getItemStackFromFQRN("Forestry:logs", 1);
diff --git a/src/main/java/gtPlusPlus/core/item/tool/misc/ItemGregtechPump.java b/src/main/java/gtPlusPlus/core/item/tool/misc/ItemGregtechPump.java
index 082f74ad2b..1c896e8497 100644
--- a/src/main/java/gtPlusPlus/core/item/tool/misc/ItemGregtechPump.java
+++ b/src/main/java/gtPlusPlus/core/item/tool/misc/ItemGregtechPump.java
@@ -1238,7 +1238,7 @@ public class ItemGregtechPump extends Item implements ISpecialElectricItem, IEle
         if (aTileEntity == null) {
             return null;
         }
-        final IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();;
+        final IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity();
         if (aMetaTileEntity == null || aMetaTileEntity instanceof MTEHatchMultiInput) {
             // blacklist multiinput hatch as it's too complex
             return null;
diff --git a/src/main/java/gtPlusPlus/core/lib/GTPPCore.java b/src/main/java/gtPlusPlus/core/lib/GTPPCore.java
index c78d734cb6..af6bedfa61 100644
--- a/src/main/java/gtPlusPlus/core/lib/GTPPCore.java
+++ b/src/main/java/gtPlusPlus/core/lib/GTPPCore.java
@@ -6,23 +6,17 @@ import java.util.List;
 import java.util.Map;
 import java.util.Random;
 import java.util.UUID;
-import java.util.WeakHashMap;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Supplier;
 
-import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.StatCollector;
-import net.minecraft.world.World;
-
-import com.mojang.authlib.GameProfile;
 
 import cpw.mods.fml.common.FMLCommonHandler;
 import gregtech.GT_Version;
 import gregtech.api.objects.XSTR;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.Pair;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.preloader.PreloaderCore;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
 import gtPlusPlus.xmod.gregtech.common.tileentities.automation.MTETesseractGenerator;
@@ -30,8 +24,6 @@ import gtPlusPlus.xmod.gregtech.common.tileentities.automation.MTETesseractTermi
 
 public class GTPPCore {
 
-    public static Map PlayerCache;
-
     // Math Related
     public static final float PI = (float) Math.PI;
     public static volatile Random RANDOM = new XSTR();
@@ -48,11 +40,6 @@ public class GTPPCore {
 
     public static int turbineCutoffBase = 75000;
 
-    // GT++ Fake Player Profile
-    public static final GameProfile gameProfile = new GameProfile(
-        UUID.nameUUIDFromBytes("gtplusplus.core".getBytes()),
-        "[GT++]");
-    public static final WeakHashMap<World, EntityPlayerMP> fakePlayerCache = new WeakHashMap<>();
     // Tooltips;
     public static final Supplier<String> GT_Tooltip = () -> StatCollector.translateToLocal("GTPP.core.GT_Tooltip");
     public static final Supplier<String> GT_Tooltip_Builder = () -> StatCollector
@@ -202,34 +189,19 @@ public class GTPPCore {
         public static final String VERSION = GT_Version.VERSION;
     }
 
-    public static final void crash() {
+    public static void crash() {
         crash("Generic Crash");
     }
 
-    public static final void crash(String aReason) {
+    public static void crash(String aReason) {
         try {
             Logger.INFO("==========================================================");
             Logger.INFO("[GT++ CRASH]");
             Logger.INFO("==========================================================");
             Logger.INFO("Oooops...");
-            Logger.INFO("This should only happy in a development environment or when something really bad happens.");
+            Logger.INFO("This should only happen in a development environment or when something really bad happens.");
             Logger.INFO("Reason: " + aReason);
             Logger.INFO("==========================================================");
-            Logger.INFO("Called from: " + ReflectionUtils.getMethodName(1));
-            Logger.INFO(ReflectionUtils.getMethodName(2));
-            Logger.INFO(ReflectionUtils.getMethodName(3));
-            Logger.INFO(ReflectionUtils.getMethodName(4));
-            Logger.INFO(ReflectionUtils.getMethodName(5));
-            Logger.INFO(ReflectionUtils.getMethodName(6));
-            Logger.INFO(ReflectionUtils.getMethodName(7));
-            Logger.INFO(ReflectionUtils.getMethodName(8));
-            Logger.INFO(ReflectionUtils.getMethodName(9));
-            Logger.INFO(ReflectionUtils.getMethodName(10));
-            Logger.INFO(ReflectionUtils.getMethodName(11));
-            Logger.INFO(ReflectionUtils.getMethodName(12));
-            Logger.INFO(ReflectionUtils.getMethodName(13));
-            Logger.INFO(ReflectionUtils.getMethodName(14));
-            Logger.INFO(ReflectionUtils.getMethodName(15));
         } catch (Throwable t) {
             t.printStackTrace();
         }
diff --git a/src/main/java/gtPlusPlus/core/material/MaterialStack.java b/src/main/java/gtPlusPlus/core/material/MaterialStack.java
index d4d11781c5..aeb23a9455 100644
--- a/src/main/java/gtPlusPlus/core/material/MaterialStack.java
+++ b/src/main/java/gtPlusPlus/core/material/MaterialStack.java
@@ -8,7 +8,6 @@ import net.minecraft.item.ItemStack;
 import gregtech.api.enums.OrePrefixes;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.xmod.bartworks.BWUtils;
 
 public class MaterialStack {
@@ -69,11 +68,7 @@ public class MaterialStack {
 
     public Material getStackMaterial() {
         if (this.stackMaterial == null) {
-            Logger.MATERIALS("Tried getStackMaterial, got an invalid material.");
-            Logger.MATERIALS(ReflectionUtils.getMethodName(0));
-            Logger.MATERIALS(ReflectionUtils.getMethodName(1));
-            Logger.MATERIALS(ReflectionUtils.getMethodName(2));
-            Logger.MATERIALS(ReflectionUtils.getMethodName(3));
+            Logger.modLogger.error("Tried getStackMaterial, got an invalid material.", new Exception());
             return null;
         }
         return this.stackMaterial;
diff --git a/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityPestKiller.java b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityPestKiller.java
index 66378f0f7a..c91476f556 100644
--- a/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityPestKiller.java
+++ b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityPestKiller.java
@@ -1,7 +1,5 @@
 package gtPlusPlus.core.tileentities.machines;
 
-import static gregtech.api.enums.Mods.Forestry;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -27,6 +25,8 @@ import net.minecraftforge.fluids.FluidTankInfo;
 import net.minecraftforge.fluids.IFluidHandler;
 import net.minecraftforge.oredict.OreDictionary;
 
+import forestry.lepidopterology.entities.EntityButterfly;
+import gregtech.api.enums.Mods;
 import gregtech.api.util.GTUtility;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.api.objects.minecraft.BTF_FluidTank;
@@ -36,7 +36,6 @@ import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.EntityUtils;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
 
 public class TileEntityPestKiller extends TileEntity implements ISidedInventory, IFluidHandler {
 
@@ -56,8 +55,8 @@ public class TileEntityPestKiller extends TileEntity implements ISidedInventory,
 
     static {
         mEntityMap.put(EntityBat.class);
-        if (Forestry.isModLoaded()) {
-            mEntityMap.put(ReflectionUtils.getClass("forestry.lepidopterology.entities.EntityButterfly"));
+        if (Mods.Forestry.isModLoaded()) {
+            mEntityMap.put(EntityButterfly.class);
         }
     }
 
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java
index 1e211290cd..26d7783b78 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java
@@ -46,7 +46,6 @@ import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.math.MathUtils;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.preloader.PreloaderCore;
 import gtPlusPlus.xmod.gregtech.api.items.GTMetaTool;
 import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools;
@@ -309,11 +308,7 @@ public class ItemUtils {
 
     public static ItemStack getItemStackOfAmountFromOreDictNoBroken(String oredictName, final int amount) {
         if (PreloaderCore.DEBUG_MODE) {
-            Logger.WARNING("Looking up: " + oredictName + " - from method: " + ReflectionUtils.getMethodName(1));
-            Logger.WARNING("Looking up: " + oredictName + " - from method: " + ReflectionUtils.getMethodName(2));
-            Logger.WARNING("Looking up: " + oredictName + " - from method: " + ReflectionUtils.getMethodName(3));
-            Logger.WARNING("Looking up: " + oredictName + " - from method: " + ReflectionUtils.getMethodName(4));
-            Logger.WARNING("Looking up: " + oredictName + " - from method: " + ReflectionUtils.getMethodName(5));
+            Logger.modLogger.warn("Looking up: " + oredictName + " - from : ", new Exception());
         }
 
         try {
diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/MiningUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/MiningUtils.java
index 16e5652e82..8845409da9 100644
--- a/src/main/java/gtPlusPlus/core/util/minecraft/MiningUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/minecraft/MiningUtils.java
@@ -2,10 +2,14 @@ package gtPlusPlus.core.util.minecraft;
 
 import java.util.HashMap;
 
+import gregtech.api.enums.Mods;
 import gregtech.common.WorldgenGTOreLayer;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
+import micdoodle8.mods.galacticraft.core.util.ConfigManagerCore;
+import micdoodle8.mods.galacticraft.planets.asteroids.ConfigManagerAsteroids;
+import micdoodle8.mods.galacticraft.planets.mars.ConfigManagerMars;
 
 public class MiningUtils {
 
@@ -48,42 +52,17 @@ public class MiningUtils {
     public static boolean findAndMapOreTypesFromGT() {
         // Gets Moon ID
 
-        boolean aEndAsteroids;
-        try {
-            if (ReflectionUtils.getClass("micdoodle8.mods.galacticraft.core.util.ConfigManagerCore") != null
-                && mMoonID == -99) {
-                mMoonID = ReflectionUtils
-                    .getField(
-                        ReflectionUtils.getClass("micdoodle8.mods.galacticraft.core.util.ConfigManagerCore"),
-                        "idDimensionMoon")
-                    .getInt(null);
+        if (Mods.GalacticraftCore.isModLoaded()) {
+            if (mMoonID == -99) {
+                mMoonID = ConfigManagerCore.idDimensionMoon;
             }
-        } catch (IllegalArgumentException | IllegalAccessException ignored) {}
-
-        // Gets Mars ID
-        try {
-            if (ReflectionUtils.getClass("micdoodle8.mods.galacticraft.planets.mars.ConfigManagerMars") != null
-                && mMarsID == -99) {
-                mMarsID = ReflectionUtils
-                    .getField(
-                        ReflectionUtils.getClass("micdoodle8.mods.galacticraft.planets.mars.ConfigManagerMars"),
-                        "dimensionIDMars")
-                    .getInt(null);
+            if (mMarsID == -99) {
+                mMarsID = ConfigManagerMars.dimensionIDMars;
             }
-        } catch (IllegalArgumentException | IllegalAccessException ignored) {}
-
-        // Get Comets ID
-        try {
-            if (ReflectionUtils.getClass("micdoodle8.mods.galacticraft.planets.asteroids.ConfigManagerAsteroids")
-                != null && mCometsID == -99) {
-                mCometsID = ReflectionUtils
-                    .getField(
-                        ReflectionUtils
-                            .getClass("micdoodle8.mods.galacticraft.planets.asteroids.ConfigManagerAsteroids"),
-                        "dimensionIDAsteroids")
-                    .getInt(null);
+            if (mCometsID == -99) {
+                mCometsID = ConfigManagerAsteroids.dimensionIDAsteroids;
             }
-        } catch (IllegalArgumentException | IllegalAccessException ignored) {}
+        }
 
         // Clear Cache
         Ores_Overworld.clear();
@@ -91,32 +70,23 @@ public class MiningUtils {
         Ores_End.clear();
         Ores_Misc.clear();
 
-        for (WorldgenGTOreLayer x : WorldgenGTOreLayer.sList) {
-            if (x.mEnabled) {
-
-                try {
-                    aEndAsteroids = ReflectionUtils.getField(WorldgenGTOreLayer.class, "mEndAsteroid")
-                        .getBoolean(x);
-                } catch (IllegalArgumentException | IllegalAccessException e) {
-                    aEndAsteroids = false;
+        for (WorldgenGTOreLayer gtOreLayer : WorldgenGTOreLayer.sList) {
+            if (gtOreLayer.mEnabled) {
+                if (gtOreLayer.mOverworld) {
+                    Ores_Overworld.put(gtOreLayer);
                 }
-
-                if (x.mOverworld) {
-                    Ores_Overworld.put(x);
-                }
-                if (x.mNether) {
-                    Ores_Nether.put(x);
+                if (gtOreLayer.mNether) {
+                    Ores_Nether.put(gtOreLayer);
                 }
-                if (x.mEnd || aEndAsteroids) {
-                    Ores_End.put(x);
+                if (gtOreLayer.mEnd || gtOreLayer.mEndAsteroid) {
+                    Ores_End.put(gtOreLayer);
                 }
-                if (x.mOverworld || x.mNether || (x.mEnd || aEndAsteroids)) {
+                if (gtOreLayer.mOverworld || gtOreLayer.mNether || (gtOreLayer.mEnd || gtOreLayer.mEndAsteroid)) {
                     continue;
                 }
-
-                Ores_Misc.put(x);
+                Ores_Misc.put(gtOreLayer);
             } else {
-                Ores_Comets.put(x);
+                Ores_Comets.put(gtOreLayer);
             }
         }
 
diff --git a/src/main/java/gtPlusPlus/core/util/reflect/ReflectionUtils.java b/src/main/java/gtPlusPlus/core/util/reflect/ReflectionUtils.java
index 078cef6ea8..576c236de6 100644
--- a/src/main/java/gtPlusPlus/core/util/reflect/ReflectionUtils.java
+++ b/src/main/java/gtPlusPlus/core/util/reflect/ReflectionUtils.java
@@ -126,7 +126,7 @@ public class ReflectionUtils {
 
     /**
      * Returns a cached {@link Constructor} object.
-     * 
+     *
      * @param aClass - Class containing the Constructor.
      * @param aTypes - Varags Class Types for objects constructor.
      * @return - Valid, non-final, {@link Method} object, or {@link null}.
@@ -155,7 +155,7 @@ public class ReflectionUtils {
 
     /**
      * Returns a cached {@link Class} object.
-     * 
+     *
      * @param aClassCanonicalName - The canonical name of the underlying class.
      * @return - Valid, {@link Class} object, or {@link null}.
      */
@@ -176,7 +176,7 @@ public class ReflectionUtils {
 
     /**
      * Returns a cached {@link Method} object. Wraps {@link #getMethod(Class, String, Class...)}.
-     * 
+     *
      * @param aObject     - Object containing the Method.
      * @param aMethodName - Method's name in {@link String} form.
      * @param aTypes      - Class Array of Types for {@link Method}'s constructor.
@@ -188,7 +188,7 @@ public class ReflectionUtils {
 
     /**
      * Returns a cached {@link Method} object.
-     * 
+     *
      * @param aClass      - Class containing the Method.
      * @param aMethodName - Method's name in {@link String} form.
      * @param aTypes      - Varags Class Types for {@link Method}'s constructor.
@@ -217,7 +217,7 @@ public class ReflectionUtils {
 
     /**
      * Returns a cached {@link Field} object.
-     * 
+     *
      * @param aClass     - Class containing the Method.
      * @param aFieldName - Field name in {@link String} form.
      * @return - Valid, non-final, {@link Field} object, or {@link null}.
@@ -246,7 +246,7 @@ public class ReflectionUtils {
 
     /**
      * Returns a cached {@link Field} object.
-     * 
+     *
      * @param aInstance  - {@link Object} to get the field instance from.
      * @param aFieldName - Field name in {@link String} form.
      * @return - Valid, non-final, {@link Field} object, or {@link null}.
@@ -286,7 +286,7 @@ public class ReflectionUtils {
     /**
      * Get the method name for a depth in call stack. <br />
      * Utility function
-     * 
+     *
      * @param depth depth in the call stack (0 means current method, 1 means call method, ...)
      * @return Method name
      */
@@ -323,14 +323,6 @@ public class ReflectionUtils {
         return loaded > 0;
     }
 
-    public static void loadClass(String aClassName) {
-        try {
-            Class.forName(aClassName, true, ReflectionUtils.class.getClassLoader());
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        }
-    }
-
     public static boolean setField(final Object object, final String fieldName, final Object fieldValue) {
         Class<?> clazz;
         if (object instanceof Class) {