From c7a10421d9b323a5f62066af8e4e59b188538fc4 Mon Sep 17 00:00:00 2001 From: khanhduytran0 Date: Sat, 28 Nov 2020 20:33:40 +0700 Subject: [PATCH] [Text input] double letter fix --- .../java/net/kdt/pojavlaunch/AndroidLWJGLKeycode.java | 8 ++++---- .../java/net/kdt/pojavlaunch/BaseLauncherActivity.java | 4 +--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/net/kdt/pojavlaunch/AndroidLWJGLKeycode.java b/app/src/main/java/net/kdt/pojavlaunch/AndroidLWJGLKeycode.java index 5e125ff3a..23b48f43b 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/AndroidLWJGLKeycode.java +++ b/app/src/main/java/net/kdt/pojavlaunch/AndroidLWJGLKeycode.java @@ -7,7 +7,7 @@ import org.lwjgl.glfw.*; public class AndroidLWJGLKeycode { // Fix double letters on MC 1.9 and above - public static boolean isBackspaceAfterChar; + public static boolean isBackspaceAfterChar = true; private static final ArrayMap androidToLwjglMap; private static String[] androidKeyNameArray; static { @@ -196,10 +196,10 @@ public class AndroidLWJGLKeycode { try { if (!CallbackBridge.isGrabbing()) { - if ((int) keyEvent.getDisplayLabel() != KeyEvent.KEYCODE_UNKNOWN) { - BaseMainActivity.sendKeyPress(androidToLwjglMap.get(keyEvent.getKeyCode()), (char) keyEvent.getDisplayLabel(), keyEvent.getScanCode(), mods, isDown); - } else if ((int) keyEvent.getUnicodeChar() != KeyEvent.KEYCODE_UNKNOWN) { + if ((int) keyEvent.getUnicodeChar() != KeyEvent.KEYCODE_UNKNOWN) { BaseMainActivity.sendKeyPress(androidToLwjglMap.get(keyEvent.getKeyCode()), (char) keyEvent.getUnicodeChar(), keyEvent.getScanCode(), mods, isDown); + } else if ((int) keyEvent.getDisplayLabel() != KeyEvent.KEYCODE_UNKNOWN) { + BaseMainActivity.sendKeyPress(androidToLwjglMap.get(keyEvent.getKeyCode()), (char) keyEvent.getDisplayLabel(), keyEvent.getScanCode(), mods, isDown); } } } catch (Throwable th) { diff --git a/app/src/main/java/net/kdt/pojavlaunch/BaseLauncherActivity.java b/app/src/main/java/net/kdt/pojavlaunch/BaseLauncherActivity.java index 12606ca9d..c3c95fdf8 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/BaseLauncherActivity.java +++ b/app/src/main/java/net/kdt/pojavlaunch/BaseLauncherActivity.java @@ -71,9 +71,7 @@ public abstract class BaseLauncherActivity extends BaseActivity { installMod(true); break; case 2: // Custom controls - if (Tools.enableDevFeatures) { - startActivity(new Intent(BaseLauncherActivity.this, CustomControlsActivity.class)); - } + startActivity(new Intent(BaseLauncherActivity.this, CustomControlsActivity.class)); break; case 3: // Settings startActivity(new Intent(BaseLauncherActivity.this, LauncherPreferenceActivity.class));