Maintenance cleanup (#2632)

* cleanup

* waila

* fix & compatibility

---------

Co-authored-by: Martin Robertz <dream-master@gmx.net>

5 files changed, 22 insertions, 53 deletions

diff --git a/src/main/java/goodgenerator/blocks/tileEntity/CoolantTower.java b/src/main/java/goodgenerator/blocks/tileEntity/CoolantTower.java
index ae3395ffb9..7117ccddf1 100644
--- a/src/main/java/goodgenerator/blocks/tileEntity/CoolantTower.java
+++ b/src/main/java/goodgenerator/blocks/tileEntity/CoolantTower.java
@@ -99,12 +99,6 @@ public class CoolantTower extends GT_MetaTileEntity_TooltipMultiBlockBase_EM
 
     @Override
     public boolean checkMachine_EM(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) {
-        mWrench = true;
-        mScrewdriver = true;
-        mSoftHammer = true;
-        mHardHammer = true;
-        mSolderingTool = true;
-        mCrowbar = true;
         return structureCheck_EM(mName, 5, 11, 0);
     }
 
@@ -139,19 +133,6 @@ public class CoolantTower extends GT_MetaTileEntity_TooltipMultiBlockBase_EM
     }
 
     @Override
-    public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
-        super.onPostTick(aBaseMetaTileEntity, aTick);
-        if (aTick % 72000 == 0) {
-            mWrench = true;
-            mScrewdriver = true;
-            mSoftHammer = true;
-            mHardHammer = true;
-            mSolderingTool = true;
-            mCrowbar = true;
-        }
-    }
-
-    @Override
     public int getMaxEfficiency(ItemStack aStack) {
         return 10000;
     }
@@ -222,4 +203,9 @@ public class CoolantTower extends GT_MetaTileEntity_TooltipMultiBlockBase_EM
         if (mMachine) return -1;
         return survivialBuildPiece(mName, stackSize, 5, 11, 0, elementBudget, env, false, true);
     }
+
+    @Override
+    public boolean getDefaultHasMaintenanceChecks() {
+        return false;
+    }
 }
diff --git a/src/main/java/goodgenerator/blocks/tileEntity/FuelRefineFactory.java b/src/main/java/goodgenerator/blocks/tileEntity/FuelRefineFactory.java
index 85c4bffbab..8fbe8787ed 100644
--- a/src/main/java/goodgenerator/blocks/tileEntity/FuelRefineFactory.java
+++ b/src/main/java/goodgenerator/blocks/tileEntity/FuelRefineFactory.java
@@ -59,22 +59,15 @@ public class FuelRefineFactory extends GT_MetaTileEntity_TooltipMultiBlockBase_E
 
     public FuelRefineFactory(String name) {
         super(name);
-        turnOffMaintenance();
         useLongPower = true;
     }
 
     public FuelRefineFactory(int id, String name, String nameRegional) {
         super(id, name, nameRegional);
-        turnOffMaintenance();
         useLongPower = true;
     }
 
     @Override
-    public void onFirstTick_EM(IGregTechTileEntity aBaseMetaTileEntity) {
-        if (!hasMaintenanceChecks) turnOffMaintenance();
-    }
-
-    @Override
     public boolean doRandomMaintenanceDamage() {
         return true;
     }
@@ -373,4 +366,9 @@ public class FuelRefineFactory extends GT_MetaTileEntity_TooltipMultiBlockBase_E
         if (mMachine) return -1;
         return survivialBuildPiece(mName, stackSize, 7, 12, 1, elementBudget, env, false, true);
     }
+
+    @Override
+    public boolean getDefaultHasMaintenanceChecks() {
+        return false;
+    }
 }
diff --git a/src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaSmeltery.java b/src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaSmeltery.java
index 039bd76c51..d5572e0b16 100644
--- a/src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaSmeltery.java
+++ b/src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaSmeltery.java
@@ -538,11 +538,6 @@ public class LargeEssentiaSmeltery extends GT_MetaTileEntity_TooltipMultiBlockBa
     }
 
     @Override
-    protected void maintenance_EM() {
-        super.maintenance_EM();
-    }
-
-    @Override
     public int survivalConstruct(ItemStack stackSize, int elementBudget, ISurvivalBuildEnvironment env) {
         if (mMachine) return -1;
         int built = survivialBuildPiece(STRUCTURE_PIECE_FIRST, stackSize, 2, 2, 0, elementBudget, env, false, true);
diff --git a/src/main/java/goodgenerator/blocks/tileEntity/YottaFluidTank.java b/src/main/java/goodgenerator/blocks/tileEntity/YottaFluidTank.java
index f712fa12a7..e162cf9e30 100644
--- a/src/main/java/goodgenerator/blocks/tileEntity/YottaFluidTank.java
+++ b/src/main/java/goodgenerator/blocks/tileEntity/YottaFluidTank.java
@@ -270,12 +270,6 @@ public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM
             if (mFluid == null) {
                 mStorageCurrent = BigInteger.ZERO;
             }
-            mWrench = true;
-            mScrewdriver = true;
-            mSolderingTool = true;
-            mSoftHammer = true;
-            mHardHammer = true;
-            mCrowbar = true;
             return true;
         }
         return false;
@@ -706,4 +700,9 @@ public class YottaFluidTank extends GT_MetaTileEntity_TooltipMultiBlockBase_EM
             .addTooltip(StatCollector.translateToLocal("gui.YOTTank.button.locking"))
             .setTooltipShowUpDelay(TOOLTIP_DELAY);
     }
+
+    @Override
+    public boolean getDefaultHasMaintenanceChecks() {
+        return false;
+    }
 }
diff --git a/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java b/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java
index 5608d19ae4..dbb6beae8b 100644
--- a/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java
+++ b/src/main/java/goodgenerator/blocks/tileEntity/base/LargeFusionComputer.java
@@ -203,22 +203,9 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti
     @Override
     public boolean checkMachine_EM(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) {
         this.eEnergyMulti.clear();
-        if (structureCheck_EM(MAIN_NAME, 23, 3, 40) && mInputHatches.size() + mDualInputHatches.size() != 0
+        return structureCheck_EM(MAIN_NAME, 23, 3, 40) && mInputHatches.size() + mDualInputHatches.size() != 0
             && !mOutputHatches.isEmpty()
-            && (mEnergyHatches.size() + eEnergyMulti.size()) != 0) {
-            fixAllIssue();
-            return true;
-        }
-        return false;
-    }
-
-    public void fixAllIssue() {
-        mWrench = true;
-        mScrewdriver = true;
-        mSoftHammer = true;
-        mHardHammer = true;
-        mSolderingTool = true;
-        mCrowbar = true;
+            && (mEnergyHatches.size() + eEnergyMulti.size()) != 0;
     }
 
     @Override
@@ -275,7 +262,6 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti
         }
 
         if (aBaseMetaTileEntity.isServerSide()) {
-            if (aTick % 400 == 0) fixAllIssue();
             if (mEfficiency < 0) mEfficiency = 0;
             if (mRunningOnLoad && checkMachine(aBaseMetaTileEntity, mInventory[1])) {
                 checkRecipe();
@@ -631,6 +617,11 @@ public abstract class LargeFusionComputer extends GT_MetaTileEntity_TooltipMulti
             .widget(new FakeSyncWidget.LongSyncer(this::getEUVar, this::setEUVar));
     }
 
+    @Override
+    public boolean getDefaultHasMaintenanceChecks() {
+        return false;
+    }
+
     public static final String[] L0 = { "                                               ",
         "                                               ", "                    FCCCCCF                    ",
         "                    FCIBICF                    ", "                    FCCCCCF                    ",