Merge remote-tracking branch 'origin/QuestCraft-5.1.0-OpenXR' into Qu…

…estCraft-5.1.0-OpenXR
QuestCraftPlusPlus · Feb 7, 2025 · 5ad9064 · 5ad9064
2 parents 47a3885 + 50f4a07
commit 5ad9064
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 14 deletions.
diff --git a/src/main/java/pojlib/API.java b/src/main/java/pojlib/API.java
@@ -10,16 +10,13 @@
 import com.google.gson.JsonObject;
 
 import pojlib.account.MinecraftAccount;
-import pojlib.account.Msa;
-import pojlib.install.Installer;
-import pojlib.install.MinecraftMeta;
+import pojlib.util.JREUtils;
 import pojlib.util.Logger;
 import pojlib.util.json.MinecraftInstances;
 import pojlib.util.Constants;
 import pojlib.account.LoginHelper;
 
 import java.io.IOException;
-import java.util.Date;
 
 /**
  * This class is the only class used by the launcher to communicate and talk to pojlib. This keeps pojlib and launcher separate.
@@ -178,7 +175,7 @@ public static void updateMods(MinecraftInstances instances, MinecraftInstances.I
      */
     public static void launchInstance(Activity activity, MinecraftAccount account, MinecraftInstances.Instance instance) {
         try {
-            Installer.prelaunchCheck(activity, instance);
+            JREUtils.prelaunchCheck(activity, instance);
         } catch (IOException e) {
             Logger.getInstance().appendToLog("WARN! Instance launch failed, " + e);
         }

diff --git a/src/main/java/pojlib/install/Installer.java b/src/main/java/pojlib/install/Installer.java
@@ -206,13 +206,4 @@ private static String parseLibraryNameToPath(String libraryName) {
 
         return String.format("%s/%s/%s/%s", location, name, version, name + "-" + version + ".jar");
     }
-
-    // Called before game launch to ensure all files are present
-    public static void prelaunchCheck(Activity activity, MinecraftInstances.Instance instance) throws IOException {
-        UnityPlayerActivity.installLWJGL(activity);
-        installJVM(activity);
-        installClient(MinecraftMeta.getVersionInfo(instance.versionName), Constants.USER_HOME);
-        installLibraries(MinecraftMeta.getVersionInfo(instance.versionName), Constants.USER_HOME);
-        installAssets(MinecraftMeta.getVersionInfo(instance.versionName), Constants.USER_HOME, activity, instance);
-    }
 }
diff --git a/src/main/java/pojlib/util/JREUtils.java b/src/main/java/pojlib/util/JREUtils.java
@@ -13,13 +13,17 @@
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import pojlib.API;
+import pojlib.UnityPlayerActivity;
+import pojlib.install.Installer;
+import pojlib.install.MinecraftMeta;
 import pojlib.util.json.MinecraftInstances;
 
 public class JREUtils {
@@ -172,6 +176,16 @@ public static void setJavaEnvironment(Activity activity, MinecraftInstances.Inst
         setLdLibraryPath(jvmLibraryPath+":"+LD_LIBRARY_PATH);
     }
 
+    // Called before game launch to ensure all files are present and correct
+    public static void prelaunchCheck(Activity activity, MinecraftInstances.Instance instance) throws IOException {
+
+        UnityPlayerActivity.installLWJGL(activity);
+        Installer.installJVM(activity);
+        Installer.installClient(MinecraftMeta.getVersionInfo(instance.versionName), Constants.USER_HOME);
+        Installer.installLibraries(MinecraftMeta.getVersionInfo(instance.versionName), Constants.USER_HOME);
+        Installer.installAssets(MinecraftMeta.getVersionInfo(instance.versionName), Constants.USER_HOME, activity, instance);
+    }
+
     public static int launchJavaVM(final Activity activity, final List<String> JVMArgs, MinecraftInstances.Instance instance) throws Throwable {
         JREUtils.relocateLibPath(activity);
         setJavaEnvironment(activity, instance);