Makes boilers "getSteamCapacity() aware" (#2131)

* Import getSteamCapacity from GT++ boilers * spotless apply --------- Co-authored-by: Wilhelm Schuster <dev@rot13.io>
GTNewHorizons · Jul 11, 2023 · 5113d4b · 5113d4b
1 parent 6c41b18
commit 5113d4b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 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
@@ -278,9 +278,9 @@ private void updateFuelTimed(IGregTechTileEntity aBaseMetaTileEntity, long aTick
  }
 
  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 int getCapacity() {
  return 16000;
  }
 
+ protected int getSteamCapacity() {
+ return getCapacity();
+ }
+
  protected abstract int getProductionPerSecond();
 
  protected abstract int getMaxTemperature();
@@ -440,7 +444,7 @@ public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildCont
  .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
@@ -456,7 +456,7 @@ public int fill(FluidStack aFluid, boolean doFill) {
  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 void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildCont
  .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)