ask for quilt & allow fabric mod for quilt

Author: North-West-Wind

src/ml/northwestwind/Modpack.java

@@ -197,7 +197,7 @@ private static String getModVersion(JSONObject manifest) {
                     String version = (String) minecraft.get("version");
                     String id = (String) ((JSONObject) optional.get()).get("id");
                     String[] splitted = id.split("-");
-                    String loader = splitted[0];
+                    String loader = splitted[0].toLowerCase();
                     String modVer = Arrays.stream(splitted).skip(1).collect(Collectors.joining("-"));
                     List<String> versions = Arrays.stream(new File(Utils.getMinecraftPath() + File.separator + "versions").listFiles()).map(File::getName).collect(Collectors.toList());
                     Optional<String> found = versions.stream().filter(name -> name.contains(loader) && name.contains(modVer) && name.contains(version)).findFirst();
@@ -208,7 +208,7 @@ private static String getModVersion(JSONObject manifest) {
                     else if (loader.equalsIgnoreCase("fabric")) System.out.println((Ansi.ansi().a("https://fabricmc.net/use/installer/")).reset());
                     else if (loader.equalsIgnoreCase("quilt")) System.out.println(Ansi.ansi().a("https://quiltmc.org/en/install/").reset());
                     if (Utils.readYesNo()) {
-                        versions = Arrays.stream(new File(Utils.getMinecraftPath() + File.separator + "versions").listFiles()).map(File::getName).collect(Collectors.toList());
+                        versions = Arrays.stream(new File(Utils.getMinecraftPath() + File.separator + "versions").listFiles()).map(f -> f.getName().toLowerCase()).collect(Collectors.toList());
                         found = versions.stream().filter(name -> name.contains(loader) && name.contains(modVer) && name.contains(version)).findFirst();
                         if (found.isPresent()) return found.get();
                         System.out.println(Ansi.ansi().fg(Ansi.Color.YELLOW).a("We still couldn't find the mod launcher version required! The installation will continue anyway. You may have to change the profile settings after this."));

src/ml/northwestwind/Profile.java

@@ -57,13 +57,13 @@ private static void create() {
                 System.out.print(Ansi.ansi().fg(Ansi.Color.YELLOW).a("The version is invalid. Minecraft version: ").reset());
             }
         }
-        System.out.print(Ansi.ansi().fg(Ansi.Color.YELLOW).a("Mod launcher [forge/fabric]: ").reset());
+        System.out.print(Ansi.ansi().fg(Ansi.Color.YELLOW).a("Mod launcher [forge/fabric/quilt]: ").reset());
         String launcher = null;
         while (launcher == null) {
             launcher = scanner.nextLine().toLowerCase();
-            if (!launcher.equalsIgnoreCase("forge") && !launcher.equalsIgnoreCase("fabric")) {
+            if (!launcher.equalsIgnoreCase("forge") && !launcher.equalsIgnoreCase("fabric") && !launcher.equalsIgnoreCase("quilt")) {
                 launcher = null;
-                System.out.println(Ansi.ansi().fg(Ansi.Color.YELLOW).a("The launcher is invalid. Mod launcher [forge/fabric]: ").reset().a("\r"));
+                System.out.println(Ansi.ansi().fg(Ansi.Color.YELLOW).a("The launcher is invalid. Mod launcher [forge/fabric/quilt]: ").reset().a("\r"));
             }
         }
         System.out.print(Ansi.ansi().fg(Ansi.Color.YELLOW).a("Mod launcher version: ").reset());

src/ml/northwestwind/Utils.java

@@ -220,7 +220,6 @@ public static boolean checkVersion(JSONArray versions, JSONObject config) {
         String requiredVer = (String) config.get("mcVer");
         String launcher = (String) config.get("launcher");
         boolean launcherMatch = false, versionMatch = false;
-        // Assume it is ok if no launcher is specified by the mod file
         int trueCount = 0;
         for (String s : LAUNCHERS)
             if (versions.contains(s)) {
@@ -230,7 +229,10 @@ public static boolean checkVersion(JSONArray versions, JSONObject config) {
                 }
                 trueCount++;
             }
+        // Assume it is ok if no launcher is specified by the mod file
         if (trueCount == 0) launcherMatch = true;
+        // Special relationship of fabric and quilt
+        if (!launcherMatch && launcher.equalsIgnoreCase("quilt") && versions.contains("fabric")) launcherMatch = true;
         if (!versions.contains(requiredVer)) {
             if (Config.acceptParentVersionMod && versions.contains(parentVersion(requiredVer))) versionMatch = true;
             else if (!versions.contains(parentVersion(requiredVer)) && versions.stream().noneMatch(ver -> isMCVersionValid((String) ver))) versionMatch = true;