From 847c4333100caff5a8a39f61db95bd8100ac18d1 Mon Sep 17 00:00:00 2001
From: Txt-Text <168109520+Txt-Text@users.noreply.github.com>
Date: Mon, 27 Jan 2025 09:52:00 +0800
Subject: [PATCH] Update ModModpack.vb
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

让PCL能够正确读取MMC整合包instance.cfg中的JvmArgs
---
 .../Modules/Minecraft/ModModpack.vb           | 35 +++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb
index da6550f..20cf487 100644
--- a/Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb	
+++ b/Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb	
@@ -1,4 +1,4 @@
-Imports System.IO.Compression
+Imports System.IO.Compression
 Imports System.Linq.Expressions
 
 Public Module ModModpack
@@ -613,7 +613,27 @@ Retry:
                 Dim MMCSetupFile As String = InstallTemp & ArchiveBaseFolder & "instance.cfg"
                 If File.Exists(MMCSetupFile) Then
                     '将其中的等号替换为冒号，以符合 ini 文件格式
-                    WriteFile(MMCSetupFile, ReadFile(MMCSetupFile).Replace("=", ":"))
+                    '旧代码
+                    'WriteFile(MMCSetupFile, ReadFile(MMCSetupFile).Replace("=", ":"))
+                    '问题+解决：（龙猫不要嫌我啰嗦，想解释一下，删掉就好...）
+                    '首先写了一个把JvmArgs加到JVM参数里头的东西，安装包后启动会崩
+                    '找了半天原因最后发现是PCL把instance.cfg当成了.ini读取，为了适配.ini的格式（ini格式就是value:xxx）PCL在读取之前把所有等号都替换成为冒号了
+                    '按说是没问题的，但新写的JvmArgs就是一个例外，后面的参数有等号，因此也被错误的替换了
+                    '解决办法：写一个排除项，遇到JvmArgs则等号以后（参数部分）不替换
+                    Dim MMCSetupFileLines() As String = File.ReadAllLines(MMCSetupFile)
+                    For i As Integer = 0 To MMCSetupFileLines.Length - 1
+                        '检查开头是不是"JvmArgs="
+                        If MMCSetupFileLines(i).StartsWith("JvmArgs=") Then
+                            '有则替换这一个等号，忽略后面的参数部分
+                            MMCSetupFileLines(i) = "JvmArgs:" & MMCSetupFileLines(i).Substring("JvmArgs=".Length)
+                        Else
+                            '无则全部替换
+                            MMCSetupFileLines(i) = MMCSetupFileLines(i).Replace("=", ":")
+                        End If
+                    Next
+                    '修改后写回文件
+                    File.WriteAllLines(MMCSetupFile, MMCSetupFileLines)
+                    '芜湖，欧了
                     If ReadIni(MMCSetupFile, "OverrideCommands", False) Then
                         Dim PreLaunchCommand As String = ReadIni(MMCSetupFile, "PreLaunchCommand")
                         If PreLaunchCommand <> "" Then
@@ -642,6 +662,17 @@ Retry:
                         CopyFile($"{InstallTemp}{ArchiveBaseFolder}{Logo}.png", $"{PathMcFolder}versions\{VersionName}\PCL\Logo.png")
                         Log($"[ModPack] 迁移 MultiMC 版本独立设置：版本图标（{Logo}.png）")
                     End If
+                    'JvmArgs参数
+                    Dim JvmArgs As String = ReadIni(MMCSetupFile, "JvmArgs", "")
+                    If JvmArgs <> "" Then
+                        WriteIni(SetupFile, "VersionAdvanceJvm", JvmArgs)
+                        Log("[ModPack] 迁移 MultiMC 版本独立设置：JVM 参数：" & JvmArgs)
+                    End If
+                    '这段我看参数有就给加上了...
+                    If ReadIni(MMCSetupFile, "OverrideJavaArgs", False) Then
+                        WriteIni(SetupFile, "VersionAdvanceJavaArgs", True)
+                        Log("[ModPack] 迁移 MultiMC 版本独立设置：覆盖 JavaArgs")
+                    End If
                 End If
             Catch ex As Exception
                 Log(ex, $"读取 MMC 配置文件失败（{InstallTemp}{ArchiveBaseFolder}instance.cfg）")