From 349d87355d58e8438c829d326afd585b1959abd7 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Mon, 7 Dec 2020 13:39:26 +0700 Subject: [PATCH 1/4] Try to fix KEY_PERIOD not working --- app/src/main/java/net/kdt/pojavlaunch/AndroidLWJGLKeycode.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/net/kdt/pojavlaunch/AndroidLWJGLKeycode.java b/app/src/main/java/net/kdt/pojavlaunch/AndroidLWJGLKeycode.java index ff4702bc9..76f4e1d2f 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/AndroidLWJGLKeycode.java +++ b/app/src/main/java/net/kdt/pojavlaunch/AndroidLWJGLKeycode.java @@ -207,7 +207,7 @@ public class AndroidLWJGLKeycode { th.printStackTrace(); } - if (isBackspaceAfterChar && (keyEvent.getDisplayLabel() + keyEvent.getUnicodeChar()) != KeyEvent.KEYCODE_UNKNOWN && !CallbackBridge.isGrabbing() && i != KeyEvent.KEYCODE_DEL) { + if (isBackspaceAfterChar && (keyEvent.getDisplayLabel() != KeyEvent.KEYCODE_UNKNOWN || keyEvent.isPrintingKey()) && !CallbackBridge.isGrabbing() && i != KeyEvent.KEYCODE_DEL) { BaseMainActivity.sendKeyPress(LWJGLGLFWKeycode.GLFW_KEY_BACKSPACE, 0, isDown); } } From 1f25a8cfefeb8cb8e3ef6aa328efa2f33aac2204 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Mon, 7 Dec 2020 13:51:44 +0700 Subject: [PATCH 2/4] Update README.md --- README.md | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 77867f5e5..768b6bb0b 100644 --- a/README.md +++ b/README.md @@ -2,10 +2,9 @@ [![Crowdin](https://badges.crowdin.net/pojavlauncher/localized.svg)](https://crowdin.com/project/pojavlauncher) [![Discord](https://img.shields.io/discord/724163890803638273.svg?label=&logo=discord&logoColor=ffffff&color=7389D8&labelColor=6A7EC2)](https://discord.gg/6RpEJda) # PojavLauncher -A Minecraft: Java Edition launcher for Android based on [Boardwalk](https://github.com/zhuowei/Boardwalk). ## Navigation -- [Introduction](#mainly-features-on-v3) +- [Introduction](#introduction) - [Building](#building) - [Current status](#current-status) - [License](#license) @@ -13,10 +12,8 @@ A Minecraft: Java Edition launcher for Android based on [Boardwalk](https://gith - [Credits & Third party components and it's licenses](#credits--third-party-components-and-its-licenses) -## Mainly features on v3 -- Launch Minecraft 1.6 to latest 1.17 snapshot. -- Launch Forge up to 1.13.2. To install Forge 1.12.2 and below, simply put to mod install launcher. For Forge 1.13.2, use custom arguments. -- Launch Fabric any versions. [How to install Fabric](https://github.com/PojavLauncherTeam/PojavLauncher/wiki/Install-Fabric). +## Introduction +PojavLauncher is a Minecraft: Java Edition launcher for Android based on [Boardwalk](https://github.com/zhuowei/Boardwalk). This launcher can launch a variety large of Minecraft versions (from 1.6 to latest 1.17 snapshot, even Combat Test versions). Modding via Forge and Fabric is also supported, but Forge is currently limited to 1.13.2 and below. ## Building - Because languages are auto added by Crowdin, so need to run language list generator before build. In this directory, run: From edcbfbf5d4aa3d394ed3f4428ad18114d6d85778 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Mon, 7 Dec 2020 14:07:20 +0700 Subject: [PATCH 3/4] Update README.md --- README.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/README.md b/README.md index 768b6bb0b..486395e02 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,17 @@ PojavLauncher is a Minecraft: Java Edition launcher for Android based on [Boardwalk](https://github.com/zhuowei/Boardwalk). This launcher can launch a variety large of Minecraft versions (from 1.6 to latest 1.17 snapshot, even Combat Test versions). Modding via Forge and Fabric is also supported, but Forge is currently limited to 1.13.2 and below. ## Building +Will be moved to **BUILDING.md** +### Java Runtime Environment (JRE) +- JRE for Android is [here](https://github.com/PojavLauncherTeam/openjdk-multiarch-jdk8u), also the build script [here](https://github.com/PojavLauncherTeam/android-openjdk-build-multiarch). +- Follow build instruction on build script [README.md](https://github.com/PojavLauncherTeam/android-openjdk-build-multiarch/blob/buildjre8/README.md). +- You can also get [CI auto builds](https://github.com/PojavLauncherTeam/android-openjdk-build-multiarch/actions). +- Spliting JRE and put to the launcher: **coming soon**. + +### LWJGL and GLFW +- **Coming soon** + +### The Launcher - Because languages are auto added by Crowdin, so need to run language list generator before build. In this directory, run: ``` # On Linux, Mac OS: From 8e21b28380059dc7bae6c0fd82371a1c831e6710 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Mon, 7 Dec 2020 14:12:23 +0700 Subject: [PATCH 4/4] Revert to 49974f0 --- .../kdt/pojavlaunch/AndroidLWJGLKeycode.java | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/net/kdt/pojavlaunch/AndroidLWJGLKeycode.java b/app/src/main/java/net/kdt/pojavlaunch/AndroidLWJGLKeycode.java index 76f4e1d2f..0d6ffc37e 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/AndroidLWJGLKeycode.java +++ b/app/src/main/java/net/kdt/pojavlaunch/AndroidLWJGLKeycode.java @@ -152,9 +152,6 @@ public class AndroidLWJGLKeycode { androidToLwjglMap.put(KeyEvent.KEYCODE_SPACE, LWJGLGLFWKeycode.GLFW_KEY_SPACE); // androidToLwjglMap.put(KeyEvent.KEYCODE_SYSRQ, LWJGLGLFWKeycode.GLFW_KEY_SYSRQ); androidToLwjglMap.put(KeyEvent.KEYCODE_TAB, LWJGLGLFWKeycode.GLFW_KEY_TAB); - - androidToLwjglMap.put(KeyEvent.KEYCODE_UNKNOWN, -1 /* LWJGLGLFWKeycode.GLFW_KEY_UNKNOWN */); - // androidToLwjglMap.put(KeyEvent.KEYCODE_YEN, LWJGLGLFWKeycode.GLFW_KEY_YEN); // androidToLwjglMap.put(KeyEvent.KEYCODE_BUTTON_1, LWJGLGLFWKeycode.G @@ -172,12 +169,14 @@ public class AndroidLWJGLKeycode { } public static void execKey(KeyEvent keyEvent, int i, boolean isDown) { - if (i == 1 && (keyEvent.getSource() == InputDevice.SOURCE_MOUSE)) { - // Right mouse detection - BaseMainActivity.sendMouseButton(LWJGLGLFWKeycode.GLFW_MOUSE_BUTTON_RIGHT, isDown); - // BaseMainActivity.sendMouseButton(LWJGLGLFWKeycode.GLFW_MOUSE_BUTTON_RIGHT, false); - } else { - BaseMainActivity.sendKeyPress(androidToLwjglMap.get(i), keyEvent.getModifiers(), isDown); + for (Map.Entry perKey : androidToLwjglMap.entrySet()) { + if (i == 1 && (keyEvent.getSource() == InputDevice.SOURCE_MOUSE)) { + // Right mouse detection + BaseMainActivity.sendMouseButton(LWJGLGLFWKeycode.GLFW_MOUSE_BUTTON_RIGHT, isDown); + // BaseMainActivity.sendMouseButton(LWJGLGLFWKeycode.GLFW_MOUSE_BUTTON_RIGHT, false); + } else if (perKey.getKey() == i) { + BaseMainActivity.sendKeyPress(perKey.getValue(), keyEvent.getModifiers(), isDown); + } } int mods = 0; @@ -207,7 +206,7 @@ public class AndroidLWJGLKeycode { th.printStackTrace(); } - if (isBackspaceAfterChar && (keyEvent.getDisplayLabel() != KeyEvent.KEYCODE_UNKNOWN || keyEvent.isPrintingKey()) && !CallbackBridge.isGrabbing() && i != KeyEvent.KEYCODE_DEL) { + if (isBackspaceAfterChar && (int) keyEvent.getDisplayLabel() != KeyEvent.KEYCODE_UNKNOWN && !CallbackBridge.isGrabbing() && i != KeyEvent.KEYCODE_DEL) { BaseMainActivity.sendKeyPress(LWJGLGLFWKeycode.GLFW_KEY_BACKSPACE, 0, isDown); } } @@ -231,4 +230,3 @@ public class AndroidLWJGLKeycode { return 0; } } -