diff --git a/app/build.gradle b/app/build.gradle index c6af170f9..c4cdc2e3d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -24,7 +24,7 @@ android { minSdkVersion 21 targetSdkVersion 26 versionCode 156235 - versionName "3.2.0t6_6406b_20201007" + versionName "3.2.0_6407b_20201012" multiDexEnabled true //important ndk { diff --git a/app/src/main/java/net/kdt/pojavlaunch/Tools.java b/app/src/main/java/net/kdt/pojavlaunch/Tools.java index 0627bbbf2..89f6ac9d2 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/Tools.java +++ b/app/src/main/java/net/kdt/pojavlaunch/Tools.java @@ -640,8 +640,12 @@ public final class Tools for (DependentLibrary lib : customVer.libraries) { if (lib.name.startsWith(optifineLib)) { customVer.optifineLib = lib; - break; - } + } else if (lib.name.startsWith("net.minecraft:launchwrapper")) { + int versionIndex = lib.name.lastIndexOf(":"); + if (lib.name.substring(versionIndex + 1).startsWith("1.")) { + lib.name = lib.name.substring(0, versionIndex + 1) + "2.0"; + } + } } if (customVer.inheritsFrom == null) { return customVer; diff --git a/app/src/main/jni/egl_bridge.c b/app/src/main/jni/egl_bridge.c index d601658a6..8582de6fc 100644 --- a/app/src/main/jni/egl_bridge.c +++ b/app/src/main/jni/egl_bridge.c @@ -186,8 +186,6 @@ JNIEXPORT jboolean JNICALL Java_org_lwjgl_glfw_GLFW_nativeEglTerminate(JNIEnv* e JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL_nativeRegalMakeCurrent(JNIEnv *env, jclass clazz) { printf("Regal: making current"); - - RegalMakeCurrent_func *RegalMakeCurrent = (RegalMakeCurrent_func *) dlsym(RTLD_DEFAULT, "RegalMakeCurrent"); RegalMakeCurrent(potatoBridge.eglContext); } diff --git a/app/src/main/jniLibs/arm64-v8a/libRegal.so b/app/src/main/jniLibs/arm64-v8a/libRegal.so deleted file mode 100644 index 6f6a83074..000000000 Binary files a/app/src/main/jniLibs/arm64-v8a/libRegal.so and /dev/null differ diff --git a/app/src/main/jniLibs/armeabi-v7a/libRegal.so b/app/src/main/jniLibs/armeabi-v7a/libRegal.so deleted file mode 100644 index 3bf5ab33d..000000000 Binary files a/app/src/main/jniLibs/armeabi-v7a/libRegal.so and /dev/null differ