Some more config refinements and some gui improvements

3 files changed, 13 insertions, 74 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 6d24f4a..04b2ce7 100644
--- a/src/main/java/io/polyfrost/oneconfig/gui/pages/ModConfigPage.java
+++ b/src/main/java/io/polyfrost/oneconfig/gui/pages/ModConfigPage.java
@@ -1,19 +1,13 @@
 package io.polyfrost.oneconfig.gui.pages;
 
-import io.polyfrost.oneconfig.config.core.ConfigCore;
 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 Mod modData;
-    private final ArrayList<BasicOption> options;
 
     public ModConfigPage(Mod mod) {
         super("Mod: " + mod.name);
         this.modData = mod;
-        options = ConfigCore.settings.get(mod);
     }
 
     @Override
@@ -29,8 +23,4 @@ public class ModConfigPage extends Page {
     public Mod getModData() {
         return modData;
     }
-
-    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 b45facb..7834e0b 100644
--- a/src/main/java/io/polyfrost/oneconfig/gui/pages/ModsPage.java
+++ b/src/main/java/io/polyfrost/oneconfig/gui/pages/ModsPage.java
@@ -28,13 +28,13 @@ public class ModsPage extends Page {
                 modCards.add(0, card);
             }
         }
-        modCategories.add(new BasicButton(64, 32, "All", null, null, 0, BasicButton.ALIGNMENT_CENTER, true));
-        modCategories.add(new BasicButton(80, 32, "Combat", null, null, 0, BasicButton.ALIGNMENT_CENTER, true));
-        modCategories.add(new BasicButton(64, 32, "HUD", null, null, 0, BasicButton.ALIGNMENT_CENTER, true));
-        modCategories.add(new BasicButton(104, 32, "Utility & QoL", null, null, 0, BasicButton.ALIGNMENT_CENTER, true));
-        modCategories.add(new BasicButton(80, 32, "Hypixel", null, null, 0, BasicButton.ALIGNMENT_CENTER, true));
-        modCategories.add(new BasicButton(80, 32, "Skyblock", null, null, 0, BasicButton.ALIGNMENT_CENTER, true));
-        modCategories.add(new BasicButton(88, 32, "3rd Party", null, null, 0, BasicButton.ALIGNMENT_CENTER, true));
+        modCategories.add(new BasicButton(64, 32, "All", null, null, 0, BasicButton.ALIGNMENT_CENTER, true, () -> unselect(0)));
+        modCategories.add(new BasicButton(80, 32, "Combat", null, null, 0, BasicButton.ALIGNMENT_CENTER, true, () -> unselect(1)));
+        modCategories.add(new BasicButton(64, 32, "HUD", null, null, 0, BasicButton.ALIGNMENT_CENTER, true, () -> unselect(2)));
+        modCategories.add(new BasicButton(104, 32, "Utility & QoL", null, null, 0, BasicButton.ALIGNMENT_CENTER, true, () -> unselect(3)));
+        modCategories.add(new BasicButton(80, 32, "Hypixel", null, null, 0, BasicButton.ALIGNMENT_CENTER, true, () -> unselect(4)));
+        modCategories.add(new BasicButton(80, 32, "Skyblock", null, null, 0, BasicButton.ALIGNMENT_CENTER, true, () -> unselect(5)));
+        modCategories.add(new BasicButton(88, 32, "3rd Party", null, null, 0, BasicButton.ALIGNMENT_CENTER, true, () -> unselect(6)));
         modCategories.get(0).setToggled(true);
     }
 
@@ -44,20 +44,6 @@ public class ModsPage extends Page {
             btn.draw(vg, iXCat, y + 16);
             iXCat += btn.getWidth() + 8;
         }
-        if ((modCategories.get(1).isClicked() || modCategories.get(2).isClicked() || modCategories.get(3).isClicked() || modCategories.get(4).isClicked() || modCategories.get(5).isClicked() || modCategories.get(6).isClicked()) && modCategories.get(0).isToggled()) {
-            modCategories.get(0).setToggled(false);
-        }
-        if (!modCategories.get(0).isToggled() && !modCategories.get(1).isToggled() && !modCategories.get(2).isToggled() && !modCategories.get(3).isToggled() && !modCategories.get(4).isToggled() && !modCategories.get(5).isToggled() && !modCategories.get(6).isToggled()) {
-            modCategories.get(0).setToggled(true);
-        }
-        if (modCategories.get(0).isToggled()) {
-            for (BasicButton btn : modCategories) {
-                if (!btn.getText().equals("All")) {
-                    btn.setToggled(false);
-                }
-            }
-        }
-
 
         int iX = x + 16;
         int iY = y + 72;
@@ -74,7 +60,12 @@ public class ModsPage extends Page {
         if (iX == x + 16 && iY == y + 72) {
             RenderManager.drawString(vg, "Looks like there is nothing here. Try another category?", x + 16, y + 72, OneConfigConfig.WHITE_60, 14f, Fonts.INTER_MEDIUM);
         }
-
     }
 
+    private void unselect(int index) {
+        for (int i = 0; i < modCategories.size(); i++) {
+            if (index == i) continue;
+            modCategories.get(i).setToggled(false);
+        }
+    }
 }
diff --git a/src/main/java/io/polyfrost/oneconfig/gui/pages/PerformanceModsPage.java b/src/main/java/io/polyfrost/oneconfig/gui/pages/PerformanceModsPage.java
deleted file mode 100644
index 43cc423..0000000
--- a/src/main/java/io/polyfrost/oneconfig/gui/pages/PerformanceModsPage.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package io.polyfrost.oneconfig.gui.pages;
-
-import io.polyfrost.oneconfig.OneConfig;
-import io.polyfrost.oneconfig.config.OneConfigConfig;
-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;
-import io.polyfrost.oneconfig.lwjgl.font.Fonts;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class PerformanceModsPage extends Page {
-    List<ModCard> modCards = new ArrayList<>();
-
-    public PerformanceModsPage() {
-        super("Performance Mods");
-        for (Mod mod : OneConfig.loadedMods) {
-            if (mod.modType == ModType.PERFORMANCE) {
-                modCards.add(new ModCard(mod, null, true, false, false));
-            }
-        }
-    }
-
-    @Override
-    public void draw(long vg, int x, int y) {
-        int iX = x + 16;
-        int iY = y + 16;
-        for (ModCard card : modCards) {
-            card.draw(vg, iX, iY);
-            iX += 260;
-            if (iX > x + 796) {
-                iX = x + 16;
-                iY += 135;
-            }
-        }
-        if (iX == x + 16 && iY == y + 16) {
-            RenderManager.drawString(vg, "Looks like there is nothing here. Try getting some more mods!", x + 16, y + 16, OneConfigConfig.WHITE_60, 14f, Fonts.INTER_MEDIUM);
-        }
-    }
-}