[Feature] [Bugfix] 资源包有关优化与修复 by Calboot · Pull Request #4980 · HMCL-dev/HMCL

Calboot · 2025-12-14T02:38:29Z

资源包管理界面边框样式修复
修复资源包依赖模组下载错误的问题
资源包启用/禁用功能
资源包详细信息界面
与模组管理界面同步
更新资源包

具体改动

修复了资源包管理界面元素边框过粗的问题
Fixes [Bug] 以资源包前置方式下载模组，模组被错误下载到资源包文件夹 #4680
修复光影包下载对话框标题错误的问题
添加启用/禁用资源包功能（实验性，有警告）
添加资源包详细信息界面
移除资源包删除按钮，改为与模组界面一致的删除逻辑
Fixes [Bug] 实例管理-资源包管理页面有概率无法用esc退回到主界面 #5037
从一些类里抽象出LocalAddonFile和LocalFileManager<T extends LocalAddonFile>，使更新对于模组以外的东西（如资源包和光影包）也能适用，从而实现了资源包更新（不保留旧版本）
Fixes [Bug] 在“下载资源包”页面中，未正确选中当前编辑的版本，且下载存储位置错误。 #5207
让资源包光影包下载也有推荐项

Calboot · 2025-12-14T04:32:36Z

需要懂其他语言的人完善 i18n

在BMC4中测试时发现BMC4会判定所有资源包兼容，与原版表现不符，会导致启用/禁用功能失效，故添加警告

3gf8jv4dv

~~我在 CF 和 MR 分别下载了好几个资源包，结果都显示「游戏版本元数据缺失」。如果真的要为这个显示警告的话，可能很多人都会迷惑。~~

可能是我搞错了，我还在弄清楚这一块。

HMCLCore/src/main/java/org/jackhuang/hmcl/resourcepack/ResourcepackFile.java

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

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

3gf8jv4dv · 2025-12-17T13:12:53Z

我下载了 Translations for Sodium，放在 1.21.9~1.21.11 的资源包文件夹内，启动器会显示「游戏版本元数据缺失」。1.21.8 和 1.21.1 正常。不知道是不是 bug。

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

Calboot · 2025-12-17T13:31:57Z

我下载了 Translations for Sodium，放在 1.21.9~1.21.11 的资源包文件夹内，启动器会显示「游戏版本元数据缺失」。1.21.8 和 1.21.1 正常。不知道是不是 bug。

确实是，我在修

…esourcepack-enhancement

Calboot · 2025-12-18T12:09:42Z

我下载了 Translations for Sodium，放在 1.21.9~1.21.11 的资源包文件夹内，启动器会显示「游戏版本元数据缺失」。1.21.8 和 1.21.1 正常。不知道是不是 bug。

Solved

HMCLCore/src/main/java/org/jackhuang/hmcl/mod/LocalAddonFile.java

Copilot

Pull request overview

Copilot reviewed 46 out of 46 changed files in this pull request and generated no new comments.

Comments suppressed due to low confidence (3)

HMCLCore/src/main/java/org/jackhuang/hmcl/resourcepack/ResourcePackFile.java:27

isFileResourcePack treats any existing path ending with .zip as a resource pack, even if it is a directory without pack.mcmeta (e.g., an extracted folder named foo.zip). That will make parse(...) attempt to load it as a ResourcePackFolder and surface misleading warnings/log spam instead of skipping it. Consider requiring Files.isRegularFile(file) && name.endsWith(".zip") for zip packs, and Files.isDirectory(file) && Files.isRegularFile(file.resolve("pack.mcmeta")) for folder packs.
HMCLCore/src/main/java/org/jackhuang/hmcl/resourcepack/ResourcePackManager.java:252
refresh() currently calls addResourcePackInfo(subitem) without per-entry exception handling. If a single broken/invalid zip triggers an IOException during parsing, the whole refresh fails and the UI ends up clearing the entire list (see ResourcePackListPage.refresh() exception path). Consider catching exceptions per file inside the loop, logging, and continuing so one bad pack doesn’t prevent listing the rest.
HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/AddonUpdatesPage.java:301
AddonUpdateTask downloads the updated file using remote.getFile().getFilename() as the target name. For resource packs, Minecraft references enabled packs by filename in options.txt (e.g., resourcePacks=["file/<filename>"]), so if the remote filename differs from the current local filename, updating will silently disable the pack and leave a stale entry pointing to a non-existent file. Consider preserving the existing filename for resource packs (download to the old name), or updating options.txt to replace the old packId with the new filename after a successful update.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

# Conflicts: # HMCLCore/src/main/java/org/jackhuang/hmcl/mod/curse/CurseForgeRemoteModRepository.java

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ResourcePackListPage.java

Copilot

Pull request overview

Copilot reviewed 46 out of 46 changed files in this pull request and generated 1 comment.

Comments suppressed due to low confidence (5)

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/AddonUpdatesPage.java:318

When restoring the state after a failed download (lines 315-317), the code calls local.setOld(false) and local.markDisabled() if the file was disabled. However, these operations can throw IOException which is not caught here. If setOld or markDisabled throws an exception, the restoration will fail silently and the file could be left in an inconsistent state. Consider wrapping these calls in a try-catch block or documenting that they shouldn't throw exceptions in this context.
HMCLCore/src/main/java/org/jackhuang/hmcl/resourcepack/ResourcePackManager.java:118
The condition at line 118 uses a negation with OR which creates a logic error. The intent seems to be checking if NEITHER minPackVersion NOR maxPackVersion is unspecified (i.e., both are specified), but the condition !(A || B) is equivalent to !A && !B, which is correct. However, the comment "See https://zh.minecraft.wiki/w/Pack.mcmeta" and the subsequent logic suggest this might be handling a specific case.

The real issue is that the condition should probably be !minPackVersion.isUnspecified() && !maxPackVersion.isUnspecified() for clarity, rather than using De Morgan's law. The current form is harder to read and reason about.
HMCLCore/src/main/java/org/jackhuang/hmcl/util/StringUtils.java:272

The compileQuery method doesn't handle potential PatternSyntaxException that can be thrown by Pattern.compile(). If a user provides an invalid regex pattern after "regex:", the exception will propagate uncaught. This should either catch the exception and fall back to a literal string search, or document that callers must handle PatternSyntaxException.
HMCLCore/src/main/java/org/jackhuang/hmcl/util/StringUtils.java:630
The broad catch (Exception e) in both serializeStringList and deserializeStringList silently swallows all exceptions and returns a default value. This makes debugging difficult when JSON serialization/deserialization fails. Consider logging the exception or being more specific about which exceptions to catch (e.g., JsonSyntaxException or JsonParseException).
HMCLCore/src/main/java/org/jackhuang/hmcl/mod/modinfo/PackMcMeta.java:84
The isUnspecified() method checks if getMin().compareTo(getMax()) > 0, but getMin() and getMax() create new PackVersion objects from min and max fields. If either min or max is negative (which signals UNSPECIFIED), the first two conditions will catch it. However, the third condition seems redundant or potentially incorrect - it would be clearer to check the raw min and max values directly rather than creating PackVersion objects and comparing them.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-02-26T13:51:45Z

HMCLCore/src/main/java/org/jackhuang/hmcl/util/io/FileUtils.java

    public static String getNameWithoutExtension(Path file) {
-        return StringUtils.substringBeforeLast(getName(file), '.');
+        String name = getName(file);
+        if (Files.isDirectory(file)) {
+            return name;
+        }
+        return StringUtils.substringBeforeLast(name, '.');
    }


The logic for checking if a path is a directory before calling substringBeforeLast is problematic because Files.isDirectory() performs I/O operations and may throw unchecked exceptions (e.g., SecurityException). Additionally, for symbolic links, Files.isDirectory() follows the link by default, which may not be the desired behavior.

More critically, this change assumes that directories should never have their extension stripped, but this breaks the contract for resource pack folders. Resource pack folders don't have extensions to strip, but the original logic would correctly return the folder name. The new logic adds an unnecessary I/O check that could fail or introduce performance issues.

何意味
这又不是我写的

# Conflicts: # HMCL/src/main/resources/assets/lang/I18N_ar.properties

Copilot

Pull request overview

Copilot reviewed 46 out of 46 changed files in this pull request and generated 8 comments.

Comments suppressed due to low confidence (1)

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/AddonUpdatesPage.java:318

AddonUpdateTask performs filesystem operations (local.setOld(true/false), local.markDisabled()) on Schedulers.javafx(). These moves/renames can block the UI noticeably when updating multiple or large files. Consider running these steps on Schedulers.io() (and only switching back to JavaFX for UI notifications) so the update flow stays responsive.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

HMCLCore/src/main/java/org/jackhuang/hmcl/resourcepack/ResourcePackManager.java

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ResourcePackListPage.java

Copilot · 2026-03-11T12:43:24Z

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ResourcePackListPage.java

+        protected void updateControl(ResourcePackInfoObject item, boolean empty) {
+            pseudoClassStateChanged(WARNING, false);
+
+            if (empty || item == null) return;
+
+            this.object = item;
+            ResourcePackFile file = item.getFile();
+            imageContainer.setImage(item.getIcon());
+
+            content.getTags().clear();
+            content.setTitle(file.getFileName());
+            content.setSubtitle(file.getFileNameWithExtension());
+
+            FXUtils.installFastTooltip(btnReveal, i18n("reveal.in_file_manager"));
+            btnReveal.setOnAction(event -> FXUtils.showFileInExplorer(file.getFile()));
+
+            btnInfo.setOnAction(e -> Controllers.dialog(new ResourcePackInfoDialog(this.page, item)));
+
+            if (booleanProperty != null) {
+                checkBox.selectedProperty().unbindBidirectional(booleanProperty);
+            }
+            checkBox.selectedProperty().bindBidirectional(booleanProperty = item.enabledProperty());


ResourcePackListCell.updateControl returns immediately for empty || item == null without unbinding the previous booleanProperty from checkBox.selectedProperty(). With cell virtualization, this can keep the checkbox bound to a stale item and cause leaks/incorrect updates. Unbind/reset bindings (and any item references) when the cell becomes empty.

Copilot · 2026-03-11T12:43:24Z

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPageSkin.java

            listView.getItems().clear();

            Predicate<@Nullable String> predicate;
-            if (queryString.startsWith("regex:")) {
-                try {
-                    Pattern pattern = Pattern.compile(queryString.substring("regex:".length()));
-                    predicate = s -> s != null && pattern.matcher(s).find();
-                } catch (Throwable e) {
-                    LOG.warning("Illegal regular expression", e);
-                    return;
-                }
-            } else {
-                String lowerQueryString = queryString.toLowerCase(Locale.ROOT);
-                predicate = s -> s != null && s.toLowerCase(Locale.ROOT).contains(lowerQueryString);
+            try {
+                predicate = StringUtils.compileQuery(queryString);
+            } catch (Throwable e) {
+                LOG.warning("Illegal regular expression", e);
+                return;
            }


In search(), the list is cleared before the query predicate is compiled. If StringUtils.compileQuery(queryString) throws (invalid regex:), the method returns and leaves the list empty. Compile/validate the predicate before clearing (or repopulate on error) to avoid losing the current results due to a typo in the regex.

HMCLCore/src/main/java/org/jackhuang/hmcl/mod/ModManager.java

Copilot · 2026-03-11T12:43:25Z

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ResourcePackListPage.java

+                listView.getItems().clear();
+
+                Predicate<@Nullable String> predicate;
+                try {
+                    predicate = StringUtils.compileQuery(queryString);
+                } catch (Throwable e) {
+                    LOG.warning("Illegal regular expression", e);
+                    return;
+                }


In search(), the list is cleared before compiling the query predicate. If StringUtils.compileQuery(queryString) throws (e.g., invalid regex:), the method returns early and leaves the list empty. Compile/validate the predicate first (or restore the previous items on error) so a bad regex doesn’t wipe the visible list.

Copilot · 2026-03-11T12:43:25Z

HMCLCore/src/main/java/org/jackhuang/hmcl/util/versioning/VersionRange.java

+    public static <T extends Comparable<T>> VersionRange<T> is(T version) {
+        assert version != null;
+        return new VersionRange<>(version, version);
+    }


VersionRange.is relies on assert version != null. In production builds where assertions are disabled, is(null) would create a range with both bounds null, which makes isAll() return true and can lead to incorrect range behavior. Prefer an explicit null check (e.g., Objects.requireNonNull(version, ...) or an IllegalArgumentException) to enforce the contract regardless of JVM flags.

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ResourcePackListPage.java

Glavo · 2026-03-11T12:52:41Z

HMCLCore/src/main/java/org/jackhuang/hmcl/resourcepack/ResourcePackManager.java

+        try (var stream = Files.lines(optionsFile, StandardCharsets.UTF_8)) {
+            stream.forEach(s -> {
+                if (StringUtils.isNotBlank(s)) {
+                    var entry = s.split(":", 2);


为什么要用 split？我没有看到 options.txt 有选项值中不能包含 : 的要求，像 fullscreenResolution这样的选项值内本来就能有 :。

不是限制了只能分两份了吗，键又不可能有:

HMCLCore/src/main/java/org/jackhuang/hmcl/resourcepack/ResourcePackManager.java

Calboot added 4 commits December 14, 2025 10:32

修复资源包管理界面边框样式问题

652491c

修复 HMCL-dev#4680

2bc3fa7

update

c5406e3

修复光影包界面下载标题错误

facdd47

Calboot changed the title ~~[Enhancement] 资源包有关优化与修复~~ [Enhancement] [Bugfix] 资源包有关优化与修复 Dec 14, 2025

Calboot added 7 commits December 16, 2025 17:49

资源包启用/禁用功能

d24b7b2

同步模组管理界面 Part1

a2b5e8b

为不兼容资源包添加警告

2ca2f3e

update

ce9377b

启用/禁用资源包时添加警告

bd96337

在BMC4中测试时发现BMC4会判定所有资源包兼容，与原版表现不符，会导致启用/禁用功能失效，故添加警告

资源包详细信息界面

bc229e3

修复esc键失效

777aea3

3gf8jv4dv reviewed Dec 17, 2025

View reviewed changes

Calboot and others added 2 commits December 17, 2025 21:28

Update i18n

e7c4f2e

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

Update i18n

07a9cc0

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

Calboot added 2 commits December 18, 2025 20:01

完善资源包版本解析

9aca021

Merge remote-tracking branch 'origin/resourcepack-enhancement' into r…

eacf26b

…esourcepack-enhancement

Calboot added 2 commits December 18, 2025 22:50

从模组管理界面同步

8d44424

update

00b377a

Calboot marked this pull request as ready for review December 18, 2025 14:53

Calboot added 4 commits December 19, 2025 21:30

update i18n

7d2ea79

移除资源包删除按钮

8ba09cf

Merge branch 'HMCL-dev:main' into resourcepack-enhancement

ae789fb

添加cf/modrinth页面检测 & fix i18n

9f6f42b

Glavo requested a review from Copilot December 20, 2025 08:43

Copilot started reviewing on behalf of Glavo December 20, 2025 08:43 View session

Glavo requested a review from Copilot February 24, 2026 14:18

Copilot started reviewing on behalf of Glavo February 24, 2026 14:19 View session

Glavo reviewed Feb 24, 2026

View reviewed changes

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

Copilot AI reviewed Feb 24, 2026

View reviewed changes

Calboot added 4 commits February 25, 2026 09:43

Apply suggestions

2133e19

Merge branch 'main' into resourcepack-enhancement

2b6837c

# Conflicts: # HMCLCore/src/main/java/org/jackhuang/hmcl/mod/curse/CurseForgeRemoteModRepository.java

update

d588e27

update

89707c5

Glavo reviewed Feb 26, 2026

View reviewed changes

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ResourcePackListPage.java Outdated Show resolved Hide resolved

Glavo requested a review from Copilot February 26, 2026 13:46

Copilot started reviewing on behalf of Glavo February 26, 2026 13:47 View session

update

22fa93c

Copilot AI reviewed Feb 26, 2026

View reviewed changes

Calboot added 6 commits February 26, 2026 21:56

Merge

771f1c6

update

8b43bbf

update test

d2bebcd

Merge branch 'main' into resourcepack-enhancement

1467763

# Conflicts: # HMCL/src/main/resources/assets/lang/I18N_ar.properties

update

6db8633

strict check for 1.20.1-

835ac14

Glavo requested a review from Copilot March 11, 2026 12:35

Copilot started reviewing on behalf of Glavo March 11, 2026 12:36 View session

Glavo added 2 commits March 11, 2026 20:39

Replace var with explicit types in ResourcePackListPage

115fa40

Reformat ResourcePackManager.getCompatibility method

591280b

Copilot AI reviewed Mar 11, 2026

View reviewed changes

Glavo added 2 commits March 11, 2026 20:46

Reformat ResourcePackManager conditional returns

bdae961

Reformat ResourcePackManager version range methods

778fc45

Glavo reviewed Mar 11, 2026

View reviewed changes

Apply suggestions

ee87e80

Glavo reviewed Mar 11, 2026

View reviewed changes

HMCLCore/src/main/java/org/jackhuang/hmcl/resourcepack/ResourcePackManager.java Outdated Show resolved Hide resolved

update

bddb7f5

Conversation

Calboot commented Dec 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Calboot commented Dec 14, 2025

Uh oh!

3gf8jv4dv left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

3gf8jv4dv commented Dec 17, 2025

Uh oh!

Calboot commented Dec 17, 2025

Uh oh!

Calboot commented Dec 18, 2025

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI Feb 26, 2026

Choose a reason for hiding this comment

Uh oh!

Calboot Feb 26, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI Mar 11, 2026

Choose a reason for hiding this comment

Uh oh!

Calboot Mar 11, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 11, 2026

Choose a reason for hiding this comment

Uh oh!

Calboot Mar 11, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Copilot AI Mar 11, 2026

Choose a reason for hiding this comment

Uh oh!

Calboot Mar 11, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 11, 2026

Choose a reason for hiding this comment

Uh oh!

Calboot Mar 11, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Glavo Mar 11, 2026

Choose a reason for hiding this comment

Uh oh!

Calboot Mar 11, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Calboot commented Dec 14, 2025 •

edited

Loading

3gf8jv4dv left a comment •

edited

Loading