Merge remote-tracking branch 'origin/master'

42 files changed, 47 insertions, 50 deletions

diff --git a/src/main/java/cc/polyfrost/oneconfig/gui/SideBar.java b/src/main/java/cc/polyfrost/oneconfig/gui/SideBar.java
index bec14b1..c3e99e0 100644
--- a/src/main/java/cc/polyfrost/oneconfig/gui/SideBar.java
+++ b/src/main/java/cc/polyfrost/oneconfig/gui/SideBar.java
@@ -51,11 +51,11 @@ public class SideBar {
             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);
+                RenderManager.drawString(vg, "MOD CONFIG", x + 16, y + 266, OneConfigConfig.WHITE_80, 12f, Fonts.SEMIBOLD);
                 i = 180;
             }
             if (i == 324) {
-                RenderManager.drawString(vg, "PERSONALIZATION", x + 16, y + 446, OneConfigConfig.WHITE_90, 12f, Fonts.SEMIBOLD);
+                RenderManager.drawString(vg, "PERSONALIZATION", x + 16, y + 446, OneConfigConfig.WHITE_80, 12f, Fonts.SEMIBOLD);
                 i = 360;
             }
             if (i == 504) {
diff --git a/src/main/java/cc/polyfrost/oneconfig/lwjgl/RenderManager.java b/src/main/java/cc/polyfrost/oneconfig/lwjgl/RenderManager.java
index 2600075..0a9ccce 100644
--- a/src/main/java/cc/polyfrost/oneconfig/lwjgl/RenderManager.java
+++ b/src/main/java/cc/polyfrost/oneconfig/lwjgl/RenderManager.java
@@ -75,7 +75,6 @@ public final class RenderManager {
         }
     }
 
-    // Can be removed or atleast marked out since it is no longer used - MoonTidez
     public static void drawGradientRoundedRect(long vg, float x, float y, float width, float height, int color, int color2, float radius) {
         NVGPaint bg = NVGPaint.create();
         nvgBeginPath(vg);
@@ -112,7 +111,6 @@ public final class RenderManager {
         nvgColor4.free();
     }
 
-    /*
     public static void drawGradientRect(long vg, float x, float y, float width, float height, int color, int color2) {
         NVGPaint bg = NVGPaint.create();
         nvgBeginPath(vg);
@@ -125,7 +123,6 @@ public final class RenderManager {
         nvgColor.free();
         nvgColor2.free();
     }
-    */
 
     public static void drawRect(long vg, float x, float y, float width, float height, int color) {
         nvgBeginPath(vg);
diff --git a/src/main/java/cc/polyfrost/oneconfig/lwjgl/image/Images.java b/src/main/java/cc/polyfrost/oneconfig/lwjgl/image/Images.java
index 7ba2aa9..fd2fc3c 100644
--- a/src/main/java/cc/polyfrost/oneconfig/lwjgl/image/Images.java
+++ b/src/main/java/cc/polyfrost/oneconfig/lwjgl/image/Images.java
@@ -1,54 +1,54 @@
 package cc.polyfrost.oneconfig.lwjgl.image;
 
 public enum Images {
-    CHEVRON_ARROW("/assets/oneconfig/textures/gui/general/arrows/chevron.png"),
-    DROPDOWN_ARROW("/assets/oneconfig/textures/gui/general/arrows/dropdown_arrow.png"),
-    UP_ARROW("/assets/oneconfig/textures/gui/general/arrows/up_arrow.png"),
-    CIRCLE_ARROW("/assets/oneconfig/textures/gui/general/arrows/circle_arrow.png"),
+    CHEVRON_ARROW("/assets/oneconfig/icons/chevron.png"),
+    DROPDOWN_ARROW("/assets/oneconfig/icons/dropdown_arrow.png"),
+    UP_ARROW("/assets/oneconfig/icons/up_arrow.png"),
+    CIRCLE_ARROW("/assets/oneconfig/icons/circle_arrow.png"),
 
-    CHECKMARK("/assets/oneconfig/textures/gui/general/configs/checkmark.png"),
-    FAVORITE("/assets/oneconfig/textures/gui/general/configs/favorite_active.png"),
-    FAVORITE_OFF("/assets/oneconfig/textures/gui/general/configs/favorite_inactive.png"),
-    HIDE_EYE("/assets/oneconfig/textures/gui/general/configs/hide_eye.png"),
-    HIDE_EYE_OFF("/assets/oneconfig/textures/gui/general/configs/hide_eye_off.png"),
+    CHECKMARK("/assets/oneconfig/icons/checkmark.png"),
+    FAVORITE("/assets/oneconfig/icons/favorite_active.png"),
+    FAVORITE_OFF("/assets/oneconfig/icons/favorite_inactive.png"),
+    HIDE_EYE("/assets/oneconfig/icons/hide_eye.png"),
+    HIDE_EYE_OFF("/assets/oneconfig/icons/hide_eye_off.png"),
 
     // TODO color picker ones
-    COLOR_BASE("/assets/oneconfig/textures/gui/general/color/color_base.png"),
-    COLOR_BASE_LONG("/assets/oneconfig/textures/gui/general/color/color_base_long.png"),
-    COLOR_BASE_LARGE("/assets/oneconfig/textures/gui/general/color/color_base_large.png"),
-    COLOR_WHEEL("/assets/oneconfig/textures/gui/general/color/colorwheel.png"),
-    HUE_GRADIENT("/assets/oneconfig/textures/gui/general/color/huegradient.png"),
-    CLOSE_COLOR("/assets/oneconfig/textures/gui/general/color/close_color.png"),
-
-    INFO("/assets/oneconfig/textures/gui/icons/alert/info.png"),
-    SUCCESS("/assets/oneconfig/textures/gui/icons/alert/success.png"),
-    WARNING("/assets/oneconfig/textures/gui/icons/alert/warning.png"),
-    ERROR("/assets/oneconfig/textures/gui/icons/alert/error.png"),
-
-    SHARE("/assets/oneconfig/textures/gui/general/nav/share.png"),
-    LAUNCH("/assets/oneconfig/textures/gui/general/nav/launch.png"),
-    SEARCH("/assets/oneconfig/textures/gui/general/nav/search.png"),
-    MINIMIZE("/assets/oneconfig/textures/gui/general/nav/minimize.png"),
-    CLOSE("/assets/oneconfig/textures/gui/general/nav/close.png"),
-    HELP("/assets/oneconfig/textures/gui/general/nav/help.png"),
-    COPY("/assets/oneconfig/textures/gui/general/nav/copy.png"),
-    PASTE("/assets/oneconfig/textures/gui/general/nav/paste.png"),
-
-    LOGO("/assets/oneconfig/textures/gui/general/logo.png"),
-
-    HUD("/assets/oneconfig/textures/gui/icons/hud/hud.png"),
-    HUD_SETTINGS("/assets/oneconfig/textures/gui/icons/hud/settings.png"),
-
-    MOD_BOX("/assets/oneconfig/textures/gui/icons/mod/mod_box.png"),
-    MODS("/assets/oneconfig/textures/gui/icons/mod/mods.png"),
-    PERFORMANCE("/assets/oneconfig/textures/gui/icons/mod/performance.png"),
-
-    DASHBOARD("/assets/oneconfig/textures/gui/icons/dashboard.png"),
-    PREFERENCES("/assets/oneconfig/textures/gui/icons/preferences.png"),
-    PROFILES("/assets/oneconfig/textures/gui/icons/profiles.png"),
-    SCREENSHOT("/assets/oneconfig/textures/gui/icons/screenshot.png"),
-    THEMES("/assets/oneconfig/textures/gui/icons/themes.png"),
-    UPDATES("/assets/oneconfig/textures/gui/icons/updates.png"),
+    COLOR_BASE("/assets/oneconfig/colorui/color_base.png"),
+    COLOR_BASE_LONG("/assets/oneconfig/colorui/color_base_long.png"),
+    COLOR_BASE_LARGE("/assets/oneconfig/colorui/color_base_large.png"),
+    COLOR_WHEEL("/assets/oneconfig/colorui/color_wheel.png"),
+    HUE_GRADIENT("/assets/oneconfig/colorui/hue_gradient.png"),
+    CLOSE_COLOR("/assets/oneconfig/colorui/close_color.png"),
+
+    INFO("/assets/oneconfig/icons/info.png"),
+    SUCCESS("/assets/oneconfig/icons/success.png"),
+    WARNING("/assets/oneconfig/icons/warning.png"),
+    ERROR("/assets/oneconfig/icons/error.png"),
+
+    SHARE("/assets/oneconfig/icons/share.png"),
+    LAUNCH("/assets/oneconfig/icons/launch.png"),
+    SEARCH("/assets/oneconfig/icons/search.png"),
+    MINIMIZE("/assets/oneconfig/icons/minimize.png"),
+    CLOSE("/assets/oneconfig/icons/close.png"),
+    HELP("/assets/oneconfig/icons/help.png"),
+    COPY("/assets/oneconfig/icons/copy.png"),
+    PASTE("/assets/oneconfig/icons/paste.png"),
+
+    LOGO("/assets/oneconfig/icons/logo.png"),
+
+    HUD("/assets/oneconfig/icons/hud.png"),
+    HUD_SETTINGS("/assets/oneconfig/icons/settings.png"),
+
+    MOD_BOX("/assets/oneconfig/icons/mod_box.png"),
+    MODS("/assets/oneconfig/icons/mods.png"),
+    PERFORMANCE("/assets/oneconfig/icons/performance.png"),
+
+    DASHBOARD("/assets/oneconfig/icons/dashboard.png"),
+    PREFERENCES("/assets/oneconfig/icons/preferences.png"),
+    PROFILES("/assets/oneconfig/icons/profiles.png"),
+    SCREENSHOT("/assets/oneconfig/icons/screenshot.png"),
+    THEMES("/assets/oneconfig/icons/themes.png"),
+    UPDATES("/assets/oneconfig/icons/updates.png"),
     ;
 
     public final String filePath;
diff --git a/src/main/resources/assets/oneconfig/textures/gui/general/color/close_color.png b/src/main/resources/assets/oneconfig/colorui/close_color.png
index f0bd126..f0bd126 100644
--- a/src/main/resources/assets/oneconfig/textures/gui/general/color/close_color.png
+++ b/src/main/resources/assets/oneconfig/colorui/close_color.png
diff --git a/src/main/resources/assets/oneconfig/textures/gui/general/color/color_base.png b/src/main/resources/assets/oneconfig/colorui/color_base.png
index 477c8fa..477c8fa 100644
--- a/src/main/resources/assets/oneconfig/textures/gui/general/color/color_base.png
+++ b/src/main/resources/assets/oneconfig/colorui/color_base.png
diff --git a/src/main/resources/assets/oneconfig/textures/gui/general/color/color_base_large.png b/src/main/resources/assets/oneconfig/colorui/color_base_large.png
index 079f5e8..079f5e8 100644
--- a/src/main/resources/assets/oneconfig/textures/gui/general/color/color_base_large.png
+++ b/src/main/resources/assets/oneconfig/colorui/color_base_large.png
diff --git a/src/main/resources/assets/oneconfig/textures/gui/general/color/color_base_long.png b/src/main/resources/assets/oneconfig/colorui/color_base_long.png
index 5eb9881..5eb9881 100644
--- a/src/main/resources/assets/oneconfig/textures/gui/general/color/color_base_long.png
+++ b/src/main/resources/assets/oneconfig/colorui/color_base_long.png
diff --git a/src/main/resources/assets/oneconfig/textures/gui/general/color/colorwheel.png b/src/main/resources/assets/oneconfig/colorui/color_wheel.png
index f4ebe3b..f4ebe3b 100644
--- a/src/main/resources/assets/oneconfig/textures/gui/general/color/colorwheel.png
+++ b/src/main/resources/assets/oneconfig/colorui/color_wheel.png
diff --git a/src/main/resources/assets/oneconfig/textures/gui/general/color/huegradient.png b/src/main/resources/assets/oneconfig/colorui/hue_gradient.png
index 69c93fe..69c93fe 100644
--- a/src/main/resources/assets/oneconfig/textures/gui/general/color/huegradient.png
+++ b/src/main/resources/assets/oneconfig/colorui/hue_gradient.png
diff --git a/src/main/resources/assets/oneconfig/textures/gui/general/configs/checkmark.png b/src/main/resources/assets/oneconfig/icons/checkmark.png
index 3069563..3069563 100644
--- a/src/main/resources/assets/oneconfig/textures/gui/general/configs/checkmark.png
+++ b/src/main/resources/assets/oneconfig/icons/checkmark.png
diff --git a/src/main/resources/assets/oneconfig/textures/gui/general/arrows/chevron.png b/src/main/resources/assets/oneconfig/icons/chevron.png
index 426a17f..426a17f 100644
--- a/src/main/resources/assets/oneconfig/textures/gui/general/arrows/chevron.png
+++ b/src/main/resources/assets/oneconfig/icons/chevron.png
diff --git a/src/main/resources/assets/oneconfig/textures/gui/general/arrows/circle_arrow.png b/src/main/resources/assets/oneconfig/icons/circle_arrow.png
index dbf1bf0..dbf1bf0 100644
--- a/src/main/resources/assets/oneconfig/textures/gui/general/arrows/circle_arrow.png
+++ b/src/main/resources/assets/oneconfig/icons/circle_arrow.png
diff --git a/src/main/resources/assets/oneconfig/textures/gui/general/nav/close.png b/src/main/resources/assets/oneconfig/icons/close.png
index 85c82f2..85c82f2 100644
--- a/src/main/resources/assets/oneconfig/textures/gui/general/nav/close.png
+++ b/src/main/resources/assets/oneconfig/icons/close.png
diff --git a/src/main/resources/assets/oneconfig/textures/gui/general/nav/copy.png b/src/main/resources/assets/oneconfig/icons/copy.png
index 00ffc0b..00ffc0b 100644
--- a/src/main/resources/assets/oneconfig/textures/gui/general/nav/copy.png
+++ b/src/main/resources/assets/oneconfig/icons/copy.png
diff --git a/src/main/resources/assets/oneconfig/textures/gui/icons/dashboard.png b/src/main/resources/assets/oneconfig/icons/dashboard.png
index 179a57d..179a57d 100644
--- a/src/main/resources/assets/oneconfig/textures/gui/icons/dashboard.png
+++ b/src/main/resources/assets/oneconfig/icons/dashboard.png
diff --git a/src/main/resources/assets/oneconfig/textures/gui/general/arrows/dropdown_arrow.png b/src/main/resources/assets/oneconfig/icons/dropdown_arrow.png
index 673458d..673458d 100644
--- a/src/main/resources/assets/oneconfig/textures/gui/general/arrows/dropdown_arrow.png
+++ b/src/main/resources/assets/oneconfig/icons/dropdown_arrow.png
diff --git a/src/main/resources/assets/oneconfig/textures/gui/icons/alert/error.png b/src/main/resources/assets/oneconfig/icons/error.png
index ea2b6b0..ea2b6b0 100644
--- a/src/main/resources/assets/oneconfig/textures/gui/icons/alert/error.png
+++ b/src/main/resources/assets/oneconfig/icons/error.png
diff --git a/src/main/resources/assets/oneconfig/textures/gui/general/configs/favorite_active.png b/src/main/resources/assets/oneconfig/icons/favorite_active.png
index 39acd3a..39acd3a 100644
--- a/src/main/resources/assets/oneconfig/textures/gui/general/configs/favorite_active.png
+++ b/src/main/resources/assets/oneconfig/icons/favorite_active.png
diff --git a/src/main/resources/assets/oneconfig/textures/gui/general/configs/favorite_inactive.png b/src/main/resources/assets/oneconfig/icons/favorite_inactive.png
index f91d77c..f91d77c 100644
--- a/src/main/resources/assets/oneconfig/textures/gui/general/configs/favorite_inactive.png
+++ b/src/main/resources/assets/oneconfig/icons/favorite_inactive.png
diff --git a/src/main/resources/assets/oneconfig/textures/gui/general/nav/help.png b/src/main/resources/assets/oneconfig/icons/help.png
index 1b91ad5..1b91ad5 100644
--- a/src/main/resources/assets/oneconfig/textures/gui/general/nav/help.png
+++ b/src/main/resources/assets/oneconfig/icons/help.png
diff --git a/src/main/resources/assets/oneconfig/textures/gui/general/configs/hide_eye.png b/src/main/resources/assets/oneconfig/icons/hide_eye.png
index 38a5126..38a5126 100644
--- a/src/main/resources/assets/oneconfig/textures/gui/general/configs/hide_eye.png
+++ b/src/main/resources/assets/oneconfig/icons/hide_eye.png
diff --git a/src/main/resources/assets/oneconfig/textures/gui/general/configs/hide_eye_off.png b/src/main/resources/assets/oneconfig/icons/hide_eye_off.png
index 14f3b2a..14f3b2a 100644
--- a/src/main/resources/assets/oneconfig/textures/gui/general/configs/hide_eye_off.png
+++ b/src/main/resources/assets/oneconfig/icons/hide_eye_off.png
diff --git a/src/main/resources/assets/oneconfig/textures/gui/icons/hud/hud.png b/src/main/resources/assets/oneconfig/icons/hud.png
index 98c052c..98c052c 100644
--- a/src/main/resources/assets/oneconfig/textures/gui/icons/hud/hud.png
+++ b/src/main/resources/assets/oneconfig/icons/hud.png
diff --git a/src/main/resources/assets/oneconfig/textures/gui/icons/alert/info.png b/src/main/resources/assets/oneconfig/icons/info.png
index 2ad09f3..2ad09f3 100644
--- a/src/main/resources/assets/oneconfig/textures/gui/icons/alert/info.png
+++ b/src/main/resources/assets/oneconfig/icons/info.png
diff --git a/src/main/resources/assets/oneconfig/textures/gui/general/nav/launch.png b/src/main/resources/assets/oneconfig/icons/launch.png
index 5f1e1ac..5f1e1ac 100644
--- a/src/main/resources/assets/oneconfig/textures/gui/general/nav/launch.png
+++ b/src/main/resources/assets/oneconfig/icons/launch.png
diff --git a/src/main/resources/assets/oneconfig/textures/gui/general/logo.png b/src/main/resources/assets/oneconfig/icons/logo.png
index f0f6e68..f0f6e68 100644
--- a/src/main/resources/assets/oneconfig/textures/gui/general/logo.png
+++ b/src/main/resources/assets/oneconfig/icons/logo.png
diff --git a/src/main/resources/assets/oneconfig/textures/gui/general/nav/minimize.png b/src/main/resources/assets/oneconfig/icons/minimize.png
index dbe5a56..dbe5a56 100644
--- a/src/main/resources/assets/oneconfig/textures/gui/general/nav/minimize.png
+++ b/src/main/resources/assets/oneconfig/icons/minimize.png
diff --git a/src/main/resources/assets/oneconfig/textures/gui/icons/mod/mod_box.png b/src/main/resources/assets/oneconfig/icons/mod_box.png
index 8a7630b..8a7630b 100644
--- a/src/main/resources/assets/oneconfig/textures/gui/icons/mod/mod_box.png
+++ b/src/main/resources/assets/oneconfig/icons/mod_box.png
diff --git a/src/main/resources/assets/oneconfig/textures/gui/icons/mod/mods.png b/src/main/resources/assets/oneconfig/icons/mods.png
index 07ebd26..07ebd26 100644
--- a/src/main/resources/assets/oneconfig/textures/gui/icons/mod/mods.png
+++ b/src/main/resources/assets/oneconfig/icons/mods.png
diff --git a/src/main/resources/assets/oneconfig/textures/gui/general/nav/paste.png b/src/main/resources/assets/oneconfig/icons/paste.png
index a5f97f9..a5f97f9 100644
--- a/src/main/resources/assets/oneconfig/textures/gui/general/nav/paste.png
+++ b/src/main/resources/assets/oneconfig/icons/paste.png
diff --git a/src/main/resources/assets/oneconfig/textures/gui/icons/mod/performance.png b/src/main/resources/assets/oneconfig/icons/performance.png
index fe64b1d..fe64b1d 100644
--- a/src/main/resources/assets/oneconfig/textures/gui/icons/mod/performance.png
+++ b/src/main/resources/assets/oneconfig/icons/performance.png
diff --git a/src/main/resources/assets/oneconfig/textures/gui/icons/preferences.png b/src/main/resources/assets/oneconfig/icons/preferences.png
index c8c9888..c8c9888 100644
--- a/src/main/resources/assets/oneconfig/textures/gui/icons/preferences.png
+++ b/src/main/resources/assets/oneconfig/icons/preferences.png
diff --git a/src/main/resources/assets/oneconfig/textures/gui/icons/profiles.png b/src/main/resources/assets/oneconfig/icons/profiles.png
index f0574e6..f0574e6 100644
--- a/src/main/resources/assets/oneconfig/textures/gui/icons/profiles.png
+++ b/src/main/resources/assets/oneconfig/icons/profiles.png
diff --git a/src/main/resources/assets/oneconfig/textures/gui/icons/screenshot.png b/src/main/resources/assets/oneconfig/icons/screenshot.png
index f9a4d25..f9a4d25 100644
--- a/src/main/resources/assets/oneconfig/textures/gui/icons/screenshot.png
+++ b/src/main/resources/assets/oneconfig/icons/screenshot.png
diff --git a/src/main/resources/assets/oneconfig/textures/gui/general/nav/search.png b/src/main/resources/assets/oneconfig/icons/search.png
index 23a9e05..23a9e05 100644
--- a/src/main/resources/assets/oneconfig/textures/gui/general/nav/search.png
+++ b/src/main/resources/assets/oneconfig/icons/search.png
diff --git a/src/main/resources/assets/oneconfig/textures/gui/icons/hud/settings.png b/src/main/resources/assets/oneconfig/icons/settings.png
index 9dd5b5d..9dd5b5d 100644
--- a/src/main/resources/assets/oneconfig/textures/gui/icons/hud/settings.png
+++ b/src/main/resources/assets/oneconfig/icons/settings.png
diff --git a/src/main/resources/assets/oneconfig/textures/gui/general/nav/share.png b/src/main/resources/assets/oneconfig/icons/share.png
index 67930ef..67930ef 100644
--- a/src/main/resources/assets/oneconfig/textures/gui/general/nav/share.png
+++ b/src/main/resources/assets/oneconfig/icons/share.png
diff --git a/src/main/resources/assets/oneconfig/textures/gui/icons/alert/success.png b/src/main/resources/assets/oneconfig/icons/success.png
index 3472a9e..3472a9e 100644
--- a/src/main/resources/assets/oneconfig/textures/gui/icons/alert/success.png
+++ b/src/main/resources/assets/oneconfig/icons/success.png
diff --git a/src/main/resources/assets/oneconfig/textures/gui/icons/themes.png b/src/main/resources/assets/oneconfig/icons/themes.png
index df8e3de..df8e3de 100644
--- a/src/main/resources/assets/oneconfig/textures/gui/icons/themes.png
+++ b/src/main/resources/assets/oneconfig/icons/themes.png
diff --git a/src/main/resources/assets/oneconfig/textures/gui/general/arrows/up_arrow.png b/src/main/resources/assets/oneconfig/icons/up_arrow.png
index f6723ad..f6723ad 100644
--- a/src/main/resources/assets/oneconfig/textures/gui/general/arrows/up_arrow.png
+++ b/src/main/resources/assets/oneconfig/icons/up_arrow.png
diff --git a/src/main/resources/assets/oneconfig/textures/gui/icons/updates.png b/src/main/resources/assets/oneconfig/icons/updates.png
index d44220b..d44220b 100644
--- a/src/main/resources/assets/oneconfig/textures/gui/icons/updates.png
+++ b/src/main/resources/assets/oneconfig/icons/updates.png
diff --git a/src/main/resources/assets/oneconfig/textures/gui/icons/alert/warning.png b/src/main/resources/assets/oneconfig/icons/warning.png
index c2a53d9..c2a53d9 100644
--- a/src/main/resources/assets/oneconfig/textures/gui/icons/alert/warning.png
+++ b/src/main/resources/assets/oneconfig/icons/warning.png