From c89b663acad487caeb15f7521be3dd14342dd4e7 Mon Sep 17 00:00:00 2001 From: Linnea Gräf Date: Fri, 18 Oct 2024 00:41:25 +0200 Subject: Add slot binding --- .../kotlin/events/HandledScreenKeyPressedEvent.kt | 44 ++++++++++++++-------- 1 file changed, 29 insertions(+), 15 deletions(-) (limited to 'src/main/kotlin/events') diff --git a/src/main/kotlin/events/HandledScreenKeyPressedEvent.kt b/src/main/kotlin/events/HandledScreenKeyPressedEvent.kt index 7ec2abb..183ec71 100644 --- a/src/main/kotlin/events/HandledScreenKeyPressedEvent.kt +++ b/src/main/kotlin/events/HandledScreenKeyPressedEvent.kt @@ -1,24 +1,38 @@ - - package moe.nea.firmament.events import net.minecraft.client.gui.screen.ingame.HandledScreen import net.minecraft.client.option.KeyBinding import moe.nea.firmament.keybindings.IKeyBinding -data class HandledScreenKeyPressedEvent( - val screen: HandledScreen<*>, - val keyCode: Int, - val scanCode: Int, - val modifiers: Int -) : FirmamentEvent.Cancellable() { - companion object : FirmamentEventBus() +sealed interface HandledScreenKeyEvent { + val screen: HandledScreen<*> + val keyCode: Int + val scanCode: Int + val modifiers: Int + + fun matches(keyBinding: KeyBinding): Boolean { + return matches(IKeyBinding.minecraft(keyBinding)) + } - fun matches(keyBinding: KeyBinding): Boolean { - return matches(IKeyBinding.minecraft(keyBinding)) - } + fun matches(keyBinding: IKeyBinding): Boolean { + return keyBinding.matches(keyCode, scanCode, modifiers) + } +} + +data class HandledScreenKeyPressedEvent( + override val screen: HandledScreen<*>, + override val keyCode: Int, + override val scanCode: Int, + override val modifiers: Int +) : FirmamentEvent.Cancellable(), HandledScreenKeyEvent { + companion object : FirmamentEventBus() +} - fun matches(keyBinding: IKeyBinding): Boolean { - return keyBinding.matches(keyCode, scanCode, modifiers) - } +data class HandledScreenKeyReleasedEvent( + override val screen: HandledScreen<*>, + override val keyCode: Int, + override val scanCode: Int, + override val modifiers: Int +) : FirmamentEvent.Cancellable(), HandledScreenKeyEvent { + companion object : FirmamentEventBus() } -- cgit