From 22f4b6d1daa7581cf46ac4bc19b346605b46494e Mon Sep 17 00:00:00 2001 From: Glease <4586901+Glease@users.noreply.github.com> Date: Sat, 17 Apr 2021 12:37:08 +0800 Subject: Fix solar boiler heat up speed Signed-off-by: Glease <4586901+Glease@users.noreply.github.com> --- .../common/tileentities/boilers/GT_MetaTileEntity_Boiler.java | 6 +++++- .../tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java | 7 ++++++- 2 files changed, 11 insertions(+), 2 deletions(-) (limited to 'src') 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 a2b357e302..ea1af92ed0 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 @@ -245,7 +245,7 @@ public abstract class GT_MetaTileEntity_Boiler extends GT_MetaTileEntity_BasicTa private void calculateHeatUp(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { if ((this.mTemperature < getMaxTemperature()) && (this.mProcessingEnergy > 0) && (aTick % 12L == 0L)) { this.mProcessingEnergy -= getEnergyConsumption(); - this.mTemperature += 1; + this.mTemperature += getHeatUpAmount(); } aBaseMetaTileEntity.setActive(this.mProcessingEnergy > 0); } @@ -370,5 +370,9 @@ public abstract class GT_MetaTileEntity_Boiler extends GT_MetaTileEntity_BasicTa protected abstract int getCooldownInterval(); + protected int getHeatUpAmount() { + return 1; + } + protected abstract void updateFuel(IGregTechTileEntity aBaseMetaTileEntity, long aTick); } diff --git a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java index b08c4bf8cf..12a7177d08 100644 --- a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java +++ b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java @@ -145,7 +145,7 @@ public class GT_MetaTileEntity_Boiler_Solar extends GT_MetaTileEntity_Boiler { @Override protected int getEnergyConsumption() { - return 1; + return basicTemperatureMod; } @Override @@ -153,6 +153,11 @@ public class GT_MetaTileEntity_Boiler_Solar extends GT_MetaTileEntity_Boiler { return basicLossTimerLimit / basicTemperatureMod; } + @Override + protected int getHeatUpAmount() { + return basicTemperatureMod; + } + @Override protected void updateFuel(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { if ((aTick % 256L == 0L) && (!aBaseMetaTileEntity.getWorld().isThundering())) { -- cgit