From 7534f9da1f1eabe8611318bb85d18bc2039959d6 Mon Sep 17 00:00:00 2001
From: huangyu <96684075+tmdakm@users.noreply.github.com>
Date: Sat, 3 Aug 2024 21:04:57 +0800
Subject: [PATCH] Read JvmArgs and LaunchArgs in ModPack

---
 Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb
index 7dacc5d..bb0c9bb 100644
--- a/Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb	
+++ b/Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb	
@@ -771,6 +771,14 @@ Retry:
             '开启版本隔离
             WriteIni(PathMcFolder & "versions\" & VersionName & "\PCL\Setup.ini", "VersionArgumentIndie", 1)
         End Sub) With {.ProgressWeight = New FileInfo(FileAddress).Length / 1024 / 1024 / 6, .Block = False}) '每 6M 需要 1s
+        If Json("launchInfo") Is Nothing Then
+            Log("[ModPack] 整合包中未找到启动信息，已跳过")
+        Else
+            Dim launchInfo as JObject = Json("launchInfo)
+            Dim launchArgument As String = String.Join(" ", launchInfo("launchArgument"))
+            Dim javaArgument As String = String.Join(" ", launchInfo("javaArgument"))
+            WriteIni(PathMcFolder & "versions\" & VersionName & "\PCL\Setup.ini", "VersionAdvanceJvm", javaArgument)
+            WriteIni(PathMcFolder & "versions\" & VersionName & "\PCL\Setup.ini", "VersionAdvanceLaunch", launchArgument)
         '构造加载器
         If Json("addons") Is Nothing Then
             Hint("该整合包未提供游戏版本附加信息，无法安装！", HintType.Critical)