aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/gui/OneConfigGui.java7
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/gui/SideBar.java88
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/gui/elements/BasicButton.java34
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/gui/elements/ColorSelector.java2
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/gui/pages/CreditsPage.java2
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/gui/pages/HomePage.java12
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/lwjgl/image/SVGs.java156
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/test/TestConfig.java2
-rw-r--r--src/main/java/cc/polyfrost/oneconfig/utils/ColorUtils.java4
-rw-r--r--src/main/resources/assets/oneconfig/icons/ApertureFill.svg1
-rw-r--r--src/main/resources/assets/oneconfig/icons/ArrowsClockwiseBold.svg1
-rw-r--r--src/main/resources/assets/oneconfig/icons/CopyrightFill.svg1
-rw-r--r--src/main/resources/assets/oneconfig/icons/FadersHorizontalBold.svg1
-rw-r--r--src/main/resources/assets/oneconfig/icons/GaugeFill.svg1
-rw-r--r--src/main/resources/assets/oneconfig/icons/GearSixFill.svg1
-rw-r--r--src/main/resources/assets/oneconfig/icons/MagnifyingGlassBold.svg1
-rw-r--r--src/main/resources/assets/oneconfig/icons/NotePencilBold.svg1
-rw-r--r--src/main/resources/assets/oneconfig/icons/PaintBrushBroadFill.svg1
-rw-r--r--src/main/resources/assets/oneconfig/icons/UserSwitchFill.svg1
-rw-r--r--src/main/resources/assets/oneconfig/icons/XCircleBold.svg1
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/AlignHCenter.svg (renamed from src/main/resources/assets/oneconfig/icons/AlignHCenter.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/AlignHLeft.svg (renamed from src/main/resources/assets/oneconfig/icons/AlignHLeft.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/AlignHRight.svg (renamed from src/main/resources/assets/oneconfig/icons/AlignHRight.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/AlignVBottom.svg (renamed from src/main/resources/assets/oneconfig/icons/AlignVBottom.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/AlignVMiddle.svg (renamed from src/main/resources/assets/oneconfig/icons/AlignVMiddle.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/AlignVTop.svg (renamed from src/main/resources/assets/oneconfig/icons/AlignVTop.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/ArrowCircleDown.svg (renamed from src/main/resources/assets/oneconfig/icons/ArrowCircleDown.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/ArrowCircleLeft.svg (renamed from src/main/resources/assets/oneconfig/icons/ArrowCircleLeft.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/ArrowCircleRight.svg (renamed from src/main/resources/assets/oneconfig/icons/ArrowCircleRight.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/ArrowCircleUp.svg (renamed from src/main/resources/assets/oneconfig/icons/ArrowCircleUp.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/ArrowDown.svg (renamed from src/main/resources/assets/oneconfig/icons/ArrowDown.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/ArrowLeft.svg (renamed from src/main/resources/assets/oneconfig/icons/ArrowLeft.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/ArrowRight.svg (renamed from src/main/resources/assets/oneconfig/icons/ArrowRight.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/ArrowUp.svg (renamed from src/main/resources/assets/oneconfig/icons/ArrowUp.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/AudioPause.svg (renamed from src/main/resources/assets/oneconfig/icons/AudioPause.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/AudioPlay.svg (renamed from src/main/resources/assets/oneconfig/icons/AudioPlay.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/AudioPrevious.svg (renamed from src/main/resources/assets/oneconfig/icons/AudioPrevious.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/AudioSkip.svg (renamed from src/main/resources/assets/oneconfig/icons/AudioSkip.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/Backspace.svg (renamed from src/main/resources/assets/oneconfig/icons/Backspace.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/Bell.svg (renamed from src/main/resources/assets/oneconfig/icons/Bell.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/BellOff.svg (renamed from src/main/resources/assets/oneconfig/icons/BellOff.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/Box.svg (renamed from src/main/resources/assets/oneconfig/icons/Box.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/Camera.svg (renamed from src/main/resources/assets/oneconfig/icons/Camera.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/Cart.svg (renamed from src/main/resources/assets/oneconfig/icons/Cart.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/Cash.svg (renamed from src/main/resources/assets/oneconfig/icons/Cash.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/CashDollar.svg (renamed from src/main/resources/assets/oneconfig/icons/CashDollar.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/CheckCircle.svg (renamed from src/main/resources/assets/oneconfig/icons/CheckCircle.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/CheckboxMixed.svg (renamed from src/main/resources/assets/oneconfig/icons/CheckboxMixed.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/CheckboxTick.svg (renamed from src/main/resources/assets/oneconfig/icons/CheckboxTick.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/ChevronDown.svg (renamed from src/main/resources/assets/oneconfig/icons/ChevronDown.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/ChevronLeft.svg (renamed from src/main/resources/assets/oneconfig/icons/ChevronLeft.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/ChevronRight.svg (renamed from src/main/resources/assets/oneconfig/icons/ChevronRight.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/ChevronUp.svg (renamed from src/main/resources/assets/oneconfig/icons/ChevronUp.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/CircleMinus.svg (renamed from src/main/resources/assets/oneconfig/icons/CircleMinus.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/CirclePlus.svg (renamed from src/main/resources/assets/oneconfig/icons/CirclePlus.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/Clock.svg (renamed from src/main/resources/assets/oneconfig/icons/Clock.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/Code.svg (renamed from src/main/resources/assets/oneconfig/icons/Code.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/ComboBoxDown.svg (renamed from src/main/resources/assets/oneconfig/icons/ComboBoxDown.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/ComboBoxUp.svg (renamed from src/main/resources/assets/oneconfig/icons/ComboBoxUp.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/Content.svg (renamed from src/main/resources/assets/oneconfig/icons/Content.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/Copy.svg (renamed from src/main/resources/assets/oneconfig/icons/Copy.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/CreditCard.svg (renamed from src/main/resources/assets/oneconfig/icons/CreditCard.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/CreditCardAdd.svg (renamed from src/main/resources/assets/oneconfig/icons/CreditCardAdd.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/Cube.svg (renamed from src/main/resources/assets/oneconfig/icons/Cube.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/Dashboard.svg (renamed from src/main/resources/assets/oneconfig/icons/Dashboard.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/Delete.svg (renamed from src/main/resources/assets/oneconfig/icons/Delete.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/Dollar.svg (renamed from src/main/resources/assets/oneconfig/icons/Dollar.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/DollarCircle.svg (renamed from src/main/resources/assets/oneconfig/icons/DollarCircle.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/Download.svg (renamed from src/main/resources/assets/oneconfig/icons/Download.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/DropdownList.svg (renamed from src/main/resources/assets/oneconfig/icons/DropdownList.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/Earth.svg (renamed from src/main/resources/assets/oneconfig/icons/Earth.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/Edit.svg (renamed from src/main/resources/assets/oneconfig/icons/Edit.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/Error.svg (renamed from src/main/resources/assets/oneconfig/icons/Error.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/Export.svg (renamed from src/main/resources/assets/oneconfig/icons/Export.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/Eye.svg (renamed from src/main/resources/assets/oneconfig/icons/Eye.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/EyeOff.svg (renamed from src/main/resources/assets/oneconfig/icons/EyeOff.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/FabricLoader.svg (renamed from src/main/resources/assets/oneconfig/icons/FabricLoader.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/File.svg (renamed from src/main/resources/assets/oneconfig/icons/File.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/Filter.svg (renamed from src/main/resources/assets/oneconfig/icons/Filter.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/Folder.svg (renamed from src/main/resources/assets/oneconfig/icons/Folder.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/ForgeLoader.svg (renamed from src/main/resources/assets/oneconfig/icons/ForgeLoader.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/HUD.svg (renamed from src/main/resources/assets/oneconfig/icons/HUD.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/HUDSettings.svg (renamed from src/main/resources/assets/oneconfig/icons/HUDSettings.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/Hamburger.svg (renamed from src/main/resources/assets/oneconfig/icons/Hamburger.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/HeartBroken.svg (renamed from src/main/resources/assets/oneconfig/icons/HeartBroken.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/HeartFill.svg (renamed from src/main/resources/assets/oneconfig/icons/HeartFill.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/HeartOutline.svg (renamed from src/main/resources/assets/oneconfig/icons/HeartOutline.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/HelpCircle.svg (renamed from src/main/resources/assets/oneconfig/icons/HelpCircle.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/History.svg (renamed from src/main/resources/assets/oneconfig/icons/History.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/Home.svg (renamed from src/main/resources/assets/oneconfig/icons/Home.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/Image.svg (renamed from src/main/resources/assets/oneconfig/icons/Image.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/InfoCircle.svg (renamed from src/main/resources/assets/oneconfig/icons/InfoCircle.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/ItemLinkBroke.svg (renamed from src/main/resources/assets/oneconfig/icons/ItemLinkBroke.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/ItemLinked.svg (renamed from src/main/resources/assets/oneconfig/icons/ItemLinked.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/Keystroke.svg (renamed from src/main/resources/assets/oneconfig/icons/Keystroke.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/LaunchProfiles.svg (renamed from src/main/resources/assets/oneconfig/icons/LaunchProfiles.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/LinkDiagonal.svg (renamed from src/main/resources/assets/oneconfig/icons/LinkDiagonal.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/LinkHorizontal.svg (renamed from src/main/resources/assets/oneconfig/icons/LinkHorizontal.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/Loading.svg (renamed from src/main/resources/assets/oneconfig/icons/Loading.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/LocationPoint.svg (renamed from src/main/resources/assets/oneconfig/icons/LocationPoint.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/Maximise.svg (renamed from src/main/resources/assets/oneconfig/icons/Maximise.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/Mic.svg (renamed from src/main/resources/assets/oneconfig/icons/Mic.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/MicOff.svg (renamed from src/main/resources/assets/oneconfig/icons/MicOff.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/MicrosoftIcon.svg (renamed from src/main/resources/assets/oneconfig/icons/MicrosoftIcon.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/Minimise.svg (renamed from src/main/resources/assets/oneconfig/icons/Minimise.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/Mods.svg (renamed from src/main/resources/assets/oneconfig/icons/Mods.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/Move.svg (renamed from src/main/resources/assets/oneconfig/icons/Move.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/Navigation.svg (renamed from src/main/resources/assets/oneconfig/icons/Navigation.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/Paste.svg (renamed from src/main/resources/assets/oneconfig/icons/Paste.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/Performance.svg (renamed from src/main/resources/assets/oneconfig/icons/Performance.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/PopOut.svg (renamed from src/main/resources/assets/oneconfig/icons/PopOut.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/Profiles.svg (renamed from src/main/resources/assets/oneconfig/icons/Profiles.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/Reset.svg (renamed from src/main/resources/assets/oneconfig/icons/Reset.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/Save.svg (renamed from src/main/resources/assets/oneconfig/icons/Save.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/Search.svg (renamed from src/main/resources/assets/oneconfig/icons/Search.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/Send.svg (renamed from src/main/resources/assets/oneconfig/icons/Send.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/Settings.svg (renamed from src/main/resources/assets/oneconfig/icons/Settings.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/ShapeCircle.svg (renamed from src/main/resources/assets/oneconfig/icons/ShapeCircle.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/ShapeDot.svg (renamed from src/main/resources/assets/oneconfig/icons/ShapeDot.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/ShapeHexagon.svg (renamed from src/main/resources/assets/oneconfig/icons/ShapeHexagon.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/ShapePentagon.svg (renamed from src/main/resources/assets/oneconfig/icons/ShapePentagon.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/ShapeSquare.svg (renamed from src/main/resources/assets/oneconfig/icons/ShapeSquare.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/ShapeTriangle.svg (renamed from src/main/resources/assets/oneconfig/icons/ShapeTriangle.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/Share.svg (renamed from src/main/resources/assets/oneconfig/icons/Share.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/ShoppingBag.svg (renamed from src/main/resources/assets/oneconfig/icons/ShoppingBag.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/Spacing.svg (renamed from src/main/resources/assets/oneconfig/icons/Spacing.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/Theme.svg (renamed from src/main/resources/assets/oneconfig/icons/Theme.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/ThumbsDown.svg (renamed from src/main/resources/assets/oneconfig/icons/ThumbsDown.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/ThumbsUp.svg (renamed from src/main/resources/assets/oneconfig/icons/ThumbsUp.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/Update.svg (renamed from src/main/resources/assets/oneconfig/icons/Update.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/VolumeHigh.svg (renamed from src/main/resources/assets/oneconfig/icons/VolumeHigh.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/VolumeMedium.svg (renamed from src/main/resources/assets/oneconfig/icons/VolumeMedium.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/VolumeMinus.svg (renamed from src/main/resources/assets/oneconfig/icons/VolumeMinus.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/VolumeMute.svg (renamed from src/main/resources/assets/oneconfig/icons/VolumeMute.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/VolumeNone.svg (renamed from src/main/resources/assets/oneconfig/icons/VolumeNone.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/VolumeOff.svg (renamed from src/main/resources/assets/oneconfig/icons/VolumeOff.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/VolumePlus.svg (renamed from src/main/resources/assets/oneconfig/icons/VolumePlus.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/Warning.svg (renamed from src/main/resources/assets/oneconfig/icons/Warning.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/Website.svg (renamed from src/main/resources/assets/oneconfig/icons/Website.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/XCircle.svg (renamed from src/main/resources/assets/oneconfig/icons/XCircle.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/XCross.svg (renamed from src/main/resources/assets/oneconfig/icons/XCross.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/ZoomIn.svg (renamed from src/main/resources/assets/oneconfig/icons/ZoomIn.svg)0
-rw-r--r--src/main/resources/assets/oneconfig/old-icons/ZoomOut.svg (renamed from src/main/resources/assets/oneconfig/icons/ZoomOut.svg)0
143 files changed, 109 insertions, 209 deletions
diff --git a/src/main/java/cc/polyfrost/oneconfig/gui/OneConfigGui.java b/src/main/java/cc/polyfrost/oneconfig/gui/OneConfigGui.java
index 75e6750..be473f9 100644
--- a/src/main/java/cc/polyfrost/oneconfig/gui/OneConfigGui.java
+++ b/src/main/java/cc/polyfrost/oneconfig/gui/OneConfigGui.java
@@ -6,6 +6,7 @@ import cc.polyfrost.oneconfig.gui.elements.BasicElement;
import cc.polyfrost.oneconfig.gui.elements.ColorSelector;
import cc.polyfrost.oneconfig.gui.elements.text.TextInputField;
import cc.polyfrost.oneconfig.gui.pages.HomePage;
+import cc.polyfrost.oneconfig.gui.pages.ModsPage;
import cc.polyfrost.oneconfig.gui.pages.Page;
import cc.polyfrost.oneconfig.libs.universal.*;
import cc.polyfrost.oneconfig.lwjgl.RenderManager;
@@ -26,7 +27,7 @@ public class OneConfigGui extends UScreen {
protected Page currentPage;
protected Page prevPage;
private float pageProgress = -224f;
- private final TextInputField textInputField = new TextInputField(248, 40, "Search...", false, false, SVGs.SEARCH);
+ 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<>();
private final BasicElement backArrow = new BasicElement(40, 40, -1, false);
@@ -68,7 +69,7 @@ public class OneConfigGui extends UScreen {
int y2 = 0;
RenderManager.setupAndDraw((vg) -> {
if (currentPage == null) {
- currentPage = new HomePage();
+ currentPage = new ModsPage();
parents.add(currentPage);
}
if (time == -1) time = UMinecraft.getTime();
@@ -94,7 +95,7 @@ public class OneConfigGui extends UScreen {
RenderManager.drawSvg(vg, SVGs.ONECONFIG, x + 19, y + 19, 42, 42);
RenderManager.drawText(vg, "OneConfig", x + 69, y + 32, OneConfigConfig.WHITE, 18f, Fonts.BOLD); // added half line height to center text
- RenderManager.drawText(vg, "ALPHA - By Polyfrost", x + 69, y + 51, OneConfigConfig.WHITE, 12f, Fonts.REGULAR);
+ RenderManager.drawText(vg, "By Polyfrost", x + 69, y + 51, OneConfigConfig.WHITE, 12f, Fonts.REGULAR);
textInputField.draw(vg, x + 1020, y + 16);
sideBar.draw(vg, x, y);
diff --git a/src/main/java/cc/polyfrost/oneconfig/gui/SideBar.java b/src/main/java/cc/polyfrost/oneconfig/gui/SideBar.java
index a17076b..6f474c7 100644
--- a/src/main/java/cc/polyfrost/oneconfig/gui/SideBar.java
+++ b/src/main/java/cc/polyfrost/oneconfig/gui/SideBar.java
@@ -1,77 +1,51 @@
package cc.polyfrost.oneconfig.gui;
-import cc.polyfrost.oneconfig.config.OneConfigConfig;
import cc.polyfrost.oneconfig.gui.elements.BasicButton;
-import cc.polyfrost.oneconfig.gui.pages.HomePage;
+import cc.polyfrost.oneconfig.gui.pages.CreditsPage;
import cc.polyfrost.oneconfig.gui.pages.ModsPage;
-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.ColorUtils;
import cc.polyfrost.oneconfig.utils.GuiUtils;
-import cc.polyfrost.oneconfig.utils.MathUtils;
import java.util.ArrayList;
-import java.util.List;
import static cc.polyfrost.oneconfig.gui.elements.BasicButton.ALIGNMENT_LEFT;
import static cc.polyfrost.oneconfig.gui.elements.BasicButton.SIZE_36;
+import static cc.polyfrost.oneconfig.utils.ColorUtils.*;
public class SideBar {
- private final List<BasicButton> btnList = new ArrayList<>();
-
- private float targetY = 0, currentY = 0;
+ private final ArrayList<BasicButton> buttons = new ArrayList<BasicButton>() {{
+ add(new BasicButton(192, SIZE_36, "Credits", SVGs.COPYRIGHT_FILL, null, ALIGNMENT_LEFT, TERTIARY));
+ add(new BasicButton(192, SIZE_36, "Global Search", SVGs.MAGNIFYING_GLASS_BOLD, null, ALIGNMENT_LEFT, TERTIARY));
+ add(new BasicButton(192, SIZE_36, "Mods", SVGs.FADERS_HORIZONTAL_BOLD, null, ALIGNMENT_LEFT, PRIMARY));
+ add(new BasicButton(192, SIZE_36, "Profiles", SVGs.USER_SWITCH_FILL, null, ALIGNMENT_LEFT, TERTIARY));
+ add(new BasicButton(192, SIZE_36, "Performance", SVGs.GAUGE_FILL, null, ALIGNMENT_LEFT, TERTIARY));
+ add(new BasicButton(192, SIZE_36, "Updates", SVGs.ARROWS_CLOCKWISE_BOLD, null, ALIGNMENT_LEFT, TERTIARY));
+ add(new BasicButton(192, SIZE_36, "Themes", SVGs.PAINT_BRUSH_BROAD_FILL, null, ALIGNMENT_LEFT, TERTIARY));
+ add(new BasicButton(192, SIZE_36, "Screenshots", SVGs.APERTURE_FILL, null, ALIGNMENT_LEFT, TERTIARY));
+ add(new BasicButton(192, SIZE_36, "Preferences", SVGs.GEAR_SIX_FILL, null, ALIGNMENT_LEFT, TERTIARY));
+ }};
+ private final BasicButton HUDButton = new BasicButton(192, SIZE_36, "Edit HUD", SVGs.NOTE_PENCIL_BOLD, null, ALIGNMENT_LEFT, SECONDARY);
+ private final BasicButton CloseButton = new BasicButton(192, SIZE_36, "Close", SVGs.X_CIRCLE_BOLD, null, ALIGNMENT_LEFT, SECONDARY_DESTRUCTIVE);
public SideBar() {
- btnList.add(new BasicButton(192, SIZE_36, "Dashboard", SVGs.DASHBOARD, null, ALIGNMENT_LEFT, ColorUtils.TERTIARY));
- btnList.get(0).setClickAction(new HomePage());
- btnList.add(new BasicButton(192, SIZE_36, "Global Search", SVGs.SEARCH, null, ALIGNMENT_LEFT, ColorUtils.TERTIARY));
- btnList.add(new BasicButton(192, SIZE_36, "Screenshots", SVGs.IMAGE, null, ALIGNMENT_LEFT, ColorUtils.TERTIARY));
- btnList.add(new BasicButton(192, SIZE_36, "Preferences", SVGs.SETTINGS, null, ALIGNMENT_LEFT, ColorUtils.TERTIARY));
- btnList.add(new BasicButton(192, 36, "Mods", SVGs.MODS, null, ALIGNMENT_LEFT, ColorUtils.TERTIARY));
- btnList.get(4).setClickAction(new ModsPage());
- btnList.add(new BasicButton(192, SIZE_36, "Performance", SVGs.PERFORMANCE, null, ALIGNMENT_LEFT, ColorUtils.TERTIARY));
- btnList.add(new BasicButton(192, SIZE_36, "Profiles", SVGs.PROFILES, null, ALIGNMENT_LEFT, ColorUtils.TERTIARY));
- btnList.add(new BasicButton(192, SIZE_36, "Updates", SVGs.UPDATE, null, ALIGNMENT_LEFT, ColorUtils.TERTIARY));
- btnList.add(new BasicButton(192, SIZE_36, "Themes Library", SVGs.THEME, null, ALIGNMENT_LEFT, ColorUtils.TERTIARY));
- btnList.add(new BasicButton(192, SIZE_36, "Themes Browser", SVGs.SEARCH, null, ALIGNMENT_LEFT, ColorUtils.TERTIARY));
- btnList.add(new BasicButton(192, SIZE_36, "Packs Library", SVGs.BOX, null, ALIGNMENT_LEFT, ColorUtils.TERTIARY));
- btnList.add(new BasicButton(192, SIZE_36, "Packs Browser", SVGs.SEARCH, null, ALIGNMENT_LEFT, ColorUtils.TERTIARY));
- btnList.add(new BasicButton(192, SIZE_36, "Close", SVGs.X_CIRCLE, null, ALIGNMENT_LEFT, ColorUtils.SECONDARY_TRANSPARENT));
- btnList.get(12).setClickAction(() -> GuiUtils.displayScreen(null));
- btnList.add(new BasicButton(192, SIZE_36, "Minimize", SVGs.MINIMISE, null, ALIGNMENT_LEFT, ColorUtils.SECONDARY_TRANSPARENT));
- btnList.get(13).setClickAction(() -> GuiUtils.displayScreen(null));
- btnList.add(new BasicButton(192, SIZE_36, "Edit HUD", SVGs.HUD, null, ALIGNMENT_LEFT, ColorUtils.SECONDARY_TRANSPARENT));
- btnList.get(14).setClickAction(() -> GuiUtils.displayScreen(new HudGui()));
+ buttons.get(0).setClickAction(new CreditsPage());
+ buttons.get(2).setClickAction(new ModsPage());
+ HUDButton.setClickAction(() -> GuiUtils.displayScreen(new HudGui()));
+ CloseButton.setClickAction(GuiUtils::closeScreen);
+ for (BasicButton button : buttons) button.setToggleable(true);
}
public void draw(long vg, int x, int y) {
- currentY = MathUtils.easeInOutCirc(50, currentY, targetY - currentY, 400);
- RenderManager.drawRoundedRect(vg, x + 16, y + currentY, 192, 36, OneConfigConfig.PRIMARY_600, OneConfigConfig.CORNER_RADIUS);
- int i = 0;
- if (targetY == 0) {
- targetY = 96;
- currentY = targetY;
- }
- for (BasicButton btn : btnList) {
- btn.draw(vg, x + 16, y + 96 + i);
- if (i >= 562) i += 44;
- else i += 36;
- if (i == 144) {
- RenderManager.drawText(vg, "MOD CONFIG", x + 16, y + 266, OneConfigConfig.WHITE_80, 12f, Fonts.SEMIBOLD);
- i = 180;
- }
- if (i == 324) {
- RenderManager.drawText(vg, "PERSONALIZATION", x + 16, y + 446, OneConfigConfig.WHITE_80, 12f, Fonts.SEMIBOLD);
- i = 360;
- }
- if (i == 504) {
- i = 562;
- }
-
- if (btn.isClicked() && btn.getPage() != null) {
- if (i < 520) targetY = btn.y - y;
- }
- }
+ buttons.get(0).draw(vg, x + 16, y + 80);
+ buttons.get(1).draw(vg, x + 16, y + 116);
+ buttons.get(2).draw(vg, x + 16, y + 192);
+ buttons.get(3).draw(vg, x + 16, y + 228);
+ buttons.get(4).draw(vg, x + 16, y + 264);
+ buttons.get(5).draw(vg, x + 16, y + 300);
+ buttons.get(6).draw(vg, x + 16, y + 376);
+ buttons.get(7).draw(vg, x + 16, y + 412);
+ buttons.get(8).draw(vg, x + 16, y + 448);
+ HUDButton.draw(vg, x + 16, y + 704);
+ CloseButton.draw(vg, x + 16, y + 748);
}
}
diff --git a/src/main/java/cc/polyfrost/oneconfig/gui/elements/BasicButton.java b/src/main/java/cc/polyfrost/oneconfig/gui/elements/BasicButton.java
index f97cde2..c2bda06 100644
--- a/src/main/java/cc/polyfrost/oneconfig/gui/elements/BasicButton.java
+++ b/src/main/java/cc/polyfrost/oneconfig/gui/elements/BasicButton.java
@@ -75,16 +75,16 @@ public class BasicButton extends BasicElement {
this.y = y;
RenderManager.drawRoundedRect(vg, x, y, this.width, this.height, currentColor, this.cornerRadius);
float contentWidth = 0f;
- int textColor = -1;
+ int color = -1;
final float middle = x + width / 2f;
final float middleYIcon = y + height / 2f - iconSize / 2f;
final float middleYText = y + height / 2f + fontSize / 8f;
if (this.text != null) {
if (this.colorPalette == ColorUtils.TERTIARY) {
- textColor = OneConfigConfig.WHITE_80;
- if (hovered) textColor = OneConfigConfig.WHITE;
- if (clicked) textColor = OneConfigConfig.WHITE_80;
- if (page == null) textColor = OneConfigConfig.WHITE_50;
+ color = OneConfigConfig.WHITE_80;
+ if (hovered) color = OneConfigConfig.WHITE;
+ if (clicked) color = OneConfigConfig.WHITE_80;
+ if (page == null) color = OneConfigConfig.WHITE_50;
}
contentWidth += RenderManager.getTextWidth(vg, text, fontSize, Fonts.MEDIUM);
}
@@ -101,48 +101,48 @@ public class BasicButton extends BasicElement {
contentWidth += iconSize + xSpacing;
}
if (text != null) {
- RenderManager.drawText(vg, text, middle - contentWidth / 2 + (icon1 == null ? 0 : iconSize + xSpacing), middleYText, textColor, fontSize, Fonts.MEDIUM);
+ RenderManager.drawText(vg, text, middle - contentWidth / 2 + (icon1 == null ? 0 : iconSize + xSpacing), middleYText, color, fontSize, Fonts.MEDIUM);
}
if (icon1 != null) {
- RenderManager.drawSvg(vg, icon1, middle - contentWidth / 2, middleYIcon, iconSize, iconSize);
+ RenderManager.drawSvg(vg, icon1, middle - contentWidth / 2, middleYIcon, iconSize, iconSize, color);
}
if (icon2 != null) {
- RenderManager.drawSvg(vg, icon2, middle + contentWidth / 2 - iconSize, middleYIcon, iconSize, iconSize);
+ RenderManager.drawSvg(vg, icon2, middle + contentWidth / 2 - iconSize, middleYIcon, iconSize, iconSize, color);
}
this.update(x, y);
return;
}
if (alignment == ALIGNMENT_JUSTIFIED) {
if (text != null) {
- RenderManager.drawText(vg, text, middle - contentWidth / 2, middleYText, textColor, fontSize, Fonts.MEDIUM);
+ RenderManager.drawText(vg, text, middle - contentWidth / 2, middleYText, color, fontSize, Fonts.MEDIUM);
}
if (icon1 != null) {
- RenderManager.drawSvg(vg, icon1, x + xSpacing, middleYIcon, iconSize, iconSize);
+ RenderManager.drawSvg(vg, icon1, x + xSpacing, middleYIcon, iconSize, iconSize, color);
}
if (icon2 != null) {
- RenderManager.drawSvg(vg, icon2, x + width - xSpacing - iconSize, middleYIcon, iconSize, iconSize);
+ RenderManager.drawSvg(vg, icon2, x + width - xSpacing - iconSize, middleYIcon, iconSize, iconSize, color);
}
this.update(x, y);
return;
}
if (alignment == ALIGNMENT_LEFT) {
- contentWidth = xSpacing;
+ contentWidth = xPadding;
if (icon1 != null) {
- RenderManager.drawSvg(vg, icon1, x + contentWidth, middleYIcon, iconSize, iconSize);
+ RenderManager.drawSvg(vg, icon1, x + contentWidth, middleYIcon, iconSize, iconSize, color);
contentWidth += iconSize + xSpacing;
}
if (text != null) {
- RenderManager.drawText(vg, text, x + contentWidth, middleYText, textColor, fontSize, Fonts.MEDIUM);
+ RenderManager.drawText(vg, text, x + contentWidth, middleYText, color, fontSize, Fonts.MEDIUM);
contentWidth += RenderManager.getTextWidth(vg, text, fontSize, Fonts.MEDIUM) + xSpacing;
}
if (icon2 != null) {
- RenderManager.drawSvg(vg, icon2, x + contentWidth, middleYIcon, iconSize, iconSize);
+ RenderManager.drawSvg(vg, icon2, x + contentWidth, middleYIcon, iconSize, iconSize, color);
}
this.update(x, y);
return;
}
if (alignment == ALIGNMENT_RIGHT) {
- contentWidth = width - xSpacing;
+ contentWidth = width - xPadding;
if (icon2 != null) {
contentWidth -= iconSize;
RenderManager.drawSvg(vg, icon2, x + contentWidth, middleYIcon, iconSize, iconSize);
@@ -150,7 +150,7 @@ public class BasicButton extends BasicElement {
}
if (text != null) {
contentWidth -= RenderManager.getTextWidth(vg, text, fontSize, Fonts.MEDIUM);
- RenderManager.drawText(vg, text, x + contentWidth, middleYText, textColor, fontSize, Fonts.MEDIUM);
+ RenderManager.drawText(vg, text, x + contentWidth, middleYText, color, fontSize, Fonts.MEDIUM);
contentWidth -= xSpacing;
}
if (icon1 != null) {
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 db97d5f..edd145e 100644
--- a/src/main/java/cc/polyfrost/oneconfig/gui/elements/ColorSelector.java
+++ b/src/main/java/cc/polyfrost/oneconfig/gui/elements/ColorSelector.java
@@ -106,7 +106,7 @@ public class ColorSelector {
RenderManager.drawText(vg, "Color Selector", x + 16, y + 32, OneConfigConfig.WHITE_90, 18f, Fonts.SEMIBOLD);
if (!closeBtn.isHovered()) RenderManager.setAlpha(vg, 0.8f);
closeBtn.draw(vg, x + 368, y + 16);
- RenderManager.drawSvg(vg, SVGs.X_CIRCLE, x + 368, y + 16, 32, 32, closeBtn.isHovered() ? OneConfigConfig.ERROR_600 : -1);
+ RenderManager.drawSvg(vg, SVGs.X_CIRCLE_BOLD, x + 368, y + 16, 32, 32, closeBtn.isHovered() ? OneConfigConfig.ERROR_600 : -1);
RenderManager.setAlpha(vg, 1f);
// hex parser
diff --git a/src/main/java/cc/polyfrost/oneconfig/gui/pages/CreditsPage.java b/src/main/java/cc/polyfrost/oneconfig/gui/pages/CreditsPage.java
index 0bb94aa..218939c 100644
--- a/src/main/java/cc/polyfrost/oneconfig/gui/pages/CreditsPage.java
+++ b/src/main/java/cc/polyfrost/oneconfig/gui/pages/CreditsPage.java
@@ -5,7 +5,7 @@ import cc.polyfrost.oneconfig.lwjgl.font.Fonts;
import cc.polyfrost.oneconfig.lwjgl.image.SVGs;
public class CreditsPage extends Page {
- CreditsPage() {
+ public CreditsPage() {
super("Credits");
}
diff --git a/src/main/java/cc/polyfrost/oneconfig/gui/pages/HomePage.java b/src/main/java/cc/polyfrost/oneconfig/gui/pages/HomePage.java
index fd6e8fe..3e15e83 100644
--- a/src/main/java/cc/polyfrost/oneconfig/gui/pages/HomePage.java
+++ b/src/main/java/cc/polyfrost/oneconfig/gui/pages/HomePage.java
@@ -15,7 +15,7 @@ import cc.polyfrost.oneconfig.utils.NetworkUtils;
import java.awt.*;
public class HomePage extends Page {
- private final BasicButton socialsBtn = new BasicButton(184, 36, "Socials", SVGs.SHARE, SVGs.POP_OUT, BasicButton.ALIGNMENT_CENTER, ColorUtils.PRIMARY);
+ /*private final BasicButton socialsBtn = new BasicButton(184, 36, "Socials", SVGs.SHARE, SVGs.POP_OUT, BasicButton.ALIGNMENT_CENTER, ColorUtils.PRIMARY);
private final BasicButton discordBtn = new BasicButton(184, 36, "Discord", SVGs.WEBSITE, SVGs.LINK_DIAGONAL, BasicButton.ALIGNMENT_CENTER, ColorUtils.PRIMARY);
private final BasicButton webBtn = new BasicButton(184, 36, "Website", SVGs.WEBSITE, null, BasicButton.ALIGNMENT_CENTER, ColorUtils.PRIMARY);
private final BasicButton creditsBtn = new BasicButton(184, 36, "Credits", SVGs.AUDIO_PLAY, SVGs.LINK_DIAGONAL, BasicButton.ALIGNMENT_CENTER, ColorUtils.SECONDARY);
@@ -27,16 +27,16 @@ public class HomePage extends Page {
private final BasicButton button5 = new BasicButton(184, BasicButton.SIZE_36, "dhwuai", SVGs.MICROSOFT_ICON, SVGs.AUDIO_PLAY, BasicButton.ALIGNMENT_JUSTIFIED, 1);
private final BasicButton button6 = new BasicButton(184, BasicButton.SIZE_32, "yes", SVGs.MICROSOFT_ICON, SVGs.AUDIO_PLAY, BasicButton.ALIGNMENT_RIGHT, 1);
private final BasicButton button7 = new BasicButton(184, BasicButton.SIZE_32, "HELLO", SVGs.MICROSOFT_ICON, SVGs.AUDIO_PLAY, BasicButton.ALIGNMENT_CENTER, 1);
- private final BasicButton button8 = new BasicButton(184, BasicButton.SIZE_40, "HELLO", SVGs.MICROSOFT_ICON, SVGs.AUDIO_PLAY, BasicButton.ALIGNMENT_CENTER, ColorUtils.SECONDARY_DESTRUCTIVE);
+ private final BasicButton button8 = new BasicButton(184, BasicButton.SIZE_40, "HELLO", SVGs.MICROSOFT_ICON, SVGs.AUDIO_PLAY, BasicButton.ALIGNMENT_CENTER, ColorUtils.SECONDARY_DESTRUCTIVE);*/
public HomePage() {
super("Home Dashboard");
- socialsBtn.setClickAction(() -> NetworkUtils.browseLink("https://twitter.com/polyfrost"));
+ /*socialsBtn.setClickAction(() -> NetworkUtils.browseLink("https://twitter.com/polyfrost"));
discordBtn.setClickAction(() -> NetworkUtils.browseLink("https://discord.gg/4BdUuGpMdf"));
webBtn.setClickAction(() -> NetworkUtils.browseLink("https://polyfrost.cc"));
creditsBtn.setClickAction(new CreditsPage());
- guideBtn.setClickAction(() -> NetworkUtils.browseLink("https://www.youtube.com/watch?v=dQw4w9WgXcQ"));
+ guideBtn.setClickAction(() -> NetworkUtils.browseLink("https://www.youtube.com/watch?v=dQw4w9WgXcQ"));*/
}
@@ -50,7 +50,7 @@ public class HomePage extends Page {
RenderManager.drawURL(vg, "https://www.youtube.com/watch?v=dQw4w9WgXcQ", x + 100, y + 205, 24, Fonts.MEDIUM);
- discordBtn.draw(vg, x + 32, y + 658);
+ /*discordBtn.draw(vg, x + 32, y + 658);
webBtn.draw(vg, x + 232, y + 658);
socialsBtn.draw(vg, x + 432, y + 658);
creditsBtn.draw(vg, x + 632, y + 658);
@@ -66,7 +66,7 @@ public class HomePage extends Page {
button5.draw(vg, x + 100, y + 600);
button6.draw(vg, x + 350, y + 100);
button7.draw(vg, x + 350, y + 300);
- button8.draw(vg, x + 350, y + 450);
+ button8.draw(vg, x + 350, y + 450);*/
}
@Override
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 76c93a4..7e6b06f 100644
--- a/src/main/java/cc/polyfrost/oneconfig/lwjgl/image/SVGs.java
+++ b/src/main/java/cc/polyfrost/oneconfig/lwjgl/image/SVGs.java
@@ -7,128 +7,44 @@ package cc.polyfrost.oneconfig.lwjgl.image;
* @see ImageLoader
*/
public enum SVGs {
- ALIGN_H_CENTER("/assets/oneconfig/icons/AlignHCenter.svg"),
- ALIGN_H_LEFT("/assets/oneconfig/icons/AlignHLeft.svg"),
- ALIGN_H_RIGHT("/assets/oneconfig/icons/AlignHRight.svg"),
- ALIGN_V_BOTTOM("/assets/oneconfig/icons/AlignVBottom.svg"),
- ALIGN_V_MIDDLE("/assets/oneconfig/icons/AlignVMiddle.svg"),
- ALIGN_V_TOP("/assets/oneconfig/icons/AlignVTop.svg"),
- ARROW_CIRCLE_DOWN("/assets/oneconfig/icons/ArrowCircleDown.svg"),
- ARROW_CIRCLE_LEFT("/assets/oneconfig/icons/ArrowCircleLeft.svg"),
- ARROW_CIRCLE_RIGHT("/assets/oneconfig/icons/ArrowCircleRight.svg"),
- ARROW_CIRCLE_UP("/assets/oneconfig/icons/ArrowCircleUp.svg"),
- ARROW_DOWN("/assets/oneconfig/icons/ArrowDown.svg"),
- ARROW_LEFT("/assets/oneconfig/icons/ArrowLeft.svg"),
- ARROW_RIGHT("/assets/oneconfig/icons/ArrowRight.svg"),
- ARROW_UP("/assets/oneconfig/icons/ArrowUp.svg"),
- AUDIO_PAUSE("/assets/oneconfig/icons/AudioPause.svg"),
- AUDIO_PLAY("/assets/oneconfig/icons/AudioPlay.svg"),
- AUDIO_PREVIOUS("/assets/oneconfig/icons/AudioPrevious.svg"),
- AUDIO_SKIP("/assets/oneconfig/icons/AudioSkip.svg"),
- BELL("/assets/oneconfig/icons/Bell.svg"),
- BELL_OFF("/assets/oneconfig/icons/BellOff.svg"),
- BOX("/assets/oneconfig/icons/Box.svg"),
- CAMERA("/assets/oneconfig/icons/Camera.svg"),
- CART("/assets/oneconfig/icons/Cart.svg"),
- CASH("/assets/oneconfig/icons/Cash.svg"),
- CASH_DOLLAR("/assets/oneconfig/icons/CashDollar.svg"),
- CHECKBOX_MIXED("/assets/oneconfig/icons/CheckboxMixed.svg"),
- CHECKBOX_TICK("/assets/oneconfig/icons/CheckboxTick.svg"),
- CHECK_CIRCLE("/assets/oneconfig/icons/CheckCircle.svg"),
- CHEVRON_DOWN("/assets/oneconfig/icons/ChevronDown.svg"),
- CHEVRON_LEFT("/assets/oneconfig/icons/ChevronLeft.svg"),
- CHEVRON_RIGHT("/assets/oneconfig/icons/ChevronRight.svg"),
- CHEVRON_UP("/assets/oneconfig/icons/ChevronUp.svg"),
- CLOCK("/assets/oneconfig/icons/Clock.svg"),
- CODE("/assets/oneconfig/icons/Code.svg"),
- COMBO_BOX_UP("/assets/oneconfig/icons/ComboBoxUp.svg"),
- COMBO_BOX_DOWN("/assets/oneconfig/icons/ComboBoxDown.svg"),
- CONTENT("/assets/oneconfig/icons/Content.svg"),
- COPY("/assets/oneconfig/icons/Copy.svg"),
- CREDIT_CARD("/assets/oneconfig/icons/CreditCard.svg"),
- CREDIT_CARD_ADD("/assets/oneconfig/icons/CreditCardAdd.svg"),
- CUBE("/assets/oneconfig/icons/Cube.svg"),
- DASHBOARD("/assets/oneconfig/icons/Dashboard.svg"),
- DELETE("/assets/oneconfig/icons/Delete.svg"),
- DOLLAR("/assets/oneconfig/icons/Dollar.svg"),
- DOLLAR_CIRCLE("/assets/oneconfig/icons/DollarCircle.svg"),
- DROPDOWN_LIST("/assets/oneconfig/icons/DropdownList.svg"), // TODO: old usage is DROPDOWN_ARROW, needs some work from developer side
- EARTH("/assets/oneconfig/icons/Earth.svg"),
- EDIT("/assets/oneconfig/icons/Edit.svg"),
- ERROR("/assets/oneconfig/icons/Error.svg"),
- EXPORT("/assets/oneconfig/icons/Export.svg"),
- EYE("/assets/oneconfig/icons/Eye.svg"),
- EYE_OFF("/assets/oneconfig/icons/EyeOff.svg"),
- FABRIC_LOADER("/assets/oneconfig/icons/FabricLoader.svg"),
- FILE("/assets/oneconfig/icons/File.svg"),
- FILTER("/assets/oneconfig/icons/Filter.svg"),
- FOLDER("/assets/oneconfig/icons/Folder.svg"),
- FORGE_LOADER("/assets/oneconfig/icons/ForgeLoader.svg"),
- HAMBURGER("/assets/oneconfig/icons/Hamburger.svg"),
- HEART_BROKEN("/assets/oneconfig/icons/HeartBroken.svg"),
- HEART_FILL("/assets/oneconfig/icons/HeartFill.svg"),
- HEART_OUTLINE("/assets/oneconfig/icons/HeartOutline.svg"),
- HELP_CIRCLE("/assets/oneconfig/icons/HelpCircle.svg"),
- HISTORY("/assets/oneconfig/icons/History.svg"),
- HOME("/assets/oneconfig/icons/Home.svg"),
- HUD("/assets/oneconfig/icons/HUD.svg"),
- HUD_SETTINGS("/assets/oneconfig/icons/HUDSettings.svg"),
- IMAGE("/assets/oneconfig/icons/Image.svg"),
- INFO_CIRCLE("/assets/oneconfig/icons/InfoCircle.svg"),
- ITEM_LINK_BROKE("/assets/oneconfig/icons/ItemLinkBroke.svg"),
- ITEM_LINKED("/assets/oneconfig/icons/ItemLinked.svg"),
- KEYSTROKE("/assets/oneconfig/icons/Keystroke.svg"),
- LAUNCH_PROFILES("/assets/oneconfig/icons/LaunchProfiles.svg"),
- LINK_DIAGONAL("/assets/oneconfig/icons/LinkDiagonal.svg"),
- LINK_HORIZONTAL("/assets/oneconfig/icons/LinkHorizontal.svg"),
- LOCATION_POINT("/assets/oneconfig/icons/LocationPoint.svg"),
- MAXIMISE("/assets/oneconfig/icons/Maximise.svg"),
- MIC("/assets/oneconfig/icons/Mic.svg"),
- MIC_OFF("/assets/oneconfig/icons/MicOff.svg"),
- MICROSOFT_ICON("/assets/oneconfig/icons/MicrosoftIcon.svg"),
- MINIMISE("/assets/oneconfig/icons/Minimise.svg"),
- MINUS_CIRCLE("/assets/oneconfig/icons/MinusCircle.svg"),
- MODS("/assets/oneconfig/icons/Mods.svg"),
- MOVE("/assets/oneconfig/icons/Move.svg"),
- NAVIGATION("/assets/oneconfig/icons/Navigation.svg"),
ONECONFIG("/assets/oneconfig/icons/OneConfig.svg"),
ONECONFIG_OFF("/assets/oneconfig/icons/OneConfigOff.svg"),
- PASTE("/assets/oneconfig/icons/Paste.svg"),
- PERFORMANCE("/assets/oneconfig/icons/Performance.svg"),
- PLUS_CIRCLE("/assets/oneconfig/icons/PlusCircle.svg"),
- POP_OUT("/assets/oneconfig/icons/PopOut.svg"),
- PROFILES("/assets/oneconfig/icons/Profiles.svg"),
- RESET("/assets/oneconfig/icons/Reset.svg"),
- SAVE("/assets/oneconfig/icons/Save.svg"),
- SEARCH("/assets/oneconfig/icons/Search.svg"),
- SEND("/assets/oneconfig/icons/Send.svg"),
- SETTINGS("/assets/oneconfig/icons/Settings.svg"),
- SHAPE_CIRCLE("/assets/oneconfig/icons/ShapeCircle.svg"),
- SHAPE_DOT("/assets/oneconfig/icons/ShapeDot.svg"),
- SHAPE_HEXAGON("/assets/oneconfig/icons/ShapeHexagon.svg"),
- SHAPE_SQUARE("/assets/oneconfig/icons/ShapeSquare.svg"),
- SHAPE_TRIANGLE("/assets/oneconfig/icons/ShapeTriangle.svg"),
- SHARE("/assets/oneconfig/icons/Share.svg"),
- SHOPPING_BAG("/assets/oneconfig/icons/ShoppingBag.svg"),
- SPACING("/assets/oneconfig/icons/Spacing.svg"),
- THEME("/assets/oneconfig/icons/Theme.svg"),
- THUMBS_DOWN("/assets/oneconfig/icons/ThumbsDown.svg"),
- THUMBS_UP("/assets/oneconfig/icons/ThumbsUp.svg"),
- UPDATE("/assets/oneconfig/icons/Update.svg"),
- VOLUME_HIGH("/assets/oneconfig/icons/VolumeHigh.svg"),
- VOLUME_MEDIUM("/assets/oneconfig/icons/VolumeMedium.svg"),
- VOLUME_LOW("/assets/oneconfig/icons/VolumeLow.svg"),
- VOLUME_NONE("/assets/oneconfig/icons/VolumeNone.svg"),
- VOLUME_MUTE("/assets/oneconfig/icons/VolumeMute.svg"),
- VOLUME_OFF("/assets/oneconfig/icons/VolumeOff.svg"),
- VOLUME_MINUS("/assets/oneconfig/icons/VolumeMinus.svg"),
- VOLUME_PLUS("/assets/oneconfig/icons/VolumePlus.svg"),
- WARNING("/assets/oneconfig/icons/Warning.svg"),
- WEBSITE("/assets/oneconfig/icons/Website.svg"),
- X_CIRCLE("/assets/oneconfig/icons/XCircle.svg"),
- X_CROSS("/assets/oneconfig/icons/XCross.svg"),
- ZOOM_IN("/assets/oneconfig/icons/ZoomIn.svg"),
- ZOOM_OUT("/assets/oneconfig/icons/ZoomOut.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"),
+
+ // 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"),
+ 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;
diff --git a/src/main/java/cc/polyfrost/oneconfig/test/TestConfig.java b/src/main/java/cc/polyfrost/oneconfig/test/TestConfig.java
index 3e40cdc..b805fb9 100644
--- a/src/main/java/cc/polyfrost/oneconfig/test/TestConfig.java
+++ b/src/main/java/cc/polyfrost/oneconfig/test/TestConfig.java
@@ -362,7 +362,7 @@ public class TestConfig extends Config {
public static String stringTest123 = "text";
public TestConfig() {
- super(new Mod("hacks", ModType.UTIL_QOL, SVGs.CASH_DOLLAR.filePath, new VigilanceMigrator("./config/testConfig.toml")), "hacksConfig.json");
+ super(new Mod("hacks", ModType.UTIL_QOL, new VigilanceMigrator("./config/testConfig.toml")), "hacksConfig.json");
addDependency("switchTest5", () -> switchTest4);
addDependency("Test page.testDescription", () -> false);
}
diff --git a/src/main/java/cc/polyfrost/oneconfig/utils/ColorUtils.java b/src/main/java/cc/polyfrost/oneconfig/utils/ColorUtils.java
index 73fd629..88653fc 100644
--- a/src/main/java/cc/polyfrost/oneconfig/utils/ColorUtils.java
+++ b/src/main/java/cc/polyfrost/oneconfig/utils/ColorUtils.java
@@ -73,8 +73,7 @@ public final class ColorUtils {
case SECONDARY_TRANSPARENT: // Formally -2
return getColorComponents(color, new float[]{0f, 0f, 0f, 0f}, new float[]{0.9f, 0.9f, 0.9f, 0.3f}, hover, 50f);
case PRIMARY: // Formally 1
- return hover ? OneConfigConfig.PRIMARY_700 : OneConfigConfig.PRIMARY_600;
- //return getColorComponents(color, splitColor(OneConfigConfig.PRIMARY_600), splitColor(OneConfigConfig.PRIMARY_700), hover, 100f);
+ return getColorComponents(color, splitColor(OneConfigConfig.PRIMARY_700), splitColor(OneConfigConfig.PRIMARY_600), hover, 100f);
default:
case SECONDARY: // Formally 0
return getColorComponents(color, splitColor(OneConfigConfig.GRAY_500), splitColor(OneConfigConfig.GRAY_400), hover, 100f);
@@ -87,7 +86,6 @@ public final class ColorUtils {
case TERTIARY_DESTRUCTIVE:
return getColorComponents(color, splitColor(OneConfigConfig.WHITE_90), splitColor(OneConfigConfig.ERROR_300), hover, 100f);
}
-
}
/**
diff --git a/src/main/resources/assets/oneconfig/icons/ApertureFill.svg b/src/main/resources/assets/oneconfig/icons/ApertureFill.svg
new file mode 100644
index 0000000..e9c741a
--- /dev/null
+++ b/src/main/resources/assets/oneconfig/icons/ApertureFill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256"><path d="M232,128A104.1,104.1,0,0,0,128,24,104.1,104.1,0,0,0,24,128,104.1,104.1,0,0,0,128,232h.1A104.1,104.1,0,0,0,232,128ZM49.2,88.9l51.2,9.4L46.7,161.5A88,88,0,0,1,49.2,88.9Zm160.1,5.6a88,88,0,0,1-2.5,72.6l-51.2-9.4Zm-8-15.2L167.6,119l-28-78.2a86.8,86.8,0,0,1,50.6,25A88.5,88.5,0,0,1,201.3,79.3ZM122.4,40.2l17.5,49L58.3,74.3a99.2,99.2,0,0,1,7.5-8.5A87.1,87.1,0,0,1,122.4,40.2ZM54.7,176.7,88.4,137l28,78.2a86.8,86.8,0,0,1-50.6-25A88.5,88.5,0,0,1,54.7,176.7Zm78.9,39.1-17.5-49,23,4.2h.1l58.5,10.7a99.2,99.2,0,0,1-7.5,8.5A87.1,87.1,0,0,1,133.6,215.8Z" fill="white"/></svg> \ No newline at end of file
diff --git a/src/main/resources/assets/oneconfig/icons/ArrowsClockwiseBold.svg b/src/main/resources/assets/oneconfig/icons/ArrowsClockwiseBold.svg
new file mode 100644
index 0000000..c60a656
--- /dev/null
+++ b/src/main/resources/assets/oneconfig/icons/ArrowsClockwiseBold.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256"><path d="M236.2,51.7v48a12,12,0,0,1-12,12h-48a12,12,0,0,1,0-24h19L181.7,74.3a75.9,75.9,0,0,0-107.4,0,12.2,12.2,0,0,1-17,0,12,12,0,0,1,0-17,100.1,100.1,0,0,1,141.4,0l13.5,13.4v-19a12,12,0,1,1,24,0Zm-54.5,130a75.9,75.9,0,0,1-107.4,0L60.8,168.3h19a12,12,0,1,0,0-24h-48a12,12,0,0,0-12,12v48a12,12,0,0,0,24,0v-19l13.5,13.4a99.9,99.9,0,0,0,141.4,0,12,12,0,0,0,0-17A12.2,12.2,0,0,0,181.7,181.7Z" fill="white"/></svg> \ No newline at end of file
diff --git a/src/main/resources/assets/oneconfig/icons/CopyrightFill.svg b/src/main/resources/assets/oneconfig/icons/CopyrightFill.svg
new file mode 100644
index 0000000..b477d1c
--- /dev/null
+++ b/src/main/resources/assets/oneconfig/icons/CopyrightFill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256"><path d="M128,20A108,108,0,1,0,236,128,108.1,108.1,0,0,0,128,20Zm0,196a88,88,0,1,1,88-88A88.1,88.1,0,0,1,128,216Zm0-160a72,72,0,1,0,72,72A72.1,72.1,0,0,0,128,56Zm0,104a31.8,31.8,0,0,0,25.6-12.8,8.1,8.1,0,0,1,11.2-1.6,8,8,0,0,1,1.6,11.2,48,48,0,1,1,0-57.6,8,8,0,0,1-1.6,11.2,8.1,8.1,0,0,1-11.2-1.6A32,32,0,1,0,128,160Z" fill="white"/></svg> \ No newline at end of file
diff --git a/src/main/resources/assets/oneconfig/icons/FadersHorizontalBold.svg b/src/main/resources/assets/oneconfig/icons/FadersHorizontalBold.svg
new file mode 100644
index 0000000..4f926e5
--- /dev/null
+++ b/src/main/resources/assets/oneconfig/icons/FadersHorizontalBold.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256"><path d="M144,172a12,12,0,0,1-12,12H40a12,12,0,0,1,0-24h92A12,12,0,0,1,144,172Zm72-12H184V148a12,12,0,0,0-24,0v48a12,12,0,0,0,24,0V184h32a12,12,0,0,0,0-24ZM40,96H68a12,12,0,0,0,0-24H40a12,12,0,0,0,0,24Zm68,24a12,12,0,0,0,12-12V96h96a12,12,0,0,0,0-24H120V60a12,12,0,0,0-24,0v48A12,12,0,0,0,108,120Z" fill="white"/></svg> \ No newline at end of file
diff --git a/src/main/resources/assets/oneconfig/icons/GaugeFill.svg b/src/main/resources/assets/oneconfig/icons/GaugeFill.svg
new file mode 100644
index 0000000..d7e8956
--- /dev/null
+++ b/src/main/resources/assets/oneconfig/icons/GaugeFill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256"><path d="M240,160v24a16,16,0,0,1-16,16H115.5a4,4,0,0,1-3.2-6.4L178,108a8.2,8.2,0,0,0-1.1-11.3A7.9,7.9,0,0,0,165.5,98L88.4,198.4a3.8,3.8,0,0,1-3.1,1.6H32a16,16,0,0,1-16-16V161.1a116.1,116.1,0,0,1,2.2-22.2L40.9,145l2.1.2a8,8,0,0,0,7.8-6.2,8.1,8.1,0,0,0-6-9.6l-22.4-6C37,82,74.9,51.5,120,48.3V71.7a8.2,8.2,0,0,0,7.5,8.3,8,8,0,0,0,8.5-8V48.3a111.5,111.5,0,0,1,71.1,32.4,112.7,112.7,0,0,1,26.8,42.6l-22.7,6.1a8.1,8.1,0,0,0-6,9.6,8,8,0,0,0,7.8,6.2l2.1-.2,22.9-6.2A114.5,114.5,0,0,1,240,160Z" fill="white"/></svg> \ No newline at end of file
diff --git a/src/main/resources/assets/oneconfig/icons/GearSixFill.svg b/src/main/resources/assets/oneconfig/icons/GearSixFill.svg
new file mode 100644
index 0000000..2a180a6
--- /dev/null
+++ b/src/main/resources/assets/oneconfig/icons/GearSixFill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256"><path d="M237.5,104.3a8,8,0,0,0-4-5.3L209.7,85.8a69.3,69.3,0,0,0-4.3-7.5l.5-27.2a8.3,8.3,0,0,0-2.6-6.1,112,112,0,0,0-41.1-23.7,8.1,8.1,0,0,0-6.6.8l-23.3,14c-2.9-.1-5.7-.1-8.6,0l-23.3-14a8.1,8.1,0,0,0-6.6-.8A111.1,111.1,0,0,0,52.7,45.1a7.9,7.9,0,0,0-2.6,6l.5,27.2c-1.6,2.4-3,4.9-4.4,7.5L22.4,99a7.9,7.9,0,0,0-3.9,5.3,111.4,111.4,0,0,0,0,47.4,8,8,0,0,0,4,5.3l23.8,13.2a69.3,69.3,0,0,0,4.3,7.5l-.5,27.2a8.3,8.3,0,0,0,2.6,6.1,112,112,0,0,0,41.1,23.7,8.1,8.1,0,0,0,6.6-.8l23.3-14h8.6l23.4,14a7.3,7.3,0,0,0,4.1,1.2,10,10,0,0,0,2.4-.4,111.1,111.1,0,0,0,41.1-23.8,7.9,7.9,0,0,0,2.6-6l-.5-27.2c1.6-2.4,3-4.9,4.4-7.5L233.6,157a7.9,7.9,0,0,0,3.9-5.3A111.4,111.4,0,0,0,237.5,104.3ZM128,172a44,44,0,1,1,44-44A44,44,0,0,1,128,172Z" fill="white"/></svg> \ No newline at end of file
diff --git a/src/main/resources/assets/oneconfig/icons/MagnifyingGlassBold.svg b/src/main/resources/assets/oneconfig/icons/MagnifyingGlassBold.svg
new file mode 100644
index 0000000..4e1d2ff
--- /dev/null
+++ b/src/main/resources/assets/oneconfig/icons/MagnifyingGlassBold.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256"><path d="M232.5,215.5l-40.7-40.7A94.9,94.9,0,0,0,212,116a96,96,0,1,0-96,96,94.9,94.9,0,0,0,58.8-20.2l40.7,40.7a12.1,12.1,0,0,0,17,0A12,12,0,0,0,232.5,215.5ZM44,116a72,72,0,1,1,72,72A72.1,72.1,0,0,1,44,116Z" fill="white"/></svg> \ No newline at end of file
diff --git a/src/main/resources/assets/oneconfig/icons/NotePencilBold.svg b/src/main/resources/assets/oneconfig/icons/NotePencilBold.svg
new file mode 100644
index 0000000..b96d495
--- /dev/null
+++ b/src/main/resources/assets/oneconfig/icons/NotePencilBold.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256"><path d="M232.5,55.5l-32-32a12,12,0,0,0-17,0l-96,96A11.9,11.9,0,0,0,84,128v32a12,12,0,0,0,12,12h32a12.3,12.3,0,0,0,8.5-3.5l96-96A12,12,0,0,0,232.5,55.5ZM192,49l15,15L196,75,181,60Zm-69,99H108V133l56-56,15,15Zm105-19.4V208a20.1,20.1,0,0,1-20,20H48a20.1,20.1,0,0,1-20-20V48A20.1,20.1,0,0,1,48,28h79.4a12,12,0,0,1,0,24H52V204H204V128.6a12,12,0,0,1,24,0Z" fill="white"/></svg> \ No newline at end of file
diff --git a/src/main/resources/assets/oneconfig/icons/PaintBrushBroadFill.svg b/src/main/resources/assets/oneconfig/icons/PaintBrushBroadFill.svg
new file mode 100644
index 0000000..3bce994
--- /dev/null
+++ b/src/main/resources/assets/oneconfig/icons/PaintBrushBroadFill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256"><path d="M216,24H72A40,40,0,0,0,32,64v72a24.1,24.1,0,0,0,24,24h46.8l-6.7,46.9A3.7,3.7,0,0,0,96,208a32,32,0,0,0,64,0,3.7,3.7,0,0,0-.1-1.1L153.2,160H200a24.1,24.1,0,0,0,24-24V32A8,8,0,0,0,216,24Zm-8,80H48V64A24.1,24.1,0,0,1,72,40H176V80a8,8,0,0,0,16,0V40h16Z" fill="white"/></svg> \ No newline at end of file
diff --git a/src/main/resources/assets/oneconfig/icons/UserSwitchFill.svg b/src/main/resources/assets/oneconfig/icons/UserSwitchFill.svg
new file mode 100644
index 0000000..8cbd39c
--- /dev/null
+++ b/src/main/resources/assets/oneconfig/icons/UserSwitchFill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256"><path d="M253.7,133.7l-24,24a8.2,8.2,0,0,1-11.4,0l-24-24a8.4,8.4,0,0,1-1.7-8.8A8,8,0,0,1,200,120h15.6A87.9,87.9,0,0,0,54.1,80.3,8,8,0,0,1,43,82.6a7.9,7.9,0,0,1-2.4-11A104,104,0,0,1,231.7,120H248a8,8,0,0,1,7.4,4.9A8.4,8.4,0,0,1,253.7,133.7ZM213,173.4a8,8,0,0,0-11.1,2.3,86.9,86.9,0,0,1-8.1,10.8h0a81.3,81.3,0,0,0-24.5-23,59.7,59.7,0,0,1-82.6,0,81.3,81.3,0,0,0-24.5,23h0A87.6,87.6,0,0,1,40.4,136H56a8,8,0,0,0,7.4-4.9,8.4,8.4,0,0,0-1.7-8.8l-24-24a8.1,8.1,0,0,0-11.4,0l-24,24a8.4,8.4,0,0,0-1.7,8.8A8,8,0,0,0,8,136H24.3a103.7,103.7,0,0,0,34.5,69.6h0l.4.3a103.9,103.9,0,0,0,156.2-21.5A7.9,7.9,0,0,0,213,173.4ZM128,164a44,44,0,1,0-44-44A44,44,0,0,0,128,164Z" fill="white"/></svg> \ No newline at end of file
diff --git a/src/main/resources/assets/oneconfig/icons/XCircleBold.svg b/src/main/resources/assets/oneconfig/icons/XCircleBold.svg
new file mode 100644
index 0000000..ff684a3
--- /dev/null
+++ b/src/main/resources/assets/oneconfig/icons/XCircleBold.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256"><path d="M128,20A108,108,0,1,0,236,128,108.1,108.1,0,0,0,128,20Zm0,192a84,84,0,1,1,84-84A84.1,84.1,0,0,1,128,212Zm40.5-107.5L145,128l23.5,23.5a12,12,0,0,1,0,17,12.1,12.1,0,0,1-17,0L128,145l-23.5,23.5a12.1,12.1,0,0,1-17,0,12,12,0,0,1,0-17L111,128,87.5,104.5a12,12,0,0,1,17-17L128,111l23.5-23.5a12,12,0,0,1,17,17Z" fill="white"/></svg> \ No newline at end of file
diff --git a/src/main/resources/assets/oneconfig/icons/AlignHCenter.svg b/src/main/resources/assets/oneconfig/old-icons/AlignHCenter.svg
index c249753..c249753 100644
--- a/src/main/resources/assets/oneconfig/icons/AlignHCenter.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/AlignHCenter.svg
diff --git a/src/main/resources/assets/oneconfig/icons/AlignHLeft.svg b/src/main/resources/assets/oneconfig/old-icons/AlignHLeft.svg
index 9767572..9767572 100644
--- a/src/main/resources/assets/oneconfig/icons/AlignHLeft.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/AlignHLeft.svg
diff --git a/src/main/resources/assets/oneconfig/icons/AlignHRight.svg b/src/main/resources/assets/oneconfig/old-icons/AlignHRight.svg
index 04f144f..04f144f 100644
--- a/src/main/resources/assets/oneconfig/icons/AlignHRight.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/AlignHRight.svg
diff --git a/src/main/resources/assets/oneconfig/icons/AlignVBottom.svg b/src/main/resources/assets/oneconfig/old-icons/AlignVBottom.svg
index c3fad49..c3fad49 100644
--- a/src/main/resources/assets/oneconfig/icons/AlignVBottom.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/AlignVBottom.svg
diff --git a/src/main/resources/assets/oneconfig/icons/AlignVMiddle.svg b/src/main/resources/assets/oneconfig/old-icons/AlignVMiddle.svg
index 05d5900..05d5900 100644
--- a/src/main/resources/assets/oneconfig/icons/AlignVMiddle.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/AlignVMiddle.svg
diff --git a/src/main/resources/assets/oneconfig/icons/AlignVTop.svg b/src/main/resources/assets/oneconfig/old-icons/AlignVTop.svg
index af11415..af11415 100644
--- a/src/main/resources/assets/oneconfig/icons/AlignVTop.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/AlignVTop.svg
diff --git a/src/main/resources/assets/oneconfig/icons/ArrowCircleDown.svg b/src/main/resources/assets/oneconfig/old-icons/ArrowCircleDown.svg
index c8f73a1..c8f73a1 100644
--- a/src/main/resources/assets/oneconfig/icons/ArrowCircleDown.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/ArrowCircleDown.svg
diff --git a/src/main/resources/assets/oneconfig/icons/ArrowCircleLeft.svg b/src/main/resources/assets/oneconfig/old-icons/ArrowCircleLeft.svg
index a105f4e..a105f4e 100644
--- a/src/main/resources/assets/oneconfig/icons/ArrowCircleLeft.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/ArrowCircleLeft.svg
diff --git a/src/main/resources/assets/oneconfig/icons/ArrowCircleRight.svg b/src/main/resources/assets/oneconfig/old-icons/ArrowCircleRight.svg
index 484e80f..484e80f 100644
--- a/src/main/resources/assets/oneconfig/icons/ArrowCircleRight.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/ArrowCircleRight.svg
diff --git a/src/main/resources/assets/oneconfig/icons/ArrowCircleUp.svg b/src/main/resources/assets/oneconfig/old-icons/ArrowCircleUp.svg
index 0a38ec4..0a38ec4 100644
--- a/src/main/resources/assets/oneconfig/icons/ArrowCircleUp.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/ArrowCircleUp.svg
diff --git a/src/main/resources/assets/oneconfig/icons/ArrowDown.svg b/src/main/resources/assets/oneconfig/old-icons/ArrowDown.svg
index 12584b5..12584b5 100644
--- a/src/main/resources/assets/oneconfig/icons/ArrowDown.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/ArrowDown.svg
diff --git a/src/main/resources/assets/oneconfig/icons/ArrowLeft.svg b/src/main/resources/assets/oneconfig/old-icons/ArrowLeft.svg
index b7da249..b7da249 100644
--- a/src/main/resources/assets/oneconfig/icons/ArrowLeft.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/ArrowLeft.svg
diff --git a/src/main/resources/assets/oneconfig/icons/ArrowRight.svg b/src/main/resources/assets/oneconfig/old-icons/ArrowRight.svg
index bd4c152..bd4c152 100644
--- a/src/main/resources/assets/oneconfig/icons/ArrowRight.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/ArrowRight.svg
diff --git a/src/main/resources/assets/oneconfig/icons/ArrowUp.svg b/src/main/resources/assets/oneconfig/old-icons/ArrowUp.svg
index e392265..e392265 100644
--- a/src/main/resources/assets/oneconfig/icons/ArrowUp.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/ArrowUp.svg
diff --git a/src/main/resources/assets/oneconfig/icons/AudioPause.svg b/src/main/resources/assets/oneconfig/old-icons/AudioPause.svg
index 3bde237..3bde237 100644
--- a/src/main/resources/assets/oneconfig/icons/AudioPause.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/AudioPause.svg
diff --git a/src/main/resources/assets/oneconfig/icons/AudioPlay.svg b/src/main/resources/assets/oneconfig/old-icons/AudioPlay.svg
index 8e7297c..8e7297c 100644
--- a/src/main/resources/assets/oneconfig/icons/AudioPlay.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/AudioPlay.svg
diff --git a/src/main/resources/assets/oneconfig/icons/AudioPrevious.svg b/src/main/resources/assets/oneconfig/old-icons/AudioPrevious.svg
index 5b87f8c..5b87f8c 100644
--- a/src/main/resources/assets/oneconfig/icons/AudioPrevious.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/AudioPrevious.svg
diff --git a/src/main/resources/assets/oneconfig/icons/AudioSkip.svg b/src/main/resources/assets/oneconfig/old-icons/AudioSkip.svg
index 6ef7282..6ef7282 100644
--- a/src/main/resources/assets/oneconfig/icons/AudioSkip.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/AudioSkip.svg
diff --git a/src/main/resources/assets/oneconfig/icons/Backspace.svg b/src/main/resources/assets/oneconfig/old-icons/Backspace.svg
index 1a03089..1a03089 100644
--- a/src/main/resources/assets/oneconfig/icons/Backspace.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/Backspace.svg
diff --git a/src/main/resources/assets/oneconfig/icons/Bell.svg b/src/main/resources/assets/oneconfig/old-icons/Bell.svg
index 10d530b..10d530b 100644
--- a/src/main/resources/assets/oneconfig/icons/Bell.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/Bell.svg
diff --git a/src/main/resources/assets/oneconfig/icons/BellOff.svg b/src/main/resources/assets/oneconfig/old-icons/BellOff.svg
index 5544801..5544801 100644
--- a/src/main/resources/assets/oneconfig/icons/BellOff.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/BellOff.svg
diff --git a/src/main/resources/assets/oneconfig/icons/Box.svg b/src/main/resources/assets/oneconfig/old-icons/Box.svg
index 9a9c451..9a9c451 100644
--- a/src/main/resources/assets/oneconfig/icons/Box.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/Box.svg
diff --git a/src/main/resources/assets/oneconfig/icons/Camera.svg b/src/main/resources/assets/oneconfig/old-icons/Camera.svg
index fcb3c3b..fcb3c3b 100644
--- a/src/main/resources/assets/oneconfig/icons/Camera.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/Camera.svg
diff --git a/src/main/resources/assets/oneconfig/icons/Cart.svg b/src/main/resources/assets/oneconfig/old-icons/Cart.svg
index f2f7f1b..f2f7f1b 100644
--- a/src/main/resources/assets/oneconfig/icons/Cart.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/Cart.svg
diff --git a/src/main/resources/assets/oneconfig/icons/Cash.svg b/src/main/resources/assets/oneconfig/old-icons/Cash.svg
index 8302b74..8302b74 100644
--- a/src/main/resources/assets/oneconfig/icons/Cash.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/Cash.svg
diff --git a/src/main/resources/assets/oneconfig/icons/CashDollar.svg b/src/main/resources/assets/oneconfig/old-icons/CashDollar.svg
index 6b5e056..6b5e056 100644
--- a/src/main/resources/assets/oneconfig/icons/CashDollar.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/CashDollar.svg
diff --git a/src/main/resources/assets/oneconfig/icons/CheckCircle.svg b/src/main/resources/assets/oneconfig/old-icons/CheckCircle.svg
index ec12533..ec12533 100644
--- a/src/main/resources/assets/oneconfig/icons/CheckCircle.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/CheckCircle.svg
diff --git a/src/main/resources/assets/oneconfig/icons/CheckboxMixed.svg b/src/main/resources/assets/oneconfig/old-icons/CheckboxMixed.svg
index 03ea4e4..03ea4e4 100644
--- a/src/main/resources/assets/oneconfig/icons/CheckboxMixed.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/CheckboxMixed.svg
diff --git a/src/main/resources/assets/oneconfig/icons/CheckboxTick.svg b/src/main/resources/assets/oneconfig/old-icons/CheckboxTick.svg
index 4d6e0a8..4d6e0a8 100644
--- a/src/main/resources/assets/oneconfig/icons/CheckboxTick.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/CheckboxTick.svg
diff --git a/src/main/resources/assets/oneconfig/icons/ChevronDown.svg b/src/main/resources/assets/oneconfig/old-icons/ChevronDown.svg
index 4adca3e..4adca3e 100644
--- a/src/main/resources/assets/oneconfig/icons/ChevronDown.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/ChevronDown.svg
diff --git a/src/main/resources/assets/oneconfig/icons/ChevronLeft.svg b/src/main/resources/assets/oneconfig/old-icons/ChevronLeft.svg
index ae78384..ae78384 100644
--- a/src/main/resources/assets/oneconfig/icons/ChevronLeft.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/ChevronLeft.svg
diff --git a/src/main/resources/assets/oneconfig/icons/ChevronRight.svg b/src/main/resources/assets/oneconfig/old-icons/ChevronRight.svg
index f60fac0..f60fac0 100644
--- a/src/main/resources/assets/oneconfig/icons/ChevronRight.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/ChevronRight.svg
diff --git a/src/main/resources/assets/oneconfig/icons/ChevronUp.svg b/src/main/resources/assets/oneconfig/old-icons/ChevronUp.svg
index 7c3c756..7c3c756 100644
--- a/src/main/resources/assets/oneconfig/icons/ChevronUp.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/ChevronUp.svg
diff --git a/src/main/resources/assets/oneconfig/icons/CircleMinus.svg b/src/main/resources/assets/oneconfig/old-icons/CircleMinus.svg
index d115d9b..d115d9b 100644
--- a/src/main/resources/assets/oneconfig/icons/CircleMinus.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/CircleMinus.svg
diff --git a/src/main/resources/assets/oneconfig/icons/CirclePlus.svg b/src/main/resources/assets/oneconfig/old-icons/CirclePlus.svg
index 9308c24..9308c24 100644
--- a/src/main/resources/assets/oneconfig/icons/CirclePlus.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/CirclePlus.svg
diff --git a/src/main/resources/assets/oneconfig/icons/Clock.svg b/src/main/resources/assets/oneconfig/old-icons/Clock.svg
index bae7961..bae7961 100644
--- a/src/main/resources/assets/oneconfig/icons/Clock.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/Clock.svg
diff --git a/src/main/resources/assets/oneconfig/icons/Code.svg b/src/main/resources/assets/oneconfig/old-icons/Code.svg
index 9a22cd0..9a22cd0 100644
--- a/src/main/resources/assets/oneconfig/icons/Code.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/Code.svg
diff --git a/src/main/resources/assets/oneconfig/icons/ComboBoxDown.svg b/src/main/resources/assets/oneconfig/old-icons/ComboBoxDown.svg
index 254806c..254806c 100644
--- a/src/main/resources/assets/oneconfig/icons/ComboBoxDown.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/ComboBoxDown.svg
diff --git a/src/main/resources/assets/oneconfig/icons/ComboBoxUp.svg b/src/main/resources/assets/oneconfig/old-icons/ComboBoxUp.svg
index a53aa55..a53aa55 100644
--- a/src/main/resources/assets/oneconfig/icons/ComboBoxUp.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/ComboBoxUp.svg
diff --git a/src/main/resources/assets/oneconfig/icons/Content.svg b/src/main/resources/assets/oneconfig/old-icons/Content.svg
index 26f61d2..26f61d2 100644
--- a/src/main/resources/assets/oneconfig/icons/Content.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/Content.svg
diff --git a/src/main/resources/assets/oneconfig/icons/Copy.svg b/src/main/resources/assets/oneconfig/old-icons/Copy.svg
index b9f3a08..b9f3a08 100644
--- a/src/main/resources/assets/oneconfig/icons/Copy.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/Copy.svg
diff --git a/src/main/resources/assets/oneconfig/icons/CreditCard.svg b/src/main/resources/assets/oneconfig/old-icons/CreditCard.svg
index 0af769d..0af769d 100644
--- a/src/main/resources/assets/oneconfig/icons/CreditCard.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/CreditCard.svg
diff --git a/src/main/resources/assets/oneconfig/icons/CreditCardAdd.svg b/src/main/resources/assets/oneconfig/old-icons/CreditCardAdd.svg
index 51cf9f7..51cf9f7 100644
--- a/src/main/resources/assets/oneconfig/icons/CreditCardAdd.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/CreditCardAdd.svg
diff --git a/src/main/resources/assets/oneconfig/icons/Cube.svg b/src/main/resources/assets/oneconfig/old-icons/Cube.svg
index 86906bd..86906bd 100644
--- a/src/main/resources/assets/oneconfig/icons/Cube.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/Cube.svg
diff --git a/src/main/resources/assets/oneconfig/icons/Dashboard.svg b/src/main/resources/assets/oneconfig/old-icons/Dashboard.svg
index 3eebe42..3eebe42 100644
--- a/src/main/resources/assets/oneconfig/icons/Dashboard.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/Dashboard.svg
diff --git a/src/main/resources/assets/oneconfig/icons/Delete.svg b/src/main/resources/assets/oneconfig/old-icons/Delete.svg
index 3d76d4b..3d76d4b 100644
--- a/src/main/resources/assets/oneconfig/icons/Delete.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/Delete.svg
diff --git a/src/main/resources/assets/oneconfig/icons/Dollar.svg b/src/main/resources/assets/oneconfig/old-icons/Dollar.svg
index b67d246..b67d246 100644
--- a/src/main/resources/assets/oneconfig/icons/Dollar.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/Dollar.svg
diff --git a/src/main/resources/assets/oneconfig/icons/DollarCircle.svg b/src/main/resources/assets/oneconfig/old-icons/DollarCircle.svg
index fcc637e..fcc637e 100644
--- a/src/main/resources/assets/oneconfig/icons/DollarCircle.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/DollarCircle.svg
diff --git a/src/main/resources/assets/oneconfig/icons/Download.svg b/src/main/resources/assets/oneconfig/old-icons/Download.svg
index d25599a..d25599a 100644
--- a/src/main/resources/assets/oneconfig/icons/Download.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/Download.svg
diff --git a/src/main/resources/assets/oneconfig/icons/DropdownList.svg b/src/main/resources/assets/oneconfig/old-icons/DropdownList.svg
index ad5c8be..ad5c8be 100644
--- a/src/main/resources/assets/oneconfig/icons/DropdownList.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/DropdownList.svg
diff --git a/src/main/resources/assets/oneconfig/icons/Earth.svg b/src/main/resources/assets/oneconfig/old-icons/Earth.svg
index a95f100..a95f100 100644
--- a/src/main/resources/assets/oneconfig/icons/Earth.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/Earth.svg
diff --git a/src/main/resources/assets/oneconfig/icons/Edit.svg b/src/main/resources/assets/oneconfig/old-icons/Edit.svg
index e8b823d..e8b823d 100644
--- a/src/main/resources/assets/oneconfig/icons/Edit.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/Edit.svg
diff --git a/src/main/resources/assets/oneconfig/icons/Error.svg b/src/main/resources/assets/oneconfig/old-icons/Error.svg
index e65228e..e65228e 100644
--- a/src/main/resources/assets/oneconfig/icons/Error.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/Error.svg
diff --git a/src/main/resources/assets/oneconfig/icons/Export.svg b/src/main/resources/assets/oneconfig/old-icons/Export.svg
index 41283f2..41283f2 100644
--- a/src/main/resources/assets/oneconfig/icons/Export.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/Export.svg
diff --git a/src/main/resources/assets/oneconfig/icons/Eye.svg b/src/main/resources/assets/oneconfig/old-icons/Eye.svg
index 9078ef6..9078ef6 100644
--- a/src/main/resources/assets/oneconfig/icons/Eye.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/Eye.svg
diff --git a/src/main/resources/assets/oneconfig/icons/EyeOff.svg b/src/main/resources/assets/oneconfig/old-icons/EyeOff.svg
index ec66c3d..ec66c3d 100644
--- a/src/main/resources/assets/oneconfig/icons/EyeOff.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/EyeOff.svg
diff --git a/src/main/resources/assets/oneconfig/icons/FabricLoader.svg b/src/main/resources/assets/oneconfig/old-icons/FabricLoader.svg
index 448fe36..448fe36 100644
--- a/src/main/resources/assets/oneconfig/icons/FabricLoader.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/FabricLoader.svg
diff --git a/src/main/resources/assets/oneconfig/icons/File.svg b/src/main/resources/assets/oneconfig/old-icons/File.svg
index 1ae91de..1ae91de 100644
--- a/src/main/resources/assets/oneconfig/icons/File.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/File.svg
diff --git a/src/main/resources/assets/oneconfig/icons/Filter.svg b/src/main/resources/assets/oneconfig/old-icons/Filter.svg
index 6b3ea7d..6b3ea7d 100644
--- a/src/main/resources/assets/oneconfig/icons/Filter.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/Filter.svg
diff --git a/src/main/resources/assets/oneconfig/icons/Folder.svg b/src/main/resources/assets/oneconfig/old-icons/Folder.svg
index efe0b38..efe0b38 100644
--- a/src/main/resources/assets/oneconfig/icons/Folder.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/Folder.svg
diff --git a/src/main/resources/assets/oneconfig/icons/ForgeLoader.svg b/src/main/resources/assets/oneconfig/old-icons/ForgeLoader.svg
index 6138dc1..6138dc1 100644
--- a/src/main/resources/assets/oneconfig/icons/ForgeLoader.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/ForgeLoader.svg
diff --git a/src/main/resources/assets/oneconfig/icons/HUD.svg b/src/main/resources/assets/oneconfig/old-icons/HUD.svg
index 702e6c7..702e6c7 100644
--- a/src/main/resources/assets/oneconfig/icons/HUD.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/HUD.svg
diff --git a/src/main/resources/assets/oneconfig/icons/HUDSettings.svg b/src/main/resources/assets/oneconfig/old-icons/HUDSettings.svg
index 7e45f29..7e45f29 100644
--- a/src/main/resources/assets/oneconfig/icons/HUDSettings.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/HUDSettings.svg
diff --git a/src/main/resources/assets/oneconfig/icons/Hamburger.svg b/src/main/resources/assets/oneconfig/old-icons/Hamburger.svg
index 805f7a9..805f7a9 100644
--- a/src/main/resources/assets/oneconfig/icons/Hamburger.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/Hamburger.svg
diff --git a/src/main/resources/assets/oneconfig/icons/HeartBroken.svg b/src/main/resources/assets/oneconfig/old-icons/HeartBroken.svg
index f75d5da..f75d5da 100644
--- a/src/main/resources/assets/oneconfig/icons/HeartBroken.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/HeartBroken.svg
diff --git a/src/main/resources/assets/oneconfig/icons/HeartFill.svg b/src/main/resources/assets/oneconfig/old-icons/HeartFill.svg
index 58f176d..58f176d 100644
--- a/src/main/resources/assets/oneconfig/icons/HeartFill.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/HeartFill.svg
diff --git a/src/main/resources/assets/oneconfig/icons/HeartOutline.svg b/src/main/resources/assets/oneconfig/old-icons/HeartOutline.svg
index cc623ac..cc623ac 100644
--- a/src/main/resources/assets/oneconfig/icons/HeartOutline.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/HeartOutline.svg
diff --git a/src/main/resources/assets/oneconfig/icons/HelpCircle.svg b/src/main/resources/assets/oneconfig/old-icons/HelpCircle.svg
index 06f99a1..06f99a1 100644
--- a/src/main/resources/assets/oneconfig/icons/HelpCircle.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/HelpCircle.svg
diff --git a/src/main/resources/assets/oneconfig/icons/History.svg b/src/main/resources/assets/oneconfig/old-icons/History.svg
index d4230c1..d4230c1 100644
--- a/src/main/resources/assets/oneconfig/icons/History.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/History.svg
diff --git a/src/main/resources/assets/oneconfig/icons/Home.svg b/src/main/resources/assets/oneconfig/old-icons/Home.svg
index 3493478..3493478 100644
--- a/src/main/resources/assets/oneconfig/icons/Home.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/Home.svg
diff --git a/src/main/resources/assets/oneconfig/icons/Image.svg b/src/main/resources/assets/oneconfig/old-icons/Image.svg
index 16c878a..16c878a 100644
--- a/src/main/resources/assets/oneconfig/icons/Image.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/Image.svg
diff --git a/src/main/resources/assets/oneconfig/icons/InfoCircle.svg b/src/main/resources/assets/oneconfig/old-icons/InfoCircle.svg
index 825ce34..825ce34 100644
--- a/src/main/resources/assets/oneconfig/icons/InfoCircle.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/InfoCircle.svg
diff --git a/src/main/resources/assets/oneconfig/icons/ItemLinkBroke.svg b/src/main/resources/assets/oneconfig/old-icons/ItemLinkBroke.svg
index 3444329..3444329 100644
--- a/src/main/resources/assets/oneconfig/icons/ItemLinkBroke.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/ItemLinkBroke.svg
diff --git a/src/main/resources/assets/oneconfig/icons/ItemLinked.svg b/src/main/resources/assets/oneconfig/old-icons/ItemLinked.svg
index 6b17bc1..6b17bc1 100644
--- a/src/main/resources/assets/oneconfig/icons/ItemLinked.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/ItemLinked.svg
diff --git a/src/main/resources/assets/oneconfig/icons/Keystroke.svg b/src/main/resources/assets/oneconfig/old-icons/Keystroke.svg
index a841c94..a841c94 100644
--- a/src/main/resources/assets/oneconfig/icons/Keystroke.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/Keystroke.svg
diff --git a/src/main/resources/assets/oneconfig/icons/LaunchProfiles.svg b/src/main/resources/assets/oneconfig/old-icons/LaunchProfiles.svg
index 060ee76..060ee76 100644
--- a/src/main/resources/assets/oneconfig/icons/LaunchProfiles.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/LaunchProfiles.svg
diff --git a/src/main/resources/assets/oneconfig/icons/LinkDiagonal.svg b/src/main/resources/assets/oneconfig/old-icons/LinkDiagonal.svg
index 159c6ca..159c6ca 100644
--- a/src/main/resources/assets/oneconfig/icons/LinkDiagonal.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/LinkDiagonal.svg
diff --git a/src/main/resources/assets/oneconfig/icons/LinkHorizontal.svg b/src/main/resources/assets/oneconfig/old-icons/LinkHorizontal.svg
index 23b9e59..23b9e59 100644
--- a/src/main/resources/assets/oneconfig/icons/LinkHorizontal.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/LinkHorizontal.svg
diff --git a/src/main/resources/assets/oneconfig/icons/Loading.svg b/src/main/resources/assets/oneconfig/old-icons/Loading.svg
index 7482ddd..7482ddd 100644
--- a/src/main/resources/assets/oneconfig/icons/Loading.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/Loading.svg
diff --git a/src/main/resources/assets/oneconfig/icons/LocationPoint.svg b/src/main/resources/assets/oneconfig/old-icons/LocationPoint.svg
index 8ad408e..8ad408e 100644
--- a/src/main/resources/assets/oneconfig/icons/LocationPoint.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/LocationPoint.svg
diff --git a/src/main/resources/assets/oneconfig/icons/Maximise.svg b/src/main/resources/assets/oneconfig/old-icons/Maximise.svg
index a34839a..a34839a 100644
--- a/src/main/resources/assets/oneconfig/icons/Maximise.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/Maximise.svg
diff --git a/src/main/resources/assets/oneconfig/icons/Mic.svg b/src/main/resources/assets/oneconfig/old-icons/Mic.svg
index 19fee3d..19fee3d 100644
--- a/src/main/resources/assets/oneconfig/icons/Mic.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/Mic.svg
diff --git a/src/main/resources/assets/oneconfig/icons/MicOff.svg b/src/main/resources/assets/oneconfig/old-icons/MicOff.svg
index 36d6ed7..36d6ed7 100644
--- a/src/main/resources/assets/oneconfig/icons/MicOff.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/MicOff.svg
diff --git a/src/main/resources/assets/oneconfig/icons/MicrosoftIcon.svg b/src/main/resources/assets/oneconfig/old-icons/MicrosoftIcon.svg
index e6536c6..e6536c6 100644
--- a/src/main/resources/assets/oneconfig/icons/MicrosoftIcon.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/MicrosoftIcon.svg
diff --git a/src/main/resources/assets/oneconfig/icons/Minimise.svg b/src/main/resources/assets/oneconfig/old-icons/Minimise.svg
index 93f4341..93f4341 100644
--- a/src/main/resources/assets/oneconfig/icons/Minimise.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/Minimise.svg
diff --git a/src/main/resources/assets/oneconfig/icons/Mods.svg b/src/main/resources/assets/oneconfig/old-icons/Mods.svg
index 4ee1fac..4ee1fac 100644
--- a/src/main/resources/assets/oneconfig/icons/Mods.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/Mods.svg
diff --git a/src/main/resources/assets/oneconfig/icons/Move.svg b/src/main/resources/assets/oneconfig/old-icons/Move.svg
index 4b4cf5a..4b4cf5a 100644
--- a/src/main/resources/assets/oneconfig/icons/Move.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/Move.svg
diff --git a/src/main/resources/assets/oneconfig/icons/Navigation.svg b/src/main/resources/assets/oneconfig/old-icons/Navigation.svg
index d67f38f..d67f38f 100644
--- a/src/main/resources/assets/oneconfig/icons/Navigation.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/Navigation.svg
diff --git a/src/main/resources/assets/oneconfig/icons/Paste.svg b/src/main/resources/assets/oneconfig/old-icons/Paste.svg
index 37864a8..37864a8 100644
--- a/src/main/resources/assets/oneconfig/icons/Paste.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/Paste.svg
diff --git a/src/main/resources/assets/oneconfig/icons/Performance.svg b/src/main/resources/assets/oneconfig/old-icons/Performance.svg
index a417a77..a417a77 100644
--- a/src/main/resources/assets/oneconfig/icons/Performance.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/Performance.svg
diff --git a/src/main/resources/assets/oneconfig/icons/PopOut.svg b/src/main/resources/assets/oneconfig/old-icons/PopOut.svg
index 34be318..34be318 100644
--- a/src/main/resources/assets/oneconfig/icons/PopOut.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/PopOut.svg
diff --git a/src/main/resources/assets/oneconfig/icons/Profiles.svg b/src/main/resources/assets/oneconfig/old-icons/Profiles.svg
index 08a17e0..08a17e0 100644
--- a/src/main/resources/assets/oneconfig/icons/Profiles.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/Profiles.svg
diff --git a/src/main/resources/assets/oneconfig/icons/Reset.svg b/src/main/resources/assets/oneconfig/old-icons/Reset.svg
index 92d9441..92d9441 100644
--- a/src/main/resources/assets/oneconfig/icons/Reset.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/Reset.svg
diff --git a/src/main/resources/assets/oneconfig/icons/Save.svg b/src/main/resources/assets/oneconfig/old-icons/Save.svg
index 64fd7b2..64fd7b2 100644
--- a/src/main/resources/assets/oneconfig/icons/Save.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/Save.svg
diff --git a/src/main/resources/assets/oneconfig/icons/Search.svg b/src/main/resources/assets/oneconfig/old-icons/Search.svg
index fb2b00d..fb2b00d 100644
--- a/src/main/resources/assets/oneconfig/icons/Search.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/Search.svg
diff --git a/src/main/resources/assets/oneconfig/icons/Send.svg b/src/main/resources/assets/oneconfig/old-icons/Send.svg
index 1b9ef56..1b9ef56 100644
--- a/src/main/resources/assets/oneconfig/icons/Send.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/Send.svg
diff --git a/src/main/resources/assets/oneconfig/icons/Settings.svg b/src/main/resources/assets/oneconfig/old-icons/Settings.svg
index 8217266..8217266 100644
--- a/src/main/resources/assets/oneconfig/icons/Settings.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/Settings.svg
diff --git a/src/main/resources/assets/oneconfig/icons/ShapeCircle.svg b/src/main/resources/assets/oneconfig/old-icons/ShapeCircle.svg
index 036a92e..036a92e 100644
--- a/src/main/resources/assets/oneconfig/icons/ShapeCircle.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/ShapeCircle.svg
diff --git a/src/main/resources/assets/oneconfig/icons/ShapeDot.svg b/src/main/resources/assets/oneconfig/old-icons/ShapeDot.svg
index 25e6212..25e6212 100644
--- a/src/main/resources/assets/oneconfig/icons/ShapeDot.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/ShapeDot.svg
diff --git a/src/main/resources/assets/oneconfig/icons/ShapeHexagon.svg b/src/main/resources/assets/oneconfig/old-icons/ShapeHexagon.svg
index d17ee99..d17ee99 100644
--- a/src/main/resources/assets/oneconfig/icons/ShapeHexagon.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/ShapeHexagon.svg
diff --git a/src/main/resources/assets/oneconfig/icons/ShapePentagon.svg b/src/main/resources/assets/oneconfig/old-icons/ShapePentagon.svg
index bb5f191..bb5f191 100644
--- a/src/main/resources/assets/oneconfig/icons/ShapePentagon.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/ShapePentagon.svg
diff --git a/src/main/resources/assets/oneconfig/icons/ShapeSquare.svg b/src/main/resources/assets/oneconfig/old-icons/ShapeSquare.svg
index 3c730ff..3c730ff 100644
--- a/src/main/resources/assets/oneconfig/icons/ShapeSquare.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/ShapeSquare.svg
diff --git a/src/main/resources/assets/oneconfig/icons/ShapeTriangle.svg b/src/main/resources/assets/oneconfig/old-icons/ShapeTriangle.svg
index bdad1c0..bdad1c0 100644
--- a/src/main/resources/assets/oneconfig/icons/ShapeTriangle.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/ShapeTriangle.svg
diff --git a/src/main/resources/assets/oneconfig/icons/Share.svg b/src/main/resources/assets/oneconfig/old-icons/Share.svg
index 278b178..278b178 100644
--- a/src/main/resources/assets/oneconfig/icons/Share.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/Share.svg
diff --git a/src/main/resources/assets/oneconfig/icons/ShoppingBag.svg b/src/main/resources/assets/oneconfig/old-icons/ShoppingBag.svg
index e4b8f0a..e4b8f0a 100644
--- a/src/main/resources/assets/oneconfig/icons/ShoppingBag.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/ShoppingBag.svg
diff --git a/src/main/resources/assets/oneconfig/icons/Spacing.svg b/src/main/resources/assets/oneconfig/old-icons/Spacing.svg
index 4c6e54b..4c6e54b 100644
--- a/src/main/resources/assets/oneconfig/icons/Spacing.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/Spacing.svg
diff --git a/src/main/resources/assets/oneconfig/icons/Theme.svg b/src/main/resources/assets/oneconfig/old-icons/Theme.svg
index ca35bbc..ca35bbc 100644
--- a/src/main/resources/assets/oneconfig/icons/Theme.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/Theme.svg
diff --git a/src/main/resources/assets/oneconfig/icons/ThumbsDown.svg b/src/main/resources/assets/oneconfig/old-icons/ThumbsDown.svg
index c44c269..c44c269 100644
--- a/src/main/resources/assets/oneconfig/icons/ThumbsDown.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/ThumbsDown.svg
diff --git a/src/main/resources/assets/oneconfig/icons/ThumbsUp.svg b/src/main/resources/assets/oneconfig/old-icons/ThumbsUp.svg
index 5c09ab6..5c09ab6 100644
--- a/src/main/resources/assets/oneconfig/icons/ThumbsUp.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/ThumbsUp.svg
diff --git a/src/main/resources/assets/oneconfig/icons/Update.svg b/src/main/resources/assets/oneconfig/old-icons/Update.svg
index 480a338..480a338 100644
--- a/src/main/resources/assets/oneconfig/icons/Update.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/Update.svg
diff --git a/src/main/resources/assets/oneconfig/icons/VolumeHigh.svg b/src/main/resources/assets/oneconfig/old-icons/VolumeHigh.svg
index 774fb50..774fb50 100644
--- a/src/main/resources/assets/oneconfig/icons/VolumeHigh.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/VolumeHigh.svg
diff --git a/src/main/resources/assets/oneconfig/icons/VolumeMedium.svg b/src/main/resources/assets/oneconfig/old-icons/VolumeMedium.svg
index 8051e24..8051e24 100644
--- a/src/main/resources/assets/oneconfig/icons/VolumeMedium.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/VolumeMedium.svg
diff --git a/src/main/resources/assets/oneconfig/icons/VolumeMinus.svg b/src/main/resources/assets/oneconfig/old-icons/VolumeMinus.svg
index b93bd82..b93bd82 100644
--- a/src/main/resources/assets/oneconfig/icons/VolumeMinus.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/VolumeMinus.svg
diff --git a/src/main/resources/assets/oneconfig/icons/VolumeMute.svg b/src/main/resources/assets/oneconfig/old-icons/VolumeMute.svg
index 799fcd6..799fcd6 100644
--- a/src/main/resources/assets/oneconfig/icons/VolumeMute.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/VolumeMute.svg
diff --git a/src/main/resources/assets/oneconfig/icons/VolumeNone.svg b/src/main/resources/assets/oneconfig/old-icons/VolumeNone.svg
index e90af91..e90af91 100644
--- a/src/main/resources/assets/oneconfig/icons/VolumeNone.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/VolumeNone.svg
diff --git a/src/main/resources/assets/oneconfig/icons/VolumeOff.svg b/src/main/resources/assets/oneconfig/old-icons/VolumeOff.svg
index e515cba..e515cba 100644
--- a/src/main/resources/assets/oneconfig/icons/VolumeOff.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/VolumeOff.svg
diff --git a/src/main/resources/assets/oneconfig/icons/VolumePlus.svg b/src/main/resources/assets/oneconfig/old-icons/VolumePlus.svg
index c848f47..c848f47 100644
--- a/src/main/resources/assets/oneconfig/icons/VolumePlus.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/VolumePlus.svg
diff --git a/src/main/resources/assets/oneconfig/icons/Warning.svg b/src/main/resources/assets/oneconfig/old-icons/Warning.svg
index 9cc750e..9cc750e 100644
--- a/src/main/resources/assets/oneconfig/icons/Warning.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/Warning.svg
diff --git a/src/main/resources/assets/oneconfig/icons/Website.svg b/src/main/resources/assets/oneconfig/old-icons/Website.svg
index 3c3c3d1..3c3c3d1 100644
--- a/src/main/resources/assets/oneconfig/icons/Website.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/Website.svg
diff --git a/src/main/resources/assets/oneconfig/icons/XCircle.svg b/src/main/resources/assets/oneconfig/old-icons/XCircle.svg
index 7053f9a..7053f9a 100644
--- a/src/main/resources/assets/oneconfig/icons/XCircle.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/XCircle.svg
diff --git a/src/main/resources/assets/oneconfig/icons/XCross.svg b/src/main/resources/assets/oneconfig/old-icons/XCross.svg
index 5e9e9be..5e9e9be 100644
--- a/src/main/resources/assets/oneconfig/icons/XCross.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/XCross.svg
diff --git a/src/main/resources/assets/oneconfig/icons/ZoomIn.svg b/src/main/resources/assets/oneconfig/old-icons/ZoomIn.svg
index 24e6cee..24e6cee 100644
--- a/src/main/resources/assets/oneconfig/icons/ZoomIn.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/ZoomIn.svg
diff --git a/src/main/resources/assets/oneconfig/icons/ZoomOut.svg b/src/main/resources/assets/oneconfig/old-icons/ZoomOut.svg
index 52d4ff9..52d4ff9 100644
--- a/src/main/resources/assets/oneconfig/icons/ZoomOut.svg
+++ b/src/main/resources/assets/oneconfig/old-icons/ZoomOut.svg