aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/tileentities/boilers
diff options
context:
space:
mode:
authorGlease <4586901+Glease@users.noreply.github.com>2021-04-17 12:37:08 +0800
committerLéa Gris <lea.gris@noiraude.net>2021-04-24 13:23:24 +0200
commit22f4b6d1daa7581cf46ac4bc19b346605b46494e (patch)
tree34d52eea5af01a42c4cbfd9854b760a7c67fd48d /src/main/java/gregtech/common/tileentities/boilers
parent53aec632a6327ac227f0fbd957dee47a202bfbe4 (diff)
downloadGT5-Unofficial-22f4b6d1daa7581cf46ac4bc19b346605b46494e.tar.gz
GT5-Unofficial-22f4b6d1daa7581cf46ac4bc19b346605b46494e.tar.bz2
GT5-Unofficial-22f4b6d1daa7581cf46ac4bc19b346605b46494e.zip
Fix solar boiler heat up speed
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
Diffstat (limited to 'src/main/java/gregtech/common/tileentities/boilers')
-rw-r--r--src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler.java6
-rw-r--r--src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java7
2 files changed, 11 insertions, 2 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 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
@@ -154,6 +154,11 @@ public class GT_MetaTileEntity_Boiler_Solar extends GT_MetaTileEntity_Boiler {
}
@Override
+ protected int getHeatUpAmount() {
+ return basicTemperatureMod;
+ }
+
+ @Override
protected void updateFuel(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
if ((aTick % 256L == 0L) && (!aBaseMetaTileEntity.getWorld().isThundering())) {
boolean bRain = aBaseMetaTileEntity.getWorld().isRaining() && aBaseMetaTileEntity.getBiome().rainfall > 0.0F;