config system rewrite

3 files changed, 12 insertions, 28 deletions

diff --git a/src/main/java/io/polyfrost/oneconfig/gui/pages/ModConfigPage.java b/src/main/java/io/polyfrost/oneconfig/gui/pages/ModConfigPage.java
index 357d684..6d24f4a 100644
--- a/src/main/java/io/polyfrost/oneconfig/gui/pages/ModConfigPage.java
+++ b/src/main/java/io/polyfrost/oneconfig/gui/pages/ModConfigPage.java
@@ -1,18 +1,16 @@
 package io.polyfrost.oneconfig.gui.pages;
 
 import io.polyfrost.oneconfig.config.core.ConfigCore;
-import io.polyfrost.oneconfig.config.data.ModData;
-import io.polyfrost.oneconfig.config.interfaces.Option;
-import io.polyfrost.oneconfig.gui.elements.config.OConfigCategory;
-import org.lwjgl.input.Mouse;
+import io.polyfrost.oneconfig.config.data.Mod;
+import io.polyfrost.oneconfig.config.interfaces.BasicOption;
 
 import java.util.ArrayList;
 
 public class ModConfigPage extends Page {
-    private final ModData modData;
-    private final ArrayList<Option> options;
+    private final Mod modData;
+    private final ArrayList<BasicOption> options;
 
-    public ModConfigPage(ModData mod) {
+    public ModConfigPage(Mod mod) {
         super("Mod: " + mod.name);
         this.modData = mod;
         options = ConfigCore.settings.get(mod);
@@ -20,21 +18,7 @@ public class ModConfigPage extends Page {
 
     @Override
     public void draw(long vg, int x, int y) {
-        for (Option option : options) {
-            if (option instanceof OConfigCategory) {
-                OConfigCategory category = (OConfigCategory) option;
-                for (Option subOption : category.options) {
-                    if (subOption.size == 0) {
-                        subOption.draw(vg, x, y, Mouse.getX(), Mouse.getY());
-                    }
-                }
-                for (Option subOption : category.options) {
-                    if (subOption.size == 1) {
-                        subOption.draw(vg, x, y, Mouse.getX(), Mouse.getY());
-                    }
-                }
-            }
-        }
+
     }
 
     @Override
@@ -42,11 +26,11 @@ public class ModConfigPage extends Page {
         modData.config.save();      // TODO
     }
 
-    public ModData getModData() {
+    public Mod getModData() {
         return modData;
     }
 
-    protected ArrayList<Option> getOptions() {
+    protected ArrayList<BasicOption> getOptions() {
         return options;
     }
 }
diff --git a/src/main/java/io/polyfrost/oneconfig/gui/pages/ModsPage.java b/src/main/java/io/polyfrost/oneconfig/gui/pages/ModsPage.java
index 9fc14f7..b45facb 100644
--- a/src/main/java/io/polyfrost/oneconfig/gui/pages/ModsPage.java
+++ b/src/main/java/io/polyfrost/oneconfig/gui/pages/ModsPage.java
@@ -2,7 +2,7 @@ package io.polyfrost.oneconfig.gui.pages;
 
 import io.polyfrost.oneconfig.OneConfig;
 import io.polyfrost.oneconfig.config.OneConfigConfig;
-import io.polyfrost.oneconfig.config.data.ModData;
+import io.polyfrost.oneconfig.config.data.Mod;
 import io.polyfrost.oneconfig.config.data.ModType;
 import io.polyfrost.oneconfig.gui.elements.BasicButton;
 import io.polyfrost.oneconfig.gui.elements.ModCard;
@@ -19,7 +19,7 @@ public class ModsPage extends Page {
 
     public ModsPage() {
         super("Mods");
-        for (ModData modData : OneConfig.loadedMods) {
+        for (Mod modData : OneConfig.loadedMods) {
             modCards.add(new ModCard(modData, null, true, false, false));
         }
         for (ModCard card : modCards) {
diff --git a/src/main/java/io/polyfrost/oneconfig/gui/pages/PerformanceModsPage.java b/src/main/java/io/polyfrost/oneconfig/gui/pages/PerformanceModsPage.java
index 8dbdea9..43cc423 100644
--- a/src/main/java/io/polyfrost/oneconfig/gui/pages/PerformanceModsPage.java
+++ b/src/main/java/io/polyfrost/oneconfig/gui/pages/PerformanceModsPage.java
@@ -2,7 +2,7 @@ package io.polyfrost.oneconfig.gui.pages;
 
 import io.polyfrost.oneconfig.OneConfig;
 import io.polyfrost.oneconfig.config.OneConfigConfig;
-import io.polyfrost.oneconfig.config.data.ModData;
+import io.polyfrost.oneconfig.config.data.Mod;
 import io.polyfrost.oneconfig.config.data.ModType;
 import io.polyfrost.oneconfig.gui.elements.ModCard;
 import io.polyfrost.oneconfig.lwjgl.RenderManager;
@@ -16,7 +16,7 @@ public class PerformanceModsPage extends Page {
 
     public PerformanceModsPage() {
         super("Performance Mods");
-        for (ModData mod : OneConfig.loadedMods) {
+        for (Mod mod : OneConfig.loadedMods) {
             if (mod.modType == ModType.PERFORMANCE) {
                 modCards.add(new ModCard(mod, null, true, false, false));
             }