From 98b778d0dd123fa1e68a4e9196ed00acfe123ac7 Mon Sep 17 00:00:00 2001 From: nea Date: Sat, 10 Jun 2023 22:37:58 +0200 Subject: Add world keyboard event --- .../java/moe/nea/firmament/mixins/MixinKeyboard.java | 17 +++++++++++++++++ .../moe/nea/firmament/events/WorldKeyboardEvent.kt | 16 ++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 src/main/java/moe/nea/firmament/mixins/MixinKeyboard.java create mode 100644 src/main/kotlin/moe/nea/firmament/events/WorldKeyboardEvent.kt (limited to 'src') diff --git a/src/main/java/moe/nea/firmament/mixins/MixinKeyboard.java b/src/main/java/moe/nea/firmament/mixins/MixinKeyboard.java new file mode 100644 index 0000000..e302679 --- /dev/null +++ b/src/main/java/moe/nea/firmament/mixins/MixinKeyboard.java @@ -0,0 +1,17 @@ +package moe.nea.firmament.mixins; + +import moe.nea.firmament.events.WorldKeyboardEvent; +import net.minecraft.client.Keyboard; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(Keyboard.class) +public class MixinKeyboard { + + @Inject(method = "onKey", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/option/KeyBinding;onKeyPressed(Lnet/minecraft/client/util/InputUtil$Key;)V")) + public void onKeyBoardInWorld(long window, int key, int scancode, int action, int modifiers, CallbackInfo ci) { + WorldKeyboardEvent.Companion.publish(new WorldKeyboardEvent(key, scancode, modifiers)); + } +} diff --git a/src/main/kotlin/moe/nea/firmament/events/WorldKeyboardEvent.kt b/src/main/kotlin/moe/nea/firmament/events/WorldKeyboardEvent.kt new file mode 100644 index 0000000..497d38f --- /dev/null +++ b/src/main/kotlin/moe/nea/firmament/events/WorldKeyboardEvent.kt @@ -0,0 +1,16 @@ +package moe.nea.firmament.events + +import net.minecraft.client.option.KeyBinding +import moe.nea.firmament.keybindings.IKeyBinding + +data class WorldKeyboardEvent(val keyCode: Int, val scanCode: Int, val modifiers: Int) : FirmamentEvent.Cancellable() { + companion object : FirmamentEventBus() + + fun matches(keyBinding: KeyBinding): Boolean { + return matches(IKeyBinding.minecraft(keyBinding)) + } + + fun matches(keyBinding: IKeyBinding): Boolean { + return keyBinding.matches(keyCode, scanCode, modifiers) + } +} -- cgit