Merge pull request #33 from PojavLauncherTeam/main

Pull from main branch
This commit is contained in:
Duy Tran Khanh authored and GitHub committed 2021-02-09 19:25:02 +07:00
commit 86b53581d8
3 files changed
+10 -2

No files matched your search

+4
View File
@@ -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";
@@ -81,6 +83,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];
+4
View File
@@ -107,6 +107,8 @@ 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 * 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));
@@ -260,6 +262,8 @@ ADD_BUTTON_DEF_KEY(f3, GLFW_KEY_F3)
ADD_BUTTON_DEF_KEY(f5, GLFW_KEY_F5)
// ADD_BUTTON_DEF_KEY(f11, GLFW_KEY_F11)
ADD_BUTTON_DEF_KEY(t, GLFW_KEY_T)
ADD_BUTTON_DEF_KEY(c, 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)
+2 -2
View File
@@ -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).<br>
- [GL4ES](https://github.com/ptitSeb/gl4es) by @lunixbochs @ptitSeb: [MIT License](https://github.com/ptitSeb/gl4es/blob/master/LICENSE).<br>
- [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).<br>
- [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).<br>
- [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.<br>