diff options
| author | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2018-06-26 18:13:08 +1000 |
|---|---|---|
| committer | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2018-06-26 18:13:08 +1000 |
| commit | 7fa6bf7d928f68b3a7309568135597b060ce3c16 (patch) | |
| tree | 5f45da5600461693ec2e822acb5b0a8c883b28ad /src/Java/gtPlusPlus/xmod | |
| parent | 09b6e763945489bff95ac8bd46402c61b9471457 (diff) | |
| download | GT5-Unofficial-7fa6bf7d928f68b3a7309568135597b060ce3c16.tar.gz GT5-Unofficial-7fa6bf7d928f68b3a7309568135597b060ce3c16.tar.bz2 GT5-Unofficial-7fa6bf7d928f68b3a7309568135597b060ce3c16.zip | |
$ Advanced boilers now consume the correct 1:160 water:steam ratio and produce the correct amount of steam per second. Fixes #314, also closes https://github.com/GTNewHorizons/NewHorizons/issues/3133.
Diffstat (limited to 'src/Java/gtPlusPlus/xmod')
| -rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java index 179e75d3e7..d5d2e23536 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java @@ -211,6 +211,7 @@ public class GT_MetaTileEntity_Boiler_Base extends GT_MetaTileEntity_Boiler { // Utils.LOG_MACHINE_INFO("mProcessingEnergy:"+this.mProcessingEnergy); //} + int mTempSteam = this.mSteam != null ? this.mSteam.amount : 0; if (this.mTemperature <= 20) { this.mTemperature = 20; this.mLossTimer = 0; @@ -236,7 +237,7 @@ public class GT_MetaTileEntity_Boiler_Base extends GT_MetaTileEntity_Boiler { } } } - if (aTick % 10L == 0L) { + if (aTick % 20L == 0L) { if (this.mTemperature > 100) { if ((this.mFluid == null) || (!GT_ModHandler.isWater(this.mFluid)) || (this.mFluid.amount <= 0)) { this.mHadNoWater = true; @@ -246,17 +247,24 @@ public class GT_MetaTileEntity_Boiler_Base extends GT_MetaTileEntity_Boiler { aBaseMetaTileEntity.doExplosion(4096L); return; } - this.mFluid.amount -= (10 * this.mBoilerTier); - // Utils.LOG_MACHINE_INFO("Draining "+(10*this.mBoilerTier)+"L - // of water. There is "+this.mFluid.amount+"L left."); + + //this.mFluid.amount -= (10 * this.mBoilerTier); + + this.mFluid.amount -= (mSteamPerSecond/160); + + Logger.MACHINE_INFO("Draining "+(mSteamPerSecond/160)+"L of water. There is "+this.mFluid.amount+"L left."); if (this.mSteam == null) { this.mSteam = GT_ModHandler.getSteam((this.mSteamPerSecond)); + Logger.MACHINE_INFO("Added "+(this.mSteam.amount-mTempSteam)+"L of steam."); + } else if (GT_ModHandler.isSteam(this.mSteam)) { this.mSteam.amount += (this.mSteamPerSecond); + Logger.MACHINE_INFO("Added "+(this.mSteam.amount-mTempSteam)+"L of steam."); } else { this.mSteam = GT_ModHandler.getSteam((this.mSteamPerSecond)); + Logger.MACHINE_INFO("Added "+(this.mSteam.amount-mTempSteam)+"L of steam."); } } } |