Remove a bunch more reflection (#3074)

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

3 files changed, 31 insertions, 74 deletions

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) {