Pipe/Cable overhaul & Add filter output on fluid filters

* Unified connect() method for pipes/wires - each subclass has it's own canConnect(), letsIn(), and letsOut() methods that map to the specifics for that implementation
* Shift Clicking while placing a GT machine will now try connecting to the cable/pipe it is placed on
* You can open a connection to the air for pipes & wires, allowing the next thing you place down to auto connect (ie: a JABBA barrel)
* Distribute Fluids - Modeled after several of the upstream PRs
* Fluid regulators on pipes should stop spazzing out now
* Fluid filter covers - Now work with filtering output

BUG/TODO:
* Spray paint doesn't seem to keep wires/pipes from connecting properly
* Spray paint on wires/pipes should force a disconnection check

10 files changed, 479 insertions, 384 deletions

diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java b/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java
index becda3c32d..a78e1185cf 100644
--- a/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java
+++ b/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java
@@ -35,18 +35,15 @@ public interface IEnergyConnected extends IColoredTileEntity, IHasWorldObjectAnd
      * Sided Energy Input
      */
     public boolean inputEnergyFrom(byte aSide);
+    public boolean inputEnergyFrom(byte aSide, boolean waitForActive);
 
     /**
      * Sided Energy Output
      */
     public boolean outputsEnergyTo(byte aSide);
+    public boolean outputsEnergyTo(byte aSide, boolean waitForActive);
 
     /**
-     * Are we ready for energy state?
-     */
-    public boolean energyStateReady();
-    
-    /**
      * Utility for the Network
      */
     public static class Util {
diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java
index 0d06c4ec03..c58db1c81a 100644
--- a/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java
+++ b/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java
@@ -645,11 +645,21 @@ public class BaseMetaPipeEntity extends BaseTileEntity implements IGregTechTileE
     }

 

     @Override

+    public boolean inputEnergyFrom(byte aSide, boolean waitForActive) {

+        return false;

+    }

+

+    @Override

     public boolean outputsEnergyTo(byte aSide) {

         return false;

     }

 

     @Override

+    public boolean outputsEnergyTo(byte aSide, boolean waitForActive) {

+        return false;

+    }

+

+    @Override

     public long getOutputAmperage() {

         return 0;

     }

@@ -1362,9 +1372,4 @@ public class BaseMetaPipeEntity extends BaseTileEntity implements IGregTechTileE
     public void onEntityCollidedWithBlock(World aWorld, int aX, int aY, int aZ, Entity collider) {

         mMetaTileEntity.onEntityCollidedWithBlock(aWorld, aX, aY, aZ, collider);

     }

-

-	@Override

-	public boolean energyStateReady() {

-		return true;

-	}

 }

diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
index 9e38ba60cd..991fcd6d2a 100644
--- a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
+++ b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
@@ -56,7 +56,6 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE
     protected int mAverageEUInputIndex = 0, mAverageEUOutputIndex = 0;
     protected boolean mReleaseEnergy = false;
     protected int[] mAverageEUInput = new int[]{0, 0, 0, 0, 0}, mAverageEUOutput = new int[]{0, 0, 0, 0, 0};
-    private boolean mEnergyStateReady = false;
     private boolean[] mActiveEUInputs = new boolean[]{false, false, false, false, false, false}, mActiveEUOutputs = new boolean[]{false, false, false, false, false, false};
     private byte[] mSidedRedstone = new byte[]{15, 15, 15, 15, 15, 15};
     private int[] mCoverSides = new int[]{0, 0, 0, 0, 0, 0}, mCoverData = new int[]{0, 0, 0, 0, 0, 0}, mTimeStatistics = new int[GregTech_API.TICKS_FOR_LAG_AVERAGING];
@@ -459,8 +458,6 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE
                                     }
                                 }
                             }
-                            // We're ready to tell about our energy state - Only used server side
-                            mEnergyStateReady = true;
                         }
 
                         if (!hasValidMetaTileEntity()) {
@@ -986,22 +983,25 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE
     }
 
     @Override
-    public boolean energyStateReady() {
-    	if (!isServerSide()) return true;
-    	else return mEnergyStateReady;
-    }
-    
-    @Override
     public boolean inputEnergyFrom(byte aSide) {
+        return inputEnergyFrom(aSide, true);
+    }
+
+    public boolean inputEnergyFrom(byte aSide, boolean waitForActive) {
         if (aSide == 6) return true;
-        if (isServerSide()) return (aSide >= 0 && aSide < 6 ? mActiveEUInputs[aSide] : false) && !mReleaseEnergy;
+        if (isServerSide() && waitForActive) return ((aSide >= 0 && aSide < 6) && mActiveEUInputs[aSide]) && !mReleaseEnergy;
         return isEnergyInputSide(aSide);
     }
 
     @Override
     public boolean outputsEnergyTo(byte aSide) {
+        return outputsEnergyTo(aSide, true);
+    }
+
+    @Override
+    public boolean outputsEnergyTo(byte aSide, boolean waitForActive) {
         if (aSide == 6) return true;
-        if (isServerSide()) return (aSide >= 0 && aSide < 6 ? mActiveEUOutputs[aSide] : false) || mReleaseEnergy;
+        if (isServerSide() && waitForActive) return ((aSide >= 0 && aSide < 6) && mActiveEUOutputs[aSide]) || mReleaseEnergy;
         return isEnergyOutputSide(aSide);
     }
 
@@ -1767,42 +1767,96 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE
 
     @Override
     public int fill(ForgeDirection aSide, FluidStack aFluid, boolean doFill) {
-        if (mTickTimer > 5 && canAccessData() && (mRunningThroughTick || !mInputDisabled) && (aSide == ForgeDirection.UNKNOWN || (mMetaTileEntity.isLiquidInput((byte) aSide.ordinal()) && getCoverBehaviorAtSide((byte) aSide.ordinal()).letsFluidIn((byte) aSide.ordinal(), getCoverIDAtSide((byte) aSide.ordinal()), getCoverDataAtSide((byte) aSide.ordinal()), aFluid == null ? null : aFluid.getFluid(), this))))
+        if (mTickTimer > 5 && canAccessData() &&
+            (mRunningThroughTick || !mInputDisabled) &&
+            (
+                aSide == ForgeDirection.UNKNOWN ||
+                (
+                    mMetaTileEntity.isLiquidInput((byte) aSide.ordinal()) &&
+                    getCoverBehaviorAtSide((byte) aSide.ordinal()).letsFluidIn((byte) aSide.ordinal(), getCoverIDAtSide((byte) aSide.ordinal()), getCoverDataAtSide((byte) aSide.ordinal()), aFluid == null ? null : aFluid.getFluid(), this)
+                )
+            )
+        )
             return mMetaTileEntity.fill(aSide, aFluid, doFill);
         return 0;
     }
 
     @Override
     public FluidStack drain(ForgeDirection aSide, int maxDrain, boolean doDrain) {
-        if (mTickTimer > 5 && canAccessData() && (mRunningThroughTick || !mOutputDisabled) && (aSide == ForgeDirection.UNKNOWN || (mMetaTileEntity.isLiquidOutput((byte) aSide.ordinal()) && getCoverBehaviorAtSide((byte) aSide.ordinal()).letsFluidOut((byte) aSide.ordinal(), getCoverIDAtSide((byte) aSide.ordinal()), getCoverDataAtSide((byte) aSide.ordinal()), mMetaTileEntity.getFluid() == null ? null : mMetaTileEntity.getFluid().getFluid(), this))))
+        if (mTickTimer > 5 && canAccessData() &&
+            (mRunningThroughTick || !mOutputDisabled) &&
+            (
+                aSide == ForgeDirection.UNKNOWN ||
+                (
+                    mMetaTileEntity.isLiquidOutput((byte) aSide.ordinal()) &&
+                    getCoverBehaviorAtSide((byte) aSide.ordinal()).letsFluidOut((byte) aSide.ordinal(), getCoverIDAtSide((byte) aSide.ordinal()), getCoverDataAtSide((byte) aSide.ordinal()), mMetaTileEntity.getFluid() == null ? null : mMetaTileEntity.getFluid().getFluid(), this)
+                )
+            )
+        )
             return mMetaTileEntity.drain(aSide, maxDrain, doDrain);
         return null;
     }
 
     @Override
     public FluidStack drain(ForgeDirection aSide, FluidStack aFluid, boolean doDrain) {
-        if (mTickTimer > 5 && canAccessData() && (mRunningThroughTick || !mOutputDisabled) && (aSide == ForgeDirection.UNKNOWN || (mMetaTileEntity.isLiquidOutput((byte) aSide.ordinal()) && getCoverBehaviorAtSide((byte) aSide.ordinal()).letsFluidOut((byte) aSide.ordinal(), getCoverIDAtSide((byte) aSide.ordinal()), getCoverDataAtSide((byte) aSide.ordinal()), aFluid == null ? null : aFluid.getFluid(), this))))
+        if (mTickTimer > 5 && canAccessData() &&
+            (mRunningThroughTick || !mOutputDisabled) &&
+            (
+                aSide == ForgeDirection.UNKNOWN ||
+                (
+                    mMetaTileEntity.isLiquidOutput((byte) aSide.ordinal()) &&
+                    getCoverBehaviorAtSide((byte) aSide.ordinal()).letsFluidOut((byte) aSide.ordinal(), getCoverIDAtSide((byte) aSide.ordinal()), getCoverDataAtSide((byte) aSide.ordinal()), aFluid == null ? null : aFluid.getFluid(), this)
+                )
+            )
+        )
             return mMetaTileEntity.drain(aSide, aFluid, doDrain);
         return null;
     }
 
     @Override
     public boolean canFill(ForgeDirection aSide, Fluid aFluid) {
-        if (mTickTimer > 5 && canAccessData() && (mRunningThroughTick || !mInputDisabled) && (aSide == ForgeDirection.UNKNOWN || (mMetaTileEntity.isLiquidInput((byte) aSide.ordinal()) && getCoverBehaviorAtSide((byte) aSide.ordinal()).letsFluidIn((byte) aSide.ordinal(), getCoverIDAtSide((byte) aSide.ordinal()), getCoverDataAtSide((byte) aSide.ordinal()), aFluid, this))))
+        if (mTickTimer > 5 && canAccessData() &&
+            (mRunningThroughTick || !mInputDisabled) &&
+            (
+                aSide == ForgeDirection.UNKNOWN ||
+                (
+                    mMetaTileEntity.isLiquidInput((byte) aSide.ordinal()) &&
+                    getCoverBehaviorAtSide((byte) aSide.ordinal()).letsFluidIn((byte) aSide.ordinal(), getCoverIDAtSide((byte) aSide.ordinal()), getCoverDataAtSide((byte) aSide.ordinal()), aFluid, this)
+                )
+            )
+        )
             return mMetaTileEntity.canFill(aSide, aFluid);
         return false;
     }
 
     @Override
     public boolean canDrain(ForgeDirection aSide, Fluid aFluid) {
-        if (mTickTimer > 5 && canAccessData() && (mRunningThroughTick || !mOutputDisabled) && (aSide == ForgeDirection.UNKNOWN || (mMetaTileEntity.isLiquidOutput((byte) aSide.ordinal()) && getCoverBehaviorAtSide((byte) aSide.ordinal()).letsFluidOut((byte) aSide.ordinal(), getCoverIDAtSide((byte) aSide.ordinal()), getCoverDataAtSide((byte) aSide.ordinal()), aFluid, this))))
+        if (mTickTimer > 5 && canAccessData() &&
+            (mRunningThroughTick || !mOutputDisabled) &&
+            (
+                aSide == ForgeDirection.UNKNOWN ||
+                (
+                    mMetaTileEntity.isLiquidOutput((byte) aSide.ordinal()) &&
+                        getCoverBehaviorAtSide((byte) aSide.ordinal()).letsFluidOut((byte) aSide.ordinal(), getCoverIDAtSide((byte) aSide.ordinal()), getCoverDataAtSide((byte) aSide.ordinal()), aFluid, this)
+                )
+            )
+        )
             return mMetaTileEntity.canDrain(aSide, aFluid);
         return false;
     }
 
     @Override
     public FluidTankInfo[] getTankInfo(ForgeDirection aSide) {
-        if (canAccessData() && (aSide == ForgeDirection.UNKNOWN || (mMetaTileEntity.isLiquidInput((byte) aSide.ordinal()) && getCoverBehaviorAtSide((byte) aSide.ordinal()).letsFluidIn((byte) aSide.ordinal(), getCoverIDAtSide((byte) aSide.ordinal()), getCoverDataAtSide((byte) aSide.ordinal()), null, this)) || (mMetaTileEntity.isLiquidOutput((byte) aSide.ordinal()) && getCoverBehaviorAtSide((byte) aSide.ordinal()).letsFluidOut((byte) aSide.ordinal(), getCoverIDAtSide((byte) aSide.ordinal()), getCoverDataAtSide((byte) aSide.ordinal()), null, this))))
+        if (canAccessData() &&
+            (
+                aSide == ForgeDirection.UNKNOWN ||
+                (
+                    mMetaTileEntity.isLiquidInput((byte) aSide.ordinal()) &&
+                    getCoverBehaviorAtSide((byte) aSide.ordinal()).letsFluidIn((byte) aSide.ordinal(), getCoverIDAtSide((byte) aSide.ordinal()), getCoverDataAtSide((byte) aSide.ordinal()), null, this)) || (mMetaTileEntity.isLiquidOutput((byte) aSide.ordinal()) &&
+                    getCoverBehaviorAtSide((byte) aSide.ordinal()).letsFluidOut((byte) aSide.ordinal(), getCoverIDAtSide((byte) aSide.ordinal()), getCoverDataAtSide((byte) aSide.ordinal()), null, this)
+                )
+            )
+        )
             return mMetaTileEntity.getTankInfo(aSide);
         return new FluidTankInfo[]{};
     }
diff --git a/src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java b/src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java
index 5f1d7cbd44..70ae71a719 100644
--- a/src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java
+++ b/src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java
@@ -2,12 +2,15 @@ package gregtech.api.metatileentity;
 

 import cpw.mods.fml.relauncher.Side;

 import cpw.mods.fml.relauncher.SideOnly;

+import gregtech.GT_Mod;

 import gregtech.api.GregTech_API;

 import gregtech.api.interfaces.metatileentity.IConnectable;

 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;

+import gregtech.api.interfaces.tileentity.ICoverable;

 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;

 import gregtech.api.objects.GT_ItemStack;

 import gregtech.api.util.GT_Config;

+import gregtech.api.util.GT_CoverBehavior;

 import gregtech.api.util.GT_LanguageManager;

 import gregtech.api.util.GT_Utility;

 import net.minecraft.block.Block;

@@ -20,6 +23,7 @@ import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.init.Blocks;

 import net.minecraft.item.ItemStack;

 import net.minecraft.nbt.NBTTagCompound;

+import net.minecraft.tileentity.TileEntity;

 import net.minecraft.util.AxisAlignedBB;

 import net.minecraft.world.IBlockAccess;

 import net.minecraft.world.World;

@@ -733,18 +737,61 @@ public abstract class MetaPipeEntity implements IMetaTileEntity, IConnectable {
     	return GT_LanguageManager.addStringLocalization("Interaction_DESCRIPTION_Index_"+aKey, aEnglish, false);

     }

 

+

+

 	@Override

 	public int connect(byte aSide) {

 		if (aSide >= 6) return 0;

-		mConnections |= (1 << aSide);

-		byte tSide = GT_Utility.getOppositeSide(aSide);

-		IGregTechTileEntity tTileEntity = getBaseMetaTileEntity().getIGregTechTileEntityAtSide(aSide);

-		IMetaTileEntity tPipe = tTileEntity instanceof IGregTechTileEntity ? ((IGregTechTileEntity) tTileEntity).getMetaTileEntity() : null;

-		if (this.getClass().isInstance(tPipe) && !((MetaPipeEntity) tPipe).isConnectedAtSide(tSide))

-			((MetaPipeEntity) tPipe).connect(tSide);

-    	return 1;

+

+		final byte tSide = GT_Utility.getOppositeSide(aSide);

+		final IGregTechTileEntity baseMetaTile = getBaseMetaTileEntity();

+        final GT_CoverBehavior coverBehavior = getBaseMetaTileEntity().getCoverBehaviorAtSide(aSide);

+        final int coverId = baseMetaTile.getCoverIDAtSide(aSide),

+                  coverData = baseMetaTile.getCoverDataAtSide(aSide);

+

+        boolean alwaysLookConnected = coverBehavior.alwaysLookConnected(aSide, coverId, coverData, baseMetaTile);

+        boolean letsIn = letsIn(coverBehavior, aSide, coverId, coverData, baseMetaTile);

+        boolean letsOut = letsOut(coverBehavior, aSide, coverId, coverData, baseMetaTile);

+

+        // Careful - tTileEntity might be null, and that's ok -- so handle it

+        TileEntity tTileEntity = baseMetaTile.getTileEntityAtSide(aSide);

+

+        if ((alwaysLookConnected || letsIn || letsOut))  {

+            // Are we trying to connect to a pipe? let's do it!

+            IMetaTileEntity tPipe = tTileEntity instanceof IGregTechTileEntity ? ((IGregTechTileEntity) tTileEntity).getMetaTileEntity() : null;

+            if (getClass().isInstance(tPipe)) {

+                connectAtSide(aSide);

+                if (!((MetaPipeEntity) tPipe).isConnectedAtSide(tSide)) {

+                    // Make sure pipes all get together -- connect back to us if we're connecting to a pipe

+                    ((MetaPipeEntity) tPipe).connect(tSide);

+                }

+                return 1;

+            }

+            else if(((GT_Mod.gregtechproxy.gt6Cable || GT_Mod.gregtechproxy.gt6Pipe) && baseMetaTile.getAirAtSide(aSide)) || canConnect(aSide, tTileEntity)) {

+                // Allow open connections to Air, so that it'll connect to the next block placed down next to it

+                // NOTE: Will need to check valid connection on a block update because of this, otherwise

+                //  we might end up connected to silly things

+                connectAtSide(aSide);

+                return 1;

+            }

+            if (!baseMetaTile.getWorld().getChunkProvider().chunkExists(baseMetaTile.getOffsetX(aSide, 1) >> 4, baseMetaTile.getOffsetZ(aSide, 1) >> 4)) {

+                // Target chunk unloaded

+                return -1;

+            }

+

+        }

+    	return 0;

 	}

 

+	public void checkConnections() {

+        // Try connecting to connecting to everything around us: Only used when GT6 style cables/pipes are disabled

+        for (byte aSide = 0; aSide < 6; aSide++) if (connect(aSide) == 0) disconnect(aSide);

+    }

+

+	private void connectAtSide(byte aSide) {

+        mConnections |= (1 << aSide);

+    }

+

 	@Override

 	public void disconnect(byte aSide) {

 		if (aSide >= 6) return;

@@ -759,4 +806,10 @@ public abstract class MetaPipeEntity implements IMetaTileEntity, IConnectable {
 	public boolean isConnectedAtSide(int aSide) {

 		return (mConnections & (1 << aSide)) != 0;

 	}

+

+

+	public boolean letsIn(GT_CoverBehavior coverBehavior, byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) { return false; }

+    public boolean letsOut(GT_CoverBehavior coverBehavior, byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) { return false; }

+

+	public boolean canConnect(byte aSide, TileEntity tTileEntity) { return false; }

 }

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 9fb807f64e..a393206257 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
@@ -12,6 +12,7 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;

 import gregtech.api.interfaces.metatileentity.IMetaTileEntityCable;

 import gregtech.api.interfaces.tileentity.IColoredTileEntity;

+import gregtech.api.interfaces.tileentity.ICoverable;

 import gregtech.api.interfaces.tileentity.IEnergyConnected;

 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;

 import gregtech.api.metatileentity.BaseMetaPipeEntity;

@@ -24,6 +25,7 @@ import gregtech.api.util.GT_Utility;
 import gregtech.common.GT_Client;

 import gregtech.common.covers.GT_Cover_SolarPanel;

 import gregtech.loaders.postload.PartP2PGTPower;

+import ic2.api.energy.tile.IEnergyEmitter;

 import ic2.api.energy.tile.IEnergySink;

 import ic2.api.energy.tile.IEnergySource;

 import net.minecraft.entity.Entity;

@@ -55,7 +57,6 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
     public long mRestRF;

     public int mOverheat;

     public static short mMaxOverheat=(short) (GT_Mod.gregtechproxy.mWireHeatingTicks * 100);

-    private boolean mCheckConnections = !GT_Mod.gregtechproxy.gt6Cable;

 

     private int[] lastAmperage;

     private long lastWorldTick;

@@ -162,8 +163,8 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
 

     @Override

     public long transferElectricity(byte aSide, long aVoltage, long aAmperage, ArrayList<TileEntity> aAlreadyPassedTileEntityList) {

-    	if (!isConnectedAtSide(aSide) && aSide != 6)

-    		return 0;

+        if (!isConnectedAtSide(aSide) && aSide != 6)

+            return 0;

         long rUsedAmperes = 0;

         aVoltage -= mCableLossPerMeter;

         if (aVoltage > 0) for (byte i = 0; i < 6 && aAmperage > rUsedAmperes; i++)

@@ -182,11 +183,6 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
                         } else {

                             rUsedAmperes += ((IEnergyConnected) tTileEntity).injectEnergyUnits(GT_Utility.getOppositeSide(i), aVoltage, aAmperage - rUsedAmperes);

                         }

-//        		} else if (tTileEntity instanceof IEnergySink) {

-//            		ForgeDirection tDirection = ForgeDirection.getOrientation(i).getOpposite();

-//            		if (((IEnergySink)tTileEntity).acceptsEnergyFrom((TileEntity)getBaseMetaTileEntity(), tDirection)) {

-//            			if (((IEnergySink)tTileEntity).demandedEnergyUnits() > 0 && ((IEnergySink)tTileEntity).injectEnergyUnits(tDirection, aVoltage) < aVoltage) rUsedAmperes++;

-//            		}

                     } else if (tTileEntity instanceof IEnergySink) {

                         ForgeDirection tDirection = ForgeDirection.getOrientation(i).getOpposite();

                         if (((IEnergySink) tTileEntity).acceptsEnergyFrom((TileEntity) getBaseMetaTileEntity(), tDirection)) {

@@ -196,7 +192,7 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
                     } else if (GregTech_API.mOutputRF && tTileEntity instanceof IEnergyReceiver) {

                         ForgeDirection tDirection = ForgeDirection.getOrientation(i).getOpposite();

                         long rfOUT = aVoltage * GregTech_API.mEUtoRF / 100;

-                        int  rfOut = rfOUT>Integer.MAX_VALUE ? Integer.MAX_VALUE : (int)rfOUT;

+                        int rfOut = rfOUT > Integer.MAX_VALUE ? Integer.MAX_VALUE : (int) rfOUT;

                         if (((IEnergyReceiver) tTileEntity).receiveEnergy(tDirection, rfOut, true) == rfOut) {

                             ((IEnergyReceiver) tTileEntity).receiveEnergy(tDirection, rfOut, false);

                             rUsedAmperes++;

@@ -216,12 +212,12 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
                     }

                 }

             }

-        mTransferredVoltage=Math.max(mTransferredVoltage,aVoltage);

+        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 (aVoltage > mVoltage) {

+            mOverheat += Math.max(100, 100 * GT_Utility.getTier(aVoltage) - GT_Utility.getTier(mVoltage));

         }

         if (mTransferredAmperage > mAmperage) return aAmperage;

         return rUsedAmperes;

@@ -299,19 +295,9 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
                 mTransferredVoltageLast20 = 0;

                 mTransferredAmperageLast20OK=mTransferredAmperageLast20;

                 mTransferredAmperageLast20 = 0;

-                for (byte tSide = 0; tSide < 6; tSide++) {

-                	IGregTechTileEntity tBaseMetaTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityAtSide(tSide);

-                	byte uSide = GT_Utility.getOppositeSide(tSide);

-                    if ((mCheckConnections || isConnectedAtSide(tSide)

-                    			|| aBaseMetaTileEntity.getCoverBehaviorAtSide(tSide).alwaysLookConnected(tSide, aBaseMetaTileEntity.getCoverIDAtSide(tSide), aBaseMetaTileEntity.getCoverDataAtSide(tSide), aBaseMetaTileEntity)

-                    			|| (tBaseMetaTileEntity != null && tBaseMetaTileEntity.getCoverBehaviorAtSide(uSide).alwaysLookConnected(uSide, tBaseMetaTileEntity.getCoverIDAtSide(uSide), tBaseMetaTileEntity.getCoverDataAtSide(uSide), tBaseMetaTileEntity)))

-                    		&& connect(tSide) == 0) {

-                    	disconnect(tSide);

-                    }

-                }

-                if (GT_Mod.gregtechproxy.gt6Cable) mCheckConnections = false;

+                if (!GT_Mod.gregtechproxy.gt6Cable) checkConnections();

             }

-        }else if(aBaseMetaTileEntity.isClientSide() && GT_Client.changeDetected==4) aBaseMetaTileEntity.issueTextureUpdate();

+        } else if(aBaseMetaTileEntity.isClientSide() && GT_Client.changeDetected==4) aBaseMetaTileEntity.issueTextureUpdate();

     }

 

     @Override

@@ -343,86 +329,62 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
         return false;

     }

 

-	@Override

-	public int connect(byte aSide) {

-		int rConnect = 0;

-		if (aSide >= 6) return rConnect;

-		byte tSide = GT_Utility.getOppositeSide(aSide);

-		TileEntity tTileEntity = getBaseMetaTileEntity().getTileEntityAtSide(aSide);

-		GT_CoverBehavior coverBehavior = getBaseMetaTileEntity().getCoverBehaviorAtSide(aSide);

-		int coverId = getBaseMetaTileEntity().getCoverIDAtSide(aSide), coverData = getBaseMetaTileEntity().getCoverDataAtSide(aSide);

-		

-		boolean sAlwaysLookConnected = coverBehavior.alwaysLookConnected(aSide, coverId, coverData, getBaseMetaTileEntity());

-		boolean sLetEnergyIn = coverBehavior.letsEnergyIn(aSide, coverId, coverData, getBaseMetaTileEntity());

-		boolean sLetEnergyOut = coverBehavior.letsEnergyOut(aSide, coverId, coverData, getBaseMetaTileEntity()); 

-

-        if (sAlwaysLookConnected || sLetEnergyIn || sLetEnergyOut) {

-            if (tTileEntity instanceof IColoredTileEntity) {

-                if (getBaseMetaTileEntity().getColorization() >= 0) {

-                    byte tColor = ((IColoredTileEntity) tTileEntity).getColorization();

-                    if (tColor >= 0 && tColor != getBaseMetaTileEntity().getColorization()) {

-                    	return rConnect;

-                    }

-                }

-            }

-            

-            boolean sHasSolarPanel = coverBehavior instanceof GT_Cover_SolarPanel;

-            

-            boolean tIsEnergyIsConnected = tTileEntity instanceof IEnergyConnected;

-            boolean tEnergyInOrOut = (tIsEnergyIsConnected && (((IEnergyConnected) tTileEntity).inputEnergyFrom(tSide) || ((IEnergyConnected) tTileEntity).outputsEnergyTo(tSide)));

-            

-            boolean tIsGregTechTileEntity = tTileEntity instanceof IGregTechTileEntity;

-            boolean tIsTileEntityCable = tIsGregTechTileEntity && ((IGregTechTileEntity) tTileEntity).getMetaTileEntity() instanceof IMetaTileEntityCable; 

-            boolean tAlwaysLookConnected = tIsGregTechTileEntity && ((IGregTechTileEntity) tTileEntity).getCoverBehaviorAtSide(tSide).alwaysLookConnected(tSide, ((IGregTechTileEntity) tTileEntity).getCoverIDAtSide(tSide), ((IGregTechTileEntity) tTileEntity).getCoverDataAtSide(tSide), ((IGregTechTileEntity) tTileEntity));

-            boolean tLetEnergyIn = tIsGregTechTileEntity && ((IGregTechTileEntity) tTileEntity).getCoverBehaviorAtSide(tSide).letsEnergyIn(tSide, ((IGregTechTileEntity) tTileEntity).getCoverIDAtSide(tSide), ((IGregTechTileEntity) tTileEntity).getCoverDataAtSide(tSide), ((IGregTechTileEntity) tTileEntity));

-            boolean tLetEnergyOut = tIsGregTechTileEntity && ((IGregTechTileEntity) tTileEntity).getCoverBehaviorAtSide(tSide).letsEnergyOut(tSide, ((IGregTechTileEntity) tTileEntity).getCoverIDAtSide(tSide), ((IGregTechTileEntity) tTileEntity).getCoverDataAtSide(tSide), ((IGregTechTileEntity) tTileEntity));

-

-            boolean tIsEnergySink = tTileEntity instanceof IEnergySink;

-            boolean tSinkAcceptsEnergyFromSide = tIsEnergySink && ((IEnergySink) tTileEntity).acceptsEnergyFrom((TileEntity) getBaseMetaTileEntity(), ForgeDirection.getOrientation(tSide));

-            

-            boolean tIsGTp2pProvider = (GT_Mod.gregtechproxy.mAE2Integration && tTileEntity instanceof IEnergySource 

-            		&& tTileEntity instanceof IPartHost && ((IPartHost)tTileEntity).getPart(ForgeDirection.getOrientation(tSide)) instanceof PartP2PGTPower);

-            boolean tGTp2pProvidesEnergyToSide = tIsGTp2pProvider && ((IEnergySource) tTileEntity).emitsEnergyTo((TileEntity) getBaseMetaTileEntity(), ForgeDirection.getOrientation(tSide));

-

-            boolean tIsEnergyReceiver = tTileEntity instanceof IEnergyReceiver;

-            boolean tEnergyReceiverCanAcceptFromSide = tIsEnergyReceiver && ((IEnergyReceiver) tTileEntity).canConnectEnergy(ForgeDirection.getOrientation(tSide));

-

-            if (   (tIsEnergyIsConnected && tEnergyInOrOut)

-                || sHasSolarPanel

-                || ((tIsGregTechTileEntity && tIsTileEntityCable) && (tAlwaysLookConnected || tLetEnergyIn || tLetEnergyOut) )

-                || (tIsEnergySink && tSinkAcceptsEnergyFromSide)

-                || (tIsGTp2pProvider && tGTp2pProvidesEnergyToSide)

-        		|| (GregTech_API.mOutputRF && tIsEnergyReceiver && tEnergyReceiverCanAcceptFromSide)

-            		/*|| (tTileEntity instanceof IEnergyEmitter && ((IEnergyEmitter)tTileEntity).emitsEnergyTo((TileEntity)getBaseMetaTileEntity(), ForgeDirection.getOrientation(tSide)))*/) 

-			{

-                rConnect = 1;

-            }

+    @Override

+    public boolean letsIn(GT_CoverBehavior coverBehavior, byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {

+        return coverBehavior.letsEnergyIn(aSide, aCoverID, aCoverVariable, aTileEntity);

+    }

 

-            if(D1 && rConnect == 0) {

-            	GT_Log.out.println("Gt6StyleCable - Debug: ");

-            	GT_Log.out.println("\t AlwaysLookConnected:" + sAlwaysLookConnected + " LetEnergyIn:" + sLetEnergyIn + " LetEnergyOut:" + sLetEnergyOut);

-            	GT_Log.out.println("\t sHasSolarPanel:" + sHasSolarPanel);

-            	GT_Log.out.println("\t tIsEnergyIsConnected:" + tIsEnergyIsConnected + " tEnergyInOrOut:" +tEnergyInOrOut);

-            	GT_Log.out.println("\t tIsGregTechTileEntity:" + tIsGregTechTileEntity + " tIsTileEntityCable:" + tIsTileEntityCable);

-            	GT_Log.out.println("\t tIsEnergySink:" + tIsEnergySink + " tSinkAcceptsEnergyFromSide:" + tSinkAcceptsEnergyFromSide );

-            	GT_Log.out.println("\t tIsGTp2pProvider:" + tIsGTp2pProvider + " tGTp2pProvidesEnergyToSide:" + tGTp2pProvidesEnergyToSide );

-            	GT_Log.out.println("\t tIsEnergyReceiver:" + tIsEnergyReceiver + " tEnergyReceiverCanAcceptFromSide:" + tEnergyReceiverCanAcceptFromSide );

-            }

+    @Override

+    public boolean letsOut(GT_CoverBehavior coverBehavior, byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {

+        return coverBehavior.letsEnergyOut(aSide, aCoverID, aCoverVariable, aTileEntity);

+    }

 

+

+    @Override

+    public boolean canConnect(byte aSide, TileEntity tTileEntity) {

+        final IGregTechTileEntity gTileEntity = (tTileEntity instanceof IGregTechTileEntity) ? (IGregTechTileEntity) tTileEntity : null;

+        final GT_CoverBehavior coverBehavior = getBaseMetaTileEntity().getCoverBehaviorAtSide(aSide);

+        final byte tSide = GT_Utility.getOppositeSide(aSide);

+        final ForgeDirection tDir = ForgeDirection.getOrientation(tSide);

+

+        if (tTileEntity instanceof IColoredTileEntity) {

+            if (getBaseMetaTileEntity().getColorization() >= 0) {

+                byte tColor = ((IColoredTileEntity) tTileEntity).getColorization();

+                if (tColor >= 0 && tColor != getBaseMetaTileEntity().getColorization()) return false;

+            }

         }

-		if (rConnect == 0) {

-			if ((!getBaseMetaTileEntity().getWorld().getChunkProvider().chunkExists(getBaseMetaTileEntity().getOffsetX(aSide, 1) >> 4, getBaseMetaTileEntity().getOffsetZ(aSide, 1) >> 4)) // if chunk unloaded

-					|| (tTileEntity instanceof IEnergyConnected && !((IEnergyConnected) tTileEntity).energyStateReady())) //Energy state not ready 

-			{ 

-				rConnect = -1;

-    			if(D1)  GT_Log.out.println("Gt6StyleCable - Deferring (dis)connection");

-    		}

-		}

-        if (rConnect > 0) {

-        	super.connect(aSide);

-        }

-        return rConnect;

-	}

+

+        // GT Machine handling

+        if ((tTileEntity instanceof IEnergyConnected) &&

+            (((IEnergyConnected) tTileEntity).inputEnergyFrom(tSide, false) || ((IEnergyConnected) tTileEntity).outputsEnergyTo(tSide, false)))

+            return true;

+

+        // Solar Panel Compat

+        if (coverBehavior instanceof GT_Cover_SolarPanel) return true;

+

+        // ((tIsGregTechTileEntity && tIsTileEntityCable) && (tAlwaysLookConnected || tLetEnergyIn || tLetEnergyOut) ) --> Not needed

+

+        // IC2 Compat

+        if ((tTileEntity instanceof IEnergySink) && ((IEnergySink) tTileEntity).acceptsEnergyFrom((TileEntity) getBaseMetaTileEntity(), tDir))

+            return true;

+

+        // AE2-p2p Compat

+        if (GT_Mod.gregtechproxy.mAE2Integration && tTileEntity instanceof IEnergySource &&

+            tTileEntity instanceof IPartHost && ((IPartHost)tTileEntity).getPart(tDir) instanceof PartP2PGTPower &&

+            ((IEnergySource) tTileEntity).emitsEnergyTo((TileEntity) getBaseMetaTileEntity(), tDir))

+            return true;

+

+        // RF Output Compat

+        if (GregTech_API.mOutputRF && tTileEntity instanceof IEnergyReceiver && ((IEnergyReceiver) tTileEntity).canConnectEnergy(tDir))

+            return true;

+

+        // RF Input Compat

+        if (GregTech_API.mInputRF && (tTileEntity instanceof IEnergyEmitter && ((IEnergyEmitter) tTileEntity).emitsEnergyTo((TileEntity)getBaseMetaTileEntity(), tDir)))

+            return true;

+

+

+        return false;

+    }

 

     @Override

     public boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {

@@ -458,8 +420,6 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
     @Override

     public void loadNBTData(NBTTagCompound aNBT) {

         if (GT_Mod.gregtechproxy.gt6Cable) {

-        	if (!aNBT.hasKey("mConnections"))

-        		mCheckConnections = true;

         	mConnections = aNBT.getByte("mConnections");

         }

     }

diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java
index 5dfa37c8c6..0644a07de1 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java
@@ -10,14 +10,18 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.BaseMetaPipeEntity;

 import gregtech.api.metatileentity.MetaPipeEntity;

 import gregtech.api.objects.GT_RenderedTexture;

+import gregtech.api.util.GT_CoverBehavior;

 import gregtech.api.util.GT_Log;

 import gregtech.api.util.GT_Utility;

 import gregtech.common.GT_Client;

+import gregtech.common.covers.GT_Cover_Drain;

+import gregtech.common.covers.GT_Cover_FluidRegulator;

 import net.minecraft.entity.Entity;

 import net.minecraft.entity.EntityLivingBase;

 import net.minecraft.entity.player.EntityPlayer;

 import net.minecraft.item.ItemStack;

 import net.minecraft.nbt.NBTTagCompound;

+import net.minecraft.tileentity.TileEntity;

 import net.minecraft.util.AxisAlignedBB;

 import net.minecraft.util.EnumChatFormatting;

 import net.minecraft.world.World;

@@ -25,11 +29,10 @@ import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;

 import net.minecraftforge.fluids.FluidTankInfo;

 import net.minecraftforge.fluids.IFluidHandler;

+import org.apache.commons.lang3.tuple.MutableTriple;

 

 import java.util.ArrayList;

 import java.util.List;

-import java.util.Map.Entry;

-import java.util.concurrent.ConcurrentHashMap;

 

 import static gregtech.api.enums.GT_Values.D1;

 import static gregtech.api.objects.XSTR.XSTR_INSTANCE;

@@ -41,7 +44,6 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
     public final boolean mGasProof;

     public final FluidStack[] mFluids;

     public byte mLastReceivedFrom = 0, oLastReceivedFrom = 0;

-    private boolean mCheckConnections = !GT_Mod.gregtechproxy.gt6Pipe;

     /**

      * Bitmask for whether disable fluid input form each side.

      */

@@ -196,8 +198,6 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
     		mFluids[i] = FluidStack.loadFluidStackFromNBT(aNBT.getComp