From 48298eb390636b1ccd27be8e25eecfd6534f5c3f Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Mon, 8 Feb 2021 20:27:10 +0700 Subject: [PATCH 1/8] Try to fix Sodium crashes --- Natives/JavaLauncher.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Natives/JavaLauncher.c b/Natives/JavaLauncher.c index 4f99fa7f..18d75d8d 100644 --- a/Natives/JavaLauncher.c +++ b/Natives/JavaLauncher.c @@ -81,6 +81,8 @@ int launchJVM(int argc, char *argv[]) { margv[margc++] = "/usr/lib/jvm/java-16-openjdk/bin/java"; margv[margc++] = "-XstartOnFirstThread"; margv[margc++] = "-Djava.library.path=/Applications/PojavLauncher.app/Frameworks"; + margv[margc++] = "-Duser.dir=/var/mobile/Documents/minecraft"; + margv[margc++] = "-Duser.home=/var/mobile/Documents"; margv[margc++] = "-Dorg.lwjgl.opengl.libname=libGL.dylib"; margv[margc++] = "-Dorg.lwjgl.system.allocator=system"; char jvmargs[10000]; From 167d22cefd8631c989df52c4a70d980ed5e015dc Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh Date: Mon, 8 Feb 2021 20:53:23 +0700 Subject: [PATCH 2/8] Fixed Sodium crashes --- Natives/JavaLauncher.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Natives/JavaLauncher.c b/Natives/JavaLauncher.c index 18d75d8d..a7086b38 100644 --- a/Natives/JavaLauncher.c +++ b/Natives/JavaLauncher.c @@ -44,6 +44,8 @@ int launchJVM(int argc, char *argv[]) { setenv("LIBGL_MIPMAP", "3", 1); setenv("LIBGL_NORMALIZE", "1", 1); + chdir("/var/mobile/Documents/minecraft"); + char *java_libs_dir = "/Applications/PojavLauncher.app/libs"; char *args_path = "/var/mobile/Documents/minecraft/overrideargs.txt"; From 373d71f52e8403253bd2a2476c07281019f11d51 Mon Sep 17 00:00:00 2001 From: HongyiMC <39605206+HongyiMC@users.noreply.github.com> Date: Mon, 8 Feb 2021 11:41:06 -0800 Subject: [PATCH 3/8] Add zoom for Optifine --- Natives/SurfaceViewController.m | 1 + 1 file changed, 1 insertion(+) diff --git a/Natives/SurfaceViewController.m b/Natives/SurfaceViewController.m index 590d2c6a..33a3b2f4 100644 --- a/Natives/SurfaceViewController.m +++ b/Natives/SurfaceViewController.m @@ -107,6 +107,7 @@ BOOL shouldTriggerClick = NO; ADD_BUTTON_VISIBLE(@"Debug", f3, CGRectMake(5, 5, BTN_RECT)); ADD_BUTTON_VISIBLE(@"Chat", t, CGRectMake(5 * 2 + 80, 5, BTN_RECT)); ADD_BUTTON_VISIBLE(@"Tab", tab, CGRectMake(5 * 4 + 80 * 3, 5, BTN_RECT)); + ADD_BUTTON_VISIBLE(@"Opti-Zoom", c, CGRectMake(5 * 5 + 80 * 3, 5, BTN_RECT)); ADD_BUTTON_VISIBLE(@"3rd", f5, CGRectMake(5, 5 * 2 + 30.0, BTN_RECT)); ADD_BUTTON_VISIBLE(@"▲", w, CGRectMake(5 * 2 + 50, height - 5 * 3 - 50 * 3, BTN_SQUARE)); From 1ee2def0353f8e5d0122e89d9424d7b733453986 Mon Sep 17 00:00:00 2001 From: HongyiMC <39605206+HongyiMC@users.noreply.github.com> Date: Mon, 8 Feb 2021 13:47:23 -0800 Subject: [PATCH 4/8] Update SurfaceViewController.m --- Natives/SurfaceViewController.m | 1 + 1 file changed, 1 insertion(+) diff --git a/Natives/SurfaceViewController.m b/Natives/SurfaceViewController.m index 33a3b2f4..11d38e8f 100644 --- a/Natives/SurfaceViewController.m +++ b/Natives/SurfaceViewController.m @@ -260,6 +260,7 @@ ADD_BUTTON_DEF(special_mouse_sec) { ADD_BUTTON_DEF_KEY(f3, GLFW_KEY_F3) ADD_BUTTON_DEF_KEY(f5, GLFW_KEY_F5) ADD_BUTTON_DEF_KEY(t, GLFW_KEY_T) +ADD_BUTTON_DEF_KEY(c, GLFW_KEY_C) ADD_BUTTON_DEF_KEY(tab, GLFW_KEY_TAB) ADD_BUTTON_DEF_KEY(w, GLFW_KEY_W) From fbb7f653daea52d38edd12e5249aff936115435c Mon Sep 17 00:00:00 2001 From: HongyiMC <39605206+HongyiMC@users.noreply.github.com> Date: Mon, 8 Feb 2021 13:57:22 -0800 Subject: [PATCH 5/8] Fix position --- Natives/SurfaceViewController.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Natives/SurfaceViewController.m b/Natives/SurfaceViewController.m index 11d38e8f..fa4be1a3 100644 --- a/Natives/SurfaceViewController.m +++ b/Natives/SurfaceViewController.m @@ -107,7 +107,7 @@ BOOL shouldTriggerClick = NO; ADD_BUTTON_VISIBLE(@"Debug", f3, CGRectMake(5, 5, BTN_RECT)); ADD_BUTTON_VISIBLE(@"Chat", t, CGRectMake(5 * 2 + 80, 5, BTN_RECT)); ADD_BUTTON_VISIBLE(@"Tab", tab, CGRectMake(5 * 4 + 80 * 3, 5, BTN_RECT)); - ADD_BUTTON_VISIBLE(@"Opti-Zoom", c, CGRectMake(5 * 5 + 80 * 3, 5, BTN_RECT)); + ADD_BUTTON_VISIBLE(@"Opti-Zoom", c, CGRectMake(5 * 5 + 80 * 4, 5, BTN_RECT)); ADD_BUTTON_VISIBLE(@"3rd", f5, CGRectMake(5, 5 * 2 + 30.0, BTN_RECT)); ADD_BUTTON_VISIBLE(@"▲", w, CGRectMake(5 * 2 + 50, height - 5 * 3 - 50 * 3, BTN_SQUARE)); From 1263d21d68de2d7dc36847e2897533c64b7ac268 Mon Sep 17 00:00:00 2001 From: HongyiMC <39605206+HongyiMC@users.noreply.github.com> Date: Mon, 8 Feb 2021 14:53:23 -0800 Subject: [PATCH 6/8] Add Offhand Button --- Natives/SurfaceViewController.m | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Natives/SurfaceViewController.m b/Natives/SurfaceViewController.m index fa4be1a3..3d498f8f 100644 --- a/Natives/SurfaceViewController.m +++ b/Natives/SurfaceViewController.m @@ -108,6 +108,7 @@ BOOL shouldTriggerClick = NO; ADD_BUTTON_VISIBLE(@"Chat", t, CGRectMake(5 * 2 + 80, 5, BTN_RECT)); ADD_BUTTON_VISIBLE(@"Tab", tab, CGRectMake(5 * 4 + 80 * 3, 5, BTN_RECT)); ADD_BUTTON_VISIBLE(@"Opti-Zoom", c, CGRectMake(5 * 5 + 80 * 4, 5, BTN_RECT)); + ADD_BUTTON_VISIBLE(@"Offhand", f, CGRectMake(5 * 6 + 80 * 5, 5, BTN_RECT)); ADD_BUTTON_VISIBLE(@"3rd", f5, CGRectMake(5, 5 * 2 + 30.0, BTN_RECT)); ADD_BUTTON_VISIBLE(@"▲", w, CGRectMake(5 * 2 + 50, height - 5 * 3 - 50 * 3, BTN_SQUARE)); @@ -261,6 +262,7 @@ ADD_BUTTON_DEF_KEY(f3, GLFW_KEY_F3) ADD_BUTTON_DEF_KEY(f5, GLFW_KEY_F5) ADD_BUTTON_DEF_KEY(t, GLFW_KEY_T) ADD_BUTTON_DEF_KEY(c, GLFW_KEY_C) +ADD_BUTTON_DEF_KEY(f, GLFW_KEY_C) ADD_BUTTON_DEF_KEY(tab, GLFW_KEY_TAB) ADD_BUTTON_DEF_KEY(w, GLFW_KEY_W) From e55860cb414a4fd2e3eb672aba2166f77a76f0e8 Mon Sep 17 00:00:00 2001 From: HongyiMC <39605206+HongyiMC@users.noreply.github.com> Date: Mon, 8 Feb 2021 15:03:05 -0800 Subject: [PATCH 7/8] fix F --- Natives/SurfaceViewController.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Natives/SurfaceViewController.m b/Natives/SurfaceViewController.m index 3d498f8f..aabd9c29 100644 --- a/Natives/SurfaceViewController.m +++ b/Natives/SurfaceViewController.m @@ -262,7 +262,7 @@ ADD_BUTTON_DEF_KEY(f3, GLFW_KEY_F3) ADD_BUTTON_DEF_KEY(f5, GLFW_KEY_F5) ADD_BUTTON_DEF_KEY(t, GLFW_KEY_T) ADD_BUTTON_DEF_KEY(c, GLFW_KEY_C) -ADD_BUTTON_DEF_KEY(f, GLFW_KEY_C) +ADD_BUTTON_DEF_KEY(f, GLFW_KEY_F) ADD_BUTTON_DEF_KEY(tab, GLFW_KEY_TAB) ADD_BUTTON_DEF_KEY(w, GLFW_KEY_W) From 0126f84836d3bfe4c59db8213d7313f916da6035 Mon Sep 17 00:00:00 2001 From: Duy Tran Khanh <40482367+khanhduytran0@users.noreply.github.com> Date: Tue, 9 Feb 2021 14:34:56 +0700 Subject: [PATCH 8/8] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 92aecb53..3811c0d0 100644 --- a/README.md +++ b/README.md @@ -93,8 +93,8 @@ Contributions are welcome! We welcome any type of contribution, not only code. A ## Credits & Third party components and their licenses - [Boardwalk](https://github.com/zhuowei/Boardwalk) (JVM Launcher): Unknown License/[Apache License 2.0](https://github.com/zhuowei/Boardwalk/blob/master/LICENSE) or GNU GPLv2. -- [GL4ES](https://github.com/ptitSeb/gl4es) by @ptitSeb: [MIT License](https://github.com/ptitSeb/gl4es/blob/master/LICENSE).
+- [GL4ES](https://github.com/ptitSeb/gl4es) by @lunixbochs @ptitSeb: [MIT License](https://github.com/ptitSeb/gl4es/blob/master/LICENSE).
- [MetalANGLE](https://github.com/kakashidinho/metalangle) by @kakashidinho and ANGLE team: [BSD License 2.0](https://github.com/kakashidinho/metalangle/blob/master/LICENSE). -- [OpenJDK 16](https://www.ios-repo-updates.com/repository/procursus/package/openjdk-16-jre) porter to iOS by @Diatrus: [GNU GPLv2 License](https://openjdk.java.net/legal/gplv2+ce.html).
+- [OpenJDK 16](https://www.ios-repo-updates.com/repository/procursus/package/openjdk-16-jre) ported to iOS by @Diatrus: [GNU GPLv2 License](https://openjdk.java.net/legal/gplv2+ce.html).
- [LWJGL3](https://github.com/PojavLauncherTeam/lwjgl3): [BSD-3 License](https://github.com/LWJGL/lwjgl3/blob/master/LICENSE.md). - [LWJGLX](https://github.com/PojavLauncherTeam/lwjglx) (LWJGL2 API compatibility layer for LWJGL3): unknown license.