Merge branch 'v1' of https://github.com/Polyfrost/OneConfig into v1

Polyfrost · Dec 24, 2024 · 688ac5e · 688ac5e
2 parents 71de332 + 560e316
commit 688ac5e
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 10 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,7 @@ name=OneConfig
 mod_id=oneconfig
 version_major=1
 version_minor=0
-version_patch=0-alpha.44
+version_patch=0-alpha.45
 
 polyfrost.defaults.loom=3
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -6,7 +6,7 @@ kotlin = "2.0.20"
 kotlinx-coroutines = "1.8.1"
 kotlinx-atomicfu = "0.24.0"
 fabric-language-kotlin = "1.12.2+kotlin.2.0.20"
-polyui = "1.7.3"
+polyui = "1.7.33"
 annotations = "24.1.0"
 hypixel-modapi = "1.0"
 hypixel-data = "0.1.2" # Dep of hypixel-modapi

diff --git a/...g-impl/src/main/kotlin/org/polyfrost/oneconfig/api/config/v1/internal/ConfigVisualizer.kt b/...g-impl/src/main/kotlin/org/polyfrost/oneconfig/api/config/v1/internal/ConfigVisualizer.kt
@@ -207,7 +207,7 @@ open class ConfigVisualizer {
                 wrapForAccordion(vis.visualize(node), node.title ?: return@map null, node.description).addHideHandler(node).linkTo(node)
             }
 
-        var open = false
+        var open = true
         val e: Property<*>? = tree.getProp("enabled")
         val toWrap: Drawable
         var enabled: Property<Boolean>? = null
@@ -238,13 +238,14 @@ open class ConfigVisualizer {
         }
 
         if (e != null && e.type == Boolean::class.java && e.getVisualizer() == null) {
+            open = e.getAs()
             toWrap = Group(
                 Switch(
                     lateralStretch = 2f,
                     size = 21f,
-                    state = e.getAs()
+                    state = open
                 ).onToggle {
-                    e.setAs(it)
+                    enabled?.setAs(it)
                     if (open != !it) (parent.parent as Drawable).openInsn(null)
                 },
                 Image("polyui/chevron-down.svg").also { it.rotation = PI }
@@ -257,10 +258,7 @@ open class ConfigVisualizer {
         val out = Block(
             wrap(toWrap, title, desc, icon).also {
                 it.color = PolyColor.TRANSPARENT
-                it.onClick {
-                    if (enabled != null && !enabled.getAs<Boolean>()) return@onClick
-                    this.openInsn(null)
-                }
+                it.onClick(openInsn)
             },
             Group(
                 size = Vec2(1078f, 0f),

diff --git a/...les/events/src/main/java/org/polyfrost/oneconfig/api/event/v1/events/ScreenOpenEvent.java b/...les/events/src/main/java/org/polyfrost/oneconfig/api/event/v1/events/ScreenOpenEvent.java
@@ -53,4 +53,9 @@ public ScreenOpenEvent(@Nullable Object screen) {
     public <T> T getScreen() {
         return (T) screen;
     }
+
+    @Nullable
+    public Object component1() {
+        return getScreen();
+    }
 }
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
@@ -196,6 +196,7 @@ object HudManager {
 
     private fun editorClose() {
         toggleHudPicker()
+        polyUI.unfocus()
         ConfigManager.active().saveAll()
     }
 

diff --git a/modules/hud/src/main/kotlin/org/polyfrost/oneconfig/api/hud/v1/internal/hud_utils.kt b/modules/hud/src/main/kotlin/org/polyfrost/oneconfig/api/hud/v1/internal/hud_utils.kt
@@ -220,6 +220,7 @@ private fun Drawable.addScaler(): Drawable {
         sb.x = x + vs.x - (sb.width / 2f)
         sb.y = y + vs.y - (sb.height / 2f)
         cur = this
+        polyUI.focus(scaleBlob)
         return@on false
     }
     return this

diff --git a/modules/ui/src/main/kotlin/org/polyfrost/oneconfig/api/ui/v1/keybind/KeybindManager.kt b/modules/ui/src/main/kotlin/org/polyfrost/oneconfig/api/ui/v1/keybind/KeybindManager.kt
@@ -28,6 +28,7 @@ package org.polyfrost.oneconfig.api.ui.v1.keybind
 
 import org.polyfrost.oneconfig.api.event.v1.eventHandler
 import org.polyfrost.oneconfig.api.event.v1.events.KeyInputEvent
+import org.polyfrost.oneconfig.api.event.v1.events.ScreenOpenEvent
 import org.polyfrost.oneconfig.api.event.v1.events.TickEvent
 import org.polyfrost.polyui.Settings
 import org.polyfrost.polyui.input.InputManager
@@ -58,6 +59,9 @@ object KeybindManager {
         eventHandler { _: TickEvent.End ->
             keyBinder.update(50_000L, inputManager.mods, true)
         }.register()
+        eventHandler { (screen): ScreenOpenEvent ->
+            if (screen == null) keyBinder.release()
+        }
 
         val m = Int2IntMap(8)
         m[UKeyboard.KEY_LSHIFT] = KeyModifiers.LSHIFT.value.toInt()

diff --git a/versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/SoundManagerMixin.java b/versions/src/main/java/org/polyfrost/oneconfig/internal/mixin/SoundManagerMixin.java
@@ -33,7 +33,7 @@ public class SoundManagerMixin {
             ),
             argsOnly = true
     )
-    private ISound oneconfig$playSound(ISound value) {
+    private ISound onPlaySoundCallback(ISound value) {
         //#if MC <= 1.8.9
         SoundEventAccessorComposite accessor = ((SoundManagerAccessorMixin) this).getSndHandler().getSound(value.getSoundLocation());
         SoundCategory category = (accessor == null ? null : accessor.getSoundCategory());