aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQuetz4l <aizektro@gmail.com>2023-07-09 00:13:47 +0300
committerGitHub <noreply@github.com>2023-07-08 23:13:47 +0200
commitb3ccca10cb1c32fe0948f9d5b3d270445ed325b0 (patch)
tree7daee3cdc88bf761a4d54c043013be225f9c3080
parent16a2258c24a381b69bb2a397241f1ecdbd7d06ed (diff)
downloadGT5-Unofficial-b3ccca10cb1c32fe0948f9d5b3d270445ed325b0.tar.gz
GT5-Unofficial-b3ccca10cb1c32fe0948f9d5b3d270445ed325b0.tar.bz2
GT5-Unofficial-b3ccca10cb1c32fe0948f9d5b3d270445ed325b0.zip
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
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java15
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java14
2 files changed, 17 insertions, 12 deletions
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;
+ }
}