Merge branch 'QuestCraft-6.0.0' into QuestCraft-6.0.1

Author: thejudge156

src/main/assets/lwjgl/lwjgl-glfw-classes.jar

@@ -1 +1 @@
-1738988056798
+1752546870116

src/main/assets/lwjgl/version

@@ -172,21 +172,29 @@ public static MinecraftInstances.Instance createNewInstance(Activity activity, M
      *
      * @param instance The instance to update
      */
-    public static void prelaunch(Activity activity, MinecraftInstances instances, MinecraftInstances.Instance instance) {
+    public static boolean prelaunch(Activity activity, MinecraftInstances instances, MinecraftInstances.Instance instance) {
         gameReady = false;
         instance.updateMods(instances);
         if (hasConnection(activity)) {
             try {
-                JREUtils.prelaunchCheck(activity, instance);
-            } catch (IOException | ExecutionException | InterruptedException e) {
+                if(!JREUtils.prelaunchCheck(activity, instance)) {
+                    Logger.getInstance().appendToLog("JVM is not properly installed despite retry!");
+                    return false;
+                }
+            } catch (Throwable e) {
                 Logger.getInstance().appendToLog("WARN! Instance launch failed!" + e);
             }
         } else {
-            Logger.getInstance().appendToLog("Skipping prelaunch check due to no wifi connection!");
+            Logger.getInstance().appendToLog("Skipping most prelaunch checks due to no WiFi connection.");
+            if(!JREUtils.initJavaRuntime()) {
+                Logger.getInstance().appendToLog("JVM is not properly installed! Please connect to WiFi to install it!");
+                return false;
+            }
         }
         DownloadManager.reset();
 
         MinecraftInstances.CheckVivecraftConfig(instance);
+        return true;
     }
 
     /**

src/main/java/pojlib/API.java

@@ -24,7 +24,6 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.ExecutionException;
 
 import pojlib.API;
 
@@ -78,11 +77,8 @@ public static ArrayList<File> locateLibs(File path) {
         return returnValue;
     }
 
-    public static void initJavaRuntime() {
-        dlopen(findInLdLibPath("libjli.so"));
-        if(!dlopen("libjvm.so")){
-            dlopen(jvmLibraryPath+"/libjvm.so");
-        }
+    public static boolean initJavaRuntime() {
+        dlopen(findInLdLibPath("server/libjvm.so"));
         dlopen(findInLdLibPath("libverify.so"));
         dlopen(findInLdLibPath("libjava.so"));
         dlopen(findInLdLibPath("libnet.so"));
@@ -91,9 +87,15 @@ public static void initJavaRuntime() {
         dlopen(findInLdLibPath("libawt_headless.so"));
         dlopen(findInLdLibPath("libfreetype.so"));
         dlopen(findInLdLibPath("libfontmanager.so"));
-        for(File f : locateLibs(new File(runtimeDir + "/lib"))) {
-            dlopen(f.getAbsolutePath());
+        dlopen(findInLdLibPath("libjli.so"));
+
+        String dlerr = dlerror();
+        if(dlerr.contains(runtimeDir)) {
+            Logger.getInstance().appendToLog("ERROR! Could not dlopen libraries! " + dlerr);
+            return false;
         }
+
+        return true;
     }
 
     public static void redirectAndPrintJRELog() {
@@ -154,11 +156,15 @@ public static void setJavaEnvironment(Activity activity, MinecraftInstances.Inst
         //envMap.put("APP_HOME", Constants.USER_HOME);
         envMap.put("TMPDIR", activity.getCacheDir().getAbsolutePath());
         envMap.put("VR_MODEL", API.model);
-        envMap.put("POJLIB_RENDERER", "LightThinWrapper");
+        envMap.put("POJLIB_RENDERER", "MobileGLUES");
+        envMap.put("MG_DIR_PATH", activity.getFilesDir() + "/mg");
 
         envMap.put("LD_LIBRARY_PATH", LD_LIBRARY_PATH);
         envMap.put("PATH", activity.getFilesDir() + "/runtimes/JRE/bin:" + Os.getenv("PATH"));
 
+        File mg = new File(activity.getFilesDir() + "/mg");
+        mg.mkdirs();
+
         File customEnvFile = new File(Constants.USER_HOME, "custom_env.txt");
         if (customEnvFile.exists() && customEnvFile.isFile()) {
             BufferedReader reader = new BufferedReader(new FileReader(customEnvFile));
@@ -184,18 +190,21 @@ public static void setJavaEnvironment(Activity activity, MinecraftInstances.Inst
     }
 
     // Called before game launch to ensure all files are present and correct
-    public static void prelaunchCheck(Activity activity, MinecraftInstances.Instance instance) throws IOException, ExecutionException, InterruptedException {
+    public static boolean prelaunchCheck(Activity activity, MinecraftInstances.Instance instance) throws Throwable {
+        runtimeDir = activity.getFilesDir() + "/runtimes/JRE";
+        JREUtils.relocateLibPath(activity);
+        setJavaEnvironment(activity, instance);
+
         UnityPlayerActivity.installLWJGL(activity);
         Installer.installJVM(activity);
         Installer.installClient(MinecraftMeta.getVersionInfo(instance.versionName), Constants.USER_HOME).get();
         Installer.installLibraries(MinecraftMeta.getVersionInfo(instance.versionName), Constants.USER_HOME).get();
         Installer.installAssets(MinecraftMeta.getVersionInfo(instance.versionName), Constants.USER_HOME).get();
+
+        return initJavaRuntime();
     }
 
     public static int launchJavaVM(final Activity activity, final List<String> JVMArgs, MinecraftInstances.Instance instance) throws Throwable {
-        JREUtils.relocateLibPath(activity);
-        setJavaEnvironment(activity, instance);
-
         final String graphicsLib = loadGraphicsLibrary();
         List<String> userArgs = getJavaArgs(activity, instance);
 
@@ -209,12 +218,10 @@ public static int launchJavaVM(final Activity activity, final List<String> JVMAr
             ActivityManager.MemoryInfo ami = new ActivityManager.MemoryInfo();
             manager.getMemoryInfo(ami);
             long availMem = (ami.availMem-ami.threshold)/(1024*1024);
-            availMem *= 0.8; // Lossy, but should work...
             long allocatedRam = Math.max(availMem, 1536);
 
             Logger.getInstance().appendToLog("QuestCraft: Setting JVM memory to " + allocatedRam + "MB");
 
-
             userArgs.add("-Xms" + 1024 + "M");
             userArgs.add("-Xmx" + allocatedRam + "M");
         }
@@ -242,9 +249,6 @@ public static int launchJavaVM(final Activity activity, final List<String> JVMAr
         userArgs.addAll(JVMArgs);
         System.out.println(JVMArgs);
 
-        runtimeDir = activity.getFilesDir() + "/runtimes/JRE";
-
-        initJavaRuntime();
         chdir(instance.gameDir);
         userArgs.add(0,"java"); //argv[0] is the program name according to C standard.
 
@@ -366,7 +370,7 @@ public static ArrayList<String> parseJavaArguments(String args){
      * @return The name of the loaded library
      */
     public static String loadGraphicsLibrary(){
-        return "libltw.so";
+        return "libmobileglues.so";
     }
 
     public static native long getEGLContextPtr();
@@ -375,6 +379,7 @@ public static String loadGraphicsLibrary(){
     public static native int chdir(String path);
     public static native void logToLogger(final Logger logger);
     public static native boolean dlopen(String libPath);
+    public static native String dlerror();
     public static native void setLdLibraryPath(String ldLibraryPath);
 
     static {

src/main/java/pojlib/util/JREUtils.java

@@ -67,7 +67,7 @@ void pojavTerminate() {
 }
 
 void dlsym_egl() {
-    void* handle = dlopen("libltw.so", RTLD_NOW);
+    void* handle = dlopen("libmobileglues.so", RTLD_NOW);
     eglGetProcAddress_p = (eglGetProcAddress_t*) dlsym(handle, "eglGetProcAddress");
     eglGetDisplay_p = (eglGetDisplay_t*) eglGetProcAddress_p("eglGetDisplay");
     eglInitialize_p = (eglInitialize_t*) eglGetProcAddress_p("eglInitialize");

src/main/jni/egl_bridge.c

@@ -36,7 +36,7 @@
 #include "utils.h"
 
 // Uncomment to try redirect signal handling to JVM
-#define TRY_SIG2JVM
+// #define TRY_SIG2JVM
 
 #define FULL_VERSION "1.8.0-internal"
 #define DOT_VERSION "1.8"
@@ -121,7 +121,7 @@ static jint launchJVM(int margc, char** margv) {
  */
 JNIEXPORT jint JNICALL Java_com_oracle_dalvik_VMLauncher_launchJVM(JNIEnv *env, jclass clazz, jobjectArray argsArray) {
 #ifdef TRY_SIG2JVM
-  void* libjvm = dlopen("libjvm.so", RTLD_LAZY | RTLD_GLOBAL);
+  void* libjvm = dlopen("libjvm.so", RTLD_NOLOAD);
   if (NULL == libjvm) {
       LOGE("JVM lib = NULL: %s", dlerror());
       return -1;

src/main/jni/jre_launcher.c

@@ -91,6 +91,16 @@ JNIEXPORT jboolean JNICALL Java_pojlib_util_JREUtils_dlopen(JNIEnv *env, jclass
 	return handle != NULL;
 }
 
+JNIEXPORT jstring JNICALL Java_pojlib_util_JREUtils_dlerror(JNIEnv *env, jclass clazz) {
+    char* err = dlerror();
+    if(err == NULL) {
+        return NULL;
+    }
+    jstring dstStr = (*env)->NewStringUTF(env, err);
+
+	return dstStr;
+}
+
 JNIEXPORT jint JNICALL Java_pojlib_util_JREUtils_chdir(JNIEnv *env, jclass clazz, jstring nameStr) {
 	const char *name = (*env)->GetStringUTFChars(env, nameStr, NULL);
 	int retval = chdir(name);

src/main/jni/utils.c

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2d5786d88e9bb9078c73c1b71ea2de57ef61931c0db5455c1688776dcec44cbd
+size 8442096

src/main/jniLibs/arm64-v8a/libltw.so

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f0e9c155c6002b19fd546e6ed3dfc8ff709b5c7e866bf1795cbdcc58a9d383ec
+size 1565080