use new working ampere api instead of reflection

4 files changed, 14 insertions, 49 deletions

diff --git a/src/main/java/net/glease/ggfab/DevEnvFixer.java b/src/main/java/net/glease/ggfab/DevEnvFixer.java
new file mode 100644
index 0000000000..e1c294126c
--- /dev/null
+++ b/src/main/java/net/glease/ggfab/DevEnvFixer.java
@@ -0,0 +1,11 @@
+package net.glease.ggfab;
+
+import gregtech.loaders.materialprocessing.ProcessingModSupport;
+
+public class DevEnvFixer implements Runnable {
+    @Override
+    public void run() {
+        ProcessingModSupport.aTGregSupport = true;
+        ProcessingModSupport.aEnableThermalFoundationMats = true;
+    }
+}
diff --git a/src/main/java/net/glease/ggfab/GigaGramFab.java b/src/main/java/net/glease/ggfab/GigaGramFab.java
index 994fad8893..a35a7e3355 100644
--- a/src/main/java/net/glease/ggfab/GigaGramFab.java
+++ b/src/main/java/net/glease/ggfab/GigaGramFab.java
@@ -18,7 +18,8 @@ public class GigaGramFab {
 
     @Mod.EventHandler
     public void preInit(FMLPreInitializationEvent event) {
-        ProcessingModSupport.aTGregSupport =true;
+        if ((Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment"))
+            new DevEnvFixer().run();
         GregTech_API.sAfterGTPreload.add(() -> {
             GGItemList.AdvAssLine.set(new MTE_AdvAssLine(13532, "ggfab.machine.adv_assline", "Advanced Assembly Line").getStackForm(1));
             GGItemList.LinkedInputBus.set(new MTE_LinkedInputBus(13533, "ggfab.machine.linked_input_bus", "Linked Input Bus", 5).getStackForm(1));
diff --git a/src/main/java/net/glease/ggfab/mte/MTE_AdvAssLine.java b/src/main/java/net/glease/ggfab/mte/MTE_AdvAssLine.java
index 16fd36efca..4ff4b7fad4 100644
--- a/src/main/java/net/glease/ggfab/mte/MTE_AdvAssLine.java
+++ b/src/main/java/net/glease/ggfab/mte/MTE_AdvAssLine.java
@@ -18,7 +18,6 @@ import mcp.mobius.waila.api.IWailaConfigHandler;
 import mcp.mobius.waila.api.IWailaDataAccessor;
 import net.glease.ggfab.ConfigurationHandler;
 import net.glease.ggfab.GGConstants;
-import net.glease.ggfab.util.LaserHelper;
 import net.glease.ggfab.util.OverclockHelper;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.entity.player.EntityPlayerMP;
@@ -29,7 +28,6 @@ import net.minecraft.nbt.NBTTagList;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ChatComponentTranslation;
-import net.minecraft.util.IChatComponent;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.Constants;
 import net.minecraftforge.common.util.ForgeDirection;
@@ -420,7 +418,7 @@ public class MTE_AdvAssLine extends GT_MetaTileEntity_ExtendedPowerMultiBlockBas
     private void recordEnergySupplier(GT_MetaTileEntity_Hatch hatch) {
         if (!isValidMetaTileEntity(hatch))
             return;
-        inputEUt += hatch.maxEUInput() * LaserHelper.getAmperes(hatch);
+        inputEUt += hatch.maxEUInput() * hatch.maxWorkingAmperesIn();
         inputVoltage = Math.min(inputVoltage, hatch.maxEUInput());
         if (inputEUt < 0)
             inputEUt = Long.MAX_VALUE;
diff --git a/src/main/java/net/glease/ggfab/util/LaserHelper.java b/src/main/java/net/glease/ggfab/util/LaserHelper.java
deleted file mode 100644
index 53bf328eb7..0000000000
--- a/src/main/java/net/glease/ggfab/util/LaserHelper.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package net.glease.ggfab.util;
-
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
-
-import java.lang.reflect.Field;
-
-public class LaserHelper {
-    private static final Class<?> GT_MetaTileEntity_Hatch_EnergyMulti;
-    private static final Field fieldAmperes;
-
-    static {
-        Class<?> tmp1;
-        Field tmp2;
-        try {
-            tmp1 = Class.forName("com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyMulti");
-        } catch (ClassNotFoundException e) {
-            tmp1 = null;
-        }
-        if (tmp1 != null) {
-            try {
-                tmp2 = tmp1.getField("Amperes");
-                tmp2.setAccessible(true);
-            } catch (ReflectiveOperationException e) {
-                tmp1 = null;
-                tmp2 = null;
-            }
-        } else {
-            tmp2 = null;
-        }
-        GT_MetaTileEntity_Hatch_EnergyMulti = tmp1;
-        fieldAmperes = tmp2;
-    }
-
-    public static long getAmperes(GT_MetaTileEntity_Hatch hatch) {
-        if (GT_MetaTileEntity_Hatch_EnergyMulti.isInstance(hatch)) {
-            try {
-                // target field is int, not long
-                return (int) fieldAmperes.get(hatch);
-            } catch (IllegalAccessException e) {
-                throw new RuntimeException(e);
-            }
-        }
-        return hatch.maxAmperesIn();
-    }
-}