Merge pull request #4360 from Pigeon0v0/datapacks

支持下载数据包

Plain Craft Launcher 2/FormMain.xaml.vb

@@ -929,6 +929,7 @@ Public Class FormMain
         DownloadPack = 12
         DownloadResourcePack = 13
         DownloadShader = 14
+        DownloadDataPack = 15
         SetupLaunch = 0
         SetupUI = 1
         SetupSystem = 2
@@ -965,6 +966,12 @@ Public Class FormMain
                         Return "Mod 下载 - " & Project.TranslatedName
                     Case CompType.ModPack
                         Return "整合包下载 - " & Project.TranslatedName
+                    Case CompType.DataPack
+                        If Project.IsMix Then
+                            Return "Mod / 数据包下载 - " & Project.TranslatedName
+                        Else
+                            Return "数据包下载 - " & Project.TranslatedName
+                        End If
                     Case CompType.ResourcePack
                         Return "资源包下载 - " & Project.TranslatedName
                     Case Else 'CompType.Shader

Plain Craft Launcher 2/Modules/Minecraft/ModComp.vb

@@ -17,6 +17,10 @@
         ''' 光影包。
         ''' </summary>
         Shader = 3
+        ''' <summary>
+        ''' 数据包。
+        ''' </summary>
+        DataPack = 4
     End Enum
     Public Enum CompModLoaderType
         'https://docs.curseforge.com/?http#tocS_ModLoaderType
@@ -118,6 +122,10 @@
         ''' </summary>
         Public ReadOnly Type As CompType
         ''' <summary>
+        ''' 是否为 Mod / 数据包融合工程。
+        ''' </summary>
+        Public ReadOnly IsMix As Boolean
+        ''' <summary>
         ''' 工程的短名。例如 technical-enchant。
         ''' </summary>
         Public ReadOnly Slug As String
@@ -283,10 +291,14 @@
                         Type = CompType.Mod
                     ElseIf Website.Contains("/modpacks/") Then
                         Type = CompType.ModPack
+                    ElseIf Website.Contains("/resourcepacks/") Then
+                        Type = CompType.ResourcePack
                     ElseIf Website.Contains("/texture-packs/") Then
                         Type = CompType.ResourcePack
-                    Else 'Website.Contains("/shaders/")
+                    ElseIf Website.Contains("/shaders/")
                         Type = CompType.Shader
+                    Else
+                        Type = CompType.DataPack
                     End If
                     'Tags
                     Tags = New List(Of String)
@@ -334,6 +346,15 @@
                             Case 4480 : Tags.Add("基于地图")
                             Case 4481 : Tags.Add("轻量")
                             Case 4482 : Tags.Add("大型")
+                        '数据包
+                            Case 6946 : Tags.Add("Mod 支持")
+                            Case 6947 : Tags.Add("杂项")
+                            Case 6948 : Tags.Add("冒险")
+                            Case 6949 : Tags.Add("幻想")
+                            Case 6950 : Tags.Add("支持库")
+                            Case 6951 : Tags.Add("科技")
+                            Case 6952 : Tags.Add("魔法")
+                            Case 6953 : Tags.Add("实用工具")
                         '光影包
                             Case 6553 : Tags.Add("写实")
                             Case 6554 : Tags.Add("幻想")
@@ -355,7 +376,6 @@
                             Case 4465 : Tags.Add("模组支持")
                             Case 402 : Tags.Add("中世纪")
                             Case 401 : Tags.Add("现代")
-
                         End Select
                     Next
                     If Not Tags.Any() Then Tags.Add("杂项")
@@ -383,8 +403,13 @@
                         Case "mod" : Type = CompType.Mod
                         Case "modpack" : Type = CompType.ModPack
                         Case "resourcepack" : Type = CompType.ResourcePack
+                        Case "datapack" : Type = CompType.DataPack
                         Case "shader" : Type = CompType.Shader
                     End Select
+                    If Data("categories").ToArray.Contains("datapack") Then 'Modrinth 上的数据包由于未知原因，返回的 project_type 为 mod，这里做兜底处理
+                        Type = CompType.DataPack
+                        IsMix = Data("categories").ToArray.Contains("forge") OrElse Data("categories").ToArray.Contains("fabric") OrElse Data("categories").ToArray.Contains("neoforge") OrElse Data("categories").ToArray.Contains("quilt")
+                    End If
                     'Tags & ModLoaders
                     Tags = New List(Of String)
                     ModLoaders = New List(Of CompModLoaderType)
@@ -432,6 +457,26 @@
                             Case "adventure" : Tags.Add("冒险")
                             Case "kitchen-sink" : Tags.Add("水槽包/大杂烩")
                             Case "lightweight" : Tags.Add("轻量")
+                            '数据包
+                            Case "adventure" : Tags.Add("冒险")
+                            Case "cursed" : Tags.Add("Cursed")
+                            Case "decoration" : Tags.Add("装饰")
+                            Case "economy" : Tags.Add("经济")
+                            Case "equipment" : Tags.Add("装备")
+                            Case "food" : Tags.Add("食物")
+                            Case "game-mechanics" : Tags.Add("游戏机制")
+                            Case "library" : Tags.Add("支持库")
+                            Case "magic" : Tags.Add("魔法")
+                            Case "management" : Tags.Add("管理")
+                            Case "minigame" : Tags.Add("小游戏")
+                            Case "mobs" : Tags.Add("生物")
+                            Case "optimization" : Tags.Add("优化")
+                            Case "social" : Tags.Add("社交")
+                            Case "storage" : Tags.Add("存储")
+                            Case "technology" : Tags.Add("科技")
+                            Case "transportation" : Tags.Add("交通")
+                            Case "utility" : Tags.Add("实用工具")
+                            Case "worldgen" : Tags.Add("世界生成")
                             '光影包
                             Case "cartoon" : Tags.Add("卡通")
                             Case "cursed" : Tags.Add("Cursed")
@@ -859,6 +904,8 @@ NoSubtitle:
                     Address += "&classId=6"
                 Case CompType.ModPack
                     Address += "&classId=4471"
+                Case CompType.DataPack
+                    Address += "&classId=6945"
                 Case CompType.Shader
                     Address += "&classId=6552"
                 Case CompType.ResourcePack

Plain Craft Launcher 2/Modules/Minecraft/MyCompItem.xaml.vb

@@ -115,11 +115,12 @@
                     TargetLoader = PageDownloadMod.Loader.Input.ModLoader
                 Case CompType.ModPack
                     TargetVersion = If(PageDownloadPack.Loader.Input.GameVersion, "")
+                Case CompType.DataPack
+                    TargetVersion = If(PageDownloadDataPack.Loader.Input.GameVersion, "")
                 Case CompType.Shader
                     TargetVersion = If(PageDownloadShader.Loader.Input.GameVersion, "")
                 Case Else 'CompType.ResourcePack
-                    'FUTURE: Res
+                    TargetVersion = If(PageDownloadResource.Loader.Input.GameVersion, "")
-                    TargetVersion = "" 'If(PageDownloadResource.Loader.Input.GameVersion, "")
             End Select
         End If
         If CType(sender.Tag, CompProject).Type <> CompType.Mod Then TargetLoader = CompModLoaderType.Any

Plain Craft Launcher 2/Modules/ModMain.vb

@@ -405,6 +405,7 @@ EndHint:
     Public FrmDownloadFabric As PageDownloadFabric
     Public FrmDownloadMod As PageDownloadMod
     Public FrmDownloadPack As PageDownloadPack
+    Public FrmDownloadDataPack As PageDownloadDataPack
     Public FrmDownloadShader As PageDownloadShader
     Public FrmDownloadResourcePack As PageDownloadResourcePack
 

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

@@ -294,6 +294,7 @@
                     Case CompType.ModPack : Desc = "整合包"
                     Case CompType.Mod : Desc = "Mod "
                     Case CompType.ResourcePack : Desc = "资源包"
+                    Case CompType.DataPack : Desc = If(File.FileName.EndsWith(".jar"), "Mod ", "数据包") '有些项目同时包含 Mod 版本和数据包版本
                     Case CompType.Shader : Desc = "光影包"
                 End Select
                 '确认默认保存位置

Plain Craft Launcher 2/Pages/PageDownload/PageDownloadDataPack.xaml

@@ -0,0 +1,111 @@
+<local:MyPageRight
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="clr-namespace:PCL" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+    mc:Ignorable="d" x:Class="PageDownloadDataPack"
+    PanScroll="{Binding ElementName=PanBack}">
+    <local:MyScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled" x:Name="PanBack">
+        <StackPanel Orientation="Vertical" Margin="25">
+            <local:MyCard Title="搜索数据包" Margin="0,0,0,15" x:Name="PanAlways">
+                <StackPanel Margin="25,40,25,15">
+                    <Grid Margin="0,0,0,11" HorizontalAlignment="Stretch">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="2.5*" />
+                            <ColumnDefinition Width="50" />
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="1*" />
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="28" />
+                            <RowDefinition Height="9" />
+                            <RowDefinition Height="28" />
+                        </Grid.RowDefinitions>
+                        <TextBlock VerticalAlignment="Center" HorizontalAlignment="Left" Text="名称" Margin="0,0,18,0" />
+                        <local:MyTextBox x:Name="TextSearchName" Grid.Column="1" />
+                        <TextBlock VerticalAlignment="Center" Grid.Column="3" HorizontalAlignment="Left" Text="来源" Margin="0,0,18,0" />
+                        <local:MyComboBox x:Name="ComboSearchSource" Grid.Column="4">
+                            <local:MyComboBoxItem Content="全部" Tag="3" IsSelected="True" />
+                            <local:MyComboBoxItem Content="CurseForge" Tag="1" />
+                            <local:MyComboBoxItem Content="Modrinth" Tag="2" />
+                        </local:MyComboBox>
+                        <TextBlock VerticalAlignment="Center" Grid.Row="2" HorizontalAlignment="Left" Text="版本" Margin="0,0,18,0" />
+                        <local:MyComboBox x:Name="TextSearchVersion" Grid.Row="2" Grid.Column="1" IsEditable="True" MaxDropDownHeight="320">
+                            <local:MyComboBoxItem Content="全部 (也可自行输入)" IsSelected="True" />
+                            <local:MyComboBoxItem Content="1.20.6" />
+                            <local:MyComboBoxItem Content="1.20.4" />
+                            <local:MyComboBoxItem Content="1.20.1" />
+                            <local:MyComboBoxItem Content="1.19.4" />
+                            <local:MyComboBoxItem Content="1.19.2" />
+                            <local:MyComboBoxItem Content="1.18.2" />
+                            <local:MyComboBoxItem Content="1.17.1" />
+                            <local:MyComboBoxItem Content="1.16.5" />
+                            <local:MyComboBoxItem Content="1.15.2" />
+                            <local:MyComboBoxItem Content="1.14.4" />
+                            <local:MyComboBoxItem Content="1.12.2" />
+                            <local:MyComboBoxItem Content="1.11.2" />
+                            <local:MyComboBoxItem Content="1.10.2" />
+                            <local:MyComboBoxItem Content="1.8.9" />
+                            <local:MyComboBoxItem Content="1.7.10" />
+                        </local:MyComboBox>
+                        <TextBlock VerticalAlignment="Center" Grid.Row="2" Grid.Column="3" HorizontalAlignment="Left" Text="类型" Margin="0,0,18,0" />
+                        <local:MyComboBox x:Name="ComboSearchTag" Grid.Column="4" Grid.Row="2" MaxDropDownHeight="320">
+                            <local:MyComboBoxItem Tag="" Content="全部" IsSelected="True" />
+                            <local:MyComboBoxItem Content="冒险" Tag="6948/adventure" />
+                            <local:MyComboBoxItem Content="Cursed" Tag="/cursed" />
+                            <local:MyComboBoxItem Content="装饰" Tag="6554/decoration" />
+                            <local:MyComboBoxItem Content="经济" Tag="6553/economy" />
+                            <local:MyComboBoxItem Content="装备" Tag="/equipment" />
+                            <local:MyComboBoxItem Content="食物" Tag="6555/food" />
+                            <local:MyComboBoxItem Content="游戏机制" Tag="/game-mechanics" />
+                            <local:MyComboBoxItem Content="支持库" Tag="6950/library" />
+                            <local:MyComboBoxItem Content="魔法" Tag="6952/magic" />
+                            <local:MyComboBoxItem Content="管理" Tag="/management" />
+                            <local:MyComboBoxItem Content="小游戏" Tag="/minigame" />
+                            <local:MyComboBoxItem Content="生物" Tag="/mobs" />
+                            <local:MyComboBoxItem Content="优化" Tag="/optimization" />
+                            <local:MyComboBoxItem Content="社交" Tag="/social" />
+                            <local:MyComboBoxItem Content="存储" Tag="/storage" />
+                            <local:MyComboBoxItem Content="科技" Tag="6951/technology" />
+                            <local:MyComboBoxItem Content="交通" Tag="/transportation" />
+                            <local:MyComboBoxItem Content="实用工具" Tag="6953/utility" />
+                            <local:MyComboBoxItem Content="世界生成" Tag="/worldgen" />
+                            <local:MyComboBoxItem Content="Mod 支持" Tag="6946/" />
+                            <local:MyComboBoxItem Content="杂项" Tag="6947/" />
+                            <local:MyComboBoxItem Content="幻想" Tag="6949/" />
+                        </local:MyComboBox>
+                    </Grid>
+                    <Grid Margin="0,4,0,6" Height="35">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" SharedSizeGroup="Button" />
+                            <ColumnDefinition Width="Auto" SharedSizeGroup="Button" />
+                        </Grid.ColumnDefinitions>
+                        <local:MyButton x:Name="BtnSearchRun" Text="搜索" MinWidth="140" Padding="13,0" Margin="0,0,20,0" ColorType="Highlight" />
+                        <local:MyButton x:Name="BtnSearchReset" Text="重置条件" MinWidth="140" Padding="13,0" Margin="0,0,20,0" Grid.Column="1" />
+                    </Grid>
+                </StackPanel>
+            </local:MyCard>
+            <StackPanel x:Name="PanContent">
+                <local:MyHint x:Name="HintError" Text="无法连接到 Modrinth，所以目前仅显示了来自 CurseForge 的内容，结果可能不全。&#xa;请尝试使用 VPN 或加速器以改善网络。" IsWarn="True" Margin="0,0,0,15" />
+                <local:MyCard x:Name="CardProjects" UseAnimation="False">
+                    <StackPanel x:Name="PanProjects" Margin="12" />
+                </local:MyCard>
+                <local:MyCard Margin="0,15,0,0" x:Name="CardPages" HorizontalAlignment="Center">
+                    <StackPanel Orientation="Horizontal" Height="23" Margin="10,7">
+                        <local:MyIconButton x:Name="BtnPageFirst" IsEnabled="False" Opacity="0.2" Margin="0,0.5,5,0.5"
+                            Logo="M496.213333 329.856L315.306667 510.848l180.992 181.077333a42.666667 42.666667 0 1 1-60.330667 60.330667l-211.2-211.2a42.453333 42.453333 0 0 1-11.818667-22.613333l-0.597333-5.034667v-5.034667a42.496 42.496 0 0 1 12.373333-27.648l211.2-211.2a42.666667 42.666667 0 0 1 60.373334 60.330667z m298.666667 0l-180.949333 180.992 180.992 181.077333a42.666667 42.666667 0 1 1-60.330667 60.330667l-211.2-211.2a42.453333 42.453333 0 0 1-11.818667-22.613333l-0.597333-5.034667v-5.034667a42.496 42.496 0 0 1 12.373333-27.648l211.2-211.2a42.666667 42.666667 0 0 1 60.373334 60.330667z" />
+                        <local:MyIconButton x:Name="BtnPageLeft" IsEnabled="False" Opacity="0.2" Margin="0,0,5,0"
+                            Logo="M650.752 278.357333l-241.322667 241.365334 241.322667 241.365333a42.666667 42.666667 0 1 1-60.330667 60.330667l-271.530666-271.530667a42.453333 42.453333 0 0 1-11.818667-22.613333l-0.597333-5.034667v-5.034667a42.496 42.496 0 0 1 12.416-27.648l271.530666-271.530666a42.666667 42.666667 0 0 1 60.330667 60.330666z" />
+                        <TextBlock x:Name="LabPage" Text="1" 
+                                   Margin="8,0,13,0" FontSize="15" VerticalAlignment="Center" Foreground="{DynamicResource ColorBrush3}" />
+                        <local:MyIconButton x:Name="BtnPageRight" Margin="0,0,30,0"
+                            Logo="M404.309333 278.357333l241.322667 241.365334-241.322667 241.365333a42.666667 42.666667 0 1 0 60.330667 60.330667l271.530667-271.530667a42.453333 42.453333 0 0 0 11.818666-22.613333l0.597334-5.034667v-5.034667a42.496 42.496 0 0 0-12.416-27.648L464.64 218.026667a42.666667 42.666667 0 0 0-60.330667 60.330666z" />
+                    </StackPanel>
+                </local:MyCard>
+            </StackPanel>
+            <local:MyCard HorizontalAlignment="Center" VerticalAlignment="Center" SnapsToDevicePixels="True" x:Name="PanLoad" UseAnimation="False" Margin="40,50">
+                <local:MyLoading Text="正在获取数据包列表" Margin="20,20,20,17" x:Name="Load" HorizontalAlignment="Center" VerticalAlignment="Center" />
+            </local:MyCard>
+        </StackPanel>
+    </local:MyScrollViewer>
+</local:MyPageRight>

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

@@ -0,0 +1,122 @@
+Public Class PageDownloadDataPack
+
+    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.DataPack, Storage, (Page + 1) * PageSize)
+        If FrmDownloadDataPack IsNot Nothing Then
+            With Request
+                .SearchText = FrmDownloadDataPack.TextSearchName.Text
+                .GameVersion = If(FrmDownloadDataPack.TextSearchVersion.Text = "全部 (也可自行输入)", Nothing,
+                    If(FrmDownloadDataPack.TextSearchVersion.Text.Contains(".") OrElse FrmDownloadDataPack.TextSearchVersion.Text.Contains("w"), FrmDownloadDataPack.TextSearchVersion.Text, Nothing))
+                .Tag = FrmDownloadDataPack.ComboSearchTag.SelectedItem.Tag
+                .Source = CType(Val(FrmDownloadDataPack.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

Plain Craft Launcher 2/Pages/PageDownload/PageDownloadLeft.xaml

@@ -117,6 +117,14 @@
                 </x:Array>
             </local:MyListItem.Buttons>
         </local:MyListItem>
+        <local:MyListItem x:Name="ItemDataPack" Type="RadioBox" IsScaleAnimationEnabled="False" Tag="15" MinPaddingRight="35" Height="36" VerticalAlignment="Top" Title="数据包"
+                  LogoScale="0.98" Logo="M511.488 995.328a128.654222 128.654222 0 0 1-57.116444-13.112889L70.769778 791.808a126.833778 126.833778 0 0 1-70.769778-113.777778V311.608889a126.179556 126.179556 0 0 1 15.36-60.103111V248.604444c1.479111-2.901333 3.356444-5.603556 5.518222-8.021333a127.630222 127.630222 0 0 1 49.891556-42.325333L454.371556 13.368889a128.739556 128.739556 0 0 1 112.981333 0l383.601778 190.407111a126.862222 126.862222 0 0 1 72.049777 113.379556v360.874666a126.805333 126.805333 0 0 1-70.769777 115.939556L568.604444 984.32c-17.92 7.964444-37.461333 11.747556-57.116444 11.008z m42.638222-470.897778v370.204445l360.192-178.545778c14.449778-7.253333 23.552-21.987556 23.438222-38.087111v-335.928889L554.097778 524.430222zM85.248 330.666667v347.335111a42.268444 42.268444 0 0 0 23.438222 38.087111l360.192 178.545778V523.576889L85.248 330.666667zM135.537778 260.835556l375.950222 189.952 137.671111-65.564445L286.435556 188.074667 135.537778 260.864z m245.105778-118.471112l363.576888 197.973334 150.897778-71.480889-365.283555-180.224a42.922667 42.922667 0 0 0-37.518223 0l-111.672888 53.731555z">
+            <local:MyListItem.Buttons>
+                <x:Array Type="{x:Type local:MyIconButton}">
+                    <local:MyIconButton Tag="15" ToolTip="刷新" ToolTipService.Placement="Right" ToolTipService.InitialShowDelay="200" ToolTipService.VerticalOffset="-1" LogoScale="0.85" Click="Refresh" Logo="M875.52 148.48C783.36 56.32 655.36 0 512 0 291.84 0 107.52 138.24 30.72 332.8l122.88 46.08C204.8 230.4 348.16 128 512 128c107.52 0 199.68 40.96 271.36 112.64L640 384h384V0L875.52 148.48zM512 896c-107.52 0-199.68-40.96-271.36-112.64L384 640H0v384l148.48-148.48C240.64 967.68 368.64 1024 512 1024c220.16 0 404.48-138.24 481.28-332.8L870.4 645.12C819.2 793.6 675.84 896 512 896z" />
+                </x:Array>
+            </local:MyListItem.Buttons>
+        </local:MyListItem>
 
         </StackPanel>
     </local:MyScrollViewer>

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

@@ -11,7 +11,7 @@
     ''' <summary>
     ''' 勾选事件改变页面。
     ''' </summary>
-    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, ItemResourcePack.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, ItemDataPack.Check, ItemShader.Check, ItemResourcePack.Check
         '尚未初始化控件属性时，sender.Tag 为 Nothing，会导致切换到页面 0
         '若使用 IsLoaded，则会导致模拟点击不被执行（模拟点击切换页面时，控件的 IsLoaded 为 False）
         If sender.Tag IsNot Nothing Then PageChange(Val(sender.Tag))
@@ -47,6 +47,9 @@
             Case FormMain.PageSubType.DownloadPack
                 If FrmDownloadPack Is Nothing Then FrmDownloadPack = New PageDownloadPack
                 Return FrmDownloadPack
+            Case FormMain.PageSubType.DownloadDataPack
+                If FrmDownloadDataPack Is Nothing Then FrmDownloadDataPack = New PageDownloadDataPack
+                Return FrmDownloadDataPack
             Case FormMain.PageSubType.DownloadShader
                 If FrmDownloadShader Is Nothing Then FrmDownloadShader = New PageDownloadShader
                 Return FrmDownloadShader
@@ -129,6 +132,12 @@
                 CompFilesCache.Clear()
                 If FrmDownloadPack IsNot Nothing Then FrmDownloadPack.PageLoaderRestart()
                 ItemPack.Checked = True
+            Case FormMain.PageSubType.DownloadDataPack
+                PageDownloadDataPack.Storage = New CompProjectStorage
+                PageDownloadDataPack.Page = 0
+                CompProjectCache.Clear()
+                If FrmDownloadDataPack IsNot Nothing Then FrmDownloadDataPack.PageLoaderRestart()
+                ItemDataPack.Checked = True
             Case FormMain.PageSubType.DownloadShader
                 PageDownloadShader.Storage = New CompProjectStorage
                 PageDownloadShader.Page = 0

Plain Craft Launcher 2/Plain Craft Launcher 2.vbproj

@@ -239,6 +239,9 @@
     <Compile Include="Modules\Minecraft\MyCompItem.xaml.vb">
       <DependentUpon>MyCompItem.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Pages\PageDownload\PageDownloadDataPack.xaml.vb">
+      <DependentUpon>PageDownloadDataPack.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Pages\PageDownload\PageDownloadResourcePack.xaml.vb">
       <DependentUpon>PageDownloadResourcePack.xaml</DependentUpon>
     </Compile>
@@ -503,6 +506,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Pages\PageDownload\PageDownloadDataPack.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Pages\PageDownload\PageDownloadResourcePack.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>