Merge pull request #375 from dvdmandt/experimental

Remove EU costs from covers

3 files changed, 3 insertions, 42 deletions

diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Arm.java b/src/main/java/gregtech/common/covers/GT_Cover_Arm.java
index 77558e001d..c07f1f7a3a 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_Arm.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_Arm.java
@@ -43,15 +43,6 @@ public class GT_Cover_Arm
             aCoverVariable = CONVERTED_BIT | Math.min(Math.abs(aCoverVariable-1), SLOT_ID_MASK);
         }
 
-        boolean usePower = false;
-        if (aTileEntity.getUniversalEnergyCapacity() >= 128L) {
-            if (aTileEntity.isUniversalEnergyStored(256L)) {
-                usePower = true;
-            } else {
-                return aCoverVariable;
-            }
-        }
-
         TileEntity toTile, fromTile;
         int toSlot, fromSlot;
 
@@ -98,9 +89,6 @@ public class GT_Cover_Arm
             movedItems = GT_Utility.moveOneItemStack(fromTile, toTile, fromSide, toSide, null, false, (byte)64, (byte)1, (byte)64, (byte)1);
         }
 
-        if (usePower)
-            aTileEntity.decreaseStoredEnergyUnits(4*movedItems, true);
-
         return aCoverVariable;
     }
 
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java b/src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java
index aee46b7aab..1e21f80ed0 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java
@@ -41,21 +41,8 @@ public class GT_Cover_Conveyor extends GT_CoverBehavior {
                  toEntity = aCoverVariable % 2 != 0 ? aTileEntity : tTileEntity;
         byte fromSide = aCoverVariable % 2 != 0 ? GT_Utility.getOppositeSide(aSide) : aSide,
                toSide = aCoverVariable % 2 == 0 ? GT_Utility.getOppositeSide(aSide) : aSide;
-        boolean costsEnergy = ((aCoverVariable % 2 == 0) || (aSide != 1)) && ((aCoverVariable % 2 != 0) || (aSide != 0)) && (aTileEntity.getUniversalEnergyCapacity() >= 128L);
-        byte moved;
-
-
-        if (costsEnergy) {
-            long tStoredEnergy = aTileEntity.getUniversalEnergyStored();
-            int tMaxStacks = (int)(tStoredEnergy/(4*64*this.mMaxStacks));
-            if (tMaxStacks > this.mMaxStacks)
-                tMaxStacks = this.mMaxStacks;
-            int tCost = moveMultipleItemStacks(fromEntity, toEntity, fromSide , toSide, null, false, (byte) 64, (byte) 1, (byte) 64, (byte) 1,tMaxStacks);
-            aTileEntity.decreaseStoredEnergyUnits(4 * tCost, true);
-        } else {
-            moveMultipleItemStacks(fromEntity, toEntity, fromSide , toSide, null, false, (byte) 64, (byte) 1, (byte) 64, (byte) 1,this.mMaxStacks);
-        }
 
+        moveMultipleItemStacks(fromEntity, toEntity, fromSide , toSide, null, false, (byte) 64, (byte) 1, (byte) 64, (byte) 1,this.mMaxStacks);
 
 //        for(int i=0 ; i < this.mMaxStacks ; i++) {
 //            // Costs energy but we don't have enough, bail
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Pump.java b/src/main/java/gregtech/common/covers/GT_Cover_Pump.java
index ce7a7a789e..3facde63a1 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_Pump.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_Pump.java
@@ -41,14 +41,7 @@ public class GT_Cover_Pump
                         tLiquid = tLiquid.copy();
                         tLiquid.amount = tTank2.fill(ForgeDirection.getOrientation(aSide).getOpposite(), tLiquid, false);
                         if (tLiquid.amount > 0 && canTransferFluid(tLiquid)) {
-                            if (((aCoverVariable % 2 == 0) || (aSide != 1)) && ((aCoverVariable % 2 != 0) || (aSide != 0)) && (aTileEntity.getUniversalEnergyCapacity() >= Math.min(1, tLiquid.amount / 10))) {
-                                if (aTileEntity.isUniversalEnergyStored(Math.min(1, tLiquid.amount / 10))) {
-                                    aTileEntity.decreaseStoredEnergyUnits(Math.min(1, tLiquid.amount / 10), true);
-                                    tTank2.fill(ForgeDirection.getOrientation(aSide).getOpposite(), tTank1.drain(ForgeDirection.getOrientation(aSide), tLiquid.amount, true), true);
-                                }
-                            } else {
-                                tTank2.fill(ForgeDirection.getOrientation(aSide).getOpposite(), tTank1.drain(ForgeDirection.getOrientation(aSide), tLiquid.amount, true), true);
-                            }
+                            tTank2.fill(ForgeDirection.getOrientation(aSide).getOpposite(), tTank1.drain(ForgeDirection.getOrientation(aSide), tLiquid.amount, true), true);
                         }
                     }
                 } else {
@@ -57,14 +50,7 @@ public class GT_Cover_Pump
                         tLiquid = tLiquid.copy();
                         tLiquid.amount = tTank1.fill(ForgeDirection.getOrientation(aSide), tLiquid, false);
                         if (tLiquid.amount > 0 && canTransferFluid(tLiquid)) {
-                            if (((aCoverVariable % 2 == 0) || (aSide != 1)) && ((aCoverVariable % 2 != 0) || (aSide != 0)) && (aTileEntity.getUniversalEnergyCapacity() >= Math.min(1, tLiquid.amount / 10))) {
-                                if (aTileEntity.isUniversalEnergyStored(Math.min(1, tLiquid.amount / 10))) {
-                                    aTileEntity.decreaseStoredEnergyUnits(Math.min(1, tLiquid.amount / 10), true);
-                                    tTank1.fill(ForgeDirection.getOrientation(aSide), tTank2.drain(ForgeDirection.getOrientation(aSide).getOpposite(), tLiquid.amount, true), true);
-                                }
-                            } else {
-                                tTank1.fill(ForgeDirection.getOrientation(aSide), tTank2.drain(ForgeDirection.getOrientation(aSide).getOpposite(), tLiquid.amount, true), true);
-                            }
+                            tTank1.fill(ForgeDirection.getOrientation(aSide), tTank2.drain(ForgeDirection.getOrientation(aSide).getOpposite(), tLiquid.amount, true), true);
                         }
                     }
                 }