Bug with hatches in Steam multis (#2923)

* Fixed hatches bug

* Apply spotless

5 files changed, 45 insertions, 38 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamCentrifuge.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamCentrifuge.java
index fb9a81dca2..5e1e06d1bd 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamCentrifuge.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamCentrifuge.java
@@ -260,10 +260,7 @@ public class GregtechMetaTileEntity_SteamCentrifuge
             && tierFireBoxCasing == 1
             && tierMachineCasing == 1
             && tCountCasing > 60
-            && !mSteamInputFluids.isEmpty()
-            && !mSteamInputs.isEmpty()
-            && !mSteamOutputs.isEmpty()
-            && !mOutputHatches.isEmpty()) {
+            && checkHatch()) {
             updateHatchTexture();
             tierMachine = 1;
             return true;
@@ -272,10 +269,7 @@ public class GregtechMetaTileEntity_SteamCentrifuge
             && tierFireBoxCasing == 2
             && tierMachineCasing == 2
             && tCountCasing > 60
-            && !mSteamInputFluids.isEmpty()
-            && !mSteamInputs.isEmpty()
-            && !mSteamOutputs.isEmpty()
-            && !mOutputHatches.isEmpty()) {
+            && checkHatches()) {
             updateHatchTexture();
             tierMachine = 2;
             return true;
@@ -283,6 +277,13 @@ public class GregtechMetaTileEntity_SteamCentrifuge
         return false;
     }
 
+    private boolean checkHatches() {
+        return !mSteamInputFluids.isEmpty() && !mSteamInputs.isEmpty()
+            && !mSteamOutputs.isEmpty()
+            && !mOutputHatches.isEmpty()
+            && mInputHatches.isEmpty();
+    }
+
     @Override
     public int getMaxParallelRecipes() {
         return tierMachine == 1 ? 8 : 16;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamCompressor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamCompressor.java
index cd09c9597e..80c84da21e 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamCompressor.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamCompressor.java
@@ -203,18 +203,12 @@ public class GregtechMetaTileEntity_SteamCompressor
         tierMachineCasing = -1;
         if (!checkPiece(STRUCTUR_PIECE_MAIN, HORIZONTAL_OFF_SET, VERTICAL_OFF_SET, DEPTH_OFF_SET)) return false;
         if (tierMachineCasing < 0) return false;
-        if (tierMachineCasing == 1 && mCountCasing > 25
-            && !mSteamInputFluids.isEmpty()
-            && !mSteamInputs.isEmpty()
-            && !mSteamOutputs.isEmpty()) {
+        if (tierMachineCasing == 1 && mCountCasing > 25 && checkHatches()) {
             updateHatchTexture();
             tierMachine = 1;
             return true;
         }
-        if (tierMachineCasing == 2 && mCountCasing > 25
-            && !mSteamInputFluids.isEmpty()
-            && !mSteamInputs.isEmpty()
-            && !mSteamOutputs.isEmpty()) {
+        if (tierMachineCasing == 2 && mCountCasing > 25 && checkHatches()) {
             updateHatchTexture();
             tierMachine = 2;
             return true;
@@ -223,6 +217,13 @@ public class GregtechMetaTileEntity_SteamCompressor
         return false;
     }
 
+    private boolean checkHatches() {
+        return !mSteamInputFluids.isEmpty() && !mSteamInputs.isEmpty()
+            && !mSteamOutputs.isEmpty()
+            && mOutputHatches.isEmpty()
+            && mInputHatches.isEmpty();
+    }
+
     @Override
     public int getMaxParallelRecipes() {
         return tierMachine == 1 ? 8 : 16;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamForgeHammer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamForgeHammer.java
index 1866bfd367..440e9360e3 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamForgeHammer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamForgeHammer.java
@@ -249,9 +249,7 @@ public class GregtechMetaTileEntity_SteamForgeHammer
         if (tierPipeCasing == 1 && tierMachineCasing == 1
             && tierSimpleBlock == 1
             && tCountCasing > 35
-            && !mSteamInputs.isEmpty()
-            && !mSteamOutputs.isEmpty()
-            && !mSteamInputFluids.isEmpty()) {
+            && checkHatches()) {
             updateHatchTexture();
             tierMachine = 1;
             return true;
@@ -259,9 +257,7 @@ public class GregtechMetaTileEntity_SteamForgeHammer
         if (tierPipeCasing == 2 && tierMachineCasing == 2
             && tierSimpleBlock == 2
             && tCountCasing > 35
-            && !mSteamInputs.isEmpty()
-            && !mSteamOutputs.isEmpty()
-            && !mSteamInputFluids.isEmpty()) {
+            && checkHatches()) {
             updateHatchTexture();
             tierMachine = 2;
             return true;
@@ -269,6 +265,13 @@ public class GregtechMetaTileEntity_SteamForgeHammer
         return false;
     }
 
+    private boolean checkHatches() {
+        return !mSteamInputFluids.isEmpty() && !mSteamInputs.isEmpty()
+            && !mSteamOutputs.isEmpty()
+            && mOutputHatches.isEmpty()
+            && mInputHatches.isEmpty();
+    }
+
     @Override
     public int getMaxParallelRecipes() {
         return tierMachine == 1 ? 8 : 16;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamMacerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamMacerator.java
index 02f24898a0..6cf3d46bfb 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamMacerator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamMacerator.java
@@ -200,18 +200,12 @@ public class GregtechMetaTileEntity_SteamMacerator
         mCounCasing = 0;
         if (!checkPiece(STRUCTUR_PIECE_MAIN, HORIZONTAL_OFF_SET, VERTICAL_OFF_SET, DEPTH_OFF_SET)) return false;
         if (tierMachineCasing < 0) return false;
-        if (tierMachineCasing == 1 && mCounCasing > 14
-            && !mSteamInputFluids.isEmpty()
-            && !mSteamInputs.isEmpty()
-            && !mSteamOutputs.isEmpty()) {
+        if (tierMachineCasing == 1 && mCounCasing > 14 && checkHatches()) {
             updateHatchTexture();
             tierMachine = 1;
             return true;
         }
-        if (tierMachineCasing == 2 && mCounCasing > 14
-            && !mSteamInputFluids.isEmpty()
-            && !mSteamInputs.isEmpty()
-            && !mSteamOutputs.isEmpty()) {
+        if (tierMachineCasing == 2 && mCounCasing > 14 && checkHatches()) {
             updateHatchTexture();
             tierMachine = 2;
             return true;
@@ -220,6 +214,13 @@ public class GregtechMetaTileEntity_SteamMacerator
         return false;
     }
 
+    private boolean checkHatches() {
+        return !mSteamInputFluids.isEmpty() && !mSteamInputs.isEmpty()
+            && !mSteamOutputs.isEmpty()
+            && mOutputHatches.isEmpty()
+            && mInputHatches.isEmpty();
+    }
+
     @Override
     public int getMaxParallelRecipes() {
         return tierMachine == 1 ? 8 : 16;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamWasher.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamWasher.java
index 5b84cf9ec4..c556f23315 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamWasher.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamWasher.java
@@ -269,10 +269,7 @@ public class GregtechMetaTileEntity_SteamWasher extends GregtechMeta_SteamMultiB
         if (tierGearBoxCasing == 1 && tierPipeCasing == 1
             && tierMachineCasing == 1
             && tCountCasing > 55
-            && !mSteamInputFluids.isEmpty()
-            && !mSteamInputs.isEmpty()
-            && !mSteamOutputs.isEmpty()
-            && !mInputHatches.isEmpty()) {
+            && checkHatches()) {
             updateHatchTexture();
             tierMachine = 1;
             return true;
@@ -280,10 +277,7 @@ public class GregtechMetaTileEntity_SteamWasher extends GregtechMeta_SteamMultiB
         if (tierGearBoxCasing == 2 && tierPipeCasing == 2
             && tierMachineCasing == 2
             && tCountCasing > 55
-            && !mSteamInputFluids.isEmpty()
-            && !mSteamInputs.isEmpty()
-            && !mSteamOutputs.isEmpty()
-            && !mInputHatches.isEmpty()) {
+            && checkHatches()) {
             updateHatchTexture();
             tierMachine = 2;
             return true;
@@ -291,6 +285,13 @@ public class GregtechMetaTileEntity_SteamWasher extends GregtechMeta_SteamMultiB
         return false;
     }
 
+    private boolean checkHatches() {
+        return !mSteamInputFluids.isEmpty() && !mSteamInputs.isEmpty()
+            && !mSteamOutputs.isEmpty()
+            && mOutputHatches.isEmpty()
+            && !mInputHatches.isEmpty();
+    }
+
     @Override
     public int getMaxParallelRecipes() {
         return tierMachine == 1 ? 8 : 16;