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 --- .../common/tileentities/machines/basic/MTEMassfabricator.java | 10 +++++----- .../machines/basic/MTEMicrowaveEnergyTransmitter.java | 11 +++++------ .../common/tileentities/machines/basic/MTETeleporter.java | 8 ++++---- 3 files changed, 14 insertions(+), 15 deletions(-) (limited to 'src/main/java/gregtech/common/tileentities/machines/basic') 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; } -- cgit