From dbc10704fdbff100d1ae592aa0ddf1dc8b1aeca0 Mon Sep 17 00:00:00 2001 From: boubou19 Date: Thu, 12 Sep 2024 22:30:04 +0200 Subject: Merge config categories (#3152) Co-authored-by: miozune Co-authored-by: Martin Robertz --- .../gregtech/common/tileentities/boilers/MTEBoilerSolar.java | 10 +++++----- .../common/tileentities/boilers/MTEBoilerSolarSteel.java | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src/main/java/gregtech/common/tileentities/boilers') diff --git a/src/main/java/gregtech/common/tileentities/boilers/MTEBoilerSolar.java b/src/main/java/gregtech/common/tileentities/boilers/MTEBoilerSolar.java index 0fc23f59cf..0628f877e6 100644 --- a/src/main/java/gregtech/common/tileentities/boilers/MTEBoilerSolar.java +++ b/src/main/java/gregtech/common/tileentities/boilers/MTEBoilerSolar.java @@ -26,7 +26,7 @@ import gregtech.api.render.TextureFactory; import gregtech.api.util.GTLanguageManager; import gregtech.api.util.GTModHandler; import gregtech.api.util.GTUtility; -import gregtech.common.config.machinestats.ConfigBronzeSolarBoiler; +import gregtech.common.config.MachineStats; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; @@ -38,10 +38,10 @@ public class MTEBoilerSolar extends MTEBoiler { "Steam Power by the Sun%n" + "Produces %sL of Steam per second%n" + "Calcifies over time, reducing Steam output to %sL/s%n" + "Break and replace to descale"); - protected int calcificationTicks = ConfigBronzeSolarBoiler.calcificationTicks; - protected int cooldownTicks = ConfigBronzeSolarBoiler.cooldownTicks; - protected int maxOutputPerSecond = ConfigBronzeSolarBoiler.maxOutputPerSecond; - protected int minOutputPerSecond = ConfigBronzeSolarBoiler.minOutputPerSecond; + protected int calcificationTicks = MachineStats.bronzeSolarBoiler.calcificationTicks; + protected int cooldownTicks = MachineStats.bronzeSolarBoiler.cooldownTicks; + protected int maxOutputPerSecond = MachineStats.bronzeSolarBoiler.maxOutputPerSecond; + protected int minOutputPerSecond = MachineStats.bronzeSolarBoiler.minOutputPerSecond; protected final int basicTemperatureMod = 5; // Base Celsius gain or loss private int mRunTimeTicks = 0; diff --git a/src/main/java/gregtech/common/tileentities/boilers/MTEBoilerSolarSteel.java b/src/main/java/gregtech/common/tileentities/boilers/MTEBoilerSolarSteel.java index b46beca108..1f53123083 100644 --- a/src/main/java/gregtech/common/tileentities/boilers/MTEBoilerSolarSteel.java +++ b/src/main/java/gregtech/common/tileentities/boilers/MTEBoilerSolarSteel.java @@ -7,7 +7,7 @@ import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.render.TextureFactory; -import gregtech.common.config.machinestats.ConfigSteelSolarBoiler; +import gregtech.common.config.MachineStats; public class MTEBoilerSolarSteel extends MTEBoilerSolar { @@ -27,10 +27,10 @@ public class MTEBoilerSolarSteel extends MTEBoilerSolar { } protected void initBoilerStats() { - calcificationTicks = ConfigSteelSolarBoiler.calcificationTicks; - cooldownTicks = ConfigSteelSolarBoiler.cooldownTicks; - maxOutputPerSecond = ConfigSteelSolarBoiler.maxOutputPerSecond; - minOutputPerSecond = ConfigSteelSolarBoiler.minOutputPerSecond; + calcificationTicks = MachineStats.steelSolarBoiler.calcificationTicks; + cooldownTicks = MachineStats.steelSolarBoiler.cooldownTicks; + maxOutputPerSecond = MachineStats.steelSolarBoiler.maxOutputPerSecond; + minOutputPerSecond = MachineStats.steelSolarBoiler.minOutputPerSecond; } @Override -- cgit