diff --git a/app_pojavlauncher/src/main/assets/components/lwjgl3/3.3.3/lwjgl-3.3.3-merged-modules.jar b/app_pojavlauncher/src/main/assets/components/lwjgl3/3.3.3/lwjgl-3.3.3-merged-modules.jar index 19a7ba4c5..a2b03a8b2 100644 Binary files a/app_pojavlauncher/src/main/assets/components/lwjgl3/3.3.3/lwjgl-3.3.3-merged-modules.jar and b/app_pojavlauncher/src/main/assets/components/lwjgl3/3.3.3/lwjgl-3.3.3-merged-modules.jar differ diff --git a/app_pojavlauncher/src/main/assets/components/lwjgl3/3.3.3/lwjgl-freetype.jar b/app_pojavlauncher/src/main/assets/components/lwjgl3/3.3.3/lwjgl-freetype.jar index 0e1a853c4..45670a88a 100644 Binary files a/app_pojavlauncher/src/main/assets/components/lwjgl3/3.3.3/lwjgl-freetype.jar and b/app_pojavlauncher/src/main/assets/components/lwjgl3/3.3.3/lwjgl-freetype.jar differ diff --git a/app_pojavlauncher/src/main/assets/components/lwjgl3/3.3.3/lwjgl-lwjglx.jar b/app_pojavlauncher/src/main/assets/components/lwjgl3/3.3.3/lwjgl-lwjglx.jar index ca4e20fa2..41ccde77a 100644 Binary files a/app_pojavlauncher/src/main/assets/components/lwjgl3/3.3.3/lwjgl-lwjglx.jar and b/app_pojavlauncher/src/main/assets/components/lwjgl3/3.3.3/lwjgl-lwjglx.jar differ diff --git a/app_pojavlauncher/src/main/assets/components/lwjgl3/3.3.3/lwjgl-nanovg.jar b/app_pojavlauncher/src/main/assets/components/lwjgl3/3.3.3/lwjgl-nanovg.jar index c7738efa0..de51565ac 100644 Binary files a/app_pojavlauncher/src/main/assets/components/lwjgl3/3.3.3/lwjgl-nanovg.jar and b/app_pojavlauncher/src/main/assets/components/lwjgl3/3.3.3/lwjgl-nanovg.jar differ diff --git a/app_pojavlauncher/src/main/assets/components/lwjgl3/3.3.3/lwjgl-openal.jar b/app_pojavlauncher/src/main/assets/components/lwjgl3/3.3.3/lwjgl-openal.jar index 0033b8061..c280f9c22 100644 Binary files a/app_pojavlauncher/src/main/assets/components/lwjgl3/3.3.3/lwjgl-openal.jar and b/app_pojavlauncher/src/main/assets/components/lwjgl3/3.3.3/lwjgl-openal.jar differ diff --git a/app_pojavlauncher/src/main/assets/components/lwjgl3/3.3.3/lwjgl-shaderc.jar b/app_pojavlauncher/src/main/assets/components/lwjgl3/3.3.3/lwjgl-shaderc.jar index b12af561d..42c12433d 100644 Binary files a/app_pojavlauncher/src/main/assets/components/lwjgl3/3.3.3/lwjgl-shaderc.jar and b/app_pojavlauncher/src/main/assets/components/lwjgl3/3.3.3/lwjgl-shaderc.jar differ diff --git a/app_pojavlauncher/src/main/assets/components/lwjgl3/3.3.3/lwjgl-spvc.jar b/app_pojavlauncher/src/main/assets/components/lwjgl3/3.3.3/lwjgl-spvc.jar index 28df172fc..8c7128655 100644 Binary files a/app_pojavlauncher/src/main/assets/components/lwjgl3/3.3.3/lwjgl-spvc.jar and b/app_pojavlauncher/src/main/assets/components/lwjgl3/3.3.3/lwjgl-spvc.jar differ diff --git a/app_pojavlauncher/src/main/assets/components/lwjgl3/3.3.3/lwjgl-stb.jar b/app_pojavlauncher/src/main/assets/components/lwjgl3/3.3.3/lwjgl-stb.jar index 7b2837383..43799d96c 100644 Binary files a/app_pojavlauncher/src/main/assets/components/lwjgl3/3.3.3/lwjgl-stb.jar and b/app_pojavlauncher/src/main/assets/components/lwjgl3/3.3.3/lwjgl-stb.jar differ diff --git a/app_pojavlauncher/src/main/assets/components/lwjgl3/3.3.3/lwjgl-tinyfd.jar b/app_pojavlauncher/src/main/assets/components/lwjgl3/3.3.3/lwjgl-tinyfd.jar index c8e7df345..7c5a5397f 100644 Binary files a/app_pojavlauncher/src/main/assets/components/lwjgl3/3.3.3/lwjgl-tinyfd.jar and b/app_pojavlauncher/src/main/assets/components/lwjgl3/3.3.3/lwjgl-tinyfd.jar differ diff --git a/app_pojavlauncher/src/main/assets/components/lwjgl3/3.3.3/lwjgl-vma.jar b/app_pojavlauncher/src/main/assets/components/lwjgl3/3.3.3/lwjgl-vma.jar index 98049ba3a..5468a5206 100644 Binary files a/app_pojavlauncher/src/main/assets/components/lwjgl3/3.3.3/lwjgl-vma.jar and b/app_pojavlauncher/src/main/assets/components/lwjgl3/3.3.3/lwjgl-vma.jar differ diff --git a/app_pojavlauncher/src/main/assets/components/lwjgl3/3.3.3/lwjgl-vulkan.jar b/app_pojavlauncher/src/main/assets/components/lwjgl3/3.3.3/lwjgl-vulkan.jar index 8e47fa2d1..ee0718840 100644 Binary files a/app_pojavlauncher/src/main/assets/components/lwjgl3/3.3.3/lwjgl-vulkan.jar and b/app_pojavlauncher/src/main/assets/components/lwjgl3/3.3.3/lwjgl-vulkan.jar differ diff --git a/app_pojavlauncher/src/main/assets/components/lwjgl3/3.3.3/lwjgl.jar b/app_pojavlauncher/src/main/assets/components/lwjgl3/3.3.3/lwjgl.jar index f5a332fa9..9c9e0632f 100644 Binary files a/app_pojavlauncher/src/main/assets/components/lwjgl3/3.3.3/lwjgl.jar and b/app_pojavlauncher/src/main/assets/components/lwjgl3/3.3.3/lwjgl.jar differ diff --git a/app_pojavlauncher/src/main/assets/components/lwjgl3/3.3.3/version b/app_pojavlauncher/src/main/assets/components/lwjgl3/3.3.3/version index 2611f98b0..50873ad45 100644 --- a/app_pojavlauncher/src/main/assets/components/lwjgl3/3.3.3/version +++ b/app_pojavlauncher/src/main/assets/components/lwjgl3/3.3.3/version @@ -1 +1 @@ -d562b83d28c54d14bbb2f0366ed428945100310e \ No newline at end of file +7e958ece157c2208c2a8c715a4f92b684b112cfa \ No newline at end of file diff --git a/app_pojavlauncher/src/main/assets/components/lwjgl3/3.4.1/lwjgl-3.4.1-merged-modules.jar b/app_pojavlauncher/src/main/assets/components/lwjgl3/3.4.1/lwjgl-3.4.1-merged-modules.jar index 3dab4bc2e..badf649cc 100644 Binary files a/app_pojavlauncher/src/main/assets/components/lwjgl3/3.4.1/lwjgl-3.4.1-merged-modules.jar and b/app_pojavlauncher/src/main/assets/components/lwjgl3/3.4.1/lwjgl-3.4.1-merged-modules.jar differ diff --git a/app_pojavlauncher/src/main/assets/components/lwjgl3/3.4.1/lwjgl-freetype.jar b/app_pojavlauncher/src/main/assets/components/lwjgl3/3.4.1/lwjgl-freetype.jar index cd6030001..f77201aad 100644 Binary files a/app_pojavlauncher/src/main/assets/components/lwjgl3/3.4.1/lwjgl-freetype.jar and b/app_pojavlauncher/src/main/assets/components/lwjgl3/3.4.1/lwjgl-freetype.jar differ diff --git a/app_pojavlauncher/src/main/assets/components/lwjgl3/3.4.1/lwjgl-lwjglx.jar b/app_pojavlauncher/src/main/assets/components/lwjgl3/3.4.1/lwjgl-lwjglx.jar index b6df6fe3b..b25b6a467 100644 Binary files a/app_pojavlauncher/src/main/assets/components/lwjgl3/3.4.1/lwjgl-lwjglx.jar and b/app_pojavlauncher/src/main/assets/components/lwjgl3/3.4.1/lwjgl-lwjglx.jar differ diff --git a/app_pojavlauncher/src/main/assets/components/lwjgl3/3.4.1/lwjgl-nanovg.jar b/app_pojavlauncher/src/main/assets/components/lwjgl3/3.4.1/lwjgl-nanovg.jar index 6522ec97d..21c50ae2d 100644 Binary files a/app_pojavlauncher/src/main/assets/components/lwjgl3/3.4.1/lwjgl-nanovg.jar and b/app_pojavlauncher/src/main/assets/components/lwjgl3/3.4.1/lwjgl-nanovg.jar differ diff --git a/app_pojavlauncher/src/main/assets/components/lwjgl3/3.4.1/lwjgl-openal.jar b/app_pojavlauncher/src/main/assets/components/lwjgl3/3.4.1/lwjgl-openal.jar index e48411565..477fb455b 100644 Binary files a/app_pojavlauncher/src/main/assets/components/lwjgl3/3.4.1/lwjgl-openal.jar and b/app_pojavlauncher/src/main/assets/components/lwjgl3/3.4.1/lwjgl-openal.jar differ diff --git a/app_pojavlauncher/src/main/assets/components/lwjgl3/3.4.1/lwjgl-shaderc.jar b/app_pojavlauncher/src/main/assets/components/lwjgl3/3.4.1/lwjgl-shaderc.jar index 9587cac93..1b7a66f7d 100644 Binary files a/app_pojavlauncher/src/main/assets/components/lwjgl3/3.4.1/lwjgl-shaderc.jar and b/app_pojavlauncher/src/main/assets/components/lwjgl3/3.4.1/lwjgl-shaderc.jar differ diff --git a/app_pojavlauncher/src/main/assets/components/lwjgl3/3.4.1/lwjgl-spvc.jar b/app_pojavlauncher/src/main/assets/components/lwjgl3/3.4.1/lwjgl-spvc.jar index 4aeae7e6d..0a859695c 100644 Binary files a/app_pojavlauncher/src/main/assets/components/lwjgl3/3.4.1/lwjgl-spvc.jar and b/app_pojavlauncher/src/main/assets/components/lwjgl3/3.4.1/lwjgl-spvc.jar differ diff --git a/app_pojavlauncher/src/main/assets/components/lwjgl3/3.4.1/lwjgl-stb.jar b/app_pojavlauncher/src/main/assets/components/lwjgl3/3.4.1/lwjgl-stb.jar index b896dd03b..db56a1b5d 100644 Binary files a/app_pojavlauncher/src/main/assets/components/lwjgl3/3.4.1/lwjgl-stb.jar and b/app_pojavlauncher/src/main/assets/components/lwjgl3/3.4.1/lwjgl-stb.jar differ diff --git a/app_pojavlauncher/src/main/assets/components/lwjgl3/3.4.1/lwjgl-tinyfd.jar b/app_pojavlauncher/src/main/assets/components/lwjgl3/3.4.1/lwjgl-tinyfd.jar index 59042e6f1..440516647 100644 Binary files a/app_pojavlauncher/src/main/assets/components/lwjgl3/3.4.1/lwjgl-tinyfd.jar and b/app_pojavlauncher/src/main/assets/components/lwjgl3/3.4.1/lwjgl-tinyfd.jar differ diff --git a/app_pojavlauncher/src/main/assets/components/lwjgl3/3.4.1/lwjgl-vma.jar b/app_pojavlauncher/src/main/assets/components/lwjgl3/3.4.1/lwjgl-vma.jar index 958b9c5b2..27f967b74 100644 Binary files a/app_pojavlauncher/src/main/assets/components/lwjgl3/3.4.1/lwjgl-vma.jar and b/app_pojavlauncher/src/main/assets/components/lwjgl3/3.4.1/lwjgl-vma.jar differ diff --git a/app_pojavlauncher/src/main/assets/components/lwjgl3/3.4.1/lwjgl-vulkan.jar b/app_pojavlauncher/src/main/assets/components/lwjgl3/3.4.1/lwjgl-vulkan.jar index 806b62ca4..4b5bbde66 100644 Binary files a/app_pojavlauncher/src/main/assets/components/lwjgl3/3.4.1/lwjgl-vulkan.jar and b/app_pojavlauncher/src/main/assets/components/lwjgl3/3.4.1/lwjgl-vulkan.jar differ diff --git a/app_pojavlauncher/src/main/assets/components/lwjgl3/3.4.1/lwjgl.jar b/app_pojavlauncher/src/main/assets/components/lwjgl3/3.4.1/lwjgl.jar index 1f746784c..632f21928 100644 Binary files a/app_pojavlauncher/src/main/assets/components/lwjgl3/3.4.1/lwjgl.jar and b/app_pojavlauncher/src/main/assets/components/lwjgl3/3.4.1/lwjgl.jar differ diff --git a/app_pojavlauncher/src/main/assets/components/lwjgl3/3.4.1/version b/app_pojavlauncher/src/main/assets/components/lwjgl3/3.4.1/version index 95678ab8e..a4cb3f363 100644 --- a/app_pojavlauncher/src/main/assets/components/lwjgl3/3.4.1/version +++ b/app_pojavlauncher/src/main/assets/components/lwjgl3/3.4.1/version @@ -1 +1 @@ -3999dc44bce7e9d269e034e79c7e430f88a50f3e \ No newline at end of file +80680c59be7562f6efefb301122e421068d6c652 \ No newline at end of file diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Tools.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Tools.java index d6305a40a..7c037d38f 100644 --- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Tools.java +++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/Tools.java @@ -862,9 +862,13 @@ public final class Tools { String internalLwjglVersion = iLwjglVersion >= 341 ? "3.4.1" : "3.3.3"; File lwjgl3Folder = new File(Tools.DIR_GAME_HOME, "lwjgl3/"+internalLwjglVersion); String lwjglCore = lwjgl3Folder.getAbsolutePath() + "/lwjgl.jar"; + String lwjglMerged = lwjgl3Folder.getAbsolutePath() + "/lwjgl-"+internalLwjglVersion+"-merged-modules"; String lwjglxFile = lwjgl3Folder + "/lwjgl-lwjglx.jar"; + launchClasspath.append(lwjglCore).append(":"); + // 2nd in priority in case we need to merge lwjgl.jar again for testing + launchClasspath.append(lwjglMerged).append(":"); File[] lwjglModules = lwjgl3Folder.listFiles(pathname -> pathname.getName().endsWith(".jar") && diff --git a/app_pojavlauncher/src/main/jni/input_bridge_v3.c b/app_pojavlauncher/src/main/jni/input_bridge_v3.c index 6ddab2e06..716946e94 100644 --- a/app_pojavlauncher/src/main/jni/input_bridge_v3.c +++ b/app_pojavlauncher/src/main/jni/input_bridge_v3.c @@ -48,6 +48,10 @@ jint JNI_OnLoad(JavaVM* vm, __attribute__((unused)) void* reserved) { LOGI("Saving DVM environ..."); //Save dalvik global JavaVM pointer pojav_environ->dalvikJavaVMPtr = vm; + // Sets up the stuff that GLFW/JVM needs to communicate to Android + // These methods are called from GLFW/JVM and connect to Android-side impls + // These aren't separated out into a method because these can be ran so long as we are in Android-land + // so that means this library must be loaded at least once in Android-land JNIEnv *dvEnv; (*vm)->GetEnv(vm, (void**) &dvEnv, JNI_VERSION_1_4); pojav_environ->bridgeClazz = (*dvEnv)->NewGlobalRef(dvEnv,(*dvEnv) ->FindClass(dvEnv,"org/lwjgl/glfw/CallbackBridge")); @@ -60,17 +64,7 @@ jint JNI_OnLoad(JavaVM* vm, __attribute__((unused)) void* reserved) { LOGI("Saving JVM environ..."); pojav_environ->runtimeJavaVMPtr = vm; JNIEnv *vmEnv; - (*vm)->GetEnv(vm, (void**) &vmEnv, JNI_VERSION_1_4); - pojav_environ->vmGlfwClass = (*vmEnv)->NewGlobalRef(vmEnv, (*vmEnv)->FindClass(vmEnv, "org/lwjgl/glfw/GLFW")); - pojav_environ->method_glftSetWindowAttrib = (*vmEnv)->GetStaticMethodID(vmEnv, pojav_environ->vmGlfwClass, "glfwSetWindowAttrib", "(JII)V"); - pojav_environ->method_internalWindowSizeChanged = (*vmEnv)->GetStaticMethodID(vmEnv, pojav_environ->vmGlfwClass, "internalWindowSizeChanged", "(J)V"); - pojav_environ->method_internalChangeMonitorSize = (*vmEnv)->GetStaticMethodID(vmEnv, pojav_environ->vmGlfwClass, "internalChangeMonitorSize", "(II)V"); - jfieldID field_keyDownBuffer = (*vmEnv)->GetStaticFieldID(vmEnv, pojav_environ->vmGlfwClass, "keyDownBuffer", "Ljava/nio/ByteBuffer;"); - jobject keyDownBufferJ = (*vmEnv)->GetStaticObjectField(vmEnv, pojav_environ->vmGlfwClass, field_keyDownBuffer); - pojav_environ->keyDownBuffer = (*vmEnv)->GetDirectBufferAddress(vmEnv, keyDownBufferJ); - jfieldID field_mouseDownBuffer = (*vmEnv)->GetStaticFieldID(vmEnv, pojav_environ->vmGlfwClass, "mouseDownBuffer", "Ljava/nio/ByteBuffer;"); - jobject mouseDownBufferJ = (*vmEnv)->GetStaticObjectField(vmEnv, pojav_environ->vmGlfwClass, field_mouseDownBuffer); - pojav_environ->mouseDownBuffer = (*vmEnv)->GetDirectBufferAddress(vmEnv, mouseDownBufferJ); + (*pojav_environ->runtimeJavaVMPtr)->GetEnv(pojav_environ->runtimeJavaVMPtr, (void**) &vmEnv, JNI_VERSION_1_4); hookExec(vmEnv); installLwjglDlopenHook(vmEnv); installEMUIIteratorMititgation(vmEnv); @@ -87,6 +81,26 @@ jint JNI_OnLoad(JavaVM* vm, __attribute__((unused)) void* reserved) { return JNI_VERSION_1_4; } +// Sets up the stuff that Android needs to communicate to GLFW/JVM +// These methods are called from Android and connect to GLFW/JVM-side impls +// These are separated out into a method because GLFW loads much later than when we need to dlopen +// pojavexec since it does more than just GLFW. +// TODO: Add checks in case someone forgets to run this method. Probably see if pojav_environ->vmGlfwClass is null or not +JNIEXPORT void JNICALL Java_org_lwjgl_glfw_GLFW_nativeInitializeGLFWNativeBridge(__attribute__((unused)) JNIEnv* env, __attribute__((unused)) jclass clazz) { + JNIEnv *vmEnv; + (*pojav_environ->runtimeJavaVMPtr)->GetEnv(pojav_environ->runtimeJavaVMPtr, (void**) &vmEnv, JNI_VERSION_1_4); + pojav_environ->vmGlfwClass = (*vmEnv)->NewGlobalRef(vmEnv, (*vmEnv)->FindClass(vmEnv, "org/lwjgl/glfw/GLFW")); + pojav_environ->method_glftSetWindowAttrib = (*vmEnv)->GetStaticMethodID(vmEnv, pojav_environ->vmGlfwClass, "glfwSetWindowAttrib", "(JII)V"); + pojav_environ->method_internalWindowSizeChanged = (*vmEnv)->GetStaticMethodID(vmEnv, pojav_environ->vmGlfwClass, "internalWindowSizeChanged", "(J)V"); + pojav_environ->method_internalChangeMonitorSize = (*vmEnv)->GetStaticMethodID(vmEnv, pojav_environ->vmGlfwClass, "internalChangeMonitorSize", "(II)V"); + jfieldID field_keyDownBuffer = (*vmEnv)->GetStaticFieldID(vmEnv, pojav_environ->vmGlfwClass, "keyDownBuffer", "Ljava/nio/ByteBuffer;"); + jobject keyDownBufferJ = (*vmEnv)->GetStaticObjectField(vmEnv, pojav_environ->vmGlfwClass, field_keyDownBuffer); + pojav_environ->keyDownBuffer = (*vmEnv)->GetDirectBufferAddress(vmEnv, keyDownBufferJ); + jfieldID field_mouseDownBuffer = (*vmEnv)->GetStaticFieldID(vmEnv, pojav_environ->vmGlfwClass, "mouseDownBuffer", "Ljava/nio/ByteBuffer;"); + jobject mouseDownBufferJ = (*vmEnv)->GetStaticObjectField(vmEnv, pojav_environ->vmGlfwClass, field_mouseDownBuffer); + pojav_environ->mouseDownBuffer = (*vmEnv)->GetDirectBufferAddress(vmEnv, mouseDownBufferJ); +} + #define ADD_CALLBACK_WWIN(NAME) \ JNIEXPORT jlong JNICALL Java_org_lwjgl_glfw_GLFW_nglfwSet##NAME##Callback(JNIEnv * env, jclass cls, jlong window, jlong callbackptr) { \ void** oldCallback = (void**) &pojav_environ->GLFW_invoke_##NAME; \ diff --git a/jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl-freetype.jar b/jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl-freetype.jar index 0e1a853c4..45670a88a 100644 Binary files a/jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl-freetype.jar and b/jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl-freetype.jar differ diff --git a/jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl-glfw.jar b/jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl-glfw.jar index 86ada0908..c78b68261 100644 Binary files a/jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl-glfw.jar and b/jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl-glfw.jar differ diff --git a/jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl-lwjglx.jar b/jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl-lwjglx.jar index ca4e20fa2..41ccde77a 100644 Binary files a/jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl-lwjglx.jar and b/jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl-lwjglx.jar differ diff --git a/jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl-nanovg.jar b/jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl-nanovg.jar index c7738efa0..de51565ac 100644 Binary files a/jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl-nanovg.jar and b/jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl-nanovg.jar differ diff --git a/jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl-openal.jar b/jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl-openal.jar index 0033b8061..c280f9c22 100644 Binary files a/jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl-openal.jar and b/jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl-openal.jar differ diff --git a/jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl-opengl.jar b/jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl-opengl.jar index 49d696e5f..4bd46ee8f 100644 Binary files a/jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl-opengl.jar and b/jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl-opengl.jar differ diff --git a/jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl-shaderc.jar b/jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl-shaderc.jar index b12af561d..42c12433d 100644 Binary files a/jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl-shaderc.jar and b/jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl-shaderc.jar differ diff --git a/jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl-spvc.jar b/jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl-spvc.jar index 28df172fc..8c7128655 100644 Binary files a/jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl-spvc.jar and b/jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl-spvc.jar differ diff --git a/jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl-stb.jar b/jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl-stb.jar index 7b2837383..43799d96c 100644 Binary files a/jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl-stb.jar and b/jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl-stb.jar differ diff --git a/jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl-tinyfd.jar b/jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl-tinyfd.jar index c8e7df345..7c5a5397f 100644 Binary files a/jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl-tinyfd.jar and b/jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl-tinyfd.jar differ diff --git a/jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl-vma.jar b/jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl-vma.jar index 98049ba3a..5468a5206 100644 Binary files a/jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl-vma.jar and b/jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl-vma.jar differ diff --git a/jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl-vulkan.jar b/jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl-vulkan.jar index 8e47fa2d1..ee0718840 100644 Binary files a/jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl-vulkan.jar and b/jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl-vulkan.jar differ diff --git a/jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl.jar b/jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl.jar index f5a332fa9..9c9e0632f 100644 Binary files a/jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl.jar and b/jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl.jar differ diff --git a/jre_lwjgl3glfw/lwjgl-3.3.3/src/main/java/org/lwjgl/glfw/GLFW.java b/jre_lwjgl3glfw/lwjgl-3.3.3/src/main/java/org/lwjgl/glfw/GLFW.java index 56292d4e2..410f0b6aa 100644 --- a/jre_lwjgl3glfw/lwjgl-3.3.3/src/main/java/org/lwjgl/glfw/GLFW.java +++ b/jre_lwjgl3glfw/lwjgl-3.3.3/src/main/java/org/lwjgl/glfw/GLFW.java @@ -522,10 +522,13 @@ public class GLFW private static final String PROP_WINDOW_HEIGHT= "glfwstub.windowHeight"; public static long mainContext = 0; private static long gamepadDataPointer; - + private static native void nativeInitializeGLFWNativeBridge(); static { try { + // Mods like LWJGL3ify have more of a chance of overriding the other classes so + // lets just load it here again just to be safe. System.loadLibrary("pojavexec"); + nativeInitializeGLFWNativeBridge(); } catch (UnsatisfiedLinkError e) { e.printStackTrace(); } diff --git a/jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl-freetype.jar b/jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl-freetype.jar index cd6030001..f77201aad 100644 Binary files a/jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl-freetype.jar and b/jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl-freetype.jar differ diff --git a/jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl-glfw.jar b/jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl-glfw.jar index 44ed7def5..f1e84084b 100644 Binary files a/jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl-glfw.jar and b/jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl-glfw.jar differ diff --git a/jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl-lwjglx.jar b/jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl-lwjglx.jar index b6df6fe3b..b25b6a467 100644 Binary files a/jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl-lwjglx.jar and b/jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl-lwjglx.jar differ diff --git a/jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl-nanovg.jar b/jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl-nanovg.jar index 6522ec97d..21c50ae2d 100644 Binary files a/jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl-nanovg.jar and b/jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl-nanovg.jar differ diff --git a/jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl-openal.jar b/jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl-openal.jar index e48411565..477fb455b 100644 Binary files a/jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl-openal.jar and b/jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl-openal.jar differ diff --git a/jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl-opengl.jar b/jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl-opengl.jar index a9f59b50b..7cd0aafa6 100644 Binary files a/jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl-opengl.jar and b/jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl-opengl.jar differ diff --git a/jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl-shaderc.jar b/jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl-shaderc.jar index 9587cac93..1b7a66f7d 100644 Binary files a/jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl-shaderc.jar and b/jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl-shaderc.jar differ diff --git a/jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl-spvc.jar b/jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl-spvc.jar index 4aeae7e6d..0a859695c 100644 Binary files a/jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl-spvc.jar and b/jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl-spvc.jar differ diff --git a/jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl-stb.jar b/jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl-stb.jar index b896dd03b..db56a1b5d 100644 Binary files a/jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl-stb.jar and b/jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl-stb.jar differ diff --git a/jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl-tinyfd.jar b/jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl-tinyfd.jar index 59042e6f1..440516647 100644 Binary files a/jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl-tinyfd.jar and b/jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl-tinyfd.jar differ diff --git a/jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl-vma.jar b/jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl-vma.jar index 958b9c5b2..27f967b74 100644 Binary files a/jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl-vma.jar and b/jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl-vma.jar differ diff --git a/jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl-vulkan.jar b/jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl-vulkan.jar index 806b62ca4..4b5bbde66 100644 Binary files a/jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl-vulkan.jar and b/jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl-vulkan.jar differ diff --git a/jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl.jar b/jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl.jar index 1f746784c..632f21928 100644 Binary files a/jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl.jar and b/jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl.jar differ diff --git a/jre_lwjgl3glfw/lwjgl-3.4.1/src/main/java/org/lwjgl/glfw/GLFW.java b/jre_lwjgl3glfw/lwjgl-3.4.1/src/main/java/org/lwjgl/glfw/GLFW.java index c25522ab9..d81731e10 100644 --- a/jre_lwjgl3glfw/lwjgl-3.4.1/src/main/java/org/lwjgl/glfw/GLFW.java +++ b/jre_lwjgl3glfw/lwjgl-3.4.1/src/main/java/org/lwjgl/glfw/GLFW.java @@ -529,9 +529,13 @@ public class GLFW public static long mainContext = 0; private static long gamepadDataPointer; + private static native void nativeInitializeGLFWNativeBridge(); static { try { + // Mods like LWJGL3ify have more of a chance of overriding the other classes so + // lets just load it here again just to be safe. System.loadLibrary("pojavexec"); + nativeInitializeGLFWNativeBridge(); } catch (UnsatisfiedLinkError e) { e.printStackTrace(); }