aboutsummaryrefslogtreecommitdiff
path: root/src/main/kotlin/events/WorldKeyboardEvent.kt
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/kotlin/events/WorldKeyboardEvent.kt')
-rw-r--r--src/main/kotlin/events/WorldKeyboardEvent.kt7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/main/kotlin/events/WorldKeyboardEvent.kt b/src/main/kotlin/events/WorldKeyboardEvent.kt
index eed892d..860db5c 100644
--- a/src/main/kotlin/events/WorldKeyboardEvent.kt
+++ b/src/main/kotlin/events/WorldKeyboardEvent.kt
@@ -4,13 +4,10 @@ import moe.nea.firmament.keybindings.GenericInputAction
import moe.nea.firmament.keybindings.InputModifiers
import moe.nea.firmament.keybindings.SavedKeyBinding
-data class WorldKeyboardEvent(val keyCode: Int, val scanCode: Int, val modifiers: Int) : FirmamentEvent.Cancellable() {
+data class WorldKeyboardEvent(val action: GenericInputAction, val modifiers: InputModifiers) : FirmamentEvent.Cancellable() {
fun matches(keyBinding: SavedKeyBinding, atLeast: Boolean = false): Boolean {
- return keyBinding.matches(intoAction(), InputModifiers(modifiers), atLeast)
+ return keyBinding.matches(action, modifiers, atLeast)
}
- fun intoAction() = GenericInputAction.key(keyCode, scanCode)
-
-
companion object : FirmamentEventBus<WorldKeyboardEvent>()
}