diff options
author | botn365 <42187820+botn365@users.noreply.github.com> | 2020-01-08 00:14:32 +0100 |
---|---|---|
committer | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2020-01-07 23:14:32 +0000 |
commit | fbb298251275388777a7ff30d8b9f0fd0c88f39c (patch) | |
tree | 7766a0d9d7fab06ebe30a88c36012b78abf9b65b /src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations | |
parent | a93e2aa92384f595dcb5907f5b88a220c6735cf0 (diff) | |
download | GT5-Unofficial-fbb298251275388777a7ff30d8b9f0fd0c88f39c.tar.gz GT5-Unofficial-fbb298251275388777a7ff30d8b9f0fd0c88f39c.tar.bz2 GT5-Unofficial-fbb298251275388777a7ff30d8b9f0fd0c88f39c.zip |
Redone Turbodyne F1-A Logic (#597)
- Removed free fuel tick on single block rocket engines.
% Changed hg1223 from ZPM to LuV.
% Spelling.
% Adjusted logging.
$ Rewrote large rocket engine logic.
Co-authored-by: Alkalus <3060479+draknyte1@users.noreply.github.com>
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations')
-rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java index b6e7b35d68..e72838fcad 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java @@ -267,12 +267,10 @@ public abstract class GregtechRocketFuelGeneratorBase extends GT_MetaTileEntity_ final int tFuelValue = this.getFuelValue(this.mFluid), tConsumed = this.consumedFluidPerOperation(this.mFluid); if ((tFuelValue > 0) && (tConsumed > 0) && (this.mFluid.amount >= tConsumed)) { final long tFluidAmountToUse = Math.min(this.mFluid.amount / tConsumed, (((this.maxEUOutput() * 20) + this.getMinimumStoredEU()) - aBaseMetaTileEntity.getUniversalEnergyStored()) / tFuelValue); - if ((tFluidAmountToUse > 0) && aBaseMetaTileEntity.increaseStoredEnergyUnits(tFluidAmountToUse * tFuelValue, true)){ - useFuel = Utils.invertBoolean(useFuel); - int aSafeFloor= (int) Math.max(((tFluidAmountToUse * tConsumed)/3), 1); - int toConsumeTrue = (int) (useFuel ? aSafeFloor : 0); + if ((tFluidAmountToUse > 0) && aBaseMetaTileEntity.increaseStoredEnergyUnits(tFluidAmountToUse * tFuelValue, true)){ + int aSafeFloor = (int) Math.max(((tFluidAmountToUse * tConsumed)/3), 1); //Logger.INFO("True consumption: "+toConsumeTrue+" | Consuming this tick? "+useFuel); - this.mFluid.amount -= toConsumeTrue; + this.mFluid.amount -= (int) aSafeFloor; PollutionUtils.addPollution(getBaseMetaTileEntity(), 10 * getPollution()); } } |