From ca729067c17a569c89748e689b0310f0fe2b36b5 Mon Sep 17 00:00:00 2001 From: wyc-26 Date: Fri, 4 Apr 2025 08:25:22 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=E7=82=B9=E5=87=BB=E2=80=9C?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E6=96=B0=20Mod=E2=80=9D=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=88=B0=E4=B8=8B=E8=BD=BD=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=97=B6=E8=87=AA=E5=8A=A8=E5=A1=AB=E5=85=85=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E6=A1=86=E7=9A=84=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Pages/PageDownload/PageDownloadMod.xaml.vb | 7 +++++++ .../Pages/PageVersion/PageVersionMod.xaml.vb | 1 + 2 files changed, 8 insertions(+) diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadMod.xaml.vb b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadMod.xaml.vb index 113ff25..4157d9a 100644 --- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadMod.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadMod.xaml.vb @@ -5,6 +5,10 @@ ''' 在切换到该页面时自动设置的目标版本。 ''' Public Shared TargetVersion As McVersion = Nothing + ''' + ''' 在切换到该页面时自动设置的搜索框内的内容。 + ''' + Public Shared TargetName As String = Nothing '加载器信息 Public Shared Loader As New LoaderTask(Of CompProjectRequest, Integer)("CompProject Mod", AddressOf CompProjectsGet, AddressOf LoaderInput) With {.ReloadTimeout = 60 * 1000} @@ -52,6 +56,9 @@ ModLoader = CompModLoaderType.Forge Then '选择了 Forge ModLoader = CompModLoaderType.Any '此时，视作没有筛选 Mod Loader（因为部分老 Mod 没有设置自己支持的加载器） End If + If TargetName IsNot Nothing Then + FrmDownloadMod.TextSearchName.Text = TargetName + End If With Request .SearchText = FrmDownloadMod.TextSearchName.Text .GameVersion = GameVersion diff --git a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionMod.xaml.vb b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionMod.xaml.vb index 3f1b77f..9804ad2 100644 --- a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionMod.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionMod.xaml.vb @@ -381,6 +381,7 @@ Install: ''' Private Sub BtnManageDownload_Click(sender As Object, e As MouseButtonEventArgs) Handles BtnManageDownload.Click, BtnHintDownload.Click PageDownloadMod.TargetVersion = PageVersionLeft.Version '将当前版本设置为筛选器 + PageDownloadMod.TargetName = SearchBox.Text '将当前搜索框内容设置为筛选器 FrmMain.PageChange(FormMain.PageType.Download, FormMain.PageSubType.DownloadMod) End Sub From 31f0b81652f7103b8393fb7bad2482b5965e8560 Mon Sep 17 00:00:00 2001 From: wyc-26 Date: Fri, 4 Apr 2025 18:05:14 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix(PageDownloadMod):=20=E5=B0=8F=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Pages/PageDownload/PageDownloadMod.xaml.vb | 1 + 1 file changed, 1 insertion(+) diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadMod.xaml.vb b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadMod.xaml.vb index 4157d9a..0996b18 100644 --- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadMod.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadMod.xaml.vb @@ -58,6 +58,7 @@ End If If TargetName IsNot Nothing Then FrmDownloadMod.TextSearchName.Text = TargetName + TargetName = Nothing End If With Request .SearchText = FrmDownloadMod.TextSearchName.Text From 52ddb979389ea6ed5b33a4c03a2123521b64a55f Mon Sep 17 00:00:00 2001 From: wyc-26 Date: Sat, 5 Apr 2025 07:46:04 +0800 Subject: [PATCH 3/4] =?UTF-8?q?chore(PageDownloadMod):=20=E8=BF=98?= =?UTF-8?q?=E6=98=AF=E8=BF=99=E6=A0=B7=E5=A5=BD=E4=BA=86=E2=80=A6=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Pages/PageDownload/PageDownloadMod.xaml.vb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadMod.xaml.vb b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadMod.xaml.vb index 0996b18..89af635 100644 --- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadMod.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadMod.xaml.vb @@ -36,6 +36,11 @@ ComboSearchLoader.SelectedItem = GetTargetItemByName("NeoForge") End If TargetVersion = Nothing + If TargetName IsNot Nothing Then + '设置搜索框内容 + TextSearchName.Text = TargetName + TargetName = Nothing + End If '如果已经完成请求，则重新开始 If IsLoaderInited Then StartNewSearch() PanScroll.ScrollToHome() From 36c03d16548f159858805b090469c6a268070856 Mon Sep 17 00:00:00 2001 From: wyc-26 Date: Mon, 2 Jun 2025 11:03:36 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix(PageComp):=20=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Pages/PageDownload/Comp/PageComp.xaml.vb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Plain Craft Launcher 2/Pages/PageDownload/Comp/PageComp.xaml.vb b/Plain Craft Launcher 2/Pages/PageDownload/Comp/PageComp.xaml.vb index 2685921..18be6d0 100644 --- a/Plain Craft Launcher 2/Pages/PageDownload/Comp/PageComp.xaml.vb +++ b/Plain Craft Launcher 2/Pages/PageDownload/Comp/PageComp.xaml.vb @@ -117,10 +117,6 @@ Public Class PageComp Dim Request As New CompProjectRequest(PageType, Storage, (Page + 1) * PageSize) Dim GameVersion As String = If(TextSearchVersion.Text = "全部 (也可自行输入)", Nothing, If(TextSearchVersion.Text.Contains(".") OrElse TextSearchVersion.Text.Contains("w"), TextSearchVersion.Text, Nothing)) - If TargetName IsNot Nothing Then - FrmDownloadMod.TextSearchName.Text = TargetName - TargetName = Nothing - End If With Request .SearchText = TextSearchName.Text .GameVersion = GameVersion