From 82604eadb847335e4b4ddf2e90a28b325786837b Mon Sep 17 00:00:00 2001
From: Alexdoru <57050655+Alexdoru@users.noreply.github.com>
Date: Sat, 7 Sep 2024 05:40:03 +0200
Subject: Remove a bunch more reflection (#3074)

Co-authored-by: boubou19 <miisterunknown@gmail.com>
---
 .../implementations/MTEHatchNaquadah.java          | 40 +++++++++-----------
 .../implementations/base/GTPPMultiBlockBase.java   | 43 +++-------------------
 .../gregtech/loaders/RecipeGenFluidCanning.java    |  9 +----
 .../xmod/gregtech/loaders/RecipeGenRecycling.java  | 13 +------
 4 files changed, 26 insertions(+), 79 deletions(-)

(limited to 'src/main/java/gtPlusPlus/xmod/gregtech')

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchNaquadah.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchNaquadah.java
index 43e43a1d4e..90db739be7 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchNaquadah.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchNaquadah.java
@@ -120,30 +120,26 @@ public class MTEHatchNaquadah extends MTEHatchInput {
 
     private static String[] aDescCache = new String[3];
 
-    private String formatFluidString(FluidStack f) {
-        FluidStack mLockedStack = f;
-        Integer mLockedTemp = 0;;
-        String mTempMod = "" + EnumChatFormatting.RESET;
-        mLockedTemp = mLockedStack.getFluid()
+    private String formatFluidString(FluidStack fluidStack) {
+        String mTempMod = EnumChatFormatting.RESET.toString();
+        int mLockedTemp = fluidStack.getFluid()
             .getTemperature();
-        if (mLockedTemp != null) {
-            if (mLockedTemp <= -3000) {
-                mTempMod = "" + EnumChatFormatting.DARK_PURPLE;
-            } else if (mLockedTemp >= -2999 && mLockedTemp <= -500) {
-                mTempMod = "" + EnumChatFormatting.DARK_BLUE;
-            } else if (mLockedTemp >= -499 && mLockedTemp <= -50) {
-                mTempMod = "" + EnumChatFormatting.BLUE;
-            } else if (mLockedTemp >= 30 && mLockedTemp <= 300) {
-                mTempMod = "" + EnumChatFormatting.AQUA;
-            } else if (mLockedTemp >= 301 && mLockedTemp <= 800) {
-                mTempMod = "" + EnumChatFormatting.YELLOW;
-            } else if (mLockedTemp >= 801 && mLockedTemp <= 1500) {
-                mTempMod = "" + EnumChatFormatting.GOLD;
-            } else if (mLockedTemp >= 1501) {
-                mTempMod = "" + EnumChatFormatting.RED;
-            }
+        if (mLockedTemp <= -3000) {
+            mTempMod = "" + EnumChatFormatting.DARK_PURPLE;
+        } else if (mLockedTemp <= -500) {
+            mTempMod = "" + EnumChatFormatting.DARK_BLUE;
+        } else if (mLockedTemp <= -50) {
+            mTempMod = "" + EnumChatFormatting.BLUE;
+        } else if (mLockedTemp >= 30 && mLockedTemp <= 300) {
+            mTempMod = "" + EnumChatFormatting.AQUA;
+        } else if (mLockedTemp >= 301 && mLockedTemp <= 800) {
+            mTempMod = "" + EnumChatFormatting.YELLOW;
+        } else if (mLockedTemp >= 801 && mLockedTemp <= 1500) {
+            mTempMod = "" + EnumChatFormatting.GOLD;
+        } else if (mLockedTemp >= 1501) {
+            mTempMod = "" + EnumChatFormatting.RED;
         }
-        return mTempMod + mLockedStack.getLocalizedName();
+        return mTempMod + fluidStack.getLocalizedName();
     }
 
     @Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GTPPMultiBlockBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GTPPMultiBlockBase.java
index 738afb0d90..b1af2451aa 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GTPPMultiBlockBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GTPPMultiBlockBase.java
@@ -2,7 +2,6 @@ package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base;
 
 import static gregtech.api.util.GTUtility.filterValidMTEs;
 
-import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -208,7 +207,7 @@ public abstract class GTPPMultiBlockBase<T extends MTEExtendedPowerMultiBlockBas
                         + ": "
                         + EnumChatFormatting.YELLOW
                         + GTValues.VN[GTUtility.getTier(getMaxInputVoltage())]
-                        + EnumChatFormatting.RESET));;
+                        + EnumChatFormatting.RESET));
         }
         if (!this.mAllDynamoHatches.isEmpty()) {
             long storedEnergy = getStoredEnergyInAllDynamoHatches();
@@ -843,43 +842,11 @@ public abstract class GTPPMultiBlockBase<T extends MTEExtendedPowerMultiBlockBas
      * Enable Texture Casing Support if found in GT 5.09
      */
     public boolean updateTexture(final IMetaTileEntity aTileEntity, int aCasingID) {
-        try { // gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch.updateTexture(int)
-
-            final IMetaTileEntity aMetaTileEntity = aTileEntity;
-            if (aMetaTileEntity == null) {
-                return false;
-            }
-            Method mProper = ReflectionUtils.getMethod(MTEHatch.class, "updateTexture", int.class);
-            if (mProper != null) {
-                if (MTEHatch.class.isInstance(aMetaTileEntity)) {
-                    mProper.setAccessible(true);
-                    mProper.invoke(aMetaTileEntity, aCasingID);
-                    // log("Good Method Call for updateTexture.");
-                    return true;
-                }
-            } else {
-                log("Bad Method Call for updateTexture.");
-                if (MTEHatch.class.isInstance(aMetaTileEntity)) {
-                    if (aCasingID <= Byte.MAX_VALUE) {
-                        ((MTEHatch) aTileEntity).updateTexture(aCasingID);
-                        log(
-                            "Good Method Call for updateTexture. Used fallback method of setting mMachineBlock as casing id was <= 128.");
-                        return true;
-                    } else {
-                        log("updateTexture returning false. 1.2");
-                    }
-                } else {
-                    log("updateTexture returning false. 1.3");
-                }
-            }
-            log("updateTexture returning false. 1");
-            return false;
-        } catch (SecurityException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
-            log("updateTexture returning false.");
-            log("updateTexture returning false. 2");
-            e.printStackTrace();
-            return false;
+        if (aTileEntity instanceof MTEHatch mteHatch) {
+            mteHatch.updateTexture(aCasingID);
+            return true;
         }
+        return false;
     }
 
     /**
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenFluidCanning.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenFluidCanning.java
index c9f627c0d5..a334fd7de4 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenFluidCanning.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenFluidCanning.java
@@ -13,7 +13,6 @@ import gtPlusPlus.api.interfaces.RunnableWithInfo;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
 
 public class RecipeGenFluidCanning implements Runnable {
 
@@ -206,13 +205,7 @@ public class RecipeGenFluidCanning implements Runnable {
     }
 
     private void dumpStack() {
-        int parents = 2;
-        for (int i = 0; i < 6; i++) {
-            Logger.INFO(
-                (disableOptional ? "EXTRACTING" : "CANNING") + " DEBUG | "
-                    + (i == 0 ? "Called from: " : "Parent: ")
-                    + ReflectionUtils.getMethodName(i + parents));
-        }
+        Logger.modLogger.info((disableOptional ? "EXTRACTING" : "CANNING") + " DEBUG ", new Exception());
     }
 
     private int getMapSize(RecipeMap<?> aMap) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenRecycling.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenRecycling.java
index 8fe051dd71..305422ccea 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenRecycling.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGenRecycling.java
@@ -28,7 +28,6 @@ import gtPlusPlus.core.material.Material;
 import gtPlusPlus.core.material.state.MaterialState;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
 
 public class RecipeGenRecycling implements Runnable {
 
@@ -252,11 +251,7 @@ public class RecipeGenRecycling implements Runnable {
     public static ItemStack get(final Object aName, final ItemStack aReplacement, final long aAmount,
         final boolean aMentionPossibleTypos, final boolean aNoInvalidAmounts) {
         if (aNoInvalidAmounts && (aAmount < 1L)) {
-            Logger.WARNING("Returning Null. Method: " + ReflectionUtils.getMethodName(0));
-            Logger.WARNING("Called from method: " + ReflectionUtils.getMethodName(1));
-            Logger.WARNING("Called from method: " + ReflectionUtils.getMethodName(2));
-            Logger.WARNING("Called from method: " + ReflectionUtils.getMethodName(3));
-            Logger.WARNING("Called from method: " + ReflectionUtils.getMethodName(4));
+            Logger.modLogger.warn("Returning Null. Method: ", new Exception());
             return null;
         }
         if (!mNameMap.containsKey(aName.toString()) && aMentionPossibleTypos) {
@@ -269,11 +264,7 @@ public class RecipeGenRecycling implements Runnable {
 
     public static ItemStack getFirstOre(final Object aName, final long aAmount) {
         if (GTUtility.isStringInvalid(aName)) {
-            Logger.WARNING("Returning Null. Method: " + ReflectionUtils.getMethodName(0));
-            Logger.WARNING("Called from method: " + ReflectionUtils.getMethodName(1));
-            Logger.WARNING("Called from method: " + ReflectionUtils.getMethodName(2));
-            Logger.WARNING("Called from method: " + ReflectionUtils.getMethodName(3));
-            Logger.WARNING("Called from method: " + ReflectionUtils.getMethodName(4));
+            Logger.modLogger.warn("Returning Null. Method: ", new Exception());
             return null;
         }
         final ItemStack tStack = mNameMap.get(aName.toString());
-- 
cgit