From 6254bbc42d0611f8eaee97b6d4c7710d082c6826 Mon Sep 17 00:00:00 2001 From: MoonTidez <79183852+MoonTidez@users.noreply.github.com> Date: Sun, 15 May 2022 19:50:30 +0400 Subject: SVG + asset reorganization (#10) * Assets reorganization * forgot 4 pixels in alpha grid oops * Updated huegradient.png Reduces file size by only use 1px height instead of 720px while maintaining quality * we do a little renaming * new assets mapping * moon I hate you * e * moon is weird * make it compile * temp * part png rendering * svgs * fix some positionings and stuff Co-authored-by: DeDiamondPro <67508414+DeDiamondPro@users.noreply.github.com> --- .../java/cc/polyfrost/oneconfig/OneConfig.java | 2 +- .../cc/polyfrost/oneconfig/gui/OneConfigGui.java | 11 +- .../java/cc/polyfrost/oneconfig/gui/SideBar.java | 31 ++--- .../oneconfig/gui/elements/BasicButton.java | 23 ++-- .../oneconfig/gui/elements/ColorSelector.java | 15 +-- .../polyfrost/oneconfig/gui/elements/ModCard.java | 7 +- .../gui/elements/config/ConfigCheckbox.java | 7 +- .../gui/elements/config/ConfigColorElement.java | 2 +- .../gui/elements/config/ConfigDropdown.java | 13 +- .../oneconfig/gui/elements/config/ConfigInfo.java | 13 +- .../gui/elements/config/ConfigKeyBind.java | 3 +- .../gui/elements/config/ConfigPageButton.java | 3 +- .../gui/elements/config/ConfigTextBox.java | 3 +- .../gui/elements/config/ConfigUniSelector.java | 9 +- .../gui/elements/text/NumberInputField.java | 13 +- .../cc/polyfrost/oneconfig/gui/pages/HomePage.java | 3 +- .../cc/polyfrost/oneconfig/gui/pages/ModsPage.java | 3 +- .../polyfrost/oneconfig/lwjgl/RenderManager.java | 100 ++++++++++++++-- .../cc/polyfrost/oneconfig/lwjgl/image/Image.java | 21 ---- .../oneconfig/lwjgl/image/ImageLoader.java | 84 ++++++++++++- .../cc/polyfrost/oneconfig/lwjgl/image/Images.java | 55 +-------- .../cc/polyfrost/oneconfig/lwjgl/image/SVGs.java | 132 +++++++++++++++++++++ .../cc/polyfrost/oneconfig/utils/ColorUtils.java | 4 + .../assets/oneconfig/colorui/alphagrid.png | Bin 0 -> 145 bytes .../assets/oneconfig/colorui/close_color.png | Bin 599 -> 0 bytes .../assets/oneconfig/colorui/color_base.png | Bin 296 -> 0 bytes .../assets/oneconfig/colorui/color_base_large.png | Bin 5990 -> 0 bytes .../assets/oneconfig/colorui/color_base_long.png | Bin 3359 -> 0 bytes .../assets/oneconfig/colorui/color_wheel.png | Bin 193805 -> 0 bytes .../assets/oneconfig/colorui/colorwheel.png | Bin 0 -> 193805 bytes .../assets/oneconfig/colorui/hsbgradient.png | Bin 0 -> 43707 bytes .../assets/oneconfig/colorui/hue_gradient.png | Bin 1797 -> 0 bytes .../assets/oneconfig/colorui/huegradient.png | Bin 0 -> 223 bytes .../assets/oneconfig/icons/AlignHCenter.svg | 3 + .../assets/oneconfig/icons/AlignHLeft.svg | 3 + .../assets/oneconfig/icons/AlignHRight.svg | 3 + .../assets/oneconfig/icons/AlignVBottom.svg | 3 + .../assets/oneconfig/icons/AlignVMiddle.svg | 3 + .../resources/assets/oneconfig/icons/AlignVTop.svg | 3 + .../assets/oneconfig/icons/ArrowCircleDown.svg | 4 + .../assets/oneconfig/icons/ArrowCircleLeft.svg | 4 + .../assets/oneconfig/icons/ArrowCircleRight.svg | 4 + .../assets/oneconfig/icons/ArrowCircleUp.svg | 4 + .../resources/assets/oneconfig/icons/ArrowDown.svg | 3 + .../resources/assets/oneconfig/icons/ArrowLeft.svg | 3 + .../assets/oneconfig/icons/ArrowRight.svg | 3 + .../resources/assets/oneconfig/icons/ArrowUp.svg | 3 + .../assets/oneconfig/icons/AudioPause.svg | 4 + .../resources/assets/oneconfig/icons/AudioPlay.svg | 3 + .../assets/oneconfig/icons/AudioPrevious.svg | 4 + .../resources/assets/oneconfig/icons/AudioSkip.svg | 4 + .../resources/assets/oneconfig/icons/Backspace.svg | 4 + src/main/resources/assets/oneconfig/icons/Bell.svg | 5 + .../resources/assets/oneconfig/icons/BellOff.svg | 6 + src/main/resources/assets/oneconfig/icons/Box.svg | 3 + .../resources/assets/oneconfig/icons/Camera.svg | 4 + src/main/resources/assets/oneconfig/icons/Cart.svg | 6 + src/main/resources/assets/oneconfig/icons/Cash.svg | 15 +++ .../assets/oneconfig/icons/CashDollar.svg | 17 +++ .../assets/oneconfig/icons/CheckCircle.svg | 3 + .../assets/oneconfig/icons/CheckboxMixed.svg | 17 +++ .../assets/oneconfig/icons/CheckboxTick.svg | 17 +++ .../assets/oneconfig/icons/ChevronDown.svg | 3 + .../assets/oneconfig/icons/ChevronLeft.svg | 3 + .../assets/oneconfig/icons/ChevronRight.svg | 3 + .../resources/assets/oneconfig/icons/ChevronUp.svg | 3 + .../assets/oneconfig/icons/CircleMinus.svg | 4 + .../assets/oneconfig/icons/CirclePlus.svg | 4 + .../resources/assets/oneconfig/icons/Clock.svg | 4 + src/main/resources/assets/oneconfig/icons/Code.svg | 4 + .../assets/oneconfig/icons/ComboBoxDown.svg | 3 + .../assets/oneconfig/icons/ComboBoxUp.svg | 3 + .../resources/assets/oneconfig/icons/Content.svg | 5 + src/main/resources/assets/oneconfig/icons/Copy.svg | 3 + .../assets/oneconfig/icons/CreditCard.svg | 5 + .../assets/oneconfig/icons/CreditCardAdd.svg | 6 + src/main/resources/assets/oneconfig/icons/Cube.svg | 5 + .../resources/assets/oneconfig/icons/Dashboard.svg | 3 + .../resources/assets/oneconfig/icons/Delete.svg | 7 ++ .../resources/assets/oneconfig/icons/Dollar.svg | 4 + .../assets/oneconfig/icons/DollarCircle.svg | 6 + .../resources/assets/oneconfig/icons/Download.svg | 3 + .../assets/oneconfig/icons/DropdownList.svg | 4 + .../resources/assets/oneconfig/icons/Earth.svg | 5 + src/main/resources/assets/oneconfig/icons/Edit.svg | 3 + .../resources/assets/oneconfig/icons/Error.svg | 4 + .../resources/assets/oneconfig/icons/Export.svg | 3 + src/main/resources/assets/oneconfig/icons/Eye.svg | 4 + .../resources/assets/oneconfig/icons/EyeOff.svg | 4 + .../assets/oneconfig/icons/FabricLoader.svg | 6 + src/main/resources/assets/oneconfig/icons/File.svg | 5 + .../resources/assets/oneconfig/icons/Filter.svg | 5 + .../resources/assets/oneconfig/icons/Folder.svg | 3 + .../assets/oneconfig/icons/ForgeLoader.svg | 3 + src/main/resources/assets/oneconfig/icons/HUD.svg | 3 + .../assets/oneconfig/icons/HUDSettings.svg | 6 + .../resources/assets/oneconfig/icons/Hamburger.svg | 5 + .../assets/oneconfig/icons/HeartBroken.svg | 4 + .../resources/assets/oneconfig/icons/HeartFill.svg | 3 + .../assets/oneconfig/icons/HeartOutline.svg | 3 + .../assets/oneconfig/icons/HelpCircle.svg | 4 + .../resources/assets/oneconfig/icons/History.svg | 4 + src/main/resources/assets/oneconfig/icons/Home.svg | 3 + .../resources/assets/oneconfig/icons/Image.svg | 4 + .../assets/oneconfig/icons/InfoCircle.svg | 4 + .../assets/oneconfig/icons/ItemLinkBroke.svg | 3 + .../assets/oneconfig/icons/ItemLinked.svg | 3 + .../resources/assets/oneconfig/icons/Keystroke.svg | 6 + .../assets/oneconfig/icons/LaunchProfiles.svg | 4 + .../assets/oneconfig/icons/LinkDiagonal.svg | 3 + .../assets/oneconfig/icons/LinkHorizontal.svg | 3 + .../resources/assets/oneconfig/icons/Loading.svg | 4 + .../assets/oneconfig/icons/LocationPoint.svg | 4 + .../resources/assets/oneconfig/icons/Maximise.svg | 4 + src/main/resources/assets/oneconfig/icons/Mic.svg | 5 + .../resources/assets/oneconfig/icons/MicOff.svg | 4 + .../assets/oneconfig/icons/MicrosoftIcon.svg | 6 + .../resources/assets/oneconfig/icons/Minimise.svg | 4 + src/main/resources/assets/oneconfig/icons/Mods.svg | 5 + src/main/resources/assets/oneconfig/icons/Move.svg | 6 + .../assets/oneconfig/icons/Navigation.svg | 3 + .../resources/assets/oneconfig/icons/OneConfig.svg | 4 + .../assets/oneconfig/icons/OneConfigOff.svg | 7 ++ .../resources/assets/oneconfig/icons/Paste.svg | 4 + .../assets/oneconfig/icons/Performance.svg | 4 + .../resources/assets/oneconfig/icons/PopOut.svg | 3 + .../resources/assets/oneconfig/icons/Profiles.svg | 3 + .../resources/assets/oneconfig/icons/Reset.svg | 4 + src/main/resources/assets/oneconfig/icons/Save.svg | 5 + .../resources/assets/oneconfig/icons/Search.svg | 4 + src/main/resources/assets/oneconfig/icons/Send.svg | 3 + .../resources/assets/oneconfig/icons/Settings.svg | 4 + .../assets/oneconfig/icons/ShapeCircle.svg | 3 + .../resources/assets/oneconfig/icons/ShapeDot.svg | 3 + .../assets/oneconfig/icons/ShapeHexagon.svg | 3 + .../assets/oneconfig/icons/ShapePentagon.svg | 3 + .../assets/oneconfig/icons/ShapeSquare.svg | 3 + .../assets/oneconfig/icons/ShapeTriangle.svg | 3 + .../resources/assets/oneconfig/icons/Share.svg | 3 + .../assets/oneconfig/icons/ShoppingBag.svg | 5 + .../resources/assets/oneconfig/icons/Spacing.svg | 5 + .../resources/assets/oneconfig/icons/Theme.svg | 4 + .../assets/oneconfig/icons/ThumbsDown.svg | 5 + .../resources/assets/oneconfig/icons/ThumbsUp.svg | 5 + .../resources/assets/oneconfig/icons/Update.svg | 4 + .../assets/oneconfig/icons/VolumeHigh.svg | 5 + .../assets/oneconfig/icons/VolumeMedium.svg | 4 + .../assets/oneconfig/icons/VolumeMinus.svg | 4 + .../assets/oneconfig/icons/VolumeMute.svg | 4 + .../assets/oneconfig/icons/VolumeNone.svg | 3 + .../resources/assets/oneconfig/icons/VolumeOff.svg | 4 + .../assets/oneconfig/icons/VolumePlus.svg | 4 + .../resources/assets/oneconfig/icons/Warning.svg | 5 + .../resources/assets/oneconfig/icons/Website.svg | 6 + .../resources/assets/oneconfig/icons/XCircle.svg | 5 + .../resources/assets/oneconfig/icons/XCross.svg | 3 + .../resources/assets/oneconfig/icons/ZoomIn.svg | 5 + .../resources/assets/oneconfig/icons/ZoomOut.svg | 5 + .../resources/assets/oneconfig/icons/checkmark.png | Bin 1714 -> 0 bytes .../resources/assets/oneconfig/icons/chevron.png | Bin 190 -> 0 bytes .../assets/oneconfig/icons/circle_arrow.png | Bin 394 -> 0 bytes .../resources/assets/oneconfig/icons/close.png | Bin 383 -> 0 bytes src/main/resources/assets/oneconfig/icons/copy.png | Bin 393 -> 0 bytes .../resources/assets/oneconfig/icons/dashboard.png | Bin 405 -> 0 bytes .../assets/oneconfig/icons/dropdown_arrow.png | Bin 164 -> 0 bytes .../resources/assets/oneconfig/icons/error.png | Bin 2080 -> 0 bytes .../assets/oneconfig/icons/favorite_active.png | Bin 323 -> 0 bytes .../assets/oneconfig/icons/favorite_inactive.png | Bin 426 -> 0 bytes src/main/resources/assets/oneconfig/icons/help.png | Bin 660 -> 0 bytes .../resources/assets/oneconfig/icons/hide_eye.png | Bin 338 -> 0 bytes .../assets/oneconfig/icons/hide_eye_off.png | Bin 619 -> 0 bytes src/main/resources/assets/oneconfig/icons/hud.png | Bin 379 -> 0 bytes src/main/resources/assets/oneconfig/icons/info.png | Bin 1145 -> 0 bytes .../resources/assets/oneconfig/icons/keystroke.png | Bin 248 -> 0 bytes .../resources/assets/oneconfig/icons/launch.png | Bin 430 -> 0 bytes src/main/resources/assets/oneconfig/icons/logo.png | Bin 1819 -> 0 bytes .../resources/assets/oneconfig/icons/minimize.png | Bin 302 -> 0 bytes .../resources/assets/oneconfig/icons/mod_box.png | Bin 1472 -> 0 bytes src/main/resources/assets/oneconfig/icons/mods.png | Bin 285 -> 0 bytes .../resources/assets/oneconfig/icons/paste.png | Bin 324 -> 0 bytes .../assets/oneconfig/icons/performance.png | Bin 381 -> 0 bytes .../assets/oneconfig/icons/preferences.png | Bin 425 -> 0 bytes .../resources/assets/oneconfig/icons/profiles.png | Bin 437 -> 0 bytes .../assets/oneconfig/icons/screenshot.png | Bin 369 -> 0 bytes .../resources/assets/oneconfig/icons/search.png | Bin 555 -> 0 bytes .../resources/assets/oneconfig/icons/settings.png | Bin 399 -> 0 bytes .../resources/assets/oneconfig/icons/share.png | Bin 480 -> 0 bytes .../resources/assets/oneconfig/icons/success.png | Bin 2260 -> 0 bytes .../resources/assets/oneconfig/icons/themes.png | Bin 304 -> 0 bytes .../resources/assets/oneconfig/icons/up_arrow.png | Bin 162 -> 0 bytes .../resources/assets/oneconfig/icons/updates.png | Bin 343 -> 0 bytes .../resources/assets/oneconfig/icons/warning.png | Bin 1936 -> 0 bytes 192 files changed, 945 insertions(+), 161 deletions(-) delete mode 100644 src/main/java/cc/polyfrost/oneconfig/lwjgl/image/Image.java create mode 100644 src/main/java/cc/polyfrost/oneconfig/lwjgl/image/SVGs.java create mode 100644 src/main/resources/assets/oneconfig/colorui/alphagrid.png delete mode 100644 src/main/resources/assets/oneconfig/colorui/close_color.png delete mode 100644 src/main/resources/assets/oneconfig/colorui/color_base.png delete mode 100644 src/main/resources/assets/oneconfig/colorui/color_base_large.png delete mode 100644 src/main/resources/assets/oneconfig/colorui/color_base_long.png delete mode 100644 src/main/resources/assets/oneconfig/colorui/color_wheel.png create mode 100644 src/main/resources/assets/oneconfig/colorui/colorwheel.png create mode 100644 src/main/resources/assets/oneconfig/colorui/hsbgradient.png delete mode 100644 src/main/resources/assets/oneconfig/colorui/hue_gradient.png create mode 100644 src/main/resources/assets/oneconfig/colorui/huegradient.png create mode 100644 src/main/resources/assets/oneconfig/icons/AlignHCenter.svg create mode 100644 src/main/resources/assets/oneconfig/icons/AlignHLeft.svg create mode 100644 src/main/resources/assets/oneconfig/icons/AlignHRight.svg create mode 100644 src/main/resources/assets/oneconfig/icons/AlignVBottom.svg create mode 100644 src/main/resources/assets/oneconfig/icons/AlignVMiddle.svg create mode 100644 src/main/resources/assets/oneconfig/icons/AlignVTop.svg create mode 100644 src/main/resources/assets/oneconfig/icons/ArrowCircleDown.svg create mode 100644 src/main/resources/assets/oneconfig/icons/ArrowCircleLeft.svg create mode 100644 src/main/resources/assets/oneconfig/icons/ArrowCircleRight.svg create mode 100644 src/main/resources/assets/oneconfig/icons/ArrowCircleUp.svg create mode 100644 src/main/resources/assets/oneconfig/icons/ArrowDown.svg create mode 100644 src/main/resources/assets/oneconfig/icons/ArrowLeft.svg create mode 100644 src/main/resources/assets/oneconfig/icons/ArrowRight.svg create mode 100644 src/main/resources/assets/oneconfig/icons/ArrowUp.svg create mode 100644 src/main/resources/assets/oneconfig/icons/AudioPause.svg create mode 100644 src/main/resources/assets/oneconfig/icons/AudioPlay.svg create mode 100644 src/main/resources/assets/oneconfig/icons/AudioPrevious.svg create mode 100644 src/main/resources/assets/oneconfig/icons/AudioSkip.svg create mode 100644 src/main/resources/assets/oneconfig/icons/Backspace.svg create mode 100644 src/main/resources/assets/oneconfig/icons/Bell.svg create mode 100644 src/main/resources/assets/oneconfig/icons/BellOff.svg create mode 100644 src/main/resources/assets/oneconfig/icons/Box.svg create mode 100644 src/main/resources/assets/oneconfig/icons/Camera.svg create mode 100644 src/main/resources/assets/oneconfig/icons/Cart.svg create mode 100644 src/main/resources/assets/oneconfig/icons/Cash.svg create mode 100644 src/main/resources/assets/oneconfig/icons/CashDollar.svg create mode 100644 src/main/resources/assets/oneconfig/icons/CheckCircle.svg create mode 100644 src/main/resources/assets/oneconfig/icons/CheckboxMixed.svg create mode 100644 src/main/resources/assets/oneconfig/icons/CheckboxTick.svg create mode 100644 src/main/resources/assets/oneconfig/icons/ChevronDown.svg create mode 100644 src/main/resources/assets/oneconfig/icons/ChevronLeft.svg create mode 100644 src/main/resources/assets/oneconfig/icons/ChevronRight.svg create mode 100644 src/main/resources/assets/oneconfig/icons/ChevronUp.svg create mode 100644 src/main/resources/assets/oneconfig/icons/CircleMinus.svg create mode 100644 src/main/resources/assets/oneconfig/icons/CirclePlus.svg create mode 100644 src/main/resources/assets/oneconfig/icons/Clock.svg create mode 100644 src/main/resources/assets/oneconfig/icons/Code.svg create mode 100644 src/main/resources/assets/oneconfig/icons/ComboBoxDown.svg create mode 100644 src/main/resources/assets/oneconfig/icons/ComboBoxUp.svg create mode 100644 src/main/resources/assets/oneconfig/icons/Content.svg create mode 100644 src/main/resources/assets/oneconfig/icons/Copy.svg create mode 100644 src/main/resources/assets/oneconfig/icons/CreditCard.svg create mode 100644 src/main/resources/assets/oneconfig/icons/CreditCardAdd.svg create mode 100644 src/main/resources/assets/oneconfig/icons/Cube.svg create mode 100644 src/main/resources/assets/oneconfig/icons/Dashboard.svg create mode 100644 src/main/resources/assets/oneconfig/icons/Delete.svg create mode 100644 src/main/resources/assets/oneconfig/icons/Dollar.svg create mode 100644 src/main/resources/assets/oneconfig/icons/DollarCircle.svg create mode 100644 src/main/resources/assets/oneconfig/icons/Download.svg create mode 100644 src/main/resources/assets/oneconfig/icons/DropdownList.svg create mode 100644 src/main/resources/assets/oneconfig/icons/Earth.svg create mode 100644 src/main/resources/assets/oneconfig/icons/Edit.svg create mode 100644 src/main/resources/assets/oneconfig/icons/Error.svg create mode 100644 src/main/resources/assets/oneconfig/icons/Export.svg create mode 100644 src/main/resources/assets/oneconfig/icons/Eye.svg create mode 100644 src/main/resources/assets/oneconfig/icons/EyeOff.svg create mode 100644 src/main/resources/assets/oneconfig/icons/FabricLoader.svg create mode 100644 src/main/resources/assets/oneconfig/icons/File.svg create mode 100644 src/main/resources/assets/oneconfig/icons/Filter.svg create mode 100644 src/main/resources/assets/oneconfig/icons/Folder.svg create mode 100644 src/main/resources/assets/oneconfig/icons/ForgeLoader.svg create mode 100644 src/main/resources/assets/oneconfig/icons/HUD.svg create mode 100644 src/main/resources/assets/oneconfig/icons/HUDSettings.svg create mode 100644 src/main/resources/assets/oneconfig/icons/Hamburger.svg create mode 100644 src/main/resources/assets/oneconfig/icons/HeartBroken.svg create mode 100644 src/main/resources/assets/oneconfig/icons/HeartFill.svg create mode 100644 src/main/resources/assets/oneconfig/icons/HeartOutline.svg create mode 100644 src/main/resources/assets/oneconfig/icons/HelpCircle.svg create mode 100644 src/main/resources/assets/oneconfig/icons/History.svg create mode 100644 src/main/resources/assets/oneconfig/icons/Home.svg create mode 100644 src/main/resources/assets/oneconfig/icons/Image.svg create mode 100644 src/main/resources/assets/oneconfig/icons/InfoCircle.svg create mode 100644 src/main/resources/assets/oneconfig/icons/ItemLinkBroke.svg create mode 100644 src/main/resources/assets/oneconfig/icons/ItemLinked.svg create mode 100644 src/main/resources/assets/oneconfig/icons/Keystroke.svg create mode 100644 src/main/resources/assets/oneconfig/icons/LaunchProfiles.svg create mode 100644 src/main/resources/assets/oneconfig/icons/LinkDiagonal.svg create mode 100644 src/main/resources/assets/oneconfig/icons/LinkHorizontal.svg create mode 100644 src/main/resources/assets/oneconfig/icons/Loading.svg create mode 100644 src/main/resources/assets/oneconfig/icons/LocationPoint.svg create mode 100644 src/main/resources/assets/oneconfig/icons/Maximise.svg create mode 100644 src/main/resources/assets/oneconfig/icons/Mic.svg create mode 100644 src/main/resources/assets/oneconfig/icons/MicOff.svg create mode 100644 src/main/resources/assets/oneconfig/icons/MicrosoftIcon.svg create mode 100644 src/main/resources/assets/oneconfig/icons/Minimise.svg create mode 100644 src/main/resources/assets/oneconfig/icons/Mods.svg create mode 100644 src/main/resources/assets/oneconfig/icons/Move.svg create mode 100644 src/main/resources/assets/oneconfig/icons/Navigation.svg create mode 100644 src/main/resources/assets/oneconfig/icons/OneConfig.svg create mode 100644 src/main/resources/assets/oneconfig/icons/OneConfigOff.svg create mode 100644 src/main/resources/assets/oneconfig/icons/Paste.svg create mode 100644 src/main/resources/assets/oneconfig/icons/Performance.svg create mode 100644 src/main/resources/assets/oneconfig/icons/PopOut.svg create mode 100644 src/main/resources/assets/oneconfig/icons/Profiles.svg create mode 100644 src/main/resources/assets/oneconfig/icons/Reset.svg create mode 100644 src/main/resources/assets/oneconfig/icons/Save.svg create mode 100644 src/main/resources/assets/oneconfig/icons/Search.svg create mode 100644 src/main/resources/assets/oneconfig/icons/Send.svg create mode 100644 src/main/resources/assets/oneconfig/icons/Settings.svg create mode 100644 src/main/resources/assets/oneconfig/icons/ShapeCircle.svg create mode 100644 src/main/resources/assets/oneconfig/icons/ShapeDot.svg create mode 100644 src/main/resources/assets/oneconfig/icons/ShapeHexagon.svg create mode 100644 src/main/resources/assets/oneconfig/icons/ShapePentagon.svg create mode 100644 src/main/resources/assets/oneconfig/icons/ShapeSquare.svg create mode 100644 src/main/resources/assets/oneconfig/icons/ShapeTriangle.svg create mode 100644 src/main/resources/assets/oneconfig/icons/Share.svg create mode 100644 src/main/resources/assets/oneconfig/icons/ShoppingBag.svg create mode 100644 src/main/resources/assets/oneconfig/icons/Spacing.svg create mode 100644 src/main/resources/assets/oneconfig/icons/Theme.svg create mode 100644 src/main/resources/assets/oneconfig/icons/ThumbsDown.svg create mode 100644 src/main/resources/assets/oneconfig/icons/ThumbsUp.svg create mode 100644 src/main/resources/assets/oneconfig/icons/Update.svg create mode 100644 src/main/resources/assets/oneconfig/icons/VolumeHigh.svg create mode 100644 src/main/resources/assets/oneconfig/icons/VolumeMedium.svg create mode 100644 src/main/resources/assets/oneconfig/icons/VolumeMinus.svg create mode 100644 src/main/resources/assets/oneconfig/icons/VolumeMute.svg create mode 100644 src/main/resources/assets/oneconfig/icons/VolumeNone.svg create mode 100644 src/main/resources/assets/oneconfig/icons/VolumeOff.svg create mode 100644 src/main/resources/assets/oneconfig/icons/VolumePlus.svg create mode 100644 src/main/resources/assets/oneconfig/icons/Warning.svg create mode 100644 src/main/resources/assets/oneconfig/icons/Website.svg create mode 100644 src/main/resources/assets/oneconfig/icons/XCircle.svg create mode 100644 src/main/resources/assets/oneconfig/icons/XCross.svg create mode 100644 src/main/resources/assets/oneconfig/icons/ZoomIn.svg create mode 100644 src/main/resources/assets/oneconfig/icons/ZoomOut.svg delete mode 100644 src/main/resources/assets/oneconfig/icons/checkmark.png delete mode 100644 src/main/resources/assets/oneconfig/icons/chevron.png delete mode 100644 src/main/resources/assets/oneconfig/icons/circle_arrow.png delete mode 100644 src/main/resources/assets/oneconfig/icons/close.png delete mode 100644 src/main/resources/assets/oneconfig/icons/copy.png delete mode 100644 src/main/resources/assets/oneconfig/icons/dashboard.png delete mode 100644 src/main/resources/assets/oneconfig/icons/dropdown_arrow.png delete mode 100644 src/main/resources/assets/oneconfig/icons/error.png delete mode 100644 src/main/resources/assets/oneconfig/icons/favorite_active.png delete mode 100644 src/main/resources/assets/oneconfig/icons/favorite_inactive.png delete mode 100644 src/main/resources/assets/oneconfig/icons/help.png delete mode 100644 src/main/resources/assets/oneconfig/icons/hide_eye.png delete mode 100644 src/main/resources/assets/oneconfig/icons/hide_eye_off.png delete mode 100644 src/main/resources/assets/oneconfig/icons/hud.png delete mode 100644 src/main/resources/assets/oneconfig/icons/info.png delete mode 100644 src/main/resources/assets/oneconfig/icons/keystroke.png delete mode 100644 src/main/resources/assets/oneconfig/icons/launch.png delete mode 100644 src/main/resources/assets/oneconfig/icons/logo.png delete mode 100644 src/main/resources/assets/oneconfig/icons/minimize.png delete mode 100644 src/main/resources/assets/oneconfig/icons/mod_box.png delete mode 100644 src/main/resources/assets/oneconfig/icons/mods.png delete mode 100644 src/main/resources/assets/oneconfig/icons/paste.png delete mode 100644 src/main/resources/assets/oneconfig/icons/performance.png delete mode 100644 src/main/resources/assets/oneconfig/icons/preferences.png delete mode 100644 src/main/resources/assets/oneconfig/icons/profiles.png delete mode 100644 src/main/resources/assets/oneconfig/icons/screenshot.png delete mode 100644 src/main/resources/assets/oneconfig/icons/search.png delete mode 100644 src/main/resources/assets/oneconfig/icons/settings.png delete mode 100644 src/main/resources/assets/oneconfig/icons/share.png delete mode 100644 src/main/resources/assets/oneconfig/icons/success.png delete mode 100644 src/main/resources/assets/oneconfig/icons/themes.png delete mode 100644 src/main/resources/assets/oneconfig/icons/up_arrow.png delete mode 100644 src/main/resources/assets/oneconfig/icons/updates.png delete mode 100644 src/main/resources/assets/oneconfig/icons/warning.png diff --git a/src/main/java/cc/polyfrost/oneconfig/OneConfig.java b/src/main/java/cc/polyfrost/oneconfig/OneConfig.java index 2dfca40..3661c42 100644 --- a/src/main/java/cc/polyfrost/oneconfig/OneConfig.java +++ b/src/main/java/cc/polyfrost/oneconfig/OneConfig.java @@ -57,7 +57,7 @@ public class OneConfig { RenderManager.setupAndDraw((vg) -> { RenderManager.drawRoundedRect(vg, -100, -100, 50, 50, -1, 12f); RenderManager.drawString(vg, "OneConfig loading...", -100, -100, -1, 12f, Fonts.MEDIUM); - RenderManager.drawImage(vg, Images.LOGO, -100, -100, 50, 50); + RenderManager.drawImage(vg, Images.HUE_GRADIENT, -100, -100, 50, 50); }); } diff --git a/src/main/java/cc/polyfrost/oneconfig/gui/OneConfigGui.java b/src/main/java/cc/polyfrost/oneconfig/gui/OneConfigGui.java index db32c92..97e03a6 100644 --- a/src/main/java/cc/polyfrost/oneconfig/gui/OneConfigGui.java +++ b/src/main/java/cc/polyfrost/oneconfig/gui/OneConfigGui.java @@ -10,6 +10,7 @@ import cc.polyfrost.oneconfig.lwjgl.OneColor; import cc.polyfrost.oneconfig.lwjgl.RenderManager; import cc.polyfrost.oneconfig.lwjgl.font.Fonts; import cc.polyfrost.oneconfig.lwjgl.image.Images; +import cc.polyfrost.oneconfig.lwjgl.image.SVGs; import cc.polyfrost.oneconfig.lwjgl.scissor.Scissor; import cc.polyfrost.oneconfig.lwjgl.scissor.ScissorManager; import cc.polyfrost.oneconfig.utils.InputUtils; @@ -84,7 +85,7 @@ public class OneConfigGui extends UScreen { RenderManager.drawLine(vg, x + 224, y + 72, x + 1280, y + 72, 1, OneConfigConfig.GRAY_700); RenderManager.drawLine(vg, x + 224, y, x + 222, y + 800, 1, OneConfigConfig.GRAY_700); - RenderManager.drawImage(vg, Images.LOGO, x + 19, y + 19, 42, 42); + RenderManager.drawSvg(vg, SVGs.ONECONFIG, x + 19, y + 19, 42, 42); RenderManager.drawString(vg, "OneConfig", x + 69, y + 32, OneConfigConfig.WHITE, 18f, Fonts.BOLD); // added half line height to center text RenderManager.drawString(vg, "ALPHA - By Polyfrost", x + 69, y + 51, OneConfigConfig.WHITE, 12f, Fonts.REGULAR); @@ -104,7 +105,7 @@ public class OneConfigGui extends UScreen { backArrow.disable(false); if (!backArrow.isHovered() || Mouse.isButtonDown(0)) NanoVG.nvgGlobalAlpha(vg, 0.8f); } - RenderManager.drawImage(vg, Images.CIRCLE_ARROW, x + 271, y + 25, -22, 22); + RenderManager.drawSvg(vg, SVGs.ARROW_CIRCLE_LEFT, x + 249, y + 25, 22, 22); NanoVG.nvgGlobalAlpha(vg, 1f); if (nextPages.size() == 0) { forwardArrow.disable(true); @@ -113,7 +114,7 @@ public class OneConfigGui extends UScreen { forwardArrow.disable(false); if (!forwardArrow.isHovered() || Mouse.isButtonDown(0)) NanoVG.nvgGlobalAlpha(vg, 0.8f); } - RenderManager.drawImage(vg, Images.CIRCLE_ARROW, x + 289, y + 25, 22, 22); + RenderManager.drawSvg(vg, SVGs.ARROW_CIRCLE_RIGHT, x + 289, y + 25, 22, 22); NanoVG.nvgGlobalAlpha(vg, 1f); if (backArrow.isClicked() && previousPages.size() > 0) { @@ -157,9 +158,7 @@ public class OneConfigGui extends UScreen { else if (hovered && !Mouse.isButtonDown(0)) color = OneConfigConfig.WHITE_80; RenderManager.drawString(vg, title, breadcrumbX, y + 38, color, 24f, Fonts.SEMIBOLD); if (i != 0) - RenderManager.drawImage(vg, Images.CHEVRON_ARROW, breadcrumbX - 22, y + 26, 13, 22, color); - if (hovered && i != parents.size() - 1) - RenderManager.drawLine(vg, breadcrumbX, y + 48, breadcrumbX + width, y + 48, 2, color); + RenderManager.drawSvg(vg, SVGs.CHEVRON_RIGHT, breadcrumbX - 28, y + 25, 24, 24, color); if (hovered && InputUtils.isClicked()) openPage(parents.get(i)); breadcrumbX += width + 32; } diff --git a/src/main/java/cc/polyfrost/oneconfig/gui/SideBar.java b/src/main/java/cc/polyfrost/oneconfig/gui/SideBar.java index 85d88f9..fcbf647 100644 --- a/src/main/java/cc/polyfrost/oneconfig/gui/SideBar.java +++ b/src/main/java/cc/polyfrost/oneconfig/gui/SideBar.java @@ -7,6 +7,7 @@ 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.Images; +import cc.polyfrost.oneconfig.lwjgl.image.SVGs; import cc.polyfrost.oneconfig.utils.MathUtils; import gg.essential.universal.UScreen; @@ -19,24 +20,24 @@ public class SideBar { private float targetY = 0, currentY = 0; public SideBar() { - btnList.add(new BasicButton(192, 36, "Dashboard", Images.DASHBOARD, null, -3, BasicButton.ALIGNMENT_LEFT, new HomePage())); - btnList.add(new BasicButton(192, 36, "Global Search", Images.SEARCH, null, -3, BasicButton.ALIGNMENT_LEFT)); - btnList.add(new BasicButton(192, 36, "Screenshots", Images.SCREENSHOT, null, -3, BasicButton.ALIGNMENT_LEFT)); - btnList.add(new BasicButton(192, 36, "Preferences", Images.PREFERENCES, null, -3, BasicButton.ALIGNMENT_LEFT)); - btnList.add(new BasicButton(192, 36, "Mods", Images.MODS, null, -3, BasicButton.ALIGNMENT_LEFT, new ModsPage())); - btnList.add(new BasicButton(192, 36, "Performance", Images.PERFORMANCE, null, -3, BasicButton.ALIGNMENT_LEFT)); - btnList.add(new BasicButton(192, 36, "Profiles", Images.PROFILES, null, -3, BasicButton.ALIGNMENT_LEFT)); - btnList.add(new BasicButton(192, 36, "Updates", Images.UPDATES, null, -3, BasicButton.ALIGNMENT_LEFT)); - btnList.add(new BasicButton(192, 36, "Themes Library", Images.THEMES, null, -3, BasicButton.ALIGNMENT_LEFT)); - btnList.add(new BasicButton(192, 36, "Themes Browser", Images.SEARCH, null, -3, BasicButton.ALIGNMENT_LEFT)); - btnList.add(new BasicButton(192, 36, "Packs Library", Images.MOD_BOX, null, -3, BasicButton.ALIGNMENT_LEFT)); - btnList.add(new BasicButton(192, 36, "Packs Browser", Images.SEARCH, null, -3, BasicButton.ALIGNMENT_LEFT)); - btnList.add(new BasicButton(192, 36, "Close", Images.CLOSE, null, -1, BasicButton.ALIGNMENT_LEFT, () -> UScreen.displayScreen(null))); - btnList.add(new BasicButton(192, 36, "Minimize", Images.MINIMIZE, null, -1, BasicButton.ALIGNMENT_LEFT, () -> { + btnList.add(new BasicButton(192, 36, "Dashboard", SVGs.DASHBOARD, null, -3, BasicButton.ALIGNMENT_LEFT, new HomePage())); + btnList.add(new BasicButton(192, 36, "Global Search", SVGs.SEARCH, null, -3, BasicButton.ALIGNMENT_LEFT)); + btnList.add(new BasicButton(192, 36, "Screenshots", SVGs.IMAGE, null, -3, BasicButton.ALIGNMENT_LEFT)); + btnList.add(new BasicButton(192, 36, "Preferences", SVGs.SETTINGS, null, -3, BasicButton.ALIGNMENT_LEFT)); + btnList.add(new BasicButton(192, 36, "Mods", SVGs.MODS, null, -3, BasicButton.ALIGNMENT_LEFT, new ModsPage())); + btnList.add(new BasicButton(192, 36, "Performance", SVGs.PERFORMANCE, null, -3, BasicButton.ALIGNMENT_LEFT)); + btnList.add(new BasicButton(192, 36, "Profiles", SVGs.PROFILES, null, -3, BasicButton.ALIGNMENT_LEFT)); + btnList.add(new BasicButton(192, 36, "Updates", SVGs.UPDATE, null, -3, BasicButton.ALIGNMENT_LEFT)); + btnList.add(new BasicButton(192, 36, "Themes Library", SVGs.THEME, null, -3, BasicButton.ALIGNMENT_LEFT)); + btnList.add(new BasicButton(192, 36, "Themes Browser", SVGs.SEARCH, null, -3, BasicButton.ALIGNMENT_LEFT)); + btnList.add(new BasicButton(192, 36, "Packs Library", SVGs.BOX, null, -3, BasicButton.ALIGNMENT_LEFT)); + btnList.add(new BasicButton(192, 36, "Packs Browser", SVGs.SEARCH, null, -3, BasicButton.ALIGNMENT_LEFT)); + btnList.add(new BasicButton(192, 36, "Close", SVGs.X_CIRCLE, null, -1, BasicButton.ALIGNMENT_LEFT, () -> UScreen.displayScreen(null))); + btnList.add(new BasicButton(192, 36, "Minimize", SVGs.MINIMISE, null, -1, BasicButton.ALIGNMENT_LEFT, () -> { OneConfigGui.instanceToRestore = OneConfigGui.INSTANCE; UScreen.displayScreen(null); })); - btnList.add(new BasicButton(192, 36, "Edit HUD", Images.HUD, null, 0, BasicButton.ALIGNMENT_LEFT, () -> UScreen.displayScreen(new HudGui()))); + btnList.add(new BasicButton(192, 36, "Edit HUD", SVGs.HUD, null, 0, BasicButton.ALIGNMENT_LEFT, () -> UScreen.displayScreen(new HudGui()))); } public void draw(long vg, int x, int y) { 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 f705d0b..2b2f590 100644 --- a/src/main/java/cc/polyfrost/oneconfig/gui/elements/BasicButton.java +++ b/src/main/java/cc/polyfrost/oneconfig/gui/elements/BasicButton.java @@ -6,6 +6,7 @@ import cc.polyfrost.oneconfig.gui.pages.Page; import cc.polyfrost.oneconfig.lwjgl.RenderManager; import cc.polyfrost.oneconfig.lwjgl.font.Fonts; import cc.polyfrost.oneconfig.lwjgl.image.Images; +import cc.polyfrost.oneconfig.lwjgl.image.SVGs; import cc.polyfrost.oneconfig.utils.ColorUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -13,7 +14,7 @@ import org.jetbrains.annotations.Nullable; public class BasicButton extends BasicElement { protected String text; - protected Images fileNameLeftIco, fileNameRightIco; + protected SVGs fileNameLeftIco, fileNameRightIco; private final int thisAlignment; private final float fontSize; private final int colorPalette; @@ -35,7 +36,7 @@ public class BasicButton extends BasicElement { * @param colorPalette color palette to use. see {@link ColorUtils} for more info. Can support color palette of -2, which is larger font and icons. Also supports -3, which is just the text changing color. * @param alignment alignment of the button. ALIGNMENT_LEFT or ALIGNMENT_CENTER. */ - public BasicButton(int width, int height, @NotNull String text, @Nullable Images fileNameLeftIco, @Nullable Images fileNameRightIco, int colorPalette, int alignment) { + public BasicButton(int width, int height, @NotNull String text, @Nullable SVGs fileNameLeftIco, @Nullable SVGs fileNameRightIco, int colorPalette, int alignment) { super(width, height, colorPalette, true); this.text = text; if (fileNameLeftIco != null) this.fileNameLeftIco = fileNameLeftIco; @@ -51,22 +52,22 @@ public class BasicButton extends BasicElement { } } - public BasicButton(int width, int height, @NotNull String text, @Nullable Images fileNameLeftIco, @Nullable Images fileNameRightIco, int colorPalette, int alignment, Page page) { + public BasicButton(int width, int height, @NotNull String text, @Nullable SVGs fileNameLeftIco, @Nullable SVGs fileNameRightIco, int colorPalette, int alignment, Page page) { this(width, height, text, fileNameLeftIco, fileNameRightIco, colorPalette, alignment); this.page = page; } - public BasicButton(int width, int height, @NotNull String text, @Nullable Images fileNameLeftIco, @Nullable Images fileNameRightIco, int colorPalette, int alignment, boolean toggleable) { + public BasicButton(int width, int height, @NotNull String text, @Nullable SVGs fileNameLeftIco, @Nullable SVGs fileNameRightIco, int colorPalette, int alignment, boolean toggleable) { this(width, height, text, fileNameLeftIco, fileNameRightIco, colorPalette, alignment); this.toggleable = toggleable; } - public BasicButton(int width, int height, @NotNull String text, @Nullable Images fileNameLeftIco, @Nullable Images fileNameRightIco, int colorPalette, int alignment, Runnable runnable) { + public BasicButton(int width, int height, @NotNull String text, @Nullable SVGs fileNameLeftIco, @Nullable SVGs fileNameRightIco, int colorPalette, int alignment, Runnable runnable) { this(width, height, text, fileNameLeftIco, fileNameRightIco, colorPalette, alignment); this.runnable = runnable; } - public BasicButton(int width, int height, @NotNull String text, @Nullable Images fileNameLeftIco, @Nullable Images fileNameRightIco, int colorPalette, int alignment, boolean toggleable, Runnable runnable) { + public BasicButton(int width, int height, @NotNull String text, @Nullable SVGs fileNameLeftIco, @Nullable SVGs fileNameRightIco, int colorPalette, int alignment, boolean toggleable, Runnable runnable) { this(width, height, text, fileNameLeftIco, fileNameRightIco, colorPalette, alignment, runnable); this.toggleable = toggleable; } @@ -99,22 +100,22 @@ public class BasicButton extends BasicElement { else RenderManager.drawString(vg, text, middle - contentWidth / 2 + (fileNameLeftIco != null ? 28 : 0), y + ((float) height / 2) + 1, textColor, fontSize, Fonts.MEDIUM); if (fileNameLeftIco != null) { - if (alignIconLeft) RenderManager.drawImage(vg, fileNameLeftIco, x + 12, y + height / 2f - 10, 20, 20); - else RenderManager.drawImage(vg, fileNameLeftIco, middle - contentWidth / 2, y + 8, 20, 20); + if (alignIconLeft) RenderManager.drawSvg(vg, fileNameLeftIco, x + 12, y + height / 2f - 10, 20, 20); + else RenderManager.drawSvg(vg, fileNameLeftIco, middle - contentWidth / 2, y + 8, 20, 20); } if (fileNameRightIco != null) { - RenderManager.drawImage(vg, fileNameRightIco, middle + contentWidth / 2 - (fileNameLeftIco != null ? 20 : 24), y + 8, 20, 20); + RenderManager.drawSvg(vg, fileNameRightIco, middle + contentWidth / 2 - (fileNameLeftIco != null ? 20 : 24), y + 8, 20, 20); } } if (thisAlignment == ALIGNMENT_LEFT) { if (fileNameLeftIco != null) { - RenderManager.drawImage(vg, fileNameLeftIco, x + 12, y + 8, 20, 20, textColor); + RenderManager.drawSvg(vg, fileNameLeftIco, x + 12, y + 8, 20, 20, textColor); RenderManager.drawString(vg, text, x + 40, y + ((float) height / 2) + 1, textColor, fontSize, Fonts.MEDIUM); } else { RenderManager.drawString(vg, text, x + 12, y + ((float) height / 2) + 1, textColor, fontSize, Fonts.MEDIUM); } if (fileNameRightIco != null) { - RenderManager.drawImage(vg, fileNameRightIco, x + width - 28, y + 8, 20, 20); + RenderManager.drawSvg(vg, fileNameRightIco, x + width - 28, y + 8, 20, 20); } } this.update(x, y); 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 c309191..faef4ef 100644 --- a/src/main/java/cc/polyfrost/oneconfig/gui/elements/ColorSelector.java +++ b/src/main/java/cc/polyfrost/oneconfig/gui/elements/ColorSelector.java @@ -8,6 +8,7 @@ import cc.polyfrost.oneconfig.lwjgl.OneColor; import cc.polyfrost.oneconfig.lwjgl.RenderManager; import cc.polyfrost.oneconfig.lwjgl.font.Fonts; import cc.polyfrost.oneconfig.lwjgl.image.Images; +import cc.polyfrost.oneconfig.lwjgl.image.SVGs; import cc.polyfrost.oneconfig.utils.InputUtils; import cc.polyfrost.oneconfig.utils.MathUtils; import org.lwjgl.input.Mouse; @@ -77,7 +78,7 @@ public class ColorSelector { RenderManager.drawRoundedRect(vg, x, y, width, height, OneConfigConfig.GRAY_800, 20f); RenderManager.drawString(vg, "Color Selector", x + 16, y + 32, OneConfigConfig.WHITE_90, 18f, Fonts.SEMIBOLD); closeBtn.draw(vg, x + 368, y + 16); - RenderManager.drawImage(vg, Images.CLOSE_COLOR, x + 369, y + 17, 32, 32); + RenderManager.drawSvg(vg, SVGs.X_CIRCLE, x + 369, y + 17, 32, 32); if (closeBtn.isClicked()) { OneConfigGui.INSTANCE.closeColorSelector(); } @@ -144,12 +145,12 @@ public class ColorSelector { copyBtn.draw(vg, x + 204, y + 624); pasteBtn.draw(vg, x + 244, y + 624); - RenderManager.drawImage(vg, Images.COPY, x + 211, y + 631, 18, 18); - RenderManager.drawImage(vg, Images.PASTE, x + 251, y + 631, 18, 18); + RenderManager.drawSvg(vg, SVGs.COPY, x + 211, y + 631, 18, 18); + RenderManager.drawSvg(vg, SVGs.PASTE, x + 251, y + 631, 18, 18); guideBtn.draw(vg, x + 288, y + 624); - RenderManager.drawImage(vg, Images.HELP, x + 301, y + 631, 18, 18); - RenderManager.drawImage(vg, Images.LAUNCH, x + 369, y + 631, 18, 18); + RenderManager.drawSvg(vg, SVGs.HELP_CIRCLE, x + 301, y + 631, 18, 18); + RenderManager.drawSvg(vg, SVGs.POP_OUT, x + 369, y + 631, 18, 18); boolean drag; @@ -214,7 +215,7 @@ public class ColorSelector { break; } bottomSlider.setGradient(OneConfigConfig.TRANSPARENT_25, color.getRGBNoAlpha()); - RenderManager.drawImage(vg, Images.COLOR_BASE_LONG, x + 16, y + 456, 384, 16); + RenderManager.drawImage(vg, Images.ALPHA_GRID, x + 16, y + 456, 384, 16); bottomSlider.draw(vg, x + 16, y + 456); RenderManager.drawRoundedRect(vg, mouseX - 6, mouseY - 6, 12, 12, OneConfigConfig.WHITE, 12f); @@ -265,7 +266,7 @@ public class ColorSelector { // draw the color preview RenderManager.drawHollowRoundRect(vg, x + 15, y + 487, 384, 40, OneConfigConfig.GRAY_300, 12f, 2f); - RenderManager.drawImage(vg, Images.COLOR_BASE_LARGE, x + 20, y + 492, 376, 32); + RenderManager.drawImage(vg, Images.ALPHA_GRID, x + 20, y + 492, 376, 32); RenderManager.drawRoundedRect(vg, x + 20, y + 492, 376, 32, color.getRGB(), 8f); } diff --git a/src/main/java/cc/polyfrost/oneconfig/gui/elements/ModCard.java b/src/main/java/cc/polyfrost/oneconfig/gui/elements/ModCard.java index 9af35f1..4942f9f 100644 --- a/src/main/java/cc/polyfrost/oneconfig/gui/elements/ModCard.java +++ b/src/main/java/cc/polyfrost/oneconfig/gui/elements/ModCard.java @@ -9,6 +9,7 @@ import cc.polyfrost.oneconfig.gui.pages.ModConfigPage; import cc.polyfrost.oneconfig.lwjgl.RenderManager; import cc.polyfrost.oneconfig.lwjgl.font.Fonts; import cc.polyfrost.oneconfig.lwjgl.image.Images; +import cc.polyfrost.oneconfig.lwjgl.image.SVGs; import cc.polyfrost.oneconfig.utils.ColorUtils; import cc.polyfrost.oneconfig.utils.InputUtils; import gg.essential.universal.wrappers.UPlayer; @@ -50,7 +51,7 @@ public class ModCard extends BasicElement { if (iconPath != null) { RenderManager.drawImage(vg, iconPath, x, y, width, 87); } else { - RenderManager.drawImage(vg, Images.MOD_BOX, x + 98, y + 19, 48, 48); + RenderManager.drawSvg(vg, SVGs.BOX, x + 98, y + 19, 48, 48); } favoriteHitbox.update(x + 212, y + 87); favoriteHitbox.currentColor = ColorUtils.getColor(favoriteHitbox.currentColor, favoriteHitbox.colorPalette, favoriteHitbox.hovered, favoriteHitbox.clicked); @@ -58,9 +59,9 @@ public class ModCard extends BasicElement { favorite = favoriteHitbox.isToggled(); RenderManager.drawString(vg, modData.name, x + 12, y + 103, OneConfigConfig.WHITE, 14f, Fonts.MEDIUM); if (favorite) { - RenderManager.drawImage(vg, Images.FAVORITE, x + 220, y + 95, 16, 16); + RenderManager.drawSvg(vg, SVGs.HEART_FILL, x + 220, y + 95, 16, 16); } else { - RenderManager.drawImage(vg, Images.FAVORITE_OFF, x + 220, y + 95, 16, 16); + RenderManager.drawSvg(vg, SVGs.HEART_OUTLINE, x + 220, y + 95, 16, 16); } super.update(x, y); isHoveredMain = InputUtils.isAreaHovered(x, y, width, 87); diff --git a/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigCheckbox.java b/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigCheckbox.java index 8a30d71..4553739 100644 --- a/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigCheckbox.java +++ b/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigCheckbox.java @@ -5,6 +5,7 @@ import cc.polyfrost.oneconfig.config.interfaces.BasicOption; import cc.polyfrost.oneconfig.lwjgl.RenderManager; import cc.polyfrost.oneconfig.lwjgl.font.Fonts; import cc.polyfrost.oneconfig.lwjgl.image.Images; +import cc.polyfrost.oneconfig.lwjgl.image.SVGs; import cc.polyfrost.oneconfig.utils.ColorUtils; import cc.polyfrost.oneconfig.utils.InputUtils; import cc.polyfrost.oneconfig.utils.MathUtils; @@ -49,9 +50,11 @@ public class ConfigCheckbox extends BasicOption { RenderManager.drawString(vg, name, x + 32, y + 17, OneConfigConfig.WHITE_90, 14f, Fonts.MEDIUM); percentOn = MathUtils.clamp(MathUtils.easeOut(percentOn, toggled ? 1f : 0f, 5f)); if (percentOn != 0 && percentOn != 1f) { - RenderManager.drawImage(vg, Images.CHECKMARK, x, y + 4, 24, 24, new Color(1f, 1f, 1f, percentOn).getRGB()); + RenderManager.drawRoundedRect(vg, x, y + 4, 24, 24, ColorUtils.setAlpha(OneConfigConfig.BLUE_500, (int) (percentOn * 255)), 6f); + RenderManager.drawSvg(vg, SVGs.CHECKBOX_TICK, x, y + 4, 24, 24, new Color(1f, 1f, 1f, percentOn).getRGB()); } else if (percentOn != 0) { - RenderManager.drawImage(vg, Images.CHECKMARK, x, y + 4, 24, 24); + RenderManager.drawRoundedRect(vg, x, y + 4, 24, 24, OneConfigConfig.BLUE_500, 6f); + RenderManager.drawSvg(vg, SVGs.CHECKBOX_TICK, x, y + 4, 24, 24); } NanoVG.nvgGlobalAlpha(vg, 1f); } diff --git a/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigColorElement.java b/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigColorElement.java index aed367f..6cf60e0 100644 --- a/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigColorElement.java +++ b/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigColorElement.java @@ -78,7 +78,7 @@ public class ConfigColorElement extends BasicOption { element.update(x + 432, y); RenderManager.drawRoundedRect(vg, x + 432, y, 64, 32, OneConfigConfig.GRAY_300, 12f); - RenderManager.drawImage(vg, Images.COLOR_BASE, x + 948, y + 4, 56, 24, color.getRGB()); + RenderManager.drawImage(vg, Images.ALPHA_GRID, x + 948, y + 4, 56, 24, color.getRGB()); if (element.isClicked() && !element.isToggled()) { OneConfigGui.INSTANCE.initColorSelector(new ColorSelector(new OneColor(40, 30, 20), InputUtils.mouseX(), InputUtils.mouseY())); } diff --git a/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigDropdown.java b/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigDropdown.java index c2cb0cf..199e0f0 100644 --- a/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigDropdown.java +++ b/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigDropdown.java @@ -5,6 +5,7 @@ import cc.polyfrost.oneconfig.config.interfaces.BasicOption; import cc.polyfrost.oneconfig.lwjgl.RenderManager; import cc.polyfrost.oneconfig.lwjgl.font.Fonts; import cc.polyfrost.oneconfig.lwjgl.image.Images; +import cc.polyfrost.oneconfig.lwjgl.image.SVGs; import cc.polyfrost.oneconfig.utils.ColorUtils; import cc.polyfrost.oneconfig.utils.InputUtils; import org.lwjgl.input.Mouse; @@ -53,14 +54,12 @@ public class ConfigDropdown extends BasicOption { // TODO: chose where dividers RenderManager.drawRoundedRect(vg, x + 224, y, 256, 32, backgroundColor, 12); RenderManager.drawString(vg, options[selected], x + 236, y + 16, OneConfigConfig.WHITE_80, 14f, Fonts.MEDIUM); RenderManager.drawRoundedRect(vg, x + 452, y + 4, 24, 24, OneConfigConfig.BLUE_600, 8); - RenderManager.drawImage(vg, Images.DROPDOWN_ARROW, x + 459, y + 8, 10, 6); - RenderManager.drawImage(vg, Images.DROPDOWN_ARROW, x + 459, y + 24, 10, -6); + RenderManager.drawSvg(vg, SVGs.DROPDOWN_LIST, x + 452, y + 4, 24, 24); } else { RenderManager.drawRoundedRect(vg, x + 352, y, 640, 32, backgroundColor, 12); RenderManager.drawString(vg, options[selected], x + 364, y + 16, OneConfigConfig.WHITE_80, 14f, Fonts.MEDIUM); RenderManager.drawRoundedRect(vg, x + 964, y + 4, 24, 24, OneConfigConfig.BLUE_600, 8); - RenderManager.drawImage(vg, Images.DROPDOWN_ARROW, x + 971, y + 8, 10, 6); - RenderManager.drawImage(vg, Images.DROPDOWN_ARROW, x + 971, y + 24, 10, -6); + RenderManager.drawSvg(vg, SVGs.DROPDOWN_LIST, x + 964, y + 4, 24, 24); } NanoVG.nvgGlobalAlpha(vg, 1f); } @@ -114,8 +113,7 @@ public class ConfigDropdown extends BasicOption { // TODO: chose where dividers if (hovered && Mouse.isButtonDown(0)) NanoVG.nvgGlobalAlpha(vg, 0.8f); RenderManager.drawRoundedRect(vg, x + 452, y + 4, 24, 24, OneConfigConfig.BLUE_600, 8); - RenderManager.drawImage(vg, Images.DROPDOWN_ARROW, x + 459, y + 8, 10, 6); - RenderManager.drawImage(vg, Images.DROPDOWN_ARROW, x + 459, y + 24, 10, -6); + RenderManager.drawSvg(vg, SVGs.DROPDOWN_LIST, x + 452, y + 4, 24, 24); } else { RenderManager.drawRoundedRect(vg, x + 352, y, 640, 32, backgroundColor, 12); RenderManager.drawString(vg, options[selected], x + 364, y + 16, OneConfigConfig.WHITE_80, 14f, Fonts.MEDIUM); @@ -149,8 +147,7 @@ public class ConfigDropdown extends BasicOption { // TODO: chose where dividers if (hovered && Mouse.isButtonDown(0)) NanoVG.nvgGlobalAlpha(vg, 0.8f); RenderManager.drawRoundedRect(vg, x + 964, y + 4, 24, 24, OneConfigConfig.BLUE_600, 8); - RenderManager.drawImage(vg, Images.DROPDOWN_ARROW, x + 971, y + 8, 10, 6); - RenderManager.drawImage(vg, Images.DROPDOWN_ARROW, x + 971, y + 24, 10, -6); + RenderManager.drawSvg(vg, SVGs.DROPDOWN_LIST, x + 964, y + 4, 24, 24); } NanoVG.nvgGlobalAlpha(vg, 1f); } diff --git a/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigInfo.java b/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigInfo.java index 2e29328..68ebf37 100644 --- a/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigInfo.java +++ b/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigInfo.java @@ -6,28 +6,29 @@ import cc.polyfrost.oneconfig.config.interfaces.BasicOption; import cc.polyfrost.oneconfig.lwjgl.RenderManager; import cc.polyfrost.oneconfig.lwjgl.font.Fonts; import cc.polyfrost.oneconfig.lwjgl.image.Images; +import cc.polyfrost.oneconfig.lwjgl.image.SVGs; import cc.polyfrost.oneconfig.lwjgl.scissor.Scissor; import cc.polyfrost.oneconfig.lwjgl.scissor.ScissorManager; import java.lang.reflect.Field; public class ConfigInfo extends BasicOption { - private Images image; + private SVGs image; public ConfigInfo(Field field, Object parent, String name, int size, InfoType type) { super(field, parent, name, size); switch (type) { case INFO: - image = Images.INFO; + image = SVGs.INFO_CIRCLE; break; case SUCCESS: - image = Images.SUCCESS; + image = SVGs.CHECK_CIRCLE; break; case WARNING: - image = Images.WARNING; + image = SVGs.WARNING; break; case ERROR: - image = Images.ERROR; + image = SVGs.ERROR; break; } } @@ -35,7 +36,7 @@ public class ConfigInfo extends BasicOption { @Override public void draw(long vg, int x, int y) { Scissor scissor = ScissorManager.scissor(vg, x, y, size == 1 ? 448 : 960, 32); - RenderManager.drawImage(vg, image, x, y + 4, 24, 24); + RenderManager.drawSvg(vg, image, x, y + 4, 24, 24); RenderManager.drawString(vg, name, x + 32, y + 18, OneConfigConfig.WHITE_90, 14, Fonts.MEDIUM); ScissorManager.resetScissor(vg, scissor); } diff --git a/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigKeyBind.java b/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigKeyBind.java index 01a2bd2..5b3efae 100644 --- a/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigKeyBind.java +++ b/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigKeyBind.java @@ -8,6 +8,7 @@ import cc.polyfrost.oneconfig.gui.elements.BasicButton; import cc.polyfrost.oneconfig.lwjgl.RenderManager; import cc.polyfrost.oneconfig.lwjgl.font.Fonts; import cc.polyfrost.oneconfig.lwjgl.image.Images; +import cc.polyfrost.oneconfig.lwjgl.image.SVGs; import gg.essential.universal.UKeyboard; import org.lwjgl.nanovg.NanoVG; @@ -19,7 +20,7 @@ public class ConfigKeyBind extends BasicOption { public ConfigKeyBind(Field field, Object parent, String name, int size) { super(field, parent, name, size); - button = new BasicButton(256, 32, "", Images.KEYSTROKE, null, 0, BasicButton.ALIGNMENT_CENTER, true); + button = new BasicButton(256, 32, "", SVGs.KEYSTROKE, null, 0, BasicButton.ALIGNMENT_CENTER, true); button.alignIconLeft(true); } diff --git a/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigPageButton.java b/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigPageButton.java index 3288123..81cd946 100644 --- a/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigPageButton.java +++ b/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigPageButton.java @@ -8,6 +8,7 @@ import cc.polyfrost.oneconfig.gui.pages.ModConfigPage; import cc.polyfrost.oneconfig.lwjgl.RenderManager; import cc.polyfrost.oneconfig.lwjgl.font.Fonts; import cc.polyfrost.oneconfig.lwjgl.image.Images; +import cc.polyfrost.oneconfig.lwjgl.image.SVGs; import cc.polyfrost.oneconfig.utils.ColorUtils; import cc.polyfrost.oneconfig.utils.InputUtils; import org.lwjgl.input.Mouse; @@ -40,7 +41,7 @@ public class ConfigPageButton extends BasicOption { RenderManager.drawString(vg, name, x + 10, y + 32, OneConfigConfig.WHITE_90, 24, Fonts.MEDIUM); if (!description.equals("")) RenderManager.drawString(vg, name, x + 10, y + 70, OneConfigConfig.WHITE_90, 14, Fonts.MEDIUM); - RenderManager.drawImage(vg, Images.CHEVRON_ARROW, x + 981f, y + (description.equals("") ? 20f : 36f), 13, 22); + RenderManager.drawSvg(vg, SVGs.CHEVRON_RIGHT, x + 981f, y + (description.equals("") ? 20f : 36f), 13, 22); if (clicked) OneConfigGui.INSTANCE.openPage(new ModConfigPage(page)); NanoVG.nvgGlobalAlpha(vg, 1f); diff --git a/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigTextBox.java b/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigTextBox.java index 3aa4050..d420f01 100644 --- a/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigTextBox.java +++ b/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigTextBox.java @@ -5,6 +5,7 @@ import cc.polyfrost.oneconfig.config.interfaces.BasicOption; import cc.polyfrost.oneconfig.lwjgl.RenderManager; import cc.polyfrost.oneconfig.lwjgl.font.Fonts; import cc.polyfrost.oneconfig.lwjgl.image.Images; +import cc.polyfrost.oneconfig.lwjgl.image.SVGs; import cc.polyfrost.oneconfig.utils.InputUtils; import cc.polyfrost.oneconfig.gui.elements.text.TextInputField; import org.lwjgl.nanovg.NanoVG; @@ -39,7 +40,7 @@ public class ConfigTextBox extends BasicOption { textField.draw(vg, x + (size == 1 && hasHalfSize() ? 224 : 352), y); if (secure) - RenderManager.drawImage(vg, Images.HIDE_EYE, x + 967, y + 7, 18, 18, new Color(196, 196, 196).getRGB()); + RenderManager.drawSvg(vg, SVGs.EYE, x + 967, y + 7, 18, 18, new Color(196, 196, 196).getRGB()); if (secure && InputUtils.isAreaClicked(x + 967, y + 7, 18, 18)) textField.setPassword(!textField.getPassword()); NanoVG.nvgGlobalAlpha(vg, 1f); } diff --git a/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigUniSelector.java b/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigUniSelector.java index a9b0ab1..e8927fd 100644 --- a/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigUniSelector.java +++ b/src/main/java/cc/polyfrost/oneconfig/gui/elements/config/ConfigUniSelector.java @@ -3,6 +3,7 @@ package cc.polyfrost.oneconfig.gui.elements.config; import cc.polyfrost.oneconfig.config.OneConfigConfig; import cc.polyfrost.oneconfig.config.interfaces.BasicOption; import cc.polyfrost.oneconfig.lwjgl.RenderManager; +import cc.polyfrost.oneconfig.lwjgl.image.SVGs; import cc.polyfrost.oneconfig.lwjgl.scissor.Scissor; import cc.polyfrost.oneconfig.lwjgl.scissor.ScissorManager; import cc.polyfrost.oneconfig.lwjgl.font.Fonts; @@ -49,10 +50,10 @@ public class ConfigUniSelector extends BasicOption { } ScissorManager.resetScissor(vg, scissor); - RenderManager.drawImage(vg, Images.CHEVRON_ARROW, x + 248, y + 7, -8, 14, OneConfigConfig.BLUE_400); - RenderManager.drawImage(vg, Images.CHEVRON_ARROW, x + 456, y + 7, 8, 14, OneConfigConfig.BLUE_400); + RenderManager.drawSvg(vg, SVGs.CHEVRON_LEFT, x + 231, y + 7, 18, 18, OneConfigConfig.BLUE_400); + RenderManager.drawSvg(vg, SVGs.CHEVRON_RIGHT, x + 455, y + 7, 18, 18, OneConfigConfig.BLUE_400); - if (InputUtils.isAreaClicked(x + 235, y + 5, 18, 18) && selected > 0 && isEnabled()) { + if (InputUtils.isAreaClicked(x + 231, y + 7, 18, 18) && selected > 0 && isEnabled()) { previous = selected; selected -= 1; try { @@ -60,7 +61,7 @@ public class ConfigUniSelector extends BasicOption { } catch (IllegalAccessException ignored) { } percentMove = selected < previous ? 0f : 1f; - } else if (InputUtils.isAreaClicked(x + 451, y + 5, 18, 18) && selected < options.length - 1 && isEnabled()) { + } else if (InputUtils.isAreaClicked(x + 455, y + 7, 18, 18) && selected < options.length - 1 && isEnabled()) { previous = selected; selected += 1; try { diff --git a/src/main/java/cc/polyfrost/oneconfig/gui/elements/text/NumberInputField.java b/src/main/java/cc/polyfrost/oneconfig/gui/elements/text/NumberInputField.java index 655900a..0660efe 100644 --- a/src/main/java/cc/polyfrost/oneconfig/gui/elements/text/NumberInputField.java +++ b/src/main/java/cc/polyfrost/oneconfig/gui/elements/text/NumberInputField.java @@ -4,6 +4,7 @@ import cc.polyfrost.oneconfig.config.OneConfigConfig; import cc.polyfrost.oneconfig.gui.elements.BasicElement; import cc.polyfrost.oneconfig.lwjgl.RenderManager; import cc.polyfrost.oneconfig.lwjgl.image.Images; +import cc.polyfrost.oneconfig.lwjgl.image.SVGs; import cc.polyfrost.oneconfig.utils.ColorUtils; import org.lwjgl.nanovg.NanoVG; @@ -29,6 +30,8 @@ public class NumberInputField extends TextInputField { public void draw(long vg, int x, int y) { super.errored = false; RenderManager.drawRoundedRect(vg, x + width + 4, y, 12, 28, OneConfigConfig.GRAY_500, 6f); + upArrow.disable(disabled); + downArrow.disable(disabled); upArrow.update(x + width + 4, y); downArrow.update(x + width + 4, y + 14); try { @@ -58,20 +61,20 @@ public class NumberInputField extends TextInputField { if (current < min) current = min; setCurrentValue(current); } - if (current >= max) { + if (current >= max && !disabled) { NanoVG.nvgGlobalAlpha(vg, 0.3f); upArrow.disable(true); } RenderManager.drawRoundedRectVaried(vg, x + width + 4, y, 12, 14, colorTop, 6f, 6f, 0f, 0f); - RenderManager.drawImage(vg, Images.UP_ARROW, x + width + 5, y + 2, 10, 10); - if (current >= max) NanoVG.nvgGlobalAlpha(vg, 1f); + RenderManager.drawSvg(vg, SVGs.CHEVRON_UP, x + width + 5, y + 2, 10, 10); + if (current >= max && !disabled) NanoVG.nvgGlobalAlpha(vg, 1f); - if (current <= min) { + if (current <= min && !disabled) { NanoVG.nvgGlobalAlpha(vg, 0.3f); downArrow.disable(true); } RenderManager.drawRoundedRectVaried(vg, x + width + 4, y + 14, 12, 14, colorBottom, 0f, 0f, 6f, 6f); - RenderManager.drawImage(vg, Images.UP_ARROW, x + width + 5, y + 25, 10, -10); + RenderManager.drawSvg(vg, SVGs.CHEVRON_DOWN, x + width + 5, y + 15, 10, 10); NanoVG.nvgGlobalAlpha(vg, 1f); try { 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 dd73183..a65f227 100644 --- a/src/main/java/cc/polyfrost/oneconfig/gui/pages/HomePage.java +++ b/src/main/java/cc/polyfrost/oneconfig/gui/pages/HomePage.java @@ -8,12 +8,13 @@ import cc.polyfrost.oneconfig.lwjgl.OneColor; import cc.polyfrost.oneconfig.lwjgl.RenderManager; import cc.polyfrost.oneconfig.lwjgl.font.Fonts; import cc.polyfrost.oneconfig.lwjgl.image.Images; +import cc.polyfrost.oneconfig.lwjgl.image.SVGs; import cc.polyfrost.oneconfig.utils.InputUtils; import java.awt.*; public class HomePage extends Page { - private final BasicButton btn = new BasicButton(184, 36, "Socials", Images.SHARE, Images.LAUNCH, 1, BasicButton.ALIGNMENT_CENTER); + private final BasicButton btn = new BasicButton(184, 36, "Socials", SVGs.SHARE, SVGs.POP_OUT, 1, BasicButton.ALIGNMENT_CENTER); public HomePage() { super("Home Dashboard"); diff --git a/src/main/java/cc/polyfrost/oneconfig/gui/pages/ModsPage.java b/src/main/java/cc/polyfrost/oneconfig/gui/pages/ModsPage.java index 2b3dfd7..1d2dfac 100644 --- a/src/main/java/cc/polyfrost/oneconfig/gui/pages/ModsPage.java +++ b/src/main/java/cc/polyfrost/oneconfig/gui/pages/ModsPage.java @@ -90,7 +90,8 @@ public class ModsPage extends Page { @Override public int getMaxScrollHeight() { - return size; + //return size; + return 3298046; } @Override diff --git a/src/main/java/cc/polyfrost/oneconfig/lwjgl/RenderManager.java b/src/main/java/cc/polyfrost/oneconfig/lwjgl/RenderManager.java index 4276865..a2da805 100644 --- a/src/main/java/cc/polyfrost/oneconfig/lwjgl/RenderManager.java +++ b/src/main/java/cc/polyfrost/oneconfig/lwjgl/RenderManager.java @@ -1,18 +1,18 @@ package cc.polyfrost.oneconfig.lwjgl; import cc.polyfrost.oneconfig.config.OneConfigConfig; +import cc.polyfrost.oneconfig.gui.OneConfigGui; import cc.polyfrost.oneconfig.lwjgl.font.FontManager; import cc.polyfrost.oneconfig.lwjgl.font.Fonts; -import cc.polyfrost.oneconfig.lwjgl.image.Image; import cc.polyfrost.oneconfig.lwjgl.image.ImageLoader; import cc.polyfrost.oneconfig.lwjgl.image.Images; +import cc.polyfrost.oneconfig.lwjgl.image.SVGs; import gg.essential.universal.UGraphics; import gg.essential.universal.UMinecraft; import gg.essential.universal.UResolution; import net.minecraft.client.gui.