aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormiozune <miozune@gmail.com>2022-07-30 21:05:42 +0900
committerGitHub <noreply@github.com>2022-07-30 13:05:42 +0100
commit244578bc4bb2edb8ad990df0e7ef412d5ceb047f (patch)
treeac2b4abef32cb2db38c5949f645c2cda39f94bcc
parent5c5df02d043fb212f1e67dcd8846861a77af3187 (diff)
downloadGT5-Unofficial-244578bc4bb2edb8ad990df0e7ef412d5ceb047f.tar.gz
GT5-Unofficial-244578bc4bb2edb8ad990df0e7ef412d5ceb047f.tar.bz2
GT5-Unofficial-244578bc4bb2edb8ad990df0e7ef412d5ceb047f.zip
Make Fusion Reactor shut down on energy shortage (#1174)
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java16
1 files changed, 10 insertions, 6 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java
index 5dfed51402..c203e49346 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java
@@ -349,7 +349,7 @@ public abstract class GT_MetaTileEntity_FusionComputer extends GT_MetaTileEntity
}
}
if (this.mEUStore <= 0 && mMaxProgresstime > 0) {
- stopMachine();
+ criticalStopMachine();
}
if (mMaxProgresstime > 0) {
this.getBaseMetaTileEntity().decreaseStoredEnergyUnits(mEUt, true);
@@ -380,8 +380,7 @@ public abstract class GT_MetaTileEntity_FusionComputer extends GT_MetaTileEntity
this.mEUStore = (int) aBaseMetaTileEntity.getStoredEU();
if (checkRecipe(mInventory[1])) {
if (this.mEUStore < this.mLastRecipe.mSpecialValue - this.mEUt) {
- mMaxProgresstime = 0;
- turnCasingActive(false);
+ criticalStopMachine();
}
aBaseMetaTileEntity.decreaseStoredEnergyUnits(this.mLastRecipe.mSpecialValue - this.mEUt, true);
}
@@ -391,7 +390,6 @@ public abstract class GT_MetaTileEntity_FusionComputer extends GT_MetaTileEntity
}
}
} else {
- turnCasingActive(false);
this.mLastRecipe = null;
stopMachine();
}
@@ -406,13 +404,13 @@ public abstract class GT_MetaTileEntity_FusionComputer extends GT_MetaTileEntity
if (mEUt < 0) {
if (!drainEnergyInput(((long) -mEUt * 10000) / Math.max(1000, mEfficiency))) {
this.mLastRecipe = null;
- stopMachine();
+ criticalStopMachine();
return false;
}
}
if (this.mEUStore <= 0) {
this.mLastRecipe = null;
- stopMachine();
+ criticalStopMachine();
return false;
}
return true;
@@ -438,6 +436,12 @@ public abstract class GT_MetaTileEntity_FusionComputer extends GT_MetaTileEntity
}
@Override
+ public void stopMachine() {
+ super.stopMachine();
+ turnCasingActive(false);
+ }
+
+ @Override
public String[] getInfoData() {
String tier = tier() == 6 ? EnumChatFormatting.RED+"I"+EnumChatFormatting.RESET : tier() == 7 ? EnumChatFormatting.YELLOW+"II"+EnumChatFormatting.RESET : tier() == 8 ? EnumChatFormatting.GRAY+"III"+EnumChatFormatting.RESET : "IV";
float plasmaOut = 0;