Merge config categories (#3152)

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

2 files changed, 0 insertions, 81 deletions

diff --git a/src/main/java/gregtech/common/config/worldgen/ConfigEndAsteroids.java b/src/main/java/gregtech/common/config/worldgen/ConfigEndAsteroids.java
deleted file mode 100644
index c1ec0125b5..0000000000
--- a/src/main/java/gregtech/common/config/worldgen/ConfigEndAsteroids.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package gregtech.common.config.worldgen;
-
-import com.gtnewhorizon.gtnhlib.config.Config;
-
-import gregtech.api.enums.Mods;
-
-@Config(
-    modid = Mods.Names.GREG_TECH,
-    category = "end_asteroids",
-    configSubDirectory = "GregTech",
-    filename = "WorldGeneration")
-public class ConfigEndAsteroids {
-
-    @Config.Comment("The maximum size for the end asteroids.")
-    @Config.DefaultInt(200)
-    @Config.RequiresMcRestart
-    public static int EndAsteroidMaxSize;
-
-    @Config.Comment("The minimum size for the end asteroids.")
-    @Config.DefaultInt(200)
-    @Config.RequiresMcRestart
-    public static int EndAsteroidMinSize;
-
-    @Config.Comment("The probability weight to generate end asteroids.")
-    @Config.DefaultInt(300)
-    @Config.RequiresMcRestart
-    public static int EndAsteroidProbability;
-
-    @Config.Comment("if true, enables end asteroids.")
-    @Config.DefaultBoolean(true)
-    @Config.RequiresMcRestart
-    public static boolean generateEndAsteroids;
-}
diff --git a/src/main/java/gregtech/common/config/worldgen/ConfigGeneral.java b/src/main/java/gregtech/common/config/worldgen/ConfigGeneral.java
deleted file mode 100644
index c978f35365..0000000000
--- a/src/main/java/gregtech/common/config/worldgen/ConfigGeneral.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package gregtech.common.config.worldgen;
-
-import com.gtnewhorizon.gtnhlib.config.Config;
-
-import gregtech.api.enums.Mods;
-
-@Config(
-    modid = Mods.Names.GREG_TECH,
-    category = "general",
-    configSubDirectory = "GregTech",
-    filename = "WorldGeneration")
-public class ConfigGeneral {
-
-    @Config.Comment("if true, enables basalt ore gen.")
-    @Config.DefaultBoolean(true)
-    @Config.RequiresMcRestart
-    public static boolean generateBasaltOres;
-
-    @Config.Comment("if true, enables black granite ore gen.")
-    @Config.DefaultBoolean(true)
-    @Config.RequiresMcRestart
-    public static boolean generateBlackGraniteOres;
-
-    @Config.Comment("if true, enables marble ore gen.")
-    @Config.DefaultBoolean(true)
-    @Config.RequiresMcRestart
-    public static boolean generateMarbleOres;
-
-    @Config.Comment("if true, enables red granite ore gen.")
-    @Config.DefaultBoolean(true)
-    @Config.RequiresMcRestart
-    public static boolean generateRedGraniteOres;
-
-    @Config.Comment("If true, disables vanilla oregen.")
-    @Config.DefaultBoolean(true)
-    @Config.RequiresMcRestart
-    public static boolean disableVanillaOres;
-
-    @Config.Comment("if true, enables underground dirt gen. Does nothing if the vanilla oregen is enabled!")
-    @Config.DefaultBoolean(true)
-    @Config.RequiresMcRestart
-    public static boolean generateUndergroundDirtGen;
-
-    @Config.Comment("if true, enables underground gravel gen. Does nothing if the vanilla oregen is enabled!")
-    @Config.DefaultBoolean(true)
-    @Config.RequiresMcRestart
-    public static boolean generateUndergroundGravelGen;
-}