From d62ee562abe14cf06275b30411226e440a6ac3a7 Mon Sep 17 00:00:00 2001 From: Linnea Gräf Date: Sat, 6 Sep 2025 17:09:15 +0200 Subject: feat: rework input system to be more generic towards keycodes --- src/main/kotlin/util/async/input.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/main/kotlin/util/async') diff --git a/src/main/kotlin/util/async/input.kt b/src/main/kotlin/util/async/input.kt index 2c546ba..35265f5 100644 --- a/src/main/kotlin/util/async/input.kt +++ b/src/main/kotlin/util/async/input.kt @@ -12,13 +12,13 @@ import kotlin.coroutines.resume import net.minecraft.client.gui.screen.Screen import moe.nea.firmament.events.HandledScreenKeyPressedEvent import moe.nea.firmament.gui.FirmButtonComponent -import moe.nea.firmament.keybindings.IKeyBinding +import moe.nea.firmament.keybindings.SavedKeyBinding import moe.nea.firmament.util.MC import moe.nea.firmament.util.MoulConfigUtils import moe.nea.firmament.util.ScreenUtil private object InputHandler { - data class KeyInputContinuation(val keybind: IKeyBinding, val onContinue: () -> Unit) + data class KeyInputContinuation(val keybind: SavedKeyBinding, val onContinue: () -> Unit) private val activeContinuations = mutableListOf() @@ -46,7 +46,7 @@ private object InputHandler { } } -suspend fun waitForInput(keybind: IKeyBinding): Unit = suspendCancellableCoroutine { cont -> +suspend fun waitForInput(keybind: SavedKeyBinding): Unit = suspendCancellableCoroutine { cont -> val unregister = InputHandler.registerContinuation(InputHandler.KeyInputContinuation(keybind) { cont.resume(Unit) }) cont.invokeOnCancellation { -- cgit