导入 PrismLauncher 格式整合包时 $.jvmArgs 参数未正确移除两侧引号 | 安装 MultiMC 整合包后应当设置图标 | 修复 HMCL 3.5.8.248 无法安装启动带 forge 的 1.11.2 版本的问题 | 更新 mod 数据 | 修复 Minecraft 1.20.2+Forge 默认图标错误的问题 (#843)

* HMCL-dev/HMCL#3030

* HMCL-dev/HMCL#3541

* HMCL-dev/HMCL#3113

* HMCL-dev/HMCL#3601

* HMCL-dev/HMCL#3439

Author: zkitefly

FCL/src/main/assets/mod_data.txt

@@ -294,7 +294,8 @@ public void execute() {
                                 /* overrideJavaArgs */ true,
                                 /* overrideConsole */ true,
                                 /* overrideCommands */ true,
-                                /* overrideWindow */ true
+                                /* overrideWindow */ true,
+                                /* iconKey */ null // TODO
                         ), modpackFile);
             }
 

FCL/src/main/assets/modpack_data.txt

@@ -171,6 +171,7 @@ public static boolean isModded(VersionProvider provider, Version version) {
         Version resolvedVersion = version.resolve(provider);
         String mainClass = resolvedVersion.getMainClass();
         return mainClass != null && (LAUNCH_WRAPPER_MAIN.equals(mainClass)
+                || mainClass.startsWith("net.minecraftforge")
                 || mainClass.startsWith("net.fabricmc")
                 || mainClass.startsWith("org.quiltmc")
                 || mainClass.startsWith("cpw.mods"));

FCL/src/main/java/com/tungsten/fcl/ui/manage/ModpackFileSelectionPage.java

@@ -132,7 +132,7 @@ public void execute() throws IOException {
                     }
                 }
             }
-            if (shouldDownloadLibrary(gameRepository, version, library, integrityCheck) && library.hasDownloadURL()) {
+            if (shouldDownloadLibrary(gameRepository, version, library, integrityCheck) && (library.hasDownloadURL() || !"optifine".equals(library.getGroupId()))) {
                 dependencies.add(new LibraryDownloadTask(dependencyManager, file, library));
             } else {
                 dependencyManager.getCacheRepository().tryCacheLibrary(library, file.toPath());

FCLCore/src/main/java/com/tungsten/fclcore/download/LibraryAnalyzer.java

@@ -54,43 +54,62 @@ public final class MultiMCInstanceConfiguration implements ModpackManifest {
     private final boolean overrideConsole; // OverrideConsole
     private final boolean overrideCommands; // OverrideCommands
     private final boolean overrideWindow; // OverrideWindow
+    private final String iconKey;
 
     private final MultiMCManifest mmcPack;
 
     MultiMCInstanceConfiguration(String defaultName, InputStream contentStream, MultiMCManifest mmcPack) throws IOException {
+        // instance.cfg is in .ini format. As it's like the .properties format, we use Properties to parse thie file.
+        // Maybe this will provide some problems (and it does, such as https://github.com/HMCL-dev/HMCL/issues/2991), but this workaround works, doesn't it?
         Properties p = new Properties();
         p.load(new InputStreamReader(contentStream, StandardCharsets.UTF_8));
 
         this.mmcPack = mmcPack;
 
-        instanceType = p.getProperty("InstanceType");
-        autoCloseConsole = Boolean.parseBoolean(p.getProperty("AutoCloseConsole"));
+        instanceType = readValue(p, "InstanceType");
+        autoCloseConsole = Boolean.parseBoolean(readValue(p, "AutoCloseConsole"));
         gameVersion = mmcPack != null ? mmcPack.getComponents().stream().filter(e -> "net.minecraft".equals(e.getUid())).findAny()
-                .orElseThrow(() -> new IOException("Malformed mmc-pack.json")).getVersion() : p.getProperty("IntendedVersion");
-        javaPath = p.getProperty("JavaPath");
-        jvmArgs = p.getProperty("JvmArgs");
-        fullscreen = Boolean.parseBoolean(p.getProperty("LaunchMaximized"));
-        maxMemory = Lang.toIntOrNull(p.getProperty("MaxMemAlloc"));
-        minMemory = Lang.toIntOrNull(p.getProperty("MinMemAlloc"));
-        height = Lang.toIntOrNull(p.getProperty("MinecraftWinHeight"));
-        width = Lang.toIntOrNull(p.getProperty("MinecraftWinWidth"));
-        overrideCommands = Boolean.parseBoolean(p.getProperty("OverrideCommands"));
-        overrideConsole = Boolean.parseBoolean(p.getProperty("OverrideConsole"));
-        overrideJavaArgs = Boolean.parseBoolean(p.getProperty("OverrideJavaArgs"));
-        overrideJavaLocation = Boolean.parseBoolean(p.getProperty("OverrideJavaLocation"));
-        overrideMemory = Boolean.parseBoolean(p.getProperty("OverrideMemory"));
-        overrideWindow = Boolean.parseBoolean(p.getProperty("OverrideWindow"));
-        permGen = Lang.toIntOrNull(p.getProperty("PermGen"));
-        postExitCommand = p.getProperty("PostExitCommand");
-        preLaunchCommand = p.getProperty("PreLaunchCommand");
-        showConsole = Boolean.parseBoolean(p.getProperty("ShowConsole"));
-        showConsoleOnError = Boolean.parseBoolean(p.getProperty("ShowConsoleOnError"));
-        wrapperCommand = p.getProperty("WrapperCommand");
+                .orElseThrow(() -> new IOException("Malformed mmc-pack.json")).getVersion() : readValue(p, "IntendedVersion");
+        javaPath = readValue(p, "JavaPath");
+        jvmArgs = readValue(p, "JvmArgs");
+        fullscreen = Boolean.parseBoolean(readValue(p, "LaunchMaximized"));
+        maxMemory = Lang.toIntOrNull(readValue(p, "MaxMemAlloc"));
+        minMemory = Lang.toIntOrNull(readValue(p, "MinMemAlloc"));
+        height = Lang.toIntOrNull(readValue(p, "MinecraftWinHeight"));
+        width = Lang.toIntOrNull(readValue(p, "MinecraftWinWidth"));
+        overrideCommands = Boolean.parseBoolean(readValue(p, "OverrideCommands"));
+        overrideConsole = Boolean.parseBoolean(readValue(p, "OverrideConsole"));
+        overrideJavaArgs = Boolean.parseBoolean(readValue(p, "OverrideJavaArgs"));
+        overrideJavaLocation = Boolean.parseBoolean(readValue(p, "OverrideJavaLocation"));
+        overrideMemory = Boolean.parseBoolean(readValue(p, "OverrideMemory"));
+        overrideWindow = Boolean.parseBoolean(readValue(p, "OverrideWindow"));
+        permGen = Lang.toIntOrNull(readValue(p, "PermGen"));
+        postExitCommand = readValue(p, "PostExitCommand");
+        preLaunchCommand = readValue(p, "PreLaunchCommand");
+        showConsole = Boolean.parseBoolean(readValue(p, "ShowConsole"));
+        showConsoleOnError = Boolean.parseBoolean(readValue(p, "ShowConsoleOnError"));
+        wrapperCommand = readValue(p, "WrapperCommand");
         name = defaultName;
-        notes = Optional.ofNullable(p.getProperty("notes")).orElse("");
+        notes = Optional.ofNullable(readValue(p, "notes")).orElse("");
+        iconKey = readValue(p, "iconKey");
     }
 
-    public MultiMCInstanceConfiguration(String instanceType, String name, String gameVersion, Integer permGen, String wrapperCommand, String preLaunchCommand, String postExitCommand, String notes, String javaPath, String jvmArgs, boolean fullscreen, Integer width, Integer height, Integer maxMemory, Integer minMemory, boolean showConsole, boolean showConsoleOnError, boolean autoCloseConsole, boolean overrideMemory, boolean overrideJavaLocation, boolean overrideJavaArgs, boolean overrideConsole, boolean overrideCommands, boolean overrideWindow) {
+    /**
+     * A workaround for <a href="https://github.com/HMCL-dev/HMCL/issues/2991">...</a>
+     */
+    private String readValue(Properties p, String key) {
+        String value = p.getProperty(key);
+        if (value == null) {
+            return null;
+        }
+        int l = value.length();
+        if (l >= 2 && value.charAt(0) == '"' && value.charAt(l - 1) == ':') {
+            return value.substring(0, l - 1);
+        }
+        return value;
+    }
+
+    public MultiMCInstanceConfiguration(String instanceType, String name, String gameVersion, Integer permGen, String wrapperCommand, String preLaunchCommand, String postExitCommand, String notes, String javaPath, String jvmArgs, boolean fullscreen, Integer width, Integer height, Integer maxMemory, Integer minMemory, boolean showConsole, boolean showConsoleOnError, boolean autoCloseConsole, boolean overrideMemory, boolean overrideJavaLocation, boolean overrideJavaArgs, boolean overrideConsole, boolean overrideCommands, boolean overrideWindow, String iconKey) {
         this.instanceType = instanceType;
         this.name = name;
         this.gameVersion = gameVersion;
@@ -116,6 +135,7 @@ public MultiMCInstanceConfiguration(String instanceType, String name, String gam
         this.overrideCommands = overrideCommands;
         this.overrideWindow = overrideWindow;
         this.mmcPack = null;
+        this.iconKey = iconKey;
     }
 
     public String getInstanceType() {
@@ -288,6 +308,10 @@ public boolean isOverrideWindow() {
         return overrideWindow;
     }
 
+    public String getIconKey() {
+        return iconKey;
+    }
+
     public Properties toProperties() {
         Properties p = new Properties();
         if (instanceType != null) p.setProperty("InstanceType", instanceType);
@@ -314,6 +338,7 @@ public Properties toProperties() {
         if (wrapperCommand != null) p.setProperty("WrapperCommand", wrapperCommand);
         if (name != null) p.setProperty("name", name);
         if (notes != null) p.setProperty("notes", notes);
+        if (iconKey != null) p.setProperty("iconKey", iconKey);
         return p;
     }
 

FCLCore/src/main/java/com/tungsten/fclcore/download/game/GameLibrariesTask.java

@@ -197,6 +197,14 @@ public void execute() throws Exception {
             Path jarmods = root.resolve("jarmods");
             if (Files.exists(jarmods))
                 FileUtils.copyDirectory(jarmods, repository.getVersionRoot(name).toPath().resolve("jarmods"));
+
+            String iconKey = this.manifest.getIconKey();
+            if (iconKey != null) {
+                Path iconFile = root.resolve(iconKey + ".png");
+                if (Files.exists(iconFile)) {
+                    FileUtils.copyFile(iconFile, repository.getVersionRoot(name).toPath().resolve("icon.png"));
+                }
+            }
         }
 
         dependencies.add(repository.saveAsync(version));