8 files changed, 29 insertions, 22 deletions
diff --git a/src/main/java/cc/polyfrost/oneconfig/gui/SideBar.java b/src/main/java/cc/polyfrost/oneconfig/gui/SideBar.java
index 5678189..bda24a2 100644
--- a/src/main/java/cc/polyfrost/oneconfig/gui/SideBar.java
+++ b/src/main/java/cc/polyfrost/oneconfig/gui/SideBar.java
@@ -10,7 +10,6 @@ import cc.polyfrost.oneconfig.internal.assets.Colors;
 import cc.polyfrost.oneconfig.renderer.RenderManager;
 import cc.polyfrost.oneconfig.renderer.font.Fonts;
 import cc.polyfrost.oneconfig.internal.assets.SVGs;
-import cc.polyfrost.oneconfig.test.ButtonTestPage;
 import cc.polyfrost.oneconfig.utils.gui.GuiUtils;
 import cc.polyfrost.oneconfig.utils.color.ColorPalette;
 
@@ -41,7 +40,6 @@ public class SideBar {
     public SideBar() {
         buttons.get(0).setClickAction(new CreditsPage());
         buttons.get(2).setClickAction(new ModsPage());
-        buttons.get(8).setClickAction(new ButtonTestPage());
         HUDButton.setClickAction(() -> GuiUtils.displayScreen(new HudGui()));
         CloseButton.setClickAction(GuiUtils::closeScreen);
         for (BasicButton button : buttons) {
diff --git a/src/main/java/cc/polyfrost/oneconfig/internal/OneConfig.java b/src/main/java/cc/polyfrost/oneconfig/internal/OneConfig.java
index 948f4ec..389e200 100644
--- a/src/main/java/cc/polyfrost/oneconfig/internal/OneConfig.java
+++ b/src/main/java/cc/polyfrost/oneconfig/internal/OneConfig.java
@@ -1,17 +1,15 @@
 package cc.polyfrost.oneconfig.internal;
 
-import cc.polyfrost.oneconfig.internal.config.core.ConfigCore;
 import cc.polyfrost.oneconfig.config.data.Mod;
 import cc.polyfrost.oneconfig.config.data.ModType;
 import cc.polyfrost.oneconfig.events.EventManager;
-import cc.polyfrost.oneconfig.internal.hud.HudCore;
-import cc.polyfrost.oneconfig.internal.config.OneConfigConfig;
 import cc.polyfrost.oneconfig.internal.command.OneConfigCommand;
+import cc.polyfrost.oneconfig.internal.config.OneConfigConfig;
+import cc.polyfrost.oneconfig.internal.config.core.ConfigCore;
 import cc.polyfrost.oneconfig.internal.gui.BlurHandler;
-import cc.polyfrost.oneconfig.test.TestCommand;
-import cc.polyfrost.oneconfig.test.TestConfig;
-import cc.polyfrost.oneconfig.utils.gui.GuiUtils;
+import cc.polyfrost.oneconfig.internal.hud.HudCore;
 import cc.polyfrost.oneconfig.utils.commands.CommandManager;
+import cc.polyfrost.oneconfig.utils.gui.GuiUtils;
 import cc.polyfrost.oneconfig.utils.hypixel.HypixelUtils;
 import net.minecraftforge.fml.common.DummyModContainer;
 import net.minecraftforge.fml.common.Loader;
@@ -32,7 +30,6 @@ public class OneConfig {
     public static final List<Mod> loadedMods = new ArrayList<>();
     public static final List<ModMetadata> loadedOtherMods = new ArrayList<>();
     public static OneConfigConfig config;
-    public static TestConfig testConfig;
     private static boolean preLaunched = false;
     private static boolean initialized = false;
 
@@ -60,9 +57,7 @@ public class OneConfig {
         if (initialized) return;
         GuiUtils.getDeltaTime(); // called to make sure static initializer is called
         BlurHandler.INSTANCE.load();
-        testConfig = new TestConfig();
         CommandManager.INSTANCE.registerCommand(OneConfigCommand.class);
-        CommandManager.INSTANCE.registerCommand(TestCommand.class);
         EventManager.getEventManager().register(new HudCore());
         EventManager.getEventManager().register(HypixelUtils.INSTANCE);
         reloadModsList();
diff --git a/src/main/java/cc/polyfrost/oneconfig/test/ButtonTestPage.java b/src/main/java/cc/polyfrost/oneconfig/test/ButtonTestPage_Test.java
index d7575ce..fe25477 100644
--- a/src/main/java/cc/polyfrost/oneconfig/test/ButtonTestPage.java
+++ b/src/main/java/cc/polyfrost/oneconfig/test/ButtonTestPage_Test.java
@@ -7,7 +7,7 @@ import cc.polyfrost.oneconfig.utils.color.ColorPalette;
 
 import java.util.ArrayList;
 
-public class ButtonTestPage extends Page {
+public class ButtonTestPage_Test extends Page {
     private final ArrayList<BasicButton> row1 = new ArrayList<BasicButton>() {{
         add(new BasicButton(254, 48, "Primary", BasicButton.ALIGNMENT_LEFT, ColorPalette.PRIMARY));
         add(new BasicButton(254, 48, "Primary Destructive", BasicButton.ALIGNMENT_LEFT, ColorPalette.PRIMARY_DESTRUCTIVE));
@@ -42,7 +42,7 @@ public class ButtonTestPage extends Page {
         add(new BasicButton(254, 48, "Disabled :(", SVGs.BOX, SVGs.BOX, BasicButton.ALIGNMENT_JUSTIFIED, ColorPalette.PRIMARY));
     }};
 
-    public ButtonTestPage() {
+    public ButtonTestPage_Test() {
         super("Buttons");
         row3.get(3).disable(true);
         row3.get(4).disable(true);
diff --git a/src/main/java/cc/polyfrost/oneconfig/test/TestCommand.java b/src/main/java/cc/polyfrost/oneconfig/test/TestCommand_Test.java
index b757c73..31a503b 100644
--- a/src/main/java/cc/polyfrost/oneconfig/test/TestCommand.java
+++ b/src/main/java/cc/polyfrost/oneconfig/test/TestCommand_Test.java
@@ -7,7 +7,7 @@ import cc.polyfrost.oneconfig.utils.commands.annotations.SubCommand;
 import gg.essential.universal.UChat;
 
 @Command(value = "test", aliases = {"t"})
-public class TestCommand {
+public class TestCommand_Test {
 
     @Main
     private static void main() {  // /test
diff --git a/src/main/java/cc/polyfrost/oneconfig/test/TestConfig.java b/src/main/java/cc/polyfrost/oneconfig/test/TestConfig_Test.java
index dc3babd..aee6d6b 100644
--- a/src/main/java/cc/polyfrost/oneconfig/test/TestConfig.java
+++ b/src/main/java/cc/polyfrost/oneconfig/test/TestConfig_Test.java
@@ -10,7 +10,7 @@ import cc.polyfrost.oneconfig.config.migration.VigilanceMigrator;
 import gg.essential.universal.UKeyboard;
 import net.minecraftforge.fml.common.FMLCommonHandler;
 
-public class TestConfig extends Config {
+public class TestConfig_Test extends Config {
 
     @Switch(
             name = "Test Switch",
@@ -88,7 +88,7 @@ public class TestConfig extends Config {
             location = PageLocation.TOP
 
     )
-    public TestPage testPage = new TestPage();
+    public TestPage_Test testPage = new TestPage_Test();
 
     @Page(
             name = "Test Page",
@@ -96,7 +96,7 @@ public class TestConfig extends Config {
             location = PageLocation.BOTTOM
 
     )
-    public TestPage testPage2 = new TestPage();
+    public TestPage_Test testPage2 = new TestPage_Test();
 
     @Switch(
             name = "Test Switch",
@@ -117,9 +117,9 @@ public class TestConfig extends Config {
             name = "Test HUD",
             category = "HUD"
     )
-    public TestHud hud = new TestHud(false, 0, 0);
+    public TestHud_Test hud = new TestHud_Test(false, 0, 0);
 
-    public TestConfig() {
+    public TestConfig_Test() {
         super(new Mod("Test Mod", ModType.UTIL_QOL, new VigilanceMigrator("./config/testConfig.toml")), "hacksConfig.json");
     }
 }
diff --git a/src/main/java/cc/polyfrost/oneconfig/test/TestHud.java b/src/main/java/cc/polyfrost/oneconfig/test/TestHud_Test.java
index 023ae43..0de9d65 100644
--- a/src/main/java/cc/polyfrost/oneconfig/test/TestHud.java
+++ b/src/main/java/cc/polyfrost/oneconfig/test/TestHud_Test.java
@@ -8,8 +8,8 @@ import net.minecraft.client.Minecraft;
 import java.util.ArrayList;
 import java.util.List;
 
-public class TestHud extends TextHud {
-    public TestHud(boolean enabled, int x, int y) {
+public class TestHud_Test extends TextHud {
+    public TestHud_Test(boolean enabled, int x, int y) {
         super(enabled, x, y);
     }
 
diff --git a/src/main/java/cc/polyfrost/oneconfig/test/TestMod_Test.java b/src/main/java/cc/polyfrost/oneconfig/test/TestMod_Test.java
new file mode 100644
index 0000000..98537f7
--- /dev/null
+++ b/src/main/java/cc/polyfrost/oneconfig/test/TestMod_Test.java
@@ -0,0 +1,14 @@
+package cc.polyfrost.oneconfig.test;
+
+import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.common.event.FMLInitializationEvent;
+
+@net.minecraftforge.fml.common.Mod(modid = "oneconfig-test-mod", name = "Test Mod", version = "0")
+public class TestMod_Test {
+    TestConfig_Test config;
+
+    @Mod.EventHandler
+    public void init(FMLInitializationEvent event) {
+        config = new TestConfig_Test();
+    }
+}
diff --git a/src/main/java/cc/polyfrost/oneconfig/test/TestPage.java b/src/main/java/cc/polyfrost/oneconfig/test/TestPage_Test.java
index 54a775a..0f8f692 100644
--- a/src/main/java/cc/polyfrost/oneconfig/test/TestPage.java
+++ b/src/main/java/cc/polyfrost/oneconfig/test/TestPage_Test.java
@@ -2,7 +2,7 @@ package cc.polyfrost.oneconfig.test;
 
 import cc.polyfrost.oneconfig.config.annotations.Switch;
 
-public class TestPage {
+public class TestPage_Test {
 
     @Switch(
             name = "Epic Test Switch"