reduce dependency on minecraft + stuff

20 files changed, 380 insertions, 166 deletions

diff --git a/src/main/java/cc/polyfrost/oneconfig/OneConfig.java b/src/main/java/cc/polyfrost/oneconfig/OneConfig.java
index 25866e8..e8121d6 100644
--- a/src/main/java/cc/polyfrost/oneconfig/OneConfig.java
+++ b/src/main/java/cc/polyfrost/oneconfig/OneConfig.java
@@ -5,14 +5,14 @@ import cc.polyfrost.oneconfig.config.OneConfigConfig;
 import cc.polyfrost.oneconfig.config.core.ConfigCore;
 import cc.polyfrost.oneconfig.config.data.Mod;
 import cc.polyfrost.oneconfig.config.data.ModType;
-import cc.polyfrost.oneconfig.lwjgl.BlurHandler;
-import cc.polyfrost.oneconfig.lwjgl.OneColor;
-import cc.polyfrost.oneconfig.lwjgl.font.Fonts;
 import cc.polyfrost.oneconfig.hud.HudCore;
+import cc.polyfrost.oneconfig.lwjgl.BlurHandler;
 import cc.polyfrost.oneconfig.lwjgl.RenderManager;
+import cc.polyfrost.oneconfig.lwjgl.font.Fonts;
 import cc.polyfrost.oneconfig.lwjgl.image.Images;
 import cc.polyfrost.oneconfig.test.TestConfig;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.ScaledResolution;
 import net.minecraftforge.client.ClientCommandHandler;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fml.common.Loader;
@@ -78,4 +78,17 @@ public class OneConfig {
             if (modData.add(newMod)) loadedMods.add(newMod);     // anti duplicate fix
         }
     }
+
+    public static int[] getScaledResolution() {
+        ScaledResolution resolution = new ScaledResolution(mc);
+        return new int[]{resolution.getScaledWidth(), resolution.getScaledHeight()};
+    }
+
+    public static int getDisplayWidth() {
+        return mc.displayWidth;
+    }
+
+    public static int getDisplayHeight() {
+        return mc.displayHeight;
+    }
 }
diff --git a/src/main/java/cc/polyfrost/oneconfig/command/OneConfigCommand.java b/src/main/java/cc/polyfrost/oneconfig/command/OneConfigCommand.java
index e6a91d9..eccaf01 100644
--- a/src/main/java/cc/polyfrost/oneconfig/command/OneConfigCommand.java
+++ b/src/main/java/cc/polyfrost/oneconfig/command/OneConfigCommand.java
@@ -2,9 +2,9 @@ package cc.polyfrost.oneconfig.command;
 
 import cc.polyfrost.oneconfig.gui.OneConfigGui;
 import cc.polyfrost.oneconfig.gui.HudGui;
+import cc.polyfrost.oneconfig.lwjgl.RenderManager;
 import cc.polyfrost.oneconfig.test.TestNanoVGGui;
 import cc.polyfrost.oneconfig.utils.TickDelay;
-import net.minecraft.client.Minecraft;
 import net.minecraft.command.CommandBase;
 import net.minecraft.command.ICommandSender;
 
@@ -13,8 +13,6 @@ import java.util.List;
 
 public class OneConfigCommand extends CommandBase {
 
-    private static final Minecraft mc = Minecraft.getMinecraft();
-
     @Override
     public String getCommandName() {
         return "oneconfig";
@@ -35,14 +33,14 @@ public class OneConfigCommand extends CommandBase {
 
     @Override
     public void processCommand(ICommandSender sender, String[] args) {
-        if (args.length == 0) new TickDelay(() -> mc.displayGuiScreen(OneConfigGui.create()), 1);
+        if (args.length == 0) new TickDelay(() -> RenderManager.displayGuiScreen(OneConfigGui.create()), 1);
         else {
             switch (args[0]) {
                 case "hud":
-                    new TickDelay(() -> mc.displayGuiScreen(new HudGui()), 1);
+                    new TickDelay(() -> RenderManager.displayGuiScreen(new HudGui()), 1);
                     break;
                 case "lwjgl":
-                    new TickDelay(() -> mc.displayGuiScreen(new TestNanoVGGui()), 1);
+                    new TickDelay(() -> RenderManager.displayGuiScreen(new TestNanoVGGui()), 1);
                     break;
             }
         }
diff --git a/src/main/java/cc/polyfrost/oneconfig/config/annotations/ConfigPage.java b/src/main/java/cc/polyfrost/oneconfig/config/annotations/ConfigPage.java
index f9d7c19..432d65c 100644
--- a/src/main/java/cc/polyfrost/oneconfig/config/annotations/ConfigPage.java
+++ b/src/main/java/cc/polyfrost/oneconfig/config/annotations/ConfigPage.java
@@ -29,4 +29,9 @@ public @interface ConfigPage {
      * The category of the page
      */
     String category() default "General";
+
+    /**
+     * The subcategory of the page
+     */
+    String subcategory() default "";
 }
diff --git a/src/main/java/cc/polyfrost/oneconfig/config/annotations/Option.java b/src/main/java/cc/polyfrost/oneconfig/config/annotations/Option.java
index d5e9fc7..efcadc8 100644
--- a/src/main/java/cc/polyfrost/oneconfig/config/annotations/Option.java
+++ b/src/main/java/cc/polyfrost/oneconfig/config/annotations/Option.java
@@ -29,7 +29,7 @@ public @interface Option {
     /**
      * The subcategory of the component (displayed as header)
      */
-    String subcategory();
+    String subcategory() default "";
 
     /**
      * The width of the option (1 = half width, 2 = full width)
@@ -82,4 +82,9 @@ public @interface Option {
      * Option for info option type
      */
     InfoType infoType() default InfoType.INFO;
+
+    /**
+     * Text displayed inside button
+     */
+    String buttonText() default "Activate";
 }
diff --git a/src/main/java/cc/polyfrost/oneconfig/config/data/OptionCategory.java b/src/main/java/cc/polyfrost/oneconfig/config/data/OptionCategory.java
index 14111f4..363cfda 100644
--- a/src/main/java/cc/polyfrost/oneconfig/config/data/OptionCategory.java
+++ b/src/main/java/cc/polyfrost/oneconfig/config/data/OptionCategory.java
@@ -7,7 +7,5 @@ import java.util.ArrayList;
 import java.util.LinkedHashMap;
 
 public class OptionCategory {
-    public final LinkedHashMap<String, ArrayList<BasicOption>> subcategories = new LinkedHashMap<>();
-    public final ArrayList<ConfigPageButton> topPages = new ArrayList<>();
-    public final ArrayList<ConfigPageButton> bottomPages = new ArrayList<>();
+    public final ArrayList<OptionSubcategory> subcategories = new ArrayList<>();
 }
diff --git a/src/main/java/cc/polyfrost/oneconfig/config/data/OptionSubcategory.java b/src/main/java/cc/polyfrost/oneconfig/config/data/OptionSubcategory.java
new file mode 100644
index 0000000..cdd9c51
--- /dev/null
+++ b/src/main/java/cc/polyfrost/oneconfig/config/data/OptionSubcategory.java
@@ -0,0 +1,118 @@
+package cc.polyfrost.oneconfig.config.data;
+
+import cc.polyfrost.oneconfig.config.OneConfigConfig;
+import cc.polyfrost.oneconfig.config.interfaces.BasicOption;
+import cc.polyfrost.oneconfig.gui.OneConfigGui;
+import cc.polyfrost.oneconfig.gui.elements.config.ConfigPageButton;
+import cc.polyfrost.oneconfig.lwjgl.RenderManager;
+import cc.polyfrost.oneconfig.lwjgl.font.Fonts;
+
+import java.util.ArrayList;
+
+public class OptionSubcategory {
+    private final String name;
+    public ArrayList<BasicOption> options = new ArrayList<>();
+    public ArrayList<ConfigPageButton> topButtons = new ArrayList<>();
+    public ArrayList<ConfigPageButton> bottomButtons = new ArrayList<>();
+
+    public OptionSubcategory(String name) {
+        this.name = name;
+    }
+
+    public int draw(long vg, int x, int y) {
+        String filter = OneConfigGui.INSTANCE == null ? "" : OneConfigGui.INSTANCE.getSearchValue().toLowerCase().trim();
+        ArrayList<BasicOption> filteredOptions = new ArrayList<>(options);
+        ArrayList<ConfigPageButton> filteredTop = new ArrayList<>(topButtons);
+        ArrayList<ConfigPageButton> filteredBottom = new ArrayList<>(bottomButtons);
+        if (!filter.equals("") && !name.toLowerCase().contains(filter)) {
+            filteredOptions.clear();
+            filteredTop.clear();
+            filteredBottom.clear();
+            for (BasicOption option : options) {
+                if (option.getName().toLowerCase().contains(filter)) filteredOptions.add(option);
+            }
+            for (ConfigPageButton page : topButtons) {
+                if (page.getName().toLowerCase().contains(filter) || page.description.toLowerCase().contains(filter))
+                    filteredTop.add(page);
+            }
+            for (ConfigPageButton page : bottomButtons) {
+                if (page.getName().toLowerCase().contains(filter) || page.description.toLowerCase().contains(filter))
+                    filteredBottom.add(page);
+            }
+        }
+        if (filteredOptions.size() == 0 && filteredTop.size() == 0 && filteredBottom.size() == 0) return 0;
+        int optionY = y;
+        if (!name.equals("")) {
+            RenderManager.drawString(vg, name, x, y + 12, OneConfigConfig.WHITE_90, 24, Fonts.MEDIUM);
+            optionY += 36;
+        }
+
+        for (ConfigPageButton page : filteredTop) {
+            page.draw(vg, x, optionY);
+            optionY += page.getHeight() + 16;
+        }
+
+        if (filteredOptions.size() > 0) {
+            int backgroundSize = 16;
+            for (int i = 0; i < filteredOptions.size(); i++) {
+                BasicOption option = filteredOptions.get(i);
+                if (i + 1 < filteredOptions.size()) {
+                    BasicOption nextOption = filteredOptions.get(i + 1);
+                    if (option.size == 1 && option.hasHalfSize() && nextOption.size == 1 && nextOption.hasHalfSize()) {
+                        backgroundSize += Math.max(option.getHeight(), nextOption.getHeight()) + 16;
+                        i++;
+                        continue;
+                    }
+                }
+                backgroundSize += option.getHeight() + 16;
+            }
+            RenderManager.drawRoundedRect(vg, x - 16, optionY, 1024, backgroundSize, OneConfigConfig.GRAY_900, 20);
+            optionY += 16;
+        }
+
+        int drawLastY = optionY;
+        if (filteredOptions.size() > 0) {
+            for (int i = 0; i < filteredOptions.size(); i++) {
+                BasicOption option = filteredOptions.get(i);
+                option.draw(vg, x, optionY);
+                if (i + 1 < filteredOptions.size()) {
+                    BasicOption nextOption = filteredOptions.get(i + 1);
+                    if (option.size == 1 && option.hasHalfSize() && nextOption.size == 1 && nextOption.hasHalfSize()) {
+                        nextOption.draw(vg, x + 512, optionY);
+                        optionY += Math.max(option.getHeight(), nextOption.getHeight()) + 16;
+                        i++;
+                        continue;
+                    }
+                }
+                optionY += option.getHeight() + 16;
+            }
+            optionY += 16;
+        }
+
+        for (ConfigPageButton page : filteredBottom) {
+            page.draw(vg, x, optionY);
+            optionY += page.getHeight() + 16;
+        }
+
+        for (int i = 0; i < filteredOptions.size(); i++) {
+            BasicOption option = filteredOptions.get(i);
+            option.drawLast(vg, x, drawLastY);
+            if (i + 1 < filteredOptions.size()) {
+                BasicOption nextOption = filteredOptions.get(i + 1);
+                if (option.size == 1 && option.hasHalfSize() && nextOption.size == 1 && nextOption.hasHalfSize()) {
+                    nextOption.drawLast(vg, x + 512, drawLastY);
+                    drawLastY += Math.max(option.getHeight(), nextOption.getHeight()) + 16;
+                    i++;
+                    continue;
+                }
+            }
+            drawLastY += option.getHeight() + 16;
+        }
+
+        return optionY - y;
+    }
+
+    public String getName() {
+        return name;
+    }
+}
diff --git a/src/main/java/cc/polyfrost/oneconfig/config/data/OptionType.java b/src/main/java/cc/polyfrost/oneconfig/config/data/OptionType.java
index a9b9a6a..6fe5733 100644
--- a/src/main/java/cc/polyfrost/oneconfig/config/data/OptionType.java
+++ b/src/main/java/cc/polyfrost/oneconfig/config/data/OptionType.java
@@ -36,11 +36,15 @@ public enum OptionType {
     DROPDOWN,
     //MULTI_DROPDOWN,
     /**
-     * Type: String
+     * Type: doesn't matter
      */
     INFO,
     /**
-     * Type: class that extends BasicHud
+     * Type: doesn't matter
+     */
+    HEADER,
+    /**
+     * Type: runnable
      */
-    HUD
+    BUTTON
 }
diff --git a/src/main/java/cc/polyfrost/oneconfig/config/interfaces/Config.java b/src/main/java/cc/polyfrost/oneconfig/config/interfaces/Config.java
index 756d3c3..9eecc52 100644
--- a/src/main/java/cc/polyfrost/oneconfig/config/interfaces/Config.java
+++ b/src/main/java/cc/polyfrost/oneconfig/config/interfaces/Config.java
@@ -6,6 +6,7 @@ import cc.polyfrost.oneconfig.config.core.ConfigCore;
 import cc.polyfrost.oneconfig.config.data.Mod;
 import cc.polyfrost.oneconfig.config.data.OptionCategory;
 import cc.polyfrost.oneconfig.config.data.OptionPage;
+import cc.polyfrost.oneconfig.config.data.OptionSubcategory;
 import cc.polyfrost.oneconfig.config.profiles.Profiles;
 import cc.polyfrost.oneconfig.gui.OneConfigGui;
 import cc.polyfrost.oneconfig.gui.elements.config.*;
@@ -84,6 +85,10 @@ public class Config {
                 ConfigPage option = field.getAnnotation(ConfigPage.class);
                 if (!page.categories.containsKey(option.category()))
                     page.categories.put(option.category(), new OptionCategory());
+                OptionCategory category = page.categories.get(option.category());
+                if (category.subcategories.size() == 0 || !category.subcategories.get(category.subcategories.size() - 1).getName().equals(option.subcategory()))
+                    category.subcategories.add(new OptionSubcategory(option.subcategory()));
+                OptionSubcategory subcategory = category.subcategories.get(category.subcategories.size() - 1);
                 OptionPage newPage = new OptionPage(option.name(), mod);
                 try {
                     field.setAccessible(true);
@@ -91,10 +96,10 @@ public class Config {
                     generateOptionList(object.getClass(), newPage, mod);
                     switch (option.location()) {
                         case TOP:
-                            page.categories.get(option.category()).topPages.add(new ConfigPageButton(field, option.name(), option.description(), newPage));
+                            subcategory.topButtons.add(new ConfigPageButton(field, option.name(), option.description(), newPage));
                             break;
                         case BOTTOM:
-                            page.categories.get(option.category()).bottomPages.add(new ConfigPageButton(field, option.name(), option.description(), newPage));
+                            subcategory.bottomButtons.add(new ConfigPageButton(field, option.name(), option.description(), newPage));
                             break;
                     }
                 } catch (IllegalAccessException e) {
@@ -105,9 +110,10 @@ public class Config {
             Option option = field.getAnnotation(Option.class);
             if (!page.categories.containsKey(option.category()))
                 page.categories.put(option.category(), new OptionCategory());
-            if (!page.categories.get(option.category()).subcategories.containsKey(option.subcategory()))
-                page.categories.get(option.category()).subcategories.put(option.subcategory(), new ArrayList<>());
-            ArrayList<BasicOption> options = page.categories.get(option.category()).subcategories.get(option.subcategory());
+            OptionCategory category = page.categories.get(option.category());
+            if (category.subcategories.size() == 0 || !category.subcategories.get(category.subcategories.size() - 1).getName().equals(option.subcategory()))
+                category.subcategories.add(new OptionSubcategory(option.subcategory()));
+            ArrayList<BasicOption> options = category.subcategories.get(category.subcategories.size() - 1).options;
             switch (option.type()) {
                 case SWITCH:
                     options.add(new ConfigSwitch(field, option.name(), option.size()));
@@ -136,6 +142,12 @@ public class Config {
                 case COLOR:
                     options.add(new ConfigColorElement(field, option.name(), option.size()));
                     break;
+                case HEADER:
+                    options.add(new ConfigHeader(field, option.name(), option.size()));
+                    break;
+                case BUTTON:
+                    options.add(new ConfigButton(field, option.name(), option.size(), option.buttonText()));
+                    break;
             }
         }
     }
@@ -172,7 +184,7 @@ public class Config {
                 Object object = adapter.fromJsonTree(value);
                 field.setAccessible(true);
                 field.set(this, object);
-            } catch (NoSuchFieldException | IllegalAccessException ignored) {
+            } catch (Exception ignored) {
             }
         }
     }
diff --git a/src/main/java/cc/polyfrost/oneconfig/gui/HudGui.java b/src/main/java/cc/polyfrost/oneconfig/gui/HudGui.java
index a67c1d1..5465652 100644
--- a/src/main/java/cc/polyfrost/oneconfig/gui/HudGui.java
+++ b/src/main/java/cc/polyfrost/oneconfig/gui/HudGui.java
@@ -3,7 +3,6 @@ package cc.polyfrost.oneconfig.gui;
 import cc.polyfrost.oneconfig.hud.HudCore;
 import cc.polyfrost.oneconfig.hud.BasicHud;
 import cc.polyfrost.oneconfig.lwjgl.RenderManager;
-import net.minecraft.client.gui.Gui;
 import net.minecraft.client.gui.GuiScreen;
 import org.lwjgl.input.Keyboard;
 
@@ -26,7 +25,7 @@ public class HudGui extends GuiScreen {
 
     @Override
     public void drawScreen(int mouseX, int mouseY, float partialTicks) {
-        Gui.drawRect(0, 0, this.width, this.height, new Color(80, 80, 80, 50).getRGB());
+        RenderManager.drawGlRect(0, 0, this.width, this.height, new Color(80, 80, 80, 50).getRGB());
 
         if (isDragging) {
             setPosition(mouseX - xOffset, mouseY - yOffset, true);
@@ -67,7 +66,7 @@ public class HudGui extends GuiScreen {
         if (editingHud == hud) {
             color = new Color(43, 159, 235).getRGB();
             if (isDragging)
-                Gui.drawRect(x, y, x + width, y + height, new Color(108, 176, 255, 60).getRGB());
+                RenderManager.drawGlRect(x, y, width, height, new Color(108, 176, 255, 60).getRGB());
         }
         int finalColor = color;
         RenderManager.setupAndDraw(true, (vg) -> {
diff --git a/src/main/java/cc/polyfrost/oneconfig/gui/OneConfigGui.java b/src/main/java/cc/polyfrost/oneconfig/gui/OneConfigGui.java
index 45d92b7..ae70758 100644
--- a/src/main/java/cc/polyfrost/oneconfig/gui/OneConfigGui.java
+++ b/src/main/java/cc/polyfrost/oneconfig/gui/OneConfigGui.java
@@ -1,5 +1,6 @@
 package cc.polyfrost.oneconfig.gui;
 
+import cc.polyfrost.oneconfig.OneConfig;
 import cc.polyfrost.oneconfig.config.OneConfigConfig;
 import cc.polyfrost.oneconfig.gui.elements.BasicElement;
 import cc.polyfrost.oneconfig.gui.elements.ColorSelector;
@@ -14,14 +15,12 @@ import cc.polyfrost.oneconfig.lwjgl.font.Fonts;
 import cc.polyfrost.oneconfig.lwjgl.image.Images;
 import cc.polyfrost.oneconfig.utils.InputUtils;
 import cc.polyfrost.oneconfig.utils.MathUtils;
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiScreen;
 import org.jetbrains.annotations.NotNull;
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.input.Mouse;
 import org.lwjgl.nanovg.NanoVG;
 
-import java.awt.*;
 import java.util.ArrayList;
 
 public class OneConfigGui extends GuiScreen {
@@ -71,7 +70,7 @@ public class OneConfigGui extends GuiScreen {
                 currentPage = new HomePage();
                 parents.add(currentPage);
             }
-            scale = Minecraft.getMinecraft().displayWidth / 1920f;
+            scale = OneConfig.getDisplayWidth() / 1920f;
             NanoVG.nvgScale(vg, scale, scale);
             if (OneConfigConfig.ROUNDED_CORNERS) {
                 RenderManager.drawRoundedRect(vg, x + 224, y, 1056, 800, OneConfigConfig.GRAY_800, OneConfigConfig.CORNER_RADIUS_WIN);
diff --git a/src/main/java/cc/polyfrost/oneconfig/gui/SideBar.java b/src/main/java/cc/polyfrost/oneconfig/gui/SideBar.java
index 1850367..bec14b1 100644
--- a/src/main/java/cc/polyfrost/oneconfig/gui/SideBar.java
+++ b/src/main/java/cc/polyfrost/oneconfig/gui/SideBar.java
@@ -20,14 +20,16 @@ public class SideBar {
     public SideBar() {
         btnList.add(new BasicButton(192, 36, "Dashboard", Images.DASHBOARD, null, -3, BasicButton.ALIGNMENT_LEFT, new HomePage()));
         btnList.add(new BasicButton(192, 36, "Global Search", Images.SEARCH, null, -3, BasicButton.ALIGNMENT_LEFT));
+        btnList.add(new BasicButton(192, 36, "Screenshots", Images.SCREENSHOT, null, -3, BasicButton.ALIGNMENT_LEFT));
+        btnList.add(new BasicButton(192, 36, "Preferences", Images.PREFERENCES, null, -3, BasicButton.ALIGNMENT_LEFT));
         btnList.add(new BasicButton(192, 36, "Mods", Images.MODS, null, -3, BasicButton.ALIGNMENT_LEFT, new ModsPage()));
         btnList.add(new BasicButton(192, 36, "Performance", Images.PERFORMANCE, null, -3, BasicButton.ALIGNMENT_LEFT));
         btnList.add(new BasicButton(192, 36, "Profiles", Images.PROFILES, null, -3, BasicButton.ALIGNMENT_LEFT));
         btnList.add(new BasicButton(192, 36, "Updates", Images.UPDATES, null, -3, BasicButton.ALIGNMENT_LEFT));
-        btnList.add(new BasicButton(192, 36, "Theme", Images.THEMES, null, -3, BasicButton.ALIGNMENT_LEFT));
-        btnList.add(new BasicButton(192, 36, "Screenshots", Images.SCREENSHOT, null, -3, BasicButton.ALIGNMENT_LEFT));
-        btnList.add(new BasicButton(192, 36, "HUD Settings", Images.HUD_SETTINGS, null, -3, BasicButton.ALIGNMENT_LEFT));
-        btnList.add(new BasicButton(192, 36, "Preferences", Images.PREFERENCES, null, -3, BasicButton.ALIGNMENT_LEFT));
+        btnList.add(new BasicButton(192, 36, "Themes Library", Images.THEMES, null, -3, BasicButton.ALIGNMENT_LEFT));
+        btnList.add(new BasicButton(192, 36, "Themes Browser", Images.SEARCH, null, -3, BasicButton.ALIGNMENT_LEFT));
+        btnList.add(new BasicButton(192, 36, "Packs Library", Images.MOD_BOX, null, -3, BasicButton.ALIGNMENT_LEFT));
+        btnList.add(new BasicButton(192, 36, "Packs Browser", Images.SEARCH, null, -3, BasicButton.ALIGNMENT_LEFT));
         btnList.add(new BasicButton(192, 36, "Close", Images.CLOSE, null, -1, BasicButton.ALIGNMENT_LEFT, () -> RenderManager.displayGuiScreen(null)));
         btnList.add(new BasicButton(192, 36, "Minimize", Images.MINIMIZE, null, -1, BasicButton.ALIGNMENT_LEFT, () -> {
             OneConfigGui.instanceToRestore = OneConfigGui.INSTANCE;
@@ -37,8 +39,6 @@ public class SideBar {
     }
 
     public void draw(long vg, int x, int y) {
-        //percentMove = 36f;
-
         currentY = MathUtils.easeInOutCirc(50, currentY, targetY - currentY, 120);
         RenderManager.drawRoundedRect(vg, x + 16, currentY, 192, 36, OneConfigConfig.BLUE_600, OneConfigConfig.CORNER_RADIUS);
         int i = 0;
@@ -48,16 +48,17 @@ public class SideBar {
         }
         for (BasicButton btn : btnList) {
             btn.draw(vg, x + 16, y + 96 + i);
-            i += 44;
-            if (i == 88) { // +88
-                RenderManager.drawString(vg, "MOD CONFIG", x + 16, y + 200, OneConfigConfig.WHITE_90, 12f, Fonts.SEMIBOLD);
-                i = 122;
+            if (i >= 562) i += 44;
+            else i += 36;
+            if (i == 144) {
+                RenderManager.drawString(vg, "MOD CONFIG", x + 16, y + 266, OneConfigConfig.WHITE_90, 12f, Fonts.SEMIBOLD);
+                i = 180;
             }
-            if (i == 298) {
-                RenderManager.drawString(vg, "PERSONALIZATION", x + 16, y + 420, OneConfigConfig.WHITE_90, 12f, Fonts.SEMIBOLD);
-                i = 342;
+            if (i == 324) {
+                RenderManager.drawString(vg, "PERSONALIZATION", x + 16, y + 446, OneConfigConfig.WHITE_90, 12f, Fonts.SEMIBOLD);
+                i = 360;
             }
-            if (i == 518) {
+            if (i == 504) {
                 i = 562;
             }
 
diff --git a/src/main/java/cc/polyfrost/oneconfig/gui/elements/ModCard.java b/src/main/java/cc/polyfrost/oneconfig/gui/elements/ModCard.java
index 48a6218..8d2ad16 100644
--- a/src/main/java/cc/polyfrost/oneconfig/gui/elements/ModCard.java
+++ b/src/main/java/cc/polyfrost/oneconfig/gui/elements/ModCard.java
@@ -12,7 +12,6 @@ import cc.polyfrost.oneconfig.lwjgl.image.Images;
 import cc.polyfrost.oneconfig.utils.ColorUtils;
 import cc.polyfrost.oneconfig.utils.InputUtils;
 import net.minecraft.client.Minecraft;
-import net.minecraft.command.CommandException;
 import net.minecraftforge.client.ClientCommandHandler;
 import net.minecraftforge.fml.common.ModMetadata;
 import org.jetbrains.annotations.NotNull;
@@ -109,7 +108,7 @@ public class ModCard extends BasicElement {
                         if (possibleCommands.contains(command)) {
                             try {
                                 ClientCommandHandler.instance.getCommands().get(command).processCommand(Minecraft.getMinecraft().thePlayer, new String[]{});
-                            } catch (CommandException e) {
+                            } catch (Exception e) {
                                 throw new RuntimeException(e);
                             }
                             break;
diff --git a/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigButton.java b/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigButton.java
new file mode 100644
index 0000000..fdb0157
--- /dev/null
+++ b/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigButton.java
@@ -0,0 +1,36 @@
+package cc.polyfrost.oneconfig.gui.elements.config;
+
+import cc.polyfrost.oneconfig.config.OneConfigConfig;
+import cc.polyfrost.oneconfig.config.interfaces.BasicOption;
+import cc.polyfrost.oneconfig.gui.elements.BasicButton;
+import cc.polyfrost.oneconfig.lwjgl.RenderManager;
+import cc.polyfrost.oneconfig.lwjgl.font.Fonts;
+
+import java.lang.reflect.Field;
+
+public class ConfigButton extends BasicOption {
+    private final BasicButton button;
+
+    public ConfigButton(Field field, String name, int size, String text) {
+        super(field, name, size);
+        Runnable runnable = () -> {
+        };
+        try {
+            runnable = (Runnable) get();
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        }
+        this.button = new BasicButton(size == 1 ? 128 : 256, 32, text, null, null, 1, BasicButton.ALIGNMENT_CENTER, runnable);
+    }
+
+    @Override
+    public void draw(long vg, int x, int y) {
+        RenderManager.drawString(vg, name, x, y + 17, OneConfigConfig.WHITE, 14f, Fonts.MEDIUM);
+        button.draw(vg, x + (size == 1 ? 352 : 736), y);
+    }
+
+    @Override
+    public int getHeight() {
+        return 32;
+    }
+}
diff --git a/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigHeader.java b/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigHeader.java
new file mode 100644
index 0000000..3ef3d06
--- /dev/null
+++ b/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigHeader.java
@@ -0,0 +1,30 @@
+package cc.polyfrost.oneconfig.gui.elements.config;
+
+import cc.polyfrost.oneconfig.config.OneConfigConfig;
+import cc.polyfrost.oneconfig.config.interfaces.BasicOption;
+import cc.polyfrost.oneconfig.lwjgl.RenderManager;
+import cc.polyfrost.oneconfig.lwjgl.font.Fonts;
+import cc.polyfrost.oneconfig.lwjgl.scissor.Scissor;
+import cc.polyfrost.oneconfig.lwjgl.scissor.ScissorManager;
+
+import java.lang.reflect.Field;
+
+public class ConfigHeader extends BasicOption {
+
+    public ConfigHeader(Field field, String name, int size) {
+        super(field, name, size);
+    }
+
+    @Override
+    public void draw(long vg, int x, int y) {
+        Scissor scissor = ScissorManager.scissor(vg, x, y, size == 1 ? 480 : 992, 32);
+        RenderManager.drawString(vg, name, x, y + 17, OneConfigConfig.WHITE_90, 24, Fonts.MEDIUM);
+        ScissorManager.resetScissor(vg, scissor);
+    }
+
+
+    @Override
+    public int getHeight() {
+        return 32;
+    }
+}
diff --git a/src/main/java/cc/polyfrost/oneconfig/gui/elements/text/TextInputField.java b/src/main/java/cc/polyfrost/oneconfig/gui/elements/text/TextInputField.java
index dbca002..349e7af 100644
--- a/src/main/java/cc/polyfrost/oneconfig/gui/elements/text/TextInputField.java
+++ b/src/main/java/cc/polyfrost/oneconfig/gui/elements/text/TextInputField.java
@@ -8,7 +8,6 @@ import cc.polyfrost.oneconfig.lwjgl.scissor.ScissorManager;
 import cc.polyfrost.oneconfig.lwjgl.font.Fonts;
 import cc.polyfrost.oneconfig.utils.InputUtils;
 import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.util.ChatAllowedCharacters;
 import org.jetbrains.annotations.NotNull;
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.input.Mouse;
@@ -344,7 +343,7 @@ public class TextInputField extends BasicElement {
                 if (!Character.isDefined(key)) return;
                 if (!Character.isDefined(c)) return;
                 if (GuiScreen.isCtrlKeyDown()) return;
-                if (ChatAllowedCharacters.isAllowedCharacter(c)) {
+                if (isAllowedCharacter(c)) {
                     if (selectedText != null) {
                         if (caretPos > prevCaret) {
                             input = input.substring(0, prevCaret) + input.substring(prevCaret, caretPos);
@@ -426,4 +425,8 @@ public class TextInputField extends BasicElement {
             return RenderManager.getTextWidth(vg, s, 14.0f, Fonts.REGULAR);
         }
     }
+
+    public static boolean isAllowedCharacter(char character) {
+        return character != 167 && character >= ' ' && character != 127;
+    }
 }
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 790d0e4..797f573 100644
--- a/