refactor(modpack): 重写整合包安装 - #3523
Open
qsc1918 wants to merge 15 commits into
Open
Conversation
pcl-ce-automation
Bot
added
🛠️ 等待审查
![sourcery-ai[bot]](https://avatars.githubusercontent.com/in/48477?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Sorry @qsc1918, your pull request is larger than the review limit of 150000 diff characters
Contributor
Reviewer's Guide将 ModModpack 重构为模块化、与格式无关的安装流水线，由新的 Modpack* 模型和归档读取器提供支持；新增对 CurseForge、Modrinth、MultiMC、HMCL、MCBBS、启动器整合包以及懒人包（包括文件夹形式整合包）的稳健检测与安装能力；并引入整合包推荐内存（RAM）支持，包括 UI、启动时安全检查和回归测试。 统一整合包安装流水线的序列图sequenceDiagram
participant User
participant ModModpack as ModModpack.ModpackInstall
participant ZipReader as ZipModpackArchiveReader
participant Detector as ModpackArchiveDetector.Detect
participant ModModpackSrc as ModModpack._InstallSource
participant CurseForge as ModModpack._InstallCurseForge
participant Modrinth as ModModpack._InstallModrinth
participant MultiMc as ModModpack._InstallMultiMc
User->>ModModpack: ModpackInstall(file, instanceName, logo, resourceId, isOnlineInstall)
ModModpack->>ZipReader: new ZipModpackArchiveReader(archive)
ModModpack->>Detector: Detect(source)
Detector-->>ModModpack: ModpackDetection(Format, ArchiveBaseFolder)
ModModpack->>ModModpackSrc: _InstallSource(source, file, instanceName, logo, resourceId, isOnlineInstall)
ModModpackSrc->>ModModpackSrc: ModpackArchiveDetector.Detect(source)
ModModpackSrc-->>ModModpackSrc: packType, archiveBaseFolder
alt packType == ModpackFormat.CurseForge
ModModpackSrc->>CurseForge: _InstallCurseForge(sourcePath, source, archiveBaseFolder, instanceName, logo, resourceId, isOnlineInstall)
else packType == ModpackFormat.Modrinth
ModModpackSrc->>Modrinth: _InstallModrinth(sourcePath, source, archiveBaseFolder, instanceName, logo, resourceId, isOnlineInstall)
else packType == ModpackFormat.MultiMc
ModModpackSrc->>MultiMc: _InstallMultiMc(sourcePath, source, archiveBaseFolder)
else other formats
ModModpackSrc->>ModModpackSrc: _InstallMcbbs / _InstallHmcl / _InstallLauncherPack / _InstallCompress
end
启动时处理整合包推荐内存（RAM）的序列图sequenceDiagram
participant Launch as ModLaunch.McLaunchPrecheck
participant Config as Config.Instance
participant States as States.Instance
participant Kernel as KernelInterop
participant Msg as ModMain.MyMsgBox
Launch->>Config: MemorySolution[ModInstanceList.McMcInstanceSelected.PathInstance]
alt MemorySolution == 3
Launch->>States: ModpackRam[ModInstanceList.McMcInstanceSelected.PathInstance]
States-->>Launch: recommendedRamMb
alt recommendedRamMb > 0
Launch->>Kernel: GetAvailablePhysicalMemoryBytes()
Kernel-->>Launch: availableBytes
Launch->>Launch: [availableMb*0.8 < recommendedRamMb || availableMb - recommendedRamMb < 2GB]
alt condition true
Launch->>Msg: MyMsgBox(ModpackRecommendedRamUnfit..., SwitchAuto, KeepRecommended)
Msg-->>Launch: result
alt result == 1
Launch->>Config: MemorySolution[...] = 0 (via ModBase.RunInUiWait)
end
end
end
end
文件级改动
Tips and commandsInteracting with Sourcery
Customizing Your Experience访问你的 dashboard 来：
Getting HelpOriginal review guide in EnglishReviewer's GuideRefactors ModModpack into a modular, format-agnostic installer pipeline backed by new Modpack* models and archive readers, adds robust detection/installation for CurseForge, Modrinth, MultiMC, HMCL, MCBBS, launcher packs and lazy packs (including folder-based packs), and introduces modpack-recommended RAM support with UI, launch-time safeguards, and regression tests. Sequence diagram for unified modpack installation pipelinesequenceDiagram
participant User
participant ModModpack as ModModpack.ModpackInstall
participant ZipReader as ZipModpackArchiveReader
participant Detector as ModpackArchiveDetector.Detect
participant ModModpackSrc as ModModpack._InstallSource
participant CurseForge as ModModpack._InstallCurseForge
participant Modrinth as ModModpack._InstallModrinth
participant MultiMc as ModModpack._InstallMultiMc
User->>ModModpack: ModpackInstall(file, instanceName, logo, resourceId, isOnlineInstall)
ModModpack->>ZipReader: new ZipModpackArchiveReader(archive)
ModModpack->>Detector: Detect(source)
Detector-->>ModModpack: ModpackDetection(Format, ArchiveBaseFolder)
ModModpack->>ModModpackSrc: _InstallSource(source, file, instanceName, logo, resourceId, isOnlineInstall)
ModModpackSrc->>ModModpackSrc: ModpackArchiveDetector.Detect(source)
ModModpackSrc-->>ModModpackSrc: packType, archiveBaseFolder
alt packType == ModpackFormat.CurseForge
ModModpackSrc->>CurseForge: _InstallCurseForge(sourcePath, source, archiveBaseFolder, instanceName, logo, resourceId, isOnlineInstall)
else packType == ModpackFormat.Modrinth
ModModpackSrc->>Modrinth: _InstallModrinth(sourcePath, source, archiveBaseFolder, instanceName, logo, resourceId, isOnlineInstall)
else packType == ModpackFormat.MultiMc
ModModpackSrc->>MultiMc: _InstallMultiMc(sourcePath, source, archiveBaseFolder)
else other formats
ModModpackSrc->>ModModpackSrc: _InstallMcbbs / _InstallHmcl / _InstallLauncherPack / _InstallCompress
end
Sequence diagram for modpack-recommended RAM handling on launchsequenceDiagram
participant Launch as ModLaunch.McLaunchPrecheck
participant Config as Config.Instance
participant States as States.Instance
participant Kernel as KernelInterop
participant Msg as ModMain.MyMsgBox
Launch->>Config: MemorySolution[ModInstanceList.McMcInstanceSelected.PathInstance]
alt MemorySolution == 3
Launch->>States: ModpackRam[ModInstanceList.McMcInstanceSelected.PathInstance]
States-->>Launch: recommendedRamMb
alt recommendedRamMb > 0
Launch->>Kernel: GetAvailablePhysicalMemoryBytes()
Kernel-->>Launch: availableBytes
Launch->>Launch: [availableMb*0.8 < recommendedRamMb || availableMb - recommendedRamMb < 2GB]
alt condition true
Launch->>Msg: MyMsgBox(ModpackRecommendedRamUnfit..., SwitchAuto, KeepRecommended)
Msg-->>Launch: result
alt result == 1
Launch->>Config: MemorySolution[...] = 0 (via ModBase.RunInUiWait)
end
end
end
end
File-Level Changes
Tips and commandsInteracting with Sourcery
Customizing Your ExperienceAccess your dashboard to:
Getting Help
|
Contributor
Author
|
Close #3403 |
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: f08b192436
ℹ️ About Codex in GitHub
Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".
Member
|
请善用编辑功能，热知识，标题/介绍及评论都是可以再更改的 |
Contributor
Author
？ |
Contributor
Author
哦，我懂了，是你要指我把那个close写到介绍里面是吧，好的，我知道了，谢谢你，其实我之前还真不知道，我还以为除了标题能改之外，其他不能 |
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 921205b28d
ℹ️ About Codex in GitHub
Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 7ef0a93511
ℹ️ About Codex in GitHub
Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 6209d9209d
ℹ️ About Codex in GitHub
Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".
Comment on lines
+108
to
+109
| var node = JsonNode.Parse(jsonText); | ||
| return node?["addons"] is not null; |
There was a problem hiding this comment.
For MCBBS packs whose root manifest.json contains addons but also uses syntax that PCL's normal parser accepts, such as comments or trailing commas, this strict JsonNode.Parse now throws and _HasAddons returns false. Those packs were previously detected through ModBase.GetJson/JsonCompat, but after this refactor they get routed to the CurseForge installer and fail with missing Minecraft version instead of installing; use JsonCompat.ParseNode here to keep detection consistent with the manifest parsers.
Useful? React with 👍 / 👎.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
修改内容
测试情况
其他说明
close #3403
Summary by Sourcery
将整合包安装重构为“按格式划分的模块”，在其之上建立共享的检测与分发层；新增对“嵌套整合包”和“文件夹整合包”的安装支持，并在安装流程、实例设置和启动流程中引入“整合包推荐内存”的统一处理。
New Features:
.minecraft实例归档）安装，实现带冲突感知的文件复制以及自动版本隔离。Bug Fixes:
Enhancements:
Documentation:
Tests:
Original summary in English
Summary by Sourcery
Refactor modpack installation into format-specific modules with a shared detection and dispatch layer, add support for installing nested and folder-based modpacks, and introduce modpack-recommended memory handling across install, instance settings, and launch flows.
New Features:
Bug Fixes:
Enhancements:
Documentation:
Tests: