moved api and debug into dev config

6 files changed, 37 insertions, 45 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/config/Features.java b/src/main/java/at/hannibal2/skyhanni/config/Features.java
index fa2cf6ac1..854ef91bc 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/Features.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/Features.java
@@ -32,8 +32,8 @@ public class Features {
             return;
         }
 
-        if (runnableId.equals("testPos")) {
-            editOverlay(activeConfigCategory, 200, 16, debug.testPos);
+        if (runnableId.equals("debugPos")) {
+            editOverlay(activeConfigCategory, 200, 16, dev.debugPos);
             return;
         }
 
@@ -128,12 +128,8 @@ public class Features {
     public CommandsFeatures commands = new CommandsFeatures();
 
     @Expose
-    @Category(name = "Api", desc = "Api Data")
-    public ApiData apiData = new ApiData();
-
-    @Expose
-    @Category(name = "Debug", desc = "Debug and test stuff.")
-    public Debug debug = new Debug();
+    @Category(name = "Dev", desc = "Debug and test stuff.")
+    public DevData dev = new DevData();
 
     @Expose
     public Hidden hidden = new Hidden();
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/ApiData.java b/src/main/java/at/hannibal2/skyhanni/config/features/ApiData.java
deleted file mode 100644
index 387388bf0..000000000
--- a/src/main/java/at/hannibal2/skyhanni/config/features/ApiData.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package at.hannibal2.skyhanni.config.features;
-
-import at.hannibal2.skyhanni.config.gui.core.config.annotations.ConfigEditorBoolean;
-import at.hannibal2.skyhanni.config.gui.core.config.annotations.ConfigOption;
-import com.google.gson.annotations.Expose;
-
-public class ApiData {
-
-    @Expose
-    @ConfigOption(name = "Repo Auto Update", desc = "Update the repository on every startup.")
-    @ConfigEditorBoolean
-    public boolean repoAutoUpdate = true;
-}
\ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Debug.java b/src/main/java/at/hannibal2/skyhanni/config/features/Debug.java
deleted file mode 100644
index c514a0d20..000000000
--- a/src/main/java/at/hannibal2/skyhanni/config/features/Debug.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package at.hannibal2.skyhanni.config.features;
-
-
-import at.hannibal2.skyhanni.config.gui.core.config.Position;
-import at.hannibal2.skyhanni.config.gui.core.config.annotations.ConfigEditorBoolean;
-import at.hannibal2.skyhanni.config.gui.core.config.annotations.ConfigEditorButton;
-import at.hannibal2.skyhanni.config.gui.core.config.annotations.ConfigOption;
-import com.google.gson.annotations.Expose;
-
-public class Debug {
-
-    @Expose
-    @ConfigOption(name = "Enable Test", desc = "Enable Test logic")
-    @ConfigEditorBoolean
-    public boolean enabled = false;
-
-    @Expose
-    @ConfigOption(name = "Test Location", desc = "")
-    @ConfigEditorButton(runnableId = "testPos", buttonText = "Edit")
-    public Position testPos = new Position(10, 10, false, true);
-}
\ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/DevData.java b/src/main/java/at/hannibal2/skyhanni/config/features/DevData.java
new file mode 100644
index 000000000..5e66e9e8f
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/DevData.java
@@ -0,0 +1,30 @@
+package at.hannibal2.skyhanni.config.features;
+
+import at.hannibal2.skyhanni.config.gui.core.config.Position;
+import at.hannibal2.skyhanni.config.gui.core.config.annotations.*;
+import com.google.gson.annotations.Expose;
+
+public class DevData {
+
+    @Expose
+    @ConfigOption(name = "Repo Auto Update", desc = "Update the repository on every startup.")
+    @ConfigEditorBoolean
+    public boolean repoAutoUpdate = true;
+
+    @Expose
+    @ConfigOption(name = "Debug", desc = "")
+    @ConfigEditorAccordion(id = 0)
+    public boolean debugDO_NOT_USE = false;
+
+    @Expose
+    @ConfigOption(name = "Enable Debug", desc = "Enable Test logic")
+    @ConfigEditorBoolean
+    @ConfigAccordionId(id = 0)
+    public boolean debugEnabled = false;
+
+    @Expose
+    @ConfigOption(name = "Debug Location", desc = "")
+    @ConfigEditorButton(runnableId = "debugPos", buttonText = "Edit")
+    @ConfigAccordionId(id = 0)
+    public Position debugPos = new Position(10, 10, false, true);
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/data/repo/RepoManager.kt b/src/main/java/at/hannibal2/skyhanni/data/repo/RepoManager.kt
index a9fbcb04a..64ee938d5 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/repo/RepoManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/repo/RepoManager.kt
@@ -21,7 +21,7 @@ class RepoManager(private val configLocation: File) {
 
     fun loadRepoInformation() {
         atomicShouldManuallyReload.set(true)
-        if (SkyHanniMod.feature.apiData.repoAutoUpdate) {
+        if (SkyHanniMod.feature.dev.repoAutoUpdate) {
             fetchRepository().thenRun(this::reloadRepository)
         } else {
             reloadRepository()
diff --git a/src/main/java/at/hannibal2/skyhanni/test/LorenzTest.kt b/src/main/java/at/hannibal2/skyhanni/test/LorenzTest.kt
index 220c664e8..b5f685420 100644
--- a/src/main/java/at/hannibal2/skyhanni/test/LorenzTest.kt
+++ b/src/main/java/at/hannibal2/skyhanni/test/LorenzTest.kt
@@ -75,9 +75,9 @@ class LorenzTest {
 
     @SubscribeEvent
     fun renderOverlay(event: RenderGameOverlayEvent.Post) {
-        if (!SkyHanniMod.feature.debug.enabled) return
+        if (!SkyHanniMod.feature.dev.debugEnabled) return
 
-        SkyHanniMod.feature.debug.testPos.renderString(text)
+        SkyHanniMod.feature.dev.debugPos.renderString(text)
     }
 
     @SubscribeEvent(priority = EventPriority.LOW, receiveCanceled = true)