From ff61ff14c12e4f5fa90c73ebcdb40a2411aa3592 Mon Sep 17 00:00:00 2001 From: SaltWood_233 <105980161+SALTWOOD@users.noreply.github.com> Date: Tue, 23 Jun 2026 00:30:02 +0800 Subject: [PATCH 1/2] fix(download): remove datapack quick download --- Plain Craft Launcher 2/Modules/Minecraft/ModComp.cs | 1 - .../Pages/PageDownload/Comp/PageComp.xaml.cs | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModComp.cs b/Plain Craft Launcher 2/Modules/Minecraft/ModComp.cs index e3f8872a1..99cd9498f 100644 --- a/Plain Craft Launcher 2/Modules/Minecraft/ModComp.cs +++ b/Plain Craft Launcher 2/Modules/Minecraft/ModComp.cs @@ -3568,7 +3568,6 @@ private static void _StartQuickDownload(CompFile file, string target) CompType.ResourcePack => "resourcepacks\\", CompType.Shader => "shaderpacks\\", CompType.World => "saves\\", - CompType.DataPack => "", // 导航到版本根目录 _ => "" }; diff --git a/Plain Craft Launcher 2/Pages/PageDownload/Comp/PageComp.xaml.cs b/Plain Craft Launcher 2/Pages/PageDownload/Comp/PageComp.xaml.cs index 00bd2528c..c30ed5b08 100644 --- a/Plain Craft Launcher 2/Pages/PageDownload/Comp/PageComp.xaml.cs +++ b/Plain Craft Launcher 2/Pages/PageDownload/Comp/PageComp.xaml.cs @@ -27,8 +27,9 @@ private void Load_OnFinish() // 列表项 PanProjects.Children.Clear(); var index = Math.Min(page * pageSize, storage.results.Count - 1); - // 整合包需要安装而非直接下载,不显示快速下载按钮 - var showQuickDownload = PageType != ModComp.CompType.ModPack; + // 整合包需要安装、数据包需放入具体存档,均不显示快速下载按钮 + var showQuickDownload = PageType != ModComp.CompType.ModPack && + PageType != ModComp.CompType.DataPack; foreach (var result in storage.results.GetRange(index, Math.Min(storage.results.Count - index, pageSize))) PanProjects.Children.Add(result.ToCompItem(loader.input.gameVersion is null, loader.input.modLoader == ModComp.CompLoaderType.Any && From 7497e56e0f31a6d571e2be954f4813f9dedcd768 Mon Sep 17 00:00:00 2001 From: SaltWood_233 <105980161+SALTWOOD@users.noreply.github.com> Date: Tue, 23 Jun 2026 00:40:41 +0800 Subject: [PATCH 2/2] fix(download): gate quick download per result type --- .../Pages/PageDownload/Comp/PageComp.xaml.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Plain Craft Launcher 2/Pages/PageDownload/Comp/PageComp.xaml.cs b/Plain Craft Launcher 2/Pages/PageDownload/Comp/PageComp.xaml.cs index c30ed5b08..1869de6b8 100644 --- a/Plain Craft Launcher 2/Pages/PageDownload/Comp/PageComp.xaml.cs +++ b/Plain Craft Launcher 2/Pages/PageDownload/Comp/PageComp.xaml.cs @@ -27,14 +27,15 @@ private void Load_OnFinish() // 列表项 PanProjects.Children.Clear(); var index = Math.Min(page * pageSize, storage.results.Count - 1); - // 整合包需要安装、数据包需放入具体存档,均不显示快速下载按钮 - var showQuickDownload = PageType != ModComp.CompType.ModPack && - PageType != ModComp.CompType.DataPack; foreach (var result in storage.results.GetRange(index, Math.Min(storage.results.Count - index, pageSize))) + { + var showQuickDownload = result.Type != ModComp.CompType.ModPack && + result.Type != ModComp.CompType.DataPack; PanProjects.Children.Add(result.ToCompItem(loader.input.gameVersion is null, loader.input.modLoader == ModComp.CompLoaderType.Any && (PageType == ModComp.CompType.Mod || PageType == ModComp.CompType.ModPack), showQuickDownload)); + } // 页码 CardPages.Visibility = storage.results.Count > 40 || storage.curseForgeOffset < storage.curseForgeTotal ||