fix: stop using internal asset classes everywhere (#69)

* fix: stop using internal asset classes everywhere
new: add wrapper classes for NanoVG rendering and rename original Image wrapper to OneImage

* I love regex

Co-authored-by: DeDiamondPro <67508414+DeDiamondPro@users.noreply.github.com>

2 files changed, 41 insertions, 51 deletions

diff --git a/src/main/java/cc/polyfrost/oneconfig/internal/assets/Images.java b/src/main/java/cc/polyfrost/oneconfig/internal/assets/Images.java
index b7dc9cc..1007be7 100644
--- a/src/main/java/cc/polyfrost/oneconfig/internal/assets/Images.java
+++ b/src/main/java/cc/polyfrost/oneconfig/internal/assets/Images.java
@@ -1,6 +1,7 @@
 package cc.polyfrost.oneconfig.internal.assets;
 
 import cc.polyfrost.oneconfig.renderer.AssetLoader;
+import cc.polyfrost.oneconfig.renderer.Image;
 
 /**
  * An enum of images used in OneConfig.
@@ -8,14 +9,8 @@ import cc.polyfrost.oneconfig.renderer.AssetLoader;
  * @see cc.polyfrost.oneconfig.renderer.RenderManager#drawImage(long, String, float, float, float, float, int)
  * @see AssetLoader
  */
-public enum Images {
-    HUE_GRADIENT("/assets/oneconfig/options/HueGradient.png"),
-    COLOR_WHEEL("/assets/oneconfig/options/ColorWheel.png"),
-    ALPHA_GRID("/assets/oneconfig/options/AlphaGrid.png");
-
-    public final String filePath;
-
-    Images(String filePath) {
-        this.filePath = filePath;
-    }
+public class Images {
+    public static final Image HUE_GRADIENT = new Image("/assets/oneconfig/options/HueGradient.png");
+    public static final Image COLOR_WHEEL = new Image("/assets/oneconfig/options/ColorWheel.png");
+    public static final Image ALPHA_GRID = new Image("/assets/oneconfig/options/AlphaGrid.png");
 }
\ No newline at end of file
diff --git a/src/main/java/cc/polyfrost/oneconfig/internal/assets/SVGs.java b/src/main/java/cc/polyfrost/oneconfig/internal/assets/SVGs.java
index eaad4ba..d0e05bf 100644
--- a/src/main/java/cc/polyfrost/oneconfig/internal/assets/SVGs.java
+++ b/src/main/java/cc/polyfrost/oneconfig/internal/assets/SVGs.java
@@ -1,6 +1,7 @@
 package cc.polyfrost.oneconfig.internal.assets;
 
 import cc.polyfrost.oneconfig.renderer.AssetLoader;
+import cc.polyfrost.oneconfig.renderer.SVG;
 
 /**
  * An enum of SVGs used in OneConfig.
@@ -8,47 +9,41 @@ import cc.polyfrost.oneconfig.renderer.AssetLoader;
  * @see cc.polyfrost.oneconfig.renderer.RenderManager#drawSvg(long, String, float, float, float, float, int)
  * @see AssetLoader
  */
-public enum SVGs {
-    ONECONFIG("/assets/oneconfig/icons/OneConfig.svg"),
-    ONECONFIG_OFF("/assets/oneconfig/icons/OneConfigOff.svg"),
-    COPYRIGHT_FILL("/assets/oneconfig/icons/CopyrightFill.svg"),
-    APERTURE_FILL("/assets/oneconfig/icons/ApertureFill.svg"),
-    ARROWS_CLOCKWISE_BOLD("/assets/oneconfig/icons/ArrowsClockwiseBold.svg"),
-    FADERS_HORIZONTAL_BOLD("/assets/oneconfig/icons/FadersHorizontalBold.svg"),
-    GAUGE_FILL("/assets/oneconfig/icons/GaugeFill.svg"),
-    GEAR_SIX_FILL("/assets/oneconfig/icons/GearSixFill.svg"),
-    MAGNIFYING_GLASS_BOLD("/assets/oneconfig/icons/MagnifyingGlassBold.svg"),
-    NOTE_PENCIL_BOLD("/assets/oneconfig/icons/NotePencilBold.svg"),
-    PAINT_BRUSH_BROAD_FILL("/assets/oneconfig/icons/PaintBrushBroadFill.svg"),
-    USER_SWITCH_FILL("/assets/oneconfig/icons/UserSwitchFill.svg"),
-    X_CIRCLE_BOLD("/assets/oneconfig/icons/XCircleBold.svg"),
-    CARET_LEFT("/assets/oneconfig/icons/CaretLeftBold.svg"),
-    CARET_RIGHT("/assets/oneconfig/icons/CaretRightBold.svg"),
+public class SVGs {
+    public static final SVG ONECONFIG = new SVG("/assets/oneconfig/icons/OneConfig.svg");
+    public static final SVG ONECONFIG_OFF = new SVG("/assets/oneconfig/icons/OneConfigOff.svg");
+    public static final SVG COPYRIGHT_FILL = new SVG("/assets/oneconfig/icons/CopyrightFill.svg");
+    public static final SVG APERTURE_FILL = new SVG("/assets/oneconfig/icons/ApertureFill.svg");
+    public static final SVG ARROWS_CLOCKWISE_BOLD = new SVG("/assets/oneconfig/icons/ArrowsClockwiseBold.svg");
+    public static final SVG FADERS_HORIZONTAL_BOLD = new SVG("/assets/oneconfig/icons/FadersHorizontalBold.svg");
+    public static final SVG GAUGE_FILL = new SVG("/assets/oneconfig/icons/GaugeFill.svg");
+    public static final SVG GEAR_SIX_FILL = new SVG("/assets/oneconfig/icons/GearSixFill.svg");
+    public static final SVG MAGNIFYING_GLASS_BOLD = new SVG("/assets/oneconfig/icons/MagnifyingGlassBold.svg");
+    public static final SVG NOTE_PENCIL_BOLD = new SVG("/assets/oneconfig/icons/NotePencilBold.svg");
+    public static final SVG PAINT_BRUSH_BROAD_FILL = new SVG("/assets/oneconfig/icons/PaintBrushBroadFill.svg");
+    public static final SVG USER_SWITCH_FILL = new SVG("/assets/oneconfig/icons/UserSwitchFill.svg");
+    public static final SVG X_CIRCLE_BOLD = new SVG("/assets/oneconfig/icons/XCircleBold.svg");
+    public static final SVG CARET_LEFT = new SVG("/assets/oneconfig/icons/CaretLeftBold.svg");
+    public static final SVG CARET_RIGHT = new SVG("/assets/oneconfig/icons/CaretRightBold.svg");
 
     // OLD ICONS
-    BOX("/assets/oneconfig/old-icons/Box.svg"),
-    CHECKBOX_TICK("/assets/oneconfig/old-icons/CheckboxTick.svg"),
-    CHECK_CIRCLE("/assets/oneconfig/old-icons/CheckCircle.svg"),
-    CHEVRON_DOWN("/assets/oneconfig/old-icons/ChevronDown.svg"),
-    CHEVRON_UP("/assets/oneconfig/old-icons/ChevronUp.svg"),
-    COPY("/assets/oneconfig/old-icons/Copy.svg"),
-    DROPDOWN_LIST("/assets/oneconfig/old-icons/DropdownList.svg"),
-    ERROR("/assets/oneconfig/old-icons/Error.svg"),
-    EYE("/assets/oneconfig/old-icons/Eye.svg"),
-    EYE_OFF("/assets/oneconfig/old-icons/EyeOff.svg"),
-    HEART_FILL("/assets/oneconfig/old-icons/HeartFill.svg"),
-    HEART_OUTLINE("/assets/oneconfig/old-icons/HeartOutline.svg"),
-    HELP_CIRCLE("/assets/oneconfig/old-icons/HelpCircle.svg"),
-    HISTORY("/assets/oneconfig/old-icons/History.svg"),
-    INFO_CIRCLE("/assets/oneconfig/old-icons/InfoCircle.svg"),
-    KEYSTROKE("/assets/oneconfig/old-icons/Keystroke.svg"),
-    PASTE("/assets/oneconfig/old-icons/Paste.svg"),
-    POP_OUT("/assets/oneconfig/old-icons/PopOut.svg"),
-    WARNING("/assets/oneconfig/old-icons/Warning.svg");
-
-    public final String filePath;
-
-    SVGs(String filePath) {
-        this.filePath = filePath;
-    }
+    public static final SVG BOX = new SVG("/assets/oneconfig/old-icons/Box.svg");
+    public static final SVG CHECKBOX_TICK = new SVG("/assets/oneconfig/old-icons/CheckboxTick.svg");
+    public static final SVG CHECK_CIRCLE = new SVG("/assets/oneconfig/old-icons/CheckCircle.svg");
+    public static final SVG CHEVRON_DOWN = new SVG("/assets/oneconfig/old-icons/ChevronDown.svg");
+    public static final SVG CHEVRON_UP = new SVG("/assets/oneconfig/old-icons/ChevronUp.svg");
+    public static final SVG COPY = new SVG("/assets/oneconfig/old-icons/Copy.svg");
+    public static final SVG DROPDOWN_LIST = new SVG("/assets/oneconfig/old-icons/DropdownList.svg");
+    public static final SVG ERROR = new SVG("/assets/oneconfig/old-icons/Error.svg");
+    public static final SVG EYE = new SVG("/assets/oneconfig/old-icons/Eye.svg");
+    public static final SVG EYE_OFF = new SVG("/assets/oneconfig/old-icons/EyeOff.svg");
+    public static final SVG HEART_FILL = new SVG("/assets/oneconfig/old-icons/HeartFill.svg");
+    public static final SVG HEART_OUTLINE = new SVG("/assets/oneconfig/old-icons/HeartOutline.svg");
+    public static final SVG HELP_CIRCLE = new SVG("/assets/oneconfig/old-icons/HelpCircle.svg");
+    public static final SVG HISTORY = new SVG("/assets/oneconfig/old-icons/History.svg");
+    public static final SVG INFO_CIRCLE = new SVG("/assets/oneconfig/old-icons/InfoCircle.svg");
+    public static final SVG KEYSTROKE = new SVG("/assets/oneconfig/old-icons/Keystroke.svg");
+    public static final SVG PASTE = new SVG("/assets/oneconfig/old-icons/Paste.svg");
+    public static final SVG POP_OUT = new SVG("/assets/oneconfig/old-icons/PopOut.svg");
+    public static final SVG WARNING = new SVG("/assets/oneconfig/old-icons/Warning.svg");
 }