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>
---
 .../base/GregtechMeta_MultiBlockBase.java          | 76 ----------------------
 .../base/GregtechMeta_SteamMultiBase.java          | 17 +++--
 2 files changed, 11 insertions(+), 82 deletions(-)

(limited to 'src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations')

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
index ab9d26cdf3..0a38677d51 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
@@ -544,52 +544,6 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
         super.updateSlots();
     }
 
-    /**
-     * Causes a Random Maint. Issue.
-     *
-     * @return {@link boolean} - Returns whether or not an issue was caused, should always be true.
-     */
-    public boolean causeMaintenanceIssue() {
-        boolean b = false;
-        switch (this.getBaseMetaTileEntity()
-            .getRandomNumber(6)) {
-            case 0 -> {
-                this.mWrench = false;
-                b = true;
-            }
-            case 1 -> {
-                this.mScrewdriver = false;
-                b = true;
-            }
-            case 2 -> {
-                this.mSoftHammer = false;
-                b = true;
-            }
-            case 3 -> {
-                this.mHardHammer = false;
-                b = true;
-            }
-            case 4 -> {
-                this.mSolderingTool = false;
-                b = true;
-            }
-            case 5 -> {
-                this.mCrowbar = false;
-                b = true;
-            }
-        }
-        return b;
-    }
-
-    public void fixAllMaintenanceIssue() {
-        this.mCrowbar = true;
-        this.mWrench = true;
-        this.mHardHammer = true;
-        this.mSoftHammer = true;
-        this.mSolderingTool = true;
-        this.mScrewdriver = true;
-    }
-
     public boolean checkHatch() {
         return mMaintenanceHatches.size() <= 1
             && (this.getPollutionPerSecond(null) > 0 ? !mMufflerHatches.isEmpty() : true);
@@ -1186,36 +1140,6 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex
         } else return super.onSolderingToolRightClick(side, wrenchingSide, aPlayer, aX, aY, aZ);
     }
 
-    @Override
-    public void onServerStart() {
-        super.onServerStart();
-        tryTickWaitTimerDown();
-    }
-
-    @Override
-    public void onFirstTick(IGregTechTileEntity aBaseMetaTileEntity) {
-        super.onFirstTick(aBaseMetaTileEntity);
-        tryTickWaitTimerDown();
-    }
-
-    @Override
-    public void onPreTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
-        super.onPreTick(aBaseMetaTileEntity, aTick);
-        tryTickWaitTimerDown();
-    }
-
-    @Override
-    public void onCreated(ItemStack aStack, World aWorld, EntityPlayer aPlayer) {
-        super.onCreated(aStack, aWorld, aPlayer);
-        tryTickWaitTimerDown();
-    }
-
-    private void tryTickWaitTimerDown() {
-        /*
-         * if (mStartUpCheck > 10) { mStartUpCheck = 10; }
-         */
-    }
-
     // Only support to use meta to tier
 
     /**
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_SteamMultiBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_SteamMultiBase.java
index abebb5a38a..aebcafaf83 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_SteamMultiBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_SteamMultiBase.java
@@ -142,7 +142,6 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu
      */
     @Override
     public boolean onRunningTick(ItemStack aStack) {
-        fixAllMaintenanceIssue();
         if (lEUt < 0) {
             long aSteamVal = ((-lEUt * 10000) / Math.max(1000, mEfficiency));
             // Logger.INFO("Trying to drain "+aSteamVal+" steam per tick.");
@@ -376,11 +375,12 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu
         if (tag.getBoolean("incompleteStructure")) {
             currentTip.add(RED + "** INCOMPLETE STRUCTURE **" + RESET);
         }
-        currentTip.add(
-            (tag.getBoolean("hasProblems") ? (RED + "** HAS PROBLEMS **") : GREEN + "Running Fine") + RESET
-                + "  Efficiency: "
-                + tag.getFloat("efficiency")
-                + "%");
+        String efficiency = RESET + "  Efficiency: " + tag.getFloat("efficiency") + "%";
+        if (tag.getBoolean("hasProblems")) {
+            currentTip.add(RED + "** HAS PROBLEMS **" + efficiency);
+        } else if (!tag.getBoolean("incompleteStructure")) {
+            currentTip.add(GREEN + "Running Fine" + efficiency);
+        }
 
         boolean isActive = tag.getBoolean("isActive");
         if (isActive) {
@@ -439,4 +439,9 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu
             return GregtechMeta_SteamMultiBase::addToMachineList;
         }
     }
+
+    @Override
+    public boolean getDefaultHasMaintenanceChecks() {
+        return false;
+    }
 }
-- 
cgit