Untangle IEnergyConnected and IHasWorldObjectAndCoords to allow FMP tiles to support IEnergyConnected (#1794)

3 files changed, 31 insertions, 28 deletions

diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IBasicEnergyContainer.java b/src/main/java/gregtech/api/interfaces/tileentity/IBasicEnergyContainer.java
index 44b59ffce1..4e64742db0 100644
--- a/src/main/java/gregtech/api/interfaces/tileentity/IBasicEnergyContainer.java
+++ b/src/main/java/gregtech/api/interfaces/tileentity/IBasicEnergyContainer.java
@@ -3,7 +3,7 @@ package gregtech.api.interfaces.tileentity;
 /**
  * Interface for internal Code, which is mainly used for independent Energy conversion.
  */
-public interface IBasicEnergyContainer extends IEnergyConnected {
+public interface IBasicEnergyContainer extends IEnergyConnected, IHasWorldObjectAndCoords {
 
     /**
      * Gets if that Amount of Energy is stored inside the Machine. It is used for checking the contained Energy before
diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConductor.java b/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConductor.java
index f136434c54..e285c6f0e3 100644
--- a/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConductor.java
+++ b/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConductor.java
@@ -7,7 +7,7 @@ import gregtech.api.enums.Materials;
  * <p/>
  * Not all Data might be reliable. This is just for Information sake.
  */
-public interface IEnergyConductor extends IEnergyConnected {
+public interface IEnergyConductor extends IEnergyConnected, IHasWorldObjectAndCoords {
 
     /**
      * @return if this is actually a Cable. (you must check this)
diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java b/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java
index d046418ea6..4fcfc861bb 100644
--- a/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java
+++ b/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java
@@ -15,7 +15,7 @@ import ic2.api.energy.tile.IEnergySink;
  * coloured Blocks to each other. IHasWorldObjectAndCoords is needed for the InWorld related Stuff. @BaseTileEntity does
  * implement most of that Interface.
  */
-public interface IEnergyConnected extends IColoredTileEntity, IHasWorldObjectAndCoords {
+public interface IEnergyConnected extends IColoredTileEntity {
 
     /**
      * Inject Energy Call for Electricity. Gets called by EnergyEmitters to inject Energy into your Block
@@ -58,33 +58,36 @@ public interface IEnergyConnected extends IColoredTileEntity, IHasWorldObjectAnd
          */
         public static long emitEnergyToNetwork(long aVoltage, long aAmperage, IEnergyConnected aEmitter) {
             long rUsedAmperes = 0;
-            for (byte i = 0, j = 0; i < 6 && aAmperage > rUsedAmperes; i++) {
-                if (aEmitter.outputsEnergyTo(i)) {
-                    j = GT_Utility.getOppositeSide(i);
-                    final TileEntity tTileEntity = aEmitter.getTileEntityAtSide(i);
-                    if (tTileEntity instanceof IEnergyConnected) {
-                        if (aEmitter.getColorization() >= 0) {
-                            final byte tColor = ((IEnergyConnected) tTileEntity).getColorization();
-                            if (tColor >= 0 && tColor != aEmitter.getColorization()) continue;
-                        }
-                        rUsedAmperes += ((IEnergyConnected) tTileEntity)
-                                .injectEnergyUnits(j, aVoltage, aAmperage - rUsedAmperes);
+            if (aEmitter instanceof IHasWorldObjectAndCoords) {
+                IHasWorldObjectAndCoords emitterTile = (IHasWorldObjectAndCoords) aEmitter;
+                for (byte i = 0, j = 0; i < 6 && aAmperage > rUsedAmperes; i++) {
+                    if (aEmitter.outputsEnergyTo(i)) {
+                        j = GT_Utility.getOppositeSide(i);
+                        final TileEntity tTileEntity = emitterTile.getTileEntityAtSide(i);
+                        if (tTileEntity instanceof IEnergyConnected) {
+                            if (aEmitter.getColorization() >= 0) {
+                                final byte tColor = ((IEnergyConnected) tTileEntity).getColorization();
+                                if (tColor >= 0 && tColor != aEmitter.getColorization()) continue;
+                            }
+                            rUsedAmperes += ((IEnergyConnected) tTileEntity)
+                                    .injectEnergyUnits(j, aVoltage, aAmperage - rUsedAmperes);
 
-                    } else if (tTileEntity instanceof IEnergySink) {
-                        if (((IEnergySink) tTileEntity)
-                                .acceptsEnergyFrom((TileEntity) aEmitter, ForgeDirection.getOrientation(j))) {
-                            while (aAmperage > rUsedAmperes && ((IEnergySink) tTileEntity).getDemandedEnergy() > 0
-                                    && ((IEnergySink) tTileEntity)
-                                            .injectEnergy(ForgeDirection.getOrientation(j), aVoltage, aVoltage)
-                                            < aVoltage)
+                        } else if (tTileEntity instanceof IEnergySink) {
+                            if (((IEnergySink) tTileEntity)
+                                    .acceptsEnergyFrom((TileEntity) aEmitter, ForgeDirection.getOrientation(j))) {
+                                while (aAmperage > rUsedAmperes && ((IEnergySink) tTileEntity).getDemandedEnergy() > 0
+                                        && ((IEnergySink) tTileEntity)
+                                                .injectEnergy(ForgeDirection.getOrientation(j), aVoltage, aVoltage)
+                                                < aVoltage)
+                                    rUsedAmperes++;
+                            }
+                        } else if (GregTech_API.mOutputRF && tTileEntity instanceof IEnergyReceiver) {
+                            final ForgeDirection tDirection = ForgeDirection.getOrientation(i).getOpposite();
+                            final int rfOut = GT_Utility.safeInt(aVoltage * GregTech_API.mEUtoRF / 100);
+                            if (((IEnergyReceiver) tTileEntity).receiveEnergy(tDirection, rfOut, true) == rfOut) {
+                                ((IEnergyReceiver) tTileEntity).receiveEnergy(tDirection, rfOut, false);
                                 rUsedAmperes++;
-                        }
-                    } else if (GregTech_API.mOutputRF && tTileEntity instanceof IEnergyReceiver) {
-                        final ForgeDirection tDirection = ForgeDirection.getOrientation(i).getOpposite();
-                        final int rfOut = GT_Utility.safeInt(aVoltage * GregTech_API.mEUtoRF / 100);
-                        if (((IEnergyReceiver) tTileEntity).receiveEnergy(tDirection, rfOut, true) == rfOut) {
-                            ((IEnergyReceiver) tTileEntity).receiveEnergy(tDirection, rfOut, false);
-                            rUsedAmperes++;
+                            }
                         }
                     }
                 }