diff options
Diffstat (limited to 'src/main/java/gregtech/common/tileentities')
6 files changed, 26 insertions, 27 deletions
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 diff --git a/src/main/java/gregtech/common/tileentities/generators/MTEMagicalEnergyAbsorber.java b/src/main/java/gregtech/common/tileentities/generators/MTEMagicalEnergyAbsorber.java index c49102ad61..01d2e1ee07 100644 --- a/src/main/java/gregtech/common/tileentities/generators/MTEMagicalEnergyAbsorber.java +++ b/src/main/java/gregtech/common/tileentities/generators/MTEMagicalEnergyAbsorber.java @@ -64,7 +64,7 @@ import gregtech.api.util.GTLanguageManager; import gregtech.api.util.GTLog; import gregtech.api.util.GTUtility; import gregtech.api.util.WorldSpawnedEventBuilder.ParticleEventBuilder; -import gregtech.common.config.machinestats.ConfigMachines; +import gregtech.common.config.MachineStats; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.aspects.AspectSourceHelper; @@ -111,7 +111,7 @@ public class MTEMagicalEnergyAbsorber extends MTEBasicGenerator implements Magic * Populates static variables dependant on config settings */ private static void sharedConfigLoad() { - sAllowMultipleEggs = ConfigMachines.allowMultipleEggs; + sAllowMultipleEggs = MachineStats.machines.allowMultipleEggs; if (Thaumcraft.isModLoaded()) { for (Aspect tAspect : Aspect.aspects.values()) { // noinspection UnstableApiUsage diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/MTEMassfabricator.java b/src/main/java/gregtech/common/tileentities/machines/basic/MTEMassfabricator.java index 195d2317de..899cc01f7c 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/MTEMassfabricator.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/MTEMassfabricator.java @@ -42,7 +42,7 @@ import gregtech.api.util.GTRecipe; import gregtech.api.util.GTUtility; import gregtech.api.util.MethodsReturnNonnullByDefault; import gregtech.api.util.OverclockCalculator; -import gregtech.common.config.machinestats.ConfigMassFabricator; +import gregtech.common.config.MachineStats; public class MTEMassfabricator extends MTEBasicMachine { @@ -136,10 +136,10 @@ public class MTEMassfabricator extends MTEBasicMachine { @Override public void onConfigLoad() { super.onConfigLoad(); - sDurationMultiplier = ConfigMassFabricator.durationMultiplier; - sUUAperUUM = ConfigMassFabricator.UUAPerUUM; - sUUASpeedBonus = ConfigMassFabricator.UUASpeedBonus; - sRequiresUUA = ConfigMassFabricator.requiresUUA; + sDurationMultiplier = MachineStats.massFabricator.durationMultiplier; + sUUAperUUM = MachineStats.massFabricator.UUAPerUUM; + sUUASpeedBonus = MachineStats.massFabricator.UUASpeedBonus; + sRequiresUUA = MachineStats.massFabricator.requiresUUA; Materials.UUAmplifier.mChemicalFormula = ("Mass Fabricator Eff/Speed Bonus: x" + sUUASpeedBonus); } diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/MTEMicrowaveEnergyTransmitter.java b/src/main/java/gregtech/common/tileentities/machines/basic/MTEMicrowaveEnergyTransmitter.java index 52d38beba0..c8b0c966e3 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/MTEMicrowaveEnergyTransmitter.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/MTEMicrowaveEnergyTransmitter.java @@ -42,8 +42,7 @@ import gregtech.api.metatileentity.BaseMetaTileEntity; import gregtech.api.metatileentity.implementations.MTEBasicTank; import gregtech.api.render.TextureFactory; import gregtech.api.util.GTUtility; -import gregtech.common.config.machinestats.ConfigMicrowaveEnergyTransmitter; -import gregtech.common.config.machinestats.ConfigTeleporter; +import gregtech.common.config.MachineStats; public class MTEMicrowaveEnergyTransmitter extends MTEBasicTank implements IAddGregtechLogo, IAddUIWidgets { @@ -148,10 +147,10 @@ public class MTEMicrowaveEnergyTransmitter extends MTEBasicTank implements IAddG @Override public void onConfigLoad() { - sInterDimensionalTeleportAllowed = ConfigTeleporter.interDimensionalTPAllowed; - mMaxLoss = Math.max(ConfigMicrowaveEnergyTransmitter.maxLoss, 11); - mMaxLossDistance = ConfigMicrowaveEnergyTransmitter.maxLossDistance; - mPassiveEnergyUse = ConfigMicrowaveEnergyTransmitter.passiveEnergyUse; + sInterDimensionalTeleportAllowed = MachineStats.teleporter.interDimensionalTPAllowed; + mMaxLoss = Math.max(MachineStats.microwaveEnergyTransmitter.maxLoss, 11); + mMaxLossDistance = MachineStats.microwaveEnergyTransmitter.maxLossDistance; + mPassiveEnergyUse = MachineStats.microwaveEnergyTransmitter.passiveEnergyUse; } @Override diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/MTETeleporter.java b/src/main/java/gregtech/common/tileentities/machines/basic/MTETeleporter.java index cb7d6d6d71..f1d09f6b75 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/MTETeleporter.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/MTETeleporter.java @@ -61,7 +61,7 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.implementations.MTEBasicTank; import gregtech.api.render.TextureFactory; import gregtech.api.util.GTUtility; -import gregtech.common.config.machinestats.ConfigTeleporter; +import gregtech.common.config.MachineStats; public class MTETeleporter extends MTEBasicTank implements IAddGregtechLogo, IAddUIWidgets { @@ -245,9 +245,9 @@ public class MTETeleporter extends MTEBasicTank implements IAddGregtechLogo, IAd @Override public void onConfigLoad() { - sInterDimensionalTeleportAllowed = ConfigTeleporter.interDimensionalTPAllowed; - sPassiveEnergyDrain = ConfigTeleporter.passiveEnergyDrain; - sPowerMultiplyer = ConfigTeleporter.powerMultiplier; + sInterDimensionalTeleportAllowed = MachineStats.teleporter.interDimensionalTPAllowed; + sPassiveEnergyDrain = MachineStats.teleporter.passiveEnergyDrain; + sPowerMultiplyer = MachineStats.teleporter.powerMultiplier; sFPowerMultiplyer = sPowerMultiplyer / 100.0; } |