Merge config categories (#3152)

Co-authored-by: miozune <miozune@gmail.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>

6 files changed, 0 insertions, 187 deletions

diff --git a/src/main/java/gregtech/common/config/machinestats/ConfigBronzeSolarBoiler.java b/src/main/java/gregtech/common/config/machinestats/ConfigBronzeSolarBoiler.java
deleted file mode 100644
index 59042b7e41..0000000000
--- a/src/main/java/gregtech/common/config/machinestats/ConfigBronzeSolarBoiler.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package gregtech.common.config.machinestats;
-
-import com.gtnewhorizon.gtnhlib.config.Config;
-
-import gregtech.api.enums.Mods;
-
-@Config(
-    modid = Mods.Names.GREG_TECH,
-    category = "bronze_solar_boiler",
-    configSubDirectory = "GregTech",
-    filename = "MachineStats")
-public class ConfigBronzeSolarBoiler {
-
-    @Config.Comment({ "Number of run-time ticks before boiler starts calcification.",
-        "100% calcification and minimal output will be reached at 2 times this." })
-    @Config.DefaultInt(1_080_000)
-    @Config.RequiresMcRestart
-    public static int calcificationTicks;
-
-    @Config.Comment("Number of ticks it takes to lose 1°C.")
-    @Config.DefaultInt(45)
-    @Config.RequiresMcRestart
-    public static int cooldownTicks;
-
-    @Config.DefaultInt(120)
-    @Config.RequiresMcRestart
-    public static int maxOutputPerSecond;
-
-    @Config.DefaultInt(40)
-    @Config.RequiresMcRestart
-    public static int minOutputPerSecond;
-}
diff --git a/src/main/java/gregtech/common/config/machinestats/ConfigMachines.java b/src/main/java/gregtech/common/config/machinestats/ConfigMachines.java
deleted file mode 100644
index ed93f31629..0000000000
--- a/src/main/java/gregtech/common/config/machinestats/ConfigMachines.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package gregtech.common.config.machinestats;
-
-import com.gtnewhorizon.gtnhlib.config.Config;
-
-import gregtech.api.enums.Mods;
-
-@Config(modid = Mods.Names.GREG_TECH, category = "machines", configSubDirectory = "GregTech", filename = "MachineStats")
-public class ConfigMachines {
-
-    @Config.Comment("Controls the damageFactorLow variable in the maintenance damage equation.")
-    @Config.DefaultInt(5)
-    @Config.RequiresMcRestart
-    public static int damageFactorLow;
-
-    @Config.Comment("Controls the damageFactorHigh variable in the maintenance damage equation.")
-    @Config.DefaultFloat(0.6f)
-    @Config.RequiresMcRestart
-    public static float damageFactorHigh;
-
-    @Config.Comment("if true, disable maintenance checks.")
-    @Config.DefaultBoolean(false)
-    @Config.RequiresMcRestart
-    public static boolean disableMaintenanceChecks;
-
-    @Config.Comment("If true, allows for multiple eggs on the magical energy absorber.")
-    @Config.DefaultBoolean(false)
-    @Config.RequiresMcRestart
-    public static boolean allowMultipleEggs;
-
-    @Config.Comment("If true, requires at least a free face to open a machine gui.")
-    @Config.DefaultBoolean(false)
-    @Config.RequiresMcRestart
-    public static boolean forceFreeFace;
-}
diff --git a/src/main/java/gregtech/common/config/machinestats/ConfigMassFabricator.java b/src/main/java/gregtech/common/config/machinestats/ConfigMassFabricator.java
deleted file mode 100644
index 13cf89470b..0000000000
--- a/src/main/java/gregtech/common/config/machinestats/ConfigMassFabricator.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package gregtech.common.config.machinestats;
-
-import com.gtnewhorizon.gtnhlib.config.Config;
-
-import gregtech.api.enums.Mods;
-
-@Config(
-    modid = Mods.Names.GREG_TECH,
-    category = "mass_fabricator",
-    configSubDirectory = "GregTech",
-    filename = "MachineStats")
-public class ConfigMassFabricator {
-
-    @Config.Comment("if true, requires UUA to run the mass fab.")
-    @Config.DefaultBoolean(false)
-    @Config.RequiresMcRestart
-    public static boolean requiresUUA;
-
-    @Config.Comment("Duration multiplier.")
-    @Config.DefaultInt(3215)
-    @Config.RequiresMcRestart
-    public static int durationMultiplier;
-
-    @Config.Comment("mb of UUA per UUM.")
-    @Config.DefaultInt(1)
-    @Config.RequiresMcRestart
-    public static int UUAPerUUM;
-
-    @Config.Comment("Speed bonus delivered by the UUA.")
-    @Config.DefaultInt(40)
-    @Config.RequiresMcRestart
-    public static int UUASpeedBonus;
-}
diff --git a/src/main/java/gregtech/common/config/machinestats/ConfigMicrowaveEnergyTransmitter.java b/src/main/java/gregtech/common/config/machinestats/ConfigMicrowaveEnergyTransmitter.java
deleted file mode 100644
index 6efec5ca12..0000000000
--- a/src/main/java/gregtech/common/config/machinestats/ConfigMicrowaveEnergyTransmitter.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package gregtech.common.config.machinestats;
-
-import com.gtnewhorizon.gtnhlib.config.Config;
-
-import gregtech.api.enums.Mods;
-
-@Config(
-    modid = Mods.Names.GREG_TECH,
-    category = "microwave_energy_transmitter",
-    configSubDirectory = "GregTech",
-    filename = "MachineStats")
-public class ConfigMicrowaveEnergyTransmitter {
-
-    @Config.Comment("if true, it has a passive energy loss.")
-    @Config.DefaultBoolean(true)
-    @Config.RequiresMcRestart
-    public static boolean passiveEnergyUse;
-
-    @Config.Comment("max loss.")
-    @Config.DefaultInt(50)
-    @Config.RequiresMcRestart
-    public static int maxLoss;
-
-    @Config.Comment("max loss distance.")
-    @Config.DefaultInt(10_000)
-    @Config.RequiresMcRestart
-    public static int maxLossDistance;
-}
diff --git a/src/main/java/gregtech/common/config/machinestats/ConfigSteelSolarBoiler.java b/src/main/java/gregtech/common/config/machinestats/ConfigSteelSolarBoiler.java
deleted file mode 100644
index c6f6ea9f2a..0000000000
--- a/src/main/java/gregtech/common/config/machinestats/ConfigSteelSolarBoiler.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package gregtech.common.config.machinestats;
-
-import com.gtnewhorizon.gtnhlib.config.Config;
-
-import gregtech.api.enums.Mods;
-
-@Config(
-    modid = Mods.Names.GREG_TECH,
-    category = "steel_solar_boiler",
-    configSubDirectory = "GregTech",
-    filename = "MachineStats")
-public class ConfigSteelSolarBoiler {
-
-    @Config.Comment({ "Number of run-time ticks before boiler starts calcification.",
-        "100% calcification and minimal output will be reached at 2 times this." })
-    @Config.DefaultInt(1_080_000)
-    @Config.RequiresMcRestart
-    public static int calcificationTicks;
-
-    @Config.Comment("Number of ticks it takes to lose 1°C.")
-    @Config.DefaultInt(75)
-    @Config.RequiresMcRestart
-    public static int cooldownTicks;
-
-    @Config.DefaultInt(360)
-    @Config.RequiresMcRestart
-    public static int maxOutputPerSecond;
-
-    @Config.DefaultInt(120)
-    @Config.RequiresMcRestart
-    public static int minOutputPerSecond;
-}
diff --git a/src/main/java/gregtech/common/config/machinestats/ConfigTeleporter.java b/src/main/java/gregtech/common/config/machinestats/ConfigTeleporter.java
deleted file mode 100644
index 26f1f8fb4d..0000000000
--- a/src/main/java/gregtech/common/config/machinestats/ConfigTeleporter.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package gregtech.common.config.machinestats;
-
-import com.gtnewhorizon.gtnhlib.config.Config;
-
-import gregtech.api.enums.Mods;
-
-@Config(
-    modid = Mods.Names.GREG_TECH,
-    category = "teleporter",
-    configSubDirectory = "GregTech",
-    filename = "MachineStats")
-public class ConfigTeleporter {
-
-    @Config.Comment("if true, allows interdim tp")
-    @Config.DefaultBoolean(true)
-    @Config.RequiresMcRestart
-    public static boolean interDimensionalTPAllowed;
-
-    @Config.Comment("passive energy loss.")
-    @Config.DefaultInt(2048)
-    @Config.RequiresMcRestart
-    public static int passiveEnergyDrain;
-
-    @Config.Comment("power multiplier.")
-    @Config.DefaultInt(100)
-    @Config.RequiresMcRestart
-    public static int powerMultiplier;
-}