Remove more reflection + reorganize mixin accessors packages (#3260)

Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: boubou19 <miisterunknown@gmail.com>

2 files changed, 15 insertions, 52 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java
index fedd28f342..9f82936035 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java
@@ -143,7 +143,7 @@ public enum GregtechOrePrefixes {
      */
     public int mMaterialGenerationBits = 0;
 
-    private GregtechOrePrefixes(final String aRegularLocalName, final String aLocalizedMaterialPre,
+    GregtechOrePrefixes(final String aRegularLocalName, final String aLocalizedMaterialPre,
         final String aLocalizedMaterialPost, final boolean aIsUnificatable, final boolean aIsMaterialBased,
         final boolean aIsSelfReferencing, final boolean aIsContainer, final boolean aDontUnificateActively,
         final boolean aIsUsedForBlocks, final boolean aAllowNormalRecycling, final boolean aGenerateDefaultItem,
@@ -277,18 +277,6 @@ public enum GregtechOrePrefixes {
         return "";
     }
 
-    public static GregtechOrePrefixes getPrefix(final String aPrefixName) {
-        return getPrefix(aPrefixName, null);
-    }
-
-    public static GregtechOrePrefixes getPrefix(final String aPrefixName, final GregtechOrePrefixes aReplacement) {
-        final Object tObject = GTUtility.getFieldContent(GregtechOrePrefixes.class, aPrefixName, false, false);
-        if ((tObject != null) && (tObject instanceof GregtechOrePrefixes)) {
-            return (GregtechOrePrefixes) tObject;
-        }
-        return aReplacement;
-    }
-
     public static Materials getMaterial(final String aOre) {
         return Materials.get(stripPrefix(aOre));
     }
@@ -302,7 +290,7 @@ public enum GregtechOrePrefixes {
     }
 
     public static boolean isInstanceOf(final String aName, final GregtechOrePrefixes aPrefix) {
-        return aName == null ? false : aName.startsWith(aPrefix.toString());
+        return aName != null && aName.startsWith(aPrefix.toString());
     }
 
     public boolean add(final ItemStack aStack) {
@@ -717,7 +705,7 @@ public enum GregtechOrePrefixes {
          */
         public final Fluid mStandardMoltenFluid = null;
 
-        private GT_Materials(final int aMetaItemSubID, final TextureSet aIconSet, final float aToolSpeed,
+        GT_Materials(final int aMetaItemSubID, final TextureSet aIconSet, final float aToolSpeed,
             final int aToolDurability, final int aToolQuality, final boolean aUnificatable) {
             this.mUnificatable = aUnificatable;
             this.mMaterialInto = this;
@@ -735,7 +723,7 @@ public enum GregtechOrePrefixes {
             }
         }
 
-        private GT_Materials(final GT_Materials aMaterialInto, final boolean aReRegisterIntoThis) {
+        GT_Materials(final GT_Materials aMaterialInto, final boolean aReRegisterIntoThis) {
             this.mUnificatable = false;
             this.mDefaultLocalName = aMaterialInto.mDefaultLocalName;
             this.mMaterialInto = aMaterialInto.mMaterialInto;
@@ -767,7 +755,7 @@ public enum GregtechOrePrefixes {
          * @param aBlastFurnaceRequired If this requires a Blast Furnace.
          * @param aColor                Vanilla MC Wool Color which comes the closest to this.
          */
-        private GT_Materials(final int aMetaItemSubID, final TextureSet aIconSet, final float aToolSpeed,
+        GT_Materials(final int aMetaItemSubID, final TextureSet aIconSet, final float aToolSpeed,
             final int aToolDurability, final int aToolQuality, final int aTypes, final int aR, final int aG,
             final int aB, final int aA, final String aLocalName, final int aFuelType, final int aFuelPower,
             final int aMeltingPoint, final int aBlastFurnaceTemp, final boolean aBlastFurnaceRequired,
@@ -799,7 +787,7 @@ public enum GregtechOrePrefixes {
             }
         }
 
-        private GT_Materials(final int aMetaItemSubID, final TextureSet aIconSet, final float aToolSpeed,
+        GT_Materials(final int aMetaItemSubID, final TextureSet aIconSet, final float aToolSpeed,
             final int aToolDurability, final int aToolQuality, final int aTypes, final int aR, final int aG,
             final int aB, final int aA, final String aLocalName, final int aFuelType, final int aFuelPower,
             final int aMeltingPoint, final int aBlastFurnaceTemp, final boolean aBlastFurnaceRequired,
@@ -833,7 +821,7 @@ public enum GregtechOrePrefixes {
         /**
          * @param aElement The Element Enum represented by this Material
          */
-        private GT_Materials(final int aMetaItemSubID, final TextureSet aIconSet, final float aToolSpeed,
+        GT_Materials(final int aMetaItemSubID, final TextureSet aIconSet, final float aToolSpeed,
             final int aToolDurability, final int aToolQuality, final int aTypes, final int aR, final int aG,
             final int aB, final int aA, final String aLocalName, final int aFuelType, final int aFuelPower,
             final int aMeltingPoint, final int aBlastFurnaceTemp, final boolean aBlastFurnaceRequired,
@@ -872,7 +860,7 @@ public enum GregtechOrePrefixes {
             this.mAspects.addAll(aAspects);
         }
 
-        private GT_Materials(final int aMetaItemSubID, final TextureSet aIconSet, final float aToolSpeed,
+        GT_Materials(final int aMetaItemSubID, final TextureSet aIconSet, final float aToolSpeed,
             final int aToolDurability, final int aToolQuality, final int aTypes, final int aR, final int aG,
             final int aB, final int aA, final String aLocalName, final int aFuelType, final int aFuelPower,
             final int aMeltingPoint, final int aBlastFurnaceTemp, final boolean aBlastFurnaceRequired,
@@ -905,7 +893,7 @@ public enum GregtechOrePrefixes {
                 null);
         }
 
-        private GT_Materials(final int aMetaItemSubID, final TextureSet aIconSet, final float aToolSpeed,
+        GT_Materials(final int aMetaItemSubID, final TextureSet aIconSet, final float aToolSpeed,
             final int aToolDurability, final int aToolQuality, final int aTypes, final int aR, final int aG,
             final int aB, final int aA, final String aLocalName, final int aFuelType, final int aFuelPower,
             final int aMeltingPoint, final int aBlastFurnaceTemp, final boolean aBlastFurnaceRequired,
@@ -970,18 +958,6 @@ public enum GregtechOrePrefixes {
             }
         }
 
-        public static GT_Materials get(final String aMaterialName) {
-            final Object tObject = GTUtility.getFieldContent(GT_Materials.class, aMaterialName, false, false);
-            if ((tObject != null) && (tObject instanceof GT_Materials)) {
-                return (GT_Materials) tObject;
-            }
-            return _NULL;
-        }
-
-        public static GT_Materials getRealMaterial(final String aMaterialName) {
-            return get(aMaterialName).mMaterialInto;
-        }
-
         /**
          * Called in preInit with the Config to set Values.
          *
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTERTGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTERTGenerator.java
index d94c764e53..9b51724b35 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTERTGenerator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTERTGenerator.java
@@ -23,8 +23,8 @@ import gtPlusPlus.api.recipe.GTPPRecipeMaps;
 import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
+import tectech.util.TTUtility;
 
 public class MTERTGenerator extends MTEBasicGenerator {
 
@@ -45,13 +45,11 @@ public class MTERTGenerator extends MTEBasicGenerator {
 
     // Generates fuel value based on MC days
     public static int convertDaysToTicks(float days) {
-        int value = 0;
-        value = MathUtils.roundToClosestInt(20 * 86400 * days);
-        return value;
+        return MathUtils.roundToClosestInt(20 * 86400 * days);
     }
 
     public static long getTotalEUGenerated(int ticks, int voltage) {
-        return ticks * voltage;
+        return (long) ticks * voltage;
     }
 
     @Override
@@ -84,18 +82,7 @@ public class MTERTGenerator extends MTEBasicGenerator {
         this.mDaysRemaining = aNBT.getInteger("mDaysRemaining");
         this.mDayTick = aNBT.getInteger("mDayTick");
         this.mNewTier = aNBT.getByte("mNewTier");
-
-        try {
-            ReflectionUtils.setByte(this, "mTier", this.mNewTier);
-        } catch (Exception e) {
-            if (this.getBaseMetaTileEntity() != null) {
-                IGregTechTileEntity thisTile = this.getBaseMetaTileEntity();
-                if (thisTile.isAllowedToWork() || thisTile.isActive()) {
-                    thisTile.setActive(false);
-                }
-            }
-        }
-
+        TTUtility.setTier(this.mNewTier, this);
         final NBTTagList list = aNBT.getTagList("mRecipeItem", 10);
         final NBTTagCompound data = list.getCompoundTagAt(0);
         ItemStack lastUsedFuel = ItemStack.loadItemStackFromNBT(data);
@@ -111,7 +98,7 @@ public class MTERTGenerator extends MTEBasicGenerator {
         if (aBaseMetaTileEntity.isServerSide()) {
             if (this.mDayTick < 24000) {
                 this.mDayTick++;
-            } else if (this.mDayTick >= 24000) {
+            } else {
                 this.mDayTick = 0;
                 this.mDaysRemaining = this.removeDayOfTime();
             }
@@ -327,7 +314,7 @@ public class MTERTGenerator extends MTEBasicGenerator {
                 } else {
                     mTier2 = 0;
                 }
-                ReflectionUtils.setByte(this, "mTier", mTier2);
+                TTUtility.setTier(mTier2, this);
                 this.mNewTier = mTier2;
             } catch (Exception e) {
                 Logger.WARNING("Failed setting mTier.");