1 files changed, 44 insertions, 30 deletions
diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java b/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java
index 4fcfc861bb..92d2482014 100644
--- a/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java
+++ b/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java
@@ -5,6 +5,8 @@ import net.minecraftforge.common.util.ForgeDirection;
 
 import cofh.api.energy.IEnergyReceiver;
 import gregtech.api.GregTech_API;
+import gregtech.api.logic.PowerLogic;
+import gregtech.api.logic.interfaces.PowerLogicHost;
 import gregtech.api.util.GT_Utility;
 import ic2.api.energy.tile.IEnergySink;
 
@@ -58,37 +60,49 @@ public interface IEnergyConnected extends IColoredTileEntity {
          */
         public static long emitEnergyToNetwork(long aVoltage, long aAmperage, IEnergyConnected aEmitter) {
             long rUsedAmperes = 0;
-            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);
+            if (!(aEmitter instanceof IHasWorldObjectAndCoords)) {
+                return 0;
+            }
+
+            IHasWorldObjectAndCoords emitterTile = (IHasWorldObjectAndCoords) aEmitter;
+            for (byte i = 0, j = 0; i < 6 && aAmperage > rUsedAmperes; i++) {
+                if (!aEmitter.outputsEnergyTo(i)) {
+                    continue;
+                }
 
-                        } 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++;
-                            }
-                        }
+                j = GT_Utility.getOppositeSide(i);
+                final TileEntity tTileEntity = emitterTile.getTileEntityAtSide(i);
+                if (tTileEntity instanceof PowerLogicHost) {
+                    PowerLogicHost host = (PowerLogicHost) tTileEntity;
+
+                    PowerLogic logic = host.getPowerLogic(j);
+                    if (logic == null || logic.isEnergyReceiver()) {
+                        continue;
+                    }
+
+                    rUsedAmperes += logic.injectEnergy(aVoltage, aAmperage - rUsedAmperes);
+                } else 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)
+                            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++;
                     }
                 }
             }