From 3c95ff427e33be84b7cb741097c318ed4046584b Mon Sep 17 00:00:00 2001 From: Raven Szewczyk Date: Mon, 5 Jan 2026 13:04:15 +0000 Subject: [PATCH] Fix key input handling in OpenComputers monitors (#290) --- dependencies.gradle | 3 ++- .../eigenraven/lwjgl3ify/mixins/Mixins.java | 3 +++ .../lwjgl3ify/mixins/TargetedMod.java | 3 +++ .../mixins/early/oc/OcInputBuffer.java | 20 +++++++++++++++++++ src/main/java/org/lwjglx/input/Keyboard.java | 17 +++++++++++----- 5 files changed, 40 insertions(+), 6 deletions(-) create mode 100644 src/main/java/me/eigenraven/lwjgl3ify/mixins/early/oc/OcInputBuffer.java diff --git a/dependencies.gradle b/dependencies.gradle index 1265e4d..66426c4 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -64,9 +64,10 @@ dependencies { compileOnly(rfg.deobf("curse.maven:xaeros-minimap-263420:6012805")) compileOnly(rfg.deobf("curse.maven:xaeros-world-map-317780:5987124")) + compileOnly('com.github.GTNewHorizons:OpenComputers:1.12.9-GTNH:dev') runtimeOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.8.35-GTNH:dev') - // runtimeOnlyNonPublishable('com.github.GTNewHorizons:OpenComputers:1.12.8-GTNH:dev') + // runtimeOnlyNonPublishable('com.github.GTNewHorizons:OpenComputers:1.12.9-GTNH:dev') // runtimeOnlyNonPublishable('com.github.GTNewHorizons:inventory-tweaks:1.7.1:dev') // runtimeOnlyNonPublishable('maven.modrinth:cursormod:1.2.2-1.7.10') // runtimeOnlyNonPublishable(rfg.deobf("curse.maven:fplib-665627:7244842")) diff --git a/src/main/java/me/eigenraven/lwjgl3ify/mixins/Mixins.java b/src/main/java/me/eigenraven/lwjgl3ify/mixins/Mixins.java index 20410fd..d64a3cc 100644 --- a/src/main/java/me/eigenraven/lwjgl3ify/mixins/Mixins.java +++ b/src/main/java/me/eigenraven/lwjgl3ify/mixins/Mixins.java @@ -49,6 +49,9 @@ public enum Mixins implements IMixins { XAEROS_WORLDMAP_SCROLL(Phase.LATE, new MixinBuilder() .addClientMixins("xaeros.XaerosWorldmapScrolling") .addRequiredMod(TargetedMod.XAEROS_WORLDMAP)), + OPENCOMPUTERS_KEYBOARD_INPUT_FIX(Phase.EARLY, new MixinBuilder() + .addClientMixins("oc.OcInputBuffer") + .addRequiredMod(TargetedMod.OPENCOMPUTERS)), // apply the texture stitching mixin if // - you don't have fastcraft diff --git a/src/main/java/me/eigenraven/lwjgl3ify/mixins/TargetedMod.java b/src/main/java/me/eigenraven/lwjgl3ify/mixins/TargetedMod.java index d11e763..1fbee00 100644 --- a/src/main/java/me/eigenraven/lwjgl3ify/mixins/TargetedMod.java +++ b/src/main/java/me/eigenraven/lwjgl3ify/mixins/TargetedMod.java @@ -28,6 +28,9 @@ public enum TargetedMod implements ITargetMod { OPTIFINE(new TargetModBuilder().setCoreModClass("optifine.OptiFineForgeTweaker")), XAEROS_MINIMAP(new TargetModBuilder().setModId("XaeroMinimap")), XAEROS_WORLDMAP(new TargetModBuilder().setModId("XaeroWorldMap")), + // Support both the NH fork and upstream + OPENCOMPUTERS(new TargetModBuilder().setCoreModClass("li.cil.oc.common.launch.TransformerLoader") + .setModId("OpenComputers")) // ; diff --git a/src/main/java/me/eigenraven/lwjgl3ify/mixins/early/oc/OcInputBuffer.java b/src/main/java/me/eigenraven/lwjgl3ify/mixins/early/oc/OcInputBuffer.java new file mode 100644 index 0000000..8ffea35 --- /dev/null +++ b/src/main/java/me/eigenraven/lwjgl3ify/mixins/early/oc/OcInputBuffer.java @@ -0,0 +1,20 @@ +package me.eigenraven.lwjgl3ify.mixins.early.oc; + +import org.lwjglx.input.Keyboard; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +import li.cil.oc.client.gui.traits.InputBuffer$class; + +@Mixin(value = InputBuffer$class.class, remap = false) +public class OcInputBuffer { + + @Redirect( + method = "handleKeyboardInput", + at = @At(value = "INVOKE", target = "Lorg/lwjgl/input/Keyboard;getEventKey()I"), + expect = -1) + private static int useLwjgl3ifyNonScancodeKeycodeForKeyboardInput() { + return Keyboard.lwjgl3ify$getEventKeyNonScancode(); + } +} diff --git a/src/main/java/org/lwjglx/input/Keyboard.java b/src/main/java/org/lwjglx/input/Keyboard.java index afa38c4..411ddc1 100644 --- a/src/main/java/org/lwjglx/input/Keyboard.java +++ b/src/main/java/org/lwjglx/input/Keyboard.java @@ -225,7 +225,7 @@ public class Keyboard { unlocalizedKeyNameMiniLut[i] = "Key " + i; } } - eventQueue.add(new KeyEvent(0, '\0', KeyState.RELEASE, Sys.getNanoTime())); + eventQueue.add(new KeyEvent(0, 0, '\0', KeyState.RELEASE, Sys.getNanoTime())); } /** Populates the key name->index lookup table with the current keyboard layout based names. */ @@ -262,7 +262,8 @@ public class Keyboard { case RELEASED -> KeyState.RELEASE; case REPEATED -> KeyState.REPEAT; }; - addRawKeyEvent(new KeyEvent(KeyCodes.sdlScancodeToLwjgl(scancode), c, state, nanoTime)); + addRawKeyEvent( + new KeyEvent(KeyCodes.sdlScancodeToLwjgl(scancode), KeyCodes.sdlKeycodeToLwjgl(key), c, state, nanoTime)); } public static void addCharEvent(int key, int c) { @@ -270,7 +271,7 @@ public class Keyboard { Lwjgl3ify.LOG.info("[DEBUG-KEY-QUEUE] queued char virtual keypress codepoint:{} char:{}", c, c); } try { - eventQueue.add(new KeyEvent(KEY_NONE, c, KeyState.PRESS, Sys.getNanoTime())); + eventQueue.add(new KeyEvent(KEY_NONE, KEY_NONE, c, KeyState.PRESS, Sys.getNanoTime())); } catch (IllegalStateException ignored) {} } @@ -324,6 +325,10 @@ public class Keyboard { return eventQueue.peek().key; } + public static int lwjgl3ify$getEventKeyNonScancode() { + return eventQueue.peek().keyNonScancode; + } + public static char getEventCharacter() { return (char) eventQueue.peek().codepoint; } @@ -386,20 +391,22 @@ public class Keyboard { public static final class KeyEvent { public int key; + public int keyNonScancode; public int codepoint; public KeyState state; public long nano; public boolean queueOutOfOrderRelease = false; - public KeyEvent(int key, int codepoint, KeyState state, long nano) { + public KeyEvent(int key, int keyNonScancode, int codepoint, KeyState state, long nano) { this.key = key; + this.keyNonScancode = keyNonScancode; this.codepoint = codepoint; this.state = state; this.nano = nano; } public KeyEvent copy() { - final KeyEvent ev = new KeyEvent(key, codepoint, state, nano); + final KeyEvent ev = new KeyEvent(key, keyNonScancode, codepoint, state, nano); ev.queueOutOfOrderRelease = this.queueOutOfOrderRelease; return ev; }