fix color things

5 files changed, 35 insertions, 30 deletions

diff --git a/src/main/java/cc/polyfrost/oneconfig/gui/OneConfigGui.java b/src/main/java/cc/polyfrost/oneconfig/gui/OneConfigGui.java
index 75c3ae5..d084186 100644
--- a/src/main/java/cc/polyfrost/oneconfig/gui/OneConfigGui.java
+++ b/src/main/java/cc/polyfrost/oneconfig/gui/OneConfigGui.java
@@ -30,7 +30,7 @@ public class OneConfigGui extends GuiScreen {
     protected Page currentPage;
     protected Page prevPage;
     private float pageProgress = -224f;
-    private final TextInputField textInputField = new TextInputField(248, 40, "Search all of OneConfig...", false, false);
+    private final TextInputField textInputField = new TextInputField(248, 40, "Search...", false, false);
     private final ArrayList<Page> previousPages = new ArrayList<>();
     private final ArrayList<Page> nextPages = new ArrayList<>();
     private final BasicElement backArrow = new BasicElement(40, 40, -1, false);
@@ -223,6 +223,9 @@ public class OneConfigGui extends GuiScreen {
         return color;
     }
 
+    public String getSearchValue() {
+        return textInputField.getInput();
+    }
 
     @Override
     public boolean doesGuiPauseGame() {
diff --git a/src/main/java/cc/polyfrost/oneconfig/gui/elements/ColorSelector.java b/src/main/java/cc/polyfrost/oneconfig/gui/elements/ColorSelector.java
index b972d40..25987db 100644
--- a/src/main/java/cc/polyfrost/oneconfig/gui/elements/ColorSelector.java
+++ b/src/main/java/cc/polyfrost/oneconfig/gui/elements/ColorSelector.java
@@ -16,13 +16,13 @@ public class ColorSelector {
     private final int y;
     private Color color;
     private float percentMove = 0f;
-    private final BasicElement hsbBtn = new BasicElement(124, 28, 2,true);
-    private final BasicElement rgbBtn = new BasicElement(124, 28, 2,true);
-    private final BasicElement chromaBtn = new BasicElement(124, 28, 2,true);
+    private final BasicElement hsbBtn = new BasicElement(124, 28, 2, true);
+    private final BasicElement rgbBtn = new BasicElement(124, 28, 2, true);
+    private final BasicElement chromaBtn = new BasicElement(124, 28, 2, true);
     private final BasicElement closeBtn = new BasicElement(32, 32, true);
 
-    private final BasicElement copyBtn = new BasicElement(32, 32, 2,true);
-    private final BasicElement pasteBtn = new BasicElement(32, 32, 2,true);
+    private final BasicElement copyBtn = new BasicElement(32, 32, 2, true);
+    private final BasicElement pasteBtn = new BasicElement(32, 32, 2, true);
     private final BasicButton guideBtn = new BasicButton(112, 32, "Guide", null, null, 0, BasicButton.ALIGNMENT_CENTER);
 
     private final NumberInputField hueInput = new NumberInputField(90, 32, 0, 0, 255, 1);
@@ -36,7 +36,6 @@ public class ColorSelector {
     private final Slider speedSlider = new Slider(384, 1, 60, 20);
 
 
-
     public ColorSelector(Color color, int mouseX, int mouseY) {
         this.color = color;
         this.x = mouseX - 208;
@@ -53,7 +52,7 @@ public class ColorSelector {
         RenderManager.drawString(vg, "Color Selector", x + 16, y + 32, OneConfigConfig.WHITE_90, 18f, Fonts.SEMIBOLD);
         closeBtn.draw(vg, x + 368, y + 16);
         RenderManager.drawImage(vg, Images.CLOSE, x + 369, y + 17, 30, 30);
-        if(closeBtn.isClicked()) {
+        if (closeBtn.isClicked()) {
             OneConfigGui.INSTANCE.closeColorSelector();
         }
 
@@ -85,9 +84,6 @@ public class ColorSelector {
         RenderManager.drawImage(vg, Images.HELP, x + 301, y + 631, 18, 18);
         RenderManager.drawImage(vg, Images.LAUNCH, x + 369, y + 631, 18, 18);
 
-
-
-
         switch (mode) {
             default:
             case 0:
@@ -128,9 +124,6 @@ public class ColorSelector {
         RenderManager.drawHollowRoundRect(vg, x + 15, y + 487, 384, 40, OneConfigConfig.GRAY_300, 12f, 2f);
         RenderManager.drawImage(vg, Images.COLOR_BASE_LARGE, x + 20, y + 492, 376, 32);
         RenderManager.drawRoundedRect(vg, x + 20, y + 492, 376, 32, color.getRGB(), 8f);
-
-
-
     }
 
     public Color getColor() {
@@ -146,8 +139,6 @@ public class ColorSelector {
     }
 
 
-
-
     private static class ColorSlider extends Slider {
         protected Color gradColorStart, gradColorEnd;
 
diff --git a/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigColorElement.java b/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigColorElement.java
index ce683bf..627c0cc 100644
--- a/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigColorElement.java
+++ b/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigColorElement.java
@@ -29,7 +29,7 @@ public class ConfigColorElement extends BasicOption {
         alphaField.setCentered(true);
         alphaField.onlyAcceptNumbers(true);
         String buf = Integer.toHexString(color.getRGB());
-        hex = "#"+buf.substring(buf.length()-6);
+        hex = "#" + buf.substring(buf.length() - 6);
     }
 
     @Override
@@ -44,7 +44,7 @@ public class ConfigColorElement extends BasicOption {
 
         if (!alphaField.isToggled()) alphaField.setInput(String.format("%.01f", alpha * 100f) + "%");
         alphaField.setErrored(false);
-        if(alphaField.isToggled()) {
+        if (alphaField.isToggled()) {
             try {
                 float input = Float.parseFloat(alphaField.getInput());
                 if (input < 0f) {
@@ -62,15 +62,13 @@ public class ConfigColorElement extends BasicOption {
         }
         alphaField.draw(vg, x + 352, y);
 
-
-
         if (!hexField.isToggled()) hexField.setInput(hex);
         hexField.setErrored(false);
-        if(hexField.isToggled()) {
+        if (hexField.isToggled()) {
             try {
                 color = HexToColor(hexField.getInput());
                 String buf = Integer.toHexString(color.getRGB());
-                hex = "#"+buf.substring(buf.length()-6);
+                hex = "#" + buf.substring(buf.length() - 6);
             } catch (NumberFormatException e) {
                 hexField.setErrored(true);
             }
@@ -80,14 +78,14 @@ public class ConfigColorElement extends BasicOption {
         element.update(x + 432, y);
         RenderManager.drawRoundedRect(vg, x + 432, y, 64, 32, OneConfigConfig.GRAY_300, 12f);
         RenderManager.drawImage(vg, Images.COLOR_BASE, x + 948, y + 4, 56, 24, color.getRGB());
-        if(element.isClicked() && !element.isToggled()) {
+        if (element.isClicked() && !element.isToggled()) {
             OneConfigGui.INSTANCE.initColorSelector(new ColorSelector(color, InputUtils.mouseX(), InputUtils.mouseY()));
         }
-        if(element.isToggled() && element.isClicked()) {
+        if (element.isToggled() && element.isClicked()) {
             color = OneConfigGui.INSTANCE.closeColorSelector();
             alpha = color.getAlpha() / 255f;
             String buf = Integer.toHexString(color.getRGB());
-            hex = "#"+buf.substring(buf.length()-6);
+            hex = "#" + buf.substring(buf.length() - 6);
         }
 
     }
@@ -110,6 +108,4 @@ public class ConfigColorElement extends BasicOption {
         }
         throw new NumberFormatException("Invalid hex string: " + hex);
     }
-
-
 }
diff --git a/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigSlider.java b/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigSlider.java
index 531f18a..d44c33f 100644
--- a/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigSlider.java
+++ b/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigSlider.java
@@ -23,7 +23,7 @@ public class ConfigSlider extends BasicOption {
         this.min = min;
         this.max = max;
         this.step = step;
-        inputField = new NumberInputField(84, 24, 0, min, max, step == 0 ? 1 : step);
+        inputField = new NumberInputField(84, 32, 0, min, max, step == 0 ? 1 : step);
     }
 
     @Override
diff --git a/src/main/java/cc/polyfrost/oneconfig/gui/pages/ModConfigPage.java b/src/main/java/cc/polyfrost/oneconfig/gui/pages/ModConfigPage.java
index fa40b12..8bd9771 100644
--- a/src/main/java/cc/polyfrost/oneconfig/gui/pages/ModConfigPage.java
+++ b/src/main/java/cc/polyfrost/oneconfig/gui/pages/ModConfigPage.java
@@ -3,12 +3,16 @@ package cc.polyfrost.oneconfig.gui.pages;
 import cc.polyfrost.oneconfig.config.OneConfigConfig;
 import cc.polyfrost.oneconfig.config.data.OptionPage;
 import cc.polyfrost.oneconfig.config.interfaces.BasicOption;
+import cc.polyfrost.oneconfig.gui.OneConfigGui;
 import cc.polyfrost.oneconfig.gui.elements.BasicButton;
 import cc.polyfrost.oneconfig.gui.elements.config.ConfigPageButton;
 import cc.polyfrost.oneconfig.lwjgl.RenderManager;
 import cc.polyfrost.oneconfig.lwjgl.font.Fonts;
 
+import java.awt.*;
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
 
 public class ModConfigPage extends Page {
     private final OptionPage page;
@@ -35,11 +39,19 @@ public class ModConfigPage extends Page {
     @Override
     public void draw(long vg, int x, int y) {
         if (page.categories.size() == 0) return;
+        String filter = OneConfigGui.INSTANCE.getSearchValue().toLowerCase().trim();
+        LinkedHashMap<String, ArrayList<BasicOption>> filteredSubcategories = page.categories.get(selectedCategory).subcategories;
+        if (!filter.equals("")) {
+
+        }
         int optionX = x + 30;
         int optionY = y + (page.categories.size() == 1 ? 16 : 64);
+        //  if (!option.getName().toLowerCase().contains(filter)) continue;
 
         // Top page buttons
         for (ConfigPageButton page : page.categories.get(selectedCategory).topPages) {
+            if (!page.getName().toLowerCase().contains(filter) && !page.description.toLowerCase().contains(filter))
+                continue;
             page.draw(vg, optionX, optionY);
             optionY += page.getHeight() + 16;
         }
@@ -92,6 +104,8 @@ public class ModConfigPage extends Page {
 
         // Bottom page buttons
         for (ConfigPageButton page : page.categories.get(selectedCategory).bottomPages) {
+            if (!page.getName().toLowerCase().contains(filter) && !page.description.toLowerCase().contains(filter))
+                continue;
             page.draw(vg, optionX, optionY);
             optionY += page.getHeight() + 16;
         }
@@ -122,10 +136,11 @@ public class ModConfigPage extends Page {
     @Override
     public int drawStatic(long vg, int x, int y) {
         // Category buttons
-        if(categories.size() <= 1) return 0;
+        if (categories.size() <= 1) return 0;
         int buttonX = x + 16;
         for (BasicButton button : categories) {
-            if (button.getWidth() == 0) button.setWidth((int) (Math.ceil(RenderManager.getTextWidth(vg, button.getText(), 12f, Fonts.MEDIUM) / 8f) * 8 + 16));
+            if (button.getWidth() == 0)
+                button.setWidth((int) (Math.ceil(RenderManager.getTextWidth(vg, button.getText(), 12f, Fonts.MEDIUM) / 8f) * 8 + 16));
             button.draw(vg, buttonX, y + 16);
             buttonX += button.getWidth() + 16;
         }