Moved amp getter from energy hatch to hatch class (#1647)

3 files changed, 9 insertions, 14 deletions

diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch.java
index 94721d2096..8f4739fec1 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch.java
@@ -142,6 +142,14 @@ public abstract class GT_MetaTileEntity_Hatch extends GT_MetaTileEntity_BasicTan
         mTexturePage = 0;
     }
 
+    /** Get the maximum amount of amperes to work with, which excludes the additional amps in for loss
+     *
+     * @return Working amps
+     */
+    public long maxWorkingAmperesIn() {
+        return maxAmperesIn();
+    }
+
     @Override
     public final byte getUpdateData() {
         return (byte) (actualTexture & 0x7F);
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Energy.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Energy.java
index a9af3c8462..1b4def6dc3 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Energy.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Energy.java
@@ -106,14 +106,6 @@ public class GT_MetaTileEntity_Hatch_Energy extends GT_MetaTileEntity_Hatch {
         return 2;
     }
 
-    /** Get the maximum amount of amperes to work with, which excludes the additional amps in for loss
-     *
-     * @return Working amps
-     */
-    public long maxWorkingAmperesIn() {
-        return maxAmperesIn();
-    }
-
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
         return new GT_MetaTileEntity_Hatch_Energy(mName, mTier, mDescriptionArray, mTextures);
diff --git a/src/main/java/gregtech/api/util/GT_ExoticEnergyInputHelper.java b/src/main/java/gregtech/api/util/GT_ExoticEnergyInputHelper.java
index 2e34fb3332..01ecb47633 100644
--- a/src/main/java/gregtech/api/util/GT_ExoticEnergyInputHelper.java
+++ b/src/main/java/gregtech/api/util/GT_ExoticEnergyInputHelper.java
@@ -4,7 +4,6 @@ import static gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Mult
 
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -78,11 +77,7 @@ public class GT_ExoticEnergyInputHelper {
         long rAmp = 0;
         for (GT_MetaTileEntity_Hatch tHatch : hatches)
             if (isValidMetaTileEntity(tHatch)) {
-                if (tHatch instanceof GT_MetaTileEntity_Hatch_Energy) {
-                    rAmp += ((GT_MetaTileEntity_Hatch_Energy) tHatch).maxWorkingAmperesIn();
-                } else {
-                    rAmp += tHatch.getBaseMetaTileEntity().getInputAmperage();
-                }
+                rAmp += tHatch.maxWorkingAmperesIn();
             }
         return rAmp;
     }