Fixes, prevent removing core mods

Author: thejudge156

build.gradle

@@ -44,13 +44,13 @@ dependencies {
 
 dependencies {
     implementation("org.jetbrains:annotations:24.0.1")
-    implementation("com.google.code.gson:gson:2.10.1")
+    implementation("com.google.code.gson:gson:2.12.1")
     implementation("org.json:json:20220924")
     implementation("commons-io:commons-io:2.13.0")
     implementation("commons-codec:commons-codec:1.15")
     implementation("androidx.annotation:annotation:1.7.1")
     implementation("androidx.core:core:1.13.1")
-    implementation("com.microsoft.azure:msal4j:1.14.0")
+    implementation("com.microsoft.azure:msal4j:1.17.2")
     implementation("com.github.Mathias-Boulay:android_gamepad_remapper:2.0.3")
     implementation("blank:unity-classes")
 }

src/main/java/pojlib/API.java

@@ -138,7 +138,6 @@ public static boolean deleteInstance(MinecraftInstances instances, MinecraftInst
      * @throws                  IOException Throws if download of library or asset fails
      */
     public static MinecraftInstances.Instance createNewInstance(Activity activity, MinecraftInstances instances, String instanceName, boolean useDefaultMods, String minecraftVersion, String modLoader, String imageURL) throws IOException {
-        finishedDownloading = false;
         return InstanceHandler.create(activity, instances, instanceName, Constants.USER_HOME, useDefaultMods, minecraftVersion, modLoader, imageURL, null);
     }
 
@@ -152,7 +151,6 @@ public static MinecraftInstances.Instance createNewInstance(Activity activity, M
      * @throws                  IOException Throws if download of library or asset fails
      */
     public static MinecraftInstances.Instance createNewInstance(Activity activity, MinecraftInstances instances, String instanceName, String imageURL, String modLoader, String mrpackFile) throws IOException {
-        finishedDownloading = false;
         if(ignoreInstanceName) {
             return InstanceHandler.create(activity, instances, instanceName, Constants.USER_HOME, modLoader, mrpackFile, imageURL);
         } else if (instanceName.contains("/") || instanceName.contains("!")) {

src/main/java/pojlib/InstanceHandler.java

@@ -14,7 +14,9 @@
 import java.nio.file.StandardCopyOption;
 import java.nio.file.attribute.BasicFileAttributes;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Locale;
+import java.util.Optional;
 import java.util.function.Consumer;
 
 import pojlib.account.MinecraftAccount;
@@ -27,6 +29,7 @@
 import pojlib.util.FileUtil;
 import pojlib.util.VLoader;
 import pojlib.util.json.MinecraftInstances;
+import pojlib.util.json.ModsJson;
 import pojlib.util.json.ProjectInfo;
 import pojlib.util.GsonUtils;
 import pojlib.util.JREUtils;
@@ -38,6 +41,7 @@ public class InstanceHandler {
     public static final String DEV_MODS = "https://raw.githubusercontent.com/QuestCraftPlusPlus/Pojlib/refs/heads/QuestCraft-6.0.0/devmods.json";
 
     public static MinecraftInstances.Instance create(Activity activity, MinecraftInstances instances, String instanceName, String userHome, String modLoader, String mrpackFilePath, String imageURL) {
+        API.finishedDownloading = false;
         File mrpackJson = new File(Constants.USER_HOME + "/instances/" + instanceName.toLowerCase(Locale.ROOT).replaceAll(" ", "_") + "/setup/modrinth.index.json");
 
         mrpackJson.getParentFile().mkdirs();
@@ -245,18 +249,25 @@ public static boolean hasExtraProject(MinecraftInstances.Instance instance, Stri
     }
 
     public static boolean removeExtraProject(MinecraftInstances instances, MinecraftInstances.Instance instance, String name) {
-        ProjectInfo oldInfo = null;
-        for(ProjectInfo info : instance.extProjects) {
-            if(info.slug.equalsIgnoreCase(name)) {
-                oldInfo = info;
-                break;
-            }
-        }
+        ProjectInfo oldInfo = Arrays.stream(instance.extProjects).filter(info -> info.slug.equalsIgnoreCase(name)).findFirst().orElse(null);
 
         if(oldInfo != null) {
             boolean isMod = oldInfo.type.equals("mod");
             boolean legacyMod = oldInfo.fileName == null;
 
+            // Check if its a coremod
+            ModsJson oldMods = instance.parseModsJson(Constants.USER_HOME + "/mods.json");
+            if(oldMods != null) {
+                Optional<ModsJson.Version> ver = Arrays.stream(oldMods.versions).filter((v) -> !v.name.equals(instance.versionName)).findFirst();
+                if(ver.isPresent()) {
+                   ModsJson.Version version = ver.get();
+                   Optional<ProjectInfo> info = Arrays.stream(version.coreMods).filter((mod) -> !mod.slug.equals(oldInfo.slug)).findFirst();
+                   if(info.isPresent()) {
+                       return false;
+                   }
+                }
+            }
+
             // Delete the mod
             File modFile = new File(instance.gameDir + (isMod ? "/mods/" : "/resourcepacks/") + (legacyMod ? oldInfo.slug : oldInfo.fileName) + (isMod ? ".jar" : ".zip"));
             modFile.delete();
@@ -265,9 +276,10 @@ public static boolean removeExtraProject(MinecraftInstances instances, Minecraft
             mods.remove(oldInfo);
             instance.extProjects = mods.toArray(mods.toArray(new ProjectInfo[0]));
             GsonUtils.objectToJsonFile(Constants.USER_HOME + "/instances.json", instances);
+            return true;
         }
 
-        return oldInfo != null;
+        return false;
     }
 
     // Return true if instance was deleted

src/main/java/pojlib/util/download/DownloadUtils.java

@@ -53,7 +53,6 @@ public static void downloadFile(String url, File out, DownloadManager downloadMa
                 tempOut.renameTo(out);
                 bos2.close();
                 if (tempOut.exists()) tempOut.delete();
-                API.finishedDownloading = true;
             } catch (IOException th2) {
                 if (tempOut.exists()) tempOut.delete();
                 API.finishedDownloading = true;

src/main/java/pojlib/util/json/MinecraftInstances.java

@@ -100,7 +100,7 @@ public ProjectInfo[] toArray() {
             return extProjects;
         }
 
-        private ModsJson parseModsJson(String jsonPath) {
+        public ModsJson parseModsJson(String jsonPath) {
             return GsonUtils.jsonFileToObject(jsonPath, ModsJson.class);
         }