restored compability for the Driller Base

Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>

4 files changed, 29 insertions, 11 deletions

diff --git a/src/main/java/gregtech/api/util/GT_Recipe.java b/src/main/java/gregtech/api/util/GT_Recipe.java
index 4938b74338..8d9595abdf 100644
--- a/src/main/java/gregtech/api/util/GT_Recipe.java
+++ b/src/main/java/gregtech/api/util/GT_Recipe.java
@@ -162,7 +162,6 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
         mDuration = aDuration;

         mSpecialValue = aSpecialValue;

         mEUt = aEUt;

-

 //		checkCellBalance();

     }

 

diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java
index 4783a0936c..992a347729 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DrillerBase.java
@@ -35,6 +35,7 @@ public abstract class GT_MetaTileEntity_DrillerBase extends GT_MetaTileEntity_Mu
     private int casingMeta;
     private int frameMeta;
     private int casingTextureIndex;
+    protected boolean isPickingPipes;
 
     private ForgeDirection back;
 
@@ -81,27 +82,37 @@ public abstract class GT_MetaTileEntity_DrillerBase extends GT_MetaTileEntity_Mu
     }
 
     protected boolean tryPickPipe() {
-        if (yHead == yDrill) return false;
+        if (yHead == yDrill)
+            return false;
         if (tryOutputPipe()){
             if (checkBlockAndMeta(xPipe, yHead + 1, zPipe, miningPipeBlock, W))
                 getBaseMetaTileEntity().getWorld().setBlock(xPipe, yHead + 1, zPipe, miningPipeTipBlock);
             getBaseMetaTileEntity().getWorld().setBlockToAir(xPipe, yHead, zPipe);
-            return true;
+            return isPickingPipes = true;
         }
-        return false;
+        return isPickingPipes = false;
+    }
+
+    /**
+     * Added for compability reasons
+     * @return true if the state is 0 false otherwise.
+     */
+    protected boolean tryLowerPipe() {
+        return tryLowerPipeState(false) == 0;
     }
 
+
     /**
      * @return 0 for succeeded, 1 for invalid block, 2 for not having mining pipes, 3 for event canceled.
      */
-    protected int tryLowerPipe() {
-        return tryLowerPipe(false);
+    protected int tryLowerPipeState() {
+        return tryLowerPipeState(false);
     }
 
     /**
      * @return 0 for succeeded, 1 for invalid block, 2 for not having mining pipes, 3 for event canceled.
      */
-    protected int tryLowerPipe(boolean isSimulating) {
+    protected int tryLowerPipeState(boolean isSimulating) {
         if (!isHasMiningPipes()) return 2;
         switch (canLowerPipe()) {
             case 1: return 1;
@@ -172,6 +183,14 @@ public abstract class GT_MetaTileEntity_DrillerBase extends GT_MetaTileEntity_Mu
         return pipe != null && pipe.stackSize > minCount - 1 && pipe.isItemEqual(miningPipe);
     }
 
+    /**
+     * Readded for compability
+     * @return if no pipes are present
+     */
+    protected boolean waitForPipes(){
+        return !isHasMiningPipes();
+    }
+
     private boolean isEnergyEnough() {
         long requiredEnergy = 512 + getMaxInputVoltage() * 4;
         for (GT_MetaTileEntity_Hatch_Energy energyHatch : mEnergyHatches) {
@@ -182,7 +201,7 @@ public abstract class GT_MetaTileEntity_DrillerBase extends GT_MetaTileEntity_Mu
     }
 
     protected boolean workingDownward(ItemStack aStack, int xDrill, int yDrill, int zDrill, int xPipe, int zPipe, int yHead, int oldYHead) {
-        switch (tryLowerPipe()) {
+        switch (tryLowerPipeState()) {
             case 2: mMaxProgresstime = 0; return false;
             case 3: workState = STATE_UPWARD; return true;
             case 1: workState = STATE_AT_BOTTOM; return true;
@@ -191,7 +210,7 @@ public abstract class GT_MetaTileEntity_DrillerBase extends GT_MetaTileEntity_Mu
     }
 
     protected boolean workingAtBottom(ItemStack aStack, int xDrill, int yDrill, int zDrill, int xPipe, int zPipe, int yHead, int oldYHead) {
-        switch (tryLowerPipe(true)) {
+        switch (tryLowerPipeState(true)) {
             case 0: workState = STATE_DOWNWARD; return true;
             default: workState = STATE_UPWARD; return true;
         }
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 e322d018e2..6e6c2c7922 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
@@ -89,7 +89,7 @@ public abstract class GT_MetaTileEntity_OilDrillBase extends GT_MetaTileEntity_D
 
     @Override
     protected boolean workingAtBottom(ItemStack aStack, int xDrill, int yDrill, int zDrill, int xPipe, int zPipe, int yHead, int oldYHead) {
-        switch (tryLowerPipe(true)) {
+        switch (tryLowerPipeState(true)) {
             case 0: workState = STATE_DOWNWARD; setElectricityStats(); return true;
             case 3: workState = STATE_UPWARD; return true;
         }
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java
index a0b46c14e7..4eb8bad9bc 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java
@@ -46,7 +46,7 @@ public abstract class GT_MetaTileEntity_OreDrillingPlantBase extends GT_MetaTile
 
         fillMineListIfEmpty(xDrill, yDrill, zDrill, xPipe, zPipe, yHead);
         if (oreBlockPositions.isEmpty()) {
-            switch (tryLowerPipe()) {
+            switch (tryLowerPipeState()) {
                 case 2: mMaxProgresstime = 0; return false;
                 case 3: workState = STATE_UPWARD; return true;
                 case 1: workState = STATE_AT_BOTTOM; return true;