From b3ccca10cb1c32fe0948f9d5b3d270445ed325b0 Mon Sep 17 00:00:00 2001 From: Quetz4l Date: Sun, 9 Jul 2023 00:13:47 +0300 Subject: fix transformer maintenance status (#229) * fix transformer maintenance status * fix transformer maintenance status * change the type of function from public to protect * change the variable name from isNeededMaintenanceChecks to hasMaintenanceChecks --- .../multi/GT_MetaTileEntity_EM_transformer.java | 15 +++------------ .../multi/base/GT_MetaTileEntity_MultiblockBase_EM.java | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 12 deletions(-) (limited to 'src/main/java/com') diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java index 5ef16225d5..5b369edb7d 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java @@ -43,6 +43,7 @@ public class GT_MetaTileEntity_EM_transformer extends GT_MetaTileEntity_Multiblo @Override public void onFirstTick_EM(IGregTechTileEntity aBaseMetaTileEntity) { + if (!hasMaintenanceChecks) turnOffMaintenance(); if (!mMachine) { aBaseMetaTileEntity.disableWorking(); } @@ -76,23 +77,13 @@ public class GT_MetaTileEntity_EM_transformer extends GT_MetaTileEntity_Multiblo public GT_MetaTileEntity_EM_transformer(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); - mWrench = true; - mScrewdriver = true; - mSoftHammer = true; - mHardHammer = true; - mSolderingTool = true; - mCrowbar = true; + turnOffMaintenance(); eDismantleBoom = true; } public GT_MetaTileEntity_EM_transformer(String aName) { super(aName); - mWrench = true; - mScrewdriver = true; - mSoftHammer = true; - mHardHammer = true; - mSolderingTool = true; - mCrowbar = true; + turnOffMaintenance(); eDismantleBoom = true; } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java index 66ab189ffa..5995d6c9b0 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java @@ -195,6 +195,10 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM // if u need to force some things to be fixed - u might need to override doRandomMaintenanceDamage protected byte minRepairStatus = 3; + // whether there is a maintenance hatch in the multi and whether checks are necessary (for now only used in a + // transformer) + protected boolean hasMaintenanceChecks = true; + // is power pass cover present public boolean ePowerPassCover = false; @@ -3210,4 +3214,14 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM } // endregion + + protected void turnOffMaintenance() { + mWrench = true; + mScrewdriver = true; + mSoftHammer = true; + mHardHammer = true; + mSolderingTool = true; + mCrowbar = true; + hasMaintenanceChecks = false; + } } -- cgit