Merge branch 'main' into resourcepacks

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

@@ -34,41 +34,120 @@
         End Select
     End Sub
     '结果 UI 化
-    Private Class VersionSorterWithSelect
+    Private Class CardSorter
         Implements IComparer(Of String)
-        Public Top As String = ""
+        Public Topmost As String = ""
         Public Function Compare(x As String, y As String) As Integer Implements IComparer(Of String).Compare
+            '相同
             If x = y Then Return 0
-            If x = Top Then Return -1
-            If y = Top Then Return 1
+            '置顶
+            If x = Topmost Then Return -1
+            If y = Topmost Then Return 1
+            '特殊版本
+            Dim IsXSpecial As Boolean = x.EndsWithF("版本")
+            Dim IsYSpecial As Boolean = y.EndsWithF("版本")
+            If IsXSpecial AndAlso IsYSpecial Then Return x.CompareTo(y)
+            If IsXSpecial Then Return 1
+            If IsYSpecial Then Return -1
+            '比较版本号
+            Dim VersionCodeSort = -VersionSortInteger(x.Replace(x.BeforeFirst(" ") & " ", ""), y.Replace(y.BeforeFirst(" ") & " ", ""))
+            If VersionCodeSort <> 0 Then Return VersionCodeSort
+            '比较全部
             Return -VersionSortInteger(x, y)
         End Function
-        Public Sub New(Optional Top As String = "")
-            Me.Top = If(Top, "")
+        Public Sub New(Optional Topmost As String = "")
+            Me.Topmost = If(Topmost, "")
         End Sub
     End Class
+
+    Private VersionFilter As String
+    Private IsMajorVersionFilter As Boolean '是否按大版本号筛选（1.21 / 1.20 / 1.19 / ...）而非小版本号（1.21.1 / 1.21 / 1.20.4 / ...）
     Private Sub Load_OnFinish()
+        '初始化筛选器
+        Dim VersionFilters As List(Of String)
+
+        '按小版本号筛选？
+        IsMajorVersionFilter = False
+        VersionFilters = CompFileLoader.Output.SelectMany(Function(v) v.GameVersions).Select(Function(v) GetGroupedVersionName(v, IsMajorVersionFilter, True)).
+            Distinct.OrderByDescending(Function(s) s, New VersionComparer).ToList
+        '按大版本号筛选？
+        If VersionFilters.Count >= 9 Then
+            IsMajorVersionFilter = True
+            VersionFilters = CompFileLoader.Output.SelectMany(Function(v) v.GameVersions).Select(Function(v) GetGroupedVersionName(v, IsMajorVersionFilter, True)).
+                Distinct.OrderByDescending(Function(s) s, New VersionComparer).ToList
+        End If
+
+        'UI 化筛选器
+        PanFilter.Children.Clear()
+        If VersionFilters.Count < 2 Then
+            CardFilter.Visibility = Visibility.Collapsed
+            VersionFilter = Nothing
+        Else
+            CardFilter.Visibility = Visibility.Visible
+            VersionFilters.Insert(0, "全部")
+            '转化为按钮
+            For Each Version As String In VersionFilters
+                Dim NewButton As New MyRadioButton With {
+                    .Text = Version, .Margin = New Thickness(2, 0, 2, 0), .ColorType = MyRadioButton.ColorState.Highlight}
+                NewButton.LabText.Margin = New Thickness(-2, 0, 8, 0)
+                AddHandler NewButton.Check,
+                Sub(sender As MyRadioButton, raiseByMouse As Boolean)
+                    VersionFilter = If(sender.Text = "全部", Nothing, sender.Text)
+                    UpdateFilterResult()
+                End Sub
+                PanFilter.Children.Add(NewButton)
+            Next
+            '自动选择
+            Dim ToCheck As MyRadioButton = Nothing
+            If TargetVersion <> "" Then
+                Dim TargetFile = CompFileLoader.Output.FirstOrDefault(Function(v) v.GameVersions.Contains(TargetVersion))
+                If TargetFile IsNot Nothing Then
+                    Dim TargetGroup = GetGroupedVersionName(TargetVersion, IsMajorVersionFilter, True)
+                    For Each Button As MyRadioButton In PanFilter.Children
+                        If Button.Text <> TargetGroup Then Continue For
+                        ToCheck = Button
+                        Exit For
+                    Next
+                End If
+            End If
+            If ToCheck Is Nothing Then ToCheck = PanFilter.Children(0)
+            ToCheck.Checked = True
+        End If
+
+        '更新筛选结果（文件列表 UI 化）
+        UpdateFilterResult()
+    End Sub
+    Private Sub UpdateFilterResult()
         Dim TargetCardName As String = If(TargetVersion <> "" OrElse TargetLoader <> CompModLoaderType.Any,
-            $"所选版本：{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))
+            $"所选版本：{If(TargetLoader <> CompModLoaderType.Any, TargetLoader.ToString & " ", "")}{TargetVersion}", "")
+        '归类到卡片下
+        Dim Dict As New SortedDictionary(Of String, List(Of CompFile))(New CardSorter(TargetCardName))
+        Dict.Add("其他版本", New List(Of CompFile))
+        Dim SupportedLoaders As New List(Of Integer)([Enum].GetValues(GetType(CompModLoaderType)))
         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.StartsWith("1.0") Then
-                    TargetCard = "远古版本"
-                Else
-                    TargetCard = GameVersion
+                '检查是否符合版本筛选器
+                If VersionFilter IsNot Nothing AndAlso
+                    GetGroupedVersionName(GameVersion, IsMajorVersionFilter, True) <> VersionFilter Then Continue For
+                '决定添加到哪个卡片
+                Dim Ver As String = GetGroupedVersionName(GameVersion, False, False)
+                '遍历加入的加载器列表
+                Dim Loaders As New List(Of String)
+                If Project.ModLoaders.Count > 1 AndAlso '至少有两个加载器
+                    Project.Type = CompType.Mod AndAlso '是 Mod
+                    Ver.StartsWith("1.") Then '不是 “快照版本” 之类的
+                    For Each Loader In Version.ModLoaders
+                        If Loader = CompModLoaderType.Quilt AndAlso Setup.Get("ToolDownloadIgnoreQuilt") Then Continue For
+                        If SupportedLoaders.Contains(Loader) Then Loaders.Add(Loader.ToString & " ")
+                    Next
                 End If
-                '实际进行添加
-                If Not Dict.ContainsKey(TargetCard) Then Dict.Add(TargetCard, New List(Of CompFile))
-                If Not Dict(TargetCard).Contains(Version) Then Dict(TargetCard).Add(Version)
+                If Not Loaders.Any() Then Loaders.Add("") '保底加一个空的，确保它在一张卡片里
+                '实际添加
+                For Each Loader In Loaders
+                    Dim TargetCard As String = Loader & Ver
+                    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
             Next
         Next
         '添加筛选的版本的卡片
@@ -77,16 +156,16 @@
             For Each Version As CompFile In CompFileLoader.Output
                 If Version.GameVersions.Contains(TargetVersion) AndAlso
                    (TargetLoader = CompModLoaderType.Any OrElse Version.ModLoaders.Contains(TargetLoader)) Then
+                    '检查是否符合版本筛选器
+                    If VersionFilter IsNot Nothing AndAlso
+                        Not Version.GameVersions.Any(Function(v) GetGroupedVersionName(v, IsMajorVersionFilter, True) = VersionFilter) Then Continue For
                     If Not Dict(TargetCardName).Contains(Version) Then Dict(TargetCardName).Add(Version)
                 End If
             Next
         End If
-
-#Region "转化为 UI"
+        '转化为 UI
         Try
-            '清空当前
-            PanMain.Children.Clear()
-            '转化为 UI
+            PanResults.Children.Clear()
             For Each Pair As KeyValuePair(Of String, List(Of CompFile)) In Dict
                 If Not Pair.Value.Any() Then Continue For
                 '增加卡片
@@ -94,7 +173,7 @@
                 Dim NewStack As New StackPanel With {.Margin = New Thickness(20, MyCard.SwapedHeight, 18, 0), .VerticalAlignment = VerticalAlignment.Top, .RenderTransform = New TranslateTransform(0, 0), .Tag = Pair.Value}
                 NewCard.Children.Add(NewStack)
                 NewCard.SwapControl = NewStack
-                PanMain.Children.Add(NewCard)
+                PanResults.Children.Add(NewCard)
                 '确定卡片是否展开
                 If Pair.Key = TargetCardName OrElse
                    (FrmMain.PageCurrent.Additional IsNot Nothing AndAlso '#2761
@@ -104,20 +183,29 @@
                     NewCard.IsSwaped = True
                 End If
                 '增加提示
-                If Pair.Key = "未知版本" Then
-                    NewStack.Children.Add(New MyHint With {.Text = "由于 API 的版本信息更新缓慢，可能无法识别刚更新不久的 MC 版本，只需等待几天即可自动恢复正常。", .IsWarn = False, .Margin = New Thickness(0, 0, 0, 7)})
+                If Pair.Key = "其他版本" Then
+                    NewStack.Children.Add(New MyHint With {.Text = "由于版本信息更新缓慢，可能无法识别刚更新的 MC 版本，只需等待几天即可自动恢复正常。", .IsWarn = False, .Margin = New Thickness(0, 0, 0, 7)})
                 End If
             Next
             '如果只有一张卡片，展开第一张卡片
-            If PanMain.Children.Count = 1 Then
-                CType(PanMain.Children(0), MyCard).IsSwaped = False
+            If PanResults.Children.Count = 1 Then
+                CType(PanResults.Children(0), MyCard).IsSwaped = False
             End If
         Catch ex As Exception
             Log(ex, "可视化工程下载列表出错", LogLevel.Feedback)
         End Try
-#End Region
-
     End Sub
+    Private Function GetGroupedVersionName(Name As String, MajorOnly As Boolean, FoldOldRelease As Boolean) As String
+        If Name Is Nothing Then
+            Return "其他版本"
+        ElseIf Name.Contains("w") Then
+            Return "快照版本"
+        ElseIf Name.StartsWith("1.0") OrElse Not Name.StartsWith("1.") OrElse (FoldOldRelease AndAlso Val(Name.Split(".")(1)) < 10) Then
+            Return "远古版本"
+        Else
+            Return If(MajorOnly, "1." & Name.Split(".")(1).BeforeFirst(" "), Name)
+        End If
+    End Function
 
 #End Region
 
@@ -167,14 +255,10 @@
             '构造步骤加载器
             Dim Loaders As New List(Of LoaderBase)
             Dim Target As String = $"{PathMcFolder}versions\{VersionName}\原始整合包.{If(Project.FromCurseForge, "zip", "mrpack")}"
-            Dim LogoFileAddress As String = PathTemp & "CompLogo\" & GetHash(CompItem.Logo) & ".png"
+            Dim LogoFileAddress As String = MyImage.GetTempPath(CompItem.Logo)
             Loaders.Add(New LoaderDownload("下载整合包文件", New List(Of NetFile) From {File.ToNetFile(Target)}) With {.ProgressWeight = 10, .Block = True})
             Loaders.Add(New LoaderTask(Of Integer, Integer)("准备安装整合包",
-            Sub()
-                If ModpackInstall(Target, VersionName, Logo:=If(IO.File.Exists(LogoFileAddress), LogoFileAddress, Nothing)) Is Nothing Then
-                    Throw New Exception("整合包安装出现异常！")
-                End If
-            End Sub) With {.ProgressWeight = 0.1})
+            Sub() ModpackInstall(Target, VersionName, If(IO.File.Exists(LogoFileAddress), LogoFileAddress, Nothing))) With {.ProgressWeight = 0.1})
 
             '启动
             Dim Loader As New LoaderCombo(Of String)(LoaderName, Loaders) With {.OnStateChanged =
@@ -234,7 +318,7 @@
                         If Not Version.IsLoaded Then Version.Load()
                         If Not Version.Modable Then Return False
                         If File.GameVersions.Any(Function(v) v.Contains(".")) AndAlso
-                           Not File.GameVersions.Any(Function(v) v.Contains(".") AndAlso v.Split(".")(1) = Version.Version.McCodeMain.ToString) Then Return False
+                           Not File.GameVersions.Any(Function(v) v.Contains(".") AndAlso v = Version.Version.McName) Then Return False
                         If AllowForge Is Nothing OrElse AllowFabric Is Nothing Then Return True
                         If AllowForge AndAlso (Version.Version.HasForge OrElse Version.Version.HasNeoForge) Then Return True
                         If AllowFabric AndAlso Version.Version.HasFabric Then Return True
@@ -282,14 +366,16 @@
                 If Project.TranslatedName = Project.RawName Then
                     FileName = File.FileName
                 Else
-                    Dim ChineseName As String = Project.TranslatedName.Before(" (").Before(" - ").
+                    Dim ChineseName As String = Project.TranslatedName.BeforeFirst(" (").BeforeFirst(" - ").
                         Replace("\", "＼").Replace("/", "／").Replace("|", "｜").Replace(":", "：").Replace("<", "＜").Replace(">", "＞").Replace("*", "＊").Replace("?", "？").Replace("""", "").Replace("： ", "：")
-                    Select Case Setup.Get("ToolDownloadTranslate")
+                    Select Case Setup.Get("ToolDownloadTranslateV2")
                         Case 0
-                            FileName = $"[{ChineseName}] {File.FileName}"
+                            FileName = $"【{ChineseName}】{File.FileName}"
                         Case 1
-                            FileName = $"{ChineseName}-{File.FileName}"
+                            FileName = $"[{ChineseName}] {File.FileName}"
                         Case 2
+                            FileName = $"{ChineseName}-{File.FileName}"
+                        Case 3
                             FileName = $"{File.FileName}-{ChineseName}"
                         Case Else
                             FileName = File.FileName
@@ -299,11 +385,11 @@
                 Sub()
                     '弹窗要求选择保存位置
                     Dim Target As String
-                    Target = SelectAs("选择保存位置", FileName,
-                                      Desc & "文件|" &
-                                      If(Project.Type = CompType.Mod,
-                                          If(File.FileName.EndsWith(".litemod"), "*.litemod", "*.jar"),
-                                          If(File.FileName.EndsWith(".mrpack"), "*.mrpack", "*.zip")), DefaultFolder)
+                    Target = SelectSaveFile("选择保存位置", FileName,
+                        Desc & "文件|" &
+                        If(Project.Type = CompType.Mod,
+                            If(File.FileName.EndsWith(".litemod"), "*.litemod", "*.jar"),
+                            If(File.FileName.EndsWith(".mrpack"), "*.mrpack", "*.zip")), DefaultFolder)
                     If Not Target.Contains("\") Then Exit Sub
                     '构造步骤加载器
                     Dim LoaderName As String = Desc & "下载：" & GetFileNameWithoutExtentionFromPath(Target) & " "
@@ -311,7 +397,7 @@
                     Dim Loaders As New List(Of LoaderBase)
                     Loaders.Add(New LoaderDownload("下载文件", New List(Of NetFile) From {File.ToNetFile(Target)}) With {.ProgressWeight = 6, .Block = True})
                     '启动
-                    Dim Loader As New LoaderCombo(Of Integer)(LoaderName, Loaders) With {.OnStateChanged = AddressOf DownloadStateSave}
+                    Dim Loader As New LoaderCombo(Of Integer)(LoaderName, Loaders) With {.OnStateChanged = AddressOf LoaderStateChangedHintOnly}
                     Loader.Start(1)
                     LoaderTaskbarAdd(Loader)
                     FrmMain.BtnExtraDownload.ShowRefresh()
@@ -330,7 +416,7 @@
         OpenWebsite("https://www.mcmod.cn/class/" & Project.WikiId & ".html")
     End Sub
     Private Sub BtnIntroCopy_Click(sender As Object, e As EventArgs) Handles BtnIntroCopy.Click
-        ClipboardSet(CompItem.LabTitle.Text)
+        ClipboardSet(CompItem.LabTitle.Text & CompItem.LabTitleRaw.Text)
     End Sub
 
 End Class