Skip to content

feat: 带启动器的压缩包含 .mrpack 时自动提取并作为 MR 整合包安装 #3446

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
LuLu-ling wants to merge 2 commits into from
Closed

feat: 带启动器的压缩包含 .mrpack 时自动提取并作为 MR 整合包安装 #3446

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
71b762f
feat: 带启动器的整合包内含 .mrpack 时自动提取 .mrpack 进行安装
LuLu-ling Jul 22, 2026
8319e93
apply [GPT-5.6-SOL]
LuLu-ling Jul 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 25 additions & 2 deletions Plain Craft Launcher 2/Modules/Minecraft/ModModpack.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ public static LoaderCombo<string> ModpackInstall(string file, string instanceNam

// 获取整合包种类与关键 Json
var packType = -1;
ZipArchiveEntry nestedModpackEntry = null;
do
{
try
Expand Down Expand Up @@ -117,12 +118,18 @@ public static LoaderCombo<string> ModpackInstall(string file, string instanceNam
break;
} // HMCL 整合包

if (archive.GetEntry("modpack.zip") is not null || archive.GetEntry("modpack.mrpack") is not null)
if (archive.GetEntry("modpack.zip") is not null)
{
packType = 9;
break;
} // 带启动器的压缩包

nestedModpackEntry = archive.GetEntry("modpack.mrpack");
if (nestedModpackEntry is not null)
{
break;
}

// 从一级目录判断整合包类型
var exitTry = false;
foreach (var Entry in archive.Entries)
Expand Down Expand Up @@ -178,12 +185,19 @@ public static LoaderCombo<string> ModpackInstall(string file, string instanceNam
break;
} // HMCL 整合包

if (fullNames[1] == "modpack.zip" || fullNames[1] == "modpack.mrpack")
if (fullNames[1] == "modpack.zip")
{
packType = 9;
exitTry = true;
break;
} // 带启动器的压缩包

if (fullNames[1] == "modpack.mrpack")
{
nestedModpackEntry = Entry;
exitTry = true;
break;
}
}

if (exitTry) break;
Expand All @@ -199,6 +213,15 @@ public static LoaderCombo<string> ModpackInstall(string file, string instanceNam
}
} while (false);

if (nestedModpackEntry is not null)
{
var tempFile = Path.Combine(ModMain.RequestTaskTempFolder(), "modpack.mrpack");
nestedModpackEntry.ExtractToFile(tempFile, overwrite: true);
archive.Dispose();
archive = null;
return ModpackInstall(tempFile, instanceName, logo, resourceId, isOnlineInstall);
}

// 执行对应的安装方法
switch (packType)
{
Expand Down
Loading