添加 Modrinth 整合包导出 #3716

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

Jump to bottom

Open

zkitefly wants to merge 45 commits into HMCL-dev:main from zkitefly:modrinth-modpack-output

Member

zkitefly commented Mar 7, 2025 •

edited

Loading

_dde-file-manager_20250308020906.mp4

Fabulously Optimized.mrpack.zip

可能需要改进翻译

HMCL-3.6.SNAPSHOT.zip 测试版本

zkitefly added 2 commits

March 8, 2025 02:02


          添加 Modrinth 整合包导出功能

f15b12d


          Merge remote-tracking branch 'upstream/main' into modrinth-modpack-ou…

9d90aaa

…tput

zkitefly requested review from burningtnt, yushijinhun and Glavo

March 7, 2025 18:11

fix

e7f11ee

burningtnt mentioned this pull request

PR Collection 开发进展 burningtnt/HMCL#9

Open

zkitefly added 2 commits

March 8, 2025 04:56


          Update ModAdviser.java

a5443d4


          Update ModAdviser.java

3e40892

3gf8jv4dv suggested changes

View reviewed changes

Contributor

3gf8jv4dv left a comment

文案建议（English）

其他语言稍后

HMCL/src/main/resources/assets/lang/I18N.properties Outdated Show resolved Hide resolved

HMCL/src/main/resources/assets/lang/I18N.properties Outdated Show resolved Hide resolved

HMCL/src/main/resources/assets/lang/I18N.properties Outdated Show resolved Hide resolved

fix

6682f15

挺9的

3gf8jv4dv suggested changes

View reviewed changes

Contributor

3gf8jv4dv left a comment

文案建议（简体中文）

HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties Outdated Show resolved Hide resolved

HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties Outdated Show resolved Hide resolved

HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties Outdated Show resolved Hide resolved

3gf8jv4dv suggested changes

View reviewed changes

Contributor

3gf8jv4dv left a comment

文案建议（繁體中文）

HMCL/src/main/resources/assets/lang/I18N_zh.properties Outdated Show resolved Hide resolved

HMCL/src/main/resources/assets/lang/I18N_zh.properties Outdated Show resolved Hide resolved

HMCL/src/main/resources/assets/lang/I18N_zh.properties Outdated Show resolved Hide resolved

3gf8jv4dv suggested changes

View reviewed changes

Contributor

3gf8jv4dv left a comment

文案建议（Español）

HMCL/src/main/resources/assets/lang/I18N_es.properties Outdated Show resolved Hide resolved

HMCL/src/main/resources/assets/lang/I18N_es.properties Outdated Show resolved Hide resolved

HMCL/src/main/resources/assets/lang/I18N_es.properties Outdated Show resolved Hide resolved

HMCL/src/main/resources/assets/lang/I18N_es.properties Outdated Show resolved Hide resolved

Contributor

3gf8jv4dv commented Mar 8, 2025

俄语和日语似乎少了 modpack.type.modrinth.export

zkitefly and others added 15 commits

March 8, 2025 14:20


          update

3c72c41


          修复 ModrinthRemoteModRepository.java 中的异常处理，改为捕获 FileNotFoundException

ab451f3


          update

7a1daef


          Update HMCL/src/main/resources/assets/lang/I18N.properties

c815a78

Co-authored-by: 3gf8jv4dv <[email protected]>


          Update HMCL/src/main/resources/assets/lang/I18N.properties

93a1e69

Co-authored-by: 3gf8jv4dv <[email protected]>


          Update HMCL/src/main/resources/assets/lang/I18N.properties

30ef641

Co-authored-by: 3gf8jv4dv <[email protected]>


          Update HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties

f603413

Co-authored-by: 3gf8jv4dv <[email protected]>


          Update HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties

723553c

Co-authored-by: 3gf8jv4dv <[email protected]>


          Update HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties

77d3807

Co-authored-by: 3gf8jv4dv <[email protected]>


          Update HMCL/src/main/resources/assets/lang/I18N_zh.properties

96f1c7d

Co-authored-by: 3gf8jv4dv <[email protected]>


          Update HMCL/src/main/resources/assets/lang/I18N_zh.properties

6e9fec3

Co-authored-by: 3gf8jv4dv <[email protected]>


          Update HMCL/src/main/resources/assets/lang/I18N_zh.properties

b1e8c99

Co-authored-by: 3gf8jv4dv <[email protected]>


          Update HMCL/src/main/resources/assets/lang/I18N_es.properties

11f90bd

Co-authored-by: 3gf8jv4dv <[email protected]>


          Update HMCL/src/main/resources/assets/lang/I18N_es.properties

f1e355e

Co-authored-by: 3gf8jv4dv <[email protected]>


          Update HMCL/src/main/resources/assets/lang/I18N_es.properties

1b75883

Co-authored-by: 3gf8jv4dv <[email protected]>

zkitefly requested a review from 3gf8jv4dv

March 8, 2025 10:20

Wulian233 mentioned this pull request

[Feature] 支持导出 Modrinth 格式整合包 #3525

Closed


          update

a4d0569

Member Author

zkitefly commented Mar 10, 2025

a4d0569 更新了 modpack.wizard.step.initialization.modrinth.info 的翻译，但日文、俄文和西班牙语没改，需要帮助（

zkitefly added 2 commits

March 10, 2025 18:26


          Update ModrinthModpackExportTask.java

99fd8c8


          Update ModrinthRemoteModRepository.java

0ce41a9

3gf8jv4dv suggested changes

View reviewed changes

HMCL/src/main/resources/assets/lang/I18N.properties Outdated Show resolved Hide resolved

HMCL/src/main/resources/assets/lang/I18N_es.properties Outdated Show resolved Hide resolved

HMCL/src/main/resources/assets/lang/I18N_ru.properties Outdated Show resolved Hide resolved

HMCL/src/main/resources/assets/lang/I18N_zh.properties Outdated Show resolved Hide resolved

zkitefly and others added 4 commits

March 10, 2025 20:44


          Update HMCL/src/main/resources/assets/lang/I18N.properties

0f1d21a

Co-authored-by: 3gf8jv4dv <[email protected]>


          Update HMCL/src/main/resources/assets/lang/I18N_es.properties

e28c9ac

Co-authored-by: 3gf8jv4dv <[email protected]>


          Update HMCL/src/main/resources/assets/lang/I18N_ru.properties

e2a5ac6

Co-authored-by: 3gf8jv4dv <[email protected]>


          Update HMCL/src/main/resources/assets/lang/I18N_zh.properties

575b400

Co-authored-by: 3gf8jv4dv <[email protected]>

zkitefly requested a review from 3gf8jv4dv

March 10, 2025 12:47

Member Author

zkitefly commented Mar 17, 2025

@Glavo cc？


          Update ModrinthModpackExportTask.java

17acb29

Member Author

zkitefly commented May 21, 2025

@Glavo 有计划在稳定版前合并吗（

Glavo requested review from Copilot and removed request for 3gf8jv4dv

May 31, 2025 15:00

Copilot AI reviewed

View reviewed changes

Copilot AI left a comment

Pull Request Overview

This PR adds support for exporting modpacks in the Modrinth format. It introduces a new export task, updates modpack export configuration to include flags for remote resource matching, adjusts the modpack blacklist accordingly, and modifies UI pages and language files for consistent Modrinth integration.

Reviewed Changes

Copilot reviewed 12 out of 12 changed files in this pull request and generated 2 comments.

Show a summary per file

File	Description
HMCLCore/src/main/java/org/jackhuang/hmcl/mod/modrinth/ModrinthModpackExportTask.java	New export task for creating Modrinth modpacks and handling remote file matching.
HMCLCore/src/main/java/org/jackhuang/hmcl/mod/ModpackExportInfo.java	Added new boolean flags and options to control remote file matching behavior.
HMCLCore/src/main/java/org/jackhuang/hmcl/mod/ModAdviser.java	Updated modpack blacklist with additional rules including entries for Modrinth exports.
HMCL/src/main/resources/assets/lang/*.properties	Added new translation keys and updated strings for Modrinth-related export parameters.
HMCL/src/main/java/org/jackhuang/hmcl/ui/export/*.java	Modified modpack selection and export info pages to include Modrinth as an export option with corresponding file extension and toggle controls.
HMCL/src/main/java/org/jackhuang/hmcl/ui/export/ExportWizardProvider.java	Integrated the new Modrinth export task into the export wizard flow.

HMCLCore/src/main/java/org/jackhuang/hmcl/mod/modrinth/ModrinthModpackExportTask.java Show resolved Hide resolved

HMCLCore/src/main/java/org/jackhuang/hmcl/mod/modrinth/ModrinthModpackExportTask.java Outdated Show resolved Hide resolved

zkitefly requested review from 3gf8jv4dv and removed request for 3gf8jv4dv

May 31, 2025 16:08

burningtnt suggested changes

View reviewed changes

HMCLCore/src/main/java/org/jackhuang/hmcl/mod/modrinth/ModrinthModpackExportTask.java

+                                                  return;
+                                              }
+                                              ModrinthManifest.File fileEntry = tryGetRemoteFile(file, relativePath);

Member

burningtnt Jun 7, 2025

请避免同步网络请求，应将请求下载源数据的代码分离至独立的 Task，并使用 getDependencies / getDependents 来链接到 ModrinthModpackExportTask。

HMCLCore/src/main/java/org/jackhuang/hmcl/mod/modrinth/ModrinthModpackExportTask.java

+                      try {
+                          modrinthVersion = ModrinthRemoteModRepository.MODS.getRemoteVersionByLocalFile(localModFile, file);
+                      } catch (IOException e) {
+                          LOG.warning("Failed to get remote file from Modrinth for: " + file, e);

Member

burningtnt Jun 7, 2025

用户若错误地在无网情况下导出整合包，则不会收到任何提示但未能将模组本体排除至整合包之外

Member Author

zkitefly Jun 7, 2025

也就是说请求失败就直接终止导出？

HMCLCore/src/main/java/org/jackhuang/hmcl/mod/modrinth/ModrinthModpackExportTask.java Outdated Show resolved Hide resolved

HMCLCore/src/main/java/org/jackhuang/hmcl/mod/modrinth/ModrinthModpackExportTask.java

+                      blackList.add(version + ".jar");
+                      blackList.add(version + ".json");
+                      LOG.info("Compressing game files without some files in blacklist, including files or directories: usernamecache.json, asm, logs, backups, versions, assets, usercache.json, libraries, crash-reports, launcher_profiles.json, NVIDIA, TCNodeTracker");
+                      try (Zipper zip = new Zipper(modpackFile.toPath())) {

Member

burningtnt Jun 7, 2025

新代码应避免使用 Zipper。请转向 CompressingUtils 中构造的 FileSystem

Member

Glavo Jun 7, 2025

新代码应避免使用 Zipper。请转向 CompressingUtils 中构造的 FileSystem

新代码请不要使用 FileSystem，尤其是不应该使用 FileSystem 写入 ZIP 文件，这存在相当多问题。

Member

burningtnt Jun 7, 2025

新代码应避免使用 Zipper。请转向 CompressingUtils 中构造的 FileSystem

新代码请不要使用 FileSystem，尤其是不应该使用 FileSystem 写入 ZIP 文件，这存在相当多问题。

请求在另一个 Issue 中列出目前 jrt FileSystem 存在的问题。FileSystem 相较于 Zipper / Unzipper / ZipArchiveReader 有较高自由度。

Member Author

zkitefly Jun 7, 2025

那就先保持这样？因为 MMC 和 MCBBS 整合包都是使用 Zipper

HMCLCore/src/main/java/org/jackhuang/hmcl/mod/modrinth/ModrinthModpackExportTask.java Outdated Show resolved Hide resolved

zkitefly and others added 6 commits

June 7, 2025 08:29


          Update HMCLCore/src/main/java/org/jackhuang/hmcl/mod/modrinth/Modrint…

c2d01a6

…hModpackExportTask.java

Co-authored-by: Copilot <[email protected]>


          适配 ModManager

a60a95d


          Merge branch 'modrinth-modpack-output' of https://github.com/zkitefly…

580125c

…/HMCL into modrinth-modpack-output


          Merge branch 'main' into modrinth-modpack-output

55418f4


          当 fileSize 超过 Integer.MAX_VALUE 时在日志中警告

afe947d

感觉没啥用啊（

我也不敢直接抛错误啊，文档说这个值只是帮助启动器显示进度条的。（详细请查看 https://support.modrinth.com/en/articles/8802351 对 fileSize 的介绍）


          去除 env 的 server 字段，并将 runDirectory 改为 client-overrides

3544cdb

Glavo requested changes

View reviewed changes

HMCLCore/src/main/java/org/jackhuang/hmcl/mod/modrinth/ModrinthModpackExportTask.java Outdated Show resolved Hide resolved

Glavo reviewed

View reviewed changes

HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties

@@ @@ -747,7 +748,10 @@ modpack.wizard.step.3.title=选择整合包导出类型 @@
               modpack.wizard.step.initialization.exported_version=要导出的游戏版本
               modpack.wizard.step.initialization.force_update=强制升级整合包至最新版本 (需要自建服务器)
               modpack.wizard.step.initialization.include_launcher=包含启动器
+              modpack.wizard.step.initialization.modrinth.info=在整合包创建过程中，启动器将匹配 CurseForge/Modrinth 远程资源替代本地文件（包括模组、资源包和光影包）以缩减整合包体积，并将扩展名为“.disabled”的文件标注为“安装时可选项”。
+              modpack.wizard.step.initialization.no_create_remote_files=不匹配远程文件

Member

Glavo Jun 11, 2025

这两个选项的功能感觉太难理解了，不看代码的话我是不知道这个选项是什么意思。

Member

Glavo Jun 12, 2025

如果这两个选项不是必要的话，那建议先不引入，后续再讨论是否要引入，该起什么名字。

Member Author

zkitefly Jun 20, 2025

更名为“打包资源文件”如何？


          使用支持 Java 8 的 API

e1e9cf9

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

Glavo Glavo requested changes

burningtnt burningtnt requested changes

Copilot code review Copilot Copilot left review comments

3gf8jv4dv 3gf8jv4dv requested changes

yushijinhun Awaiting requested review from yushijinhun

Labels

None yet