mirror of
https://github.com/AngelAuraMC/Amethyst-Android.git
synced 2025-09-14 15:17:02 -04:00
Multiple changes
- Force to use LaunchWrapper 2.0 or above, to fix java9 compatibility issue. - Remove Regal libraries. - Update version name
This commit is contained in:
parent
d606d25bea
commit
11f1e1b5c9
@ -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 {
|
||||
|
@ -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;
|
||||
|
@ -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);
|
||||
}
|
||||
|
Binary file not shown.
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user