diff options
| author | Lyfts <127234178+Lyfts@users.noreply.github.com> | 2023-07-11 18:47:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-11 18:47:04 +0200 |
| commit | 5113d4b19a842292884f1b2fb9fe60e4681b148a (patch) | |
| tree | 1d54441b008f4c2f284db73b2f7a703cbdbb481f /src/main/java | |
| parent | 6c41b18bfb09d3122c14e6d95c21d6d14e2a3a68 (diff) | |
| download | GT5-Unofficial-5113d4b19a842292884f1b2fb9fe60e4681b148a.tar.gz GT5-Unofficial-5113d4b19a842292884f1b2fb9fe60e4681b148a.tar.bz2 GT5-Unofficial-5113d4b19a842292884f1b2fb9fe60e4681b148a.zip | |
Makes boilers "getSteamCapacity() aware" (#2131)
* Import getSteamCapacity from GT++ boilers
* spotless apply
---------
Co-authored-by: Wilhelm Schuster <dev@rot13.io>
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler.java | 10 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Lava.java | 4 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler.java b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler.java index a5b4fba4ab..5142a06766 100644 --- a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler.java +++ b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler.java @@ -278,9 +278,9 @@ public abstract class GT_MetaTileEntity_Boiler extends GT_MetaTileEntity_BasicTa } protected void ventSteamIfTankIsFull() { - if ((this.mSteam != null) && (this.mSteam.amount > getCapacity())) { + if ((this.mSteam != null) && (this.mSteam.amount > getSteamCapacity())) { sendSound(SOUND_EVENT_LET_OFF_EXCESS_STEAM); - this.mSteam.amount = getCapacity() * 3 / 4; + this.mSteam.amount = getSteamCapacity() * 3 / 4; } } @@ -391,6 +391,10 @@ public abstract class GT_MetaTileEntity_Boiler extends GT_MetaTileEntity_BasicTa return 16000; } + protected int getSteamCapacity() { + return getCapacity(); + } + protected abstract int getProductionPerSecond(); protected abstract int getMaxTemperature(); @@ -440,7 +444,7 @@ public abstract class GT_MetaTileEntity_Boiler extends GT_MetaTileEntity_BasicTa .widget(createFuelSlot()) .widget(createAshSlot()) .widget( - new ProgressBar().setProgress(() -> mSteam == null ? 0 : (float) mSteam.amount / getCapacity()) + new ProgressBar().setProgress(() -> mSteam == null ? 0 : (float) mSteam.amount / getSteamCapacity()) .setTexture(getProgressbarEmpty(), GT_UITextures.PROGRESSBAR_BOILER_STEAM, 10) .setDirection(ProgressBar.Direction.UP) .setPos(70, 25) diff --git a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Lava.java b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Lava.java index 65b7df004a..7fe3a3f4bb 100644 --- a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Lava.java +++ b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Lava.java @@ -456,7 +456,7 @@ public class GT_MetaTileEntity_Boiler_Lava extends GT_MetaTileEntity_Boiler { public FluidTankInfo[] getTankInfo(ForgeDirection side) { return new FluidTankInfo[] { super.getTankInfo(side)[0], new FluidTankInfo(this.lavaTank.getFluid(), this.lavaTank.getCapacity()), - new FluidTankInfo(getDrainableStack(), getCapacity()) }; + new FluidTankInfo(getDrainableStack(), getSteamCapacity()) }; } @Override @@ -479,7 +479,7 @@ public class GT_MetaTileEntity_Boiler_Lava extends GT_MetaTileEntity_Boiler { .setPos(115, 61)) .widget(createAshSlot()) .widget( - new ProgressBar().setProgress(() -> mSteam == null ? 0 : (float) mSteam.amount / getCapacity()) + new ProgressBar().setProgress(() -> mSteam == null ? 0 : (float) mSteam.amount / getSteamCapacity()) .setTexture(getProgressbarEmpty(), GT_UITextures.PROGRESSBAR_BOILER_STEAM, 10) .setDirection(ProgressBar.Direction.UP) .setPos(70, 25) |