From f6509ebc186be88568cb2d7ea01f29cc1a26d645 Mon Sep 17 00:00:00 2001 From: Glease <4586901+Glease@users.noreply.github.com> Date: Fri, 4 Jun 2021 13:37:32 +0800 Subject: Fix ancient copy paste problem Signed-off-by: Glease <4586901+Glease@users.noreply.github.com> --- .../boilers/GT_MetaTileEntity_Boiler_Solar.java | 18 ++++++++++-------- .../boilers/GT_MetaTileEntity_Boiler_Solar_Steel.java | 2 +- 2 files changed, 11 insertions(+), 9 deletions(-) (limited to 'src') 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 30c056e089..c32bf98476 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 @@ -173,7 +173,7 @@ public class GT_MetaTileEntity_Boiler_Solar extends GT_MetaTileEntity_Boiler { if (mTemperature < 100) { return 0; } - if (mRunTimeTicks > getMaxRuntimeInTicks()) { + if (mRunTimeTicks > mConfig.getMaxRuntimeTicks()) { return mConfig.getMinOutputPerSecond(); } else if (mRunTimeTicks > mConfig.getCalcificationTicks()) { /* When reaching calcification ticks; discount the proportion of run-time spent on calcification @@ -259,13 +259,6 @@ public class GT_MetaTileEntity_Boiler_Solar extends GT_MetaTileEntity_Boiler { return mRunTimeTicks / 20; } - /** - * After which min output is reached. - */ - public int getMaxRuntimeInTicks() { - return (mConfig.getMaxOutputPerSecond() - mConfig.getMinOutputPerSecond()) * mConfig.getCalcificationTicks() / mConfig.getMaxOutputPerSecond(); - } - @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { return new GT_MetaTileEntity_Boiler_Solar(mName, mTier, mDescriptionArray, mTextures, mConfig); @@ -276,6 +269,7 @@ public class GT_MetaTileEntity_Boiler_Solar extends GT_MetaTileEntity_Boiler { private final int minOutputPerSecond; private final int maxOutputPerSecond; private final int coolDownTicks; + private final int maxRuntimeTicks; public Config(String aCategory, int aDefaultCalcificationTicks, @@ -288,6 +282,7 @@ public class GT_MetaTileEntity_Boiler_Solar extends GT_MetaTileEntity_Boiler { minOutputPerSecond = get(aCategory,"MinOutputPerSecond", aDefaultMinOutputPerSecond); maxOutputPerSecond = get(aCategory,"MaxOutputPerSecond", aDefaultMaxOutputPerSecond); coolDownTicks = get(aCategory,"CoolDownTicks", aDefaultCoolDownTicks, "Number of ticks it takes to lose 1°C."); + maxRuntimeTicks = (getMaxOutputPerSecond() - getMinOutputPerSecond()) * getCalcificationTicks() / getMaxOutputPerSecond() + getCalcificationTicks(); } protected int get(final String aCategory, final String aKey, final int aDefaultValue, final String... aComments) { @@ -313,5 +308,12 @@ public class GT_MetaTileEntity_Boiler_Solar extends GT_MetaTileEntity_Boiler { public int getCoolDownTicks() { return coolDownTicks; } + + /** + * After which min output is reached. + */ + public int getMaxRuntimeTicks() { + return maxRuntimeTicks; + } } } diff --git a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar_Steel.java b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar_Steel.java index d7a003ac5d..ff77b049c4 100644 --- a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar_Steel.java +++ b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar_Steel.java @@ -30,7 +30,7 @@ public class GT_MetaTileEntity_Boiler_Solar_Steel extends GT_MetaTileEntity_Boil @Override protected Config createConfig() { - return new Config(machineconfig + ".boiler.solar.steel",108000, 120, 360, 75); + return new Config(machineconfig + ".boiler.solar.steel", 1080000, 120, 360, 75); } @Override -- cgit