From c556dbb39c19ac6a31fd9286ec5012bdf4640802 Mon Sep 17 00:00:00 2001 From: Pigeon0v0 Date: Sat, 27 Jul 2024 11:03:59 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=85=89=E5=BD=B1=E5=8C=85=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Plain Craft Launcher 2/FormMain.xaml.vb | 5 +- .../Modules/Minecraft/ModComp.vb | 46 ++++++- Plain Craft Launcher 2/Modules/ModMain.vb | 1 + .../Pages/PageDownload/PageDownloadLeft.xaml | 8 ++ .../PageDownload/PageDownloadLeft.xaml.vb | 11 +- .../PageDownload/PageDownloadShader.xaml | 115 +++++++++++++++++ .../PageDownload/PageDownloadShader.xaml.vb | 122 ++++++++++++++++++ .../Plain Craft Launcher 2.vbproj | 12 +- 8 files changed, 308 insertions(+), 12 deletions(-) create mode 100644 Plain Craft Launcher 2/Pages/PageDownload/PageDownloadShader.xaml create mode 100644 Plain Craft Launcher 2/Pages/PageDownload/PageDownloadShader.xaml.vb diff --git a/Plain Craft Launcher 2/FormMain.xaml.vb b/Plain Craft Launcher 2/FormMain.xaml.vb index 265004e..c80849c 100644 --- a/Plain Craft Launcher 2/FormMain.xaml.vb +++ b/Plain Craft Launcher 2/FormMain.xaml.vb @@ -1062,6 +1062,7 @@ Install: DownloadLiteLoader = 9 DownloadMod = 11 DownloadPack = 12 + DownloadShader = 14 SetupLaunch = 0 SetupUI = 1 SetupSystem = 2 @@ -1097,8 +1098,10 @@ Install: Return "Mod 下载 - " & Project.TranslatedName Case CompType.ModPack Return "整合包下载 - " & Project.TranslatedName - Case Else 'CompType.ResourcePack + Case CompType.ResourcePack Return "资源包下载 - " & Project.TranslatedName + Case Else 'CompType.Shader + Return "光影包下载 - " & Project.TranslatedName End Select Case PageType.HelpDetail Dim Entry As HelpEntry = Stack.Additional(0) diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModComp.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModComp.vb index 44ce4d0..b1e6fe7 100644 --- a/Plain Craft Launcher 2/Modules/Minecraft/ModComp.vb +++ b/Plain Craft Launcher 2/Modules/Minecraft/ModComp.vb @@ -13,6 +13,10 @@ ''' 资源包。 ''' ResourcePack = 2 + ''' + ''' 光影包。 + ''' + Shader = 3 End Enum Public Enum CompModLoaderType 'https://docs.curseforge.com/?http#tocS_ModLoaderType @@ -273,8 +277,10 @@ Type = CompType.Mod ElseIf Website.Contains("/modpacks/") Then Type = CompType.ModPack - Else + ElseIf Website.Contains("/texture-packs/") Then Type = CompType.ResourcePack + Else 'Website.Contains("/shaders/") + Type = CompType.Shader End If 'Tags Tags = New List(Of String) @@ -321,7 +327,10 @@ Case 4480 : Tags.Add("基于地图") Case 4481 : Tags.Add("轻量") Case 4482 : Tags.Add("大型") - 'FUTURE: Res + '光影包 + Case 6553 : Tags.Add("写实") + Case 6554 : Tags.Add("幻想") + Case 6555 : Tags.Add("原版风") End Select Next If Not Tags.Any() Then Tags.Add("杂项") @@ -349,6 +358,7 @@ Case "mod" : Type = CompType.Mod Case "modpack" : Type = CompType.ModPack Case "resourcepack" : Type = CompType.ResourcePack + Case "shaders" : Type = CompType.Shader End Select 'Tags & ModLoaders Tags = New List(Of String) @@ -387,7 +397,33 @@ Case "adventure" : Tags.Add("冒险") Case "kitchen-sink" : Tags.Add("烹饪") Case "lightweight" : Tags.Add("轻量") - 'FUTURE: Res + '光影包 + Case "cartoon" : Tags.Add("卡通") + Case "cursed" : Tags.Add("Cursed") + Case "fantasy" : Tags.Add("幻想") + Case "realistic" : Tags.Add("写实") + Case "semi-realistic" : Tags.Add("半写实") + Case "vanilla-like" : Tags.Add("原版风") + + Case "atmosphere" : Tags.Add("大气环境") + Case "bloom" : Tags.Add("植被") + Case "colored-lighting" : Tags.Add("光源着色") + Case "foliage" : Tags.Add("树叶") + Case "path-tracing" : Tags.Add("路径追踪") + Case "pbr" : Tags.Add("PBR") + Case "reflections" : Tags.Add("反射") + Case "shadows" : Tags.Add("阴影") + + Case "potato" : Tags.Add("土豆画质") + Case "low" : Tags.Add("低性能影响") + Case "medium" : Tags.Add("中性能影响") + Case "high" : Tags.Add("高性能影响") + Case "screenshot" : Tags.Add("极致画质") + + Case "canvas" : Tags.Add("Canvas") + Case "iris" : Tags.Add("Iris") + Case "optifine" : Tags.Add("OptiFine") + Case "vanilla-shader" : Tags.Add("原版光影") End Select Next If Not Tags.Any() Then Tags.Add("杂项") @@ -748,8 +784,8 @@ NoSubtitle: Address += "&classId=6" Case CompType.ModPack Address += "&classId=4471" - Case CompType.ResourcePack - 'FUTURE: Res + Case CompType.Shader + Address += "&classId=6552" End Select Address += "&categoryId=" & If(Tag = "", "0", Tag.Before("/")) If ModLoader <> CompModLoaderType.Any Then Address += "&modLoaderType=" & CType(ModLoader, Integer) diff --git a/Plain Craft Launcher 2/Modules/ModMain.vb b/Plain Craft Launcher 2/Modules/ModMain.vb index a971886..ad25e83 100644 --- a/Plain Craft Launcher 2/Modules/ModMain.vb +++ b/Plain Craft Launcher 2/Modules/ModMain.vb @@ -398,6 +398,7 @@ EndHint: Public FrmDownloadFabric As PageDownloadFabric Public FrmDownloadMod As PageDownloadMod Public FrmDownloadPack As PageDownloadPack + Public FrmDownloadShader As PageDownloadShader '设置页面声明 Public FrmSetupLeft As PageSetupLeft diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadLeft.xaml b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadLeft.xaml index 8a64667..451e351 100644 --- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadLeft.xaml +++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadLeft.xaml @@ -84,6 +84,14 @@ + + + + + + + diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadLeft.xaml.vb b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadLeft.xaml.vb index 2658c33..91888f0 100644 --- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadLeft.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadLeft.xaml.vb @@ -10,7 +10,7 @@ ''' ''' 勾选事件改变页面。 ''' - Private Sub PageCheck(sender As MyListItem, e As RouteEventArgs) Handles ItemInstall.Check, ItemClient.Check, ItemOptiFine.Check, ItemForge.Check, ItemNeoForge.Check, ItemLiteLoader.Check, ItemMod.Check, ItemFabric.Check, ItemPack.Check + Private Sub PageCheck(sender As MyListItem, e As RouteEventArgs) Handles ItemInstall.Check, ItemClient.Check, ItemOptiFine.Check, ItemForge.Check, ItemNeoForge.Check, ItemLiteLoader.Check, ItemMod.Check, ItemFabric.Check, ItemPack.Check, ItemShader.Check '尚未初始化控件属性时，sender.Tag 为 Nothing，会导致切换到页面 0 '若使用 IsLoaded，则会导致模拟点击不被执行（模拟点击切换页面时，控件的 IsLoaded 为 False） If sender.Tag IsNot Nothing Then PageChange(Val(sender.Tag)) @@ -46,6 +46,9 @@ Case FormMain.PageSubType.DownloadPack If FrmDownloadPack Is Nothing Then FrmDownloadPack = New PageDownloadPack Return FrmDownloadPack + Case FormMain.PageSubType.DownloadShader + If FrmDownloadShader Is Nothing Then FrmDownloadShader = New PageDownloadShader + Return FrmDownloadShader Case Else Throw New Exception("未知的下载子页面种类：" & ID) End Select @@ -114,6 +117,12 @@ CompProjectCache.Clear() If FrmDownloadPack IsNot Nothing Then FrmDownloadPack.PageLoaderRestart() ItemPack.Checked = True + Case FormMain.PageSubType.DownloadShader + PageDownloadShader.Storage = New CompProjectStorage + PageDownloadShader.Page = 0 + CompProjectCache.Clear() + If FrmDownloadShader IsNot Nothing Then FrmDownloadShader.PageLoaderRestart() + ItemShader.Checked = True Case FormMain.PageSubType.DownloadClient DlClientListLoader.Start(IsForceRestart:=True) ItemClient.Checked = True diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadShader.xaml b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadShader.xaml new file mode 100644 index 0000000..6e40136 --- /dev/null +++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadShader.xaml @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadShader.xaml.vb b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadShader.xaml.vb new file mode 100644 index 0000000..13a58c9 --- /dev/null +++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadShader.xaml.vb @@ -0,0 +1,122 @@ +Public Class PageDownloadShader + + Public Const PageSize = 40 + + '加载器信息 + Public Shared Loader As New LoaderTask(Of CompProjectRequest, Integer)("CompProject Shader", AddressOf CompProjectsGet, AddressOf LoaderInput) With {.ReloadTimeout = 60 * 1000} + Public Shared Storage As New CompProjectStorage + Public Shared Page As Integer = 0 + Private Sub PageDownloadShader_Inited(sender As Object, e As EventArgs) Handles Me.Initialized + PageLoaderInit(Load, PanLoad, PanContent, PanAlways, Loader, AddressOf Load_OnFinish, AddressOf LoaderInput) + If McVersionHighest = -1 Then McVersionHighest = Math.Max(McVersionHighest, Integer.Parse(CType(TextSearchVersion.Items(1), MyComboBoxItem).Content.ToString.Split(".")(1))) + End Sub + Private Shared Function LoaderInput() As CompProjectRequest + Dim Request As New CompProjectRequest(CompType.Shader, Storage, (Page + 1) * PageSize) + If FrmDownloadShader IsNot Nothing Then + With Request + .SearchText = FrmDownloadShader.TextSearchName.Text + .GameVersion = If(FrmDownloadShader.TextSearchVersion.Text = "全部 (也可自行输入)", Nothing, + If(FrmDownloadShader.TextSearchVersion.Text.Contains(".") OrElse FrmDownloadShader.TextSearchVersion.Text.Contains("w"), FrmDownloadShader.TextSearchVersion.Text, Nothing)) + .Tag = FrmDownloadShader.ComboSearchTag.SelectedItem.Tag + .Source = CType(Val(FrmDownloadShader.ComboSearchSource.SelectedItem.Tag), CompSourceType) + End With + End If + Return Request + End Function + + '结果 UI 化 + Private Sub Load_OnFinish() + Try + Log($"[Comp] 开始可视化光影包列表，已储藏 {Storage.Results.Count} 个结果，当前在第 {Page + 1} 页") + '列表项 + PanProjects.Children.Clear() + For i = Math.Min(Page * PageSize, Storage.Results.Count - 1) To Math.Min((Page + 1) * PageSize - 1, Storage.Results.Count - 1) + PanProjects.Children.Add(Storage.Results(i).ToCompItem(Loader.Input.GameVersion Is Nothing, False)) + Next + '页码 + CardPages.Visibility = If(Storage.Results.Count > 40 OrElse + Storage.CurseForgeOffset < Storage.CurseForgeTotal OrElse Storage.ModrinthOffset < Storage.ModrinthTotal, + Visibility.Visible, Visibility.Collapsed) + LabPage.Text = Page + 1 + BtnPageFirst.IsEnabled = Page > 1 + BtnPageFirst.Opacity = If(BtnPageFirst.IsEnabled, 1, 0.2) + BtnPageLeft.IsEnabled = Page > 0 + BtnPageLeft.Opacity = If(BtnPageLeft.IsEnabled, 1, 0.2) + BtnPageRight.IsEnabled = Storage.Results.Count > PageSize * (Page + 1) OrElse + Storage.CurseForgeOffset < Storage.CurseForgeTotal OrElse Storage.ModrinthOffset < Storage.ModrinthTotal + BtnPageRight.Opacity = If(BtnPageRight.IsEnabled, 1, 0.2) + '错误信息 + If Storage.ErrorMessage Is Nothing Then + HintError.Visibility = Visibility.Collapsed + Else + HintError.Visibility = Visibility.Visible + HintError.Text = Storage.ErrorMessage + End If + '强制返回顶部 + PanBack.ScrollToTop() + Catch ex As Exception + Log(ex, "可视化光影包列表出错", LogLevel.Feedback) + End Try + End Sub + + '自动重试 + Private Sub Load_State(sender As Object, state As MyLoading.MyLoadingState, oldState As MyLoading.MyLoadingState) Handles Load.StateChanged + Select Case Loader.State + Case LoadState.Failed + Dim ErrorMessage As String = "" + If Loader.Error IsNot Nothing Then ErrorMessage = Loader.Error.Message + If ErrorMessage.Contains("不是有效的 JSON 文件") Then + Log("[Download] 下载的光影包列表 JSON 文件损坏，已自动重试", LogLevel.Debug) + PageLoaderRestart() + End If + End Select + End Sub + + '切换页码 + + Private Sub BtnPageFirst_Click(sender As Object, e As RoutedEventArgs) Handles BtnPageFirst.Click + ChangePage(0) + End Sub + Private Sub BtnPageLeft_Click(sender As Object, e As RoutedEventArgs) Handles BtnPageLeft.Click + ChangePage(Page - 1) + End Sub + Private Sub BtnPageRight_Click(sender As Object, e As RoutedEventArgs) Handles BtnPageRight.Click + ChangePage(Page + 1) + End Sub + Private Sub ChangePage(NewPage As Integer) + CardPages.IsEnabled = False + Page = NewPage + FrmMain.BackToTop() + Log($"[Download] 光影包切换到第 {Page + 1} 页") + RunInThread(Sub() + Thread.Sleep(100) '等待向上滚的动画结束 + RunInUi(Sub() CardPages.IsEnabled = True) + Loader.Start() + End Sub) + End Sub + +#Region "搜索" + + '搜索按钮 + Private Sub StartNewSearch() Handles BtnSearchRun.Click + Page = 0 + If Loader.ShouldStart(LoaderInput()) Then Storage = New CompProjectStorage '避免连续搜索两次使得 CompProjectStorage 引用丢失（#1311） + Loader.Start() + End Sub + Private Sub EnterTrigger(sender As Object, e As KeyEventArgs) Handles TextSearchName.KeyDown, TextSearchVersion.KeyDown + If e.Key = Key.Enter Then StartNewSearch() + End Sub + + '重置按钮 + Private Sub BtnSearchReset_Click(sender As Object, e As EventArgs) Handles BtnSearchReset.Click + TextSearchName.Text = "" + TextSearchVersion.Text = "全部 (也可自行输入)" + TextSearchVersion.SelectedIndex = 0 + ComboSearchSource.SelectedIndex = 0 + ComboSearchTag.SelectedIndex = 0 + Loader.LastFinishedTime = 0 '要求强制重新开始 + End Sub + +#End Region + +End Class diff --git a/Plain Craft Launcher 2/Plain Craft Launcher 2.vbproj b/Plain Craft Launcher 2/Plain Craft Launcher 2.vbproj index d68df7a..e130435 100644 --- a/Plain Craft Launcher 2/Plain Craft Launcher 2.vbproj +++ b/Plain Craft Launcher 2/Plain Craft Launcher 2.vbproj @@ -185,9 +185,6 @@ MyIconTextButton.xaml - - - @@ -250,6 +247,9 @@ PageDownloadPack.xaml + + PageDownloadShader.xaml + FormLoginOAuth.xaml @@ -472,7 +472,6 @@ FormMain.xaml Code - MSBuild:Compile Designer @@ -505,6 +504,10 @@ Designer MSBuild:Compile + + MSBuild:Compile + Designer + Designer MSBuild:Compile @@ -928,7 +931,6 @@ -