Merge pull request #572 from GTNewHorizons/beter-power-net

Better power net

1 files changed, 36 insertions, 182 deletions

diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java
index 93d947b9d0..b15e520da7 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java
@@ -9,6 +9,12 @@ import gregtech.api.enums.Dyes;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.TextureSet;
 import gregtech.api.enums.Textures;
+import gregtech.api.graphs.PowerNode;
+import gregtech.api.graphs.PowerNodes;
+import gregtech.api.graphs.consumers.ConsumerNode;
+import gregtech.api.graphs.Node;
+import gregtech.api.graphs.NodeList;
+import gregtech.api.graphs.paths.PowerNodePath;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntityCable;
@@ -18,10 +24,7 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.BaseMetaPipeEntity;
 import gregtech.api.metatileentity.MetaPipeEntity;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_CoverBehavior;
-import gregtech.api.util.GT_GC_Compat;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.*;
 import gregtech.common.GT_Client;
 import gregtech.common.covers.GT_Cover_SolarPanel;
 import ic2.api.energy.EnergyNet;
@@ -158,7 +161,8 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
     		return 0;
         if (!getBaseMetaTileEntity().getCoverBehaviorAtSide(aSide).letsEnergyIn(aSide, getBaseMetaTileEntity().getCoverIDAtSide(aSide), getBaseMetaTileEntity().getCoverDataAtSide(aSide), getBaseMetaTileEntity()))
             return 0;
-        return transferElectricity(aSide, aVoltage, aAmperage, Sets.newHashSet((TileEntity) getBaseMetaTileEntity()));
+        HashSet<TileEntity> nul = null;
+        return transferElectricity(aSide, aVoltage, aAmperage,nul);
     }
 
     @Override
@@ -169,118 +173,30 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
 
     @Override
     public long transferElectricity(byte aSide, long aVoltage, long aAmperage, HashSet<TileEntity> aAlreadyPassedSet) {
-        if (!isConnectedAtSide(aSide) && aSide != 6) return 0;
-
-        long rUsedAmperes = 0;
-        final IGregTechTileEntity baseMetaTile = getBaseMetaTileEntity();
-        byte i = (byte)((((aSide/2)*2)+2)%6); //this bit of trickery makes sure a direction goes to the next cardinal pair.  IE, NS goes to E, EW goes to U, UD goes to N.  It's a lame way to make sure locally connected machines on a wire get EU first.
-        aVoltage -= mCableLossPerMeter;
-        
-        if (aVoltage > 0) for (byte j = 0; j < 6 && aAmperage > rUsedAmperes; j++, i=(byte)((i+1)%6) )
-            if (i != aSide && isConnectedAtSide(i) && baseMetaTile.getCoverBehaviorAtSide(i).letsEnergyOut(i, baseMetaTile.getCoverIDAtSide(i), baseMetaTile.getCoverDataAtSide(i), baseMetaTile)) {
-                final TileEntity tTileEntity = baseMetaTile.getTileEntityAtSide(i);
-
-                if (tTileEntity != null && aAlreadyPassedSet.add(tTileEntity)) {
-                    final byte tSide = GT_Utility.getOppositeSide(i);
-                    final IGregTechTileEntity tBaseMetaTile = tTileEntity instanceof IGregTechTileEntity ? ((IGregTechTileEntity) tTileEntity) : null;
-                    final IMetaTileEntity tMeta = tBaseMetaTile != null ? tBaseMetaTile.getMetaTileEntity() : null;
-
-                    if (tMeta instanceof IMetaTileEntityCable) {
-                        if (tBaseMetaTile.getCoverBehaviorAtSide(tSide).letsEnergyIn(tSide, tBaseMetaTile.getCoverIDAtSide(tSide), tBaseMetaTile.getCoverDataAtSide(tSide), tBaseMetaTile) && ((IGregTechTileEntity) tTileEntity).getTimer() > 50) {
-                            rUsedAmperes += ((IMetaTileEntityCable) ((IGregTechTileEntity) tTileEntity).getMetaTileEntity()).transferElectricity(tSide, aVoltage, aAmperage - rUsedAmperes, aAlreadyPassedSet);
-                        }
-                    } else {
-                        rUsedAmperes += insertEnergyInto(tTileEntity, tSide, aVoltage, aAmperage - rUsedAmperes);
-                    }
-
-                }
-            }
-        mTransferredVoltage = Math.max(mTransferredVoltage, aVoltage);
-        mTransferredAmperage += rUsedAmperes;
-        mTransferredVoltageLast20 = Math.max(mTransferredVoltageLast20, aVoltage);
-        mTransferredAmperageLast20 = Math.max(mTransferredAmperageLast20, mTransferredAmperage);
-        if (aVoltage > mVoltage) {
-            mOverheat += Math.max(100, 100 * GT_Utility.getTier(aVoltage) - GT_Utility.getTier(mVoltage));
-        }
-        if (mTransferredAmperage > mAmperage) return aAmperage;
-
-        // Always return amount of used amperes, used on overheat
-        return rUsedAmperes;
-    }
-
-
-
-    private long insertEnergyInto(TileEntity tTileEntity, byte tSide, long aVoltage, long aAmperage) {
-        if (aAmperage == 0 || tTileEntity == null) return 0;
-
-        final IGregTechTileEntity baseMetaTile = getBaseMetaTileEntity();
-        final ForgeDirection tDirection = ForgeDirection.getOrientation(tSide);
-
-        if (tTileEntity instanceof IEnergyConnected) {
-            return ((IEnergyConnected) tTileEntity).injectEnergyUnits(tSide, aVoltage, aAmperage);
-        }
-
-        // AE2 Compat
-        if (GT_Mod.gregtechproxy.mAE2Integration && tTileEntity instanceof appeng.tile.powersink.IC2) {
-            if (((appeng.tile.powersink.IC2) tTileEntity).acceptsEnergyFrom((TileEntity) baseMetaTile, tDirection)) {
-                long rUsedAmperes = 0;
-                while (aAmperage > rUsedAmperes && ((appeng.tile.powersink.IC2)tTileEntity).getDemandedEnergy() > 0 && ((appeng.tile.powersink.IC2)tTileEntity).injectEnergy(tDirection, aVoltage, aVoltage) <= aVoltage)
-                    rUsedAmperes++;
-
-                return rUsedAmperes;
-            }
+        if (!getBaseMetaTileEntity().isServerSide() || !isConnectedAtSide(aSide) && aSide != 6) return 0;
+        BaseMetaPipeEntity tBase =(BaseMetaPipeEntity) getBaseMetaTileEntity();
+        if (!(tBase.getNode() instanceof PowerNode))
             return 0;
-        }
-
-        if (Loader.isModLoaded("GalacticraftCore")) {
-            long gc = GT_GC_Compat.insertEnergyInto(tTileEntity, aVoltage, tDirection);
-            if (gc != 2)
-                return gc;
-        }
-
-        // IC2 Compat
-        {
-            final TileEntity tIc2Acceptor = (tTileEntity instanceof IEnergyTile || EnergyNet.instance == null) ? tTileEntity :
-                EnergyNet.instance.getTileEntity(tTileEntity.getWorldObj(), tTileEntity.xCoord, tTileEntity.yCoord, tTileEntity.zCoord);
-
-            if (tIc2Acceptor instanceof IEnergySink && ((IEnergySink) tIc2Acceptor).acceptsEnergyFrom((TileEntity) baseMetaTile, tDirection)) {
-                long rUsedAmperes = 0;
-                while (aAmperage > rUsedAmperes && ((IEnergySink) tIc2Acceptor).getDemandedEnergy() > 0 && ((IEnergySink) tIc2Acceptor).injectEnergy(tDirection, aVoltage, aVoltage) <= aVoltage)
-                    rUsedAmperes++;
-                return rUsedAmperes;
-            }
-        }
-
-        // RF Compat
-        if (GregTech_API.mOutputRF && tTileEntity instanceof IEnergyReceiver) {
-            final IEnergyReceiver rfReceiver = (IEnergyReceiver) tTileEntity;
-            long rfOUT = aVoltage * GregTech_API.mEUtoRF / 100, rUsedAmperes = 0;
-            int rfOut = rfOUT > Integer.MAX_VALUE ? Integer.MAX_VALUE : (int) rfOUT;
-
-            if (rfReceiver.receiveEnergy(tDirection, rfOut, true) == rfOut) {
-                rfReceiver.receiveEnergy(tDirection, rfOut, false);
-                rUsedAmperes++;
-            }
-            else if (rfReceiver.receiveEnergy(tDirection, rfOut, true) > 0) {
-                if (mRestRF == 0) {
-                    int RFtrans = rfReceiver.receiveEnergy(tDirection, rfOut, false);
-                    rUsedAmperes++;
-                    mRestRF = rfOut - RFtrans;
-                } else {
-                    int RFtrans = rfReceiver.receiveEnergy(tDirection, (int) mRestRF, false);
-                    mRestRF = mRestRF - RFtrans;
+        PowerNode tNode =(PowerNode) tBase.getNode();
+        if (tNode != null) {
+            int tPlace = 0;
+            Node[] tToPower = new Node[tNode.mConsumers.size()];
+            if (tNode.mHadVoltage) {
+                for (ConsumerNode consumer : tNode.mConsumers) {
+                    if (consumer.needsEnergy())
+                        tToPower[tPlace++] = consumer;
+                }
+            } else {
+                tNode.mHadVoltage = true;
+                for (ConsumerNode consumer : tNode.mConsumers) {
+                    tToPower[tPlace++] = consumer;
                 }
             }
-            if (GregTech_API.mRFExplosions && rfReceiver.getMaxEnergyStored(tDirection) < rfOut * 600) {
-                if (rfOut > 32 * GregTech_API.mEUtoRF / 100) this.doExplosion(rfOut);
-            }
-            return rUsedAmperes;
+            return PowerNodes.powerNode(tNode,null,new NodeList(tToPower),(int)aVoltage,(int)aAmperage);
         }
-
         return 0;
     }
 
-
     @Override
     public void onFirstTick(IGregTechTileEntity aBaseMetaTileEntity) {
         if(aBaseMetaTileEntity.isServerSide()) {
@@ -290,76 +206,6 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
     }
 
     @Override
-    public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
-        super.onPostTick(aBaseMetaTileEntity, aTick);
-        if (aBaseMetaTileEntity.isServerSide()) {
-
-            { //amp handler
-                long worldTick = aBaseMetaTileEntity.getWorld().getTotalWorldTime();
-                int tickDiff = (int) (worldTick - lastWorldTick);
-                lastWorldTick = worldTick;
-
-                if (tickDiff >= 16) for (int i = 0; i <= 14; i++) lastAmperage[i] = 0;
-                else {
-                    System.arraycopy(lastAmperage, tickDiff, lastAmperage, 0, 16 - tickDiff);
-                    for (int i = 14; i >= 0; i--) {
-                        if (--tickDiff > 0) lastAmperage[i] = 0;
-                        else break;
-                    }
-                }
-
-                lastAmperage[15] = mTransferredAmperage;
-
-                if (lastAmperage[15] > mAmperage) {
-                    int i = 0;
-                    for (; i <= 14; i++) {
-                        if (lastAmperage[i] < mAmperage) {
-                            lastAmperage[15] -= (int) mAmperage - lastAmperage[i];
-                            lastAmperage[i] = (int)mAmperage;
-                            if (lastAmperage[15] <= mAmperage) break;
-                        }
-                    }
-                    if (lastAmperage[15] > mAmperage) {
-                        mOverheat += 100 * (lastAmperage[15] - mAmperage);
-                        lastAmperage[15] = (int) mAmperage;
-                    } else if (lastAmperage[15] < mAmperage) {
-                        lastAmperage[i] = lastAmperage[15];
-                        lastAmperage[15] = (int) mAmperage;
-                    }
-                }
-            }
-
-            if(mOverheat>=mMaxOverheat) {
-                //TODO someday
-                //int newMeta=aBaseMetaTileEntity.getMetaTileID()-6;
-                //if(mInsulated &&
-                //        GregTech_API.METATILEENTITIES[newMeta] instanceof GT_MetaPipeEntity_Cable &&
-                //        ((GT_MetaPipeEntity_Cable)GregTech_API.METATILEENTITIES[newMeta]).mMaterial==mMaterial &&
-                //        ((GT_MetaPipeEntity_Cable)GregTech_API.METATILEENTITIES[newMeta]).mAmperage<=mAmperage){
-                //    aBaseMetaTileEntity.setOnFire();
-                //    aBaseMetaTileEntity.setMetaTileEntity(GregTech_API.METATILEENTITIES[newMeta]);
-                //    return;
-                //}else{
-                    aBaseMetaTileEntity.setToFire();
-                //}
-            }else if (mOverheat>0) mOverheat--;
-
-            mTransferredVoltageOK=mTransferredVoltage;
-            mTransferredVoltage=0;
-            mTransferredAmperageOK=mTransferredAmperage;
-            mTransferredAmperage = 0;
-
-            if (aTick % 20 == 0) {
-                mTransferredVoltageLast20OK=mTransferredVoltageLast20;
-                mTransferredVoltageLast20 = 0;
-                mTransferredAmperageLast20OK=mTransferredAmperageLast20;
-                mTransferredAmperageLast20 = 0;
-                if (!GT_Mod.gregtechproxy.gt6Cable || mCheckConnections) checkConnections();
-            }
-        }
-    }
-
-    @Override
     public boolean onWireCutterRightClick(byte aSide, byte aWrenchingSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
         if (GT_Mod.gregtechproxy.gt6Cable && GT_ModHandler.damageOrDechargeItem(aPlayer.inventory.getCurrentItem(), 1, 500, aPlayer)) {
             if(isConnectedAtSide(aWrenchingSide)) {
@@ -506,15 +352,23 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
 
     @Override
     public String[] getInfoData() {
+        BaseMetaPipeEntity base = (BaseMetaPipeEntity) getBaseMetaTileEntity();
+        PowerNodePath path =(PowerNodePath) base.getNodePath();
+        int amps = 0;
+        int volts = 0;
+        if (path != null) {
+            amps = path.getAmps();
+            volts = path.getVoltage(this);
+        }
         return new String[]{
                 //EnumChatFormatting.BLUE + mName + EnumChatFormatting.RESET,
                 "Heat: "+
                         EnumChatFormatting.RED+ mOverheat +EnumChatFormatting.RESET+" / "+EnumChatFormatting.YELLOW+ mMaxOverheat + EnumChatFormatting.RESET,
                 "Max Load (1t):",
-                EnumChatFormatting.GREEN + Integer.toString(mTransferredAmperageOK) + EnumChatFormatting.RESET +" A / "+
+                EnumChatFormatting.GREEN + Integer.toString(amps) + EnumChatFormatting.RESET +" A / "+
                         EnumChatFormatting.YELLOW + mAmperage + EnumChatFormatting.RESET +" A",
                 "Max EU/p (1t):",
-                EnumChatFormatting.GREEN + Long.toString(mTransferredVoltageOK) + EnumChatFormatting.RESET +" EU / "+
+                EnumChatFormatting.GREEN + Long.toString(volts) + EnumChatFormatting.RESET +" EU / "+
                         EnumChatFormatting.YELLOW + mVoltage + EnumChatFormatting.RESET +" EU",
                 "Max Load (20t): "+
                     EnumChatFormatting.GREEN + mTransferredAmperageLast20OK + EnumChatFormatting.RESET +" A",