Fixed profile update delete mod when no download

Author: North-West-Wind

src/ml/northwestwind/Constants.java

@@ -2,7 +2,7 @@
 
 public class Constants {
     public static final String CURSEFORGE_API = "https://addons-ecs.forgesvc.net/api/v2/addon/";
-    public static final String VERSION = "1.2.8";
+    public static final String VERSION = "1.2.9";
     private static final String OS = System.getProperty("os.name").toLowerCase();
     public static final boolean IS_WINDOWS = (OS.contains("win"));
     public static final boolean IS_MAC = (OS.contains("mac"));

src/ml/northwestwind/Profile.java

@@ -479,6 +479,10 @@ private static void update(String[] args) {
         for (String id : Arrays.stream(args).skip(1).toArray(String[]::new)) {
             try {
                 if (!Utils.isInteger(id)) throw new NoSuchObjectException("Mod ID is invalid: " + id);
+                if (!mods.containsKey(Integer.parseInt(id))) {
+                    System.out.println(Ansi.ansi().fg(Ansi.Color.YELLOW).a("Cannot find mod with ID " + id + " installed. Skipping updating this mod..."));
+                    continue;
+                }
                 JSONObject json = Utils.runRetry(() -> (JSONObject) Utils.readJsonFromUrl(Constants.CURSEFORGE_API + id));
                 if (((long) ((JSONObject) json.get("categorySection")).get("gameCategoryId")) != 6)
                     throw new NoSuchObjectException("The ID " + id + " does not represent a mod.");
@@ -490,11 +494,11 @@ private static void update(String[] args) {
                 JSONObject bestFile = (JSONObject) f.get(0);
                 Map.Entry<Integer, String> entry = mods.get(Integer.parseInt(id));
                 if (((long) bestFile.get("id")) > entry.getKey()) {
-                    System.out.println(Ansi.ansi().fg(Ansi.Color.YELLOW).a(entry.getValue()).reset().a(" | ").fg(Ansi.Color.MAGENTA).a(entry.getKey()));
+                    System.out.println(Ansi.ansi().fg(Ansi.Color.YELLOW).a(entry.getValue()).reset().a(" | ").fg(Ansi.Color.MAGENTA).a(id));
                     String downloadUrl = ((String) bestFile.get("downloadUrl")).replaceFirst("edge", "media");
-                    if (mods.containsKey(Integer.parseInt(id)))
-                        new File(profileConfig.getParent() + File.separator + "mods" + File.separator + entry.getValue() + "_" + id + "_" + entry.getKey() + ".jar").delete();
                     String loc = Utils.downloadFile(downloadUrl, profileConfig.getParent() + File.separator + "mods", ((String) bestFile.get("fileName")).replace(".jar", "_" + id + "_" + bestFile.get("id") + ".jar"));
+                    if (loc == null) continue;
+                    new File(profileConfig.getParent() + File.separator + "mods" + File.separator + entry.getValue() + "_" + id + "_" + entry.getKey() + ".jar").delete();
                     System.out.println(Ansi.ansi().fg(Ansi.Color.GREEN).a("Downloaded " + loc));
                 }
             } catch (Exception e) {

src/ml/northwestwind/Utils.java

@@ -223,9 +223,8 @@ public static boolean checkVersion(JSONArray versions, JSONObject config) {
         if (oppoLauncher == null || !versions.contains(oppoLauncher) || (versions.contains(oppoLauncher) && versions.contains(launcher)))
             launcherMatch = true;
         if (!versions.contains(requiredVer)) {
-            if (Config.acceptParentVersionMod && !versions.contains(parentVersion(requiredVer))) {
-                if (versions.stream().noneMatch(ver -> isMCVersionValid((String) ver))) versionMatch = true;
-            } else versionMatch = true;
+            if (Config.acceptParentVersionMod && versions.contains(parentVersion(requiredVer))) versionMatch = true;
+            else if (!versions.contains(parentVersion(requiredVer)) && versions.stream().noneMatch(ver -> isMCVersionValid((String) ver))) versionMatch = true;
         } else versionMatch = true;
         return versionMatch && launcherMatch;
     }

update.json

@@ -1,4 +1,8 @@
 {
+  "1.2.9": {
+    "title": "Profile \"update\" retains old mods",
+    "description": "Fixed the profile \"update\" command removing old mod even when the new mod download fails."
+  },
   "1.2.8": {
     "title": "Fixed \"update\" still deleting mods"
   },
@@ -31,5 +35,5 @@
   "1.2.0": {
     "title": "Update Checker & Profile Generator"
   },
-  "latest": "1.2.8"
+  "latest": "1.2.9"
 }