重构启动器配置模型#6122
Open
Glavo wants to merge 519 commits into
Open
Conversation
This comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as resolved.
This comment was marked as resolved.
…or improved clarity
…ames over built-in names
…or improved readability
…ssary parameters and unused methods
…eters for improved safety
…or inherited instance settings
3gf8jv4dv
suggested changes
Jun 13, 2026
…moving redundant method
…stency in game settings
Member
Author
|
/gemini review |
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Code Review
This pull request refactors the configuration and settings management of HMCL by replacing the legacy Config and ConfigHolder classes with a modular settings architecture. Configuration domains such as launcher settings, user settings, game directories, presets, accounts, and authlib-injector servers are now persisted in separate, detached JSON files managed by SettingsManager. Additionally, the PR introduces robust migration utilities for legacy configuration formats. The code review identified three critical issues: a compilation error in LineComponent due to calling protected Region methods on container, a potential null pointer or logic bug in HMCLGameRepository when retrieving parent game settings, and a potential unhandled UnsupportedOperationException in Launcher when retrieving file owners on unsupported filesystems.
Important
The consumer version of Gemini Code Assist on GitHub is being sunset. Starting June 18, 2026, new organization installations will be blocked, and all code review activity will officially cease on July 17, 2026.
For more details on the timeline and next steps, please review the Help Documentation.
Comment on lines
+129
to
+130
| double horizontalInsets = container.snappedLeftInset() + container.snappedRightInset(); | ||
| double verticalInsets = container.snappedTopInset() + container.snappedBottomInset(); |
Contributor
There was a problem hiding this comment.
在 LineComponent 中，container 是一个 HBox 实例。由于 LineComponent 位于 org.jackhuang.hmcl.ui.construct 包中，而 Region.snappedLeftInset() 等方法在 javafx.scene.layout.Region 中是 protected 的，且 LineComponent 并不是 HBox 的子类，因此在非同包下无法通过 container 引用直接调用这些 protected 方法。这会导致编译错误（例如：snappedLeftInset() has protected access in Region）。
建议使用公开的 container.getInsets().getLeft() 等方法来代替，以避免编译失败。
Suggested change
| double horizontalInsets = container.snappedLeftInset() + container.snappedRightInset(); | |
| double verticalInsets = container.snappedTopInset() + container.snappedBottomInset(); | |
| double horizontalInsets = container.getInsets().getLeft() + container.getInsets().getRight(); | |
| double verticalInsets = container.getInsets().getTop() + container.getInsets().getBottom(); |
Comment on lines
+282
to
+283
| GameSettings.Preset profilePreset = SettingsManager.getGameSettings(profile.getLegacyGameSettings()); | ||
| if (profilePreset != null && profilePreset.defaultIsolationTypeProperty().getValue() == DefaultIsolationType.ALWAYS) { |
Contributor
There was a problem hiding this comment.
此处使用 SettingsManager.getGameSettings(profile.getLegacyGameSettings()) 来获取配置预设。如果当前游戏文件夹（Profile）没有关联特定的旧版游戏设置（即 profile.getLegacyGameSettings() 返回 null），则 profilePreset 将为 null。这会导致即使全局默认预设启用了“始终隔离（ALWAYS）”，也无法为该实例应用隔离设置。
建议使用已有的 getParentGameSettings(null) 方法，它会在 profile.getLegacyGameSettings() 为 null 时自动回退到默认预设，从而保证逻辑的正确性。
Suggested change
| GameSettings.Preset profilePreset = SettingsManager.getGameSettings(profile.getLegacyGameSettings()); | |
| if (profilePreset != null && profilePreset.defaultIsolationTypeProperty().getValue() == DefaultIsolationType.ALWAYS) { | |
| GameSettings.Preset profilePreset = getParentGameSettings(null); | |
| if (profilePreset.defaultIsolationTypeProperty().getValue() == DefaultIsolationType.ALWAYS) { |
Comment on lines
294
to
299
| try { | ||
| owner = Files.getOwner(ConfigHolder.configLocation()).getName(); | ||
| owner = Files.getOwner(configDirectory).getName(); | ||
| } catch (IOException ioe) { | ||
| LOG.warning("Failed to get file owner", ioe); | ||
| return; | ||
| } |
Contributor
There was a problem hiding this comment.
Files.getOwner(configDirectory) 在某些不支持文件所有者属性的文件系统（如 FAT32、某些网盘同步目录或特定的内存文件系统）上运行时，会抛出 UnsupportedOperationException。由于当前只捕获了 IOException，这可能会导致程序在这些环境下意外崩溃。
建议同时捕获 UnsupportedOperationException，以提高程序的健壮性。
Suggested change
| try { | |
| owner = Files.getOwner(ConfigHolder.configLocation()).getName(); | |
| owner = Files.getOwner(configDirectory).getName(); | |
| } catch (IOException ioe) { | |
| LOG.warning("Failed to get file owner", ioe); | |
| return; | |
| } | |
| try { | |
| owner = Files.getOwner(configDirectory).getName(); | |
| } catch (IOException | UnsupportedOperationException ioe) { | |
| LOG.warning("Failed to get file owner", ioe); | |
| return; | |
| } |
…r improved validation
…and update related classes
…hema to launcher-settings
…code and documentation
…and update schemas
3gf8jv4dv
suggested changes
Jun 14, 2026
| settings.game.dimension=游戏窗口分辨率 | ||
| settings.game.exploration=浏览 | ||
| settings.game.fullscreen=全屏 | ||
| settings.game.inherit_global=当前继承游戏设置预设。点击后改为实例特定设置。 |
Contributor
There was a problem hiding this comment.
Suggested change
| settings.game.inherit_global=当前继承游戏设置预设。点击后改为实例特定设置。 | |
| settings.game.inherit_global=当前继承游戏设置预设。点击后使用实例特定设置。 |
| settings.game.working_directory.hint=在「執行路徑」選項中選取「各實例獨立」使目前實例獨立存放設定、世界、模組等資料。使用模組時建議開啟此選項以避免不同實例模組衝突。修改此選項後需自行移動世界等檔案。 | ||
|
|
||
| settings.icon=遊戲圖示 | ||
| settings.game_directories.read_only=遊戲資料夾檔案是由更高版本的 HMCL 儲存的，目前版本的 HMCL 無法新增遊戲資料夾。 |
Contributor
There was a problem hiding this comment.
Suggested change
| settings.game_directories.read_only=遊戲資料夾檔案是由更高版本的 HMCL 儲存的，目前版本的 HMCL 無法新增遊戲資料夾。 | |
| settings.game_directories.read_only=遊戲目錄設定檔是由更高版本的 HMCL 儲存的，目前版本的 HMCL 無法新增遊戲目錄。 |
| \ · Enter any GC arguments in "JVM Arguments", and the G1 argument of the default arguments will be disabled.\n\ | ||
| \ · Enable "Do not add default JVM arguments" to launch the game without adding default arguments. | ||
| settings.advanced.jvm_memory.deprecated=Deprecated JVM Memory Options | ||
| settings.advanced.jvm_memory.deprecated.subtitle=These options are kept only for compatibility with older versions |
Contributor
There was a problem hiding this comment.
Suggested change
| settings.advanced.jvm_memory.deprecated.subtitle=These options are kept only for compatibility with older versions | |
| settings.advanced.jvm_memory.deprecated.subtitle=These options are kept only for compatibility with older versions of HMCL |
| settings.game.copy_global.copy_all.confirm=Are you sure you want to overwrite the current instance settings? This action cannot be undone! | ||
| settings.game.current=Game | ||
| settings.game.default_isolation=Default Isolation Strategy | ||
| settings.game.default_isolation.subtitle=Automatically enable version isolation for eligible instances when installing a new instance. |
Contributor
There was a problem hiding this comment.
Suggested change
| settings.game.default_isolation.subtitle=Automatically enable version isolation for eligible instances when installing a new instance. | |
| settings.game.default_isolation.subtitle=Automatically enable instance isolation for eligible instances when installing a new instance. |
| settings.game.default_isolation=Default Isolation Strategy | ||
| settings.game.default_isolation.subtitle=Automatically enable version isolation for eligible instances when installing a new instance. | ||
| settings.game.default_isolation.always=Isolate All Instances | ||
| settings.game.default_isolation.always.desc=Automatically enable version isolation for all new installations |
Contributor
There was a problem hiding this comment.
Suggested change
| settings.game.default_isolation.always.desc=Automatically enable version isolation for all new installations | |
| settings.game.default_isolation.always.desc=Automatically enable instance isolation for all new installations |
| settings.game.default_isolation.modded=Isolate Instances of Installable Mods | ||
| settings.game.default_isolation.modded.desc=Automatically enable instance isolation for installable module instances | ||
| settings.game.default_isolation.never=Do not isolate instances | ||
| settings.game.default_isolation.never.desc=Do not automatically enable version isolation for new installations |
Contributor
There was a problem hiding this comment.
Suggested change
| settings.game.default_isolation.never.desc=Do not automatically enable version isolation for new installations | |
| settings.game.default_isolation.never.desc=Do not automatically enable instance isolation for new installations |
| settings.game.quick_play.subtitle=Enter a server or world directly after launching the game | ||
| settings.game.running_directory=Game Working Directory | ||
| settings.game.running_directory.subtitle=Leave empty to use the default game directory. | ||
| settings.game.running_directory.subtitle.instance=When version isolation is enabled, leave empty to use the instance directory; otherwise the global working directory is inherited. |
Contributor
There was a problem hiding this comment.
Suggested change
| settings.game.running_directory.subtitle.instance=When version isolation is enabled, leave empty to use the instance directory; otherwise the global working directory is inherited. | |
| settings.game.running_directory.subtitle.instance=When instance isolation is enabled, leave empty to use the instance directory; otherwise the global working directory is inherited. |
| settings.game.dimension=遊戲介面解析度大小 | ||
| settings.game.exploration=瀏覽 | ||
| settings.game.fullscreen=全螢幕 | ||
| settings.game.inherit_global=目前繼承遊戲設定預設。點擊後改為實例特定設定。 |
Contributor
There was a problem hiding this comment.
Suggested change
| settings.game.inherit_global=目前繼承遊戲設定預設。點擊後改為實例特定設定。 | |
| settings.game.inherit_global=目前繼承遊戲設定預設。點擊後使用實例特定設定。 |
Contributor
|
英文里，这个实例隔离策略看不清选了什么。 
|
Contributor
|
预设名称似乎允许重复。要不在重命名的地方检查一下已有的预设名，免得混淆。 |
Contributor
|
自定义命令 > 包装命令，在英文下显示不全。 
|
…config file paths
- replace the credential envelope schema with protection-specific payload formats and remove the obsolete nonce field - allow credentials to serialize as plain JSON payloads for development while keeping obfuscated payload support - preserve unknown credential fields during deserialization and tighten tests to verify tokens stay out of protected output
- move payload writing behind `protectionMode` to keep credential serialization logic in one place - update protected payload encoding to use shared JSON helpers and compressed stream handling for portable account data - reduce duplication between account credential persistence and the protection envelope implementation
- move account identifier generation into `Account` for shared reuse - update credential serialization to call the unified identifier API - align account-related classes with repository nullability and documentation requirements - adjust detached account storage tests to cover the refactored identifier flow
- replace ad hoc credential map redaction with a dedicated JSON adapter for `AccountCredentials` - separate protected credential payload serialization from account diagnostics to reduce exposure of sensitive fields - log stable account identifiers instead of full storage maps when account loading fails or encounters an unknown type
- merge account credentials by searching a list of credential stores in priority order instead of relying on a single source - prefer the credential file paired with the active account metadata while still falling back to other available stores - update account storage tests to cover ordered credential restore behavior across multiple stores
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
4 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.
No description provided.