Merge branch 'Meloong-Git:main' into fix

2025-07-17 23:14:58 +08:00
parent 08e4414f34 96b6ef294b
commit a843b22f38
10 changed files with 329 additions and 174 deletions
@@ -68,6 +68,10 @@ Public Class PageComp
    ''' 在切换到页面时，应自动将筛选项设置为与该目标 MC 版本和加载器相同。
    ''' </summary>
    Public Shared TargetVersion As McVersion = Nothing
+    ''' <summary>
+    ''' 在切换到该页面时自动设置的搜索框内的内容。
+    ''' </summary>
+    Public Shared TargetName As String = Nothing

    '在点击 MyCompItem 时会获取 Loader 的输入，以使资源详情页面可以应用相同的筛选项
    Public Loader As New LoaderTask(Of CompProjectRequest, Integer)("社区资源获取：XXX", AddressOf CompProjectsGet, AddressOf LoaderInput) With {.ReloadTimeout = 60 * 1000}
@@ -94,6 +98,11 @@ Public Class PageComp
                ComboSearchLoader.SelectedItem = GetTargetItemByName("NeoForge")
            End If
            TargetVersion = Nothing
+            If TargetName IsNot Nothing Then
+                '设置搜索框内容
+                TextSearchName.Text = TargetName
+                TargetName = Nothing
+            End If
            '如果已经完成请求，则重新开始
            If IsLoaderInited Then StartNewSearch()
            ScrollToHome()
@@ -75,6 +75,8 @@
        Dim Results As List(Of CompFile) = CompFileLoader.Output
        If PageType = CompType.Any Then
            Results = Results.Where(Function(r) r.Type <> CompType.Plugin).ToList
+        ElseIf PageType = CompType.Shader OrElse PageType = CompType.ResourcePack Then
+            Results = Results.ToList
        Else
            Results = Results.Where(Function(r) r.Type = PageType).ToList
        End If
@@ -1,4 +1,6 @@
-Public Class PageSetupUI
+Imports NAudio.Wave
+
+Public Class PageSetupUI

    Public Shadows IsLoaded As Boolean = False

@@ -274,7 +276,7 @@

    '顶部栏
    Private Sub BtnLogoChange_Click(sender As Object, e As EventArgs) Handles BtnLogoChange.Click
-        Dim FileName As String = SelectFile("常用图片文件(*.png;*.jpg;*.gif;*.webp)|*.png;*.jpg;*.gif;*.webp", "选择图片")
+        Dim FileName As String = SelectFile("常用图片文件(*.png;*.jpg;*.gif;*.webp;*.jpeg)|*.png;*.jpg;*.gif;*.webp;*.jpeg", "选择图片")
        If FileName = "" Then Return
        Try
            '拷贝文件
@@ -357,7 +359,15 @@ Refresh:
            PanMusicVolume.Visibility = Visibility.Visible
            PanMusicDetail.Visibility = Visibility.Visible
            BtnMusicClear.Visibility = Visibility.Visible
-            CardMusic.Title = "背景音乐（" & EnumerateFiles(Path & "PCL\Musics\").Count & " 首）"
+            Dim validMusicCount As Integer = 0
+            For Each File In EnumerateFiles(Path & "PCL\Musics\")
+                Try
+                    If {".ini", ".jpg", ".txt", ".cfg", ".lrc", ".db", ".png"}.Contains(File.Extension.ToLower) Then Continue For
+                    validMusicCount += 1
+                Catch ex As Exception
+                End Try
+            Next
+            CardMusic.Title = "背景音乐（" & validMusicCount & " 首）"
        Else
            PanMusicVolume.Visibility = Visibility.Collapsed
            PanMusicDetail.Visibility = Visibility.Collapsed
@@ -382,6 +382,7 @@ Install:
    ''' </summary>
    Private Sub BtnManageDownload_Click(sender As Object, e As MouseButtonEventArgs) Handles BtnManageDownload.Click, BtnHintDownload.Click
        PageComp.TargetVersion = PageVersionLeft.Version '将当前版本设置为筛选器
+        PageComp.TargetName = SearchBox.Text '将当前搜索框内容设置为筛选器
        FrmMain.PageChange(FormMain.PageType.Download, FormMain.PageSubType.DownloadMod)
    End Sub

@@ -185,7 +185,7 @@
        '选择 自定义 时修改图片
        Try
            If ComboDisplayLogo.SelectedItem Is ItemDisplayLogoCustom Then
-                Dim FileName As String = SelectFile("常用图片文件(*.png;*.jpg;*.gif)|*.png;*.jpg;*.gif", "选择图片")
+                Dim FileName As String = SelectFile("常用图片文件(*.png;*.jpg;*.gif;*.jpeg)|*.png;*.jpg;*.gif;*.jpeg", "选择图片")
                If FileName = "" Then
                    Reload() '还原选项
                    Return
@@ -331,7 +331,7 @@
                        DeleteDirectory(PageVersionLeft.Version.Path)
                        Hint("版本 " & PageVersionLeft.Version.Name & " 已永久删除！", HintType.Finish)
                    Else
-                        FileIO.FileSystem.DeleteDirectory(PageVersionLeft.Version.Path, FileIO.UIOption.OnlyErrorDialogs, FileIO.RecycleOption.SendToRecycleBin)
+                        FileIO.FileSystem.DeleteDirectory(PageVersionLeft.Version.Path, FileIO.UIOption.AllDialogs, FileIO.RecycleOption.SendToRecycleBin)
                        Hint("版本 " & PageVersionLeft.Version.Name & " 已删除到回收站！", HintType.Finish)
                    End If
                Case 2