Merge remote-tracking branch 'origin/master'

2 files changed, 45 insertions, 48 deletions

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;