From abcc71f96ee98bb4043f466404652a3e015f4f31 Mon Sep 17 00:00:00 2001 From: nextdayy <79922345+nextdayy@users.noreply.github.com> Date: Mon, 3 Jun 2024 11:15:35 +0100 Subject: [PATCH] reorganise resources --- gradle/libs.versions.toml | 4 +- .../oneconfig/api/hud/v1/HudManager.kt | 12 ++- .../oneconfig/api/hud/v1/internal/hudpages.kt | 6 +- .../assets/oneconfig/hud}/align/alignment.svg | 0 .../oneconfig/hud}/align/alignment1.svg | 0 .../oneconfig/hud}/align/alignment2.svg | 0 .../oneconfig/hud}/align/alignment3.svg | 0 .../assets/oneconfig/hud/en_default.lang | 32 +++++++ .../oneconfig/internal/ui/OneConfigUI.kt | 1 + .../oneconfig/internal/ui/pages/pages.kt | 2 +- .../assets/oneconfig/brand/oneconfig.svg | 0 .../assets/oneconfig/brand/polyfrost.png | Bin .../assets/oneconfig/en_default.lang | 23 +++++ .../assets/oneconfig/ico/default_mod.svg | 0 modules/ui/api/ui.api | 1 + .../oneconfig/api/ui/v1/PolyUIBuilder.java | 6 ++ .../assets/oneconfig/color/alpha.png | Bin .../resources/assets/oneconfig/color/hue.png | Bin .../resources/assets/oneconfig/ico/bell.svg | 0 .../resources/assets/oneconfig/ico/close.svg | 0 .../resources/assets/oneconfig/ico/cloud.svg | 0 .../resources/assets/oneconfig/ico/cog.svg | 0 .../assets/oneconfig/ico/console.svg | 0 .../resources/assets/oneconfig/ico/hud.svg | 0 .../assets/oneconfig/ico/hypixel.svg | 0 .../resources/assets/oneconfig/ico/info.svg | 0 .../assets/oneconfig/ico/keyboard.svg | 0 .../assets/oneconfig/ico/left-arrow.svg | 0 .../resources/assets/oneconfig/ico/minus.svg | 0 .../resources/assets/oneconfig/ico/moon.svg | 0 .../assets/oneconfig/ico/paintbrush.svg | 0 .../resources/assets/oneconfig/ico/plus.svg | 0 .../assets/oneconfig/ico/profiles.svg | 0 .../assets/oneconfig/ico/refresh.svg | 0 .../assets/oneconfig/ico/right-arrow.svg | 0 .../resources/assets/oneconfig/ico/search.svg | 0 .../assets/oneconfig/ico/settings.svg | 0 .../assets/oneconfig/ico/shuffle.svg | 0 .../assets/oneconfig/ico/spanner.svg | 0 .../resources/assets/oneconfig/ico/sun.svg | 0 .../resources/assets/oneconfig/ico/text.svg | 0 .../oneconfig}/minecraft/Minecraft-Bold.otf | Bin .../minecraft/Minecraft-Regular.otf | Bin modules/ui/src/main/resources/en_default.lang | 24 +++++ versions/src/main/resources/en_default.lang | 88 ------------------ versions/src/main/resources/err.png | Bin 4628 -> 0 bytes .../resources/licenses/BlurMC-License.txt | 7 +- 47 files changed, 102 insertions(+), 104 deletions(-) rename {versions/src/main/resources/assets/oneconfig/ico => modules/hud/src/main/resources/assets/oneconfig/hud}/align/alignment.svg (100%) rename {versions/src/main/resources/assets/oneconfig/ico => modules/hud/src/main/resources/assets/oneconfig/hud}/align/alignment1.svg (100%) rename {versions/src/main/resources/assets/oneconfig/ico => modules/hud/src/main/resources/assets/oneconfig/hud}/align/alignment2.svg (100%) rename {versions/src/main/resources/assets/oneconfig/ico => modules/hud/src/main/resources/assets/oneconfig/hud}/align/alignment3.svg (100%) create mode 100644 modules/hud/src/main/resources/assets/oneconfig/hud/en_default.lang rename {versions => modules/internal}/src/main/resources/assets/oneconfig/brand/oneconfig.svg (100%) rename {versions => modules/internal}/src/main/resources/assets/oneconfig/brand/polyfrost.png (100%) create mode 100644 modules/internal/src/main/resources/assets/oneconfig/en_default.lang rename versions/src/main/resources/chatting.svg => modules/internal/src/main/resources/assets/oneconfig/ico/default_mod.svg (100%) rename {versions => modules/ui}/src/main/resources/assets/oneconfig/color/alpha.png (100%) rename {versions => modules/ui}/src/main/resources/assets/oneconfig/color/hue.png (100%) rename {versions => modules/ui}/src/main/resources/assets/oneconfig/ico/bell.svg (100%) rename {versions => modules/ui}/src/main/resources/assets/oneconfig/ico/close.svg (100%) rename {versions => modules/ui}/src/main/resources/assets/oneconfig/ico/cloud.svg (100%) rename {versions => modules/ui}/src/main/resources/assets/oneconfig/ico/cog.svg (100%) rename {versions => modules/ui}/src/main/resources/assets/oneconfig/ico/console.svg (100%) rename {versions => modules/ui}/src/main/resources/assets/oneconfig/ico/hud.svg (100%) rename {versions => modules/ui}/src/main/resources/assets/oneconfig/ico/hypixel.svg (100%) rename {versions => modules/ui}/src/main/resources/assets/oneconfig/ico/info.svg (100%) rename {versions => modules/ui}/src/main/resources/assets/oneconfig/ico/keyboard.svg (100%) rename {versions => modules/ui}/src/main/resources/assets/oneconfig/ico/left-arrow.svg (100%) rename {versions => modules/ui}/src/main/resources/assets/oneconfig/ico/minus.svg (100%) rename {versions => modules/ui}/src/main/resources/assets/oneconfig/ico/moon.svg (100%) rename {versions => modules/ui}/src/main/resources/assets/oneconfig/ico/paintbrush.svg (100%) rename {versions => modules/ui}/src/main/resources/assets/oneconfig/ico/plus.svg (100%) rename {versions => modules/ui}/src/main/resources/assets/oneconfig/ico/profiles.svg (100%) rename {versions => modules/ui}/src/main/resources/assets/oneconfig/ico/refresh.svg (100%) rename {versions => modules/ui}/src/main/resources/assets/oneconfig/ico/right-arrow.svg (100%) rename {versions => modules/ui}/src/main/resources/assets/oneconfig/ico/search.svg (100%) rename {versions => modules/ui}/src/main/resources/assets/oneconfig/ico/settings.svg (100%) rename {versions => modules/ui}/src/main/resources/assets/oneconfig/ico/shuffle.svg (100%) rename {versions => modules/ui}/src/main/resources/assets/oneconfig/ico/spanner.svg (100%) rename {versions => modules/ui}/src/main/resources/assets/oneconfig/ico/sun.svg (100%) rename {versions => modules/ui}/src/main/resources/assets/oneconfig/ico/text.svg (100%) rename {versions/src/main/resources/assets/oneconfig/font => modules/ui/src/main/resources/assets/oneconfig}/minecraft/Minecraft-Bold.otf (100%) rename {versions/src/main/resources/assets/oneconfig/font => modules/ui/src/main/resources/assets/oneconfig}/minecraft/Minecraft-Regular.otf (100%) create mode 100644 modules/ui/src/main/resources/en_default.lang delete mode 100644 versions/src/main/resources/en_default.lang delete mode 100644 versions/src/main/resources/err.png diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b941b1ae4..3b7fe5154 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,7 +8,7 @@ pgt = "0.5.2" shadow = "8.1.1" licenser = "2.0.1" -polyui = "1.2.01" +polyui = "1.2.1" log4j-api = "2.0-beta9" # used because this is the version that 1.8.9 supports, so we have to compile against the same (annoying) log4j-impl = "2.23.1" # unvulnerable version @@ -72,4 +72,4 @@ pgt-defaults-repo = { id = "org.polyfrost.defaults.repo", version.ref = "pgt" } pgt-defaults-java = { id = "org.polyfrost.defaults.java", version.ref = "pgt" } shadow = { id = "com.github.johnrengelman.shadow", version.ref = "shadow" } -licenser = { id = "org.quiltmc.gradle.licenser", version.ref = "licenser" } \ No newline at end of file +licenser = { id = "org.quiltmc.gradle.licenser", version.ref = "licenser" } diff --git a/modules/hud/src/main/kotlin/org/polyfrost/oneconfig/api/hud/v1/HudManager.kt b/modules/hud/src/main/kotlin/org/polyfrost/oneconfig/api/hud/v1/HudManager.kt index c49c31e43..1c2be86cd 100644 --- a/modules/hud/src/main/kotlin/org/polyfrost/oneconfig/api/hud/v1/HudManager.kt +++ b/modules/hud/src/main/kotlin/org/polyfrost/oneconfig/api/hud/v1/HudManager.kt @@ -48,6 +48,7 @@ import org.polyfrost.polyui.color.PolyColor.Companion.TRANSPARENT import org.polyfrost.polyui.component.* import org.polyfrost.polyui.component.impl.* import org.polyfrost.polyui.event.Event +import org.polyfrost.polyui.input.Translator import org.polyfrost.polyui.operations.DrawableOp import org.polyfrost.polyui.operations.Fade import org.polyfrost.polyui.operations.Move @@ -192,13 +193,16 @@ object HudManager { }.register() } + private val settings = Settings().apply { + cleanupAfterInit = false + debug = false + } + val polyUI: PolyUI = PolyUI( renderer = UIManager.INSTANCE.renderer, size = 1920f by 1080f, - settings = Settings().apply { - cleanupAfterInit = false - debug = false - } + translator = Translator(settings, "").also { it.addDelegate("assets/oneconfig/hud") }, + settings = settings ).also { it.master.rawResize = true it.resize(Platform.screen().windowWidth().toFloat(), Platform.screen().windowHeight().toFloat()) diff --git a/modules/hud/src/main/kotlin/org/polyfrost/oneconfig/api/hud/v1/internal/hudpages.kt b/modules/hud/src/main/kotlin/org/polyfrost/oneconfig/api/hud/v1/internal/hudpages.kt index 2f6dda385..aa9dcf88b 100644 --- a/modules/hud/src/main/kotlin/org/polyfrost/oneconfig/api/hud/v1/internal/hudpages.kt +++ b/modules/hud/src/main/kotlin/org/polyfrost/oneconfig/api/hud/v1/internal/hudpages.kt @@ -175,15 +175,15 @@ private fun interactiveAlignment(hud: Hud): Drawable { var s2 = 0f return Block( Image( - "assets/oneconfig/ico/align/alignment3.svg".image(), + "assets/oneconfig/hud/align/alignment3.svg".image(), alignment = alignC, children = arrayOf( Image( - "assets/oneconfig/ico/align/alignment2.svg".image(), + "assets/oneconfig/hud/align/alignment2.svg".image(), alignment = alignC, children = arrayOf( Block( - Image("assets/oneconfig/ico/align/alignment1.svg".image()).withStates(true).setPalette { + Image("assets/oneconfig/hud/align/alignment1.svg".image()).withStates(true).setPalette { Colors.Palette( text.primary.normal, brand.fg.normal, diff --git a/versions/src/main/resources/assets/oneconfig/ico/align/alignment.svg b/modules/hud/src/main/resources/assets/oneconfig/hud/align/alignment.svg similarity index 100% rename from versions/src/main/resources/assets/oneconfig/ico/align/alignment.svg rename to modules/hud/src/main/resources/assets/oneconfig/hud/align/alignment.svg diff --git a/versions/src/main/resources/assets/oneconfig/ico/align/alignment1.svg b/modules/hud/src/main/resources/assets/oneconfig/hud/align/alignment1.svg similarity index 100% rename from versions/src/main/resources/assets/oneconfig/ico/align/alignment1.svg rename to modules/hud/src/main/resources/assets/oneconfig/hud/align/alignment1.svg diff --git a/versions/src/main/resources/assets/oneconfig/ico/align/alignment2.svg b/modules/hud/src/main/resources/assets/oneconfig/hud/align/alignment2.svg similarity index 100% rename from versions/src/main/resources/assets/oneconfig/ico/align/alignment2.svg rename to modules/hud/src/main/resources/assets/oneconfig/hud/align/alignment2.svg diff --git a/versions/src/main/resources/assets/oneconfig/ico/align/alignment3.svg b/modules/hud/src/main/resources/assets/oneconfig/hud/align/alignment3.svg similarity index 100% rename from versions/src/main/resources/assets/oneconfig/ico/align/alignment3.svg rename to modules/hud/src/main/resources/assets/oneconfig/hud/align/alignment3.svg diff --git a/modules/hud/src/main/resources/assets/oneconfig/hud/en_default.lang b/modules/hud/src/main/resources/assets/oneconfig/hud/en_default.lang new file mode 100644 index 000000000..ae82e7a8c --- /dev/null +++ b/modules/hud/src/main/resources/assets/oneconfig/hud/en_default.lang @@ -0,0 +1,32 @@ +oneconfig.huds.info=World & Server +oneconfig.huds.player=Player + +oneconfig.hudeditor.title=HUD Editor +oneconfig.hudeditor.general.title=Background Options +oneconfig.hudeditor.choosesomething=Click on an element to continue. +oneconfig.hudeditor.cantedit.aslegacy=This HUD is running in legacy compatibility mode and cannot be edited. + +oneconfig.hudeditor.padding.title=ALIGNMENT & PADDING +oneconfig.hudeditor.padding.info=These settings control the distance between the edge of the background and the HUD, as well as its alignment. +oneconfig.hudeditor.padding.mode.main=Main-axis alignment +oneconfig.hudeditor.padding.mode.cross=Cross-axis alignment +oneconfig.hudeditor.padding.main=Main-axis padding +oneconfig.hudeditor.padding.cross=Cross-axis padding + +oneconfig.hudeditor.component.title=Component settings +oneconfig.hudeditor.component.info=These settings control the size and alignment of the component. + +oneconfig.hudeditor.color.fill=Fill color +oneconfig.hudeditor.color.border=Border color + +oneconfig.hudeditor.opacity=Opacity +oneconfig.hudeditor.rotation=Rotation +oneconfig.hudeditor.radii=Corner radius +oneconfig.hudeditor.skew=Skew + +oneconfig.hudeditor.text.title=TEXT OPTIONS +oneconfig.hudeditor.text.example=The quick brown fox jumps over the lazy dog +oneconfig.hudeditor.text.size=Font size +oneconfig.hudeditor.text.weight=Weight +oneconfig.hudeditor.text.font=Font +oneconfig.hudeditor.text.effects=Case type diff --git a/modules/internal/src/main/kotlin/org/polyfrost/oneconfig/internal/ui/OneConfigUI.kt b/modules/internal/src/main/kotlin/org/polyfrost/oneconfig/internal/ui/OneConfigUI.kt index 11e963581..dec66cb61 100644 --- a/modules/internal/src/main/kotlin/org/polyfrost/oneconfig/internal/ui/OneConfigUI.kt +++ b/modules/internal/src/main/kotlin/org/polyfrost/oneconfig/internal/ui/OneConfigUI.kt @@ -62,6 +62,7 @@ object OneConfigUI { fun open() { val vertical = Align(cross = Align.Cross.Start, mode = Align.Mode.Vertical) val builder = PolyUIBuilder.builder().blurs().backgroundColor(rgba(21, 21, 21)).atResolution(1920f by 1080f).size(1400f by 700f) + builder.translatorDelegate("assets/oneconfig") builder.onClose { _ -> for (t in ConfigManager.active().trees()) { ConfigManager.active().save(t) diff --git a/modules/internal/src/main/kotlin/org/polyfrost/oneconfig/internal/ui/pages/pages.kt b/modules/internal/src/main/kotlin/org/polyfrost/oneconfig/internal/ui/pages/pages.kt index 8995cf6da..201f2f304 100644 --- a/modules/internal/src/main/kotlin/org/polyfrost/oneconfig/internal/ui/pages/pages.kt +++ b/modules/internal/src/main/kotlin/org/polyfrost/oneconfig/internal/ui/pages/pages.kt @@ -49,7 +49,7 @@ import org.polyfrost.polyui.utils.radii import org.polyfrost.polyui.utils.translated private val heart = PolyImage("assets/oneconfig/ico/plus.svg") -private val defaultModImage = "chatting.svg".image() +private val defaultModImage = "assets/oneconfig/ico/default_mod.svg".image() private val modBoxTopRad = radii(8f, 8f, 0f, 0f) private val modBoxBotRad = radii(0f, 0f, 8f, 8f) private val modBoxAlign = Align(cross = Align.Cross.Start, mode = Align.Mode.Vertical, padding = Vec2.ZERO) diff --git a/versions/src/main/resources/assets/oneconfig/brand/oneconfig.svg b/modules/internal/src/main/resources/assets/oneconfig/brand/oneconfig.svg similarity index 100% rename from versions/src/main/resources/assets/oneconfig/brand/oneconfig.svg rename to modules/internal/src/main/resources/assets/oneconfig/brand/oneconfig.svg diff --git a/versions/src/main/resources/assets/oneconfig/brand/polyfrost.png b/modules/internal/src/main/resources/assets/oneconfig/brand/polyfrost.png similarity index 100% rename from versions/src/main/resources/assets/oneconfig/brand/polyfrost.png rename to modules/internal/src/main/resources/assets/oneconfig/brand/polyfrost.png diff --git a/modules/internal/src/main/resources/assets/oneconfig/en_default.lang b/modules/internal/src/main/resources/assets/oneconfig/en_default.lang new file mode 100644 index 000000000..739d76ddb --- /dev/null +++ b/modules/internal/src/main/resources/assets/oneconfig/en_default.lang @@ -0,0 +1,23 @@ +oneconfig.sidebar.title.options=OPTIONS +oneconfig.mods=Mods +oneconfig.profiles=Profiles +oneconfig.keybinds=Keybinds +oneconfig.sidebar.title.personal=PERSONALIZATION +oneconfig.themes=Themes +oneconfig.preferences=Preferences +oneconfig.sidebar.title.extra=HELP & FEEDBACK +oneconfig.changelog=Changelog +oneconfig.edithud=Edit HUD + +oneconfig.mods.none=No mods installed! +oneconfig.mods.none.desc=You don't have any compatible mods installed.\nInstall some to configure them here. Visit https://polyfrost.org/mods to get some! + +oneconfig.feedback=Feedback + +oneconfig.beta=BETA +oneconfig.soon=SOON +oneconfig.readmore=Read more +oneconfig.writtenby=Written by {0} + +oneconfig.all=All +oneconfig.pvp=PvP diff --git a/versions/src/main/resources/chatting.svg b/modules/internal/src/main/resources/assets/oneconfig/ico/default_mod.svg similarity index 100% rename from versions/src/main/resources/chatting.svg rename to modules/internal/src/main/resources/assets/oneconfig/ico/default_mod.svg diff --git a/modules/ui/api/ui.api b/modules/ui/api/ui.api index e3dcee259..c7e96a889 100644 --- a/modules/ui/api/ui.api +++ b/modules/ui/api/ui.api @@ -17,6 +17,7 @@ public final class org/polyfrost/oneconfig/api/ui/v1/PolyUIBuilder { public fun settings (Lorg/polyfrost/polyui/property/Settings;)Lorg/polyfrost/oneconfig/api/ui/v1/PolyUIBuilder; public fun size (Lorg/polyfrost/polyui/unit/Vec2;)Lorg/polyfrost/oneconfig/api/ui/v1/PolyUIBuilder; public fun translator (Lorg/polyfrost/polyui/input/Translator;)Lorg/polyfrost/oneconfig/api/ui/v1/PolyUIBuilder; + public fun translatorDelegate (Ljava/lang/String;)Lorg/polyfrost/oneconfig/api/ui/v1/PolyUIBuilder; } public abstract interface class org/polyfrost/oneconfig/api/ui/v1/TinyFD { diff --git a/modules/ui/src/main/java/org/polyfrost/oneconfig/api/ui/v1/PolyUIBuilder.java b/modules/ui/src/main/java/org/polyfrost/oneconfig/api/ui/v1/PolyUIBuilder.java index 8324a4358..c54eb3233 100644 --- a/modules/ui/src/main/java/org/polyfrost/oneconfig/api/ui/v1/PolyUIBuilder.java +++ b/modules/ui/src/main/java/org/polyfrost/oneconfig/api/ui/v1/PolyUIBuilder.java @@ -75,6 +75,12 @@ public PolyUIBuilder translator(Translator translator) { return this; } + public PolyUIBuilder translatorDelegate(String translationDir) { + Translator translator = this.translator == null ? this.translator = new Translator(settings, "", null) : this.translator; + translator.addDelegate(translationDir); + return this; + } + public PolyUIBuilder align(Align alignment) { this.alignment = alignment; return this; diff --git a/versions/src/main/resources/assets/oneconfig/color/alpha.png b/modules/ui/src/main/resources/assets/oneconfig/color/alpha.png similarity index 100% rename from versions/src/main/resources/assets/oneconfig/color/alpha.png rename to modules/ui/src/main/resources/assets/oneconfig/color/alpha.png diff --git a/versions/src/main/resources/assets/oneconfig/color/hue.png b/modules/ui/src/main/resources/assets/oneconfig/color/hue.png similarity index 100% rename from versions/src/main/resources/assets/oneconfig/color/hue.png rename to modules/ui/src/main/resources/assets/oneconfig/color/hue.png diff --git a/versions/src/main/resources/assets/oneconfig/ico/bell.svg b/modules/ui/src/main/resources/assets/oneconfig/ico/bell.svg similarity index 100% rename from versions/src/main/resources/assets/oneconfig/ico/bell.svg rename to modules/ui/src/main/resources/assets/oneconfig/ico/bell.svg diff --git a/versions/src/main/resources/assets/oneconfig/ico/close.svg b/modules/ui/src/main/resources/assets/oneconfig/ico/close.svg similarity index 100% rename from versions/src/main/resources/assets/oneconfig/ico/close.svg rename to modules/ui/src/main/resources/assets/oneconfig/ico/close.svg diff --git a/versions/src/main/resources/assets/oneconfig/ico/cloud.svg b/modules/ui/src/main/resources/assets/oneconfig/ico/cloud.svg similarity index 100% rename from versions/src/main/resources/assets/oneconfig/ico/cloud.svg rename to modules/ui/src/main/resources/assets/oneconfig/ico/cloud.svg diff --git a/versions/src/main/resources/assets/oneconfig/ico/cog.svg b/modules/ui/src/main/resources/assets/oneconfig/ico/cog.svg similarity index 100% rename from versions/src/main/resources/assets/oneconfig/ico/cog.svg rename to modules/ui/src/main/resources/assets/oneconfig/ico/cog.svg diff --git a/versions/src/main/resources/assets/oneconfig/ico/console.svg b/modules/ui/src/main/resources/assets/oneconfig/ico/console.svg similarity index 100% rename from versions/src/main/resources/assets/oneconfig/ico/console.svg rename to modules/ui/src/main/resources/assets/oneconfig/ico/console.svg diff --git a/versions/src/main/resources/assets/oneconfig/ico/hud.svg b/modules/ui/src/main/resources/assets/oneconfig/ico/hud.svg similarity index 100% rename from versions/src/main/resources/assets/oneconfig/ico/hud.svg rename to modules/ui/src/main/resources/assets/oneconfig/ico/hud.svg diff --git a/versions/src/main/resources/assets/oneconfig/ico/hypixel.svg b/modules/ui/src/main/resources/assets/oneconfig/ico/hypixel.svg similarity index 100% rename from versions/src/main/resources/assets/oneconfig/ico/hypixel.svg rename to modules/ui/src/main/resources/assets/oneconfig/ico/hypixel.svg diff --git a/versions/src/main/resources/assets/oneconfig/ico/info.svg b/modules/ui/src/main/resources/assets/oneconfig/ico/info.svg similarity index 100% rename from versions/src/main/resources/assets/oneconfig/ico/info.svg rename to modules/ui/src/main/resources/assets/oneconfig/ico/info.svg diff --git a/versions/src/main/resources/assets/oneconfig/ico/keyboard.svg b/modules/ui/src/main/resources/assets/oneconfig/ico/keyboard.svg similarity index 100% rename from versions/src/main/resources/assets/oneconfig/ico/keyboard.svg rename to modules/ui/src/main/resources/assets/oneconfig/ico/keyboard.svg diff --git a/versions/src/main/resources/assets/oneconfig/ico/left-arrow.svg b/modules/ui/src/main/resources/assets/oneconfig/ico/left-arrow.svg similarity index 100% rename from versions/src/main/resources/assets/oneconfig/ico/left-arrow.svg rename to modules/ui/src/main/resources/assets/oneconfig/ico/left-arrow.svg diff --git a/versions/src/main/resources/assets/oneconfig/ico/minus.svg b/modules/ui/src/main/resources/assets/oneconfig/ico/minus.svg similarity index 100% rename from versions/src/main/resources/assets/oneconfig/ico/minus.svg rename to modules/ui/src/main/resources/assets/oneconfig/ico/minus.svg diff --git a/versions/src/main/resources/assets/oneconfig/ico/moon.svg b/modules/ui/src/main/resources/assets/oneconfig/ico/moon.svg similarity index 100% rename from versions/src/main/resources/assets/oneconfig/ico/moon.svg rename to modules/ui/src/main/resources/assets/oneconfig/ico/moon.svg diff --git a/versions/src/main/resources/assets/oneconfig/ico/paintbrush.svg b/modules/ui/src/main/resources/assets/oneconfig/ico/paintbrush.svg similarity index 100% rename from versions/src/main/resources/assets/oneconfig/ico/paintbrush.svg rename to modules/ui/src/main/resources/assets/oneconfig/ico/paintbrush.svg diff --git a/versions/src/main/resources/assets/oneconfig/ico/plus.svg b/modules/ui/src/main/resources/assets/oneconfig/ico/plus.svg similarity index 100% rename from versions/src/main/resources/assets/oneconfig/ico/plus.svg rename to modules/ui/src/main/resources/assets/oneconfig/ico/plus.svg diff --git a/versions/src/main/resources/assets/oneconfig/ico/profiles.svg b/modules/ui/src/main/resources/assets/oneconfig/ico/profiles.svg similarity index 100% rename from versions/src/main/resources/assets/oneconfig/ico/profiles.svg rename to modules/ui/src/main/resources/assets/oneconfig/ico/profiles.svg diff --git a/versions/src/main/resources/assets/oneconfig/ico/refresh.svg b/modules/ui/src/main/resources/assets/oneconfig/ico/refresh.svg similarity index 100% rename from versions/src/main/resources/assets/oneconfig/ico/refresh.svg rename to modules/ui/src/main/resources/assets/oneconfig/ico/refresh.svg diff --git a/versions/src/main/resources/assets/oneconfig/ico/right-arrow.svg b/modules/ui/src/main/resources/assets/oneconfig/ico/right-arrow.svg similarity index 100% rename from versions/src/main/resources/assets/oneconfig/ico/right-arrow.svg rename to modules/ui/src/main/resources/assets/oneconfig/ico/right-arrow.svg diff --git a/versions/src/main/resources/assets/oneconfig/ico/search.svg b/modules/ui/src/main/resources/assets/oneconfig/ico/search.svg similarity index 100% rename from versions/src/main/resources/assets/oneconfig/ico/search.svg rename to modules/ui/src/main/resources/assets/oneconfig/ico/search.svg diff --git a/versions/src/main/resources/assets/oneconfig/ico/settings.svg b/modules/ui/src/main/resources/assets/oneconfig/ico/settings.svg similarity index 100% rename from versions/src/main/resources/assets/oneconfig/ico/settings.svg rename to modules/ui/src/main/resources/assets/oneconfig/ico/settings.svg diff --git a/versions/src/main/resources/assets/oneconfig/ico/shuffle.svg b/modules/ui/src/main/resources/assets/oneconfig/ico/shuffle.svg similarity index 100% rename from versions/src/main/resources/assets/oneconfig/ico/shuffle.svg rename to modules/ui/src/main/resources/assets/oneconfig/ico/shuffle.svg diff --git a/versions/src/main/resources/assets/oneconfig/ico/spanner.svg b/modules/ui/src/main/resources/assets/oneconfig/ico/spanner.svg similarity index 100% rename from versions/src/main/resources/assets/oneconfig/ico/spanner.svg rename to modules/ui/src/main/resources/assets/oneconfig/ico/spanner.svg diff --git a/versions/src/main/resources/assets/oneconfig/ico/sun.svg b/modules/ui/src/main/resources/assets/oneconfig/ico/sun.svg similarity index 100% rename from versions/src/main/resources/assets/oneconfig/ico/sun.svg rename to modules/ui/src/main/resources/assets/oneconfig/ico/sun.svg diff --git a/versions/src/main/resources/assets/oneconfig/ico/text.svg b/modules/ui/src/main/resources/assets/oneconfig/ico/text.svg similarity index 100% rename from versions/src/main/resources/assets/oneconfig/ico/text.svg rename to modules/ui/src/main/resources/assets/oneconfig/ico/text.svg diff --git a/versions/src/main/resources/assets/oneconfig/font/minecraft/Minecraft-Bold.otf b/modules/ui/src/main/resources/assets/oneconfig/minecraft/Minecraft-Bold.otf similarity index 100% rename from versions/src/main/resources/assets/oneconfig/font/minecraft/Minecraft-Bold.otf rename to modules/ui/src/main/resources/assets/oneconfig/minecraft/Minecraft-Bold.otf diff --git a/versions/src/main/resources/assets/oneconfig/font/minecraft/Minecraft-Regular.otf b/modules/ui/src/main/resources/assets/oneconfig/minecraft/Minecraft-Regular.otf similarity index 100% rename from versions/src/main/resources/assets/oneconfig/font/minecraft/Minecraft-Regular.otf rename to modules/ui/src/main/resources/assets/oneconfig/minecraft/Minecraft-Regular.otf diff --git a/modules/ui/src/main/resources/en_default.lang b/modules/ui/src/main/resources/en_default.lang new file mode 100644 index 000000000..a315ca504 --- /dev/null +++ b/modules/ui/src/main/resources/en_default.lang @@ -0,0 +1,24 @@ +polyui.color.solid=Solid color +polyui.color.gradient=Gradient color +polyui.color.chroma=Chroma color +polyui.color.hex=HEX + +oneconfig.search.placeholder=Search for something... +oneconfig.button.default=Click + +oneconfig.align=Align +oneconfig.align.start=Start +oneconfig.align.center=Center +oneconfig.align.end=End +oneconfig.align.spacebetween=Space Between +oneconfig.align.spaceevenly=Space Evenly + +oneconfig.fweight.100=Thin +oneconfig.fweight.200=Extra light +oneconfig.fweight.300=Light +oneconfig.fweight.400=Regular +oneconfig.fweight.500=Medium +oneconfig.fweight.600=Semi bold +oneconfig.fweight.700=Bold +oneconfig.fweight.800=Extra bold +oneconfig.fweight.900=Black \ No newline at end of file diff --git a/versions/src/main/resources/en_default.lang b/versions/src/main/resources/en_default.lang deleted file mode 100644 index 2711b2f63..000000000 --- a/versions/src/main/resources/en_default.lang +++ /dev/null @@ -1,88 +0,0 @@ -polyui.test=Kotlin... {}! and image -polyui.button=I am a button. -polyui.textinput.placeholder=Write something... -polyui.color.solid=Solid color -polyui.color.gradient=Gradient color -polyui.color.chroma=Chroma color -polyui.color.hex=HEX -polyfrost.copyright=© Polyfrost 2023. All rights reserved. -button.randomize=Randomize order -text.light=Flashbang mode -text.dark=Boring mode -button.text=A {0} button - -oneconfig.search.placeholder=Search for something... -oneconfig.button.default=Click - -oneconfig.edithud=Edit HUD -oneconfig.all=All -oneconfig.pvp=PvP -oneconfig.huds.info=World & Server -oneconfig.huds.player=Player - -oneconfig.hudeditor.title=HUD Editor -oneconfig.hudeditor.general.title=Background Options -oneconfig.hudeditor.choosesomething=Click on an element to continue. -oneconfig.hudeditor.cantedit.aslegacy=This HUD is running in legacy compatibility mode and cannot be edited. - -oneconfig.hudeditor.padding.title=ALIGNMENT & PADDING -oneconfig.hudeditor.padding.info=These settings control the distance between the edge of the background and the HUD, as well as its alignment. -oneconfig.hudeditor.padding.mode.main=Main-axis alignment -oneconfig.hudeditor.padding.mode.cross=Cross-axis alignment -oneconfig.hudeditor.padding.main=Main-axis padding -oneconfig.hudeditor.padding.cross=Cross-axis padding - -oneconfig.hudeditor.component.title=Component settings -oneconfig.hudeditor.component.info=These settings control the size and alignment of the component. - -oneconfig.hudeditor.color.fill=Fill color -oneconfig.hudeditor.color.border=Border color - -oneconfig.hudeditor.opacity=Opacity -oneconfig.hudeditor.rotation=Rotation -oneconfig.hudeditor.radii=Corner radius -oneconfig.hudeditor.skew=Skew - -oneconfig.hudeditor.text.title=TEXT OPTIONS -oneconfig.hudeditor.text.example=The quick brown fox jumps over the lazy dog -oneconfig.hudeditor.text.size=Font size -oneconfig.hudeditor.text.weight=Weight -oneconfig.hudeditor.text.font=Font -oneconfig.hudeditor.text.effects=Case type - -oneconfig.align=Align -oneconfig.align.start=Start -oneconfig.align.center=Center -oneconfig.align.end=End -oneconfig.align.spacebetween=Space Between -oneconfig.align.spaceevenly=Space Evenly - -oneconfig.fweight.100=Thin -oneconfig.fweight.200=Extra light -oneconfig.fweight.300=Light -oneconfig.fweight.400=Regular -oneconfig.fweight.500=Medium -oneconfig.fweight.600=Semi bold -oneconfig.fweight.700=Bold -oneconfig.fweight.800=Extra bold -oneconfig.fweight.900=Black - -oneconfig.sidebar.title.options=OPTIONS -oneconfig.mods=Mods -oneconfig.profiles=Profiles -oneconfig.keybinds=Keybinds -oneconfig.sidebar.title.personal=PERSONALIZATION -oneconfig.themes=Themes -oneconfig.preferences=Preferences -oneconfig.sidebar.title.extra=HELP & FEEDBACK -oneconfig.changelog=Changelog - -oneconfig.mods.none=No mods installed! -oneconfig.mods.none.desc=You don't have any compatible mods installed.\nInstall some to configure them here. Visit https://polyfrost.org/mods to get some! - -oneconfig.feedback=Feedback - -oneconfig.beta=BETA -oneconfig.soon=SOON -oneconfig.readmore=Read more -oneconfig.writtenby=Written by {0} diff --git a/versions/src/main/resources/err.png b/versions/src/main/resources/err.png deleted file mode 100644 index 8ab7805936a6d412ba9cfea2ffac068d0d5cac39..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4628 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 diff --git a/versions/src/main/resources/licenses/BlurMC-License.txt b/versions/src/main/resources/licenses/BlurMC-License.txt index cfbfd8390..04cb43bb9 100644 --- a/versions/src/main/resources/licenses/BlurMC-License.txt +++ b/versions/src/main/resources/licenses/BlurMC-License.txt @@ -16,9 +16,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - ----------------- - -The proof of permission is listed in this -folder, feel free to view it if you wish \ No newline at end of file +SOFTWARE. \ No newline at end of file