From dc976486677197e2df9223067347043a5c22dfa7 Mon Sep 17 00:00:00 2001
From: HoleFish <48403212+HoleFish@users.noreply.github.com>
Date: Sat, 8 Jun 2024 02:44:03 +0800
Subject: Maintenance cleanup (#2632)

* cleanup

* waila

* fix & compatibility

---------

Co-authored-by: Martin Robertz <dream-master@gmx.net>
---
 .../steam/GregtechMetaTileEntity_SteamCompressor.java        |  1 -
 .../multi/production/GregtechMTE_NuclearReactor.java         |  6 +++++-
 .../multi/production/GregtechMetaTileEntity_Cyclotron.java   |  7 +++++--
 .../multi/production/algae/GregtechMTE_AlgaePondBase.java    |  6 +++++-
 .../turbines/GregtechMetaTileEntity_LargerTurbineBase.java   |  9 +--------
 .../GregtechMetaTileEntity_PowerSubStationController.java    | 12 +++++-------
 6 files changed, 21 insertions(+), 20 deletions(-)

(limited to 'src/main/java/gtPlusPlus/xmod/gregtech/common')

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 344df2e1c3..babdaee78c 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
@@ -278,5 +278,4 @@ public class GregtechMetaTileEntity_SteamCompressor
         info.add("Parallel: " + EnumChatFormatting.YELLOW + getMaxParallelRecipes());
         return info.toArray(new String[0]);
     }
-
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java
index 2faccc9697..2acc981358 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java
@@ -269,7 +269,6 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase<Greg
                 && mDynamoHatches.size() == 4
                 && mMufflerHatches.size() == 4
                 && mMaintenanceHatches.size() == 2) {
-                fixAllMaintenanceIssue();
                 this.turnCasingActive(false);
                 return true;
             }
@@ -521,4 +520,9 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase<Greg
         this.mFuelRemaining = aNBT.getInteger("mFuelRemaining");
         super.loadNBTData(aNBT);
     }
+
+    @Override
+    public boolean getDefaultHasMaintenanceChecks() {
+        return false;
+    }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Cyclotron.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Cyclotron.java
index 5861885bd0..2f9168a236 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Cyclotron.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Cyclotron.java
@@ -230,7 +230,6 @@ public class GregtechMetaTileEntity_Cyclotron extends GregtechMeta_MultiBlockBas
             @NotNull
             @Override
             public CheckRecipeResult process() {
-                fixAllMaintenanceIssue();
                 CheckRecipeResult result = super.process();
                 if (result.wasSuccessful()) {
                     for (ItemStack s : outputItems) {
@@ -284,7 +283,6 @@ public class GregtechMetaTileEntity_Cyclotron extends GregtechMeta_MultiBlockBas
                 }
             }
         }
-        this.fixAllMaintenanceIssue();
         return super.onRunningTick(aStack);
     }
 
@@ -328,4 +326,9 @@ public class GregtechMetaTileEntity_Cyclotron extends GregtechMeta_MultiBlockBas
     public boolean doesBindPlayerInventory() {
         return false;
     }
+
+    @Override
+    public boolean getDefaultHasMaintenanceChecks() {
+        return false;
+    }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/GregtechMTE_AlgaePondBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/GregtechMTE_AlgaePondBase.java
index 8a3442b5e7..fd0c4885e1 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/GregtechMTE_AlgaePondBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/GregtechMTE_AlgaePondBase.java
@@ -309,7 +309,6 @@ public class GregtechMTE_AlgaePondBase extends GregtechMeta_MultiBlockBase<Gregt
     @Override
     public void onPreTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
         super.onPreTick(aBaseMetaTileEntity, aTick);
-        this.fixAllMaintenanceIssue();
         // Silly Client Syncing
         if (aBaseMetaTileEntity.isClientSide()) {
             this.mLevel = getCasingTier();
@@ -373,4 +372,9 @@ public class GregtechMTE_AlgaePondBase extends GregtechMeta_MultiBlockBase<Gregt
             return 0;
         }
     }
+
+    @Override
+    public boolean getDefaultHasMaintenanceChecks() {
+        return false;
+    }
 }
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GregtechMetaTileEntity_LargerTurbineBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GregtechMetaTileEntity_LargerTurbineBase.java
index eec137cea2..c343d170f2 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GregtechMetaTileEntity_LargerTurbineBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GregtechMetaTileEntity_LargerTurbineBase.java
@@ -536,14 +536,7 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase
             mRuntime = 0;
 
             if (getBaseMetaTileEntity().getRandomNumber(6000) < getMaintenanceThreshold()) {
-                switch (getBaseMetaTileEntity().getRandomNumber(6)) {
-                    case 0 -> mWrench = false;
-                    case 1 -> mScrewdriver = false;
-                    case 2 -> mSoftHammer = false;
-                    case 3 -> mHardHammer = false;
-                    case 4 -> mSolderingTool = false;
-                    case 5 -> mCrowbar = false;
-                }
+                causeMaintenanceIssue();
             }
             for (GT_MetaTileEntity_Hatch_Turbine aHatch : getFullTurbineAssemblies()) {
                 // This cycle depletes durability from the turbine rotors.
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java
index 5ad8803040..0270dfea37 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java
@@ -450,7 +450,6 @@ public class GregtechMetaTileEntity_PowerSubStationController extends
         if (mAllEnergyHatches.size() + mAllDynamoHatches.size() > 0) {
             mAverageEuUsage = volSum / (mAllEnergyHatches.size() + mAllDynamoHatches.size());
         } else mAverageEuUsage = 0;
-        fixAllMaintenanceIssue();
         return true;
     }
 
@@ -559,7 +558,6 @@ public class GregtechMetaTileEntity_PowerSubStationController extends
         this.mMaxProgresstime = 200;
         this.lEUt = 0;
         this.mEfficiencyIncrease = 10000;
-        this.fixAllMaintenanceIssue();
         return SimpleCheckRecipeResult.ofSuccess("managing_power");
     }
 
@@ -612,11 +610,6 @@ public class GregtechMetaTileEntity_PowerSubStationController extends
         return MathUtils.roundToClosestLong(mTax);
     }
 
-    @Override
-    public void onPreTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
-        this.fixAllMaintenanceIssue();
-    }
-
     @Override
     public boolean onRunningTick(ItemStack aStack) {
         // First, decay overcharge (1% of stored energy plus 1000 EU per tick)
@@ -935,4 +928,9 @@ public class GregtechMetaTileEntity_PowerSubStationController extends
     private float getProgress() {
         return (float) getBaseMetaTileEntity().getStoredEU() / getBaseMetaTileEntity().getEUCapacity();
     }
+
+    @Override
+    public boolean getDefaultHasMaintenanceChecks() {
+        return false;
+    }
 }
-- 
cgit