Merge branch 'experimental' into Dream-Master_Test-Branch

3 files changed, 42 insertions, 24 deletions

diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java
index fd4426da62..78a462a7af 100644
--- a/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java
+++ b/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java
@@ -1168,45 +1168,63 @@ public class BaseMetaPipeEntity extends BaseTileEntity implements IGregTechTileE
         if (!canAccessData() || getCoverIDAtSide(aSide) != 0) return false;

         return mMetaTileEntity.injectRotationalEnergy(aSide, aSpeed, aEnergy);

     }

-

-    @Override

-    public int fill(ForgeDirection aSide, FluidStack aFluid, boolean doFill) {

-        if (mTickTimer > 5 && 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()), aFluid == null ? null : aFluid.getFluid(), this))))

-            return mMetaTileEntity.fill(aSide, aFluid, doFill);

+    

+    private boolean canMoveFluidOnSide(ForgeDirection aSide, Fluid aFluid, boolean isFill) {

+        if (aSide == ForgeDirection.UNKNOWN 

+            || ( (isFill ? mMetaTileEntity.isLiquidInput((byte) aSide.ordinal()) : 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)

+                    && mMetaTileEntity.isConnectedAtSide((byte) aSide.ordinal())

+                    )

+                )

+        	return true;

+    	return false;

+    }

+

+    @Override

+    public int fill(ForgeDirection aSide, FluidStack aFluidStack, boolean doFill) {

+        if (mTickTimer > 5 && canAccessData() && canMoveFluidOnSide(aSide, aFluidStack == null ? null : aFluidStack.getFluid(), true))

+            return mMetaTileEntity.fill(aSide, aFluidStack, doFill);

         return 0;

     }

 

     @Override

     public FluidStack drain(ForgeDirection aSide, int maxDrain, boolean doDrain) {

-        if (mTickTimer > 5 && canAccessData() && (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() && canMoveFluidOnSide(aSide, mMetaTileEntity.getFluid() == null ? null : mMetaTileEntity.getFluid().getFluid(), false))

             return mMetaTileEntity.drain(aSide, maxDrain, doDrain);

         return null;

     }

 

     @Override

-    public FluidStack drain(ForgeDirection aSide, FluidStack aFluid, boolean doDrain) {

-        if (mTickTimer > 5 && canAccessData() && (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);

+    public FluidStack drain(ForgeDirection aSide, FluidStack aFluidStack, boolean doDrain) {

+        if (mTickTimer > 5 && canAccessData() && canMoveFluidOnSide(aSide, aFluidStack == null ? null : aFluidStack.getFluid(), false))

+            return mMetaTileEntity.drain(aSide, aFluidStack, doDrain);

         return null;

     }

 

     @Override

     public boolean canFill(ForgeDirection aSide, Fluid aFluid) {

-        if (mTickTimer > 5 && 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()), aFluid, this))))

+        if (mTickTimer > 5 && canAccessData() && canMoveFluidOnSide(aSide, aFluid, true))

             return mMetaTileEntity.canFill(aSide, aFluid);

         return false;

     }

 

     @Override

     public boolean canDrain(ForgeDirection aSide, Fluid aFluid) {

-        if (mTickTimer > 5 && canAccessData() && (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() && canMoveFluidOnSide(aSide, aFluid, false)) 

             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))

+                    // Doesn't need to be connected to get Tank Info -- otherwise things can't connect

+               )

+            )

             return mMetaTileEntity.getTankInfo(aSide);

         return new FluidTankInfo[]{};

     }

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 d601ceb8b6..eb403aa5f0 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
@@ -594,12 +594,12 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
 

     @Override

     public boolean isLiquidInput(byte aSide) {

-    	return isConnectedAtSide(aSide) && !isInputDisabledAtSide(aSide);

+    	return !isInputDisabledAtSide(aSide);

     }

 

     @Override

     public boolean isLiquidOutput(byte aSide) {

-    	return isConnectedAtSide(aSide);

+    	return true;

     }

 

     public boolean isInputDisabledAtSide(int aSide) {

diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillBase.java
index 9be68e0e25..0fb8db7890 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillBase.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrillBase.java
@@ -64,9 +64,7 @@ public abstract class GT_MetaTileEntity_OilDrillBase extends GT_MetaTileEntity_D
         return new GT_GUIContainer_MultiMachine(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), "DrillingRig.png");
     }
 
-    protected int getRangeInChunks(){
-        return 0;
-    }
+    protected abstract int getRangeInChunks();
 
     @Override
     protected boolean checkHatches() {
@@ -77,10 +75,13 @@ public abstract class GT_MetaTileEntity_OilDrillBase extends GT_MetaTileEntity_D
     protected void setElectricityStats() {
         this.mEfficiency = getCurrentEfficiency(null);
         this.mEfficiencyIncrease = 10000;
-        int tier = Math.max(1, GT_Utility.getTier(getMaxInputVoltage()));
-        this.mEUt = -3 * (1 << (tier << 1));
-        this.mMaxProgresstime = (workState == STATE_AT_BOTTOM ? (1280 * getRangeInChunks() * getRangeInChunks() / (1 << getMinTier())) : 80) / (1 << tier);
-        this.mMaxProgresstime = Math.max(1, this.mMaxProgresstime);
+        int tier = Math.max(0, GT_Utility.getTier(getMaxInputVoltage()));
+        this.mEUt = (workState==STATE_AT_BOTTOM?-1:-7) << (tier << 1);//(1/4) A of current tier when at bottom (7/8) A of current tier while mining
+        this.mMaxProgresstime = Math.max(1,
+                (workState == STATE_AT_BOTTOM ?
+                        (240 * (getRangeInChunks() * getRangeInChunks()))>>(getMinTier()-1)  :
+                        120
+                ) >> tier);
     }
 
     @Override
@@ -124,8 +125,7 @@ public abstract class GT_MetaTileEntity_OilDrillBase extends GT_MetaTileEntity_D
                 }
             }
         }
-        if (mOilFieldChunks.isEmpty()) return false;
-        return true;
+        return !mOilFieldChunks.isEmpty();
     }
 
     private FluidStack pumpOil(float speed){
@@ -134,7 +134,7 @@ public abstract class GT_MetaTileEntity_OilDrillBase extends GT_MetaTileEntity_D
         tOil = new FluidStack(FluidRegistry.getFluid(mOilId), 0);
         for (Chunk tChunk : mOilFieldChunks) {
             tFluid = undergroundOil(getBaseMetaTileEntity(),speed);
-            if (tFluid == null) mOilFieldChunks.remove(tChunk);
+            if (tFluid == null || tFluid.amount<1) mOilFieldChunks.remove(tChunk);
             if (tOil.isFluidEqual(tFluid)) tOil.amount += tFluid.amount;
         }
         return tOil.amount == 0 ? null : tOil;