2.9.2

2025-03-18 21:58:55 +08:00
parent 4c8174d6db
commit 6ed967281b
56 changed files with 1749 additions and 1395 deletions
@@ -1,7 +1,8 @@
 Public Class PageDownloadInstall

    Private Sub LoaderInit() Handles Me.Initialized
-        PageLoaderInit(LoadMinecraft, PanLoad, PanBack, Nothing, DlClientListLoader, AddressOf LoadMinecraft_OnFinish)
+        DisabledPageAnimControls.Add(BtnStart)
+        PageLoaderInit(LoadMinecraft, PanLoad, PanAllBack, Nothing, DlClientListLoader, AddressOf LoadMinecraft_OnFinish)
    End Sub

    Private IsLoad As Boolean = False
@@ -40,6 +41,8 @@
        If IsInSelectPage Then Exit Sub
        IsInSelectPage = True

+        PanInner.Margin = New Thickness(25, 10, 25, 40)
+
        AutoSelectedFabricApi = False
        AutoSelectedOptiFabric = False
        IsSelectNameEdited = False
@@ -49,7 +52,8 @@
        PanBack.IsHitTestVisible = False
        PanBack.ScrollToHome()

-        CardMinecraft.IsSwaped = True
+        DisabledPageAnimControls.Remove(BtnStart)
+        BtnStart.Show = True
        CardOptiFine.IsSwaped = True
        CardLiteLoader.IsSwaped = True
        CardForge.IsSwaped = True
@@ -83,8 +87,8 @@
        DlOptiFabricLoader.Start()

        AniStart({
-            AaOpacity(PanMinecraft, -PanMinecraft.Opacity, 100, 10),
-            AaTranslateX(PanMinecraft, -50 - CType(PanMinecraft.RenderTransform, TranslateTransform).X, 110, 10),
+            AaOpacity(PanMinecraft, -PanMinecraft.Opacity, 90, 10),
+            AaTranslateX(PanMinecraft, -50 - CType(PanMinecraft.RenderTransform, TranslateTransform).X, 100, 10),
            AaCode(
            Sub()
                PanBack.ScrollToHome()
@@ -98,8 +102,8 @@
                OptiFabric_Loaded()
                SelectReload()
            End Sub, After:=True),
-            AaOpacity(PanSelect, 1 - PanSelect.Opacity, 250, 150),
-            AaTranslateX(PanSelect, -CType(PanSelect.RenderTransform, TranslateTransform).X, 500, 150, Ease:=New AniEaseOutBack(AniEasePower.Weak)),
+            AaOpacity(PanSelect, 1 - PanSelect.Opacity, 90, 100),
+            AaTranslateX(PanSelect, -CType(PanSelect.RenderTransform, TranslateTransform).X, 200, 100, Ease:=New AniEaseOutFluent(AniEasePower.ExtraStrong)),
            AaCode(
            Sub()
                PanMinecraft.Visibility = Visibility.Collapsed
@@ -117,10 +121,14 @@
            End Sub,, True)
        }, "FrmDownloadInstall SelectPageSwitch", True)
    End Sub
-    Public Sub ExitSelectPage()
+    Public Sub ExitSelectPage() Handles BtnBack.Click
        If Not IsInSelectPage Then Exit Sub
        IsInSelectPage = False

+        PanInner.Margin = New Thickness(25, 10, 25, 25)
+
+        DisabledPageAnimControls.Add(BtnStart)
+        BtnStart.Show = False
        SelectClear() '清除已选择项
        PanMinecraft.Visibility = Visibility.Visible
        PanSelect.IsHitTestVisible = False
@@ -132,26 +140,21 @@
            AaOpacity(PanSelect, -PanSelect.Opacity, 90, 10),
            AaTranslateX(PanSelect, 50 - CType(PanSelect.RenderTransform, TranslateTransform).X, 100, 10),
            AaCode(Sub() PanBack.ScrollToHome(), After:=True),
-            AaOpacity(PanMinecraft, 1 - PanMinecraft.Opacity, 150, 100),
-            AaTranslateX(PanMinecraft, -CType(PanMinecraft.RenderTransform, TranslateTransform).X, 400, 100, Ease:=New AniEaseOutBack(AniEasePower.Weak)),
-            AaCode(Sub()
-                       PanSelect.Visibility = Visibility.Collapsed
-                       PanBack.IsHitTestVisible = True
-                   End Sub,, True)
+            AaOpacity(PanMinecraft, 1 - PanMinecraft.Opacity, 90, 100),
+            AaTranslateX(PanMinecraft, -CType(PanMinecraft.RenderTransform, TranslateTransform).X, 200, 100, Ease:=New AniEaseOutFluent(AniEasePower.ExtraStrong)),
+            AaCode(
+            Sub()
+                PanSelect.Visibility = Visibility.Collapsed
+                PanBack.IsHitTestVisible = True
+            End Sub,, True)
        }, "FrmDownloadInstall SelectPageSwitch")
    End Sub
-
-    '页面切换触发
    Public Sub MinecraftSelected(sender As MyListItem, e As MouseButtonEventArgs)
        SelectedMinecraftId = sender.Title
        SelectedMinecraftJsonUrl = sender.Tag("url").ToString
        SelectedMinecraftIcon = sender.Logo
        EnterSelectPage()
    End Sub
-    Private Sub CardMinecraft_PreviewSwap(sender As Object, e As RouteEventArgs) Handles CardMinecraft.PreviewSwap
-        ExitSelectPage()
-        e.Handled = True
-    End Sub

 #End Region

@@ -311,12 +314,7 @@
        IsReloading = True
        '主预览
        SelectNameUpdate()
-        ItemSelect.Title = TextSelectName.Text
-        ItemSelect.Info = GetSelectInfo()
-        ItemSelect.Logo = GetSelectLogo()
-        'Minecraft
-        LabMinecraft.Text = SelectedMinecraftId
-        ImgMinecraft.Source = New MyBitmap(SelectedMinecraftIcon)
+        ImgLogo.Source = GetSelectLogo()
        'OptiFine
        Dim OptiFineError As String = LoadOptiFineGetError()
        CardOptiFine.MainSwap.Visibility = If(OptiFineError Is Nothing, Visibility.Visible, Visibility.Collapsed)
@@ -325,7 +323,7 @@
        If SelectedOptiFine Is Nothing Then
            BtnOptiFineClear.Visibility = Visibility.Collapsed
            ImgOptiFine.Visibility = Visibility.Collapsed
-            LabOptiFine.Text = If(OptiFineError, "点击选择")
+            LabOptiFine.Text = If(OptiFineError, "可以添加")
            LabOptiFine.Foreground = ColorGray4
        Else
            BtnOptiFineClear.Visibility = Visibility.Visible
@@ -345,7 +343,7 @@
            If SelectedLiteLoader Is Nothing Then
                BtnLiteLoaderClear.Visibility = Visibility.Collapsed
                ImgLiteLoader.Visibility = Visibility.Collapsed
-                LabLiteLoader.Text = If(LiteLoaderError, "点击选择")
+                LabLiteLoader.Text = If(LiteLoaderError, "可以添加")
                LabLiteLoader.Foreground = ColorGray4
            Else
                BtnLiteLoaderClear.Visibility = Visibility.Visible
@@ -362,7 +360,7 @@
        If SelectedForge Is Nothing Then
            BtnForgeClear.Visibility = Visibility.Collapsed
            ImgForge.Visibility = Visibility.Collapsed
-            LabForge.Text = If(ForgeError, "点击选择")
+            LabForge.Text = If(ForgeError, "可以添加")
            LabForge.Foreground = ColorGray4
        Else
            BtnForgeClear.Visibility = Visibility.Visible
@@ -382,7 +380,7 @@
            If SelectedNeoForge Is Nothing Then
                BtnNeoForgeClear.Visibility = Visibility.Collapsed
                ImgNeoForge.Visibility = Visibility.Collapsed
-                LabNeoForge.Text = If(NeoForgeError, "点击选择")
+                LabNeoForge.Text = If(NeoForgeError, "可以添加")
                LabNeoForge.Foreground = ColorGray4
            Else
                BtnNeoForgeClear.Visibility = Visibility.Visible
@@ -403,7 +401,7 @@
            If SelectedFabric Is Nothing Then
                BtnFabricClear.Visibility = Visibility.Collapsed
                ImgFabric.Visibility = Visibility.Collapsed
-                LabFabric.Text = If(FabricError, "点击选择")
+                LabFabric.Text = If(FabricError, "可以添加")
                LabFabric.Foreground = ColorGray4
            Else
                BtnFabricClear.Visibility = Visibility.Visible
@@ -424,7 +422,7 @@
            If SelectedFabricApi Is Nothing Then
                BtnFabricApiClear.Visibility = Visibility.Collapsed
                ImgFabricApi.Visibility = Visibility.Collapsed
-                LabFabricApi.Text = If(FabricApiError, "点击选择")
+                LabFabricApi.Text = If(FabricApiError, "可以添加")
                LabFabricApi.Foreground = ColorGray4
            Else
                BtnFabricApiClear.Visibility = Visibility.Visible
@@ -445,7 +443,7 @@
            If SelectedOptiFabric Is Nothing Then
                BtnOptiFabricClear.Visibility = Visibility.Collapsed
                ImgOptiFabric.Visibility = Visibility.Collapsed
-                LabOptiFabric.Text = If(OptiFabricError, "点击选择")
+                LabOptiFabric.Text = If(OptiFabricError, "可以添加")
                LabOptiFabric.Foreground = ColorGray4
            Else
                BtnOptiFabricClear.Visibility = Visibility.Visible
@@ -497,7 +495,26 @@
        SelectedOptiFabric = Nothing
    End Sub

-    '显示信息获取
+    ''' <summary>
+    ''' 获取版本图标。
+    ''' </summary>
+    Private Function GetSelectLogo() As String
+        If SelectedFabric IsNot Nothing Then
+            Return "pack://application:,,,/images/Blocks/Fabric.png"
+        ElseIf SelectedForge IsNot Nothing Then
+            Return "pack://application:,,,/images/Blocks/Anvil.png"
+        ElseIf SelectedNeoForge IsNot Nothing Then
+            Return "pack://application:,,,/images/Blocks/NeoForge.png"
+        ElseIf SelectedLiteLoader IsNot Nothing Then
+            Return "pack://application:,,,/images/Blocks/Egg.png"
+        ElseIf SelectedOptiFine IsNot Nothing Then
+            Return "pack://application:,,,/images/Blocks/GrassPath.png"
+        Else
+            Return SelectedMinecraftIcon
+        End If
+    End Function
+
+    '版本名处理
    ''' <summary>
    ''' 获取默认版本名。
    ''' </summary>
@@ -520,49 +537,6 @@
        End If
        Return Name
    End Function
-    ''' <summary>
-    ''' 获取版本描述信息。
-    ''' </summary>
-    Private Function GetSelectInfo() As String
-        Dim Info As String = ""
-        If SelectedFabric IsNot Nothing Then
-            Info += ", Fabric " & SelectedFabric.Replace("+build", "")
-        End If
-        If SelectedForge IsNot Nothing Then
-            Info += ", Forge " & SelectedForge.VersionName
-        End If
-        If SelectedNeoForge IsNot Nothing Then
-            Info += ", NeoForge " & SelectedNeoForge.VersionName
-        End If
-        If SelectedLiteLoader IsNot Nothing Then
-            Info += ", LiteLoader"
-        End If
-        If SelectedOptiFine IsNot Nothing Then
-            Info += ", OptiFine " & SelectedOptiFine.NameDisplay.Replace(SelectedMinecraftId & " ", "")
-        End If
-        If Info = "" Then Info = ", 无附加安装"
-        Return Info.TrimStart(", ".ToCharArray())
-    End Function
-    ''' <summary>
-    ''' 获取版本图标。
-    ''' </summary>
-    Private Function GetSelectLogo() As String
-        If SelectedFabric IsNot Nothing Then
-            Return "pack://application:,,,/images/Blocks/Fabric.png"
-        ElseIf SelectedForge IsNot Nothing Then
-            Return "pack://application:,,,/images/Blocks/Anvil.png"
-        ElseIf SelectedNeoForge IsNot Nothing Then
-            Return "pack://application:,,,/images/Blocks/NeoForge.png"
-        ElseIf SelectedLiteLoader IsNot Nothing Then
-            Return "pack://application:,,,/images/Blocks/Egg.png"
-        ElseIf SelectedOptiFine IsNot Nothing Then
-            Return "pack://application:,,,/images/Blocks/GrassPath.png"
-        Else
-            Return SelectedMinecraftIcon
-        End If
-    End Function
-
-    '版本名处理
    Private IsSelectNameEdited As Boolean = False
    Private IsSelectNameChanging As Boolean = False
    Private Sub SelectNameUpdate()
@@ -577,7 +551,7 @@
        SelectReload()
    End Sub
    Private Sub TextSelectName_ValidateChanged(sender As Object, e As EventArgs) Handles TextSelectName.ValidateChanged
-        BtnSelectStart.IsEnabled = TextSelectName.ValidateResult = ""
+        BtnStart.IsEnabled = TextSelectName.IsValidated
    End Sub

 #End Region
@@ -637,10 +611,8 @@
                Dict(Type).Add(Version)
            Next
            '排序
-            For i = 0 To Dict.Keys.Count - 1
-                Dict(Dict.Keys(i)) = Sort(Dict.Values(i), Function(Left As JObject, Right As JObject) As Boolean
-                                                              Return Left("releaseTime").Value(Of Date) > Right("releaseTime").Value(Of Date)
-                                                          End Function)
+            For Each Pair In Dict.ToList
+                Dict(Pair.Key) = Pair.Value.OrderByDescending(Function(j) j("releaseTime").Value(Of Date)).ToList
            Next
            '清空当前
            PanMinecraft.Children.Clear()
@@ -697,46 +669,41 @@
    ''' </summary>
    Private Function LoadOptiFineGetError() As String
        If SelectedNeoForge IsNot Nothing Then Return "与 NeoForge 不兼容"
-        If LoadOptiFine Is Nothing OrElse LoadOptiFine.State.LoadingState = MyLoading.MyLoadingState.Run Then Return "正在获取版本列表……"
+        If LoadOptiFine Is Nothing OrElse LoadOptiFine.State.LoadingState = MyLoading.MyLoadingState.Run Then Return "加载中……"
        If LoadOptiFine.State.LoadingState = MyLoading.MyLoadingState.Error Then Return "获取版本列表失败：" & CType(LoadOptiFine.State, Object).Error.Message
        '检查 Forge 1.13 - 1.14.3：全部不兼容
        If SelectedForge IsNot Nothing AndAlso
            VersionSortInteger(SelectedMinecraftId, "1.13") >= 0 AndAlso VersionSortInteger("1.14.3", SelectedMinecraftId) >= 0 Then
            Return "与 Forge 不兼容"
        End If
-        '检查最低 Forge 版本
-        Dim MinimalForgeVersion As String = "9999.9999"
-        Dim NotSuitForForge As Boolean = False
+        '检查 Forge 版本
+        Dim HasAny As Boolean = False
+        Dim HasRequiredVersion As Boolean = False
        For Each OptiFineVersion As DlOptiFineListEntry In DlOptiFineListLoader.Output.Value
            If Not OptiFineVersion.NameDisplay.StartsWith(SelectedMinecraftId & " ") Then Continue For '不是同一个大版本
-            If SelectedForge Is Nothing Then Return Nothing '该版本可用
-            If IsOptiFineSuitForForge(OptiFineVersion, SelectedForge) Then
-                Return Nothing '该版本可用
-            Else
-                NotSuitForForge = True
-                If OptiFineVersion.RequiredForgeVersion IsNot Nothing Then
-                    '设置用于显示的最低允许的 Forge 版本
-                    MinimalForgeVersion = If(VersionSortBoolean(MinimalForgeVersion, OptiFineVersion.RequiredForgeVersion),
-                                          OptiFineVersion.RequiredForgeVersion, MinimalForgeVersion)
-                End If
-            End If
+            HasAny = True
+            If SelectedForge Is Nothing Then Return Nothing '未选择 Forge
+            If IsOptiFineSuitForForge(OptiFineVersion, SelectedForge) Then Return Nothing '该版本可用
+            If OptiFineVersion.RequiredForgeVersion IsNot Nothing Then HasRequiredVersion = True
        Next
-        If MinimalForgeVersion = "9999.9999" Then
-            Return If(NotSuitForForge, "与 Forge 不兼容", "没有可用版本")
+        If Not HasAny Then
+            Return "不可用"
+        ElseIf HasRequiredVersion Then
+            Return "仅兼容特定版本的 Forge"
        Else
-            Return "需要 Forge " & If(MinimalForgeVersion.Contains("."), "", "#") & MinimalForgeVersion & " 或更高版本"
+            Return "与 Forge 不兼容"
        End If
    End Function

-    '检查某个 OptiFine 是否与某个 Forge 兼容（最低 Forge 版本是否达到需求）
+    '检查某个 OptiFine 是否与某个 Forge 兼容
    Private Function IsOptiFineSuitForForge(OptiFine As DlOptiFineListEntry, Forge As DlForgeVersionEntry)
        If Forge.Inherit <> OptiFine.Inherit Then Return False '不是同一个大版本
        If OptiFine.RequiredForgeVersion Is Nothing Then Return False '不兼容 Forge
        If String.IsNullOrWhiteSpace(OptiFine.RequiredForgeVersion) Then Return True '#4183
        If OptiFine.RequiredForgeVersion.Contains(".") Then 'XX.X.XXX
-            Return VersionSortInteger(Forge.Version.ToString, OptiFine.RequiredForgeVersion) >= 0
+            Return VersionSortInteger(Forge.Version.ToString, OptiFine.RequiredForgeVersion) = 0
        Else 'XXXX
-            Return Forge.Version.Revision >= OptiFine.RequiredForgeVersion
+            Return Forge.Version.Revision = OptiFine.RequiredForgeVersion
        End If
    End Function

@@ -760,7 +727,7 @@
            Next
            If Not Versions.Any() Then Exit Sub
            '排序
-            Versions = Sort(Versions,
+            Versions = Versions.Sort(
            Function(Left As DlOptiFineListEntry, Right As DlOptiFineListEntry) As Boolean
                If Not Left.IsPreview AndAlso Right.IsPreview Then Return True
                If Left.IsPreview AndAlso Not Right.IsPreview Then Return False
@@ -804,13 +771,13 @@
    ''' 获取 LiteLoader 的加载异常信息。若正常则返回 Nothing。
    ''' </summary>
    Private Function LoadLiteLoaderGetError() As String
-        If Not SelectedMinecraftId.Contains("1.") OrElse Val(SelectedMinecraftId.Split(".")(1)) > 12 Then Return "没有可用版本"
-        If LoadLiteLoader Is Nothing OrElse LoadLiteLoader.State.LoadingState = MyLoading.MyLoadingState.Run Then Return "正在获取版本列表……"
+        If Not SelectedMinecraftId.Contains("1.") OrElse Val(SelectedMinecraftId.Split(".")(1)) > 12 Then Return "不可用"
+        If LoadLiteLoader Is Nothing OrElse LoadLiteLoader.State.LoadingState = MyLoading.MyLoadingState.Run Then Return "加载中……"
        If LoadLiteLoader.State.LoadingState = MyLoading.MyLoadingState.Error Then Return "获取版本列表失败：" & CType(LoadLiteLoader.State, Object).Error.Message
        For Each Version As DlLiteLoaderListEntry In DlLiteLoaderListLoader.Output.Value
            If Version.Inherit = SelectedMinecraftId Then Return Nothing
        Next
-        Return "没有可用版本"
+        Return "不可用"
    End Function

    '限制展开
@@ -861,15 +828,15 @@
    ''' 获取 Forge 的加载异常信息。若正常则返回 Nothing。
    ''' </summary>
    Private Function LoadForgeGetError() As String
-        If Not SelectedMinecraftId.StartsWith("1.") Then Return "没有可用版本"
-        If Not LoadForge.State.IsLoader Then Return "正在获取版本列表……"
+        If Not SelectedMinecraftId.StartsWith("1.") Then Return "不可用"
+        If Not LoadForge.State.IsLoader Then Return "加载中……"
        Dim Loader As LoaderTask(Of String, List(Of DlForgeVersionEntry)) = LoadForge.State
-        If SelectedMinecraftId <> Loader.Input Then Return "正在获取版本列表……"
-        If Loader.State = LoadState.Loading Then Return "正在获取版本列表……"
+        If SelectedMinecraftId <> Loader.Input Then Return "加载中……"
+        If Loader.State = LoadState.Loading Then Return "加载中……"
        If Loader.State = LoadState.Failed Then
            Dim ErrorMessage As String = Loader.Error.Message
-            If ErrorMessage.Contains("没有可用版本") Then
-                Return "没有可用版本"
+            If ErrorMessage.Contains("不可用") Then
+                Return "不可用"
            Else
                Return "获取版本列表失败：" & ErrorMessage
            End If
@@ -911,12 +878,12 @@
            Dim Versions = Loader.Output.ToList '复制数组，以免 Output 在实例化后变空
            If Not Loader.Output.Any() Then Exit Sub
            PanForge.Children.Clear()
-            Versions = Sort(Versions, Function(a, b) a.Version > b.Version).Where(
+            Versions = Versions.Where(
            Function(v)
                If v.Category = "universal" OrElse v.Category = "client" Then Return False '跳过无法自动安装的版本
                If SelectedOptiFine IsNot Nothing AndAlso Not IsOptiFineSuitForForge(SelectedOptiFine, v) Then Return False
                Return True
-            End Function).ToList()
+            End Function).OrderByDescending(Function(v) v.Version).ToList()
            ForgeDownloadListItemPreload(PanForge, Versions, AddressOf Forge_Selected, False)
            For Each Version In Versions
                PanForge.Children.Add(ForgeDownloadListItem(Version, AddressOf Forge_Selected, False))
@@ -950,16 +917,16 @@
    ''' 获取 NeoForge 的加载异常信息。若正常则返回 Nothing。
    ''' </summary>
    Private Function LoadNeoForgeGetError() As String
-        If Not SelectedMinecraftId.StartsWith("1.") Then Return "没有可用版本"
+        If Not SelectedMinecraftId.StartsWith("1.") Then Return "不可用"
        If SelectedOptiFine IsNot Nothing Then Return "与 OptiFine 不兼容"
        If SelectedForge IsNot Nothing Then Return "与 Forge 不兼容"
        If SelectedFabric IsNot Nothing Then Return "与 Fabric 不兼容"
-        If LoadNeoForge Is Nothing OrElse LoadNeoForge.State.LoadingState = MyLoading.MyLoadingState.Run Then Return "正在获取版本列表……"
+        If LoadNeoForge Is Nothing OrElse LoadNeoForge.State.LoadingState = MyLoading.MyLoadingState.Run Then Return "加载中……"
        If LoadNeoForge.State.LoadingState = MyLoading.MyLoadingState.Error Then Return "获取版本列表失败：" & CType(LoadNeoForge.State, Object).Error.Message
        If DlNeoForgeListLoader.Output.Value.Any(Function(v) v.Inherit = SelectedMinecraftId) Then
            Return Nothing
        Else
-            Return "没有可用版本"
+            Return "不可用"
        End If
    End Function

@@ -1011,7 +978,7 @@
    ''' 获取 Fabric 的加载异常信息。若正常则返回 Nothing。
    ''' </summary>
    Private Function LoadFabricGetError() As String
-        If LoadFabric Is Nothing OrElse LoadFabric.State.LoadingState = MyLoading.MyLoadingState.Run Then Return "正在获取版本列表……"
+        If LoadFabric Is Nothing OrElse LoadFabric.State.LoadingState = MyLoading.MyLoadingState.Run Then Return "加载中……"
        If LoadFabric.State.LoadingState = MyLoading.MyLoadingState.Error Then Return "获取版本列表失败：" & CType(LoadFabric.State, Object).Error.Message
        For Each Version As JObject In DlFabricListLoader.Output.Value("game")
            If Version("version").ToString = SelectedMinecraftId.Replace("∞", "infinite").Replace("Combat Test 7c", "1.16_combat-3") Then
@@ -1020,7 +987,7 @@
                Return Nothing
            End If
        Next
-        Return "没有可用版本"
+        Return "不可用"
    End Function

    '限制展开
@@ -1111,18 +1078,18 @@
    ''' 获取 FabricApi 的加载异常信息。若正常则返回 Nothing。
    ''' </summary>
    Private Function LoadFabricApiGetError() As String
-        If LoadFabricApi Is Nothing OrElse LoadFabricApi.State.LoadingState = MyLoading.MyLoadingState.Run Then Return "正在获取版本列表……"
+        If LoadFabricApi Is Nothing OrElse LoadFabricApi.State.LoadingState = MyLoading.MyLoadingState.Run Then Return "加载中……"
        If LoadFabricApi.State.LoadingState = MyLoading.MyLoadingState.Error Then Return "获取版本列表失败：" & CType(LoadFabricApi.State, Object).Error.Message
        If DlFabricApiLoader.Output Is Nothing Then
            If SelectedFabric Is Nothing Then Return "需要安装 Fabric"
-            Return "正在获取版本列表……"
+            Return "加载中……"
        End If
        For Each Version In DlFabricApiLoader.Output
            If Not IsSuitableFabricApi(Version.DisplayName, SelectedMinecraftId) Then Continue For
            If SelectedFabric Is Nothing Then Return "需要安装 Fabric"
            Return Nothing
        Next
-        Return "没有可用版本"
+        Return "不可用"
    End Function

    '限制展开
@@ -1150,7 +1117,7 @@
                End If
            Next
            If Not Versions.Any() Then Exit Sub
-            Versions = Sort(Versions, Function(a, b) a.ReleaseDate > b.ReleaseDate)
+            Versions = Versions.OrderByDescending(Function(v) v.ReleaseDate).ToList
            '可视化
            PanFabricApi.Children.Clear()
            For Each Version In Versions
@@ -1204,13 +1171,13 @@
    ''' </summary>
    Private Function LoadOptiFabricGetError() As String
        If SelectedMinecraftId.StartsWith("1.14") OrElse SelectedMinecraftId.StartsWith("1.15") Then Return "不兼容老版本 Fabric，请手动下载 OptiFabric Origins"
-        If LoadOptiFabric Is Nothing OrElse LoadOptiFabric.State.LoadingState = MyLoading.MyLoadingState.Run Then Return "正在获取版本列表……"
+        If LoadOptiFabric Is Nothing OrElse LoadOptiFabric.State.LoadingState = MyLoading.MyLoadingState.Run Then Return "加载中……"
        If LoadOptiFabric.State.LoadingState = MyLoading.MyLoadingState.Error Then Return "获取版本列表失败：" & CType(LoadOptiFabric.State, Object).Error.Message
        If DlOptiFabricLoader.Output Is Nothing Then
            If SelectedFabric Is Nothing AndAlso SelectedOptiFine Is Nothing Then Return "需要安装 OptiFine 与 Fabric"
            If SelectedFabric Is Nothing Then Return "需要安装 Fabric"
            If SelectedOptiFine Is Nothing Then Return "需要安装 OptiFine"
-            Return "正在获取版本列表……"
+            Return "加载中……"
        End If
        For Each Version In DlOptiFabricLoader.Output
            If Not IsSuitableOptiFabric(Version, SelectedMinecraftId) Then Continue For '2135#
@@ -1219,7 +1186,7 @@
            If SelectedOptiFine Is Nothing Then Return "需要安装 OptiFine"
            Return Nothing '通过检查
        Next
-        Return "没有可用版本"
+        Return "不可用"
    End Function

    '限制展开
@@ -1241,7 +1208,7 @@
            Next
            If Not Versions.Any() Then Exit Sub
            '排序
-            Versions = Sort(Versions, Function(a, b) a.ReleaseDate > b.ReleaseDate)
+            Versions = Versions.OrderByDescending(Function(v) v.ReleaseDate).ToList
            '可视化
            PanOptiFabric.Children.Clear()
            For Each Version In Versions
@@ -1278,22 +1245,23 @@
 #Region "安装"

    Private Sub TextSelectName_KeyDown(sender As Object, e As KeyEventArgs) Handles TextSelectName.KeyDown
-        If e.Key = Key.Enter AndAlso BtnSelectStart.IsEnabled Then BtnSelectStart_Click()
+        If e.Key = Key.Enter AndAlso BtnStart.IsEnabled Then BtnStart_Click()
    End Sub
-    Private Sub BtnSelectStart_Click() Handles BtnSelectStart.Click
+    Private Sub BtnStart_Click() Handles BtnStart.Click
        '确认版本隔离
        If (SelectedForge IsNot Nothing OrElse SelectedNeoForge IsNot Nothing OrElse SelectedFabric IsNot Nothing) AndAlso
-           (Setup.Get("LaunchArgumentIndie") = 0 OrElse Setup.Get("LaunchArgumentIndie") = 2) Then
-            If MyMsgBox("你尚未开启版本隔离，这会导致多个 MC 共用同一个 Mod 文件夹。" & vbCrLf &
-                        "因此在切换 MC 版本时，MC 会因为读取到与当前版本不符的 Mod 而崩溃。" & vbCrLf &
-                        "PCL 推荐你在开始下载前，在 设置 → 版本隔离 中开启版本隔离选项！", "版本隔离提示", "取消下载", "继续") = 1 Then
+           (Setup.Get("LaunchArgumentIndieV2") = 0 OrElse Setup.Get("LaunchArgumentIndieV2") = 2) Then
+            If MyMsgBox("你尚未开启版本隔离，这会导致多个版本共用同一个 Mod 文件夹。" & vbCrLf &
+                        "因此游戏可能会因为读取到与当前版本不符的 Mod 而崩溃。" & vbCrLf &
+                        "推荐在开始下载前，在 设置 → 启动选项 → 版本隔离 中开启版本隔离！", "版本隔离提示", "取消下载", "继续") = 1 Then
                Exit Sub
            End If
        End If
        '提交安装申请
+        Dim VersionName As String = TextSelectName.Text
        Dim Request As New McInstallRequest With {
-            .TargetVersionName = TextSelectName.Text,
-            .TargetVersionFolder = $"{PathMcFolder}versions\{TextSelectName.Text}\",
+            .TargetVersionName = VersionName,
+            .TargetVersionFolder = $"{PathMcFolder}versions\{VersionName}\",
            .MinecraftJson = SelectedMinecraftJsonUrl,
            .MinecraftName = SelectedMinecraftId,
            .OptiFineEntry = SelectedOptiFine,