Fix race condition

QuestCraftPlusPlus · Apr 15, 2024 · 82bb770 · 82bb770
1 parent beb2717
commit 82bb770
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 23 deletions.
diff --git a/src/main/java/pojlib/api/API_V1.java b/src/main/java/pojlib/api/API_V1.java
@@ -135,14 +135,14 @@ public static boolean deleteInstance(MinecraftInstances instances, MinecraftInst
      * @return                  A minecraft instance object
      * @throws                  IOException Throws if download of library or asset fails
      */
-    public static MinecraftInstances.Instance createNewInstance(Activity activity, String instanceName, String home, boolean useDefaultMods, String minecraftVersion, String modsFolderName) throws IOException {
+    public static MinecraftInstances.Instance createNewInstance(Activity activity, MinecraftInstances instances, String instanceName, String home, boolean useDefaultMods, String minecraftVersion, String modsFolderName) throws IOException {
 
         if(ignoreInstanceName) {
-            return InstanceHandler.create(activity, instanceName, home, useDefaultMods, minecraftVersion, InstanceHandler.ModLoader.Fabric, modsFolderName);
+            return InstanceHandler.create(activity, instances, instanceName, home, useDefaultMods, minecraftVersion, InstanceHandler.ModLoader.Fabric, modsFolderName);
         } else if (instanceName.contains("/") || instanceName.contains("!")) {
             throw new IOException("You cannot use special characters (!, /, ., etc) when creating instances.");
         } else {
-            return InstanceHandler.create(activity, instanceName, home, useDefaultMods, minecraftVersion, InstanceHandler.ModLoader.Fabric, modsFolderName);
+            return InstanceHandler.create(activity, instances, instanceName, home, useDefaultMods, minecraftVersion, InstanceHandler.ModLoader.Fabric, modsFolderName);
         }
     }
 

diff --git a/src/main/java/pojlib/instance/InstanceHandler.java b/src/main/java/pojlib/instance/InstanceHandler.java
@@ -45,10 +45,9 @@ public enum ModLoader {
     }
 
     //creates a new instance of a minecraft version, install game + mod loader, stores non login related launch info to json
-    public static MinecraftInstances.Instance create(Activity activity, String instanceName, String gameDir, boolean useDefaultMods, String minecraftVersion, ModLoader modLoader, String modsFolderName) {
+    public static MinecraftInstances.Instance create(Activity activity, MinecraftInstances instances, String instanceName, String gameDir, boolean useDefaultMods, String minecraftVersion, ModLoader modLoader, String modsFolderName) {
         File instancesFile = new File(gameDir + "/instances.json");
         if (instancesFile.exists()) {
-            MinecraftInstances instances = GsonUtils.jsonFileToObject(instancesFile.getAbsolutePath(), MinecraftInstances.class);
             for (MinecraftInstances.Instance instance : instances.instances) {
                 if (instance.instanceName.equals(instanceName)) {
                     Logger.getInstance().appendToLog("Instance " + instanceName + " already exists! Using original instance.");
@@ -98,6 +97,16 @@ public static MinecraftInstances.Instance create(Activity activity, String insta
 
         // Install minecraft
         VersionInfo finalModLoaderVersionInfo = modLoaderVersionInfo;
+
+        if(instances.instances == null) {
+            instances.instances = new MinecraftInstances.Instance[0];
+            GsonUtils.objectToJsonFile(gameDir + "/instances.json", instances);
+        }
+
+        ArrayList<MinecraftInstances.Instance> instances1 = Lists.newArrayList(instances.instances);
+        instances1.add(instance);
+        instances.instances = instances1.toArray(new MinecraftInstances.Instance[0]);
+
         new Thread(() -> {
             try {
                 String clientClasspath = Installer.installClient(minecraftVersionInfo, gameDir);
@@ -113,24 +122,6 @@ public static MinecraftInstances.Instance create(Activity activity, String insta
             }
             instance.assetIndex = minecraftVersionInfo.assetIndex.id;
 
-            MinecraftInstances instances;
-            try {
-                instances = GsonUtils.jsonFileToObject(gameDir + "/instances.json", MinecraftInstances.class);
-            } catch (Exception e) {
-                instances = new MinecraftInstances();
-                instances.instances = new MinecraftInstances.Instance[0];
-            }
-
-            if(instances == null) {
-                instances = new MinecraftInstances();
-                instances.instances = new MinecraftInstances.Instance[0];
-                GsonUtils.objectToJsonFile(gameDir + "/instances.json", instances);
-            }
-
-            ArrayList<MinecraftInstances.Instance> instances1 = Lists.newArrayList(instances.instances);
-            instances1.add(instance);
-            instances.instances = instances1.toArray(new MinecraftInstances.Instance[0]);
-
             // Write instance to json file
             GsonUtils.objectToJsonFile(gameDir + "/instances.json", instances);
             instance.updateMods(Constants.MC_DIR, instances);