more stuff

6 files changed, 10 insertions, 10 deletions

diff --git a/src/main/java/cc/polyfrost/oneconfig/gui/OneConfigGui.java b/src/main/java/cc/polyfrost/oneconfig/gui/OneConfigGui.java
index 5432b23..27ff322 100644
--- a/src/main/java/cc/polyfrost/oneconfig/gui/OneConfigGui.java
+++ b/src/main/java/cc/polyfrost/oneconfig/gui/OneConfigGui.java
@@ -16,7 +16,6 @@ import cc.polyfrost.oneconfig.lwjgl.image.SVGs;
 import cc.polyfrost.oneconfig.lwjgl.scissor.ScissorManager;
 import cc.polyfrost.oneconfig.utils.color.ColorPalette;
 import cc.polyfrost.oneconfig.utils.InputUtils;
-import cc.polyfrost.oneconfig.utils.MathUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.lwjgl.input.Mouse;
@@ -110,7 +109,7 @@ public class OneConfigGui extends UScreen {
                 backArrow.disable(false);
                 if (!backArrow.isHovered() || Mouse.isButtonDown(0)) RenderManager.setAlpha(vg, 0.8f);
             }
-            RenderManager.drawSvg(vg, SVGs.CHEVRON_LEFT, x + 246, y + 22, 28, 28);
+            RenderManager.drawSvg(vg, SVGs.CARET_LEFT, x + 246, y + 22, 28, 28);
             RenderManager.setAlpha(vg, 1f);
             if (nextPages.size() == 0) {
                 forwardArrow.disable(true);
@@ -119,7 +118,7 @@ public class OneConfigGui extends UScreen {
                 forwardArrow.disable(false);
                 if (!forwardArrow.isHovered() || Mouse.isButtonDown(0)) RenderManager.setAlpha(vg, 0.8f);
             }
-            RenderManager.drawSvg(vg, SVGs.CHEVRON_RIGHT, x + 294, y + 22, 28, 28);
+            RenderManager.drawSvg(vg, SVGs.CARET_RIGHT, x + 294, y + 22, 28, 28);
             RenderManager.setAlpha(vg, 1f);
 
             if (backArrow.isClicked() && previousPages.size() > 0) {
@@ -166,7 +165,7 @@ public class OneConfigGui extends UScreen {
                 else if (hovered && !Mouse.isButtonDown(0)) color = OneConfigConfig.WHITE_80;
                 RenderManager.drawText(vg, title, breadcrumbX, y + 38, color, 24f, Fonts.SEMIBOLD);
                 if (i != 0)
-                    RenderManager.drawSvg(vg, SVGs.CHEVRON_RIGHT, breadcrumbX - 28, y + 25, 24, 24, color);
+                    RenderManager.drawSvg(vg, SVGs.CARET_RIGHT, breadcrumbX - 28, y + 25, 24, 24, color);
                 if (hovered && InputUtils.isClicked()) openPage(parents.get(i));
                 breadcrumbX += width + 32;
             }
diff --git a/src/main/java/cc/polyfrost/oneconfig/gui/elements/BasicElement.java b/src/main/java/cc/polyfrost/oneconfig/gui/elements/BasicElement.java
index 84ac43c..0e3fe23 100644
--- a/src/main/java/cc/polyfrost/oneconfig/gui/elements/BasicElement.java
+++ b/src/main/java/cc/polyfrost/oneconfig/gui/elements/BasicElement.java
@@ -1,6 +1,7 @@
 package cc.polyfrost.oneconfig.gui.elements;
 
 import cc.polyfrost.oneconfig.gui.animations.ColorAnimation;
+import cc.polyfrost.oneconfig.lwjgl.RenderManager;
 import cc.polyfrost.oneconfig.utils.InputUtils;
 import cc.polyfrost.oneconfig.utils.color.ColorPalette;
 import org.jetbrains.annotations.NotNull;
@@ -41,6 +42,7 @@ public class BasicElement {
 
     public void draw(long vg, int x, int y) {
         this.update(x, y);
+        RenderManager.drawRoundedRect(vg, x, y, width, height, currentColor, radius);
     }
 
     public void update(int x, int y) {
diff --git a/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigPageButton.java b/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigPageButton.java
index ed1f0e0..b464423 100644
--- a/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigPageButton.java
+++ b/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigPageButton.java
@@ -10,7 +10,6 @@ import cc.polyfrost.oneconfig.lwjgl.RenderManager;
 import cc.polyfrost.oneconfig.lwjgl.font.Fonts;
 import cc.polyfrost.oneconfig.lwjgl.image.SVGs;
 import cc.polyfrost.oneconfig.utils.color.ColorPalette;
-import cc.polyfrost.oneconfig.utils.color.ColorUtils;
 import cc.polyfrost.oneconfig.utils.InputUtils;
 import org.lwjgl.input.Mouse;
 
@@ -39,7 +38,7 @@ public class ConfigPageButton extends BasicOption {
         RenderManager.drawText(vg, name, x + 10, y + 32, OneConfigConfig.WHITE_90, 24, Fonts.MEDIUM);
         if (!description.equals(""))
             RenderManager.drawText(vg, name, x + 10, y + 70, OneConfigConfig.WHITE_90, 14, Fonts.MEDIUM);
-        RenderManager.drawSvg(vg, SVGs.CHEVRON_RIGHT, x + 981f, y + (description.equals("") ? 20f : 36f), 13, 22);
+        RenderManager.drawSvg(vg, SVGs.CARET_RIGHT, x + 981f, y + (description.equals("") ? 20f : 36f), 13, 22);
 
         if (clicked) OneConfigGui.INSTANCE.openPage(new ModConfigPage(page));
         RenderManager.setAlpha(vg, 1f);
diff --git a/src/main/java/cc/polyfrost/oneconfig/lwjgl/image/SVGs.java b/src/main/java/cc/polyfrost/oneconfig/lwjgl/image/SVGs.java
index 7e6b06f..28e9f4a 100644
--- a/src/main/java/cc/polyfrost/oneconfig/lwjgl/image/SVGs.java
+++ b/src/main/java/cc/polyfrost/oneconfig/lwjgl/image/SVGs.java
@@ -20,16 +20,14 @@ public enum SVGs {
     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"),
 
     // OLD ICONS
-    ARROW_CIRCLE_LEFT("/assets/oneconfig/old-icons/ArrowCircleLeft.svg"),
-    ARROW_CIRCLE_RIGHT("/assets/oneconfig/old-icons/ArrowCircleRight.svg"),
     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_LEFT("/assets/oneconfig/old-icons/ChevronLeft.svg"),
-    CHEVRON_RIGHT("/assets/oneconfig/old-icons/ChevronRight.svg"),
     CHEVRON_UP("/assets/oneconfig/old-icons/ChevronUp.svg"),
     COPY("/assets/oneconfig/old-icons/Copy.svg"),
     DROPDOWN_LIST("/assets/oneconfig/old-icons/DropdownList.svg"),
diff --git a/src/main/resources/assets/oneconfig/icons/CaretLeftBold.svg b/src/main/resources/assets/oneconfig/icons/CaretLeftBold.svg
new file mode 100644
index 0000000..be4bcc6
--- /dev/null
+++ b/src/main/resources/assets/oneconfig/icons/CaretLeftBold.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256"><path d="M160,220a12.2,12.2,0,0,1-8.5-3.5l-80-80a12,12,0,0,1,0-17l80-80a12,12,0,0,1,17,17L97,128l71.5,71.5a12,12,0,0,1,0,17A12.2,12.2,0,0,1,160,220Z" fill="white"/></svg>
\ No newline at end of file
diff --git a/src/main/resources/assets/oneconfig/icons/CaretRightBold.svg b/src/main/resources/assets/oneconfig/icons/CaretRightBold.svg
new file mode 100644
index 0000000..d920a78
--- /dev/null
+++ b/src/main/resources/assets/oneconfig/icons/CaretRightBold.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256"><path d="M96,220a12.2,12.2,0,0,1-8.5-3.5,12,12,0,0,1,0-17L159,128,87.5,56.5a12,12,0,0,1,17-17l80,80a12,12,0,0,1,0,17l-80,80A12.2,12.2,0,0,1,96,220Z" fill="white"/></svg>
\ No newline at end of file