2.6.10 修正

Update PageLoginMs.xaml.vb

.github/ISSUE_TEMPLATE/bug1.yml

@@ -1,5 +1,5 @@
 name: "Minecraft 崩溃"
-description: "PCL2 提示 “Minecraft 出现错误”，或游戏崩溃"
+description: "PCL 提示 “Minecraft 出现错误”，或游戏崩溃"
 labels: [· Bug, 新反馈]
 body:
 - type: checkboxes
@@ -8,13 +8,11 @@ body:
     label: "检查项"
     description: "请逐个检查下列项目，并勾选确认。"
     options:
-    - label: "**我所启动的游戏不是整合包，且未安装任何 Mod。** 安装 Mod 后的游戏崩溃不是 PCL2 的原因，请 **不要** 提交反馈。你可以在 QQ 群里或者论坛找人求助，但这里并不是你求助的地方。"
+    - label: "**我所启动的游戏不是整合包，且未安装任何 Mod。** 安装 Mod 后的游戏崩溃基本不是 PCL 的原因，请 **不要** 提交反馈。你可以在论坛或社区找人求助，但这里并不是你求助的地方。"
+      required: false
+    - label: "**我已尝试使用 HMCL 启动，HMCL 没有出现问题。** 如果 HMCL 也无法启动就不是 PCL 导致的问题，请 **不要** 提交反馈。[下载 HMCL](https://hmcl.huangyuhui.net/download)"
       required: true
-    - label: "**我已尝试使用其他启动器，其他启动器没有出现问题。** 如果其他启动器也存在问题，证明是游戏本身的问题，并非 PCL2 的问题，请 **不要** 提交反馈。[下载其他启动器](https://www.mcbbs.net/forum.php?mod=forumdisplay&fid=43&filter=typeid&typeid=908)"
-      required: true
-    - label: "我已点击 `设置 → 启动器 → 检查更新` 确认了启动器已为最新版，且最新版未修复这个 Bug。[怎样更新？](https://shimo.im/docs/qKPttVvXKqPD8YDC#anchor-oTgb)"
-      required: true
-    - label: "我已在 [Issues 页面](https://github.com/Hex-Dragon/PCL2/issues?q=is%3Aissue+) 中搜索，确认了这一 Bug 未被提交过。"
+    - label: "我已在 [Issues 页面](https://github.com/Hex-Dragon/PCL2/issues?q=is%3Aissue+) 和 [常见&难检反馈及问题列表](https://github.com/Hex-Dragon/PCL2/discussions/1930) 中搜索，确认了这一 Bug 未被提交过。"
       required: true
 - type: textarea
   id: "yml-2"
@@ -26,8 +24,16 @@ body:
 - type: textarea
   id: "yml-3"
   attributes:
-    label: 错误报告、日志与附件
-    description: "上传 PCL2 提供的错误报告（在崩溃时选择导出错误报告）。如果没有，也可以上传 PCL 文件夹中的 Log1~5.txt。"
+    label: PCL 错误报告、日志与附件
+    description: "上传 PCL 提供的错误报告（在崩溃时选择导出错误报告）。如果没有，也可以上传 PCL 文件夹中的 Log1~5.txt。"
     placeholder: "先点击这个文本框，然后再将文件直接拖拽到文本框中以上传。"
   validations:
-    required: true
+    required: true
+- type: textarea
+  id: "yml-4"
+  attributes:
+    label: HMCL 启动脚本
+    description: "在 HMCL 中进入版本列表，点击版本右侧的三个点，选择 生成启动脚本。"
+    placeholder: "先点击这个文本框，然后再将文件直接拖拽到文本框中以上传。"
+  validations:
+    required: false

.github/ISSUE_TEMPLATE/bug2.yml

@@ -1,5 +1,5 @@
 name: "下载或登录时卡住或失败"
-description: "下载游戏、Mod 或整合包，登录正版账号时出现问题"
+description: "下载游戏、Mod 或整合包，或登录正版账号时出现问题"
 labels: [· Bug, 新反馈]
 body:
 - type: checkboxes
@@ -8,13 +8,11 @@ body:
     label: "检查项"
     description: "请逐个检查下列项目，并勾选确认。"
     options:
-    - label: "**我已尝试使用其他启动器，其他启动器没有出现问题。** 如果其他启动器也存在问题，证明是网络环境不佳[（解决方法）](https://shimo.im/docs/qKPttVvXKqPD8YDC#anchor-0hDr)，并非 PCL2 的问题，请 **不要** 提交反馈。[下载其他启动器](https://www.mcbbs.net/forum.php?mod=forumdisplay&fid=43&filter=typeid&typeid=908)"
+    - label: "**我已尝试使用其他启动器，其他启动器没有出现问题。** 如果其他启动器也存在问题，证明是网络环境不佳[（解决方法）](https://shimo.im/docs/qKPttVvXKqPD8YDC#anchor-0hDr)，并非 PCL 的问题，请 **不要** 提交反馈。[下载其他启动器](https://www.mcbbs.net/forum.php?mod=forumdisplay&fid=43&filter=typeid&typeid=908)"
+      required: false
+    - label: "我知晓大多数此类问题都是网络环境不佳导致的，但我确实认为我的问题可能是 PCL 导致的，和网络环境无关。"
       required: true
-    - label: "我已知晓大多数此类问题都是网络环境不佳导致的，但我确实认为我的问题是 PCL2 导致的，和我的网络环境无关。"
-      required: true
-    - label: "我已点击 `设置 → 启动器 → 检查更新` 确认了启动器已为最新版，且最新版未修复这个 Bug。[怎样更新？](https://shimo.im/docs/qKPttVvXKqPD8YDC#anchor-oTgb)"
-      required: true
-    - label: "我已在 [Issues 页面](https://github.com/Hex-Dragon/PCL2/issues?q=is%3Aissue+) 中搜索，确认了这一 Bug 未被提交过。"
+    - label: "我已在 [Issues 页面](https://github.com/Hex-Dragon/PCL2/issues?q=is%3Aissue+) 和 [常见&难检反馈及问题列表](https://github.com/Hex-Dragon/PCL2/discussions/1930) 中搜索，确认了这一 Bug 未被提交过。"
       required: true
 - type: textarea
   id: "yml-2"

.github/ISSUE_TEMPLATE/bug9.yml

@@ -8,9 +8,7 @@ body:
     label: "检查项"
     description: "请逐个检查下列项目，并勾选确认。"
     options:
-    - label: "我已点击 `设置 → 启动器 → 检查更新` 确认了启动器已为最新版，且最新版未修复这个 Bug。[怎样更新？](https://shimo.im/docs/qKPttVvXKqPD8YDC#anchor-oTgb)"
-      required: false
-    - label: "我已在 [Issues 页面](https://github.com/Hex-Dragon/PCL2/issues?q=is%3Aissue+) 中搜索，确认了这一 Bug 未被提交过。"
+    - label: "我已在 [Issues 页面](https://github.com/Hex-Dragon/PCL2/issues?q=is%3Aissue+) 和 [常见&难检反馈及问题列表](https://github.com/Hex-Dragon/PCL2/discussions/1930) 中搜索，确认了这一 Bug 未被提交过。"
       required: true
 - type: textarea
   id: "yml-2"

.github/ISSUE_TEMPLATE/ch.yml

@@ -8,9 +8,7 @@ body:
     label: "检查项"
     description: "请逐个检查下列项目，并勾选确认。"
     options:
-    - label: "我已点击 `设置 → 启动器 → 检查更新` 确认了启动器已为最新版，且最新版未实现这项建议。[怎样更新？](https://shimo.im/docs/qKPttVvXKqPD8YDC#anchor-oTgb)"
-      required: true
-    - label: "我已在 [Issues 页面](https://github.com/Hex-Dragon/PCL2/issues?q=is%3Aissue+) 中搜索，确认了这一建议未被提交过。"
+    - label: "我已在 [Issues 页面](https://github.com/Hex-Dragon/PCL2/issues?q=is%3Aissue+) 和 [常见&难检反馈及问题列表](https://github.com/Hex-Dragon/PCL2/discussions/1930) 中搜索，确认了这一建议未被提交过。"
       required: true
     - label: "我已查看 [功能投票页面](https://github.com/Hex-Dragon/PCL2/discussions/categories/%E5%8A%9F%E8%83%BD%E6%8A%95%E7%A5%A8/)，确认了这一建议未在投票列表中。"
       required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -2,7 +2,10 @@ blank_issues_enabled: false
 contact_links:
   - name: 帮助文档反馈
     url: https://github.com/LTCatt/PCL2Help/issues
-    about: 提交 PCL2 帮助系统（更多 → 帮助）相关的反馈
+    about: 提交与 PCL 帮助文档（更多 → 帮助）中的具体内容相关的反馈
   - name: 提问
     url: https://github.com/Hex-Dragon/PCL2/discussions/new?category=%E6%8F%90%E9%97%AE
-    about: 我不想提交反馈，只是想问一些问题
+    about: 我想问一些 PCL 相关的问题……
+  - name: 讨论
+    url: https://github.com/Hex-Dragon/PCL2/discussions/new?category=%E8%AE%A8%E8%AE%BA
+    about: 我想讨论一些 PCL 相关的事情……

.github/ISSUE_TEMPLATE/feature.yml

@@ -8,13 +8,11 @@ body:
     label: "检查项"
     description: "请逐个检查下列项目，并勾选确认。"
     options:
-    - label: "我已点击 `设置 → 启动器 → 检查更新` 确认了启动器已为最新版，且最新版未实现这一功能。[怎样更新？](https://shimo.im/docs/qKPttVvXKqPD8YDC#anchor-oTgb)"
-      required: true
-    - label: "我已在 [Issues 页面](https://github.com/Hex-Dragon/PCL2/issues?q=is%3Aissue+) 中搜索，确认了这一提案未被提交过。"
+    - label: "我已在 [Issues 页面](https://github.com/Hex-Dragon/PCL2/issues?q=is%3Aissue+) 和 [常见&难检反馈及问题列表](https://github.com/Hex-Dragon/PCL2/discussions/1930) 中搜索，确认了这一提案未被提交过。"
       required: true
     - label: "我已查看 [功能投票页面](https://github.com/Hex-Dragon/PCL2/discussions/categories/%E5%8A%9F%E8%83%BD%E6%8A%95%E7%A5%A8/)，确认了这一提案未在投票列表中。"
       required: true
-    - label: "我已知晓还没做的新功能真的太多了，忙不过来，所以新功能提案几乎不会被处理，也不建议再提交新功能提案 qwq……"
+    - label: "我知晓还没做的新功能真的太多了，忙不过来，所以新功能提案几乎不会被处理，也不建议再提交新功能提案 qwq……"
       required: true
 - type: textarea
   id: "yml-2"

Plain Craft Launcher 2/Application.xaml

@@ -133,7 +133,7 @@
                 <Setter Property="Template">
                     <Setter.Value>
                         <ControlTemplate>
-                            <Border BorderBrush="{DynamicResource ColorBrush1}" BorderThickness="1.5" CornerRadius="4" MaxWidth="500" Background="#E5FFFFFF" Margin="0,0,4,4" SnapsToDevicePixels="True">
+                            <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>
@@ -147,7 +147,7 @@
                 <Setter Property="Template">
                     <Setter.Value>
                         <ControlTemplate>
-                            <Border BorderBrush="{DynamicResource ColorBrush1}" BorderThickness="1" CornerRadius="3" Background="White" Margin="0,0,4,4" SnapsToDevicePixels="True">
+                            <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>

Plain Craft Launcher 2/Application.xaml.vb

@@ -247,4 +247,12 @@ Public Class Application
         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/MyCard.vb

@@ -41,10 +41,6 @@
     End Sub
     Private IsLoad As Boolean = False
     Private Sub MyCard_Loaded() Handles Me.Loaded
-        '卡片的进入时动画已被页面通用切换动画替代
-        'If LoadAnimation AndAlso IsLoad Then
-        '    StartHeightAnimation(Math.Min(50, ActualHeight), ActualHeight - Math.Min(50, ActualHeight), True)
-        'End If
         If IsLoad Then Exit Sub
         '初次加载限定
         If Not Title = "" AndAlso IsNothing(MainTextBlock) Then
@@ -113,7 +109,7 @@
             Case 6
                 ForgeDownloadListItemPreload(Stack, Stack.Tag, AddressOf ForgeSave_Click, True)
             Case 8
-                CompFilesCardPreload(Stack, Stack.Tag, AddressOf FrmDownloadMod.ProjectClick)
+                CompFilesCardPreload(Stack, Stack.Tag)
         End Select
         '实现控件虚拟化
         For Each Data As Object In Stack.Tag

Plain Craft Launcher 2/Controls/MyExtraButton.xaml

@@ -16,9 +16,9 @@
                 <DropShadowEffect ShadowDepth="0" BlurRadius="10" Opacity="0.2" />
             </Border.Effect>
         </Border>
-        <Border x:Name="PanProgress" CornerRadius="1000" BorderThickness="0.001" Background="#2AFFFFFF" ClipToBounds="True" Visibility="Collapsed">
+        <Border x:Name="PanProgress" CornerRadius="1000" BorderThickness="0.001" Background="#2FFFFFFF" ClipToBounds="True" Visibility="Collapsed">
             <Border.Clip>
-                <RectangleGeometry x:Name="RectProgress" Rect="0,0,40,25" />
+                <RectangleGeometry x:Name="RectProgress" Rect="0,5,40,35" />
             </Border.Clip>
         </Border>
         <Path x:Name="Path" Stretch="Uniform" Margin="12" Fill="{DynamicResource ColorBrush8}" RenderTransformOrigin="0.5,0.5">

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

@@ -17,7 +17,7 @@
                 PanProgress.Visibility = Visibility.Collapsed
             Else
                 PanProgress.Visibility = Visibility.Visible
-                RectProgress.Rect = New Rect(0, 0, 40, 40 * (1 - value))
+                RectProgress.Rect = New Rect(0, 40 * (1 - value), 40, 40 * value)
             End If
         End Set
     End Property
@@ -179,7 +179,7 @@
 
                 AniStop("MyExtraButton Color " & Uuid)
                 If IsMouseOver Then
-                    PanColor.SetResourceReference(BackgroundProperty, "ColorBrush2")
+                    PanColor.SetResourceReference(BackgroundProperty, "ColorBrush4")
                 Else
                     PanColor.SetResourceReference(BackgroundProperty, "ColorBrush3")
                 End If

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

@@ -11,17 +11,17 @@
             If _IsWarn = value Then Exit Property
             _IsWarn = value
             If _IsWarn Then
-                BorderBrush = New MyColor("#99FF4444")
-                Gradient1.Color = New MyColor("#88FFBBBB")
-                Gradient2.Color = New MyColor("#88FF8888")
+                BorderBrush = New MyColor("#CCFF4444")
+                Gradient1.Color = New MyColor("#BBFFBBBB")
+                Gradient2.Color = New MyColor("#BBFF8888")
                 Path.Fill = New MyColor("#BF0000")
                 LabText.Foreground = New MyColor("#BF0000")
                 BtnClose.Foreground = New MyColor("#BF0000")
                 Path.Data = (New GeometryConverter).ConvertFromString("F1 M 58.5832,55.4172L 17.4169,55.4171C 15.5619,53.5621 15.5619,50.5546 17.4168,48.6996L 35.201,15.8402C 37.056,13.9852 40.0635,13.9852 41.9185,15.8402L 58.5832,48.6997C 60.4382,50.5546 60.4382,53.5622 58.5832,55.4172 Z M 34.0417,25.7292L 36.0208,41.9584L 39.9791,41.9583L 41.9583,25.7292L 34.0417,25.7292 Z M 38,44.3333C 36.2511,44.3333 34.8333,45.7511 34.8333,47.5C 34.8333,49.2489 36.2511,50.6667 38,50.6667C 39.7489,50.6667 41.1666,49.2489 41.1666,47.5C 41.1666,45.7511 39.7489,44.3333 38,44.3333 Z ")
             Else
-                BorderBrush = New MyColor("#994D76FF")
-                Gradient1.Color = New MyColor("#88B0D0FF")
-                Gradient2.Color = New MyColor("#889EBAFF")
+                BorderBrush = New MyColor("#CC4D76FF")
+                Gradient1.Color = New MyColor("#BBB0D0FF")
+                Gradient2.Color = New MyColor("#BB9EBAFF")
                 Path.Fill = New MyColor("#0062BF")
                 LabText.Foreground = New MyColor("#0062BF")
                 BtnClose.Foreground = New MyColor("#0062BF")
@@ -49,7 +49,6 @@
     End Property
 
     Public RelativeSetup As String = ""
-
     Private Sub MyHint_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
         If CanClose AndAlso Setup.Get(RelativeSetup) Then
             Visibility = Visibility.Collapsed
@@ -60,6 +59,40 @@
         AniDispose(Me, False)
     End Sub
 
+    '触发点击事件
+    Private IsMouseDown As Boolean = False
+    Private Sub MyHint_MouseUp(sender As Object, e As MouseButtonEventArgs) Handles Me.MouseLeftButtonUp
+        If Not IsMouseDown Then Return
+        IsMouseDown = False
+        Log("[Control] 按下提示条" & If(String.IsNullOrEmpty(Name), "", "：" & Name))
+        e.Handled = True
+        ModEvent.TryStartEvent(EventType, EventData)
+    End Sub
+    Private Sub MyHint_MouseDown(sender As Object, e As MouseButtonEventArgs) Handles Me.MouseLeftButtonDown
+        IsMouseDown = True
+    End Sub
+    Private Sub MyHint_MouseLeave() Handles Me.MouseLeave
+        IsMouseDown = False
+    End Sub
+    Public Property EventType As String
+        Get
+            Return GetValue(EventTypeProperty)
+        End Get
+        Set(value As String)
+            SetValue(EventTypeProperty, value)
+        End Set
+    End Property
+    Public Shared ReadOnly EventTypeProperty As DependencyProperty = DependencyProperty.Register("EventType", GetType(String), GetType(MyHint), New PropertyMetadata(Nothing))
+    Public Property EventData As String
+        Get
+            Return GetValue(EventDataProperty)
+        End Get
+        Set(value As String)
+            SetValue(EventDataProperty, value)
+        End Set
+    End Property
+    Public Shared ReadOnly EventDataProperty As DependencyProperty = DependencyProperty.Register("EventData", GetType(String), GetType(MyHint), New PropertyMetadata(Nothing))
+
 End Class
 Partial Public Module ModAnimation
     Public Sub AniDispose(Control As MyHint, RemoveFromChildren As Boolean, Optional CallBack As ParameterizedThreadStart = Nothing)

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

@@ -50,13 +50,31 @@
 
     '触发点击事件
     Private Sub Button_MouseUp(sender As Object, e As MouseButtonEventArgs) Handles Me.MouseLeftButtonUp
-        If IsMouseDown Then
-            Log("[Control] 按下图标按钮" & If(String.IsNullOrEmpty(Name), "", "：" & Name))
-            RaiseEvent Click(sender, e)
-            e.Handled = True
-            Button_MouseUp()
-        End If
+        If Not IsMouseDown Then Return
+        Log("[Control] 按下图标按钮" & If(String.IsNullOrEmpty(Name), "", "：" & Name))
+        RaiseEvent Click(sender, e)
+        e.Handled = True
+        Button_MouseUp()
+        ModEvent.TryStartEvent(EventType, EventData)
     End Sub
+    Public Property EventType As String
+        Get
+            Return GetValue(EventTypeProperty)
+        End Get
+        Set(value As String)
+            SetValue(EventTypeProperty, value)
+        End Set
+    End Property
+    Public Shared ReadOnly EventTypeProperty As DependencyProperty = DependencyProperty.Register("EventType", GetType(String), GetType(MyIconButton), New PropertyMetadata(Nothing))
+    Public Property EventData As String
+        Get
+            Return GetValue(EventDataProperty)
+        End Get
+        Set(value As String)
+            SetValue(EventDataProperty, value)
+        End Set
+    End Property
+    Public Shared ReadOnly EventDataProperty As DependencyProperty = DependencyProperty.Register("EventData", GetType(String), GetType(MyIconButton), New PropertyMetadata(Nothing))
 
     '鼠标点击判定（务必放在点击事件之后，以使得 Button_MouseUp 先于 Button_MouseLeave 执行）
     Private IsMouseDown As Boolean = False

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

@@ -56,6 +56,8 @@
             RefreshColor()
         End Set
     End Property '颜色类别
+    Public Shared ReadOnly ColorTypeProperty As DependencyProperty =
+        DependencyProperty.Register("ColorType", GetType(ColorState), GetType(MyIconTextButton), New PropertyMetadata())
 
     '点击事件
 
@@ -73,6 +75,10 @@
         IsMouseDown = True
         RefreshColor()
     End Sub
+    Private Sub MyIconTextButton_MouseLeave() Handles Me.MouseLeave
+        IsMouseDown = False
+        RefreshColor()
+    End Sub
     Public Property EventType As String
         Get
             Return GetValue(EventTypeProperty)
@@ -96,7 +102,7 @@
 
     Private Const AnimationTimeOfMouseIn As Integer = 100 '鼠标指向动画长度
     Private Const AnimationTimeOfMouseOut As Integer = 150 '鼠标移出动画长度
-    Private Sub RefreshColor(Optional obj = Nothing, Optional e = Nothing) Handles Me.MouseEnter, Me.MouseLeave, Me.Loaded, Me.IsEnabledChanged
+    Private Sub RefreshColor(Optional obj = Nothing, Optional e = Nothing) Handles Me.MouseEnter, Me.Loaded, Me.IsEnabledChanged
         Try
             If IsLoaded AndAlso AniControlEnabled = 0 AndAlso Not False.Equals(e) Then '防止默认属性变更触发动画，若强制不执行动画，则 e 为 False
 
@@ -173,7 +179,7 @@
 
             End If
         Catch ex As Exception
-            Log(ex, "刷新按钮颜色出错")
+            Log(ex, "刷新带图标按钮颜色出错")
         End Try
     End Sub
 

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

@@ -78,7 +78,10 @@ Public Class MyLoading
                         Ex = Ex.InnerException
                     Loop
                     LabText.Text = StrTrim(Ex.Message)
-                    If LabText.Text.Contains("远程主机强迫关闭了一个现有的连接") OrElse LabText.Text.Contains("操作已超时") OrElse LabText.Text.Contains("操作超时") OrElse LabText.Text.Contains("服务器超时") OrElse LabText.Text.Contains("连接超时") Then LabText.Text = "网络环境不佳，请重试或尝试使用 VPN"
+                    If {"远程主机强迫关闭了", "远程方已关闭传输流", "未能解析此远程名称", "由于目标计算机积极拒绝",
+                        "操作已超时", "操作超时", "服务器超时", "连接超时"}.Any(Function(s) LabText.Text.Contains(s)) Then
+                        LabText.Text = "网络环境不佳，请重试或尝试使用 VPN"
+                    End If
                 End If
             Else
                 LabText.Text = TextError

Plain Craft Launcher 2/Controls/MyPageLeft.vb

@@ -29,21 +29,28 @@
             '逐个进入动画
             Dim AniList As New List(Of AniData)
             Dim Id As Integer = 0, Delay As Integer = 0
-            Dim Controls = GetAllAnimControls()
-            For Each Element As FrameworkElement In Controls
-                Element.Opacity = 0
-                Element.RenderTransform = New TranslateTransform(-25, 0)
-                AniList.Add(AaOpacity(Element, If(TypeOf Element Is TextBlock, 0.6, 1), 200, Delay, New AniEaseOutFluent(AniEasePower.Weak)))
-                AniList.Add(AaTranslateX(Element, 5, 200, Delay, New AniEaseOutFluent))
-                AniList.Add(AaTranslateX(Element, 20, 300, Delay, New AniEaseOutBack(AniEasePower.Weak)))
-                If TypeOf Element Is MyListItem Then
-                    AniList.Add(AaCode(Sub()
-                                           CType(Element, MyListItem).IsMouseOverAnimationEnabled = True
-                                           CType(Element, MyListItem).RefreshColor(Me, New EventArgs)
-                                       End Sub, Delay + 280))
+            For Each Element As FrameworkElement In GetAllAnimControls(True)
+                If Element.Visibility = Visibility.Collapsed Then
+                    '还原之前的隐藏动画可能导致的改变（#2436）
+                    Element.Opacity = 1
+                    Element.RenderTransform = New TranslateTransform(0, 0)
+                    If TypeOf Element Is MyListItem Then CType(Element, MyListItem).IsMouseOverAnimationEnabled = True
+                Else
+                    Element.Opacity = 0
+                    Element.RenderTransform = New TranslateTransform(-25, 0)
+                    If TypeOf Element Is MyListItem Then CType(Element, MyListItem).IsMouseOverAnimationEnabled = False
+                    AniList.Add(AaOpacity(Element, If(TypeOf Element Is TextBlock, 0.6, 1), 200, Delay, New AniEaseOutFluent(AniEasePower.Weak)))
+                    AniList.Add(AaTranslateX(Element, 5, 200, Delay, New AniEaseOutFluent))
+                    AniList.Add(AaTranslateX(Element, 20, 300, Delay, New AniEaseOutBack(AniEasePower.Weak)))
+                    If TypeOf Element Is MyListItem Then
+                        AniList.Add(AaCode(Sub()
+                                               CType(Element, MyListItem).IsMouseOverAnimationEnabled = True
+                                               CType(Element, MyListItem).RefreshColor(Me, New EventArgs)
+                                           End Sub, Delay + 280))
+                    End If
+                    Delay += Math.Max(8, 20 - Id) * 2.5
+                    Id += 1
                 End If
-                Delay += Math.Max(8, 20 - Id) * 2.5
-                Id += 1
             Next
             AniStart(AniList, "PageLeft PageChange " & Uuid)
         End If
@@ -74,23 +81,22 @@
     End Sub
 
     '遍历获取所有需要生成动画的控件
-    Private Function GetAllAnimControls() As List(Of FrameworkElement)
+    Private Function GetAllAnimControls(Optional IgnoreInvisibility As Boolean = False) As List(Of FrameworkElement)
         Dim AllControls As New List(Of FrameworkElement)
-        GetAllAnimControls(AnimatedControl, AllControls)
+        GetAllAnimControls(AnimatedControl, AllControls, IgnoreInvisibility)
         Return AllControls
     End Function
-    Private Sub GetAllAnimControls(Element As FrameworkElement, ByRef AllControls As List(Of FrameworkElement))
-        If Element.Visibility = Visibility.Collapsed Then Exit Sub
+    Private Sub GetAllAnimControls(Element As FrameworkElement, ByRef AllControls As List(Of FrameworkElement), IgnoreInvisibility As Boolean)
+        If Not IgnoreInvisibility AndAlso Element.Visibility = Visibility.Collapsed Then Exit Sub
         If TypeOf Element Is MyTextButton Then
             AllControls.Add(Element)
         ElseIf TypeOf Element Is MyListItem Then
-            CType(Element, MyListItem).IsMouseOverAnimationEnabled = False
             AllControls.Add(Element)
         ElseIf TypeOf Element Is ContentControl Then
-            GetAllAnimControls(CType(Element, ContentControl).Content, AllControls)
+            GetAllAnimControls(CType(Element, ContentControl).Content, AllControls, IgnoreInvisibility)
         ElseIf TypeOf Element Is Panel Then
             For Each Element2 As FrameworkElement In CType(Element, Panel).Children
-                GetAllAnimControls(Element2, AllControls)
+                GetAllAnimControls(Element2, AllControls, IgnoreInvisibility)
             Next
         Else
             AllControls.Add(Element)

Plain Craft Launcher 2/Controls/MyPageRight.vb

@@ -152,6 +152,7 @@
     ''' </summary>
     Public Sub PageOnExit()
         If ModeDebug Then Log("[UI] 已触发 PageOnExit")
+        RaiseEvent PageExit()
         Select Case PageState
             Case PageStates.ContentEnter, PageStates.ContentStay
                 PageState = PageStates.PageExit
@@ -168,6 +169,7 @@
             Case PageStates.PageExit, PageStates.Empty
         End Select
     End Sub
+    Public Event PageExit()
     ''' <summary>
     ''' 即将切换到其他页面，需要强制完成页面状态清理。
     ''' 需要立即切换至 Empty。

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

@@ -252,7 +252,7 @@
 
             End If
         Catch ex As Exception
-            Log(ex, "刷新按钮颜色出错")
+            Log(ex, "刷新单选按钮颜色出错")
         End Try
     End Sub
 

Plain Craft Launcher 2/Controls/MyScrollViewer.vb

@@ -15,8 +15,12 @@
             '如果当前是在对有滚动条的下拉框或文本框执行，则不接管操作
             Exit Sub
         End If
-        PerformVerticalOffsetDelta(-e.Delta)
         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(AaDouble(Sub(AnimDelta As Double)

Plain Craft Launcher 2/FormMain.xaml.vb

@@ -10,6 +10,24 @@ Public Class FormMain
         Dim FeatureList As New List(Of KeyValuePair(Of Integer, String))
         '统计更新日志条目
 #If BETA Then
+        If LastVersion < 308 Then 'Release 2.6.10
+            FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "为版本独立设置添加忽略 Java 兼容性警告选项"))
+            FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复开始或结束游戏时可能报错的 Bug"))
+            FeatureCount += 31
+            BugCount += 37
+        End If
+        If LastVersion < 302 Then 'Release 2.6.7
+            FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "再次修复网络条件差时可能无法下载 MC 的 Bug"))
+            BugCount += 1
+        End If
+        If LastVersion < 300 Then 'Release 2.6.6
+            FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "支持选择多种预设的主页"))
+            FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "Mod 管理中允许多选 Mod 进行批量操作"))
+            FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "优化崩溃分析，添加多种崩溃情况的判断"))
+            FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "优化联网获取的主页的加载与缓存"))
+            FeatureCount += 40
+            BugCount += 34
+        End If
         If LastVersion < 296 Then 'Release 2.6.3
             FeatureList.Add(New KeyValuePair(Of Integer, String)(4, "新增内存优化功能，可以将所有程序的物理内存占用降低约 1/3"))
             FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "在选择 OptiFine 与 Fabric 后会自动选择 OptiFabric"))
@@ -116,6 +134,34 @@ Public Class FormMain
         '3：BUG+ IMP* FEAT-
         '2：BUG* IMP-
         '1：BUG-
+        If LastVersion < 307 Then 'Snapshot 2.6.10
+            FeatureCount += 2
+            BugCount += 3
+        End If
+        If LastVersion < 306 Then 'Snapshot 2.6.9
+            FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "为版本独立设置添加忽略 Java 兼容性警告选项"))
+            FeatureCount += 9
+            BugCount += 11
+        End If
+        If LastVersion < 305 Then 'Snapshot 2.6.8
+            FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复开始或结束游戏时可能报错的 Bug"))
+            FeatureCount += 20
+            BugCount += 25
+        End If
+        If LastVersion < 303 Then 'Snapshot 2.6.7
+            FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "再次修复网络条件差时可能无法下载 MC 的 Bug"))
+            BugCount += 1
+        End If
+        If LastVersion < 301 Then 'Snapshot 2.6.6
+            FeatureCount += 4
+            BugCount += 2
+        End If
+        If LastVersion < 299 Then 'Snapshot 2.6.5
+            FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "支持选择多种预设的主页"))
+            FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "优化联网获取的主页的加载与缓存"))
+            FeatureCount += 18
+            BugCount += 13
+        End If
         If LastVersion < 298 Then 'Snapshot 2.6.4
             FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "Mod 管理中允许多选 Mod 进行批量操作"))
             FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "优化崩溃分析，添加多种崩溃情况的判断"))
@@ -305,6 +351,7 @@ Public Class FormMain
     End Sub
 
     '窗口加载
+    Private Declare Auto Function ChangeWindowMessageFilterEx Lib "user32.dll" (ByVal hwnd As IntPtr, ByVal message As UInt32, ByVal action As UInt32, ByVal changeInfo As UInt32) As Boolean
     Private IsWindowLoadFinished As Boolean = False
     ''' <summary>
     ''' 是否为联机提权后自动重启。
@@ -416,6 +463,7 @@ Public Class FormMain
         TimerMainStartRun()
         '加载池
         RunInNewThread(Sub()
+                           'EULA 提示
                            If Not Setup.Get("SystemEula") Then
                                Select Case MyMsgBox("在使用 PCL 前，请同意 PCL 的用户协议与免责声明。", "协议授权", "同意", "拒绝", "查看用户协议与免责声明",
                                    Button3Action:=Sub() OpenWebsite("https://shimo.im/docs/rGrd8pY8xWkt6ryW"))
@@ -425,6 +473,7 @@ Public Class FormMain
                                        EndProgram(False)
                                End Select
                            End If
+                           '启动加载器池
                            Try
                                JavaListInit() '延后到同意协议后再执行，避免在初次启动时进行进程操作
                                Thread.Sleep(200)
@@ -434,11 +483,22 @@ Public Class FormMain
                            Catch ex As Exception
                                Log(ex, "初始化加载池运行失败", LogLevel.Feedback)
                            End Try
+                           '清理自动更新文件
                            Try
                                If File.Exists(Path & "PCL\Plain Craft Launcher 2.exe") Then File.Delete(Path & "PCL\Plain Craft Launcher 2.exe")
                            Catch ex As Exception
                                Log(ex, "清理自动更新文件失败")
                            End Try
+                           '开启管理员权限下的文件拖拽（#2531）
+                           Try
+                               If IsAdmin() Then
+                                   Log("[System] PCL 正以管理员权限运行")
+                                   ChangeWindowMessageFilterEx(Handle, &H233, 1, Nothing)
+                                   ChangeWindowMessageFilterEx(Handle, &H49, 1, Nothing)
+                               End If
+                           Catch ex As Exception
+                               Log(ex, "开启管理员权限下的文件拖拽失败")
+                           End Try
                        End Sub, "Start Loader", ThreadPriority.Lowest)
 
         Log("[Start] 第三阶段加载用时：" & GetTimeTick() - ApplicationStartTick & " ms")
@@ -790,7 +850,12 @@ Public Class FormMain
                 End Try
             ElseIf e.Data.GetDataPresent(DataFormats.FileDrop) Then
                 '获取文件并检查
-                Dim FilePathList As New List(Of String)(CType(e.Data.GetData(DataFormats.FileDrop), Array))
+                Dim FilePathRaw = e.Data.GetData(DataFormats.FileDrop)
+                If FilePathRaw Is Nothing Then '#2690
+                    Hint("请将文件解压后再拖入！", HintType.Critical)
+                    Exit Sub
+                End If
+                Dim FilePathList As New List(Of String)(CType(FilePathRaw, IEnumerable(Of String)))
                 e.Handled = True
                 If Directory.Exists(FilePathList.First) AndAlso Not File.Exists(FilePathList.First) Then
                     Hint("请拖入一个文件，而非文件夹！", HintType.Critical)
@@ -824,6 +889,7 @@ Public Class FormMain
                                        RunInUi(Sub()
                                                    Setup.Set("UiCustomType", 1)
                                                    FrmLaunchRight.ForceRefresh()
+                                                   Hint("已加载主页自定义文件！", HintType.Finish)
                                                End Sub)
                                        Exit Sub
                                    End If
@@ -1057,28 +1123,18 @@ Install:
             Case PageType.VersionSetup
                 Return "版本设置 - " & If(PageVersionLeft.Version Is Nothing, "未知版本", PageVersionLeft.Version.Name)
             Case PageType.CompDetail
-                If Stack.Additional Is Nothing Then
-                    Log("[Control] 资源工程详情页面未提供关键项", LogLevel.Feedback)
-                    Return "未知页面"
-                Else
-                    Dim Project As CompProject = Stack.Additional
-                    Select Case Project.Type
-                        Case CompType.Mod
-                            Return "Mod 下载 - " & Project.TranslatedName
-                        Case CompType.ModPack
-                            Return "整合包下载 - " & Project.TranslatedName
-                        Case Else 'CompType.ResourcePack
-                            Return "资源包下载 - " & Project.TranslatedName
-                    End Select
-                End If
+                Dim Project As CompProject = Stack.Additional(0)
+                Select Case Project.Type
+                    Case CompType.Mod
+                        Return "Mod 下载 - " & Project.TranslatedName
+                    Case CompType.ModPack
+                        Return "整合包下载 - " & Project.TranslatedName
+                    Case Else 'CompType.ResourcePack
+                        Return "资源包下载 - " & Project.TranslatedName
+                End Select
             Case PageType.HelpDetail
-                If Stack.Additional Is Nothing Then
-                    Log("[Control] 帮助详情页面未提供关键项", LogLevel.Msgbox)
-                    Return "未知页面"
-                Else
-                    Dim Entry As HelpEntry = Stack.Additional(0)
-                    Return Entry.Title
-                End If
+                Dim Entry As HelpEntry = Stack.Additional(0)
+                Return Entry.Title
             Case Else
                 Return ""
         End Select

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

@@ -1,8 +1,8 @@
 Imports System.IO.Compression
-Imports System.Management
 Imports System.Runtime.CompilerServices
 Imports System.Security.Cryptography
 Imports System.Security.Principal
+Imports System.Text.RegularExpressions
 Imports System.Windows.Markup
 Imports Newtonsoft.Json
 
@@ -11,12 +11,12 @@ Public Module ModBase
 #Region "声明"
 
     '下列版本信息由更新器自动修改
-    Public Const VersionBaseName As String = "2.6.4" '不含分支前缀的显示用版本名
-    Public Const VersionStandardCode As String = "2.6.4." & VersionBranchCode '标准格式的四段式版本号
+    Public Const VersionBaseName As String = "2.6.100" '不含分支前缀的显示用版本名
+    Public Const VersionStandardCode As String = "2.6.100." & VersionBranchCode '标准格式的四段式版本号
 #If BETA Then
-    Public Const VersionCode As Integer = 296 'Release
+    Public Const VersionCode As Integer = 308 'Release
 #Else
-    Public Const VersionCode As Integer = 298 'Snapshot
+    Public Const VersionCode As Integer = 307 'Snapshot
 #End If
     '自动生成的版本信息
     Public Const VersionDisplayName As String = VersionBranchName & " " & VersionBaseName
@@ -1242,23 +1242,7 @@ Re:
     Public Function ExtractFile(CompressFilePath As String, DestDirectory As String, Optional Encode As Encoding = Nothing) As Boolean
         Try
             Directory.CreateDirectory(DestDirectory)
-            If CompressFilePath.EndsWith(".zip") OrElse CompressFilePath.EndsWith(".jar") OrElse CompressFilePath.EndsWith(".mrpack") Then
-                '以 zip 方式解压
-                Using stream As New FileStream(CompressFilePath, FileMode.Open)
-                    Using archive As New ZipArchive(stream, ZipArchiveMode.Read, False, If(Encode, Encoding.GetEncoding("GB18030")))
-                        For Each entry As ZipArchiveEntry In archive.Entries
-                            Dim destinationPath As String = IO.Path.Combine(DestDirectory, entry.FullName)
-                            If destinationPath.EndsWith("\") OrElse destinationPath.EndsWith("/") Then
-                                Directory.CreateDirectory(destinationPath)
-                            Else
-                                If File.Exists(destinationPath) Then File.Delete(destinationPath)
-                                entry.ExtractToFile(destinationPath, True)
-                            End If
-                        Next
-                    End Using
-                End Using
-                Return True
-            ElseIf CompressFilePath.EndsWith(".gz") Then
+            If CompressFilePath.EndsWith(".gz") Then
                 '以 gz 方式解压
                 Dim stream As New GZipStream(New FileStream(CompressFilePath, FileMode.Open, FileAccess.ReadWrite), CompressionMode.Decompress)
                 Dim decompressedFile As New FileStream(DestDirectory & GetFileNameFromPath(CompressFilePath).ToLower.Replace(".tar", "").Replace(".gz", ""), FileMode.OpenOrCreate, FileAccess.Write)
@@ -1271,7 +1255,19 @@ Re:
                 stream.Close()
                 Return True
             Else
-                Return False
+                '以 zip 方式解压
+                Using Archive = ZipFile.Open(CompressFilePath, ZipArchiveMode.Read, If(Encode, Encoding.GetEncoding("GB18030")))
+                    For Each Entry As ZipArchiveEntry In Archive.Entries
+                        Dim DestinationPath As String = IO.Path.Combine(DestDirectory, Entry.FullName)
+                        If DestinationPath.EndsWith("\") OrElse DestinationPath.EndsWith("/") Then
+                            Continue For '不创建空文件夹
+                        Else
+                            Directory.CreateDirectory(GetPathFromFullPath(DestinationPath))
+                            Entry.ExtractToFile(DestinationPath, True)
+                        End If
+                    Next
+                End Using
+                Return True
             End If
         Catch ex As Exception
             Log(ex, "尝试解压文件失败")
@@ -1301,7 +1297,7 @@ Re:
         Next
         Temp = Directory.GetDirectories(Path)
         For Each str As String In Temp
-            DeleteDirectory(str)
+            DeleteDirectory(str, IgnoreIssue)
         Next
         Try
             Directory.Delete(Path, True)
@@ -1578,19 +1574,19 @@ Re:
     ''' 为字符串进行 XML 转义。
     ''' </summary>
     Public Function EscapeXML(Str As String) As String
-        Return Str.Replace("&", "&amp;").Replace("<", "&lt;").Replace(">", "&gt;").Replace("'", "&apos;").Replace("""", "&quot;")
+        Return Str.Replace("&", "&amp;").Replace("<", "&lt;").Replace(">", "&gt;").Replace("'", "&apos;").Replace("""", "&quot;").Replace(vbCrLf, "&#xa;")
     End Function
 
     '正则
     ''' <summary>
     ''' 搜索字符串中的所有正则匹配项。
     ''' </summary>
-    Public Function RegexSearch(str As String, regex As String, Optional options As RegularExpressions.RegexOptions = RegularExpressions.RegexOptions.None) As List(Of String)
+    Public Function RegexSearch(str As String, regex As String, Optional options As RegexOptions = RegularExpressions.RegexOptions.None) As List(Of String)
         Try
             RegexSearch = New List(Of String)
-            Dim RegexSearchRes = New RegularExpressions.Regex(regex, options).Matches(str)
+            Dim RegexSearchRes = New Regex(regex, options).Matches(str)
             If RegexSearchRes Is Nothing Then Return RegexSearch
-            For Each item As RegularExpressions.Match In RegexSearchRes
+            For Each item As Match In RegexSearchRes
                 RegexSearch.Add(item.Value)
             Next
         Catch ex As Exception
@@ -1601,7 +1597,7 @@ Re:
     ''' <summary>
     ''' 获取字符串中的第一个正则匹配项，若无匹配则返回 Nothing。
     ''' </summary>
-    Public Function RegexSeek(str As String, regex As String, Optional options As RegularExpressions.RegexOptions = RegularExpressions.RegexOptions.None) As String
+    Public Function RegexSeek(str As String, regex As String, Optional options As RegexOptions = RegularExpressions.RegexOptions.None) As String
         Try
             Dim Result = RegularExpressions.Regex.Match(str, regex, options).Value
             Return If(Result = "", Nothing, Result)
@@ -1613,7 +1609,7 @@ Re:
     ''' <summary>
     ''' 检查字符串是否匹配某正则模式。
     ''' </summary>
-    Public Function RegexCheck(str As String, regex As String, Optional options As RegularExpressions.RegexOptions = RegularExpressions.RegexOptions.None) As Boolean
+    Public Function RegexCheck(str As String, regex As String, Optional options As RegexOptions = RegularExpressions.RegexOptions.None) As Boolean
         Try
             Return RegularExpressions.Regex.IsMatch(str, regex, options)
         Catch ex As Exception
@@ -1624,7 +1620,13 @@ Re:
     ''' <summary>
     ''' 进行正则替换，会抛出错误。
     ''' </summary>
-    Public Function RegexReplace(Input As String, Replacement As String, Regex As String, Optional options As RegularExpressions.RegexOptions = RegularExpressions.RegexOptions.None) As String
+    Public Function RegexReplace(Input As String, Replacement As String, Regex As String, Optional options As RegexOptions = RegularExpressions.RegexOptions.None) As String
+        Return RegularExpressions.Regex.Replace(Input, Regex, Replacement, options)
+    End Function
+    ''' <summary>
+    ''' 对每个正则匹配分别进行替换，会抛出错误。
+    ''' </summary>
+    Public Function RegexReplaceEach(Input As String, Replacement As MatchEvaluator, Regex As String, Optional options As RegexOptions = RegularExpressions.RegexOptions.None) As String
         Return RegularExpressions.Regex.Replace(Input, Regex, Replacement, options)
     End Function
 

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

@@ -437,10 +437,6 @@
                             For Each Loader In Loaders
                                 Loader.Abort()
                             Next
-                            '从列表删除
-                            SyncLock LoaderTaskbarLock
-                                If LoaderTaskbar.Contains(Me) Then LoaderTaskbar.Remove(Me)
-                            End SyncLock
                         End Sub)
         End Sub
 
@@ -571,6 +567,7 @@ Restart:
         If FrmSpeedLeft IsNot Nothing Then FrmSpeedLeft.TaskRemove(Loader)
         SyncLock LoaderTaskbarLock
             LoaderTaskbar.Add(Loader)
+            Log($"[Taskbar] {Loader.Name} 已加入任务列表")
         End SyncLock
     End Sub
     Public Sub LoaderTaskbarProgressRefresh()
@@ -585,16 +582,13 @@ Restart:
                     If Loader.Show AndAlso Loader.State = LoadState.Loading Then IsAllDownloadTaskCompleted = False
                 Next
                 '若单个任务已中止或全部任务已完成，则刷新并移除
-                Dim RemovedTask As New List(Of LoaderBase)
-                For i = 0 To LoaderTaskbar.Count - 1
-                    If (IsAllDownloadTaskCompleted OrElse LoaderTaskbar(i).State = LoadState.Aborted) AndAlso LoaderTaskbar(i).Show Then
-                        If FrmSpeedLeft IsNot Nothing Then FrmSpeedLeft.TaskRefresh(LoaderTaskbar(i))
-                        RemovedTask.Add(LoaderTaskbar(i))
+                For Each Task In LoaderTaskbar.ToList()
+                    If (IsAllDownloadTaskCompleted OrElse Task.State = LoadState.Aborted OrElse Task.State = LoadState.Waiting) AndAlso Task.Show Then
+                        If FrmSpeedLeft IsNot Nothing Then FrmSpeedLeft.TaskRefresh(Task)
+                        LoaderTaskbar.Remove(Task)
+                        Log($"[Taskbar] {Task.Name} 已移出任务列表")
                     End If
                 Next
-                For Each Task In RemovedTask
-                    LoaderTaskbar.Remove(Task)
-                Next
             End SyncLock
             '更新平滑后的进度
             If NewProgress <= 0 OrElse NewProgress >= 1 OrElse LoaderTaskbarProgress > NewProgress Then
@@ -625,8 +619,9 @@ Restart:
         Try
             Dim Total As Double = 0, Count As Integer = 0
             SyncLock LoaderTaskbarLock
-                For i = 0 To LoaderTaskbar.Count - 1
-                    Total += LoaderTaskbar(i).Progress
+                For Each Task In LoaderTaskbar.ToList
+                    If Not Task.Show Then Continue For
+                    Total += Task.Progress
                     Count += 1 '避免多线程影响导致计数出错
                 Next
             End SyncLock

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

@@ -106,15 +106,15 @@ Retry:
 Retry:
             Select Case RetryCount
                 Case 0 '正常尝试
-                    Return NetGetCodeRequest(Url, Encode, 10000, IsJson, Accept)
+                    Return NetGetCodeByRequestOnce(Url, Encode, 10000, IsJson, Accept)
                 Case 1 '慢速重试
                     Thread.Sleep(500)
-                    Return NetGetCodeRequest(If(BackupUrl, Url), Encode, 30000, IsJson, Accept)
+                    Return NetGetCodeByRequestOnce(If(BackupUrl, Url), Encode, 30000, IsJson, Accept)
                 Case Else '快速重试
                     If GetTimeTick() - StartTime > 5500 Then
                         '若前两次加载耗费 5 秒以上，才进行重试
                         Thread.Sleep(500)
-                        Return NetGetCodeRequest(If(BackupUrl, Url), Encode, 4000, IsJson, Accept)
+                        Return NetGetCodeByRequestOnce(If(BackupUrl, Url), Encode, 4000, IsJson, Accept)
                     Else
                         Throw RetryException
                     End If
@@ -148,7 +148,7 @@ Retry:
         For i = 1 To 4
             Dim th As New Thread(Sub()
                                      Try
-                                         RequestResult = NetGetCodeRequest(Url, Encode, 30000, IsJson, Accept)
+                                         RequestResult = NetGetCodeByRequestOnce(Url, Encode, 30000, IsJson, Accept)
                                      Catch ex As Exception
                                          FailCount += 1
                                          RequestEx = ex
@@ -182,10 +182,10 @@ RequestFinished:
         Loop
         Throw New Exception("未知错误")
     End Function
-    Private Function NetGetCodeRequest(Url As String, Encode As Encoding, Timeout As Integer, IsJson As Boolean, Accept As String)
+    Public Function NetGetCodeByRequestOnce(Url As String, Optional Encode As Encoding = Nothing, Optional Timeout As Integer = 30000, Optional IsJson As Boolean = False, Optional Accept As String = "")
         If RunInUi() AndAlso Not Url.Contains("//127.") Then Throw New Exception("在 UI 线程执行了网络请求")
         Url = SecretCdnSign(Url)
-        Log("[Net] 获取网络结果：" & Url & "，最大超时 " & Timeout)
+        Log($"[Net] 获取网络结果：{Url}，超时 {Timeout}ms{If(IsJson, "，要求 json", "")}")
         Dim Request As HttpWebRequest = WebRequest.Create(Url)
         Dim Result As New List(Of Byte)
         Try
@@ -269,6 +269,8 @@ RequestFinished:
         '下载
         Using Client As New WebClient
             Try
+                Client.Headers(HttpRequestHeader.UserAgent) = "PCL2/" & VersionStandardCode & " Mozilla/5.0 AppleWebKit/537.36 Chrome/63.0.3239.132 Safari/537.36"
+                Client.Headers(HttpRequestHeader.Referer) = "http://" & VersionCode & ".pcl2.server/"
                 Client.DownloadFile(Url, LocalFile)
             Catch ex As Exception
                 Throw New WebException("直接下载文件失败（" & Url & "）。", ex)
@@ -328,7 +330,7 @@ Retry:
     ''' <summary>
     ''' 同时发送多个网络请求并要求返回内容。
     ''' </summary>
-    Public Function NetRequestMuity(Url As String, Method As String, Data As Object, ContentType As String, Optional RequestCount As Integer = 4, Optional Headers As Dictionary(Of String, String) = Nothing)
+    Public Function NetRequestMulty(Url As String, Method As String, Data As Object, ContentType As String, Optional RequestCount As Integer = 4, Optional Headers As Dictionary(Of String, String) = Nothing)
         Dim Threads As New List(Of Thread)
         Dim RequestResult = Nothing
         Dim RequestEx As Exception = Nothing
@@ -1276,14 +1278,6 @@ Wrong:
             Try
 Retry:
                 SyncLock LockChain
-                    ''大小检测
-                    'If DownloadDone <> FileSize AndAlso Not IsUnknownSize Then
-                    '    For Each Th As NetThread In Threads
-                    '        Log("[Download] " & "File size detail: ")
-                    '        Log("[Download] " & Th.Uuid & "#, State " & GetStringFromEnum(CType(Th.State, [Enum])) & ", Range " & Th.DownloadStart & "~" & (Th.DownloadStart + Th.DownloadDone) & ", Left " & Th.DownloadUndone)
-                    '    Next
-                    '    Throw New Exception("文件大小应为 " & FileSize & " B，实际下载为 " & DownloadDone & " B。")
-                    'End If
                     If ModeDebug Then Log("[Download] " & LocalName & "：正在合并文件")
                     '创建文件夹
                     If File.Exists(LocalPath) Then File.Delete(LocalPath)
@@ -1297,7 +1291,7 @@ Retry:
                         AddWriter.Write(SmailFileCache.ToArray)
                         AddWriter.Dispose() : AddWriter = Nothing
                         MergeFile.Dispose() : MergeFile = Nothing
-                    ElseIf Threads.DownloadDone = DownloadDone Then
+                    ElseIf Threads.DownloadDone = DownloadDone AndAlso Threads.Temp IsNot Nothing Then
                         '仅有一个文件，直接复制
                         CopyFile(Threads.Temp, LocalPath)
                     Else
@@ -1305,7 +1299,7 @@ Retry:
                         MergeFile = New FileStream(LocalPath, FileMode.Create)
                         AddWriter = New BinaryWriter(MergeFile)
                         For Each Thread As NetThread In Threads
-                            If Thread.DownloadDone = 0 Then Continue For
+                            If Thread.DownloadDone = 0 OrElse Thread.Temp Is Nothing Then Continue For
                             Using fs As New FileStream(Thread.Temp, FileMode.Open, FileAccess.Read, FileShare.Read)
                                 Dim TempReader As New BinaryReader(fs)
                                 AddWriter.Write(TempReader.ReadBytes(fs.Length))
@@ -1326,9 +1320,9 @@ Retry:
                     '检查文件
                     Dim CheckResult As String = Check?.Check(LocalPath)
                     If CheckResult IsNot Nothing Then
-                        Log("[Download] " & "File size detail of " & Uuid & "# :")
+                        Log("[Download] " & Uuid & "# 的下载线程细节：")
                         For Each Th As NetThread In Threads
-                            Log("[Download] " & Th.Uuid & "#, State " & GetStringFromEnum(CType(Th.State, [Enum])) & ", Range " & Th.DownloadStart & "~" & (Th.DownloadStart + Th.DownloadDone) & ", Left " & Th.DownloadUndone)
+                            Log("[Download] " & Th.Uuid & "#，状态 " & GetStringFromEnum(CType(Th.State, [Enum])) & "，字节范围 " & Th.DownloadStart & "~" & (Th.DownloadStart + Th.DownloadDone) & "，字节剩余 " & Th.DownloadUndone)
                         Next
                         Throw New Exception(CheckResult)
                     End If

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

@@ -28,7 +28,7 @@ Public Class MyBitmap
     Public Shared Widening Operator CType(Image As MyBitmap) As ImageSource
         Dim Bitmap = Image.Pic
         Dim rect = New System.Drawing.Rectangle(0, 0, Bitmap.Width, Bitmap.Height)
-        Dim bitmapData = Bitmap.LockBits(rect, System.Drawing.Imaging.ImageLockMode.ReadWrite, System.Drawing.Imaging.PixelFormat.Format32bppArgb)
+        Dim bitmapData = Bitmap.LockBits(rect, ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb)
         Try
             Dim size = rect.Width * rect.Height * 4
             Return BitmapSource.Create(Bitmap.Width, Bitmap.Height, Bitmap.HorizontalResolution, Bitmap.VerticalResolution, PixelFormats.Bgra32, Nothing, bitmapData.Scan0, size, bitmapData.Stride)
@@ -104,45 +104,27 @@ Public Class MyBitmap
         End Using
     End Sub
 
-    ''' <summary>
-    ''' 获取旋转的图片，这个方法不会导致原对象改变且会返回一个新的对象。图片长宽必须相等。
-    ''' </summary>
-    ''' <param name="angle">旋转角度（单位为角度）。</param>
-    Public Function Rotation(angle As Double) As System.Drawing.Bitmap
-        Dim img As System.Drawing.Image = Me.Pic
-        Dim bitSize As Single = img.Width
-        Dim bmp As New System.Drawing.Bitmap(CInt(bitSize), CInt(bitSize), img.PixelFormat)
-        bmp.SetResolution(img.HorizontalResolution, img.VerticalResolution)
-        Using g As System.Drawing.Graphics = System.Drawing.Graphics.FromImage(bmp)
-            g.InterpolationMode = System.Drawing.Drawing2D.InterpolationMode.NearestNeighbor
-            g.TranslateTransform(bitSize / 2, bitSize / 2)
-            g.RotateTransform(angle)
-            g.TranslateTransform(-bitSize / 2, -bitSize / 2)
-            g.DrawImage(img, New System.Drawing.Rectangle(0, 0, img.Width, img.Width))
-        End Using
-        Return bmp
-    End Function
-
     ''' <summary>
     ''' 获取裁切的图片，这个方法不会导致原对象改变且会返回一个新的对象。
     ''' </summary>
-    Public Function Clip(rect As System.Drawing.Rectangle) As System.Drawing.Bitmap
-        Dim img As System.Drawing.Image = Pic
-        Dim bmp As New System.Drawing.Bitmap(rect.Width, rect.Height, img.PixelFormat)
-        bmp.SetResolution(img.HorizontalResolution, img.VerticalResolution)
+    Public Function Clip(X As Integer, Y As Integer, Width As Integer, Height As Integer) As MyBitmap
+        Dim bmp As New System.Drawing.Bitmap(Width, Height, Pic.PixelFormat)
+        bmp.SetResolution(Pic.HorizontalResolution, Pic.VerticalResolution)
         Using g As System.Drawing.Graphics = System.Drawing.Graphics.FromImage(bmp)
             g.InterpolationMode = System.Drawing.Drawing2D.InterpolationMode.NearestNeighbor
-            g.DrawImageUnscaled(img, rect.X, rect.Y)
+            g.TranslateTransform(-X, -Y)
+            g.DrawImage(Pic, New System.Drawing.Rectangle(0, 0, Pic.Width, Pic.Height))
         End Using
         Return bmp
     End Function
 
     ''' <summary>
-    ''' 获取左右翻转的图片，这个方法不会导致原对象改变。
+    ''' 获取旋转或翻转后的图片，这个方法不会导致原对象改变且会返回一个新的对象。
     ''' </summary>
-    Public Function LeftRightFilp() As System.Drawing.Bitmap
+    Public Function RotateFlip(Type As System.Drawing.RotateFlipType) As MyBitmap
         Dim bmp As New System.Drawing.Bitmap(Pic)
-        bmp.RotateFlip(System.Drawing.RotateFlipType.RotateNoneFlipX)
+        bmp.SetResolution(Pic.HorizontalResolution, Pic.VerticalResolution)
+        bmp.RotateFlip(Type)
         Return bmp
     End Function
 
@@ -152,7 +134,7 @@ Public Class MyBitmap
     Public Sub Save(FilePath As String)
         Dim encoder As BitmapEncoder = New PngBitmapEncoder()
         encoder.Frames.Add(BitmapFrame.Create(Me))
-        Using fileStream = New System.IO.FileStream(FilePath, FileMode.Create)
+        Using fileStream As New FileStream(FilePath, FileMode.Create)
             encoder.Save(fileStream)
         End Using
     End Sub

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

@@ -385,7 +385,7 @@
         ''' <summary>
         ''' 将当前工程信息实例化为控件。
         ''' </summary>
-        Public Function ToCompItem(ShowMcVersionDesc As Boolean, ShowLoaderDesc As Boolean, Optional OnClick As MyCompItem.ClickEventHandler = Nothing) As MyCompItem
+        Public Function ToCompItem(ShowMcVersionDesc As Boolean, ShowLoaderDesc As Boolean) As MyCompItem
             '获取版本描述
             Dim GameVersionDescription As String
             If GameVersions Is Nothing OrElse GameVersions.Count = 0 Then
@@ -421,7 +421,7 @@
             Dim NewItem As New MyCompItem With {.Tag = Me}
             '整理 FinalName 与 ExNameList
             '检查下列代码时可以参考 #1567 的测试例
-            Dim FinalName As String
+            Dim FinalName As String = RawName
             Dim ExNameList As List(Of String)
             If TranslatedName = RawName Then
                 '没有中文翻译
@@ -434,7 +434,7 @@
                 Dim NormalNameList = New List(Of String)
                 For Each Name In NameLists
                     Dim LowerName As String = Name.ToLower
-                    If Name.ToUpper = Name Then
+                    If Name.ToUpper = Name AndAlso Name <> "FPS" AndAlso Name <> "HUD" Then
                         '缩写
                         ExNameList.Add(Name)
                     ElseIf (LowerName.Contains("forge") OrElse LowerName.Contains("fabric") OrElse LowerName.Contains("quilt")) AndAlso
@@ -476,7 +476,7 @@
             '显示 FinalName 与 ExNameList
             If ExNameList.Count = 0 Then
 NoExName:
-                NewItem.LabTitle.Text = RawName
+                NewItem.LabTitle.Text = FinalName
                 CType(NewItem.LabTitleRaw.Parent, StackPanel).Children.Remove(NewItem.LabTitleRaw)
             Else
                 NewItem.LabTitle.Text = FinalName
@@ -487,8 +487,10 @@ NoExName:
                     '将 “Forge” 等提示改为 “Forge 版”
                     If (Ex.ToLower.Contains("forge") OrElse Ex.ToLower.Contains("fabric") OrElse Ex.ToLower.Contains("quilt")) AndAlso Not Ex.Contains("版") AndAlso
                         Ex.ToLower.Replace("forge", "").Replace("fabric", "").Replace("quilt", "").Length <= 3 Then
-                        Ex = Ex.Replace("Edition", "").Trim.Capitalize & " 版"
+                        Ex = Ex.Replace("Edition", "").Replace("edition", "").Trim.Capitalize & " 版"
                     End If
+                    '将 “forge” 等词语的首字母大写
+                    Ex = Ex.Replace("forge", "Forge").Replace("neo", "Neo").Replace("fabric", "Fabric").Replace("quilt", "Quilt")
                     ExName &= "  |  " & Ex.Trim
                 Next
                 If ExName = "" Then GoTo NoExName
@@ -565,12 +567,6 @@ NoExName:
             Else
                 NewItem.Logo = LogoUrl
             End If
-            If OnClick IsNot Nothing Then
-                AddHandler NewItem.Click, OnClick
-                NewItem.HasAnimation = True
-            Else
-                NewItem.HasAnimation = False
-            End If
             Return NewItem
         End Function
 
@@ -933,7 +929,10 @@ Retry:
                             Next
                             '更新结果
                             SyncLock ResultsLock
-                                RawResults.AddRange(ProjectList)
+                                For Each Project In ProjectList
+                                    If Task.Input.Type = CompType.Mod AndAlso Not Project.ModLoaders.Any() Then Continue For '过滤插件（#2458）
+                                    RawResults.Add(Project)
+                                Next
                             End SyncLock
                             Storage.ModrinthOffset += ProjectList.Count
                             Storage.ModrinthTotal = RequestResult("total_hits").ToObject(Of Integer)
@@ -988,7 +987,7 @@ Retry:
                                                   Not Storage.Results.Any(Function(b) r.IsLike(b))).ToList
         '加入列表
         RealResults.AddRange(RawResults)
-        Log($"[Comp] 去重后累计新增结果 {RealResults.Count} 个")
+        Log($"[Comp] 去重、筛选后累计新增结果 {RealResults.Count} 个")
 
 #End Region
 
@@ -1372,7 +1371,7 @@ Retry:
     ''' <summary>
     ''' 预载包含大量 CompFile 的卡片，添加必要的元素和前置 Mod 列表。
     ''' </summary>
-    Public Sub CompFilesCardPreload(Stack As StackPanel, Files As List(Of CompFile), OnClick As MyListItem.ClickEventHandler)
+    Public Sub CompFilesCardPreload(Stack As StackPanel, Files As List(Of CompFile))
         '获取卡片对应的前置 ID
         '如果为整合包就不会有 Dependencies 信息，所以不用管
         Dim Deps As List(Of String) = Files.SelectMany(Function(f) f.Dependencies).Distinct.ToList()
@@ -1386,7 +1385,7 @@ Retry:
         Stack.Children.Add(New TextBlock With {.Text = "前置 Mod", .FontSize = 14, .HorizontalAlignment = HorizontalAlignment.Left, .Margin = New Thickness(6, 2, 0, 5)})
         '添加前置 Mod 列表
         For Each Dep In Deps
-            Dim Item = CompProjectCache(Dep).ToCompItem(False, False, AddressOf FrmDownloadMod.ProjectClick)
+            Dim Item = CompProjectCache(Dep).ToCompItem(False, False)
             Stack.Children.Add(Item)
         Next
         '添加结尾间隔

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

@@ -127,7 +127,7 @@
         End Try
 
         '导入其中的日志文件
-        For Each TargetFile As FileInfo In New DirectoryInfo(TempFolder & "Temp\").EnumerateFiles
+        For Each TargetFile As FileInfo In New DirectoryInfo(TempFolder & "Temp\").EnumerateFiles.ToList()
             Try
                 If Not TargetFile.Exists OrElse TargetFile.Length = 0 Then Continue For
                 Dim Ext As String = TargetFile.Extension.ToLower
@@ -137,6 +137,8 @@
                     Else
                         AnalyzeRawFiles.Add(New KeyValuePair(Of String, String())(TargetFile.FullName, ReadFile(TargetFile.FullName, Encoding.UTF8).Split(vbCrLf.ToCharArray)))
                     End If
+                Else
+                    File.Delete(TargetFile.FullName)
                 End If
             Catch ex As Exception
                 Log(ex, "导入单个日志文件失败")
@@ -235,6 +237,7 @@
                         End If
                     Case AnalyzeFileType.MinecraftLog
                         LogMc = ""
+                        LogMcDebug = ""
                         '创建文件名词典
                         Dim FileNameDict As New Dictionary(Of String, KeyValuePair(Of String, String()))
                         For Each SelectedFile In SelectedFiles
@@ -272,11 +275,21 @@
                                 Exit For
                             End If
                         Next
+                        '查找 Debug Log
+                        For Each FileName As String In {"debug.log", "debug log.txt"}
+                            If FileNameDict.ContainsKey(FileName) Then
+                                Dim CurrentLog = FileNameDict(FileName)
+                                LogMcDebug += GetHeadTailLines(CurrentLog.Value, 1000, 0)
+                                Log("[Crash] 导入分析：" & CurrentLog.Key & "，作为 Minecraft Debug 日志")
+                                Exit For
+                            End If
+                        Next
                         '检查错误
                         If LogMc = "" Then
                             LogMc = Nothing
                             Throw New Exception("无法找到匹配的 Minecraft Log")
                         End If
+                        If LogMcDebug = "" Then LogMcDebug = Nothing
                     Case AnalyzeFileType.ExtraLog
                         '全部丢过去
                         For Each SelectedFile In SelectedFiles
@@ -294,7 +307,7 @@
         If ResultCount = 0 Then
             Log("[Crash] 步骤 2：准备日志文本完成，没有任何可供分析的日志")
         Else
-            Log(("[Crash] 步骤 2：准备日志文本完成，找到" & If(LogMc Is Nothing, "", "游戏日志、") & If(LogHs Is Nothing, "", "虚拟机日志、") & If(LogCrash Is Nothing, "", "崩溃日志、")).TrimEnd("、") & "用作分析")
+            Log(("[Crash] 步骤 2：准备日志文本完成，找到" & If(LogMc Is Nothing, "", "游戏日志、") & If(LogMcDebug Is Nothing, "", "游戏 Debug 日志、") & If(LogHs Is Nothing, "", "虚拟机日志、") & If(LogCrash Is Nothing, "", "崩溃日志、")).TrimEnd("、") & "用作分析")
         End If
         Return ResultCount
 
@@ -315,7 +328,7 @@
     End Function
 
     '3：根据文本分析崩溃原因
-    Private LogMc As String = Nothing, LogHs As String = Nothing, LogCrash As String = Nothing
+    Private LogMc As String = Nothing, LogMcDebug As String = Nothing, LogHs As String = Nothing, LogCrash As String = Nothing
     Private LogAll As String
     '可能导致崩溃的原因与附加信息
     Private CrashReasons As New Dictionary(Of CrashReason, List(Of String))
@@ -324,6 +337,7 @@
     ''' </summary>
     Private Enum CrashReason
         Mod文件被解压
+        MixinBootstrap缺失
         内存不足
         使用JDK
         显卡不支持OpenGL
@@ -344,9 +358,8 @@
         ModMixin失败
         Mod加载器报错
         Mod初始化失败
-        崩溃日志堆栈分析发现关键字
-        崩溃日志堆栈分析发现Mod名称
-        MC日志堆栈分析发现关键字
+        堆栈分析发现关键字
+        堆栈分析发现Mod名称
         OptiFine导致无法加载世界 'https://www.minecraftforum.net/forums/support/java-edition-support/3051132-exception-ticking-world
         特定方块导致崩溃
         特定实体导致崩溃
@@ -372,7 +385,7 @@
     ''' </summary>
     Public Sub Analyze(Optional Version As McVersion = Nothing)
         Log("[Crash] 步骤 3：分析崩溃原因")
-        LogAll = (If(LogMc, "") & If(LogHs, "") & If(LogCrash, "")).ToLower
+        LogAll = (If(LogMc, "") & If(LogMcDebug, "") & If(LogHs, "") & If(LogCrash, ""))
 
         '1. 精准日志匹配，中/高优先级
         AnalyzeCrit1()
@@ -381,37 +394,40 @@
         If CrashReasons.Count > 0 Then GoTo Done
 
         '2. 堆栈分析
-        If LogAll.Contains("forge") OrElse LogAll.Contains("fabric") OrElse LogAll.Contains("liteloader") Then
-            '来源崩溃日志的分析
+        If LogAll.Contains("orge") OrElse LogAll.Contains("abric") OrElse LogAll.Contains("uilt") OrElse LogAll.Contains("iteloader") Then
+            Dim Keywords As New List(Of String)
+            '崩溃日志
             If LogCrash IsNot Nothing Then
                 Log("[Crash] 开始进行崩溃日志堆栈分析")
                 Dim StackLogs As String = LogCrash.Split("System Details").First
-                Dim Keywords = AnalyzeStackKeyword(StackLogs)
-                If Keywords.Count > 0 Then
-                    Dim Names = AnalyzeModName(Keywords)
-                    If Names Is Nothing Then
-                        AppendReason(CrashReason.崩溃日志堆栈分析发现关键字, Keywords)
-                    Else
-                        AppendReason(CrashReason.崩溃日志堆栈分析发现Mod名称, Names)
-                    End If
-                    GoTo Done
-                End If
+                Keywords.AddRange(AnalyzeStackKeyword(StackLogs))
             End If
-            '来自 Minecraft 日志的分析
+            'Minecraft 日志
             If LogMc IsNot Nothing Then
                 Dim Fatals = RegexSearch(LogMc, "/FATAL] [\w\W]+?(?=[\n]+\[)")
                 Log("[Crash] 开始进行 Minecraft 日志堆栈分析，发现 " & Fatals.Count & " 个报错项")
                 If Fatals.Count > 0 Then
-                    Dim Keywords As New List(Of String)
                     For Each Fatal In Fatals
                         Keywords.AddRange(AnalyzeStackKeyword(Fatal))
                     Next
-                    If Keywords.Count > 0 Then
-                        AppendReason(CrashReason.MC日志堆栈分析发现关键字, Keywords.Distinct.ToList)
-                        GoTo Done
-                    End If
                 End If
             End If
+            '虚拟机日志
+            If LogHs IsNot Nothing Then
+                Log("[Crash] 开始进行虚拟机堆栈分析")
+                Dim StackLogs As String = LogHs.Split("Registers:").First.Split("T H R E A D").Last
+                Keywords.AddRange(AnalyzeStackKeyword(StackLogs))
+            End If
+            'Mod 名称分析
+            If Keywords.Count > 0 Then
+                Dim Names = AnalyzeModName(Keywords)
+                If Names Is Nothing Then
+                    AppendReason(CrashReason.堆栈分析发现关键字, Keywords)
+                Else
+                    AppendReason(CrashReason.堆栈分析发现Mod名称, Names)
+                End If
+                GoTo Done
+            End If
         Else
             Log("[Crash] 可能并未安装 Mod，不进行堆栈分析")
         End If
@@ -485,6 +501,7 @@ Done:
             If LogMc.Contains("java.lang.ClassNotFoundException: java.lang.invoke.LambdaMetafactory") Then AppendReason(CrashReason.Java版本过高)
             If LogMc.Contains("The directories below appear to be extracted jar files. Fix this before you continue.") Then AppendReason(CrashReason.Mod文件被解压)
             If LogMc.Contains("Extracted mod jars found, loading will NOT continue") Then AppendReason(CrashReason.Mod文件被解压)
+            If LogMc.Contains("java.lang.ClassNotFoundException: org.spongepowered.asm.launch.MixinTweaker") Then AppendReason(CrashReason.MixinBootstrap缺失)
             If LogMc.Contains("Couldn't set pixel format") Then AppendReason(CrashReason.显卡驱动不支持导致无法设置像素格式)
             If LogMc.Contains("java.lang.OutOfMemoryError") Then AppendReason(CrashReason.内存不足)
             If LogMc.Contains("java.lang.RuntimeException: Shaders Mod detected. Please remove it, OptiFine has built-in support for shaders.") Then AppendReason(CrashReason.ShadersMod与Optifine同时安装)
@@ -499,6 +516,7 @@ Done:
             If LogMc.Contains("Invalid module name: '' is not a Java identifier") Then AppendReason(CrashReason.Mod名称包含特殊字符)
             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 major.minor 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
@@ -563,22 +581,6 @@ Done:
 
         '游戏日志分析
         If LogMc IsNot Nothing Then
-            'Mixin 崩溃
-            If LogMc.Contains("Mixin prepare failed ") OrElse LogMc.Contains("Mixin apply failed ") OrElse LogMc.Contains("MixinApplyError") OrElse
-               LogMc.Contains("mixin.injection.throwables.") OrElse LogMc.Contains(".mixins.json] FAILED during )") Then
-                Dim ModId As String = RegexSeek(LogMc, "(?<=in )[^./ ]+(?=.mixins.json.+failed injection check)")
-                If ModId Is Nothing Then ModId = RegexSeek(LogMc, "(?<=in mixins.)[^./ ]+(?=.json.+failed injection check)")
-                If ModId Is Nothing Then ModId = RegexSeek(LogMc, "(?<= failed .+ in )[^./ ]+(?=.mixins.json)")
-                If ModId Is Nothing Then ModId = RegexSeek(LogMc, "(?<= failed .+ in mixins.)[^./ ]+(?=.json)")
-                If ModId Is Nothing Then ModId = RegexSeek(LogMc, "(?<= in config \[)[^./ ]+(?=.mixins.json\] FAILED during )")
-                If ModId Is Nothing Then ModId = RegexSeek(LogMc, "(?<= in config \[mixins.)[^./ ]+(?=.json\] FAILED during )")
-                If ModId Is Nothing Then ModId = RegexSeek(LogMc, "(?<=from mod )[^./ ]+(?=\] from)")
-                If ModId Is Nothing Then ModId = RegexSeek(LogMc, "(?<=for mod )[^./ ]+(?= failed)")
-                '兜底名称判断
-                If ModId Is Nothing Then ModId = RegexSeek(LogMc, "[^./ \]]+(?=.mixins.json")
-                If ModId Is Nothing Then ModId = RegexSeek(LogMc, "(?<=mixins.)[^./ \]]+(?=.json")
-                AppendReason(CrashReason.ModMixin失败, TryAnalyzeModName(If(ModId, "").TrimEnd((vbCrLf & " ").ToCharArray)))
-            End If
             '常规信息
             If LogMc.Contains("An exception was thrown, the game will display an error screen and halt.") Then AppendReason(CrashReason.Forge报错, RegexSeek(LogMc, "(?<=the game will display an error screen and halt.[\n\r]+[^\n]+?Exception: )[\s\S]+?(?=\n\tat)")?.Trim(vbCrLf))
             If LogMc.Contains("A potential solution has been determined:") Then AppendReason(CrashReason.Fabric报错并给出解决方案, Join(RegexSearch(If(RegexSeek(LogMc, "(?<=A potential solution has been determined:\n)((\t)+ - [^\n]+\n)+"), ""), "(?<=(\t)+)[^\n]+"), vbLf))
@@ -592,6 +594,24 @@ Done:
 
         '游戏日志分析
         If LogMc IsNot Nothing Then
+            'Mixin 崩溃
+            If LogMc.Contains("Mixin prepare failed ") OrElse LogMc.Contains("Mixin apply failed ") OrElse LogMc.Contains("MixinApplyError") OrElse
+               LogMc.Contains("mixin.injection.throwables.") OrElse LogMc.Contains(".mixins.json] FAILED during )") Then
+                Dim ModId As String = RegexSeek(LogMc, "(?<=in )[^./ ]+(?=.mixins.json.+failed injection check)")
+                If ModId Is Nothing Then ModId = RegexSeek(LogMc, "(?<=in mixins.)[^./ ]+(?=.json.+failed injection check)")
+                If ModId Is Nothing Then ModId = RegexSeek(LogMc, "(?<= failed .+ in )[^./ ]+(?=.mixins.json)")
+                If ModId Is Nothing Then ModId = RegexSeek(LogMc, "(?<= failed .+ in mixins.)[^./ ]+(?=.json)")
+                If ModId Is Nothing Then ModId = RegexSeek(LogMc, "(?<= failed mixins.)[^./ ]+(?=.json:)")
+                If ModId Is Nothing Then ModId = RegexSeek(LogMc, "(?<= in config \[)[^./ ]+(?=.mixins.json\] FAILED during )")
+                If ModId Is Nothing Then ModId = RegexSeek(LogMc, "(?<= in config \[mixins.)[^./ ]+(?=.json\] FAILED during )")
+                If ModId Is Nothing Then ModId = RegexSeek(LogMc, "(?<=from mod )[^./ ]+(?=\] from)")
+                If ModId Is Nothing Then ModId = RegexSeek(LogMc, "(?<=for mod )[^./ ]+(?= failed)")
+                '兜底名称判断
+                If ModId Is Nothing Then ModId = RegexSeek(LogMc, "[^./ \]]+(?=.mixins.json)")
+                If ModId Is Nothing Then ModId = RegexSeek(LogMc, "(?<=mixins.)[^./ \]]+(?=.json)")
+                AppendReason(CrashReason.ModMixin失败, TryAnalyzeModName(If(ModId, "").TrimEnd((vbCrLf & " ").ToCharArray)))
+            End If
+            '极短的程序输出
             If Not (LogMc.Contains("at net.") OrElse LogMc.Contains("INFO]")) AndAlso LogHs Is Nothing AndAlso LogCrash Is Nothing AndAlso LogMc.Length < 100 Then
                 AppendReason(CrashReason.极短的程序输出, LogMc)
             End If
@@ -647,8 +667,9 @@ NextStack:
                     "core", "init", "mods", "main", "file", "game", "load", "read", "done", "util", "tile", "item", "base", "oshi",
                     "forge", "setup", "block", "model", "mixin", "event", "unimi", "netty",
                     "common", "server", "config", "loader", "launch", "entity", "assist", "client", "plugin", "modapi", "mojang", "shader", "events", "github", "recipe",
-                    "preinit", "preload", "machine", "reflect", "channel", "general", "handler", "content",
-                    "fastutil", "optifine", "scheduler", "minecraft", "transformers", "universal", "internal", "multipart", "minecraftforge", "override", "blockentity", "platform"
+                    "preinit", "preload", "machine", "reflect", "channel", "general", "handler", "content", "systems", "modules",
+                    "fastutil", "optifine", "internal", "platform", "override",
+                    "listeners", "scheduler", "minecraft", "transformers", "universal", "multipart", "minecraftforge", "blockentity"
                    }.Contains(Word.ToLower) Then Continue For
                 PossibleWords.Add(Word.Trim)
             Next
@@ -665,7 +686,7 @@ NextStack:
 
     End Function
     ''' <summary>
-    ''' 根据 Mod 关键词与详细信息（崩溃报告第二部分）与，获取实际的 Mod 名称。
+    ''' 根据 Mod 关键词尝试获取实际的 Mod 名称。
     ''' 若失败则返回 Nothing。
     ''' </summary>
     Private Function AnalyzeModName(Keywords As List(Of String)) As List(Of String)
@@ -680,60 +701,95 @@ NextStack:
         Next
         Keywords = RealKeywords
 
-        '获取崩溃报告对应部分
-        If LogCrash Is Nothing Then Return Nothing
-        If Not LogCrash.Contains("A detailed walkthrough of the error") Then Return Nothing
-        Dim Details As String = LogCrash.Replace("A detailed walkthrough of the error", "¨")
-        Dim IsFabricDetail As Boolean = Details.Contains("Fabric Mods") '是否为 Fabric 信息格式
-        If IsFabricDetail Then
-            Details = Details.Replace("Fabric Mods", "¨")
-            Log("[Crash] 检测到 Fabric Mod 信息格式")
-        End If
-        Details = Details.Split("¨").Last
-
-        '[Forge] 获取所有包含 .jar 的行
-        '[Fabric] 获取所有包含 Mod 信息的行
-        Dim ModNameLines As New List(Of String)
-        For Each Line In Details.Split(vbLf)
-            If Line.ToLower.Contains(".jar") OrElse
-               (IsFabricDetail AndAlso Line.StartsWith(vbTab & vbTab) AndAlso Not RegexCheck(Line, "\t\tfabric[\w-]*: Fabric")) Then ModNameLines.Add(Line)
-        Next
-        Log("[Crash] 找到 " & ModNameLines.Count & " 个可能的 Mod 项目行")
-
-        '获取 Mod ID 与关键词的匹配行
-        Dim HintLines As New List(Of String)
-        For Each KeyWord As String In Keywords
-            For Each ModString As String In ModNameLines
-                Dim RealModString As String = ModString.ToLower.Replace("_", "")
-                If Not RealModString.Contains(KeyWord.ToLower.Replace("_", "")) Then Continue For
-                If RealModString.Contains("minecraft.jar") OrElse RealModString.Contains(" forge-") OrElse RealModString.Contains(" mixin-") Then Continue For
-                HintLines.Add(ModString.Trim(vbCrLf.ToCharArray))
-                Exit For
-            Next
-        Next
-        HintLines = HintLines.Distinct.ToList
-        Log("[Crash] 找到 " & HintLines.Count & " 个可能的崩溃 Mod 匹配行")
-        For Each ModName As String In HintLines
-            Log("[Crash]  - " & ModName)
-        Next
-
-        '从 Mod 匹配行中提取 .jar 文件的名称
-        For Each Line As String In HintLines
-            Dim Name As String
+        '从崩溃报告获取 Mod 信息
+        If LogCrash IsNot Nothing AndAlso LogCrash.Contains("A detailed walkthrough of the error") Then
+            Dim Details As String = LogCrash.Replace("A detailed walkthrough of the error", "¨")
+            Dim IsFabricDetail As Boolean = Details.Contains("Fabric Mods") '是否为 Fabric 信息格式
             If IsFabricDetail Then
-                Name = RegexSeek(Line, "(?<=: )[^\n]+(?= [^\n]+)")
-            Else
-                Name = RegexSeek(Line, "(?<=\()[^\t]+.jar(?=\))|(?<=(\t\t)|(\| ))[^\t\|]+.jar", RegularExpressions.RegexOptions.IgnoreCase)
+                Details = Details.Replace("Fabric Mods", "¨")
+                Log("[Crash] 崩溃报告中检测到 Fabric Mod 信息格式")
             End If
-            If Name IsNot Nothing Then ModFileNames.Add(Name)
-        Next
-        ModFileNames = ModFileNames.Distinct.ToList
-        Log("[Crash] 找到 " & ModFileNames.Count & " 个可能的崩溃 Mod 文件名")
-        For Each ModFileName As String In ModFileNames
-            Log("[Crash]  - " & ModFileName)
-        Next
+            Details = Details.Split("¨").Last
 
-        Return If(ModFileNames.Count = 0, Nothing, ModFileNames)
+            '[Forge] 获取所有包含 .jar 的行
+            '[Fabric] 获取所有包含 Mod 信息的行
+            Dim ModNameLines As New List(Of String)
+            For Each Line In Details.Split(vbLf)
+                If Line.ToLower.Contains(".jar") OrElse
+                   (IsFabricDetail AndAlso Line.StartsWith(vbTab & vbTab) AndAlso Not RegexCheck(Line, "\t\tfabric[\w-]*: Fabric")) Then ModNameLines.Add(Line)
+            Next
+            Log("[Crash] 崩溃报告中找到 " & ModNameLines.Count & " 个可能的 Mod 项目行")
+
+            '获取 Mod ID 与关键词的匹配行
+            Dim HintLines As New List(Of String)
+            For Each KeyWord As String In Keywords
+                For Each ModString As String In ModNameLines
+                    Dim RealModString As String = ModString.ToLower.Replace("_", "")
+                    If Not RealModString.Contains(KeyWord.ToLower.Replace("_", "")) Then Continue For
+                    If RealModString.Contains("minecraft.jar") OrElse RealModString.Contains(" forge-") OrElse RealModString.Contains(" mixin-") Then Continue For
+                    HintLines.Add(ModString.Trim(vbCrLf.ToCharArray))
+                    Exit For
+                Next
+            Next
+            HintLines = HintLines.Distinct.ToList
+            Log("[Crash] 崩溃报告中找到 " & HintLines.Count & " 个可能的崩溃 Mod 匹配行")
+            For Each ModLine As String In HintLines
+                Log("[Crash]  - " & ModLine)
+            Next
+
+            '从 Mod 匹配行中提取 .jar 文件的名称
+            For Each Line As String In HintLines
+                Dim Name As String
+                If IsFabricDetail Then
+                    Name = RegexSeek(Line, "(?<=: )[^\n]+(?= [^\n]+)")
+                Else
+                    Name = RegexSeek(Line, "(?<=\()[^\t]+.jar(?=\))|(?<=(\t\t)|(\| ))[^\t\|]+.jar", RegularExpressions.RegexOptions.IgnoreCase)
+                End If
+                If Name IsNot Nothing Then ModFileNames.Add(Name)
+            Next
+
+        End If
+
+        '从 debug.log 获取 Mod 信息
+        If LogMcDebug IsNot Nothing Then
+
+            'Forge: Found valid mod file YungsBetterStrongholds-1.20-Forge-4.0.1.jar with {betterstrongholds} mods - versions {1.20-Forge-4.0.1}
+            Dim ModNameLines As List(Of String) = RegexSearch(LogMcDebug, "(?<=valid mod file ).*", RegularExpressions.RegexOptions.Multiline)
+            Log("[Crash] Debug 信息中找到 " & ModNameLines.Count & " 个可能的 Mod 项目行")
+
+            '获取 Mod ID 与关键词的匹配行
+            Dim HintLines As New List(Of String)
+            For Each KeyWord As String In Keywords
+                For Each ModString As String In ModNameLines
+                    If ModString.Contains($"{{{KeyWord}}}") Then HintLines.Add(ModString)
+                Next
+            Next
+            HintLines = HintLines.Distinct.ToList
+            Log("[Crash] Debug 信息中找到 " & HintLines.Count & " 个可能的崩溃 Mod 匹配行")
+            For Each ModLine As String In HintLines
+                Log("[Crash]  - " & ModLine)
+            Next
+
+            '从 Mod 匹配行中提取 .jar 文件的名称
+            For Each Line As String In HintLines
+                Dim Name As String
+                Name = RegexSeek(Line, ".*(?= with)")
+                If Name IsNot Nothing Then ModFileNames.Add(Name)
+            Next
+
+        End If
+
+        '输出
+        ModFileNames = ModFileNames.Distinct.ToList
+        If ModFileNames.Count = 0 Then
+            Return Nothing
+        Else
+            Log("[Crash] 找到 " & ModFileNames.Count & " 个可能的崩溃 Mod 文件名")
+            For Each ModFileName As String In ModFileNames
+                Log("[Crash]  - " & ModFileName)
+            Next
+            Return ModFileNames
+        End If
     End Function
     ''' <summary>
     ''' 尝试获取 Mod 名称，若失败则返回原关键字。
@@ -813,9 +869,7 @@ NextStack:
             If IsHandAnalyze Then
                 Return "很抱歉，PCL 无法确定错误原因。"
             Else
-                Return "很抱歉，你的游戏出现了一些问题……" & vbCrLf &
-                       "如果要寻求帮助，请向他人发送错误报告文件，而不是发送这个窗口的截图。" & vbCrLf &
-                       "你也可以查看错误报告，其中可能会有出错的原因。"
+                Return $"很抱歉，你的游戏出现了一些问题……{vbCrLf}如果要寻求帮助，请导出错误报告并发给他人，而不是发送这个窗口的截图。"
             End If
         End If
 
@@ -838,25 +892,27 @@ NextStack:
                     Results.Add("游戏不兼容你当前使用的 Java。\n如果没有合适的 Java，可以从网络中下载、安装一个。")
                 Case CrashReason.Mod名称包含特殊字符
                     Results.Add("由于有 Mod 的名称包含特殊字符，导致游戏崩溃。\n请尝试修改 Mod 文件名，让它只包含英文字母、数字、减号（-）、下划线（_）和小数点，然后再启动游戏。")
+                Case CrashReason.MixinBootstrap缺失
+                    Results.Add("由于缺失 MixinBootstrap，导致游戏崩溃。\n请尝试安装 MixinBootstrap。若安装后依然崩溃，可以尝试在文件名前添加英文感叹号。")
                 Case CrashReason.使用32位Java导致JVM无法分配足够多的内存
                     If Environment.Is64BitOperatingSystem Then
                         Results.Add("你似乎正在使用 32 位 Java，这会导致 Minecraft 无法使用所需的内存，进而造成崩溃。\n\n请在启动设置的 Java 选择一项中改用 64 位的 Java 再启动游戏，然后再启动游戏。\n如果你没有安装 64 位的 Java，你可以从网络中下载、安装一个。")
                     Else
                         Results.Add("你正在使用 32 位的操作系统，这会导致 Minecraft 无法使用所需的内存，进而造成崩溃。\n\n你或许只能重装 64 位的操作系统来解决此问题。\n如果你的电脑内存在 2GB 以内，那或许只能换台电脑了……\h")
                     End If
-                Case CrashReason.崩溃日志堆栈分析发现关键字, CrashReason.MC日志堆栈分析发现关键字
-                    If Additional.Count = 1 Then
-                        Results.Add("你的游戏遇到了一些问题，这可能是某些 Mod 所引起的，PCL 找到了一个可疑的关键词：" & Additional.First & "。\n\n如果你知道它对应的 Mod，那么有可能就是它引起的错误，你也可以查看错误报告获取详情。\h")
-                    Else
-                        Results.Add("你的游戏遇到了一些问题，这可能是某些 Mod 所引起的，PCL 找到了以下可疑的关键词：\n - " & Join(Additional, ", ") & "\n\n如果你知道这些关键词对应的 Mod，那么有可能就是它引起的错误，你也可以查看错误报告获取详情。\h")
-                    End If
                 Case CrashReason.Mod缺少前置或MC版本错误
                     If Additional.Count > 0 Then
                         Results.Add("由于未满足 Mod 的依赖项，导致游戏退出。\n未满足的依赖项：\n - " & Join(Additional, "\n - ") & "\n\n请根据上述信息进行对应处理，如果看不懂英文可以使用翻译软件。")
                     Else
                         Results.Add("由于未满足 Mod 的依赖项，导致游戏退出。\n请根据错误报告中的日志信息进行对应处理，如果看不懂英文可以使用翻译软件。\h")
                     End If
-                Case CrashReason.崩溃日志堆栈分析发现Mod名称
+                Case CrashReason.堆栈分析发现关键字
+                    If Additional.Count = 1 Then
+                        Results.Add("你的游戏遇到了一些问题，这可能是某些 Mod 所引起的，PCL 找到了一个可疑的关键词：" & Additional.First & "。\n\n如果你知道它对应的 Mod，那么有可能就是它引起的错误，你也可以查看错误报告获取详情。\h")
+                    Else
+                        Results.Add("你的游戏遇到了一些问题，这可能是某些 Mod 所引起的，PCL 找到了以下可疑的关键词：\n - " & Join(Additional, ", ") & "\n\n如果你知道这些关键词对应的 Mod，那么有可能就是它引起的错误，你也可以查看错误报告获取详情。\h")
+                    End If
+                Case CrashReason.堆栈分析发现Mod名称
                     If Additional.Count = 1 Then
                         Results.Add("名为 " & Additional.First & " 的 Mod 可能导致了游戏出错。\n\e\h")
                     Else
@@ -909,7 +965,7 @@ NextStack:
                 Case CrashReason.ShadersMod与Optifine同时安装
                     Results.Add("无需同时安装 Optifine 和 Shaders Mod，Optifine 已经集成了 Shaders Mod 的功能。\n在删除 Shaders Mod 后，游戏即可正常运行。")
                 Case CrashReason.低版本Forge与高版本Java不兼容
-                    Results.Add("由于低版本 Forge 与当前 Java 不兼容，导致了游戏崩溃。\n\n请尝试以下解决方案：\n - 更新 Forge 到 36.2.26 或更高版本\n - 换用版本低于 8.0.320 的 Java")
+                    Results.Add("由于低版本 Forge 与当前 Java 不兼容，导致了游戏崩溃。\n\n请尝试以下解决方案：\n - 更新 Forge 到 36.2.26 或更高版本\n - 换用版本低于 1.8.0.320 的 Java")
                 Case CrashReason.版本Json中存在多个Forge
                     Results.Add("可能由于使用其他启动器修改了 Forge 版本，当前版本的文件存在异常，导致了游戏崩溃。\n请尝试重新全新安装 Forge，而非使用其他启动器修改 Forge 版本。")
                 Case CrashReason.玩家手动触发调试崩溃
@@ -928,7 +984,7 @@ NextStack:
                     End If
                 Case CrashReason.材质过大或显卡配置不足
                     Results.Add("你所使用的材质分辨率过高，或显卡配置不足，导致游戏无法继续运行。\n\n如果你正在使用高清材质，请将它移除。\n如果你没有使用材质，那么你可能需要更新显卡驱动，或者换个更好的显卡……\h")
-                Case CrashReason.材质过大或显卡配置不足
+                Case CrashReason.NightConfig的Bug
                     Results.Add("由于 Night Config 存在问题，导致了游戏崩溃。\n你可以尝试安装 Night Config Fixes 模组，这或许能解决此问题。\h")
                 Case CrashReason.光影或资源包导致OpenGL1282错误
                     Results.Add("你所使用的光影或材质导致游戏出现了一些问题……\n\n请尝试删除你所添加的这些额外资源。\h")

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

@@ -19,14 +19,7 @@
         Dim Checker As New FileChecker(MinSize:=1024, ActualSize:=If(Version.JsonObject("downloads")("client")("size"), -1), Hash:=Version.JsonObject("downloads")("client")("sha1"))
         If ReturnNothingOnFileUseable Then
             '是否跳过
-            Dim IsSetupSkip As Boolean = Setup.Get("LaunchAdvanceAssets")
-            Select Case Setup.Get("VersionAdvanceAssets", Version:=Version)
-                Case 0 '使用全局设置
-                Case 1 '开启
-                    IsSetupSkip = False
-                Case 2 '关闭
-                    IsSetupSkip = True
-            End Select
+            Dim IsSetupSkip As Boolean = ShouldIgnoreFileCheck(Version)
             If IsSetupSkip AndAlso File.Exists(Version.Path & Version.Name & ".jar") Then Return Nothing '跳过校验
             If Checker.Check(Version.Path & Version.Name & ".jar") Is Nothing Then Return Nothing '通过校验
         End If
@@ -52,7 +45,7 @@
         If IndexUrl = "" Then
             Return Nothing
         Else
-            Return New NetFile(DlSourceLauncherOrMetaGet(IndexUrl, False), IndexAddress, New FileChecker(CanUseExistsFile:=False, IsJson:=True))
+            Return New NetFile(DlSourceLauncherOrMetaGet(IndexUrl), IndexAddress, New FileChecker(CanUseExistsFile:=False, IsJson:=True))
         End If
     End Function
 
@@ -72,17 +65,7 @@
 #End Region
 
 #Region "下载资源文件"
-        Dim IsSetupSkip As Boolean = Setup.Get("LaunchAdvanceAssets")
-        Select Case Setup.Get("VersionAdvanceAssets", Version:=Version)
-            Case 0
-                '使用全局设置
-            Case 1
-                '开启
-                IsSetupSkip = False
-            Case 2
-                '关闭
-                IsSetupSkip = True
-        End Select
+        Dim IsSetupSkip As Boolean = ShouldIgnoreFileCheck(Version)
         If IsSetupSkip Then Log("[Download] 已跳过 Assets 下载")
         If (Not SkipAssetsDownloadWhileSetupRequired) OrElse Not IsSetupSkip Then
             Dim LoadersAssets As New List(Of LoaderBase)
@@ -960,34 +943,27 @@
 
     Public Function DlSourceResourceGet(MojangBase As String) As String()
         MojangBase = MojangBase.Replace("http://resources.download.minecraft.net", "https://resources.download.minecraft.net")
-        Return {MojangBase.Replace("https://resources.download.minecraft.net", "https://download.mcbbs.net/assets"),
+        Return {MojangBase.Replace("https://piston-data.mojang.com", "https://download.mcbbs.net/assets").Replace("https://piston-meta.mojang.com", "https://download.mcbbs.net/assets").Replace("https://resources.download.minecraft.net", "https://download.mcbbs.net/assets"),
                 MojangBase,
-                MojangBase.Replace("https://resources.download.minecraft.net", "https://bmclapi2.bangbang93.com/assets")
+                MojangBase.Replace("https://piston-data.mojang.com", "https://bmclapi2.bangbang93.com/assets").Replace("https://piston-meta.mojang.com", "https://bmclapi2.bangbang93.com/assets").Replace("https://resources.download.minecraft.net", "https://bmclapi2.bangbang93.com/assets")
                }
     End Function
 
     Public Function DlSourceLibraryGet(MojangBase As String) As String()
-        Return {MojangBase.Replace("https://libraries.minecraft.net", "https://download.mcbbs.net/maven"),
-                MojangBase.Replace("https://libraries.minecraft.net", "https://download.mcbbs.net/libraries"),
+        Return {MojangBase.Replace("https://piston-data.mojang.com", "https://download.mcbbs.net/maven").Replace("https://piston-meta.mojang.com", "https://download.mcbbs.net/maven").Replace("https://libraries.minecraft.net", "https://download.mcbbs.net/maven"),
+                MojangBase.Replace("https://piston-data.mojang.com", "https://download.mcbbs.net/libraries").Replace("https://piston-meta.mojang.com", "https://download.mcbbs.net/libraries").Replace("https://libraries.minecraft.net", "https://download.mcbbs.net/libraries"),
                 MojangBase,
-                MojangBase.Replace("https://libraries.minecraft.net", "https://bmclapi2.bangbang93.com/maven"),
-                MojangBase.Replace("https://libraries.minecraft.net", "https://bmclapi2.bangbang93.com/libraries")
+                MojangBase.Replace("https://piston-data.mojang.com", "https://bmclapi2.bangbang93.com/maven").Replace("https://piston-meta.mojang.com", "https://bmclapi2.bangbang93.com/maven").Replace("https://libraries.minecraft.net", "https://bmclapi2.bangbang93.com/maven"),
+                MojangBase.Replace("https://piston-data.mojang.com", "https://bmclapi2.bangbang93.com/libraries").Replace("https://piston-meta.mojang.com", "https://bmclapi2.bangbang93.com/libraries").Replace("https://libraries.minecraft.net", "https://bmclapi2.bangbang93.com/libraries")
                }
     End Function
 
-    Public Function DlSourceLauncherOrMetaGet(MojangBase As String, Optional IsStatic As Boolean = True) As String()
+    Public Function DlSourceLauncherOrMetaGet(MojangBase As String) As String()
         If MojangBase Is Nothing Then Throw New Exception("无对应的 json 下载地址")
-        If IsStatic Then
-            Return {MojangBase.Replace("https://launcher.mojang.com", "https://download.mcbbs.net").Replace("https://launchermeta.mojang.com", "https://download.mcbbs.net"),
-                    MojangBase,
-                    MojangBase.Replace("https://launcher.mojang.com", "https://bmclapi2.bangbang93.com").Replace("https://launchermeta.mojang.com", "https://bmclapi2.bangbang93.com")
-                   }
-        Else
-            Return {MojangBase.Replace("https://launcher.mojang.com", "https://download.mcbbs.net").Replace("https://launchermeta.mojang.com", "https://download.mcbbs.net"),
-                    MojangBase,
-                    MojangBase.Replace("https://launcher.mojang.com", "https://bmclapi2.bangbang93.com").Replace("https://launchermeta.mojang.com", "https://bmclapi2.bangbang93.com")
-                   }
-        End If
+        Return {MojangBase.Replace("https://piston-data.mojang.com", "https://download.mcbbs.net").Replace("https://piston-meta.mojang.com", "https://download.mcbbs.net").Replace("https://launcher.mojang.com", "https://download.mcbbs.net").Replace("https://launchermeta.mojang.com", "https://download.mcbbs.net"),
+                MojangBase,
+                MojangBase.Replace("https://piston-data.mojang.com", "https://bmclapi2.bangbang93.com").Replace("https://piston-meta.mojang.com", "https://bmclapi2.bangbang93.com").Replace("https://launcher.mojang.com", "https://bmclapi2.bangbang93.com").Replace("https://launchermeta.mojang.com", "https://bmclapi2.bangbang93.com")
+               }
     End Function
 
     Private Sub DlSourceLoader(Of InputType, OutputType)(MainLoader As LoaderTask(Of InputType, OutputType),

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

@@ -111,8 +111,9 @@
                 IsJre = Not File.Exists(PathFolder & "javac.exe")
                 '运行 -version
                 Output = ShellAndGetOutput(PathFolder & "java.exe", "-version", 15000).ToLower
-                If Output = "" Then Throw New Exception("尝试运行该 Java 失败")
+                If Output = "" Then Throw New ApplicationException("尝试运行该 Java 失败")
                 If ModeDebug Then Log("[Java] Java 检查输出：" & PathFolder & "java.exe" & vbCrLf & Output)
+                If Output.Contains("/lib/ext exists") Then Throw New ApplicationException("无法运行该 Java，请在删除 Java 文件夹中的 /lib/ext 文件夹后再试")
                 '获取详细信息
                 Dim VersionString = If(RegexSeek(Output, "(?<=version "")[^""]+"), If(RegexSeek(Output, "(?<=openjdk )[0-9]+"), "")).Replace("_", ".").Split("-").First
                 Do While VersionString.Split(".").Count < 4
@@ -122,6 +123,7 @@
                         VersionString = "1." & VersionString
                     End If
                 Loop
+                If VersionString = "" Then Throw New ApplicationException($"未找到该 Java 的版本号{If(Output.Length < 500, $"{vbCrLf}输出为：{vbCrLf}{Output}", "")}")
                 Version = New Version(VersionString)
                 If Version.Minor = 0 Then
                     Log("[Java] 疑似 X.0.X.X 格式版本号：" & Version.ToString)
@@ -129,10 +131,10 @@
                 End If
                 Is64Bit = Output.Contains("64-bit")
                 If Version.Minor <= 4 OrElse Version.Minor >= 25 Then Throw New Exception("分析详细信息失败，获取的版本为 " & Version.ToString)
-                '基于 #2249 发现的 JRE 17 似乎也导致了 Forge 安装失败，干脆禁用更多版本的 JRE
-                If IsJre AndAlso VersionCode >= 16 Then Throw New Exception("由于高版本 JRE 对 Minecraft 的兼容性很差，因此不再允许使用")
-                ''无论如何不允许使用 JRE 16，它完全是炸的，安 OptiFine、Forge 和启动 MC 都会炸
-                'If IsJre AndAlso VersionCode = 16 Then Throw New Exception("由于 JRE 16 对 Minecraft 的兼容性很差，因此不再允许使用")
+                '基于 #2249 发现 JRE 17 似乎也导致了 Forge 安装失败，干脆禁用更多版本的 JRE
+                If IsJre AndAlso VersionCode >= 16 Then Throw New Exception("由于高版本 JRE 对游戏的兼容性很差，因此不再允许使用。你可以使用对应版本的 JDK，而非 JRE！")
+            Catch ex As ApplicationException
+                Throw ex
             Catch ex As Exception
                 Log("[Java] 检查失败的 Java 输出：" & PathFolder & "java.exe" & vbCrLf & If(Output, "无程序输出"))
                 Throw New Exception("检查 Java 失败（" & If(PathJavaw, "Nothing") & "）", ex)
@@ -324,9 +326,9 @@ RetryGet:
                 Requirement = "需要 Java " & If(Left = Right, Left, Left & " ~ " & Right)
             End If
             Dim JavaCurrent As String = UserJava.VersionCode & If(ShowRevision, "." & UserJava.Version.MajorRevision & "." & UserJava.Version.MinorRevision, "")
-            If Setup.Get("LaunchAdvanceJava") Then
+            If Setup.Get("LaunchAdvanceJava") OrElse (RelatedVersion IsNot Nothing AndAlso Setup.Get("VersionAdvanceJava", RelatedVersion)) Then
                 '直接跳过弹窗
-                Hint("设置中指定了使用 Java " & JavaCurrent & "，但当前版本" & Requirement & "，这可能会导致游戏崩溃！", HintType.Critical)
+                Log("[Java] 设置中指定了使用 Java " & JavaCurrent & "，但当前版本" & Requirement & "，这可能会导致游戏崩溃！", LogLevel.Debug)
                 AllowedJavaList = New List(Of JavaEntry) From {UserJava}
             Else
                 Select Case MyMsgBox("你在设置中手动指定了使用 Java " & JavaCurrent & "，但当前" & Requirement & "。" & vbCrLf &
@@ -659,7 +661,7 @@ Wait:
                         SearchEntry.Contains("java") OrElse SearchEntry.Contains("jdk") OrElse SearchEntry.Contains("env") OrElse
                         SearchEntry.Contains("环境") OrElse SearchEntry.Contains("run") OrElse SearchEntry.Contains("软件") OrElse
                         SearchEntry.Contains("jre") OrElse SearchEntry = "bin" OrElse SearchEntry.Contains("mc") OrElse
-                        SearchEntry.Contains("software") OrElse SearchEntry.Contains("cache") OrElse SearchEntry.Contains("temp") OrElse
+                        SearchEntry.Contains("soft") OrElse SearchEntry.Contains("cache") OrElse SearchEntry.Contains("temp") OrElse
                         SearchEntry.Contains("corretto") OrElse SearchEntry.Contains("roaming") OrElse SearchEntry.Contains("users") OrElse
                         SearchEntry.Contains("craft") OrElse SearchEntry.Contains("program") OrElse SearchEntry.Contains("世界") OrElse
                         SearchEntry.Contains("net") OrElse SearchEntry.Contains("游戏") OrElse SearchEntry.Contains("oracle") OrElse
@@ -675,7 +677,8 @@ Wait:
                         SearchEntry.Contains("mod") OrElse SearchEntry.Contains("高清") OrElse SearchEntry.Contains("download") OrElse
                         SearchEntry.Contains("launch") OrElse SearchEntry.Contains("程序") OrElse SearchEntry.Contains("path") OrElse
                         SearchEntry.Contains("version") OrElse SearchEntry.Contains("baka") OrElse SearchEntry.Contains("pcl") OrElse
-                        SearchEntry.Contains("local") OrElse SearchEntry.Contains("packages") OrElse SearchEntry.Contains("4297127D64EC6") OrElse '官启文件夹
+                        SearchEntry.Contains("zulu") OrElse
+                        SearchEntry.Contains("local") OrElse SearchEntry.Contains("packages") OrElse SearchEntry.Contains("4297127d64ec6") OrElse '官启文件夹
                         SearchEntry.Contains("国服") OrElse SearchEntry.Contains("网易") OrElse SearchEntry.Contains("ext") OrElse '网易 Java 文件夹名
                         SearchEntry.Contains("netease") OrElse SearchEntry.Contains("1.") OrElse SearchEntry.Contains("启动") Then
                     JavaSearchFolder(FolderInfo, Results, Source)

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

@@ -881,7 +881,7 @@ SystemBrowser:
         End If
         Dim Result As String
         Try
-            Result = NetRequestMuity("https://login.live.com/oauth20_token.srf", "POST", Request, "application/x-www-form-urlencoded", 1)
+            Result = NetRequestMulty("https://login.live.com/oauth20_token.srf", "POST", Request, "application/x-www-form-urlencoded", 1)
         Catch ex As Exception
             If ex.Message.Contains("must sign in again") OrElse ex.Message.Contains("invalid_grant") Then '#269
                 Return {"Relogin", ""}
@@ -908,7 +908,7 @@ SystemBrowser:
                                     ""RelyingParty"": ""http://auth.xboxlive.com"",
                                     ""TokenType"": ""JWT""
                                  }"
-        Dim Result As String = NetRequestMuity("https://user.auth.xboxlive.com/user/authenticate", "POST", Request, "application/json", 3)
+        Dim Result As String = NetRequestMulty("https://user.auth.xboxlive.com/user/authenticate", "POST", Request, "application/json", 3)
 
         Dim ResultJson As JObject = GetJson(Result)
         Dim XBLToken As String = ResultJson("Token").ToString
@@ -930,10 +930,10 @@ SystemBrowser:
                                  }"
         Dim Result As String
         Try
-            Result = NetRequestMuity("https://xsts.auth.xboxlive.com/xsts/authorize", "POST", Request, "application/json", 3)
+            Result = NetRequestMulty("https://xsts.auth.xboxlive.com/xsts/authorize", "POST", Request, "application/json", 3)
         Catch ex As Net.WebException
             If ex.Message.Contains("2148916233") Then
-                If MyMsgBox("该微软账号尚未购买 Minecraft Java 版，或尚未注册 XBox 账户。" & vbCrLf &
+                If MyMsgBox("该微软账号尚未购买 Minecraft Java 版，或尚未注册 Xbox 账户。" & vbCrLf &
                             "如果你确定该账号完成了上述步骤，请先在游戏官网登录一次，然后再在启动器登录。", "登录提示", "打开游戏官网", "取消") = 1 Then
                     OpenWebsite("https://www.minecraft.net/")
                 End If
@@ -967,7 +967,7 @@ SystemBrowser:
         Dim Request As String = "{""identityToken"": ""XBL3.0 x=" & Tokens(1) & ";" & Tokens(0) & """}"
         Dim Result As String
         Try
-            Result = NetRequestMuity("https://api.minecraftservices.com/authentication/login_with_xbox", "POST", Request, "application/json", 2)
+            Result = NetRequestMulty("https://api.minecraftservices.com/authentication/login_with_xbox", "POST", Request, "application/json", 2)
         Catch ex As Net.WebException
             Dim Message As String = GetExceptionSummary(ex)
             If Message.Contains("(429)") Then
@@ -991,7 +991,7 @@ SystemBrowser:
 
         Dim Result As String
         Try
-            Result = NetRequestMuity("https://api.minecraftservices.com/minecraft/profile", "GET", "", "application/json", 2, New Dictionary(Of String, String) From {{"Authorization", "Bearer " & AccessToken}})
+            Result = NetRequestMulty("https://api.minecraftservices.com/minecraft/profile", "GET", "", "application/json", 2, New Dictionary(Of String, String) From {{"Authorization", "Bearer " & AccessToken}})
         Catch ex As Net.WebException
             Dim Message As String = GetExceptionSummary(ex)
             If Message.Contains("(429)") Then
@@ -1000,7 +1000,7 @@ SystemBrowser:
             ElseIf Message.Contains("(404)") Then
                 Log(ex, "微软登录第 6 步汇报 404")
                 RunInNewThread(Sub()
-                                   Select Case MyMsgBox("你可能没有在 Minecraft 官网创建档案，XBox Game Pass 已到期，或者还没有购买 Minecraft。" & vbCrLf &
+                                   Select Case MyMsgBox("你可能没有在 Minecraft 官网创建档案，Xbox Game Pass 已到期，或者还没有购买 Minecraft。" & vbCrLf &
                                             "如果你确认拥有 Minecraft，请在官网上创建档案后再试。", "登录失败", "创建档案", "购买 Minecraft", "取消")
                                        Case 1
                                            OpenWebsite("https://www.minecraft.net/zh-hans/msaprofile/mygames/editprofile")
@@ -1120,8 +1120,8 @@ SystemBrowser:
             ElseIf McVersionCurrent.Version.McCodeMain >= 8 AndAlso McVersionCurrent.Version.McCodeMain <= 11 Then
                 '1.8 - 1.11：必须恰好 Java 8
                 MinVer = New Version(1, 8, 0, 0) : MaxVer = New Version(1, 8, 999, 999)
-            ElseIf McVersionCurrent.Version.McCodeMain = 12 AndAlso McVersionCurrent.Version.HasForge Then
-                '1.12：若安装了 Forge，最高 Java 8
+            ElseIf McVersionCurrent.Version.McCodeMain = 12 Then
+                '1.12：最高 Java 8
                 MaxVer = New Version(1, 8, 999, 999)
             End If
         End If
@@ -1141,14 +1141,11 @@ SystemBrowser:
                 '1.15：Java 8 - 15
                 MinVer = New Version(1, 8, 0, 0) : MaxVer = New Version(1, 15, 999, 999)
             ElseIf VersionSortBoolean(McVersionCurrent.Version.ForgeVersion, "34.0.0") AndAlso VersionSortBoolean("36.2.25", McVersionCurrent.Version.ForgeVersion) Then
-                '1.16.X，Forge 34.X ~ 36.2.25：最高 Java 8u320
+                '1.16，Forge 34.X ~ 36.2.25：最高 Java 8u320
                 MaxVer = New Version(1, 8, 0, 320)
-            ElseIf McVersionCurrent.Version.McCodeMain >= 18 AndAlso McVersionCurrent.Version.McCodeMain < 99 AndAlso McVersionCurrent.Version.HasOptiFine Then '#305
-                '1.18+：若安装了 OptiFine，最高 Java 18
+            ElseIf McVersionCurrent.Version.McCodeMain >= 18 AndAlso McVersionCurrent.Version.McCodeMain < 19 AndAlso McVersionCurrent.Version.HasOptiFine Then '#305
+                '1.18：若安装了 OptiFine，最高 Java 18
                 MaxVer = New Version(1, 18, 999, 999)
-            ElseIf McVersionCurrent.Version.McCodeMain >= 19 AndAlso McVersionCurrent.Version.McCodeMain < 99 Then
-                '1.19+：最高 Java 19
-                MaxVer = New Version(1, 19, 999, 999)
             End If
         End If
 
@@ -1753,6 +1750,15 @@ NextVersion:
 
         '更新 options.txt
         Dim SetupFileAddress As String = McVersionCurrent.PathIndie & "options.txt"
+        If Not File.Exists(SetupFileAddress) Then
+            'Yosbr Mod 兼容（#2385）：https://www.curseforge.com/minecraft/mc-mods/yosbr
+            Dim YosbrFileAddress As String = McVersionCurrent.PathIndie & "config\yosbr\options.txt"
+            If File.Exists(YosbrFileAddress) Then
+                McLaunchLog("将修改 Yosbr Mod 中的 options.txt")
+                SetupFileAddress = YosbrFileAddress
+                WriteIni(SetupFileAddress, "lang", "none") '忽略默认语言
+            End If
+        End If
         Try
             '语言
             '1.0-     ：没有语言选项
@@ -1773,11 +1779,11 @@ NextVersion:
                 WriteIni(SetupFileAddress, "lang", RequiredLang)
                 McLaunchLog($"已将语言从 {CurrentLang} 修改为 {RequiredLang}")
             End If
-            '如果是初次设置，一并修改 forceUnicodeFont
-            If Setup.Get("ToolHelpChinese") AndAlso (CurrentLang = "none" OrElse Not Directory.Exists(McVersionCurrent.PathIndie & "saves")) Then
-                WriteIni(SetupFileAddress, "forceUnicodeFont", "true")
-                McLaunchLog("已开启 forceUnicodeFont")
-            End If
+            ''如果是初次设置，一并修改 forceUnicodeFont
+            'If Setup.Get("ToolHelpChinese") AndAlso (CurrentLang = "none" OrElse Not Directory.Exists(McVersionCurrent.PathIndie & "saves")) Then
+            '    WriteIni(SetupFileAddress, "forceUnicodeFont", "true")
+            '    McLaunchLog("已开启 forceUnicodeFont")
+            'End If
             '窗口
             Select Case Setup.Get("LaunchArgumentWindowType")
                 Case 0 '全屏
@@ -1843,10 +1849,14 @@ NextVersion:
                         Else
                             PackFormat = 12
                         End If
-                    Case 20, 99 '99 是快照版
-                        PackFormat = 15
-                    Case Else
-                        PackFormat = 16
+                    Case 20
+                        If McVersionCurrent.Version.McCodeSub <= 1 Then
+                            PackFormat = 15
+                        Else
+                            PackFormat = 17
+                        End If
+                    Case Else '快照版是 99
+                        PackFormat = 17
                         'https://minecraft.fandom.com/zh/wiki/数据包#数据包版本
                 End Select
                 McLaunchLog("正在构建自定义皮肤资源包，格式为：" & PackFormat)
@@ -1857,7 +1867,7 @@ NextVersion:
                 Dim Skin As New MyBitmap(PathAppdata & "CustomSkin.png")
                 If (McVersionCurrent.Version.McCodeMain = 6 OrElse McVersionCurrent.Version.McCodeMain = 7) AndAlso Skin.Pic.Height = 64 Then
                     McLaunchLog("该 Minecraft 版本不支持双层皮肤，已进行裁剪")
-                    Skin = Skin.Clip(New System.Drawing.Rectangle(0, 0, 64, 32))
+                    Skin = Skin.Clip(0, 0, 64, 32)
                 End If
                 Skin.Save(Path & "PCL\CustomSkin_Cliped.png")
                 '构建压缩文件

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

@@ -1,7 +1,4 @@
-Imports System.IO.Compression
-Imports NAudio.Gui
-
-Public Module ModMinecraft
+Public Module ModMinecraft
 
 #Region "文件夹"
 
@@ -573,7 +570,7 @@ Recheck:
         ''' </summary>
         Public ReadOnly Property IsOldJson As Boolean
             Get
-                Return JsonObject("minecraftArguments") IsNot Nothing
+                Return JsonObject("minecraftArguments") IsNot Nothing AndAlso JsonObject("minecraftArguments") <> ""
             End Get
         End Property
         ''' <summary>
@@ -716,7 +713,7 @@ Recheck:
 ExitDataLoad:
                 '确定版本图标
                 Logo = ReadIni(Path & "PCL\Setup.ini", "Logo", "")
-                If Logo = "" OrElse ReadIni(Path & "PCL\Setup.ini", "LogoCustom", "False") = "False" Then
+                If Logo = "" OrElse Not CType(ReadIni(Path & "PCL\Setup.ini", "LogoCustom", False), Boolean) Then
                     Select Case State
                         Case McVersionState.Original
                             Logo = "pack://application:,,,/images/Blocks/Grass.png"
@@ -1881,14 +1878,7 @@ NextVersion:
         If CoreJarOnly Then Return Result
 
         '是否跳过校验
-        Dim IsSetupSkip As Boolean = Setup.Get("LaunchAdvanceAssets")
-        Select Case Setup.Get("VersionAdvanceAssets", Version:=Version)
-            Case 0 '使用全局设置
-            Case 1 '开启校验
-                IsSetupSkip = False
-            Case 2 '关闭校验
-                IsSetupSkip = True
-        End Select
+        Dim IsSetupSkip As Boolean = ShouldIgnoreFileCheck(Version)
 
         'Library 文件
         Result.AddRange(McLibFixFromLibToken(McLibListGet(Version, False), JumpLoaderFolder:=Version.PathIndie & ".jumploader\", AllowUnsameFile:=IsSetupSkip))
@@ -2017,6 +2007,13 @@ NextVersion:
         End If
     End Function
 
+    ''' <summary>
+    ''' 检查设置，是否应当忽略文件检查？
+    ''' </summary>
+    Public Function ShouldIgnoreFileCheck(Version As McVersion)
+        Return Setup.Get("LaunchAdvanceAssets") OrElse Setup.Get("VersionAdvanceAssetsV2", Version:=Version) OrElse (Setup.Get("VersionAdvanceAssets", Version:=Version) = 2)
+    End Function
+
 #End Region
 
 #Region "资源文件（Assets）"

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

@@ -411,16 +411,20 @@ Public Module ModMod
                         ElseIf RawValue.StartsWith("'''") Then
                             '多行字符串
                             Dim ValueLines As New List(Of String) From {RawValue.TrimStart("'")}
-                            Do Until i >= Lines.Count - 1
-                                i += 1
-                                Dim ValueLine As String = Lines(i)
-                                If ValueLine.EndsWith("'''") Then
-                                    ValueLines.Add(ValueLine.TrimEnd("'"))
-                                    Exit Do
-                                Else
-                                    ValueLines.Add(ValueLine)
-                                End If
-                            Loop
+                            If ValueLines(0).EndsWith("'''") Then '把多行字符串按单行写法写的错误处理（#2732）
+                                ValueLines(0) = ValueLines(0).TrimEnd("'")
+                            Else
+                                Do Until i >= Lines.Count - 1
+                                    i += 1
+                                    Dim ValueLine As String = Lines(i)
+                                    If ValueLine.EndsWith("'''") Then
+                                        ValueLines.Add(ValueLine.TrimEnd("'"))
+                                        Exit Do
+                                    Else
+                                        ValueLines.Add(ValueLine)
+                                    End If
+                                Loop
+                            End If
                             Value = Join(ValueLines, vbLf).Trim(vbLf).Replace(vbLf, vbCrLf)
                         ElseIf RawValue.ToLower = "true" OrElse RawValue.ToLower = "false" Then
                             '布尔型

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

@@ -1,4 +1,6 @@
-Public Module ModModpack
+Imports System.IO.Compression
+
+Public Module ModModpack
 
     '触发整合包安装的外部接口
     ''' <summary>
@@ -14,13 +16,13 @@
     ''' </summary>
     Public Function ModpackInstall(File As String, Optional VersionName As String = Nothing, Optional ShowHint As Boolean = True, Optional Logo As String = Nothing) As Boolean
         Log("[ModPack] 整合包安装请求：" & If(File, "null"))
-        Dim Archive As Compression.ZipArchive = Nothing
+        Dim Archive As ZipArchive = Nothing
         Dim ArchiveBaseFolder As String = ""
         Try
             '获取整合包种类与关键 Json
             Dim PackType As Integer = -1
             Try
-                Archive = New Compression.ZipArchive(New FileStream(File, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                Archive = New ZipArchive(New FileStream(File, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
                 '从根目录判断整合包类型
                 If Archive.GetEntry("mcbbs.packmeta") IsNot Nothing Then PackType = 3 : Exit Try 'MCBBS 整合包（优先于 manifest.json 判断）
                 If Archive.GetEntry("modrinth.index.json") IsNot Nothing Then PackType = 4 : Exit Try 'Modrinth 整合包
@@ -109,7 +111,7 @@
     '整合包缓存清理
     Private IsInstallCacheCleared As Boolean = False
     Private IsInstallCacheClearing As Boolean = False
-    Private Sub UnpackFiles(InstallTemp As String, FileAddress As String)
+    Private Sub UnpackFiles(InstallTemp As String, FileAddress As String, Loader As LoaderBase)
         '清理缓存文件夹
         If Not IsInstallCacheCleared Then
             IsInstallCacheCleared = True
@@ -135,9 +137,8 @@
         Try
 Retry:
             '完全不知道为啥会出现文件正在被另一进程使用的问题，总之多试试
-            Directory.CreateDirectory(InstallTemp)
             DeleteDirectory(InstallTemp)
-            Compression.ZipFile.ExtractToDirectory(FileAddress, InstallTemp, Encode)
+            ExtractFile(FileAddress, InstallTemp, Encode)
         Catch ex As Exception
             Log(ex, "第 " & RetryCount & " 次解压尝试失败")
             If TypeOf ex Is ArgumentException Then
@@ -146,6 +147,7 @@ Retry:
             End If
             If RetryCount < 5 Then
                 Thread.Sleep(RetryCount * 2000)
+                If Loader IsNot Nothing AndAlso Loader.LoadingState <> MyLoading.MyLoadingState.Run Then Exit Sub
                 RetryCount += 1
                 GoTo Retry
             Else
@@ -215,13 +217,15 @@ Retry:
         If OverrideHome <> "" Then
             InstallLoaders.Add(New LoaderTask(Of String, Integer)("解压整合包文件",
             Sub(Task As LoaderTask(Of String, Integer))
-                UnpackFiles(InstallTemp, FileAddress)
+                UnpackFiles(InstallTemp, FileAddress, Task)
                 Task.Progress = 0.5
+                Dim OverridePath As String = InstallTemp & ArchiveBaseFolder & OverrideHome
                 '复制结果
-                If Directory.Exists(InstallTemp & ArchiveBaseFolder & OverrideHome) Then
-                    CopyDirectory(InstallTemp & ArchiveBaseFolder & OverrideHome, PathMcFolder & "versions\" & VersionName)
+                If Directory.Exists(OverridePath) Then
+                    CopyDirectory(OverridePath, PathMcFolder & "versions\" & VersionName)
+                    Log($"[ModPack] 整合包 override 复制：{OverridePath} -> {PathMcFolder & "versions\" & VersionName}")
                 Else
-                    Log("[ModPack] 整合包中未找到 override 目录，已跳过")
+                    Log($"[ModPack] 整合包中未找到 override 文件夹：{OverridePath}")
                 End If
                 Task.Progress = 0.9
                 '开启版本隔离
@@ -230,30 +234,39 @@ Retry:
             .ProgressWeight = New FileInfo(FileAddress).Length / 1024 / 1024 / 6, .Block = False}) '每 6M 需要 1s
         End If
         '获取 Mod 列表
-        Dim ModFileList As New List(Of Integer)
+        Dim ModList As New List(Of Integer)
+        Dim ModOptionalList As New List(Of Integer)
         For Each ModEntry In If(Json("files"), {})
             If ModEntry("projectID") Is Nothing OrElse ModEntry("fileID") Is Nothing Then
                 Hint("某项 Mod 缺少必要信息，已跳过：" & ModEntry.ToString)
                 Continue For
             End If
-            If ModEntry("required") IsNot Nothing AndAlso Not ModEntry("required").ToObject(Of Boolean) Then Continue For
-            ModFileList.Add(ModEntry("fileID"))
+            ModList.Add(ModEntry("fileID"))
+            If ModEntry("required") IsNot Nothing AndAlso Not ModEntry("required").ToObject(Of Boolean) Then ModOptionalList.Add(ModEntry("fileID"))
         Next
-        If ModFileList.Count > 0 Then
+        If ModList.Count > 0 Then
             '获取 Mod 下载信息
             InstallLoaders.Add(New LoaderTask(Of Integer, JArray)("获取 Mod 下载信息",
             Sub(Task As LoaderTask(Of Integer, JArray))
-                Task.Output = GetJson(NetRequestRetry("https://api.curseforge.com/v1/mods/files", "POST", "{""fileIds"": [" & Join(ModFileList, ",") & "]}", "application/json"))("data")
+                Task.Output = GetJson(NetRequestRetry("https://api.curseforge.com/v1/mods/files", "POST", "{""fileIds"": [" & Join(ModList, ",") & "]}", "application/json"))("data")
                 '如果文件已被删除，则 API 会跳过那一项
-                If ModFileList.Count > Task.Output.Count Then Throw New Exception("整合包所需要的部分 Mod 版本已被 Mod 作者删除，因此无法完成整合包安装，请联系整合包作者更新整合包中的 Mod 版本")
-            End Sub) With {.ProgressWeight = ModFileList.Count / 10}) '每 10 Mod 需要 1s
+                If ModList.Count > Task.Output.Count Then Throw New Exception("整合包所需要的部分 Mod 版本已被 Mod 作者删除，因此无法完成整合包安装，请联系整合包作者更新整合包中的 Mod 版本")
+            End Sub) With {.ProgressWeight = ModList.Count / 10}) '每 10 Mod 需要 1s
             '构造 NetFile
             InstallLoaders.Add(New LoaderTask(Of JArray, List(Of NetFile))("构造 Mod 下载信息",
             Sub(Task As LoaderTask(Of JArray, List(Of NetFile)))
                 Dim FileList As New Dictionary(Of Integer, NetFile)
                 For Each ModJson In Task.Input
+                    Dim Id As Integer = ModJson("id").ToObject(Of Integer)
                     '跳过重复的 Mod（疑似 CurseForge Bug）
-                    If FileList.ContainsKey(ModJson("id").ToObject(Of Integer)) Then Continue For
+                    If FileList.ContainsKey(Id) Then Continue For
+                    '可选 Mod 提示
+                    If ModOptionalList.Contains(Id) Then
+                        If MyMsgBox("是否要下载整合包中的可选文件 " & ModJson("displayName").ToString & "？",
+                                        "下载可选文件", "是", "否") = 2 Then
+                            Continue For
+                        End If
+                    End If
                     '建立 CompFile
                     Dim File As New CompFile(ModJson, CompType.Mod)
                     If Not File.Available Then Continue For
@@ -269,14 +282,13 @@ Retry:
                         IsResourcePack = False
                     End If
                     '实际的添加
-                    FileList.Add(ModJson("id"),
-                                 File.ToNetFile($"{PathMcFolder}versions\{VersionName}\{If(IsResourcePack, "resourcepacks", "mods")}\"))
-                    Task.Progress += 1 / (1 + ModFileList.Count)
+                    FileList.Add(Id, File.ToNetFile($"{PathMcFolder}versions\{VersionName}\{If(IsResourcePack, "resourcepacks", "mods")}\"))
+                    Task.Progress += 1 / (1 + ModList.Count)
                 Next
                 Task.Output = FileList.Values.ToList
-            End Sub) With {.ProgressWeight = ModFileList.Count / 200, .Show = False}) '每 200 Mod 需要 1s
+            End Sub) With {.ProgressWeight = ModList.Count / 200, .Show = False}) '每 200 Mod 需要 1s
             '下载 Mod 文件
-            InstallLoaders.Add(New LoaderDownload("下载 Mod", New List(Of NetFile)) With {.ProgressWeight = ModFileList.Count * 1.5}) '每个 Mod 需要 1.5s
+            InstallLoaders.Add(New LoaderDownload("下载 Mod", New List(Of NetFile)) With {.ProgressWeight = ModList.Count * 1.5}) '每个 Mod 需要 1.5s
         End If
 
         '构造加载器
@@ -393,7 +405,7 @@ Retry:
         Dim InstallLoaders As New List(Of LoaderBase)
         InstallLoaders.Add(New LoaderTask(Of String, Integer)("解压整合包文件",
             Sub(Task As LoaderTask(Of String, Integer))
-                UnpackFiles(InstallTemp, FileAddress)
+                UnpackFiles(InstallTemp, FileAddress, Task)
                 Task.Progress = 0.5
                 '复制 overrides 文件夹和 client-overrides 文件夹
                 If Directory.Exists(InstallTemp & ArchiveBaseFolder & "overrides") Then
@@ -425,7 +437,7 @@ Retry:
                 End Select
             End If
             '添加下载文件
-            FileList.Add(New NetFile(File("downloads").Select(Function(t) t.ToString).ToArray,
+            FileList.Add(New NetFile(File("downloads").Select(Function(t) t.ToString.Replace("://edge.forgecdn", "://media.forgecdn")).ToArray, '修复 #2390
                                      PathMcFolder & "versions\" & VersionName & "\" & File("path").ToString,
                                      New FileChecker(ActualSize:=File("fileSize").ToObject(Of Long), Hash:=File("hashes")("sha1").ToString)))
         Next
@@ -520,7 +532,7 @@ Retry:
         Dim InstallLoaders As New List(Of LoaderBase)
         InstallLoaders.Add(New LoaderTask(Of String, Integer)("解压整合包文件",
         Sub(Task As LoaderTask(Of String, Integer))
-            UnpackFiles(InstallTemp, FileAddress)
+            UnpackFiles(InstallTemp, FileAddress, Task)
             Task.Progress = 0.5
             '复制结果
             If Directory.Exists(InstallTemp & ArchiveBaseFolder & "minecraft") Then
@@ -614,12 +626,13 @@ Retry:
         If Validate.Validate(PackName) <> "" Then PackName = ""
         Dim VersionName As String = MyMsgBoxInput("输入版本名称", "", PackName, New ObjectModel.Collection(Of Validate) From {Validate})
         If VersionName Is Nothing Then Exit Sub
-        '解压与配置文件
-        Dim InstallTemp As String = PathTemp & "PackInstall\" & RandomInteger(0, 100000) & "\"
+        '解压、配置设置文件
+        Dim InstallTemp As String = $"{PathTemp}PackInstall\{RandomInteger(0, 100000)}\"
+        Dim SetupFile As String = $"{PathMcFolder}versions\{VersionName}\PCL\Setup.ini"
         Dim InstallLoaders As New List(Of LoaderBase)
         InstallLoaders.Add(New LoaderTask(Of String, Integer)("解压整合包文件",
         Sub(Task As LoaderTask(Of String, Integer))
-            UnpackFiles(InstallTemp, FileAddress)
+            UnpackFiles(InstallTemp, FileAddress, Task)
             Task.Progress = 0.5
             '复制结果
             If Directory.Exists(InstallTemp & ArchiveBaseFolder & ".minecraft") Then
@@ -629,7 +642,45 @@ Retry:
             End If
             Task.Progress = 0.9
             '开启版本隔离
-            WriteIni(PathMcFolder & "versions\" & VersionName & "\PCL\Setup.ini", "VersionArgumentIndie", 1)
+            WriteIni(SetupFile, "VersionArgumentIndie", 1)
+            '读取 MMC 设置文件（#2655）
+            Try
+                Dim MMCSetupFile As String = InstallTemp & ArchiveBaseFolder & "instance.cfg"
+                If File.Exists(MMCSetupFile) Then
+                    '将其中的等号替换为冒号，以符合 ini 文件格式
+                    WriteFile(MMCSetupFile, ReadFile(MMCSetupFile).Replace("=", ":"))
+                    If ReadIni(MMCSetupFile, "OverrideCommands", False) Then
+                        Dim PreLaunchCommand As String = ReadIni(MMCSetupFile, "PreLaunchCommand")
+                        If PreLaunchCommand <> "" Then
+                            PreLaunchCommand = PreLaunchCommand.Replace("\""", """").
+                                Replace("$INST_JAVA", "{java}javaw.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}")
+                            WriteIni(SetupFile, "VersionAdvanceRun", PreLaunchCommand)
+                            Log("[ModPack] 迁移 MultiMC 版本独立设置：启动前执行命令：" & PreLaunchCommand)
+                        End If
+                    End If
+                    If ReadIni(MMCSetupFile, "JoinServerOnLaunch", False) Then
+                        Dim ServerAddress As String = ReadIni(MMCSetupFile, "JoinServerOnLaunchAddress").Replace("\""", """")
+                        WriteIni(SetupFile, "VersionServerEnter", ServerAddress)
+                        Log("[ModPack] 迁移 MultiMC 版本独立设置：自动进入服务器：" & ServerAddress)
+                    End If
+                    If ReadIni(MMCSetupFile, "IgnoreJavaCompatibility", False) Then
+                        WriteIni(SetupFile, "VersionAdvanceJava", True)
+                        Log("[ModPack] 迁移 MultiMC 版本独立设置：忽略 Java 兼容性警告")
+                    End If
+                    Dim Logo As String = ReadIni(MMCSetupFile, "iconKey", "")
+                    If Logo <> "" AndAlso File.Exists($"{InstallTemp}{ArchiveBaseFolder}{Logo}.png") Then
+                        WriteIni(SetupFile, "LogoCustom", True)
+                        WriteIni(SetupFile, "Logo", "PCL\Logo.png")
+                        CopyFile($"{InstallTemp}{ArchiveBaseFolder}{Logo}.png", $"{PathMcFolder}versions\{VersionName}\PCL\Logo.png")
+                        Log($"[ModPack] 迁移 MultiMC 版本独立设置：版本图标（{Logo}.png）")
+                    End If
+                End If
+            Catch ex As Exception
+                Log(ex, $"读取 MMC 配置文件失败（{InstallTemp}{ArchiveBaseFolder}instance.cfg）")
+            End Try
         End Sub) With {.ProgressWeight = New FileInfo(FileAddress).Length / 1024 / 1024 / 6, .Block = False}) '每 6M 需要 1s
         '构造版本安装请求
         If PackJson("components") Is Nothing Then
@@ -714,7 +765,7 @@ Retry:
         Dim InstallLoaders As New List(Of LoaderBase)
         InstallLoaders.Add(New LoaderTask(Of String, Integer)("解压整合包文件",
         Sub(Task As LoaderTask(Of String, Integer))
-            UnpackFiles(InstallTemp, FileAddress)
+            UnpackFiles(InstallTemp, FileAddress, Task)
             Task.Progress = 0.5
             '复制结果
             If Directory.Exists(InstallTemp & ArchiveBaseFolder & "overrides") Then
@@ -805,7 +856,7 @@ Retry:
         If String.IsNullOrWhiteSpace(NewName) Then Exit Sub
         '解压
         Hint("正在解压压缩包……")
-        UnpackFiles(TargetFolder, FileAddress)
+        UnpackFiles(TargetFolder, FileAddress, Nothing)
         '加入文件夹列表
         PageSelectLeft.AddFolder(TargetFolder, NewName, False)
         Hint("已加入游戏文件夹列表：" & NewName, HintType.Finish)

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

@@ -272,7 +272,7 @@
                 If Not MinecraftWindowName.StartsWith("FML") Then
                     '已找到 Minecraft 窗口
                     WindowHandle = MinecraftWindowHandle
-                    WatcherLog("Minecraft 窗口已加载：" & MinecraftWindowName & "（" & MinecraftWindowHandle.ToInt64 & "）")
+                    WatcherLog($"Minecraft 窗口已加载：{MinecraftWindowName}（{MinecraftWindowHandle.ToInt64}）")
                     IsWindowFinished = True
                     '最大化
                     If Setup.Get("LaunchArgumentWindowType") = 4 Then
@@ -282,6 +282,7 @@
                                                '……虽然我很想这样说，但总有人反馈，算了
                                                Thread.Sleep(2000)
                                                ShowWindow(WindowHandle, 3)
+                                               WatcherLog($"已最大化 Minecraft 窗口：{MinecraftWindowHandle.ToInt64}")
                                            Catch ex As Exception
                                                Log(ex, "最大化 Minecraft 窗口时出现错误")
                                            End Try

Plain Craft Launcher 2/Modules/Minecraft/MyCompItem.xaml.vb

@@ -94,6 +94,18 @@ RetryStart:
             Log("[Control] 按下资源工程列表项：" & LabTitle.Text)
         End If
     End Sub
+    Private Sub ProjectClick(sender As MyCompItem, e As EventArgs) Handles Me.Click
+        '记录当前展开的卡片标题（#2712）
+        Dim Titles As New List(Of String)
+        If FrmMain.PageCurrent.Page = FormMain.PageType.CompDetail Then
+            For Each Card As MyCard In FrmDownloadCompDetail.PanMain.Children
+                If Card.Title <> "" AndAlso Not Card.IsSwaped Then Titles.Add(Card.Title)
+            Next
+            Log("[Comp] 记录当前已展开的卡片：" & String.Join("、", Titles))
+            FrmMain.PageCurrent.Additional(1) = Titles
+        End If
+        FrmMain.PageChange(New FormMain.PageStackData With {.Page = FormMain.PageType.CompDetail, .Additional = {sender.Tag, New List(Of String)}})
+    End Sub
 
     '鼠标点击判定
     Private IsMouseDown As Boolean = False

Plain Craft Launcher 2/Modules/ModEvent.vb

@@ -23,11 +23,9 @@
                 Case "打开文件", "打开帮助"
                     RunInThread(Sub()
                                     Try
-
                                         '确认实际路径
                                         Dim ActualPaths = GetEventAbsoluteUrls(Data(0), Type)
                                         Dim Location = ActualPaths(0), WorkingDir = ActualPaths(1)
-
                                         '执行
                                         If Type = "打开文件" Then
                                             Dim Info As New ProcessStartInfo With {
@@ -39,13 +37,14 @@
                                         Else '打开帮助
                                             PageOtherHelp.EnterHelpPage(Location)
                                         End If
-
                                     Catch ex As Exception
                                         Log(ex, "执行打开类自定义事件失败", LogLevel.Msgbox)
                                     End Try
                                 End Sub)
+
                 Case "启动游戏"
-                    If McLaunchStart(New McLaunchOptions With {.ServerIp = If(Data.Length >= 2, Data(1), Nothing), .Version = New McVersion(Data(0))}) Then
+                    If McLaunchStart(New McLaunchOptions With
+                                     {.ServerIp = If(Data.Length >= 2, Data(1), Nothing), .Version = New McVersion(Data(0))}) Then
                         Hint("正在启动 " & Data(0) & "……")
                     End If
 
@@ -54,6 +53,7 @@
 
                 Case "刷新主页"
                     FrmLaunchRight.ForceRefresh()
+                    If Data(0) = "" Then Hint("已刷新主页！", HintType.Finish)
 
                 Case "刷新帮助"
                     PageOtherLeft.RefreshHelp()

Plain Craft Launcher 2/Modules/ModMusic.vb

@@ -5,7 +5,7 @@
     ''' <summary>
     ''' 接下来要播放的音乐文件路径。未初始化时为 Nothing。
     ''' </summary>
-    Public MusicToplayList As List(Of String) = Nothing
+    Public MusicWaitingList As List(Of String) = Nothing
     ''' <summary>
     ''' 全部音乐文件路径。未初始化时为 Nothing。
     ''' </summary>
@@ -25,17 +25,17 @@
                 For Each File In My.Computer.FileSystem.GetFiles(Path & "PCL\Musics\", FileIO.SearchOption.SearchAllSubDirectories, "*.*")
                     '文件夹可能会被加入 .ini 文件夹配置文件、一些乱七八糟的 .jpg 文件啥的
                     Dim Extend As String = File.Split(".").Last.ToLower
-                    If Not (Extend = "ini" OrElse Extend = "jpg" OrElse Extend = "txt" OrElse Extend = "cfg" OrElse Extend = "lrc" OrElse Extend = "png") Then
+                    If Not (Extend = "ini" OrElse Extend = "jpg" OrElse Extend = "txt" OrElse Extend = "cfg" OrElse Extend = "lrc" OrElse Extend = "db" OrElse Extend = "png") Then
                         MusicAllList.Add(File)
                     End If
                 Next
             End If
             '打乱顺序播放
-            MusicToplayList = If(Setup.Get("UiMusicRandom"), Shuffle(New List(Of String)(MusicAllList)), New List(Of String)(MusicAllList))
-            If Not IgnoreFirst = "" AndAlso Not MusicToplayList.Count = 0 AndAlso MusicToplayList(0) = IgnoreFirst Then
+            MusicWaitingList = If(Setup.Get("UiMusicRandom"), Shuffle(New List(Of String)(MusicAllList)), New List(Of String)(MusicAllList))
+            If Not IgnoreFirst = "" AndAlso Not MusicWaitingList.Count = 0 AndAlso MusicWaitingList(0) = IgnoreFirst Then
                 '若需要避免成为第一项的为第一项，则将它放在最后
-                MusicToplayList.RemoveAt(0)
-                MusicToplayList.Add(IgnoreFirst)
+                MusicWaitingList.RemoveAt(0)
+                MusicWaitingList.Add(IgnoreFirst)
             End If
         Catch ex As Exception
             Log(ex, "初始化音乐列表失败", LogLevel.Feedback)
@@ -46,12 +46,11 @@
     ''' </summary>
     Private Function DequeueNextMusicAddress() As String
         '初始化，确保存在音乐
-        If MusicAllList Is Nothing Then MusicListInit(False)
-        If MusicAllList.Count = 0 Then Throw New Exception("在没有音乐时尝试获取音乐路径")
+        If MusicAllList Is Nothing OrElse MusicAllList.Count = 0 Then MusicListInit(False)
         '出列下一个音乐，如果出列结束则生成新列表
-        DequeueNextMusicAddress = MusicToplayList(0)
-        MusicToplayList.RemoveAt(0)
-        If MusicToplayList.Count = 0 Then MusicListInit(False, DequeueNextMusicAddress)
+        DequeueNextMusicAddress = MusicWaitingList(0)
+        MusicWaitingList.RemoveAt(0)
+        If MusicWaitingList.Count = 0 Then MusicListInit(False, DequeueNextMusicAddress)
     End Function
 
 #End Region
@@ -106,7 +105,8 @@
                 Case MusicStates.Play
                     MusicPause()
                 Case Else
-                    Hint("音乐目前为停止状态！", HintType.Critical)
+                    Log("[Music] 音乐目前为停止状态，已强制尝试开始播放", LogLevel.Debug)
+                    MusicRefreshPlay(False)
             End Select
         End If
     End Sub
@@ -212,15 +212,15 @@
     ''' 继续音乐播放，返回是否成功切换了状态。
     ''' </summary>
     Public Function MusicResume() As Boolean
-        If MusicState = MusicStates.Pause Then
+        If MusicState = MusicStates.Play OrElse Not MusicAllList.Any() Then
+            Return False
+        Else
             RunInThread(Sub()
                             MusicNAudio.Play()
                             MusicRefreshUI()
                             Log("[Music] 已恢复播放")
                         End Sub)
             Return True
-        Else
-            Return False
         End If
     End Function
 

Plain Craft Launcher 2/My Project/AssemblyInfo.vb

@@ -51,6 +51,6 @@ Imports System.Runtime.InteropServices
 ' 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
 ' 方法是按如下所示使用“*”
 
-<Assembly: AssemblyVersion("2.6.4.0")>
-<Assembly: AssemblyFileVersion("2.6.4.0")>
+<Assembly: AssemblyVersion("2.6.10.0")>
+<Assembly: AssemblyFileVersion("2.6.10.0")>
 <Assembly: NeutralResourcesLanguage("")>

Plain Craft Launcher 2/Pages/PageDownload/ModDownloadLib.vb

@@ -196,7 +196,7 @@ Public Module ModDownloadLib
         Else
             NewItem.Info = Entry("lore").ToString
         End If
-        If Entry("url").ToString.Contains("pcl") Then NewItem.Info = "[PCL 特别提供] " & NewItem.Info
+        If Entry("url").ToString.Contains("pcl") Then NewItem.Info = "[PCL 特供下载] " & NewItem.Info
         AddHandler NewItem.Click, OnClick
         '建立菜单
         If IsSaveOnly Then
@@ -299,8 +299,8 @@ Public Module ModDownloadLib
             WikiName = "Java版Infdev_20100618"
         ElseIf Id = "c0.30_01c" OrElse Id = "c0.30_survival" OrElse Id.Contains("生存测试") Then
             WikiName = "Java版Classic_0.30（生存模式）"
-        ElseIf Id = "c0.31" Then
-            WikiName = "Java版Indev_0.31（2010年1月30日）"
+        ElseIf Id.StartsWith("c0.31") Then
+            WikiName = "Java版Indev_0.31_20100130"
         ElseIf Id.StartsWith("c") Then
             WikiName = "Java版" & Id.Replace("c", "Classic_")
         ElseIf Id.StartsWith("rd-") Then
@@ -382,7 +382,7 @@ Public Module ModDownloadLib
             Log(ex, "开始 OptiFine 下载失败", LogLevel.Feedback)
         End Try
     End Sub
-    Private Sub McDownloadOptiFineInstall(BaseMcFolderHome As String, Target As String, Task As LoaderTask(Of List(Of NetFile), Boolean))
+    Private Sub McDownloadOptiFineInstall(BaseMcFolderHome As String, Target As String, Task As LoaderTask(Of List(Of NetFile), Boolean), UseJavaWrapper As Boolean)
         '选择 Java
         Dim Java = JavaSelect("已取消安装。", New Version(1, 8, 0, 0))
         If Java Is Nothing Then
@@ -399,7 +399,12 @@ Public Module ModDownloadLib
             If Java Is Nothing Then Throw New Exception("由于未找到 Java，已取消安装。")
         End If
         '添加 Java Wrapper 作为主 Jar
-        Dim Arguments = "-Doolloo.jlw.tmpdir=""" & GetJavaWrapperDir() & """ -Duser.home=""" & BaseMcFolderHome & """ -cp """ & Target & """ -jar """ & ExtractJavaWrapper() & """ optifine.Installer"
+        Dim Arguments As String
+        If UseJavaWrapper Then
+            Arguments = $"-Doolloo.jlw.tmpdir=""{GetJavaWrapperDir()}"" -Duser.home=""{BaseMcFolderHome}"" -cp ""{Target}"" -jar ""{ExtractJavaWrapper()}"" optifine.Installer"
+        Else
+            Arguments = $"-Duser.home=""{BaseMcFolderHome}"" -cp ""{Target}"" optifine.Installer"
+        End If
         If Java.VersionCode >= 9 Then Arguments = "--add-exports cpw.mods.bootstraplauncher/cpw.mods.bootstraplauncher=ALL-UNNAMED " & Arguments
         '开始启动
         SyncLock InstallSyncLock
@@ -504,67 +509,66 @@ Public Module ModDownloadLib
 
         '获取下载地址
         Loaders.Add(New LoaderTask(Of String, List(Of NetFile))("获取 OptiFine 主文件下载地址",
-                                                            Sub(Task As LoaderTask(Of String, List(Of NetFile)))
-                                                                '启动依赖版本的下载
-                                                                If ClientDownloadLoader Is Nothing Then
-                                                                    If IsCustomFolder Then Throw New Exception("如果没有指定原版下载器，则不能指定 MC 安装文件夹")
-                                                                    ClientDownloadLoader = McDownloadClient(NetPreDownloadBehaviour.ExitWhileExistsOrDownloading, DownloadInfo.Inherit)
-                                                                End If
-                                                                Task.Progress = 0.1
-                                                                Dim Sources As New List(Of String)
-                                                                'BMCLAPI 源
-                                                                If DownloadInfo.IsPreview Then
-                                                                    Sources.Add("https://download.mcbbs.net/optifine/" & DownloadInfo.Inherit & "/HD_U_" & DownloadInfo.NameDisplay.Replace(DownloadInfo.Inherit & " ", "").Replace(" ", "/"))
-                                                                    Sources.Add("https://bmclapi2.bangbang93.com/optifine/" & DownloadInfo.Inherit & "/HD_U_" & DownloadInfo.NameDisplay.Replace(DownloadInfo.Inherit & " ", "").Replace(" ", "/"))
-                                                                Else
-                                                                    Sources.Add("https://download.mcbbs.net/optifine/" & DownloadInfo.Inherit & "/HD_U/" & DownloadInfo.NameDisplay.Replace(DownloadInfo.Inherit & " ", ""))
-                                                                    Sources.Add("https://bmclapi2.bangbang93.com/optifine/" & DownloadInfo.Inherit & "/HD_U/" & DownloadInfo.NameDisplay.Replace(DownloadInfo.Inherit & " ", ""))
-                                                                End If
-                                                                '官方源
-                                                                Dim PageData As String
-                                                                Try
-                                                                    PageData = NetGetCodeByClient("https://optifine.net/adloadx?f=" & DownloadInfo.NameFile, New UTF8Encoding(False), 15000, "text/html")
-                                                                    Task.Progress = 0.8
-                                                                    Sources.Add("https://optifine.net/" & RegexSearch(PageData, "downloadx\?f=[^""']+")(0))
-                                                                    Log("[Download] OptiFine " & DownloadInfo.NameDisplay & " 官方下载地址：" & Sources(0))
-                                                                Catch ex As Exception
-                                                                    Log(ex, "获取 OptiFine " & DownloadInfo.NameDisplay & " 官方下载地址失败")
-                                                                End Try
-                                                                Task.Progress = 0.9
-                                                                'OptiFine 中文镜像源
-                                                                Sources.Add("https://optifine.cn/download/" & DownloadInfo.NameFile)
-                                                                '构造文件请求
-                                                                Task.Output = New List(Of NetFile) From {New NetFile(Sources.ToArray, Target, New FileChecker(MinSize:=64 * 1024))}
-                                                            End Sub) With {.ProgressWeight = 8})
+            Sub(Task As LoaderTask(Of String, List(Of NetFile)))
+                '启动依赖版本的下载
+                If ClientDownloadLoader Is Nothing Then
+                    If IsCustomFolder Then Throw New Exception("如果没有指定原版下载器，则不能指定 MC 安装文件夹")
+                    ClientDownloadLoader = McDownloadClient(NetPreDownloadBehaviour.ExitWhileExistsOrDownloading, DownloadInfo.Inherit)
+                End If
+                Task.Progress = 0.1
+                Dim Sources As New List(Of String)
+                'BMCLAPI 源
+                If DownloadInfo.IsPreview Then
+                    Sources.Add("https://download.mcbbs.net/optifine/" & DownloadInfo.Inherit & "/HD_U_" & DownloadInfo.NameDisplay.Replace(DownloadInfo.Inherit & " ", "").Replace(" ", "/"))
+                    Sources.Add("https://bmclapi2.bangbang93.com/optifine/" & DownloadInfo.Inherit & "/HD_U_" & DownloadInfo.NameDisplay.Replace(DownloadInfo.Inherit & " ", "").Replace(" ", "/"))
+                Else
+                    Sources.Add("https://download.mcbbs.net/optifine/" & DownloadInfo.Inherit & "/HD_U/" & DownloadInfo.NameDisplay.Replace(DownloadInfo.Inherit & " ", ""))
+                    Sources.Add("https://bmclapi2.bangbang93.com/optifine/" & DownloadInfo.Inherit & "/HD_U/" & DownloadInfo.NameDisplay.Replace(DownloadInfo.Inherit & " ", ""))
+                End If
+                '官方源
+                Dim PageData As String
+                Try
+                    PageData = NetGetCodeByClient("https://optifine.net/adloadx?f=" & DownloadInfo.NameFile, New UTF8Encoding(False), 15000, "text/html")
+                    Task.Progress = 0.8
+                    Sources.Add("https://optifine.net/" & RegexSearch(PageData, "downloadx\?f=[^""']+")(0))
+                    Log("[Download] OptiFine " & DownloadInfo.NameDisplay & " 官方下载地址：" & Sources(0))
+                Catch ex As Exception
+                    Log(ex, "获取 OptiFine " & DownloadInfo.NameDisplay & " 官方下载地址失败")
+                End Try
+                'OptiFine 中文镜像源
+                Sources.Add("https://optifine.cn/download/" & DownloadInfo.NameFile)
+                '构造文件请求
+                Task.Output = New List(Of NetFile) From {New NetFile(Sources.ToArray, Target, New FileChecker(MinSize:=64 * 1024))}
+            End Sub) With {.ProgressWeight = 8})
         Loaders.Add(New LoaderDownload("下载 OptiFine 主文件", New List(Of NetFile)) With {.ProgressWeight = 8})
         Loaders.Add(New LoaderTask(Of List(Of NetFile), Boolean)("等待原版下载",
-                                                                         Sub(Task As LoaderTask(Of List(Of NetFile), Boolean))
-                                                                             '等待原版文件下载完成
-                                                                             If ClientDownloadLoader Is Nothing Then Exit Sub
-                                                                             Dim TargetLoaders As List(Of LoaderBase) =
-                                                                                ClientDownloadLoader.GetLoaderList.Where(Function(l) l.Name = McDownloadClientLibName OrElse l.Name = McDownloadClientJsonName).
-                                                                                Where(Function(l) l.State <> LoadState.Finished).ToList
-                                                                             If TargetLoaders.Count > 0 Then Log("[Download] OptiFine 安装正在等待原版文件下载完成")
-                                                                             Do While TargetLoaders.Count > 0 AndAlso Not Task.IsAborted
-                                                                                 TargetLoaders = TargetLoaders.Where(Function(l) l.State <> LoadState.Finished).ToList
-                                                                                 Thread.Sleep(50)
-                                                                             Loop
-                                                                             If Task.IsAborted Then Exit Sub
-                                                                             '拷贝原版文件
-                                                                             If Not IsCustomFolder Then Exit Sub
-                                                                             SyncLock VanillaSyncLock
-                                                                                 Dim ClientName As String = GetFolderNameFromPath(ClientFolder)
-                                                                                 Directory.CreateDirectory(McFolder & "versions\" & DownloadInfo.Inherit)
-                                                                                 If Not File.Exists(McFolder & "versions\" & DownloadInfo.Inherit & "\" & DownloadInfo.Inherit & ".json") Then
-                                                                                     CopyFile(ClientFolder & ClientName & ".json",
+            Sub(Task As LoaderTask(Of List(Of NetFile), Boolean))
+                '等待原版文件下载完成
+                If ClientDownloadLoader Is Nothing Then Exit Sub
+                Dim TargetLoaders As List(Of LoaderBase) =
+                   ClientDownloadLoader.GetLoaderList.Where(Function(l) l.Name = McDownloadClientLibName OrElse l.Name = McDownloadClientJsonName).
+                   Where(Function(l) l.State <> LoadState.Finished).ToList
+                If TargetLoaders.Count > 0 Then Log("[Download] OptiFine 安装正在等待原版文件下载完成")
+                Do While TargetLoaders.Count > 0 AndAlso Not Task.IsAborted
+                    TargetLoaders = TargetLoaders.Where(Function(l) l.State <> LoadState.Finished).ToList
+                    Thread.Sleep(50)
+                Loop
+                If Task.IsAborted Then Exit Sub
+                '拷贝原版文件
+                If Not IsCustomFolder Then Exit Sub
+                SyncLock VanillaSyncLock
+                    Dim ClientName As String = GetFolderNameFromPath(ClientFolder)
+                    Directory.CreateDirectory(McFolder & "versions\" & DownloadInfo.Inherit)
+                    If Not File.Exists(McFolder & "versions\" & DownloadInfo.Inherit & "\" & DownloadInfo.Inherit & ".json") Then
+                        CopyFile(ClientFolder & ClientName & ".json",
                                                                                           McFolder & "versions\" & DownloadInfo.Inherit & "\" & DownloadInfo.Inherit & ".json")
-                                                                                 End If
-                                                                                 If Not File.Exists(McFolder & "versions\" & DownloadInfo.Inherit & "\" & DownloadInfo.Inherit & ".jar") Then
-                                                                                     CopyFile(ClientFolder & ClientName & ".jar",
+                    End If
+                    If Not File.Exists(McFolder & "versions\" & DownloadInfo.Inherit & "\" & DownloadInfo.Inherit & ".jar") Then
+                        CopyFile(ClientFolder & ClientName & ".jar",
                                                                                               McFolder & "versions\" & DownloadInfo.Inherit & "\" & DownloadInfo.Inherit & ".jar")
-                                                                                 End If
-                                                                             End SyncLock
-                                                                         End Sub) With {.ProgressWeight = 0.1, .Show = False})
+                    End If
+                End SyncLock
+            End Sub) With {.ProgressWeight = 0.1, .Show = False})
 
         '安装（新旧方式均需要原版 Jar 和 Json）
         If IsNewVersion Then
@@ -586,7 +590,19 @@ Public Module ModDownloadLib
                               BaseMcFolder & "versions\" & DownloadInfo.Inherit & "\" & DownloadInfo.Inherit & ".jar")
                     Task.Progress = 0.06
                     '进行安装
-                    McDownloadOptiFineInstall(BaseMcFolderHome, Target, Task)
+                    Dim UseJavaWrapper As Boolean = True
+Retry:
+                    Try
+                        McDownloadOptiFineInstall(BaseMcFolderHome, Target, Task, UseJavaWrapper)
+                    Catch ex As Exception
+                        If UseJavaWrapper Then
+                            Log(ex, "使用 JavaWrapper 安装 OptiFine 失败，将不使用 JavaWrapper 并重试")
+                            UseJavaWrapper = False
+                            GoTo Retry
+                        Else
+                            Throw New Exception("运行 OptiFine 安装器失败", ex)
+                        End If
+                    End Try
                     Task.Progress = 0.96
                     '复制文件
                     File.Delete(BaseMcFolder & "launcher_profiles.json")
@@ -596,7 +612,7 @@ Public Module ModDownloadLib
                     File.Delete(Target)
                     DeleteDirectory(BaseMcFolderHome)
                 Catch ex As Exception
-                    Throw New Exception("安装新版 OptiFine 版本失败", ex)
+                    Throw New Exception("安装 OptiFine（方式 A）失败", ex)
                 End Try
             End Sub) With {.ProgressWeight = 8})
         Else
@@ -645,7 +661,7 @@ Public Module ModDownloadLib
                     End If
                     WriteFile(VersionFolder & Id & ".json", Json)
                 Catch ex As Exception
-                    Throw New Exception("安装旧版 OptiFine 版本失败", ex)
+                    Throw New Exception("安装 OptiFine（方式 B）失败", ex)
                 End Try
             End Sub) With {.ProgressWeight = 1})
         End If
@@ -1110,7 +1126,7 @@ Public Module ModDownloadLib
         End Try
     End Sub
 
-    Private Sub ForgeInjector(Target As String, Task As LoaderTask(Of Boolean, Boolean), McFolder As String)
+    Private Sub ForgeInjector(Target As String, Task As LoaderTask(Of Boolean, Boolean), McFolder As String, UseJavaWrapper As Boolean)
         '选择 Java
         Dim Java = JavaSelect("已取消安装。", New Version(1, 8, 0, 0))
         If Java Is Nothing Then
@@ -1127,7 +1143,12 @@ Public Module ModDownloadLib
             If Java Is Nothing Then Throw New Exception("由于未找到 Java，已取消安装。")
         End If
         '添加 Java Wrapper 作为主 Jar
-        Dim Arguments = "-Doolloo.jlw.tmpdir=""" & GetJavaWrapperDir() & """ -cp """ & PathTemp & "Cache\forge_installer.jar;" & Target & """ -jar """ & ExtractJavaWrapper() & """  com.bangbang93.ForgeInstaller """ & McFolder
+        Dim Arguments As String
+        If UseJavaWrapper Then
+            Arguments = $"-Doolloo.jlw.tmpdir=""{GetJavaWrapperDir()}"" -cp ""{PathTemp}Cache\forge_installer.jar;{Target}"" -jar ""{ExtractJavaWrapper()}"" com.bangbang93.ForgeInstaller ""{McFolder}"
+        Else
+            Arguments = $"-cp ""{PathTemp}Cache\forge_installer.jar;{Target}"" com.bangbang93.ForgeInstaller ""{McFolder}"
+        End If
         If Java.VersionCode >= 9 Then Arguments = "--add-exports cpw.mods.bootstraplauncher/cpw.mods.bootstraplauncher=ALL-UNNAMED " & Arguments
         '开始启动
         SyncLock InstallSyncLock
@@ -1415,12 +1436,25 @@ Public Module ModDownloadLib
                                                                     '释放 launcher_installer.json
                                                                     McFolderLauncherProfilesJsonCreate(McFolder)
                                                                     Task.Progress = 0.05
-                                                                    '释放 Forge 注入器
-                                                                    WriteFile(PathTemp & "Cache\forge_installer.jar", GetResources("ForgeInstaller"))
-                                                                    Task.Progress = 0.06
-                                                                    '运行注入器
-                                                                    ForgeInjector(InstallerAddress, Task, McFolder)
-                                                                    Task.Progress = 0.97
+                                                                    '运行 Forge 安装器
+                                                                    Dim UseJavaWrapper As Boolean = True
+Retry:
+                                                                    Try
+                                                                        '释放 Forge 注入器
+                                                                        WriteFile(PathTemp & "Cache\forge_installer.jar", GetResources("ForgeInstaller"))
+                                                                        Task.Progress = 0.06
+                                                                        '运行注入器
+                                                                        ForgeInjector(InstallerAddress, Task, McFolder, UseJavaWrapper)
+                                                                        Task.Progress = 0.97
+                                                                    Catch ex As Exception
+                                                                        If UseJavaWrapper Then
+                                                                            Log(ex, "使用 JavaWrapper 安装 Forge 失败，将不使用 JavaWrapper 并重试")
+                                                                            UseJavaWrapper = False
+                                                                            GoTo Retry
+                                                                        Else
+                                                                            Throw New Exception("运行 Forge 安装器失败", ex)
+                                                                        End If
+                                                                    End Try
                                                                     '拷贝新增的版本 Json
                                                                     Dim DeltaList = New DirectoryInfo(McFolder & "versions\").EnumerateDirectories.SkipWhile(Function(Info As DirectoryInfo) As Boolean
                                                                                                                                                                  Return OldList.Contains(Info.FullName)
@@ -1470,7 +1504,7 @@ Public Module ModDownloadLib
                                                                         Task.Progress = 0.6
                                                                         '解压支持库文件
                                                                         Installer.Dispose()
-                                                                        ZipFile.ExtractToDirectory(InstallerAddress, InstallerAddress & "_unrar\")
+                                                                        ExtractFile(InstallerAddress, InstallerAddress & "_unrar\")
                                                                         CopyDirectory(InstallerAddress & "_unrar\maven\", McFolder & "libraries\")
                                                                         DeleteDirectory(InstallerAddress & "_unrar\")
                                                                     Else
@@ -1954,9 +1988,9 @@ Public Module ModDownloadLib
         If Directory.Exists(TempMcFolder) Then DeleteDirectory(TempMcFolder)
         Dim OptiFineFolder As String = Nothing
         If Request.OptiFineVersion IsNot Nothing Then
-            If Request.OptiFineVersion.Contains("_HD_U") Then Request.OptiFineVersion = "HD_U_" & Request.OptiFineVersion.Split("_HD_U").Last '#735
+            If Request.OptiFineVersion.Contains("_HD_U_") Then Request.OptiFineVersion = "HD_U_" & Request.OptiFineVersion.Split("_HD_U_").Last '#735
             Request.OptiFineEntry = New DlOptiFineListEntry With {
-                .NameDisplay = Request.MinecraftName & " " & Request.OptiFineVersion.Replace("HD_U_", "").Replace("_", ""),
+                .NameDisplay = Request.MinecraftName & " " & Request.OptiFineVersion.Replace("HD_U_", "").Replace("_", "").Replace("pre", " pre"),
                 .Inherit = Request.MinecraftName,
                 .IsPreview = Request.OptiFineVersion.ToLower.Contains("pre"),
                 .NameVersion = Request.MinecraftName & "-OptiFine_" & Request.OptiFineVersion,
@@ -2180,7 +2214,7 @@ Public Module ModDownloadLib
             OutputJson.Merge(FabricJson)
         End If
         '修改
-        If RealArguments IsNot Nothing Then OutputJson("minecraftArguments") = RealArguments
+        If RealArguments IsNot Nothing AndAlso RealArguments.Replace(" ", "") <> "" Then OutputJson("minecraftArguments") = RealArguments
         OutputJson.Remove("_comment_")
         OutputJson.Remove("inheritsFrom")
         OutputJson.Remove("jar")

Plain Craft Launcher 2/Pages/PageDownload/PageDownloadCompDetail.xaml.vb

@@ -9,7 +9,7 @@
 
     '初始化加载器信息
     Private Sub PageDownloadCompDetail_Inited(sender As Object, e As EventArgs) Handles Me.Initialized
-        Project = FrmMain.PageCurrent.Additional
+        Project = FrmMain.PageCurrent.Additional(0)
         PageLoaderInit(Load, PanLoad, PanMain, CardIntro, CompFileLoader, AddressOf Load_OnFinish)
     End Sub
     '自动重试
@@ -40,7 +40,7 @@
     End Class
     Private Sub Load_OnFinish()
         '获取目标版本与 Mod 加载器
-        Dim TargetVersion As String = ""
+        Dim TargetVersion As String
         Select Case Project.Type
             Case CompType.Mod
                 TargetVersion = If(PageDownloadMod.Loader.Input.GameVersion, "")
@@ -102,7 +102,9 @@
                 NewCard.SwapControl = NewStack
                 PanMain.Children.Add(NewCard)
                 '确定卡片是否展开
-                If Pair.Key = TargetCardName Then
+                If Pair.Key = TargetCardName OrElse
+                   (FrmMain.PageCurrent.Additional IsNot Nothing AndAlso '#2761
+                   CType(FrmMain.PageCurrent.Additional(1), List(Of String)).Contains(NewCard.Title)) Then
                     MyCard.StackInstall(NewStack, If(Project.Type = CompType.ModPack, 9, 8), Pair.Key) 'FUTURE: Res
                 Else
                     NewCard.IsSwaped = True
@@ -128,7 +130,7 @@
     Private IsFirstInit As Boolean = True
     Public Sub Init() Handles Me.PageEnter
         AniControlEnabled += 1
-        Project = FrmMain.PageCurrent.Additional
+        Project = FrmMain.PageCurrent.Additional(0)
         PanBack.ScrollToHome()
 
         '重启加载器
@@ -142,6 +144,8 @@
         '放置当前工程
         If CompItem IsNot Nothing Then PanIntro.Children.Remove(CompItem)
         CompItem = Project.ToCompItem(True, True)
+        CompItem.IsHitTestVisible = False
+        CompItem.HasAnimation = False
         CompItem.Margin = New Thickness(-7, -7, 0, 8)
         PanIntro.Children.Insert(0, CompItem)
 

Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb

@@ -597,7 +597,7 @@
     ''' 获取 OptiFine 的加载异常信息。若正常则返回 Nothing。
     ''' </summary>
     Private Function LoadOptiFineGetError() As String
-        If LoadOptiFine.State.LoadingState = MyLoading.MyLoadingState.Run Then Return "正在获取版本列表……"
+        If LoadOptiFine Is Nothing OrElse LoadOptiFine.State.LoadingState = MyLoading.MyLoadingState.Run Then Return "正在获取版本列表……"
         If LoadOptiFine.State.LoadingState = MyLoading.MyLoadingState.Error Then Return "获取版本列表失败：" & CType(LoadOptiFine.State, Object).Error.Message
         '检查 Forge 1.13 - 1.14.3：全部不兼容
         If SelectedForge IsNot Nothing AndAlso
@@ -700,7 +700,7 @@
     ''' </summary>
     Private Function LoadLiteLoaderGetError() As String
         If Not SelectedMinecraftId.Contains("1.") OrElse Val(SelectedMinecraftId.Split(".")(1)) > 12 Then Return "没有可用版本"
-        If LoadLiteLoader.State.LoadingState = MyLoading.MyLoadingState.Run Then Return "正在获取版本列表……"
+        If LoadLiteLoader Is Nothing OrElse LoadLiteLoader.State.LoadingState = MyLoading.MyLoadingState.Run Then Return "正在获取版本列表……"
         If LoadLiteLoader.State.LoadingState = MyLoading.MyLoadingState.Error Then Return "获取版本列表失败：" & CType(LoadLiteLoader.State, Object).Error.Message
         For Each Version As DlLiteLoaderListEntry In DlLiteLoaderListLoader.Output.Value
             If Version.Inherit = SelectedMinecraftId Then Return Nothing
@@ -845,10 +845,10 @@
     ''' 获取 Fabric 的加载异常信息。若正常则返回 Nothing。
     ''' </summary>
     Private Function LoadFabricGetError() As String
-        If LoadFabric.State.LoadingState = MyLoading.MyLoadingState.Run Then Return "正在获取版本列表……"
+        If LoadFabric Is Nothing OrElse LoadFabric.State.LoadingState = MyLoading.MyLoadingState.Run Then Return "正在获取版本列表……"
         If LoadFabric.State.LoadingState = MyLoading.MyLoadingState.Error Then Return "获取版本列表失败：" & CType(LoadFabric.State, Object).Error.Message
         For Each Version As JObject In DlFabricListLoader.Output.Value("game")
-            If Version("version").ToString = SelectedMinecraftId.Replace("∞", "infinite") Then
+            If Version("version").ToString = SelectedMinecraftId.Replace("∞", "infinite").Replace("Combat Test 7c", "1.16_combat-3") Then
                 If SelectedForge IsNot Nothing Then Return "与 Forge 不兼容"
                 'If SelectedOptiFine IsNot Nothing Then Return "与 OptiFine 不兼容"
                 Return Nothing
@@ -908,7 +908,7 @@
     Public Shared Function IsSuitableFabricApi(DisplayName As String, MinecraftVersion As String) As Boolean
         Try
             If DisplayName Is Nothing OrElse MinecraftVersion Is Nothing Then Return False
-            DisplayName = DisplayName.ToLower : MinecraftVersion = MinecraftVersion.ToLower
+            DisplayName = DisplayName.ToLower : MinecraftVersion = MinecraftVersion.Replace("∞", "infinite").Replace("Combat Test 7c", "1.16_combat-3").ToLower
             If DisplayName.StartsWith("[" & MinecraftVersion & "]") Then Return True
             If Not DisplayName.Contains("/") OrElse Not DisplayName.Contains("]") Then Return False
             '直接的判断（例如 1.18.1/22w03a）
@@ -945,7 +945,7 @@
     ''' 获取 FabricApi 的加载异常信息。若正常则返回 Nothing。
     ''' </summary>
     Private Function LoadFabricApiGetError() As String
-        If LoadFabricApi.State.LoadingState = MyLoading.MyLoadingState.Run Then Return "正在获取版本列表……"
+        If LoadFabricApi Is Nothing OrElse LoadFabricApi.State.LoadingState = MyLoading.MyLoadingState.Run Then Return "正在获取版本列表……"
         If LoadFabricApi.State.LoadingState = MyLoading.MyLoadingState.Error Then Return "获取版本列表失败：" & CType(LoadFabricApi.State, Object).Error.Message
         If DlFabricApiLoader.Output Is Nothing Then
             If SelectedFabric Is Nothing Then Return "需要安装 Fabric"
@@ -1038,7 +1038,7 @@
     ''' </summary>
     Private Function LoadOptiFabricGetError() As String
         If SelectedMinecraftId.StartsWith("1.14") OrElse SelectedMinecraftId.StartsWith("1.15") Then Return "不兼容老版本 Fabric，请手动下载 OptiFabric Origins"
-        If LoadOptiFabric.State.LoadingState = MyLoading.MyLoadingState.Run Then Return "正在获取版本列表……"
+        If LoadOptiFabric Is Nothing OrElse LoadOptiFabric.State.LoadingState = MyLoading.MyLoadingState.Run Then Return "正在获取版本列表……"
         If LoadOptiFabric.State.LoadingState = MyLoading.MyLoadingState.Error Then Return "获取版本列表失败：" & CType(LoadOptiFabric.State, Object).Error.Message
         If DlOptiFabricLoader.Output Is Nothing Then
             If SelectedFabric Is Nothing AndAlso SelectedOptiFine Is Nothing Then Return "需要安装 OptiFine 与 Fabric"

Plain Craft Launcher 2/Pages/PageDownload/PageDownloadMod.xaml

@@ -33,6 +33,7 @@
                         <TextBlock VerticalAlignment="Center" Grid.Row="2" HorizontalAlignment="Left" Text="版本" Margin="0,0,18,0" />
                         <local:MyComboBox x:Name="TextSearchVersion" Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="2" IsEditable="True" MaxDropDownHeight="320">
                             <local:MyComboBoxItem Content="全部 (也可自行输入)" IsSelected="True" />
+                            <local:MyComboBoxItem Content="1.20.2" />
                             <local:MyComboBoxItem Content="1.20.1" />
                             <local:MyComboBoxItem Content="1.20" />
                             <local:MyComboBoxItem Content="1.19.4" />

Plain Craft Launcher 2/Pages/PageDownload/PageDownloadMod.xaml.vb

@@ -32,9 +32,7 @@
             '列表项
             PanProjects.Children.Clear()
             For i = Math.Min(Page * PageSize, Storage.Results.Count - 1) To Math.Min((Page + 1) * PageSize - 1, Storage.Results.Count - 1)
-                PanProjects.Children.Add(
-                    Storage.Results(i).ToCompItem(Loader.Input.GameVersion Is Nothing,
-                                                  Loader.Input.ModLoader = CompModLoaderType.Any, AddressOf ProjectClick))
+                PanProjects.Children.Add(Storage.Results(i).ToCompItem(Loader.Input.GameVersion Is Nothing, Loader.Input.ModLoader = CompModLoaderType.Any))
             Next
             '页码
             CardPages.Visibility = If(Storage.Results.Count > 40 OrElse
@@ -68,12 +66,6 @@
         End Select
     End Sub
 
-    '进入详情页面
-
-    Public Sub ProjectClick(sender As MyCompItem, e As EventArgs)
-        FrmMain.PageChange(New FormMain.PageStackData With {.Page = FormMain.PageType.CompDetail, .Additional = sender.Tag})
-    End Sub
-
     '切换页码
 
     Private Sub BtnPageFirst_Click(sender As Object, e As RoutedEventArgs) Handles BtnPageFirst.Click
@@ -114,6 +106,7 @@
         TextSearchName.Text = ""
         TextSearchVersion.Text = "全部 (也可自行输入)"
         TextSearchVersion.SelectedIndex = 0
+        ComboSearchSource.SelectedIndex = 0
         ComboSearchTag.SelectedIndex = 0
         ComboSearchLoader.SelectedIndex = 0
         Loader.LastFinishedTime = 0 '要求强制重新开始

Plain Craft Launcher 2/Pages/PageDownload/PageDownloadPack.xaml

@@ -32,6 +32,7 @@
                         <TextBlock VerticalAlignment="Center" Grid.Row="2" HorizontalAlignment="Left" Text="版本" Margin="0,0,18,0" />
                         <local:MyComboBox x:Name="TextSearchVersion" Grid.Row="2" Grid.Column="1" IsEditable="True" MaxDropDownHeight="320">
                             <local:MyComboBoxItem Content="全部 (也可自行输入)" IsSelected="True" />
+                            <local:MyComboBoxItem Content="1.20.2" />
                             <local:MyComboBoxItem Content="1.20.1" />
                             <local:MyComboBoxItem Content="1.20" />
                             <local:MyComboBoxItem Content="1.19.4" />

Plain Craft Launcher 2/Pages/PageDownload/PageDownloadPack.xaml.vb

@@ -31,8 +31,7 @@
             '列表项
             PanProjects.Children.Clear()
             For i = Math.Min(Page * PageSize, Storage.Results.Count - 1) To Math.Min((Page + 1) * PageSize - 1, Storage.Results.Count - 1)
-                PanProjects.Children.Add(
-                    Storage.Results(i).ToCompItem(Loader.Input.GameVersion Is Nothing, True, AddressOf ProjectClick))
+                PanProjects.Children.Add(Storage.Results(i).ToCompItem(Loader.Input.GameVersion Is Nothing, True))
             Next
             '页码
             CardPages.Visibility = If(Storage.Results.Count > 40 OrElse
@@ -66,12 +65,6 @@
         End Select
     End Sub
 
-    '进入详情页面
-
-    Public Sub ProjectClick(sender As MyCompItem, e As EventArgs)
-        FrmMain.PageChange(New FormMain.PageStackData With {.Page = FormMain.PageType.CompDetail, .Additional = sender.Tag})
-    End Sub
-
     '切换页码
 
     Private Sub BtnPageFirst_Click(sender As Object, e As RoutedEventArgs) Handles BtnPageFirst.Click
@@ -116,6 +109,7 @@
         TextSearchName.Text = ""
         TextSearchVersion.Text = "全部 (也可自行输入)"
         TextSearchVersion.SelectedIndex = 0
+        ComboSearchSource.SelectedIndex = 0
         ComboSearchTag.SelectedIndex = 0
         Loader.LastFinishedTime = 0 '要求强制重新开始
     End Sub

Plain Craft Launcher 2/Pages/PageLaunch/MySkin.xaml.vb

@@ -104,7 +104,7 @@
                    (Image.Pic.GetPixel(1, 1) <> Image.Pic.GetPixel(Scale * 41, Scale * 9) AndAlso '或是头部颜色和透明区均不一样
                     Image.Pic.GetPixel(Image.Pic.Width - 1, Image.Pic.Height - 1) <> Image.Pic.GetPixel(Scale * 41, Scale * 9) AndAlso
                     Image.Pic.GetPixel(Image.Pic.Width - 2, Image.Pic.Height / 2 - 2) <> Image.Pic.GetPixel(Scale * 41, Scale * 9)) Then
-                    ImgFore.Source = New CroppedBitmap(Image, New Int32Rect(Scale * 40, Scale * 8, Scale * 8, Scale * 8))
+                    ImgFore.Source = Image.Clip(Scale * 40, Scale * 8, Scale * 8, Scale * 8)
                 Else
                     ImgFore.Source = Nothing
                 End If
@@ -112,7 +112,7 @@
                 ImgFore.Source = Nothing
             End If
             '脸层
-            ImgBack.Source = New CroppedBitmap(Image, New Int32Rect(Scale * 8, Scale * 8, Scale * 8, Scale * 8))
+            ImgBack.Source = Image.Clip(Scale * 8, Scale * 8, Scale * 8, Scale * 8)
             Log("[Skin] 载入头像成功：" & Loader.Name)
         Catch ex As Exception
             Log(ex, "载入头像失败（" & If(Address, "null") & "," & Loader.Name & "）", LogLevel.Hint)

Plain Craft Launcher 2/Pages/PageLaunch/PageLaunchLeft.xaml.vb

@@ -79,7 +79,45 @@
     ''' 切换至启动中页面。
     ''' </summary>
     Public Sub PageChangeToLaunching()
-        LaunchingPreload()
+        '修改登陆方式
+        Select Case Setup.Get("LoginType")
+            Case McLoginType.Legacy
+                If PageLinkHiper.HiperState = LoadState.Finished Then
+                    LabLaunchingMethod.Text = "联机离线登录"
+                Else
+                    LabLaunchingMethod.Text = "离线登录"
+                End If
+            Case McLoginType.Ms
+                LabLaunchingMethod.Text = "正版登录"
+            Case McLoginType.Nide
+                LabLaunchingMethod.Text = "统一通行证"
+            Case McLoginType.Auth
+                LabLaunchingMethod.Text = "Authlib-Injector"
+        End Select
+        '初始化页面
+        LabLaunchingName.Text = McVersionCurrent.Name
+        LabLaunchingStage.Text = "初始化"
+        LabLaunchingTitle.Text = If(McLaunchLoader.Input Is Nothing OrElse McLaunchLoader.Input.SaveBatch Is Nothing, "正在启动游戏", "正在导出启动脚本")
+        LabLaunchingProgress.Text = "0.00 %"
+        LabLaunchingProgress.Opacity = 1
+        LabLaunchingDownload.Visibility = Visibility.Visible
+        LabLaunchingProgressLeft.Opacity = 0.6
+        LabLaunchingDownload.Visibility = Visibility.Visible
+        LabLaunchingDownload.Text = "0 B/s"
+        LabLaunchingDownload.Opacity = 0
+        LabLaunchingDownload.Visibility = Visibility.Collapsed
+        LabLaunchingDownloadLeft.Opacity = 0
+        LabLaunchingDownloadLeft.Visibility = Visibility.Collapsed
+        ProgressLaunchingFinished.Width = New GridLength(0, GridUnitType.Star)
+        ProgressLaunchingUnfinished.Width = New GridLength(1, GridUnitType.Star)
+        PanLaunchingHint.Opacity = 0
+        PanLaunchingHint.Visibility = Visibility.Collapsed
+        PanLaunchingInfo.Width = Double.NaN '重置宽度改变动画
+        McLaunchProcess = Nothing
+        McLaunchWatcher = Nothing
+        '获取 “你知道吗” 提示
+        LabLaunchingHint.Text = PageOtherTest.GetRandomHint()
+        '初始化其他页面
         PanInput.IsHitTestVisible = False
         PanLaunching.IsHitTestVisible = False
         LoadLaunching.State.LoadingState = MyLoading.MyLoadingState.Run
@@ -634,55 +672,6 @@ ExitRefresh:
         PageVersionLeft.Version = McVersionCurrent
         FrmMain.PageChange(FormMain.PageType.VersionSetup, 0)
     End Sub
-    '刷新 UI
-    Public Sub LaunchingPreload()
-        '修改登陆方式
-        Select Case Setup.Get("LoginType")
-            Case McLoginType.Legacy
-                If PageLinkHiper.HiperState = LoadState.Finished Then
-                    LabLaunchingMethod.Text = "联机离线登录"
-                Else
-                    LabLaunchingMethod.Text = "离线登录"
-                End If
-            Case McLoginType.Ms
-                LabLaunchingMethod.Text = "正版登录"
-            Case McLoginType.Nide
-                LabLaunchingMethod.Text = "统一通行证"
-            Case McLoginType.Auth
-                LabLaunchingMethod.Text = "Authlib-Injector"
-        End Select
-        '初始化页面
-        LabLaunchingName.Text = McVersionCurrent.Name
-        LabLaunchingStage.Text = "初始化"
-        LabLaunchingTitle.Text = If(McLaunchLoader.Input Is Nothing OrElse McLaunchLoader.Input.SaveBatch Is Nothing, "正在启动游戏", "正在导出启动脚本")
-        LabLaunchingProgress.Text = "0.00 %"
-        LabLaunchingProgress.Opacity = 1
-        LabLaunchingDownload.Visibility = Visibility.Visible
-        LabLaunchingProgressLeft.Opacity = 0.6
-        LabLaunchingDownload.Visibility = Visibility.Visible
-        LabLaunchingDownload.Text = "0 B/s"
-        LabLaunchingDownload.Opacity = 0
-        LabLaunchingDownload.Visibility = Visibility.Collapsed
-        LabLaunchingDownloadLeft.Opacity = 0
-        LabLaunchingDownloadLeft.Visibility = Visibility.Collapsed
-        ProgressLaunchingFinished.Width = New GridLength(0, GridUnitType.Star)
-        ProgressLaunchingUnfinished.Width = New GridLength(1, GridUnitType.Star)
-        PanLaunchingHint.Opacity = 0
-        PanLaunchingHint.Visibility = Visibility.Collapsed
-        PanLaunchingInfo.Width = Double.NaN '重置宽度改变动画
-        McLaunchProcess = Nothing
-        McLaunchWatcher = Nothing
-        '获取 “你知道吗” 提示
-        Dim Hint As String = PageOtherTest.GetRandomHint()
-        Try
-            Dim RawHints = ReadFile(Path & "PCL\hints.txt").Split(vbCrLf.ToCharArray).Where(Function(s) Not String.IsNullOrWhiteSpace(s)).ToList
-            If RawHints.Count > 0 Then Hint = RandomOne(RawHints)
-        Catch ex As Exception
-            Log(ex, "获取自定义 你知道吗 提示失败", LogLevel.Hint)
-        End Try
-        LabLaunchingHint.Text = Hint
-    End Sub
-    Private ShowProgress As Double = 0
     ''' <summary>
     ''' 每 0.2s 执行一次，刷新启动的数据 UI 显示。
     ''' </summary>
@@ -766,6 +755,7 @@ ExitRefresh:
             Log(ex, "刷新启动信息失败", LogLevel.Feedback)
         End Try
     End Sub
+    Private ShowProgress As Double = 0
     '尺寸改变动画
     Private IsWidthAnimating As Boolean = False
     Private ActualUsedWidth As Double

Plain Craft Launcher 2/Pages/PageLaunch/PageLaunchRight.xaml

@@ -10,9 +10,12 @@
             <StackPanel x:Name="PanCustom">
             </StackPanel>
             <local:MyCard Margin="0,0,0,15" Title="快照版提示" x:Name="PanHint">
-                <StackPanel Margin="25,40,23,12">
-                    <TextBlock x:Name="LabHint1" TextWrapping="Wrap" Margin="0,0,0,2" />
-                    <TextBlock x:Name="LabHint2" TextWrapping="Wrap" Margin="0,0,0,2" />
+                <local:MyIconButton LogoScale="1.1" 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"
+                                    Height="20" Margin="10" HorizontalAlignment="Right" VerticalAlignment="Top"
+                                    x:Name="BtnHintClose" />
+                <StackPanel Margin="25,38,23,15">
+                    <TextBlock x:Name="LabHint1" TextWrapping="Wrap" Margin="0,0,0,2" FontSize="13.5" />
+                    <TextBlock x:Name="LabHint2" TextWrapping="Wrap" Margin="0,0,0,2" FontSize="13.5" />
                 </StackPanel>
             </local:MyCard>
             <local:MyCard Margin="0,0,0,15" Title="启动日志" x:Name="PanLog">

Plain Craft Launcher 2/Pages/PageLaunch/PageLaunchRight.xaml.vb

@@ -3,100 +3,214 @@
     Private Sub Init() Handles Me.Loaded
         PanBack.ScrollToHome()
         PanLog.Visibility = If(ModeDebug, Visibility.Visible, Visibility.Collapsed)
-        '刷新主页
-        If ShouldRefresh Then
-            ShouldRefresh = False
-            RefreshCustom()
-        End If
         '快照版提示
 #If BETA Then
         PanHint.Visibility = Visibility.Collapsed
 #Else
-        PanHint.Title = "快照版提示"
         PanHint.Visibility = If(ThemeCheckGold(), Visibility.Collapsed, Visibility.Visible)
-        LabHint1.Text = "快照版包含尚未在正式版发布的测试性功能，仅用于赞助者本人尝鲜。所以请不要发给其他人或者用于制作整合包哦！如果发现了 Bug，可以在 更多 → 反馈 中提交！"
-        LabHint2.Text = "你可以通过赞助￥23.33 档位换取解锁码来隐藏这个提示。"
+        LabHint1.Text = "快照版包含尚未正式发布的测试功能，仅用于赞助者本人尝鲜。请不要发给其他人或者用来制作整合包哦！"
+        LabHint2.Text = $"若已累积赞助￥23.33，在爱发电私信发送 {vbLQ}解锁码{vbRQ} 即可永久隐藏此提示。"
 #End If
     End Sub
 
-    Private LatestFileContent As String = ""
-    Private LatestFileLink As String = Nothing
-    Private IsRefreshing As Boolean = False
-    Public ShouldRefresh As Boolean = True
+    '暂时关闭快照版提示
+#If Not BETA Then
+    Private Sub BtnHintClose_Click(sender As Object, e As EventArgs) Handles BtnHintClose.Click
+        AniDispose(PanHint, True)
+    End Sub
+#End If
+
+#Region "自定义主页"
+
     ''' <summary>
-    ''' 刷新自定义的主页。返回是否成功。
+    ''' 刷新自定义主页。
     ''' </summary>
-    Private Sub RefreshCustom()
-        If IsRefreshing Then
-            ShouldRefresh = True
-            Exit Sub
-        End If
+    Private Sub Refresh() Handles Me.Loaded
+        RunInNewThread(Sub()
+                           Try
+                               SyncLock RefreshLock
+                                   RefreshReal()
+                               End SyncLock
+                           Catch ex As Exception
+                               Log(ex, "加载 PCL 主页自定义信息失败", LogLevel.Msgbox)
+                           End Try
+                       End Sub, $"刷新自定义主页 #{GetUuid()}")
+    End Sub
+    Private Sub RefreshReal()
+        Dim Content As String = ""
+        Dim Url As String
+        Select Case Setup.Get("UiCustomType")
+            Case 1
+                '加载本地文件
+                Log("[Page] 主页自定义数据来源：本地文件")
+                Content = ReadFile(Path & "PCL\Custom.xaml") 'ReadFile 会进行存在检测
+            Case 2
+                Url = Setup.Get("UiCustomNet")
+Download:
+                '加载联网文件
+                If String.IsNullOrWhiteSpace(Url) Then Exit Select
+                If Url = Setup.Get("CacheSavedPageUrl") AndAlso File.Exists(PathTemp & "Cache\Custom.xaml") Then
+                    '缓存可用
+                    Log("[Page] 主页自定义数据来源：联网缓存文件")
+                    Content = ReadFile(PathTemp & "Cache\Custom.xaml")
+                    '后台更新缓存
+                    OnlineLoader.Start(Url)
+                Else
+                    '缓存不可用
+                    Log("[Page] 主页自定义数据来源：联网全新下载")
+                    Hint("正在加载主页……")
+                    RunInUiWait(Sub() LoadContent("")) '在加载结束前清空页面
+                    Setup.Set("CacheSavedPageVersion", "")
+                    OnlineLoader.Start(Url) '下载完成后将会再次触发更新
+                    Exit Sub
+                End If
+            Case 3
+                Select Case Setup.Get("UiCustomPreset")
+                    Case 0 '你知道吗
+                        Log("[Page] 主页预设：你知道吗")
+                        Content = "
+                            <local:MyCard Title=""你知道吗？"" Margin=""0,0,0,15"">
+                                <TextBlock Margin=""25,38,23,15"" FontSize=""13.5"" IsHitTestVisible=""False"" Text=""{hint}"" TextWrapping=""Wrap"" Foreground=""{DynamicResource ColorBrush1}"" />
+                                <local:MyIconButton Height=""22"" Width=""22"" Margin=""9"" VerticalAlignment=""Top"" HorizontalAlignment=""Right"" 
+                                    EventType=""刷新主页"" EventData=""/""
+                                    Logo=""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"" />
+                            </local:MyCard>"
+                    Case 1 '回声洞
+                        Log("[Page] 主页预设：回声洞")
+                        Content = "
+                            <local:MyCard Title=""回声洞"" Margin=""0,0,0,15"">
+                                <TextBlock Margin=""25,38,23,15"" FontSize=""13.5"" IsHitTestVisible=""False"" Text=""{cave}"" TextWrapping=""Wrap"" Foreground=""{DynamicResource ColorBrush1}"" />
+                                <local:MyIconButton Height=""22"" Width=""22"" Margin=""9"" VerticalAlignment=""Top"" HorizontalAlignment=""Right"" 
+                                    EventType=""刷新主页"" EventData=""/""
+                                    Logo=""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"" />
+                            </local:MyCard>"
+                    Case 2 '新闻
+                        Log("[Page] 主页预设：Minecraft 新闻")
+                        Url = "http://pcl.mcnews.thestack.top"
+                        GoTo Download
+                    Case 3 '简单主页
+                        Log("[Page] 主页预设：简单主页")
+                        Url = "https://cdn.wearclub.online/PCL/Custom.xaml"
+                        GoTo Download
+                End Select
+        End Select
+        RunInUi(Sub() LoadContent(Content))
+    End Sub
+    Private RefreshLock As New Object
+
+    '联网获取自定义主页文件
+    Private OnlineLoader As New LoaderTask(Of String, Integer)("自定义主页获取", AddressOf OnlineLoaderSub) With {.ReloadTimeout = 10 * 60 * 1000}
+    Private Sub OnlineLoaderSub(Task As LoaderTask(Of String, Integer))
         Try
-            IsRefreshing = True
-            PanCustom.Children.Clear()
-            RunInNewThread(Sub()
-                               Dim FileContent As String = ""
-                               Select Case Setup.Get("UiCustomType")
-                                   Case 0
-                                       '啥也不干
-                                   Case 1
-                                       '加载本地文件
-                                       FileContent = ReadFile(Path & "PCL\Custom.xaml") 'ReadFile 会进行存在检测
-                                       Log("[System] 尝试从本地文件读取主页自定义数据（" & FileContent.Length & "）")
-                                   Case 2
-                                       '加载联网文件
-                                       Try
-                                           Dim Link As String = Setup.Get("UiCustomNet")
-                                           If Link = LatestFileLink Then
-                                               FileContent = LatestFileContent
-                                               Log("[System] 尝试缓存加载主页自定义数据（" & FileContent.Length & "）")
-                                           ElseIf Not String.IsNullOrWhiteSpace(Link) Then
-                                               Log("[System] 开始从网络读取主页自定义数据（" & Link & "）")
-                                               FileContent = NetGetCodeByRequestRetry(Link)
-                                               Log("[System] 尝试从网络读取主页自定义数据（" & FileContent.Length & "）")
-                                           End If
-                                           LatestFileLink = Link
-                                           LatestFileContent = FileContent
-                                       Catch ex As Exception
-                                           Log(ex, "获取 PCL 主页自定义信息失败", LogLevel.Msgbox)
-                                           LatestFileLink = ""
-                                       End Try
-                               End Select
-                               If FileContent = "" Then
-                                   IsRefreshing = False
-                                   Exit Sub
-                               End If
-                               FileContent = "<StackPanel xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation"" xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"" xmlns:local=""clr-namespace:PCL;assembly=Plain Craft Launcher 2"">" & FileContent & "</StackPanel>"
-                               FileContent = FileContent.Replace("{path}", Path)
-                               RunInUi(Sub()
-                                           Try
-                                               Log("[System] 加载主页自定义数据")
-                                               PanCustom.Children.Add(GetObjectFromXML(FileContent))
-                                               IsRefreshing = False
-                                           Catch ex As Exception
-                                               IsRefreshing = False
-                                               Log("[System] 自定义信息内容：" & vbCrLf & FileContent)
-                                               If MyMsgBox(ex.Message, "加载自定义主页失败", "重试", "取消") = 1 Then
-                                                   LatestFileLink = Nothing
-                                                   LatestFileContent = ""
-                                                   RefreshCustom()
-                                               End If
-                                           End Try
-                                       End Sub)
-                           End Sub, "主页自定义刷新")
+            '获取版本校验地址
+            Dim VersionAddress As String
+            If Task.Input.Contains(".xaml") Then
+                VersionAddress = Task.Input.Replace(".xaml", ".xaml.ini")
+            Else
+                VersionAddress = Task.Input.Split("?").First
+                If Not VersionAddress.EndsWith("/") Then VersionAddress += "/"
+                VersionAddress += "version"
+                If Task.Input.Contains("?") Then VersionAddress += Task.Input.Split("?").Last
+            End If
+            '校验版本
+            Dim Version As String = ""
+            Dim NeedDownload As Boolean = True
+            Try
+                Version = NetGetCodeByRequestOnce(VersionAddress, Timeout:=10000)
+                If Version.Length > 100 Then Throw New Exception($"获取的自定义主页版本过长（{Version.Length} 字符）")
+                Dim CurrentVersion As String = Setup.Get("CacheSavedPageVersion")
+                If Version <> "" AndAlso CurrentVersion <> "" AndAlso Version = CurrentVersion Then
+                    Log($"[Page] 当前缓存的自定义主页已为最新，当前版本：{Version}，检查源：{VersionAddress}")
+                    NeedDownload = False
+                Else
+                    Log($"[Page] 需要下载联网自定义主页，当前版本：{Version}，检查源：{VersionAddress}")
+                End If
+            Catch exx As Exception
+                Log(exx, $"联网获取自定义主页版本失败", LogLevel.Developer)
+                Log($"[Page] 无法检查联网自定义主页版本，将直接下载，检查源：{VersionAddress}")
+            End Try
+            '实际下载
+            If NeedDownload Then
+                Dim FileContent As String = NetGetCodeByRequestRetry(Task.Input)
+                Log($"[Page] 已联网下载自定义主页，内容长度：{FileContent.Length}，来源：{Task.Input}")
+                Setup.Set("CacheSavedPageUrl", Task.Input)
+                Setup.Set("CacheSavedPageVersion", Version)
+                WriteFile(PathTemp & "Cache\Custom.xaml", FileContent)
+            End If
+            '要求刷新
+            Refresh()
         Catch ex As Exception
-            Log(ex, "加载 PCL 主页自定义信息失败", LogLevel.Msgbox)
-            IsRefreshing = False
+            If Setup.Get("CacheSavedPageVersion") = "" Then
+                Log(ex, $"联网下载自定义主页失败（{Task.Input}）", LogLevel.Msgbox)
+            Else
+                Log(ex, $"联网下载自定义主页失败（{Task.Input}）")
+            End If
+            Task.Input = ""
         End Try
     End Sub
 
-    Public Sub ForceRefresh(Optional ShowHint As Boolean = True)
-        ShouldRefresh = True
-        LatestFileContent = ""
-        LatestFileLink = Nothing
-        If ShowHint Then Hint("已刷新主页！", HintType.Finish)
-        FrmMain.PageChange(FormMain.PageType.Launch)
-        Init()
+    ''' <summary>
+    ''' 立即强制刷新自定义主页。
+    ''' 必须在 UI 线程调用。
+    ''' </summary>
+    Public Sub ForceRefresh()
+        Log("[Page] 要求强制刷新自定义主页")
+        ClearCache()
+        '实际的刷新
+        If FrmMain.PageCurrent.Page = FormMain.PageType.Launch Then
+            PanBack.ScrollToHome()
+            Refresh()
+        Else
+            FrmMain.PageChange(FormMain.PageType.Launch)
+        End If
     End Sub
 
+    ''' <summary>
+    ''' 清空自定义主页缓存信息。
+    ''' </summary>
+    Private Sub ClearCache()
+        LoadedContentHash = -1
+        OnlineLoader.Input = ""
+        Setup.Set("CacheSavedPageUrl", "")
+        Setup.Set("CacheSavedPageVersion", "")
+        Log("[Page] 已清空自定义主页缓存")
+    End Sub
+
+    ''' <summary>
+    ''' 从文本内容中加载自定义主页。
+    ''' 必须在 UI 线程调用。
+    ''' </summary>
+    Private Sub LoadContent(Content As String)
+        SyncLock LoadContentLock
+            '如果加载目标内容一致则不加载
+            Dim Hash = Content.GetHashCode()
+            If Hash = LoadedContentHash Then Exit Sub
+            LoadedContentHash = Hash
+            '实际加载内容
+            PanCustom.Children.Clear()
+            If String.IsNullOrWhiteSpace(Content) Then
+                Log($"[Page] 实例化：清空自定义主页 UI，来源为空")
+                Return
+            End If
+            Content = "<StackPanel xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation"" xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml"" xmlns:local=""clr-namespace:PCL;assembly=Plain Craft Launcher 2"">" & Content & "</StackPanel>"
+            Content = HelpArgumentReplace(Content)
+            Log($"[Page] 实例化：加载自定义主页 UI，最终内容长度：{Content.Count}")
+            Try
+                PanCustom.Children.Add(GetObjectFromXML(Content))
+            Catch ex As Exception
+                Log("[Page] 加载失败的自定义主页内容：" & vbCrLf & Content)
+                If MyMsgBox($"自定义主页内容编写有误，请根据下列错误信息进行检查：{vbCrLf}{ex.Message}", "加载自定义主页失败", "重试", "取消") = 1 Then
+                    GoTo Refresh '防止 SyncLock 死锁
+                End If
+            End Try
+        End SyncLock
+        Return
+Refresh:
+        ForceRefresh()
+    End Sub
+    Private LoadedContentHash As Integer = -1
+    Private LoadContentLock As New Object
+
+#End Region
+
 End Class

Plain Craft Launcher 2/Pages/PageLaunch/PageLoginMs.xaml.vb

@@ -103,8 +103,8 @@
     End Sub
     '账号迁移入口
     Private Sub BtnMigration_Click(sender As Object, e As EventArgs) Handles BtnMigration.Click
-        MyMsgBox("在迁移过程中，你可能需要设置你的档案信息，此时请注意让年龄大于 18 岁，否则可能导致无法登录！", "迁移提示", "继续", ForceWait:=True)
-        OpenWebsite("https://www.minecraft.net/zh-hans/account-security")
+        MyMsgBox($"请在接下来要打开的页面登录你的 Mojang 账号。{vbCrLf}在迁移时，你可能需要设置档案信息，请注意让年龄大于 18 岁，否则可能会导致无法登录！", "迁移提示", "继续", ForceWait:=True)
+        OpenWebsite("https://www.minecraft.net/zh-hans/login")
     End Sub
 
 End Class

Plain Craft Launcher 2/Pages/PageLink/PageLinkIoi.xaml.vb

@@ -133,7 +133,7 @@ StartDownload:
         Log("[IOI] 解压联机模块以完成下载")
         If File.Exists(PathTemp & "ioi.exe") Then File.Delete(PathTemp & "ioi.exe")
         If File.Exists(PathIoi) Then File.Delete(PathIoi)
-        Compression.ZipFile.ExtractToDirectory(PathTemp & "联机模块.zip", PathTemp)
+        ExtractFile(PathTemp & "联机模块.zip", PathTemp)
         File.Delete(PathTemp & "联机模块.zip")
         CopyFile(PathTemp & "ioi.exe", PathIoi)
         File.Delete(PathTemp & "ioi.exe")

Plain Craft Launcher 2/Pages/PageOther/PageOtherHelpDetail.xaml.vb

@@ -14,7 +14,7 @@
             If String.IsNullOrEmpty(Entry.XamlContent) Then Throw New Exception("帮助 xaml 文件为空")
             Me.Entry = Entry
             PanCustom.Children.Clear()
-            FileContent = FileContent.Replace("{path}", Path)
+            FileContent = HelpArgumentReplace(FileContent)
             PanCustom.Children.Add(GetObjectFromXML(FileContent))
             Return True
         Catch ex As Exception

Plain Craft Launcher 2/Pages/PageSelectRight.xaml.vb

@@ -219,6 +219,7 @@
                         If(IsHintIndie, vbCrLf & "由于该版本开启了版本隔离，删除版本时该版本对应的存档、资源包、Mod 等文件也将被一并删除！", ""),
                         "版本删除确认", , "取消",, True)
                 Case 1
+                    IniClearCache(Version.Path & "PCL\Setup.ini")
                     If IsShiftPressed Then
                         DeleteDirectory(Version.Path)
                         Hint("版本 " & Version.Name & " 已永久删除！", HintType.Finish)

Plain Craft Launcher 2/Pages/PageSetup/PageSetupLaunch.xaml

@@ -165,7 +165,7 @@
             </local:MyCard>
             <local:MyCard Margin="0,0,0,15" Title="游戏内存">
                 <StackPanel Margin="25,40,25,15">
-                    <local:MyHint x:Name="LabRamWarn" CanClose="False" Text="32 位 Java 最多只能分配 1 GB 内存，建议安装 64 位 Java!" IsWarn="True" Margin="0,0,0,12" />
+                    <local:MyHint x:Name="LabRamWarn" Text="32 位 Java 最多只能分配 1 GB 内存，建议安装 64 位 Java!" IsWarn="True" Margin="0,0,0,12" />
                     <Grid Margin="0,0,0,3">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="Auto" />
@@ -213,7 +213,7 @@
                     </Grid>
                 </StackPanel>
             </local:MyCard>
-            <local:MyCard Margin="0,0,0,15" Title="高级设置" IsSwaped="True" CanSwap="True">
+            <local:MyCard Margin="0,0,0,15" Title="高级启动选项" IsSwaped="True" CanSwap="True">
                 <Grid Margin="25,40,25,15">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="Auto" SharedSizeGroup="Name" />
@@ -240,9 +240,9 @@
                                       Text="等待命令执行完成后再继续启动" Margin="0,8,0,7" />
                     <StackPanel Margin="0,12,0,4" Orientation="Horizontal" Grid.Row="6" Grid.ColumnSpan="2">
                         <local:MyCheckBox Text="忽略 Java 兼容性警告" x:Name="CheckAdvanceJava" Tag="LaunchAdvanceJava" Margin="0,0,60,0"
-                                        ToolTip="如果在设置中手动选择了与当前版本不兼容的 Java，则自动跳过兼容性警告弹窗，强制使用手动选择的 Java。" />
+                                        ToolTip="警告：强烈推荐在版本设置中关闭特定版本的警告，而不是在这里关闭所有版本的警告！&#xa;如果在设置中手动选择了与当前版本不兼容的 Java，则自动跳过兼容性警告弹窗，强制使用手动选择的 Java。" />
                         <local:MyCheckBox Text="关闭文件校验" x:Name="CheckAdvanceAssets" Tag="LaunchAdvanceAssets"
-                                        ToolTip="完全不更改 assets；不校验 libraries、第三方登录库与版本主 jar 文件是否被修改。&#xa;如果你没有修改相关文件，请勿勾选此项。&#xa;强烈推荐在版本设置中关闭特定版本的校验，而不是在这里关闭所有版本的校验。" />
+                                        ToolTip="警告：强烈推荐在版本设置中关闭特定版本的校验，而不是在这里关闭所有版本的校验！&#xa;完全不更改 assets；不校验 libraries、第三方登录库与版本主 jar 文件是否被修改。&#xa;如果你没有修改相关文件，请勿勾选此项。" />
                     </StackPanel>
                 </Grid>
             </local:MyCard>

Plain Craft Launcher 2/Pages/PageSetup/PageSetupSystem.xaml

@@ -74,7 +74,7 @@
                     <local:MyCheckBox Text="正式版更新提示" Grid.Column="1" x:Name="CheckUpdateRelease" Tag="ToolUpdateRelease" ToolTip="在 Minecraft 正式版更新时弹窗提示" />
                     <local:MyCheckBox Text="测试版更新提示" Grid.Column="2" Height="22" x:Name="CheckUpdateSnapshot" Tag="ToolUpdateSnapshot" ToolTip="在 Minecraft 测试版（快照、预发布版）更新时弹窗提示" />
                     <TextBlock VerticalAlignment="Center" Grid.Row="2" HorizontalAlignment="Left" Text="游戏语言" Margin="0,0,25,0" />
-                    <local:MyCheckBox Text="默认设置为中文" Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="5" x:Name="CheckHelpChinese" Tag="ToolHelpChinese" />
+                    <local:MyCheckBox Text="自动设置为中文" Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="5" x:Name="CheckHelpChinese" Tag="ToolHelpChinese" />
                 </Grid>
             </local:MyCard>
             <local:MyCard Margin="0,0,0,15" Title="系统">

Plain Craft Launcher 2/Pages/PageSpeedLeft.xaml.vb

@@ -195,7 +195,6 @@
                                                  AniDispose(sender, False)
                                                  AniDispose(Card, True, Sub() If FrmSpeedRight.PanMain.Children.Count = 0 AndAlso FrmMain.PageCurrent = FormMain.PageType.DownloadManager Then FrmMain.PageBack())
                                                  RightCards.Remove(Loader.Name)
-                                                 LoaderTaskbar.Remove(Loader)
                                                  Log($"[Watcher] 关闭下载管理卡片：{Loader.Name}")
                                                  RunInThread(Sub() Loader.Abort())
                                              End Sub

Plain Craft Launcher 2/Pages/PageVersion/PageVersionMod.xaml.vb

@@ -1,7 +1,4 @@
-Imports System.Security.Principal
-Imports PCL.MyLoading
-
-Public Class PageVersionMod
+Public Class PageVersionMod
 
 #Region "初始化"
 
@@ -78,11 +75,6 @@ Public Class PageVersionMod
             Dim NewCard As New MyCard With {.Title = McModGetTitle(List), .Margin = New Thickness(0, 0, 0, 15)}
             NewCard.Children.Add(PanItems)
             PanList.Children.Add(NewCard)
-            '显示提示
-            If List.Count > 0 AndAlso Not Setup.Get("HintModDisable") Then
-                Setup.Set("HintModDisable", True)
-                Hint("直接点击某个 Mod 项即可将它禁用！")
-            End If
 
         Catch ex As Exception
             Log(ex, "加载 Mod 列表 UI 失败", LogLevel.Feedback)
@@ -336,8 +328,14 @@ Public Class PageVersionMod
         '更新下边栏 UI
         RefreshBottomBar()
     End Sub
-    Private Sub Load_State(sender As Object, newState As MyLoadingState, oldState As MyLoadingState) Handles Load.StateChanged
+    Private Sub UnselectedAllWithAnimation() Handles Load.StateChanged, Me.PageExit
+        Dim CacheAniControlEnabled = AniControlEnabled
+        AniControlEnabled = 0
         ChangeAllSelected(False)
+        AniControlEnabled += CacheAniControlEnabled
+    End Sub
+    Private Sub PageVersionMod_KeyDown(sender As Object, e As KeyEventArgs) Handles Me.KeyDown
+        If My.Computer.Keyboard.CtrlKeyDown AndAlso e.Key = Key.A Then ChangeAllSelected(True)
     End Sub
 
 #End Region
@@ -377,10 +375,11 @@ Public Class PageVersionMod
             Dim IndexOfLoader As Integer = McModLoader.Output.IndexOf(ModEntity)
             McModLoader.Output.RemoveAt(IndexOfLoader)
             McModLoader.Output.Insert(IndexOfLoader, NewModEntity)
-            Dim Parent As StackPanel = If(IsSearching, PanSearchList, PanItems)
-            Dim IndexOfUi As Integer = Parent.Children.IndexOf(Parent.Children.OfType(Of MyListItem).First(Function(i) CType(i.Tag, McMod) Is ModEntity))
-            Parent.Children.RemoveAt(IndexOfUi)
-            Parent.Children.Insert(IndexOfUi, McModListItem(NewModEntity))
+            Dim List = If(IsSearching, PanSearchList, PanItems).Children
+            Dim IndexOfUi As Integer = List.IndexOf(List.OfType(Of MyListItem).FirstOrDefault(Function(i) CType(i.Tag, McMod) Is ModEntity))
+            If IndexOfUi = -1 Then Continue For '因为未知原因 Mod 的状态已经切换完了
+            List.RemoveAt(IndexOfUi)
+            List.Insert(IndexOfUi, McModListItem(NewModEntity))
         Next
         If Not IsSearching Then
             '改变禁用数量的显示

Plain Craft Launcher 2/Pages/PageVersion/PageVersionSetup.xaml

@@ -58,7 +58,7 @@
             </local:MyCard>
             <local:MyCard Margin="0,0,0,15" Title="游戏内存">
                 <StackPanel Margin="25,40,25,15">
-                    <local:MyHint x:Name="LabRamWarn" CanClose="False" Text="32 位 Java 最多只能分配 1 GB 内存，建议安装 64 位 Java!" IsWarn="True" Margin="0,0,0,12" />
+                    <local:MyHint x:Name="LabRamWarn" Text="32 位 Java 最多只能分配 1 GB 内存，建议安装 64 位 Java!" IsWarn="True" Margin="0,0,0,12" />
                     <Grid Margin="0,0,0,3">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="Auto" />
@@ -188,29 +188,26 @@
                         <RowDefinition Height="9" />
                         <RowDefinition Height="28" />
                         <RowDefinition Height="9" />
-                        <RowDefinition Height="28" />
-                        <RowDefinition Height="9" />
                         <RowDefinition Height="31" />
                         <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
                     </Grid.RowDefinitions>
                     <TextBlock Grid.Row="0" VerticalAlignment="Center" HorizontalAlignment="Left" Text="JVM 参数头" Margin="0,0,25,0" />
                     <local:MyTextBox x:Name="TextAdvanceJvm" Grid.Row="0" Grid.ColumnSpan="2" Tag="VersionAdvanceJvm" Grid.Column="1" ToolTip="启动 Minecraft 时使用的额外 JVM 参数，在没有确定把握的情况下请不要尝试修改。&#xa;若留空，则使用全局设置的值。" HintText="使用全局设置"
                                      Height="57" AcceptsReturn="True" TextWrapping="Wrap" VerticalContentAlignment="Top" Padding="0,5" />
                     <TextBlock Grid.Row="2" VerticalAlignment="Center" HorizontalAlignment="Left" Text="JVM 参数尾" Margin="0,0,25,0" />
                     <local:MyTextBox x:Name="TextAdvanceGame" Grid.Row="2" Grid.ColumnSpan="2" Tag="VersionAdvanceGame" Grid.Column="1" ToolTip="文本框中的内容将会被直接拼合在启动参数的末尾。&#xa;例如输入 --demo 则会以试玩模式启动游戏。&#xa;若留空，则使用全局设置的值。" HintText="使用全局设置" />
-                    <TextBlock Grid.Row="4" VerticalAlignment="Center" HorizontalAlignment="Left" Text="文件校验" Margin="0,0,25,0" />
-                    <local:MyComboBox x:Name="ComboAdvanceAssets" Grid.Row="4" Grid.ColumnSpan="2" Tag="VersionAdvanceAssets" Grid.Column="1">
-                        <local:MyComboBoxItem Content="使用全局设置" IsSelected="True" />
-                        <local:MyComboBoxItem Content="开启" 
-                                              ToolTip="在启动 Minecraft 时，简单校验并下载缺失或错误的文件" ToolTipService.HorizontalOffset="100" />
-                        <local:MyComboBoxItem Content="关闭" 
-                                              ToolTip="完全不更改 assets；不校验 libraries、第三方登录库与版本主 jar 文件是否被修改。&#xa;如果你没有修改相关文件，请勿勾选此项。" ToolTipService.HorizontalOffset="100" />
-                    </local:MyComboBox>
-                    <TextBlock Grid.Row="6" VerticalAlignment="Center" HorizontalAlignment="Left" Text="启动前执行命令" Margin="0,0,25,3" />
-                    <local:MyTextBox x:Name="TextAdvanceRun" Grid.Row="6" Grid.ColumnSpan="2" Tag="VersionAdvanceRun" Grid.Column="1" HintText="" Margin="0,0,0,3"
+                    <TextBlock Grid.Row="4" VerticalAlignment="Center" HorizontalAlignment="Left" Text="启动前执行命令" Margin="0,0,25,3" />
+                    <local:MyTextBox x:Name="TextAdvanceRun" Grid.Row="4" Grid.ColumnSpan="2" Tag="VersionAdvanceRun" Grid.Column="1" HintText="" Margin="0,0,0,3"
                                      ToolTip="该项不会覆盖全局设置：启动时会先执行全局设置的命令，再执行版本设置的命令。&#xa;&#xa;在 MC 启动前执行特定命令或程序，语法与 Windows 的命令提示符一致。&#xa;&#xa;可以使用以下替换标记实现相对路径（路径均以 \ 结尾）：&#xa; · {path}：PCL 的 exe 文件所在的文件夹&#xa; · {minecraft}：.minecraft 文件夹&#xa; · {verpath}：版本文件夹（.minecraft\versions\版本名\）&#xa; · {verindie}：开启版本隔离时等同版本文件夹，未开启时等同 .minecraft 文件夹&#xa; · {java}：游戏运行时的 Java 文件夹&#xa;&#xa;除此之外，也支持以下替换标记：&#xa; · {user}：玩家名字&#xa; · {login}：玩家的登录方式&#xa; · {uuid}：玩家的 UUID&#xa; · {name}：游戏版本名&#xa; · {time}：当前的系统时间&#xa; · {version}：游戏对应的原版版本号&#xa;&#xa;例如：&#xa; · &quot;{verpath}test.exe&quot; ：运行版本文件夹下的 test.exe 程序&#xa; · &quot;{java}java.exe&quot; -jar &quot;{verpath}test.jar&quot; ：用 Java 运行版本文件夹下的 test.jar&#xa; · notepad &quot;{verindie}option.txt&quot; ：使用记事本打开该版本的设置文件&#xa;&#xa;涉及路径的操作最好都打上双引号，以避免路径中的空格导致运行失败。" />
-                    <local:MyCheckBox Grid.Row="7" Grid.Column="1" x:Name="CheckAdvanceRunWait" Tag="VersionAdvanceRunWait" Visibility="Collapsed"
+                    <local:MyCheckBox Grid.Row="5" Grid.Column="1" x:Name="CheckAdvanceRunWait" Tag="VersionAdvanceRunWait" Visibility="Collapsed"
                                       Text="等待命令执行完成后再继续启动" Margin="0,5,0,0" />
+                    <StackPanel Margin="0,10,0,0" Orientation="Horizontal" Grid.Row="6" Grid.ColumnSpan="2">
+                        <local:MyCheckBox Text="忽略 Java 兼容性警告" x:Name="CheckAdvanceJava" Tag="VersionAdvanceJava" Margin="0,0,60,0"
+                                        ToolTip="如果在设置中手动选择了与当前版本不兼容的 Java，则自动跳过兼容性警告弹窗，强制使用手动选择的 Java。" />
+                        <local:MyCheckBox Text="关闭文件校验" x:Name="CheckAdvanceAssetsV2" Tag="VersionAdvanceAssetsV2"
+                                        ToolTip="完全不更改 assets；不校验 libraries、第三方登录库与版本主 jar 文件是否被修改。&#xa;如果你没有修改相关文件，请勿勾选此项。" />
+                    </StackPanel>
                 </Grid>
             </local:MyCard>
         </StackPanel>

Plain Craft Launcher 2/Pages/PageVersion/PageVersionSetup.xaml.vb

@@ -67,7 +67,13 @@
             TextAdvanceGame.Text = Setup.Get("VersionAdvanceGame", Version:=PageVersionLeft.Version)
             TextAdvanceRun.Text = Setup.Get("VersionAdvanceRun", Version:=PageVersionLeft.Version)
             CheckAdvanceRunWait.Checked = Setup.Get("VersionAdvanceRunWait", Version:=PageVersionLeft.Version)
-            ComboAdvanceAssets.SelectedIndex = Setup.Get("VersionAdvanceAssets", Version:=PageVersionLeft.Version)
+            If Setup.Get("VersionAdvanceAssets", Version:=PageVersionLeft.Version) = 2 Then
+                Log("[Setup] 已迁移老版本的关闭文件校验设置")
+                Setup.Reset("VersionAdvanceAssets", Version:=PageVersionLeft.Version)
+                Setup.Set("VersionAdvanceAssetsV2", True, Version:=PageVersionLeft.Version)
+            End If
+            CheckAdvanceAssetsV2.Checked = Setup.Get("VersionAdvanceAssetsV2", Version:=PageVersionLeft.Version)
+            CheckAdvanceJava.Checked = Setup.Get("VersionAdvanceJava", Version:=PageVersionLeft.Version)
 
         Catch ex As Exception
             Log(ex, "重载版本独立设置时出错", LogLevel.Feedback)
@@ -92,6 +98,8 @@
             Setup.Reset("VersionAdvanceJvm", Version:=PageVersionLeft.Version)
             Setup.Reset("VersionAdvanceGame", Version:=PageVersionLeft.Version)
             Setup.Reset("VersionAdvanceAssets", Version:=PageVersionLeft.Version)
+            Setup.Reset("VersionAdvanceAssetsV2", Version:=PageVersionLeft.Version)
+            Setup.Reset("VersionAdvanceJava", Version:=PageVersionLeft.Version)
             Setup.Reset("VersionAdvanceRun", Version:=PageVersionLeft.Version)
             Setup.Reset("VersionAdvanceRunWait", Version:=PageVersionLeft.Version)
 
@@ -121,10 +129,10 @@
     Private Shared Sub SliderChange(sender As MySlider, e As Object) Handles SliderRamCustom.Change
         If AniControlEnabled = 0 Then Setup.Set(sender.Tag, sender.Value, Version:=PageVersionLeft.Version)
     End Sub
-    Private Shared Sub ComboChange(sender As MyComboBox, e As Object) Handles ComboArgumentIndie.SelectionChanged, ComboAdvanceAssets.SelectionChanged
+    Private Shared Sub ComboChange(sender As MyComboBox, e As Object) Handles ComboArgumentIndie.SelectionChanged
         If AniControlEnabled = 0 Then Setup.Set(sender.Tag, sender.SelectedIndex, Version:=PageVersionLeft.Version)
     End Sub
-    Private Shared Sub CheckBoxChange(sender As MyCheckBox, e As Object) Handles CheckAdvanceRunWait.Change
+    Private Shared Sub CheckBoxChange(sender As MyCheckBox, e As Object) Handles CheckAdvanceRunWait.Change, CheckAdvanceAssetsV2.Change, CheckAdvanceJava.Change
         If AniControlEnabled = 0 Then Setup.Set(sender.Tag, sender.Checked, Version:=PageVersionLeft.Version)
     End Sub
 

Plain Craft Launcher 2/Resources/Custom.xaml

@@ -4,102 +4,102 @@
      你也可以使用 Ctrl + F 快速查找。例如，若需要改变文本颜色，则搜索 “颜色” 即可。 -->
 
 <local:MyCard Title="纯文本" Margin="0,0,0,15" CanSwap="True" IsSwaped="True">
-    <StackPanel Margin="25,40,23,15">
+	<StackPanel Margin="25,40,23,15">
         <TextBlock TextWrapping="Wrap" Margin="0,0,0,4"
                     Text="每个 local:MyCard 代表一张卡片，你可以添加、删除格式类似的 MyCard 来添加多个卡片。每个 TextBlock 代表一段文本，你可以在 Text 属性中书写任何你想写的内容，也可以自行添加更多的 TextBlock。" />
         <TextBlock TextWrapping="Wrap" Margin="0,0,0,4" FontSize="11"
                     Text="你可以通过添加、删除属性修改样式，例如上一行的 FontSize 就会将字号改为 11 号。" />
         <TextBlock TextWrapping="Wrap" Margin="20,5,20,0" Foreground="#8C7721"
                     Text="它还有许多可以调整的属性：上一行的 Margin 调整了边距，Foreground 则会让文字变色。" />
-    </StackPanel>
+	</StackPanel>
 </local:MyCard>
 
 <local:MyCard Title="卡片、提示条" Margin="0,0,0,15" CanSwap="True" IsSwaped="True">
-    <StackPanel Margin="25,40,23,15">
-        <local:MyHint Text="local:MyHint 代表提示条，它默认是警告样式。" />
-        <local:MyHint Margin="0,8,0,2" IsWarn="False"
+	<StackPanel Margin="25,40,23,15">
+		<local:MyHint Text="local:MyHint 代表提示条，它默认是警告样式。" />
+		<local:MyHint Margin="0,8,0,2" IsWarn="False"
                     Text="将提示条的 IsWarn 属性改为 False 即可改为提示样式。&#xA;使用左边的那堆字符可以在任意地方手动换行，如果需要使用等号、引号等特殊字符，可以自行百度 XAML 转义字符。" />
         <TextBlock TextWrapping="Wrap" Margin="0,6,0,0"
                     Text="卡片（local:MyCard）的 Title 属性决定了它的标题。&#xA;为卡片添加 CanSwap 属性让它可以被折叠，True 代表是，False 代表否。在此基础上，再使用 IsSwaped 属性调整它是否默认被折叠。" />
-    </StackPanel>
+	</StackPanel>
 </local:MyCard>
 
 <local:MyCard Title="长宽属性、图片" Margin="0,0,0,15" CanSwap="True" IsSwaped="True">
-    <StackPanel Margin="25,40,23,15">
+	<StackPanel Margin="25,40,23,15">
         <TextBlock TextWrapping="Wrap" Margin="0,0,0,4" Width="320" HorizontalAlignment="Right"
                     Text="任意项目都可以添加 Width 与 Height 属性来控制宽高。HorizontalAlignment 属性可以控制对齐：Center 代表居中，Right 代表居右，例如这段文本就被居右了。" />
         <TextBlock TextWrapping="Wrap" Margin="0,0,0,6"
                     Text="Image 代表图片，你需要在它的 Source 属性中填写一个网址或文件路径，它会从该处获取图片并显示。通常需要使用 Height 限制它的高度。" />
-        <Image Height="50" HorizontalAlignment="Center" Source="https://www.mcbbs.net/template/mcbbs/image/logo_sc.png" />
-    </StackPanel>
+		<Image Height="50" HorizontalAlignment="Center" Source="https://www.mcbbs.net/template/mcbbs/image/logo_sc.png" />
+	</StackPanel>
 </local:MyCard>
 
 <local:MyCard Title="按钮" Margin="0,0,0,15" CanSwap="True" IsSwaped="True">
-    <StackPanel Margin="25,40,23,15">
+	<StackPanel Margin="25,40,23,15">
         <TextBlock TextWrapping="Wrap" Margin="0,0,0,4"
                     Text="添加 local:MyButton 即可新建一个按钮。你需要限定它的尺寸与位置，并通过 Padding 属性进一步控制它的内边距。" />
-        <local:MyButton Margin="0,4,0,10" Height="35" HorizontalAlignment="Left" Padding="25,0,25,0"
+		<local:MyButton Margin="0,4,0,10" Height="35" HorizontalAlignment="Left" Padding="25,0,25,0"
                     Text="这是一个按钮！一个按钮！" />
         <TextBlock TextWrapping="Wrap" Margin="0,0,0,4"
                     Text="你可以修改 ColorType 属性来调整按钮配色：Highlight 代表当前主题色，Red 代表红色。ToolTip 属性还可以让你在鼠标悬浮在上面的时候显示提示文本。" />
-        <local:MyButton Margin="0,4,0,10" Width="250" Height="35" ColorType="Highlight"
+		<local:MyButton Margin="0,4,0,10" Width="250" Height="35" ColorType="Highlight"
                     Text="把鼠标停在这里别动……" ToolTip="……就能看到这句话！" />
         <TextBlock TextWrapping="Wrap" Margin="0,0,0,4"
                     Text="local:MyTextButton 是没有边框的 “纯文本按钮”，其作用与 local:MyButton 一致。" />
-        <local:MyTextButton Margin="0,8,0,10" HorizontalAlignment="Center"
+		<local:MyTextButton Margin="0,8,0,10" HorizontalAlignment="Center"
                     Text="一个精简版的文本按钮" />
         <TextBlock TextWrapping="Wrap" Margin="0,0,0,4"
                     Text="按钮可以做到很多事，具体将在 “事件” 部分介绍。" />
-    </StackPanel>
+	</StackPanel>
 </local:MyCard>
 
 <local:MyCard Title="事件 1：打开网页、弹出窗口" Margin="0,0,0,15" CanSwap="True" IsSwaped="True">
-    <StackPanel Margin="25,40,23,15">
+	<StackPanel Margin="25,40,23,15">
         <TextBlock TextWrapping="Wrap" Margin="0,0,0,10"
                     Text="将按钮的 EventType 属性设为 打开网页，然后在 EventData 属性中写入网址，即可通过点击按钮打开网页。" />
-        <local:MyButton Width="140" Height="35" HorizontalAlignment="Left" Padding="13,0,13,0"
+		<local:MyButton Width="140" Height="35" HorizontalAlignment="Left" Padding="13,0,13,0"
                     Text="打开 MCBBS" EventType="打开网页" EventData="https://www.mcbbs.net/" />
         <TextBlock TextWrapping="Wrap" Margin="0,10,0,10"
                     Text="或者将 EventType 属性改为 弹出窗口，然后在 EventData 属性中写入弹窗的标题与内容……" />
-        <local:MyButton Width="140" Height="35" HorizontalAlignment="Left" Padding="13,0,13,0"
+		<local:MyButton Width="140" Height="35" HorizontalAlignment="Left" Padding="13,0,13,0"
                     Text="显示一个弹窗" EventType="弹出窗口" EventData="这是标题|标题与内容以竖线间隔。\n你也可以直接在其中换行。" />
         <TextBlock TextWrapping="Wrap" Margin="0,10,0,0"
                     Text="local:MyTextButton 同样可以设置 EventType 与 EventData 让它具有特定功能。" />
-        <local:MyTextButton Margin="0,8,0,0" HorizontalAlignment="Center"
+		<local:MyTextButton Margin="0,8,0,0" HorizontalAlignment="Center"
                     Text="点击打开知乎" EventType="打开网页" EventData="https://www.zhihu.com/" />
-    </StackPanel>
+	</StackPanel>
 </local:MyCard>
 
 <local:MyCard Title="事件 2：启动游戏" Margin="0,0,0,15" CanSwap="True" IsSwaped="True">
-    <StackPanel Margin="25,40,23,15">
+	<StackPanel Margin="25,40,23,15">
         <TextBlock TextWrapping="Wrap" Margin="0,0,0,4"
                     Text="将 EventType 设置为 启动游戏，EventData 设置为具体的游戏版本，即可通过点击按钮启动游戏。如果当前游戏文件夹没有该版本，则无法启动。" />
-        <local:MyButton Margin="0,4,0,10" Width="250" Height="35"
+		<local:MyButton Margin="0,4,0,10" Width="250" Height="35"
                     Text="启动 Minecraft 1.12.2" EventType="启动游戏" EventData="1.12.2" />
         <TextBlock TextWrapping="Wrap" Margin="0,0,0,4"
                     Text="在 EventData 后面添加一条竖线（|），竖线后填写服务器 IP，即可在启动该版本的同时自动进入服务器。" />
-        <local:MyButton Margin="0,4,0,0" Width="250" Height="35"
+		<local:MyButton Margin="0,4,0,0" Width="250" Height="35"
                     Text="启动 1.12.2 并进入 Hypixel" EventType="启动游戏" EventData="1.12.2|mc.hypixel.net" ToolTip="服务器 IP：mc.hypixel.net" />
-    </StackPanel>
+	</StackPanel>
 </local:MyCard>
 
 <local:MyCard Title="事件 3：打开文件" Margin="0,0,0,15" CanSwap="True" IsSwaped="True">
-    <StackPanel Margin="25,40,23,15">
+	<StackPanel Margin="25,40,23,15">
         <TextBlock TextWrapping="Wrap" Margin="0,0,0,4"
                     Text="将 EventType 设置为 打开文件，EventData 设置为文件路径，即可点击打开特定文件或启动程序。" />
-        <local:MyButton Margin="0,4,0,8" Width="200" Height="35"
+		<local:MyButton Margin="0,4,0,8" Width="200" Height="35"
                     Text="打开记事本" EventType="打开文件" EventData="notepad.exe" />
         <TextBlock TextWrapping="Wrap" Margin="0,4,0,0"
                     Text="如果能在 PCL 文件夹中找到该文件，则会优先打开 PCL 文件夹中的文件。当然，你可以使用例如 C:\ 开头的绝对路径。" />
-        <TextBlock TextWrapping="Wrap" Margin="0,0,0,4"
-                    Text="此外，PCL2 会将文件中的花括号 path 替换为 PCL 可执行文件所在文件夹（{path}），可以用于执行特定程序或加载图片。" />
-        <local:MyButton Margin="0,4,0,10" Width="200" Height="35"
-                    Text="打开 PCL 日志" EventType="打开文件" EventData="Log1.txt" ToolTip="PCL2 的日志文件就在 PCL 文件夹内，且名为 Log1.txt" />
-        <TextBlock TextWrapping="Wrap" Margin="0,0,0,4"
+		<TextBlock TextWrapping="Wrap" Margin="0,0,0,4"
+                    Text="此外，PCL 会将文件中的 “花括号 path” 替换为 PCL 可执行文件所在文件夹（{path}），可以用于执行特定程序或加载图片。" />
+		<local:MyButton Margin="0,4,0,10" Width="200" Height="35"
+                    Text="打开 PCL 日志" EventType="打开文件" EventData="Log1.txt" ToolTip="PCL 的日志文件就在 PCL 文件夹内，且名为 Log1.txt" />
+		<TextBlock TextWrapping="Wrap" Margin="0,0,0,4"
                     Text="就像为游戏指定服务器 IP 一样，你也可以在 EventData 的竖线后为程序添加启动参数。" />
-        <local:MyButton Margin="0,4,0,0" Width="200" Height="35"
-                    Text="定位游戏启动脚本" EventType="打开文件" EventData="explorer.exe|/select,LatestLaunch.bat" ToolTip="PCL2 会将上一次启动 MC 的脚本保存在 PCL 文件夹内，且名为 LatestLaunch.bat。&#xA;点击按钮会打开文件管理器，并且借助参数要求它选中这个文件。" />
-    </StackPanel>
+		<local:MyButton Margin="0,4,0,0" Width="200" Height="35"
+                    Text="定位游戏启动脚本" EventType="打开文件" EventData="explorer.exe|/select,LatestLaunch.bat" ToolTip="PCL 会将上一次启动 MC 的脚本保存在 PCL 文件夹内，且名为 LatestLaunch.bat。&#xA;点击按钮会打开文件管理器，并且借助参数要求它选中这个文件。" />
+	</StackPanel>
 </local:MyCard>
 
 <local:MyCard Title="事件 4：其他事件类型" Margin="0,0,0,15" CanSwap="True" IsSwaped="True">
@@ -133,128 +133,176 @@
 	</StackPanel>
 </local:MyCard>
 
-<local:MyCard Title="横向布局 1：StackPanel" Margin="0,0,0,15" CanSwap="True" IsSwaped="True">
-    <StackPanel Margin="25,40,23,15">
-        <TextBlock TextWrapping="Wrap" Margin="0,0,0,10"
+<local:MyCard Title="StackPanel 横向布局" Margin="0,0,0,15" CanSwap="True" IsSwaped="True">
+	<StackPanel Margin="25,40,23,15">
+		<TextBlock TextWrapping="Wrap" Margin="0,0,0,10"
                     Text="你需要使用 StackPanel 在一行里塞下多个按钮。你可以仅在这个教学卡片的基础上稍作调整，来实现自己的按钮布局。" />
-        <!-- 这是第一行 -->
-        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-            <local:MyButton Margin="0,0,10,0" Width="140" Height="35" HorizontalAlignment="Left" Padding="13,0,13,0" ColorType="Highlight"
+		<!-- 这是第一行 -->
+		<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+			<local:MyButton Margin="0,0,10,0" Width="140" Height="35" HorizontalAlignment="Left" Padding="13,0,13,0" ColorType="Highlight"
                         Text="打开 B 站" EventType="打开网页" EventData="https://www.bilibili.com/" />
-            <local:MyButton Margin="0,0,10,0" Width="140" Height="35" HorizontalAlignment="Left" Padding="13,0,13,0"
+			<local:MyButton Margin="0,0,10,0" Width="140" Height="35" HorizontalAlignment="Left" Padding="13,0,13,0"
                         Text="进入 Hypixel" EventType="启动游戏" EventData="1.16.3|mc.hypixel.net" ToolTip="使用 Minecraft 1.16.3 进入 Hypixel" />
-            <local:MyButton Margin="0,0,10,0" Width="140" Height="35" HorizontalAlignment="Left" Padding="13,0,13,0"
+			<local:MyButton Margin="0,0,10,0" Width="140" Height="35" HorizontalAlignment="Left" Padding="13,0,13,0"
                         Text="打开画图" EventType="打开文件" EventData="mspaint.exe" />
-        </StackPanel>
-        <!-- 这是第二行 -->
-        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,10,0,0">
-            <local:MyButton Margin="0,0,10,0" Width="140" Height="35" HorizontalAlignment="Left" Padding="13,0,13,0" ColorType="Red"
+		</StackPanel>
+		<!-- 这是第二行 -->
+		<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,10,0,0">
+			<local:MyButton Margin="0,0,10,0" Width="140" Height="35" HorizontalAlignment="Left" Padding="13,0,13,0" ColorType="Red"
                         Text="复制召唤命令" EventType="复制文本" EventData="/execute as @a at @s run summon Creeper ~ ~2 ~" ToolTip="这条 Minecraft 命令会在每个玩家头顶召唤一只苦力怕！" />
-            <local:MyButton Margin="0,0,10,0" Width="140" Height="35" HorizontalAlignment="Left" Padding="13,0,13,0"
+			<local:MyButton Margin="0,0,10,0" Width="140" Height="35" HorizontalAlignment="Left" Padding="13,0,13,0"
                         Text="内存优化" EventType="内存优化" />
-            <local:MyButton Margin="0,0,10,0" Width="140" Height="35" HorizontalAlignment="Left" Padding="13,0,13,0"
+			<local:MyButton Margin="0,0,10,0" Width="140" Height="35" HorizontalAlignment="Left" Padding="13,0,13,0"
                         Text="下载作者的头像" EventType="下载文件" EventData="https://www.mcbbs.net/uc_server/data/avatar/000/14/51/06_avatar_small.jpg?ts=1471402592" />
-        </StackPanel>
-    </StackPanel>
-</local:MyCard>
-
-<local:MyCard Title="横向布局 2：Grid" Margin="0,0,0,15" CanSwap="True" IsSwaped="True">
-    <StackPanel Margin="25,40,23,15">
-        <TextBlock TextWrapping="Wrap" Margin="0,0,0,4"
-                    Text="如果要实现更复杂的布局，则必须使用 Grid。Grid 可以让按钮们自动适应窗口宽度：随意拉伸 PCL 窗口，按钮大小会自动改变。" />
-        <TextBlock TextWrapping="Wrap" Margin="0,0,0,10"
-                    Text="你可以上网查找 “WPF Grid” 的相关教程，这里仅给出一个例子，不作详细介绍。你可以仅在这个教学卡片的基础上稍作调整，来实现自己的按钮布局。" />
-        <Grid>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="1*" />
-                <ColumnDefinition Width="1.6*" />
-                <!-- 这个按钮的宽度是其他按钮的 1.6 倍 -->
-                <ColumnDefinition Width="1*" />
-                <!-- 如果不打 *，则会占用固定的宽度 -->
-            </Grid.ColumnDefinitions>
-            <!-- 为按钮添加 Grid.Column 属性，删除 Width 与 HorizontalAlignment 属性 -->
-            <local:MyButton Grid.Column="0" Margin="0,0,10,0" Height="35" ColorType="Highlight"
-                        Text="打开 B 站" EventType="打开网页" EventData="https://www.bilibili.com/" />
-            <local:MyButton Grid.Column="1" Margin="0,0,10,0" Height="35" 
-                        Text="进入 Hypixel" EventType="启动游戏" EventData="1.16.3|mc.hypixel.net" ToolTip="使用 Minecraft 1.16.3 进入 Hypixel" />
-            <local:MyButton Grid.Column="2" Margin="0,0,10,0" Height="35" 
-                        Text="打开画图" EventType="打开文件" EventData="mspaint.exe" />
-        </Grid>
-    </StackPanel>
+		</StackPanel>
+	</StackPanel>
 </local:MyCard>
 
 <local:MyCard Title="列表项 1：基础" Margin="0,0,0,15" CanSwap="True" IsSwaped="True">
-    <StackPanel Margin="25,40,23,15">
+	<StackPanel Margin="25,40,23,15">
         <TextBlock TextWrapping="Wrap" Margin="0,0,0,4"
                     Text="你也可以使用列表项 “local:MyListItem” 来替代按钮，其使用方式与按钮类似。" />
-        <local:MyListItem  Margin="-5,2,-5,8"
-		            Logo="https://www.baidu.com/favicon.ico" Title="百度" Info="百度一下，你就知道！" 
+		<local:MyListItem  Margin="-5,2,-5,8"
+		            Logo="https://www.baidu.com/favicon.ico" Title="百度" Info="百度一下，你就知道！"
 		            EventType="打开网页" EventData="https://www.baidu.com/" Type="Clickable" />
         <TextBlock TextWrapping="Wrap" Margin="0,0,0,4"
                     Text="Logo 属性为列表项的图标，指定的可以是链接也可以是文件路径；Title 是大标题，Info 是可选的小标题（详细信息）；Type 如果省略，该列表项则单纯只展示信息，仅当 Type 为 Clickable 才能触发点击效果。"/>
-        <local:MyListItem Margin="-5,2,-5,8"
+		<local:MyListItem Margin="-5,2,-5,8"
                     Logo="pack://application:,,,/images/Blocks/Grass.png"
 		            EventType="打开帮助" EventData="帮助/自定义帮助.json" Type="Clickable" />
         <TextBlock TextWrapping="Wrap" Margin="0,0,0,4"
                     Text="EventType、EventData 与按钮几乎一致，唯一不同的是，列表项不支持联网加载帮助文件。" />
-    </StackPanel>
+	</StackPanel>
 </local:MyCard>
 
 <local:MyCard Title="列表项 2：内置图片" Margin="0,0,0,15" CanSwap="True" IsSwaped="True">
-    <StackPanel Margin="25,40,23,15">
+	<StackPanel Margin="25,40,23,15">
         <TextBlock TextWrapping="Wrap" Margin="0,0,0,4"
                     Text="PCL 内置了一些 Minecraft 方块与物品图片，可以直接使用。"/>
-        <StackPanel Orientation="Horizontal" Margin="10,8,0,15" Height="30">
-            <Image Width="30" Margin="5,0,0,0" Source="pack://application:,,,/images/Blocks/CommandBlock.png"/>
-            <!-- 命令方块 -->
-            <Image Width="30" Margin="5,0,0,0" Source="pack://application:,,,/images/Blocks/Cobblestone.png"/>
-            <!-- 圆石 -->
-            <Image Width="30" Margin="5,0,0,0" Source="pack://application:,,,/images/Blocks/GoldBlock.png"/>
-            <!-- 金块 -->
-            <Image Width="30" Margin="5,0,0,0" Source="pack://application:,,,/images/Blocks/Grass.png"/>
-            <!-- 草方块 -->
-            <Image Width="30" Margin="5,0,0,0" Source="pack://application:,,,/images/Blocks/GrassPath.png"/>
-            <!-- 草径 -->
-            <Image Width="30" Margin="5,0,0,0" Source="pack://application:,,,/images/Blocks/Anvil.png"/>
-            <!-- 铁砧 -->
-            <Image Width="30" Margin="5,0,0,0" Source="pack://application:,,,/images/Blocks/RedstoneBlock.png"/>
-            <!-- 红石块 -->
-            <Image Width="30" Margin="5,0,0,0" Source="pack://application:,,,/images/Blocks/RedstoneLampOn.png"/>
-            <!-- 红石灯（亮） -->
-            <Image Width="30" Margin="5,0,0,0" Source="pack://application:,,,/images/Blocks/RedstoneLampOff.png"/>
-            <!-- 红石灯（灭） -->
-            <Image Width="30" Margin="5,0,0,0" Source="pack://application:,,,/images/Blocks/Egg.png"/>
-            <!-- 鸡蛋 -->
-            <Image Width="30" Margin="5,0,0,0" Source="pack://application:,,,/images/Blocks/Fabric.png"/>
-            <!-- 布料（Fabric 图标） -->
-        </StackPanel>
+		<StackPanel Orientation="Horizontal" Margin="10,8,0,15" Height="30">
+			<Image Width="30" Margin="5,0,0,0" Source="pack://application:,,,/images/Blocks/CommandBlock.png"/>
+			<!-- 命令方块 -->
+			<Image Width="30" Margin="5,0,0,0" Source="pack://application:,,,/images/Blocks/Cobblestone.png"/>
+			<!-- 圆石 -->
+			<Image Width="30" Margin="5,0,0,0" Source="pack://application:,,,/images/Blocks/GoldBlock.png"/>
+			<!-- 金块 -->
+			<Image Width="30" Margin="5,0,0,0" Source="pack://application:,,,/images/Blocks/Grass.png"/>
+			<!-- 草方块 -->
+			<Image Width="30" Margin="5,0,0,0" Source="pack://application:,,,/images/Blocks/GrassPath.png"/>
+			<!-- 草径 -->
+			<Image Width="30" Margin="5,0,0,0" Source="pack://application:,,,/images/Blocks/Anvil.png"/>
+			<!-- 铁砧 -->
+			<Image Width="30" Margin="5,0,0,0" Source="pack://application:,,,/images/Blocks/RedstoneBlock.png"/>
+			<!-- 红石块 -->
+			<Image Width="30" Margin="5,0,0,0" Source="pack://application:,,,/images/Blocks/RedstoneLampOn.png"/>
+			<!-- 红石灯（亮） -->
+			<Image Width="30" Margin="5,0,0,0" Source="pack://application:,,,/images/Blocks/RedstoneLampOff.png"/>
+			<!-- 红石灯（灭） -->
+			<Image Width="30" Margin="5,0,0,0" Source="pack://application:,,,/images/Blocks/Egg.png"/>
+			<!-- 鸡蛋 -->
+			<Image Width="30" Margin="5,0,0,0" Source="pack://application:,,,/images/Blocks/Fabric.png"/>
+			<!-- 布料（Fabric 图标） -->
+		</StackPanel>
         <TextBlock TextWrapping="Wrap" Margin="0,0,0,4"
                     Text="使用时，将上方对应行的 Source 复制到 MyListItem 的 Logo 属性处即可。"/>
-        <local:MyListItem Margin="-5,0,-5,8"
+		<local:MyListItem Margin="-5,0,-5,8"
             Logo="pack://application:,,,/images/Blocks/CommandBlock.png"
             Title="清理垃圾" Info="使用内置的命令方块图片作为 Logo" EventType="清理垃圾" Type="Clickable" />
-    </StackPanel>
+	</StackPanel>
 </local:MyCard>
 
 <local:MyCard Title="主题色" Margin="0,0,0,15" CanSwap="True" IsSwaped="True">
-    <StackPanel Margin="25,40,23,15">
+	<StackPanel Margin="25,40,23,15">
         <TextBlock TextWrapping="Wrap" Margin="0,0,0,15"
                     Text="你可以用类似 {DynamicResource ColorBrush5} 的格式使用 PCL 当前的主题颜色，修改末尾的数字编号以改变颜色浓度。" />
-        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="8,4">
+		<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="8,4">
             <TextBlock TextWrapping="Wrap" Text=" 浓度 1 " Margin="5,0" Background="{DynamicResource ColorBrush1}" Foreground="#FFFFFF" />
             <TextBlock TextWrapping="Wrap" Text=" 浓度 2 " Margin="5,0" Background="{DynamicResource ColorBrush2}" Foreground="#FFFFFF" />
             <TextBlock TextWrapping="Wrap" Text=" 浓度 3 " Margin="5,0" Background="{DynamicResource ColorBrush3}" Foreground="#FFFFFF" />
             <TextBlock TextWrapping="Wrap" Text=" 浓度 4 " Margin="5,0" Background="{DynamicResource ColorBrush4}" Foreground="#FFFFFF" />
-        </StackPanel>
-        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="8,4">
+		</StackPanel>
+		<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="8,4">
             <TextBlock TextWrapping="Wrap" Text=" 浓度 5 " Margin="5,0" Background="{DynamicResource ColorBrush5}" />
             <TextBlock TextWrapping="Wrap" Text=" 浓度 6 " Margin="5,0" Background="{DynamicResource ColorBrush6}" />
             <TextBlock TextWrapping="Wrap" Text=" 浓度 7 " Margin="5,0" Background="{DynamicResource ColorBrush7}" />
             <TextBlock TextWrapping="Wrap" Text=" 浓度 8 " Margin="5,0" Background="{DynamicResource ColorBrush8}" />
-        </StackPanel>
-        <TextBlock TextWrapping="Wrap" Margin="0,15,0,8" Foreground="{DynamicResource ColorBrush2}" Background="{DynamicResource ColorBrush6}"
+		</StackPanel>
+		<TextBlock Margin="0,15,0,8" Foreground="{DynamicResource ColorBrush2}" Background="{DynamicResource ColorBrush6}"
                     Text="除了字体颜色，你也可以将主题色用于背景色、边框颜色等颜色参数。例如这行字的颜色为浓度 2，背景为浓度 6。" />
-    </StackPanel>
+	</StackPanel>
+</local:MyCard>
+
+<local:MyCard Title="替换标记" Margin="0,0,0,15" CanSwap="True" IsSwaped="True">
+	<StackPanel Margin="25,40,23,15">
+		<TextBlock TextWrapping="Wrap" Margin="0,0,0,4"
+                    Text="在花括号 {} 中写入特定内容，PCL 会在加载时对其进行替换。&#xa;例如，path 会被替换为 PCL 可执行文件所在文件夹（{path}），用于在 EventData 中指定特定文件，或是加载图片。" />
+		<local:MyHint Margin="0,6,0,10" Text="以下特性于 PCL 2.6.5 (299) 加入，不适用于更早版本的 PCL。" IsWarn="False" />
+		<TextBlock TextWrapping="Wrap" Margin="0,0,0,4"
+                    Text="你也可以使用替换标记来获取随机内容：cave 会被替换为一条随机的回声洞内容，hint 则是 “你知道吗” 的内容。" />
+		<TextBlock TextWrapping="Wrap" Margin="10,6,0,5" Foreground="{DynamicResource ColorBrush3}"
+                    Text="你知道吗：{hint}" />
+	</StackPanel>
+</local:MyCard>
+
+<local:MyCard Title="进阶：Grid 布局" Margin="0,0,0,15" CanSwap="True" IsSwaped="True">
+	<StackPanel Margin="25,40,23,15">
+		<TextBlock TextWrapping="Wrap" Margin="0,0,0,4"
+                    Text="如果要实现更复杂的布局，则必须使用 Grid。Grid 可以让按钮们自动适应窗口宽度：随意拉伸 PCL 窗口，按钮大小会自动改变。" />
+		<TextBlock TextWrapping="Wrap" Margin="0,0,0,10"
+                    Text="你可以上网查找 “WPF Grid” 的相关教程，这里仅给出一个例子，不作详细介绍。你可以仅在这个教学卡片的基础上稍作调整，来实现自己的按钮布局。" />
+		<Grid>
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition Width="1*" />
+				<ColumnDefinition Width="1.6*" MinWidth="200" />
+				<!-- 第二个按钮的宽度是第一个按钮的 1.6 倍，且至少为 200 -->
+				<ColumnDefinition Width="150" />
+				<!-- 如果不打 *，则会占用固定的宽度，也可以写 Auto 来自适应 -->
+			</Grid.ColumnDefinitions>
+			<!-- 为按钮添加 Grid.Column 属性指定它所在的列，不要添加 Width 与 HorizontalAlignment 属性 -->
+			<local:MyButton Grid.Column="0" Margin="0,0,10,0" Height="35" ColorType="Highlight"
+                        Text="打开 B 站" EventType="打开网页" EventData="https://www.bilibili.com/" />
+			<local:MyButton Grid.Column="1" Margin="0,0,10,0" Height="35"
+                        Text="进入 Hypixel" EventType="启动游戏" EventData="1.16.3|mc.hypixel.net" ToolTip="使用 Minecraft 1.16.3 进入 Hypixel" />
+			<local:MyButton Grid.Column="2" Margin="0,0,10,0" Height="35"
+                        Text="打开画图" EventType="打开文件" EventData="mspaint.exe" />
+		</Grid>
+	</StackPanel>
+</local:MyCard>
+
+<local:MyCard Title="进阶：图标按钮" Margin="0,0,0,15" CanSwap="True" IsSwaped="True">
+	<StackPanel Margin="25,40,23,15">
+		<local:MyHint Margin="0,0,0,10" Text="以下特性于 PCL 2.6.5 (299) 加入，不适用于更早版本的 PCL。" IsWarn="False" />
+		<TextBlock TextWrapping="Wrap" Margin="0,0,0,4"
+                    Text="MyIconTextButton 是一种带有自定义矢量图标的按钮变体，它同样支持 EventType 与 EventData 属性。&#xa;通过设置 Logo 属性来控制它的图标，设置 LogoScale 属性还可以调整图标的缩放比例。" />
+		<local:MyIconTextButton Margin="0,4,0,8" Height="35" HorizontalAlignment="Center"
+                    Text="查看 SVG Path 简介" EventType="打开网页" EventData="https://developer.mozilla.org/zh-CN/docs/Web/SVG/Tutorial/Paths"
+                    LogoScale="1.02" Logo="M1091 0H78C35 0 0 35 0 78v863c0 43 35 78 78 78H1091c43 0 78-35 78-78V78C1170 35 1134 0 1091 0z m-8 87v78H87v-78h994zM87 933V254h994v679H87v0zM724 340l-206 547a43 43 0 0 1-82-31l206-547a43 43 0 0 1 82 30zM369 545l-85 85 85 85a43 43 0 0 1-62 62l-116-116a43 43 0 0 1 0-62l116-116a43 43 0 0 1 62 61z m610-37a43 43 0 0 1 0 62l-116 116a43 43 0 0 1-62 0 43 43 0 0 1 0-62l85-85-85-85a43 43 0 0 1 62-62l116 116z" />
+		<TextBlock TextWrapping="Wrap" Margin="0,0,0,4"
+                    Text="Logo 属性的内容是 SVG Path 的值，你需要使用 SVG 编辑器或者从图标资源网站（如 IconFont）查找它。不要自己写，写不懂的。&#xa;此外，它还有两种 ColorType：Black（默认）和 Highlight。" />
+		<local:MyIconTextButton Margin="0,4,0,8" Height="35" HorizontalAlignment="Center"
+                    ColorType="Highlight" Text="打开 IconFont" EventType="打开网页" EventData="https://www.iconfont.cn/"
+                    LogoScale="1" Logo="M510 959c-51-31-40-86-74-120-61-63-168-66-231-138C-5 457 196 3 593 70c231 39 407 363 250 592-67 98-198 106-277 213-23 23-11 81-55 83zM176 432c-9 176 240 167 240 9 0-80-72-145-166-111-66 23-71 49-74 101z m509 129c212 59 217-307 0-231-102 36-90 206 0 231z m-213 111c33 7 44-91 9-92-19 19-64 79-9 92z m83 0H575c23-37-8-87-46-92 3 37-11 92 27 92z" />
+		<TextBlock TextWrapping="Wrap" Margin="0,0,0,4"
+                    Text="如果只想要图标，不要文字，还可以使用 MyIconButton。它不能设置 Text 属性，只有一个图标可以按。&#xa;它的 Theme 属性可以设置为 Color（默认）、White、Black、Red。" />
+		<local:MyIconButton Margin="0,4,0,0" Width="25" Height="25" HorizontalAlignment="Center"
+                    Theme="Black" EventType="弹出窗口" EventData="事件|MyIconButton 当然也支持 EventType 和 EventData——要不然介绍它干啥？"
+                    LogoScale="1" Logo="M149 873c47 47 101 83 162 109 63 26 130 40 199 40 69 0 136-13 199-40 61-25 115-62 162-109s83-101 109-162c26-63 40-130 40-199 0-69-13-136-40-199-25-61-62-115-109-162-46-46-101-83-162-109C648 13 580 0 511 0s-136 13-199 40c-61 25-115 62-162 109s-83 101-109 162C13 375 0 442 0 511s13 136 40 199c25 61 62 115 109 162zM97 511c0-228 185-414 414-414 228 0 414 185 414 414S740 926 511 926c-228 0-414-185-414-414z M539 244c-8-4-17-7-27-7-9 0-19 2-27 7-16 9-27 27-27 47 0 30 24 54 54 54 30 0 54-24 54-54 0-19-10-37-27-47zM566 732v-284c0-30-24-54-54-54-30 0-54 24-54 54v284c0 30 24 54 54 54 30 0 54-24 54-54z" />
+		<TextBlock TextWrapping="Wrap" Margin="0,0,0,4"
+                    Text="如果只想显示一个图标，不想让它是能按的按钮，可以使用 WPF 自带的 Path 等绘图控件，感兴趣的话可以自行搜索。想偷懒也可以把 MyIconButton 的 IsHitTestVisible 属性改为 False……" />
+		<Path Margin="0,4,0,0" Width="20" Height="20" HorizontalAlignment="Center"
+                    Stretch="Uniform" Fill="{DynamicResource ColorBrush1}"
+                    Data="M149 873c47 47 101 83 162 109 63 26 130 40 199 40 69 0 136-13 199-40 61-25 115-62 162-109s83-101 109-162c26-63 40-130 40-199 0-69-13-136-40-199-25-61-62-115-109-162-46-46-101-83-162-109C648 13 580 0 511 0s-136 13-199 40c-61 25-115 62-162 109s-83 101-109 162C13 375 0 442 0 511s13 136 40 199c25 61 62 115 109 162zM97 511c0-228 185-414 414-414 228 0 414 185 414 414S740 926 511 926c-228 0-414-185-414-414z M539 244c-8-4-17-7-27-7-9 0-19 2-27 7-16 9-27 27-27 47 0 30 24 54 54 54 30 0 54-24 54-54 0-19-10-37-27-47zM566 732v-284c0-30-24-54-54-54-30 0-54 24-54 54v284c0 30 24 54 54 54 30 0 54-24 54-54z" />
+	</StackPanel>
+</local:MyCard>
+
+<local:MyCard Title="进阶：联网自定义主页" Margin="0,0,0,15" CanSwap="True" IsSwaped="True">
+	<StackPanel Margin="25,40,23,15">
+		<local:MyHint Margin="0,0,0,10" Text="以下特性于 PCL 2.6.5 (299) 加入，不适用于更早版本的 PCL。" IsWarn="False" />
+		<TextBlock TextWrapping="Wrap" Margin="0,0,0,10"
+                    Text="如果你在尝试制作联网更新的自定义主页，可以查看下方的 GitHub 讨论页。&#xa;你可以根据其中的介绍为主页添加版本号检查以节省流量，也可以通过检查 Referer 和 User Agent 来确定对方的 PCL 版本。" />
+		<local:MyButton Margin="0,0,0,8" Height="35" HorizontalAlignment="Center" Padding="20,0,20,0"
+                    Text="打开 GitHub 讨论页" EventType="打开网页" EventData="https://github.com/Hex-Dragon/PCL2/discussions/2528" />
+	</StackPanel>
 </local:MyCard>
 
 <!-- 
@@ -262,8 +310,10 @@
 全部通用的属性：
  - Width、Height：设置宽度与高度
  - ToolTip：设置鼠标指向时的提示文本
- - Background：调整背景颜色（十六进制字符串，例如 #FF010203 代表 ARGB 中的 255,1,2,3。前两位代表不透明度，FF 为全不透明，00 为全透明）
  - Margin：调整外边距（格式为 左,上,右,下。例如 Margin="0,0,0,2" 即为 2 单位的下边距）
+ - HorizontalAlignment：设置横向对齐方式，居左：Left、居中：Center、居右：Right、拉伸（默认）：Stretch
+ - VerticalAlignment：设置纵向对齐方式，居上：Top、居中：Center、居下：Bottom、拉伸（默认）：Stretch
+ - IsHitTestVisible：该控件是否响应交互（点击、指向动画等），True 为是（默认），False 为否
 
 TextBlock（纯文本）：
  - Text：设置显示的文本（如果要使用引号等特殊字符，自行百度 XAML 转义）
@@ -271,37 +321,32 @@ TextBlock（纯文本）：
  - FontSize：设置字号
  - FontWeight：设置为 Bold 时，文字加粗
  - Foreground：调整前景颜色（十六进制字符串，例如 #FF010203 代表 ARGB 中的 255,1,2,3。前两位代表不透明度，FF 为全不透明，00 为全透明）
- - HorizontalAlignment：设置对齐方式（Left、Center、Right）
 
 Image（图片）：
- - Source：要显示的图片的网址
- - Foreground：调整前景颜色（十六进制字符串，例如 #FF010203 代表 ARGB 中的 255,1,2,3。前两位代表不透明度，FF 为全不透明，00 为全透明）
- - HorizontalAlignment：设置对齐方式（Left、Center、Right）
+ - Source：要显示的图片的网址，或 PCL 内置图片位置
 
 local:MyCard（卡片）：
  - Title：设置显示的标题文本
- - CanSwap：这张卡片是否可以折叠，True 为是，False 为否
- - IsSwaped：这张卡片是否默认折叠，要求 CanSwap 必须为 True
- - Foreground：调整前景颜色（十六进制字符串，例如 #FF010203 代表 ARGB 中的 255,1,2,3。前两位代表不透明度，FF 为全不透明，00 为全透明）
- - HorizontalAlignment：设置对齐方式（Left、Center、Right）（使用时，CanSwap 属性需为 False）
+ - CanSwap：卡片是否可以折叠，True 为是，False 为否
+ - IsSwaped：卡片是否默认折叠，要求 CanSwap 必须为 True
+ - HorizontalAlignment：若使用，要求 CanSwap 必须为 False
+ - UseAnimation：是否在展开等高度改变时触发动画，True 为是（默认），False 为否
+ - SwapLogoRight：卡片折叠时的箭头是朝下还是朝右，True 为朝右，False 为朝下（默认）
+ - HasMouseAnimation：是否在鼠标指向时改变卡片颜色，True 为是（默认），False 为否
 
 local:MyHint（提示条）：
  - Text：设置显示的文本（&#xA; 代表换行）
  - IsWarn：设置为 True 代表警告样式，False 代表提示样式
- - HorizontalAlignment：设置对齐方式（Left、Center、Right）
 
 local:MyButton（按钮）：
  - Text：设置显示的文本
  - Padding：设置内边距，格式与 Margin 一致
  - ColorType：设置颜色主题（Highlight 为当前启动器的主题颜色，Red 为红色，默认为黑色）
  - EventType、EventData：触发特定事件
- - HorizontalAlignment：设置对齐方式（Left、Center、Right）
 
 local:MyTextButton（文本按钮）：
  - Text：设置显示的文本
  - EventType、EventData：触发特定事件
- - Foreground：调整前景颜色（十六进制字符串，例如 #FF010203 代表 ARGB 中的 255,1,2,3。前两位代表不透明度，FF 为全不透明，00 为全透明）
- - HorizontalAlignment：设置对齐方式（Left、Center、Right）
 
 local:MyListItem（列表项）：
  - Logo：列表项的图标（所指定的可以是链接也可以是文件路径）
@@ -309,4 +354,17 @@ local:MyListItem（列表项）：
  - Info：列表项的详细信息，它将会以灰色显示在大标题下方
  - Type：若留空仅单纯展示信息，设置为 Clickable 触发相应活动
 
--->
+local:MyIconTextButton（带图标的按钮）：
+ - Text：设置显示的文本
+ - Logo：设置显示的图标
+ - LogoScale：设置图标的缩放，默认为 1
+ - ColorType：设置颜色主题（Highlight 为当前启动器的主题颜色，默认为黑色）
+ - EventType、EventData：触发特定事件
+
+local:MyIconButton（图标按钮）：
+ - Logo：设置显示的图标
+ - LogoScale：设置图标的缩放，默认为 1
+ - Theme：设置颜色主题，Color（默认）为当前启动器的主题颜色，也可设置为 White、Black、Red
+ - EventType、EventData：触发特定事件
+
+-->

README.md

@@ -1,21 +1,21 @@
 ## Plain Craft Launcher 2 源代码库
 
-这里提供了 PCL2 的大多数源代码，包括 UI 库、动画模块、下载模块、Minecraft 启动模块等！
+这里提供了 PCL 的大多数源代码，包括 UI 库、动画模块、下载模块、Minecraft 启动模块等！
 
-PCL2 的代码绝大多数其实都是几年前学生时代的产物了……那时候英语还不过关……所以经常出现奇葩命名，还有令人高血压的高耦合啊，没做单例啊，瞎勾八乱糊啊之类的问题……额，我也不可能把这一堆玩意儿再从头写一次，各位就基于能跑就行的原则凑合凑合着看吧，求求别喷了（run
+PCL 的代码绝大多数其实都是几年前学生时代的产物了……那时候英语还不过关……所以经常出现奇葩命名，还有令人高血压的高耦合啊，没做单例啊，瞎勾八乱糊啊之类的问题……额，我也不可能把这一堆玩意儿再从头写一次，各位就基于能跑就行的原则凑合凑合着看吧，求求别喷了（run
 
 你也可以丢 Pull Request，虽然这个源代码库并不能直接编译，但一些简单的修改应该还是没问题的……
 
 　
 
 **相关内容：**
-- [PCL2 功能投票](https://github.com/Hex-Dragon/PCL2/discussions/2)：来参加投票吧，开发者会优先处理票数较高的帖子！
-- [程序下载](https://afdian.net/p/0164034c016c11ebafcb52540025c377)：下载免费的正式版 PCL2。
-- [帮助文档库](https://github.com/LTCatt/PCL2Help)：PCL2 帮助文档在 GitHub 上的存储库（是的，帮助库在另一个 Repo……）
+- [PCL 功能投票](https://github.com/Hex-Dragon/PCL2/discussions/2)：来参加投票吧，开发者会优先处理票数较高的帖子！
+- [程序下载](https://afdian.net/p/0164034c016c11ebafcb52540025c377)：下载免费的正式版 PCL。
+- [帮助文档库](https://github.com/LTCatt/PCL2Help)：PCL 帮助文档在 GitHub 上的存储库（是的，帮助库在另一个 Repo……）
 
 　
 
 **一些无趣的小细节：**
 - 别想在这里面找到解密游戏的线索，那部分的代码被我抠掉了（笑）
 - 哦，对，解锁隐藏主题的相关代码也都被抠掉了，所以别想着用翻源代码这种歪门邪道来绕过解密了.jpg
-- 源代码库并不是即时更新的，而是在每次 PCL2 发布更新时（手动）同步一次
+- 源代码库并不是即时更新的，而是在每次 PCL 发布更新时（手动）同步一次