From 292571c00e1d2d94167c7da10e0ea368fdb60e53 Mon Sep 17 00:00:00 2001 From: SerpentSpirale Date: Sat, 14 Aug 2021 14:34:12 +0200 Subject: [PATCH] - Fix keyboard not working in mc 1.13+ - Fix bad handling of KEY_MULTIPLE cases. --- .../kdt/pojavlaunch/customcontrols/TouchCharInput.java | 4 +++- .../src/main/java/org/lwjgl/glfw/CallbackBridge.java | 9 --------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/TouchCharInput.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/TouchCharInput.java index 38b1cdda7..edcf1380f 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/TouchCharInput.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/customcontrols/TouchCharInput.java @@ -50,7 +50,9 @@ public class TouchCharInput extends androidx.appcompat.widget.AppCompatEditText } }else{ for(int i=lengthBefore, index=lengthBefore+start; i < lengthAfter; ++i){ - CallbackBridge.sendChar(text.charAt(index)); + //I didn't know F25 existed before that. I just need a full fat keycode for mc 1.13+ + CallbackBridge.sendKeycode(LWJGLGLFWKeycode.GLFW_KEY_F25, text.charAt(index), 0, 0, true); + index ++; } } diff --git a/app_pojavlauncher/src/main/java/org/lwjgl/glfw/CallbackBridge.java b/app_pojavlauncher/src/main/java/org/lwjgl/glfw/CallbackBridge.java index c11f76368..94111f036 100644 --- a/app_pojavlauncher/src/main/java/org/lwjgl/glfw/CallbackBridge.java +++ b/app_pojavlauncher/src/main/java/org/lwjgl/glfw/CallbackBridge.java @@ -80,15 +80,6 @@ public class CallbackBridge { // sendData(JRE_TYPE_KEYCODE_CONTROL, keycode, Character.toString(keychar), Boolean.toString(isDown), modifiers); } - /** - * Send only the char to the input bridge - * Intended for chat functions, or anything that only requires writing text - * @param keychar the char to send - */ - public static void sendChar(char keychar){ - nativeSendChar(keychar); - } - public static void sendMouseKeycode(int button, int modifiers, boolean isDown) { DEBUG_STRING.append("MouseKey=").append(button).append(", down=").append(isDown).append("\n"); // if (isGrabbing()) DEBUG_STRING.append("MouseGrabStrace: " + android.util.Log.getStackTraceString(new Throwable()) + "\n");