Merge remote-tracking branch 'origin/QuestCraft-Instance-Dirs' into V…

…C-OpenXR
QuestCraftPlusPlus · Apr 26, 2024 · 30eba0a · 30eba0a
2 parents 9707851 + fd5c8b7
commit 30eba0a
Show file tree

Hide file tree

Showing 16 changed files with 113 additions and 130 deletions.
diff --git a/src/main/java/pojlib/util/APIHandler.java → src/main/java/pojlib/APIHandler.java b/src/main/java/pojlib/util/APIHandler.java → src/main/java/pojlib/APIHandler.java
@@ -1,4 +1,4 @@
-package pojlib.util;
+package pojlib;
 
 import com.google.gson.Gson;
 
@@ -14,6 +14,11 @@
 import java.util.HashMap;
 import java.util.stream.Collectors;
 
+import pojlib.util.Constants;
+import pojlib.util.DownloadUtils;
+import pojlib.util.GsonUtils;
+import pojlib.util.Logger;
+
 public class APIHandler {
     public final String baseUrl;
 

diff --git a/...java/pojlib/instance/InstanceHandler.java → src/main/java/pojlib/InstanceHandler.java b/...java/pojlib/instance/InstanceHandler.java → src/main/java/pojlib/InstanceHandler.java
@@ -1,4 +1,4 @@
-package pojlib.instance;
+package pojlib;
 
 import android.app.Activity;
 
@@ -17,16 +17,56 @@
 import pojlib.install.QuiltMeta;
 import pojlib.install.VersionInfo;
 import pojlib.util.Constants;
-import pojlib.util.ModInfo;
+import pojlib.util.DownloadUtils;
+import pojlib.util.json.MinecraftInstances;
+import pojlib.util.json.ModInfo;
 import pojlib.util.GsonUtils;
 import pojlib.util.JREUtils;
 import pojlib.util.Logger;
 import pojlib.util.VLoader;
+import pojlib.util.json.ModrinthIndexJson;
 
 public class InstanceHandler {
     public static final String MODS = "https://raw.githubusercontent.com/QuestCraftPlusPlus/Pojlib/QuestCraft/mods.json";
     public static final String DEV_MODS = "https://raw.githubusercontent.com/QuestCraftPlusPlus/Pojlib/QuestCraft/devmods.json";
 
+    public static MinecraftInstances.Instance create(Activity activity, MinecraftInstances instances, String instanceName, String userHome, ModLoader modLoader, File mrpackFile, String imageURL) {
+        ModrinthIndexJson index = GsonUtils.jsonFileToObject(mrpackFile.getAbsolutePath(), ModrinthIndexJson.class);
+        if(index == null) {
+            Logger.getInstance().appendToLog("Couldn't install the modpack with path " + mrpackFile.getAbsolutePath());
+            return null;
+        }
+
+        MinecraftInstances.Instance instance = create(activity, instances, instanceName, userHome, false, index.dependencies.minecraft, modLoader, imageURL);
+        new Thread(() -> {
+            API_V1.finishedDownloading = false;
+            for (ModrinthIndexJson.ModpackFile file : index.files) {
+                if (file.path.contains("mods")) {
+                    ArrayList<ModInfo> mods = Lists.newArrayList(instance.mods);
+                    ModInfo info = new ModInfo();
+                    info.slug = file.path
+                            .replaceAll(".*\\/", "")
+                            .replaceAll("\\..*", "");
+                    info.version = "1.0.0";
+                    info.download_link = file.downloads[0];
+                    mods.add(info);
+                    instance.mods = mods.toArray(new ModInfo[0]);
+                }
+                try {
+                    API_V1.currentDownload = file.path;
+                    DownloadUtils.downloadFile(file.downloads[0], new File(instance.gameDir, file.path));
+                } catch (IOException e) {
+                    Logger.getInstance().appendToLog("Couldn't install the modpack with path " + mrpackFile.getAbsolutePath());
+                    Logger.getInstance().appendToLog(e.toString());
+                }
+            }
+            API_V1.finishedDownloading = false;
+            GsonUtils.objectToJsonFile(userHome + "/instances.json", instances);
+        }).start();
+
+        return instance;
+    }
+
     public enum ModLoader {
         Fabric(0),
         Quilt(1),
@@ -59,7 +99,7 @@ public static MinecraftInstances.Instance create(Activity activity, MinecraftIns
         instance.instanceName = instanceName;
         instance.instanceImageURL = imageURL;
         instance.versionName = minecraftVersion;
-        instance.gameDir = Constants.USER_HOME + "/" + instanceName.toLowerCase(Locale.ROOT).replaceAll(" ", "_");
+        instance.gameDir = Constants.USER_HOME + "/instances/" + instanceName.toLowerCase(Locale.ROOT).replaceAll(" ", "_");
         instance.defaultMods = useDefaultMods;
 
         File gameDirFile = new File(instance.gameDir);

diff --git a/src/main/java/pojlib/util/LoginHelper.java → ...main/java/pojlib/account/LoginHelper.java b/src/main/java/pojlib/util/LoginHelper.java → ...main/java/pojlib/account/LoginHelper.java
@@ -1,4 +1,4 @@
-package pojlib.util;
+package pojlib.account;
 
 import android.app.Activity;
 
@@ -21,8 +21,9 @@
 import java.util.concurrent.ExecutionException;
 import java.util.function.Consumer;
 
-import pojlib.account.MinecraftAccount;
 import pojlib.api.API_V1;
+import pojlib.util.Constants;
+import pojlib.util.Logger;
 
 public class LoginHelper {
     public static Thread loginThread;

diff --git a/...in/java/pojlib/util/TokenPersistence.java → ...java/pojlib/account/TokenPersistence.java b/...in/java/pojlib/util/TokenPersistence.java → ...java/pojlib/account/TokenPersistence.java
@@ -1,4 +1,4 @@
-package pojlib.util;
+package pojlib.account;
 
 import com.microsoft.aad.msal4j.ITokenCacheAccessAspect;
 import com.microsoft.aad.msal4j.ITokenCacheAccessContext;

diff --git a/src/main/java/pojlib/api/API_V1.java b/src/main/java/pojlib/api/API_V1.java
@@ -8,13 +8,13 @@
 import com.google.gson.JsonObject;
 
 import pojlib.account.MinecraftAccount;
-import pojlib.install.*;
-import pojlib.instance.InstanceHandler;
-import pojlib.instance.MinecraftInstances;
-import pojlib.util.APIHandler;
+import pojlib.InstanceHandler;
+import pojlib.util.json.MinecraftInstances;
+import pojlib.APIHandler;
 import pojlib.util.Constants;
-import pojlib.util.LoginHelper;
+import pojlib.account.LoginHelper;
 
+import java.io.File;
 import java.io.IOException;
 import java.util.Date;
 
@@ -140,6 +140,28 @@ public static MinecraftInstances.Instance createNewInstance(Activity activity, M
         }
     }
 
+    /**
+     * Creates a new game instance from a mrpack file.
+     *
+     * @param activity          The active android activity
+     * @param instanceName      The name of the instance being created - can be anything, used for identification
+     * @param useDefaultMods    Use QC's default mods for the version (Core mods are automatically included)
+     * @param minecraftVersion  The version of minecraft to install
+     * @param imageURL          Modpack image url, nullable
+     * @return                  A minecraft instance object
+     * @throws                  IOException Throws if download of library or asset fails
+     */
+    public static MinecraftInstances.Instance createNewInstance(Activity activity, MinecraftInstances instances, String instanceName, String imageURL, File mrpackFile) throws IOException {
+
+        if(ignoreInstanceName) {
+            return InstanceHandler.create(activity, instances, instanceName, Constants.USER_HOME, InstanceHandler.ModLoader.Fabric, mrpackFile, imageURL);
+        } else if (instanceName.contains("/") || instanceName.contains("!")) {
+            throw new IOException("You cannot use special characters (!, /, ., etc) when creating instances.");
+        } else {
+            return InstanceHandler.create(activity, instances, instanceName, Constants.USER_HOME, InstanceHandler.ModLoader.Fabric, mrpackFile, imageURL);
+        }
+    }
+
     /**
      * Update the mods for the selected instance
      *

diff --git a/src/main/java/pojlib/install/FabricMeta.java b/src/main/java/pojlib/install/FabricMeta.java
@@ -1,7 +1,7 @@
 package pojlib.install;
 
 import com.google.gson.annotations.SerializedName;
-import pojlib.util.APIHandler;
+import pojlib.APIHandler;
 import pojlib.util.Constants;
 
 public class FabricMeta {

diff --git a/src/main/java/pojlib/install/Installer.java b/src/main/java/pojlib/install/Installer.java
@@ -8,7 +8,8 @@
 
 import org.apache.commons.io.FileUtils;
 
-import pojlib.instance.MinecraftInstances;
+import pojlib.APIHandler;
+import pojlib.util.json.MinecraftInstances;
 import pojlib.util.*;
 
 import java.io.File;

diff --git a/src/main/java/pojlib/install/MinecraftMeta.java b/src/main/java/pojlib/install/MinecraftMeta.java
@@ -1,7 +1,7 @@
 package pojlib.install;
 
 import com.google.gson.annotations.SerializedName;
-import pojlib.util.APIHandler;
+import pojlib.APIHandler;
 import pojlib.util.Constants;
 
 public class MinecraftMeta {

diff --git a/src/main/java/pojlib/install/QuiltMeta.java b/src/main/java/pojlib/install/QuiltMeta.java
@@ -1,7 +1,7 @@
 package pojlib.install;
 
 import com.google.gson.annotations.SerializedName;
-import pojlib.util.APIHandler;
+import pojlib.APIHandler;
 import pojlib.util.Constants;
 
 public class QuiltMeta {

diff --git a/src/main/java/pojlib/modmanager/ModData.java b/src/main/java/pojlib/modmanager/ModData.java
diff --git a/src/main/java/pojlib/modmanager/State.java b/src/main/java/pojlib/modmanager/State.java
diff --git a/src/main/java/pojlib/util/JREUtils.java b/src/main/java/pojlib/util/JREUtils.java
@@ -19,7 +19,7 @@
 import java.util.Map;
 
 import pojlib.api.API_V1;
-import pojlib.instance.MinecraftInstances;
+import pojlib.util.json.MinecraftInstances;
 
 public class JREUtils {
     private JREUtils() {}

diff --git a/...a/pojlib/instance/MinecraftInstances.java → .../pojlib/util/json/MinecraftInstances.java b/...a/pojlib/instance/MinecraftInstances.java → .../pojlib/util/json/MinecraftInstances.java
@@ -1,4 +1,4 @@
-package pojlib.instance;
+package pojlib.util.json;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -7,12 +7,11 @@
 
 import pojlib.account.MinecraftAccount;
 import pojlib.api.API_V1;
+import pojlib.InstanceHandler;
 import pojlib.util.Constants;
 import pojlib.util.DownloadUtils;
 import pojlib.util.GsonUtils;
 import pojlib.util.Logger;
-import pojlib.util.ModInfo;
-import pojlib.util.ModsJson;
 
 public class MinecraftInstances {
     public Instance[] instances;

diff --git a/src/main/java/pojlib/util/ModInfo.java → src/main/java/pojlib/util/json/ModInfo.java b/src/main/java/pojlib/util/ModInfo.java → src/main/java/pojlib/util/json/ModInfo.java
@@ -1,4 +1,4 @@
-package pojlib.util;
+package pojlib.util.json;
 
 public class ModInfo {
     public String slug;

diff --git a/src/main/java/pojlib/util/json/ModrinthIndexJson.java b/src/main/java/pojlib/util/json/ModrinthIndexJson.java
@@ -0,0 +1,23 @@
+package pojlib.util.json;
+
+import com.google.gson.annotations.SerializedName;
+
+public class ModrinthIndexJson {
+    public String versionId;
+    public String name;
+    public String summary;
+    public ModpackFile[] files;
+    public Dependencies dependencies;
+
+    public static class ModpackFile {
+        public String path;
+        public String[] downloads;
+        public int fileSize;
+    }
+
+    public static class Dependencies {
+        public String minecraft;
+        @SerializedName("fabric-loader")
+        public String fabricLoader;
+    }
+}
diff --git a/src/main/java/pojlib/util/ModsJson.java → src/main/java/pojlib/util/json/ModsJson.java b/src/main/java/pojlib/util/ModsJson.java → src/main/java/pojlib/util/json/ModsJson.java
@@ -1,4 +1,4 @@
-package pojlib.util;
+package pojlib.util.json;
 
 public class ModsJson {
     public Version[] versions;