Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/cc/polyfrost/oneconfig/gui/OneConfigGui.java
#	src/main/java/cc/polyfrost/oneconfig/gui/animations/EaseInOutQuad.java
#	src/main/java/cc/polyfrost/oneconfig/gui/elements/BasicButton.java
#	src/main/java/cc/polyfrost/oneconfig/gui/elements/BasicElement.java
#	src/main/java/cc/polyfrost/oneconfig/gui/elements/ModCard.java
#	src/main/java/cc/polyfrost/oneconfig/gui/elements/text/NumberInputField.java
#	src/main/java/cc/polyfrost/oneconfig/lwjgl/image/ImageLoader.java
#	src/main/java/cc/polyfrost/oneconfig/utils/GuiUtils.java
#	src/main/java/cc/polyfrost/oneconfig/utils/commands/annotations/Command.java
#	src/main/java/cc/polyfrost/oneconfig/utils/commands/arguments/ArgumentParser.java

48 files changed, 400 insertions, 326 deletions

diff --git a/src/main/java/cc/polyfrost/oneconfig/OneConfig.java b/src/main/java/cc/polyfrost/oneconfig/OneConfig.java
index 977c53b..e8612b6 100644
--- a/src/main/java/cc/polyfrost/oneconfig/OneConfig.java
+++ b/src/main/java/cc/polyfrost/oneconfig/OneConfig.java
@@ -8,6 +8,7 @@ import cc.polyfrost.oneconfig.config.data.ModType;
 import cc.polyfrost.oneconfig.events.EventManager;
 import cc.polyfrost.oneconfig.hud.HudCore;
 import cc.polyfrost.oneconfig.lwjgl.BlurHandler;
+import cc.polyfrost.oneconfig.test.TestCommand;
 import cc.polyfrost.oneconfig.test.TestConfig;
 import cc.polyfrost.oneconfig.utils.GuiUtils;
 import cc.polyfrost.oneconfig.utils.commands.CommandManager;
@@ -28,10 +29,10 @@ import java.util.List;
 @net.minecraftforge.fml.common.Mod(modid = "@ID@", name = "@NAME@", version = "@VER@")
 public class OneConfig {
     public static final File oneConfigDir = new File("./OneConfig");
-    public static OneConfigConfig config;
-    public static TestConfig testConfig;
     public static final List<Mod> loadedMods = new ArrayList<>();
     public static final List<ModMetadata> loadedOtherMods = new ArrayList<>();
+    public static OneConfigConfig config;
+    public static TestConfig testConfig;
     private static boolean preLaunched = false;
     private static boolean initialized = false;
 
@@ -60,7 +61,8 @@ public class OneConfig {
         GuiUtils.getDeltaTime(); // called to make sure static initializer is called
         BlurHandler.INSTANCE.load();
         testConfig = new TestConfig();
-        CommandManager.INSTANCE.registerCommand(new OneConfigCommand());
+        CommandManager.INSTANCE.registerCommand(OneConfigCommand.class);
+        CommandManager.INSTANCE.registerCommand(TestCommand.class);
         EventManager.INSTANCE.register(new HudCore());
         EventManager.INSTANCE.register(HypixelUtils.INSTANCE);
         reloadModsList();
diff --git a/src/main/java/cc/polyfrost/oneconfig/config/OneConfigConfig.java b/src/main/java/cc/polyfrost/oneconfig/config/OneConfigConfig.java
index faeffff..b867bc0 100644
--- a/src/main/java/cc/polyfrost/oneconfig/config/OneConfigConfig.java
+++ b/src/main/java/cc/polyfrost/oneconfig/config/OneConfigConfig.java
@@ -14,18 +14,10 @@ import java.util.ArrayList;
 
 public class OneConfigConfig extends Config {
 
-    public static String currentProfile = "Default Profile";
-    public static ArrayList<String> favoriteMods = new ArrayList<>();
-    public static ArrayList<OneColor> favoriteColors = new ArrayList<>();
-    public static ArrayList<OneColor> recentColors = new ArrayList<>();
-
-
     // the color library
     public static final int TRANSPARENT = new Color(0, 0, 0, 0).getRGB();                // Transparent
-
     public static final int BLACK = new Color(0, 0, 0, 255).getRGB();                     // Black
     public static final int GRAY_900 = new Color(13, 14, 15, 255).getRGB();           // Gray 900
-
     public static final int GRAY_900_80 = new Color(13, 14, 15, 204).getRGB();         // Gray 900 80%
     public static final int GRAY_800 = new Color(21, 22, 23, 255).getRGB();           // Gray 800
     public static final int GRAY_800_95 = new Color(21, 22, 23, 242).getRGB();
@@ -59,8 +51,10 @@ public class OneConfigConfig extends Config {
     public static final int ERROR_800_80 = new Color(145, 24, 24, 204).getRGB();         // Red 800
     public static final int ERROR_300 = new Color(253, 155, 155).getRGB();
     public static final int ERROR_300_80 = new Color(253, 155, 155, 204).getRGB();
-
-
+    public static String currentProfile = "Default Profile";
+    public static ArrayList<String> favoriteMods = new ArrayList<>();
+    public static ArrayList<OneColor> favoriteColors = new ArrayList<>();
+    public static ArrayList<OneColor> recentColors = new ArrayList<>();
     public static boolean ROUNDED_CORNERS = true;
     public static float CORNER_RADIUS_WIN = 20f;
     public static float CORNER_RADIUS = 12f;
diff --git a/src/main/java/cc/polyfrost/oneconfig/config/compatibility/VigilanceConfig.java b/src/main/java/cc/polyfrost/oneconfig/config/compatibility/VigilanceConfig.java
index 3115f3a..fa4f058 100644
--- a/src/main/java/cc/polyfrost/oneconfig/config/compatibility/VigilanceConfig.java
+++ b/src/main/java/cc/polyfrost/oneconfig/config/compatibility/VigilanceConfig.java
@@ -168,8 +168,8 @@ public class VigilanceConfig extends Config {
     }
 
     private static class CompatConfigColorElement extends ConfigColorElement {
-        private Color prevColor = null;
         private final Field color;
+        private Color prevColor = null;
         private OneColor cachedColor = null;
 
         public CompatConfigColorElement(Field color, Vigilant parent, String name, int size) {
diff --git a/src/main/java/cc/polyfrost/oneconfig/config/core/OneColor.java b/src/main/java/cc/polyfrost/oneconfig/config/core/OneColor.java
index dbec72a..9ed1cd9 100644
--- a/src/main/java/cc/polyfrost/oneconfig/config/core/OneColor.java
+++ b/src/main/java/cc/polyfrost/oneconfig/config/core/OneColor.java
@@ -97,6 +97,27 @@ public final class OneColor {
     // accessors
 
     /**
+     * Get the RGBA color from the HSB color, and apply the alpha.
+     */
+    public static int HSBAtoRGBA(float hue, float saturation, float brightness, int alpha) {
+        int temp = Color.HSBtoRGB(hue / 360f, saturation / 100f, brightness / 100f);
+        return ((temp & 0x00ffffff) | (alpha << 24));
+    }
+
+    /**
+     * Get the HSBA color from the RGBA color.
+     */
+    public static short[] RGBAtoHSBA(int rgba) {
+        short[] hsb = new short[4];
+        float[] hsbArray = Color.RGBtoHSB((rgba >> 16 & 255), (rgba >> 8 & 255), (rgba & 255), null);
+        hsb[0] = (short) (hsbArray[0] * 360);
+        hsb[1] = (short) (hsbArray[1] * 100);
+        hsb[2] = (short) (hsbArray[2] * 100);
+        hsb[3] = (short) (rgba >> 24 & 255);
+        return hsb;
+    }
+
+    /**
      * Get the red value of the color (0-255).
      */
     public int getRed() {
@@ -145,6 +166,11 @@ public final class OneColor {
         return hsba[3];
     }
 
+    public void setAlpha(int alpha) {
+        this.hsba[3] = (short) alpha;
+        rgba = HSBAtoRGBA(this.hsba[0], this.hsba[1], this.hsba[2], this.hsba[3]);
+    }
+
     /**
      * Get the chroma speed of the color (1s-30s).
      */
@@ -221,27 +247,6 @@ public final class OneColor {
         }
     }
 
-    /**
-     * Get the RGBA color from the HSB color, and apply the alpha.
-     */
-    public static int HSBAtoRGBA(float hue, float saturation, float brightness, int alpha) {
-        int temp = Color.HSBtoRGB(hue / 360f, saturation / 100f, brightness / 100f);
-        return ((temp & 0x00ffffff) | (alpha << 24));
-    }
-
-    /**
-     * Get the HSBA color from the RGBA color.
-     */
-    public static short[] RGBAtoHSBA(int rgba) {
-        short[] hsb = new short[4];
-        float[] hsbArray = Color.RGBtoHSB((rgba >> 16 & 255), (rgba >> 8 & 255), (rgba & 255), null);
-        hsb[0] = (short) (hsbArray[0] * 360);
-        hsb[1] = (short) (hsbArray[1] * 100);
-        hsb[2] = (short) (hsbArray[2] * 100);
-        hsb[3] = (short) (rgba >> 24 & 255);
-        return hsb;
-    }
-
     public String getHex() {
         return Integer.toHexString(0xff000000 | getRGB()).toUpperCase().substring(2);
     }
@@ -273,11 +278,6 @@ public final class OneColor {
         hsba = RGBAtoHSBA(rgba);
     }
 
-    public void setAlpha(int alpha) {
-        this.hsba[3] = (short) alpha;
-        rgba = HSBAtoRGBA(this.hsba[0], this.hsba[1], this.hsba[2], this.hsba[3]);
-    }
-
     private String charsToString(char... chars) {
         StringBuilder sb = new StringBuilder();
         for (char c : chars) {
diff --git a/src/main/java/cc/polyfrost/oneconfig/config/core/OneKeyBind.java b/src/main/java/cc/polyfrost/oneconfig/config/core/OneKeyBind.java
index d62247c..d455411 100644
--- a/src/main/java/cc/polyfrost/oneconfig/config/core/OneKeyBind.java
+++ b/src/main/java/cc/polyfrost/oneconfig/config/core/OneKeyBind.java
@@ -1,6 +1,6 @@
 package cc.polyfrost.oneconfig.config.core;
 
-import cc.polyfrost.oneconfig.libs.universal.UKeyboard;
+import gg.essential.universal.UKeyboard;
 
 import java.util.ArrayList;
 
diff --git a/src/main/java/cc/polyfrost/oneconfig/config/data/Mod.java b/src/main/java/cc/polyfrost/oneconfig/config/data/Mod.java
index 7849124..241dca7 100644
--- a/src/main/java/cc/polyfrost/oneconfig/config/data/Mod.java
+++ b/src/main/java/cc/polyfrost/oneconfig/config/data/Mod.java
@@ -9,8 +9,8 @@ public class Mod {
     public final ModType modType;
     public final String modIcon;
     public final Migrator migrator;
-    public Config config;
     public final OptionPage defaultPage;
+    public Config config;
     public boolean isShortCut = false;
 
     /**
diff --git a/src/main/java/cc/polyfrost/oneconfig/config/interfaces/BasicOption.java b/src/main/java/cc/polyfrost/oneconfig/config/interfaces/BasicOption.java
index 6fa3254..d4b4498 100644
--- a/src/main/java/cc/polyfrost/oneconfig/config/interfaces/BasicOption.java
+++ b/src/main/java/cc/polyfrost/oneconfig/config/interfaces/BasicOption.java
@@ -5,11 +5,11 @@ import java.util.function.Supplier;
 
 @SuppressWarnings({"unused"})
 public abstract class BasicOption {
+    public final int size;
     protected final Field field;
     protected final String name;
-    public final int size;
-    private Supplier<Boolean> dependency;
     protected final Object parent;
+    private Supplier<Boolean> dependency;
 
     /**
      * Initialize option
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 531c374..8eb5eb1 100644
--- a/src/main/java/cc/polyfrost/oneconfig/config/interfaces/Config.java
+++ b/src/main/java/cc/polyfrost/oneconfig/config/interfaces/Config.java
@@ -22,10 +22,10 @@ import java.util.*;
 import java.util.function.Supplier;
 
 public class Config {
+    public final transient HashMap<String, BasicOption> optionNames = new HashMap<>();
     transient protected final String configFile;
     transient protected final Gson gson = new GsonBuilder().excludeFieldsWithModifiers(Modifier.TRANSIENT).setPrettyPrinting().create();
     transient public Mod mod;
-    public final transient HashMap<String, BasicOption> optionNames = new HashMap<>();
     public transient boolean hasBeenInitialized = false;
     public boolean enabled = true;
 
diff --git a/src/main/java/cc/polyfrost/oneconfig/config/migration/VigilanceMigrator.java b/src/main/java/cc/polyfrost/oneconfig/config/migration/VigilanceMigrator.java
index 5573a3e..b45aeba 100644
--- a/src/main/java/cc/polyfrost/oneconfig/config/migration/VigilanceMigrator.java
+++ b/src/main/java/cc/polyfrost/oneconfig/config/migration/VigilanceMigrator.java
@@ -14,8 +14,8 @@ public class VigilanceMigrator implements Migrator {
     private static final Pattern booleanPattern = Pattern.compile("\"?(?<name>[^\\s\"]+)\"? = (?<value>true|false)");
     private static final Pattern numberPattern = Pattern.compile("\"?(?<name>[^\\s\"]+)\"? = (?<value>[\\d.]+)");
     private static final Pattern stringPattern = Pattern.compile("\"?(?<name>[^\\s\"]+)\"? = \"(?<value>.+)\"");
-    protected HashMap<String, HashMap<String, HashMap<String, Object>>> values = null;
     protected final String filePath;
+    protected HashMap<String, HashMap<String, HashMap<String, Object>>> values = null;
 
     public VigilanceMigrator(String filePath) {
         this.filePath = filePath;
diff --git a/src/main/java/cc/polyfrost/oneconfig/events/EventManager.java b/src/main/java/cc/polyfrost/oneconfig/events/EventManager.java
index c758ec1..cb75a12 100644
--- a/src/main/java/cc/polyfrost/oneconfig/events/EventManager.java
+++ b/src/main/java/cc/polyfrost/oneconfig/events/EventManager.java
@@ -1,22 +1,22 @@
 package cc.polyfrost.oneconfig.events;
 
-import cc.polyfrost.oneconfig.libs.eventbus.EventBus;
-import cc.polyfrost.oneconfig.libs.eventbus.invokers.LMFInvoker;
+import me.kbrewster.eventbus.EventBus;
+import me.kbrewster.eventbus.invokers.LMFInvoker;
 
 /**
  * Manages all events from OneConfig.
  */
 public final class EventManager {
-    private EventManager() {
-
-    }
-
     /**
      * The instance of the {@link EventManager}.
      */
     public static final EventManager INSTANCE = new EventManager();
     private final EventBus eventBus = new EventBus(new LMFInvoker(), Throwable::printStackTrace);
 
+    private EventManager() {
+
+    }
+
     /**
      * Returns the {@link EventBus} instance.
      *
diff --git a/src/main/java/cc/polyfrost/oneconfig/gui/HudGui.java b/src/main/java/cc/polyfrost/oneconfig/gui/HudGui.java
index 72e8e58..52030fc 100644
--- a/src/main/java/cc/polyfrost/oneconfig/gui/HudGui.java
+++ b/src/main/java/cc/polyfrost/oneconfig/gui/HudGui.java
@@ -3,10 +3,10 @@ package cc.polyfrost.oneconfig.gui;
 import cc.polyfrost.oneconfig.config.core.ConfigCore;
 import cc.polyfrost.oneconfig.hud.BasicHud;
 import cc.polyfrost.oneconfig.hud.HudCore;
-import cc.polyfrost.oneconfig.libs.universal.UKeyboard;
-import cc.polyfrost.oneconfig.libs.universal.UMatrixStack;
-import cc.polyfrost.oneconfig.libs.universal.UScreen;
 import cc.polyfrost.oneconfig.lwjgl.RenderManager;
+import gg.essential.universal.UKeyboard;
+import gg.essential.universal.UMatrixStack;
+import gg.essential.universal.UScreen;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
diff --git a/src/main/java/cc/polyfrost/oneconfig/gui/OneConfigGui.java b/src/main/java/cc/polyfrost/oneconfig/gui/OneConfigGui.java
index 8db7640..a9da8c2 100644
--- a/src/main/java/cc/polyfrost/oneconfig/gui/OneConfigGui.java
+++ b/src/main/java/cc/polyfrost/oneconfig/gui/OneConfigGui.java
@@ -9,10 +9,6 @@ import cc.polyfrost.oneconfig.gui.elements.ColorSelector;
 import cc.polyfrost.oneconfig.gui.elements.text.TextInputField;
 import cc.polyfrost.oneconfig.gui.pages.ModsPage;
 import cc.polyfrost.oneconfig.gui.pages.Page;
-import cc.polyfrost.oneconfig.libs.universal.UKeyboard;
-import cc.polyfrost.oneconfig.libs.universal.UMatrixStack;
-import cc.polyfrost.oneconfig.libs.universal.UResolution;
-import cc.polyfrost.oneconfig.libs.universal.UScreen;
 import cc.polyfrost.oneconfig.lwjgl.RenderManager;
 import cc.polyfrost.oneconfig.lwjgl.font.Fonts;
 import cc.polyfrost.oneconfig.lwjgl.image.SVGs;
@@ -20,6 +16,10 @@ import cc.polyfrost.oneconfig.lwjgl.scissor.ScissorManager;
 import cc.polyfrost.oneconfig.utils.GuiUtils;
 import cc.polyfrost.oneconfig.utils.InputUtils;
 import cc.polyfrost.oneconfig.utils.color.ColorPalette;
+import gg.essential.universal.UKeyboard;
+import gg.essential.universal.UMatrixStack;
+import gg.essential.universal.UResolution;
+import gg.essential.universal.UScreen;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.lwjgl.input.Mouse;
@@ -28,9 +28,8 @@ import java.util.ArrayList;
 
 public class OneConfigGui extends UScreen {
     public static OneConfigGui INSTANCE;
+    public static OneConfigGui instanceToRestore = null;
     private final SideBar sideBar = new SideBar();
-    protected Page currentPage;
-    protected Page prevPage;
     private final TextInputField textInputField = new TextInputField(248, 40, "Search...", false, false, SVGs.MAGNIFYING_GLASS_BOLD);
     private final ArrayList<Page> previousPages = new ArrayList<>();
     private final ArrayList<Page> nextPages = new ArrayList<>();
@@ -39,9 +38,10 @@ public class OneConfigGui extends UScreen {
     private final ArrayList<Page> parents = new ArrayList<>();
     public ColorSelector currentColorSelector;
     public boolean mouseDown;
-    private float scale = 1f;
-    public static OneConfigGui instanceToRestore = null;
     public boolean allowClose = true;
+    protected Page currentPage;
+    protected Page prevPage;
+    private float scale = 1f;
     private Animation animation;
 
     public OneConfigGui() {
@@ -67,7 +67,6 @@ public class OneConfigGui extends UScreen {
     public void onDrawScreen(@NotNull UMatrixStack matrixStack, int mouseX, int mouseY, float partialTicks) {
         super.onDrawScreen(matrixStack, mouseX, mouseY, partialTicks);
         long start = System.nanoTime();
-        RenderManager.drawScaledString("HELLO", 10, 10, -1, false, 1.5f);
         int x2 = 0;
         int y2 = 0;
         RenderManager.setupAndDraw((vg) -> {
diff --git a/src/main/java/cc/polyfrost/oneconfig/gui/animations/Animation.java b/src/main/java/cc/polyfrost/oneconfig/gui/animations/Animation.java
index 069a807..3f2a552 100644
--- a/src/main/java/cc/polyfrost/oneconfig/gui/animations/Animation.java
+++ b/src/main/java/cc/polyfrost/oneconfig/gui/animations/Animation.java
@@ -3,11 +3,11 @@ package cc.polyfrost.oneconfig.gui.animations;
 import cc.polyfrost.oneconfig.utils.GuiUtils;
 
 public abstract class Animation {
+    protected final boolean reverse;
     private final float duration;
     private final float start;
     private final float change;
     private float timePassed = 0;
-    protected final boolean reverse;
 
     /**
      * @param duration The duration of the animation
diff --git a/src/main/java/cc/polyfrost/oneconfig/gui/animations/EaseInOutQuad.java b/src/main/java/cc/polyfrost/oneconfig/gui/animations/EaseInOutQuad.java
index 7b4ba7f..f43c75d 100644
--- a/src/main/java/cc/polyfrost/oneconfig/gui/animations/EaseInOutQuad.java
+++ b/src/main/java/cc/polyfrost/oneconfig/gui/animations/EaseInOutQuad.java
@@ -18,7 +18,6 @@ public class EaseInOutQuad extends Animation {
     @Override
     protected float animate(float timePassed, float duration, float start, float change) {
         if ((timePassed /= duration / 2) < 1) return change / 2 * timePassed * timePassed + start;
-        ;
         return -change / 2 * ((--timePassed) * (timePassed - 2) - 1) + start;
     }
 }
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 e16b83e..683be1e 100644
--- a/src/main/java/cc/polyfrost/oneconfig/gui/elements/ColorSelector.java
+++ b/src/main/java/cc/polyfrost/oneconfig/gui/elements/ColorSelector.java
@@ -26,21 +26,14 @@ import java.awt.datatransfer.StringSelection;
 import java.util.ArrayList;
 
 public class ColorSelector {
-    private int x;
-    private int y;
     private final OneColor color;
-    private Animation barMoveAnimation = new DummyAnimation(18);
-    private Animation moveAnimation = new DummyAnimation(1);
-    private int mouseX, mouseY;
     private final ArrayList<BasicElement> buttons = new ArrayList<>();
     private final BasicElement closeBtn = new BasicElement(32, 32, false);
-
     private final BasicButton copyBtn = new BasicButton(32, 32, SVGs.COPY, BasicButton.ALIGNMENT_CENTER, ColorPalette.SECONDARY);
     private final BasicButton pasteBtn = new BasicButton(32, 32, SVGs.PASTE, BasicButton.ALIGNMENT_CENTER, ColorPalette.SECONDARY);
     private final BasicButton guideBtn = new BasicButton(112, 32, "Guide", SVGs.HELP_CIRCLE, SVGs.POP_OUT, BasicButton.ALIGNMENT_CENTER, ColorPalette.SECONDARY);
     private final BasicButton faveBtn = new BasicButton(32, 32, SVGs.HEART_OUTLINE, BasicButton.ALIGNMENT_CENTER, ColorPalette.SECONDARY);
     private final BasicButton recentBtn = new BasicButton(32, 32, SVGs.HISTORY, BasicButton.ALIGNMENT_CENTER, ColorPalette.SECONDARY);
-
     private final NumberInputField hueInput = new NumberInputField(90, 32, 0, 0, 360, 1);
     private final NumberInputField saturationInput = new NumberInputField(90, 32, 100, 0, 100, 1);
     private final NumberInputField brightnessInput = new NumberInputField(90, 32, 100, 0, 100, 1);
@@ -4