aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSampsa <69092953+S4mpsa@users.noreply.github.com>2024-01-28 00:56:27 +0200
committerGitHub <noreply@github.com>2024-01-27 23:56:27 +0100
commit46c33e464cf22464f8c619e223cea2c011076273 (patch)
tree06e8ec508f178fe3e8edeae1ec4dccacb4005821
parentef3f46cf4db9bda97529de32a805c8015ad40452 (diff)
downloadGT5-Unofficial-46c33e464cf22464f8c619e223cea2c011076273.tar.gz
GT5-Unofficial-46c33e464cf22464f8c619e223cea2c011076273.tar.bz2
GT5-Unofficial-46c33e464cf22464f8c619e223cea2c011076273.zip
Fix DTPF not consuming energy (#2479)
Fix DTPF not conusming energy
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PlasmaForge.java13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PlasmaForge.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PlasmaForge.java
index eb57b55696..19ce347d9f 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PlasmaForge.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PlasmaForge.java
@@ -88,7 +88,6 @@ public class GT_MetaTileEntity_PlasmaForge extends
private int mHeatingCapacity = 0;
private long running_time = 0;
// Custom long EU per tick value given that mEUt is an int. Required to overclock beyond MAX voltage.
- private long EU_per_tick = 0;
private HeatingCoilLevel mCoilLevel;
@SuppressWarnings("SpellCheckingInspection")
@@ -805,15 +804,17 @@ public class GT_MetaTileEntity_PlasmaForge extends
@Override
public boolean onRunningTick(ItemStack aStack) {
- if (EU_per_tick < 0) {
- if (!drainEnergyInput(-EU_per_tick)) {
+ if (this.lEUt > 0) {
+ addEnergyOutput((this.lEUt * mEfficiency) / 10000);
+ return true;
+ }
+ if (this.lEUt < 0) {
+ if (!drainEnergyInput(getActualEnergyUsage())) {
resetDiscount();
- EU_per_tick = 0;
criticalStopMachine();
return false;
}
}
-
return true;
}
@@ -963,7 +964,6 @@ public class GT_MetaTileEntity_PlasmaForge extends
public void saveNBTData(NBTTagCompound aNBT) {
aNBT.setLong("eRunningTime", running_time);
aNBT.setDouble("eLongDiscountValue", discount);
- aNBT.setLong("eLongEUPerTick", EU_per_tick);
super.saveNBTData(aNBT);
}
@@ -971,7 +971,6 @@ public class GT_MetaTileEntity_PlasmaForge extends
public void loadNBTData(final NBTTagCompound aNBT) {
running_time = aNBT.getLong("eRunningTime");
discount = aNBT.getDouble("eLongDiscountValue");
- EU_per_tick = aNBT.getLong("eLongEUPerTick");
super.loadNBTData(aNBT);
}