2.6.1（正式版重新上传）

优化 综合 Bug 反馈 模板

.github/ISSUE_TEMPLATE/bug9.yml

@@ -9,7 +9,7 @@ body:
     description: "请逐个检查下列项目，并勾选确认。"
     options:
     - label: "我已点击 `设置 → 启动器 → 检查更新` 确认了启动器已为最新版，且最新版未修复这个 Bug。[怎样更新？](https://shimo.im/docs/qKPttVvXKqPD8YDC#anchor-oTgb)"
-      required: true
+      required: false
     - label: "我已在 [Issues 页面](https://github.com/Hex-Dragon/PCL2/issues?q=is%3Aissue+) 中搜索，确认了这一 Bug 未被提交过。"
       required: true
 - type: textarea
@@ -36,4 +36,4 @@ body:
     description: "上传 PCL 文件夹中的 Log1~5.txt。[日志在哪？](https://shimo.im/docs/qKPttVvXKqPD8YDC#anchor-fvZW)"
     placeholder: "先点击这个文本框，然后再将文件直接拖拽到文本框中以上传。"
   validations:
-    required: true
+    required: true

Plain Craft Launcher 2/Application.xaml

@@ -292,7 +292,7 @@
                                            Margin="5,0,0,0" Cursor="IBeam" />
                                     <!-- 由于未知原因，TextView 会有 2,0 的 Margin -->
                                 </Border>
-                                <Border Margin="{TemplateBinding Padding}" IsHitTestVisible="False" VerticalAlignment="Center" BorderThickness="0">
+                                <Border Margin="{TemplateBinding Padding}" IsHitTestVisible="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" BorderThickness="0">
                                     <TextBlock x:Name="labHint" Foreground="{DynamicResource ColorBrush1}" Opacity="0.3" Margin="7,0,0,0" Padding="{TemplateBinding BorderThickness}" FontSize="{TemplateBinding FontSize}" FontFamily="Resources/#PCL English, Microsoft YaHei UI" />
                                 </Border>
                                 <TextBlock Grid.Row="1" x:Name="labWrong" Height="0" Foreground="{TemplateBinding BorderBrush}" Padding="0,4,0,0" />
@@ -345,7 +345,7 @@
 
             <!-- ComboBox -->
             <DataTemplate x:Key="ComboBoxItemTemplateWithDelete">
-                <local:MyListItem Title="{Binding}" FontSize="13" PaddingRight="40" MaxHeight="26" IsScaleAnimationEnabled="False" Margin="-1,0,0,0">
+                <local:MyListItem Title="{Binding}" FontSize="13" PaddingRight="40" MaxHeight="26" IsScaleAnimationEnabled="False" Margin="-3,0,0,0">
                     <local:MyListItem.Buttons>
                         <x:Array Type="local:MyIconButton">
                             <local:MyIconButton Grid.Column="1" Height="20" Width="20" VerticalAlignment="Center" Tag="{Binding}" Click="MyIconButton_Click" Logo="F1 M 26.9166,22.1667L 37.9999,33.25L 49.0832,22.1668L 53.8332,26.9168L 42.7499,38L 53.8332,49.0834L 49.0833,53.8334L 37.9999,42.75L 26.9166,53.8334L 22.1666,49.0833L 33.25,38L 22.1667,26.9167L 26.9166,22.1667 Z" />
@@ -367,7 +367,10 @@
                             <Grid>
                                 <Border x:Name="border" Background="{TemplateBinding Background}" CornerRadius="3" BorderThickness="1" BorderBrush="{TemplateBinding Foreground}" />
                                 <ToggleButton Margin="0,0,1.5,0" Foreground="{TemplateBinding Foreground}" IsTabStop="False" SnapsToDevicePixels="False" Focusable="False" IsChecked="{Binding IsDropDownOpen,Mode=TwoWay,RelativeSource={RelativeSource TemplatedParent}}" ClickMode="Press" />
-                                <ContentPresenter Margin="8.5,0,21.5,0" IsHitTestVisible="False" Content="{TemplateBinding SelectionBoxItem}" ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}" ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}" VerticalAlignment="Center" />
+                                <ContentPresenter x:Name="PART_Content" Margin="8.5,0,21.5,0" IsHitTestVisible="False" VerticalAlignment="Center"
+                                                  Content="{TemplateBinding SelectionBoxItem}" 
+                                                  ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}" 
+                                                  ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}" />
                                 <Popup x:Name="PART_Popup" SnapsToDevicePixels="True" VerticalOffset="-1.5" AllowsTransparency="True" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Placement="Bottom" PopupAnimation="Fade">
                                     <Grid x:Name="PanPopup">
                                         <Border Background="White" CornerRadius="3" />

Plain Craft Launcher 2/Application.xaml.vb

@@ -179,49 +179,48 @@ Public Class Application
 
     '切换窗口
 
-
     '控件模板事件
     Private Sub MyIconButton_Click(sender As Object, e As EventArgs)
-        If Setup.Get("LoginType") = McLoginType.Legacy Then
-            '离线
-            Dim Names As New List(Of String)
-            Names.AddRange(Setup.Get("LoginLegacyName").ToString.Split("¨"))
-            Names.Remove(sender.Tag)
-            Setup.Set("LoginLegacyName", Join(Names, "¨"))
-            FrmLoginLegacy.ComboName.ItemsSource = Names
-            FrmLoginLegacy.ComboName.Text = If(Names.Count > 0, Names(0), "")
-        Else
-            '非离线
-            Dim Token As String = GetStringFromEnum(Setup.Get("LoginType"))
-            Dim Dict As New Dictionary(Of String, String)
-            Dim Names As New List(Of String)
-            Dim Passs As New List(Of String)
-            If Not Setup.Get("Login" & Token & "Email") = "" Then Names.AddRange(Setup.Get("Login" & Token & "Email").ToString.Split("¨"))
-            If Not Setup.Get("Login" & Token & "Pass") = "" Then Passs.AddRange(Setup.Get("Login" & Token & "Pass").ToString.Split("¨"))
-            For i = 0 To Names.Count - 1
-                Dict.Add(Names(i), Passs(i))
-            Next
-            Dict.Remove(sender.Tag)
-            Setup.Set("Login" & Token & "Email", Join(Dict.Keys.ToArray, "¨"))
-            Setup.Set("Login" & Token & "Pass", Join(Dict.Values.ToArray, "¨"))
-            Select Case Token
-                Case "Mojang"
-                    FrmLoginMojang.ComboName.ItemsSource = Dict.Keys
-                    FrmLoginMojang.ComboName.Text = If(Dict.Keys.Count > 0, Dict.Keys(0), "")
-                    FrmLoginMojang.TextPass.Password = If(Dict.Values.Count > 0, Dict.Values(0), "")
-                Case "Nide"
-                    FrmLoginNide.ComboName.ItemsSource = Dict.Keys
-                    FrmLoginNide.ComboName.Text = If(Dict.Keys.Count > 0, Dict.Keys(0), "")
-                    FrmLoginNide.TextPass.Password = If(Dict.Values.Count > 0, Dict.Values(0), "")
-                Case "Auth"
-                    FrmLoginAuth.ComboName.ItemsSource = Dict.Keys
-                    FrmLoginAuth.ComboName.Text = If(Dict.Keys.Count > 0, Dict.Keys(0), "")
-                    FrmLoginAuth.TextPass.Password = If(Dict.Values.Count > 0, Dict.Values(0), "")
-                Case Else
-                    DebugAssert(True)
-                    Exit Sub
-            End Select
-        End If
+        Select Case Setup.Get("LoginType")
+            Case McLoginType.Ms
+                '微软
+                Dim MsJson As JObject = GetJson(Setup.Get("LoginMsJson"))
+                MsJson.Remove(sender.Tag)
+                Setup.Set("LoginMsJson", MsJson.ToString(Newtonsoft.Json.Formatting.None))
+                FrmLoginMs.ComboAccounts.Items.Remove(sender.Parent)
+            Case McLoginType.Legacy
+                '离线
+                Dim Names As New List(Of String)
+                Names.AddRange(Setup.Get("LoginLegacyName").ToString.Split("¨"))
+                Names.Remove(sender.Tag)
+                Setup.Set("LoginLegacyName", Join(Names, "¨"))
+                FrmLoginLegacy.ComboName.ItemsSource = Names
+                FrmLoginLegacy.ComboName.Text = If(Names.Count > 0, Names(0), "")
+            Case Else
+                '第三方
+                Dim Token As String = GetStringFromEnum(Setup.Get("LoginType"))
+                Dim Dict As New Dictionary(Of String, String)
+                Dim Names As New List(Of String)
+                Dim Passs As New List(Of String)
+                If Not Setup.Get("Login" & Token & "Email") = "" Then Names.AddRange(Setup.Get("Login" & Token & "Email").ToString.Split("¨"))
+                If Not Setup.Get("Login" & Token & "Pass") = "" Then Passs.AddRange(Setup.Get("Login" & Token & "Pass").ToString.Split("¨"))
+                For i = 0 To Names.Count - 1
+                    Dict.Add(Names(i), Passs(i))
+                Next
+                Dict.Remove(sender.Tag)
+                Setup.Set("Login" & Token & "Email", Join(Dict.Keys, "¨"))
+                Setup.Set("Login" & Token & "Pass", Join(Dict.Values, "¨"))
+                Select Case Token
+                    Case "Nide"
+                        FrmLoginNide.ComboName.ItemsSource = Dict.Keys
+                        FrmLoginNide.ComboName.Text = If(Dict.Keys.Count > 0, Dict.Keys(0), "")
+                        FrmLoginNide.TextPass.Password = If(Dict.Values.Count > 0, Dict.Values(0), "")
+                    Case "Auth"
+                        FrmLoginAuth.ComboName.ItemsSource = Dict.Keys
+                        FrmLoginAuth.ComboName.Text = If(Dict.Keys.Count > 0, Dict.Keys(0), "")
+                        FrmLoginAuth.TextPass.Password = If(Dict.Values.Count > 0, Dict.Values(0), "")
+                End Select
+        End Select
     End Sub
 
 End Class

Plain Craft Launcher 2/Controls/MyComboBox.vb

@@ -128,4 +128,10 @@
         End If
     End Sub
 
+    Public ReadOnly Property ContentPresenter As ContentPresenter
+        Get
+            Return Template.FindName("PART_Content", Me)
+        End Get
+    End Property
+
 End Class

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

@@ -115,7 +115,7 @@
                     Dim AnimList As New List(Of AniData)
                     Select Case Theme
                         Case Themes.Color
-                            AnimList.Add(AaColor(Path, Shape.FillProperty, "ColorBrush4", AnimationColorOut))
+                            AnimList.Add(AaColor(Path, Shape.FillProperty, "ColorBrush5", AnimationColorOut))
                             PanBack.Background = New MyColor(0, 255, 255, 255)
                         Case Themes.White
                             AnimList.Add(AaColor(Path, Shape.FillProperty, "ColorBrush8", AnimationColorOut))

Plain Craft Launcher 2/Controls/MyPageRight.vb

@@ -68,7 +68,7 @@
                     Loop
                     RunInUiWait(Sub() FinishedInvoke(RealLoader))
                     Thread.Sleep(20) '由于大量初始化控件会导致掉帧，延迟触发 State 改变事件
-            End Sub
+                End Sub
         End If
         AddHandler RealLoader.OnStateChangedUi, Sub(Loader As LoaderBase, NewState As LoadState, OldState As LoadState) RunInUi(Sub() PageLoaderState(Loader, NewState, OldState))
         '隐藏 UI
@@ -325,17 +325,13 @@
 
     '逐个进入动画
     Public Sub TriggerEnterAnimation(ParamArray Elements As FrameworkElement())
-        '去除 Nothing 项
-        Dim RealElements As New List(Of FrameworkElement)
-        For Each Element In Elements
-            If Element IsNot Nothing Then RealElements.Add(Element)
-        Next
-
+        Dim RealElements = Elements.Where(Function(e) e IsNot Nothing)
         For Each Element In RealElements
             Element.Visibility = Visibility.Visible '页面均处于默认的隐藏状态
         Next
         Dim AniList As New List(Of AniData)
         Dim Delay As Integer = 0
+        '基础动画
         For Each Element In RealElements
             For Each Control As FrameworkElement In GetAllAnimControls(Element, True)
                 '还原被隐藏的卡片的消失动画
@@ -351,18 +347,20 @@
                 Delay += 40
             Next
         Next
+        '滚动条动画
+        Dim Scroll As MyScrollBar = GetFirstScrollViewer(RealElements)
+        If Scroll IsNot Nothing Then
+            If TypeOf Scroll.RenderTransform IsNot TranslateTransform Then Scroll.RenderTransform = New TranslateTransform(10, 0)
+            AniList.Add(AaTranslateX(Scroll, -CType(Scroll.RenderTransform, TranslateTransform).X, 350, 0, New AniEaseOutFluent))
+        End If
+        '结束
         AniList.Add(AaCode(Sub() PageOnEnterAnimationFinished(),, True))
         AniStart(AniList, "PageRight PageChange " & PageUuid)
     End Sub
 
     '逐个退出动画
     Public Sub TriggerExitAnimation(ParamArray Elements As FrameworkElement())
-        '去除 Nothing 项
-        Dim RealElements As New List(Of FrameworkElement)
-        For Each Element In Elements
-            If Element IsNot Nothing Then RealElements.Add(Element)
-        Next
-
+        Dim RealElements = Elements.Where(Function(e) e IsNot Nothing)
         Dim AniList As New List(Of AniData)
         Dim Delay As Integer = 0
         For Each Element In RealElements
@@ -373,6 +371,13 @@
                 Delay += 20
             Next
         Next
+        '滚动条动画
+        Dim Scroll As MyScrollBar = GetFirstScrollViewer(RealElements)
+        If Scroll IsNot Nothing Then
+            If TypeOf Scroll.RenderTransform IsNot TranslateTransform Then Scroll.RenderTransform = New TranslateTransform
+            AniList.Add(AaTranslateX(Scroll, 10 - CType(Scroll.RenderTransform, TranslateTransform).X, 90, 0, New AniEaseInFluent))
+        End If
+        '结束
         AniList.Add(AaCode(Sub()
                                For Each Element In RealElements
                                    Element.Visibility = Visibility.Collapsed
@@ -402,6 +407,27 @@
         End If
     End Sub
 
+    '查找列表中的第一个滚动条
+    Private Function GetFirstScrollViewer(Elements As IEnumerable(Of FrameworkElement)) As MyScrollBar
+        Dim Viewer As MyScrollViewer = Nothing
+        For Each Element In Elements
+            If TypeOf Element Is MyScrollViewer Then
+                Viewer = Element
+                GoTo FindViewer
+            End If
+            For Each Control In LogicalTreeHelper.GetChildren(Element)
+                If TypeOf Control Is MyScrollViewer Then
+                    Viewer = Control
+                    GoTo FindViewer
+                End If
+            Next
+        Next
+        Return Nothing
+FindViewer:
+        If Viewer.ComputedVerticalScrollBarVisibility <> Visibility.Visible Then Return Nothing
+        Return Viewer.ScrollBar
+    End Function
+
 #End Region
 
 End Class

Plain Craft Launcher 2/Controls/MyScrollViewer.vb

@@ -2,11 +2,19 @@
     Inherits ScrollViewer
 
     Public Property DeltaMuity As Double = 1
+
+
     Private RealOffset As Double
     Private Sub MyScrollViewer_PreviewMouseWheel(sender As Object, e As MouseWheelEventArgs) Handles Me.PreviewMouseWheel
         If e.Delta = 0 OrElse ActualHeight = 0 OrElse ScrollableHeight = 0 Then Exit Sub
-        Dim SourceTypeName As String = e.Source.GetType.Name
-        If Content.TemplatedParent Is Nothing AndAlso (SourceTypeName.Contains("Combo") OrElse SourceTypeName = "MyTextBox") Then Exit Sub '确定可视树，防止滚动问题
+        Dim SourceType = e.Source.GetType
+        If Content.TemplatedParent Is Nothing AndAlso
+            ((GetType(ComboBox).IsAssignableFrom(SourceType) AndAlso CType(e.Source, ComboBox).IsDropDownOpen) OrElse
+            (GetType(TextBox).IsAssignableFrom(SourceType) AndAlso CType(e.Source, TextBox).AcceptsReturn) OrElse
+            GetType(ComboBoxItem).IsAssignableFrom(SourceType)) Then
+            '如果当前是在对有滚动条的下拉框或文本框执行，则不接管操作
+            Exit Sub
+        End If
         PerformVerticalOffsetDelta(-e.Delta)
         e.Handled = True
     End Sub
@@ -24,4 +32,9 @@
         FrmMain.BtnExtraBack.ShowRefresh()
     End Sub
 
+    Public ScrollBar As MyScrollBar
+    Private Sub Load() Handles Me.Loaded
+        ScrollBar = GetTemplateChild("PART_VerticalScrollBar")
+    End Sub
+
 End Class

Plain Craft Launcher 2/FormMain.xaml.vb

@@ -10,6 +10,20 @@ Public Class FormMain
         Dim FeatureList As New List(Of KeyValuePair(Of Integer, String))
         '统计更新日志条目
 #If BETA Then
+        If LastVersion < 293 Then 'Release 2.6.1
+            BugCount += 1
+        End If
+        If LastVersion < 292 Then 'Release 2.6.0
+            FeatureList.Add(New KeyValuePair(Of Integer, String)(4, "支持在多个正版账号间切换"))
+            FeatureList.Add(New KeyValuePair(Of Integer, String)(4, "在缺少 Java 时会自动下载所需的 Java"))
+            FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "重新制作正版登录页面"))
+            FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "彻底移除 Mojang 登录"))
+            FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "添加 CurseForge / Modrinth 来源筛选"))
+            FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "Mod / 整合包下载会单独列出筛选的版本"))
+            FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "为下载管理和音乐播放按钮添加进度条"))
+            FeatureCount += 24
+            BugCount += 24
+        End If
         If LastVersion < 286 Then 'Release 2.5.2
             FeatureList.Add(New KeyValuePair(Of Integer, String)(5, "支持搜索、安装 Modrinth 的 Mod 与整合包"))
             FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "资源搜索页面支持翻页"))
@@ -95,7 +109,19 @@ Public Class FormMain
         '3：BUG+ IMP* FEAT-
         '2：BUG* IMP-
         '1：BUG-
-        If LastVersion < 287 Then 'Snapshot 2.5.3
+        If LastVersion < 291 Then 'Snapshot 2.6.0
+            FeatureList.Add(New KeyValuePair(Of Integer, String)(4, "支持在多个正版账号间切换"))
+            FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "Mod / 整合包下载会单独列出筛选的版本"))
+            FeatureCount += 10
+            BugCount += 2
+        End If
+        If LastVersion < 289 Then 'Snapshot 2.5.4
+            FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "重新制作正版登录页面"))
+            FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "彻底移除 Mojang 登录"))
+            FeatureCount += 6
+            BugCount += 14
+        End If
+        If LastVersion < 288 Then 'Snapshot 2.5.3
             FeatureList.Add(New KeyValuePair(Of Integer, String)(4, "在缺少 Java 时会自动下载所需的 Java"))
             FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "添加 CurseForge / Modrinth 来源筛选"))
             FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "为下载管理和音乐播放按钮添加进度条"))

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

@@ -11,12 +11,12 @@ Public Module ModBase
 #Region "声明"
 
     '下列版本信息由更新器自动修改
-    Public Const VersionBaseName As String = "2.5.3" '不含分支前缀的显示用版本名
-    Public Const VersionStandardCode As String = "2.5.3." & VersionBranchCode '标准格式的四段式版本号
+    Public Const VersionBaseName As String = "2.6.1" '不含分支前缀的显示用版本名
+    Public Const VersionStandardCode As String = "2.6.1." & VersionBranchCode '标准格式的四段式版本号
 #If BETA Then
-    Public Const VersionCode As Integer = 287 'Release
+    Public Const VersionCode As Integer = 293 'Release
 #Else
-    Public Const VersionCode As Integer = 285 'Snapshot
+    Public Const VersionCode As Integer = 291 'Snapshot
 #End If
     '自动生成的版本信息
     Public Const VersionDisplayName As String = VersionBranchName & " " & VersionBaseName
@@ -158,6 +158,10 @@ Public Module ModBase
         ''' </summary>
         Public Const IconButtonUser As String = "M660.338 528.065c63.61-46.825 105.131-121.964 105.131-206.83 0-141.7-115.29-256.987-256.997-256.987-141.706 0-256.998 115.288-256.998 256.987 0 85.901 42.52 161.887 107.456 208.562-152.1 59.92-260.185 207.961-260.185 381.077 0 21.276 17.253 38.53 38.53 38.53 21.278 0 38.53-17.254 38.53-38.53 0-183.426 149.232-332.671 332.667-332.671 1.589 0 3.113-0.207 4.694-0.244 0.8 0.056 1.553 0.244 2.362 0.244 183.434 0 332.664 149.245 332.664 332.671 0 21.276 17.255 38.53 38.533 38.53 21.277 0 38.53-17.254 38.53-38.53 0-174.885-110.354-324.13-264.917-382.809z m-331.803-206.83c0-99.22 80.72-179.927 179.935-179.927s179.937 80.708 179.937 179.927c0 99.203-80.721 179.91-179.937 179.91s-179.935-80.708-179.935-179.91z"
         ''' <summary>
+        ''' 图标按钮，微软，0.9x
+        ''' </summary>
+        Public Const IconButtonMs As String = "M0,0h5v5h-5ZM6,0h5v5h-5v-5ZM0,6h5v5h-5v-5ZM6,6h5v5h-5v-5Z"
+        ''' <summary>
         ''' 图标，音符，1x
         ''' </summary>
         Public Const IconMusic As String = "M348.293565 716.53287V254.797913c0-41.672348 28.004174-78.358261 68.919652-90.37913L815.994435 40.826435c62.775652-18.610087 125.907478 26.579478 125.907478 89.933913v539.158261c8.013913 42.25113-8.94887 89.177043-47.014956 127.109565a232.848696 232.848696 0 0 1-170.785392 65.758609c-61.885217-2.938435-111.081739-33.435826-129.113043-80.050087-18.031304-46.614261-2.137043-102.177391 41.672348-145.853218a232.848696 232.848696 0 0 1 170.785391-65.80313c21.014261 1.024 40.514783 5.164522 57.878261 12.065391V233.338435c0-12.109913-10.551652-20.034783-20.569044-20.034783a24.620522 24.620522 0 0 0-5.787826 0.934957L439.785739 338.18713a19.545043 19.545043 0 0 0-14.825739 19.144348v438.984348H423.846957c11.53113 43.987478-5.164522 94.208-45.412174 134.322087a232.848696 232.848696 0 0 1-170.785392 65.758609c-61.885217-2.938435-111.081739-33.435826-129.113043-80.050087-18.031304-46.614261-2.137043-102.177391 41.672348-145.853218a232.848696 232.848696 0 0 1 170.785391-65.80313c20.791652 1.024 40.069565 5.075478 57.299478 11.842783z"
@@ -784,7 +788,7 @@ Public Module ModBase
             '复制文件
             File.Copy(FromPath, ToPath, True)
         Catch ex As Exception
-            Throw New Exception("复制文件出错：" & FromPath & " -> " & ToPath, ex)
+            Throw New Exception("复制文件出错：" & FromPath & " → " & ToPath, ex)
         End Try
     End Sub
     ''' <summary>
@@ -1240,7 +1244,19 @@ Re:
             Directory.CreateDirectory(DestDirectory)
             If CompressFilePath.EndsWith(".zip") OrElse CompressFilePath.EndsWith(".jar") OrElse CompressFilePath.EndsWith(".mrpack") Then
                 '以 zip 方式解压
-                ZipFile.ExtractToDirectory(CompressFilePath, DestDirectory, If(Encode, Encoding.GetEncoding("GB18030")))
+                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
                 '以 gz 方式解压
@@ -1358,8 +1374,6 @@ Re:
             CommonReason = "PCL 的运行环境存在问题。请尝试重新安装 .NET Framework 4.6.2 然后再试。"
         ElseIf TypeOf InnerEx Is UnauthorizedAccessException Then
             CommonReason = "PCL 的权限不足。请尝试右键 PCL，选择以管理员身份运行。"
-        ElseIf TypeOf InnerEx Is System.Runtime.InteropServices.COMException Then
-            CommonReason = "你的电脑系统进程崩溃，PCL 的运行环境出现问题，或者电脑设置、驱动存在问题。请尝试重启 PCL。"
         ElseIf TypeOf InnerEx Is OutOfMemoryException Then
             CommonReason = "你的电脑运行内存不足，导致 PCL 无法继续运行。请在关闭一部分不需要的程序后再试。"
         ElseIf TypeOf InnerEx Is Runtime.InteropServices.COMException Then
@@ -2592,11 +2606,11 @@ Retry:
     ''' <summary>
     ''' 将数组随机打乱。
     ''' </summary>
-    Public Function RandomChaos(Of T)(array As IList(Of T)) As IList(Of T)
-        RandomChaos = New List(Of T)
+    Public Function Shuffle(Of T)(array As IList(Of T)) As IList(Of T)
+        Shuffle = New List(Of T)
         Do While array.Count > 0
             Dim i As Integer = RandomInteger(0, array.Count - 1)
-            RandomChaos.Add(array(i))
+            Shuffle.Add(array(i))
             array.RemoveAt(i)
         Loop
     End Function

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

@@ -1,5 +1,7 @@
 '一个万能的自动图片类型转换工具类
 
+Imports System.Drawing.Imaging
+
 Public Class MyBitmap
 
     ''' <summary>
@@ -29,7 +31,7 @@ Public Class MyBitmap
         Dim bitmapData = Bitmap.LockBits(rect, System.Drawing.Imaging.ImageLockMode.ReadWrite, System.Drawing.Imaging.PixelFormat.Format32bppArgb)
         Try
             Dim size = rect.Width * rect.Height * 4
-            Return BitmapSource.Create(Bitmap.Width, Bitmap.Height, DPI, DPI, PixelFormats.Bgra32, Nothing, bitmapData.Scan0, size, bitmapData.Stride)
+            Return BitmapSource.Create(Bitmap.Width, Bitmap.Height, Bitmap.HorizontalResolution, Bitmap.VerticalResolution, PixelFormats.Bgra32, Nothing, bitmapData.Scan0, size, bitmapData.Stride)
         Finally
             Bitmap.UnlockBits(bitmapData)
         End Try
@@ -109,8 +111,10 @@ Public Class MyBitmap
     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))
+        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)
@@ -124,9 +128,11 @@ Public Class MyBitmap
     ''' </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)
+        Dim bmp As New System.Drawing.Bitmap(rect.Width, rect.Height, img.PixelFormat)
+        bmp.SetResolution(img.HorizontalResolution, img.VerticalResolution)
         Using g As System.Drawing.Graphics = System.Drawing.Graphics.FromImage(bmp)
-            g.DrawImageUnscaled(img, rect)
+            g.InterpolationMode = System.Drawing.Drawing2D.InterpolationMode.NearestNeighbor
+            g.DrawImageUnscaled(img, rect.X, rect.Y)
         End Using
         Return bmp
     End Function

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

@@ -181,7 +181,7 @@
             Get
                 If Not LoadedDatabase Then
                     LoadedDatabase = True
-                    _DatabaseEntry = CompDatabase.FirstOrDefault(Function(c) If(FromCurseForge, c.CurseForgeSlug, c.ModrinthSlug) = Slug)
+                    If Type = CompType.Mod Then _DatabaseEntry = CompDatabase.FirstOrDefault(Function(c) If(FromCurseForge, c.CurseForgeSlug, c.ModrinthSlug) = Slug)
                 End If
                 Return _DatabaseEntry
             End Get
@@ -596,8 +596,8 @@ NoExName:
         ''' </summary>
         Public ReadOnly Property CanContinue As Boolean
             Get
-                If Tag.StartsWith("/") Then Storage.CurseForgeTotal = 0
-                If Tag.EndsWith("/") Then Storage.ModrinthTotal = 0
+                If Tag.StartsWith("/") OrElse Not Source.HasFlag(CompSourceType.CurseForge) Then Storage.CurseForgeTotal = 0
+                If Tag.EndsWith("/") OrElse Not Source.HasFlag(CompSourceType.Modrinth) Then Storage.ModrinthTotal = 0
                 If Storage.CurseForgeTotal = -1 OrElse Storage.ModrinthTotal = -1 Then Return True
                 Return Storage.CurseForgeOffset < Storage.CurseForgeTotal OrElse Storage.ModrinthOffset < Storage.ModrinthTotal
             End Get

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

@@ -361,6 +361,9 @@
         低版本Forge与高版本Java不兼容
         版本Json中存在多个Forge
         Mod过多导致超出ID限制
+        NightConfig的Bug
+        ShadersMod与Optifine同时安装
+        Forge安装不完整
     End Enum
     ''' <summary>
     ''' 根据 AnalyzeLogs 与可能的版本信息分析崩溃原因。
@@ -468,6 +471,8 @@ Done:
             If LogMc.Contains("java.lang.NoSuchMethodError: 'void net.minecraft.client.renderer.texture.SpriteContents.<init>(net.minecraft.resources.ResourceLocation, ") Then AppendReason(CrashReason.OptiFine与Forge不兼容)
             If LogMc.Contains("java.lang.NoSuchMethodError: 'void net.minecraft.client.renderer.block.model.BakedQuad.<init>(int[], int, net.minecraft.core.Direction, net.minecraft.client.renderer.texture.TextureAtlasSprite, boolean, boolean)'") Then AppendReason(CrashReason.OptiFine与Forge不兼容)
             If LogMc.Contains("java.lang.NoSuchMethodError: 'void net.minecraft.server.level.DistanceManager.addRegionTicket(net.minecraft.server.level.TicketType, net.minecraft.world.level.ChunkPos, int, java.lang.Object, boolean)'") Then AppendReason(CrashReason.OptiFine与Forge不兼容)
+            If LogMc.Contains("java.lang.NoSuchMethodError: 'void net.minecraft.server.level.DistanceManager.removeRegionTicket(net.minecraft.server.level.TicketType, net.minecraft.world.level.ChunkPos, int, java.lang.Object, boolean)'") Then AppendReason(CrashReason.OptiFine与Forge不兼容)
+            If LogMc.Contains("java.lang.NoSuchMethodError: 'net.minecraft.network.chat.FormattedText net.minecraft.client.gui.Font.ellipsize(net.minecraft.network.chat.FormattedText, int)'") Then AppendReason(CrashReason.OptiFine与Forge不兼容)
             If LogMc.Contains("Open J9 is not supported") OrElse LogMc.Contains("OpenJ9 is incompatible") OrElse LogMc.Contains(".J9VMInternals.") Then AppendReason(CrashReason.使用OpenJ9)
             If LogMc.Contains("java.lang.NoSuchFieldException: ucp") Then AppendReason(CrashReason.Java版本过高)
             If LogMc.Contains("because module java.base does not export") Then AppendReason(CrashReason.Java版本过高)
@@ -477,15 +482,17 @@ Done:
             If LogMc.Contains("Extracted mod jars found, loading will NOT continue") Then AppendReason(CrashReason.Mod文件被解压)
             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同时安装)
             If LogMc.Contains("java.lang.NoSuchMethodError: sun.security.util.ManifestEntryVerifier") Then AppendReason(CrashReason.低版本Forge与高版本Java不兼容)
             If LogMc.Contains("1282: Invalid operation") Then AppendReason(CrashReason.光影或资源包导致OpenGL1282错误)
             If LogMc.Contains("signer information does not match signer information of other classes in the same package") Then AppendReason(CrashReason.文件或内容校验失败, If(RegexSeek(LogMc, "(?<=class "")[^']+(?=""'s signer information)"), "").TrimEnd(vbCrLf))
             If LogMc.Contains("Maybe try a lower resolution resourcepack?") Then AppendReason(CrashReason.材质过大或显卡配置不足)
             If LogMc.Contains("java.lang.NoSuchMethodError: net.minecraft.world.server.ChunkManager$ProxyTicketManager.shouldForceTicks(J)Z") AndAlso LogMc.Contains("OptiFine") Then AppendReason(CrashReason.OptiFine导致无法加载世界)
             If LogMc.Contains("Unsupported class file major version") Then AppendReason(CrashReason.Java版本不兼容)
+            If LogMc.Contains("com.electronwill.nightconfig.core.io.ParsingException: Not enough data available") Then AppendReason(CrashReason.NightConfig的Bug)
+            If LogMc.Contains("Cannot find launch target fmlclient, unable to launch") Then AppendReason(CrashReason.Forge安装不完整)
             If LogMc.Contains("Invalid module name: '' is not a Java identifier") Then AppendReason(CrashReason.Mod名称包含特殊字符)
             If LogMc.Contains("java.lang.UnsupportedClassVersionError: net/fabricmc/loader/impl/launch/knot/KnotClient : Unsupported major.minor version") Then AppendReason(CrashReason.Java版本不兼容)
-            If LogMc.Contains("Invalid module name: '' is not a Java identifier") Then AppendReason(CrashReason.模组名称中未含合法字符)
             If LogMc.Contains("Could not reserve enough space") Then
                 If LogMc.Contains("for 1048576KB object heap") Then
                     AppendReason(CrashReason.使用32位Java导致JVM无法分配足够多的内存)
@@ -506,7 +513,7 @@ Done:
                 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, "(?<= in callback )[^./ ]+(?=.mixins.json:)")
-                If ModId Is Nothing Then ModId = RegexSeek(LogMc, "(?<= in callback mixins.)[^./ ]+(?=.json:)")
+                If ModId Is Nothing Then ModId = RegexSeek(LogMc, "(?<=from mod )[^\] ]+(?=\] from phase)")
                 AppendReason(CrashReason.ModMixin失败, TryAnalyzeModName(If(ModId, "").TrimEnd((vbCrLf & " ").ToCharArray)))
             End If
             If LogMc.Contains("Caught exception from ") Then AppendReason(CrashReason.确定Mod导致游戏崩溃, TryAnalyzeModName(RegexSeek(LogMc, "(?<=Caught exception from )[^\n]+?")?.TrimEnd((vbCrLf & " ").ToCharArray)))
@@ -866,6 +873,8 @@ NextStack:
                     End If
                 Case CrashReason.OptiFine与Forge不兼容
                     Results.Add("由于 OptiFine 与当前版本的 Forge 不兼容，导致了游戏崩溃。\n\n请前往 OptiFine 官网（https://optifine.net/downloads）查看 OptiFine 所兼容的 Forge 版本，并严格按照对应版本重新安装游戏。")
+                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")
                 Case CrashReason.版本Json中存在多个Forge
@@ -884,12 +893,16 @@ NextStack:
                     End If
                 Case CrashReason.材质过大或显卡配置不足
                     Results.Add("你所使用的材质分辨率过高，或显卡配置不足，导致游戏无法继续运行。\n\n如果你正在使用高清材质，请将它移除。\n如果你没有使用材质，那么你可能需要更新显卡驱动，或者换个更好的显卡……\h")
+                Case CrashReason.材质过大或显卡配置不足
+                    Results.Add("由于 Night Config 存在问题，导致了游戏崩溃。\n你可以尝试安装 Night Config Fixes 模组，这或许能解决此问题。\h")
                 Case CrashReason.光影或资源包导致OpenGL1282错误
                     Results.Add("你所使用的光影或材质导致游戏出现了一些问题……\n\n请尝试删除你所添加的这些额外资源。\h")
                 Case CrashReason.Mod过多导致超出ID限制
                     Results.Add("你所安装的 Mod 过多，超出了游戏的 ID 限制，导致了游戏崩溃。\n请尝试安装 JEID 等修复 Mod，或删除部分大型 Mod。")
                 Case CrashReason.文件或内容校验失败
                     Results.Add("部分文件或内容校验失败，导致游戏出现了问题。\n\n请尝试删除游戏（包括 Mod）并重新下载，或尝试在重新下载时使用 VPN。\h")
+                Case CrashReason.Forge安装不完整
+                    Results.Add("由于 Forge 安装不完整，导致游戏无法正常运行。\n请尝试重新安装 Forge。\h")
                 Case CrashReason.Fabric报错
                     If Additional.Count = 1 Then
                         Results.Add("Fabric 提供了以下错误信息：\n" & Additional.First & "\n\n请根据上述信息进行对应处理，如果看不懂英文可以使用翻译软件。")

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

@@ -181,20 +181,32 @@ NextInner:
                         CheckResult = McLoginAble(LoginInput)
                     End Sub)
         If CheckResult <> "" Then Throw New ArgumentException(CheckResult)
-        '求赞助
 #If BETA Then
+        '求赞助
         RunInNewThread(Sub()
                            Select Case Setup.Get("SystemLaunchCount")
-                               Case 20, 50, 100, 150, 200, 250, 300, 350, 400, 450, 500, 600, 700, 800, 900, 1000, 1100, 1200, 1300, 1400, 1500, 1600, 1700, 1800, 1900, 2000
+                               Case 20, 50, 100, 150, 200, 250, 300, 350, 400, 450, 500, 600, 700, 800, 900, 1000, 1100, 1200, 1300, 1400, 1500, 1700, 1900, 2100, 2300, 2500
                                    If MyMsgBox("PCL 已经为你启动了 " & Setup.Get("SystemLaunchCount") & " 次游戏啦！" & vbCrLf &
-                                               "如果觉得 PCL 还算好用的话，也可以考虑小小地赞助一下作者呢 qwq……" & vbCrLf &
-                                               "毕竟一个人开发也不容易（小声）……",
+                                               "如果觉得 PCL 还算好用的话，也可以考虑赞助一下作者……一点心意也行……" & vbCrLf &
+                                               "毕竟一个人开发也不容易（悲）……",
                                                "求赞助啦……", "这就赞助！", "但是我拒绝") = 1 Then
-                                       OpenWebsite("https://afdian.net/a/LTCat/plan")
+                                       OpenWebsite("https://afdian.net/a/LTCat")
                                    End If
                            End Select
                        End Sub, "Donate")
 #End If
+        '正版购买提示
+        If Not Setup.Get("HintBuy") AndAlso Setup.Get("LoginType") <> McLoginType.Ms Then
+            Select Case Setup.Get("SystemLaunchCount")
+                Case 10, 35, 75, 125, 175, 225, 275, 325, 375, 425, 475, 550, 650, 750, 850, 950, 1050, 1150, 1250, 1350, 1450, 1600, 1800, 2000, 2200, 2400
+                    If MyMsgBox("你已经启动了 " & Setup.Get("SystemLaunchCount") & " 次 Minecraft 啦！" & vbCrLf &
+                                "如果觉得 Minecraft 还不错，也可以考虑购买正版支持一下，毕竟开发游戏也很不容易……" & vbCrLf &
+                                "在你登录一次正版账号后，就不会再出现这个提示了。",
+                                "考虑一下正版？", "购买正版游戏", "下次一定") = 1 Then
+                        OpenWebsite("https://www.xbox.com/zh-cn/games/store/minecraft-java-bedrock-edition-for-pc/9nxp44l49shj")
+                    End If
+            End Select
+        End If
     End Sub
 
 #End Region
@@ -204,7 +216,6 @@ NextInner:
     '登录方式
     Public Enum McLoginType
         Legacy = 0
-        Mojang = 1
         Nide = 2
         Auth = 3
         Ms = 5
@@ -304,15 +315,8 @@ NextInner:
         Public Uuid As String
         Public AccessToken As String
         Public Type As String
-        ''' <summary>
-        ''' 仅用于登录方式为 Mojang 正版时的 Refresh Login，其余时间为一个无意义的 ID（一般为玩家的 UUID）。
-        ''' </summary>
         Public ClientToken As String
         ''' <summary>
-        ''' 用于登录的邮箱。仅用于登录方式为 Mojang 正版时的 launcher_profile 更新。
-        ''' </summary>
-        Public Email As String
-        ''' <summary>
         ''' 进行微软登录时返回的 profile 信息。
         ''' </summary>
         Public ProfileJson As String
@@ -324,8 +328,6 @@ NextInner:
     Public Function McLoginName() As String
         '根据当前登录方式优先返回
         Select Case Setup.Get("LoginType")
-            Case McLoginType.Mojang
-                If Setup.Get("CacheMojangName") <> "" Then Return Setup.Get("CacheMojangName")
             Case McLoginType.Ms
                 If Setup.Get("CacheMsName") <> "" Then Return Setup.Get("CacheMsName")
             Case McLoginType.Legacy
@@ -337,7 +339,6 @@ NextInner:
         End Select
         '查找所有可能的项
         If Setup.Get("CacheMsName") <> "" Then Return Setup.Get("CacheMsName")
-        If Setup.Get("CacheMojangName") <> "" Then Return Setup.Get("CacheMojangName")
         If Setup.Get("CacheNideName") <> "" Then Return Setup.Get("CacheNideName")
         If Setup.Get("CacheAuthName") <> "" Then Return Setup.Get("CacheAuthName")
         If Setup.Get("LoginLegacyName") <> "" Then Return Setup.Get("LoginLegacyName").ToString.Split("¨")(0)
@@ -348,12 +349,6 @@ NextInner:
     ''' </summary>
     Public Function McLoginAble() As String
         Select Case Setup.Get("LoginType")
-            Case McLoginType.Mojang
-                If Setup.Get("CacheMojangAccess") = "" Then
-                    Return FrmLoginMojang.IsVaild()
-                Else
-                    Return ""
-                End If
             Case McLoginType.Ms
                 If Setup.Get("CacheMsOAuthRefresh") = "" Then
                     Return FrmLoginMs.IsVaild()
@@ -383,8 +378,6 @@ NextInner:
     ''' </summary>
     Public Function McLoginAble(LoginData As McLoginData) As String
         Select Case LoginData.Type
-            Case McLoginType.Mojang
-                Return PageLoginMojang.IsVaild(LoginData)
             Case McLoginType.Ms
                 Return PageLoginMs.IsVaild(LoginData)
             Case McLoginType.Legacy
@@ -407,12 +400,6 @@ NextInner:
             Select Case LoginType
                 Case McLoginType.Legacy
                     LoginData = PageLoginLegacy.GetLoginData()
-                Case McLoginType.Mojang
-                    If Setup.Get("CacheMojangAccess") = "" Then
-                        LoginData = PageLoginMojang.GetLoginData()
-                    Else
-                        LoginData = PageLoginMojangSkin.GetLoginData()
-                    End If
                 Case McLoginType.Ms
                     If Setup.Get("CacheMsOAuthRefresh") = "" Then
                         LoginData = PageLoginMs.GetLoginData()
@@ -445,8 +432,6 @@ NextInner:
         '获取对应加载器
         Dim Loader As LoaderBase = Nothing
         Select Case Data.Input.Type
-            Case McLoginType.Mojang
-                Loader = McLoginMojangLoader
             Case McLoginType.Ms
                 Loader = McLoginMsLoader
             Case McLoginType.Legacy
@@ -473,7 +458,6 @@ NextInner:
 #Region "分方式登录模块"
 
     '各个登录方式的主对象与输入构造
-    Public McLoginMojangLoader As New LoaderTask(Of McLoginServer, McLoginResult)("Loader Login Mojang", AddressOf McLoginServerStart) With {.ReloadTimeout = 60000}
     Public McLoginMsLoader As New LoaderTask(Of McLoginMs, McLoginResult)("Loader Login Ms", AddressOf McLoginMsStart) With {.ReloadTimeout = 300000}
     Public McLoginLegacyLoader As New LoaderTask(Of McLoginLegacy, McLoginResult)("Loader Login Legacy", AddressOf McLoginLegacyStart)
     Public McLoginNideLoader As New LoaderTask(Of McLoginServer, McLoginResult)("Loader Login Nide", AddressOf McLoginServerStart) With {.ReloadTimeout = 60000}
@@ -484,7 +468,7 @@ NextInner:
     Private Sub McLoginMsStart(Data As LoaderTask(Of McLoginMs, McLoginResult))
         Dim Input As McLoginMs = Data.Input
         Dim LogUsername As String = Input.UserName
-        McLaunchLog("登录方式：微软正版（" & If(LogUsername = "", "尚未登录", LogUsername) & "）")
+        McLaunchLog("登录方式：正版（" & If(LogUsername = "", "尚未登录", LogUsername) & "）")
         Data.Progress = 0.05
         '检查是否已经登录完成
         If Input.AccessToken <> "" AndAlso Not Data.IsForceRestarting Then
@@ -494,7 +478,7 @@ NextInner:
         End If
         '尝试登录
         Dim OAuthTokens As String()
-        If Setup.Get("CacheMsOAuthRefresh") = "" Then
+        If Input.OAuthRefreshToken = "" Then
             '无 RefreshToken
 Relogin:
             Dim OAuthCode As String = MsLoginStep1(Data)
@@ -503,7 +487,7 @@ Relogin:
             OAuthTokens = MsLoginStep2(OAuthCode, False)
         Else
             '有 RefreshToken
-            OAuthTokens = MsLoginStep2(Setup.Get("CacheMsOAuthRefresh"), True)
+            OAuthTokens = MsLoginStep2(Input.OAuthRefreshToken, True)
         End If
         '要求重新打开登录网页认证
         If OAuthTokens(0) = "Relogin" Then GoTo Relogin
@@ -527,10 +511,15 @@ Relogin:
         Setup.Set("CacheMsUuid", Result(0))
         Setup.Set("CacheMsName", Result(1))
         Setup.Set("CacheMsProfileJson", Result(2))
+        Dim MsJson As JObject = GetJson(Setup.Get("LoginMsJson"))
+        MsJson.Remove(Input.UserName) '如果更改了玩家名……
+        MsJson(Result(1)) = OAuthRefreshToken
+        Setup.Set("LoginMsJson", MsJson.ToString(Newtonsoft.Json.Formatting.None))
         Data.Output = New McLoginResult With {.AccessToken = AccessToken, .Name = Result(1), .Uuid = Result(0), .Type = "Microsoft", .ClientToken = Result(0), .ProfileJson = Result(2)}
         '解锁主题
 SkipLogin:
         McLaunchLog("微软登录完成")
+        Setup.Set("HintBuy", True) '关闭正版购买提示
         Data.Progress = 0.95
         If ThemeUnlock(10, False) Then MyMsgBox("感谢你对正版游戏的支持！" & vbCrLf & "隐藏主题 跳票红 已解锁！", "提示")
     End Sub
@@ -617,11 +606,7 @@ LoginFinish:
             .Type = "Legacy"
         End With
         '将结果扩展到所有项目中
-        'Data.Output.AccessToken = Setup.Get("CacheMojangAccess") '不能优先使用缓存的 AccessToken，这会导致离线用户名设置失效
-        'If Data.Output.AccessToken.Length < 300 Then
         Data.Output.AccessToken = Data.Output.Uuid
-        'Data.Output.ClientToken = Setup.Get("CacheMojangClient")
-        'If Data.Output.AccessToken.Length <> 32 Then
         Data.Output.ClientToken = Data.Output.Uuid
         '保存启动记录
         Dim Names As New List(Of String)
@@ -649,7 +634,6 @@ LoginFinish:
             Data.Output.Name = LoginJson("selectedProfile")("name").ToString
             Data.Output.Uuid = LoginJson("selectedProfile")("id").ToString
             Data.Output.Type = "Auth"
-            Data.Output.Email = Data.Input.UserName
             McLaunchLog("登录成功（Login, HiPer）")
             '保存启动记录
             Dim Names As New List(Of String)
@@ -691,7 +675,6 @@ LoginFinish:
         Data.Output.Uuid = Uuid
         Data.Output.Name = Name
         Data.Output.Type = Data.Input.Token
-        Data.Output.Email = Data.Input.UserName
         '不更改缓存，直接结束
         McLaunchLog("验证登录成功（Validate, " & Data.Input.Token & "）")
     End Sub
@@ -716,7 +699,6 @@ LoginFinish:
         Data.Output.Uuid = LoginJson("selectedProfile")("id").ToString
         Data.Output.Name = LoginJson("selectedProfile")("name").ToString
         Data.Output.Type = Data.Input.Token
-        Data.Output.Email = Data.Input.UserName
         '保存缓存
         Setup.Set("Cache" & Data.Input.Token & "Access", Data.Output.AccessToken)
         Setup.Set("Cache" & Data.Input.Token & "Client", Data.Output.ClientToken)
@@ -737,12 +719,8 @@ LoginFinish:
                    ContentType:="application/json; charset=utf-8"))
             '检查登录结果
             If LoginJson("availableProfiles").Count = 0 Then
-                If Data.Input.Type = McLoginType.Auth Then
-                    If Data.Input.ForceReselectProfile Then Hint("你还没有创建角色，无法更换！", HintType.Critical)
-                    Throw New Exception("$你还没有创建角色，请在创建角色后再试！")
-                Else
-                    Throw New Exception("$你还没有购买 Minecraft 正版，请在购买后再试！")
-                End If
+                If Data.Input.ForceReselectProfile Then Hint("你还没有创建角色，无法更换！", HintType.Critical)
+                Throw New Exception("$你还没有创建角色，请在创建角色后再试！")
             ElseIf Data.Input.ForceReselectProfile AndAlso LoginJson("availableProfiles").Count = 1 Then
                 Hint("你的账户中只有一个角色，无法更换！", HintType.Critical)
             End If
@@ -785,7 +763,6 @@ LoginFinish:
             Data.Output.Name = SelectedName
             Data.Output.Uuid = SelectedId
             Data.Output.Type = Data.Input.Token
-            Data.Output.Email = Data.Input.UserName
             '保存缓存
             Setup.Set("Cache" & Data.Input.Token & "Access", Data.Output.AccessToken)
             Setup.Set("Cache" & Data.Input.Token & "Client", Data.Output.ClientToken)
@@ -798,27 +775,13 @@ LoginFinish:
         Catch ex As Exception
             Dim AllMessage As String = GetExceptionSummary(ex)
             Log(ex, "登录失败原始错误信息", LogLevel.Normal)
-            If AllMessage.Contains("410") AndAlso AllMessage.Contains("Migrated") Then
-                Throw New Exception("$登录失败：该 Mojang 账号已迁移至微软账号，请在上方的登录方式中选择 微软 并再次尝试登录！")
-            ElseIf AllMessage.Contains("403") Then
+            If AllMessage.Contains("403") Then
                 Select Case Data.Input.Type
                     Case McLoginType.Auth
                         Throw New Exception("$登录失败，以下为可能的原因：" & vbCrLf &
                                             " - 输入的账号或密码错误。" & vbCrLf &
                                             " - 登录尝试过于频繁，导致被暂时屏蔽。请不要操作，等待 10 分钟后再试。" & vbCrLf &
                                             " - 只注册了账号，但没有在皮肤站新建角色。")
-                    Case McLoginType.Legacy
-                        Throw
-                    Case McLoginType.Mojang
-                        If AllMessage.Contains("Invalid username or password") Then
-                            Throw New Exception("$登录失败：输入的账号或密码有误。")
-                        Else
-                            Throw New Exception("$登录尝试过于频繁，导致被 Mojang 暂时屏蔽。请不要操作，等待 10 分钟后再试。")
-                        End If
-                    Case McLoginType.Ms
-                        Throw New Exception("$登录失败，以下为可能的原因：" & vbCrLf &
-                                            " - 登录尝试过于频繁，导致被暂时屏蔽。请不要操作，等待 10 分钟后再试。" & vbCrLf &
-                                            " - 账号类别错误。如果你在使用 Mojang 账号，请将登录方式切换为 Mojang。")
                     Case McLoginType.Nide
                         Throw New Exception("$登录失败，以下为可能的原因：" & vbCrLf &
                                             " - 输入的账号或密码错误。" & vbCrLf &
@@ -1037,12 +1000,12 @@ SystemBrowser:
             ElseIf Message.Contains("(404)") Then
                 Log(ex, "微软登录第 6 步汇报 404")
                 RunInNewThread(Sub()
-                                   Select Case MyMsgBox("你可能没有在 Minecraft 官网创建档案，或者没有购买 Minecraft。" & vbCrLf &
-                                            "如果你已经购买了游戏，请在官网上创建档案后再试。", "登录失败", "创建档案", "购买 Minecraft", "取消")
+                                   Select Case MyMsgBox("你可能没有在 Minecraft 官网创建档案，XBox Game Pass 已到期，或者还没有购买 Minecraft。" & vbCrLf &
+                                            "如果你确认拥有 Minecraft，请在官网上创建档案后再试。", "登录失败", "创建档案", "购买 Minecraft", "取消")
                                        Case 1
                                            OpenWebsite("https://www.minecraft.net/zh-hans/msaprofile/mygames/editprofile")
                                        Case 2
-                                           OpenWebsite("https://www.minecraft.net/store/checkout/minecraft-java-bedrock-edition-pc")
+                                           OpenWebsite("https://www.xbox.com/zh-cn/games/store/minecraft-java-bedrock-edition-for-pc/9nxp44l49shj")
                                    End Select
                                End Sub, "Login Failed: Create Profile")
                 Throw New Exception("$$")
@@ -1180,6 +1143,9 @@ SystemBrowser:
             ElseIf McVersionCurrent.Version.McCodeMain >= 18 AndAlso McVersionCurrent.Version.McCodeMain < 99 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
 
@@ -1708,7 +1674,7 @@ NextVersion:
         '更新 launcher_profiles.json
         Try
             '确保可用
-            If Not (McLoginLoader.Output.Type = "Mojang" OrElse McLoginLoader.Output.Type = "Microsoft") Then Exit Try
+            If Not McLoginLoader.Output.Type = "Microsoft" Then Exit Try
             McFolderLauncherProfilesJsonCreate(PathMcFolder)
             '构建需要替换的 Json 对象
             Dim ReplaceJsonString As String = "
@@ -1716,7 +1682,7 @@ NextVersion:
               ""authenticationDatabase"": {
                 ""00000111112222233333444445555566"": {
                   ""accessToken"": """ & McLoginLoader.Output.AccessToken & """,
-                  ""username"": """ & If(McLoginLoader.Output.Email, McLoginLoader.Output.Name).Replace("""", "-") & """,
+                  ""username"": """ & McLoginLoader.Output.Name.Replace("""", "-") & """,
                   ""profiles"": {
                     ""66666555554444433333222221111100"": {
                         ""displayName"": """ & McLoginLoader.Output.Name & """
@@ -1747,7 +1713,7 @@ NextVersion:
                       ""authenticationDatabase"": {
                         ""00000111112222233333444445555566"": {
                           ""accessToken"": """ & McLoginLoader.Output.AccessToken & """,
-                          ""username"": """ & If(McLoginLoader.Output.Email, McLoginLoader.Output.Name).Replace("""", "-") & """,
+                          ""username"": """ & McLoginLoader.Output.Name.Replace("""", "-") & """,
                           ""profiles"": {
                             ""66666555554444433333222221111100"": {
                                 ""displayName"": """ & McLoginLoader.Output.Name & """
@@ -1851,14 +1817,14 @@ NextVersion:
                         End If
                     Case 19
                         If McVersionCurrent.Version.McCodeSub <= 3 Then
-                            PackFormat = 10
+                            PackFormat = 9
                         Else
                             PackFormat = 12
                         End If
                     Case 20, 99 '99 是快照版
-                        PackFormat = 13
+                        PackFormat = 15
                     Case Else
-                        PackFormat = 14
+                        PackFormat = 16
                         'https://minecraft.fandom.com/zh/wiki/数据包#数据包版本
                 End Select
                 McLaunchLog("正在构建自定义皮肤资源包，格式为：" & PackFormat)
@@ -1989,7 +1955,7 @@ IgnoreCustomSkin:
             Try
                 CustomProcess.StartInfo.FileName = "cmd.exe"
                 CustomProcess.StartInfo.Arguments = "/c """ & CustomCommandGlobal & """"
-                CustomProcess.StartInfo.WorkingDirectory = Path
+                CustomProcess.StartInfo.WorkingDirectory = PathMcFolder
                 CustomProcess.StartInfo.UseShellExecute = False
                 CustomProcess.StartInfo.CreateNoWindow = True
                 CustomProcess.Start()
@@ -2013,7 +1979,7 @@ IgnoreCustomSkin:
             Try
                 CustomProcess.StartInfo.FileName = "cmd.exe"
                 CustomProcess.StartInfo.Arguments = "/c """ & CustomCommandVersion & """"
-                CustomProcess.StartInfo.WorkingDirectory = Path
+                CustomProcess.StartInfo.WorkingDirectory = PathMcFolder
                 CustomProcess.StartInfo.UseShellExecute = False
                 CustomProcess.StartInfo.CreateNoWindow = True
                 CustomProcess.Start()
@@ -2061,12 +2027,16 @@ IgnoreCustomSkin:
         '开始进程
         GameProcess.Start()
         McLaunchLog("已启动游戏进程：" & McLaunchJavaSelected.PathJavaw)
+        If Loader.IsAborted Then
+            McLaunchLog("由于取消启动，已强制结束游戏进程") '#1631
+            GameProcess.Kill()
+            Exit Sub
+        End If
         Loader.Output = GameProcess
         McLaunchProcess = GameProcess
 
         '进程优先级处理
         Try
-            If GameProcess.HasExited Then Exit Try '可能在启动游戏进程的同时刚好取消了启动
             GameProcess.PriorityBoostEnabled = True
             Select Case Setup.Get("LaunchArgumentPriority")
                 Case 0 '高
@@ -2177,10 +2147,8 @@ IgnoreCustomSkin:
                 Else
                     Raw = Raw.Replace("{login}", "离线")
                 End If
-            Case McLoginType.Mojang
-                Raw = Raw.Replace("{login}", "Mojang 正版")
             Case McLoginType.Ms
-                Raw = Raw.Replace("{login}", "微软正版")
+                Raw = Raw.Replace("{login}", "正版")
             Case McLoginType.Nide
                 Raw = Raw.Replace("{login}", "统一通行证")
             Case McLoginType.Auth

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

@@ -147,7 +147,7 @@ Public Module ModMinecraft
 
 #Region "版本处理"
 
-    Public Const McVersionCacheVersion As Integer = 25
+    Public Const McVersionCacheVersion As Integer = 26
 
     Private _McVersionCurrent As McVersion
     Private _McVersionLast = 0 '为 0 以保证与 Nothing 不相同，使得 UI 显示可以正常初始化
@@ -742,8 +742,10 @@ ExitDataLoad:
                 If CustomInfo = "" Then
                     Select Case State
                         Case McVersionState.Snapshot
-                            If Version.McName.ToLower.Contains("pre") OrElse Version.McName.ToLower.Contains("rc") Then
+                            If Version.McName.ToLower.Contains("pre") Then
                                 Info = "预发布版 " & Version.McName
+                            ElseIf Version.McName.ToLower.Contains("rc") Then
+                                Info = "发布候选 " & Version.McName
                             ElseIf Version.McName.Contains("experimental") OrElse Version.McName = "pending" Then
                                 Info = "实验性快照"
                             Else

Plain Craft Launcher 2/Modules/ModMusic.vb

@@ -31,7 +31,7 @@
                 Next
             End If
             '打乱顺序播放
-            MusicToplayList = RandomChaos(New List(Of String)(MusicAllList))
+            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
                 '若需要避免成为第一项的为第一项，则将它放在最后
                 MusicToplayList.RemoveAt(0)

Plain Craft Launcher 2/My Project/AssemblyInfo.vb

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

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

@@ -3,10 +3,14 @@
 Public Module ModDownloadLib
 
     ''' <summary>
-    ''' 如果 OptiFine 与 Forge 同时开始安装，就会导致 Forge 安装失败，所以在这里添加一个锁。
+    ''' 如果 OptiFine 与 Forge 同时开始安装，就会导致 Forge 安装失败。
     ''' </summary>
     Private InstallSyncLock As New Object
     ''' <summary>
+    ''' 如果 OptiFine 与 Forge 同时复制原版 Jar，就会导致复制文件时冲突。
+    ''' </summary>
+    Private VanillaSyncLock As New Object
+    ''' <summary>
     ''' 最高的 Minecraft 大版本号，-1 代表尚未获取。
     ''' </summary>
     Public McVersionHighest As Integer = -1
@@ -548,16 +552,18 @@ Public Module ModDownloadLib
                                                                              If Task.IsAborted Then Exit Sub
                                                                              '拷贝原版文件
                                                                              If Not IsCustomFolder Then Exit Sub
-                                                                             Dim ClientName As String = New DirectoryInfo(ClientDownloadLoader.Input).Name
-                                                                             Directory.CreateDirectory(McFolder & "versions\" & DownloadInfo.Inherit)
-                                                                             If Not File.Exists(McFolder & "versions\" & DownloadInfo.Inherit & "\" & DownloadInfo.Inherit & ".json") Then
-                                                                                 CopyFile(ClientDownloadLoader.Input & ClientName & ".json",
+                                                                             SyncLock VanillaSyncLock
+                                                                                 Dim ClientName As String = New DirectoryInfo(ClientDownloadLoader.Input).Name
+                                                                                 Directory.CreateDirectory(McFolder & "versions\" & DownloadInfo.Inherit)
+                                                                                 If Not File.Exists(McFolder & "versions\" & DownloadInfo.Inherit & "\" & DownloadInfo.Inherit & ".json") Then
+                                                                                     CopyFile(ClientDownloadLoader.Input & ClientName & ".json",
                                                                                           McFolder & "versions\" & DownloadInfo.Inherit & "\" & DownloadInfo.Inherit & ".json")
-                                                                             End If
-                                                                             If Not File.Exists(McFolder & "versions\" & DownloadInfo.Inherit & "\" & DownloadInfo.Inherit & ".jar") Then
-                                                                                 CopyFile(ClientDownloadLoader.Input & ClientName & ".jar",
-                                                                                          McFolder & "versions\" & DownloadInfo.Inherit & "\" & DownloadInfo.Inherit & ".jar")
-                                                                             End If
+                                                                                 End If
+                                                                                 If Not File.Exists(McFolder & "versions\" & DownloadInfo.Inherit & "\" & DownloadInfo.Inherit & ".jar") Then
+                                                                                     CopyFile(ClientDownloadLoader.Input & ClientName & ".jar",
+                                                                                              McFolder & "versions\" & DownloadInfo.Inherit & "\" & DownloadInfo.Inherit & ".jar")
+                                                                                 End If
+                                                                             End SyncLock
                                                                          End Sub) With {.ProgressWeight = 0.1, .Show = False})
 
         '安装（新旧方式均需要原版 Jar 和 Json）
@@ -1379,14 +1385,16 @@ Public Module ModDownloadLib
                                                                              If Task.IsAborted Then Exit Sub
                                                                              '拷贝原版文件
                                                                              If Not IsCustomFolder Then Exit Sub
-                                                                             Dim ClientName As String = New DirectoryInfo(ClientDownloadLoader.Input).Name
-                                                                             Directory.CreateDirectory(McFolder & "versions\" & Inherit)
-                                                                             If Not File.Exists(McFolder & "versions\" & Inherit & "\" & Inherit & ".json") Then
-                                                                                 CopyFile(ClientDownloadLoader.Input & ClientName & ".json", McFolder & "versions\" & Inherit & "\" & Inherit & ".json")
-                                                                             End If
-                                                                             If Not File.Exists(McFolder & "versions\" & Inherit & "\" & Inherit & ".jar") Then
-                                                                                 CopyFile(ClientDownloadLoader.Input & ClientName & ".jar", McFolder & "versions\" & Inherit & "\" & Inherit & ".jar")
-                                                                             End If
+                                                                             SyncLock VanillaSyncLock
+                                                                                 Dim ClientName As String = New DirectoryInfo(ClientDownloadLoader.Input).Name
+                                                                                 Directory.CreateDirectory(McFolder & "versions\" & Inherit)
+                                                                                 If Not File.Exists(McFolder & "versions\" & Inherit & "\" & Inherit & ".json") Then
+                                                                                     CopyFile(ClientDownloadLoader.Input & ClientName & ".json", McFolder & "versions\" & Inherit & "\" & Inherit & ".json")
+                                                                                 End If
+                                                                                 If Not File.Exists(McFolder & "versions\" & Inherit & "\" & Inherit & ".jar") Then
+                                                                                     CopyFile(ClientDownloadLoader.Input & ClientName & ".jar", McFolder & "versions\" & Inherit & "\" & Inherit & ".jar")
+                                                                                 End If
+                                                                             End SyncLock
 #End Region
                                                                          End Sub) With {.ProgressWeight = 0.1, .Show = False})
             Loaders.Add(New LoaderTask(Of Boolean, Boolean)("安装 Mod 加载器（方式 A）",

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

@@ -39,51 +39,54 @@
         End Sub
     End Class
     Private Sub Load_OnFinish()
-
-        '初始化字典，并将当前版本排在最上面
-        Dim TopVersion As String
+        '获取目标版本与 Mod 加载器
+        Dim TargetVersion As String = ""
         Select Case Project.Type
             Case CompType.Mod
-                TopVersion = If(PageDownloadMod.Loader.Input.GameVersion, "")
+                TargetVersion = If(PageDownloadMod.Loader.Input.GameVersion, "")
             Case CompType.ModPack
-                TopVersion = If(PageDownloadPack.Loader.Input.GameVersion, "")
+                TargetVersion = If(PageDownloadPack.Loader.Input.GameVersion, "")
             Case Else 'CompType.ResourcePack
                 'FUTURE: Res
-                TopVersion = Nothing 'If(PageDownloadResource.Loader.Input.GameVersion, "")
+                TargetVersion = "" 'If(PageDownloadResource.Loader.Input.GameVersion, "")
         End Select
-        Dim Dict As New SortedDictionary(Of String, List(Of CompFile))(New VersionSorterWithSelect(TopVersion))
-        '#8826 汇报了奇怪的这个 Try 块里出现 NPE 的问题，但实在找不到，就瞎加点检测
-        Try
-            Dict.Add("未知版本", New List(Of CompFile))
-            If CompFileLoader.Output Is Nothing Then
-                Log("[Comp] 列表加载输出为 Nothing，请反馈此问题", LogLevel.Feedback)
-                Exit Try
-            End If
-            For Each Version As CompFile In CompFileLoader.Output
-                If Version Is Nothing Then
-                    Log("[Comp] 列表中的一个版本为 Nothing，请反馈此问题", LogLevel.Feedback)
-                    Continue For
+        Dim TargetLoader = CompModLoaderType.Any
+        If Project.Type = CompType.Mod AndAlso PageDownloadMod.Loader.Input.ModLoader <> CompModLoaderType.Any Then
+            TargetLoader = PageDownloadMod.Loader.Input.ModLoader
+        End If
+        Dim TargetCardName As String = If(TargetVersion <> "" OrElse TargetLoader <> CompModLoaderType.Any,
+            $"目标PCL2版本：{TargetVersion} {If(TargetLoader <> CompModLoaderType.Any, TargetLoader, "")}", "")
+        '初始化字典
+        Dim Dict As New SortedDictionary(Of String, List(Of CompFile))(New VersionSorterWithSelect(TargetCardName))
+        Dict.Add("未知版本", New List(Of CompFile))
+        For Each Version As CompFile In CompFileLoader.Output
+            For Each GameVersion In Version.GameVersions
+                '决定添加到哪个版本
+                Dim TargetCard As String
+                If GameVersion Is Nothing Then
+                    TargetCard = "未知版本"
+                ElseIf GameVersion.Contains("w") OrElse GameVersion.Contains("pre") OrElse GameVersion.Contains("rc") Then
+                    TargetCard = "快照版本"
+                ElseIf GameVersion.Split(".").Count >= 2 Then
+                    TargetCard = GameVersion
+                Else
+                    TargetCard = "未知版本"
                 End If
-                For Each GameVersion In Version.GameVersions
-                    '决定添加到哪个版本
-                    Dim TargetVersion As String
-                    If GameVersion Is Nothing Then
-                        TargetVersion = "未知版本"
-                    ElseIf GameVersion.Contains("w") Then
-                        TargetVersion = "快照版本"
-                    ElseIf GameVersion.Split(".").Count >= 2 Then
-                        TargetVersion = GameVersion
-                    Else
-                        TargetVersion = "未知版本"
-                    End If
-                    '实际进行添加
-                    If Not Dict.ContainsKey(TargetVersion) Then Dict.Add(TargetVersion, New List(Of CompFile))
-                    If Not Dict(TargetVersion).Contains(Version) Then Dict(TargetVersion).Add(Version)
-                Next
+                '实际进行添加
+                If Not Dict.ContainsKey(TargetCard) Then Dict.Add(TargetCard, New List(Of CompFile))
+                If Not Dict(TargetCard).Contains(Version) Then Dict(TargetCard).Add(Version)
             Next
-        Catch ex As Exception
-            Log(ex, "准备工程下载列表出错", LogLevel.Feedback)
-        End Try
+        Next
+        '添加筛选的版本的卡片
+        If TargetCardName <> "" Then
+            Dict.Add(TargetCardName, New List(Of CompFile))
+            For Each Version As CompFile In CompFileLoader.Output
+                If Version.GameVersions.Contains(TargetVersion) AndAlso
+                   (TargetLoader = CompModLoaderType.Any OrElse Version.ModLoaders.Contains(TargetLoader)) Then
+                    If Not Dict(TargetCardName).Contains(Version) Then Dict(TargetCardName).Add(Version)
+                End If
+            Next
+        End If
 
 #Region "转化为 UI"
         Try
@@ -99,7 +102,7 @@
                 NewCard.SwapControl = NewStack
                 PanMain.Children.Add(NewCard)
                 '确定卡片是否展开
-                If Pair.Key = TopVersion Then
+                If Pair.Key = TargetCardName Then
                     MyCard.StackInstall(NewStack, If(Project.Type = CompType.ModPack, 9, 8), Pair.Key) 'FUTURE: Res
                 Else
                     NewCard.IsSwaped = True

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

@@ -33,11 +33,8 @@
                         <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" />
                             <local:MyComboBoxItem Content="1.19.4" />
-                            <local:MyComboBoxItem Content="1.19.3" />
-                            <local:MyComboBoxItem Content="1.19.2" />
-                            <local:MyComboBoxItem Content="1.19.1" />
-                            <local:MyComboBoxItem Content="1.19" />
                             <local:MyComboBoxItem Content="1.18.2" />
                             <local:MyComboBoxItem Content="1.17.1" />
                             <local:MyComboBoxItem Content="1.16.5" />

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

@@ -32,11 +32,8 @@
                         <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" />
                             <local:MyComboBoxItem Content="1.19.4" />
-                            <local:MyComboBoxItem Content="1.19.3" />
-                            <local:MyComboBoxItem Content="1.19.2" />
-                            <local:MyComboBoxItem Content="1.19.1" />
-                            <local:MyComboBoxItem Content="1.19" />
                             <local:MyComboBoxItem Content="1.18.2" />
                             <local:MyComboBoxItem Content="1.17.1" />
                             <local:MyComboBoxItem Content="1.16.5" />

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

@@ -41,7 +41,7 @@
     End Sub
 
     '保存皮肤
-    Private Sub BtnSkinSave_Click(sender As Object, e As RoutedEventArgs) Handles BtnSkinSave.Click
+    Public Sub BtnSkinSave_Click() Handles BtnSkinSave.Click
         Save(Loader)
     End Sub
     Public Shared Sub Save(Loader As LoaderTask(Of EqualableList(Of String), String))
@@ -121,7 +121,7 @@
     End Sub
 
     '刷新缓存
-    Private Sub RefreshClick(sender As MyMenuItem, e As EventArgs) Handles BtnSkinRefresh.Click
+    Public Sub RefreshClick() Handles BtnSkinRefresh.Click
         RefreshCache(Loader)
     End Sub
     ''' <summary>
@@ -140,21 +140,20 @@
         Else
             RunInThread(Sub()
                             Try
-                                Hint("正在刷新皮肤……")
+                                Hint("正在刷新头像……")
                                 '清空缓存
                                 Log("[Skin] 正在清空皮肤缓存")
                                 If Directory.Exists(PathTemp & "Cache\Skin") Then DeleteDirectory(PathTemp & "Cache\Skin")
                                 If Directory.Exists(PathTemp & "Cache\Uuid") Then DeleteDirectory(PathTemp & "Cache\Uuid")
-                                IniClearCache(PathTemp & "Cache\Skin\IndexMojang.ini")
                                 IniClearCache(PathTemp & "Cache\Skin\IndexMs.ini")
                                 IniClearCache(PathTemp & "Cache\Skin\IndexNide.ini")
                                 IniClearCache(PathTemp & "Cache\Skin\IndexAuth.ini")
                                 IniClearCache(PathTemp & "Cache\Uuid\Mojang.ini")
                                 '刷新控件
-                                For Each SkinLoader In If(sender IsNot Nothing, {sender}, {PageLaunchLeft.SkinMojang, PageLaunchLeft.SkinLegacy, PageLaunchLeft.SkinMs})
+                                For Each SkinLoader In If(sender IsNot Nothing, {sender}, {PageLaunchLeft.SkinLegacy, PageLaunchLeft.SkinMs})
                                     SkinLoader.WaitForExit(IsForceRestart:=True)
                                 Next
-                                Hint("已刷新皮肤！", HintType.Finish)
+                                Hint("已刷新头像！", HintType.Finish)
                             Catch ex As Exception
                                 Log(ex, "刷新皮肤缓存失败", LogLevel.Msgbox)
                             End Try
@@ -165,15 +164,14 @@
     ''' 在更换正版皮肤后，刷新正版皮肤。
     ''' </summary>
     ''' <param name="SkinAddress">新的正版皮肤完整地址。</param>
-    Public Shared Sub ReloadCache(SkinAddress As String, IsMsLogin As Boolean)
+    Public Shared Sub ReloadCache(SkinAddress As String)
         RunInThread(Sub()
                         Try
                             '更新缓存
-                            Dim LoginType As String = If(IsMsLogin, "Ms", "Mojang")
-                            WriteIni(PathTemp & "Cache\Skin\Index" & LoginType & ".ini", Setup.Get("Cache" & LoginType & "Uuid"), SkinAddress)
-                            Log(String.Format("[Skin] 已写入皮肤地址缓存 {0} -> {1}", Setup.Get("Cache" & LoginType & "Uuid"), SkinAddress))
+                            WriteIni(PathTemp & "Cache\Skin\IndexMs.ini", Setup.Get("CacheMsUuid"), SkinAddress)
+                            Log(String.Format("[Skin] 已写入皮肤地址缓存 {0} -> {1}", Setup.Get("CacheMsUuid"), SkinAddress))
                             '刷新控件
-                            For Each SkinLoader In If(IsMsLogin, {PageLaunchLeft.SkinMs, PageLaunchLeft.SkinLegacy}, {PageLaunchLeft.SkinMojang, PageLaunchLeft.SkinLegacy})
+                            For Each SkinLoader In {PageLaunchLeft.SkinMs, PageLaunchLeft.SkinLegacy}
                                 SkinLoader.WaitForExit(IsForceRestart:=True)
                             Next
                             '完成提示
@@ -198,7 +196,7 @@
         End Set
     End Property
     Private IsChanging As Boolean = False
-    Private Sub BtnSkinCape_Click(sender As Object, e As RoutedEventArgs) Handles BtnSkinCape.Click
+    Public Sub BtnSkinCape_Click() Handles BtnSkinCape.Click
         '检查条件，获取新披风
         If IsChanging Then
             Hint("正在更改披风中，请稍候！")

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

@@ -33,7 +33,7 @@
                     <Path Name="PathTypeOne" HorizontalAlignment="Left" RenderTransformOrigin="0.5,0.5" Margin="12,0,0,0" Stretch="Uniform" Fill="{DynamicResource ColorBrush3}" MaxHeight="16" MaxWidth="16" VerticalAlignment="Center"
                           Data="">
                         <Path.RenderTransform>
-                            <ScaleTransform ScaleX="1.4" ScaleY="1.4" />
+                            <ScaleTransform ScaleX="1.2" ScaleY="1.2" />
                         </Path.RenderTransform>
                     </Path>
                     <TextBlock Name="LabTypeOne" Text="" FontSize="14" VerticalAlignment="Center" Grid.Column="1" Foreground="{DynamicResource ColorBrush3}" Margin="15,0,12,0" Grid.ColumnSpan="2" SnapsToDevicePixels="False" UseLayoutRounding="False" />
@@ -48,12 +48,10 @@
                 <ColumnDefinition Width="Auto" />
                 <ColumnDefinition Width="1*" />
             </Grid.ColumnDefinitions>
-            <local:MyRadioButton x:Name="RadioLoginType1" Tag="LoginType/1" Grid.Column="1" Grid.ColumnSpan="1" ColorType="Highlight" Text="Mojang" Margin="4,0"
-                             LogoScale="1.1" Logo="M9.183,18.967c-0.109-2.239,1.336-5.119,3.92-4.96c3.657-0.027,7.319-0.044,10.977,0.005	c3.712,0.214,6.596,2.759,9.652,4.533c0.181-1.697-0.197-3.717,1.237-4.982c1.899,2.091,3.143,4.894,5.677,6.334	c1.577,0.805,2.973-0.668,4.221-1.44c1.55,2.305,2.108,5.075,2.622,7.752c0.657,3.438,0.947,6.925,1.111,10.413	c-1.734-0.733-3.355-1.708-4.971-2.671c-1.396-4.933-5.349-8.656-9.723-11.059c-3.46-1.817-7.752-2.185-11.338-0.52	c-3.761,1.593-6.285,5.666-5.891,9.75c0.121,4.577,3.17,8.765,7.391,10.456c7.746,3.285,16.407,2.234,24.521,1.243	c0.454,2.315-1.511,4.527-3.695,4.889c-10.577,0.038-21.148-0.011-31.725,0.022c-2.217,0.279-4.079-1.879-3.964-4.008	C9.167,36.141,9.216,27.556,9.183,18.967z M40.114,8.09c0.294-0.801,0.872-1.417,1.542-1.924c1.379,2.589,2.742,5.482,2.311,8.491	c-0.332,2.54-4.42,2.507-5.052,0.163C38.349,12.527,39.209,10.178,40.114,8.09z M0,53 l0.1,0 z" Checked="True" />
-            <local:MyRadioButton x:Name="RadioLoginType5" Tag="LoginType/5" Grid.Column="2" Grid.ColumnSpan="1" ColorType="Highlight" Text="微软" Margin="4,0"
-                             LogoScale="0.9" Logo="M481.882353 826.428235V527.661176l402.371765 2.409412v356.592941l-402.371765-60.235294z m0-628.85647l402.371765-60.235294v330.089411H481.882353V197.571765zM137.336471 525.251765h289.129411v293.948235l-289.129411-45.778824V525.251765z m0-55.416471V248.169412l289.129411-45.778824v265.035294h-289.129411z" />
+            <local:MyRadioButton x:Name="RadioLoginType5" Tag="LoginType/5" Grid.Column="2" Grid.ColumnSpan="1" ColorType="Highlight" Text="正版" Margin="4,0"
+                             LogoScale="1" Logo="M511.488256 95.184408c35.310345 22.516742 95.184408 55.78011 167.34033 84.437781 75.738131 29.681159 148.405797 40.93953 191.392304 45.033483v353.615193c0 73.691154-50.662669 164.781609-136.123938 244.101949C649.65917 901.181409 558.568716 942.12094 512 942.12094c-46.568716 0-137.65917-40.93953-222.096952-119.748126C204.441779 742.54073 153.77911 651.450275 153.77911 577.247376v-353.103448c42.474763-4.093953 116.165917-15.352324 191.904048-45.545227 75.226387-30.192904 133.565217-63.456272 165.805098-83.414293M512 0c-4.093953 0-8.187906 1.535232-11.258371 3.582209l-14.84058 10.234882c-1.023488 0.511744-67.550225 47.592204-170.410794 88.531735-100.813593 39.916042-198.556722 41.963018-199.58021 41.963018l-25.075462 0.511744c-10.746627 0.511744-18.934533 8.187906-18.934533 18.422789v414.000999c0 216.97951 286.064968 446.24088 440.09995 446.24088s440.09995-229.261369 440.09995-445.729136V163.758121c0-10.234883-8.69965-18.422789-18.934533-18.422789l-24.563718-0.511744c-1.023488 0-98.766617-2.046977-199.58021-41.963018-103.372314-40.93953-170.410795-88.01999-170.922538-88.531734L523.258371 3.582209c-3.070465-2.558721-7.164418-3.582209-11.258371-3.582209z M743.308346 410.930535l-260.477761 260.477761c-15.864068 15.864068-41.963018 15.864068-57.827087 0l-144.823588-144.823588c-15.864068-15.864068-15.864068-41.963018 0-57.827087 8.187906-8.187906 18.422789-11.770115 29.169415-11.770115 10.234883 0 20.981509 4.093953 29.169416 11.770115l115.654173 115.654173L685.993003 352.591704c15.864068-15.864068 41.963018-15.864068 57.827087 0 15.352324 16.375812 15.352324 42.474763-0.511744 58.338831z" />
             <local:MyRadioButton x:Name="RadioLoginType0" Tag="LoginType/0" Grid.Column="3" Grid.ColumnSpan="1" ColorType="Highlight" Text="离线"  Margin="4,0"
-                             LogoScale="0.95" Logo="M660.338 528.065c63.61-46.825 105.131-121.964 105.131-206.83 0-141.7-115.29-256.987-256.997-256.987-141.706 0-256.998 115.288-256.998 256.987 0 85.901 42.52 161.887 107.456 208.562-152.1 59.92-260.185 207.961-260.185 381.077 0 21.276 17.253 38.53 38.53 38.53 21.278 0 38.53-17.254 38.53-38.53 0-183.426 149.232-332.671 332.667-332.671 1.589 0 3.113-0.207 4.694-0.244 0.8 0.056 1.553 0.244 2.362 0.244 183.434 0 332.664 149.245 332.664 332.671 0 21.276 17.255 38.53 38.533 38.53 21.277 0 38.53-17.254 38.53-38.53 0-174.885-110.354-324.13-264.917-382.809z m-331.803-206.83c0-99.22 80.72-179.927 179.935-179.927s179.937 80.708 179.937 179.927c0 99.203-80.721 179.91-179.937 179.91s-179.935-80.708-179.935-179.91z" />
+                             LogoScale="0.85" Logo="M533.293176 788.841412a60.235294 60.235294 0 1 1 85.202824 85.202823l-42.616471 42.586353c-129.355294 129.385412-339.124706 129.385412-468.510117 0-129.385412-129.385412-129.385412-339.124706 0-468.510117l42.586353-42.616471a60.235294 60.235294 0 1 1 85.202823 85.202824l-42.61647 42.586352a210.823529 210.823529 0 1 0 298.164706 298.164706l42.586352-42.61647z m255.548236-255.548236l42.61647-42.586352a210.823529 210.823529 0 1 0-298.164706-298.164706l-42.586352 42.61647a60.235294 60.235294 0 1 1-85.202824-85.202823l42.616471-42.586353c129.355294-129.385412 339.124706-129.385412 468.510117 0 129.385412 129.385412 129.385412 339.124706 0 468.510117l-42.586353 42.616471a60.235294 60.235294 0 1 1-85.202823-85.202824zM192.542118 192.542118a60.235294 60.235294 0 0 1 85.202823 0l553.712941 553.712941a60.235294 60.235294 0 0 1-85.202823 85.202823L192.542118 277.744941a60.235294 60.235294 0 0 1 0-85.202823z" />
             <!--<local:MyRadioButton x:Name="RadioLoginType2" Tag="LoginType/2" Grid.Column="4" ColorType="Highlight" Text="统一通行证" Visibility="Collapsed"
                              LogoScale="1.1" Logo="M834.5 684.1c-31.2-70.4-98.9-120.9-179.1-127.3 63.5-8.5 112.6-63 112.6-128.8 0-71.8-58.2-130-130-130s-130 58.2-130 130c0 65.9 49 120.3 112.6 128.8-80.2 6.4-148 57-179.1 127.3-8.7 19.7 6 42 27.6 42 12.1 0 22.7-7.5 27.7-18.5 24.3-53.9 78.5-91.5 141.3-91.5s117 37.6 141.3 91.5c5 11.1 15.6 18.5 27.7 18.5 21.4 0 36.1-22.3 27.4-42zM567.9 427.9c0-38.6 31.4-70 70-70s70 31.4 70 70-31.4 70-70 70-70-31.4-70-70zM460.3 347.9H216.9c-16.6 0-30 13.4-30 30s13.4 30 30 30h243.3c16.6 0 30-13.4 30-30 0.1-16.5-13.4-30-29.9-30zM367.4 459.6H216.9c-16.6 0-30 13.4-30 30s13.4 30 30 30h150.4c16.6 0 30-13.4 30-30 0.1-16.6-13.4-30-29.9-30zM297.4 571.2H217c-16.6 0-30 13.4-30 30s13.4 30 30 30h80.4c16.6 0 30-13.4 30-30 0-16.5-13.5-30-30-30zM900 236v552H124V236h776m0-60H124c-33.1 0-60 26.9-60 60v552c0 33.1 26.9 60 60 60h776c33.1 0 60-26.9 60-60V236c0-33.1-26.9-60-60-60z" />-->
         </Grid>

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

@@ -67,7 +67,7 @@
 
         '改变页面
         Dim LoginType As McLoginType = Setup.Get("LoginType")
-        If LoginType = McLoginType.Legacy OrElse LoginType = McLoginType.Mojang OrElse LoginType = McLoginType.Ms Then CType(FindName("RadioLoginType" & LoginType), MyRadioButton).Checked = True
+        If LoginType = McLoginType.Legacy OrElse LoginType = McLoginType.Ms Then CType(FindName("RadioLoginType" & LoginType), MyRadioButton).Checked = True
         RefreshPage(False, False)
 
         AniControlEnabled -= 1
@@ -117,8 +117,6 @@
 
     Private Enum PageType
         None
-        Mojang
-        MojangSkin
         Legacy
         Nide
         NideSkin
@@ -134,12 +132,6 @@
 
     Private Function PageGet(Type As PageType)
         Select Case Type
-            Case PageType.Mojang
-                If IsNothing(FrmLoginMojang) Then FrmLoginMojang = New PageLoginMojang
-                Return FrmLoginMojang
-            Case PageType.MojangSkin
-                If IsNothing(FrmLoginMojangSkin) Then FrmLoginMojangSkin = New PageLoginMojangSkin
-                Return FrmLoginMojangSkin
             Case PageType.Legacy
                 If IsNothing(FrmLoginLegacy) Then FrmLoginLegacy = New PageLoginLegacy
                 Return FrmLoginLegacy
@@ -171,7 +163,7 @@
     ''' <param name="Type">新页面的种类。</param>
     ''' <param name="Anim">是否显示动画。</param>
     Private Function PageChange(Type As PageType, Anim As Boolean)
-        Dim PageNew As Object = FrmLoginMojang '初始化一个东西，避免在执行时出现异常导致雪崩
+        Dim PageNew As Object = FrmLoginMs '初始化一个东西，避免在执行时出现异常导致雪崩
         Try
 
 #Region "确定更改的页面实例并实例化"
@@ -232,14 +224,7 @@
         Select Case LoginPageType
             Case 0 '正版或离线
 UnknownType:
-                If RadioLoginType1.Checked Then
-                    If Setup.Get("CacheMojangAccess") = "" Then
-                        Type = PageType.Mojang
-                    Else
-                        Type = PageType.MojangSkin
-                    End If
-                    Setup.Set("LoginType", McLoginType.Mojang)
-                ElseIf RadioLoginType5.Checked Then
+                If RadioLoginType5.Checked Then
                     If Setup.Get("CacheMsAccess") = "" Then
                         Type = PageType.Ms
                     Else
@@ -252,28 +237,19 @@ UnknownType:
                 End If
                 PanType.Visibility = Visibility.Visible
                 PanTypeOne.Visibility = Visibility.Collapsed
-                RadioLoginType1.Visibility = Visibility.Visible
                 RadioLoginType5.Visibility = Visibility.Visible
                 RadioLoginType0.Visibility = Visibility.Visible
             Case 1 '仅正版
-                If RadioLoginType1.Checked Then
-                    If Setup.Get("CacheMojangAccess") = "" Then
-                        Type = PageType.Mojang
-                    Else
-                        Type = PageType.MojangSkin
-                    End If
-                    Setup.Set("LoginType", McLoginType.Mojang)
+                If Setup.Get("CacheMsAccess") = "" Then
+                    Type = PageType.Ms
                 Else
-                    If Setup.Get("CacheMsAccess") = "" Then
-                        Type = PageType.Ms
-                    Else
-                        Type = PageType.MsSkin
-                    End If
-                    Setup.Set("LoginType", McLoginType.Ms)
+                    Type = PageType.MsSkin
                 End If
-                PanType.Visibility = Visibility.Visible
-                PanTypeOne.Visibility = Visibility.Collapsed
-                RadioLoginType1.Visibility = Visibility.Visible
+                Setup.Set("LoginType", McLoginType.Ms)
+                PanType.Visibility = Visibility.Collapsed
+                PanTypeOne.Visibility = Visibility.Visible
+                PathTypeOne.Data = (New GeometryConverter).ConvertFromString(Logo.IconButtonMs)
+                LabTypeOne.Text = "正版登录"
                 RadioLoginType5.Visibility = Visibility.Visible
                 RadioLoginType0.Visibility = Visibility.Collapsed
             Case 2 '仅离线
@@ -316,7 +292,7 @@ UnknownType:
         Dim Control As MyRadioButton = FindName("RadioLoginType" & Setup.Get("LoginType"))
         If Control IsNot Nothing Then Control.Checked = True
     End Sub
-    Private Sub RadioLoginType_Change(sender As Object, raiseByMouse As Boolean) Handles RadioLoginType0.Check, RadioLoginType1.Check, RadioLoginType5.Check
+    Private Sub RadioLoginType_Change(sender As Object, raiseByMouse As Boolean) Handles RadioLoginType0.Check, RadioLoginType5.Check
         If raiseByMouse Then RefreshPage(True, True)
     End Sub
 
@@ -324,54 +300,6 @@ UnknownType:
 
 #Region "皮肤"
 
-    'Mojang 正版皮肤
-    Public Shared SkinMojang As New LoaderTask(Of EqualableList(Of String), String)("Loader Skin Mojang", AddressOf SkinMojangLoad, AddressOf SkinMojangInput, ThreadPriority.AboveNormal)
-    Private Shared Function SkinMojangInput() As EqualableList(Of String)
-        '获取名称
-        Return New EqualableList(Of String) From {Setup.Get("CacheMojangName"), Setup.Get("CacheMojangUuid")}
-    End Function
-    Private Shared Sub SkinMojangLoad(Data As LoaderTask(Of EqualableList(Of String), String))
-        '清空已有皮肤
-        '如果在输入时清空皮肤，若输入内容一样则不会执行 Load 方法，导致皮肤不被加载
-        RunInUi(Sub() If FrmLoginMojangSkin IsNot Nothing AndAlso FrmLoginMojangSkin.Skin IsNot Nothing Then FrmLoginMojangSkin.Skin.Clear())
-        '获取 Url
-        Dim UserName As String = Data.Input(0)
-        Dim Uuid As String = Data.Input(1)
-        If UserName = "" Then
-            Data.Output = PathImage & "Skins/" & McSkinSex(McLoginLegacyUuid(UserName)) & ".png"
-            Log("[Minecraft] 获取正版皮肤失败，ID 为空")
-            GoTo Finish
-        End If
-        Try
-            Dim Result As String = McSkinGetAddress(Uuid, "Mojang")
-            If Data.IsAborted Then Throw New ThreadInterruptedException("当前任务已取消：" & UserName)
-            Result = McSkinDownload(Result)
-            If Data.IsAborted Then Throw New ThreadInterruptedException("当前任务已取消：" & UserName)
-            Data.Output = Result
-        Catch ex As Exception
-            If ex.GetType.Name = "ThreadInterruptedException" Then
-                Data.Output = ""
-                Exit Sub
-            ElseIf GetExceptionSummary(ex).Contains("429") Then
-                Data.Output = PathImage & "Skins/" & McSkinSex(McLoginLegacyUuid(UserName)) & ".png"
-                Log("[Minecraft] 获取正版皮肤失败（" & UserName & "）：获取皮肤太过频繁，请 5 分钟后再试！", LogLevel.Hint)
-            ElseIf GetExceptionSummary(ex).Contains("未设置自定义皮肤") Then
-                Data.Output = PathImage & "Skins/" & McSkinSex(McLoginLegacyUuid(UserName)) & ".png"
-                Log("[Minecraft] 用户未设置自定义皮肤，跳过皮肤加载")
-            Else
-                Data.Output = PathImage & "Skins/" & McSkinSex(McLoginLegacyUuid(UserName)) & ".png"
-                Log(ex, "获取正版皮肤失败（" & UserName & "）", LogLevel.Hint)
-            End If
-        End Try
-Finish:
-        '刷新显示
-        If FrmLoginMojangSkin IsNot Nothing Then
-            RunInUi(AddressOf FrmLoginMojangSkin.Skin.Load)
-        ElseIf Not Data.IsAborted Then '如果已经中断，Input 也被清空，就不会再次刷新
-            Data.Input = Nothing '清空输入，因为皮肤实际上没有被渲染，如果不清空切换到页面的 Start 会由于输入相同而不渲染
-        End If
-    End Sub
-
     '微软正版皮肤
     Public Shared SkinMs As New LoaderTask(Of EqualableList(Of String), String)("Loader Skin Ms", AddressOf SkinMsLoad, AddressOf SkinMsInput, ThreadPriority.AboveNormal)
     Private Shared Function SkinMsInput() As EqualableList(Of String)
@@ -592,7 +520,7 @@ Finish:
 
     '全部皮肤加载器
     '需要放在其中元素的后面，否则会因为它提前被加载而莫名其妙变成 Nothing
-    Public Shared SkinLoaders As New List(Of LoaderTask(Of EqualableList(Of String), String)) From {SkinMojang, SkinMs, SkinLegacy, SkinNide, SkinAuth}
+    Public Shared SkinLoaders As New List(Of LoaderTask(Of EqualableList(Of String), String)) From {SkinMs, SkinLegacy, SkinNide, SkinAuth}
 
 #End Region
 
@@ -713,10 +641,8 @@ ExitRefresh:
                 Else
                     LabLaunchingMethod.Text = "离线登录"
                 End If
-            Case McLoginType.Mojang
-                LabLaunchingMethod.Text = "Mojang 正版登录"
             Case McLoginType.Ms
-                LabLaunchingMethod.Text = "微软正版登录"
+                LabLaunchingMethod.Text = "正版登录"
             Case McLoginType.Nide
                 LabLaunchingMethod.Text = "统一通行证"
             Case McLoginType.Auth

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

@@ -99,10 +99,4 @@
         Init()
     End Sub
 
-    Public Shared Sub StartMigration()
-        MyMsgBox("在迁移过程中，你可能需要设置你的档案信息，此时请注意让年龄大于 18 岁，否则可能导致无法登录！" & vbCrLf &
-                 "在迁移完成后，请在上方选择 微软 登录方式而非 Mojang。", "迁移提示", "继续", ForceWait:=True)
-        OpenWebsite("https://www.minecraft.net/zh-hans/account-security")
-    End Sub
-
 End Class

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

@@ -1,26 +0,0 @@
-<Grid x:Class="PageLoginMojang" Tag="False"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-      xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-      xmlns:local="clr-namespace:PCL"
-      mc:Ignorable="d" d:DesignWidth="302.4" Margin="0,0,0,-2">
-    <Grid.RowDefinitions>
-        <RowDefinition Height="Auto" />
-        <RowDefinition Height="Auto" />
-        <RowDefinition Height="10" />
-        <RowDefinition Height="Auto" />
-        <RowDefinition Height="Auto" />
-    </Grid.RowDefinitions>
-    <Grid.ColumnDefinitions>
-        <ColumnDefinition />
-        <ColumnDefinition Width="224" />
-    </Grid.ColumnDefinitions>
-    <local:MyHint Text="Mojang 账号现已无法进入正版服务器，请点击此处开始账号迁移！" Grid.ColumnSpan="2" Margin="0,0,0,15" x:Name="HintMigration" />
-    <local:MyComboBox Grid.Row="1" Grid.Column="1" IsEditable="True" Height="28" x:Name="ComboName" />
-    <TextBlock Grid.Row="1" Text="邮箱" VerticalAlignment="Center" />
-    <PasswordBox Grid.Row="3" Grid.Column="1" x:Name="TextPass" />
-    <TextBlock Text="密码" Grid.Row="3" VerticalAlignment="Center" />
-    <local:MyCheckBox x:Name="CheckRemember" Tag="LoginRemember" Height="20" Margin="-1,12,80,0" Text="记住密码" Grid.Row="4" Grid.Column="1" Grid.ColumnSpan="2" />
-    <local:MyTextButton Margin="0,12,2,0" x:Name="BtnLink" Content="购买正版" Grid.Row="4" HorizontalAlignment="Right" Grid.Column="1" Padding="20,0,0,0" HorizontalContentAlignment="Right" VerticalContentAlignment="Center" FontSize="13" />
-</Grid>

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

@@ -1,84 +0,0 @@
-Public Class PageLoginMojang
-
-    Private IsFirstLoad As Boolean = True
-    ''' <summary>
-    ''' 刷新页面显示的所有信息。
-    ''' </summary>
-    Public Sub Reload(KeepInput As Boolean)
-        '记住密码
-        CheckRemember.Checked = Setup.Get("LoginRemember")
-        If KeepInput AndAlso Not IsFirstLoad Then '避免第一次就以 KeepInput 的方式加载，导致文本框里没东西
-            '保留输入，只刷新下拉框列表
-            Dim Input As String = ComboName.Text
-            ComboName.ItemsSource = If(Setup.Get("LoginMojangEmail") = "", Nothing, Setup.Get("LoginMojangEmail").ToString.Split("¨"))
-            ComboName.Text = Input
-        Else
-            '不保留输入，刷新列表后自动选择第一项
-            If Setup.Get("LoginMojangEmail") = "" Then
-                ComboName.ItemsSource = Nothing
-            Else
-                ComboName.ItemsSource = Setup.Get("LoginMojangEmail").ToString.Split("¨")
-                ComboName.Text = Setup.Get("LoginMojangEmail").ToString.Split("¨")(0)
-                If Setup.Get("LoginRemember") Then TextPass.Password = Setup.Get("LoginMojangPass").ToString.Split("¨")(0).Trim
-            End If
-        End If
-        IsFirstLoad = False
-    End Sub
-    ''' <summary>
-    ''' 获取当前页面的登录信息。
-    ''' </summary>
-    Public Shared Function GetLoginData() As McLoginServer
-        If FrmLoginMojang Is Nothing Then
-            Return New McLoginServer(McLoginType.Mojang) With {.BaseUrl = "https://authserver.mojang.com", .Token = "Mojang", .UserName = "", .Password = "", .Type = McLoginType.Mojang, .Description = "Mojang 正版"}
-        Else
-            Return New McLoginServer(McLoginType.Mojang) With {.BaseUrl = "https://authserver.mojang.com", .Token = "Mojang", .UserName = If(FrmLoginMojang.ComboName.Text, "").Replace("¨", "").Trim(), .Password = If(FrmLoginMojang.TextPass.Password, "").Replace("¨", "").Trim(), .Type = McLoginType.Mojang, .Description = "Mojang 正版"}
-        End If
-    End Function
-    ''' <summary>
-    ''' 当前页面的登录信息是否有效。
-    ''' </summary>
-    Public Shared Function IsVaild(LoginData As McLoginServer) As String
-        If LoginData.UserName = "" Then Return "邮箱不能为空！"
-        If Not LoginData.UserName.Contains("@") Then Return "邮箱格式错误！"
-        If LoginData.Password = "" Then Return "密码不能为空！"
-        Return ""
-    End Function
-    Public Function IsVaild() As String
-        Return IsVaild(GetLoginData())
-    End Function
-
-    '保存输入信息
-    Private Sub ComboMojangName_TextChanged(sender As Object, e As TextChangedEventArgs) Handles ComboName.TextChanged
-        If sender.Text = "" Then TextPass.Password = ""
-        If AniControlEnabled = 0 Then Setup.Set("CacheMojangAccess", "") '迫使其不进行 Validate
-    End Sub
-    Private Sub TextMojangPass_PasswordChanged(sender As Object, e As RoutedEventArgs) Handles TextPass.PasswordChanged
-        If AniControlEnabled = 0 Then Setup.Set("CacheMojangAccess", "")
-    End Sub
-    Private Sub ComboMojangName_SelectionChanged(sender As MyComboBox, e As SelectionChangedEventArgs) Handles ComboName.SelectionChanged
-        If sender.SelectedIndex = -1 OrElse Not Setup.Get("LoginRemember") Then
-            TextPass.Password = ""
-        Else
-            TextPass.Password = Setup.Get("LoginMojangPass").ToString.Split("¨")(sender.SelectedIndex).Trim
-        End If
-    End Sub
-    Private Sub CheckRememberChange(sender As MyCheckBox, e As Object) Handles CheckRemember.Change
-        If AniControlEnabled = 0 Then Setup.Set(sender.Tag, sender.Checked)
-    End Sub
-
-    '链接处理
-    Private Sub InputChanged() Handles ComboName.TextChanged, TextPass.PasswordChanged
-        BtnLink.Content = If(ComboName.Text = "" AndAlso TextPass.Password = "", "购买正版", "找回密码")
-    End Sub
-    Private Sub BtnMojang_Click(sender As Object, e As EventArgs) Handles BtnLink.Click
-        If BtnLink.Content = "购买正版" Then
-            OpenWebsite("https://www.minecraft.net/zh-hans/store/checkout/minecraft-java-bedrock-edition-pc")
-        Else
-            OpenWebsite("https://www.minecraft.net/zh-hans/password/forgot")
-        End If
-    End Sub
-    Private Sub HintMigration_Click() Handles HintMigration.MouseLeftButtonUp
-        PageLaunchRight.StartMigration()
-    End Sub
-
-End Class

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

@@ -1,29 +0,0 @@
-<Grid x:Class="PageLoginMojangSkin" Tag="True"
-      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-      xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-      xmlns:local="clr-namespace:PCL"
-      mc:Ignorable="d" d:DesignWidth="297.6" Margin="0,19,0,5">
-    <Grid Margin="0,56,0,0" Background="{StaticResource ColorBrushSemiTransparent}" Name="PanData">
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="34" />
-            <ColumnDefinition />
-            <ColumnDefinition Width="34" />
-        </Grid.ColumnDefinitions>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="19" />
-            <RowDefinition Height="Auto" MinHeight="30" />
-            <RowDefinition Height="19" />
-        </Grid.RowDefinitions>
-        <local:MyHint Text="Mojang 账号现已无法进入正版服务器，请点击此处开始账号迁移！" Grid.ColumnSpan="3" Margin="0,0,0,15" x:Name="HintMigration" />
-        <StackPanel Grid.Column="1" Grid.Row="2" VerticalAlignment="Center">
-            <TextBlock Name="TextName" Text="加载中" Margin="8,0" FontSize="14" HorizontalAlignment="Center" TextTrimming="CharacterEllipsis" />
-            <TextBlock Name="TextEmail" Text="加载中" Margin="8,4,8,0" FontSize="12" HorizontalAlignment="Center" TextTrimming="CharacterEllipsis" Foreground="{DynamicResource ColorBrushGray3}" />
-        </StackPanel>
-        <local:MyIconButton ToolTip="更改密码" Grid.Row="2" Height="14" Opacity="0" x:Name="BtnEdit" ToolTipService.Placement="Center" ToolTipService.VerticalOffset="32" ToolTipService.InitialShowDelay="50" ToolTipService.ShowDuration="1000000" Grid.Column="0" HorizontalAlignment="Center" Logo="F1 M 53.2929,21.2929L 54.7071,22.7071C 56.4645,24.4645 56.4645,27.3137 54.7071,29.0711L 52.2323,31.5459L 44.4541,23.7677L 46.9289,21.2929C 48.6863,19.5355 51.5355,19.5355 53.2929,21.2929 Z M 31.7262,52.052L 23.948,44.2738L 43.0399,25.182L 50.818,32.9601L 31.7262,52.052 Z M 23.2409,47.1023L 28.8977,52.7591L 21.0463,54.9537L 23.2409,47.1023 Z" Margin="8,0,0,0" VerticalAlignment="Center" />
-        <local:MyIconButton ToolTip="退出登录" Grid.Row="2" Height="14" Opacity="0" x:Name="BtnExit" ToolTipService.Placement="Center" ToolTipService.VerticalOffset="32" ToolTipService.InitialShowDelay="50" ToolTipService.ShowDuration="1000000" Grid.Column="2" HorizontalAlignment="Center" Logo="F1 M 51.0071,19.0027L 51.0071,27.0038L 48.0067,27.0038L 48.0067,22.0031L 25.0035,22.0031L 25.0035,54.0075L 48.0067,54.0075L 48.0067,49.0068L 51.0071,49.0068L 51.0071,57.008L 22.1698,57.008L 22.0031,19.0027L 51.0071,19.0027 Z M 30.0042,35.0049L 45.2563,35.0049L 37.005,28.0039L 47.0066,28.0039L 58.5082,38.0053L 47.0066,48.0067L 37.005,48.0067L 45.2563,41.0057L 30.0042,41.0057L 30.0042,35.0049 Z" Margin="0,0,8,0" VerticalAlignment="Center" />
-    </Grid>
-    <local:MySkin HorizontalAlignment="Center" VerticalAlignment="Top" x:Name="Skin" HasCape="False" />
-</Grid>

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

@@ -1,117 +0,0 @@
-Public Class PageLoginMojangSkin
-
-    Public Sub New()
-        InitializeComponent()
-        Skin.Loader = PageLaunchLeft.SkinMojang
-    End Sub
-    Private Sub PageLoginLegacy_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
-        Skin.Loader.Start()
-    End Sub
-
-    ''' <summary>
-    ''' 刷新页面显示的所有信息。
-    ''' </summary>
-    Public Sub Reload(KeepInput As Boolean)
-        TextName.Text = Setup.Get("CacheMojangName")
-        TextEmail.Text = Setup.Get("CacheMojangUsername")
-        TextEmail.Visibility = If(Setup.Get("UiLauncherEmail"), Visibility.Collapsed, Visibility.Visible)
-        '皮肤在 Loaded 加载
-    End Sub
-    ''' <summary>
-    ''' 获取当前页面的登录信息。
-    ''' </summary>
-    Public Shared Function GetLoginData() As McLoginServer
-        Return New McLoginServer(McLoginType.Mojang) With {.BaseUrl = "https://authserver.mojang.com", .Token = "Mojang", .UserName = Setup.Get("CacheMojangUsername"), .Password = Setup.Get("CacheMojangPass"), .Description = "Mojang 正版", .Type = McLoginType.Mojang}
-    End Function
-
-    Private Sub PageLoginMojangSkin_MouseEnter(sender As Object, e As MouseEventArgs) Handles PanData.MouseEnter
-        AniStart({
-                 AaOpacity(BtnEdit, 1 - BtnEdit.Opacity, 80),
-                 AaHeight(BtnEdit, 25.5 - BtnEdit.Height, 140,, New AniEaseOutFluent),
-                 AaHeight(BtnEdit, -1.5, 50, 140, New AniEaseInFluent),
-                 AaOpacity(BtnExit, 1 - BtnExit.Opacity, 80),
-                 AaHeight(BtnExit, 25.5 - BtnExit.Height, 140,, New AniEaseOutFluent),
-                 AaHeight(BtnExit, -1.5, 50, 140, New AniEaseInFluent)
-        }, "PageLoginMojangSkin Button")
-    End Sub
-    Private Sub PageLoginMojangSkin_MouseLeave(sender As Object, e As MouseEventArgs) Handles PanData.MouseLeave
-        AniStart({
-                 AaOpacity(BtnEdit, -BtnEdit.Opacity, 120,, New AniEaseOutFluent),
-                 AaHeight(BtnEdit, 14 - BtnEdit.Height, 120,, New AniEaseInFluent),
-                 AaOpacity(BtnExit, -BtnExit.Opacity, 120,, New AniEaseOutFluent),
-                 AaHeight(BtnExit, 14 - BtnExit.Height, 120,, New AniEaseInFluent)
-        }, "PageLoginMojangSkin Button")
-    End Sub
-
-    Private Sub BtnEdit_Click(sender As Object, e As EventArgs) Handles BtnEdit.Click
-        Select Case MyMsgBox("你希望通过哪种途径更改密码？" & vbCrLf & "首次通过个人档案修改密码可能需要验证你的密保问题。", "更改密码", "个人档案", "密保邮箱", "取消")
-            Case 1
-                '个人档案
-                OpenWebsite("https://www.minecraft.net/zh-hans/msaprofile")
-            Case 2
-                '密保邮箱
-                OpenWebsite("https://account.mojang.com/password")
-            Case 3
-                '取消
-        End Select
-    End Sub
-    Private Sub BtnExit_Click() Handles BtnExit.Click
-        Setup.Set("CacheMojangAccess", "")
-        FrmLaunchLeft.RefreshPage(False, True)
-    End Sub
-
-    Private Sub Skin_Click(sender As Object, e As MouseButtonEventArgs) Handles Skin.Click
-        If McLoginLoader.State = LoadState.Failed Then
-            Hint("登录失败，无法更改皮肤！", HintType.Critical)
-            Exit Sub
-        End If
-        Dim SkinInfo As McSkinInfo = McSkinSelect()
-        If Not SkinInfo.IsVaild Then Exit Sub
-        Hint("正在更改皮肤……")
-        RunInNewThread(Async Sub()
-                           Try
-
-                               If McLoginLoader.State = LoadState.Loading Then McLoginLoader.WaitForExit() '等待登录结束
-                               Dim AccessToken As String = Setup.Get("CacheMojangAccess")
-                               Dim Uuid As String = Setup.Get("CacheMojangUuid")
-
-                               Dim Client As New Net.Http.HttpClient With {.Timeout = New TimeSpan(0, 0, 10)}
-                               Client.DefaultRequestHeaders.Authorization = New Net.Http.Headers.AuthenticationHeaderValue("Bearer", AccessToken)
-                               Client.DefaultRequestHeaders.Accept.Add(New Net.Http.Headers.MediaTypeWithQualityHeaderValue("*/*"))
-                               Client.DefaultRequestHeaders.UserAgent.Add(New Net.Http.Headers.ProductInfoHeaderValue("MojangSharp", "0.1"))
-                               Dim Contents As New Net.Http.MultipartFormDataContent From {
-                                      {New Net.Http.StringContent(If(SkinInfo.IsSlim, "slim", "")), "model"},
-                                      {New Net.Http.ByteArrayContent(File.ReadAllBytes(SkinInfo.LocalFile)), "file", GetFileNameFromPath(SkinInfo.LocalFile)}
-                                  }
-                               Dim Result As String = Await (Await Client.PutAsync(New Uri("https://api.mojang.com/user/profile/" & Uuid & "/skin"), Contents)).Content.ReadAsStringAsync
-                               If RegexCheck(Result, "^[0-9a-f]{59,64}$") Then
-                                   MySkin.ReloadCache("http://textures.minecraft.net/texture/" & Result, False)
-                               ElseIf Result.ToLower.Contains("ip not secured") Then
-                                   If MyMsgBox("首次操作需要在官网验证密保问题。" & vbCrLf & "验证完成后，你即可使用 PCL 更改皮肤，且无需再次验证。", "验证密保问题", "开始验证", "取消") = 1 Then
-                                       OpenWebsite("https://www.minecraft.net/zh-hans/profile/skin")
-                                   End If
-                               ElseIf Result.Contains("request requires user authentication") Then
-                                   Hint("正在重新登录，请稍后再次尝试更改皮肤！")
-                                   RunInUi(Sub()
-                                               BtnExit_Click()
-                                               If String.IsNullOrEmpty(McLoginAble()) Then McLoginLoader.Start()
-                                           End Sub)
-                               ElseIf Result.Contains("""errorMessage""") Then
-                                   Hint("更改皮肤失败：" & GetJson(Result)("errorMessage"), HintType.Critical)
-                               Else
-                                   Throw New Exception("未知错误（" & Result & "）")
-                               End If
-                           Catch ex As Exception
-                               If ex.GetType.Equals(GetType(Tasks.TaskCanceledException)) Then
-                                   Hint("更改皮肤失败：与 Mojang 皮肤服务器的连接超时，请检查你的网络是否通畅！", HintType.Critical)
-                               Else
-                                   Log(ex, "更改皮肤失败", LogLevel.Hint)
-                               End If
-                           End Try
-                       End Sub, "Mojang Skin Upload")
-    End Sub
-    Private Sub HintMigration_Click() Handles HintMigration.MouseLeftButtonUp
-        PageLaunchRight.StartMigration()
-    End Sub
-
-End Class

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

@@ -4,13 +4,33 @@
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
       xmlns:local="clr-namespace:PCL"
-      mc:Ignorable="d" d:DesignWidth="302.4" Margin="0,0,0,-2">
-    <StackPanel x:Name="PanEmpty">
-        <Path Data="M535.94 571.76l291.060 0.36v286.020l-291.060-39.24v-247.14M499.94 535.76v314.64l363.060 48.96v-363.060l-363.060-0.54zM197 571.4l218.52 0.36v226.98l-218.52-30.42v-196.92M161 535.4v264.42l290.52 40.32v-304.2l-290.52-0.54zM827 166.76v285.12l-291.060-0.36v-239.76l291.060-45M863 124.64l-363.060 56.16v306.54l363.060 0.54v-363.24zM415.52 231.2v219.96l-218.52-0.18v-189.36l218.52-30.42M451.52 189.8l-290.52 40.5v256.68l290.52 0.36v-297.54z"
-          Fill="{DynamicResource ColorBrush1}" Opacity="0.7"
-          Width="40" Stretch="Uniform"/>
-        <TextBlock Text="　　　 无账号信息&#xa;点击 添加账号 按钮以登录" HorizontalAlignment="Center" Margin="0,15,0,25"
-               Foreground="{DynamicResource ColorBrush1}" Opacity="0.7" />
-        <local:MyButton Text="添加账号" x:Name="BtnLogin" ColorType="Highlight" Height="35" HorizontalAlignment="Center" Width="150" />
-    </StackPanel>
+      mc:Ignorable="d" d:DesignWidth="302.4">
+    <Grid x:Name="PanEmpty" Margin="0,10,0,0">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="1*" />
+            <ColumnDefinition Width="Auto" />
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="25" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+        <Path Data="M660.338 528.065c63.61-46.825 105.131-121.964 105.131-206.83 0-141.7-115.29-256.987-256.997-256.987-141.706 0-256.998 115.288-256.998 256.987 0 85.901 42.52 161.887 107.456 208.562-152.1 59.92-260.185 207.961-260.185 381.077 0 21.276 17.253 38.53 38.53 38.53 21.278 0 38.53-17.254 38.53-38.53 0-183.426 149.232-332.671 332.667-332.671 1.589 0 3.113-0.207 4.694-0.244 0.8 0.056 1.553 0.244 2.362 0.244 183.434 0 332.664 149.245 332.664 332.671 0 21.276 17.255 38.53 38.533 38.53 21.277 0 38.53-17.254 38.53-38.53 0-174.885-110.354-324.13-264.917-382.809z m-331.803-206.83c0-99.22 80.72-179.927 179.935-179.927s179.937 80.708 179.937 179.927c0 99.203-80.721 179.91-179.937 179.91s-179.935-80.708-179.935-179.91z"
+            Fill="{DynamicResource ColorBrush2}" Opacity="0.7" Width="40" Stretch="Uniform" Grid.ColumnSpan="2" />
+        <local:MyComboBox x:Name="ComboAccounts" Grid.Row="2" />
+        <local:MyButton Text="登录" x:Name="BtnLogin" ColorType="Highlight" 
+                        Height="28" Width="60" Margin="10,0,0,0" Grid.Row="2" Grid.Column="1" />
+        <Grid Grid.Row="4" Grid.ColumnSpan="2" Opacity="0.3" Margin="2,30,2,0" HorizontalAlignment="Center">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="30" />
+                <ColumnDefinition Width="Auto" />
+            </Grid.ColumnDefinitions>
+            <local:MyTextButton Text="»  购买正版" EventType="打开网页" EventData="https://www.xbox.com/zh-cn/games/store/minecraft-java-bedrock-edition-for-pc/9nxp44l49shj"
+                            Grid.Column="0" />
+            <local:MyTextButton Text="»  老账号迁移" x:Name="BtnMigration"
+                            Grid.Column="2" />
+        </Grid>
+    </Grid>
 </StackPanel>

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

@@ -4,19 +4,57 @@
     ''' 刷新页面显示的所有信息。
     ''' </summary>
     Public Sub Reload(KeepInput As Boolean)
+        Dim IndexBefore = ComboAccounts.SelectedIndex
+        '刷新下拉框列表
+        ComboAccounts.Items.Clear()
+        ComboAccounts.Items.Add(New MyComboBoxItem With {.Content = "添加新账号"})
+        Try
+            Dim MsJson As JObject = GetJson(Setup.Get("LoginMsJson"))
+            For Each Account In MsJson
+                Dim Item As MyListItem = CType(FindResource("ComboBoxItemTemplateWithDelete"), DataTemplate).LoadContent()
+                Item.Tag = Account.Value.ToString
+                Item.Title = Account.Key
+                CType(Item.Buttons(0), MyIconButton).Tag = Account.Key
+                ComboAccounts.Items.Add(Item)
+            Next
+        Catch ex As Exception
+            Log(ex, $"微软登录信息出错，登录信息已被重置（{Setup.Get("LoginMsJson")}）", LogLevel.Hint)
+            Setup.Set("LoginMsJson", "{}")
+        End Try
+        '如果不保留输入，刷新列表后自动选择第一项
+        ComboAccounts.SelectedIndex = If(KeepInput, Math.Max(0, IndexBefore), 0)
     End Sub
+    Private Sub ComboAccounts_SelectionChanged(sender As Object, e As SelectionChangedEventArgs) Handles ComboAccounts.SelectionChanged
+        If AniControlEnabled <> 0 OrElse ComboAccounts.SelectedItem Is Nothing OrElse ComboAccounts.ContentPresenter Is Nothing Then Exit Sub
+        If TypeOf ComboAccounts.SelectedItem Is MyListItem Then
+            ComboAccounts.ContentPresenter.Content = CType(ComboAccounts.SelectedItem, MyListItem).Title
+        ElseIf TypeOf ComboAccounts.SelectedItem Is MyComboBoxItem Then
+            ComboAccounts.ContentPresenter.Content = CType(ComboAccounts.SelectedItem, MyComboBoxItem).Content
+        End If
+    End Sub
+
     ''' <summary>
     ''' 获取当前页面的登录信息。
     ''' </summary>
     Public Shared Function GetLoginData() As McLoginMs
-        Return New McLoginMs With {.OAuthRefreshToken = Setup.Get("CacheMsOAuthRefresh"), .UserName = Setup.Get("CacheMsName")}
+        If FrmLoginMs Is Nothing Then Return New McLoginMs With {.OAuthRefreshToken = Setup.Get("CacheMsOAuthRefresh"), .UserName = Setup.Get("CacheMsName")}
+        Dim Result As McLoginMs = Nothing
+        RunInUiWait(Sub()
+                        If FrmLoginMs.ComboAccounts.SelectedIndex = 0 Then
+                            Result = New McLoginMs
+                        Else
+                            Dim Item As MyListItem = FrmLoginMs.ComboAccounts.SelectedItem
+                            Result = New McLoginMs With {.OAuthRefreshToken = Item.Tag, .UserName = Item.Title}
+                        End If
+                    End Sub)
+        Return Result
     End Function
     ''' <summary>
     ''' 当前页面的登录信息是否有效。
     ''' </summary>
     Public Shared Function IsVaild(LoginData As McLoginMs) As String
         If LoginData.OAuthRefreshToken = "" Then
-            Return "请在登录账号后再继续！"
+            Return "请在登录账号后再启动游戏！"
         Else
             Return ""
         End If
@@ -26,13 +64,14 @@
     End Function
 
     Private Sub BtnLogin_Click(sender As Object, e As EventArgs) Handles BtnLogin.Click
+        ComboAccounts.IsEnabled = False
         BtnLogin.IsEnabled = False
-        BtnLogin.Text = "登录中 0%"
+        BtnLogin.Text = "0%"
         RunInNewThread(Sub()
                            Try
                                McLoginMsLoader.Start(GetLoginData(), IsForceRestart:=True)
                                Do While McLoginMsLoader.State = LoadState.Loading
-                                   RunInUi(Sub() BtnLogin.Text = "登录中 " & Math.Round(McLoginMsLoader.Progress * 100) & "%")
+                                   RunInUi(Sub() BtnLogin.Text = Math.Round(McLoginMsLoader.Progress * 100) & "%")
                                    Thread.Sleep(50)
                                Loop
                                If McLoginMsLoader.State = LoadState.Finished Then
@@ -45,7 +84,7 @@
                                    Throw New Exception(McLoginMsLoader.Error.Message, McLoginMsLoader.Error)
                                End If
                            Catch ex As ThreadInterruptedException
-                               Hint("登录已取消！")
+                               Hint("已取消登录！")
                            Catch ex As Exception
                                If ex.Message = "$$" Then
                                ElseIf ex.Message.StartsWith("$") Then
@@ -55,11 +94,17 @@
                                End If
                            Finally
                                RunInUi(Sub()
+                                           ComboAccounts.IsEnabled = True
                                            BtnLogin.IsEnabled = True
-                                           BtnLogin.Text = "添加账号"
+                                           BtnLogin.Text = "登录"
                                        End Sub)
                            End Try
                        End Sub, "Ms Login")
     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")
+    End Sub
 
 End Class

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

@@ -4,21 +4,47 @@
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
       xmlns:local="clr-namespace:PCL"
-      mc:Ignorable="d" d:DesignWidth="297.6" Margin="0,19,0,5">
-    <Grid Margin="0,56,0,0" Background="{StaticResource ColorBrushSemiTransparent}" Name="PanData">
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="34" />
-            <ColumnDefinition />
-            <ColumnDefinition Width="34" />
-        </Grid.ColumnDefinitions>
+      mc:Ignorable="d" d:DesignWidth="297.6" Margin="0,60,0,5">
+    <Grid Background="{StaticResource ColorBrushSemiTransparent}" Name="PanData">
         <Grid.RowDefinitions>
-            <RowDefinition Height="19" />
+            <RowDefinition Height="75" />
             <RowDefinition Height="Auto" MinHeight="30" />
+            <RowDefinition Height="13" />
+            <RowDefinition Height="30" />
             <RowDefinition Height="19" />
         </Grid.RowDefinitions>
-        <TextBlock Grid.Column="1" Grid.Row="1" VerticalAlignment="Center" Name="TextName" Text="加载中" Margin="8,0" FontSize="14" HorizontalAlignment="Center" TextTrimming="CharacterEllipsis" />
-        <local:MyIconButton ToolTip="更改密码" Grid.Row="1" Height="14" Opacity="0" x:Name="BtnEdit" ToolTipService.Placement="Center" ToolTipService.VerticalOffset="32" ToolTipService.InitialShowDelay="50" ToolTipService.ShowDuration="1000000" Grid.Column="0" HorizontalAlignment="Center" Logo="F1 M 53.2929,21.2929L 54.7071,22.7071C 56.4645,24.4645 56.4645,27.3137 54.7071,29.0711L 52.2323,31.5459L 44.4541,23.7677L 46.9289,21.2929C 48.6863,19.5355 51.5355,19.5355 53.2929,21.2929 Z M 31.7262,52.052L 23.948,44.2738L 43.0399,25.182L 50.818,32.9601L 31.7262,52.052 Z M 23.2409,47.1023L 28.8977,52.7591L 21.0463,54.9537L 23.2409,47.1023 Z" Margin="8,0,0,0" VerticalAlignment="Center" />
-        <local:MyIconButton ToolTip="退出登录" Grid.Row="1" Height="14" Opacity="0" x:Name="BtnExit" ToolTipService.Placement="Center" ToolTipService.VerticalOffset="32" ToolTipService.InitialShowDelay="50" ToolTipService.ShowDuration="1000000" Grid.Column="2" HorizontalAlignment="Center" Logo="F1 M 51.0071,19.0027L 51.0071,27.0038L 48.0067,27.0038L 48.0067,22.0031L 25.0035,22.0031L 25.0035,54.0075L 48.0067,54.0075L 48.0067,49.0068L 51.0071,49.0068L 51.0071,57.008L 22.1698,57.008L 22.0031,19.0027L 51.0071,19.0027 Z M 30.0042,35.0049L 45.2563,35.0049L 37.005,28.0039L 47.0066,28.0039L 58.5082,38.0053L 47.0066,48.0067L 37.005,48.0067L 45.2563,41.0057L 30.0042,41.0057L 30.0042,35.0049 Z" Margin="0,0,8,0" VerticalAlignment="Center" />
+        <TextBlock Grid.Row="1" VerticalAlignment="Center" Name="TextName" Text="加载中" Margin="8,0" FontSize="17" HorizontalAlignment="Center" TextTrimming="CharacterEllipsis" />
+        <Border Grid.Row="3" HorizontalAlignment="Center" x:Name="PanButtons" Opacity="0"
+                CornerRadius="5" Background="{DynamicResource ColorBrush8}" Padding="10,3,9,3">
+            <StackPanel Orientation="Horizontal">
+                <local:MyIconButton Height="24" Margin="0,0.5,9,0"  x:Name="BtnSkin"
+                                ToolTip="皮肤与披风" ToolTipService.Placement="Center" ToolTipService.VerticalOffset="40" ToolTipService.InitialShowDelay="50" ToolTipService.ShowDuration="1000000" 
+                                LogoScale="1.08" Logo="M764.0003 0.076794a215.433442 215.433442 0 0 0-76.282279 13.950954l-9.06172 3.686123c-49.148314 20.734445-88.518161 30.53851-115.498538 30.53851-27.031573 0-66.478214-9.855261-116.676049-31.050471a217.583681 217.583681 0 0 0-72.186586-16.766743l-9.138515-0.307177-3.839712-0.051196-8.626553 0.307177-4.223683 0.281579A160.755943 160.755943 0 0 0 250.477214 45.385396l-219.32435 212.438467a102.392321 102.392321 0 0 0-11.263156 134.210734l106.360023 144.552359 3.378947 4.351674a102.469115 102.469115 0 0 0 112.810739 31.690423l5.657176-2.175837V883.210559a140.789441 140.789441 0 0 0 140.789441 140.789441h372.170487l5.657175-0.102392a140.789441 140.789441 0 0 0 135.132266-140.687049l-0.025599-318.6705 1.177512 0.716747a102.392321 102.392321 0 0 0 141.941355-44.233483l70.906682-144.39877a102.392321 102.392321 0 0 0-20.657651-118.647101L875.86391 45.385396A160.730345 160.730345 0 0 0 764.0003 0.076794z m-357.349199 111.454041C468.444867 137.615279 520.562558 150.644702 563.157763 150.644702c42.492813 0 94.584906-12.978227 156.199485-38.985876A112.580356 112.580356 0 0 1 764.0003 102.469115c15.154063 0 29.693773 5.887558 40.598555 16.433967L1023.923206 331.495138l-70.906682 144.39877-93.023423-65.684674a38.39712 38.39712 0 0 0-60.53946 31.383247V883.210559a38.39712 38.39712 0 0 1-38.39712 38.39712H388.886034a38.39712 38.39712 0 0 1-38.397121-38.39712V445.176212a38.39712 38.39712 0 0 0-61.691373-30.487314l-80.070795 61.20501L102.392321 331.341549l219.32435-212.438467a58.363623 58.363623 0 0 1 35.581332-16.229183L362.110442 102.469115l6.322726 0.179186a115.191361 115.191361 0 0 1 38.217933 8.882534z">
+                    <local:MyIconButton.ContextMenu>
+                        <ContextMenu Closed="HidePanel" HorizontalOffset="10" VerticalOffset="18">
+                            <local:MyMenuItem Click="BtnSkinEdit_Click" Header="修改皮肤"/>
+                            <local:MyMenuItem Click="BtnSkinSave_Click" Header="保存皮肤"/>
+                            <local:MyMenuItem Click="BtnSkinRefresh_Click" Header="刷新头像"/>
+                            <Separator />
+                            <local:MyMenuItem Click="BtnSkinCape_Click" Header="修改披风"/>
+                        </ContextMenu>
+                    </local:MyIconButton.ContextMenu>
+                </local:MyIconButton>
+                <local:MyIconButton Height="24" Margin="0,0,9,0" x:Name="BtnEdit"
+                                ToolTip="修改信息" ToolTipService.Placement="Center" ToolTipService.VerticalOffset="40" ToolTipService.InitialShowDelay="50" ToolTipService.ShowDuration="1000000" 
+                                LogoScale="1.1" Logo="M462.336 924.891429L73.142857 950.857143l25.965714-389.193143 467.017143-467.017143a73.398857 73.398857 0 0 1 103.789715 0l259.437714 259.437714a73.398857 73.398857 0 0 1 0 103.789715l-467.017143 467.017143z m155.684571-778.349715L202.861714 561.664l259.474286 259.474286L877.458286 405.942857 618.057143 146.541714zM151.003429 873.033143l233.508571-25.965714-207.579429-207.579429-25.965714 233.545143z m544.841142-492.982857l51.894858 51.894857-233.508572 233.508571-51.931428-51.894857 233.545142-233.508571z">
+                    <local:MyIconButton.ContextMenu>
+                        <ContextMenu Closed="HidePanel" HorizontalOffset="10" VerticalOffset="18">
+                            <local:MyMenuItem Click="BtnEditPassword_Click" Header="修改密码" />
+                            <local:MyMenuItem Click="BtnEditName_Click" Header="修改玩家名" />
+                        </ContextMenu>
+                    </local:MyIconButton.ContextMenu>
+                </local:MyIconButton>
+                <local:MyIconButton Height="24" x:Name="BtnExit" Margin="0,0,0,0"
+                                ToolTip="切换账号" ToolTipService.Placement="Center" ToolTipService.VerticalOffset="40" ToolTipService.InitialShowDelay="50" ToolTipService.ShowDuration="1000000" 
+                                LogoScale="1.15" Logo="M512 0A512 512 0 1 0 1024 512 512 512 0 0 0 512 0z m0 941.407086A429.407086 429.407086 0 1 1 941.407086 512 429.407086 429.407086 0 0 1 512 941.407086z m235.139657-368.64H264.045714a43.505371 43.505371 0 0 0-31.246628 72.060343l159.305143 166.765714a41.281829 41.281829 0 1 0 59.626057-56.788114l-94.997943-99.474286H747.227429a41.311086 41.311086 0 1 0 0-82.622172zM262.670629 450.940343H745.764571a43.505371 43.505371 0 0 0 31.246629-72.352914l-159.305143-166.765715a41.281829 41.281829 0 1 0-59.713828 57.022172l94.968685 99.474285H262.670629a41.281829 41.281829 0 0 0 0 82.563658z" />
+            </StackPanel>
+        </Border>
     </Grid>
-    <local:MySkin HorizontalAlignment="Center" VerticalAlignment="Top" x:Name="Skin" HasCape="True" />
+    <local:MySkin HorizontalAlignment="Center" VerticalAlignment="Top" x:Name="Skin" HasCape="True" IsHitTestVisible="False" />
 </Grid>

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

@@ -26,28 +26,29 @@
         End If
     End Function
 
-    Private Sub PageLoginMsSkin_MouseEnter(sender As Object, e As MouseEventArgs) Handles PanData.MouseEnter
-        AniStart({
-                 AaOpacity(BtnEdit, 1 - BtnEdit.Opacity, 80),
-                 AaHeight(BtnEdit, 25.5 - BtnEdit.Height, 140,, New AniEaseOutFluent),
-                 AaHeight(BtnEdit, -1.5, 50, 140, New AniEaseInFluent),
-                 AaOpacity(BtnExit, 1 - BtnExit.Opacity, 80),
-                 AaHeight(BtnExit, 25.5 - BtnExit.Height, 140,, New AniEaseOutFluent),
-                 AaHeight(BtnExit, -1.5, 50, 140, New AniEaseInFluent)
-        }, "PageLoginMsSkin Button")
+#Region "下边栏其他内容"
+
+    '显示/隐藏控制
+    Private Sub ShowPanel(sender As Object, e As MouseEventArgs) Handles PanData.MouseEnter
+        AniStart(AaOpacity(PanButtons, 1 - PanButtons.Opacity, 120), "PageLoginMsSkin Button")
     End Sub
-    Private Sub PageLoginMsSkin_MouseLeave(sender As Object, e As MouseEventArgs) Handles PanData.MouseLeave
-        AniStart({
-                 AaOpacity(BtnEdit, -BtnEdit.Opacity, 120,, New AniEaseOutFluent),
-                 AaHeight(BtnEdit, 14 - BtnEdit.Height, 120,, New AniEaseInFluent),
-                 AaOpacity(BtnExit, -BtnExit.Opacity, 120,, New AniEaseOutFluent),
-                 AaHeight(BtnExit, 14 - BtnExit.Height, 120,, New AniEaseInFluent)
-        }, "PageLoginMsSkin Button")
+    Public Sub HidePanel() Handles PanData.MouseLeave
+        If BtnEdit.ContextMenu.IsOpen OrElse BtnSkin.ContextMenu.IsOpen OrElse PanData.IsMouseOver Then Exit Sub
+        AniStart(AaOpacity(PanButtons, -PanButtons.Opacity, 120), "PageLoginMsSkin Button")
     End Sub
 
+    '修改账号信息
     Private Sub BtnEdit_Click(sender As Object, e As EventArgs) Handles BtnEdit.Click
-        OpenWebsite("https://account.microsoft.com/security")
+        BtnEdit.ContextMenu.IsOpen = True
     End Sub
+    Public Sub BtnEditPassword_Click(sender As Object, e As RoutedEventArgs)
+        OpenWebsite("https://account.live.com/password/Change")
+    End Sub
+    Public Sub BtnEditName_Click(sender As Object, e As RoutedEventArgs)
+        OpenWebsite("https://www.minecraft.net/zh-hans/msaprofile/mygames/editprofile")
+    End Sub
+
+    '退出登录
     Private Sub BtnExit_Click() Handles BtnExit.Click
         Setup.Set("CacheMsOAuthRefresh", "")
         Setup.Set("CacheMsAccess", "")
@@ -58,8 +59,18 @@
         FrmLaunchLeft.RefreshPage(False, True)
     End Sub
 
+#End Region
+
+#Region "皮肤/披风"
+
+    '展开
+    Private Sub BtnSkin_Click(sender As Object, e As RoutedEventArgs) Handles BtnSkin.Click
+        BtnSkin.ContextMenu.IsOpen = True
+    End Sub
+
+    '修改皮肤
     Private IsChanging As Boolean = False
-    Private Sub Skin_Click(sender As Object, e As MouseButtonEventArgs) Handles Skin.Click
+    Public Sub BtnSkinEdit_Click(sender As Object, e As RoutedEventArgs)
         '检查条件，获取新皮肤
         If IsChanging Then
             Hint("正在更改皮肤中，请稍候！")
@@ -103,7 +114,7 @@ Retry:
                                Dim ResultJson As JObject = GetJson(Result)
                                For Each Skin As JObject In ResultJson("skins")
                                    If Skin("state").ToString = "ACTIVE" Then
-                                       MySkin.ReloadCache(Skin("url"), True)
+                                       MySkin.ReloadCache(Skin("url"))
                                        Exit Sub
                                    End If
                                Next
@@ -120,4 +131,21 @@ Retry:
                        End Sub, "Ms Skin Upload")
     End Sub
 
+    '保存皮肤
+    Public Sub BtnSkinSave_Click(sender As Object, e As RoutedEventArgs)
+        Skin.BtnSkinSave_Click()
+    End Sub
+
+    '刷新头像
+    Public Sub BtnSkinRefresh_Click(sender As Object, e As RoutedEventArgs)
+        Skin.RefreshClick()
+    End Sub
+
+    '修改披风
+    Public Sub BtnSkinCape_Click(sender As Object, e As RoutedEventArgs)
+        Skin.BtnSkinCape_Click()
+    End Sub
+
+#End Region
+
 End Class

Plain Craft Launcher 2/Pages/PageSelectRight.xaml

@@ -7,7 +7,7 @@
     <Grid>
         <Grid x:Name="PanAllBack">
             <local:MyScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled" x:Name="PanBack">
-                <VirtualizingStackPanel VirtualizingStackPanel.IsVirtualizing="True" VirtualizingStackPanel.VirtualizationMode="Recycling" Name="PanMain" Margin="25,25,25,10" Grid.IsSharedSizeScope="True" />
+                <StackPanel Name="PanMain" Margin="25,25,25,10" Grid.IsSharedSizeScope="True" />
             </local:MyScrollViewer>
             <local:MyCard HorizontalAlignment="Center" VerticalAlignment="Center" Margin="40" x:Name="PanEmpty" UseAnimation="False">
                 <StackPanel Margin="20,17">

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

@@ -219,7 +219,7 @@
                         <ColumnDefinition Width="1*" />
                     </Grid.ColumnDefinitions>
                     <Grid.RowDefinitions>
-                        <RowDefinition Height="28" />
+                        <RowDefinition Height="Auto" />
                         <RowDefinition Height="9" />
                         <RowDefinition Height="28" />
                         <RowDefinition Height="9" />
@@ -228,7 +228,8 @@
                         <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="LaunchAdvanceJvm" Grid.Column="1" ToolTip="启动 Minecraft 时使用的额外 JVM 参数，在没有确定把握的情况下请不要尝试修改。&#xa;你可以通过点击左侧选项卡的初始化按钮来恢复到默认设置。" Text="-XX:+UseG1GC -XX:-UseAdaptiveSizePolicy -XX:-OmitStackTraceInFastThrow -Dfml.ignoreInvalidMinecraftCertificates=True -Dfml.ignorePatchDiscrepancies=True -Dlog4j2.formatMsgNoLookups=true" />
+                    <local:MyTextBox x:Name="TextAdvanceJvm" Grid.Row="0" Grid.ColumnSpan="2" Tag="LaunchAdvanceJvm" Grid.Column="1" ToolTip="启动 Minecraft 时使用的额外 JVM 参数，在没有确定把握的情况下请不要尝试修改。&#xa;你可以通过点击左侧选项卡的初始化按钮来恢复到默认设置。" Text="-XX:+UseG1GC -XX:-UseAdaptiveSizePolicy -XX:-OmitStackTraceInFastThrow -Dfml.ignoreInvalidMinecraftCertificates=True -Dfml.ignorePatchDiscrepancies=True -Dlog4j2.formatMsgNoLookups=true" 
+                                     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="LaunchAdvanceGame" Grid.Column="1" ToolTip="文本框中的内容将会被直接拼合在启动参数的末尾。&#xa;例如输入 --demo 则会以试玩模式启动游戏。" />
                     <TextBlock Grid.Row="4" VerticalAlignment="Center" HorizontalAlignment="Left" Text="启动前执行命令" Margin="0,0,25,0" />

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

@@ -7,11 +7,11 @@
 
     Public Sub RefreshModDisabled() Handles Me.Loaded
         If Version IsNot Nothing AndAlso Version.Modable Then
-            ItemMod.Height = 36
-            ItemModDisabled.Height = 0
+            ItemMod.Visibility = Visibility.Visible
+            ItemModDisabled.Visibility = Visibility.Collapsed
         Else
-            ItemMod.Height = 0
-            ItemModDisabled.Height = 36
+            ItemMod.Visibility = Visibility.Collapsed
+            ItemModDisabled.Visibility = Visibility.Visible
         End If
     End Sub
 

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

@@ -182,7 +182,7 @@
                         <ColumnDefinition Width="60" />
                     </Grid.ColumnDefinitions>
                     <Grid.RowDefinitions>
-                        <RowDefinition Height="28" />
+                        <RowDefinition Height="Auto" />
                         <RowDefinition Height="9" />
                         <RowDefinition Height="28" />
                         <RowDefinition Height="9" />
@@ -192,7 +192,8 @@
                         <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="使用全局设置" />
+                    <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" />

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

@@ -396,7 +396,8 @@ PreFin:
 
     'LittleSkin
     Private Sub BtnServerAuthLittle_Click(sender As Object, e As EventArgs) Handles BtnServerAuthLittle.Click
-        If MyMsgBox("即将把第三方登录设置覆盖为自动使用 LittleSkin 登录，是否继续？", "覆盖确认", "确定", "取消") = 2 Then Exit Sub
+        If TextServerAuthServer.Text <> "" AndAlso TextServerAuthServer.Text <> "https://littleskin.cn/api/yggdrasil" AndAlso
+            MyMsgBox("即将把第三方登录设置覆盖为自动使用 LittleSkin 登录，是否继续？", "覆盖确认", "确定", "取消") = 2 Then Exit Sub
         TextServerAuthServer.Text = "https://littleskin.cn/api/yggdrasil"
         TextServerAuthRegister.Text = "https://littleskin.cn/auth/register"
         TextServerAuthName.Text = "LittleSkin 登录"

Plain Craft Launcher 2/Plain Craft Launcher 2.vbproj

@@ -285,7 +285,7 @@
     <Compile Include="Pages\PageVersion\PageVersionSetup.xaml.vb">
       <DependentUpon>PageVersionSetup.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Modules\Reference\PresentationFramework.Aero\SystemDropShadowChrome.vb" />
+    <Compile Include="Modules\Reference\SystemDropShadowChrome.vb" />
     <Compile Include="Modules\Base\ModLoader.vb" />
     <Compile Include="Modules\Base\ModNet.vb" />
     <Compile Include="Modules\Base\ModValidate.vb" />
@@ -313,12 +313,6 @@
     <Compile Include="Pages\PageLaunch\PageLoginLegacy.xaml.vb">
       <DependentUpon>PageLoginLegacy.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Pages\PageLaunch\PageLoginMojang.xaml.vb">
-      <DependentUpon>PageLoginMojang.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Pages\PageLaunch\PageLoginMojangSkin.xaml.vb">
-      <DependentUpon>PageLoginMojangSkin.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Pages\PageSelectRight.xaml.vb">
       <DependentUpon>PageSelectRight.xaml</DependentUpon>
     </Compile>
@@ -570,14 +564,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Pages\PageLaunch\PageLoginMojang.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Pages\PageLaunch\PageLoginMojangSkin.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="Pages\PageSelectRight.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>