2.99.0.0 正式版

fix: 修复没有 单个自定义事件 的情况下无法触发自定义事件列表

.editorconfig

@@ -1,12 +1,23 @@
 # 如果要从更高级别的目录继承 .editorconfig 设置，请删除以下行
 root = true
 
+[*]
+charset = utf-8
+
 [*.cs]
 
 # IDE0320: 使匿名函数成为静态函数
 csharp_prefer_static_anonymous_function = false
+# CS8618: 在退出构造函数时，不可为 null 的字段必须包含非 null 值。请考虑添加 "required" 修饰符或声明为可为 null。
+dotnet_diagnostic.CS8618.severity = suggestion
+# IDE0305: 使用 [.. ] 简化集合初始化
+dotnet_diagnostic.IDE0305.severity = none
+# CS8524: switch 表达式不会处理其输入类型的某些值(它不是穷举)，这包括未命名的枚举值。
+dotnet_diagnostic.CS8524.severity = suggestion
 
 [*.{cs,vb}]
 
 # IDE0028: 简化集合初始化
 dotnet_style_collection_initializer = true:silent
+# IDE0130: 命名空间与文件夹结构不匹配
+dotnet_diagnostic.IDE0130.severity = silent

.github/ISSUE_TEMPLATE/bug1.yml

@@ -8,7 +8,7 @@ body:
     label: "检查项"
     description: "请逐个检查下列项目，并勾选确认。"
     options:
-    - label: "**我所启动的游戏不是整合包，且未安装任何 Mod。** 安装 Mod 后的游戏崩溃基本不是 PCL 的原因，请 **不要** 提交反馈。你可以在论坛或社区找人求助，但这里并不是你求助的地方。"
+    - label: "**我所启动的游戏不是整合包，且未安装任何 Mod。** 安装 Mod 后的崩溃基本不是 PCL 导致的，请 **不要** 提交反馈。你可以前往 [PCL 汉医堂](https://qm.qq.com/q/JJTzwEAmcw) 等民间 QQ 群求助，但这里不是求助的地方……"
       required: false
     - label: "**我已尝试使用 HMCL 启动，HMCL 没有出现问题。** 如果 HMCL 也无法启动就不是 PCL 导致的问题，请 **不要** 提交反馈。[下载 HMCL](https://hmcl.huangyuhui.net/download)"
       required: true
@@ -36,4 +36,4 @@ body:
     description: "在 HMCL 中进入版本列表，点击版本右侧的三个点，选择 生成启动脚本。"
     placeholder: "先点击这个文本框，然后再将文件直接拖拽到文本框中以上传。"
   validations:
-    required: false
+    required: false

.github/workflows/build.yml

@@ -21,9 +21,9 @@ jobs:
     steps:
 
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
       with:
-        fetch-depth: 0
+        fetch-depth: 1
         submodules: true
 
     - name: Set Describe
@@ -33,7 +33,7 @@ jobs:
           echo "describe=$describe" >> $GITHUB_ENV
 
     - name: Setup MSBuild.exe
-      uses: microsoft/setup-msbuild@v2
+      uses: microsoft/setup-msbuild@v3
       with:
         msbuild-architecture: x64
     
@@ -63,7 +63,7 @@ jobs:
       run: msbuild "Plain Craft Launcher 2\Plain Craft Launcher 2.vbproj" -p:Configuration=${{ matrix.configuration }}
 
     - name: Upload a Build Artifact
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: ${{ matrix.configuration }} ${{ env.describe }}
         path: Plain Craft Launcher 2\obj\${{ matrix.configuration }}\Plain Craft Launcher 2.exe

LICENCE

@@ -1,11 +1,15 @@
-一、声明
+《PCL 分发有限许可》
 
-本文件仅作为指南，不是法律文件或协议。但开发者在此承诺，在您遵守本指南且善意、合理使用的情况下，不会追究您的责任。
-法律上，开发者仍保留所有权利（All Rights Reserved），若情况恶劣，仍可能将诉讼作为最终手段。
+详见 https://shimo.im/docs/rGrd8pY8xWkt6ryW#anchor-X0bo
 
+————————————————————————————————————
 
+《PCL 存储库合理使用指南》
 
-二、轻度使用
+本指南仅作为说明，不是法律文件或协议。
+除《PCL 分发有限许可》明确授予的权利外，开发者保留软件及其相关知识产权中的全部权利。但开发者承诺，在遵守本指南，且善意、合理使用的情况下，不会追究责任。
+
+一、轻度使用
 
 若您仅参考了本存储库中极小部分的内容，或您在制作与 PCL 的实质功能不存在任何重叠的软件，则为轻度使用。
 其常见情形例如：
@@ -15,11 +19,9 @@
 若属于轻度使用，您需要：
 1、以适当的形式给出署名。
 2、不得将您的内容与 PCL 混淆，或暗示您的内容与 PCL 有关。
- 　例如：您的内容不得使用 Planting Craft Launcher、PCL 手机版 等会造成混淆或暗示这与 PCL 有关的名称。
+ 　例如：您的内容不得使用 Potato Craft Launcher、PCL 手机版 等会造成混淆或暗示这与 PCL 有关的名称。
 
-
-
-三、重度使用
+二、重度使用
 
 若不符合轻度使用的情形，即为重度使用。
 其常见情形例如：
@@ -36,14 +38,13 @@
 5、软件在 Windows 系统上运行时，不应有与 PCL 的赞助解锁功能类似的功能或表现。
  　例如：界面的主要色相必须为蓝色（即使没有修改功能，改为其他色相也和需要赞助解锁的主题功能类似）。
 
-————————————
+————————————————————————————————————
 
 说人话的备注：
 
-因为没有法律专业人士检查，所以这不敢作为正式的法律协议，如果有专业人士愿意帮忙改一改我也很乐意……
-这些规则主要是为了阻止恶意的使用和 “山寨版” 的出现，常规、善意的使用都没啥问题的，放心吧！
+这些规则主要是为了阻止恶意的使用、倒卖和 “山寨版” 的出现，常规、善意的使用都没啥问题的，放心吧！
 
 如果你只是参考了一小段代码，署个名就行啦，不用担心。
-如果对具体细节有疑问，欢迎在 https://github.com/Meloong-Git/PCL/discussions/new?category=%E6%8F%90%E9%97%AE 发帖询问！
+如果对具体细节有疑问，或是希望修改这些规则，欢迎在 https://github.com/Meloong-Git/PCL/discussions/new?category=%E6%8F%90%E9%97%AE 发帖！
 
 多谢大家啦！

PCLCS/.editorconfig

@@ -0,0 +1,246 @@
+# 如果要从更高级别的目录继承 .editorconfig 设置，请删除以下行
+root = true
+
+# c# 文件
+[*.cs]
+
+#### Core EditorConfig 选项 ####
+
+# 缩进和间距
+indent_size = 4
+indent_style = space
+tab_width = 4
+
+# 新行首选项
+end_of_line = crlf
+insert_final_newline = false
+
+#### .NET 代码操作 ####
+
+# 类型成员
+dotnet_hide_advanced_members = false
+dotnet_member_insertion_location = with_other_members_of_the_same_kind
+dotnet_property_generation_behavior = prefer_throwing_properties
+
+# 符号搜索
+dotnet_search_reference_assemblies = true
+
+#### .NET 编码约定 ####
+
+# 组织 Using
+dotnet_separate_import_directive_groups = false
+dotnet_sort_system_directives_first = false
+file_header_template = unset
+
+# this. 和 Me. 首选项
+dotnet_style_qualification_for_event = false
+dotnet_style_qualification_for_field = false
+dotnet_style_qualification_for_method = false
+dotnet_style_qualification_for_property = false
+
+# 语言关键字与 bcl 类型首选项
+dotnet_style_predefined_type_for_locals_parameters_members = true
+dotnet_style_predefined_type_for_member_access = true
+
+# 括号首选项
+dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity
+dotnet_style_parentheses_in_other_binary_operators = always_for_clarity
+dotnet_style_parentheses_in_other_operators = never_if_unnecessary
+dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity
+
+# 修饰符首选项
+dotnet_style_require_accessibility_modifiers = for_non_interface_members
+
+# 表达式级首选项
+dotnet_prefer_system_hash_code = true
+dotnet_style_coalesce_expression = true
+dotnet_style_collection_initializer = true
+dotnet_style_explicit_tuple_names = true
+dotnet_style_namespace_match_folder = true
+dotnet_style_null_propagation = true
+dotnet_style_object_initializer = true
+dotnet_style_operator_placement_when_wrapping = beginning_of_line
+dotnet_style_prefer_auto_properties = true:suggestion
+dotnet_style_prefer_collection_expression = when_types_loosely_match
+dotnet_style_prefer_compound_assignment = true
+dotnet_style_prefer_conditional_expression_over_assignment = true:suggestion
+dotnet_style_prefer_conditional_expression_over_return = true:suggestion
+dotnet_style_prefer_foreach_explicit_cast_in_source = when_strongly_typed
+dotnet_style_prefer_inferred_anonymous_type_member_names = true
+dotnet_style_prefer_inferred_tuple_names = true
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true
+dotnet_style_prefer_simplified_boolean_expressions = true
+dotnet_style_prefer_simplified_interpolation = true
+
+# 字段首选项
+dotnet_style_readonly_field = true
+
+# 参数首选项
+dotnet_code_quality_unused_parameters = all
+
+# 禁止显示首选项
+dotnet_remove_unnecessary_suppression_exclusions = none
+
+# 新行首选项
+dotnet_style_allow_multiple_blank_lines_experimental = true
+dotnet_style_allow_statement_immediately_after_block_experimental = true
+
+#### c# 编码约定 ####
+
+# var 首选项
+csharp_style_var_elsewhere = false
+csharp_style_var_for_built_in_types = false
+csharp_style_var_when_type_is_apparent = false
+
+# Expression-bodied 成员
+csharp_style_expression_bodied_accessors = true
+csharp_style_expression_bodied_constructors = false
+csharp_style_expression_bodied_indexers = true
+csharp_style_expression_bodied_lambdas = true
+csharp_style_expression_bodied_local_functions = false
+csharp_style_expression_bodied_methods = false
+csharp_style_expression_bodied_operators = false
+csharp_style_expression_bodied_properties = true
+
+# 模式匹配首选项
+csharp_style_pattern_matching_over_as_with_null_check = true
+csharp_style_pattern_matching_over_is_with_cast_check = true
+csharp_style_prefer_extended_property_pattern = true
+csharp_style_prefer_not_pattern = true
+csharp_style_prefer_pattern_matching = true:suggestion
+csharp_style_prefer_switch_expression = true
+
+# Null 检查首选项
+csharp_style_conditional_delegate_call = true
+
+# 修饰符首选项
+csharp_prefer_static_anonymous_function = true
+csharp_prefer_static_local_function = true
+csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async
+csharp_style_prefer_readonly_struct = true
+csharp_style_prefer_readonly_struct_member = true
+
+# 代码块首选项
+csharp_prefer_braces = true
+csharp_prefer_simple_using_statement = true
+csharp_prefer_system_threading_lock = true
+csharp_style_namespace_declarations = file_scoped:suggestion
+csharp_style_prefer_method_group_conversion = true
+csharp_style_prefer_primary_constructors = true
+csharp_style_prefer_top_level_statements = true
+
+# 表达式级首选项
+csharp_prefer_simple_default_expression = true
+csharp_style_deconstructed_variable_declaration = true
+csharp_style_implicit_object_creation_when_type_is_apparent = true
+csharp_style_inlined_variable_declaration = true
+csharp_style_prefer_implicitly_typed_lambda_expression = true
+csharp_style_prefer_index_operator = true
+csharp_style_prefer_local_over_anonymous_function = true
+csharp_style_prefer_null_check_over_type_check = true
+csharp_style_prefer_range_operator = true
+csharp_style_prefer_tuple_swap = true
+csharp_style_prefer_unbound_generic_type_in_nameof = true
+csharp_style_prefer_utf8_string_literals = true
+csharp_style_throw_expression = true
+csharp_style_unused_value_assignment_preference = discard_variable
+csharp_style_unused_value_expression_statement_preference = discard_variable
+
+# "using" 指令首选项
+csharp_using_directive_placement = outside_namespace
+
+# 新行首选项
+csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = true
+csharp_style_allow_blank_line_after_token_in_arrow_expression_clause_experimental = true
+csharp_style_allow_blank_line_after_token_in_conditional_expression_experimental = true
+csharp_style_allow_blank_lines_between_consecutive_braces_experimental = true
+csharp_style_allow_embedded_statements_on_same_line_experimental = true
+
+#### C# 格式规则 ####
+
+# 新行首选项
+csharp_new_line_before_catch = false
+csharp_new_line_before_else = false
+csharp_new_line_before_finally = false
+csharp_new_line_before_members_in_anonymous_types = false
+csharp_new_line_before_members_in_object_initializers = false
+csharp_new_line_before_open_brace = none
+csharp_new_line_between_query_expression_clauses = false
+
+# 缩进首选项
+csharp_indent_block_contents = true
+csharp_indent_braces = false
+csharp_indent_case_contents = true
+csharp_indent_case_contents_when_block = false
+csharp_indent_labels = flush_left
+csharp_indent_switch_labels = false
+
+# 空格键首选项
+csharp_space_after_cast = true
+csharp_space_after_colon_in_inheritance_clause = true
+csharp_space_after_comma = true
+csharp_space_after_dot = false
+csharp_space_after_keywords_in_control_flow_statements = true
+csharp_space_after_semicolon_in_for_statement = true
+csharp_space_around_binary_operators = ignore
+csharp_space_around_declaration_statements = false
+csharp_space_before_colon_in_inheritance_clause = true
+csharp_space_before_comma = false
+csharp_space_before_dot = false
+csharp_space_before_open_square_brackets = false
+csharp_space_before_semicolon_in_for_statement = false
+csharp_space_between_empty_square_brackets = false
+csharp_space_between_method_call_empty_parameter_list_parentheses = false
+csharp_space_between_method_call_name_and_opening_parenthesis = false
+csharp_space_between_method_call_parameter_list_parentheses = false
+csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
+csharp_space_between_method_declaration_name_and_open_parenthesis = false
+csharp_space_between_method_declaration_parameter_list_parentheses = false
+csharp_space_between_parentheses = false
+csharp_space_between_square_brackets = false
+
+# 包装首选项
+csharp_preserve_single_line_blocks = true
+csharp_preserve_single_line_statements = true
+
+#### 命名样式 ####
+
+# 命名规则
+
+dotnet_naming_rule.interface_should_be_以_i_开始.severity = suggestion
+dotnet_naming_rule.interface_should_be_以_i_开始.symbols = interface
+dotnet_naming_rule.interface_should_be_以_i_开始.style = 以_i_开始
+
+dotnet_naming_rule.类型_should_be_帕斯卡拼写法.severity = suggestion
+dotnet_naming_rule.类型_should_be_帕斯卡拼写法.symbols = 类型
+dotnet_naming_rule.类型_should_be_帕斯卡拼写法.style = 帕斯卡拼写法
+
+dotnet_naming_rule.非字段成员_should_be_帕斯卡拼写法.severity = suggestion
+dotnet_naming_rule.非字段成员_should_be_帕斯卡拼写法.symbols = 非字段成员
+dotnet_naming_rule.非字段成员_should_be_帕斯卡拼写法.style = 帕斯卡拼写法
+
+# 符号规范
+
+dotnet_naming_symbols.interface.applicable_kinds = interface
+dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.interface.required_modifiers = 
+
+dotnet_naming_symbols.类型.applicable_kinds = class, struct, interface, enum
+dotnet_naming_symbols.类型.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.类型.required_modifiers = 
+
+dotnet_naming_symbols.非字段成员.applicable_kinds = property, event, method
+dotnet_naming_symbols.非字段成员.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.非字段成员.required_modifiers = 
+
+# 命名样式
+
+dotnet_naming_style.帕斯卡拼写法.required_prefix = 
+dotnet_naming_style.帕斯卡拼写法.required_suffix = 
+dotnet_naming_style.帕斯卡拼写法.word_separator = 
+dotnet_naming_style.帕斯卡拼写法.capitalization = pascal_case
+
+dotnet_naming_style.以_i_开始.required_prefix = I
+dotnet_naming_style.以_i_开始.required_suffix = 
+dotnet_naming_style.以_i_开始.word_separator = 
+dotnet_naming_style.以_i_开始.capitalization = pascal_case

PCLCS/Configs.cs

@@ -0,0 +1,28 @@
+namespace PCLCS;
+public static class Configs {
+
+    public static readonly DynamicConfigEntry<McInstallManifest> McInstallManifest = new("MinecraftInstallManifest", null);
+
+    // Java
+
+    /// <summary> 当前 Java 相关配置的版本。0 代表尚未从老的 Settings 系统中迁移。</summary>
+    public static readonly ConfigEntry<int> JavaConfigVersion = new("JavaConfigVersion", 0);
+    public static readonly ConfigEntry<ConcurrentList<Java>> JavaList = new("JavaList", []);
+    public static readonly ConfigEntry<List<string>> JavaRemovedList = new("JavaRemovedList", []);
+    public static readonly DynamicConfigEntry<bool> JavaMigrated = new("InstanceMigratedJava", false);
+    public static readonly DynamicConfigEntry<Java> JavaForced = new("InstanceForcedJava", null);
+
+    // 提示
+
+    public static readonly ConfigEntry<bool> HintModifyInstanceWarning = new("HintModifyInstanceWarning", false);
+
+    static Configs() {
+        /// 当 JavaForced 获取到一个不在 JavaList 中的值时，将其重置为 null。
+        JavaForced.PreviewGet += (args, provider) => {
+            if (args.Value is not null && !JavaList.Get()!.Contains(args.Value)) {
+                args.Value = null;
+                JavaForced.Reset(provider);
+            }
+        };
+    }
+}

PCLCS/Constants.cs

@@ -17,10 +17,12 @@ public enum ResourceTypes {
     DataPack = 16,
     /// <summary>服务端插件。</summary>
     Plugin = 32,
+    /// <summary>地图。</summary>
+    Map = 64,
     /// <summary>同时包含数据包以及 Mod。</summary>
     ModOrDataPack = Mod | DataPack,
     /// <summary>允许任意种类，或种类未知。</summary>
-    Any = Mod | ModPack | ResourcePack | Shader | DataPack | Plugin,
+    Any = Mod | ModPack | ResourcePack | Shader | DataPack | Plugin | Map,
 }
 
 /// <summary>
@@ -42,9 +44,8 @@ public enum ModLoaders {
     Forge = 1,
     LiteLoader = 2,
     Fabric = 4,
-    Quilt = 8,
     NeoForge = 16,
-    All = Forge | LiteLoader | Fabric | Quilt | NeoForge,
+    All = Forge | LiteLoader | Fabric | NeoForge,
 }
 
 /// <summary>
@@ -63,13 +64,21 @@ public static class Versions {
     /// <summary>
     /// 土豆码版本号。
     /// </summary>
-    public const char POTATO_VERSION = '1';
+    public const char PotatoVersion = '1';
     /// <summary>
     /// 版本管理中 Mod 信息缓存的版本号。
     /// </summary>
-    public const int LOCAL_MOD_CACHE_VERSION = 17;
+    public const int LocalModCacheVersion = 21;
     /// <summary>
     /// Minecraft 本地实例信息缓存的版本号。
     /// </summary>
-    public const int MCINSTANCE_CACHE_VERSION = 38;
+    public const int McInstanceCacheVersion = 39;
+    /// <summary>
+    /// Java 相关配置的版本号。
+    /// </summary>
+    public const int JavaConfigVersion = 1;
+    /// <summary>
+    /// Minecraft 安装清单的版本号。
+    /// </summary>
+    public const int McInstallManifestVersion = 1;
 }

PCLCS/Java.cs

@@ -0,0 +1,252 @@
+namespace PCLCS;
+
+/// <summary>
+/// 单个 Java 的实例。
+/// </summary>
+[Serializable] public class Java(string folder, Version? version = null) : IEquatable<Java> {
+
+    /// <summary>
+    /// java.exe 文件所在的文件夹路径，这通常是 bin 文件夹。以 \ 结尾。
+    /// </summary>
+    public readonly string Folder = PathUtils.AddSlashSuffix(PathUtils.ForCompare(folder));
+    /// <summary>
+    /// java.exe 文件的完整路径。
+    /// </summary>
+    [JsonIgnore] public string JavaExePath => Path.Combine(Folder, "java.exe");
+
+    /// <summary>
+    /// Java 的版本号（例如 16.0.1），保证 <see cref="Version.Major"/> 为其主版本。
+    /// <para/> 若为 null，则还需要调用 <see cref="CheckAsync"/> 以获取版本号。
+    /// </summary>
+    public Version? Version = version;
+    /// <summary>Java 的默认字符编码。</summary>
+    [JsonIgnore] public string? FileEncodingName;
+    /// <summary>
+    /// Java 根据系统环境确定的本地字符编码，仅 Java 17+ 可用。
+    /// <para/>若系统开启了 UTF-8，部分 Java 会错误地返回 JDK，因此不能使用 <see cref="Encoding.Default"/>。
+    /// </summary>
+    [JsonIgnore] public string? NativeEncodingName;
+
+    /// <summary>
+    /// 检查该 Java 是否存在问题，并获取其版本号。
+    /// 返回其是否通过了检查。
+    /// </summary>
+    public async Task<bool> CheckAsync(CancellationToken cancellationToken = default) {
+        if (Interlocked.Exchange(ref isChecked, 1) == 1 && available != null) return available!.Value; // 已检查过
+        string? output = null;
+        try {
+            if (!FileUtils.Exists(JavaExePath)) throw new FileNotFoundException("未找到 java.exe 文件", JavaExePath);
+
+            // 运行 -version
+            output = (await TaskUtils.RunProgramAsync(JavaExePath, "-XshowSettings:properties -version", 15000, cancellationToken: cancellationToken).NoCapture()).Output.Lower();
+            if (output == "") throw new InvalidOperationException("尝试运行该 Java 失败");
+            Logger.Trace($"Java 检查输出：{JavaExePath}{Environment.NewLine}{output}");
+            if (output.Contains("/lib/ext exists")) throw new InvalidOperationException("无法运行该 Java，请在删除 Java 文件夹中的 /lib/ext 文件夹后再试");
+            if (output.Contains("a fatal error") || output.Contains("error: ")) throw new InvalidOperationException("无法运行该 Java，该 Java 或系统存在问题");
+           
+            // 获取版本号
+            var versionString = (output.RegexSeek(@"(?<=version "")[^""]+") ?? output.RegexSeek("(?<=openjdk )[0-9]+"))?.Replace("_", ".").Replace("+", ".").BeforeFirst("-");
+            if (string.IsNullOrEmpty(versionString)) throw new InvalidOperationException($"未找到该 Java 的版本号{(output.Length < 500 ? $"\n原始输出为：\n{output}" : "")}");
+            if (versionString.StartsWithF("1.")) versionString = versionString!.AfterFirst("."); // 去除开头的 1.
+            var segments = versionString!.Split(".", true).ToList();
+            while (segments.Count < 4) segments.Add("0");
+            Version = new Version(segments.Take(4).Join("."));
+            if (Version.Major is <= 4 or >= 100) throw new InvalidOperationException($"分析详细信息失败，获取的版本为 {Version}{(output.Length < 500 ? $"\n原始输出为：\n{output}" : "")}");
+
+            // 获取 Java 的相关属性
+            if (!output.Contains("64-bit")) throw new InvalidOperationException("该 Java 为 32 位版本，请安装 64 位的 Java");
+            string? GetProperty(string name) {
+                string prefix = name + " = ";
+                string? line = output.Split('\n').Select(l => l.Trim()).FirstOrDefault(l => l.StartsWithF(prefix));
+                return line?[prefix.Length..].Trim();
+            }
+            FileEncodingName = GetProperty("file.encoding");
+            NativeEncodingName = GetProperty("native.encoding") ?? FileEncodingName; // 旧版本没有 native.encoding
+
+            Logger.Info($"检查 Java 成功：{this}");
+            available = true;
+        } catch (Exception ex) {
+            if (ex.IsCanceled()) {
+                isChecked = 0;
+                throw;
+            }
+            Logger.Warn($"检查 Java 失败（{JavaExePath}），其输出为：\n{output ?? "无程序输出"}");
+            available = false;
+        }
+        return available!.Value;
+    }
+
+    public void InvalidateChecked() {
+        isChecked = 0;
+        available = null;
+    }
+
+    [JsonIgnore] private int isChecked = 0;
+    /// <summary>若已进行过检查，表示该检查是否成功。若未检查，则为 null。</summary>
+    [JsonIgnore] internal bool? available = null;
+
+    // 相同检查
+    public bool Equals(Java? other)
+        => other is not null && PathUtils.IsSame(Folder, other.Folder);
+    public override bool Equals(object? obj) => obj is Java other && Equals(other);
+    public override int GetHashCode() => StringComparer.CurrentCultureIgnoreCase.GetHashCode(PathUtils.ForCompare(Folder));
+
+    /// <summary>用户友好的描述文本。</summary>
+    public override string ToString()
+        => $"Java {Version?.Major.ToString() ?? "尚未检查"} ({Version})：{Folder}";
+}
+
+public static class JavaUtils {
+
+    /// <summary>
+    /// 检查所有指定的 Java 是否存在问题，并获取其版本号。
+    /// </summary>
+    /// <returns>所有通过检查的 Java。</returns>
+    public static async Task<List<Java>> CheckAllAsync(IEnumerable<Java> javas, CancellationToken cancellationToken = default, ProgressProvider? progress = null) {
+        await TaskUtils.WhenAll(javas.Where(j => j.available == null).Select(
+            async java => await java.CheckAsync(cancellationToken).NoCapture()
+        ), progress).NoCapture();
+        return javas.Where(j => j.available == true).ToList();
+    }
+
+    /// <summary>
+    /// 将 Java 列表进行排序。
+    /// 这同时会检查所有未检查的 Java。
+    /// </summary>
+    public static async Task<List<Java>> SortAsync(List<Java> javas, CancellationToken cancellationToken = default, ProgressProvider? progress = null) {
+        javas = await JavaUtils.CheckAllAsync(javas, cancellationToken, progress).NoCapture();
+        javas.Sort((left, right) => {
+            // 优先使用带完整 Java 的文件夹列表中的 Java
+            var isLeftInCandidateFolder = JavaUtils.CandidateFolders.Value.Any(folder => PathUtils.IsParentOf(folder, left.Folder));
+            var isRightInCandidateFolder = JavaUtils.CandidateFolders.Value.Any(folder => PathUtils.IsParentOf(folder, right.Folder));
+            if (isLeftInCandidateFolder != isRightInCandidateFolder) return isLeftInCandidateFolder ? -1 : 1;
+            // 其次优先使用主版本号接近 21 的 Java
+            var leftDistance = left.Version is null ? int.MaxValue : Math.Abs(left.Version.Major - 21);
+            var rightDistance = right.Version is null ? int.MaxValue : Math.Abs(right.Version.Major - 21);
+            return leftDistance.CompareTo(rightDistance);
+        });
+        return javas;
+    }
+
+    #region 搜索
+
+    /// <summary>
+    /// 存在完整 Java 的文件夹列表。
+    /// </summary>
+    internal static readonly Lazy<List<string>> CandidateFolders = new(() => {
+        List<string> folders = [
+            Paths.AppData + @".minecraft\runtime\", // 这也是 PCL 下载 Java 的路径
+            Paths.AppData + @".hmcl\java\",
+            Paths.AppData + @"ATLauncher\runtimes\minecraft\",
+            Paths.AppData + @"ModrinthApp\meta\java_versions\",
+            Paths.AppData + @"PrismLauncher\java\",
+            Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) + @"\curseforge\minecraft\Install\runtime\",
+            Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) + @"\.jdks\",
+            Environment.GetFolderPath(Environment.SpecialFolder.UserProfile) + @"\.sdkman\candidates\java\",
+            Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + @"\.ftba\bin\runtime\",
+            Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + @"\Packages\Microsoft.4297127D64EC6_8wekyb3d8bbwe\LocalCache\Local\runtime\",
+            Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86) + @"\Minecraft Launcher\runtime\",
+            Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86) + @"\Minecraft\runtime\",
+            Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments) + @"\Curse\Minecraft\Install\runtime\",
+            Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles) + @"\Java\",
+            Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles) + @"\Eclipse Adoptium\",
+            Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles) + @"\Amazon Corretto\",
+            Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles) + @"\Zulu\",
+            ..DirectoryUtils.EnumerateDirectories(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles) + @"\Microsoft\", searchPattern: "jdk-*"),
+            // 环境变量
+            ..(Environment.GetEnvironmentVariable("JDK_HOME") + ";" + Environment.GetEnvironmentVariable("JAVA_HOME")).
+                Split(";", true).Select(path => path.Trim(' ', '"'))
+        ];
+        return folders.Select(f => {
+            try {
+                return PathUtils.ForCompare(f);
+            } catch (Exception ex) {
+                Logger.Warn(ex, $"Java 候选文件夹路径无效（{f}）");
+                return null;
+            }
+        }).Where(f => f is not null).Cast<string>().ToList();
+    });
+    
+
+    /// <summary>
+    /// 从常见文件夹和环境变量中搜索 Java，并将搜索结果写入设置。
+    /// </summary>
+    public static async Task RefreshListAsync(CancellationToken c = default, ProgressProvider? p = null) {
+        // 搜索
+        List<Java> javaList = await SearchFoldersAsync(true, CandidateFolders.Value, c, p?.SplitTo(0.5)).NoCapture();
+        // 将新发现的 Java 排在最前，原有列表保留既有顺序排在后面
+        var oldJavaList = Configs.JavaList.Get()!;
+        oldJavaList = await JavaUtils.CheckAllAsync(oldJavaList, c, p?.SplitTo(0.9)).NoCapture(); // 检查原有列表中的 Java
+        javaList.RemoveAll(oldJavaList); // 此时 javaList 中只剩下新发现的 Java
+        javaList = await JavaUtils.SortAsync(javaList, c).NoCapture(); // 将所有新发现的 Java 按优先级排序
+        javaList.AddRange(oldJavaList);
+        javaList = javaList.Distinct().ToList();
+        // 删掉已被移除的 Java
+        javaList.RemoveIf(j => Configs.JavaRemovedList.Get()!.Contains(j.Folder, StringComparer.OrdinalIgnoreCase));
+        // 写入设置
+        Configs.JavaList.Set([..javaList]);
+        Logger.Info($"Java 搜索完成，发现 {javaList.Count} 个 Java");
+    }
+
+    /// <summary>
+    /// 并行搜索所有指定的文件夹及其子文件夹中的 Java，并检查其有效性。
+    /// </summary>
+    public static async Task<List<Java>> SearchFoldersAsync(bool includeSubDirectories, IEnumerable<string> folders, CancellationToken cancellationToken = default, ProgressProvider? progress = null) {
+        // 并行搜索
+        ConcurrentBag<(string Folder, bool HasReparsePoint, bool IsSpecialPath)> results = [];
+        await TaskUtils.ForEachAsync(folders.Distinct(StringComparer.OrdinalIgnoreCase), 4, async (folder, cp) => {
+            await Task.Run(() => {
+                try {
+                    foreach (var file in DirectoryUtils.EnumerateFiles(folder, includeSubDirectories, "java.exe")) {
+                        cancellationToken.ThrowIfCancellationRequested();
+                        string targetFolder = PathUtils.AddSlashSuffix(PathUtils.ForCompare(PathUtils.RemoveLastPart(file)));
+                        // 判断文件夹是否包含重解析点（例如符号链接）
+                        static bool HasReparsePoint(FileSystemInfo info) {
+                            if (PathUtils.IsParentOf(Paths.AppData + @".minecraft\runtime\", info.FullName)) return false; // 不筛查 PCL 的下载路径（#8928）
+                            do {
+                                if (info.Attributes.HasFlagF(FileAttributes.ReparsePoint)) return true;
+                                info = info is FileInfo fileInfo ? fileInfo.Directory : ((DirectoryInfo) info).Parent;
+                            } while (info is not null);
+                            return false;
+                        }
+                        // 结果
+                        var hasReparsePoint = HasReparsePoint(FileUtils.GetInfo(Path.Combine(targetFolder, "java.exe")));
+                        var isSpecialPath = targetFolder.ContainsIgnoreCase("java8path_target_") || targetFolder.ContainsIgnoreCase("javapath_target_") || targetFolder.ContainsIgnoreCase("javatmp") || targetFolder.ContainsIgnoreCase("system32");
+                        results.Add((targetFolder, hasReparsePoint, isSpecialPath));
+                    }
+                } catch (UnauthorizedAccessException) {
+                    Logger.Info($"快速查找 Java 时没有权限（{folder}）");
+                } catch (Exception ex) {
+                    ex.ThrowIfCanceled();
+                    Logger.Warn(ex, $"快速查找 Java 时出错（{folder}）");
+                }
+            }, cancellationToken).NoCapture();
+        }, cancellationToken, progress?.SplitTo(0.2)).NoCapture();
+        if (!results.Any()) return [];
+
+        // 筛除重解析点
+        if (results.All(r => r.HasReparsePoint)) {
+            Logger.Warn("找到的所有 Java 都包含重解析点，保留全部结果");
+        } else if (results.Any(r => r.HasReparsePoint)) {
+            Logger.Warn($"找到的以下 Java 包含重解析点，将它们从列表中排除：{results.Where(r => r.HasReparsePoint).Select(r => r.Folder).Join('、')}");
+            results = [..results.Where(r => !r.HasReparsePoint)];
+        }
+        // 筛除特殊路径
+        if (results.All(r => r.IsSpecialPath)) {
+            Logger.Warn("找到的所有 Java 都包含特殊路径，保留全部结果");
+        } else if (results.Any(r => r.IsSpecialPath)) {
+            Logger.Warn($"找到的以下 Java 包含特殊路径，将它们从列表中排除：{results.Where(r => r.IsSpecialPath).Select(r => r.Folder).Join('、')}");
+            results = [..results.Where(r => !r.IsSpecialPath)];
+        }
+
+        // 检查并返回
+        List<Java> javaList = results.Select(r => r.Folder).Distinct(StringComparer.OrdinalIgnoreCase).Select(folder => new Java(folder)).ToList();
+        javaList = (await JavaUtils.CheckAllAsync(javaList, cancellationToken, progress?.SplitTo(1)).NoCapture()).ToList();
+        javaList = await JavaUtils.SortAsync(javaList, cancellationToken).NoCapture();
+        Logger.Info($"快速查找 Java 完成，共有 {javaList.Count} 个候选：{javaList.Join('、')}");
+        return javaList;
+    }
+
+    #endregion
+
+}

PCLCS/Launch/LaunchUtils.cs

@@ -0,0 +1,30 @@
+namespace PCLCS;
+
+public static class LaunchUtils {
+
+    /// <summary>
+    /// 释放补丁文件并返回完整文件路径。
+    /// </summary>
+    /// <param name="patchFilePath">补丁文件路径
+    /// <param name="outputDirectory">补丁文件的释放目录。</param>
+    public static string ExtractPatch(string patchFilePath, string outputDirectory) {
+        Logger.Info($"选定的资源 {patchFilePath} 输出路径：{outputDirectory}");
+        lock (ExtractPatchLock) { // 避免 OptiFine 和 Forge 安装时同时释放导致冲突
+            try {
+                FileUtils.ExtractResources(patchFilePath, Path.Combine(outputDirectory, PathUtils.GetLastPart(patchFilePath)), typeof(LaunchUtils));
+            } catch (Exception ex) {
+                if (!FileUtils.Exists(outputDirectory)) throw new FileNotFoundException($"释放 {patchFilePath} 失败", ex);
+                Logger.Warn(ex, $"{patchFilePath} 文件重新释放失败，将尝试更换文件名重新生成");
+                patchFilePath = Path.Combine(outputDirectory, $"{PathUtils.GetFileNameWithoutExtension(patchFilePath)}2.{PathUtils.GetExtension(patchFilePath)}");
+                try {
+                    FileUtils.ExtractResources(patchFilePath, Path.Combine(outputDirectory, PathUtils.GetLastPart(patchFilePath)), typeof(LaunchUtils));
+                } catch (Exception ex2) {
+                    throw new FileNotFoundException($"释放 {patchFilePath} 最终尝试失败", ex2);
+                }
+            }
+        }
+        return Path.Combine(outputDirectory, PathUtils.GetLastPart(patchFilePath));
+    }
+    private static readonly object ExtractPatchLock = new();
+
+}

PCLCS/Minecraft/MCUtils.cs

@@ -0,0 +1,47 @@
+using System.Globalization;
+
+namespace PCLCS;
+
+public static class McUtils {
+
+    /// <summary>
+    /// 比较两个版本名；左侧较新返回正数，相同返回 0，右侧较新返回负数。
+    /// 无法比较两个预发布版的大小。
+    /// 支持的格式：未知版本, 26.1-snapshot-1，1.13.2, 1.7.10-pre4, 1.8_pre, 1.14 Pre-Release 2, 1.14.4 C6
+    /// </summary>
+    public static int CompareVersion(string left, string right) {
+        if (left == right) return 0;
+        if (left == "未知版本" || right == "未知版本") return left == "未知版本" ? 1 : -1;
+        left = left.Lower();
+        right = right.Lower();
+        var leftParts = left.Replace("快照", "snapshot").Replace("预览版", "pre").RegexSearch("[a-z]+|[0-9]+").ToList();
+        var rightParts = right.Replace("快照", "snapshot").Replace("预览版", "pre").RegexSearch("[a-z]+|[0-9]+").ToList();
+        for (int i = 0; ; i++) {
+            if (i >= leftParts.Count && i >= rightParts.Count) return string.Compare(left, right, StringComparison.Ordinal); // 两边均缺失，感觉是一个东西
+            string leftValue = i < leftParts.Count ? leftParts[i] : "0";
+            string rightValue = i < rightParts.Count ? rightParts[i] : "0";
+            if (leftValue == rightValue) continue;
+            int leftNumber = leftValue switch {
+                "rc" => -1,
+                "pre" => -2,
+                "snapshot" => -3,
+                "experimental" => -4,
+                _ => int.TryParse(leftValue, NumberStyles.Integer, CultureInfo.InvariantCulture, out int leftResult) ? leftResult : 0
+            };
+            int rightNumber = rightValue switch {
+                "rc" => -1,
+                "pre" => -2,
+                "snapshot" => -3,
+                "experimental" => -4,
+                _ => int.TryParse(rightValue, NumberStyles.Integer, CultureInfo.InvariantCulture, out int rightResult) ? rightResult : 0
+            };
+            if (leftNumber == 0 && rightNumber == 0) return string.Compare(leftValue, rightValue, StringComparison.Ordinal);
+            if (leftNumber != rightNumber) return leftNumber.CompareTo(rightNumber);
+        }
+    }
+    /// <summary>
+    /// 比较两个版本名；左侧不旧于右侧返回 True。
+    /// </summary>
+    public static bool CompareVersionGE(string left, string right) => CompareVersion(left, right) >= 0;
+
+}

PCLCS/Minecraft/McInstallManifest.cs

@@ -0,0 +1,71 @@
+namespace PCLCS;
+
+/// <summary>
+/// MC 版本安装清单及 PCL 管理文件清单。
+/// </summary>
+/// <param name="SchemaVersion"> 清单格式版本；无版本的旧清单为 0。</param>
+/// <param name="Components"> 安装目标及受管理组件版本。</param>
+/// <param name="LastModifiedUtc"> 最后修改时间（UTC）。</param>
+/// <param name="ManagedFiles"> 受管理文件；没有文件时为空列表。</param>
+public record McInstallManifest(int SchemaVersion, McComponents Components, DateTime LastModifiedUtc, IReadOnlyList<McInstallManifest.ManagedFile> ManagedFiles) {
+    /// <summary>
+    /// 清理以 Mod 形式安装的、已删除或修改的组件的记录，并更新清单。
+    /// </summary>
+    public McInstallManifest RefreshModComponents(string gameFolder) {
+        List<ManagedFile> invalidFiles = [];
+        foreach (ManagedFile entry in ManagedFiles) {
+            if (entry.Component is null) continue; // 不检查非组件文件
+            FileInfo file = new(Path.Combine(gameFolder, entry.RelativePath));
+            if (!file.Exists || file.LastWriteTimeUtc != entry.LastWriteTimeUtc.ToUniversalTime()) invalidFiles.Add(entry);
+        }
+        if (!invalidFiles.Any()) return this;
+        return this with {
+            Components = Components with {
+                OptiFineEntry = invalidFiles.Any(file => file.Component == "OptiFine") ? null : Components.OptiFineEntry,
+                FabricApiVersion = invalidFiles.Any(file => file.Component == "FabricApi") ? null : Components.FabricApiVersion,
+                OptiFabricVersion = invalidFiles.Any(file => file.Component == "OptiFabric") ? null : Components.OptiFabricVersion
+            },
+            ManagedFiles = ManagedFiles.Where(file => !invalidFiles.Contains(file)).ToList(),
+            LastModifiedUtc = DateTime.UtcNow
+        };
+    }
+
+    /// <summary>
+    /// 由 PCL 管理并记录的版本内文件。
+    /// </summary>
+    /// <param name="RelativePath"> 相对于游戏目录的文件路径。确保路径为全小写且可比较。</param>
+    /// <param name="Sha1"> 小写的 SHA1。</param>
+    /// <param name="LastWriteTimeUtc"> 目标文件的最后修改时间（UTC）。</param>
+    /// <param name="Component"> 安装器组件名；为空时表示文件由整合包管理。</param>
+    public record ManagedFile(string RelativePath, string Sha1, DateTime LastWriteTimeUtc,
+        [property: JsonProperty(NullValueHandling = NullValueHandling.Ignore)] string? Component = null);
+}
+
+/// <param name="MinecraftVersion"> 目标 Minecraft 版本。</param>
+/// <param name="ModLoaderVersions"> 目标中各个 Mod Loader 的版本；原版为空字典。</param>
+/// <param name="OptiFineEntry"> OptiFine 条目信息，不安装时为 <see langword="null"/>。</param>
+/// <param name="FabricApiVersion"> 由 PCL 管理的 Fabric API 版本；不安装时为 <see langword="null"/>。</param>
+/// <param name="OptiFabricVersion"> 由 PCL 管理的 OptiFabric 版本；不安装时为 <see langword="null"/>。</param>
+[method: JsonConstructor]
+public record McComponents(string MinecraftVersion, Dictionary<ModLoaders, string> ModLoaderVersions,
+        [property: JsonProperty(NullValueHandling = NullValueHandling.Ignore)] JObject? OptiFineEntry = null,
+        [property: JsonProperty(NullValueHandling = NullValueHandling.Ignore)] string? FabricApiVersion = null,
+        [property: JsonProperty(NullValueHandling = NullValueHandling.Ignore)] string? OptiFabricVersion = null) {
+    [JsonIgnore]
+    public string? OptiFineVersion => OptiFineEntry?["InstanceName"]?.Value<string>()?.AfterLast("-OptiFine_");
+    public McComponents(string minecraftVersion, JObject? optiFineEntry, string? forgeVersion,
+        string? neoForgeVersion, string? fabricVersion, string? fabricApiVersion, string? optiFabricVersion, string? liteLoaderVersion)
+        : this(minecraftVersion, [], optiFineEntry, fabricApiVersion, optiFabricVersion) {
+        if (forgeVersion is not null) ModLoaderVersions[ModLoaders.Forge] = forgeVersion;
+        if (neoForgeVersion is not null) ModLoaderVersions[ModLoaders.NeoForge] = neoForgeVersion;
+        if (fabricVersion is not null) ModLoaderVersions[ModLoaders.Fabric] = fabricVersion;
+        if (liteLoaderVersion is not null) ModLoaderVersions[ModLoaders.LiteLoader] = liteLoaderVersion;
+    }
+    public bool IsEquivalentTo(McComponents other) =>
+        MinecraftVersion == other.MinecraftVersion &&
+        OptiFineVersion == other.OptiFineVersion &&
+        FabricApiVersion == other.FabricApiVersion &&
+        OptiFabricVersion == other.OptiFabricVersion &&
+        ModLoaderVersions.Count == other.ModLoaderVersions.Count &&
+        ModLoaderVersions.All(entry => other.ModLoaderVersions.TryGetValue(entry.Key, out string? version) && version == entry.Value);
+}

PCLCS/Minecraft/McVersion.cs

@@ -0,0 +1,295 @@
+using System.Globalization;
+
+namespace PCLCS;
+
+/// <summary>
+/// Minecraft 版本号和组件信息
+/// </summary>
+public sealed class McVersion {
+    /// <summary>
+    /// 原版版本名，如 26.1、26.1-snapshot-1、1.12.2、16w01a。
+    /// </summary>
+    public string VanillaName {
+        get => _vanillaName;
+        set {
+            _vanillaName = value ?? "Unknown";
+            Vanilla = NameToVersion(_vanillaName);
+        }
+    }
+    private string _vanillaName = "Unknown";
+    /// <summary>
+    /// 可比较的三段式原版版本号。
+    /// 旧格式会将次版本号移到主版本号，例如 1.20.1 会转换为 20.0.1，若没有版本号，例如旧快照，则为 9999.0.0。
+    /// </summary>
+    public Version Vanilla = new(9999, 0, 0);
+    /// <summary> 原版版本号是否可靠（不是通过猜测获取）。</summary>
+    public bool Reliable;
+    /// <summary> 原版版本号是否有效。</summary>
+    public bool Valid => Vanilla.Major < 1000;
+    /// <summary> 可供比较的原版 Drop 序数，例如 26.3.2 为 263，1.21.5 为 210；若没有版本号，例如旧快照，则直接指定为 209。</summary>
+    public int Drop => Valid ? Vanilla.Major * 10 + Vanilla.Minor : 209;
+    /// <summary> 已安装的 Mod Loader，可能有多个。未安装时为 <see cref="ModLoaders.None"/>。</summary>
+    public ModLoaders ModLoaders => ModLoaderVersions.Keys.Aggregate(ModLoaders.None, (result, loader) => result | loader);
+    /// <summary> 已安装的各个 Mod Loader 及其版本；无法确定精确版本时为“未知版本”。</summary>
+    public Dictionary<ModLoaders, string> ModLoaderVersions { get; } = [];
+    /// <summary> OptiFine 版本名，如 C8、C9_pre10；未识别到时为 null。</summary>
+    public string? OptiFine;
+    /// <summary> OptiFine 是否以 Mod 形式安装。</summary>
+    public bool OptiFineAsMod;
+    /// <summary> 版本的发布时间。</summary>
+    public DateTime ReleaseTime = new(1970, 1, 1, 15, 0, 0);
+    /// <summary> 是否为愚人节版本。</summary>
+    public bool IsFool;
+    /// <summary> 是否为快照、预发布版、发布候选或实验性版本。</summary>
+    public bool IsSnapshot;
+    /// <summary> 是否识别到已安装的 OptiFine。</summary>
+    public bool HasOptiFine => OptiFine is not null;
+    /// <summary>
+    /// 可供比较的 OptiFine 版本序数。
+    /// </summary>
+    public int OptiFineCode {
+        get {
+            if (OptiFine is null or "未知版本" || OptiFine.Length == 0) return 0;
+            // 字母编号，如 G2 中的 G（7）
+            int result = char.ToUpperInvariant(OptiFine[0]) - 'A' + 1;
+            // 末尾数字，如 C5 beta4 中的 5
+            result = result * 100 + (int.TryParse(OptiFine.Substring(1).RegexSeek(@"\d+"), out int mainVersion) ? mainVersion : 0);
+            // 测试标记（正式版为 99，Pre[x] 为 50+x，Beta[x] 为 x）
+            result *= 100;
+            string? preview = OptiFine.RegexSeek(@"(?i)(pre|beta)\d*");
+            if (preview is null) return result + 99;
+            int sequence = int.TryParse(preview.RegexSeek(@"\d+"), out int value) ? value : 1; // 为 pre 或 beta 结尾，视作 1
+            return result + (preview.StartsWithF("pre", true) ? 50 : 0) + sequence;
+        }
+    }
+    /// <summary>
+    /// 可供比较的类 Forge 版本序数。
+    /// </summary>
+    public int ForgelikeCode {
+        get {
+            if (!ModLoaderVersions.TryGetValue(ModLoaders.Forge, out string? version)) {
+                ModLoaderVersions.TryGetValue(ModLoaders.NeoForge, out version);
+            }
+            if (version is null or "未知版本") return 0;
+            // 提取所有数字段，以兼容 beta、alpha 和 snapshot 等非数字后缀。
+            int[] segments = version.RegexSearch(@"\d+")
+                .Select(segment => int.TryParse(segment, out int value) ? value : 0).ToArray();
+            return segments.Length switch {
+                >= 4 => segments[0] * 1000000 + segments[1] * 10000 + segments[3],
+                3 => segments[0] * 1000000 + segments[1] * 10000 + segments[2],
+                2 => segments[0] * 1000000 + segments[1] * 10000,
+                1 => segments[0] * 1000000,
+                _ => 0
+            };
+        }
+    }
+
+    /// <summary>
+    /// 创建默认 Minecraft 版本。
+    /// </summary>
+    /// <param name="vanillaName">原版版本名。</param>
+    /// <param name="reliable">版本名是否来自可靠依据。</param>
+    public McVersion(string vanillaName, bool reliable = true) {
+        Reliable = reliable;
+        VanillaName = vanillaName;
+        IsFool = IsFoolName(VanillaName);
+        IsSnapshot = IsSnapshotName(VanillaName);
+    }
+
+    /// <summary>
+    /// 通过 Components 创建 Minecraft 版本信息。
+    /// </summary>
+    public McVersion(McComponents components) : this(components.MinecraftVersion) {
+        OptiFine = components.OptiFineVersion?.AfterLast("HD_").AfterFirst("_");
+        foreach (var loader in components.ModLoaderVersions) ModLoaderVersions[loader.Key] = loader.Value;
+    }
+
+    /// <summary>
+    /// 通过 JSON 识别 Minecraft 版本和已安装组件。
+    /// </summary>
+    /// <param name="instanceName">实例文件夹名。</param>
+    /// <param name="json">展开的版本 JSON。</param>
+    /// <param name="jarVersionJson">版本 JAR 中的 version.json。</param>
+    public McVersion(string instanceName, JObject json, JObject? jarVersionJson = null) {
+        string jsonText = json.ToString(Formatting.None);
+        DateTime releaseTime = new(1970, 1, 1, 15, 0, 0); // 未知版本也可能显示为 1970 年
+        try {
+            if (json["releaseTime"] is JToken releaseTimeToken) releaseTime = releaseTimeToken.ToObject<DateTime>();
+        } catch {
+        }
+        bool reliable = true;
+        // 获取游戏版本
+        string vanillaName = (GetVanillaName(instanceName, json, jarVersionJson, releaseTime, ref reliable) ?? "Unknown").Replace("_unobfuscated", "").Replace(" Unobfuscated", "");
+        Reliable = reliable;
+        VanillaName = vanillaName;
+        ReleaseTime = releaseTime;
+        // 确定版本分类
+        string jsonType = json.Value<string>("type") ?? "";
+        // OptiFine
+        OptiFine = jsonText.ContainsIgnoreCase("optifine") ? jsonText.RegexSeek(@"(?<=HD_U_)[^\"":/]+") ?? "未知版本": null;
+        // 愚人节与快照版本
+        DateTime fixedReleaseTime = releaseTime.ToUniversalTime().AddHours(2);
+        IsFool = jsonType == "fool" || IsFoolName(vanillaName) || (fixedReleaseTime.Month == 4 && fixedReleaseTime.Day == 1 && jsonType == "snapshot");
+        IsSnapshot = IsSnapshotName(vanillaName) || instanceName.ContainsIgnoreCase("combat") || jsonType is "snapshot" or "pending" or "fool";
+        if (!Reliable) Logger.Info($"无法完全确认 MC 版本号的版本：{VanillaName}");
+        // LiteLoader
+        if (jsonText.ContainsIgnoreCase("liteloader")) {
+            ModLoaderVersions[ModLoaders.LiteLoader] = jsonText.RegexSeek(@"(?<=com\.mumfrey:liteloader:)[^\"":/]+") ?? "未知版本";
+        }
+        // Fabric、Forge、NeoForge
+        if (jsonText.ContainsIgnoreCase("net.fabricmc:fabric-loader") || jsonText.ContainsIgnoreCase("org.quiltmc:quilt-loader")) {
+            ModLoaderVersions[ModLoaders.Fabric] = jsonText.RegexSeek(@"(?<=(net\.fabricmc:fabric-loader:|org\.quiltmc:quilt-loader:))[0-9\.]+(\+build.[0-9]+)?")?
+                                                        .Replace("+build", "") ?? "未知版本";
+        } else if (jsonText.ContainsIgnoreCase("net.neoforge")) {
+            // 1.20.1 JSON 范例："--fml.forgeVersion", "47.1.99"
+            // 1.20.2+ JSON 范例："--fml.neoForgeVersion", "20.6.119-beta"
+            ModLoaderVersions[ModLoaders.NeoForge] = FindArgumentValue(json, "--fml.neoForgeVersion") ?? FindArgumentValue(json, "--fml.forgeVersion") ?? "未知版本";
+        } else if (jsonText.ContainsIgnoreCase("minecraftforge")) {
+            ModLoaderVersions[ModLoaders.Forge] = jsonText.RegexSeek(@"(?<=forge:[0-9\.]+(?:_pre[0-9]*)?-)[0-9\.]+")
+                                                    ?? jsonText.RegexSeek(@"(?<=net\.minecraftforge:minecraftforge:)[0-9\.]+")
+                                                    ?? jsonText.RegexSeek(@"(?<=net\.minecraftforge:fmlloader:[0-9\.]+-)[0-9\.]+") ?? "未知版本";
+        }
+    }
+
+    private static string? GetVanillaName(string instanceName, JObject json, JObject? jarVersionJson, DateTime releaseTime, ref bool reliable) {
+        // 获取发布时间并判断是否为老版本
+        if (releaseTime.Year is > 2000 and < 2013) return "Old";
+        // 实验性快照
+        if (json.Value<string>("type") == "pending") return "pending";
+        // 从 PCL 下载的版本信息中获取版本号
+        if (json["clientVersion"] is JToken clientVersion) return clientVersion.ToString();
+        // 从 HMCL 下载的版本信息中获取版本号
+        if (json["patches"] is JArray patches) {
+            JToken? gameVersion = patches.OfType<JObject>().FirstOrDefault(patch => patch.Value<string>("id") == "game")?["version"];
+            if (gameVersion is not null) return gameVersion.ToString();
+        }
+        // 从 Forge / NeoForge Arguments 中获取版本号
+        if (FindArgumentValue(json, "--fml.mcVersion") is { Length: > 0 } fmlVersion) return fmlVersion;
+        // 从继承版本中获取版本号
+        string inherit = json["inheritsFrom"]?.ToString() ?? "";
+        if (inherit.Length > 0) {
+            string jar = json["jar"]?.ToString() ?? ""; // LiteLoader 优先使用 Jar
+            return jar.Length > 0 ? jar : inherit;
+        }
+        // 从下载地址中获取版本号
+        string? download = json["downloads"]?.ToString(Formatting.None).RegexSeek(@"(?<=launcher.mojang.com/mc/game/)[^/]*");
+        if (download is not null) return download;
+        // 从 Forge/OptiFine/Fabric 版本中获取版本号
+        string librariesText = json["libraries"]!.ToString();
+        string[] libraryPatterns = [
+            @"(?<=net.minecraftforge:forge:)[0-9]{1,2}.[0-9+.]+",
+            @"(?<=net.minecraftforge:fmlloader:)[0-9]{1,2}.[0-9+.]+",
+            @"(?<=optifine:OptiFine:)[0-9]{1,2}.[0-9+.]+",
+            @"(?<=((fabricmc)|(quiltmc)):intermediary:)[^\""]*"
+        ];
+        foreach (string pattern in libraryPatterns) {
+            if (librariesText.RegexSeek(pattern) is string match) return match;
+        }
+        // 从 jar 项中获取版本号
+        if (json["jar"] is JToken jarToken) return jarToken.ToString();
+        // 从 jar 文件的 version.json 中获取版本号
+        if (jarVersionJson?["name"] is JToken jarNameToken && jarNameToken.ToString() is { Length: < 32 } jarName) { // 因为 wiki 说这玩意儿可能是个 hash，虽然我没发现
+            Logger.Info($"从版本 jar 中的 version.json 获取到版本号：{jarName}");
+            return jarName;
+        }
+        string VersionPattern = @"(([1-9][0-9]w[0-9]{2}[a-g])|((1|[2-9][0-9])\.[0-9]+(\.[0-9]+)?(-(pre|rc|snapshot-?)[1-9]*| Pre-Release( [1-9])?)?))(_unobfuscated)?";
+        // 从 JSON 的 ID 中获取
+        if (json["id"]!.ToString().RegexSeek(VersionPattern, RegexOptions.IgnoreCase) is string idMatch) return idMatch;
+        // 非准确的版本判断警告
+        Logger.Info($"无法完全确认 MC 版本号的版本：{instanceName}");
+        reliable = false;
+        // 从文件夹名中获取
+        if (instanceName.RegexSeek(VersionPattern, RegexOptions.IgnoreCase) is string folderMatch) return folderMatch;
+        // 从 JSON 出现的版本号中获取
+        JObject withoutLibraries = (JObject) json.DeepClone();
+        withoutLibraries.Remove("libraries");
+        return withoutLibraries.ToString(Formatting.None).RegexSeek(VersionPattern, RegexOptions.IgnoreCase);
+    }
+
+    private static bool IsFoolName(string name) {
+        name = name.Lower();
+        return name.StartsWithF("2.0") || name is "15w14a" or "1.rv-pre1" or
+            "3d shareware v1.34" or "20w14∞" or "22w13oneblockatatime" or "23w13a_or_b" or
+            "24w14potato" or "25w14craftmine" or "26w14a" || name.StartsWithF("20w14inf");
+    }
+
+    private static bool IsSnapshotName(string name) =>
+        new[] { "w", "snapshot", "rc", "pre", "experimental", "-" }.Any(name.ContainsIgnoreCase);
+
+    /// <summary>
+    /// 读取 arguments 中指定参数的字符串值。
+    /// </summary>
+    private static string? FindArgumentValue(JObject json, string name) {
+        JArray? arguments = json["arguments"]?["game"] as JArray;
+        if (arguments is null) return null;
+        for (int i = 0; i + 1 < arguments.Count; i++) {
+            if (arguments[i]?.ToString() == name) return arguments[i + 1]?.ToString();
+        }
+        return null;
+    }
+
+    /// <summary>
+    /// 判断版本字符串是否符合 Minecraft 原版格式，例如 1.x、26.x。
+    /// </summary>
+    public static bool IsStandardFormat(string? version) {
+        if (version is null) return false;
+        if (Regex.IsMatch(version, @"^1\.\d")) return true;
+        return double.TryParse(version.RegexSeek(@"^[2-9]\d\.\d+"), NumberStyles.Float,
+            CultureInfo.InvariantCulture, out double value) && value >= 26;
+    }
+
+    /// <summary>
+    /// 将版本名转换为 Drop 序数；无法转换时返回 209。
+    /// </summary>
+    public static int VersionToDrop(string? vanillaName) {
+        if (vanillaName is null) return 209;
+        Version version = NameToVersion(vanillaName);
+        return version.Major >= 1000 ? 209 : version.Major * 10 + version.Minor;
+    }
+
+    /// <summary>
+    /// 将 Drop 序数转换为版本字符串。
+    /// </summary>
+    public static string DropToVersion(int drop) {
+        if (drop >= 250) return $"{drop / 10}.{drop % 10}";
+        if (drop != 209) return $"1.{drop / 10}";
+        Logger.Warn(new Exception("尝试将旧快照版 Drop 序数转换为版本字符串，这不应该发生！"));
+        return "1.20";
+    }
+
+    /// <summary>
+    /// 将版本名转换为可比较的三段式原版版本号。
+    /// 对老版本格式，例如 1.20.3，会被转换为 20.0.3。
+    /// 对愚人节版本，返回其基于的正式版版本号。
+    /// 若没有版本号，例如旧快照，则为 9999.0.0。
+    /// </summary>
+    public static Version NameToVersion(string? name) {
+        if (name is null) return new Version(9999, 0, 0);
+        name = name.Lower().Replace("_unobfuscated", "").Replace(" unobfuscated", "");
+        // 愚人节版本
+        if (name.StartsWithF("2.0")) return NameToVersion("1.5.1");
+        if (name == "15w14a") return NameToVersion("1.8.3");
+        if (name.ContainsIgnoreCase(".rv-pre")) return NameToVersion("1.9.2");
+        if (name.ContainsIgnoreCase("shareware")) return NameToVersion("1.13.2");
+        if (name.StartsWithF("20w14") && name != "20w14a") return NameToVersion("1.15.2");
+        if (name.ContainsIgnoreCase("oneblockatatime")) return NameToVersion("1.18.2");
+        if (name.ContainsIgnoreCase("23w13a") && name != "20w13a") return NameToVersion("1.19.4");
+        if (name == "24w14potato") return NameToVersion("1.20.4");
+        if (name == "25w14craftmine") return NameToVersion("1.21.4");
+        if (name == "26w14a") return NameToVersion("26.1.1");
+        // 其余版本
+        static int ParseSegment(string[] segments, int index) {
+            if (index >= segments.Length) return 0;
+            // 只读取该段开头连续的数字，忽略其后的预览版标记。
+            return int.TryParse(segments[index].RegexSeek(@"^\d+"), out int value) ? value : 0;
+        }
+        string[] segments = name.Split([' ', '_', '-', '.'], StringSplitOptions.None);
+        if (name.StartsWithF("1.")) {
+            return new Version(ParseSegment(segments, 1), 0, ParseSegment(segments, 2));
+        } else if (name.RegexCheck(@"^[2-9][0-9]\.")) {
+            return new Version(ParseSegment(segments, 0), ParseSegment(segments, 1), ParseSegment(segments, 2));
+        } else {
+            return new Version(9999, 0, 0);
+        }
+    }
+}

PCLCS/Minecraft/OptifineHashes.json

@@ -0,0 +1,423 @@
+{
+  "f3a3c9d792bdb48595405d52c02cc7baf1db4ecb": "OptiFine_1.7.2_HD_U_E3.jar",
+  "657169c421ce280f80c73b05ab71ad582d2b37fd": "OptiFine_1.7.2_HD_U_E4.jar",
+  "99f20d449912cd860b409e4679c54dd8da43d55e": "OptiFine_1.7.2_HD_U_E7.jar",
+  "8253f6ed418a2a61a612cc9e69fd1fea1d11fa7d": "OptiFine_1.7.2_HD_U_E8.jar",
+  "379e52fc02cd75562d201b0c505269b6109b2136": "OptiFine_1.7.2_HD_U_F3.jar",
+  "fb04b91e47b5eaa172d2b76c843e488dba8f909b": "OptiFine_1.7.2_HD_U_F7.jar",
+  "b4b6c2c99f5734e4267030a47f2eaad2796eb2a7": "OptiFine_1.7.10_HD_U_D3.jar",
+  "a0b533bc97b24fe771f5b08536c6339d04f92bae": "OptiFine_1.7.10_HD_U_D4.jar",
+  "5e9327dd05a1e762c23c3c0227445d90f193922f": "OptiFine_1.7.10_HD_U_D6.jar",
+  "7a7d2adf21038d241dd375faa7316fb2c74d34d3": "OptiFine_1.7.10_HD_U_D7.jar",
+  "2345677be44dd56a0ae5b90e747a590c3cc00ff8": "OptiFine_1.7.10_HD_U_D8.jar",
+  "23f133173428aee712eb11f200b461e3114bde31": "OptiFine_1.7.10_HD_U_E3.jar",
+  "2130d7266224da6a7325051e37444f7e7c19277c": "OptiFine_1.7.10_HD_U_E7.jar",
+  "55c9c475ecd0f62cc1776ce52be04c5937112936": "OptiFine_1.8.0_HD_U_H5.jar",
+  "bb2c2997cdc66cfb3c311a3dc065752a4845c1a8": "OptiFine_1.8.0_HD_U_H6.jar",
+  "692b0b7e878c3416f21b4347fab4516f3cc86dfc": "OptiFine_1.8.0_HD_U_H7.jar",
+  "5464962b66b9b0dacb3d787e6a71d2365ae50bca": "OptiFine_1.8.0_HD_U_H8.jar",
+  "b7718b03111bec04036fd3352ce374eea273171c": "OptiFine_1.8.0_HD_U_I3.jar",
+  "0d1dcf64b4d104a71e8f65a1362a163ed81a9030": "OptiFine_1.8.0_HD_U_I7.jar",
+  "e5e5eb03748af0fa160b502a28359c0144e254d2": "OptiFine_1.8.8_HD_U_H5.jar",
+  "9294bc4562a143c35ece03a6b3d3a000109def5f": "OptiFine_1.8.8_HD_U_H6.jar",
+  "1c06c011904ab22952a96f73d4b575a5c265d207": "OptiFine_1.8.8_HD_U_H7.jar",
+  "3984e4dd222bb62cb7e28e4d3092029cc7534fd1": "OptiFine_1.8.8_HD_U_H8.jar",
+  "0dc33a9761ceac19ca0bbb1ea6813c0160d43aa1": "OptiFine_1.8.8_HD_U_I3.jar",
+  "30cbf4d61052cbfb736a78117da333df23c129a3": "OptiFine_1.8.8_HD_U_I7.jar",
+  "d8240cfa7387b994fdf2a64bdc8a8860857adc18": "OptiFine_1.8.9_HD_U_H5.jar",
+  "2636689b31810896cf80493f6fc4d8c1783048ea": "OptiFine_1.8.9_HD_U_H6.jar",
+  "e4544c9210bc056abffa1986a33c4e72623d4f31": "OptiFine_1.8.9_HD_U_H7.jar",
+  "4b73738913453bcbca969d3e77f05ae0cf5b8a7e": "OptiFine_1.8.9_HD_U_H8.jar",
+  "d5cd8b902077075bbf1d865cfd5b3362a6863ace": "OptiFine_1.8.9_HD_U_I3.jar",
+  "58bec8f8766918dcad2b8412f1fbb6f30cc9319f": "OptiFine_1.8.9_HD_U_I7.jar",
+  "dcab4849a24ccad5a6a3496c67bc5a88411d2a35": "OptiFine_1.8.9_HD_U_L5.jar",
+  "d362d58a28f5373b141b9e426e8e160638bfafcd": "OptiFine_1.8.9_HD_U_M5.jar",
+  "1f9dcc9735e94ebb5195c4014300ea462eb12878": "preview_OptiFine_1.8.9_HD_U_L6_pre1.jar",
+  "6e0b3b86e51c2647c98e277475ee7e68f32a0d0e": "preview_OptiFine_1.8.9_HD_U_M5_pre2.jar",
+  "7287fcd1a415ab87eca5e89457cc3507aa3fa579": "preview_OptiFine_1.8.9_HD_U_M6_pre1.jar",
+  "0bb792be16ec78d8b62586cc4856950befb3391b": "preview_OptiFine_1.8.9_HD_U_M6_pre2.jar",
+  "fd87c53197312614c34669feb7608f74a30da712": "OptiFine_1.9.0_HD_U_B1.jar",
+  "f99941037f3633926ffebb3eda67f296a701c019": "OptiFine_1.9.0_HD_U_B2.jar",
+  "34c47106cda1371ecf13e61aed4c1b53a3a53163": "OptiFine_1.9.0_HD_U_B3.jar",
+  "ebc7258e13344097588c73a0b48457083069e1df": "OptiFine_1.9.0_HD_U_B5.jar",
+  "999df92e8904f9268e549135edbec322d332ef62": "OptiFine_1.9.0_HD_U_D7.jar",
+  "0fe031e95f9c01481c9376d9a1df68f9e9857db8": "OptiFine_1.9.0_HD_U_D8.jar",
+  "f4bc2eb5e039e842eb07181ea564eba487513228": "OptiFine_1.9.0_HD_U_E3.jar",
+  "78870a94ec3c4db8aebc4c29d4d39bdda2bf05da": "OptiFine_1.9.0_HD_U_E7.jar",
+  "d3d55bb37e76d1932cb3ad9dde4b9127993f856d": "OptiFine_1.9.0_HD_U_H5.jar",
+  "b5faec3b84f42dd396512a3ce7c1b57c0b972b70": "OptiFine_1.9.0_HD_U_I5.jar",
+  "92742ecac143b1d28c215ca145bd9775a01c5085": "preview_OptiFine_1.9.0_HD_U_I5_pre1.jar",
+  "c87029938376017deba9108322bcb8424d64e92c": "OptiFine_1.9.2_HD_U_B1.jar",
+  "d3e5e1fa480e66603ca037d74966a95d25968d51": "OptiFine_1.9.2_HD_U_B2.jar",
+  "fbd545f921d098235a28f87cda55a0504e831954": "OptiFine_1.9.2_HD_U_B3.jar",
+  "1ae8e6daeeccb6ee48618e8ccdc0b6276d47944f": "OptiFine_1.9.2_HD_U_D7.jar",
+  "3350c829b29d170e9ac19809a3ae45cb099277b5": "OptiFine_1.9.2_HD_U_D8.jar",
+  "c032b2ae0b6087077efef8ae89b612e0d4ea81b7": "OptiFine_1.9.2_HD_U_E3.jar",
+  "3d8cbc19bcad9e9ecc98f607e10f65673a09b482": "OptiFine_1.9.4_HD_U_B4.jar",
+  "b6b9e66b34ddcda5294b016602fb17d741ff6f54": "OptiFine_1.9.4_HD_U_B5.jar",
+  "060ddd5a0b7b7ac5586de04ae53cf923ae5c7290": "OptiFine_1.9.4_HD_U_B6.jar",
+  "2c39611a89dc583cdb403f402c2efd2bd8c6da63": "OptiFine_1.9.4_HD_U_D7.jar",
+  "4b26926208de270225eb9d3af24a4ff3841238f5": "OptiFine_1.9.4_HD_U_D8.jar",
+  "012f82fce41aee5e6e56e551d450a07b2b361646": "OptiFine_1.9.4_HD_U_E3.jar",
+  "cf9c075fa71dab34cdf1c376a76bd08295c69ce6": "OptiFine_1.9.4_HD_U_E7.jar",
+  "b3a76b92e0e9594f6fa135f1156b9cc13712db20": "OptiFine_1.9.4_HD_U_H5.jar",
+  "68a206db0d425dd85f6eba33e52122b01e844c46": "OptiFine_1.9.4_HD_U_I5.jar",
+  "2e48d20605340cfad844a6587d3848e328fd4399": "preview_OptiFine_1.9.4_HD_U_I5_pre1.jar",
+  "d7a1e5f40e28fa3283b82bf3af7d3f433b91df08": "OptiFine_1.10_HD_U_B6.jar",
+  "717a02b21136e022cdb4d7d6ec6a4125f4ed2312": "OptiFine_1.10_HD_U_B7.jar",
+  "0b5d1719592a57cf414643c5b56f4bb3c23a5b94": "OptiFine_1.10_HD_U_C1.jar",
+  "236747126edcf0c97fc6a20fa7f6491accbf0108": "OptiFine_1.10_HD_U_D7.jar",
+  "c5fd78710e821f06f871994032e951065c15c40d": "OptiFine_1.10_HD_U_D8.jar",
+  "1bea8b0bae04ca4b25c6824a6f23a5442d5aa926": "OptiFine_1.10_HD_U_E3.jar",
+  "7a7195348ea583458b657573b5fcc72e4adc8308": "OptiFine_1.10_HD_U_E7.jar",
+  "3bcc46f718711cd6fe3db49de4cc810b75420de8": "OptiFine_1.10_HD_U_H5.jar",
+  "a0070afe9c1c0ced4bcfcda85359e07917d569bd": "OptiFine_1.10_HD_U_I5.jar",
+  "f9a36eb0246ad6ba303e670082be2c2515c50dcd": "preview_OptiFine_1.10_HD_U_I5_pre1.jar",
+  "3ea5dae651b6d64900562d1cde5070ebd9db2936": "OptiFine_1.10.2_HD_U_C1.jar",
+  "41968442e8d1e30e9a32e7a5594caca22312d9d6": "OptiFine_1.10.2_HD_U_C2.jar",
+  "9c8bc96d3125199e96f5dbfda685ea5dd92c253e": "OptiFine_1.10.2_HD_U_C3.jar",
+  "7ec4ccc213b482936baaffb9f1937f7147796893": "OptiFine_1.10.2_HD_U_D1.jar",
+  "3ee5aecc8e11567fb46de0b94e23cf1428f4c9fc": "OptiFine_1.10.2_HD_U_D2.jar",
+  "98059ed7e93d0fc058203569ccfe965b022fb18f": "OptiFine_1.10.2_HD_U_D3.jar",
+  "c3165d0a0207d72e18f4533e7aa5ca30e96819a9": "OptiFine_1.10.2_HD_U_D4.jar",
+  "347359aef422d64711b470f4cf0803cb072da0fa": "OptiFine_1.10.2_HD_U_D6.jar",
+  "4ddf7c45e00839031f5793451541bca002f9257f": "OptiFine_1.10.2_HD_U_D7.jar",
+  "5c3685e279c664a818c41ca213b2bc9bfc4340b0": "OptiFine_1.10.2_HD_U_D8.jar",
+  "129581af3d7d73b506b42d822cb2d3fce68c8e2e": "OptiFine_1.10.2_HD_U_E3.jar",
+  "f052d269109154d851cc7a8e766c78802a76e9b2": "OptiFine_1.10.2_HD_U_E7.jar",
+  "f285cfe6753c5d987e4cb0940da05e9513334d98": "OptiFine_1.10.2_HD_U_H5.jar",
+  "12fd8dd33150f9e4436f23bac08265305f949e20": "OptiFine_1.10.2_HD_U_I5.jar",
+  "adac69b25bb95242422a635965c7f17503c694be": "preview_OptiFine_1.10.2_HD_U_I5_pre1.jar",
+  "06031e4c828b66facefdfa32cd29c585909d9e45": "OptiFine_1.11_HD_U_B1.jar",
+  "449aef14cee17cf1c79d4bad73b69107202d3c1c": "OptiFine_1.11_HD_U_B2.jar",
+  "7663e1ee572c742e96a71a355f0775baf7cbc6ef": "OptiFine_1.11_HD_U_B3.jar",
+  "bde9d34f84a030734c7b9d09eda700c7c828eb96": "OptiFine_1.11_HD_U_B5.jar",
+  "579cfb75b86f3404c5f6e8f694c51b09b7c9b261": "OptiFine_1.11_HD_U_B6.jar",
+  "350af22b31dbc27d1b928e7144582fd361deb193": "OptiFine_1.11_HD_U_B7.jar",
+  "236161183cc5cd5faf84dd27824cc3eaa107ed5f": "OptiFine_1.11_HD_U_B8.jar",
+  "9ca32d42c7e5ad9de9665ffee9ddd41dddd33b66": "OptiFine_1.11_HD_U_C3.jar",
+  "2e45de9e9fb385f24c6eecb1a64537de78778105": "OptiFine_1.11_HD_U_C7.jar",
+  "32df58fec7148e75b599b18691f80e69b7f9cd1b": "OptiFine_1.11_HD_U_F5.jar",
+  "71057cb7a3d0971c3b56e1fbbc333304a72e1352": "OptiFine_1.11_HD_U_G5.jar",
+  "c2ee1e1019ab26bee56447f4df8a2639d2029925": "preview_OptiFine_1.11_HD_U_G5_pre1.jar",
+  "083a002215e2174c0d40af20d2f3844ea349a354": "OptiFine_1.11.2_HD_U_B5.jar",
+  "eb92ce00048faa95b184d121fa667074532fb9db": "OptiFine_1.11.2_HD_U_B6.jar",
+  "7449a2db44e86303d588b526dc73127c16b0e94f": "OptiFine_1.11.2_HD_U_B7.jar",
+  "3e1006c935fe27d83459e77d336460ac5b5c81b4": "OptiFine_1.11.2_HD_U_B8.jar",
+  "049e7e134e8c7364ab61810d84289394e17921de": "OptiFine_1.11.2_HD_U_B9.jar",
+  "4871f2edf7ded30c374aa770e9ea4adcc0b786d0": "OptiFine_1.11.2_HD_U_C1.jar",
+  "e7a54d9e203a1b951f8373ab6dcdedb348e536b1": "OptiFine_1.11.2_HD_U_C2.jar",
+  "8d7fd0facc2299f3dad9dc7c19cc13f72a780343": "OptiFine_1.11.2_HD_U_C3.jar",
+  "20db26eaafb1c4ebd99e1dc2fffe4a62456bf60e": "OptiFine_1.11.2_HD_U_C7.jar",
+  "e4efcf05086389fe18d6fe62eb8ab7512a07323c": "OptiFine_1.11.2_HD_U_F5.jar",
+  "65c425ab628d1748b489dee8619271402428509e": "OptiFine_1.11.2_HD_U_G5.jar",
+  "f253807a4689e44da030acd5c2187d2184885e87": "preview_OptiFine_1.11.2_HD_U_G5_pre1.jar",
+  "1fdacab6f3b0df1f46142acf9c427db2a653d680": "OptiFine_1.12_HD_U_C2.jar",
+  "a62a02c8437a0dccaf2ea89ab8392fd40dc92eb1": "OptiFine_1.12_HD_U_C3.jar",
+  "36d6f6f64048f68dd248a4d3c43a6f5e51fbb9c5": "OptiFine_1.12_HD_U_C4.jar",
+  "fd8e0e3ba43568e5ca0ce31c87373806d269b7e5": "OptiFine_1.12_HD_U_C5.jar",
+  "25ba634e5105e6d1e615dad0046905b68313cc9f": "OptiFine_1.12_HD_U_C7.jar",
+  "b9cd2775fc49bf009f82d3ce36235b1e702d46bb": "OptiFine_1.12_HD_U_F5.jar",
+  "3b8369d33c3257cb247c22b13a41b7db0924e948": "OptiFine_1.12_HD_U_G5.jar",
+  "aeee885ccf821c34d86537184389873d8c312ae1": "preview_OptiFine_1.12_HD_U_G5_pre1.jar",
+  "c754771bf6a7371a7084459505c244cbec61a7cf": "OptiFine_1.12.1_HD_U_C5.jar",
+  "4362a9d38542b5f4ba07782fc4d07949f4fede08": "OptiFine_1.12.1_HD_U_C6.jar",
+  "38785968beeb796cde55f91995c6cf8bfbc3b062": "OptiFine_1.12.1_HD_U_C7.jar",
+  "e6f9e6b573119c052062192695fed4ef388db9c1": "OptiFine_1.12.1_HD_U_F5.jar",
+  "3c9cd74810cad75de5091633a1e0c7d3d76ea09c": "OptiFine_1.12.1_HD_U_G5.jar",
+  "aaaaff3ae13a0cdffa2475632cf6303b9f86e0b0": "preview_OptiFine_1.12.1_HD_U_G5_pre1.jar",
+  "a9d21f084a485bc12fce8c9bea1660c6d4b08855": "OptiFine_1.12.2_HD_U_C5.jar",
+  "2159a0a754828d63446fca7b6f8fa57b710c6048": "OptiFine_1.12.2_HD_U_C6.jar",
+  "8ed8009fc82b43909190882927f335d5250a0e19": "OptiFine_1.12.2_HD_U_C7.jar",
+  "a55768a83db4ad0599f68d9bf3fa8041e2ae3852": "OptiFine_1.12.2_HD_U_C8.jar",
+  "e0236d21a2a164f2af1cfff8f9f325f53c9125f2": "OptiFine_1.12.2_HD_U_C9.jar",
+  "b91a0d82c24eef95be0af92993b14e94b842f166": "OptiFine_1.12.2_HD_U_D1.jar",
+  "04c28238506dc3561addb6efb87c9878d5b82ffe": "OptiFine_1.12.2_HD_U_D2.jar",
+  "b784000951d41f54d67685a0a275d9f61f810514": "OptiFine_1.12.2_HD_U_D3.jar",
+  "343f814410401ebdbb3314deb17c27cbab67bfac": "OptiFine_1.12.2_HD_U_E1.jar",
+  "5c87706b6d14061fed248506d8e3f95b7824ad18": "OptiFine_1.12.2_HD_U_E2.jar",
+  "e805d4be5c2a3343488c573145606e90bb13816d": "OptiFine_1.12.2_HD_U_E3.jar",
+  "0e8d45666e80829c9ab74527628dace9187fbfb5": "OptiFine_1.12.2_HD_U_F4.jar",
+  "84ada0f48bcfb16c37c49283627597bb74d935f6": "OptiFine_1.12.2_HD_U_F5.jar",
+  "ca3aea3a09ce215906c346fe190907fe0347b0c4": "OptiFine_1.12.2_HD_U_G5.jar",
+  "23a8be042f354ec97c99672906c3e61fdf54ca2c": "preview_OptiFine_1.12.2_HD_U_F6_pre1.jar",
+  "b71f993a364c7945081cc6cde9a20d29b4e43f1f": "preview_OptiFine_1.12.2_HD_U_G5_pre1.jar",
+  "ab2118b1ed23444d6decf081e0295e4c679af6c2": "preview_OptiFine_1.12.2_HD_U_G6_pre1.jar",
+  "25498de48dd9b7ed2ba5b83464950ad132e61c1f": "preview_OptiFine_1.14_HD_U_F1_pre6.jar",
+  "396ce7f0e22aae3543134baabd61ad547334c0aa": "OptiFine_1.14.2_HD_U_F1.jar",
+  "c8c6da3e2ae32d020d9001d4489aad702680f50f": "preview_OptiFine_1.14.2_HD_U_F1_pre15.jar",
+  "52420ef34128a8b15d7c8f5ed8f7ebc94b708efd": "OptiFine_1.14.3_HD_U_F1.jar",
+  "887d648f26f7ba17ea34c0c2dcff4096f7a226b1": "OptiFine_1.14.3_HD_U_F2.jar",
+  "ad8a8f60931f48e2873238d1460268bb4111f6c9": "OptiFine_1.14.4_HD_U_F2.jar",
+  "c9710081fb7012ddb56838ac54653ac2258a2404": "OptiFine_1.14.4_HD_U_F3.jar",
+  "c09f4d1ad66df8e3039334023422f1bc8cc211b8": "OptiFine_1.14.4_HD_U_F4.jar",
+  "3408258990309de773cc5a8ab71cb4137718a82b": "OptiFine_1.14.4_HD_U_F5.jar",
+  "117c01a5431244a8b6a3ac393374dac9624f9be6": "OptiFine_1.14.4_HD_U_G5.jar",
+  "ac602fe6a39d2fb4cadfe08e87af0b0daa2d8ac9": "preview_OptiFine_1.14.4_HD_U_G5_pre1.jar",
+  "630a32be9b711b5a479507159d5d2598189fed33": "OptiFine_1.15.2_HD_U_G6.jar",
+  "8339858b33056ec8975f6c0c9e1694a11f0d209a": "preview_OptiFine_1.15.2_HD_U_G1_pre1.jar",
+  "6cdf96d972b5f70c4575ff875a031c4931985686": "preview_OptiFine_1.15.2_HD_U_G1_pre10.jar",
+  "489d2284f2d50bd7c7cf4c216a766503d37e1f3c": "preview_OptiFine_1.15.2_HD_U_G1_pre12.jar",
+  "c66d412c4cb46c6f2c76c224dc45a62d30ee8b43": "preview_OptiFine_1.15.2_HD_U_G1_pre13.jar",
+  "582eb1d6470cc133db563bd1c2c8bc2068215806": "preview_OptiFine_1.15.2_HD_U_G1_pre18.jar",
+  "64d738862683c54a22e1856b2c13379599ca79ce": "preview_OptiFine_1.15.2_HD_U_G1_pre19.jar",
+  "3da9d466c847c50a73dc634dabc6a57f3b24e2f7": "preview_OptiFine_1.15.2_HD_U_G1_pre2.jar",
+  "e6583246a85dba26a478dd4925c298bb5b3f277a": "preview_OptiFine_1.15.2_HD_U_G1_pre20.jar",
+  "84c5d50e26aaa02733fa15a8c13ab845fbdea97f": "preview_OptiFine_1.15.2_HD_U_G1_pre21.jar",
+  "c55e449386eeca34df5b428d85927242fc841438": "preview_OptiFine_1.15.2_HD_U_G1_pre22.jar",
+  "459e17c77059671ef5daa9ab794400e8ae25095d": "preview_OptiFine_1.15.2_HD_U_G1_pre23.jar",
+  "2c6e4f61b1ceea92b76e0be40bc672e5b6d58efe": "preview_OptiFine_1.15.2_HD_U_G1_pre24.jar",
+  "4ea53e3d202239c5ffa2affa809e36998194f1bc": "preview_OptiFine_1.15.2_HD_U_G1_pre26.jar",
+  "29861ba50021b08200ef33f77c776f9f5b7135f7": "preview_OptiFine_1.15.2_HD_U_G1_pre27.jar",
+  "454dc0e03dab9d30a2ccce5823b7a0b309f5c859": "preview_OptiFine_1.15.2_HD_U_G1_pre28.jar",
+  "3c3623d75dc47722149edfb93fdca121c32e8987": "preview_OptiFine_1.15.2_HD_U_G1_pre29.jar",
+  "942e23fa0169c693fb1b645fae4db9217c6b5916": "preview_OptiFine_1.15.2_HD_U_G1_pre3.jar",
+  "bdbd92e5252c0afc0f22d6d5840f96762e5d01ea": "preview_OptiFine_1.15.2_HD_U_G1_pre30.jar",
+  "5daa9461c5762bdd647665f49d2e0ef0eb348910": "preview_OptiFine_1.15.2_HD_U_G1_pre4.jar",
+  "0029ab50050d19f4009f0a7d708982dde736f022": "preview_OptiFine_1.15.2_HD_U_G1_pre5.jar",
+  "646b279927cab6036e8f295efd5bda268acd85cf": "preview_OptiFine_1.15.2_HD_U_G1_pre7.jar",
+  "f11e79a7bc91a5fd985cb756445fc88e8c2dd31b": "preview_OptiFine_1.15.2_HD_U_G1_pre9.jar",
+  "1e9869b63a89a8ab81a58e1473dd2c2291fbd943": "preview_OptiFine_1.15.2_HD_U_G6_pre5.jar",
+  "87533b8ac0dfeb11241041f197f8f95c0ffa8c08": "OptiFine_1.16.1_HD_U_G2.jar",
+  "3e610c9bd89ae2a54cc06de6dfb1b00cd45e9895": "preview_OptiFine_1.16.1_HD_U_G2_pre1.jar",
+  "df817e1ab0e577be1dfb6c20a9b628d3d725c780": "preview_OptiFine_1.16.1_HD_U_G2_pre10.jar",
+  "dbca331e7abbe64d6aa360e6a93beec2935d24e3": "preview_OptiFine_1.16.1_HD_U_G2_pre11.jar",
+  "6fef880338cabe32443557762ca43fb36fe01f7c": "preview_OptiFine_1.16.1_HD_U_G2_pre12.jar",
+  "ea7bea6511f3b20aa672544d28dbc6d1a2ee8b41": "preview_OptiFine_1.16.1_HD_U_G2_pre13.jar",
+  "efdc788f59e1c1bcde3b64430322d8990ce7c7d6": "preview_OptiFine_1.16.1_HD_U_G2_pre14.jar",
+  "388100110b4dc8ef28eaa2f3a4ae2f33a8beb5ae": "preview_OptiFine_1.16.1_HD_U_G2_pre15.jar",
+  "63f5f097ce2e678d69767981b09b133ab8eac4f5": "preview_OptiFine_1.16.1_HD_U_G2_pre16.jar",
+  "c56031c3f6e5dcad536115e9f6a1fb5710b72391": "preview_OptiFine_1.16.1_HD_U_G2_pre2.jar",
+  "da269cdb109b6441ebed179a8d9f974590006cbb": "preview_OptiFine_1.16.1_HD_U_G2_pre3.jar",
+  "ad9b5d4e0bdd5697d4f6a6b9c30a64977bb8834e": "preview_OptiFine_1.16.1_HD_U_G2_pre4.jar",
+  "f6d5ea6cedff1f80bed298f9b456de2448b1f268": "preview_OptiFine_1.16.1_HD_U_G2_pre5.jar",
+  "f57a4269d404d4025de4d864b88510504e785e19": "preview_OptiFine_1.16.1_HD_U_G2_pre6.jar",
+  "28b46592e2f510a246a8bf62a2b12e808094167c": "preview_OptiFine_1.16.1_HD_U_G2_pre7.jar",
+  "26207daec6acc66250116e4f73295c9a031b491a": "preview_OptiFine_1.16.1_HD_U_G2_pre8.jar",
+  "6902e902866b765ff8e31716980c2067d491e004": "preview_OptiFine_1.16.1_HD_U_G2_pre9.jar",
+  "dde4274c696063496323731ad7b58e0f6d7265af": "OptiFine_1.16.2_HD_U_G3.jar",
+  "5b5627a814e8c95aa7ac27fa4cf2cc0b8bd4519b": "OptiFine_1.16.2_HD_U_G5.jar",
+  "5dafc10061020c519ba4abe4982a7dc80eae30f6": "preview_OptiFine_1.16.2_HD_U_G3_pre1.jar",
+  "0c0d9828984da34f9d5967027c244bb2c83a4396": "preview_OptiFine_1.16.2_HD_U_G3_pre2.jar",
+  "7c791e4348808132b8c7b59e6350ae2ee25a1918": "preview_OptiFine_1.16.2_HD_U_G3_pre3.jar",
+  "9a30a2cbc81095d38b4dc17e7d30a4b84e10e235": "preview_OptiFine_1.16.2_HD_U_G3_pre4.jar",
+  "ec1a4ce97e29c9ee2ac259d98e35bc386035a66d": "preview_OptiFine_1.16.2_HD_U_G3_pre5.jar",
+  "e03b0cdfbbcf01b1371b3e1090dee64e60a759d8": "preview_OptiFine_1.16.2_HD_U_G3_pre6.jar",
+  "40ae5fbb4e3724d6e5525d2688445c09ecfe5d39": "preview_OptiFine_1.16.2_HD_U_G3_pre7.jar",
+  "dc83d55f74722e1e6f503817e00e5ba2e6cb4abb": "OptiFine_1.16.3_HD_U_G3.jar",
+  "89d9472ee507946caa227e226524e5260ed944db": "OptiFine_1.16.3_HD_U_G4.jar",
+  "6a8f57ca84628da47b011e608ff449cde7ec13ed": "OptiFine_1.16.3_HD_U_G5.jar",
+  "f53bad69adaac9e523577dcb1c65b158802f3dee": "preview_OptiFine_1.16.3_HD_U_G3_pre2.jar",
+  "5b970eeae2ba07316b3e3a53da1d71de87c9f9f2": "preview_OptiFine_1.16.3_HD_U_G4_pre1.jar",
+  "599d9de6b656077b03fbebc9478924c548a6e9e0": "OptiFine_1.16.4_HD_U_G5.jar",
+  "7cce72db1f77c6178b549fa430e241eadb318f69": "OptiFine_1.16.4_HD_U_G6.jar",
+  "f49c042fa099907eafcbe22d7035d84f8b5715f1": "OptiFine_1.16.4_HD_U_G7.jar",
+  "f0b1eb59acdae57e10bb928046ee26012ef220ad": "preview_OptiFine_1.16.4_HD_U_G6_pre12.jar",
+  "ded7894eebda787b7bd5013aa8c66577f2ba03fc": "preview_OptiFine_1.16.4_HD_U_G7_pre1.jar",
+  "57cfcec3dd99b9f0950d0d6305bc95ecd8563212": "OptiFine_1.16.5_HD_U_G6.jar",
+  "706fb33784045d69e7ac5730426d813a39511dcd": "OptiFine_1.16.5_HD_U_G7.jar",
+  "137363842c5bfdebb72356a4079faeef3157eb3c": "OptiFine_1.16.5_HD_U_G8.jar",
+  "ad0f1577ce02a703185e46ee9e24fdeb65479fd5": "preview_OptiFine_1.16.5_HD_U_G7_pre10.jar",
+  "11770876367980da546c68bc95c4f794582907f2": "preview_OptiFine_1.16.5_HD_U_G7_pre11.jar",
+  "c5b32d2bad3bd54c31ddb29869a55fe44409cfe2": "preview_OptiFine_1.16.5_HD_U_G7_pre2.jar",
+  "9fc9cc09e72a3060d577f62f3535820056b0c2d4": "preview_OptiFine_1.16.5_HD_U_G7_pre4.jar",
+  "577fae32b60ac8d1b91e3fa645dc004d4a9e513e": "preview_OptiFine_1.16.5_HD_U_G7_pre5.jar",
+  "4bccf7f371ac83523796b4706569cc5077c46aea": "preview_OptiFine_1.16.5_HD_U_G7_pre6.jar",
+  "97b8d413a909354e2e0f42943cf292941dfe4c38": "preview_OptiFine_1.16.5_HD_U_G7_pre7.jar",
+  "9c48a804ee990e526000c7061bde9aa6f75d62a6": "preview_OptiFine_1.16.5_HD_U_G7_pre8.jar",
+  "9a9b69a52a4514f5d25c9f47127a822e93458fa3": "preview_OptiFine_1.16.5_HD_U_G7_pre9.jar",
+  "d16a450ec4205d02319480799008d8177ba05d69": "preview_OptiFine_1.16.5_HD_U_G8_pre1.jar",
+  "539c215aa0e8b8f696b325e89f3f9a3658ab32c8": "preview_OptiFine_1.16.5_HD_U_G8_pre10.jar",
+  "311ed81a27d24047b6ade33f46ac21c962897016": "preview_OptiFine_1.16.5_HD_U_G8_pre11.jar",
+  "4bc50f85809a299d30c3e3e73cfd87cad61cf7e6": "preview_OptiFine_1.16.5_HD_U_G8_pre12.jar",
+  "7de1b8e9f7cd6d7ca941d90121e50206aba80c68": "preview_OptiFine_1.16.5_HD_U_G8_pre13.jar",
+  "a4e021a75aab7ed1eb83ff7b45182d497aa930f2": "preview_OptiFine_1.16.5_HD_U_G8_pre14.jar",
+  "0ddcc4f47e10b2d671ebbf9147eb16cf8f1bb92a": "preview_OptiFine_1.16.5_HD_U_G8_pre2.jar",
+  "b8600be4fde6f8cc3c28173cc9bde6923956ff42": "preview_OptiFine_1.16.5_HD_U_G8_pre3.jar",
+  "d46b10098309929d9a6583323f059e65ba40a5e5": "preview_OptiFine_1.16.5_HD_U_G8_pre4.jar",
+  "e835424b36fdae3d5f46c6bf096852848127f1e7": "preview_OptiFine_1.16.5_HD_U_G8_pre5.jar",
+  "5a84983221331597f58e9636d41f1fb0c9e3de61": "preview_OptiFine_1.16.5_HD_U_G8_pre6.jar",
+  "d03ce2209d787539e5e51f80a7cbffc69a49ce9f": "preview_OptiFine_1.16.5_HD_U_G8_pre7.jar",
+  "1c646dc058aa32898917589858d900407883ba3f": "preview_OptiFine_1.16.5_HD_U_G8_pre8.jar",
+  "9bf369aa609e5612247473326dc298e6e6c9fecf": "preview_OptiFine_1.16.5_HD_U_G8_pre9.jar",
+  "b88b05278fbbf400cb5ec0cc26e0c5b7306e0c1e": "preview_OptiFine_1.17_HD_U_G9_pre16.jar",
+  "a6beac3091d17a4ba420116c75c89faeaee48539": "preview_OptiFine_1.17_HD_U_G9_pre17.jar",
+  "2839c5e74f64500561ee3e8605c51d9f06727c22": "preview_OptiFine_1.17_HD_U_G9_pre18.jar",
+  "455243ff55177189fff140ba7f4c4777cc977ef6": "preview_OptiFine_1.17_HD_U_G9_pre19.jar",
+  "bcc390e34bd529a86e6ae0e25d50417f46ba482f": "preview_OptiFine_1.17_HD_U_G9_pre20.jar",
+  "d30c23d745df54fd6ea2374e9c0b4392f0a78199": "preview_OptiFine_1.17_HD_U_G9_pre21.jar",
+  "075e7f8473b6785c3c6bbeeb41a3728f6ff3c3ba": "preview_OptiFine_1.17_HD_U_G9_pre22.jar",
+  "2ffaee36c717ae918cc93661df739740636900c9": "preview_OptiFine_1.17_HD_U_G9_pre23.jar",
+  "4385493e7ce4c6f4a3945f1d96246bce0b151c7e": "preview_OptiFine_1.17_HD_U_G9_pre24.jar",
+  "bcc33e67f134861eb30b1f0b9a829183c8afdebf": "preview_OptiFine_1.17_HD_U_G9_pre25.jar",
+  "6a8e34605cc828091027d9f011b804d916808af4": "preview_OptiFine_1.17_HD_U_G9_pre26.jar",
+  "4714bdceaefc15e0af9d5c72de8c05cf3051d760": "OptiFine_1.17.1_HD_U_G9.jar",
+  "cc64084e73d6423baf7ccbdd9f3760dd56f2fce5": "OptiFine_1.17.1_HD_U_H1.jar",
+  "1ee73bd882385a7abb9896b9469586741a6850a8": "preview_OptiFine_1.17.1_HD_U_G9_pre26.jar",
+  "537c1fbee9ebe25b49a8e6fb93db162d217f1c83": "preview_OptiFine_1.17.1_HD_U_G9_pre27.jar",
+  "68e1124f4b0376773d8d581da78f9bb6fc76486e": "preview_OptiFine_1.17.1_HD_U_G9_pre28.jar",
+  "3f80a562b39439831491c650c65ecb762e70d5f7": "preview_OptiFine_1.17.1_HD_U_G9_pre29.jar",
+  "9751c69568a61ce5b2a602b4dcf77c1cea57c709": "preview_OptiFine_1.17.1_HD_U_G9_pre30.jar",
+  "162fa1b4a0d5b89dad6030b5fd5903a3f24d39c7": "preview_OptiFine_1.17.1_HD_U_G9_pre31.jar",
+  "c4f3a33d892948927cecfaa60b284217325557c5": "preview_OptiFine_1.17.1_HD_U_G9_pre32.jar",
+  "12dbbc8ccd8dc02806768fb3fbe4a2d8c7c11301": "preview_OptiFine_1.17.1_HD_U_G9_pre33.jar",
+  "f74d1dfcb24c43e633076c63dd4492b29fca14b3": "preview_OptiFine_1.17.1_HD_U_G9_pre34.jar",
+  "42e55681fb106475ef13d5c5ef7113fb631392d4": "preview_OptiFine_1.17.1_HD_U_G9_pre35.jar",
+  "245ddb68349f5f81d067f4d9402d62db3d439d50": "preview_OptiFine_1.17.1_HD_U_H1_pre1.jar",
+  "0ac033f5ba4089311af55172281e73df143b9ac4": "preview_OptiFine_1.17.1_HD_U_H1_pre2.jar",
+  "68a3727bcdb0eac0986ff4e883d93fef406eb1c3": "preview_OptiFine_1.17.1_HD_U_H1_pre3.jar",
+  "a6534877558f0438bda604dc43093d61c6de88ae": "preview_OptiFine_1.17.1_HD_U_H1_pre4.jar",
+  "3e18db17b8695feb0a188ecdcb81b561d9d7030c": "preview_OptiFine_1.17.1_HD_U_H1_pre5.jar",
+  "c2e0c4391a671cd06931f7b6e965085c04c58762": "preview_OptiFine_1.17.1_HD_U_H1_pre6.jar",
+  "1ffb7325df5bf01b1d99bbbed8006a477b861394": "preview_OptiFine_1.17.1_HD_U_H1_pre7.jar",
+  "f2fa727e67b4795ddea3cc37cc5ced42e9c3b0c5": "preview_OptiFine_1.17.1_HD_U_H1_pre8.jar",
+  "aee167aff9937a068d514c85e3f8c766db99ed43": "preview_OptiFine_1.17.1_HD_U_H1_pre9.jar",
+  "59709e09632c80ab80ffcc4b5bf380d073bf467f": "preview_OptiFine_1.17.1_HD_U_H2_pre1.jar",
+  "52629bc5319ec203edd42de1776cb8d67a0e6b1b": "OptiFine_1.18_HD_U_H3.jar",
+  "e5077b4be03956118613162b5dbcf90406b27747": "preview_OptiFine_1.18_HD_U_H3_pre7.jar",
+  "326c160481cc849bccb821939992c101a8fe163b": "OptiFine_1.18.1_HD_U_H4.jar",
+  "1679654fdf49fd1216b090d51d3d8ec906094619": "OptiFine_1.18.1_HD_U_H5.jar",
+  "c86534ee821a78efc741c9cb407eec76625e1bab": "OptiFine_1.18.1_HD_U_H6.jar",
+  "34c98382131efa1394cff06528238dc44d255794": "preview_OptiFine_1.18.1_HD_U_H4_pre1.jar",
+  "d6cd0a2d0243ecad107220bff639eb46277762ea": "preview_OptiFine_1.18.1_HD_U_H5_pre1.jar",
+  "e24d766864f9238b94be5b3ad65608d7eb521fad": "preview_OptiFine_1.18.1_HD_U_H5_pre2.jar",
+  "bc1b87a6379acf5a5dca2a56196080ace49e4864": "preview_OptiFine_1.18.1_HD_U_H5_pre3.jar",
+  "555a6b8e420bd63a04d9f338d61f3333b4ccf5d9": "preview_OptiFine_1.18.1_HD_U_H5_pre4.jar",
+  "1d02694393f10992cbbd11a802568b0890b4dc81": "preview_OptiFine_1.18.1_HD_U_H5_pre5.jar",
+  "e3a22adc6931dcd7513f26afa1adecd62a35641b": "preview_OptiFine_1.18.1_HD_U_H5_pre6.jar",
+  "445a8cb8a1d565d8a1fabc0ba984c5936edbf561": "OptiFine_1.18.2_HD_U_H6.jar",
+  "8d83d4d5e325887e000a462029d2bf7a6e77eebc": "OptiFine_1.18.2_HD_U_H7.jar",
+  "2a461188167c1da6b1cfd520d85a656f45c74d70": "OptiFine_1.18.2_HD_U_H9.jar",
+  "e591777f272df533b62260a6dbe0e6cde62066f6": "preview_OptiFine_1.18.2_HD_U_H6_pre1.jar",
+  "f7c727c99e7f58ef9b86cc96fb894f628391016c": "preview_OptiFine_1.18.2_HD_U_H7_pre1.jar",
+  "cb51529f94e0eff5b9da92c8f70b1d498662a115": "preview_OptiFine_1.18.2_HD_U_H7_pre2.jar",
+  "ceea3c6612d2ec36c6ef1ca4a9355a141df9089f": "preview_OptiFine_1.18.2_HD_U_H7_pre3.jar",
+  "596c3a399889c3e2ef1d8fee994e8cf5a91e457e": "preview_OptiFine_1.18.2_HD_U_H8_pre1.jar",
+  "85f545aeb9d232ae970b0efa24e833f9c5d0fe33": "preview_OptiFine_1.18.2_HD_U_H9_pre1.jar",
+  "b9bbabb8f31f2b04ca1a1a8645df1be701f705bd": "preview_OptiFine_1.18.2_HD_U_H9_pre2.jar",
+  "c2bf213b4f60b6a29e402e3eaf219a4c85a5d1e6": "preview_OptiFine_1.18.2_HD_U_H9_pre3.jar",
+  "64c8c35313d25a64a8a8677cb851a2c83556ddc8": "OptiFine_1.19_HD_U_H8.jar",
+  "c668eaf9b6ce4e64f26a29fb27e830229ab4bef3": "OptiFine_1.19_HD_U_H9.jar",
+  "cda9130e0d36f0d6e06950ab393a8929b502a440": "preview_OptiFine_1.19_HD_U_H8_pre1.jar",
+  "cd1ae81f544672df776dc4426269771d2e82d0b2": "preview_OptiFine_1.19_HD_U_H8_pre10.jar",
+  "cb3ad2a9b4c23675ca569058f55dd174eed67a38": "preview_OptiFine_1.19_HD_U_H8_pre2.jar",
+  "2f7139ea0888ed18006e3a39b7475e88a3fd545d": "preview_OptiFine_1.19_HD_U_H8_pre3.jar",
+  "85cd70bb714e65935abf351811889a47a648bb96": "preview_OptiFine_1.19_HD_U_H8_pre4.jar",
+  "c65cbae4c1cfb5b9a5a573e4b83424df2d81b172": "preview_OptiFine_1.19_HD_U_H8_pre5.jar",
+  "10cd57890ebf449f5c258cff1c60d8dcefcc6cf6": "preview_OptiFine_1.19_HD_U_H8_pre6.jar",
+  "eb03e60c2fa9904a47eec1ef4a2c8804ee6cc0b8": "preview_OptiFine_1.19_HD_U_H8_pre7.jar",
+  "40d0b514168161fdefc91594f0d3f774f831d7de": "preview_OptiFine_1.19_HD_U_H8_pre8.jar",
+  "8e5bedd1c1a3641caad0743c4629db51c11f8feb": "preview_OptiFine_1.19_HD_U_H9_pre1.jar",
+  "7745216a810f0d617ed17a520fda44e12456492f": "preview_OptiFine_1.19_HD_U_H9_pre2.jar",
+  "6d6ed920eb99836e76549a7803af85881fcdee34": "preview_OptiFine_1.19_HD_U_H9_pre3.jar",
+  "7604e63ca74876b4e8ea9c3a36dbe80111c776b1": "preview_OptiFine_1.19_HD_U_H9_pre4.jar",
+  "b42dcce86c88ad4bcfa52a9d297afa800477aa78": "OptiFine_1.19.1_HD_U_H9.jar",
+  "648427a02940b3c53b3678cd5df1ff6997bd1e6c": "preview_OptiFine_1.19.1_HD_U_H9_pre1.jar",
+  "7cc221a6df6831b62c3b676b5f958e82a4487fd8": "OptiFine_1.19.2_HD_U_H9.jar",
+  "f304c56c7ab9119ce4269f2b019cd4668f48376d": "OptiFine_1.19.2_HD_U_I1.jar",
+  "708c1ecc148a0bd7d341e8f5e005e670903650f7": "OptiFine_1.19.2_HD_U_I2.jar",
+  "e0e924990bd12cc499fc89439f0b2c50b6e147fa": "preview_OptiFine_1.19.2_HD_U_I1_pre1.jar",
+  "465b229481c0a285195a168bf6581549a5cd7373": "preview_OptiFine_1.19.2_HD_U_I1_pre2.jar",
+  "af4398d0ce0628bcc0204e61c157e3c8951b9ad5": "preview_OptiFine_1.19.2_HD_U_I1_pre3.jar",
+  "35ef18f953bbea9a4cba6e14d0731d56f888114f": "preview_OptiFine_1.19.2_HD_U_I1_pre4.jar",
+  "b24d8725a8d06e1c190d1d2b3bc51c899f74b36d": "OptiFine_1.19.3_HD_U_I3.jar",
+  "f5ce615d9886e377079fd13cc4700a51d5a9c7b6": "preview_OptiFine_1.19.3_HD_U_I2_pre1.jar",
+  "10e6d97ea2c97cf0575a7c587fb11e1ddb73aa71": "preview_OptiFine_1.19.3_HD_U_I2_pre2.jar",
+  "89718cd608225d7c23f7e180d011daa4a47ce6bd": "preview_OptiFine_1.19.3_HD_U_I2_pre3.jar",
+  "204baf0fd59432054aebd2f83c83fe15fdd3e611": "preview_OptiFine_1.19.3_HD_U_I2_pre4.jar",
+  "90a52b3adc94a1b9a70f03f4c4ea14dfdf3424d8": "preview_OptiFine_1.19.3_HD_U_I2_pre5.jar",
+  "050d787936cc239ea8db0aa250d2ed72a44fa71d": "OptiFine_1.19.4_HD_U_I3.jar",
+  "253e9d29c6826c134fbdeea074d1d91c3410225c": "OptiFine_1.19.4_HD_U_I4.jar",
+  "068b998d6c5db5b3bb7ad6a0a7d0c6aefc4dc191": "preview_OptiFine_1.19.4_HD_U_I3_pre3.jar",
+  "a8b9156811c4745dbd612ebbb1df6f93d2fa734a": "preview_OptiFine_1.19.4_HD_U_I3_pre4.jar",
+  "6f2793e6236a27c06a74e8a1876ea6b29be038a7": "preview_OptiFine_1.19.4_HD_U_I3_pre5.jar",
+  "9ad82ef9f32fb5a0e7e7e0c7e8906c9f319a9705": "preview_OptiFine_1.19.4_HD_U_I3_pre6.jar",
+  "cf02ee8b5cf6922fbc28d6ffc8183949fff55d49": "preview_OptiFine_1.19.4_HD_U_I3_pre7.jar",
+  "702e0e9987209f66a5b4f825e7ac658fd49dd4b1": "preview_OptiFine_1.19.4_HD_U_I3_pre8.jar",
+  "04c8eaeadf24c42929500812a8f3f5fe634f0d1f": "preview_OptiFine_1.19.4_HD_U_I3_pre9.jar",
+  "968784e051c2c44f10a4ab448c979572977969c0": "preview_OptiFine_1.19.4_HD_U_I4_pre1.jar",
+  "abe4b1dbda7d95eb47953ef8aa11ed8ed1d8e238": "preview_OptiFine_1.20_HD_U_I5_pre3.jar",
+  "6612ce97d846018126f91cdbae23f0eff6bd2bab": "preview_OptiFine_1.20_HD_U_I5_pre4.jar",
+  "f37d62b6a071f6cd3d6bdfa378b56f7f5b9ec7c6": "preview_OptiFine_1.20_HD_U_I5_pre5.jar",
+  "c44bd276edd10fa910d929a4e7f6b8c7ffe6c23f": "OptiFine_1.20.1_HD_U_I5.jar",
+  "227914ab1037762eae44a2e66a568b87d7a02365": "OptiFine_1.20.1_HD_U_I6.jar",
+  "7484cf60bd8e019c40fa448daa294bd31f52962b": "preview_OptiFine_1.20.1_HD_U_I5_pre4.jar",
+  "953b1b4f15f56329bc4ade851846ef004ebbd5d0": "preview_OptiFine_1.20.1_HD_U_I5_pre5.jar",
+  "ebbdb3076f8291d7f8e10cbec3b1d3c49a0a701d": "preview_OptiFine_1.20.1_HD_U_I5_pre6.jar",
+  "b831d59eeb63122893f87a62ec3e5b3f1cc5586a": "preview_OptiFine_1.20.1_HD_U_I5_pre7.jar",
+  "dc93d991b07b2c5c6d2cd50a553599900c256264": "preview_OptiFine_1.20.1_HD_U_I5_pre8.jar",
+  "040a73427541170bccf162c04f4129b3909b8da1": "preview_OptiFine_1.20.1_HD_U_I5_pre9.jar",
+  "9f5fd75ede7770ad35383443b0a203f026cef5db": "preview_OptiFine_1.20.1_HD_U_I6_pre1.jar",
+  "85d5566b440036b926c5dd306108e48e7fb9b6e8": "preview_OptiFine_1.20.1_HD_U_I6_pre2.jar",
+  "d09c110358117336472414720bf961a581690dc5": "preview_OptiFine_1.20.1_HD_U_I6_pre3.jar",
+  "3365577f5161f9a1bbfefb15675bb5ece27600e4": "preview_OptiFine_1.20.1_HD_U_I6_pre4.jar",
+  "f317c701ae8c533fc34809dbce914bcced4e9a03": "preview_OptiFine_1.20.1_HD_U_I6_pre5.jar",
+  "445b32b14a2c2802d5a0832a708712d2fabafbc2": "preview_OptiFine_1.20.1_HD_U_I6_pre6.jar",
+  "9ea6b1389e88b81797f54b9d8d1e870d3fe8532c": "preview_OptiFine_1.20.2_HD_U_I7_pre1.jar",
+  "f2475e8d5746477d1d2972cd5aae62a5d9c04264": "OptiFine_1.20.4_HD_U_I7.jar",
+  "fec28a2fa152744bc2b47b3c5db3217974aa57ee": "preview_OptiFine_1.20.4_HD_U_I7_pre2.jar",
+  "4068365a57f4b154f4ebbc670894dc9038cf3819": "preview_OptiFine_1.20.4_HD_U_I7_pre3.jar",
+  "2481e0bed7610bfdfe26dea5a6bd8f01537c4ea8": "preview_OptiFine_1.20.4_HD_U_I7_pre4.jar",
+  "150990ba068cfb55bbf9e525c5ab84db0b8903e1": "preview_OptiFine_1.20.4_HD_U_I7_pre5.jar",
+  "fcf0f0f278d1901e4341d5ec8022bede03572430": "preview_OptiFine_1.20.4_HD_U_I7_pre6.jar",
+  "1c3395efa928758505b808291162a2514523b399": "preview_OptiFine_1.20.4_HD_U_I7_pre7.jar",
+  "4bcfec24e5d917ee96e0de6ef095bfc08782217b": "preview_OptiFine_1.20.4_HD_U_I8_pre1.jar",
+  "c931df21309800f1d1ece59b318e6b3e39c98176": "preview_OptiFine_1.20.4_HD_U_I8_pre2.jar",
+  "83f5ad147536405d86bf4ee47a7f7970e1fa8329": "preview_OptiFine_1.20.4_HD_U_I8_pre3.jar",
+  "7c6669319db18c9622d896da2a061479be88acf5": "preview_OptiFine_1.20.4_HD_U_I8_pre4.jar",
+  "bda7bbdd5e2d8c73148372e8c3b34d7c2485a4e8": "preview_OptiFine_1.20.6_HD_U_J1_pre18.jar",
+  "24a20f949a719480523669669a4e5e7339df6186": "OptiFine_1.21.1_HD_U_J1.jar",
+  "6bc74af8f733864539404a3f087aeb6f0cadc6b1": "preview_OptiFine_1.21.1_HD_U_J1_pre10.jar",
+  "4813a6cde6b0f5b20223d486ba7adf0816236a77": "preview_OptiFine_1.21.1_HD_U_J1_pre11.jar",
+  "c99ea98d8537f99b7470f1bcfa81c7ce405fd97e": "preview_OptiFine_1.21.1_HD_U_J1_pre12.jar",
+  "f2f55e6d61a4b90bdaa31eb520f5af78f8a1833b": "preview_OptiFine_1.21.1_HD_U_J1_pre13.jar",
+  "53a15b75ea9d20b644b0d3e9c7280ba172ade053": "preview_OptiFine_1.21.1_HD_U_J1_pre14.jar",
+  "da5575e1138fc2a4c28779cfc5e7d260253ccbdb": "preview_OptiFine_1.21.1_HD_U_J1_pre15.jar",
+  "0930876341beadf7014f57e9ebdd44be445dacbe": "OptiFine_1.21.3_HD_U_J2.jar",
+  "350f63ec3e59d21227f803d4078883884e482660": "preview_OptiFine_1.21.3_HD_U_J2_pre10.jar",
+  "2c48a4210acd25082c220f9601f17d1cc7769098": "preview_OptiFine_1.21.3_HD_U_J2_pre11.jar",
+  "8f0a097b1f7c9d065396bac9230eab62412a8b54": "preview_OptiFine_1.21.3_HD_U_J2_pre12.jar",
+  "f97df5638fcda7f4380d9284b329569d4e1554aa": "preview_OptiFine_1.21.3_HD_U_J2_pre8.jar",
+  "77df50552deea51687592b60c6d24561ee11aa74": "preview_OptiFine_1.21.3_HD_U_J2_pre9.jar",
+  "bcc6a7a140320566a985b1499a59fcb085255d14": "OptiFine_1.21.4_HD_U_J3.jar",
+  "e7bff4575b7311e11d7111506e855b4ad910481f": "preview_OptiFine_1.21.4_HD_U_J3_pre10.jar",
+  "52b2b6defdb8d1c189afb42125079f1b76ff72e2": "preview_OptiFine_1.21.4_HD_U_J3_pre11.jar",
+  "708f70aa5f70919a40d02ba75fc30d2d60c8e7cd": "preview_OptiFine_1.21.4_HD_U_J3_pre12.jar",
+  "86b796325d03d4571809a155c54cf6cba7c7482b": "preview_OptiFine_1.21.4_HD_U_J3_pre13.jar",
+  "618719a6a69eb674ea50c82cffe3d4e3c2f67abf": "preview_OptiFine_1.21.4_HD_U_J3_pre14.jar",
+  "98dd84b0581fcf7a27aa96238acb615b5b719825": "preview_OptiFine_1.21.4_HD_U_J3_pre15.jar",
+  "5c8573ae921082a069a9e7269500178f0c580c97": "preview_OptiFine_1.21.4_HD_U_J3_pre4.jar",
+  "17d51e1bfc94dde95368ab91aa0bb56e89c706bf": "preview_OptiFine_1.21.4_HD_U_J3_pre5.jar",
+  "1a4311606ac94d682800714793ea887c3276b18d": "preview_OptiFine_1.21.4_HD_U_J3_pre6.jar",
+  "12bf1a1b5607b5c62405a8c6ab4e1bd02bef2c8d": "preview_OptiFine_1.21.4_HD_U_J3_pre7.jar",
+  "f1f56403dc575fd975a000bfb133060285cacd6f": "preview_OptiFine_1.21.4_HD_U_J3_pre8.jar",
+  "9584de0e8204f5c855b60741d58af967dfc599a8": "preview_OptiFine_1.21.4_HD_U_J3_pre9.jar",
+  "0b97631e166ace9346744de33b7772df7bf5fbeb": "preview_OptiFine_1.21.4_HD_U_J4_pre1.jar",
+  "a776ec6c072529d4b731e0e6929a8aee56d04e76": "preview_OptiFine_1.21.4_HD_U_J4_pre2.jar",
+  "2a3fdfcbfc9c572b22c7d15c6129b8ea58ea1712": "preview_OptiFine_1.21.8_HD_U_J6_pre13.jar",
+  "ba7ca56c9b33d2fc7f7d22e20ce2765e4d257299": "preview_OptiFine_1.21.8_HD_U_J6_pre14.jar",
+  "097d3acd315b0682a4565ab9cbb4cdc1cc17d81f": "preview_OptiFine_1.21.8_HD_U_J6_pre15.jar",
+  "d7effca0de34c9442f06776848679a684f1f166a": "preview_OptiFine_1.21.8_HD_U_J6_pre16.jar",
+  "696ed52cdfd0ac2eafab8e98575d146b400de530": "preview_OptiFine_1.21.10_HD_U_J7_pre10.jar",
+  "be7bc81f0c9ce15316f76a059b0a690f62c03a5d": "preview_OptiFine_1.21.10_HD_U_J7_pre11.jar",
+  "731e698abe94bbd90cda628f80b4ce6ac5af8188": "preview_OptiFine_1.21.10_HD_U_J7_pre6.jar",
+  "63f189a4b7ff5b53e5bc56391f5274eab8555def": "preview_OptiFine_1.21.10_HD_U_J7_pre7.jar",
+  "7ccfc0085ccdef3f4ec21918a059ddd05171711a": "preview_OptiFine_1.21.10_HD_U_J7_pre8.jar",
+  "aad53ad3346944a12ed088ffbba98cf9eccc474c": "preview_OptiFine_1.21.10_HD_U_J7_pre9.jar",
+  "2800efeb56565f23494d372e7edac29333113e11": "OptiFine_1.21.11_HD_U_J8.jar",
+  "cee35b83c75da33dc07ffbb344386cae5cdc5c5b": "OptiFine_1.21.11_HD_U_J9.jar",
+  "687046282c370e690ec4b4aa6d90a6b42ada3ee1": "preview_OptiFine_1.21.11_HD_U_J8_pre10.jar",
+  "c09b05637610072bc33023d1c901e2726b7d16ce": "preview_OptiFine_1.21.11_HD_U_J8_pre11.jar",
+  "88682b40f08f462c4daae8e6b25ea99b1ed5cd14": "preview_OptiFine_1.21.11_HD_U_J8_pre12.jar",
+  "1c69de725c249d487df676470c71a7c05ece943c": "preview_OptiFine_1.21.11_HD_U_J8_pre3.jar",
+  "921b68e014539d75b77a47ca2117fc9e09ace4ed": "preview_OptiFine_1.21.11_HD_U_J8_pre4.jar",
+  "2fee496a35eeebf39fbb43017b12d752f5c37dee": "preview_OptiFine_1.21.11_HD_U_J8_pre5.jar",
+  "e5b5da810d43c02dccedfd99f83ae8ad63e49966": "preview_OptiFine_1.21.11_HD_U_J8_pre6.jar",
+  "8309638bab4d99258354b4d13c3cd82ff7c9645b": "preview_OptiFine_1.21.11_HD_U_J8_pre7.jar",
+  "b3d208ec7b5015842fcc77b3399b04b24e0b54cb": "preview_OptiFine_1.21.11_HD_U_J8_pre8.jar",
+  "c4ac7401bb5f668e4e92121501d1537cdbe7343c": "preview_OptiFine_1.21.11_HD_U_J8_pre9.jar",
+  "fd96031b5fc4c41ad71581eea53eb122022fff5b": "preview_OptiFine_1.21.11_HD_U_J9_pre1.jar",
+  "a159a217aba02cd7897394a51bd346c3b658b9f9": "preview_OptiFine_1.21.11_HD_U_J9_pre2.jar",
+  "2a784437076b539ea1a3c1a37ec98ff21bc3952c": "preview_OptiFine_1.21.11_HD_U_J9_pre3.jar",
+  "ee32ce4b406e290a0e99685afd09dc44cad03ddd": "preview_OptiFine_1.21.11_HD_U_J9_pre4.jar"
+}

PCLCS/PCLCS.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
 		<TargetFramework>net48</TargetFramework>
@@ -25,10 +25,14 @@
 		<Using Include="System.Diagnostics.CodeAnalysis" />
 		<Using Include="System.Collections" />
 		<Using Include="System.Collections.Generic" />
+		<Using Include="System.Collections.Concurrent" />
 		<Using Include="System.Text" />
+		<Using Include="System.Text.RegularExpressions" />
 		<Using Include="System.Net" />
 		<Using Include="System.Runtime.CompilerServices" />
 		<Using Include="System.Runtime.InteropServices" />
+		<Using Include="Newtonsoft.Json" />
+		<Using Include="Newtonsoft.Json.Linq" />
 		<Using Include="MeloongCore" />
 		<Using Include="MeloongCore.Extensions" />
 		<Using Include="MeloongCore.Wpf" />
@@ -50,4 +54,18 @@
 		<Optimize>True</Optimize>
 	</PropertyGroup>
 
+	<!-- 内嵌的资源 -->
+	<ItemGroup>
+		<EmbeddedResource Include="Launch\JavaWrapper.jar" LogicalName="Launch\JavaWrapper.jar" />
+		<EmbeddedResource Include="Launch\LwjglUnsafeAgent.jar" LogicalName="Launch\LwjglUnsafeAgent.jar" />
+		<EmbeddedResource Include="Resource\WikiEntries.txt" LogicalName="Resource\WikiEntries.txt" />
+		<EmbeddedResource Include="Minecraft\OptiFineHashes.json" LogicalName="Minecraft\OptiFineHashes.json" />
+	</ItemGroup>
+	<ItemGroup>
+	  <Reference Include="Microsoft.VisualBasic" />
+	  <Reference Include="Newtonsoft.Json">
+	    <HintPath>..\Plain Craft Launcher 2\Resources\Newtonsoft.Json.dll</HintPath>
+	  </Reference>
+	</ItemGroup>
+
 </Project>

PCLCS/Resource/Resource.cs

@@ -1,4 +1,4 @@
-namespace PCLCS;
+namespace PCLCS;
 public static class Resource {
 
     /// <summary>
@@ -9,7 +9,6 @@ public static class Resource {
         1 => ModLoaders.Forge,
         3 => ModLoaders.LiteLoader,
         4 => ModLoaders.Fabric,
-        5 => ModLoaders.Quilt,
         6 => ModLoaders.NeoForge,
         _ => ModLoaders.None,
     };
@@ -24,7 +23,6 @@ public static class Resource {
             ModLoaders.Forge => 1,
             ModLoaders.LiteLoader => 3,
             ModLoaders.Fabric => 4,
-            ModLoaders.Quilt => 5,
             ModLoaders.NeoForge => 6,
             _ => 0,
         };

PCLCS/Resource/WikiEntry.cs

@@ -0,0 +1,83 @@
+namespace PCLCS;
+
+/// <summary>
+/// MC 百科条目。
+/// <para/>使用 <see cref="WikiEntry.All"/> 获取所有条目。
+/// </summary>
+public class WikiEntry {
+
+    /// <summary>
+    /// 在 MC 百科中的对应 ID。
+    /// </summary>
+    public int Id;
+    /// <summary>
+    /// 中文译名。
+    /// <c>null</c> 代表没有翻译。
+    /// </summary>
+    public string? ChineseName;
+    /// <summary>
+    /// 各个 Mod 平台的 Slug（例如 advanced-solar-panels）。
+    /// 若没有对应键则为不在该平台上。
+    /// </summary>
+    public Dictionary<ResourcePlatforms, string> Slugs = [];
+    /// <summary>
+    /// MC 百科的浏览量逆序排行，1 代表浏览量最低。
+    /// </summary>
+    public int Popularity;
+
+    /// <summary>
+    /// 内置数据库中的所有 MC 百科条目。
+    /// </summary>
+    public static readonly Lazy<List<WikiEntry>> All = new(() => {
+        var dataLines = FileUtils.ReadAsLines(@"Resource\WikiEntries.txt", type: typeof(WikiEntry)).ToList();
+
+        // 读取最后一行的浏览量
+        Queue<int> popularities = [];
+        for (int i = 0; i < dataLines[^1].Length; i += 3) { // 将每 3 个字符切割成一个元素
+            popularities.Enqueue(int.Parse(dataLines[^1].Substring(i, 3).ConvertRadix(86, 10)));
+        }
+        dataLines.RemoveAt(dataLines.Count - 1);
+
+        // 解析每一行
+        List<WikiEntry> results = [];
+        var lineNumber = 0;
+        foreach (var lineData in dataLines) {
+            lineNumber++;
+            if (lineData == "") continue;
+
+            var popularity = popularities.Dequeue();
+            foreach (var entryData in lineData.Split('¨')) {
+                var entry = new WikiEntry();
+                var parts = entryData.Split('|');
+                var slugs = parts[0];
+                if (slugs.StartsWithF("@")) {
+                    entry.Slugs.Add(ResourcePlatforms.Modrinth, slugs.Replace("@", ""));
+                } else if (slugs.EndsWithF("@")) {
+                    entry.Slugs.Add(ResourcePlatforms.CurseForge, slugs.TrimEnd('@'));
+                    entry.Slugs.Add(ResourcePlatforms.Modrinth, entry.Slugs[ResourcePlatforms.CurseForge]);
+                } else if (slugs.Contains("@")) {
+                    var splitSlugs = slugs.Split('@');
+                    entry.Slugs.Add(ResourcePlatforms.CurseForge, splitSlugs[0]);
+                    entry.Slugs.Add(ResourcePlatforms.Modrinth, splitSlugs[1]);
+                } else {
+                    entry.Slugs.Add(ResourcePlatforms.CurseForge, slugs);
+                }
+
+                entry.Id = lineNumber;
+                entry.Popularity = popularity;
+                if (parts.Length >= 2) {
+                    entry.ChineseName = parts[^1]; // 最后一项
+                    if (entry.ChineseName.Contains("*")) { // 处理 *
+                        var englishName = entry.Slugs.Values.First().Replace("-", " ").Capitalize();
+                        entry.ChineseName = entry.ChineseName.Replace("*", $" ({englishName})");
+                    }
+                }
+                results.Add(entry);
+            }
+        }
+        return results;
+    });
+
+    public override string ToString()
+        => $"{Slugs.GetOrDefault(ResourcePlatforms.CurseForge)}&{Slugs.GetOrDefault(ResourcePlatforms.Modrinth)}|{Id}|{ChineseName}，浏览量 {Popularity}";
+}

Plain Craft Launcher 2/Application.xaml

@@ -1,4 +1,4 @@
-<Application x:Class="Application"
+<Application x:Class="Application"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:behaviors="clr-namespace:PCL.Controls.Behaviors"
@@ -132,33 +132,6 @@
                 <Setter Property="FontFamily" Value="Resources/#PCL English, Microsoft YaHei UI" />
             </Style>
 
-            <!-- ToolTip -->
-            <Style TargetType="ToolTip">
-                <Setter Property="Template">
-                    <Setter.Value>
-                        <ControlTemplate>
-                            <Border Loaded="TooltipLoaded" Unloaded="TooltipUnloaded" BorderBrush="{DynamicResource ColorBrush1}" BorderThickness="1.5" CornerRadius="4" MaxWidth="500" Background="#E5FFFFFF" Margin="0,0,4,4" SnapsToDevicePixels="True">
-                                <Border.Effect>
-                                    <DropShadowEffect Opacity="0.3" BlurRadius="4" ShadowDepth="2" Color="{DynamicResource ColorObject1}" />
-                                </Border.Effect>
-                                <TextBlock Text="{TemplateBinding ContentControl.Content}" TextWrapping="Wrap" Foreground="{DynamicResource ColorBrush1}" Margin="7,5" FontSize="12"/>
-                            </Border>
-                        </ControlTemplate>
-                    </Setter.Value>
-                </Setter>
-            </Style>
-            <Style x:Key="ExtendTextToolTip" TargetType="ToolTip">
-                <Setter Property="Template">
-                    <Setter.Value>
-                        <ControlTemplate>
-                            <Border Loaded="TooltipLoaded" Unloaded="TooltipUnloaded" BorderBrush="{DynamicResource ColorBrush1}" BorderThickness="1" CornerRadius="3" Background="White" Margin="0,0,4,4" SnapsToDevicePixels="True">
-                                <TextBlock Text="{TemplateBinding ContentControl.Content}" TextWrapping="Wrap" Foreground="{DynamicResource ColorBrush1}" Margin="7,5" FontSize="12"/>
-                            </Border>
-                        </ControlTemplate>
-                    </Setter.Value>
-                </Setter>
-            </Style>
-            
             <!-- ScrollViewer -->
             <Style x:Key="MyThumb" TargetType="Thumb">
                 <Setter Property="Stylus.IsPressAndHoldEnabled" Value="false"/>
@@ -287,7 +260,7 @@
                 <Setter Property="Template">
                     <Setter.Value>
                         <ControlTemplate TargetType="local:MyTextBox">
-                            <Grid SnapsToDevicePixels="True" ToolTip="{TemplateBinding ToolTip}">
+                            <Grid SnapsToDevicePixels="True">
                                 <Grid.RowDefinitions>
                                     <RowDefinition MinHeight="28" />
                                     <RowDefinition Height="Auto" />
@@ -473,11 +446,6 @@
             </Style>
             <Style TargetType="ComboBoxItem" x:Key="MyComboBoxItem">
                 <Setter Property="OverridesDefaultStyle" Value="True" />
-                <Setter Property="ToolTipService.Placement" Value="Relative" />
-                <Setter Property="ToolTipService.VerticalOffset" Value="-2" />
-                <Setter Property="ToolTipService.HorizontalOffset" Value="200" />
-                <Setter Property="ToolTipService.InitialShowDelay" Value="150" />
-                <Setter Property="ToolTipService.BetweenShowDelay" Value="150" />
                 <Setter Property="FocusVisualStyle" Value="{x:Null}" />
                 <Setter Property="Background" Value="{StaticResource ColorBrushTransparent}" />
                 <Setter Property="Template">

Plain Craft Launcher 2/Application.xaml.vb

@@ -1,12 +1,18 @@
-Imports System.Reflection
+Imports System.Reflection
 Imports System.Windows.Threading
-Imports Microsoft.Win32
 
 Public Class Application
 
     '开始
     Private Sub Application_Startup(sender As Object, e As StartupEventArgs) Handles Me.Startup
         Try
+            '核心初始化
+            MeloongCore.Main.Init("PCL")
+            MeloongCore.Wpf.Main.Init()
+            If Not (e.Args.Contains("--update") OrElse e.Args.Contains("--gpu") OrElse e.Args.Contains("--memory")) Then '若是通过命令行调用，则不检查单例、不轮换日志（#9137）
+                WaitingMutex(e)
+                Logger.Instance = New PclLogger With {.logFolder = Paths.BaseThenName, .MinLevel = If(ModeDebug, LogLevel.Trace, LogLevel.Info)}
+            End If
             '提升主线程优先级
             Thread.CurrentThread.Priority = ThreadPriority.Highest
             '执行开发版测试
@@ -19,9 +25,7 @@ Public Class Application
             End If
             '检查 .NET Framework 版本
             Try
-                Using ndpKey As RegistryKey = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry32).OpenSubKey("SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full\")
-                    If ndpKey?.GetValue("Release") IsNot Nothing AndAlso CInt(ndpKey.GetValue("Release")) < 528040 Then OldEnvironmentAssert()
-                End Using
+                If CInt(RegistryUtils.TryRead("HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full", "Release", 999999)) < 528040 Then OldEnvironmentAssert()
             Catch ex As Exception
                 Logger.Warn(ex, "检查 .NET Framework 版本失败")
             End Try
@@ -46,7 +50,7 @@ Public Class Application
                     Catch ex As Exception
                         Environment.Exit(ProcessReturnValues.Fail)
                     End Try
-                ElseIf e.Args(0).StartsWithF("--memory") Then
+                ElseIf e.Args(0) = "--memory" Then
                     '内存优化
                     Dim Ram = My.Computer.Info.AvailablePhysicalMemory
                     Try
@@ -64,12 +68,12 @@ Public Class Application
             End If
             '初始化文件结构
             Try
-                DirectoryUtils.Create(PathExeFolder & "PCL\Pictures\")
-                DirectoryUtils.Create(PathExeFolder & "PCL\Musics\")
-                CheckPermissionWithException(PathExeFolder & "PCL\")
+                DirectoryUtils.Create(Paths.Base & "PCL\Pictures\")
+                DirectoryUtils.Create(Paths.Base & "PCL\Musics\")
+                CheckPermissionWithException(Paths.Base & "PCL\")
             Catch ex As Exception
-                MsgBox($"PCL 没有对当前文件夹的权限（{PathExeFolder}PCL\），请尝试：" & vbCrLf &
-                  "1. 将 PCL 移动到其他文件夹" & If(PathExeFolder.StartsWithF("C:", True), "，例如 C 盘和桌面以外的其他位置。", "。") & vbCrLf &
+                MsgBox($"PCL 没有对当前文件夹的权限（{Paths.Base}PCL\），请尝试：" & vbCrLf &
+                  "1. 将 PCL 移动到其他文件夹" & If(PathUtils.GetDiskName(Paths.Base) = "C"c, "，例如 C 盘和桌面以外的其他位置。", "。") & vbCrLf &
                   "2. 删除当前目录中的 PCL 文件夹，然后再试。" & vbCrLf &
                   "3. 右键 PCL 选择属性，打开 兼容性 中的 以管理员身份运行此程序。",
                 MsgBoxStyle.Critical, "运行环境错误")
@@ -80,7 +84,7 @@ RetryCacheCheck:
                 DirectoryUtils.Create(PathTemp)
                 CheckPermissionWithException(PathTemp)
             Catch ex As Exception
-                If PathTemp = Path.GetTempPath() & "PCL\" Then
+                If PathUtils.IsSame(PathTemp, Path.GetTempPath() & "PCL\") Then
                     MyMsgBox("PCL 无法访问缓存文件夹，可能导致程序出错或无法正常使用！" & vbCrLf & vbCrLf & "错误原因：" & ex.GetDisplay(True), "缓存文件夹不可用")
                 Else
                     MyMsgBox("手动设置的缓存文件夹不可用，PCL 将使用默认缓存文件夹。" & vbCrLf & vbCrLf & "错误原因：" & ex.GetDisplay(True), "缓存文件夹不可用")
@@ -90,16 +94,9 @@ RetryCacheCheck:
                 End If
             End Try
             DirectoryUtils.Create(PathTemp & "Cache\")
-            DirectoryUtils.Create(PathAppdata)
-            '要求单例
-            WaitingMutex(e)
+            DirectoryUtils.Create(Paths.AppDataThenName)
             '设置 ToolTipService 默认值
-            ToolTipService.InitialShowDelayProperty.OverrideMetadata(GetType(DependencyObject), New FrameworkPropertyMetadata(300))
-            ToolTipService.BetweenShowDelayProperty.OverrideMetadata(GetType(DependencyObject), New FrameworkPropertyMetadata(400))
-            ToolTipService.ShowDurationProperty.OverrideMetadata(GetType(DependencyObject), New FrameworkPropertyMetadata(9999999))
-            ToolTipService.PlacementProperty.OverrideMetadata(GetType(DependencyObject), New FrameworkPropertyMetadata(Primitives.PlacementMode.Bottom))
-            ToolTipService.HorizontalOffsetProperty.OverrideMetadata(GetType(DependencyObject), New FrameworkPropertyMetadata(8.0))
-            ToolTipService.VerticalOffsetProperty.OverrideMetadata(GetType(DependencyObject), New FrameworkPropertyMetadata(4.0))
+            ToolTipService.InitialShowDelayProperty.OverrideMetadata(GetType(DependencyObject), New FrameworkPropertyMetadata(100))
             '设置网络配置默认值
             ServicePointManager.Expect100Continue = False
             ServicePointManager.DefaultConnectionLimit = 10000
@@ -114,8 +111,7 @@ RetryCacheCheck:
                 FrmStart = New SplashScreen("Images\icon.ico")
                 FrmStart.Show(False, True)
             End If
-            '日志初始化
-            MeloongCore.Main.Init(New PclLogger With {.logFolder = PathUtils.CurrentFolder & "PCL", .MinLevel = If(ModeDebug, LogLevel.Trace, LogLevel.Info)})
+            '基础信息
             Logger.Info($"程序版本：{VersionDisplay} ({VersionCode}{If(CommitHash = "", "", $"，#{CommitHash}")})")
             If BuildType = BuildTypes.Snapshot Then
                 Logger.Info($"识别码：{Identify}{If(ThemeCheckOne(9), "，已解锁反馈主题", "，未解锁反馈主题")}")
@@ -124,14 +120,15 @@ RetryCacheCheck:
             End If
             Logger.Info($"程序路径：{PathExe}")
             Logger.Info($"系统编码：{Encoding.Default.HeaderName} ({Encoding.Default.CodePage}, GBK={IsGBKEncoding})")
-            Logger.Info($"管理员权限：{SystemUtils.HasAdminRole()}")
+            Logger.Info($"管理员权限：{WindowsUtils.HasAdminRole()}")
             '检测异常环境
-            If PathExeFolder.Contains(Path.GetTempPath()) OrElse PathExeFolder.Contains("AppData\Local\Temp\") Then
+            If Paths.Base.Contains(Path.GetTempPath()) OrElse Paths.Base.Contains("AppData\Local\Temp\") Then
                 MyMsgBox("请将 PCL 从压缩包中解压后再使用！" & vbCrLf & "如果不会解压，可以在网上寻找教程。", "需要解压！", "我知道了", IsWarn:=True, ForceWait:=True)
                 FormMain.EndProgramForce(ProcessReturnValues.Cancel)
             End If
-            If Is32BitSystem Then
-                MyMsgBox("PCL 和新版 Minecraft 均不再支持 32 位系统，部分功能将无法使用。" & vbCrLf & "非常建议重装为 64 位系统后再进行游戏！", "环境警告", "我知道了", IsWarn:=True)
+            If Not Environment.Is64BitOperatingSystem Then
+                MyMsgBox("PCL 和新版 Minecraft 均不再支持 32 位系统，请重装为 64 位系统后再进行游戏！", "环境警告", "我知道了", IsWarn:=True, ForceWait:=True)
+                FormMain.EndProgramForce(ProcessReturnValues.Cancel)
             End If
             '计时
             Logger.Info($"第一阶段加载用时：{GetTimeMs() - ApplicationStartTick} ms")
@@ -219,7 +216,7 @@ RetryCacheCheck:
 
     '动态 DLL 加载
     Private Sub New() '这里必须尽早调用，且不能使用任何库，否则加载 MeloongCore 就会导致崩溃
-        Static Prefixes As String() = {"NAudio", "Newtonsoft.Json", "Ookii.Dialogs.Wpf", "Imazen.WebP", "CacheCow.Common", "CacheCow.Client.FileStore", "CacheCow.Client", "System.Net.Http.Formatting", "PCLCS", "MeloongCore.Wpf", "MeloongCore"}
+        Static Prefixes As String() = {"NAudio", "Newtonsoft.Json", "Ookii.Dialogs.Wpf", "Imazen.WebP", "CacheCow.Common", "CacheCow.Client.FileStore", "CacheCow.Client", "ThrottleDebounce", "System.Net.Http.Formatting", "Microsoft.Win32.Registry", "PCLCS", "MeloongCore.Wpf", "MeloongCore"}
         Static LoadedAssemblies As New ConcurrentDictionary(Of String, Lazy(Of Assembly))(StringComparer.Ordinal) '缓存
         AddHandler AppDomain.CurrentDomain.AssemblyResolve,
         Function(sender As Object, Args As ResolveEventArgs) As Assembly
@@ -235,23 +232,21 @@ RetryCacheCheck:
         End Function
     End Sub
     Private Shared Sub ExtractLibwebp() '这个方法会调用 ModBase，进而调用 MeloongCore，所以不能放在 New 里
-        SetDllDirectory(PathPure.TrimEnd("\"c))
+        SetDllDirectory(PathUtils.RemoveSlashSuffix(PathPure.Value))
         Try
-            ExtractResources(PathPure & "libwebp.dll", "libwebp64")
+            ExtractResources(PathPure.Value & "libwebp.dll", "libwebp64")
         Catch ex As Exception
             Logger.Warn(ex, "写入 libwebp.dll 失败") '防止同时加载多个图片时，同时写入文件导致文件占用，进而导致崩溃
         End Try
     End Sub
     Private Declare Function SetDllDirectory Lib "kernel32" Alias "SetDllDirectoryA" (lpPathName As String) As Boolean
 
-    '切换窗口
-
     '控件模板事件
     Private Sub MyIconButton_Click(sender As Object, e As EventArgs)
         Select Case Settings.Get(Of McLoginType)("LoginType")
             Case McLoginType.Ms
                 '微软
-                Dim MsJson As JObject = GetJson(Settings.Get(Of String)("LoginMsJson"))
+                Dim MsJson As JObject = Settings.Get(Of String)("LoginMsJson").DeserializeJson()
                 MsJson.Remove(sender.Tag)
                 Settings.Set("LoginMsJson", MsJson.ToString(Newtonsoft.Json.Formatting.None))
                 If FrmLoginMs.ComboAccounts.SelectedItem Is sender.Parent Then FrmLoginMs.ComboAccounts.SelectedIndex = 0
@@ -291,12 +286,4 @@ RetryCacheCheck:
         End Select
     End Sub
 
-    Public Shared ShowingTooltips As New List(Of Border)
-    Private Sub TooltipLoaded(sender As Border, e As EventArgs)
-        ShowingTooltips.Add(sender)
-    End Sub
-    Private Sub TooltipUnloaded(sender As Border, e As RoutedEventArgs)
-        ShowingTooltips.Remove(sender)
-    End Sub
-
 End Class

Plain Craft Launcher 2/Controls/Behaviors/ClipboardInterceptor.vb

@@ -1,4 +1,4 @@
-' Author: uye (owner of the MaaAssistantArknights team)
+' Author: uye (owner of the MaaAssistantArknights team)
 ' Original Source: MaaAssistantArknights project - https://github.com/MaaAssistantArknights/MaaAssistantArknights
 ' License: Apache License 2.0 (this file only)
 '
@@ -15,12 +15,6 @@
 '
 ' Date: 2025-07-03
 
-Imports System.Windows
-Imports System.Windows.Controls
-Imports System.Windows.Input
-Imports System.Windows.Documents
-Imports System.Linq
-
 Namespace Controls.Behaviors
     Public NotInheritable Class ClipboardInterceptor
         Private Sub New()
@@ -50,8 +44,8 @@ Namespace Controls.Behaviors
 
         Private Shared Sub AddCommandBindingsToTextBox(tb As TextBox)
             tb.CommandBindings.Add(New CommandBinding(ApplicationCommands.Copy, AddressOf OnCopyTextBox))
-            tb.CommandBindings.Add(New CommandBinding(ApplicationCommands.Cut, AddressOf OnCutTextBox))
-            tb.CommandBindings.Add(New CommandBinding(ApplicationCommands.Paste, AddressOf OnPasteTextBox))
+            tb.CommandBindings.Add(New CommandBinding(ApplicationCommands.Cut, AddressOf OnCutTextBox, AddressOf CanEditTextBox))
+            tb.CommandBindings.Add(New CommandBinding(ApplicationCommands.Paste, AddressOf OnPasteTextBox, AddressOf CanEditTextBox))
         End Sub
 
         Private Shared Sub AddCommandBindingsToRichTextBox(rtb As RichTextBox)
@@ -64,51 +58,74 @@ Namespace Controls.Behaviors
             dg.CommandBindings.Add(New CommandBinding(ApplicationCommands.Copy, AddressOf OnCopyDataGrid))
         End Sub
 
+        Private Shared Sub SetClipboardText(text As String)
+            Forms.Clipboard.SetDataObject(text, False, retryTimes:=10, retryDelay:=100) '实际的复制
+            Try
+                System.Windows.Clipboard.Flush() '将数据持久化到系统剪贴板，避免应用程序退出后数据丢失
+            Catch ex As Exception '持久化失败不抛出异常
+                Logger.Warn(ex, $"剪贴板持久化失败（错误码：0x{ex.HResult:X8}）")
+            End Try
+        End Sub
+
         Private Shared Sub OnCopyTextBox(sender As Object, e As ExecutedRoutedEventArgs)
             Dim tb = TryCast(sender, TextBox)
             If tb Is Nothing OrElse tb.SelectionLength <= 0 Then Return
 
             Try
-                Forms.Clipboard.Clear()
-                Forms.Clipboard.SetDataObject(tb.SelectedText, True)
-            Catch
+                SetClipboardText(tb.SelectedText)
+            Catch ex As Exception
+                Logger.Warn(ex, $"复制失败，请稍后再试（错误码：0x{ex.HResult:X8}）", LogBehavior.Toast)
             End Try
 
             e.Handled = True
         End Sub
 
+        Private Shared Sub CanEditTextBox(sender As Object, e As CanExecuteRoutedEventArgs)
+            Dim tb = TryCast(sender, TextBox)
+            e.CanExecute = tb IsNot Nothing AndAlso Not tb.IsReadOnly AndAlso
+                (e.Command IsNot ApplicationCommands.Cut OrElse tb.SelectionLength > 0)
+            e.Handled = True
+        End Sub
+
         Private Shared Sub OnCutTextBox(sender As Object, e As ExecutedRoutedEventArgs)
             Dim tb = TryCast(sender, TextBox)
-            If tb Is Nothing OrElse tb.SelectionLength <= 0 Then Return
+            e.Handled = True
+            If tb Is Nothing OrElse tb.IsReadOnly OrElse tb.SelectionLength <= 0 Then Return
 
             Try
-                Forms.Clipboard.Clear()
-                Forms.Clipboard.SetDataObject(tb.SelectedText, True)
-            Catch
+                SetClipboardText(tb.SelectedText)
+            Catch ex As Exception
+                Logger.Warn(ex, $"剪切失败，请稍后再试（错误码：0x{ex.HResult:X8}）", LogBehavior.Toast)
+                Return
             End Try
 
             tb.SelectedText = String.Empty
-            e.Handled = True
         End Sub
 
         Private Shared Sub OnPasteTextBox(sender As Object, e As ExecutedRoutedEventArgs)
             Dim tb = TryCast(sender, TextBox)
-            If tb Is Nothing Then Return
-
-            If Forms.Clipboard.ContainsText() Then
-                Dim pasteText = Forms.Clipboard.GetText()
-
-                '将换行符替换为空格（#7825）
-                If Not tb.AcceptsReturn Then pasteText = pasteText.ReplaceLineEndings(" ", mergeMultiple:=True)
-
-                Dim start = tb.SelectionStart
-
-                tb.SelectedText = pasteText
-                tb.CaretIndex = start + pasteText.Length
-                tb.SelectionLength = 0
-            End If
-
             e.Handled = True
+            If tb Is Nothing OrElse tb.IsReadOnly Then Return
+
+            Try
+                Dim pasteText = Retrier.Attempt(func:=
+                Function(Attempt) As String
+                    Return If(Forms.Clipboard.ContainsText(), Forms.Clipboard.GetText(), Nothing)
+                End Function, maxAttempts:=10, delay:=Function() TimeSpan.FromMilliseconds(100))
+                If pasteText IsNot Nothing Then
+
+                    '将换行符替换为空格（#7825）
+                    If Not tb.AcceptsReturn Then pasteText = pasteText.ReplaceLineEndings(" ", mergeMultiple:=True)
+
+                    Dim start = tb.SelectionStart
+
+                    tb.SelectedText = pasteText
+                    tb.CaretIndex = start + pasteText.Length
+                    tb.SelectionLength = 0
+                End If
+            Catch ex As Exception
+                Logger.Warn(ex, $"粘贴失败，请稍后再试（错误码：0x{ex.HResult:X8}）", LogBehavior.Toast)
+            End Try
         End Sub
 
         Private Shared Sub OnCopyRichTextBox(sender As Object, e As ExecutedRoutedEventArgs)
@@ -119,9 +136,9 @@ Namespace Controls.Behaviors
             If String.IsNullOrEmpty(textRange.Text) Then Return
 
             Try
-                Forms.Clipboard.Clear()
-                Forms.Clipboard.SetDataObject(textRange.Text, True)
-            Catch
+                SetClipboardText(textRange.Text)
+            Catch ex As Exception
+                Logger.Warn(ex, $"复制失败，请稍后再试（错误码：0x{ex.HResult:X8}）", LogBehavior.Toast)
             End Try
 
             e.Handled = True
@@ -133,31 +150,38 @@ Namespace Controls.Behaviors
 
             Dim selection = New TextRange(rtb.Selection.Start, rtb.Selection.End)
             If String.IsNullOrEmpty(selection.Text) Then Return
+            e.Handled = True
 
             Try
-                Forms.Clipboard.Clear()
-                Forms.Clipboard.SetDataObject(selection.Text, True)
-            Catch
+                SetClipboardText(selection.Text)
+            Catch ex As Exception
+                Logger.Warn(ex, $"剪切失败，请稍后再试（错误码：0x{ex.HResult:X8}）", LogBehavior.Toast)
+                Return
             End Try
 
             selection.Text = String.Empty
-            e.Handled = True
         End Sub
 
         Private Shared Sub OnPasteRichTextBox(sender As Object, e As ExecutedRoutedEventArgs)
             Dim rtb = TryCast(sender, RichTextBox)
             If rtb Is Nothing Then Return
 
-            If Not Forms.Clipboard.ContainsText() Then Return
+            Try
+                Dim pasteText = Retrier.Attempt(func:=
+                Function(Attempt) As String
+                    Return If(Forms.Clipboard.ContainsText(), Forms.Clipboard.GetText(), Nothing)
+                End Function, maxAttempts:=2, delay:=Function() TimeSpan.FromMilliseconds(200))
+                If pasteText Is Nothing Then Return
+                Dim selection = rtb.Selection
 
-            Dim pasteText = Forms.Clipboard.GetText()
-            Dim selection = rtb.Selection
+                selection.Text = pasteText
 
-            selection.Text = pasteText
-
-            Dim caretPos = selection.End
-            rtb.CaretPosition = caretPos
-            rtb.Selection.Select(caretPos, caretPos)
+                Dim caretPos = selection.End
+                rtb.CaretPosition = caretPos
+                rtb.Selection.Select(caretPos, caretPos)
+            Catch ex As Exception
+                Logger.Warn(ex, $"粘贴失败，请稍后再试（错误码：0x{ex.HResult:X8}）", LogBehavior.Toast)
+            End Try
 
             e.Handled = True
         End Sub
@@ -181,9 +205,9 @@ Namespace Controls.Behaviors
             Dim sbStr = sb.ToString().TrimEnd(ControlChars.Cr, ControlChars.Lf)
 
             Try
-                Forms.Clipboard.Clear()
-                Forms.Clipboard.SetDataObject(sbStr, True)
-            Catch
+                SetClipboardText(sbStr)
+            Catch ex As Exception
+                Logger.Warn(ex, $"复制失败，请稍后再试（错误码：0x{ex.HResult:X8}）", LogBehavior.Toast)
             End Try
 
             e.Handled = True

Plain Craft Launcher 2/Controls/Behaviors/Interfaces.vb

@@ -1,4 +1,4 @@
-Imports System.Windows.Threading
+Imports System.Windows.Threading
 
 ''' <summary>
 ''' 指示页面可以通过按下 F5 或以其他方式刷新。

Plain Craft Launcher 2/Controls/Behaviors/LazyLoadBehavior.vb

@@ -1,4 +1,4 @@
-Public Class LazyLoadBehavior
+Public Class LazyLoadBehavior
 
     ''' <summary>
     ''' 指定首次进入 ScrollViewer 的可视范围时执行的操作。

Plain Craft Launcher 2/Controls/MyButton.xaml

@@ -1,4 +1,4 @@
-<Border x:Class="MyButton"
+<Border x:Class="MyButton"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              FocusVisualStyle="{x:Null}" x:Name="PanBack"

Plain Craft Launcher 2/Controls/MyButton.xaml.vb

@@ -1,4 +1,4 @@
-Imports System.Windows.Markup
+Imports System.Windows.Markup
 
 <ContentProperty("Inlines")>
 Public Class MyButton

Plain Craft Launcher 2/Controls/MyCard.vb

@@ -1,4 +1,4 @@
-Public Class MyCard
+Public Class MyCard
 
     '控件
     Inherits Grid
@@ -102,73 +102,36 @@
             RunInUi(Sub() UseAnimation = RawUseAnimation, True)
         End If
     End Sub
-    Public Sub StackInstall()
-        StackInstall(SwapControl, SwapType, Title)
-        TriggerForceResize()
+
+    '填充
+    Private ContentBuilder As Action(Of Panel)
+    Public Sub SetContentBuilder(Builder As Action(Of Panel))
+        ContentBuilder = Builder
     End Sub
-    Public Shared Sub StackInstall(ByRef Stack As StackPanel, Type As Integer, Optional CardTitle As String = "")
-        '这一部分的代码是好几年前留下的究极屎坑，当时还不知道该咋正确调用这种方法，就写了这么一坨屎
-        '但是现在……反正勉强能用……懒得改了就这样吧.jpg
-        '别骂了别骂了.jpg
-        If Stack.Tag Is Nothing Then Return
-        '排序
-        Dim HasDuplicates As Boolean = False
-        Select Case Type
-            Case 3
-                Stack.Tag = CType(Stack.Tag, List(Of DlOptiFineListEntry)).SortByComparison(Function(a, b) CompareVersionGE(a.DisplayName, b.DisplayName))
-            Case 4, 10
-                Stack.Tag = CType(Stack.Tag, List(Of DlLiteLoaderListEntry)).SortByComparison(Function(a, b) CompareVersionGE(a.Inherit, b.Inherit))
-            Case 6
-                Stack.Tag = CType(Stack.Tag, List(Of DlForgeVersionEntry)).OrderByDescending(Function(a) a).ToList
-            Case 8, 9
-                Stack.Tag = CType(Stack.Tag, List(Of ResourceVersion)).SortByComparison(Function(a, b) a.ReleaseDate > b.ReleaseDate)
-                HasDuplicates =
-                    CType(Stack.Tag, List(Of ResourceVersion)).DistinctBy(Function(a) a.Display).Count <>
-                    CType(Stack.Tag, List(Of ResourceVersion)).Count
-        End Select
-        '控件转换
-        Select Case Type
-            Case 6
-                ForgeDownloadListItemPreload(Stack, Stack.Tag, AddressOf ForgeSave_Click, True)
-            Case 8
-                PageDownloadResourceDetail.ResourceFilesCardPreload(Stack, Stack.Tag)
-        End Select
-        '实现控件虚拟化
-        For Each Data As Object In Stack.Tag
-            Select Case Type
-                Case 0
-                    Stack.Children.Add(CType(Data, McInstance).ToListItem(AddressOf PageSelectRight.McInstanceListContent))
-                Case 2
-                    Stack.Children.Add(McDownloadListItem(Data, AddressOf McDownloadMenuSave, True))
-                Case 3
-                    Stack.Children.Add(OptiFineDownloadListItem(Data, AddressOf OptiFineSave_Click, True))
-                Case 6
-                    Stack.Children.Add(ForgeDownloadListItem(Data, AddressOf ForgeSave_Click, True))
-                Case 7
-                    '不能使用 AddressOf，这导致了 #535，原因完全不明，疑似是编译器 Bug
-                    Stack.Children.Add(McDownloadListItem(Data, Sub(sender, e) FrmDownloadInstall.MinecraftSelected(sender, e), False))
-                Case 8
-                    '若存在重复的版本名，则显示文件名而非版本名（#1344）
-                    Stack.Children.Add(CType(Data, ResourceVersion).ToListItem(
-                        AddressOf FrmDownloadResourceDetail.Save_Click, IsBadDisplay:=HasDuplicates))
-                Case 9
-                    '若存在重复的版本名，则显示文件名而非版本名（#1344）
-                    Stack.Children.Add(CType(Data, ResourceVersion).ToListItem(
-                        AddressOf FrmDownloadResourceDetail.Install_Click, AddressOf FrmDownloadResourceDetail.Save_Click, IsBadDisplay:=HasDuplicates))
-                Case 10
-                    Stack.Children.Add(LiteLoaderDownloadListItem(Data, AddressOf LiteLoaderSave_Click, True))
-                Case 11
-                    Stack.Children.Add(CType(Data, HelpEntry).ToListItem)
-                Case 12
-                    Stack.Children.Add(FabricDownloadListItem(CType(Data, JObject), AddressOf FrmDownloadInstall.Fabric_Selected))
-                Case 13
-                    Stack.Children.Add(NeoForgeDownloadListItem(Data, AddressOf NeoForgeSave_Click, True))
-                Case Else
-                    Logger.Error($"未知的虚拟化种类：{Type}")
-            End Select
-        Next
-        Stack.Children.Add(New FrameworkElement With {.Height = 18}) '下边距，同时适应折叠
-        Stack.Tag = Nothing
+    Public Sub SetContentBuilder(Of T)(Items As IEnumerable(Of T), ItemBuilder As Func(Of T, UIElement))
+        SetContentBuilder(
+        Sub(Stack)
+            For Each Item In Items
+                Stack.Children.Add(ItemBuilder(Item))
+            Next
+            Stack.Children.Add(New FrameworkElement With {.Height = 18})
+        End Sub)
+    End Sub
+    ''' <summary>
+    ''' 使用 ContentBuilder 生成卡片内容。
+    ''' </summary>
+    Public Sub BuildContent()
+        If ContentBuilder Is Nothing Then Return
+        Dim Stack = TryCast(SwapControl, Panel)
+        If Stack Is Nothing Then Return
+        Try
+            ContentBuilder(Stack)
+            ContentBuilder = Nothing
+        Catch
+            Stack.Children.Clear()
+            Throw
+        End Try
+        TriggerForceResize()
     End Sub
 
     '动画
@@ -278,10 +241,6 @@
     Public SwapControl As FrameworkElement
     Public Property CanSwap As Boolean = False
     ''' <summary>
-    ''' 被折叠的种类，用于控件虚拟化。
-    ''' </summary>
-    Public Property SwapType As Integer
-    ''' <summary>
     ''' 是否已被折叠。
     ''' </summary>
     Public Property IsSwapped As Boolean
@@ -293,7 +252,7 @@
             _IsSwapped = value
             If SwapControl Is Nothing Then Return
             '展开
-            If Not IsSwapped AndAlso TypeOf SwapControl Is StackPanel Then StackInstall(SwapControl, SwapType, Title)
+            If Not IsSwapped Then BuildContent()
             '若尚未加载，会在 Loaded 事件中触发无动画的折叠，不需要在这里进行
             If Not IsLoaded Then Return
             '更新样式
@@ -397,4 +356,4 @@ Partial Public Module ModAnimation
             If CallBack IsNot Nothing Then CallBack(Control)
         End If
     End Sub
-End Module
+End Module

Plain Craft Launcher 2/Controls/MyCheckBox.xaml

@@ -1,4 +1,4 @@
-<Grid
+<Grid
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" x:Class="MyCheckBox"

Plain Craft Launcher 2/Controls/MyCheckBox.xaml.vb

@@ -1,4 +1,4 @@
-Imports System.Windows.Markup
+Imports System.Windows.Markup
 
 <ContentProperty("Inlines")>
 Public Class MyCheckBox

Plain Craft Launcher 2/Controls/MyComboBox.vb

@@ -1,4 +1,4 @@
-Public Class MyComboBox
+Public Class MyComboBox
     Inherits ComboBox
     Implements ISettingControl
     Public Event TextChanged(sender As Object, e As TextChangedEventArgs)
@@ -104,6 +104,7 @@
     Private Sub MyComboBox_DropDownOpened(sender As Object, e As EventArgs) Handles Me.DropDownOpened
         RealWidth = Width
         Width = ActualWidth
+        '将下拉菜单透明度与主窗口同步
         Try
             CType(Template.FindName("PanPopup", Me), Grid).Opacity = FrmMain.Opacity
         Catch ex As Exception

Plain Craft Launcher 2/Controls/MyComboBoxItem.vb

@@ -1,4 +1,4 @@
-Public Class MyComboBoxItem
+Public Class MyComboBoxItem
     Inherits ComboBoxItem
 
     '基础

Plain Craft Launcher 2/Controls/MyDropShadow.vb

@@ -1,4 +1,4 @@
-Public Class MyDropShadow
+Public Class MyDropShadow
     Inherits Decorator
 
     ''' <summary>

Plain Craft Launcher 2/Controls/MyExtraButton.xaml

@@ -1,8 +1,8 @@
-<Grid
+<Grid
             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" x:Name="PanBack" mc:Ignorable="d" x:Class="MyExtraButton"
-            Width="40" RenderTransformOrigin="0.5,0.5" ToolTipService.Placement="Left" ToolTipService.VerticalOffset="16" ToolTipService.HorizontalOffset="-8" Height="0">
+            Width="40" RenderTransformOrigin="0.5,0.5" Height="0">
     <Grid.RenderTransform>
         <ScaleTransform ScaleX="0" ScaleY="0" />
     </Grid.RenderTransform>

Plain Craft Launcher 2/Controls/MyExtraButton.xaml.vb

@@ -1,4 +1,4 @@
-Public Class MyExtraButton
+Public Class MyExtraButton
 
     '声明
     Public Event Click(sender As Object, e As MouseButtonEventArgs) '自定义事件

Plain Craft Launcher 2/Controls/MyExtraTextButton.xaml

@@ -1,10 +1,10 @@
-<Grid
+<Grid
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="clr-namespace:PCL"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
     x:Name="PanBack" mc:Ignorable="d" x:Class="MyExtraTextButton"
-    RenderTransformOrigin="0.5,0.5" ToolTipService.Placement="Left" Height="52" Margin="20" Cursor="Hand">
+    RenderTransformOrigin="0.5,0.5" Height="52" Margin="20" Cursor="Hand">
     <Grid.RenderTransform>
         <ScaleTransform ScaleX="0" ScaleY="0" />
     </Grid.RenderTransform>

Plain Craft Launcher 2/Controls/MyExtraTextButton.xaml.vb

@@ -1,4 +1,4 @@
-Imports System.Windows.Markup
+Imports System.Windows.Markup
 
 <ContentProperty("Inlines")>
 Public Class MyExtraTextButton

Plain Craft Launcher 2/Controls/MyHint.xaml

@@ -1,4 +1,4 @@
-<Border x:Class="MyHint" x:Name="PanBack"
+<Border x:Class="MyHint" x:Name="PanBack"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:PCL"
@@ -11,6 +11,6 @@
         </Grid.ColumnDefinitions>
         <TextBlock IsHitTestVisible="False" x:Name="LabText" LineHeight="16" Margin="0,0,0,-1" Padding="12,9" VerticalAlignment="Center" TextWrapping="Wrap" />
         <local:MyIconButton x:Name="BtnClose" Visibility="Collapsed" Theme="Custom" Margin="0,0,8,0" Grid.Column="1" Height="20" Width="20" VerticalAlignment="Center" Logo="F1 M2,0 L0,2 8,10 0,18 2,20 10,12 18,20 20,18 12,10 20,2 18,0 10,8 2,0Z"
-                           ToolTip="不再提示" ToolTipService.Placement="Center" ToolTipService.VerticalOffset="29" ToolTipService.HorizontalOffset="2" />
+                           ToolTip="不再提示" />
     </Grid>
 </Border>

Plain Craft Launcher 2/Controls/MyHint.xaml.vb

@@ -1,4 +1,4 @@
-Imports System.Windows.Markup
+Imports System.Windows.Markup
 
 <ContentProperty("Inlines")>
 Public Class MyHint

Plain Craft Launcher 2/Controls/MyIconButton.xaml

@@ -1,7 +1,7 @@
-<Border x:Class="MyIconButton"
+<Border x:Class="MyIconButton"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            CornerRadius="1000" Background="{StaticResource ColorBrushSemiTransparent}" BorderThickness="0.001" Cursor="Hand">
+            CornerRadius="1000" Background="{StaticResource ColorBrushSemiTransparent}" BorderThickness="0.001">
     <Border x:Name="PanBack" CornerRadius="1000"  RenderTransformOrigin="0.5,0.5" BorderThickness="0.001" IsHitTestVisible="False">
         <Path x:Name="Path" Stretch="Uniform" Margin="5" RenderTransformOrigin="0.5,0.5">
             <Path.RenderTransform>

Plain Craft Launcher 2/Controls/MyIconButton.xaml.vb

@@ -1,4 +1,4 @@
-Imports System.Windows.Shapes
+Imports System.Windows.Shapes
 
 Public Class MyIconButton
 
@@ -52,7 +52,9 @@ Public Class MyIconButton
 
     '鼠标点击判定（务必放在点击事件之后，以使得 Button_MouseUp 先于 Button_MouseLeave 执行）
     Private IsMouseDown As Boolean = False
+    Public Property CanClick As Boolean = True
     Private Sub Button_MouseUp(sender As Object, e As MouseButtonEventArgs) Handles Me.MouseLeftButtonUp
+        If Not CanClick Then Return
         If Not IsMouseDown Then Return
         Logger.Info($"按下图标按钮{If(String.IsNullOrEmpty(Name), "", "：" & Name)}")
         RaiseEvent Click(sender, e)
@@ -61,12 +63,14 @@ Public Class MyIconButton
         RaiseCustomEvent() '自定义事件
     End Sub
     Private Sub Button_MouseDown(sender As Object, e As MouseButtonEventArgs) Handles Me.MouseLeftButtonDown
+        If Not CanClick Then Return
         IsMouseDown = True
         Focus()
         '指向
         AniStart(AaScaleTransform(PanBack, 0.8 - CType(PanBack.RenderTransform, ScaleTransform).ScaleX, 400,, New AniEaseOutFluent(AniEasePower.Strong)), "MyIconButton Scale " & Uuid)
     End Sub
     Private Sub Button_MouseUp() Handles Me.MouseLeftButtonUp
+        If Not CanClick Then Return
         If IsMouseDown Then
             IsMouseDown = False
             AniStart({
@@ -77,6 +81,7 @@ Public Class MyIconButton
         RefreshAnim() '直接刷新颜色以判断是否已触发 MouseLeave
     End Sub
     Private Sub Button_MouseLeave() Handles Me.MouseLeave
+        If Not CanClick Then Return
         IsMouseDown = False
         AniStart({
                      AaScaleTransform(PanBack, 1 - CType(PanBack.RenderTransform, ScaleTransform).ScaleX, 250,, New AniEaseOutFluent)
@@ -87,10 +92,9 @@ Public Class MyIconButton
     '务必放在 IsMouseDown 更新之后
     Private Const AnimationColorIn As Integer = 120
     Private Const AnimationColorOut As Integer = 150
-    Public Sub RefreshAnim() Handles Me.MouseEnter, Me.MouseLeave, Me.Loaded
+    Public Sub RefreshAnim() Handles Me.MouseEnter, Me.MouseLeave, Me.Loaded, Me.IsEnabledChanged
         Try
             If IsLoaded AndAlso AniControlEnabled = 0 Then '防止默认属性变更触发动画
-
                 If PanBack.Background Is Nothing Then PanBack.Background = New MyColor(0, 255, 255, 255)
                 If Path.Fill Is Nothing Then
                     Select Case Theme
@@ -102,9 +106,10 @@ Public Class MyIconButton
                             Path.Fill = New MyColor(160, Foreground)
                     End Select
                 End If
-                If IsMouseOver Then
-                    '指向
-                    Dim AnimList As New List(Of AniData)
+                Dim AnimList As New List(Of AniData)
+                If Not IsEnabled Then
+                    AnimList.Add(AaColor(Path, Shape.FillProperty, "ColorBrushGray5", AnimationColorIn))
+                ElseIf IsMouseOver Then '指向
                     Select Case Theme
                         Case Themes.Color
                             AnimList.Add(AaColor(Path, Shape.FillProperty, "ColorBrush2", AnimationColorIn))
@@ -117,10 +122,7 @@ Public Class MyIconButton
                         Case Themes.Custom
                             AnimList.Add(AaColor(Path, Shape.FillProperty, New MyColor(255, Foreground) - Path.Fill, AnimationColorIn))
                     End Select
-                    AniStart(AnimList, "MyIconButton Color " & Uuid)
-                Else
-                    '普通
-                    Dim AnimList As New List(Of AniData)
+                Else '普通
                     Select Case Theme
                         Case Themes.Color
                             AnimList.Add(AaColor(Path, Shape.FillProperty, "ColorBrush4", AnimationColorOut))
@@ -138,26 +140,27 @@ Public Class MyIconButton
                             AnimList.Add(AaColor(Path, Shape.FillProperty, New MyColor(160, Foreground) - Path.Fill, AnimationColorOut))
                             PanBack.Background = New MyColor(0, 255, 255, 255)
                     End Select
-                    AniStart(AnimList, "MyIconButton Color " & Uuid)
                 End If
-
+                AniStart(AnimList, "MyIconButton Color " & Uuid)
             Else
-
                 AniStop("MyIconButton Color " & Uuid)
-                Select Case Theme
-                    Case Themes.Color
-                        Path.SetResourceReference(Shape.FillProperty, "ColorBrush5")
-                    Case Themes.White
-                        Path.SetResourceReference(Shape.FillProperty, "ColorBrush8")
-                    Case Themes.Red
-                        Path.Fill = New MyColor(160, 255, 76, 76)
-                    Case Themes.Black
-                        Path.Fill = New MyColor(160, 0, 0, 0)
-                    Case Themes.Custom
-                        Path.Fill = New MyColor(160, Foreground)
-                End Select
+                If IsEnabled Then
+                    Select Case Theme
+                        Case Themes.Color
+                            Path.SetResourceReference(Shape.FillProperty, "ColorBrush5")
+                        Case Themes.White
+                            Path.SetResourceReference(Shape.FillProperty, "ColorBrush8")
+                        Case Themes.Red
+                            Path.Fill = New MyColor(160, 255, 76, 76)
+                        Case Themes.Black
+                            Path.Fill = New MyColor(160, 0, 0, 0)
+                        Case Themes.Custom
+                            Path.Fill = New MyColor(160, Foreground)
+                    End Select
+                Else
+                    Path.SetResourceReference(Shape.FillProperty, "ColorBrushGray5")
+                End If
                 PanBack.Background = New MyColor(0, 255, 255, 255)
-
             End If
         Catch ex As Exception
             Logger.Warn(ex, "刷新图标按钮动画状态出错")

Plain Craft Launcher 2/Controls/MyIconTextButton.xaml

@@ -1,4 +1,4 @@
-<Border x:Name="PanBack" x:Class="MyIconTextButton"
+<Border x:Name="PanBack" x:Class="MyIconTextButton"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              HorizontalAlignment="Center" VerticalAlignment="Center" Background="{StaticResource ColorBrushSemiTransparent}" CornerRadius="13.5" MinHeight="27" MaxHeight="27">

Plain Craft Launcher 2/Controls/MyIconTextButton.xaml.vb

@@ -1,4 +1,4 @@
-Imports System.Windows.Markup
+Imports System.Windows.Markup
 
 <ContentProperty("Inlines")>
 Public Class MyIconTextButton

Plain Craft Launcher 2/Controls/MyImage.vb

@@ -1,4 +1,4 @@
-Public Class MyImage
+Public Class MyImage
     Inherits Image
 
 #Region "公开属性"
@@ -90,7 +90,7 @@
             Catch ex As Exception
                 Logger.Warn(ex, $"加载图片失败（{value}）")
                 Try
-                    If value.StartsWithF(PathTemp) Then FileUtils.Delete(value)
+                    If value.StartsWithF(PathTemp, True) Then FileUtils.Delete(value)
                 Catch
                 End Try
             End Try

Plain Craft Launcher 2/Controls/MyListItem.xaml

@@ -1,4 +1,4 @@
-<Grid x:Class="MyListItem"
+<Grid x:Class="MyListItem"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              x:Name="PanBack"

Plain Craft Launcher 2/Controls/MyListItem.xaml.vb

@@ -1,4 +1,4 @@
-Imports System.Windows.Markup
+Imports System.Windows.Markup
 
 <ContentProperty("Inlines")>
 Public Class MyListItem
@@ -312,7 +312,8 @@ Public Class MyListItem
             Else
                 '添加竖条控件
                 If IsNothing(RectCheck) Then
-                    RectCheck = New Border With {.Width = 5, .Height = If(Checked, Double.NaN, 0), .CornerRadius = New CornerRadius(2, 2, 2, 2),
+                    RectCheck = New Border With {
+                        .Width = 5, .Height = If(Checked, Double.NaN, 0), .CornerRadius = New CornerRadius(2, 2, 2, 2),
                         .VerticalAlignment = If(Checked, VerticalAlignment.Stretch, VerticalAlignment.Center),
                         .HorizontalAlignment = HorizontalAlignment.Left, .UseLayoutRounding = False, .SnapsToDevicePixels = False,
                         .Margin = If(Checked, New Thickness(-1, 6, 0, 6), New Thickness(-1, 0, 0, 0))}
@@ -507,7 +508,8 @@ Public Class MyListItem
         RaiseEvent Click(sender, e)
         If e.Handled Then Return
         '触发自定义事件
-        If CustomEventService.GetEventType(sender) <> CustomEvent.EventType.None Then
+        If CustomEventService.GetEventType(sender) <> CustomEvent.EventType.None OrElse
+           CustomEventService.GetEvents(sender).Events.Count > 0 Then
             RaiseCustomEvent()
             e.Handled = True
         End If
@@ -542,7 +544,7 @@ Public Class MyListItem
 
     Private StateLast As String
     Public IsMouseOverAnimationEnabled As Boolean = True
-    Public Sub RefreshColor(sender As Object, e As EventArgs) Handles Me.MouseEnter, Me.MouseLeave, Me.MouseLeftButtonDown, Me.MouseLeftButtonUp
+    Public Sub RefreshColor(sender As Object, e As EventArgs) Handles Me.MouseEnter, Me.MouseLeave, Me.PreviewMouseLeftButtonDown, Me.PreviewMouseLeftButtonUp
         '菜单虚拟化检测
         If ContentHandler IsNot Nothing Then
             ContentHandler(Me, e)

Plain Craft Launcher 2/Controls/MyLoading.xaml

@@ -1,4 +1,4 @@
-<Grid
+<Grid
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" x:Name="PanBack" mc:Ignorable="d" x:Class="MyLoading"
              MinWidth="50" MinHeight="50" Background="{StaticResource ColorBrushSemiTransparent}">

Plain Craft Launcher 2/Controls/MyLoading.xaml.vb

@@ -1,4 +1,4 @@
-Imports PCL.MyLoading
+Imports PCL.MyLoading
 
 Public Class MyLoading
 
@@ -76,8 +76,7 @@ Public Class MyLoading
                     If Ex Is Nothing Then
                         LabText.Text = "未知错误"
                     Else
-                        Ex = Ex.RootException()
-                        LabText.Text = If(Ex.IsBadNetwork(), "网络环境不佳，请稍后再试，或使用 VPN 改善网络环境", Ex.Message)
+                        LabText.Text = Ex.GetDisplay(False)
                     End If
                 Else
                     LabText.Text = TextError

Plain Craft Launcher 2/Controls/MyMenuItem.vb

@@ -1,4 +1,4 @@
-Public Class MyMenuItem
+Public Class MyMenuItem
     Inherits MenuItem
 
     Private Sub MyMenuItem_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
@@ -7,7 +7,9 @@
             If IconControl IsNot Nothing Then IconControl.Data = (New GeometryConverter).ConvertFromString(Icon)
         End If
         '对父级设置透明度
-        CType(Parent, ContextMenu).Opacity = Settings.Get(Of Integer)("UiLauncherTransparent") / 1000 + 0.4
+        If TypeOf Parent Is ContextMenu Then
+            CType(Parent, ContextMenu).Opacity = Settings.Get(Of Integer)("UiLauncherTransparent") / 1000 + 0.4
+        End If
     End Sub
 
     '基础

Plain Craft Launcher 2/Controls/MyMsg/MyMsgInput.xaml

@@ -1,4 +1,4 @@
-<Grid x:Class="MyMsgInput"
+<Grid x:Class="MyMsgInput"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:my="clr-namespace:PCL"

Plain Craft Launcher 2/Controls/MyMsg/MyMsgInput.xaml.vb

@@ -1,4 +1,4 @@
-Public Class MyMsgInput
+Public Class MyMsgInput
 
     Private ReadOnly MyConverter As MyMsgBoxConverter
     Private ReadOnly Uuid As Integer = GetUuid()

Plain Craft Launcher 2/Controls/MyMsg/MyMsgSelect.xaml

@@ -1,4 +1,4 @@
-<Grid x:Class="MyMsgSelect"
+<Grid x:Class="MyMsgSelect"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:my="clr-namespace:PCL"

Plain Craft Launcher 2/Controls/MyMsg/MyMsgSelect.xaml.vb

@@ -1,4 +1,4 @@
-Public Class MyMsgSelect
+Public Class MyMsgSelect
 
     Private ReadOnly MyConverter As MyMsgBoxConverter
     Private ReadOnly Uuid As Integer = GetUuid()

Plain Craft Launcher 2/Controls/MyMsg/MyMsgText.xaml

@@ -1,4 +1,4 @@
-<Grid x:Class="MyMsgText"
+<Grid x:Class="MyMsgText"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:my="clr-namespace:PCL"

Plain Craft Launcher 2/Controls/MyMsg/MyMsgText.xaml.vb

@@ -1,4 +1,4 @@
-Public Class MyMsgText
+Public Class MyMsgText
 
     Private ReadOnly MyConverter As MyMsgBoxConverter
     Private ReadOnly Uuid As Integer = GetUuid()

Plain Craft Launcher 2/Controls/MyPageLeft.vb

@@ -1,4 +1,4 @@
-Public Class MyPageLeft
+Public Class MyPageLeft
     Inherits Grid
     Private Uuid As Integer = GetUuid()
 

Plain Craft Launcher 2/Controls/MyPageRight.vb

@@ -1,4 +1,4 @@
-Public Class MyPageRight
+Public Class MyPageRight
     Inherits AdornerDecorator
     Public PageUuid As Integer = GetUuid()
 
@@ -153,7 +153,7 @@
     '重试
     Public Sub PageLoaderRestart(Optional Input As Object = Nothing, Optional IsForceRestart As Boolean = True) '由外部调用的重试
         If Not PageLoaderAutoRun Then Return
-        If PageLoader.GetType.Name.StartsWithF("LoaderTask") Then
+        If GeneralUtils.IsGenericInstanceOf(PageLoader, GetType(LoaderTask(Of ,))) OrElse TypeOf PageLoader Is LoaderWorker Then
             PageLoader.Start(CType(PageLoader, Object).StartGetInput(Input, PageLoaderInputInvoke), IsForceRestart:=IsForceRestart)
         Else
             If Input Is Nothing AndAlso PageLoaderInputInvoke IsNot Nothing Then Input = PageLoaderInputInvoke()
@@ -175,7 +175,7 @@
         RaiseEvent PageEnter()
         Select Case PageState
             Case PageStates.Empty
-                If PageLoader Is Nothing OrElse PageLoader.State = LoadState.Finished OrElse PageLoader.State = LoadState.Waiting OrElse PageLoader.State = LoadState.Interrupted Then
+                If PageLoader Is Nothing OrElse PageLoader.State = LoadState.Finished OrElse PageLoader.State = LoadState.Waiting OrElse PageLoader.State = LoadState.Canceled Then
                     '如果加载器在进入页面时不启动（例如联机），那么在此时就会有 State = Waiting
                     PageState = PageStates.ContentEnter
                     TriggerEnterAnimation(PanAlways, If(PanContent, Child))
@@ -188,7 +188,7 @@
                 End If
             Case PageStates.ContentExit
                 '和上面的一样，但是不管 PanAlways
-                If PageLoader Is Nothing OrElse PageLoader.State = LoadState.Finished OrElse PageLoader.State = LoadState.Waiting OrElse PageLoader.State = LoadState.Interrupted Then
+                If PageLoader Is Nothing OrElse PageLoader.State = LoadState.Finished OrElse PageLoader.State = LoadState.Waiting OrElse PageLoader.State = LoadState.Canceled Then
                     PageState = PageStates.ContentEnter
                     TriggerEnterAnimation(If(PanContent, Child))
                 ElseIf PageLoader.State = LoadState.Loading Then
@@ -364,9 +364,9 @@
                     Case PageStates.LoaderExit
                         PageState = PageStates.ContentExit
                 End Select
-            Case LoadState.Finished, LoadState.Interrupted, LoadState.Waiting
+            Case LoadState.Finished, LoadState.Canceled, LoadState.Waiting
                 If Not (OldState = LoadState.Failed OrElse OldState = LoadState.Loading) Then Return
-                Logger.Trace("已触发 PageLoaderState (Stop/Interrupt)")
+                Logger.Trace("已触发 PageLoaderState (Stop/Canceled)")
                 '运行结束
                 '需要从 LoaderWait 切换到 ContentEnter，或从 LoaderStay 切换到 LoaderExit
                 Select Case PageState

Plain Craft Launcher 2/Controls/MyRadioBox.xaml

@@ -1,4 +1,4 @@
-<Grid x:Class="MyRadioBox"
+<Grid x:Class="MyRadioBox"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              FocusVisualStyle="{x:Null}"

Plain Craft Launcher 2/Controls/MyRadioBox.xaml.vb

@@ -1,4 +1,4 @@
-Imports System.Windows.Markup
+Imports System.Windows.Markup
 Imports System.Windows.Shapes
 
 <ContentProperty("Inlines")>

Plain Craft Launcher 2/Controls/MyRadioButton.xaml

@@ -1,4 +1,4 @@
-<Border x:Name="PanBack" x:Class="MyRadioButton"
+<Border x:Name="PanBack" x:Class="MyRadioButton"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              HorizontalAlignment="Center" VerticalAlignment="Center" Background="{StaticResource ColorBrushSemiTransparent}" CornerRadius="13.5" MinHeight="27" MaxHeight="27">

Plain Craft Launcher 2/Controls/MyRadioButton.xaml.vb

@@ -1,4 +1,4 @@
-Imports System.Windows.Markup
+Imports System.Windows.Markup
 
 <ContentProperty("Inlines")>
 Public Class MyRadioButton

Plain Craft Launcher 2/Controls/MyResizer.vb

@@ -1,4 +1,4 @@
-Imports System.Runtime.InteropServices
+Imports System.Runtime.InteropServices
 Imports System.Windows.Interop
 Imports System.Windows.Threading
 

Plain Craft Launcher 2/Controls/MyScrollBar.vb

@@ -1,4 +1,4 @@
-Public Class MyScrollBar
+Public Class MyScrollBar
     Inherits Primitives.ScrollBar
 
     '基础

Plain Craft Launcher 2/Controls/MyScrollViewer.vb

@@ -1,9 +1,8 @@
-Public Class MyScrollViewer
+Public Class MyScrollViewer
     Inherits ScrollViewer
 
     Public Property DeltaMult As Double = 1
 
-
     Private RealOffset As Double
     Private Sub MyScrollViewer_PreviewMouseWheel(sender As Object, e As MouseWheelEventArgs) Handles Me.PreviewMouseWheel
         If e.Delta = 0 OrElse ActualHeight = 0 OrElse ScrollableHeight = 0 Then Return
@@ -12,16 +11,13 @@
                 (GetType(ComboBox).IsAssignableFrom(SourceType) AndAlso CType(e.Source, ComboBox).IsDropDownOpen) OrElse
                 (GetType(TextBox).IsAssignableFrom(SourceType) AndAlso CType(e.Source, TextBox).AcceptsReturn) OrElse
                 GetType(ComboBoxItem).IsAssignableFrom(SourceType) OrElse
-                TypeOf e.Source Is CheckBox) Then
+                (TypeOf e.Source Is Visual AndAlso
+                    PresentationSource.FromVisual(e.Source)?.RootVisual?.GetType().FullName = "System.Windows.Controls.Primitives.PopupRoot")) Then
             '如果当前是在对有滚动条的下拉框或文本框执行，则不接管操作
             Return
         End If
         e.Handled = True
         PerformVerticalOffsetDelta(-e.Delta)
-        '关闭 Tooltip (#2552)
-        For Each TooltipBorder In Application.ShowingTooltips
-            AniStart(AaOpacity(TooltipBorder, -1, 100), $"Hide Tooltip {GetUuid()}")
-        Next
     End Sub
     Public Sub PerformVerticalOffsetDelta(Delta As Double)
         AniStart(

Plain Craft Launcher 2/Controls/MySearchBox.xaml

@@ -1,4 +1,4 @@
-<local:MyCard x:Class="MySearchBox"
+<local:MyCard x:Class="MySearchBox"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 

Plain Craft Launcher 2/Controls/MySearchBox.xaml.vb

@@ -1,4 +1,4 @@
-Class MySearchBox
+Class MySearchBox
     Inherits MyCard
 
     Public Event TextChanged(sender As Object, e As EventArgs)

Plain Craft Launcher 2/Controls/MySlider.xaml

@@ -1,4 +1,4 @@
-<Border x:Class="MySlider"
+<Border x:Class="MySlider"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 

Plain Craft Launcher 2/Controls/MySlider.xaml.vb

@@ -1,4 +1,4 @@
-Imports System.Windows.Shapes
+Imports System.Windows.Shapes
 
 Public Class MySlider
     Implements ISettingControl

Plain Craft Launcher 2/Controls/MySliderDot.xaml

@@ -1,4 +1,4 @@
-<Border x:Class="MySliderDot"
+<Border x:Class="MySliderDot"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 

Plain Craft Launcher 2/Controls/MySliderDot.xaml.vb

@@ -1,4 +1,4 @@
-Public Class MySliderDot
+Public Class MySliderDot
 
     '基础
 

Plain Craft Launcher 2/Controls/MyTextBox.vb

@@ -1,4 +1,4 @@
-Public Class MyTextBox
+Public Class MyTextBox
     Inherits TextBox
     Implements ISettingControl
 

Plain Craft Launcher 2/Controls/MyTextButton.vb

@@ -1,4 +1,4 @@
-Public Class MyTextButton
+Public Class MyTextButton
     Inherits Label
 
     Public Event Click(sender As Object, e As EventArgs)

Plain Craft Launcher 2/Controls/MyVirtualizingElement.vb

@@ -1,4 +1,4 @@
-Public Class MyVirtualizingElement(Of T As FrameworkElement)
+Public Class MyVirtualizingElement(Of T As FrameworkElement)
     Inherits FrameworkElement
 
     Private Initializer As Func(Of T)
@@ -58,7 +58,7 @@ Public Class MyVirtualizingElement
     ''' 如果类型错误，则返回原值。
     ''' </summary>
     Public Shared Function TryInit(Element As FrameworkElement) As FrameworkElement
-        If GetType(MyVirtualizingElement(Of )).IsInstanceOfGenericType(Element) Then
+        If GeneralUtils.IsGenericInstanceOf(Element, GetType(MyVirtualizingElement(Of ))) Then
             Return CType(Element, Object).Init()
         ElseIf TypeOf Element Is MyVirtualizingElement Then
             Return CType(Element, MyVirtualizingElement).Init()

Plain Craft Launcher 2/FormMain.xaml

@@ -1,4 +1,4 @@
-<Window
+<Window
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="clr-namespace:PCL"
@@ -169,8 +169,8 @@
                 <StackPanel HorizontalAlignment="Right" VerticalAlignment="Bottom" Grid.Row="1" Margin="15">
                     <local:MyExtraButton x:Name="BtnExtraBack" HorizontalAlignment="Right" VerticalAlignment="Center" ToolTip="返回顶部" Visibility="Collapsed"
                                        Logo="M858.496 188.9024 173.1072 188.9024c-30.2848 0-54.8352-24.5504-54.8352-54.8352L118.272 106.6496c0-30.2848 24.5504-54.8352 54.8352-54.8352l685.3888 0c30.2848 0 54.8352 24.5504 54.8352 54.8352l0 27.4176C913.3312 164.352 888.7808 188.9024 858.496 188.9024L858.496 188.9024zM150.6048 550.8608c0 0 300.0064-240.3584 303.0272-243.328 13.9776-13.5936 31.1808-21.8624 48.8192-24.7552 1.7152-0.3072 3.4304-0.5888 5.1456-0.768 2.7392-0.3072 5.4528-0.3584 8.192-0.3328 2.7392-0.0256 5.4272 0.0256 8.1664 0.3328 1.7408 0.1792 3.4304 0.4864 5.1456 0.768 17.664 2.8928 34.8672 11.1616 48.8192 24.7552 3.0464 2.944 303.0016 243.328 303.0016 243.328 32.384 31.5136 29.6192 63.9744-2.7392 95.5136-32.3328 31.5392-75.648 2.9696-108.0064-28.544l-185.8816-147.1232 0 485.8368c0 30.3104-24.5248 54.8608-54.8352 54.8608l-27.392 0c-30.2848 0-54.8352-24.5504-54.8352-54.8608L447.232 470.7072l-185.8304 147.0976c-32.3584 31.5392-75.6992 60.1344-108.032 28.5696C121.0368 614.8352 118.272 582.3744 150.6048 550.8608L150.6048 550.8608zM150.6048 550.8608" />
-                    <local:MyExtraButton x:Name="BtnExtraDownload" HorizontalAlignment="Right" VerticalAlignment="Center" ToolTip="下载管理" Visibility="Collapsed"
-                                       Logo="M955 610h-59c-15 0-29 13-29 29v196c0 15-13 29-29 29h-649c-15 0-29-13-29-29v-196c0-15-13-29-29-29h-59c-15 0-29 13-29 29V905c0 43 35 78 78 78h787c43 0 78-35 78-78V640c0-15-13-29-29-29zM492 740c11 11 29 11 41 0l265-265c11-11 11-29 0-41l-41-41c-11-11-29-11-41 0l-110 110c-11 11-33 3-33-13V68C571 53 555 39 541 39h-59c-15 0-29 13-29 29v417c0 17-21 25-33 13l-110-110c-11-11-29-11-41 0L226 433c-11 11-11 29 0 41L492 740z" />
+                    <local:MyExtraButton x:Name="BtnExtraDownload" HorizontalAlignment="Right" VerticalAlignment="Center" ToolTip="任务管理" Visibility="Collapsed"
+                                       LogoScale="1.1" Logo="M484.693 225.28 314.027 389.12l-68.267-68.267c-13.653-13.653-40.96-13.653-47.787 0-13.653 13.654-13.653 34.134 0 47.787l95.574 95.573c13.653 13.654 34.133 13.654 47.786 0L532.48 273.067c13.653-13.654 13.653-34.134 0-47.787s-34.133-13.653-47.787 0M819.2 341.333H614.4c-20.48 0-34.133 13.654-34.133 34.134S593.92 409.6 614.4 409.6h204.8c20.48 0 34.133-13.653 34.133-34.133s-13.653-34.134-34.133-34.134m0 341.334H614.4c-20.48 0-34.133 13.653-34.133 34.133s13.653 34.133 34.133 34.133h204.8c20.48 0 34.133-13.653 34.133-34.133s-13.653-34.133-34.133-34.133m-477.867-102.4c-75.093 0-136.533 61.44-136.533 136.533s61.44 136.533 136.533 136.533 136.534-61.44 136.534-136.533-61.44-136.533-136.534-136.533m0 204.8c-40.96 0-68.266-27.307-68.266-68.267s27.306-68.267 68.266-68.267S409.6 675.84 409.6 716.8s-27.307 68.267-68.267 68.267" />
                     <local:MyExtraButton x:Name="BtnExtraApril" HorizontalAlignment="Right" VerticalAlignment="Center" ToolTip="投降" Visibility="Collapsed"
                                        Logo="M124.96 32c-28.64 0-60.064 23.2-60.064 51.904v856.192c0 28.576 30.688 51.904 59.296 51.904s60.064-23.328 60.064-51.904V83.904C184.256 55.2 153.536 32 124.96 32z m616.352 71.264c-168.416 0-168.416-69.024-336.8-69.024-97.216 0-172.256 45.344-172.256 45.344l-0.736 516.736s75.776-45.28 172.96-45.28c168.416 0 168.416 69.024 336.8 69.024 105.344 0 211.168-55.328 211.168-55.328V48.064c0.032 0-105.792 55.2-211.136 55.2z m0 0" />
                     <local:MyExtraButton x:Name="BtnExtraShutdown" HorizontalAlignment="Right" VerticalAlignment="Center" ToolTip="关闭 Minecraft" Visibility="Collapsed"

Plain Craft Launcher 2/FormMain.xaml.vb

@@ -1,4 +1,4 @@
-Imports System.ComponentModel
+Imports System.ComponentModel
 Imports System.Windows.Interop
 
 Public Class FormMain
@@ -11,6 +11,30 @@ Public Class FormMain
         Dim FeatureList As New List(Of KeyValuePair(Of Integer, String))
         '统计更新日志条目
         If BuildType = BuildTypes.Release Then
+            If LastVersion < 413 Then 'Release 2.99.0.0
+                FeatureList.Add(New KeyValuePair(Of Integer, String)(5, "删除：为遵守相关法律法规，PCL 暂时不再提供 MC 下载功能，非常抱歉 qwq……"))
+            End If
+            If LastVersion < 411 Then 'Release 2.14.0.0
+                FeatureList.Add(New KeyValuePair(Of Integer, String)(4, "新增：允许修改、添加、移除、更新已安装版本的各个组件，可从版本设置中进入"))
+                FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "优化：启动游戏时允许按 Esc 取消"))
+                FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "优化：允许复制主页的启动日志中的内容"))
+                FeatureCount += 19
+                BugCount += 26
+            End If
+            If LastVersion < 408 Then 'Release 2.13.1.1
+                FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "优化：版本设置中，添加打开截图文件夹的快捷方式"))
+                FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "优化：导出整合包时，可以勾选导出光影设置文件"))
+                FeatureCount += 23
+                BugCount += 28
+            End If
+            If LastVersion < 406 Then 'Release 2.13.0.1
+                FeatureList.Add(New KeyValuePair(Of Integer, String)(4, "新增：重做 Java 管理与相关设置，允许调整 Java 优先级、指定 Java 版本范围等"))
+                FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "优化：导出整合包时允许自动导出版本文件夹中的 Java"))
+                FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "优化：重做弹出提示的样式以及动画，以更符合现代 UI 审美"))
+                FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复：可能无法安装 OptiFine 26.1.2"))
+                FeatureCount += 35
+                BugCount += 17
+            End If
             If LastVersion < 404 Then 'Release 2.12.8.2
                 FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复：Windows 7 无法正常联网"))
                 FeatureCount += 1
@@ -79,6 +103,45 @@ Public Class FormMain
             '3：BUG+ IMP* FEAT-
             '2：BUG* IMP-
             '1：BUG-
+            If LastVersion < 414 Then 'Snapshot 2.99.0.0
+                FeatureList.Add(New KeyValuePair(Of Integer, String)(5, "删除：为遵守相关法律法规，PCL 暂时不再提供 MC 下载功能，非常抱歉 qwq……"))
+            End If
+            If LastVersion < 412 Then 'Snapshot 2.14.0.0
+                FeatureList.Add(New KeyValuePair(Of Integer, String)(4, "新增：允许修改、添加、移除、更新已安装版本的各个组件，可从版本设置中进入"))
+                FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "优化：启动游戏时允许按 Esc 取消"))
+                FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "优化：允许复制主页的启动日志中的内容"))
+                FeatureCount += 19
+                BugCount += 26
+            End If
+            If LastVersion < 410 Then 'Snapshot 2.13.1.1
+                If LastVersion = 409 Then FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复：更新 Mod 时可能更新成另一个 Mod 加载器的版本"))
+                FeatureCount += 2
+                BugCount += 6
+            End If
+            If LastVersion < 409 Then 'Snapshot 2.13.1.0
+                FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "优化：版本设置中，添加打开截图文件夹的快捷方式"))
+                FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "优化：导出整合包时，可以勾选导出光影设置文件"))
+                FeatureCount += 21
+                BugCount += 22
+            End If
+            If LastVersion < 407 Then 'Snapshot 2.13.0.1
+                If LastVersion = 405 Then
+                    FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复：使用部分主页预设时崩溃"))
+                    FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复：无法删除部分文件夹"))
+                    FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复：版本设置中指定的 Java 无法被保存"))
+                    FeatureCount += 1
+                    BugCount += 3
+                End If
+                FeatureCount += 2
+            End If
+            If LastVersion < 405 Then 'Snapshot 2.13.0.0
+                FeatureList.Add(New KeyValuePair(Of Integer, String)(4, "新增：重做 Java 管理与相关设置，允许调整 Java 优先级、指定 Java 版本范围等"))
+                FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "优化：导出整合包时允许自动导出版本文件夹中的 Java"))
+                FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "优化：重做弹出提示的样式以及动画，以更符合现代 UI 审美"))
+                FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复：可能无法安装 OptiFine 26.1.2"))
+                FeatureCount += 35
+                BugCount += 17
+            End If
             If LastVersion < 403 Then 'Snapshot 2.12.8.2
                 FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复：Windows 7 无法正常联网"))
                 FeatureCount += 1
@@ -124,7 +187,7 @@ Public Class FormMain
             If LastVersion < 385 Then 'Snapshot 2.12.5
                 FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "修复：无法下载 NeoForge 26.1"))
                 If LastVersion = 384 Then
-                    FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "修复：下载可能失败，提示下载管理刷新线程出错"))
+                    FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "修复：下载可能失败，提示任务管理刷新线程出错"))
                     FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "修复：无法保存选择的 Minecraft 文件夹"))
                     FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复：使用中文搜索 Mod 时，部分结果会忽略筛选条件"))
                 End If
@@ -256,7 +319,7 @@ Public Class FormMain
         InitializeComponent()
         Opacity = 0
         '开启管理员权限下的文件拖拽
-        If SystemUtils.HasAdminRole() Then
+        If WindowsUtils.HasAdminRole() Then
             Static Helper As New DragHelper
             AddHandler SourceInitialized,
             Sub()
@@ -367,7 +430,7 @@ Public Class FormMain
             End If
             '启动加载器池
             Try
-                JavaListInit() '延后到同意协议后再执行，避免在初次启动时进行进程操作
+                JavaInit() '延后到同意协议后再执行，避免在初次启动时进行进程操作
                 Thread.Sleep(100)
                 DlClientListMojangLoader.Start(1) 'PCL 会同时根据这里的加载结果决定是否使用官方源进行下载
                 RunCountSub()
@@ -378,7 +441,7 @@ Public Class FormMain
             End Try
             '清理自动更新文件
             Try
-                FileUtils.Delete(PathExeFolder & "PCL\Plain Craft Launcher 2.exe")
+                FileUtils.Delete(Paths.Base & "PCL\Plain Craft Launcher 2.exe")
             Catch ex As Exception
                 Logger.Warn(ex, "清理自动更新文件失败")
             End Try
@@ -415,17 +478,17 @@ Public Class FormMain
         Logger.Info($"版本号从 {LastVersionCode} 升高到 {VersionCode}")
         Settings.Set("SystemLastVersionReg", VersionCode)
         '检查有记录的最高版本号
-        Dim LowerVersionCode As Integer
+        Dim HighestVersionCode As Integer
         Const SettingKey = If(BuildType = BuildTypes.Snapshot, "SystemHighestAlphaVersionReg", "SystemHighestBetaVersionReg")
-        LowerVersionCode = Settings.Get(Of Integer)("SystemHighestAlphaVersionReg")
-        If LowerVersionCode < VersionCode Then
+        HighestVersionCode = Settings.Get(Of Integer)(SettingKey)
+        If HighestVersionCode < VersionCode Then
             Settings.Set(SettingKey, VersionCode)
-            Logger.Info($"最高版本号从 {LowerVersionCode} 升高到 {VersionCode}")
+            Logger.Info($"最高版本号从 {HighestVersionCode} 升高到 {VersionCode}")
         End If
         '被移除的窗口设置选项
         If Settings.Get(Of Integer)("LaunchArgumentWindowType") = 5 Then Settings.Set("LaunchArgumentWindowType", 1)
         '修改主题设置项名称
-        If LowerVersionCode <= 207 Then
+        If HighestVersionCode <= 207 Then
             Dim UnlockedTheme As New List(Of String) From {"2"}
             UnlockedTheme.AddRange(New List(Of String)(Settings.Get(Of String)("UiLauncherThemeHide").ToString.Split("|")))
             UnlockedTheme.AddRange(New List(Of String)(Settings.Get(Of String)("UiLauncherThemeHide2").ToString.Split("|")))
@@ -448,12 +511,12 @@ Public Class FormMain
                      "多谢各位的理解啦！", "重新解锁提醒")
         End If
         '移动自定义皮肤
-        If LastVersionCode <= 161 AndAlso FileUtils.Exists(PathExeFolder & "PCL\CustomSkin.png") AndAlso Not FileUtils.Exists(PathAppdata & "CustomSkin.png") Then
-            FileUtils.Copy(PathExeFolder & "PCL\CustomSkin.png", PathAppdata & "CustomSkin.png")
+        If LastVersionCode <= 161 AndAlso FileUtils.Exists(Paths.Base & "PCL\CustomSkin.png") AndAlso Not FileUtils.Exists(Paths.AppDataThenName & "CustomSkin.png") Then
+            FileUtils.Copy(Paths.Base & "PCL\CustomSkin.png", Paths.AppDataThenName & "CustomSkin.png")
             Logger.Info("已移动离线自定义皮肤 (162)")
         End If
-        If LastVersionCode <= 263 AndAlso FileUtils.Exists(PathTemp & "CustomSkin.png") AndAlso Not FileUtils.Exists(PathAppdata & "CustomSkin.png") Then
-            FileUtils.Copy(PathTemp & "CustomSkin.png", PathAppdata & "CustomSkin.png")
+        If LastVersionCode <= 263 AndAlso FileUtils.Exists(PathTemp & "CustomSkin.png") AndAlso Not FileUtils.Exists(Paths.AppDataThenName & "CustomSkin.png") Then
+            FileUtils.Copy(PathTemp & "CustomSkin.png", Paths.AppDataThenName & "CustomSkin.png")
             Logger.Info("已移动离线自定义皮肤 (264)")
         End If
         '解除帮助页面的隐藏
@@ -484,8 +547,8 @@ Public Class FormMain
         End If
         '输出更新日志
         If LastVersionCode <= 0 Then Return
-        If LowerVersionCode >= VersionCode Then Return
-        ShowUpdateLog(LowerVersionCode)
+        If HighestVersionCode >= VersionCode Then Return
+        ShowUpdateLog(HighestVersionCode)
     End Sub
     Private Sub DowngradeSub(LastVersionCode As Integer)
         Logger.Info($"版本号从 {LastVersionCode} 降低到 {VersionCode}")
@@ -513,7 +576,7 @@ Public Class FormMain
             Sub()
                 Logger.Info("正在强行停止任务")
                 For Each Task As LoaderBase In LoaderTaskbar.ToList()
-                    Task.Interrupt()
+                    Task.Cancel()
                 Next
             End Sub, "强行停止下载任务")
         End If
@@ -562,11 +625,12 @@ Public Class FormMain
                 FeedbackInfo()
                 Logger.Info("请在 https://github.com/Meloong-Git/PCL/issues 提交错误报告，以便于作者解决此问题！")
                 IsLogShown = True
-                StartProcess(PathExeFolder & "PCL\Log1.txt")
+                StartProcess(Paths.Base & "PCL\Log1.txt")
             End If
             Thread.Sleep(500) '防止 PCL 在记事本打开前就被掐掉
         End If
         Logger.Info($"程序已退出，返回值：{ReturnCode}")
+        ConfigUtils.SaveAll()
         Logger.Instance.Flush()
         If ReturnCode <> ProcessReturnValues.Success Then Environment.Exit(ReturnCode)
         Process.GetCurrentProcess.Kill()
@@ -716,7 +780,7 @@ Public Class FormMain
                     FrmSetupUI.PanLogoChange.Visibility = Visibility.Visible
                 End If
                 Try
-                    ImageTitleLogo.Source = PathExeFolder & "PCL\Logo.png"
+                    ImageTitleLogo.Source = Paths.Base & "PCL\Logo.png"
                 Catch ex As Exception
                     ImageTitleLogo.Source = Nothing
                     Logger.Error(ex, "显示标题栏图片失败", LogBehavior.Alert)
@@ -759,8 +823,14 @@ Public Class FormMain
         ' 在没有弹窗时：继续检查……
         '==========================
 
-        '按 ESC 返回上一级
-        If e.Key = Key.Escape Then TriggerPageBack()
+        '按 ESC 取消启动，或返回上一级
+        If e.Key = Key.Escape Then
+            If PageCurrent = FormMain.PageType.Launch AndAlso McLaunchLoader.State = LoadState.Loading Then
+                FrmLaunchLeft.BtnCancel_Click()
+                Return
+            End If
+            TriggerPageBack()
+        End If
         '更改隐藏版本可见性
         If e.Key = Key.F11 AndAlso PageCurrent = FormMain.PageType.InstanceSelect Then
             FrmSelectRight.ShowHidden = Not FrmSelectRight.ShowHidden
@@ -808,12 +878,16 @@ Public Class FormMain
 
     '切回窗口
     Private Sub FormMain_Activated() Handles Me.Activated
+        '切回窗口时自动刷新
         Try
             If PageCurrent = PageType.InstanceSetup AndAlso PageCurrentSub = PageSubType.InstanceMod Then
-                'Mod 管理自动刷新
+                'Mod 管理
                 FrmInstanceMod.ReloadModList()
+            ElseIf PageCurrent = PageType.InstanceSetup AndAlso (PageCurrentSub = PageSubType.InstanceSetup OrElse PageCurrentSub = PageSubType.InstanceExport) Then
+                '更新当前选用的 Java
+                PageInstanceLeft.ReloadCurrentJava()
             ElseIf PageCurrent = PageType.InstanceSelect Then
-                '版本选择自动刷新
+                '版本选择
                 LoaderFolderRun(McInstanceListLoader, McFolderSelected, LoaderFolderRunType.RunOnUpdated, MaxDepth:=1, ExtraPath:="versions\")
             End If
         Catch ex As Exception
@@ -883,7 +957,7 @@ Public Class FormMain
                         'Authlib 拖拽
                         e.Handled = True
                         e.Effects = DragDropEffects.Copy
-                        Dim AuthlibServer As String = EscapeUtils.FormUrlUnescape(Str.Substring("authlib-injector:yggdrasil-server:".Length))
+                        Dim AuthlibServer As String = StringUtils.FormUrlUnescape(Str.Substring("authlib-injector:yggdrasil-server:".Length))
                         Logger.Info($"Authlib 拖拽：{AuthlibServer}")
                         If Not String.IsNullOrEmpty(New ValidateHttp().Validate(AuthlibServer)) Then
                             Hint($"输入的 Authlib 验证服务器不符合网址格式（{AuthlibServer}）！", HintType.Red)
@@ -967,22 +1041,22 @@ Public Class FormMain
             If FilePathList.Count > 1 Then
                 '必须要求全部为 jar 文件
                 For Each File In PathList
-                    If Not {"jar", "litemod", "disabled", "old"}.Contains(File.AfterLast(".").Lower) Then
+                    If Not {"jar", "litemod", "disabled", "old"}.Contains(PathUtils.GetExtension(File)) Then
                         Hint("一次请只拖入一个文件！", HintType.Red)
                         Return
                     End If
                 Next
             End If
             '主页
-            Dim Extension As String = FilePath.AfterLast(".").Lower
+            Dim Extension As String = PathUtils.GetExtension(FilePath)
             If Extension = "xaml" Then
                 Logger.Info("文件后缀为 XAML，作为主页加载")
-                If FileUtils.Exists(PathExeFolder & "PCL\Custom.xaml") Then
+                If FileUtils.Exists(Paths.Base & "PCL\Custom.xaml") Then
                     If MyMsgBox("已存在一个主页文件，是否要将它覆盖？", "覆盖确认", "覆盖", "取消") = 2 Then
                         Return
                     End If
                 End If
-                FileUtils.Copy(FilePath, PathExeFolder & "PCL\Custom.xaml")
+                FileUtils.Copy(FilePath, Paths.Base & "PCL\Custom.xaml")
                 RunInUi(
                 Sub()
                     Settings.Set("UiCustomType", 1)
@@ -995,19 +1069,24 @@ Public Class FormMain
             If PageInstanceMod.InstallMods(PathList) Then Return
             '安装整合包
             If {"zip", "rar", "mrpack"}.Any(Function(t) t = Extension) Then '部分压缩包是 zip 格式但后缀为 rar，总之试一试
-                Logger.Info("文件为压缩包，尝试作为整合包安装")
+                Hint("正在读取压缩包……")
                 Try
+                    Logger.Info("文件为压缩包，尝试作为整合包安装")
                     ModpackInstall(FilePath)
+                    RunInUi(Sub() FrmMain.PageChange(FormMain.PageType.TaskManager))
                     Return
-                Catch ex As CancelledException
-                    Return '用户主动取消
                 Catch ex As Exception
+                    If RestrictMcDownload AndAlso ex.Message = "为遵守相关法律法规，PCL 暂时不再提供 MC 下载功能，非常抱歉 qwq……" Then
+                        Hint(ex.Message, HintType.Red)
+                        Return
+                    End If
+                    If ex.IsCanceled Then Return
                     '安装失败，继续往后尝试
                 End Try
             End If
             'RAR 处理
             If Extension = "rar" Then
-                Hint("PCL 无法处理 rar 格式的压缩包，请在解压后重新压缩为 zip 格式再试！")
+                Hint("PCL 无法处理 rar 格式的压缩包，请在解压后重新压缩为 zip 格式再试！", HintType.Red)
                 Return
             End If
             '错误报告分析
@@ -1023,7 +1102,7 @@ Public Class FormMain
                 Logger.Error(ex, "自主错误报告分析失败")
             End Try
             '未知操作
-            Hint("PCL 无法确定应当执行的文件拖拽操作……")
+            Hint("PCL 无法确定适合的操作……", HintType.Red)
         End Sub, "文件拖拽")
     End Sub
 
@@ -1127,9 +1206,9 @@ Public Class FormMain
         ''' </summary>
         InstanceSelect = 5
         ''' <summary>
-        ''' 下载管理。这是一个副页面。
+        ''' 任务管理。这是一个副页面。
         ''' </summary>
-        DownloadManager = 6
+        TaskManager = 6
         ''' <summary>
         ''' 版本设置。这是一个副页面。
         ''' </summary>
@@ -1165,9 +1244,10 @@ Public Class FormMain
         OtherTest = 2
         InstanceOverall = 0
         InstanceSetup = 1
-        InstanceMod = 2
-        InstanceModDisabled = 3
-        InstanceExport = 4
+        InstanceModify = 2
+        InstanceMod = 3
+        InstanceModDisabled = 4
+        InstanceExport = 5
     End Enum
     ''' <summary>
     ''' 获取次级页面的名称。若并非次级页面则返回空字符串，故可以以此判断是否为次级页面。
@@ -1176,8 +1256,8 @@ Public Class FormMain
         Select Case Stack.Page
             Case PageType.InstanceSelect
                 Return "版本选择"
-            Case PageType.DownloadManager
-                Return "下载管理"
+            Case PageType.TaskManager
+                Return "任务管理"
             Case PageType.InstanceSetup
                 Return "版本设置 - " & If(PageInstanceLeft.Instance Is Nothing, "未知版本", PageInstanceLeft.Instance.Name)
             Case PageType.ResourceDetail
@@ -1332,6 +1412,10 @@ Public Class FormMain
     ''' </summary>
     Private Sub PageChangeActual(Stack As PageStackData, Optional SubType As PageSubType = -1)
         If PageCurrent = Stack AndAlso (PageCurrentSub = SubType OrElse SubType = -1) Then Return
+        If Stack.Page = PageType.InstanceSetup AndAlso PageInstanceLeft.Instance IsNot Nothing AndAlso McInstanceLock.IsLocked(PageInstanceLeft.Instance) Then
+            Hint("该版本正在被修改，暂时无法进入版本设置！", HintType.Red)
+            Return
+        End If
         AniControlEnabled += 1
         Try
 
@@ -1399,7 +1483,7 @@ Public Class FormMain
                     If FrmSelectLeft Is Nothing Then FrmSelectLeft = New PageSelectLeft
                     If FrmSelectRight Is Nothing Then FrmSelectRight = New PageSelectRight
                     PageChangeAnim(FrmSelectLeft, FrmSelectRight)
-                Case PageType.DownloadManager '下载管理
+                Case PageType.TaskManager '任务管理
                     If FrmSpeedLeft Is Nothing Then FrmSpeedLeft = New PageSpeedLeft
                     If FrmSpeedRight Is Nothing Then FrmSpeedRight = New PageSpeedRight
                     PageChangeAnim(FrmSpeedLeft, FrmSpeedRight)
@@ -1419,7 +1503,7 @@ Public Class FormMain
             BtnExtraApril.ShowRefresh()
 #End Region
 
-            Logger.Info($"切换主要页面：{Stack}, {SubType}")
+            Logger.Info($"切换主要页面：{Stack.Page}, {SubType}")
         Catch ex As Exception
             Logger.Error(ex, $"切换主要页面失败（ID {PageCurrent.Page}）")
         Finally
@@ -1431,8 +1515,8 @@ Public Class FormMain
         AniStop("PageLeft PageChange") '停止左边栏变更导致的右页面切换动画，防止它与本动画一起触发多次 PageOnEnter
         AniControlEnabled += 1
         '清除新页面关联性
-        If Not IsNothing(TargetLeft.Parent) Then TargetLeft.SetValue(ContentPresenter.ContentProperty, Nothing)
-        If Not IsNothing(TargetRight) AndAlso Not IsNothing(TargetRight.Parent) Then TargetRight.SetValue(ContentPresenter.ContentProperty, Nothing)
+        If TargetLeft.Parent IsNot Nothing Then TargetLeft.SetValue(ContentPresenter.ContentProperty, Nothing)
+        If TargetRight IsNot Nothing AndAlso TargetRight.Parent IsNot Nothing Then TargetRight.SetValue(ContentPresenter.ContentProperty, Nothing)
         PageLeft = TargetLeft
         PageRight = TargetRight
         '触发页面通用动画
@@ -1573,12 +1657,12 @@ Public Class FormMain
         MusicControlNext()
     End Sub
 
-    '下载管理
+    '任务管理
     Private Sub BtnExtraDownload_Click(sender As Object, e As EventArgs) Handles BtnExtraDownload.Click
-        PageChange(PageType.DownloadManager)
+        PageChange(PageType.TaskManager)
     End Sub
     Private Function BtnExtraDownload_ShowCheck() As Boolean
-        Return HasDownloadingTask() AndAlso Not PageCurrent = PageType.DownloadManager
+        Return HasDownloadingTask() AndAlso Not PageCurrent = PageType.TaskManager
     End Function
 
     '投降
@@ -1598,7 +1682,7 @@ Public Class FormMain
     '关闭 Minecraft
     Public Sub BtnExtraShutdown_Click() Handles BtnExtraShutdown.Click
         Try
-            If McLaunchLoaderReal IsNot Nothing Then McLaunchLoaderReal.Interrupt()
+            If McLaunchLoaderReal IsNot Nothing Then McLaunchLoaderReal.Cancel()
             For Each Watcher In McWatcherList
                 Watcher.Kill()
             Next

Plain Craft Launcher 2/GlobalSuppressions.vb

@@ -1,4 +1,4 @@
-' This file is used by Code Analysis to maintain SuppressMessage
+' This file is used by Code Analysis to maintain SuppressMessage
 ' attributes that are applied to this project.
 ' Project-level suppressions either have no target or are given
 ' a specific target and scoped to a namespace, type, member, etc.

Plain Craft Launcher 2/Modules/Base/ModAnimation.vb

@@ -1,4 +1,4 @@
-'动画引擎模块
+'动画引擎模块
 '使用 Ani 作为方法或属性的开头，使用 Aa 作为单个动画对象的开头（便于自动补全）
 
 Imports System.Windows.Media.Effects
@@ -79,7 +79,7 @@ Public Module ModAnimation
         ''' 已经执行的动画长度。如果为负数则为延迟。
         ''' </summary>
         ''' <remarks></remarks>
-        Public TimeFinished As Integer
+        Public TimeFinished As Double
         ''' <summary>
         ''' 已经完成的百分比。
         ''' </summary>
@@ -832,7 +832,12 @@ Public Module ModAnimation
                         AniCount = 0
                         AniTimer(DeltaTime * AniSpeed)
                         If RandomInteger(0, 64 * If(ModeDebug, 5, 30)) = 0 AndAlso ((AniFPS < 62 AndAlso AniFPS > 0) OrElse AniCount > 4 OrElse NetManager.FileRemain <> 0) Then
-                            Logger.Info($"FPS {AniFPS}, 动画 {AniCount}, 下载中 {NetManager.FileRemain}（{FormatFileSize(NetManager.Speed)}/s）")
+                            Logger.Info($"FPS {AniFPS}, 动画 {AniCount}, 下载中 {NetManager.FileRemain}（{StringUtils.FormatByteSize(NetManager.Speed)}/s）")
+                            If NetManager.FileRemain < 5 Then
+                                For Each File In NetManager.AllFiles.Values
+                                    If File.State < NetState.Finished Then Logger.Trace($"- {File.State} {StringUtils.FormatByteSize(File.Speed)}/s {File.LocalPath}")
+                                Next
+                            End If
                         End If
                     End Sub)
 Sleeper:
@@ -848,9 +853,8 @@ Sleeper:
     ''' <summary>
     ''' 动画定时器事件。
     ''' </summary>
-    Public Sub AniTimer(DeltaTick As Integer)
+    Public Sub AniTimer(DeltaTick As Double)
         Try
-
             If DeltaTick / AniSpeed > 100 Then Logger.Info($"两个动画帧间隔 {DeltaTick} ms")
             Dim i As Integer = -1
             '循环每个动画组
@@ -1018,7 +1022,7 @@ NextAni:
                         If Convert.ToInt32(Convert.ToChar(NextText)) >= Convert.ToInt32(Convert.ToChar(128)) Then
                             NewText &= Encoding.GetEncoding("GB18030").GetString({RandomInteger(16 + 160, 87 + 160), RandomInteger(1 + 160, 89 + 160)})
                         Else
-                            NewText &= RandomOne("0123456789./*-+\[]{};':/?,!@#$%^&*()_+-=qwwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDFGHJKLZXCVBNM".ToCharArray)
+                            NewText &= RandomInteger(0, 85).ConvertRadix(86)
                         End If
                     End If
                     '设置文本
@@ -1029,6 +1033,7 @@ NextAni:
                     End If
 
                 Case AniType.Code
+                    Ani.TimeFinished = Ani.TimeTotal
                     CType(Ani.Value, ThreadStart)()
 
                 Case AniType.ScaleTransform

Plain Craft Launcher 2/Modules/Base/ModBase.vb

@@ -1,21 +1,17 @@
-Imports System.Globalization
 Imports System.Runtime.CompilerServices
-Imports System.Security.Cryptography
-Imports System.Threading.Tasks
 Imports System.Xaml
-Imports Newtonsoft.Json
 
 Public Module ModBase
 
 #Region "声明"
 
     '下列版本信息由更新器自动修改
-    Public Const VersionBaseName As String = "2.12.8.2" '显示用版本名
+    Public Const VersionBaseName As String = "2.99.0.0" '显示用版本名
     Public Const CommitHash As String = "" 'Commit Hash，由 GitHub Workflow 自动替换
 #If RELEASE Then
-    Public Const VersionCode As Integer = 404 '正式版
+    Public Const VersionCode As Integer = 413 '正式版
 #Else
-    Public Const VersionCode As Integer = 403 '快照版
+    Public Const VersionCode As Integer = 414 '快照版
 #End If
 
     '版本信息
@@ -41,13 +37,9 @@ Public Module ModBase
     ''' </summary>
     Public Handle As IntPtr
     ''' <summary>
-    ''' 程序的启动路径，以 \ 结尾。
-    ''' </summary>
-    Public PathExeFolder As String = AppDomain.CurrentDomain.SetupInformation.ApplicationBase
-    ''' <summary>
     ''' 包含程序名的完整路径。
     ''' </summary>
-    Public PathExe As String = PathExeFolder & AppDomain.CurrentDomain.SetupInformation.ApplicationName
+    Public PathExe As String = Paths.Base & AppDomain.CurrentDomain.SetupInformation.ApplicationName
     ''' <summary>
     ''' 程序内嵌图片文件夹路径，以 / 结尾。
     ''' </summary>
@@ -55,11 +47,7 @@ Public Module ModBase
     ''' <summary>
     ''' 程序的缓存文件夹路径，以 \ 结尾。
     ''' </summary>
-    Public PathTemp As String = If(Settings.Get(Of String)("SystemSystemCache") = "", Path.GetTempPath() & "PCL\", Settings.Get(Of String)("SystemSystemCache")).ToString.Replace("/", "\").TrimEnd("\") & "\"
-    ''' <summary>
-    ''' AppData 中的 PCL 文件夹路径，以 \ 结尾。
-    ''' </summary>
-    Public PathAppdata As String = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\PCL\"
+    Public PathTemp As String = PathUtils.AddSlashSuffix(If(Settings.Get(Of String)("SystemSystemCache") = "", Path.GetTempPath() & "PCL\", Settings.Get(Of String)("SystemSystemCache")).Replace("/", "\"))
     ''' <summary>
     ''' 当前程序的语言。
     ''' </summary>
@@ -81,17 +69,13 @@ Public Module ModBase
     ''' </summary>
     Public IsProgramEnding As Boolean = False
     ''' <summary>
-    ''' 是否为 32 位系统。
-    ''' </summary>
-    Public Is32BitSystem As Boolean = Not Environment.Is64BitOperatingSystem
-    ''' <summary>
     ''' 是否使用 GBK 编码。
     ''' </summary>
     Public IsGBKEncoding As Boolean = Encoding.Default.CodePage = 936
     ''' <summary>
     ''' 系统盘盘符，以 \ 结尾。例如 “C:\”。
     ''' </summary>
-    Public OsDrive As String = Environment.GetLogicalDrives().Where(Function(p) Directory.Exists(p)).First.Upper.First & ":\" '#3799
+    Public OsDrive As String = Environment.GetLogicalDrives().First(Function(p) Directory.Exists(p)) '#3799
 
     Public ReadOnly Property ModeDebug As Boolean
         Get
@@ -139,7 +123,7 @@ Public Module ModBase
         ''' <summary>
         ''' 图标按钮，刷新，0.85x
         ''' </summary>
-        Public Const IconButtonRefresh As String = "M875.52 148.48C783.36 56.32 655.36 0 512 0 291.84 0 107.52 138.24 30.72 332.8l122.88 46.08C204.8 230.4 348.16 128 512 128c107.52 0 199.68 40.96 271.36 112.64L640 384h384V0L875.52 148.48zM512 896c-107.52 0-199.68-40.96-271.36-112.64L384 640H0v384l148.48-148.48C240.64 967.68 368.64 1024 512 1024c220.16 0 404.48-138.24 481.28-332.8L870.4 645.12C819.2 793.6 675.84 896 512 896z"
+        Public Const IconButtonRefresh As String = "M512.0 838.3c-80.2 0-153.4-29.3-210.2-77.4l75.5-75.5c11.5-11.5 25.8-22.0 25.8-37.0a27.2 27.2 0 0 0-27.1-27.1H104.0c-27.1 0-27.1 23.9-27.1 27.1v271.9a27.1 27.1 0 0 0 27.1 27.1c15.0 0 27.8-16.6 42.5-31.2l77.9-77.9c76.6 67.7 177.1 108.9 287.4 108.9 221.7 0 404.5-166.0 431.2-380.6h-109.8c-25.9 154.2-159.7 271.9-321.3 271.9zM919.9 76.6c-15.0 0-27.8 16.6-42.5 31.3L799.5 185.8c-76.5-67.7-177.1-108.9-287.4-108.9-221.8 0-404.5 166.1-431.3 380.6H190.6c25.9-154.2 159.7-271.9 321.4-271.9 80.2 0 153.4 29.3 210.1 77.4l-75.5 75.5c-11.6 11.5-25.8 22.0-25.8 37.1a27.2 27.2 0 0 0 27.1 27.1h271.9c27.1 0 27.1-23.9 27.1-27.1V103.8a27.1 27.1 0 0 0-27.1-27.1z"
         ''' <summary>
         ''' 图标按钮，软盘，1x
         ''' </summary>
@@ -153,10 +137,18 @@ Public Module ModBase
         ''' </summary>
         Public Const IconButtonList As String = "M384 128h640v128H384zM160 192m-96 0a96 96 0 1 0 192 0 96 96 0 1 0-192 0ZM384 448h640v128H384zM160 512m-96 0a96 96 0 1 0 192 0 96 96 0 1 0-192 0ZM384 768h640v128H384zM160 832m-96 0a96 96 0 1 0 192 0 96 96 0 1 0-192 0Z"
         ''' <summary>
-        ''' 图标按钮，文件夹，1.15x
+        ''' 图标按钮，文件夹，1.1x
         ''' </summary>
         Public Const IconButtonOpen As String = "M889.018182 418.909091H884.363636V316.509091a93.090909 93.090909 0 0 0-99.607272-89.832727h-302.545455l-93.090909-76.334546A46.545455 46.545455 0 0 0 358.865455 139.636364H146.152727A93.090909 93.090909 0 0 0 46.545455 229.469091V837.818182a46.545455 46.545455 0 0 0 46.545454 46.545454 46.545455 46.545455 0 0 0 16.756364-3.258181 109.381818 109.381818 0 0 0 25.134545 3.258181h586.472727a85.178182 85.178182 0 0 0 87.04-63.301818l163.374546-302.545454a46.545455 46.545455 0 0 0 5.585454-21.876364A82.385455 82.385455 0 0 0 889.018182 418.909091z m-744.727273-186.181818h198.283636l93.09091 76.334545a46.545455 46.545455 0 0 0 29.323636 10.705455h319.301818a12.101818 12.101818 0 0 1 6.516364 0V418.909091H302.545455a85.178182 85.178182 0 0 0-87.04 63.301818L139.636364 622.778182V232.727273a19.549091 19.549091 0 0 1 6.516363 0z m578.094546 552.029091a27.461818 27.461818 0 0 0-2.792728 6.516363H154.530909l147.083636-272.290909a27.461818 27.461818 0 0 0 2.792728-6.981818h565.061818z"
         ''' <summary>
+        ''' 图标按钮，上箭头，0.95x
+        ''' </summary>
+        Public Const IconButtonArrowUp As String = "M554 333V853h-85V333l-228 228-60-60L512 170l331 331-60 60L554 333z"
+        ''' <summary>
+        ''' 图标按钮，下箭头，0.95x
+        ''' </summary>
+        Public Const IconButtonArrowDown As String = "M554 691V171h-85V691L241 463l-60 60L512 854l331-331-60-60L554 691z"
+        ''' <summary>
         ''' 图标按钮，名片，1.1x
         ''' </summary>
         Public Const IconButtonCard As String = "M834.5 684.1c-31.2-70.4-98.9-120.9-179.1-127.3 63.5-8.5 112.6-63 112.6-128.8 0-71.8-58.2-130-130-130s-130 58.2-130 130c0 65.9 49 120.3 112.6 128.8-80.2 6.4-148 57-179.1 127.3-8.7 19.7 6 42 27.6 42 12.1 0 22.7-7.5 27.7-18.5 24.3-53.9 78.5-91.5 141.3-91.5s117 37.6 141.3 91.5c5 11.1 15.6 18.5 27.7 18.5 21.4 0 36.1-22.3 27.4-42zM567.9 427.9c0-38.6 31.4-70 70-70s70 31.4 70 70-31.4 70-70 70-70-31.4-70-70zM460.3 347.9H216.9c-16.6 0-30 13.4-30 30s13.4 30 30 30h243.3c16.6 0 30-13.4 30-30 0.1-16.5-13.4-30-29.9-30zM367.4 459.6H216.9c-16.6 0-30 13.4-30 30s13.4 30 30 30h150.4c16.6 0 30-13.4 30-30 0.1-16.6-13.4-30-29.9-30zM297.4 571.2H217c-16.6 0-30 13.4-30 30s13.4 30 30 30h80.4c16.6 0 30-13.4 30-30 0-16.5-13.5-30-30-30zM900 236v552H124V236h776m0-60H124c-33.1 0-60 26.9-60 60v552c0 33.1 26.9 60 60 60h776c33.1 0 60-26.9 60-60V236c0-33.1-26.9-60-60-60z"
@@ -436,7 +428,7 @@ Public Module ModBase
         Loading
         Finished
         Failed
-        Interrupted
+        Canceled
     End Enum
 
     ''' <summary>
@@ -473,57 +465,7 @@ Public Module ModBase
 
 #Region "文件"
 
-    '=============================
-    '  注册表
-    '=============================
-
-    ''' <summary>
-    ''' 读取注册表键。如果失败则返回默认值。
-    ''' </summary>
-    Public Function ReadReg(Key As String, Optional DefaultValue As String = "") As String
-        Try
-            Return If(My.Computer.Registry.CurrentUser.OpenSubKey("Software\" & RegFolder, False)?.GetValue(Key), DefaultValue)
-        Catch ex As Exception
-            Logger.Error(ex, $"读取注册表出错：{Key}", LogBehavior.Toast)
-            Return DefaultValue
-        End Try
-    End Function
-    ''' <summary>
-    ''' 写入注册表键。
-    ''' </summary>
-    Public Sub WriteReg(Key As String, Value As String, Optional ThrowException As Boolean = False)
-        Try
-            Dim SubKey As Microsoft.Win32.RegistryKey = My.Computer.Registry.CurrentUser.OpenSubKey("Software\" & RegFolder, True)
-            If SubKey Is Nothing Then SubKey = My.Computer.Registry.CurrentUser.CreateSubKey("Software\" & RegFolder) '如果不存在就创建  
-            SubKey.SetValue(Key, Value)
-        Catch ex As Exception
-            Logger.Warn(ex, $"写入注册表出错：{Key}", If(ThrowException, LogBehavior.Toast, LogBehavior.ToastIfDebug))
-            If ThrowException Then Throw
-        End Try
-    End Sub
-    ''' <summary>
-    ''' 是否存在某个注册表键。
-    ''' </summary>
-    Public Function HasReg(Key As String) As Boolean
-        Return ReadReg(Key, Nothing) IsNot Nothing
-    End Function
-    ''' <summary>
-    ''' 删除注册表键。
-    ''' </summary>
-    Public Sub DeleteReg(Key As String, Optional ThrowException As Boolean = False)
-        Try
-            Dim SubKey As Microsoft.Win32.RegistryKey = My.Computer.Registry.CurrentUser.OpenSubKey("Software\" & RegFolder, True)
-            If SubKey?.GetValue(Key) Is Nothing Then Return
-            SubKey.DeleteValue(Key)
-        Catch ex As Exception
-            Logger.Warn(ex, $"删除注册表出错：{Key}", If(ThrowException, LogBehavior.Toast, LogBehavior.ToastIfDebug))
-            If ThrowException Then Throw
-        End Try
-    End Sub
-
-    '=============================
-    '  ini
-    '=============================
+    'ini
 
     Private ReadOnly IniCache As New ConcurrentDictionary(Of String, ConcurrentDictionary(Of String, String))
     ''' <summary>
@@ -531,7 +473,7 @@ Public Module ModBase
     ''' </summary>
     ''' <param name="FileName">文件完整路径或简写文件名。简写将会使用“ApplicationName\文件名.ini”作为路径。</param>
     Public Sub IniClearCache(FileName As String)
-        If Not FileName.Contains(":\") Then FileName = $"{PathExeFolder}PCL\{FileName}.ini"
+        If Not FileName.Contains(":\") Then FileName = $"{Paths.Base}PCL\{FileName}.ini"
         IniCache.Remove(FileName)
     End Sub
     ''' <summary>
@@ -542,7 +484,7 @@ Public Module ModBase
     Private Function IniGetContent(FileName As String) As ConcurrentDictionary(Of String, String)
         Try
             '还原文件路径
-            If Not FileName.Contains(":\") Then FileName = $"{PathExeFolder}PCL\{FileName}.ini"
+            If Not FileName.Contains(":\") Then FileName = $"{Paths.Base}PCL\{FileName}.ini"
             '检索缓存
             Dim Cache As ConcurrentDictionary(Of String, String) = Nothing
             If IniCache.TryGetValue(FileName, Cache) Then Return Cache
@@ -616,16 +558,17 @@ Public Module ModBase
                 FileContent.Append(Pair.Value)
                 FileContent.Append(vbCrLf)
             Next
-            If Not FileName.Contains(":\") Then FileName = $"{PathExeFolder}PCL\{FileName}.ini"
+            If Not FileName.Contains(":\") Then FileName = $"{Paths.Base}PCL\{FileName}.ini"
             '处理相对路径
-            FileName = If(FileName.Contains(":\"), FileName, PathExeFolder & FileName)
+            FileName = If(FileName.Contains(":\"), FileName, Paths.Base & FileName)
             FileUtils.Write(FileName, FileContent.ToString)
         Catch ex As Exception
             Logger.Error(ex, $"写入文件失败（{FileName} → {Key}:{Value}）", LogBehavior.Toast)
         End Try
     End Sub
 
-    '文件校验
+    '权限检查
+
     ''' <summary>
     ''' 检查是否拥有某一文件夹的 I/O 权限。如果文件夹不存在，会返回 False。
     ''' </summary>
@@ -633,7 +576,7 @@ Public Module ModBase
         Try
             If String.IsNullOrEmpty(Folder) Then Return False
             Folder = PathUtils.AddSlashSuffix(Folder)
-            If Folder.EndsWithF(":\System Volume Information\") OrElse Folder.EndsWithF(":\$RECYCLE.BIN\") Then Return False
+            If Folder.EndsWithF(":\System Volume Information\", True) OrElse Folder.EndsWithF(":\$RECYCLE.BIN\", True) Then Return False
             If Not DirectoryUtils.Exists(Folder) Then Return False
             Dim TestFilePath As String = $"{Folder}CheckPermission{GetUuid()}.txt"
             FileUtils.Write(TestFilePath, "临时文件，用于检测该文件夹的权限是否正常。")
@@ -650,149 +593,19 @@ Public Module ModBase
     Public Sub CheckPermissionWithException(Folder As String)
         If String.IsNullOrWhiteSpace(Folder) Then Throw New ArgumentNullException("文件夹名不能为空！")
         Folder = PathUtils.AddSlashSuffix(Folder)
-        If Folder.EndsWithF(":\System Volume Information\") OrElse Folder.EndsWithF(":\$RECYCLE.BIN\") Then Throw New UnauthorizedAccessException("没有对系统文件夹的权限！")
+        If Folder.EndsWithF(":\System Volume Information\", True) OrElse Folder.EndsWithF(":\$RECYCLE.BIN\", True) Then Throw New UnauthorizedAccessException("没有对系统文件夹的权限！")
         If Not DirectoryUtils.Exists(Folder) Then Throw New DirectoryNotFoundException("文件夹不存在！")
         Dim TestFilePath As String = $"{Folder}CheckPermission{GetUuid()}.txt"
         FileUtils.Write(TestFilePath, "临时文件，用于检测该文件夹的权限是否正常。")
         FileUtils.Delete(TestFilePath)
     End Sub
 
-    ''' <summary>
-    ''' 文件的校验规则。
-    ''' </summary>
-    Public Class FileChecker
-        ''' <summary>
-        ''' 文件的准确大小。
-        ''' 不检查则为 -1。
-        ''' </summary>
-        Public ActualSize As Long = -1
-        ''' <summary>
-        ''' 文件的最小大小。
-        ''' 不检查则为 -1。
-        ''' </summary>
-        Public MinSize As Long = -1
-        ''' <summary>
-        ''' 文件的 MD5、SHA1 或 SHA256。会根据输入字符串的长度自动判断种类。
-        ''' 不检查则为 Nothing。
-        ''' </summary>
-        Public Hash As String = Nothing
-        ''' <summary>
-        ''' 是否可以使用已经存在的文件。
-        ''' </summary>
-        Public CanUseExistsFile As Boolean = True
-        ''' <summary>
-        ''' 是否要求为 JSON 文件。
-        ''' 即，开头结尾必须为 {} 或 []。
-        ''' </summary>
-        Public IsJson As Boolean = False
-        Public Sub New(Optional MinSize As Long = -1, Optional ActualSize As Long = -1, Optional Hash As String = Nothing, Optional CanUseExistsFile As Boolean = True, Optional IsJson As Boolean = False)
-            Me.ActualSize = ActualSize
-            Me.MinSize = MinSize
-            Me.Hash = Hash
-            Me.CanUseExistsFile = CanUseExistsFile
-            Me.IsJson = IsJson
-        End Sub
-        ''' <summary>
-        ''' 检查文件。若成功则返回 Nothing，失败则返回错误的描述文本，描述文本不以句号结尾。不会抛出错误。
-        ''' </summary>
-        Public Function Check(LocalPath As String) As String
-            Try
-                Dim Info = FileUtils.GetInfo(LocalPath)
-                If Not Info.Exists Then Return "文件不存在：" & LocalPath
-                Dim FileSize As Long = Info.Length
-                If ActualSize >= 0 AndAlso ActualSize <> FileSize Then
-                    Return $"文件大小应为 {ActualSize} B，实际为 {FileSize} B" &
-                        If(FileSize < 2000, "，内容为：" & FileUtils.ReadAsString(LocalPath), "")
-                End If
-                If MinSize >= 0 AndAlso MinSize > FileSize Then
-                    Return $"文件大小应大于 {MinSize} B，实际为 {FileSize} B" &
-                        If(FileSize < 2000, "，内容为：" & FileUtils.ReadAsString(LocalPath), "")
-                End If
-                If Not String.IsNullOrEmpty(Hash) Then
-                    If Hash.Length < 35 Then 'MD5
-                        Dim md5 As String = CryptographyUtils.ComputeFileHash(LocalPath, CryptographyUtils.HashMethod.Md5)
-                        If Hash.Lower <> md5 Then Return "文件 MD5 应为 " & Hash & "，实际为 " & md5
-                    ElseIf Hash.Length = 64 Then 'SHA256
-                        Dim sha256 As String = CryptographyUtils.ComputeFileHash(LocalPath, CryptographyUtils.HashMethod.Sha256)
-                        If Hash.Lower <> sha256 Then Return "文件 SHA256 应为 " & Hash & "，实际为 " & sha256
-                    Else 'SHA1 (40)
-                        Dim sha1 As String = CryptographyUtils.ComputeFileHash(LocalPath, CryptographyUtils.HashMethod.Sha1)
-                        If Hash.Lower <> sha1 Then Return "文件 SHA1 应为 " & Hash & "，实际为 " & sha1
-                    End If
-                End If
-                If IsJson Then
-                    Dim Content As String = FileUtils.ReadAsString(LocalPath)
-                    If Content = "" Then Throw New Exception("读取到的文件为空")
-                    Try
-                        GetJson(Content)
-                    Catch ex As Exception
-                        Throw New Exception("不是有效的 json 文件", ex)
-                    End Try
-                End If
-                Return Nothing
-            Catch ex As Exception
-                Logger.Warn(ex, "检查文件出错")
-                Return ex.GetDisplay(False)
-            End Try
-        End Function
-    End Class
-
 #End Region
 
 #Region "文本"
     Public vbLQ As Char = Convert.ToChar(8220)
     Public vbRQ As Char = Convert.ToChar(8221)
 
-    ''' <summary>
-    ''' 将对象转换为枚举类型，支持数字或原文两种格式，若为空字符串或 Nothing 则返回 0。
-    ''' 若转换失败会抛出异常。
-    ''' </summary>
-    <Extension> Public Function ToEnum(Of T As Structure)(Value As Object) As T
-        If IsNumeric(Value) Then
-            Return CType(CInt(Value), Object)
-        ElseIf String.IsNullOrEmpty(Value?.ToString) Then
-            Return CType(0, Object)
-        Else
-            Return [Enum].Parse(GetType(T), Value.ToString(), True)
-        End If
-    End Function
-    ''' <summary>
-    ''' 将文件大小转化为适合的文本形式，如“1.28 M”。
-    ''' </summary>
-    ''' <param name="FileSize">以字节为单位的大小表示。</param>
-    Public Function FormatFileSize(FileSize As Long) As String
-        Dim IsNegative = FileSize < 0
-        If IsNegative Then FileSize *= -1
-        If FileSize < 1000 Then
-            'B 级
-            Return If(IsNegative, "-", "") & FileSize & " B"
-        ElseIf FileSize < 1024 * 1000 Then
-            'K 级
-            Dim RoundResult As String = Math.Round(FileSize / 1024)
-            Return If(IsNegative, "-", "") & Math.Round(FileSize / 1024, CInt((3 - RoundResult.Length).Clamp(0, 2))) & " K"
-        ElseIf FileSize < 1024 * 1024 * 1000 Then
-            'M 级
-            Dim RoundResult As String = Math.Round(FileSize / 1024 / 1024)
-            Return If(IsNegative, "-", "") & Math.Round(FileSize / 1024 / 1024, CInt((3 - RoundResult.Length).Clamp(0, 2))) & " M"
-        Else
-            'G 级
-            Dim RoundResult As String = Math.Round(FileSize / 1024 / 1024 / 1024)
-            Return If(IsNegative, "-", "") & Math.Round(FileSize / 1024 / 1024 / 1024, CInt((3 - RoundResult.Length).Clamp(0, 2))) & " G"
-        End If
-    End Function
-
-    ''' <summary>
-    ''' 获取 JSON 对象。
-    ''' </summary>
-    Public Function GetJson(Data As String) As JToken
-        Try
-            Return JsonConvert.DeserializeObject(Data, New JsonSerializerSettings With {.DateTimeZoneHandling = DateTimeZoneHandling.Local})
-        Catch ex As Exception
-            Dim Length As Integer = If(Data, "").Length
-            Throw New Exception("格式化 JSON 失败：" & If(Length > 2000, Data.Substring(0, 500) & $"...(全长 {Length} 个字符)..." & Right(Data, 500), Data), ex)
-        End Try
-    End Function
-
     ''' <summary>
     ''' 不会报错的 Val。
     ''' 如果输入有误，返回 0。
@@ -958,7 +771,7 @@ Public Module ModBase
             TokenSource.Cancel()
             Throw New TimeoutException($"任务超时（{TimeoutMs} ms）")
         End If
-        Return TargetTask.GetAwaiter().GetResult()
+        Return TargetTask.Run()
     End Function
     ''' <summary>
     ''' 为 Task 设置超时，在超时时抛出 TimeoutException。
@@ -969,24 +782,24 @@ Public Module ModBase
             TokenSource.Cancel()
             Throw New TimeoutException($"任务超时（{TimeoutMs} ms）")
         End If
-        TargetTask.GetAwaiter().GetResult()
+        TargetTask.Run()
     End Sub
 
     ''' <summary>
     ''' 可用于临时存放文件的，不含任何特殊字符的文件夹路径，以“\”结尾。
     ''' </summary>
-    Public PathPure As String = GetPureASCIIDir()
-    Private Function GetPureASCIIDir() As String
-        If (PathExeFolder & "PCL").IsAsciiOnly() Then
-            Return PathExeFolder & "PCL\"
-        ElseIf PathAppdata.IsAsciiOnly() Then
-            Return PathAppdata
+    Public PathPure As New Lazy(Of String)(
+    Function()
+        If Paths.Base.IsAsciiOnly() Then
+            Return Paths.Base & "PCL\"
+        ElseIf Paths.AppDataThenName.IsAsciiOnly() Then
+            Return Paths.AppDataThenName
         ElseIf PathTemp.IsAsciiOnly() Then
             Return PathTemp
         Else
             Return OsDrive & "ProgramData\PCL\"
         End If
-    End Function
+    End Function)
 
     ''' <summary>
     ''' 指示接取到这个异常的函数进行重试。
@@ -994,12 +807,6 @@ Public Module ModBase
     Public Class RestartException
         Inherits Exception
     End Class
-    ''' <summary>
-    ''' 指示用户手动取消了操作，或用户已知晓操作被取消的原因。
-    ''' </summary>
-    Public Class CancelledException
-        Inherits Exception
-    End Class
 
     ''' <summary>
     ''' 以管理员权限运行当前程序，并等待程序运行结束。
@@ -1011,19 +818,6 @@ Public Module ModBase
         Return NewProcess.ExitCode
     End Function
 
-    ''' <summary>
-    ''' 判断对象是否为某个泛型类型的实例。
-    ''' </summary>
-    <Extension> Public Function IsInstanceOfGenericType(genericType As Type, obj As Object) As Boolean
-        If obj Is Nothing Then Return False
-        Dim t = obj.GetType()
-        While t IsNot Nothing
-            If t.IsGenericType AndAlso t.GetGenericTypeDefinition() Is genericType Then Return True
-            t = t.BaseType
-        End While
-        Return False
-    End Function
-
     Private Uuid As Integer = 1
     Private UuidLock As Object
     ''' <summary>
@@ -1045,85 +839,18 @@ Public Module ModBase
         Return Stopwatch.GetTimestamp() \ (Stopwatch.Frequency \ 1000L)
     End Function
     ''' <summary>
-    ''' 将时间间隔转换为类似“5 分 10 秒前”的易于阅读的形式。
-    ''' </summary>
-    Public Function GetTimeSpanString(Span As TimeSpan, IsShortForm As Boolean) As String
-        Dim EndFix = If(Span.TotalMilliseconds > 0, "后", "前")
-        If Span.TotalMilliseconds < 0 Then Span = -Span
-        Dim TotalMonthes = Math.Floor(Span.Days / 30)
-        Dim Result As String
-        If IsShortForm Then
-            If TotalMonthes >= 12 Then
-                '1+ 年，“3 年”
-                Result = Math.Floor(TotalMonthes / 12) & " 年"
-            ElseIf TotalMonthes >= 2 Then
-                '2~11 月，“5 个月”
-                Result = TotalMonthes & " 个月"
-            ElseIf Span.TotalDays >= 2 Then
-                '2 天 ~ 2 月，“23 天”
-                Result = Span.Days & " 天"
-            ElseIf Span.TotalHours >= 1 Then
-                '1 小时 ~ 2 天，“15 小时”
-                Result = Span.Hours & " 小时"
-            ElseIf Span.TotalMinutes >= 1 Then
-                '1 分钟 ~ 1 小时，“49 分钟”
-                Result = Span.Minutes & " 分钟"
-            ElseIf Span.TotalSeconds >= 1 Then
-                '1 秒 ~ 1 分钟，“23 秒”
-                Result = Span.Seconds & " 秒"
-            Else
-                '不到 1 秒
-                Result = "1 秒"
-            End If
-        Else
-            If TotalMonthes >= 61 Then
-                '5+ 年，“5 年”
-                Result = Math.Floor(TotalMonthes / 12) & " 年"
-            ElseIf TotalMonthes >= 12 Then
-                '12~60 月，“1 年 2 个月”
-                Result = Math.Floor(TotalMonthes / 12) & " 年" & If((TotalMonthes Mod 12) > 0, " " & (TotalMonthes Mod 12) & " 个月", "")
-            ElseIf TotalMonthes >= 4 Then
-                '4~11 月，“5 个月”
-                Result = TotalMonthes & " 个月"
-            ElseIf TotalMonthes >= 1 Then
-                '1~4 月，“2 个月 13 天”
-                Result = TotalMonthes & " 月" & If((Span.Days Mod 30) > 0, " " & (Span.Days Mod 30) & " 天", "")
-            ElseIf Span.TotalDays >= 4 Then
-                '4~30 天，“23 天”
-                Result = Span.Days & " 天"
-            ElseIf Span.TotalDays >= 1 Then
-                '1~3 天，“2 天 20 小时”
-                Result = Span.Days & " 天" & If(Span.Hours > 0, " " & Span.Hours & " 小时", "")
-            ElseIf Span.TotalHours >= 10 Then
-                '10 小时 ~ 1 天，“15 小时”
-                Result = Span.Hours & " 小时"
-            ElseIf Span.TotalHours >= 1 Then
-                '1~10 小时，“1 小时 20 分钟”
-                Result = Span.Hours & " 小时" & If(Span.Minutes > 0, " " & Span.Minutes & " 分钟", "")
-            ElseIf Span.TotalMinutes >= 10 Then
-                '10 分钟 ~ 1 小时，“49 分钟”
-                Result = Span.Minutes & " 分钟"
-            ElseIf Span.TotalMinutes >= 1 Then
-                '1~10 分钟，“9 分 23 秒”
-                Result = Span.Minutes & " 分" & If(Span.Seconds > 0, " " & Span.Seconds & " 秒", "")
-            ElseIf Span.TotalSeconds >= 1 Then
-                '1 秒 ~ 1 分钟，“23 秒”
-                Result = Span.Seconds & " 秒"
-            Else
-                '不到 1 秒
-                Result = "1 秒"
-            End If
-        End If
-        Result += EndFix
-        Return Result
-    End Function
-    ''' <summary>
     ''' 获取十进制 Unix 时间戳。
     ''' </summary>
     Public Function GetUnixTimestampUtc() As Long
         Return (Now.ToUniversalTime().Ticks - 621355968000000000) / 10000000
     End Function
     ''' <summary>
+    ''' 获取十进制 Unix 时间戳。
+    ''' </summary>
+    Public Function ToUnixTimestampUtc(Time As Date) As Long
+        Return (Time.ToUniversalTime().Ticks - 621355968000000000) / 10000000
+    End Function
+    ''' <summary>
     ''' 时间戳转化为日期。
     ''' </summary>
     Public Function GetDate(timeStamp As Integer) As Date
@@ -1165,41 +892,6 @@ Public Module ModBase
         Logger.Info($"启动进程：{StartInfo.FileName} {StartInfo.Arguments}")
         Return Process.Start(StartInfo)
     End Function
-    ''' <summary>
-    ''' 静默运行文件并返回输出流字符串。执行失败会抛出异常。
-    ''' </summary>
-    ''' <param name="FileName">文件名。可以为“notepad”等缩写。</param>
-    ''' <param name="Arguments">运行参数。</param>
-    ''' <param name="Timeout">等待该程序结束的最长时间（毫秒）。超时会抛出错误。</param>
-    Public Function StartProcessAndGetOutput(FileName As String, Optional Arguments As String = "", Optional Timeout As Integer = 1000000,
-        Optional WorkingDirectory As String = Nothing, Optional Encoding As Encoding = Nothing, Optional PrintLog As Boolean = True) As String
-        Dim Info = New ProcessStartInfo With {
-            .Arguments = Arguments,
-            .FileName = PathUtils.ToShortPath(FileName),
-            .UseShellExecute = False,
-            .CreateNoWindow = True,
-            .RedirectStandardError = True,
-            .RedirectStandardOutput = True,
-            .WorkingDirectory = PathUtils.ToShortPath(If(WorkingDirectory, PathExeFolder.TrimEnd("\"c))),
-            .StandardErrorEncoding = Encoding,
-            .StandardOutputEncoding = Encoding
-        }
-        If WorkingDirectory IsNot Nothing Then
-            If Info.EnvironmentVariables.ContainsKey("appdata") Then
-                Info.EnvironmentVariables("appdata") = WorkingDirectory
-            Else
-                Info.EnvironmentVariables.Add("appdata", WorkingDirectory)
-            End If
-        End If
-        If PrintLog Then Logger.Info($"执行命令并等待返回结果：{FileName} {Arguments}")
-        Using Program As New Process With {.StartInfo = Info}
-            Program.Start()
-            Dim Result As String = Program.StandardOutput.ReadToEnd & Program.StandardError.ReadToEnd
-            Program.WaitForExit(Timeout)
-            If Not Program.HasExited Then Program.Kill()
-            Return Result
-        End Using
-    End Function
 
     ''' <summary>
     ''' 在新的工作线程中执行代码。
@@ -1209,8 +901,6 @@ Public Module ModBase
         Sub()
             Try
                 Action()
-            Catch ex As ThreadInterruptedException
-                Logger.Info($"{Name}：线程已中止")
             Catch ex As Exception
                 Logger.Error(ex, $"{Name}：线程执行失败")
             End Try
@@ -1341,9 +1031,9 @@ Public Module ModBase
         RunInThread(
         Sub()
             Try
-                ResilientUtils.Retry(
+                Retrier.Attempt(delay:=Function(Attempt) TimeSpan.FromMilliseconds(200), maxAttempts:=4, isRetryAllowed:=Function(ex) True, action:=
                 Sub()
-                    RunInUi(
+                    RunInUiWait(
                     Sub()
                         My.Computer.Clipboard.Clear()
                         If Not String.IsNullOrEmpty(Text) Then My.Computer.Clipboard.SetText(Text)
@@ -1476,20 +1166,10 @@ Public Module ModBase
     ''' <summary>
     ''' 控件是否受到 TextTrimming 属性影响，导致内容被截取。
     ''' </summary>
-    <Extension> Public Function IsTextTrimmed(Control As TextBlock) As Boolean
-        Control.Measure(New Size(Double.MaxValue, Double.MaxValue))
-        Return Control.DesiredSize.Width > Control.ActualWidth
-    End Function
-
-    ''' <summary>
-    ''' 获取文本在被渲染后的宽度。
-    ''' </summary>
-    Public Function MeasureStringWidth(text As String, Optional fontSize As Double = 14, Optional fontFamily As FontFamily = Nothing) As Double
-        If fontFamily Is Nothing Then fontFamily = New FontFamily("微软雅黑")
-        Dim formattedText = New FormattedText(
-            text, CultureInfo.CurrentCulture, FlowDirection.LeftToRight, New Typeface(fontFamily, FontStyles.Normal, FontWeights.Normal, FontStretches.Normal),
-            fontSize, Brushes.Black, New NumberSubstitution(), TextFormattingMode.Display, New DpiScale(1, 1).PixelsPerDip)
-        Return formattedText.Width
+    <Extension> Public Function IsTextTrimmed(TextBlock As TextBlock) As Boolean
+        Dim typeface As New Typeface(TextBlock.FontFamily, TextBlock.FontStyle, TextBlock.FontWeight, TextBlock.FontStretch)
+        Dim formattedText As New FormattedText(TextBlock.Text, Thread.CurrentThread.CurrentCulture, TextBlock.FlowDirection, typeface, TextBlock.FontSize, TextBlock.Foreground, DPI)
+        Return formattedText.Width > TextBlock.ActualWidth
     End Function
 
     ''' <summary>

Plain Craft Launcher 2/Modules/Base/ModLoader.vb

@@ -1,4 +1,4 @@
-Public Module ModLoader
+Public Module ModLoader
 
     '各类加载器
     ''' <summary>
@@ -89,7 +89,8 @@
                 Dim OldState = _State
                 If value = LoadState.Finished AndAlso Settings.Get(Of Boolean)("SystemDebugDelay") Then Thread.Sleep(RandomInteger(100, 2000))
                 _State = value
-                Logger.Log($"加载器 {Name} 状态改变：{value}", If(value = LoadState.Failed, LogLevel.Error, LogLevel.Info))
+                If value = LoadState.Canceled Then CancellationTokenSource?.Cancel()
+                Logger.Log($"加载器 {[GetType].Name} {Name} 状态改变：{value}", If(value = LoadState.Failed, LogLevel.Error, LogLevel.Info))
                 '实现 ILoadingTrigger 接口与 OnStateChanged 回调
                 RunInUi(
                 Sub()
@@ -163,14 +164,42 @@
         Private _Progress As Double = -1
         Public Event ProgressChanged(NewProgress As Double, OldProgress As Double) Implements ILoadingTrigger.ProgressChanged
         ''' <summary>
+        ''' 创建一个 ProgressProvider，在其进度改变时，并将其进度单向映射到此加载器上。
+        ''' 这是 Loader 对新框架的兼容层。
+        ''' </summary>
+        Public Function CreateSyncProgressProvider(Optional FromPercentage As Double = 0, Optional ToPercentage As Double = 1) As ProgressProvider
+            Dim Provider As New ProgressProvider
+            AddHandler Provider.ProgressChanged,
+            Sub(ChangedProgress)
+                Dim RawProgress = Provider.GetRaw()
+                Progress = FromPercentage + (RawProgress.actual + RawProgress.skiped) * (ToPercentage - FromPercentage)
+            End Sub
+            Return Provider
+        End Function
+        ''' <summary>
         ''' 计算总进度时的权重。它应该为预计时间（秒）。
         ''' </summary>
         Public Property ProgressWeight As Double = 1
 
         '状态变化
         Public MustOverride Sub Start(Optional Input As Object = Nothing, Optional IsForceRestart As Boolean = False)
-        Public MustOverride Sub Interrupt()
+        Public MustOverride Sub Cancel()
         Public MustOverride Sub Failed(Ex As Exception)
+        Private CancellationTokenSource As CancellationTokenSource
+        ''' <summary>
+        ''' 创建一个随此加载器取消的取消令牌；令牌取消时也会调用此加载器的 Cancel。
+        ''' 这是 Loader 对新框架的兼容层。
+        ''' </summary>
+        Public Function CreateCancellationToken() As CancellationToken
+            SyncLock LockState
+                If CancellationTokenSource Is Nothing OrElse CancellationTokenSource.IsCancellationRequested Then
+                    CancellationTokenSource = New CancellationTokenSource
+                    CancellationTokenSource.Token.Register(AddressOf Cancel)
+                End If
+                If State = LoadState.Canceled Then CancellationTokenSource.Cancel()
+                Return CancellationTokenSource.Token
+            End SyncLock
+        End Function
 
         '等待结束
         Public Const WaitForExitTimeoutMessage As String = "等待加载器执行超时。"
@@ -178,16 +207,19 @@
         ''' <summary>
         ''' 无限期地等待加载器完成，直到结束或抛出异常。若加载器尚未开始，则会开始执行。
         ''' </summary>
-        Public Sub WaitForExit(Optional Input As Object = Nothing, Optional LoaderToSyncProgress As LoaderBase = Nothing, Optional IsForceRestart As Boolean = False)
+        Public Sub WaitForExit(Optional Input As Object = Nothing, Optional LoaderToSyncProgress As LoaderBase = Nothing, Optional IsForceRestart As Boolean = False,
+                               Optional c As CancellationToken = Nothing, Optional p As ProgressProvider = Nothing)
             Start(Input, IsForceRestart)
             Do While State = LoadState.Loading
                 If LoaderToSyncProgress IsNot Nothing Then LoaderToSyncProgress.Progress = Progress
+                p?.Set(Progress)
+                c.ThrowIfCancellationRequested()
                 Thread.Sleep(10)
             Loop
             If State = LoadState.Finished Then
                 Return
-            ElseIf State = LoadState.Interrupted Then
-                Throw New ThreadInterruptedException("加载器执行已中断。")
+            ElseIf State = LoadState.Canceled Then
+                Throw New OperationCanceledException("加载器执行已中断")
             ElseIf IsNothing([Error]) Then
                 Throw New Exception("未知错误！")
             Else
@@ -209,8 +241,8 @@
             Loop
             If State = LoadState.Finished Then
                 Return
-            ElseIf State = LoadState.Interrupted Then
-                Throw New ThreadInterruptedException("加载器执行已中断。")
+            ElseIf State = LoadState.Canceled Then
+                Throw New OperationCanceledException("加载器执行已中断")
             ElseIf IsNothing([Error]) Then
                 Throw New Exception("未知错误！")
             Else
@@ -240,16 +272,16 @@
         ''' <summary>
         ''' 当前执行线程是否应当中断。只应用在加载器的工作线程中判断，不可跨线程调用。
         ''' </summary>
-        Public ReadOnly Property IsInterrupted As Boolean
+        Public ReadOnly Property IsCanceled As Boolean
             Get
-                Return IsInterruptedWithThread(Thread.CurrentThread)
+                Return IsCanceledWithThread(Thread.CurrentThread)
             End Get
         End Property
         ''' <summary>
         ''' 当前执行线程是否应当中断。需要手动提供加载器线程，用于需要跨线程检查的情况。
         ''' </summary>
-        Public Function IsInterruptedWithThread(Thread As Thread) As Boolean
-            Return LastRunningThread Is Nothing OrElse Not ReferenceEquals(Thread, LastRunningThread) OrElse State = LoadState.Interrupted
+        Public Function IsCanceledWithThread(Thread As Thread) As Boolean
+            Return LastRunningThread Is Nothing OrElse Not ReferenceEquals(Thread, LastRunningThread) OrElse State = LoadState.Canceled
         End Function
         ''' <summary>
         ''' 在输入相同时使用原有结果的超时，单位为毫秒。
@@ -318,30 +350,29 @@
             Sub()
                 Try
                     IsForceRestarting = IsForceRestart
-                    Logger.Trace(Function() $"加载线程 {Name} ({Thread.CurrentThread.ManagedThreadId}) 已{If(IsForceRestarting, "强制", "")}启动")
+                    Logger.Trace(Function() $"加载线程 {Name} 已{If(IsForceRestarting, "强制", "")}启动")
                     LoadDelegate(Me)
-                    If IsInterrupted Then
-                        Logger.Warn($"加载线程 {Name} ({Thread.CurrentThread.ManagedThreadId}) 已中断但线程正常运行至结束，输出被弃用（最新线程：{If(LastRunningThread Is Nothing, -1, LastRunningThread.ManagedThreadId)}）")
+                    If IsCanceled Then
+                        Logger.Warn($"加载线程 {Name} 已中断但线程正常运行至结束，输出被弃用（最新线程：{If(LastRunningThread Is Nothing, -1, LastRunningThread.ManagedThreadId)}）")
                         Return
                     End If
-                    Logger.Trace(Function() $"加载线程 {Name} ({Thread.CurrentThread.ManagedThreadId}) 已完成")
+                    Logger.Trace(Function() $"加载线程 {Name} 已完成")
                     RaisePreviewFinish()
                     State = LoadState.Finished
                     LastFinishedTime = GetTimeMs() '未中断，本次输出有效
-                Catch ex As CancelledException
-                    Logger.Trace(ex, $"加载线程 {Name} ({Thread.CurrentThread.ManagedThreadId}) 已触发取消中断，已完成 {Math.Round(Progress * 100)}%")
-                    If Not IsInterrupted Then State = LoadState.Interrupted
-                Catch ex As ThreadInterruptedException
-                    Logger.Trace(ex, $"加载线程 {Name} ({Thread.CurrentThread.ManagedThreadId}) 已触发线程中断，已完成 {Math.Round(Progress * 100)}%")
-                    '如果线程是因为判断到 IsInterrupted 而提前中止，则代表已有新线程被重启，此时不应当改为 Interrupted
-                    '如果线程是在没有 IsInterrupted 时手动引发了 ThreadInterruptedException，则代表没有重启线程，这通常代表用户手动取消，应当改为 Interrupted
-                    If Not IsInterrupted Then State = LoadState.Interrupted
                 Catch ex As Exception
-                    Failed(ex)
+                    If ex.IsCanceled Then
+                        '如果线程是因为判断到 IsCanceled 而提前中止，则代表已有新线程被重启，此时不应当改为 Canceled
+                        '如果线程是在没有 IsCanceled 时手动引发了取消异常，则代表没有重启线程，这通常代表用户手动取消，应当改为 Canceled
+                        Logger.Trace(ex, $"加载线程 {Name} 已取消，当前已完成 {Math.Round(Progress * 100)}%")
+                        If Not IsCanceled Then State = LoadState.Canceled
+                    Else
+                        Failed(ex)
+                    End If
                 End Try
             End Sub) With {.Name = "L/" & Name, .Priority = ThreadPriority}
             Try
-                LastRunningThread.Start() '不能使用 RunInNewThread，否则在函数返回前线程就会运行完，导致误判 IsInterrupted
+                LastRunningThread.Start() '不能使用 RunInNewThread，否则在函数返回前线程就会运行完，导致误判 IsCanceled
             Catch ex As ThreadStateException '若遇到偶发的 “线程正在运行或被终止”，则等待后重试
                 Thread.Sleep(500)
                 LastRunningThread.Start()
@@ -350,16 +381,16 @@
         Public Overrides Sub Failed(ex As Exception)
             [Error] = ex
             SyncLock LockState
-                If IsInterrupted OrElse State >= LoadState.Finished Then Return
+                If IsCanceled OrElse State >= LoadState.Finished Then Return
                 State = LoadState.Failed
             End SyncLock
-            Logger.Warn(ex, $"加载线程 {Name} ({Thread.CurrentThread.ManagedThreadId}) 出错，已完成 {Math.Round(Progress * 100)}%")
+            Logger.Warn(ex, $"加载线程 {Name} 出错，已完成 {Math.Round(Progress * 100)}%")
             TriggerThreadInterrupt()
         End Sub
-        Public Overrides Sub Interrupt()
+        Public Overrides Sub Cancel()
             SyncLock LockState
                 If State <> LoadState.Loading Then Return
-                State = LoadState.Interrupted
+                State = LoadState.Canceled
             End SyncLock
             TriggerThreadInterrupt()
         End Sub
@@ -367,7 +398,7 @@
             If LastRunningThread Is Nothing Then Return
             If LastRunningThread.IsAlive Then
                 LastRunningThread.Interrupt()
-                Logger.Trace(Function() $"加载线程 {Name} ({LastRunningThread.ManagedThreadId}) 已中断")
+                Logger.Trace(Function() $"加载线程 {Name} 已中断")
             End If
             LastRunningThread = Nothing
         End Sub
@@ -383,6 +414,53 @@
         End Sub
 
     End Class
+
+    ''' <summary>
+    ''' 新 Worker 对老 Loader 的兼容包装类。
+    ''' </summary>
+    Public Class LoaderWorker
+        Inherits LoaderBase
+        Public WithEvents Worker As IWorker
+        Public Sub New(Name As String, Worker As IWorker)
+            Me.Name = Name
+            Me.Worker = Worker
+            AddHandler Worker.Progress.ProgressChanged, Sub(Raw) Progress = Raw.actual + Raw.skiped
+        End Sub
+
+        Public Overrides Sub Start(Optional Input As Object = Nothing, Optional IsForceRestart As Boolean = False)
+            SyncLock LockState
+                State = LoadState.Loading
+            End SyncLock
+            Logger.Trace(Function() $"Worker {Name} 已启动")
+            IsForceRestarting = IsForceRestart
+            Worker.Start()
+        End Sub
+        Private Sub Worker_Succeeded() Handles Worker.Succeeded
+            Logger.Trace(Function() $"Worker {Name} 已完成")
+            RaisePreviewFinish()
+            SyncLock LockState
+                State = LoadState.Finished
+            End SyncLock
+        End Sub
+        Public Overrides Sub Cancel() Handles Worker.Canceled
+            SyncLock LockState
+                If State <> LoadState.Loading Then Return
+                State = LoadState.Canceled
+            End SyncLock
+            Logger.Trace(Function() $"Worker {Name} 已取消，当前已完成 {Math.Round(Progress * 100)}%")
+            Worker.Cancel()
+        End Sub
+        Public Overrides Sub Failed(Ex As Exception) Handles Worker.Failed
+            SyncLock LockState
+                If State >= LoadState.Finished Then Return
+                State = LoadState.Failed
+            End SyncLock
+            Logger.Warn(Ex, $"Worker {Name} 出错，已完成 {Math.Round(Progress * 100)}%")
+            [Error] = Ex
+            Worker.Cancel()
+        End Sub
+    End Class
+
     ''' <summary>
     ''' 支持多个加载器连续运作的复合加载器。
     ''' </summary>
@@ -450,11 +528,11 @@
             End If
             RunInThread(AddressOf Update)
         End Sub
-        Public Overrides Sub Interrupt()
+        Public Overrides Sub Cancel()
             '改变状态
             SyncLock LockState
                 If State = LoadState.Loading OrElse State = LoadState.Waiting Then
-                    State = LoadState.Interrupted
+                    State = LoadState.Canceled
                 Else
                     Return
                 End If
@@ -463,7 +541,7 @@
             Sub()
                 '中断加载器
                 For Each Loader In Loaders
-                    Loader.Interrupt()
+                    Loader.Cancel()
                 Next
             End Sub)
         End Sub
@@ -474,7 +552,7 @@
                 State = LoadState.Failed
             End SyncLock
             For Each Loader In Loaders
-                Loader.Interrupt()
+                Loader.Cancel()
             Next
             FrmMain.BtnExtraDownload.ShowRefresh()
         End Sub
@@ -492,9 +570,9 @@
                 Case LoadState.Finished
                     '正常结束，触发刷新
                     Update()
-                Case LoadState.Interrupted
+                Case LoadState.Canceled
                     '被中断，这个任务也中断
-                    Interrupt()
+                    Cancel()
                 Case LoadState.Failed
                     '完蛋，出错了
                     Failed(New Exception(Loader.Name & "失败", Loader.Error))
@@ -504,15 +582,15 @@
         ''' 触发一次更新，以启动新加载器或完成。
         ''' </summary>
         Private Sub Update()
-            If State = LoadState.Finished OrElse State = LoadState.Failed OrElse State = LoadState.Interrupted Then Return
+            If State = LoadState.Finished OrElse State = LoadState.Failed OrElse State = LoadState.Canceled Then Return
             Dim IsFinished As Boolean = True
             Dim Blocked As Boolean = False
             Dim Input As Object = Me.Input
             For Each Loader In Loaders
                 Select Case Loader.State
                     Case LoadState.Finished
-                        '检查是否需要重启
-                        If Loader.GetType.Name.StartsWithF("LoaderTask") Then '类型名后面带有泛型，必须用 StartsWith
+                        '检查 LoaderTask 是否需要重启
+                        If GeneralUtils.IsGenericInstanceOf(Loader, GetType(LoaderTask(Of ,))) Then
                             If CType(Loader, Object).ShouldStart(If(Input IsNot Nothing AndAlso Loader.GetType.GenericTypeArguments.First Is Input.GetType, Input, Nothing), IgnoreReloadTimeout:=True) Then
                                 Logger.Info($"由于输入条件变更，重启已完成的加载器 {Loader.Name}")
                                 GoTo Restart
@@ -523,8 +601,8 @@
                         '如果不让继续启动，且已有加载器正在加载中，就不继续启动
                         If Loader.Block AndAlso Not IsFinished Then Blocked = True
                     Case LoadState.Loading
-                        '检查是否需要重启
-                        If Loader.GetType.Name.StartsWithF("LoaderTask") Then
+                        '检查 LoaderTask 是否需要重启
+                        If GeneralUtils.IsGenericInstanceOf(Loader, GetType(LoaderTask(Of ,))) Then
                             If CType(Loader, Object).ShouldStart(If(Input IsNot Nothing AndAlso Loader.GetType.GenericTypeArguments.First Is Input.GetType, Input, Nothing), IgnoreReloadTimeout:=True) Then
                                 Logger.Warn($"由于输入条件变更，重启进行中的加载器 {Loader.Name}")
                                 GoTo Restart
@@ -540,13 +618,14 @@ Restart:
                         If Blocked Then Continue For
                         If Input IsNot Nothing Then
                             '若输入类型与下一个加载器相同才继续
-                            Dim LoaderType As String = Loader.GetType.Name
-                            If LoaderType.StartsWithF("LoaderTask") OrElse LoaderType.StartsWithF("LoaderCombo") Then
+                            If GeneralUtils.IsGenericInstanceOf(Loader, GetType(LoaderTask(Of ,))) OrElse GeneralUtils.IsGenericInstanceOf(Loader, GetType(LoaderCombo(Of ))) Then
                                 Loader.Start(If(Loader.GetType.GenericTypeArguments.First Is Input.GetType, Input, Nothing), IsForceRestarting)
-                            ElseIf LoaderType.StartsWithF("LoaderDownload") Then
+                            ElseIf TypeOf Loader Is LoaderWorker Then
+                                Loader.Start(IsForceRestart:=IsForceRestarting)
+                            ElseIf TypeOf Loader Is LoaderDownload Then
                                 Loader.Start(If(TypeOf Input Is List(Of NetFile), Input, Nothing), IsForceRestarting)
                             Else
-                                Throw New Exception("未知的加载器类型（" & LoaderType & "）")
+                                Throw New Exception("未知的加载器类型（" & Loader.GetType.Name & "）")
                             End If
                         Else
                             Loader.Start(IsForceRestart:=IsForceRestarting)
@@ -569,7 +648,7 @@ Restart:
         Public Shared Sub GetLoaderList(Loader As Object, ByRef List As List(Of LoaderBase), Optional RequireShow As Boolean = True)
             For Each SubLoader In Loader.Loaders
                 If SubLoader.Show OrElse Not RequireShow Then List.Add(SubLoader)
-                If SubLoader.GetType.Name.StartsWithF("LoaderCombo") Then GetLoaderList(SubLoader, List)
+                If GeneralUtils.IsGenericInstanceOf(SubLoader, GetType(LoaderCombo(Of ))) Then GetLoaderList(SubLoader, List)
             Next
         End Sub
         ''' <summary>
@@ -606,7 +685,7 @@ Restart:
             '若单个任务已中止，或全部任务已完成，则刷新并移除
             For Each Task In LoaderTaskbar
                 If LoaderTaskbar.All(Function(l) l.State <> LoadState.Loading) OrElse
-                   (Task.State = LoadState.Waiting OrElse Task.State = LoadState.Interrupted) Then
+                   (Task.State = LoadState.Waiting OrElse Task.State = LoadState.Canceled) Then
                     FrmSpeedLeft?.TaskRefresh(Task)
                     LoaderTaskbar.Remove(Task)
                     Logger.Info($"{Task.Name} 已移出任务列表")

Plain Craft Launcher 2/Modules/Base/ModNet.vb

@@ -1,5 +1,4 @@
-Imports System.Net.Sockets
-Imports System.Threading.Tasks
+Imports System.Net.Sockets
 
 Public Module ModNet
 
@@ -32,10 +31,8 @@ Public Module ModNet
             Return Result
         Catch ex As FormatException
             Throw
-        Catch ex As ThreadInterruptedException
-            Throw
         Catch ex As Exception
-            If MakeLog Then Logger.Warn(ex, "网络请求失败")
+            If MakeLog Then Logger.Warn(ex, $"网络请求失败（{Method.Method}，{Url}）")
             Throw
         End Try
     End Function
@@ -68,9 +65,8 @@ Retry:
                         Throw RetryException
                     End If
             End Select
-        Catch ex As ThreadInterruptedException
-            Throw
         Catch ex As Exception
+            ex.ThrowIfCanceled()
             If TypeOf ex Is HttpRequestCodeException Then
                 If CType(ex, HttpRequestCodeException).StatusCode = HttpStatusCode.Forbidden Then Throw
                 If CType(ex, HttpRequestCodeException).StatusCode = HttpStatusCode.NotFound Then Throw
@@ -161,7 +157,7 @@ RequestFinished:
             FileUtils.Delete(Temp)
             Return Result
         Finally
-            NewTask.Interrupt()
+            NewTask.Cancel()
         End Try
     End Function
 
@@ -179,11 +175,9 @@ RequestFinished:
 Retry:
         Try
             FileUtils.Write(LocalPath, SendRequest(Url, HttpMethod.Get, SimulateBrowserHeaders:=SimulateBrowserHeaders))
-        Catch ex As ThreadInterruptedException
-            FileUtils.Delete(LocalPath)
-            Throw
         Catch ex As Exception
             FileUtils.Delete(LocalPath)
+            ex.ThrowIfCanceled()
             If RetryCount < 2 Then
                 RetryCount += 1
                 GoTo Retry
@@ -210,7 +204,7 @@ Retry:
         Catch ex As Exception
             Throw New WebException($"多线程直接下载文件失败（第一下载源：" & Urls.First() & "）", ex)
         Finally
-            NewTask.Interrupt()
+            NewTask.Cancel()
         End Try
     End Sub
 
@@ -223,35 +217,9 @@ Retry:
             Optional Content As Object = Nothing, Optional Headers As Dictionary(Of String, String) = Nothing,
             Optional SimulateBrowserHeaders As Boolean = False, Optional Timeout As Integer = 25000, Optional Encoding As Encoding = Nothing) As Byte()
         If RunInUi() AndAlso Not Url.Contains("//127.") Then Throw New Exception("在 UI 线程执行了网络请求")
-        Dim Request As HttpRequestMessage = Nothing, CancelToken As CancellationTokenSource = Nothing,
-            Response As HttpResponseMessage = Nothing, HostIp As String = Nothing
+        Dim Request As HttpRequestMessage = Nothing, CancelToken As CancellationTokenSource = Nothing, Response As HttpResponseMessage = Nothing
         Try
-            Url = SecretCdnSign(Url)
-            Request = New HttpRequestMessage(Method, Url)
-            '写入 Content
-            If Content IsNot Nothing AndAlso Request.Method <> HttpMethod.Get AndAlso Request.Method <> HttpMethod.Head Then
-                If TypeOf Content Is HttpContent Then
-                    Request.Content = DirectCast(Content, HttpContent)
-                ElseIf TypeOf Content Is Byte() Then
-                    Request.Content = New ByteArrayContent(DirectCast(Content, Byte()))
-                ElseIf Content IsNot Nothing Then
-                    Request.Content = New ByteArrayContent(If(Encoding, Encoding.UTF8).GetBytes(Content.ToString()))
-                End If
-            End If
-            '写入 Headers
-            For Each Header In If(Headers, New Dictionary(Of String, String))
-                If Header.Key.Lower = "content-type" Then
-                    Request.Content?.Headers.TryAddWithoutValidation(Header.Key, Header.Value)
-                Else
-                    Request.Headers.TryAddWithoutValidation(Header.Key, Header.Value)
-                End If
-            Next
-            SecretHeadersSign(Url, Request, SimulateBrowserHeaders)
-            'DNS 解析
-            CancelToken = New CancellationTokenSource(Timeout)
-            HostIp = DNSLookup(Request, CancelToken.Token)
-            If HostIp IsNot Nothing Then IPReliability.GetOrAdd(HostIp, -0.01) '预先降低一点，这样快速的重复请求会使用不同的 IP 以提高成功率
-            '发送请求
+            '构建 RequestClient
             Directory.CreateDirectory(PathTemp & "Cache\Http\")
             SyncLock RequestClientLock
                 If RequestClient Is Nothing Then '延迟初始化，以避免在程序启动前加载 CacheCow 导致 DLL 加载失败
@@ -261,11 +229,39 @@ Retry:
                     })
                 End If
             End SyncLock
-            ResilientUtils.RetryOn(Of FileNotFoundException, IOException)( 'CacheCow 读取缓存时若文件被占用，会调用不存在的 System.Net.Http.Formatting.resources，抛出此异常（#8150）
-            Sub()
-                CancelToken.Dispose() : CancelToken = New CancellationTokenSource(Timeout)
-                Response = RequestClient.SendAsync(Request, HttpCompletionOption.ResponseHeadersRead, CancelToken.Token).GetResultWithTimeout(CancelToken, Timeout)
+            '构建请求
+            Url = SecretCdnSign(Url)
+            Request = New HttpRequestMessage(Method, Url)
+            If Content IsNot Nothing AndAlso Request.Method <> HttpMethod.Get AndAlso Request.Method <> HttpMethod.Head Then '写入 Content
+                If TypeOf Content Is HttpContent Then
+                    Request.Content = DirectCast(Content, HttpContent).Clone()
+                ElseIf TypeOf Content Is Byte() Then
+                    Request.Content = New ByteArrayContent(DirectCast(Content, Byte()))
+                ElseIf Content IsNot Nothing Then
+                    Request.Content = New ByteArrayContent(If(Encoding, Encoding.UTF8).GetBytes(Content.ToString()))
+                End If
+            End If
+            For Each Header In If(Headers, New Dictionary(Of String, String)) '写入 Headers
+                If Header.Key.Lower = "content-type" Then
+                    Request.Content?.Headers.TryAddWithoutValidation(Header.Key, Header.Value)
+                Else
+                    Request.Headers.TryAddWithoutValidation(Header.Key, Header.Value)
+                End If
+            Next
+            SecretHeadersSign(Url, Request, SimulateBrowserHeaders)
+            '发送请求
+            'CacheCow 读取缓存时若文件被占用，会调用不存在的 System.Net.Http.Formatting.resources，抛出异常（#8150）
+            Retrier.Attempt(delay:=Function() TimeSpan.FromMilliseconds(200), isRetryAllowed:=Function(ex) TypeOf ex Is FileNotFoundException OrElse TypeOf ex Is IOException, action:=
+            Sub(Attempt)
+                CancelToken?.Dispose() : CancelToken = New CancellationTokenSource(Timeout)
+                Dim ClonedRequest As HttpRequestMessage = Request.Clone() 'HttpRequestMessage 只能发送一次，重试时需要克隆一个新的
+                Try
+                    Response = RequestClient.SendAsync(ClonedRequest, HttpCompletionOption.ResponseHeadersRead, CancelToken.Token).GetResultWithTimeout(CancelToken, Timeout)
+                Finally
+                    ClonedRequest.Dispose()
+                End Try
             End Sub)
+            '读取响应
             Dim ResponseBytes As Byte()
             CancelToken.Dispose() : CancelToken = New CancellationTokenSource(Timeout)
             Using ResponseStream = Response.Content.ReadAsStreamAsync().GetResultWithTimeout(CancelToken, Timeout)
@@ -274,29 +270,23 @@ Retry:
                     ResponseBytes = Stream.ToArray()
                 End Using
             End Using
-            '输出
-            If Response.IsSuccessStatusCode Then
-                RecordIPReliability(HostIp, 0.5)
-                Return ResponseBytes
-            Else
-                RecordIPReliability(HostIp, -0.7)
+            If Not Response.IsSuccessStatusCode Then
                 Dim ResponseMessage = ResponseBytes.GetString(Encoding)
                 Throw New HttpRequestCodeException(
-                    $"错误码 {Response.StatusCode} ({CInt(Response.StatusCode)})，{Method}，{Url}，{HostIp}" &
+                    $"错误码 {Response.StatusCode} ({CInt(Response.StatusCode)})，{Method}，{Url}" &
                     If(String.IsNullOrEmpty(ResponseMessage), "", vbCrLf & ResponseMessage), Response.StatusCode, ResponseMessage)
             End If
-        Catch ex As ThreadInterruptedException
-            Throw
+            Return ResponseBytes
         Catch ex As HttpRequestException
             Throw
+        Catch ex As TimeoutException
+            Throw New WebException($"连接服务器超时，请稍后再试，或使用 VPN 改善网络环境（{Method}, {Url}）", WebExceptionStatus.Timeout)
         Catch ex As Exception
-            RecordIPReliability(HostIp, -1)
-            If TypeOf ex Is OperationCanceledException OrElse TypeOf ex Is TimeoutException Then 'CancellationToken 超时
-                Throw New WebException($"连接服务器超时，请稍后再试，或使用 VPN 改善网络环境（{Method}, {Url}，IP：{HostIp}）", WebExceptionStatus.Timeout)
-            ElseIf ex.IsBadNetwork Then
-                Throw New WebException($"网络请求失败，请稍后再试，或使用 VPN 改善网络环境（{Method}, {Url}，IP：{HostIp}）", WebExceptionStatus.Timeout)
+            If TypeOf ex IsNot TaskCanceledException Then ex.ThrowIfCanceled() 'GetResultWithTimeout 会抛出 TaskCanceledException
+            If ex.IsBadNetwork Then
+                Throw New WebException($"网络请求失败，请稍后再试，或使用 VPN 改善网络环境（{Method}, {Url}）", WebExceptionStatus.Timeout)
             Else
-                Throw New Exception($"网络请求出现意外异常（{Method}, {Url}，{HostIp}）", ex)
+                Throw New Exception($"网络请求出现意外异常（{Method}, {Url}）", ex)
             End If
         Finally
             Request?.Dispose()
@@ -307,72 +297,6 @@ Retry:
     Private RequestClient As HttpClient = Nothing
     Private RequestClientLock As New Object
 
-    ''' <summary>
-    ''' 进行 DNS 解析。它仅在选择的 IP 与系统默认的不一致时才对 URL 中的 Host 进行替换。
-    ''' 返回请求时应使用的 IP。若解析失败，则返回 Nothing。
-    ''' </summary>
-    Private Function DNSLookup(Request As HttpRequestMessage, CancelToken As CancellationToken) As String
-        Dim Host = Request.RequestUri.Host
-        '不对部分有严格 SNI 限制的域名进行 DNS 解析（#8295）
-        If {"mojang.com", "minecraft.net", "minecraftservices.com"}.Any(Function(h) Host.ContainsIgnoreCase(h)) Then Return Nothing
-        '若一分钟内已失败过，则不再重复尝试解析，以减少断网时的 Exception 数量
-        Dim LastFailureTime As Date
-        If DNSFailureRecord.TryGetValue(Host, LastFailureTime) Then
-            If Date.Now - LastFailureTime < New TimeSpan(0, 1, 0) Then
-                Return Nothing
-            Else
-                DNSFailureRecord.Remove(Host)
-            End If
-        End If
-        '初步 DNS 解析
-        Dim Candidates As IPAddress()
-        Try
-            Dim AsyncResult = Dns.BeginGetHostAddresses(Host, Nothing, Nothing)
-            If WaitHandle.WaitAny(New WaitHandle() {AsyncResult.AsyncWaitHandle, CancelToken.WaitHandle}) Then Throw New TimeoutException("DNS 解析超时")
-            Candidates = Dns.EndGetHostAddresses(AsyncResult).Distinct.ToArray
-        Catch ex As Exception
-            Logger.Warn(ex, $"DNS 解析失败（{Host}）")
-            DNSFailureRecord(Host) = Date.Now
-            Return Nothing
-        End Try
-        If Not Candidates.Any Then
-            Logger.Info($"DNS 解析无结果（{Host}）")
-            Return Nothing
-        End If
-        '若同时存在 IPv4 和 IPv6 地址，仅选择其中一类（因为 GFW 可能只屏蔽了 IPv4 或 IPv6）
-        Dim Reliabilities = Candidates.ToDictionary(Function(i) i, Function(i) IPReliability.GetOrDefault(i.ToString, 0))
-        Dim IPv4Targets = Candidates.Where(Function(i) i.AddressFamily = AddressFamily.InterNetwork).ToArray
-        Dim IPv6Targets = Candidates.Where(Function(i) i.AddressFamily = AddressFamily.InterNetworkV6).ToArray
-        If IPv4Targets.Any AndAlso IPv6Targets.Any Then
-            Dim IPv4Reliability = IPv4Targets.Max(Function(i) Reliabilities(i))
-            Dim IPv6Reliability = IPv6Targets.Max(Function(i) Reliabilities(i))
-            If Host = "api.modrinth.com" Then IPv6Reliability -= 0.1 '让 Modrinth 优先使用 IPv4 地址（#6887）
-            Logger.Trace(Function() $"DNS IPv4/IPv6 选择（{Host}），IPv4 {IPv4Reliability:0.000}，IPv6 {IPv6Reliability:0.000}")
-            Candidates = If(IPv4Reliability >= IPv6Reliability, IPv4Targets, IPv6Targets)
-        End If
-        '选择可靠度最高的 IP
-        Dim Target As IPAddress = Candidates.MaxBy(Function(i) Reliabilities(i))
-        Request.Headers.Host = Request.RequestUri.Authority
-        Request.RequestUri = (New UriBuilder(Request.RequestUri) With {.Host = If(Target.AddressFamily = AddressFamily.InterNetworkV6, $"[{Target}]", Target.ToString)}).Uri
-        Return Target.ToString
-    End Function
-    Private DNSFailureRecord As New ConcurrentDictionary(Of String, Date)
-    ''' <summary>
-    ''' 记录每个 IP 地址的请求可靠度。
-    ''' 通常取值 -1 ~ +0.5，越高越好。未尝试过的 IP 应视为 0。
-    ''' </summary>
-    Private IPReliability As New ConcurrentDictionary(Of String, Double)
-    ''' <summary>
-    ''' 根据请求结果，记录 IP 地址的可靠度。
-    ''' </summary>
-    Private Sub RecordIPReliability(IP As String, Result As Double)
-        If IP Is Nothing Then Return
-        IPReliability.AddOrUpdate(IP,
-            Function() Result * 0.5,
-            Function(k, v) v * 0.5 + Result * 0.5
-        )
-    End Sub
-
 #End Region
 
 #Region "多线程下载引擎"
@@ -478,7 +402,7 @@ Retry:
         ''' <summary>
         ''' 已失败或中断。
         ''' </summary>
-        Interrupted = 6
+        Canceled = 6
     End Enum
     ''' <summary>
     ''' 预下载检查行为。
@@ -626,7 +550,7 @@ Retry:
         ''' </summary>
         Public ReadOnly Property IsEnded As Boolean
             Get
-                Return State = NetState.Finished OrElse State = NetState.Interrupted
+                Return State = NetState.Finished OrElse State = NetState.Canceled
             End Get
         End Property
 
@@ -663,7 +587,7 @@ Retry:
         ''' <summary>
         ''' 所有下载源。
         ''' </summary>
-        Public Sources As ConcurrentList(Of NetSource)
+        Public Sources As List(Of NetSource)
         ''' <summary>
         ''' 用于在第一个线程出错时切换下载源。
         ''' </summary>
@@ -819,7 +743,7 @@ Retry:
                         Return OriginalProgress * 0.93 + 0.05
                     Case NetState.Merging
                         Return 0.99
-                    Case NetState.Finished, NetState.Interrupted
+                    Case NetState.Finished, NetState.Canceled
                         Return 1
                     Case Else
                         Throw New ArgumentOutOfRangeException("文件状态未知：" & State)
@@ -889,7 +813,7 @@ Retry:
                 '条件检测
                 SyncLock LockSource
                     If NetTaskThreadCount >= NetTaskThreadLimit OrElse Not HasAvailableSource() OrElse
-                        (IsNoSplit AndAlso Threads IsNot Nothing AndAlso Threads.State <> NetState.Interrupted) Then Return Nothing
+                        (IsNoSplit AndAlso Threads IsNot Nothing AndAlso Threads.State <> NetState.Canceled) Then Return Nothing
                     If State >= NetState.Merging OrElse State = NetState.WaitingToCheck Then Return Nothing
                     SyncLock LockState
                         If State < NetState.Connecting Then State = NetState.Connecting
@@ -900,7 +824,7 @@ Retry:
                     If IsNoSplit Then GoTo StartSingleThreadDownload
                     '只剩下单线程可用点
                     If Not HasAvailableSource(False) Then
-                        If SourcesOnce.First.SingleThread IsNot Nothing AndAlso SourcesOnce.First.SingleThread.State <> NetState.Interrupted Then Return Nothing
+                        If SourcesOnce.First.SingleThread IsNot Nothing AndAlso SourcesOnce.First.SingleThread.State <> NetState.Canceled Then Return Nothing
 StartSingleThreadDownload:
                         Reset()
                         State = NetState.Reading
@@ -916,7 +840,7 @@ StartSingleThreadDownload:
                     End If
                     '寻找失败点
                     For Each Thread As NetThread In Threads
-                        If Thread.State = NetState.Interrupted AndAlso Thread.DownloadUndone > 0 Then
+                        If Thread.State = NetState.Canceled AndAlso Thread.DownloadUndone > 0 Then
                             StartPosition = Thread.DownloadStart + Thread.DownloadDone
                             StartSource = GetSource(Thread.Source.Id + 1)
                             GoTo StartThread
@@ -979,7 +903,7 @@ StartThread:
             Logger.Log($"{LocalName}：开始，起始点 {Th.DownloadStart}，{Th.Source.Url}", If(Th.DownloadStart = 0, LogLevel.Info, LogLevel.Trace))
             Dim ResultStream As Stream = Nothing, HttpRequest As HttpRequestMessage = Nothing,
                 Response As HttpResponseMessage = Nothing, ResponseStream As Stream = Nothing,
-                CancelToken As CancellationTokenSource = Nothing, HostIp As String = Nothing
+                CancelToken As CancellationTokenSource = Nothing
             '部分下载源真的特别慢，并且只需要一个请求，例如 Ping 为 20s，如果增长太慢，就会造成类似 2.5s 5s 7.5s 10s 12.5s... 的极大延迟
             '延迟过长会导致某些特别慢的链接迟迟不被掐死
             Dim Timeout As Integer = Math.Min(Math.Max(ConnectAverage, 15000) * (1 + Th.Source.FailCount), 30000)
@@ -990,14 +914,13 @@ StartThread:
                 HttpRequest = New HttpRequestMessage(HttpMethod.Get, Th.Source.Url)
                 SecretHeadersSign(Th.Source.Url, HttpRequest, SimulateBrowserHeaders)
                 CancelToken = New CancellationTokenSource(Timeout)
-                HostIp = DNSLookup(HttpRequest, CancelToken.Token) 'DNS 预解析
                 If Not Th.IsFirstThread Then HttpRequest.Headers.Range = New Headers.RangeHeaderValue(Th.DownloadStart, Nothing)
                 Dim ContentLength As Long = 0
                 Response = ThreadClient.SendAsync(HttpRequest, HttpCompletionOption.ResponseHeadersRead, CancelToken.Token).GetResultWithTimeout(CancelToken, Timeout)
                 If Not Response.IsSuccessStatusCode Then '状态码检查
                     Throw New HttpRequestCodeException($"错误码 {Response.StatusCode} ({CInt(Response.StatusCode)})，{Th.Source.Url}", Response.StatusCode, Nothing)
                 End If
-                If State = NetState.Interrupted Then GoTo SourceBreak '快速中断
+                If State = NetState.Canceled Then GoTo SourceBreak '快速中断
                 If Response.RequestMessage.RequestUri.ToString <> Th.Source.Url Then Logger.Trace(Function() $"{LocalName}：重定向至 {Response.RequestMessage.RequestUri}")
                 '文件大小校验
                 ContentLength = Response.Content.Headers.ContentLength.GetValueOrDefault(-1)
@@ -1023,7 +946,7 @@ StartThread:
                         End If
                     End If
                     FileSize = ContentLength : IsUnknownSize = False
-                    Logger.Info($"{LocalName}：文件大小 {ContentLength}（{FormatFileSize(ContentLength)}）")
+                    Logger.Info($"{LocalName}：文件大小 {ContentLength}（{StringUtils.FormatByteSize(ContentLength)}）")
                     '若文件大小大于 50 M，进行剩余磁盘空间校验
                     If ContentLength > 50 * 1024 * 1024 Then
                         For Each Drive As DriveInfo In DriveInfo.GetDrives
@@ -1031,7 +954,7 @@ StartThread:
                             Dim RequiredSpace = If(PathTemp.StartsWithF(DriveName), ContentLength * 1.1, 0) +
                                                 If(LocalPath.StartsWithF(DriveName), ContentLength + 5 * 1024 * 1024, 0)
                             If RequiredSpace > 0 AndAlso Drive.TotalFreeSpace < RequiredSpace Then
-                                Throw New Exception(DriveName & " 盘空间不足，无法进行下载。" & vbCrLf & "需要至少 " & FormatFileSize(RequiredSpace) & " 空间，但当前仅剩余 " & FormatFileSize(Drive.TotalFreeSpace) & "。" &
+                                Throw New Exception(DriveName & " 盘空间不足，无法进行下载。" & vbCrLf & "需要至少 " & StringUtils.FormatByteSize(RequiredSpace) & " 空间，但当前仅剩余 " & StringUtils.FormatByteSize(Drive.TotalFreeSpace) & "。" &
                                                     If(PathTemp.StartsWithF(DriveName), vbCrLf & vbCrLf & "下载时需要与文件同等大小的空间存放缓存，你可以在设置中调整缓存文件夹的位置。", ""))
                             End If
                         Next
@@ -1111,9 +1034,9 @@ NotSupportRange:
                     HttpDataCount = ResponseStream.ReadAsync(ResponseBytes, 0, 16384, CancelToken.Token).GetResultWithTimeout(CancelToken, Timeout)
                 End While
 SourceBreak:
-                If State = NetState.Interrupted OrElse (Th.Source.IsFailed AndAlso Th.Source.SingleThread <> Th) OrElse (Th.DownloadUndone > 0 AndAlso Not IsUnknownSize) Then
+                If State = NetState.Canceled OrElse (Th.Source.IsFailed AndAlso Th.Source.SingleThread <> Th) OrElse (Th.DownloadUndone > 0 AndAlso Not IsUnknownSize) Then
                     '被外部中断
-                    Th.State = NetState.Interrupted
+                    Th.State = NetState.Canceled
                     Logger.Info($"{LocalName}：中断")
                 ElseIf HttpDataCount = 0 AndAlso Th.DownloadUndone > 0 AndAlso Not IsUnknownSize Then
                     '服务器无返回数据
@@ -1122,15 +1045,13 @@ SourceBreak:
                     '本线程完成
                     Th.State = NetState.Finished
                     Logger.Trace(Function() $"{LocalName}：完成，已下载 {Th.DownloadDone}（{Th.DownloadStart}~{Th.DownloadEnd}）")
-                    RecordIPReliability(HostIp, 0.5)
                 End If
             Catch ex As Exception
                 If ex.IsBadNetwork OrElse TypeOf ex Is TaskCanceledException Then
-                    Logger.Info(New TimeoutException($"{LocalName}：超时（{Timeout}ms），{ex.Message}，IP：{If(String.IsNullOrEmpty(HostIp), "自动", "")}"))
+                    Logger.Info(New TimeoutException($"{LocalName}：超时（{Timeout}ms），{ex.Message}"))
                 Else
-                    Logger.Info(ex, $"{LocalName}：出错，IP：{HostIp}")
+                    Logger.Info(ex, $"{LocalName}：出错")
                 End If
-                RecordIPReliability(HostIp, -0.7)
                 SourceFail(Th, ex, False)
             Finally
                 '释放资源
@@ -1143,7 +1064,7 @@ SourceBreak:
                 Interlocked.Decrement(NetTaskThreadCount)
                 '合并
                 If ((FileSize >= 0 AndAlso DownloadDone >= FileSize) OrElse (FileSize = -1 AndAlso DownloadDone > 0)) AndAlso
-                    State < NetState.Merging AndAlso Th.State <> NetState.Interrupted Then Merge(Th)
+                    State < NetState.Merging AndAlso Th.State <> NetState.Canceled Then Merge(Th)
             End Try
         End Sub
         Private Sub SourceFail(Th As NetThread, ex As Exception, IsMergeFailure As Boolean)
@@ -1152,7 +1073,7 @@ SourceBreak:
             For Each Task In Tasks
                 Interlocked.Increment(Task.FailCount)
             Next
-            Th.State = NetState.Interrupted
+            Th.State = NetState.Canceled
             Th.Source.Ex = ex
             '根据情况判断，是否在多线程下禁用下载源（连续错误过多，或不支持断点续传）
             Dim IsRangeNotSupported As Boolean = TypeOf ex Is RangeNotSupportedException OrElse ex.Message.Contains("(416)")
@@ -1333,29 +1254,29 @@ Retry:
                 If RaiseEx IsNot Nothing Then Ex.Add(RaiseEx)
                 '凉凉
                 Logger.Info($"{LocalName}：已失败，当前状态 {State}")
-                State = NetState.Interrupted
+                State = NetState.Canceled
             End SyncLock
-            InterruptInternal()
+            CancelInternal()
             For Each Task In Tasks
                 Task.OnFileFail(Me)
             Next
         End Sub
         ''' <summary>
-        ''' 下载中断。
+        ''' 取消下载。
         ''' </summary>
-        Public Sub Interrupt(InterruptedTask As LoaderDownload)
+        Public Sub Cancel(CanceledTask As LoaderDownload)
             '从特定任务中移除，如果它还属于其他任务，则继续下载
-            Tasks.Remove(InterruptedTask)
+            Tasks.Remove(CanceledTask)
             If Tasks.Any Then Return
             '确认中断
             SyncLock LockState
                 If State >= NetState.Finished Then Return
                 Logger.Info($"{LocalName}：已中断，当前状态 {State}")
-                State = NetState.Interrupted
+                State = NetState.Canceled
             End SyncLock
-            InterruptInternal()
+            CancelInternal()
         End Sub
-        Private Sub InterruptInternal()
+        Private Sub CancelInternal()
             On Error Resume Next
             Reset()
             Interlocked.Decrement(NetManager.FileRemain)
@@ -1395,7 +1316,7 @@ Retry:
         ''' <summary>
         ''' 需要下载的文件。
         ''' </summary>
-        Public Files As ConcurrentList(Of NetFile)
+        Public Files As ConcurrentQueue(Of NetFile)
         ''' <summary>
         ''' 剩余未完成的文件数。（用于减轻 FilesLock 的占用）
         ''' </summary>
@@ -1426,8 +1347,8 @@ Retry:
             End Get
             Set(value As Integer)
                 _FailCount = value
-                If State = LoadState.Loading AndAlso value >= Math.Min(10000, Math.Max(FileRemain * 5.5, NetTaskThreadLimit * 5.5 + 3)) Then
-                    Logger.Warn($"由于同加载器中失败次数过多引发强制失败：连续失败了 {value} 次")
+                If State = LoadState.Loading AndAlso value >= Math.Min(10000, Math.Max(FileRemain * 8, NetTaskThreadLimit * 8 + 3)) Then
+                    Logger.Error($"由于同加载器中失败次数过多引发强制失败：连续失败了 {value} 次", LogBehavior.ToastIfDebug)
                     On Error Resume Next
                     Dim ExList As New List(Of Exception)
                     For Each File In Files
@@ -1470,12 +1391,12 @@ FinishExCatch:
 
         Public Sub New(Name As String, FileTasks As IEnumerable(Of NetFile))
             Me.Name = Name
-            Files = New ConcurrentList(Of NetFile)(FileTasks)
+            Files = New ConcurrentQueue(Of NetFile)(FileTasks)
         End Sub
         Public Overrides Sub Start(Optional Input As Object = Nothing, Optional IsForceRestart As Boolean = False)
-            If Input IsNot Nothing Then Files = New ConcurrentList(Of NetFile)(Input)
+            If Input IsNot Nothing Then Files = New ConcurrentQueue(Of NetFile)(CType(Input, IEnumerable(Of NetFile)))
             '去重
-            Files = New ConcurrentList(Of NetFile)(Files.DistinctBy(Function(a) a.LocalPath))
+            Files = New ConcurrentQueue(Of NetFile)(Files.DistinctBy(Function(a) PathUtils.ForCompare(a.LocalPath).Lower()))
             '设置剩余文件数
             SyncLock FileRemainLock
                 FileRemain += Files.Where(Function(f) f.State <> NetState.Finished).Count
@@ -1500,13 +1421,14 @@ FinishExCatch:
                         Next
                         If Not File.HasAvailableSource() Then Throw New ArgumentException("输入的下载链接不正确！")
                         File.LocalPath = File.LocalPath.Replace("/", "\")
-                        If Not File.LocalPath.Lower.Contains(":\") Then Throw New ArgumentException("输入的本地文件地址不正确：" & File.LocalPath)
+                        If Not File.LocalPath.Contains(":\") Then Throw New ArgumentException("输入的本地文件地址不正确：" & File.LocalPath)
                         If File.LocalPath.EndsWithF("\") Then Throw New ArgumentException("请输入含文件名的完整文件路径：" & File.LocalPath)
                         DirectoryUtils.Create(PathUtils.RemoveLastPart(File.LocalPath)) '创建目标文件夹
                     Next
                     '接入下载管理器，获取新开始下载的文件列表
                     Dim NewFiles = NetManager.Start(Me)
 
+
                     '====================================
                     ' 已存在文件查找
                     '====================================
@@ -1514,9 +1436,9 @@ FinishExCatch:
                     '整理允许进行查找的文件
                     Dim FilesToCheck As New List(Of NetFile)
                     For Each File In NewFiles
-                        If File.Check?.CanUseExistsFile Then
+                        If File.Check IsNot Nothing Then
                             FilesToCheck.Add(File)
-                        Else '不允许，直接开始下载
+                        Else '没有校验信息，直接开始下载
                             SyncLock LockState
                                 File.State = NetState.WaitingToDownload
                                 File.IsCopy = False
@@ -1526,7 +1448,7 @@ FinishExCatch:
                     If Not FilesToCheck.Any Then Return
                     '获取 MC 文件夹列表
                     Dim Folders As New List(Of String)
-                    Folders.Add(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) & "\.minecraft\") '总是添加官启文件夹，因为 HMCL 会把所有文件存在这里
+                    Folders.Add(Paths.AppData & ".minecraft\") '总是添加官启文件夹，因为 HMCL 会把所有文件存在这里
                     Folders.AddRange(McFolderList.Select(Function(f) f.Location))
                     Folders = Folders.Distinct.Where(Function(f) DirectoryUtils.Exists(f)).ToList
                     '平均分配到多个检查线程
@@ -1555,7 +1477,7 @@ FinishExCatch:
                 '列出 MC 文件夹中的各个版本文件夹
                 Dim VersionFolders As New List(Of String)
                 For Each McFolder In FolderList
-                    For Each VersionFolder In DirectoryUtils.GetDirectories(McFolder & "versions\", True)
+                    For Each VersionFolder In DirectoryUtils.EnumerateDirectories(McFolder & "versions\")
                         VersionFolders.Add(PathUtils.AddSlashSuffix(VersionFolder))
                     Next
                 Next
@@ -1597,7 +1519,7 @@ FinishExCatch:
                 Select(Function(FolderName) (FolderName, File.LocalPath.IndexOfF(FolderName, True))).
                 Where(Function(kv) kv.Item2 >= 0).ToList
             If Not TypeIndexes.Any Then
-                If File.LocalName.EndsWithF(".jar") Then
+                If PathUtils.GetExtension(File.LocalName) = "jar" Then
                     TypeIndexes.Add(("\versions\", 1)) '总是对 jar 进行版本文件检查，以包括另存为 jar 的情况
                 Else
                     Return Nothing
@@ -1625,7 +1547,7 @@ FinishExCatch:
                 Case "versions\"
                     '版本 jar 或 json：查找 MC 文件夹下的各个版本文件夹
                     For Each VersionFolder In VersionFolders
-                        For Each Candidate In DirectoryUtils.GetFiles(VersionFolder, True, "*." & PathUtils.GetLastPart(File.LocalPath).AfterLast(".").Lower)
+                        For Each Candidate In DirectoryUtils.EnumerateFiles(VersionFolder, searchPattern:="*." & PathUtils.GetExtension(File.LocalPath))
                             If CheckCandidate(Candidate, File.Check) Then Return Candidate
                         Next
                     Next
@@ -1633,7 +1555,7 @@ FinishExCatch:
                     '社区资源
                     If File.Check.ActualSize < 0 OrElse File.Check.Hash Is Nothing Then Return Nothing '必须要求指定了文件大小和 Hash
                     For Each Folder In FolderList.Concat(VersionFolders)
-                        For Each Candidate In DirectoryUtils.GetFiles(Folder & Type, True)
+                        For Each Candidate In DirectoryUtils.EnumerateFiles(Folder & Type)
                             If CheckCandidate(Candidate, File.Check) Then Return Candidate
                         Next
                     Next
@@ -1671,12 +1593,12 @@ FinishExCatch:
                 If State >= LoadState.Finished Then Return
                 If ExList Is Nothing OrElse Not ExList.Any() Then ExList = New List(Of Exception) From {New Exception("未知错误！")}
                 '寻找有效的错误信息
-                Dim UsefulExs = ExList.Where(Function(e) TypeOf e IsNot OperationCanceledException AndAlso TypeOf e IsNot TimeoutException AndAlso TypeOf e IsNot ThreadInterruptedException).ToList
+                Dim UsefulExs = ExList.Where(Function(e) Not e.IsCanceled AndAlso TypeOf e IsNot TimeoutException).ToList
                 [Error] = If(UsefulExs.FirstOrDefault, ExList.FirstOrDefault)
                 '获取实际失败的文件
                 For Each File In Files
-                    If File.State <> NetState.Interrupted Then Continue For
-                    If File.Sources.All(Function(s) TypeOf s.Ex Is OperationCanceledException OrElse TypeOf s.Ex Is TimeoutException OrElse TypeOf s.Ex Is ThreadInterruptedException) Then Continue For
+                    If File.State <> NetState.Canceled Then Continue For
+                    If File.Sources.All(Function(s) s.Ex.IsCanceled OrElse TypeOf s.Ex Is TimeoutException) Then Continue For
                     Dim Detail As String = File.Sources.Select(Function(s) $"{If(s.Ex Is Nothing, "无错误信息。", s.Ex.GetDisplay(False))}（{s.Url}）").Join(vbCrLf)
                     [Error] = New Exception("文件下载失败：" & File.LocalPath & vbCrLf &
                                             "各下载源的错误如下：" & vbCrLf & Detail, [Error])
@@ -1691,20 +1613,20 @@ FinishExCatch:
             End SyncLock
             '中断所有文件
             For Each TaskFile In Files
-                TaskFile.Interrupt(Me)
+                TaskFile.Cancel(Me)
             Next
             '在退出同步锁后再进行日志输出
             Logger.Error(New AggregateException(ExList), "下载加载器失败", LogBehavior.None)
         End Sub
-        Public Overrides Sub Interrupt()
+        Public Overrides Sub Cancel()
             SyncLock LockState
                 If State >= LoadState.Finished Then Return
-                State = LoadState.Interrupted
+                State = LoadState.Canceled
             End SyncLock
             Logger.Info($"{Name} 已取消！")
             '中断所有文件
             For Each TaskFile In Files
-                TaskFile.Interrupt(Me)
+                TaskFile.Cancel(Me)
             Next
         End Sub
 
@@ -1726,7 +1648,7 @@ FinishExCatch:
         ''' <summary>
         ''' 当前的所有下载任务。
         ''' </summary>
-        Public Tasks As New ConcurrentList(Of LoaderDownload)
+        Public Tasks As New ConcurrentBag(Of LoaderDownload)
 
         ''' <summary>
         ''' 已下载完成的大小。
@@ -1777,7 +1699,7 @@ FinishExCatch:
                 If SpeedLast.Count >= 10 Then Limit = SpeedLast.Take(10).Average * 0.85 '取近 1 秒的平均速度的 85%
                 If Limit > NetTaskSpeedLimitLow Then
                     NetTaskSpeedLimitLow = Limit
-                    Logger.Info($"速度下限已提升到 {FormatFileSize(Limit)}")
+                    Logger.Info($"速度下限已提升到 {StringUtils.FormatByteSize(Limit)}")
                 End If
 #End Region
 #Region "刷新下载任务属性"
@@ -1894,14 +1816,13 @@ FinishExCatch:
             End SyncLock
             '添加每个文件
             Dim NewFiles As New List(Of NetFile)
-            For i = 0 To Task.Files.Count - 1
-                Dim File As NetFile = Task.Files(i)
+            Dim NewFilesList As New List(Of NetFile)
+            For Each File In Task.Files
                 Dim OngoingFile As NetFile = Nothing
                 If AllFiles.TryGetValue(File.LocalPath, OngoingFile) AndAlso OngoingFile.State < NetState.Finished Then
                     '该文件正在被另一个任务下载
                     Logger.Trace(Function() $"{File.LocalName}：无需开始，该文件已在下载中，目标 {File.LocalPath}")
                     File = OngoingFile '将列表中的文件替换成下载中的文件，即两个任务指向同一个文件；抛弃现在的 File 对象
-                    Task.Files(i) = File
                 Else
                     '常规情况（该文件可能已在其他任务中下载完成，但这并不影响）
                     Logger.Trace(Function() $"{File.LocalName}：开始，目标 {File.LocalPath}")
@@ -1909,8 +1830,10 @@ FinishExCatch:
                     NewFiles.Add(File)
                     Interlocked.Increment(FileRemain)
                 End If
+                NewFilesList.Add(File)
                 File.Tasks.Add(Task)
             Next
+            Task.Files = New ConcurrentQueue(Of NetFile)(NewFilesList)
             Tasks.Add(Task)
             Return NewFiles
         End Function
@@ -1918,7 +1841,7 @@ FinishExCatch:
     End Class
 
     ''' <summary>
-    ''' 是否有正在进行中、需要在下载管理页面显示的下载任务？
+    ''' 是否有正在进行中、需要在任务管理页面显示的下载任务？
     ''' </summary>
     Public Function HasDownloadingTask(Optional IgnoreCustomDownload As Boolean = False) As Boolean
         Return LoaderTaskbar.Any(

Plain Craft Launcher 2/Modules/Base/ModValidate.vb

@@ -1,4 +1,4 @@
-'提供不同的输入验证方法，名称以 Validate 开头
+'提供不同的输入验证方法，名称以 Validate 开头
 Public Module ModValidate
 
     ''' <summary>
@@ -66,6 +66,20 @@ Public Class ValidateNullOrWhiteSpace
     End Function
 End Class
 
+''' <summary>
+''' 自定义的 Validate。
+''' </summary>
+Public Class ValidateFunc
+    Inherits Validate
+    Private ReadOnly _func As Func(Of String, String)
+    Public Sub New(F As Func(Of String, String))
+        _func = F
+    End Sub
+    Public Overrides Function Validate(Str As String) As String
+        Return _func(Str)
+    End Function
+End Class
+
 ''' <summary>
 ''' 必须满足正则表达式。
 ''' </summary>
@@ -246,16 +260,16 @@ Public Class ValidateFolderName
     Inherits Validate
     Public Property Folder As String
     Public Property UseMinecraftCharCheck As Boolean = True
-    Public Property IgnoreCase As Boolean = True
     Private ReadOnly PathIgnore As IEnumerable(Of String)
+    Private ReadOnly IgnoreList As List(Of String)
     Public Sub New()
     End Sub
-    Public Sub New(Folder As String, Optional UseMinecraftCharCheck As Boolean = True, Optional IgnoreCase As Boolean = True)
+    Public Sub New(Folder As String, Optional UseMinecraftCharCheck As Boolean = True, Optional IgnoreList As List(Of String) = Nothing)
         Me.Folder = Folder
-        Me.IgnoreCase = IgnoreCase
         Me.UseMinecraftCharCheck = UseMinecraftCharCheck
         On Error Resume Next
-        PathIgnore = DirectoryUtils.GetDirectories(Folder, True)
+        PathIgnore = DirectoryUtils.EnumerateDirectories(Folder)
+        Me.IgnoreList = IgnoreList
     End Sub
     Public Overrides Function Validate(Str As String) As String
         Try
@@ -280,12 +294,14 @@ Public Class ValidateFolderName
             If Str.RegexCheck(".{2,}~\d") Then Return "文件夹名不能包含这一特殊格式！"
             '检查文件夹重名
             Dim Arr As New List(Of String)
+            Dim folderName As String
             If PathIgnore IsNot Nothing Then
                 For Each FolderPath In PathIgnore
-                    Arr.Add(PathUtils.GetLastPart(FolderPath))
+                    folderName = PathUtils.GetLastPart(FolderPath)
+                    If IgnoreList Is Nothing OrElse Not IgnoreList.Contains(folderName, StringComparer.OrdinalIgnoreCase) Then Arr.Add(folderName)
                 Next
             End If
-            Dim SameNameCheck = New ValidateExceptSame(Arr, "不可与现有文件夹重名！", IgnoreCase).Validate(Str)
+            Dim SameNameCheck = New ValidateExceptSame(Arr, "不可与现有文件夹重名！", True).Validate(Str)
             If Not SameNameCheck = "" Then Return SameNameCheck
             Return ""
         Catch ex As Exception
@@ -366,13 +382,16 @@ Public Class ValidateFolderPath
     Public Overrides Function Validate(Str As String) As String
         '去除尾部斜线，统一为 \
         Str = Str.Replace("/", "\")
-        If Not Str.TrimEnd("\").EndsWithF(":") Then Str = Str.TrimEnd("\")
+        If Not PathUtils.RemoveSlashSuffix(Str).EndsWithF(":") Then Str = PathUtils.RemoveSlashSuffix(Str)
         '检查是否为空
         Dim LengthCheck As String = New ValidateNullOrWhiteSpace().Validate(Str)
         If LengthCheck <> "" Then Return LengthCheck
         '检查长度
         LengthCheck = New ValidateLength(1, 254).Validate(Str)
         If LengthCheck <> "" Then Return LengthCheck
+        '检查 NTFS 8.3 文件名（#4505）
+        Dim Match = Str.RegexSeek(".{2,}~\d")
+        If Match IsNot Nothing Then Return $"文件夹名不能包含 {Match} 这一特殊格式！"
         '检查开头
         If Str.StartsWithF("\\Mac\") Then GoTo Fin
         For Each Drive In Environment.GetLogicalDrives().Where(Function(p) DirectoryUtils.Exists(p))
@@ -399,8 +418,6 @@ Fin:
             '检查特殊字符串
             Dim InvalidStrCheck As String = New ValidateExceptSame({"CON", "PRN", "AUX", "CLOCK$", "NUL", "COM0", "COM1", "COM2", "COM3", "COM4", "COM5", "COM6", "COM7", "COM8", "COM9", "LPT0", "LPT1", "LPT2", "LPT3", "LPT4", "LPT5", "LPT6", "LPT7", "LPT8", "LPT9"}, "文件夹名不可为 %！").Validate(SubStr)
             If Not InvalidStrCheck = "" Then Return InvalidStrCheck
-            '检查 NTFS 8.3 文件名（#4505）
-            If Str.RegexCheck(".{2,}~\d") Then Return "文件夹名不能包含这一特殊格式！"
         Next
         Return ""
     End Function

Plain Craft Launcher 2/Modules/Base/MyBitmap.vb

@@ -1,4 +1,4 @@
-'一个万能的自动图片类型转换工具类
+'一个万能的自动图片类型转换工具类
 
 Imports System.Drawing.Imaging
 
@@ -126,9 +126,7 @@ Public Class MyBitmap
     End Sub
     Private Class WebPDecoder '将代码隔离在另外一个类中，这样只要不调用这个方法就不会加载 Imazen.WebP.dll
         Public Shared Function DecodeFromBytes(Bytes As Byte()) As System.Drawing.Bitmap
-            If Is32BitSystem Then Throw New Exception("不支持在 32 位系统下加载 WebP 图片。")
-            Dim Decoder As New Imazen.WebP.SimpleDecoder()
-            Return Decoder.DecodeFromBytes(Bytes, Bytes.Length)
+            Return New Imazen.WebP.SimpleDecoder().DecodeFromBytes(Bytes, Bytes.Length)
         End Function
     End Class
 

Plain Craft Launcher 2/Modules/Base/PclLogger.vb

@@ -1,4 +1,4 @@
-Public Class PclLogger
+Public Class PclLogger
     Inherits FileLogger
 
     ''' <inheritdoc/>

Plain Craft Launcher 2/Modules/Minecraft/ModCrash.vb

@@ -1,4 +1,4 @@
-Public Class CrashAnalyzer
+Public Class CrashAnalyzer
 
     '构造函数
     Private TempFolder As String
@@ -24,7 +24,7 @@
         '简单收集可能的日志文件路径
         Dim PossibleLogs As New List(Of String)
         Try
-            PossibleLogs.AddRange(DirectoryUtils.GetFiles(VersionPathIndie & "crash-reports\"))
+            PossibleLogs.AddRange(DirectoryUtils.EnumerateFiles(VersionPathIndie & "crash-reports\", True))
         Catch ex As Exception
             Logger.Warn(ex, "收集 Minecraft 崩溃日志文件夹下的日志失败")
         End Try
@@ -92,7 +92,7 @@
         '尝试视作压缩包解压
         Try
             Dim Info = FileUtils.GetInfo(FilePath)
-            If Info.Exists AndAlso Info.Length > 0 AndAlso Not FilePath.EndsWithF(".jar", True) Then
+            If Info.Exists AndAlso Info.Length > 0 AndAlso Not PathUtils.GetExtension(FilePath) = "jar" Then
                 FileUtils.ExtractToDirectory(FilePath, TempFolder & "Temp\")
                 Logger.Info($"已解压导入的日志文件：{FilePath}")
                 GoTo Extracted
@@ -163,9 +163,9 @@ Extracted:
                 Else
                     TargetType = AnalyzeFileType.ExtraLogFile
                 End If
-            ElseIf MatchName.EndsWithF(".log", True) Then
+            ElseIf PathUtils.GetExtension(MatchName) = "log" Then
                 TargetType = AnalyzeFileType.ExtraLogFile
-            ElseIf MatchName.EndsWithF(".txt", True) Then
+            ElseIf PathUtils.GetExtension(MatchName) = "txt" Then
                 TargetType = AnalyzeFileType.ExtraReportFile
             Else
                 Logger.Info($"{MatchName} 分类为 Ignore")
@@ -514,7 +514,6 @@ Done:
             If LogMc.Contains("signer information does not match signer information of other classes in the same package") Then AppendReason(CrashReason.文件或内容校验失败, If(LogMc.RegexSeek("(?<=class "")[^']+(?=""'s signer information)"), "").TrimEnd(vbCrLf))
             If LogMc.Contains("Maybe try a lower resolution resourcepack?") Then AppendReason(CrashReason.材质过大或显卡配置不足)
             If LogMc.Contains("java.lang.NoSuchMethodError: net.minecraft.world.server.ChunkManager$ProxyTicketManager.shouldForceTicks(J)Z") AndAlso LogMc.Contains("OptiFine") Then AppendReason(CrashReason.OptiFine导致无法加载世界)
-            If LogMc.Contains("Unsupported class file major version") Then AppendReason(CrashReason.Java版本不兼容)
             If LogMc.Contains("com.electronwill.nightconfig.core.io.ParsingException: Not enough data available") AndAlso Not CrashReasons.ContainsKey(CrashReason.Mod配置文件导致游戏崩溃) Then AppendReason(CrashReason.NightConfig的Bug)
             If LogMc.Contains("Cannot find launch target fmlclient, unable to launch") Then AppendReason(CrashReason.Forge安装不完整)
             If LogMc.Contains("Invalid paths argument, contained no existing paths") AndAlso LogMc.Contains("libraries\net\minecraftforge\fmlcore") Then AppendReason(CrashReason.Forge安装不完整)
@@ -522,7 +521,9 @@ Done:
             If LogMc.Contains("has been compiled by a more recent version of the Java Runtime (class file version 55.0), this version of the Java Runtime only recognizes class file versions up to") Then AppendReason(CrashReason.Mod需要Java11)
             If LogMc.Contains("java.lang.RuntimeException: java.lang.NoSuchMethodException: no such method: sun.misc.Unsafe.defineAnonymousClass(Class,byte[],Object[])Class/invokeVirtual") Then AppendReason(CrashReason.Mod需要Java11)
             If LogMc.Contains("java.lang.IllegalArgumentException: The requested compatibility level JAVA_11 could not be set. Level is not supported by the active JRE or ASM version") Then AppendReason(CrashReason.Mod需要Java11)
+            If LogMc.Contains("Unsupported class file major version") Then AppendReason(CrashReason.Java版本不兼容)
             If LogMc.Contains("Unsupported major.minor version") Then AppendReason(CrashReason.Java版本不兼容)
+            If LogMc.Contains("Level is not supported by the active JRE or ASM version") Then AppendReason(CrashReason.Java版本不兼容)
             If LogMc.Contains("Invalid maximum heap size") Then AppendReason(CrashReason.使用32位Java导致JVM无法分配足够多的内存)
             If LogMc.Contains("Could not reserve enough space") Then
                 If LogMc.Contains("for 1048576KB object heap") Then
@@ -543,8 +544,8 @@ Done:
             End If
             If LogMc.Contains("Missing or unsupported mandatory dependencies:") Then
                 AppendReason(CrashReason.Mod缺少前置或MC版本错误,
-                    LogMc.RegexSearch("(?<=Missing or unsupported mandatory dependencies:)([\n\r]+\t(.*))+", RegularExpressions.RegexOptions.IgnoreCase).
-                    Select(Function(s) s.Trim((vbCrLf & vbTab & " ").ToCharArray)).Distinct().ToList())
+                LogMc.RegexSearch("(?<=Missing or unsupported mandatory dependencies:)([\n\r]+\t(.*))+", RegularExpressions.RegexOptions.IgnoreCase).
+                Select(Function(s) s.Trim((vbCrLf & vbTab & " ").ToCharArray)).Distinct().ToList())
             End If
         End If
 
@@ -948,13 +949,13 @@ NextStack:
                 Case CrashReason.内存不足
                     Results.Add("Minecraft 内存不足，导致其无法继续运行。\n这很可能是因为电脑内存不足、游戏分配的内存不足，或是配置要求过高。\n\n你可以尝试在 更多 → 百宝箱 中选择 内存优化，然后再启动游戏。\n如果还是不行，请在启动设置中增加为游戏分配的内存，并删除配置要求较高的材质、Mod、光影。\n如果依然不奏效，请在开始游戏前尽量关闭其他软件，或者……换台电脑？\h")
                 Case CrashReason.使用OpenJ9
-                    Results.Add("游戏因为使用 OpenJ9 而崩溃了。\n请在启动设置的 Java 选择一项中改用非 OpenJ9 的 Java，然后再启动游戏。")
+                    Results.Add("游戏因为使用 OpenJ9 而崩溃了。\n请在版本设置的 Java 选项中改用非 OpenJ9 的 Java，然后再启动游戏。")
                 Case CrashReason.使用JDK
-                    Results.Add("游戏似乎因为使用 JDK，或 Java 版本过高而崩溃了。\n请在启动设置的 Java 选择一项中改用 JRE 8（Java 8），然后再启动游戏。\n如果你没有安装 JRE 8，你可以从网络中下载、安装一个。")
+                    Results.Add("游戏似乎因为使用 JDK，或 Java 版本过高而崩溃了。\n请在版本设置的 Java 选项中改用 Java 8，然后再启动游戏。\n如果你没有安装 Java 8，可以从网络中下载、安装一个。")
                 Case CrashReason.Java版本过高
-                    Results.Add("游戏似乎因为你所使用的 Java 版本过高而崩溃了。\n请在启动设置的 Java 选择一项中改用较低版本的 Java，然后再启动游戏。\n如果没有，可以从网络中下载、安装一个。")
+                    Results.Add("游戏似乎因为你所使用的 Java 版本过高而崩溃了。\n请在版本设置的 Java 选项中改用较低版本的 Java，然后再启动游戏。\n如果没有，可以从网络中下载、安装一个。")
                 Case CrashReason.Java版本不兼容
-                    Results.Add("游戏不兼容你当前使用的 Java。\n如果没有合适的 Java，可以从网络中下载、安装一个。")
+                    Results.Add("游戏不兼容你当前使用的 Java。\n请在版本设置的 Java 选项中改用合适版本的 Java，然后再启动游戏。\n如果你没有安装任何 Mod 并且因此崩溃，请向 PCL 提交反馈。")
                 Case CrashReason.Mod名称包含特殊字符
                     Results.Add("由于有 Mod 的名称包含特殊字符，导致游戏崩溃。\n请尝试修改 Mod 文件名，让它只包含英文字母、数字、减号（-）、下划线（_）和小数点，然后再启动游戏。")
                 Case CrashReason.MixinBootstrap缺失

Plain Craft Launcher 2/Modules/Minecraft/ModDownload.vb

@@ -1,4 +1,4 @@
-Public Module ModDownload
+Public Module ModDownload
 
 #Region "DlClient* | Minecraft 客户端"
 
@@ -20,7 +20,7 @@
             Throw New Exception("底层版本 " & Instance.Name & " 中无 jar 文件下载信息")
         End If
         '检查文件
-        Dim Checker As New FileChecker(MinSize:=1024, ActualSize:=If(Instance.JsonObject("downloads")("client")("size"), -1), Hash:=Instance.JsonObject("downloads")("client")("sha1"))
+        Dim Checker As New FileChecker With {.MinSize = 1024, .ActualSize = If(Instance.JsonObject("downloads")("client")("size"), -1), .Hash = Instance.JsonObject("downloads")("client")("sha1")}
         If ReturnNothingOnFileUseable AndAlso Checker.Check(Instance.PathVersion & Instance.Name & ".jar") Is Nothing Then Return Nothing '通过校验
         '返回下载信息
         Dim JarUrl As String = Instance.JsonObject("downloads")("client")("url")
@@ -44,14 +44,14 @@
         If IndexUrl = "" Then
             Return Nothing
         Else
-            Return New NetFile(DlSourceLauncherOrMetaGet(IndexUrl), IndexAddress, New FileChecker(CanUseExistsFile:=False, IsJson:=True))
+            Return New NetFile(DlSourceLauncherOrMetaGet(IndexUrl), IndexAddress, New FileChecker With {.IsJson = True})
         End If
     End Function
 
     ''' <summary>
     ''' 构造补全某 Minecraft 版本的所有文件的加载器列表。失败会抛出异常。
     ''' </summary>
-    Public Function DlClientFix(Instance As McInstance, CheckAssetsHash As Boolean, AssetsIndexBehaviour As AssetsIndexExistsBehaviour) As List(Of LoaderBase)
+    Public Function DlClientFix(Instance As McInstance, CheckAssetsHash As Boolean, DownloadAssetIndexInBackground As Boolean) As List(Of LoaderBase)
         Dim Loaders As New List(Of LoaderBase)
 
 #Region "下载支持库文件"
@@ -65,10 +65,12 @@
 
 #Region "下载资源文件"
         If ShouldIgnoreFileCheck(Instance) Then
-            Logger.Info("已跳过所有 Assets 检查")
+            Logger.Warn("设置要求跳过所有 Assets 检查，文件可能不是最新的", LogBehavior.None)
         Else
             Dim LoadersAssets As New List(Of LoaderBase)
             '获取资源文件索引地址
+            Dim TempAddressMain As String = Nothing
+            Dim RealAddressMain As String = Nothing
             LoadersAssets.Add(New LoaderTask(Of String, List(Of NetFile))("分析资源文件索引地址",
             Sub(Task As LoaderTask(Of String, List(Of NetFile)))
                 Try
@@ -76,9 +78,26 @@
                     If IndexFile Is Nothing Then
                         Task.Output = New List(Of NetFile)
                         Logger.Warn($"未找到版本 {Instance.Name} 的合适的资源索引下载地址，游戏 assets 可能缺失")
-                    ElseIf AssetsIndexBehaviour <> AssetsIndexExistsBehaviour.AlwaysDownload AndAlso IndexFile.Check.Check(IndexFile.LocalPath) Is Nothing Then
-                        Task.Output = New List(Of NetFile)
+                        Return
+                    End If
+                    Dim IndexBackgroundFile = PathTemp & "Cache\" & IndexFile.LocalName & "_background"
+                    If FileUtils.Exists(IndexBackgroundFile) AndAlso
+                       FileUtils.GetInfo(IndexBackgroundFile).LastWriteTime.Date > FileUtils.GetInfo(IndexFile.LocalPath).LastWriteTime.Date Then
+                        Logger.Info($"发现后台更新的资源索引缓存文件：{IndexBackgroundFile}")
+                        FileUtils.Move(IndexBackgroundFile, IndexFile.LocalPath)
+                    End If
+                    If DownloadAssetIndexInBackground Then
+                        '允许后台更新索引
+                        If IndexFile.Check.Check(IndexFile.LocalPath) Is Nothing Then
+                            Task.Output = New List(Of NetFile)
+                        Else
+                            Task.Output = New List(Of NetFile) From {IndexFile}
+                        End If
                     Else
+                        '强制要求重新下载
+                        RealAddressMain = IndexFile.LocalPath
+                        TempAddressMain = PathTemp & "Cache\" & IndexFile.LocalName
+                        IndexFile.LocalPath = TempAddressMain
                         Task.Output = New List(Of NetFile) From {IndexFile}
                     End If
                 Catch ex As Exception
@@ -87,65 +106,51 @@
             End Sub) With {.ProgressWeight = 0.5, .Show = False})
             '下载资源文件索引
             LoadersAssets.Add(New LoaderDownload("下载资源文件索引", New List(Of NetFile)) With {.ProgressWeight = 2})
-            '要求独立更新索引
-            If AssetsIndexBehaviour = AssetsIndexExistsBehaviour.DownloadInBackground Then
-                Dim LoadersAssetsUpdate As New List(Of LoaderBase)
-                Dim TempAddress As String = Nothing
-                Dim RealAddress As String = Nothing
-                LoadersAssetsUpdate.Add(New LoaderTask(Of String, List(Of NetFile))("后台分析资源文件索引地址",
-                Sub(Task As LoaderTask(Of String, List(Of NetFile)))
-                    Dim BackAssetsFile As NetFile = DlClientAssetIndexGet(Instance)
-                    If BackAssetsFile Is Nothing Then
-                        Logger.Warn($"未找到版本 {Instance.Name} 的合适的资源索引下载地址，游戏 assets 可能缺失")
-                        Task.Interrupt()
-                        Throw New ThreadInterruptedException
-                    End If
-                    RealAddress = BackAssetsFile.LocalPath
-                    TempAddress = PathTemp & "Cache\" & BackAssetsFile.LocalName
-                    BackAssetsFile.LocalPath = TempAddress
-                    Task.Output = New List(Of NetFile) From {BackAssetsFile}
-                    '检查是否需要更新：每天只更新一次
-                    If FileUtils.Exists(RealAddress) AndAlso Math.Abs((FileUtils.GetInfo(RealAddress).LastWriteTime.Date - Now.Date).TotalDays) < 1 Then
-                        Logger.Info("无需更新资源文件索引，取消")
-                        Task.Interrupt()
-                    End If
-                End Sub))
-                LoadersAssetsUpdate.Add(New LoaderDownload("后台下载资源文件索引", New List(Of NetFile)))
-                LoadersAssetsUpdate.Add(New LoaderTask(Of List(Of NetFile), String)("后台复制资源文件索引",
-                Sub(Task As LoaderTask(Of List(Of NetFile), String))
-                    FileUtils.Copy(TempAddress, RealAddress)
-                    McLaunchLog("后台更新资源文件索引成功：" & TempAddress)
-                End Sub))
-                Dim Updater As New LoaderCombo(Of String)("后台更新资源文件索引", LoadersAssetsUpdate)
-                Logger.Info("开始后台检查资源文件索引")
-                Updater.Start()
-            End If
             '获取资源文件地址
             LoadersAssets.Add(New LoaderTask(Of String, List(Of NetFile))("获取资源文件列表",
-                Sub(Task) Task.Output = McAssetsFixList(Instance, CheckAssetsHash, Task)) With {.ProgressWeight = 0.01})
+            Sub(Task)
+                If TempAddressMain IsNot Nothing Then FileUtils.Move(TempAddressMain, RealAddressMain)
+                Task.Output = McAssetsFixList(Instance, CheckAssetsHash, Task)
+            End Sub) With {.ProgressWeight = 0.01})
             '下载资源文件
             LoadersAssets.Add(New LoaderDownload("下载资源文件", New List(Of NetFile)) With {.ProgressWeight = 25})
             '构造加载器
             Loaders.Add(New LoaderCombo(Of String)("下载资源文件（主加载器）", LoadersAssets) With {.Block = False, .Show = False, .ProgressWeight = 27})
+
+            '后台独立更新索引
+            If DownloadAssetIndexInBackground Then
+                Dim RealAddressBg As String = Nothing
+                Dim TempAddressBg As String = Nothing
+                Dim LoadersAssetsUpdate As New List(Of LoaderBase)
+                LoadersAssetsUpdate.Add(New LoaderTask(Of String, List(Of NetFile))("后台分析资源文件索引地址",
+                Sub(Task As LoaderTask(Of String, List(Of NetFile)))
+                    Dim IndexFile As NetFile = DlClientAssetIndexGet(Instance)
+                    If IndexFile Is Nothing Then
+                        Logger.Warn($"未找到版本 {Instance.Name} 的合适的资源索引下载地址，游戏 assets 可能缺失")
+                        Task.Cancel()
+                        Throw New OperationCanceledException
+                    End If
+                    RealAddressBg = IndexFile.LocalPath
+                    TempAddressBg = PathTemp & "Cache\" & IndexFile.LocalName & "_background"
+                    IndexFile.LocalPath = TempAddressBg
+                    Task.Output = New List(Of NetFile) From {IndexFile}
+                    '检查是否需要更新：每天只更新一次
+                    Dim LastUpdate As Date = FileUtils.GetInfo(RealAddressBg).LastWriteTime.Date
+                    If FileUtils.Exists(RealAddressBg) AndAlso Math.Abs((LastUpdate - Now.Date).TotalDays) < 1 Then
+                        Logger.Info($"无需更新资源文件索引，上次更新于 {LastUpdate}")
+                        Task.Cancel()
+                    End If
+                End Sub))
+                LoadersAssetsUpdate.Add(New LoaderDownload("后台下载资源文件索引", New List(Of NetFile)))
+                Dim Updater As New LoaderCombo(Of String)("后台更新资源文件索引", LoadersAssetsUpdate)
+                Logger.Info("开始后台检查资源文件索引")
+                Updater.Start()
+            End If
         End If
 #End Region
 
         Return Loaders
     End Function
-    Public Enum AssetsIndexExistsBehaviour
-        ''' <summary>
-        ''' 如果文件存在，则不进行下载。
-        ''' </summary>
-        DontDownload
-        ''' <summary>
-        ''' 如果文件存在，则启动新的下载加载器进行独立的更新。
-        ''' </summary>
-        DownloadInBackground
-        ''' <summary>
-        ''' 如果文件存在，也同样进行下载。
-        ''' </summary>
-        AlwaysDownload
-    End Enum
 
 #End Region
 
@@ -227,7 +232,7 @@
     Public DlClientListMojangLoader As New LoaderTask(Of String, DlClientListResult)("DlClientList Mojang", AddressOf DlClientListMojangMain)
     Private Sub DlClientListMojangMain(Loader As LoaderTask(Of String, DlClientListResult))
         Dim StartTime As Long = GetTimeMs()
-        Dim Json As JObject = GetJson(NetRequestByClientRetry("https://launchermeta.mojang.com/mc/game/version_manifest.json", RequireJson:=True))
+        Dim Json As JObject = NetRequestByClientRetry("https://launchermeta.mojang.com/mc/game/version_manifest.json", RequireJson:=True).DeserializeJson()
         Try
             Dim Versions As JArray = Json("versions")
             If Versions.Count < 200 Then Throw New Exception("获取到的版本列表长度不足（" & Json.ToString & "）")
@@ -237,8 +242,6 @@
                 DlPreferMojang = DeltaTime < 4000
                 Logger.Info($"Mojang 官方源加载耗时：{DeltaTime}ms，{If(DlPreferMojang, "可优先使用官方源", "不优先使用官方源")}")
             End If
-            '添加 PCL 特供项
-            If FileUtils.Exists(PathTemp & "Cache\download.json") Then Versions.Merge(GetJson(FileUtils.ReadAsString(PathTemp & "Cache\download.json")))
             '返回
             Loader.Output = New DlClientListResult With {.IsOfficial = True, .SourceName = "Mojang 官方源", .Value = Json}
             'MC 更新提示
@@ -269,12 +272,12 @@
     ''' </summary>
     Public DlClientListBmclapiLoader As New LoaderTask(Of String, DlClientListResult)("DlClientList Bmclapi", AddressOf DlClientListBmclapiMain)
     Private Sub DlClientListBmclapiMain(Loader As LoaderTask(Of String, DlClientListResult))
-        Dim Json As JObject = GetJson(NetRequestByClientRetry("https://bmclapi2.bangbang93.com/mc/game/version_manifest.json", RequireJson:=True))
+        Dim Json As JObject = NetRequestByClientRetry("https://bmclapi2.bangbang93.com/mc/game/version_manifest.json", RequireJson:=True).DeserializeJson()
         Try
             Dim Versions As JArray = Json("versions")
             If Versions.Count < 200 Then Throw New Exception("获取到的版本列表长度不足（" & Json.ToString & "）")
             '添加 PCL 特供项
-            If FileUtils.Exists(PathTemp & "Cache\download.json") Then Versions.Merge(GetJson(FileUtils.ReadAsString(PathTemp & "Cache\download.json")))
+            If FileUtils.Exists(PathTemp & "Cache\download.json") Then Versions.Merge(FileUtils.ReadAsJson(PathTemp & "Cache\download.json"))
             '检查是否有要求的版本（#5195）
             If Not String.IsNullOrEmpty(Loader.Input) Then
                 Dim Id = Loader.Input
@@ -308,7 +311,7 @@
                     DlClientListLoader.WaitForExit(Id, IsForceRestart:=True)
                 Case LoadState.Loading
                     DlClientListLoader.WaitForExit(Id)
-                Case LoadState.Failed, LoadState.Interrupted, LoadState.Waiting
+                Case LoadState.Failed, LoadState.Canceled, LoadState.Waiting
                     DlClientListLoader.WaitForExit(Id, IsForceRestart:=True)
             End Select
             '重新查找版本
@@ -433,7 +436,7 @@
                     .FileName = If(Name(i).ContainsIgnoreCase("pre"), "preview_", "") & "OptiFine_" & Name(i).Replace(" ", "_") & ".jar",
                     .RequiredForgeVersion = Forge(i).Replace("Forge ", "").Replace("#", "")}
                 If Entry.RequiredForgeVersion.Contains("N/A") Then Entry.RequiredForgeVersion = Nothing
-                Entry.InstanceName = Entry.Inherit & "-OptiFine_" & Name(i).ToString.Replace(" ", "_").Replace(Entry.Inherit & "_", "")
+                Entry.InstanceName = Entry.Inherit & "-OptiFine_" & Name(i).AfterFirst(" ").Replace(" ", "_")
                 Versions.Add(Entry)
             Next
             Loader.Output = New DlOptiFineListResult With {.IsOfficial = True, .SourceName = "OptiFine 官方源", .Value = Versions}
@@ -447,7 +450,7 @@
     ''' </summary>
     Public DlOptiFineListBmclapiLoader As New LoaderTask(Of Integer, DlOptiFineListResult)("DlOptiFineList Bmclapi", AddressOf DlOptiFineListBmclapiMain)
     Private Sub DlOptiFineListBmclapiMain(Loader As LoaderTask(Of Integer, DlOptiFineListResult))
-        Dim Json As JArray = GetJson(NetRequestByClientRetry("https://bmclapi2.bangbang93.com/optifine/versionList", RequireJson:=True))
+        Dim Json As JArray = NetRequestByClientRetry("https://bmclapi2.bangbang93.com/optifine/versionList", RequireJson:=True).DeserializeJson()
         Try
             Dim Versions As New List(Of DlOptiFineListEntry)
             For Each Token As JObject In Json
@@ -531,8 +534,8 @@
     ''' </summary>
     Public DlForgeListBmclapiLoader As New LoaderTask(Of Integer, DlForgeListResult)("DlForgeList Bmclapi", AddressOf DlForgeListBmclapiMain)
     Private Sub DlForgeListBmclapiMain(Loader As LoaderTask(Of Integer, DlForgeListResult))
-        Dim Result As JArray = GetJson(NetRequestByClientRetry("https://bmclapi2.bangbang93.com/forge/minecraft",
-                                                       Encoding:=Encoding.Default, RequireJson:=True))
+        Dim Result As JArray = NetRequestByClientRetry("https://bmclapi2.bangbang93.com/forge/minecraft",
+                                                       Encoding:=Encoding.Default, RequireJson:=True).DeserializeJson()
         Dim Names As List(Of String) = Result.Select(Function(v) v.ToString).ToList
         If Names.Count < 10 Then Throw New Exception("获取到的版本数量不足")
         Loader.Output = New DlForgeListResult With {.IsOfficial = False, .SourceName = "BMCLAPI", .Value = Names}
@@ -576,7 +579,7 @@
             If Version <> other.Version Then
                 Return Version.CompareTo(other.Version)
             Else
-                Return CompareVersion(VersionName, other.VersionName)
+                Return McUtils.CompareVersion(VersionName, other.VersionName)
             End If
         End Function
     End Class
@@ -738,8 +741,8 @@
     ''' Forge 版本列表，BMCLAPI。
     ''' </summary>
     Public Sub DlForgeVersionBmclapiMain(Loader As LoaderTask(Of String, List(Of DlForgeVersionEntry)))
-        Dim Json As JArray = GetJson(NetRequestByClientRetry("https://bmclapi2.bangbang93.com/forge/minecraft/" &
-            Loader.Input.Replace("-", "_"), RequireJson:=True)) '兼容 Forge 1.7.10-pre4，#4057
+        Dim Json As JArray = NetRequestByClientRetry("https://bmclapi2.bangbang93.com/forge/minecraft/" &
+            Loader.Input.Replace("-", "_"), RequireJson:=True).DeserializeJson() '兼容 Forge 1.7.10-pre4，#4057
         Dim Versions As New List(Of DlForgeVersionEntry)
         Try
             Dim Recommended As String = McDownloadForgeRecommendedGet(Loader.Input)
@@ -1026,7 +1029,7 @@
     ''' </summary>
     Public DlLiteLoaderListOfficialLoader As New LoaderTask(Of Integer, DlLiteLoaderListResult)("DlLiteLoaderList Official", AddressOf DlLiteLoaderListOfficialMain)
     Private Sub DlLiteLoaderListOfficialMain(Loader As LoaderTask(Of Integer, DlLiteLoaderListResult))
-        Dim Result As JObject = GetJson(NetRequestByClientRetry("https://dl.liteloader.com/versions/versions.json", RequireJson:=True))
+        Dim Result As JObject = NetRequestByClientRetry("https://dl.liteloader.com/versions/versions.json", RequireJson:=True).DeserializeJson()
         Try
             Dim Json As JObject = Result("versions")
             Dim Versions As New List(Of DlLiteLoaderListEntry)
@@ -1054,7 +1057,7 @@
     ''' </summary>
     Public DlLiteLoaderListBmclapiLoader As New LoaderTask(Of Integer, DlLiteLoaderListResult)("DlLiteLoaderList Bmclapi", AddressOf DlLiteLoaderListBmclapiMain)
     Private Sub DlLiteLoaderListBmclapiMain(Loader As LoaderTask(Of Integer, DlLiteLoaderListResult))
-        Dim Result As JObject = GetJson(NetRequestByClientRetry("https://bmclapi2.bangbang93.com/maven/com/mumfrey/liteloader/versions.json", RequireJson:=True))
+        Dim Result As JObject = NetRequestByClientRetry("https://bmclapi2.bangbang93.com/maven/com/mumfrey/liteloader/versions.json", RequireJson:=True).DeserializeJson()
         Try
             Dim Json As JObject = Result("versions")
             Dim Versions As New List(Of DlLiteLoaderListEntry)
@@ -1125,7 +1128,7 @@
     ''' </summary>
     Public DlFabricListOfficialLoader As New LoaderTask(Of Integer, DlFabricListResult)("DlFabricList Official", AddressOf DlFabricListOfficialMain)
     Private Sub DlFabricListOfficialMain(Loader As LoaderTask(Of Integer, DlFabricListResult))
-        Dim Result As JObject = GetJson(NetRequestByClientRetry("https://meta.fabricmc.net/v2/versions", RequireJson:=True))
+        Dim Result As JObject = NetRequestByClientRetry("https://meta.fabricmc.net/v2/versions", RequireJson:=True).DeserializeJson()
         Try
             Dim Output = New DlFabricListResult With {.IsOfficial = True, .SourceName = "Fabric 官方源", .Value = Result}
             If Output.Value("game") Is Nothing OrElse Output.Value("loader") Is Nothing OrElse Output.Value("installer") Is Nothing Then Throw New Exception("获取到的列表缺乏必要项")
@@ -1140,7 +1143,7 @@
     ''' </summary>
     Public DlFabricListBmclapiLoader As New LoaderTask(Of Integer, DlFabricListResult)("DlFabricList Bmclapi", AddressOf DlFabricListBmclapiMain)
     Private Sub DlFabricListBmclapiMain(Loader As LoaderTask(Of Integer, DlFabricListResult))
-        Dim Result As JObject = GetJson(NetRequestByClientRetry("https://bmclapi2.bangbang93.com/fabric-meta/v2/versions", RequireJson:=True))
+        Dim Result As JObject = NetRequestByClientRetry("https://bmclapi2.bangbang93.com/fabric-meta/v2/versions", RequireJson:=True).DeserializeJson()
         Try
             Dim Output = New DlFabricListResult With {.IsOfficial = False, .SourceName = "BMCLAPI", .Value = Result}
             If Output.Value("game") Is Nothing OrElse Output.Value("loader") Is Nothing OrElse Output.Value("installer") Is Nothing Then Throw New Exception("获取到的列表缺乏必要项")
@@ -1194,15 +1197,15 @@
             Urls.Add((Url, If(Url.Contains("modrinth"), 20, 10)))
             Urls.Add((Url, 30))
         End If
-        Dim Exs As String = ""
+        Dim Errors As New List(Of Exception)
         For Each Source In Urls
             Try
-                Return GetJson(NetRequestByClient(Source.Url, Method, Content, ContentType, Timeout:=Source.Timeout * 1000, Encoding:=Encoding.UTF8, RequireJson:=True))
+                Return NetRequestByClient(Source.Url, Method, Content, ContentType, Timeout:=Source.Timeout * 1000, Encoding:=Encoding.UTF8, RequireJson:=True).DeserializeJson()
             Catch ex As Exception
-                Exs += ex.Message + vbCrLf
+                Errors.Add(ex)
             End Try
         Next
-        Throw New Exception(Exs)
+        Throw New AggregateException(Errors)
     End Function
 
 #End Region
@@ -1328,7 +1331,7 @@
                 If SubLoader.Key.State = LoadState.Finished Then
                     '检查加载器成功
                     MainLoader.Output = SubLoader.Key.Output
-                    DlSourceLoaderInterrupt(LoaderList)
+                    DlSourceLoaderCancel(LoaderList)
                     Return
                 ElseIf BeforeLoadersAllFailed Then
                     '此前的加载器全部失败，直接启动后续加载器
@@ -1360,7 +1363,7 @@
                         End If
                     Next
                     If ErrorInfo Is Nothing Then ErrorInfo = New TimeoutException("下载源连接超时")
-                    DlSourceLoaderInterrupt(LoaderList)
+                    DlSourceLoaderCancel(LoaderList)
                     Throw ErrorInfo
                 End If
                 Exit For
@@ -1369,15 +1372,15 @@
             Thread.Sleep(10)
             WaitCycle += 1
             '检查父加载器中断
-            If MainLoader.IsInterrupted Then
-                DlSourceLoaderInterrupt(LoaderList)
+            If MainLoader.IsCanceled Then
+                DlSourceLoaderCancel(LoaderList)
                 Return
             End If
         Loop
     End Sub
-    Private Sub DlSourceLoaderInterrupt(Of InputType, OutputType)(LoaderList As List(Of KeyValuePair(Of LoaderTask(Of InputType, OutputType), Integer)))
+    Private Sub DlSourceLoaderCancel(Of InputType, OutputType)(LoaderList As List(Of KeyValuePair(Of LoaderTask(Of InputType, OutputType), Integer)))
         For Each Loader In LoaderList
-            If Loader.Key.State = LoadState.Loading Then Loader.Key.Interrupt()
+            If Loader.Key.State = LoadState.Loading Then Loader.Key.Cancel()
         Next
     End Sub
 

Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb

@@ -1,18 +1,25 @@
-Public Module ModModpack
+Imports System.Collections.ObjectModel
+Imports System.Text.RegularExpressions
+
+Public Module ModModpack
 
     '触发整合包安装的外部接口
     ''' <summary>
     ''' 弹窗要求选择一个整合包文件并进行安装。
     ''' </summary>
     Public Sub ModpackInstall()
+        If RestrictMcDownload Then
+            Hint("为遵守相关法律法规，PCL 暂时不再提供 MC 下载功能，非常抱歉 qwq……", HintType.Red)
+            Return
+        End If
         Dim File As String = Dialogs.SelectFile("选择整合包压缩文件", False, filter:={({"rar", "zip", "mrpack"}, "整合包文件")}).FirstOrDefault() '选择整合包文件
         If String.IsNullOrEmpty(File) Then Return
         RunInThread(
         Sub()
             Try
                 ModpackInstall(File)
-            Catch ex As CancelledException
             Catch ex As Exception
+                ex.ThrowIfCanceled()
                 Logger.Error(ex, "手动安装整合包失败", LogBehavior.Alert)
             End Try
         End Sub)
@@ -21,7 +28,6 @@
     ''' 构建并启动安装给定的整合包文件的加载器，并返回该加载器。若失败则抛出异常。
     ''' 必须在工作线程执行。
     ''' </summary>
-    ''' <exception cref="CancelledException" />
     Public Function ModpackInstall(File As String, Optional InstanceName As String = Nothing, Optional Logo As String = Nothing) As LoaderCombo(Of String)
         Logger.Info($"整合包安装请求：{If(File, "null")}")
         Dim Archive As ZipArchive = Nothing
@@ -29,7 +35,7 @@
         Try
             '字符校验
             Dim TargetFolder As String = $"{McFolderSelected}versions\{InstanceName}\"
-            If TargetFolder.Contains("!") OrElse TargetFolder.Contains(";") Then Hint("游戏路径中不能含有感叹号或分号：" & TargetFolder, HintType.Red) : Throw New CancelledException
+            If TargetFolder.Contains("!") OrElse TargetFolder.Contains(";") Then Hint("游戏路径中不能含有感叹号或分号：" & TargetFolder, HintType.Red) : Throw New OperationCanceledException
             '获取整合包种类与关键 Json
             Dim PackType As Integer = -1
             Try
@@ -39,7 +45,7 @@
                 If Archive.GetEntry("mmc-pack.json") IsNot Nothing Then PackType = 2 : Exit Try 'MMC 整合包（优先于 manifest.json 判断，#4194）
                 If Archive.GetEntry("modrinth.index.json") IsNot Nothing Then PackType = 4 : Exit Try 'Modrinth 整合包
                 If Archive.GetEntry("manifest.json") IsNot Nothing Then
-                    Dim Json As JObject = GetJson(Archive.GetEntry("manifest.json").Open().ReadString(Encoding.UTF8))
+                    Dim Json As JObject = Archive.GetEntry("manifest.json").Open().ReadString(Encoding.UTF8).DeserializeJson()
                     If Json("addons") Is Nothing Then
                         PackType = 0 : Exit Try 'CurseForge 整合包
                     Else
@@ -59,7 +65,7 @@
                     If PathSplits(1) = "mmc-pack.json" Then PackType = 2 : Exit Try 'MMC 整合包（优先于 manifest.json 判断，#4194）
                     If PathSplits(1) = "modrinth.index.json" Then PackType = 4 : Exit Try 'Modrinth 整合包
                     If PathSplits(1) = "manifest.json" Then
-                        Dim Json As JObject = GetJson(Entry.Open().ReadString(Encoding.UTF8))
+                        Dim Json As JObject = Entry.Open().ReadString(Encoding.UTF8).DeserializeJson()
                         If Json("addons") Is Nothing Then
                             PackType = 0 : Exit Try 'CurseForge 整合包
                         Else
@@ -72,13 +78,14 @@
             Catch ex As Exception
                 If ex.GetDisplay(True).Contains("Error.WinIOError") Then
                     Throw New Exception("打开整合包文件失败", ex)
-                ElseIf File.EndsWithF(".rar", True) Then
+                ElseIf PathUtils.GetExtension(File) = "rar" Then
                     Throw New Exception("PCL 无法处理 rar 格式的压缩包，请在解压后重新压缩为 zip 格式再试", ex)
                 Else
                     Throw New Exception("打开整合包文件失败，文件可能损坏或为不支持的压缩包格式", ex)
                 End If
             End Try
             '执行对应的安装方法
+            If RestrictMcDownload Then Throw New Exception("为遵守相关法律法规，PCL 暂时不再提供 MC 下载功能，非常抱歉 qwq……")
             Select Case PackType
                 Case 0
                     Logger.Info("整合包种类：CurseForge")
@@ -107,37 +114,18 @@
         End Try
     End Function
 
-    Private Sub ExtractModpackFiles(InstallTemp As String, FileAddress As String, Loader As LoaderBase, ProgressIncrement As Double)
-        '解压文件
-        Dim RetryCount As Integer = 1
-        Dim InitialProgress = Loader.Progress
-Retry:
-        Try
-            Loader.Progress = InitialProgress
-            DirectoryUtils.Delete(InstallTemp)
-            Dim RawProgress As Double = Loader.Progress
-            FileUtils.ExtractToDirectory(FileAddress, InstallTemp, progressHandler:=Sub(Percentage) Loader.Progress = RawProgress + Percentage * ProgressIncrement)
-        Catch ex As Exception
-            Logger.Warn(ex, $"第 {RetryCount} 次解压尝试失败")
-            '完全不知道为啥会出现文件正在被另一进程使用的问题，总之加个重试
-            If RetryCount < 5 Then
-                Thread.Sleep(RetryCount * 2000)
-                If Loader IsNot Nothing AndAlso Loader.LoadingState <> MyLoading.MyLoadingState.Run Then Return
-                RetryCount += 1
-                GoTo Retry
-            Else
-                Throw New Exception("解压整合包文件失败", ex)
-            End If
-        End Try
-        Loader.Progress = InitialProgress + ProgressIncrement
+    Private Sub ExtractModpackFiles(InstallTemp As String, FileAddress As String, Optional c As CancellationToken = Nothing, Optional p As ProgressProvider = Nothing)
+        DirectoryUtils.Delete(InstallTemp)
+        c.ThrowIfCancellationRequested()
+        FileUtils.ExtractToDirectory(FileAddress, InstallTemp, c, p)
     End Sub
     ''' <summary>
     ''' 从整合包的 override 目录复制文件，同时设置 PCL 的配置文件与版本隔离。
     ''' 对路径末尾是否为 \ 没有要求。
     ''' </summary>
     Private Sub CopyOverrideDirectory(OverridesFolder As String, VersionFolder As String, Loader As LoaderBase)
-        If Not OverridesFolder.EndsWithF("\") Then OverridesFolder += "\"
-        If Not VersionFolder.EndsWithF("\") Then VersionFolder += "\"
+        OverridesFolder = PathUtils.AddSlashSuffix(OverridesFolder)
+        VersionFolder = PathUtils.AddSlashSuffix(VersionFolder)
         '复制文件
         If DirectoryUtils.Exists(OverridesFolder) Then
             Logger.Info($"处理整合包覆写文件夹：{OverridesFolder} → {VersionFolder}")
@@ -163,22 +151,21 @@ Retry:
     ''' 弹窗提示整合包中存在不兼容的加载器。
     ''' 如果取消，则抛出 CancelledException。
     ''' </summary>
-    ''' <exception cref="CancelledException" />
     Private Sub NotifyIncompatibleLoader(LoaderName As String)
         If MyMsgBox($"整合包中存在不兼容的加载器：{LoaderName}{vbCrLf}如果你知道如何手动安装它，可以先选择跳过，然后在整合包下载结束后手动安装。",
-            "不兼容的加载器", "取消", $"不安装 {LoaderName} 并继续") = 1 Then Throw New CancelledException
+            "不兼容的加载器", "取消", $"不安装 {LoaderName} 并继续") = 1 Then Throw New OperationCanceledException
     End Sub
 
 #Region "不同类型整合包的安装方法"
 
     'CurseForge
-    Private Function InstallPackCurseForge(FileAddress As String, Archive As Compression.ZipArchive, ArchiveBaseFolder As String,
+    Private Function InstallPackCurseForge(FileAddress As String, Archive As ZipArchive, ArchiveBaseFolder As String,
                                            Optional InstanceName As String = Nothing, Optional Logo As String = Nothing) As LoaderCombo(Of String)
 
         '读取 Json 文件
         Dim Json As JObject
         Try
-            Json = GetJson(Archive.GetEntry(ArchiveBaseFolder & "manifest.json").Open().ReadString)
+            Json = Archive.GetEntry(ArchiveBaseFolder & "manifest.json").Open().ReadString().DeserializeJson()
         Catch ex As Exception
             Throw New Exception("CurseForge 整合包安装信息存在问题", ex)
         End Try
@@ -189,30 +176,29 @@ Retry:
             InstanceName = If(Json("name"), "")
             Dim Validate As New ValidateFolderName(McFolderSelected & "versions")
             If Validate.Validate(InstanceName) <> "" Then InstanceName = ""
-            If InstanceName = "" Then InstanceName = MyMsgBoxInput("输入版本名称", "", "", New ObjectModel.Collection(Of Validate) From {Validate})
-            If String.IsNullOrEmpty(InstanceName) Then Throw New CancelledException
+            If InstanceName = "" Then InstanceName = MyMsgBoxInput("输入版本名称", "", "", New Collection(Of Validate) From {Validate})
+            If String.IsNullOrEmpty(InstanceName) Then Throw New OperationCanceledException
         End If
+        Dim VersionFolder As String = PathUtils.AddSlashSuffix(Path.Combine(McFolderSelected, "versions", InstanceName) & "\")
 
         '获取 Mod API 版本信息
-        Dim TargetVersion As New McVersion
-        TargetVersion.VanillaName = Json("minecraft")("version").ToString
+        Dim TargetVersion As New McVersion(Json("minecraft")("version").ToString)
         For Each Entry In If(Json("minecraft")("modLoaders"), {})
             Dim Id As String = If(Entry("id"), "").ToString.Lower
             If Id.StartsWithF("forge-") Then
                 'Forge 指定
                 If Id.Contains("recommended") Then Throw New Exception("该整合包版本过老，已不支持进行安装！")
                 Logger.Info($"整合包 Forge 版本：{Id}")
-                TargetVersion.Forge = Id.Replace("forge-", "")
+                TargetVersion.ModLoaderVersions(ModLoaders.Forge) = Id.Replace("forge-", "")
             ElseIf Id.StartsWithF("neoforge-") Then
                 'NeoForge 指定
                 Logger.Info($"整合包 NeoForge 版本：{Id}")
-                TargetVersion.NeoForge = Id.Replace("neoforge-", "")
+                TargetVersion.ModLoaderVersions(ModLoaders.NeoForge) = Id.Replace("neoforge-", "")
             ElseIf Id.StartsWithF("fabric-") Then
                 'Fabric 指定
                 Logger.Info($"整合包 Fabric 版本：{Id}")
-                TargetVersion.Fabric = Id.Replace("fabric-", "")
+                TargetVersion.ModLoaderVersions(ModLoaders.Fabric) = Id.Replace("fabric-", "")
             Else
-                'ElseIf Id.StartsWithF("quilt-") Then
                 NotifyIncompatibleLoader(Id)
             End If
         Next
@@ -221,12 +207,12 @@ Retry:
         Dim InstallLoaders As New List(Of LoaderBase)
         Dim OverrideHome As String = If(Json("overrides"), "")
         If OverrideHome <> "" Then
+            Dim OverridesFolder As String = InstallTemp & ArchiveBaseFolder & If(OverrideHome = "." OrElse OverrideHome = "./", "", OverrideHome) '#5613
+            If Not PathUtils.IsParentOf(InstallTemp, OverridesFolder) Then Throw New Exception("整合包的 overrides 路径超出了解压目录，请向整合包作者反馈此问题！")
             InstallLoaders.Add(New LoaderTask(Of String, Integer)("解压整合包文件",
             Sub(Task As LoaderTask(Of String, Integer))
-                ExtractModpackFiles(InstallTemp, FileAddress, Task, 0.6)
-                CopyOverrideDirectory(
-                    InstallTemp & ArchiveBaseFolder & If(OverrideHome = "." OrElse OverrideHome = "./", "", OverrideHome), '#5613
-                    $"{McFolderSelected}versions\{InstanceName}", Task)
+                ExtractModpackFiles(InstallTemp, FileAddress, Task.CreateCancellationToken(), Task.CreateSyncProgressProvider(ToPercentage:=0.6))
+                CopyOverrideDirectory(OverridesFolder, VersionFolder, Task)
             End Sub) With {
             .ProgressWeight = FileUtils.GetInfo(FileAddress).Length / 1024 / 1024 / 6, .Block = False}) '每 6M 需要 1s
         End If
@@ -272,9 +258,9 @@ Retry:
                         MissingDesc.Add($"{Project.TranslatedName} (文件 ID {Missing.FileId})")
                     End If
                 Next
-                If MyMsgBox($"未找到该整合包所需的以下内容，它们可能已被原作者删除：{vbCrLf}- {MissingDesc.Join(vbCrLf & "- ")}{vbCrLf}{vbCrLf}是否继续安装？缺失这些内容可能导致整合包出现异常！",
+                If MyMsgBox($"未找到该整合包所需的以下内容，它们可能已被原作者删除：{vbCrLf}- {MissingDesc.Join(vbCrLf + "- ")}{vbCrLf}{vbCrLf}是否继续安装？缺失这些内容可能导致整合包出现异常！",
                     "整合包内容缺失", "继续", "取消", IsWarn:=True) = 2 Then
-                    Task.Interrupt()
+                    Task.Cancel()
                 End If
             End Sub) With {.ProgressWeight = ModList.Count / 10}) '每 10 Mod 需要 1s
             '构造 NetFile
@@ -295,13 +281,15 @@ Retry:
                     Dim TargetFolder As String, Type As ResourceTypes
                     If ModJson("modules").Any Then 'modules 可能返回 null（#1006）
                         Dim ModuleNames = CType(ModJson("modules"), JArray).Select(Function(l) l("name").ToString).ToList
-                        If ModuleNames.Contains("META-INF") OrElse ModuleNames.Contains("mcmod.info") OrElse
-                           ModJson?("FileName")?.ToString.EndsWithF(".jar", True) Then
+                        If ModuleNames.Contains("META-INF") OrElse ModuleNames.Contains("mcmod.info") OrElse ModuleNames.Contains("fabric.mod.json") OrElse
+                            ModJson?("FileName")?.ToString.EndsWithF(".jar", True) Then
                             TargetFolder = "mods" : Type = ResourceTypes.Mod
                         ElseIf ModuleNames.Contains("pack.mcmeta") Then
                             TargetFolder = "resourcepacks" : Type = ResourceTypes.ResourcePack
-                        Else
+                        ElseIf ModuleNames.Contains("shaders") Then
                             TargetFolder = "shaderpacks" : Type = ResourceTypes.Shader
+                        Else
+                            TargetFolder = "saves" : Type = ResourceTypes.Map
                         End If
                     Else
                         TargetFolder = "mods" : Type = ResourceTypes.Mod
@@ -310,7 +298,7 @@ Retry:
                     Dim File = ResourceVersion.FromPlatformJson(ModJson, Type)
                     If Not File.DownloadAvailable Then Continue For
                     '实际的添加
-                    FileList.Add(Id, File.ToNetFile($"{McFolderSelected}versions\{InstanceName}\{TargetFolder}\",
+                    FileList.Add(Id, File.ToNetFile(PathUtils.AddSlashSuffix(Path.Combine(VersionFolder, TargetFolder)),
                         ResourceVersion.DownloadReason.ModPack, TargetVersion.VanillaName, TargetVersion.ModLoaders))
                     Task.Progress += 1 / (1 + ModList.Count)
                 Next
@@ -324,15 +312,9 @@ Retry:
         End If
 
         '构造加载器
-        Dim Request As New McInstallRequest With {
-            .NewInstanceName = InstanceName,
-            .VersionFolder = $"{McFolderSelected}versions\{InstanceName}\",
-            .MinecraftName = TargetVersion.VanillaName,
-            .ForgeVersion = TargetVersion.Forge,
-            .NeoForgeVersion = TargetVersion.NeoForge,
-            .FabricVersion = TargetVersion.Fabric
-        }
-        Dim MergeLoaders As List(Of LoaderBase) = McInstallLoader(Request)
+        Dim Target As New McComponents(TargetVersion.VanillaName, TargetVersion.ModLoaderVersions)
+        Dim MergeLoaders = McInstallLoadersGet(New McInstallRequest With {
+            .NewInstanceName = InstanceName, .InstanceFolder = VersionFolder, .Components = Target})
         '构造总加载器
         Dim Loaders As New List(Of LoaderBase)
         Loaders.Add(New LoaderCombo(Of String)("整合包安装", InstallLoaders) With {.Show = False, .Block = False, .ProgressWeight = InstallLoaders.Sum(Function(l) l.ProgressWeight)})
@@ -340,18 +322,23 @@ Retry:
         Loaders.Add(New LoaderTask(Of String, String)("最终整理文件",
         Sub(Task As LoaderTask(Of String, String))
             '设置图标
-            Dim VersionFolder As String = $"{McFolderSelected}versions\{InstanceName}\"
             If Logo IsNot Nothing AndAlso FileUtils.Exists(Logo) Then
                 FileUtils.Copy(Logo, VersionFolder & "PCL\Logo.png")
                 WriteIni(VersionFolder & "PCL\Setup.ini", "Logo", "PCL\Logo.png")
                 WriteIni(VersionFolder & "PCL\Setup.ini", "LogoCustom", "True")
                 Logger.Info($"已设置整合包 Logo：{Logo}")
             End If
+            '解压地图文件
+            Dim SaveFolder As String = $"{VersionFolder}saves\"
+            For Each MapFile In DirectoryUtils.EnumerateFiles(SaveFolder, searchPattern:="*.zip")
+                FileUtils.ExtractToDirectory(MapFile, SaveFolder, Task.CreateCancellationToken())
+                FileUtils.Delete(MapFile)
+            Next
             '删除原始整合包文件
-            For Each Target As String In {VersionFolder & "原始整合包.zip", VersionFolder & "原始整合包.mrpack"}
-                If FileUtils.Exists(Target) Then
-                    Logger.Info($"删除原始整合包文件：{Target}")
-                    FileUtils.Delete(Target)
+            For Each FileToDelete As String In {VersionFolder & "原始整合包.zip", VersionFolder & "原始整合包.mrpack"}
+                If FileUtils.Exists(FileToDelete) Then
+                    Logger.Info($"删除原始整合包文件：{FileToDelete}")
+                    FileUtils.Delete(FileToDelete)
                 End If
             Next
             If FileUtils.Exists(FileAddress) AndAlso PathUtils.GetFileNameWithoutExtension(FileAddress) = "modpack" Then
@@ -364,46 +351,45 @@ Retry:
         Dim LoaderName As String = "CurseForge 整合包安装：" & InstanceName & " "
         If LoaderTaskbar.Any(Function(l) l.Name = LoaderName) Then
             Hint("该整合包正在安装中！", HintType.Red)
-            Throw New CancelledException
+            Throw New OperationCanceledException
         End If
 
         '启动
         Dim Loader As New LoaderCombo(Of String)(LoaderName, Loaders) With {.OnStateChanged = AddressOf McInstallState}
-        Loader.Start(Request.VersionFolder)
+        Loader.Start(VersionFolder)
         LoaderTaskbarAdd(Loader)
         FrmMain.BtnExtraDownload.ShowRefresh()
-        RunInUi(Sub() FrmMain.PageChange(FormMain.PageType.DownloadManager))
         Return Loader
     End Function
 
     'Modrinth
-    Private Function InstallPackModrinth(FileAddress As String, Archive As Compression.ZipArchive, ArchiveBaseFolder As String, Optional InstanceName As String = Nothing, Optional Logo As String = Nothing) As LoaderCombo(Of String)
+    Private Function InstallPackModrinth(FileAddress As String, Archive As ZipArchive, ArchiveBaseFolder As String, Optional InstanceName As String = Nothing, Optional Logo As String = Nothing) As LoaderCombo(Of String)
 
         '读取 Json 文件
         Dim Json As JObject
         Try
-            Json = GetJson(Archive.GetEntry(ArchiveBaseFolder & "modrinth.index.json").Open().ReadString)
+            Json = Archive.GetEntry(ArchiveBaseFolder & "modrinth.index.json").Open().ReadString().DeserializeJson()
         Catch ex As Exception
             Throw New Exception("Modrinth 整合包安装信息存在问题", ex)
         End Try
         If Json("dependencies") Is Nothing OrElse Json("dependencies")("minecraft") Is Nothing Then Throw New Exception("Modrinth 整合包未提供 Minecraft 版本信息")
         '获取 Mod API 版本信息
-        Dim TargetVersion As New McVersion
+        'TODO: 改为使用类似 InstallPackMMC 中，一个版本名一个字典的方式来存储它，不要用 Unknown
+        Dim TargetVersion As New McVersion("Unknown")
         For Each Entry As JProperty In If(Json("dependencies"), {})
             Select Case Entry.Name.Lower
                 Case "minecraft"
                     TargetVersion.VanillaName = Entry.Value.ToString
                 Case "forge" 'eg. 14.23.5.2859 / 1.19-41.1.0
-                    TargetVersion.Forge = Entry.Value.ToString
-                    Logger.Info($"整合包 Forge 版本：{TargetVersion.Forge}")
+                    TargetVersion.ModLoaderVersions(ModLoaders.Forge) = Entry.Value.ToString
+                    Logger.Info($"整合包 Forge 版本：{TargetVersion.ModLoaderVersions(ModLoaders.Forge)}")
                 Case "neoforge", "neo-forge" 'eg. 20.6.98-beta
-                    TargetVersion.NeoForge = Entry.Value.ToString
-                    Logger.Info($"整合包 NeoForge 版本：{TargetVersion.NeoForge}")
+                    TargetVersion.ModLoaderVersions(ModLoaders.NeoForge) = Entry.Value.ToString
+                    Logger.Info($"整合包 NeoForge 版本：{TargetVersion.ModLoaderVersions(ModLoaders.NeoForge)}")
                 Case "fabric-loader" 'eg. 0.14.14
-                    TargetVersion.Fabric = Entry.Value.ToString
-                    Logger.Info($"整合包 Fabric 版本：{TargetVersion.Fabric}")
+                    TargetVersion.ModLoaderVersions(ModLoaders.Fabric) = Entry.Value.ToString
+                    Logger.Info($"整合包 Fabric 版本：{TargetVersion.ModLoaderVersions(ModLoaders.Fabric)}")
                 Case Else
-                    'Case "quilt-loader" 'eg. 1.0.0
                     NotifyIncompatibleLoader(Entry.Name)
             End Select
         Next
@@ -412,21 +398,18 @@ Retry:
             InstanceName = If(Json("name"), "")
             Dim Validate As New ValidateFolderName(McFolderSelected & "versions")
             If Validate.Validate(InstanceName) <> "" Then InstanceName = ""
-            If InstanceName = "" Then InstanceName = MyMsgBoxInput("输入版本名称", "", "", New ObjectModel.Collection(Of Validate) From {Validate})
-            If String.IsNullOrEmpty(InstanceName) Then Throw New CancelledException
+            If InstanceName = "" Then InstanceName = MyMsgBoxInput("输入版本名称", "", "", New Collection(Of Validate) From {Validate})
+            If String.IsNullOrEmpty(InstanceName) Then Throw New OperationCanceledException
         End If
+        Dim VersionFolder As String = Path.Combine(McFolderSelected, "versions", InstanceName) & "\"
         '解压
         Dim InstallTemp As String = RequestTaskTempFolder()
         Dim InstallLoaders As New List(Of LoaderBase)
         InstallLoaders.Add(New LoaderTask(Of String, Integer)("解压整合包文件",
         Sub(Task As LoaderTask(Of String, Integer))
-            ExtractModpackFiles(InstallTemp, FileAddress, Task, 0.5)
-            CopyOverrideDirectory(
-                InstallTemp & ArchiveBaseFolder & "overrides",
-                McFolderSelected & "versions\" & InstanceName, Task)
-            CopyOverrideDirectory(
-                InstallTemp & ArchiveBaseFolder & "client-overrides",
-                McFolderSelected & "versions\" & InstanceName, Task)
+            ExtractModpackFiles(InstallTemp, FileAddress, Task.CreateCancellationToken(), Task.CreateSyncProgressProvider(ToPercentage:=0.5))
+            CopyOverrideDirectory(InstallTemp & ArchiveBaseFolder & "overrides", VersionFolder, Task)
+            CopyOverrideDirectory(InstallTemp & ArchiveBaseFolder & "client-overrides", VersionFolder, Task)
         End Sub) With {.ProgressWeight = FileUtils.GetInfo(FileAddress).Length / 1024 / 1024 / 6, .Block = False}) '每 6M 需要 1s
         '获取下载文件列表
         Dim FileList As New List(Of NetFile)
@@ -449,28 +432,23 @@ Retry:
             Urls = ResourceVersion.ParseModrinthTrackArguments(Urls,
                 ResourceVersion.DownloadReason.ModPack, TargetVersion.VanillaName, TargetVersion.ModLoaders).ToList 'Modrinth 来源追踪信息
             Urls = Urls.Distinct.ToList()
-            Dim TargetPath As String = $"{McFolderSelected}versions\{InstanceName}\{File("path")}"
-            If Not Path.GetFullPath(TargetPath).StartsWithF(Path.GetFullPath($"{McFolderSelected}versions\{InstanceName}\")) Then
+            Dim TargetPath As String = Path.Combine(VersionFolder, File("path").ToString().TrimStart(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar))
+            If Not PathUtils.IsParentOf(VersionFolder, TargetPath) Then
                 MyMsgBox($"整合包的文件路径超出了版本文件夹，请向整合包作者反馈此问题！{vbCrLf}目标：{Path.GetFullPath(TargetPath)}{vbCrLf}错误的文件：{TargetPath}", "文件路径校验失败", IsWarn:=True)
-                Throw New CancelledException
+                Throw New OperationCanceledException
             End If
             FileList.Add(New NetFile(Urls, TargetPath,
-                New FileChecker(ActualSize:=File("fileSize").ToObject(Of Long), Hash:=File("hashes")("sha1").ToString), True))
+                New FileChecker With {.Hash = File("hashes")("sha1").ToString}, True)) 'Modrinth 整合包不应校验文件大小（他们官方自己说的）
         Next
         If FileList.Any Then
             InstallLoaders.Add(New LoaderDownload("下载额外文件", FileList) With {.ProgressWeight = FileList.Count * 1.5}) '每个 Mod 需要 1.5s
         End If
 
         '构造加载器
-        Dim Request As New McInstallRequest With {
-            .NewInstanceName = InstanceName,
-            .VersionFolder = $"{McFolderSelected}versions\{InstanceName}\",
-            .MinecraftName = TargetVersion.VanillaName,
-            .ForgeVersion = TargetVersion.Forge,
-            .NeoForgeVersion = TargetVersion.NeoForge,
-            .FabricVersion = TargetVersion.Fabric
-        }
-        Dim MergeLoaders As List(Of LoaderBase) = McInstallLoader(Request)
+        Dim Target As New McComponents(TargetVersion.VanillaName, TargetVersion.ModLoaderVersions)
+        Dim MergeLoaders = McInstallLoadersGet(New McInstallRequest With {
+            .NewInstanceName = InstanceName, .InstanceFolder = VersionFolder,
+            .Components = Target})
         '构造总加载器
         Dim Loaders As New List(Of LoaderBase)
         Loaders.Add(New LoaderCombo(Of String)("整合包安装", InstallLoaders) With {.Show = False, .Block = False, .ProgressWeight = InstallLoaders.Sum(Function(l) l.ProgressWeight)})
@@ -478,7 +456,6 @@ Retry:
         Loaders.Add(New LoaderTask(Of String, String)("最终整理文件",
         Sub(Task As LoaderTask(Of String, String))
             '设置图标
-            Dim VersionFolder As String = $"{McFolderSelected}versions\{InstanceName}\"
             If Logo IsNot Nothing AndAlso FileUtils.Exists(Logo) Then
                 FileUtils.Copy(Logo, VersionFolder & "PCL\Logo.png")
                 WriteIni(VersionFolder & "PCL\Setup.ini", "Logo", "PCL\Logo.png")
@@ -486,10 +463,10 @@ Retry:
                 Logger.Info($"已设置整合包 Logo：{Logo}")
             End If
             '删除原始整合包文件
-            For Each Target As String In {VersionFolder & "原始整合包.zip", VersionFolder & "原始整合包.mrpack"}
-                If FileUtils.Exists(Target) Then
-                    Logger.Info($"删除原始整合包文件：{Target}")
-                    FileUtils.Delete(Target)
+            For Each FileToDelete As String In {VersionFolder & "原始整合包.zip", VersionFolder & "原始整合包.mrpack"}
+                If FileUtils.Exists(FileToDelete) Then
+                    Logger.Info($"删除原始整合包文件：{FileToDelete}")
+                    FileUtils.Delete(FileToDelete)
                 End If
             Next
             If FileUtils.Exists(FileAddress) AndAlso PathUtils.GetFileNameWithoutExtension(FileAddress) = "modpack" Then
@@ -502,24 +479,23 @@ Retry:
         Dim LoaderName As String = $"Modrinth 整合包安装：{InstanceName} "
         If LoaderTaskbar.Any(Function(l) l.Name = LoaderName) Then
             Hint("该整合包正在安装中！", HintType.Red)
-            Throw New CancelledException
+            Throw New OperationCanceledException
         End If
 
         '启动
         Dim Loader As New LoaderCombo(Of String)(LoaderName, Loaders) With {.OnStateChanged = AddressOf McInstallState}
-        Loader.Start(Request.VersionFolder)
+        Loader.Start(VersionFolder)
         LoaderTaskbarAdd(Loader)
         FrmMain.BtnExtraDownload.ShowRefresh()
-        RunInUi(Sub() FrmMain.PageChange(FormMain.PageType.DownloadManager))
         Return Loader
     End Function
 
     'HMCL
-    Private Function InstallPackHMCL(FileAddress As String, Archive As Compression.ZipArchive, ArchiveBaseFolder As String) As LoaderCombo(Of String)
+    Private Function InstallPackHMCL(FileAddress As String, Archive As ZipArchive, ArchiveBaseFolder As String) As LoaderCombo(Of String)
         '读取 Json 文件
         Dim Json As JObject
         Try
-            Json = GetJson(Archive.GetEntry(ArchiveBaseFolder & "modpack.json").Open().ReadString(Encoding.UTF8))
+            Json = Archive.GetEntry(ArchiveBaseFolder & "modpack.json").Open().ReadString(Encoding.UTF8).DeserializeJson()
         Catch ex As Exception
             Throw New Exception("HMCL 整合包安装信息存在问题", ex)
         End Try
@@ -527,26 +503,23 @@ Retry:
         Dim InstanceName As String = If(Json("name"), "")
         Dim Validate As New ValidateFolderName(McFolderSelected & "versions")
         If Validate.Validate(InstanceName) <> "" Then InstanceName = ""
-        If InstanceName = "" Then InstanceName = MyMsgBoxInput("输入版本名称", "", "", New ObjectModel.Collection(Of Validate) From {Validate})
-        If String.IsNullOrEmpty(InstanceName) Then Throw New CancelledException
+        If InstanceName = "" Then InstanceName = MyMsgBoxInput("输入版本名称", "", "", New Collection(Of Validate) From {Validate})
+        If String.IsNullOrEmpty(InstanceName) Then Throw New OperationCanceledException
+        Dim VersionFolder As String = Path.Combine(McFolderSelected, "versions", InstanceName) & "\"
         '解压
         Dim InstallTemp As String = RequestTaskTempFolder()
         Dim InstallLoaders As New List(Of LoaderBase)
         InstallLoaders.Add(New LoaderTask(Of String, Integer)("解压整合包文件",
         Sub(Task As LoaderTask(Of String, Integer))
-            ExtractModpackFiles(InstallTemp, FileAddress, Task, 0.6)
-            CopyOverrideDirectory(
-                InstallTemp & ArchiveBaseFolder & "minecraft",
-                McFolderSelected & "versions\" & InstanceName, Task)
+            ExtractModpackFiles(InstallTemp, FileAddress, Task.CreateCancellationToken(), Task.CreateSyncProgressProvider(ToPercentage:=0.6))
+            CopyOverrideDirectory(InstallTemp & ArchiveBaseFolder & "minecraft", VersionFolder, Task)
         End Sub) With {.ProgressWeight = FileUtils.GetInfo(FileAddress).Length / 1024 / 1024 / 6, .Block = False}) '每 6M 需要 1s
         '构造游戏本体安装加载器
         If Json("gameVersion") Is Nothing Then Throw New Exception("该 HMCL 整合包未提供游戏版本信息，无法安装！")
-        Dim Request As New McInstallRequest With {
-            .NewInstanceName = InstanceName,
-            .VersionFolder = $"{McFolderSelected}versions\{InstanceName}\",
-            .MinecraftName = Json("gameVersion").ToString
-        }
-        Dim MergeLoaders As List(Of LoaderBase) = McInstallLoader(Request)
+        Dim Target As New McComponents(Json("gameVersion").ToString, New Dictionary(Of ModLoaders, String))
+        Dim MergeLoaders = McInstallLoadersGet(New McInstallRequest With {
+            .NewInstanceName = InstanceName, .InstanceFolder = VersionFolder,
+            .Components = Target})
         '构造总加载器
         Dim Loaders As New List(Of LoaderBase) From {
             New LoaderCombo(Of String)("整合包安装", InstallLoaders) With {.Show = False, .Block = False, .ProgressWeight = InstallLoaders.Sum(Function(l) l.ProgressWeight)},
@@ -556,23 +529,22 @@ Retry:
         Dim LoaderName As String = "HMCL 整合包安装：" & InstanceName & " "
         If LoaderTaskbar.Any(Function(l) l.Name = LoaderName) Then
             Hint("该整合包正在安装中！", HintType.Red)
-            Throw New CancelledException
+            Throw New OperationCanceledException
         End If
         '启动
         Dim Loader As New LoaderCombo(Of String)(LoaderName, Loaders) With {.OnStateChanged = AddressOf McInstallState}
-        Loader.Start(Request.VersionFolder)
+        Loader.Start(VersionFolder)
         LoaderTaskbarAdd(Loader)
         FrmMain.BtnExtraDownload.ShowRefresh()
-        RunInUi(Sub() FrmMain.PageChange(FormMain.PageType.DownloadManager))
         Return Loader
     End Function
 
     'MMC
-    Private Function InstallPackMMC(FileAddress As String, Archive As Compression.ZipArchive, ArchiveBaseFolder As String) As LoaderCombo(Of String)
+    Private Function InstallPackMMC(FileAddress As String, Archive As ZipArchive, ArchiveBaseFolder As String) As LoaderCombo(Of String)
         '读取 Json 文件
         Dim PackJson As JObject, PackInstance As String
         Try
-            PackJson = GetJson(Archive.GetEntry(ArchiveBaseFolder & "mmc-pack.json").Open().ReadString(Encoding.UTF8))
+            PackJson = Archive.GetEntry(ArchiveBaseFolder & "mmc-pack.json").Open().ReadString(Encoding.UTF8).DeserializeJson()
             PackInstance = Archive.GetEntry(ArchiveBaseFolder & "instance.cfg").Open().ReadString(Encoding.UTF8)
         Catch ex As Exception
             Throw New Exception("MMC 整合包安装信息存在问题", ex)
@@ -581,18 +553,24 @@ Retry:
         Dim InstanceName As String = If(PackInstance.RegexSeek("(?<=\nname\=)[^\n]+"), "")
         Dim Validate As New ValidateFolderName(McFolderSelected & "versions")
         If Validate.Validate(InstanceName) <> "" Then InstanceName = ""
-        If InstanceName = "" Then InstanceName = MyMsgBoxInput("输入版本名称", "", "", New ObjectModel.Collection(Of Validate) From {Validate})
-        If String.IsNullOrEmpty(InstanceName) Then Throw New CancelledException
+        If InstanceName = "" Then InstanceName = MyMsgBoxInput("输入版本名称", "", "", New Collection(Of Validate) From {Validate})
+        If String.IsNullOrEmpty(InstanceName) Then Throw New OperationCanceledException
+        Dim VersionFolder As String = Path.Combine(McFolderSelected, "versions", InstanceName) & "\"
         '解压
         Dim InstallTemp As String = RequestTaskTempFolder()
-        Dim SetupFile As String = $"{McFolderSelected}versions\{InstanceName}\PCL\Setup.ini"
+        Dim SetupFile As String = VersionFolder & "PCL\Setup.ini"
         Dim InstallLoaders As New List(Of LoaderBase)
         InstallLoaders.Add(New LoaderTask(Of String, Integer)("解压整合包文件",
         Sub(Task As LoaderTask(Of String, Integer))
-            ExtractModpackFiles(InstallTemp, FileAddress, Task, 0.55)
-            CopyOverrideDirectory(
-                InstallTemp & ArchiveBaseFolder & ".minecraft",
-                McFolderSelected & "versions\" & InstanceName, Task)
+            ExtractModpackFiles(InstallTemp, FileAddress, Task.CreateCancellationToken(), Task.CreateSyncProgressProvider(ToPercentage:=0.55))
+            'Prism 优先使用 minecraft/ 而非 .minecraft/（#9272）
+            Dim MmcGameRoot As String
+            If DirectoryUtils.Exists(InstallTemp & ArchiveBaseFolder & ".minecraft") AndAlso Not DirectoryUtils.Exists(InstallTemp & ArchiveBaseFolder & "minecraft") Then
+                MmcGameRoot = InstallTemp & ArchiveBaseFolder & ".minecraft"
+            Else
+                MmcGameRoot = InstallTemp & ArchiveBaseFolder & "minecraft"
+            End If
+            CopyOverrideDirectory(MmcGameRoot, VersionFolder, Task)
             '读取 MMC 设置文件（#2655）
             Try
                 Dim MmcSetupFile As String = InstallTemp & ArchiveBaseFolder & "instance.cfg"
@@ -609,7 +587,7 @@ Retry:
                         Dim PreLaunchCommand As String = ReadIni(MmcSetupFile, "PreLaunchCommand")
                         If PreLaunchCommand <> "" Then
                             PreLaunchCommand = PreLaunchCommand.Replace("\""", """").
-                                Replace("$INST_JAVA", "{java}javaw.exe").
+                                Replace("$INST_JAVA", "{java}java.exe").
                                 Replace("$INST_MC_DIR\", "{minecraft}").Replace("$INST_MC_DIR", "{minecraft}").
                                 Replace("$INST_DIR\", "{verpath}").Replace("$INST_DIR", "{verpath}").
                                 Replace("$INST_ID", "{name}").Replace("$INST_NAME", "{name}")
@@ -622,15 +600,11 @@ Retry:
                         WriteIni(SetupFile, "VersionServerEnter", ServerAddress)
                         Logger.Info($"迁移 MultiMC 版本独立设置：自动进入服务器：{ServerAddress}")
                     End If
-                    If ReadIni(MmcSetupFile, "IgnoreJavaCompatibility", False) Then
-                        WriteIni(SetupFile, "VersionAdvanceJava", True)
-                        Logger.Info("迁移 MultiMC 版本独立设置：忽略 Java 兼容性警告")
-                    End If
                     Dim Logo As String = ReadIni(MmcSetupFile, "iconKey", "")
                     If Logo <> "" AndAlso FileUtils.Exists($"{InstallTemp}{ArchiveBaseFolder}{Logo}.png") Then
                         WriteIni(SetupFile, "LogoCustom", True)
                         WriteIni(SetupFile, "Logo", "PCL\Logo.png")
-                        FileUtils.Copy($"{InstallTemp}{ArchiveBaseFolder}{Logo}.png", $"{McFolderSelected}versions\{InstanceName}\PCL\Logo.png")
+                        FileUtils.Copy($"{InstallTemp}{ArchiveBaseFolder}{Logo}.png", VersionFolder & "PCL\Logo.png")
                         Logger.Info($"迁移 MultiMC 版本独立设置：版本图标（{Logo}.png）")
                     End If
                     'JVM 参数
@@ -652,20 +626,20 @@ Retry:
         End Sub) With {.ProgressWeight = FileUtils.GetInfo(FileAddress).Length / 1024 / 1024 / 6, .Block = False}) '每 6M 需要 1s
         '构造版本安装请求
         If PackJson("components") Is Nothing Then Throw New Exception("该 MMC 整合包未提供游戏版本信息，无法安装！")
-        Dim Request As New McInstallRequest With {.NewInstanceName = InstanceName, .VersionFolder = $"{McFolderSelected}versions\{InstanceName}\"}
+        Dim MinecraftVersion As String = Nothing
+        Dim ModLoaderVersions As New Dictionary(Of ModLoaders, String)
         For Each Component As JObject In PackJson("components")
             If Not Component.ContainsKey("uid") Then Continue For
             Dim UID As String = Component("uid").ToString
             Select Case UID
                 Case "net.minecraft"
-                    Request.MinecraftName = Component("version")
+                    MinecraftVersion = Component("version")
                 Case "net.minecraftforge"
-                    Request.ForgeVersion = Component("version")
+                    ModLoaderVersions(ModLoaders.Forge) = Component("version")
                 Case "net.neoforged"
-                    Request.NeoForgeVersion = Component("version")
+                    ModLoaderVersions(ModLoaders.NeoForge) = Component("version")
                 Case "net.fabricmc.fabric-loader"
-                    Request.FabricVersion = Component("version")
-                    'Case "org.quiltmc.quilt-loader" 'eg. 1.0.0
+                    ModLoaderVersions(ModLoaders.Fabric) = Component("version")
                 Case Else
                     If UID.StartsWithF("org.lwjgl") Then '#8210
                         Logger.Info($"已跳过 LWJGL 项：{UID}")
@@ -675,7 +649,10 @@ Retry:
             End Select
         Next
         '构造加载器
-        Dim MergeLoaders As List(Of LoaderBase) = McInstallLoader(Request)
+        Dim Target As New McComponents(MinecraftVersion, ModLoaderVersions)
+        Dim MergeLoaders = McInstallLoadersGet(New McInstallRequest With {
+            .NewInstanceName = InstanceName, .InstanceFolder = VersionFolder,
+            .Components = Target})
         '构造总加载器
         Dim Loaders As New List(Of LoaderBase)
         Loaders.Add(New LoaderCombo(Of String)("整合包安装", InstallLoaders) With {.Show = False, .Block = False, .ProgressWeight = InstallLoaders.Sum(Function(l) l.ProgressWeight)})
@@ -685,26 +662,25 @@ Retry:
         Dim LoaderName As String = "MMC 整合包安装：" & InstanceName & " "
         If LoaderTaskbar.Any(Function(l) l.Name = LoaderName) Then
             Hint("该整合包正在安装中！", HintType.Red)
-            Throw New CancelledException
+            Throw New OperationCanceledException
         End If
 
         '启动
         Dim Loader As New LoaderCombo(Of String)(LoaderName, Loaders) With {.OnStateChanged = AddressOf McInstallState}
-        Loader.Start(Request.VersionFolder)
+        Loader.Start(VersionFolder)
         LoaderTaskbarAdd(Loader)
         FrmMain.BtnExtraDownload.ShowRefresh()
-        RunInUi(Sub() FrmMain.PageChange(FormMain.PageType.DownloadManager))
         Return Loader
     End Function
 
     'MCBBS
-    Private Function InstallPackMCBBS(FileAddress As String, Archive As Compression.ZipArchive, ArchiveBaseFolder As String,
+    Private Function InstallPackMCBBS(FileAddress As String, Archive As ZipArchive, ArchiveBaseFolder As String,
                                       Optional InstanceName As String = Nothing) As LoaderCombo(Of String)
         '读取 Json 文件
         Dim Json As JObject
         Try
             Dim Entry = If(Archive.GetEntry(ArchiveBaseFolder & "mcbbs.packmeta"), Archive.GetEntry(ArchiveBaseFolder & "manifest.json"))
-            Json = GetJson(Entry.Open().ReadString(Encoding.UTF8))
+            Json = Entry.Open().ReadString(Encoding.UTF8).DeserializeJson()
         Catch ex As Exception
             Throw New Exception("MCBBS 整合包安装信息存在问题", ex)
         End Try
@@ -713,19 +689,18 @@ Retry:
             InstanceName = If(Json("name"), "")
             Dim Validate As New ValidateFolderName(McFolderSelected & "versions")
             If Validate.Validate(InstanceName) <> "" Then InstanceName = ""
-            If InstanceName = "" Then InstanceName = MyMsgBoxInput("输入版本名称", "", "", New ObjectModel.Collection(Of Validate) From {Validate})
-            If String.IsNullOrEmpty(InstanceName) Then Throw New CancelledException
+            If InstanceName = "" Then InstanceName = MyMsgBoxInput("输入版本名称", "", "", New Collection(Of Validate) From {Validate})
+            If String.IsNullOrEmpty(InstanceName) Then Throw New OperationCanceledException
         End If
+        Dim VersionFolder As String = Path.Combine(McFolderSelected, "versions", InstanceName) & "\"
         '解压
         Dim InstallTemp As String = RequestTaskTempFolder()
-        Dim SetupFile As String = $"{McFolderSelected}versions\{InstanceName}\PCL\Setup.ini"
+        Dim SetupFile As String = VersionFolder & "PCL\Setup.ini"
         Dim InstallLoaders As New List(Of LoaderBase)
         InstallLoaders.Add(New LoaderTask(Of String, Integer)("解压整合包文件",
         Sub(Task As LoaderTask(Of String, Integer))
-            ExtractModpackFiles(InstallTemp, FileAddress, Task, 0.6)
-            CopyOverrideDirectory(
-                InstallTemp & ArchiveBaseFolder & "overrides",
-                McFolderSelected & "versions\" & InstanceName, Task)
+            ExtractModpackFiles(InstallTemp, FileAddress, Task.CreateCancellationToken(), Task.CreateSyncProgressProvider(ToPercentage:=0.6))
+            CopyOverrideDirectory(InstallTemp & ArchiveBaseFolder & "overrides", VersionFolder, Task)
             'JVM 参数
             If Json("launchInfo") IsNot Nothing Then
                 Dim LaunchInfo As JObject = Json("launchInfo")
@@ -741,19 +716,29 @@ Retry:
         Next
         If Not Addons.ContainsKey("game") Then Throw New Exception("该 MCBBS 整合包未提供游戏版本信息，无法安装！")
         If Addons.ContainsKey("quilt") Then
-            Hint("PCL 暂不支持安装需要 Quilt 的整合包！", HintType.Red)
-            Throw New CancelledException
+            Hint("PCL 不支持安装 Quilt 整合包！", HintType.Red)
+            Throw New OperationCanceledException
         End If
-        Dim Request As New McInstallRequest With {
-            .NewInstanceName = InstanceName,
-            .VersionFolder = $"{McFolderSelected}versions\{InstanceName}\",
-            .MinecraftName = Addons("game"),
-            .OptiFineVersion = If(Addons.ContainsKey("optifine"), Addons("optifine"), Nothing),
-            .ForgeVersion = If(Addons.ContainsKey("forge"), Addons("forge"), Nothing),
-            .NeoForgeVersion = If(Addons.ContainsKey("neoforge"), Addons("neoforge"), Nothing),
-            .FabricVersion = If(Addons.ContainsKey("fabric"), Addons("fabric"), Nothing)
-        }
-        Dim MergeLoaders As List(Of LoaderBase) = McInstallLoader(Request)
+        Dim ModLoaderVersions As New Dictionary(Of ModLoaders, String)
+        If Addons.ContainsKey("forge") Then ModLoaderVersions(ModLoaders.Forge) = Addons("forge")
+        If Addons.ContainsKey("neoforge") Then ModLoaderVersions(ModLoaders.NeoForge) = Addons("neoforge")
+        If Addons.ContainsKey("fabric") Then ModLoaderVersions(ModLoaders.Fabric) = Addons("fabric")
+        Dim OptiFineEntry As JObject = Nothing
+        If Addons.ContainsKey("optifine") Then
+            Dim MinecraftVersion = Addons("game")
+            If MinecraftVersion.EndsWithF(".0") Then MinecraftVersion = MinecraftVersion.Substring(0, MinecraftVersion.Length - 2)
+            Dim OptiFineFileSuffix = "_HD_" & Addons("optifine").AfterLast("HD_") & ".jar"
+            '从镜像源拉取 OptiFine 列表
+            If DlOptiFineListBmclapiLoader.State <> LoadState.Finished Then DlOptiFineListBmclapiLoader.WaitForExit()
+            Dim Entry = DlOptiFineListBmclapiLoader.Output.Value.FirstOrDefault(
+                Function(v) v.Inherit = MinecraftVersion AndAlso v.FileName.EndsWithF(OptiFineFileSuffix))
+            If Entry Is Nothing Then Throw New Exception($"OptiFine 列表中没有整合包所需的 OptiFine {Addons("optifine")}（Minecraft {Addons("game")}）")
+            OptiFineEntry = JObject.FromObject(Entry)
+        End If
+        Dim Target As New McComponents(Addons("game"), ModLoaderVersions, OptiFineEntry)
+        Dim MergeLoaders = McInstallLoadersGet(New McInstallRequest With {
+            .NewInstanceName = InstanceName, .InstanceFolder = VersionFolder,
+            .Components = Target})
         '构造总加载器
         Dim Loaders As New List(Of LoaderBase)
         Loaders.Add(New LoaderCombo(Of String)("整合包安装", InstallLoaders) With {.Show = False, .Block = False, .ProgressWeight = InstallLoaders.Sum(Function(l) l.ProgressWeight)})
@@ -763,36 +748,35 @@ Retry:
         Dim LoaderName As String = "MCBBS 整合包安装：" & InstanceName & " "
         If LoaderTaskbar.Any(Function(l) l.Name = LoaderName) Then
             Hint("该整合包正在安装中！", HintType.Red)
-            Throw New CancelledException
+            Throw New OperationCanceledException
         End If
 
         '启动
         Dim Loader As New LoaderCombo(Of String)(LoaderName, Loaders) With {.OnStateChanged = AddressOf McInstallState}
         'If Archive IsNot Nothing Then Archive.Dispose() '解除占用，以免在加载器中触发 “正由另一进程使用，因此该进程无法访问此文件”
-        Loader.Start(Request.VersionFolder)
+        Loader.Start(VersionFolder)
         LoaderTaskbarAdd(Loader)
         FrmMain.BtnExtraDownload.ShowRefresh()
-        RunInUi(Sub() FrmMain.PageChange(FormMain.PageType.DownloadManager))
         Return Loader
     End Function
 
     '带启动器的压缩包
-    Private Function InstallPackLauncherPack(FileAddress As String, Archive As Compression.ZipArchive, ArchiveBaseFolder As String) As LoaderCombo(Of String)
+    Private Function InstallPackLauncherPack(FileAddress As String, Archive As ZipArchive, ArchiveBaseFolder As String) As LoaderCombo(Of String)
         '获取解压路径
         MyMsgBox("接下来请选择一个空文件夹，它会被安装到这个文件夹里。", "安装", "继续", ForceWait:=True)
         Dim TargetFolder As String = Dialogs.SelectFolder("选择安装目标（必须是一个空文件夹）", False).FirstOrDefault
-        If TargetFolder Is Nothing Then Throw New CancelledException
-        If Not DirectoryUtils.IsEmpty(TargetFolder) Then Hint("请选择一个空文件夹作为安装目标！", HintType.Red) : Throw New CancelledException
+        If TargetFolder Is Nothing Then Throw New OperationCanceledException
+        If Not DirectoryUtils.IsEmpty(TargetFolder) Then Hint("请选择一个空文件夹作为安装目标！", HintType.Red) : Throw New OperationCanceledException
         '解压
         Dim Loader As New LoaderCombo(Of String)("解压压缩包", {
             New LoaderTask(Of String, Integer)("解压压缩包",
             Sub(Task As LoaderTask(Of String, Integer))
-                ExtractModpackFiles(TargetFolder, FileAddress, Task, 0.9)
+                ExtractModpackFiles(TargetFolder, FileAddress, Task.CreateCancellationToken(), Task.CreateSyncProgressProvider(ToPercentage:=0.9))
                 OpenExplorer(TargetFolder)
                 Thread.Sleep(400) '避免文件争用
                 '查找解压后的 exe 文件
                 Dim Launcher As String = Nothing
-                For Each ExeFile In DirectoryUtils.GetFiles(TargetFolder, True, "*.exe")
+                For Each ExeFile In DirectoryUtils.EnumerateFiles(TargetFolder, searchPattern:="*.exe")
                     Dim Info = FileVersionInfo.GetVersionInfo(ExeFile)
                     Logger.Info($"文件 {ExeFile} 的产品名标识为 {Info.ProductName}")
                     If Info.ProductName = "Plain Craft Launcher" Then
@@ -826,7 +810,7 @@ Retry:
                     TargetFolder & ".minecraft\" & ArchiveBaseFolder.Replace("/", "\").TrimStart("\"), '格式例如：包裹文件夹\.minecraft\（最短为空字符串）
                     InstanceName, False)
                 '调用 modpack 文件进行安装
-                Dim ModpackFile = DirectoryUtils.GetFiles(TargetFolder, "modpack.*").First
+                Dim ModpackFile = DirectoryUtils.EnumerateFiles(TargetFolder, True, "modpack.*").First
                 Logger.Info($"调用 modpack 文件继续安装：{ModpackFile}")
                 ModpackInstall(ModpackFile)
             End Sub)
@@ -839,10 +823,10 @@ Retry:
     End Function
 
     '普通压缩包
-    Private Function InstallPackCompress(FileAddress As String, Archive As Compression.ZipArchive) As LoaderCombo(Of String)
+    Private Function InstallPackCompress(FileAddress As String, Archive As ZipArchive) As LoaderCombo(Of String)
         '尝试定位 .minecraft 文件夹：寻找形如 “/versions/XXX/XXX.json” 的路径
-        Dim Match As RegularExpressions.Match = Nothing
-        Dim Regex As New RegularExpressions.Regex("^.*\/(?=versions\/(?<ver>[^\/]+)\/(\k<ver>)\.json$)", RegularExpressions.RegexOptions.IgnoreCase)
+        Dim Match As Match = Nothing
+        Dim Regex As New Regex("^.*\/(?=versions\/(?<ver>[^\/]+)\/(\k<ver>)\.json$)", RegexOptions.IgnoreCase)
         For Each Entry In Archive.Entries
             Dim EntryMatch = Regex.Match("/" & Entry.FullName)
             If EntryMatch.Success Then
@@ -856,14 +840,14 @@ Retry:
         '获取解压路径
         MyMsgBox("接下来请选择一个空文件夹，它会被安装到这个文件夹里。", "安装", "继续", ForceWait:=True)
         Dim TargetFolder As String = Dialogs.SelectFolder("选择安装目标（必须是一个空文件夹）", False).FirstOrDefault
-        If TargetFolder Is Nothing Then Throw New CancelledException
-        If TargetFolder.Contains("!") OrElse TargetFolder.Contains(";") Then Hint("Minecraft 文件夹路径中不能含有感叹号或分号！", HintType.Red) : Throw New CancelledException
-        If Not DirectoryUtils.IsEmpty(TargetFolder) Then Hint("请选择一个空文件夹作为安装目标！", HintType.Red) : Throw New CancelledException
+        If TargetFolder Is Nothing Then Throw New OperationCanceledException
+        If TargetFolder.Contains("!") OrElse TargetFolder.Contains(";") Then Hint("Minecraft 文件夹路径中不能含有感叹号或分号！", HintType.Red) : Throw New OperationCanceledException
+        If Not DirectoryUtils.IsEmpty(TargetFolder) Then Hint("请选择一个空文件夹作为安装目标！", HintType.Red) : Throw New OperationCanceledException
         '解压
         Dim Loader As New LoaderCombo(Of String)("解压压缩包", {
             New LoaderTask(Of String, Integer)("解压压缩包",
             Sub(Task As LoaderTask(Of String, Integer))
-                ExtractModpackFiles(TargetFolder, FileAddress, Task, 0.95)
+                ExtractModpackFiles(TargetFolder, FileAddress, Task.CreateCancellationToken(), Task.CreateSyncProgressProvider(ToPercentage:=0.95))
                 '加入文件夹列表
                 PageSelectLeft.AddFolder(TargetFolder & ArchiveBaseFolder, PathUtils.GetLastPart(TargetFolder), False)
                 Thread.Sleep(400) '避免文件争用

Plain Craft Launcher 2/Modules/Minecraft/ModWatcher.vb

@@ -1,4 +1,4 @@
-Public Module ModWatcher
+Public Module ModWatcher
 
     '对全体的监视
     Public McWatcherList As New List(Of Watcher)
@@ -8,7 +8,8 @@
         Dim IsRunning As Boolean = False
         Dim TriggerLauncherShutdown As Boolean = True
         For Each Watcher In McWatcherList
-            If Watcher.State = Watcher.MinecraftState.Loading OrElse Watcher.State = Watcher.MinecraftState.Running Then
+            If Watcher.State = Watcher.MinecraftState.Loading OrElse Watcher.State = Watcher.MinecraftState.Running OrElse
+               (Watcher.State = Watcher.MinecraftState.Crashed AndAlso Not Watcher.GameProcess.HasExited) Then
                 IsRunning = True
                 Exit For
             ElseIf Watcher.State = Watcher.MinecraftState.Crashed OrElse Watcher.State = Watcher.MinecraftState.Canceled Then
@@ -91,7 +92,9 @@
             RunInNewThread(
             Sub()
                 Try
-                    Do Until State = MinecraftState.Ended OrElse State = MinecraftState.Crashed OrElse State = MinecraftState.Canceled OrElse Loader.State = LoadState.Interrupted
+                    Do Until State = MinecraftState.Ended OrElse State = MinecraftState.Canceled OrElse
+                             (Loader.State = LoadState.Canceled AndAlso State <> MinecraftState.Crashed) OrElse
+                             (State = MinecraftState.Crashed AndAlso GameProcess.HasExited)
                         TimerWindow()
                         TimerLog()
                         '设置窗口标题
@@ -103,6 +106,7 @@
                             Thread.Sleep(64)
                         Next
                     Loop
+                    If State = MinecraftState.Crashed Then WatcherStateChanged()
                     WatcherLog("Minecraft 日志监控已退出")
                 Catch ex As Exception
                     Logger.Error(ex, "Minecraft 日志监控主循环出错")
@@ -177,7 +181,7 @@
                 Logger.Error(ex, "输出 Minecraft 日志失败")
             End Try
         End Sub
-        Public LatestLog As New Queue(Of String)
+        Public LatestLog As New ConcurrentQueue(Of String)
         Private Sub GameLog(Text As String)
             '预处理
             If Text Is Nothing Then Return
@@ -185,7 +189,7 @@
             'If Text.Contains("�����") Then Hint("检测到错误的日志编码：" & Text)
             '加入预存储
             LatestLog.Enqueue(Text)
-            If LatestLog.Count >= 501 Then LatestLog.Dequeue()
+            If LatestLog.Count >= 501 Then LatestLog.TryDequeue(Nothing)
             Logger.Trace(Text)
             '进度处理
             If LogProgress < 1 Then
@@ -314,14 +318,17 @@
                     Dim str As New StringBuilder(512)
                     GetClassName(hwnd, str, str.Capacity)
                     Dim ClassName As String = str.ToString
-                    If Not (ClassName = "GLFW30" OrElse ClassName = "LWJGL" OrElse ClassName = "SunAwtFrame") Then Return
+                    If Not (ClassName = "GLFW30" OrElse ClassName = "SDL_app" OrElse ClassName = "LWJGL" OrElse ClassName = "SunAwtFrame") Then Return
+                    'SDL 会先创建隐藏窗口，待初始化完成后才显示（#9073）
+                    If ClassName = "SDL_app" AndAlso Not IsWindowVisible(hwnd) Then Return
                     '获取窗口标题名
                     str = New StringBuilder(512)
                     GetWindowText(hwnd, str, str.Capacity)
                     Dim WindowText As String = str.ToString
                     '有的 Mod 可以修改窗口标题，所以不能检测是否为 Minecraft 打头，这并不准确
-                    '部分版本会搞个 GLFW message window 出来所以得反选
-                    If Not (WindowText.StartsWithF("FML") OrElse (WindowText <> "PopupMessageWindow") AndAlso Not WindowText.StartsWithF("GLFW")) Then Return
+                    '部分版本会搞个 GLFW message window，高版本还有个 Hidden Utility Window，都要反选
+                    If String.IsNullOrWhiteSpace(WindowText) OrElse WindowText = "SDL_app" OrElse WindowText = "PopupMessageWindow" OrElse
+                       WindowText.StartsWithF("GLFW") OrElse WindowText.EndsWithF("Hidden Utility Window") Then Return
                     '获取窗口关联的进程
                     Dim ProcessId As Integer
                     GetWindowThreadProcessId(hwnd, ProcessId)
@@ -342,6 +349,7 @@
         Private Declare Function GetWindowText Lib "user32" Alias "GetWindowTextA" (hWnd As Integer, str As StringBuilder, maxCount As Integer) As Integer
         Private Declare Function SetWindowText Lib "user32" Alias "SetWindowTextA" (hWnd As Integer, str As String) As Boolean
         Private Declare Function ShowWindow Lib "user32" (hWnd As IntPtr, cmdWindow As UInteger) As Boolean
+        Private Declare Function IsWindowVisible Lib "user32" (hWnd As IntPtr) As Boolean
         Private Declare Function GetWindowThreadProcessId Lib "user32" (hWnd As IntPtr, ByRef lpdwProcessId As Integer) As Integer
 
         '崩溃处理
@@ -362,7 +370,7 @@
                     Analyzer.Prepare()
                     Analyzer.Analyze()
                     Analyzer.Output(False, New List(Of String) From
-                        {Instance.PathVersion & Instance.Name & ".json", PathExeFolder & "PCL\Log1.txt", PathExeFolder & "PCL\LatestLaunch.bat"})
+                        {Instance.PathVersion & Instance.Name & ".json", Paths.Base & "PCL\Log1.txt", Paths.Base & "PCL\LatestLaunch.bat"})
                 Catch ex As Exception
                     Logger.Error(ex, "崩溃分析失败")
                 End Try

Plain Craft Launcher 2/Modules/ModDevelop.vb

@@ -1,4 +1,4 @@
-Public Class ModDevelop
+Public Class ModDevelop
 
     Public Shared Sub Start()
     End Sub

Plain Craft Launcher 2/Modules/ModEvent.vb

@@ -1,6 +1,9 @@
-
+
+
 #Region "附加属性"
 
+Imports PCL.FormMain
+
 ''' <summary>
 ''' 用于在 XAML 中初始化列表对象。
 ''' 附加属性无法在 XAML 中为每个对象初始化独立的列表对象，因此需要一个包装类，然后在 XAML 中显式初始化。
@@ -178,6 +181,8 @@ Public Class CustomEvent
         Logger.Info($"执行自定义事件：{Type}, {Arg}")
         If Arg Is Nothing Then Arg = ""
         Dim Args As String() = Arg.Split("|")
+        Dim Arg0 As String = Arg.BeforeFirst("|")
+        Dim Arg1 As String = Arg.AfterFirst("|")
         Try
             Select Case Type
                 Case EventType.打开网页
@@ -194,16 +199,16 @@ Public Class CustomEvent
                     Sub()
                         Try
                             '确认实际路径
-                            Dim ActualPaths = GetAbsoluteUrls(Args(0), Type)
+                            Dim ActualPaths = GetAbsoluteUrls(Arg0, Type)
                             Dim Location = ActualPaths(0), WorkingDir = ActualPaths(1)
                             Logger.Info($"打开类自定义事件实际路径：{Location}，工作目录：{WorkingDir}")
                             '执行
                             If Type = EventType.打开帮助 Then
                                 PageOtherHelp.EnterHelpPage(Location)
                             Else
-                                If Not EventSafetyConfirm("即将执行：" & Location & If(Args.Length >= 2, " " & Args(1), "")) Then Return
+                                If Not EventSafetyConfirm("即将执行：" & Location & If(Args.Length >= 2, " " & Arg1, "")) Then Return
                                 Dim Info As New ProcessStartInfo With {
-                                    .Arguments = If(Args.Length >= 2, Args(1), ""),
+                                    .Arguments = If(Args.Length >= 2, Arg1, ""),
                                     .FileName = Location,
                                     .WorkingDirectory = WorkingDir
                                 }
@@ -215,19 +220,19 @@ Public Class CustomEvent
                     End Sub)
 
                 Case EventType.启动游戏
-                    If Args(0) = "\current" Then
+                    If Arg0 = "\current" Then
                         If McInstanceSelected Is Nothing Then
                             Hint("请先选择一个 Minecraft 版本！", HintType.Red)
                             Return
                         Else
-                            Args(0) = McInstanceSelected.Name
+                            Arg0 = McInstanceSelected.Name
                         End If
                     End If
                     RunInUi(
                     Sub()
                         If McLaunchStart(New McLaunchOptions With
-                                {.ServerIp = If(Args.Length >= 2, Args(1), Nothing), .Instance = New McInstance(Args(0))}) Then
-                            Hint($"正在启动 {Args(0)}……")
+                                {.ServerIp = If(Args.Length >= 2, Args(1), Nothing), .Instance = New McInstance(Arg0)}) Then
+                            Hint($"正在启动 {Arg0}……")
                         End If
                     End Sub)
 
@@ -264,51 +269,69 @@ Public Class CustomEvent
 
                 Case EventType.弹出窗口
                     If Args.Length = 1 Then Throw New Exception($"EventType {Type} 需要至少 2 个以 | 分割的参数，例如 弹窗标题|弹窗内容")
-                    MyMsgBox(Args(1).Replace("\n", vbCrLf), Args(0).Replace("\n", vbCrLf), If(Args.Length > 2, Args(2), "确定"))
+                    MyMsgBox(Arg1.BeforeLast("|").Replace("\n", vbCrLf), Arg0.Replace("\n", vbCrLf), If(Args.Length > 2, Arg1.AfterLast("|"), "确定"))
 
                 Case EventType.弹出提示
-                    Hint(Args(0).Replace("\n", vbCrLf), If(Args.Length = 1, HintType.Blue, Args(1).ToEnum(Of HintType)))
+                    Hint(Arg0.Replace("\n", vbCrLf), If(Args.Length = 1, HintType.Blue, EnumUtils.FromString(Of HintType)(Arg1)))
 
                 Case EventType.切换页面
-                    RunInUi(Sub() FrmMain.PageChange(
-                                Args(0).ToEnum(Of FormMain.PageType),
-                                If(Args.Length = 1, FormMain.PageSubType.Default, Args(1).ToEnum(Of FormMain.PageSubType))))
+                    RunInUi(
+                    Sub()
+                        Dim TargetPage = EnumUtils.FromString(Of PageType)(Arg0)
+                        If TargetPage = PageType.InstanceSetup Then
+                            If McInstanceSelected Is Nothing Then
+                                Hint("请先选择一个 Minecraft 版本！", HintType.Red)
+                                Return
+                            End If
+                            If McInstanceLock.IsLocked(McInstanceSelected) Then
+                                Hint("该版本正在被修改，暂时无法进入版本设置！", HintType.Red)
+                                Return
+                            End If
+                            PageInstanceLeft.Instance = McInstanceSelected
+                        End If
+                        FrmMain.PageChange(TargetPage,
+                            If(Args.Length = 1, PageSubType.Default, EnumUtils.FromString(Of PageSubType)(Arg1)))
+                    End Sub)
 
                 Case EventType.导入整合包, EventType.安装整合包
                     RunInUi(Sub() ModpackInstall())
 
                 Case EventType.下载文件
-                    Args(0) = Args(0).Replace("\", "/")
-                    If Not (Args(0).StartsWithF("http://", True) OrElse Args(0).StartsWithF("https://", True)) Then
+                    Arg0 = Arg0.Replace("\", "/")
+                    If Not (Arg0.StartsWithF("http://", True) OrElse Arg0.StartsWithF("https://", True)) Then
                         MyMsgBox("EventData 必须为以 http:// 或 https:// 开头的网址。" & vbCrLf & "PCL 不支持其他乱七八糟的下载协议。", "事件执行失败")
                         Return
                     End If
-                    If Not EventSafetyConfirm("即将从该网址下载文件：" & vbCrLf & Args(0)) Then Return
+                    If Not EventSafetyConfirm("即将从该网址下载文件：" & vbCrLf & Arg0) Then Return
                     RunInUi(
                     Sub()
                         Try
                             Select Case Args.Length
                                 Case 1
-                                    PageOtherTest.StartCustomDownload(Args(0), PathUtils.GetLastPart(Args(0)))
+                                    PageOtherTest.StartCustomDownload(Arg0, PathUtils.GetLastPart(Arg0))
                                 Case 2
-                                    PageOtherTest.StartCustomDownload(Args(0), Args(1))
+                                    PageOtherTest.StartCustomDownload(Arg0, Arg1)
                                 Case Else
-                                    PageOtherTest.StartCustomDownload(Args(0), Args(1), Args(2))
+                                    PageOtherTest.StartCustomDownload(Arg0, Args(1), Args(2))
                             End Select
                         Catch
-                            PageOtherTest.StartCustomDownload(Args(0), "未知")
+                            PageOtherTest.StartCustomDownload(Arg0, "未知")
                         End Try
                     End Sub)
 
                 Case EventType.修改设置, EventType.写入设置
                     If Args.Length = 1 Then Throw New Exception($"EventType {Type} 需要至少 2 个以 | 分割的参数，例如 UiLauncherTransparent|400")
-                    Settings.SetSafe(Args(0), Args(1), Instance:=McInstanceSelected)
-                    If Args.Length = 2 Then Hint($"已写入设置：{Args(0)} → {Args(1)}", HintType.Green)
+                    Settings.SetSafe(Arg0, Args(1), Instance:=McInstanceSelected)
+                    If Args.Length = 2 Then Hint($"已写入设置：{Arg0} → {Args(1)}", HintType.Green)
 
                 Case EventType.修改变量, EventType.写入变量
                     If Args.Length = 1 Then Throw New Exception($"EventType {Type} 需要至少 2 个以 | 分割的参数，例如 VariableName|SomeValue")
-                    WriteReg("CustomEvent" & Args(0), Args(1))
-                    If Args.Length = 2 Then Hint($"已写入变量：{Args(0)} → {Args(1)}", HintType.Green)
+                    Try
+                        RegistryUtils.Write($"HKEY_CURRENT_USER\Software\{RegFolder}", $"CustomEvent{Arg0}", Args(1))
+                        If Args.Length = 2 Then Hint($"已写入变量：{Arg0} → {Args(1)}", HintType.Green)
+                    Catch ex As Exception
+                        Logger.Warn(ex, $"写入变量失败：{Arg0} → {Args(1)}", LogBehavior.Toast)
+                    End Try
 
                 Case EventType.加入房间
                     RunInUi(
@@ -347,7 +370,7 @@ Public Class CustomEvent
             Dim RawFileName As String
             Try
                 RawFileName = PathUtils.GetLastPart(RelativeUrl)
-                If Not RawFileName.EndsWithF(".json", True) Then Throw New Exception("未指向 .json 后缀的文件")
+                If Not PathUtils.GetExtension(RawFileName) = "json" Then Throw New Exception("未指向 .json 后缀的文件")
             Catch ex As Exception
                 Throw New Exception("联网帮助页面须指向一个帮助 JSON 文件，并在同路径下包含相应 XAML 文件！" & vbCrLf &
                                     "例如：" & vbCrLf &
@@ -372,20 +395,20 @@ Public Class CustomEvent
         RelativeUrl = RelativeUrl.Replace("/", "\").Lower.TrimStart("\")
 
         '确认实际路径
-        Dim Location As String, WorkingDir As String = PathExeFolder & "PCL"
+        Dim Location As String, WorkingDir As String = Paths.Base & "PCL"
         HelpTryExtract()
         If RelativeUrl.Contains(":\") Then
             '绝对路径
             Location = RelativeUrl
             Logger.Info($"自定义事件中由绝对路径{Type}：{Location}")
-        ElseIf FileUtils.Exists(PathExeFolder & "PCL\" & RelativeUrl) Then
+        ElseIf FileUtils.Exists(Paths.Base & "PCL\" & RelativeUrl) Then
             '相对 PCL 文件夹的路径
-            Location = PathExeFolder & "PCL\" & RelativeUrl
+            Location = Paths.Base & "PCL\" & RelativeUrl
             Logger.Info($"自定义事件中由相对 PCL 文件夹的路径{Type}：{Location}")
-        ElseIf FileUtils.Exists(PathExeFolder & "PCL\Help\" & RelativeUrl) Then
+        ElseIf FileUtils.Exists(Paths.Base & "PCL\Help\" & RelativeUrl) Then
             '相对 PCL 本地帮助文件夹的路径
-            Location = PathExeFolder & "PCL\Help\" & RelativeUrl
-            WorkingDir = PathExeFolder & "PCL\Help\"
+            Location = Paths.Base & "PCL\Help\" & RelativeUrl
+            WorkingDir = Paths.Base & "PCL\Help\"
             Logger.Info($"自定义事件中由相对 PCL 本地帮助文件夹的路径{Type}：{Location}")
         ElseIf Type = EventType.打开帮助 AndAlso FileUtils.Exists(PathTemp & "Help\" & RelativeUrl) Then
             '相对 PCL 自带帮助文件夹的路径

Plain Craft Launcher 2/Modules/ModMain.vb

@@ -1,4 +1,5 @@
-Imports System.Windows.Interop
+Imports System.Collections.ObjectModel
+Imports System.Windows.Interop
 Imports System.Windows.Threading
 
 Public Module ModMain
@@ -23,27 +24,24 @@ Public Module ModMain
     ''' <summary>
     ''' 等待弹出的提示列表。以 {String, HintType, Log As Boolean} 形式存储为数组。
     ''' </summary>
-    Private HintWaiting As ConcurrentList(Of HintMessage) = If(HintWaiting, New ConcurrentList(Of HintMessage))
+    Private HintWaiting As New ConcurrentQueue(Of HintMessage)
     ''' <summary>
     ''' 在窗口左下角弹出提示文本。
     ''' </summary>
     Public Sub Hint(Text As String, Optional Type As HintType = HintType.Blue, Optional Log As Boolean = True)
-        If HintWaiting Is Nothing Then HintWaiting = New ConcurrentList(Of HintMessage)
-        HintWaiting.Add(New HintMessage With {.Text = If(Text, ""), .Type = Type, .Log = Log})
+        HintWaiting.Enqueue(New HintMessage With {.Text = If(Text, ""), .Type = Type, .Log = Log})
     End Sub
 
     Private Sub HintTick()
         Try
-
             'Tag 存储了：{ 是否可以重用, Uuid }
-            If Not HintWaiting.Any() Then Return
-            Do While HintWaiting.Any
+            Dim CurrentHint As HintMessage = Nothing
+            Do While HintWaiting.TryDequeue(CurrentHint)
                 ''清除空提示
                 'If IsNothing(HintWaiting(0)) OrElse IsNothing(HintWaiting(0)(0)) Then
                 '    HintWaiting.RemoveAt(0)
                 '    Continue Do
                 'End If
-                Dim CurrentHint = HintWaiting(0)
                 '去回车
                 CurrentHint.Text = CurrentHint.Text.ReplaceLineEndings(" ", mergeMultiple:=True)
                 '超量提示直接忽略
@@ -134,7 +132,6 @@ Public Module ModMain
                 '结束处理
 EndHint:
                 If CurrentHint.Log Then Logger.Info($"弹出提示：{CurrentHint.Text}")
-                HintWaiting.RemoveAt(0)
             Loop
         Catch ex As Exception
             Logger.Info(ex, "显示弹出提示失败")
@@ -173,7 +170,7 @@ EndHint:
         ''' <summary>
         ''' 输入模式：输入验证规则。
         ''' </summary>
-        Public ValidateRules As ObjectModel.Collection(Of Validate)
+        Public ValidateRules As Collection(Of Validate)
         ''' <summary>
         ''' 输入模式：提示文本。
         ''' </summary>
@@ -236,14 +233,13 @@ EndHint:
                              Optional Button1Action As Action = Nothing, Optional Button2Action As Action = Nothing, Optional Button3Action As Action = Nothing) As Integer
         '将弹窗列入队列
         Dim Converter As New MyMsgBoxConverter With {.Type = MyMsgBoxType.Text, .Button1 = Button1, .Button2 = Button2, .Button3 = Button3, .Text = Caption, .IsWarn = IsWarn, .Title = Title, .HighLight = HighLight, .ForceWait = True, .Button1Action = Button1Action, .Button2Action = Button2Action, .Button3Action = Button3Action}
-        WaitingMyMsgBox.Add(Converter)
         If Button2.Length > 0 OrElse ForceWait Then
             '若有多个按钮则开始等待
             If FrmMain Is Nothing OrElse FrmMain.PanMsg Is Nothing AndAlso RunInUi() Then
                 '主窗体尚未加载，用老土的弹窗来替代
-                WaitingMyMsgBox.Remove(Converter)
                 If Button2.Length > 0 Then
-                    Dim RawResult As MsgBoxResult = MsgBox(Caption, If(Button3.Length > 0, MsgBoxStyle.YesNoCancel, MsgBoxStyle.YesNo) + If(IsWarn, MsgBoxStyle.Critical, MsgBoxStyle.Question), Title)
+                    Dim RawResult As MsgBoxResult =
+                        MsgBox(Caption, If(Button3.Length > 0, MsgBoxStyle.YesNoCancel, MsgBoxStyle.YesNo) + If(IsWarn, MsgBoxStyle.Critical, MsgBoxStyle.Question), Title)
                     Select Case RawResult
                         Case MsgBoxResult.Yes
                             Converter.Result = 1
@@ -258,6 +254,7 @@ EndHint:
                 End If
                 Logger.Warn($"主窗体加载完成前出现意料外的等待弹窗：{Button1},{Button2},{Button3}")
             Else
+                WaitingMyMsgBox.Enqueue(Converter)
                 Try
                     FrmMain.DragStop()
                     If RunInUi() Then MyMsgBoxTick()
@@ -271,6 +268,7 @@ EndHint:
             Return Converter.Result
         Else
             '不进行等待，直接返回
+            WaitingMyMsgBox.Enqueue(Converter)
             Return 1
         End If
     End Function
@@ -285,10 +283,10 @@ EndHint:
     ''' <param name="Button1">显示的第一个按钮，默认为“确定”。</param>
     ''' <param name="Button2">显示的第二个按钮，默认为“取消”。</param>
     ''' <param name="IsWarn">是否为警告弹窗，若为 True，弹窗配色和背景会变为红色。</param>
-    Public Function MyMsgBoxInput(Title As String, Optional Text As String = Nothing, Optional DefaultInput As String = Nothing, Optional ValidateRules As ObjectModel.Collection(Of Validate) = Nothing, Optional HintText As String = "", Optional Button1 As String = "确定", Optional Button2 As String = "取消", Optional IsWarn As Boolean = False) As String
+    Public Function MyMsgBoxInput(Title As String, Optional Text As String = Nothing, Optional DefaultInput As String = Nothing, Optional ValidateRules As Collection(Of Validate) = Nothing, Optional HintText As String = "", Optional Button1 As String = "确定", Optional Button2 As String = "取消", Optional IsWarn As Boolean = False) As String
         '将弹窗列入队列
-        Dim Converter As New MyMsgBoxConverter With {.Text = If(Text, ""), .HintText = If(HintText, ""), .Type = MyMsgBoxType.Input, .ValidateRules = If(ValidateRules, New ObjectModel.Collection(Of Validate)), .Button1 = Button1, .Button2 = Button2, .Content = DefaultInput, .IsWarn = IsWarn, .Title = Title}
-        WaitingMyMsgBox.Add(Converter)
+        Dim Converter As New MyMsgBoxConverter With {.Text = If(Text, ""), .HintText = If(HintText, ""), .Type = MyMsgBoxType.Input, .ValidateRules = If(ValidateRules, New Collection(Of Validate)), .Button1 = Button1, .Button2 = Button2, .Content = DefaultInput, .IsWarn = IsWarn, .Title = Title}
+        WaitingMyMsgBox.Enqueue(Converter)
         '虽然我也不知道这是啥但是能用就成了 :)
         Try
             If FrmMain IsNot Nothing Then FrmMain.DragStop()
@@ -311,7 +309,7 @@ EndHint:
     Public Function MyMsgBoxSelect(Selections As IEnumerable(Of IMyRadio), Optional Title As String = "提示", Optional Button1 As String = "确定", Optional Button2 As String = "", Optional IsWarn As Boolean = False) As Integer?
         '将弹窗列入队列
         Dim Converter As New MyMsgBoxConverter With {.Type = MyMsgBoxType.Select, .Button1 = Button1, .Button2 = Button2, .Content = Selections, .IsWarn = IsWarn, .Title = Title}
-        WaitingMyMsgBox.Add(Converter)
+        WaitingMyMsgBox.Enqueue(Converter)
         '虽然我也不知道这是啥但是能用就成了 :)
         Try
             If FrmMain IsNot Nothing Then FrmMain.DragStop()
@@ -328,27 +326,27 @@ EndHint:
     ''' <summary>
     ''' 等待显示的弹窗。
     ''' </summary>
-    Public WaitingMyMsgBox As List(Of MyMsgBoxConverter) = If(WaitingMyMsgBox, New List(Of MyMsgBoxConverter))
+    Public WaitingMyMsgBox As New ConcurrentQueue(Of MyMsgBoxConverter)
     Public Sub MyMsgBoxTick()
         Try
-            If FrmMain Is Nothing OrElse FrmMain.PanMsg Is Nothing OrElse FrmMain.WindowState = WindowState.Minimized Then Return
+            If FrmMain?.PanMsg Is Nothing OrElse FrmMain.WindowState = WindowState.Minimized Then Return
+            Dim TargetMsgBox As MyMsgBoxConverter = Nothing
             If FrmMain.PanMsg.Children.Count > 0 Then
                 '弹窗中
                 FrmMain.PanMsg.Visibility = Visibility.Visible
-            ElseIf WaitingMyMsgBox.Any Then
+            ElseIf WaitingMyMsgBox.TryDequeue(TargetMsgBox) Then
                 '没有弹窗，显示一个等待的弹窗
                 FrmMain.PanMsg.Visibility = Visibility.Visible
-                Select Case WaitingMyMsgBox(0).Type
+                Select Case TargetMsgBox.Type
                     Case MyMsgBoxType.Input
-                        FrmMain.PanMsg.Children.Add(New MyMsgInput(WaitingMyMsgBox(0)))
+                        FrmMain.PanMsg.Children.Add(New MyMsgInput(TargetMsgBox))
                     Case MyMsgBoxType.Select
-                        FrmMain.PanMsg.Children.Add(New MyMsgSelect(WaitingMyMsgBox(0)))
+                        FrmMain.PanMsg.Children.Add(New MyMsgSelect(TargetMsgBox))
                     Case MyMsgBoxType.Text
-                        FrmMain.PanMsg.Children.Add(New MyMsgText(WaitingMyMsgBox(0)))
+                        FrmMain.PanMsg.Children.Add(New MyMsgText(TargetMsgBox))
                     Case MyMsgBoxType.Login
-                        FrmMain.PanMsg.Children.Add(New MyMsgLogin(WaitingMyMsgBox(0)))
+                        FrmMain.PanMsg.Children.Add(New MyMsgLogin(TargetMsgBox))
                 End Select
-                WaitingMyMsgBox.RemoveAt(0)
             Else
                 '没有弹窗，没有等待的弹窗
                 If FrmMain.PanMsg.Visibility <> Visibility.Collapsed Then FrmMain.PanMsg.Visibility = Visibility.Collapsed
@@ -416,6 +414,7 @@ EndHint:
     Public FrmInstanceModDisabled As PageInstanceModDisabled
     Public FrmInstanceSetup As PageInstanceSetup
     Public FrmInstanceExport As PageInstanceExport
+    Public FrmDownloadModify As PageDownloadModify
 
     '资源信息分页声明
     Public FrmDownloadResourceDetail As PageDownloadResourceDetail
@@ -489,7 +488,7 @@ EndHint:
         Public Sub New(FilePath As String)
             RawPath = FilePath
             If Not FileUtils.Exists(FilePath) Then Throw New FileNotFoundException("未找到帮助文件：" & FilePath, FilePath)
-            Dim JsonData As JObject = GetJson(ArgumentReplace(FileUtils.ReadAsString(FilePath), AddressOf EscapeUtils.XmlEscape))
+            Dim JsonData As JObject = ArgumentReplace(FileUtils.ReadAsString(FilePath), AddressOf StringUtils.XmlEscape).DeserializeJson()
             '加载常规信息
             If JsonData("Title") IsNot Nothing Then
                 Title = JsonData("Title")
@@ -503,7 +502,7 @@ EndHint:
             ShowInPublic = If(JsonData("ShowInPublic"), ShowInPublic)
             ShowInSnapshot = If(JsonData("ShowInSnapshot"), ShowInSnapshot)
             Types = New List(Of String)
-            For Each NameOfType In If(JsonData("Types"), GetJson("[]"))
+            For Each NameOfType In If(JsonData("Types"), New JArray)
                 Types.Add(NameOfType)
             Next
             '加载事件信息
@@ -512,7 +511,7 @@ EndHint:
                 EventData = If(JsonData("EventData"), "")
                 IsEvent = True
             Else
-                Dim XamlAddress As String = FilePath.Lower.Replace(".json", ".xaml")
+                Dim XamlAddress As String = Path.ChangeExtension(FilePath, ".xaml")
                 If FileUtils.Exists(XamlAddress) Then
                     XamlContent = FileUtils.ReadAsString(XamlAddress)
                     IsEvent = False
@@ -577,8 +576,8 @@ EndHint:
                 Try
                     Dim IgnoreList As New List(Of String)
                     '读取自定义文件
-                    If DirectoryUtils.Exists(PathExeFolder & "PCL\Help\") Then
-                        For Each File In DirectoryUtils.GetFiles(PathExeFolder & "PCL\Help\")
+                    If DirectoryUtils.Exists(Paths.Base & "PCL\Help\") Then
+                        For Each File In DirectoryUtils.EnumerateFiles(Paths.Base & "PCL\Help\", True)
                             Select Case PathUtils.GetExtension(File)
                                 Case "helpignore"
                                     '加载忽略列表
@@ -596,11 +595,11 @@ EndHint:
                     End If
                     Logger.Info($"已扫描 PCL 文件夹下的帮助文件，目前总计 {FileList.Count} 条")
                     '读取自带文件
-                    For Each File In DirectoryUtils.GetFiles(PathTemp & "Help")
+                    For Each File In DirectoryUtils.EnumerateFiles(PathTemp & "Help", True)
                         '跳过非 json 文件与以 . 开头的文件夹
-                        If PathUtils.RemoveLastPart(File).Replace(PathTemp & "Help", "").Contains("\.") OrElse PathUtils.GetExtension(File) <> "json" Then Continue For
+                        If PathUtils.RemoveLastPart(File).Substring((PathTemp & "Help").Length).Contains("\.") OrElse PathUtils.GetExtension(File) <> "json" Then Continue For
                         '检查忽略列表
-                        Dim RealPath As String = File.Replace(PathTemp & "Help\", "")
+                        Dim RealPath As String = File.Substring((PathTemp & "Help\").Length)
                         For Each Ignore In IgnoreList
                             If RealPath.RegexCheck(Ignore) Then
                                 Logger.Trace($"已忽略 {RealPath}：{Ignore}")
@@ -614,7 +613,7 @@ NextFile:
                 Catch ex As Exception
                     Logger.Error(ex, "检查帮助文件夹失败", LogBehavior.Alert)
                 End Try
-                If Loader.IsInterrupted Then Return
+                If Loader.IsCanceled Then Return
 
                 '将文件实例化
                 Dim Dict As New List(Of HelpEntry)
@@ -630,7 +629,7 @@ NextFile:
 
                 '回设
                 If Not Dict.Any() Then Throw New Exception("未找到可用的帮助；若不需要帮助页面，可以在 设置 → 个性化 → 功能隐藏 中将其隐藏")
-                If Loader.IsInterrupted Then Return
+                If Loader.IsCanceled Then Return
                 Loader.Output = Dict
 
             Catch ex As Exception
@@ -648,7 +647,7 @@ NextFile:
             ExtractResources(PathTemp & "Cache\Help.zip", "Help")
             FileUtils.ExtractToDirectory(PathTemp & "Cache\Help.zip", PathTemp & "Help")
             Settings.Set("SystemHelpVersion", VersionCode)
-            Logger.Warn($"已解压内置帮助文件，目前状态：{FileUtils.Exists(PathTemp & "Help\启动器\备份设置.xaml")}")
+            Logger.Info($"已解压内置帮助文件，目前状态：{FileUtils.Exists(PathTemp + "Help\启动器\备份设置.xaml")}")
         End If
     End Sub
 
@@ -662,7 +661,7 @@ NextFile:
             If _IsAprilEnabled Is Nothing Then
                 _IsAprilEnabled =
                     Date.Now.Month = 4 AndAlso Date.Now.Day = 1 AndAlso
-                    Settings.Get(Of Integer)("AprilDoneYear") <> Date.Now.Year '成功后同年内则不再触发
+                    Settings.Get(Of Integer)("AprilYear") <> Date.Now.Year '成功后同年内则不再触发
             End If
             Return _IsAprilEnabled.Value
         End Get
@@ -801,26 +800,16 @@ NextFile:
     ''' 如果失败，则抛出异常。
     ''' </summary>
     Public Sub SetGPUPreference(Executeable As String)
-        Const REG_KEY As String = "Software\Microsoft\DirectX\UserGpuPreferences"
+        Const REG_KEY As String = "HKEY_CURRENT_USER\Software\Microsoft\DirectX\UserGpuPreferences"
         Const REG_VALUE As String = "GpuPreference=2;"
         '查看现有设置
-        Using ReadOnlyKey = My.Computer.Registry.CurrentUser.OpenSubKey(REG_KEY, False)
-            If ReadOnlyKey IsNot Nothing Then
-                If REG_VALUE = ReadOnlyKey.GetValue(Executeable)?.ToString() Then
-                    Logger.Info($"无需调整显卡设置：{Executeable}")
-                    Return
-                End If
-            Else
-                '创建父级键
-                Logger.Info($"需要创建显卡设置的父级键")
-                My.Computer.Registry.CurrentUser.CreateSubKey(REG_KEY)
-            End If
-        End Using
+        If RegistryUtils.Read(REG_KEY, Executeable).result?.ToString() = REG_VALUE Then
+            Logger.Info($"无需调整显卡设置：{Executeable}")
+            Return
+        End If
         '写入新设置
-        Using WriteKey = My.Computer.Registry.CurrentUser.OpenSubKey(REG_KEY, True)
-            WriteKey.SetValue(Executeable, REG_VALUE)
-            Logger.Info($"已调整显卡设置：{Executeable}")
-        End Using
+        RegistryUtils.Write(REG_KEY, Executeable, REG_VALUE)
+        Logger.Info($"已调整显卡设置：{Executeable}")
     End Sub
 
     ''' <summary>
@@ -847,7 +836,7 @@ NextFile:
         Text = Text.Replace("{pcl_build_type}", Replacer(BuildType.ToString))
         Text = Text.Replace("{pcl_branch}", Replacer(VersionBranchMain))
         Text = Text.Replace("{identify}", Replacer(Identify))
-        Text = Text.Replace("{path}", Replacer(PathUtils.CurrentFolder))
+        Text = Text.Replace("{path}", Replacer(Paths.Base))
         Text = Text.Replace("{path_with_name}", Replacer(PathExe))
         Text = Text.Replace("{path_temp}", Replacer(PathTemp))
         Text = Text.Replace("{pcl_md5}", Function() Replacer(CryptographyUtils.ComputeFileHash(PathExe, CryptographyUtils.HashMethod.Md5)))
@@ -858,7 +847,7 @@ NextFile:
             Text = Text.Replace("{time}", Replacer(Date.Now.ToString("HH':'mm':'ss")))
         End If
         'Minecraft
-        Text = Text.Replace("{java}", Replacer(McLaunchJavaSelected?.PathFolder))
+        Text = Text.Replace("{java}", Replacer(McLaunchJavaSelected?.Folder))
         Text = Text.Replace("{minecraft}", Replacer(McFolderSelected))
         If McInstanceSelected?.IsLoaded Then
             Text = Text.Replace("{version_path}", Replacer(McInstanceSelected.PathVersion)) : Text = Text.Replace("{verpath}", Replacer(McInstanceSelected.PathVersion))
@@ -869,11 +858,19 @@ NextFile:
             Else
                 Text = Text.Replace("{version}", Replacer(McInstanceSelected.Version.VanillaName))
             End If
+            Text = Text.Replace("{forge}", Replacer(If(McInstanceSelected.Version.ModLoaders.HasFlagF(ModLoaders.Forge), McInstanceSelected.Version.ModLoaderVersions(ModLoaders.Forge), "")))
+            Text = Text.Replace("{fabric}", Replacer(If(McInstanceSelected.Version.ModLoaders.HasFlagF(ModLoaders.Fabric), McInstanceSelected.Version.ModLoaderVersions(ModLoaders.Fabric), "")))
+            Text = Text.Replace("{neoforge}", Replacer(If(McInstanceSelected.Version.ModLoaders.HasFlagF(ModLoaders.NeoForge), McInstanceSelected.Version.ModLoaderVersions(ModLoaders.NeoForge), "")))
+            Text = Text.Replace("{liteloader}", Replacer(If(McInstanceSelected.Version.ModLoaders.HasFlagF(ModLoaders.LiteLoader), "true", "")))
         Else
             Text = Text.Replace("{version_path}", Replacer(Nothing)) : Text = Text.Replace("{verpath}", Replacer(Nothing))
             Text = Text.Replace("{version_indie}", Replacer(Nothing)) : Text = Text.Replace("{verindie}", Replacer(Nothing))
             Text = Text.Replace("{name}", Replacer(Nothing))
             Text = Text.Replace("{version}", Replacer(Nothing))
+            Text = Text.Replace("{forge}", Replacer(Nothing))
+            Text = Text.Replace("{fabric}", Replacer(Nothing))
+            Text = Text.Replace("{neoforge}", Replacer(Nothing))
+            Text = Text.Replace("{liteloader}", Replacer(Nothing))
         End If
         '登录信息
         If McLoginLoader.State = LoadState.Finished Then
@@ -898,8 +895,8 @@ NextFile:
         Text = Text.RegexReplace("\{hint\}", Function() Replacer(PageOtherTest.GetRandomHint()))
         Text = Text.RegexReplace("\{cave\}", Function() Replacer(PageOtherTest.GetRandomCave()))
         Text = Text.RegexReplace("\{setup:([a-zA-Z0-9]+)\}", Function(m) Replacer(Settings.GetSafe(m.Groups(1).Value, McInstanceSelected)))
-        Text = Text.RegexReplace("\{varible:([^:\}]+)(?::([^\}]+))?\}", Function(m) Replacer(ReadReg("CustomEvent" & m.Groups(1).Value, m.Groups(2).Value)))
-        Text = Text.RegexReplace("\{variable:([^:\}]+)(?::([^\}]+))?\}", Function(m) Replacer(ReadReg("CustomEvent" & m.Groups(1).Value, m.Groups(2).Value)))
+        Text = Text.RegexReplace("\{varible:([^:\}]+)(?::([^\}]+))?\}", Function(m) Replacer(RegistryUtils.TryRead($"HKEY_CURRENT_USER\Software\{RegFolder}", $"CustomEvent{m.Groups(1).Value}", m.Groups(2).Value)))
+        Text = Text.RegexReplace("\{variable:([^:\}]+)(?::([^\}]+))?\}", Function(m) Replacer(RegistryUtils.TryRead($"HKEY_CURRENT_USER\Software\{RegFolder}", $"CustomEvent{m.Groups(1).Value}", m.Groups(2).Value)))
         Return Text
     End Function
 
@@ -968,7 +965,7 @@ NextFile:
         On Error Resume Next
         FeedbackInfo()
         If ForceOpenLog OrElse (ShowMsgbox AndAlso MyMsgBox("若你在汇报一个 Bug，请点击 打开文件夹 按钮，并上传 Log(1~5).txt 中包含错误信息的文件。" & vbCrLf & "游戏崩溃一般与启动器无关，请不要因为游戏崩溃而提交反馈。", "反馈提交提醒", "打开文件夹", "不需要") = 1) Then
-            OpenExplorer(PathExeFolder & "PCL\Log1.txt")
+            OpenExplorer(Paths.Base & "PCL\Log1.txt")
         End If
         OpenWebsite("https://github.com/Meloong-Git/PCL/issues/")
     End Sub
@@ -978,11 +975,11 @@ NextFile:
     Public Sub FeedbackInfo()
         On Error Resume Next
         Logger.Warn($"诊断信息：{vbCrLf}" &
-            "操作系统：" & My.Computer.Info.OSFullName & "（32 位：" & Is32BitSystem & "）" & vbCrLf &
+            "操作系统：" & My.Computer.Info.OSFullName & vbCrLf &
             "剩余内存：" & Int(My.Computer.Info.AvailablePhysicalMemory / 1024 / 1024) & " M / " & Int(My.Computer.Info.TotalPhysicalMemory / 1024 / 1024) & " M" & vbCrLf &
             "DPI：" & DPI & "（" & Math.Round(DPI / 96, 2) * 100 & "%）" & vbCrLf &
             "MC 文件夹：" & If(McFolderSelected, "Nothing") & vbCrLf &
-            "文件位置：" & PathExeFolder)
+            "文件位置：" & Paths.Base)
     End Sub
 
     '遥测
@@ -994,9 +991,9 @@ NextFile:
         Sub()
             Try
                 Logger.Info($"匿名数据上报：{[Event]}")
-                Dim Url As String = $"{ClsBaseUrl}&Event={EscapeUtils.UrlEscape([Event])}"
+                Dim Url As String = $"{ClsBaseUrl}&Event={StringUtils.UrlEscape([Event])}"
                 For i = 0 To Datas.Length - 1 Step 2
-                    Url &= "&" & EscapeUtils.UrlEscape(Datas(i)) & "=" & EscapeUtils.UrlEscape(Datas(i + 1).ReplaceLineEndings(vbLf, mergeMultiple:=True))
+                    Url &= "&" & StringUtils.UrlEscape(Datas(i)) & "=" & StringUtils.UrlEscape(Datas(i + 1).ReplaceLineEndings(vbLf, mergeMultiple:=True))
                 Next
                 NetRequestByClient(Url, MakeLog:=False)
             Catch ex As Exception

Plain Craft Launcher 2/Modules/ModMusic.vb

@@ -1,4 +1,4 @@
-Imports NAudio.Wave
+Imports NAudio.Wave
 
 Public Module ModMusic
 
@@ -23,8 +23,8 @@ Public Module ModMusic
             '初始化全部可用音乐列表
             If MusicAllList Is Nothing Then
                 MusicAllList = New List(Of String)
-                DirectoryUtils.Create(PathExeFolder & "PCL\Musics\")
-                For Each File In DirectoryUtils.GetFiles(PathExeFolder & "PCL\Musics\")
+                DirectoryUtils.Create(Paths.Base & "PCL\Musics\")
+                For Each File In DirectoryUtils.EnumerateFiles(Paths.Base & "PCL\Musics\", True)
                     '文件夹可能会被加入 .ini 文件夹配置文件、一些乱七八糟的 .jpg 文件啥的
                     If {"ini", "jpg", "txt", "cfg", "lrc", "db", "png"}.Contains(PathUtils.GetExtension(File)) Then Continue For
                     MusicAllList.Add(File)
@@ -99,7 +99,6 @@ Public Module ModMusic
                         End If
                     End If
                     FrmMain.BtnExtraMusic.ToolTip = ToolTipText
-                    ToolTipService.SetVerticalOffset(FrmMain.BtnExtraMusic, If(ToolTipText.Contains(vbLf), 10, 16))
                 End If
                 If FrmSetupUI IsNot Nothing Then FrmSetupUI.MusicRefreshUI()
 
@@ -321,7 +320,7 @@ Public Module ModMusic
                 Hint("由于音频设备变更，音乐播放功能在重启 PCL 后才能恢复！", HintType.Red)
                 Thread.Sleep(1000000000)
             End If
-            If Not (MusicCurrent.EndsWithF(".wav", True) OrElse MusicCurrent.EndsWithF(".mp3", True) OrElse MusicCurrent.EndsWithF(".flac", True)) OrElse
+            If Not ({"wav", "mp3", "flac"}.Contains(PathUtils.GetExtension(MusicCurrent))) OrElse
                 ex.Message.Contains("0xC00D36C4") Then '#5096：不支持给定的 URL 的字节流类型。 (异常来自 HRESULT:0xC00D36C4)
                 Hint("播放音乐失败（" & PathUtils.GetLastPart(MusicCurrent) & "）：PCL 可能不支持此音乐格式，请将格式转换为 .wav、.mp3 或 .flac 后再试", HintType.Red)
             Else

Plain Craft Launcher 2/Modules/ModSecret.vb

@@ -1,4 +1,4 @@
-'由于包含加解密等安全信息，本文件中的部分代码已被删除
+'由于包含加解密等安全信息，本文件中的部分代码已被删除
 
 Friend Module ModSecret
 
@@ -15,6 +15,7 @@ Friend Module ModSecret
 
 #Region "网络鉴权"
 
+    Public Const RestrictMcDownload As Boolean = True
     Friend Function SecretCdnSign(UrlWithMark As String) As String
         If Not UrlWithMark.EndsWithF("{CDN}") Then Return UrlWithMark
         Return UrlWithMark.Replace("{CDN}", "").Replace(" ", "%20")
@@ -33,7 +34,7 @@ Friend Module ModSecret
             End If
         End If
         If Not SimulateBrowserHeaders Then Req.Headers.Add("Referer", $"http://{VersionCode}.open.pcl2.server/")
-        If Url.Contains("api.curseforge.com") Then Req.Headers.Add("x-api-key", CurseForgeAPIKey)
+        If Url.Contains("api.curseforge.com") OrElse Url.Contains("forgecdn.net") Then Req.Headers.Add("x-api-key", CurseForgeAPIKey)
     End Sub
 
 #End Region

Plain Craft Launcher 2/Modules/Resource/LocalResourceFile.vb

@@ -1,4 +1,4 @@
-''' <summary>
+''' <summary>
 ''' 本地的社区资源文件。
 ''' </summary>
 Public Class LocalResourceFile
@@ -25,7 +25,7 @@ Public Class LocalResourceFile
         End Get
     End Property
     ''' <summary>
-    ''' 假若该资源未被禁用时，文件的文件名。
+    ''' 假若该资源未被禁用时，文件的文件名。包含 .jar/.litemod 等后缀。
     ''' </summary>
     Public ReadOnly Property EnabledName As String
         Get
@@ -57,7 +57,7 @@ Public Class LocalResourceFile
     Public Property Display As String
         Get
             If _Display Is Nothing Then _Display = ProjectVersion?.Display
-            If _Display Is Nothing Then _Display = PathUtils.GetFileNameWithoutExtension(File.FullName)
+            If _Display Is Nothing Then _Display = PathUtils.GetFileNameWithoutExtension(EnabledName)
             Return _Display
         End Get
         Set(value As String)
@@ -106,235 +106,6 @@ Public Class LocalResourceFile
 
 #End Region
 
-#Region "从 JAR 获取信息"
-
-    ''' <summary>
-    ''' 从 JAR 文件中获取 Mod 信息。
-    ''' </summary>
-    Public Sub LoadMetadataFromJar()
-        Static IsLoaded As Boolean = False
-        If IsLoaded Then Return
-        IsLoaded = True
-        Dim Jar As ZipArchive = Nothing
-        Try
-            '基础可用性检查
-            If Not FileUtils.Exists(File.FullName) Then Throw New FileNotFoundException("未找到 Mod 文件（" & File.FullName & "）")
-            '打开 Jar 文件
-            Jar = FileUtils.OpenZip(File.FullName)
-            '信息获取
-            LoadMetadataFromJar(Jar)
-        Catch ex As UnauthorizedAccessException
-            Logger.Warn(ex, $"Mod 文件由于无权限无法打开（{File.FullName}）")
-        Catch ex As Exception
-            Logger.Warn(ex, $"Mod 文件无法打开（{File.FullName}）")
-        Finally
-            If Jar IsNot Nothing Then Jar.Dispose()
-        End Try
-    End Sub
-    Private Sub LoadMetadataFromJar(Jar As ZipArchive)
-
-#Region "尝试使用 mcmod.info"
-        Try
-            '获取信息文件
-            Dim InfoEntry As ZipArchiveEntry = Jar.GetEntry("mcmod.info")
-            Dim InfoString As String = Nothing
-            If InfoEntry IsNot Nothing Then
-                InfoString = InfoEntry.Open().ReadString()
-                If InfoString.Length < 15 Then InfoString = Nothing
-            End If
-            If InfoString Is Nothing Then Exit Try
-            '获取可用 Json 项
-            Dim InfoObject As JObject
-            Dim JsonObject = GetJson(InfoString)
-            If JsonObject.Type = JTokenType.Array Then
-                InfoObject = JsonObject(0)
-            Else
-                InfoObject = JsonObject("modList")(0)
-            End If
-            '从文件中获取 Mod 信息项
-            Display = InfoObject("name")
-            Description = InfoObject("description")
-            Version = InfoObject("version")
-        Catch ex As Exception
-            Logger.Warn(ex, $"读取 mcmod.info 时出现未知错误（{File.FullName}）")
-        End Try
-#End Region
-#Region "尝试使用 fabric.mod.json"
-        Try
-            '获取 fabric.mod.json 文件
-            Dim FabricEntry As ZipArchiveEntry = Jar.GetEntry("fabric.mod.json")
-            Dim FabricText As String = Nothing
-            If FabricEntry IsNot Nothing Then
-                FabricText = FabricEntry.Open().ReadString(Encoding.UTF8)
-                If Not FabricText.Contains("schemaVersion") Then FabricText = Nothing
-            End If
-            If FabricText Is Nothing Then Exit Try
-            Dim FabricObject As JObject = GetJson(FabricText)
-GotFabric:
-            '从文件中获取 Mod 信息项
-            If FabricObject.ContainsKey("name") Then Display = FabricObject("name")
-            If FabricObject.ContainsKey("version") Then Version = FabricObject("version")
-            If FabricObject.ContainsKey("description") Then Description = FabricObject("description")
-            '加载成功
-            GoTo Finished
-        Catch ex As Exception
-            Logger.Warn(ex, $"读取 fabric.mod.json 时出现未知错误（{File.FullName}）")
-        End Try
-#End Region
-#Region "尝试使用 mods.toml"
-        Try
-            '获取 mods.toml 文件
-            Dim TomlEntry As ZipArchiveEntry = Jar.GetEntry("META-INF/mods.toml")
-            Dim TomlText As String = Nothing
-            If TomlEntry IsNot Nothing Then
-                TomlText = TomlEntry.Open().ReadString()
-                If TomlText.Length < 15 Then TomlText = Nothing
-            End If
-            If TomlText Is Nothing Then Exit Try
-            '文件标准化：统一换行符为 vbLf，去除注释、头尾的空格、空行
-            Dim Lines As New List(Of String)
-            For Each Line In TomlText.SplitLines(True)
-                If Line.StartsWithF("#") Then '去除注释
-                    Continue For
-                ElseIf Line.Contains("#") Then
-                    Line = Line.Substring(0, Line.IndexOfF("#"))
-                End If
-                Line = Line.Trim(New Char() {" "c, "	"c, "　"c}) '去除头尾的空格
-                If Line.Any Then Lines.Add(Line) '去除空行
-            Next
-            '读取文件数据
-            Dim TomlData As New List(Of KeyValuePair(Of String, Dictionary(Of String, Object))) From {New KeyValuePair(Of String, Dictionary(Of String, Object))("", New Dictionary(Of String, Object))}
-            For i = 0 To Lines.Count - 1
-                Dim Line As String = Lines(i)
-                If Line.StartsWithF("[") AndAlso Line.EndsWithF("]") Then
-                    '段落标记
-                    Dim Header = Line.Trim("[]".ToCharArray)
-                    TomlData.Add(New KeyValuePair(Of String, Dictionary(Of String, Object))(Header, New Dictionary(Of String, Object)))
-                ElseIf Line.Contains("=") Then
-                    '字段标记
-                    Dim Key As String = Line.Substring(0, Line.IndexOfF("=")).TrimEnd(New Char() {" "c, "	"c, "　"c})
-                    Dim RawValue As String = Line.Substring(Line.IndexOfF("=") + 1).TrimStart(New Char() {" "c, "	"c, "　"c})
-                    Dim Value As Object
-                    If RawValue.StartsWithF("""") AndAlso RawValue.EndsWithF("""") Then
-                        '单行字符串
-                        Value = RawValue.Trim("""")
-                    ElseIf RawValue.StartsWithF("'''") Then
-                        '多行字符串
-                        Dim ValueLines As New List(Of String) From {RawValue.TrimStart("'")}
-                        If ValueLines(0).EndsWithF("'''") Then '把多行字符串按单行写法写的错误处理（#2732）
-                            ValueLines(0) = ValueLines(0).TrimEnd("'")
-                        Else
-                            Do Until i >= Lines.Count - 1
-                                i += 1
-                                Dim ValueLine As String = Lines(i)
-                                If ValueLine.EndsWithF("'''") Then
-                                    ValueLines.Add(ValueLine.TrimEnd("'"))
-                                    Exit Do
-                                Else
-                                    ValueLines.Add(ValueLine)
-                                End If
-                            Loop
-                        End If
-                        Value = ValueLines.Join(vbLf).Trim(vbLf).ReplaceLineEndings(vbCrLf)
-                    ElseIf RawValue.Lower = "true" OrElse RawValue.Lower = "false" Then
-                        '布尔型
-                        Value = (RawValue.Lower = "true")
-                    ElseIf Val(RawValue).ToString = RawValue Then
-                        '数字型
-                        Value = Val(RawValue)
-                    Else
-                        '不知道是个啥玩意儿，直接存储
-                        Value = RawValue
-                    End If
-                    TomlData.Last.Value(Key) = Value
-                Else
-                    '不知道是个啥玩意儿
-                    Exit Try
-                End If
-            Next
-            '从文件数据中获取信息
-            Dim ModEntry As Dictionary(Of String, Object) = Nothing
-            For Each TomlSubData In TomlData
-                If TomlSubData.Key = "mods" Then
-                    ModEntry = TomlSubData.Value
-                    Exit For
-                End If
-            Next
-            If ModEntry Is Nothing OrElse Not ModEntry.ContainsKey("modId") Then Exit Try
-            If ModEntry.ContainsKey("displayName") Then Display = ModEntry("displayName")
-            If ModEntry.ContainsKey("description") Then Description = ModEntry("description")
-            If ModEntry.ContainsKey("version") Then Version = ModEntry("version")
-            '加载成功
-            GoTo Finished
-        Catch ex As Exception
-            Logger.Warn(ex, $"读取 mods.toml 时出现未知错误（{File.FullName}）")
-        End Try
-#End Region
-#Region "尝试使用 fml_cache_annotation.json"
-        Try
-            '获取 fml_cache_annotation.json 文件
-            Dim FmlEntry As ZipArchiveEntry = Jar.GetEntry("META-INF/fml_cache_annotation.json")
-            Dim FmlText As String = Nothing
-            If FmlEntry IsNot Nothing Then
-                FmlText = FmlEntry.Open().ReadString(Encoding.UTF8)
-                If Not FmlText.Contains("Lnet/minecraftforge/fml/common/Mod;") Then FmlText = Nothing
-            End If
-            If FmlText Is Nothing Then Exit Try
-            Dim FmlJson As JObject = GetJson(FmlText)
-            '获取可用 Json 项
-            Dim FmlObject As JObject = Nothing
-            For Each ModFilePair In FmlJson
-                Dim ModFileAnnos As JArray = ModFilePair.Value("annotations")
-                If ModFileAnnos IsNot Nothing Then
-                    '先获取 Mod
-                    For Each ModFileAnno In ModFileAnnos
-                        Dim Name As String = If(ModFileAnno("name"), "")
-                        If Name = "Lnet/minecraftforge/fml/common/Mod;" Then
-                            FmlObject = ModFileAnno("values")
-                            GoTo Got
-                        End If
-                    Next
-                End If
-            Next
-            Exit Try
-Got:
-            '从文件中获取 Mod 信息项
-            If FmlObject.ContainsKey("name") Then Display = FmlObject("name")("value")
-            If FmlObject.ContainsKey("version") Then Version = FmlObject("version")("value")
-            '加载成功
-            GoTo Finished
-        Catch ex As Exception
-            Logger.Warn(ex, $"读取 fml_cache_annotation.json 时出现未知错误（{File.FullName}）")
-        End Try
-#End Region
-        Return '没能成功获取任何信息
-
-Finished:
-#Region "将 Version 代号转换为 META-INF 中的版本"
-        If _Version = "version" Then
-            Try
-                Dim MetaEntry As ZipArchiveEntry = Jar.GetEntry("META-INF/MANIFEST.MF")
-                If MetaEntry IsNot Nothing Then
-                    Dim MetaString As String = MetaEntry.Open().ReadString().Replace(" :", ":").Replace(": ", ":")
-                    If MetaString.Contains("Implementation-Version:") Then
-                        MetaString = MetaString.Substring(MetaString.IndexOfF("Implementation-Version:") + "Implementation-Version:".Count)
-                        MetaString = MetaString.Substring(0, MetaString.IndexOfAny(vbCrLf.ToCharArray)).Trim
-                        Version = MetaString
-                    End If
-                End If
-            Catch ex As Exception
-                Logger.Warn($"获取 META-INF 中的版本信息失败（{File.FullName}）")
-                Version = Nothing
-            End Try
-        End If
-        If _Version IsNot Nothing AndAlso Not (_Version.Contains(".") OrElse _Version.Contains("-")) Then Version = Nothing
-#End Region
-        RaiseEvent OnUpdate(Me)
-
-    End Sub
-
-#End Region
-
 #Region "网络信息"
 
     ''' <summary>
@@ -467,7 +238,7 @@ Finished:
     Private _CurseForgeHash As UInteger?
 
     ''' <summary>
-    ''' 获取用于 Modrinth 信息获取的 Hash 值（SHA1）。
+    ''' 获取用于 Modrinth 信息获取的 Hash 值（SHA1）。固定为小写。
     ''' </summary>
     Public ReadOnly Property ModrinthHash As String
         Get
@@ -498,7 +269,7 @@ Finished:
     End Function
     Public Overrides Function Equals(obj As Object) As Boolean
         Dim Target = TryCast(obj, LocalResourceFile)
-        Return Target IsNot Nothing AndAlso File.FullName = Target.File.FullName
+        Return Target IsNot Nothing AndAlso PathUtils.IsSame(File.FullName, Target.File.FullName)
     End Function
 
 #End Region

Plain Craft Launcher 2/Modules/Resource/LocalResourceLoaders.vb

@@ -1,4 +1,4 @@
-Public Module LocalResourceLoaders
+Public Module LocalResourceLoaders
 
     '加载 Mod 列表
     Public LocalResourceLoader As New LoaderTask(Of String, List(Of LocalResourceFile))("LocalResourceLoader", AddressOf LocalResourceFileLoad)
@@ -12,7 +12,7 @@
                 Try
                     RunInUiWait(Sub() If FrmInstanceMod IsNot Nothing Then FrmInstanceMod.Load.Text = "正在更新 Mod")
                     Do Until Not PageInstanceMod.UpdatingInstanceModFolders.Contains(Loader.Input)
-                        If Loader.IsInterrupted Then Return
+                        If Loader.IsCanceled Then Return
                         Thread.Sleep(100)
                     Loop
                 Finally
@@ -24,11 +24,10 @@
             '获取 Mod 文件夹下的可用文件列表
             Dim ModFileList As New List(Of String)
             If DirectoryUtils.Exists(Loader.Input) Then
-                Dim RawName As String = Loader.Input.Lower
-                For Each File In DirectoryUtils.GetFiles(Loader.Input)
-                    If File.BeforeLast("\").Lower & "\" <> RawName Then
+                For Each File In DirectoryUtils.EnumerateFiles(Loader.Input, True)
+                    If Not PathUtils.IsSame(PathUtils.RemoveLastPart(File), Loader.Input) Then
                         '仅当 Forge 1.13- 且文件夹名与版本号相同时，才加载该子文件夹下的 Mod
-                        If Not (PageInstanceLeft.Instance IsNot Nothing AndAlso PageInstanceLeft.Instance.Version.HasForge AndAlso
+                        If Not (PageInstanceLeft.Instance IsNot Nothing AndAlso PageInstanceLeft.Instance.Version.ModLoaders.HasFlagF(ModLoaders.Forge) AndAlso
                                 PageInstanceLeft.Instance.Version.Vanilla.Major < 13 AndAlso
                                 PathUtils.GetLastPart(PathUtils.RemoveLastPart(File)) = $"1.{PageInstanceLeft.Instance.Version.Vanilla.Major}.{PageInstanceLeft.Instance.Version.Vanilla.Build}") Then
                             Continue For
@@ -36,12 +35,9 @@
                     End If
                     Static IsModFile As Func(Of String, Boolean) =
                     Function(FullName As String)
-                        If FullName Is Nothing OrElse Not FullName.Contains(".") Then Return False
-                        FullName = FullName.Lower
-                        If FullName.EndsWithF(".jar", True) OrElse FullName.EndsWithF(".zip", True) OrElse FullName.EndsWithF(".litemod", True) OrElse
-                            FullName.EndsWithF(".jar.disabled", True) OrElse FullName.EndsWithF(".zip.disabled", True) OrElse FullName.EndsWithF(".litemod.disabled", True) OrElse
-                            FullName.EndsWithF(".jar.old", True) OrElse FullName.EndsWithF(".zip.old", True) OrElse FullName.EndsWithF(".litemod.old", True) Then Return True
-                        Return False
+                        If FullName Is Nothing Then Return False
+                        If {"disabled", "old"}.Contains(PathUtils.GetExtension(FullName)) Then FullName = PathUtils.GetFileNameWithoutExtension(FullName)
+                        Return {"jar", "zip", "litemod"}.Contains(PathUtils.GetExtension(FullName))
                     End Function
                     If IsModFile(File) Then ModFileList.Add(File)
                 Next
@@ -53,8 +49,8 @@
             Try
                 Dim CacheContent As String = FileUtils.TryReadAsString(CachePath)
                 If Not String.IsNullOrWhiteSpace(CacheContent) Then
-                    Cache = GetJson(CacheContent)
-                    If Not Cache.ContainsKey("version") OrElse Cache("version").ToObject(Of Integer) <> Versions.LOCAL_MOD_CACHE_VERSION Then
+                    Cache = CacheContent.DeserializeJson()
+                    If Not Cache.ContainsKey("version") OrElse Cache("version").ToObject(Of Integer) <> Versions.LocalModCacheVersion Then
                         Logger.Warn($"本地 Mod 信息缓存版本已过期，将弃用这些缓存信息")
                         Cache = New JObject
                     End If
@@ -63,12 +59,12 @@
                 Logger.Warn(ex, "读取本地 Mod 信息缓存失败，已重置")
                 Cache = New JObject
             End Try
-            Cache("version") = Versions.LOCAL_MOD_CACHE_VERSION
+            Cache("version") = Versions.LocalModCacheVersion
 
             '加载 Mod 列表
             Dim ModList As New List(Of LocalResourceFile)
             For Each ModFile In ModFileList
-                If Loader.IsInterrupted Then Return
+                If Loader.IsCanceled Then Return
                 Dim ModEntry As New LocalResourceFile(ModFile)
                 Dim DumpMod As LocalResourceFile = ModList.FirstOrDefault(Function(m) m.EnabledName = ModEntry.EnabledName) '存在两个文件，名称相同，但一个启用一个禁用
                 If DumpMod IsNot Nothing Then
@@ -88,7 +84,7 @@
             ModList = ModList.OrderBy(Function(m) m.File.Name).ToList
 
             '回设
-            If Loader.IsInterrupted Then Return
+            If Loader.IsCanceled Then Return
             Loader.Output = ModList
 
             '开始联网加载
@@ -109,7 +105,7 @@
         Dim ModLoaders = Loader.Input.Target.ModLoaders
         '读取缓存，获取需要更新的 Mod 列表
         For Each ModEntry As LocalResourceFile In Loader.Input.ModList
-            If Loader.IsInterrupted Then Return
+            If Loader.IsCanceled Then Return
             Dim CacheKey = ModEntry.ModrinthHash & Loader.Input.Target.VanillaName & ModLoaders
             If Cache.ContainsKey(CacheKey) Then
                 ModEntry.FromJson(Cache(CacheKey))
@@ -119,16 +115,13 @@
             Mods.Add(ModEntry)
         Next
         Logger.Info($"有 {Mods.Where(Function(m) m.Project Is Nothing).Count} 个 Mod 需要联网获取信息，{Mods.Where(Function(m) m.Project IsNot Nothing).Count} 个 Mod 需要更新信息")
-        If Not Mods.Any Then
-            Loader.Input.ModList.Where(Function(m) m.Version Is Nothing).ForAll(Sub(m) m.LoadMetadataFromJar())  '从 JAR 中获取缺失的版本信息（下面有另一个分支）
-            Return
-        End If
-        '获取作为检查目标的加载器和版本
+        If Not Mods.Any Then Return
+        '获取作为检查目标的版本
         '此处不应向下扩展检查的 MC 小版本，例如 Mod 在更新 1.16.5 后，对早期的 1.16.2 版本发布了修补补丁，这会导致 PCL 将 1.16.5 版本的 Mod 降级到 1.16.2
         Dim TargetMcVersion As McVersion = Loader.Input.Target
         Dim VanillaVersion = TargetMcVersion.VanillaName
         '开始网络获取
-        Logger.Info($"目标加载器：{ModLoaders}，版本：{VanillaVersion}")
+        Logger.Info($"正在检查 Mod 信息的版本：{VanillaVersion}，加载器 {ModLoaders}")
         Dim EndedThreadCount As Integer = 0, IsFailed As Boolean = False
         Dim CurrentTaskThread As Thread = Thread.CurrentThread
         '从 Modrinth 获取信息
@@ -143,6 +136,7 @@
                 '步骤 2：尝试读取工程信息缓存，构建其他 Mod 的对应关系
                 If ModrinthVersion.Count = 0 Then Return
                 Dim ModrinthMapping As New Dictionary(Of String, List(Of LocalResourceFile))
+                Dim ModrinthLoaders As New Dictionary(Of LocalResourceFile, List(Of String))
                 For Each Entry In Mods
                     If Not ModrinthVersion.ContainsKey(Entry.ModrinthHash) Then Continue For
                     If ModrinthVersion(Entry.ModrinthHash)("files")(0)("hashes")("sha1") <> Entry.ModrinthHash Then Continue For
@@ -152,13 +146,15 @@
                     ModrinthMapping(ProjectId).Add(Entry)
                     '记录对应的 ProjectVersion
                     Dim File = ResourceVersion.FromPlatformJson(ModrinthVersion(Entry.ModrinthHash), ResourceTypes.Mod)
+                    ModrinthLoaders(Entry) = ModrinthVersion(Entry.ModrinthHash)("loaders").
+                        Select(Function(l) l.ToString.Lower).Distinct.OrderBy(Function(l) l).ToList
                     If Entry.ProjectVersion Is Nothing OrElse Entry.ProjectVersion.ReleaseDate < File.ReleaseDate Then
                         Entry.ProjectVersion = File
                     Else
                         Entry.ProjectVersion.Version = File.Version '使用来自 Modrinth 的版本号
                     End If
                 Next
-                If Loader.IsInterruptedWithThread(CurrentTaskThread) Then Return
+                If Loader.IsCanceledWithThread(CurrentTaskThread) Then Return
                 Logger.Info($"需要从 Modrinth 获取 {ModrinthMapping.Count} 个本地 Mod 的工程信息")
                 '步骤 3：获取工程信息
                 If Not ModrinthMapping.Any() Then Return
@@ -172,17 +168,20 @@
                 Next
                 Logger.Info($"已从 Modrinth 获取本地 Mod 信息，继续获取更新信息")
                 '步骤 4：获取更新信息
-                If ModLoaders = ModLoaders.None Then
-                    Logger.Warn("该 Minecraft 版本没有可用的 Mod 加载器，不获取 Mod 更新信息")
-                    Return
-                End If
-                Dim ModrinthUpdate As JObject = DlModRequest("https://api.modrinth.com/v2/version_files/update", HttpMethod.Post,
-                    $"{{""hashes"": [""{ModrinthMapping.SelectMany(Function(l) l.Value.Select(Function(m) m.ModrinthHash)).Join(""",""")}""], ""algorithm"": ""sha1"", 
-                    ""loaders"": [""{ModLoaders.Flags.Join(""",""").Lower}""],""game_versions"": [""{VanillaVersion}""]}}", "application/json")
+                Dim ModsToUpdate = ModrinthMapping.SelectMany(Function(l) l.Value).ToList
+                If Not ModsToUpdate.Any Then Return
+                Dim UpdateData As String = ModsToUpdate.
+                    Select(Function(m) $"{{""hash"": ""{m.ModrinthHash}"", ""loaders"": [""{ModrinthLoaders(m).Join(""",""")}""], ""game_versions"": [""{VanillaVersion}""]}}").
+                    Join(",")
+                Dim ModrinthUpdate As JObject = DlModRequest("https://api.modrinth.com/v2/version_files/update_individual", HttpMethod.Post,
+                    $"{{""algorithm"": ""sha1"", ""hashes"": [{UpdateData}]}}", "application/json")
                 For Each Entry In Mods
                     If Not ModrinthUpdate.ContainsKey(Entry.ModrinthHash) OrElse Entry.ProjectVersion Is Nothing Then Continue For
                     Dim UpdateFile = ResourceVersion.FromPlatformJson(ModrinthUpdate(Entry.ModrinthHash), ResourceTypes.Mod)
                     If Not UpdateFile.DownloadAvailable Then Continue For
+                    Dim UpdateLoaders = ModrinthUpdate(Entry.ModrinthHash)("loaders").
+                        Select(Function(l) l.ToString.Lower).Distinct.OrderBy(Function(l) l).ToList
+                    If Not UpdateLoaders.SequenceEqual(ModrinthLoaders(Entry)) Then Continue For
                     Logger.Trace(Function() $"本地文件 {Entry.ProjectVersion.FileName} 在 Modrinth 上的最新版为 {UpdateFile.FileName}")
                     If Entry.ProjectVersion.ReleaseDate >= UpdateFile.ReleaseDate OrElse Entry.ProjectVersion.Hash = UpdateFile.Hash Then Continue For
                     '设置更新日志与更新文件
@@ -211,7 +210,7 @@
                 Dim Hashes As New List(Of UInteger)
                 For Each Entry In Mods
                     Hashes.Add(Entry.CurseForgeHash)
-                    If Loader.IsInterruptedWithThread(CurrentTaskThread) Then Return
+                    If Loader.IsCanceledWithThread(CurrentTaskThread) Then Return
                 Next
                 Dim CurseForgeRaw As JContainer = DlModRequest("https://api.curseforge.com/v1/fingerprints/432", HttpMethod.Post,
                     $"{{""fingerprints"": [{Hashes.Join(",")}]}}", "application/json")("data")("exactMatches")
@@ -220,6 +219,7 @@
 
                 '步骤 2：尝试读取工程信息缓存，构建其他 Mod 的对应关系
                 Dim ProjectIdToLocalFiles As New Dictionary(Of Integer, List(Of LocalResourceFile))
+                Dim CurseForgeLoaders As New Dictionary(Of LocalResourceFile, ModLoaders)
                 For Each Project In CurseForgeRaw
                     Dim ProjectId = Project("id").ToString
                     Dim Hash As UInteger = Project("file")("fileFingerprint")
@@ -229,10 +229,11 @@
                         ProjectIdToLocalFiles.AddIntoValueCollection(ProjectId, Entry)
                         '记录对应的 ProjectVersion
                         Dim File = ResourceVersion.FromPlatformJson(Project("file"), ResourceTypes.Mod)
+                        CurseForgeLoaders(Entry) = File.ModLoaders
                         If Entry.ProjectVersion Is Nothing OrElse Entry.ProjectVersion.ReleaseDate < File.ReleaseDate Then Entry.ProjectVersion = File
                     Next
                 Next
-                If Loader.IsInterruptedWithThread(CurrentTaskThread) Then Return
+                If Loader.IsCanceledWithThread(CurrentTaskThread) Then Return
                 Logger.Info($"需要从 CurseForge 获取 {ProjectIdToLocalFiles.Count} 个本地 Mod 的工程信息")
                 If Not ProjectIdToLocalFiles.Any() Then Return
 
@@ -245,34 +246,34 @@
                     If ProjectJson("isAvailable") IsNot Nothing AndAlso Not ProjectJson("isAvailable").ToObject(Of Boolean) Then Continue For
                     '设置 Entry 中的工程信息
                     Dim Project As New ResourceProject(ProjectJson)
-                    Dim TargetLoaders As ModLoaders = ModLoaders.None
                     For Each LocalFile In ProjectIdToLocalFiles(Project.Id) '倒查防止 CurseForge 返回的内容有漏
                         If LocalFile.Project?.Platform = ResourcePlatforms.Modrinth Then
                             LocalFile.Project = LocalFile.Project '再次触发修改事件
                         Else
                             LocalFile.Project = Project
-                            TargetLoaders = TargetLoaders Or LocalFile.Project.ModLoaders
                         End If
-                    Next
-                    TargetLoaders = TargetLoaders And ModLoaders '与目标 MC 版本的加载器取交集
-                    '查找或许版本更新的文件列表
-                    If ModLoaders = ModLoaders.None Then Continue For '无法判断 MC 版本使用的加载器，跳过更新检查
-                    Dim LatestFiles = ProjectJson("latestFilesIndexes").Where(
-                    Function(Entry)
-                        'Mod Loader 匹配
-                        If Entry("modLoader") Is Nothing Then Return False
-                        Dim EntryLoader As ModLoaders = Resource.FromCurseForgeModLoaderType(Entry("modLoader").ToObject(Of Integer))
-                        If Not TargetLoaders.HasFlag(EntryLoader) Then Return False
-                        'MC 版本匹配
-                        Dim EntryVersion As String = Entry("gameVersion")
-                        Return EntryVersion IsNot Nothing AndAlso EntryVersion = VanillaVersion
-                    End Function).
-                    MaxByAll(Function(Entry) Entry("gameVersion").ToString, New VersionComparer) '只保留最新的 MC 版本
-                    For Each Entry In LatestFiles
-                        Dim FileId = Entry("fileId").ToObject(Of Integer)
-                        If Not UpdateFileIds.ContainsKey(FileId) Then UpdateFileIds(FileId) = New List(Of LocalResourceFile)
-                        UpdateFileIds(FileId).AddRange(ProjectIdToLocalFiles(Project.Id))
-                        FileIdToProjectSlug(FileId) = Project.Slug
+                        '查找可能有版本更新的文件列表
+                        Dim LatestFiles = ProjectJson("latestFilesIndexes").Where(
+                        Function(Entry)
+                            'Mod Loader 匹配
+                            Dim EntryLoader As ModLoaders = If(Entry("modLoader") Is Nothing, ModLoaders.None,
+                                Resource.FromCurseForgeModLoaderType(Entry("modLoader").ToObject(Of Integer)))
+                            If CurseForgeLoaders(LocalFile) = ModLoaders.None Then
+                                If EntryLoader <> ModLoaders.None Then Return False
+                            ElseIf Not CurseForgeLoaders(LocalFile).HasFlagF(EntryLoader) Then
+                                Return False
+                            End If
+                            'MC 版本匹配
+                            Dim EntryVersion As String = Entry("gameVersion")
+                            Return EntryVersion IsNot Nothing AndAlso EntryVersion = VanillaVersion
+                        End Function).
+                        MaxByAll(Function(Entry) Entry("gameVersion").ToString, Comparer(Of String).Create(Function(x, y) McUtils.CompareVersion(x, y))) '只保留最新的 MC 版本
+                        For Each Entry In LatestFiles
+                            Dim FileId = Entry("fileId").ToObject(Of Integer)
+                            If Not UpdateFileIds.ContainsKey(FileId) Then UpdateFileIds(FileId) = New List(Of LocalResourceFile)
+                            UpdateFileIds(FileId).Add(LocalFile)
+                            FileIdToProjectSlug(FileId) = Project.Slug
+                        Next
                     Next
                 Next
                 Logger.Info($"已从 CurseForge 获取本地 Mod 信息，需要获取 {UpdateFileIds.Count} 个用于检查更新的文件信息")
@@ -286,6 +287,10 @@
                     Dim File = ResourceVersion.FromPlatformJson(FileJson, ResourceTypes.Mod)
                     If Not File.DownloadAvailable Then Continue For
                     For Each Entry As LocalResourceFile In UpdateFileIds(File.Id)
+                        If File.ModLoaders <> CurseForgeLoaders(Entry) Then
+                            Logger.Warn($"从 CurseForge 获取到的更新文件 {File.FileName} 加载器为 {File.ModLoaders}，与本地文件 {Entry.File.Name} 的加载器 {CurseForgeLoaders(Entry)} 不一致，已忽略", LogBehavior.None)
+                            Continue For
+                        End If
                         If UpdateFiles.ContainsKey(Entry) AndAlso UpdateFiles(Entry).ReleaseDate >= File.ReleaseDate Then Continue For
                         UpdateFiles(Entry) = File
                     Next
@@ -313,25 +318,23 @@
                 EndedThreadCount += 1
             End Try
         End Sub, "Mod List Detail Loader CurseForge")
-        '从 JAR 中获取缺失的版本信息（上面有另一个分支）
-        Loader.Input.ModList.Where(Function(m) m.Version Is Nothing).ForAll(Sub(m) m.LoadMetadataFromJar())
         '等待线程结束
         Do Until EndedThreadCount = 2
             Thread.Sleep(10)
-            If Loader.IsInterrupted Then Return
+            If Loader.IsCanceled Then Return
         Loop
         '保存缓存
         Mods = Mods.Where(Function(m) m.Project IsNot Nothing).ToList()
         Logger.Info($"联网获取本地 Mod 信息完成，为 {Mods.Count} 个 Mod 更新缓存")
         If Not Mods.Any() Then Return
-        If Loader.IsInterrupted Then Return
+        If Loader.IsCanceled Then Return
         For Each Entry In Mods
             Entry.OnlineDataLoaded = Not IsFailed
             Cache(Entry.ModrinthHash & VanillaVersion & ModLoaders) = Entry.ToJson()
         Next
         FileUtils.Write(PathTemp & "Cache\LocalMod.json", Cache.ToString(If(ModeDebug, Newtonsoft.Json.Formatting.Indented, Newtonsoft.Json.Formatting.None)))
         '刷新边栏
-        If Loader.IsInterrupted Then Return
+        If Loader.IsCanceled Then Return
         If FrmInstanceMod?.Filter = PageInstanceMod.FilterType.CanUpdate Then
             RunInUi(Sub() FrmInstanceMod?.RefreshUI()) '同步 “可更新” 列表 (#4677)
         Else

Plain Craft Launcher 2/Modules/Resource/ResourceProject.vb

@@ -1,4 +1,4 @@
-''' <summary>
+''' <summary>
 ''' 社区资源的项目信息。
 ''' </summary>
 Public Class ResourceProject
@@ -87,8 +87,8 @@ Public Class ResourceProject
         Get
             If Not LoadedDatabase Then
                 LoadedDatabase = True
-                If Types.HasFlag(ResourceTypes.Mod) OrElse Types.HasFlag(ResourceTypes.DataPack) Then
-                    _WikiEntry = WikiEntry.All.FirstOrDefault(Function(c) If(Platform = ResourcePlatforms.CurseForge, c.CurseForgeSlug, c.ModrinthSlug) = Slug)
+                If Types.HasFlagF(ResourceTypes.Mod) OrElse Types.HasFlagF(ResourceTypes.DataPack) Then
+                    _WikiEntry = WikiEntry.All.Value.FirstOrDefault(Function(c) c.Slugs.GetOrDefault(Platform) = Slug)
                 End If
             End If
             Return _WikiEntry
@@ -111,7 +111,7 @@ Public Class ResourceProject
     ''' </summary>
     Public ReadOnly Property TranslatedName As String
         Get
-            Return If(WikiEntry Is Nothing OrElse WikiEntry.ChineseName = "", RawName, WikiEntry.ChineseName)
+            Return If(WikiEntry?.ChineseName, RawName)
         End Get
     End Property
 
@@ -184,11 +184,11 @@ Public Class ResourceProject
                     If Not NewFile.DownloadAvailable Then Continue For
                     ModLoaders = ModLoaders Or NewFile.ModLoaders
                     Dim GameVersions = File("gameVersions").ToObject(Of List(Of String))
-                    If Not GameVersions.Any(Function(v) McVersion.IsFormatFit(v)) Then Continue For
+                    If Not GameVersions.Any(Function(v) McVersion.IsStandardFormat(v)) Then Continue For
                     Files.Add(New KeyValuePair(Of Integer, List(Of String))(File("id"), GameVersions))
                 Next
                 For Each File In If(Data("latestFilesIndexes"), New JArray) '这俩玩意儿包含的文件不一样，见 #3599
-                    If Not McVersion.IsFormatFit(File("gameVersion")) Then Continue For
+                    If Not McVersion.IsStandardFormat(File("gameVersion")) Then Continue For
                     Files.Add(New KeyValuePair(Of Integer, List(Of String))(File("fileId"), {File("gameVersion").ToString}.ToList))
                 Next
                 CurseForgeFileIds = Files.Select(Function(f) f.Key).Distinct.ToList
@@ -415,7 +415,7 @@ Public Class ResourceProject
         If Not MissingProjectIds.Any() Then Return
         '联网获取剩余的工程对象
         Dim Projects As JArray
-        If Platform.HasFlag(ResourcePlatforms.CurseForge) Then
+        If Platform.HasFlagF(ResourcePlatforms.CurseForge) Then
             Projects = DlModRequest("https://api.curseforge.com/v1/mods",
                 HttpMethod.Post, "{""modIds"": [" & MissingProjectIds.Join(","c) & "]}", "application/json")("data")
         Else
@@ -441,7 +441,7 @@ Public Class ResourceProject
         Json("Website") = Website
         Json("LastUpdate") = LastUpdate
         Json("DownloadCount") = DownloadCount
-        If ModLoaders <> ModLoaders.None Then Json("ModLoaders") = ModLoaders
+        If ModLoaders <> ModLoaders.None Then Json("ModLoaders") = CInt(ModLoaders)
         Json("Tags") = New JArray(Tags)
         If LogoUrl IsNot Nothing Then Json("LogoUrl") = LogoUrl
         If Drops.Any Then Json("Drops") = New JArray(Drops)
@@ -502,7 +502,6 @@ Public Class ResourceProject
         '获取 Mod 加载器描述
         Dim ModLoaderDescriptionFull As String, ModLoaderDescriptionPart As String
         Dim ModLoadersForDesc = ModLoaders.Flags().ToList()
-        If Settings.Get(Of Boolean)("ToolDownloadIgnoreQuilt") Then ModLoadersForDesc.Remove(ModLoaders.Quilt)
         Select Case ModLoadersForDesc.Count
             Case 0
                 If ModLoadersForDesc.IsSingle Then
@@ -519,8 +518,7 @@ Public Class ResourceProject
                 Dim NewestDrop As Integer = If(Drops.Any, Drops.First, 9999)
                 If ModLoadersForDesc.Contains(ModLoaders.Forge) AndAlso
                    (NewestDrop < 140 OrElse ModLoadersForDesc.Contains(ModLoaders.Fabric)) AndAlso
-                   (NewestDrop < 200 OrElse ModLoadersForDesc.Contains(ModLoaders.NeoForge)) AndAlso
-                   (NewestDrop < 140 OrElse ModLoadersForDesc.Contains(ModLoaders.Quilt) OrElse Settings.Get(Of Boolean)("ToolDownloadIgnoreQuilt")) Then
+                   (NewestDrop < 200 OrElse ModLoadersForDesc.Contains(ModLoaders.NeoForge)) Then
                     ModLoaderDescriptionFull = "任意"
                     ModLoaderDescriptionPart = ""
                 Else
@@ -561,7 +559,7 @@ Public Class ResourceProject
                 NewItem.LabVersion.Text = ModLoaderDescriptionFull
             End If
             NewItem.LabSource.Text = Platform.ToString
-            NewItem.LabTime.Text = GetTimeSpanString(LastUpdate - Date.Now, True)
+            NewItem.LabTime.Text = StringUtils.FormatTimeSpan(LastUpdate - Date.Now, True)
             NewItem.LabDownload.Text =
                 If(DownloadCount > 100000000, Math.Round(DownloadCount / 100000000, 2) & " 亿",
                 If(DownloadCount > 100000, Math.Floor(DownloadCount / 10000) & " 万", DownloadCount))