diff options
Diffstat (limited to 'src/main/kotlin/keybindings')
| -rw-r--r-- | src/main/kotlin/keybindings/FirmamentKeyboardState.kt | 7 | ||||
| -rw-r--r-- | src/main/kotlin/keybindings/GenericInputButton.kt | 6 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/main/kotlin/keybindings/FirmamentKeyboardState.kt b/src/main/kotlin/keybindings/FirmamentKeyboardState.kt index 65288bc..dc20630 100644 --- a/src/main/kotlin/keybindings/FirmamentKeyboardState.kt +++ b/src/main/kotlin/keybindings/FirmamentKeyboardState.kt @@ -2,6 +2,7 @@ package moe.nea.firmament.keybindings import java.util.BitSet import org.lwjgl.glfw.GLFW +import net.minecraft.client.input.KeyInput object FirmamentKeyboardState { @@ -14,10 +15,10 @@ object FirmamentKeyboardState { } @Synchronized - fun maintainState(key: Int, scancode: Int, action: Int, modifiers: Int) { + fun maintainState(keyInput: KeyInput, action: Int) { when (action) { - GLFW.GLFW_PRESS -> pressedScancodes.set(scancode) - GLFW.GLFW_RELEASE -> pressedScancodes.clear(scancode) + GLFW.GLFW_PRESS -> pressedScancodes.set(keyInput.scancode) + GLFW.GLFW_RELEASE -> pressedScancodes.clear(keyInput.scancode) } } } diff --git a/src/main/kotlin/keybindings/GenericInputButton.kt b/src/main/kotlin/keybindings/GenericInputButton.kt index a352ce0..3876573 100644 --- a/src/main/kotlin/keybindings/GenericInputButton.kt +++ b/src/main/kotlin/keybindings/GenericInputButton.kt @@ -15,7 +15,9 @@ import kotlinx.serialization.json.int import kotlinx.serialization.json.put import net.minecraft.client.MinecraftClient import net.minecraft.client.gui.Click +import net.minecraft.client.input.AbstractInput import net.minecraft.client.input.KeyInput +import net.minecraft.client.input.MouseInput import net.minecraft.client.util.InputUtil import net.minecraft.client.util.MacWindowUtil import net.minecraft.text.Text @@ -195,6 +197,8 @@ sealed interface GenericInputAction { fun mouse(click: Click): GenericInputAction = mouse(click.button()) @JvmStatic + fun of(input: net.minecraft.client.input.MouseInput): GenericInputAction = mouse(input.button) + @JvmStatic fun of(input: KeyInput): GenericInputAction = key(input.keycode, input.scancode) @JvmStatic @@ -276,7 +280,7 @@ data class InputModifiers( fun of(modifiers: Int) = InputModifiers(modifiers) @JvmStatic - fun of(input: KeyInput) = InputModifiers(input.modifiers) + fun of(input: AbstractInput) = InputModifiers(input.modifiers()) fun none(): InputModifiers { return InputModifiers(0) |