2.13.0.0

2026-07-02 23:24:29 +08:00
parent 124e3be6bf
commit c6d0457946
193 changed files with 3112 additions and 3747 deletions
@@ -1,4 +1,4 @@
-<Grid x:Class="MyResourceItem"
+<Grid x:Class="MyResourceItem"
             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:local="clr-namespace:PCL"
@@ -41,10 +41,9 @@
    <TextBlock x:Name="LabInfo" Grid.Row="2" Grid.Column="4" VerticalAlignment="Bottom" Margin="0,0,3,0.5"
               TextTrimming="CharacterEllipsis" FontSize="12" Foreground="{StaticResource ColorBrushGray3}"
               IsHitTestVisible="True" SnapsToDevicePixels="False" UseLayoutRounding="False"
-               ToolTipService.InitialShowDelay="100" ToolTipService.BetweenShowDelay="100" 
-               ToolTipService.Placement="Relative" ToolTipService.PlacementRectangle="-16,-10,500,10000">
+               ToolTipService.InitialShowDelay="100">
        <TextBlock.ToolTip>
-            <ToolTip x:Name="ToolTipInfo" Style="{StaticResource ExtendTextToolTip}" />
+            <ToolTip x:Name="ToolTipInfo" />
        </TextBlock.ToolTip>
    </TextBlock>
    <!-- 下边栏 -->
@@ -1,4 +1,4 @@
-Public Class MyResourceItem
+Public Class MyResourceItem

 #Region "基础属性"
    Public Uuid As Integer = GetUuid()
@@ -38,19 +38,9 @@
    End Property
    '指向时扩展描述
    Private Sub LabInfo_MouseEnter(sender As Object, e As MouseEventArgs) Handles LabInfo.MouseEnter
-        If IsTextTrimmed(LabInfo) Then
-            ToolTipInfo.Content = LabInfo.Text
-            ToolTipInfo.Width = LabInfo.ActualWidth + 25
-            LabInfo.ToolTip = ToolTipInfo
-        Else
-            LabInfo.ToolTip = Nothing
-        End If
+        ToolTipInfo.Content = LabInfo.Text
+        LabInfo.ToolTip = If(IsTextTrimmed(LabInfo), ToolTipInfo, Nothing)
    End Sub
-    Private Function IsTextTrimmed(textBlock As TextBlock) As Boolean
-        Dim typeface As New Typeface(textBlock.FontFamily, textBlock.FontStyle, textBlock.FontWeight, textBlock.FontStretch)
-        Dim formattedText As New FormattedText(textBlock.Text, Thread.CurrentThread.CurrentCulture, textBlock.FlowDirection, typeface, textBlock.FontSize, textBlock.Foreground, DPI)
-        Return formattedText.Width > textBlock.ActualWidth
-    End Function

    'Tag
    Public WriteOnly Property Tags As List(Of String)
@@ -1,4 +1,4 @@
-<local:MyPageRight
+<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" 
@@ -1,4 +1,6 @@
-Public Class PageDownloadResourceDetail
+Imports System.Collections.ObjectModel
+
+Public Class PageDownloadResourceDetail
    Private ResourceItem As MyResourceItem = Nothing

    ''' <summary>
@@ -24,7 +26,7 @@
        Sub(Task)
            LoadPageArguments()
            Dim Result = ResourceVersion.FromProjectId(Project.Id, Project.Platform)
-            If Task.IsInterrupted Then Return
+            If Task.IsCanceled Then Return
            Task.Output = Result
        End Sub)

@@ -157,7 +159,7 @@ GroupDone:
        Dim Results = GetResults()

        Dim TargetCardName As String = If(TargetVersion <> "" OrElse TargetLoaders <> ModLoaders.None,
-            $"{If(TargetLoaders <> ModLoaders.None, TargetLoaders.ToString & " ", "")}{TargetVersion}（所选版本）", "")
+            $"{If(TargetLoaders <> ModLoaders.None, TargetLoaders.ToString + " ", "")}{TargetVersion}（所选版本）", "")
        '归类到卡片下
        Dim Dict As New SortedDictionary(Of String, List(Of ResourceVersion))(New CardSorter(TargetCardName))
        Dict.Add("其他", New List(Of ResourceVersion))
@@ -298,7 +300,7 @@ GroupDone:
            Dim PackName As String = Project.TranslatedName.Replace(".zip", "").Replace(".rar", "").Replace(".mrpack", "").Replace("\", "＼").Replace("/", "／").Replace("|", "｜").Replace(":", "：").Replace("<", "＜").Replace(">", "＞").Replace("*", "＊").Replace("?", "？").Replace("""", "").Replace("： ", "：")
            Dim Validate As New ValidateFolderName(McFolderSelected & "versions")
            If Validate.Validate(PackName) <> "" Then PackName = ""
-            Dim InstanceName As String = MyMsgBoxInput("输入版本名称", "", PackName, New ObjectModel.Collection(Of Validate) From {Validate})
+            Dim InstanceName As String = MyMsgBoxInput("输入版本名称", "", PackName, New Collection(Of Validate) From {Validate})
            If String.IsNullOrEmpty(InstanceName) Then Return

            '构造步骤加载器
@@ -317,7 +319,7 @@ GroupDone:
                Select Case MyLoader.State
                    Case LoadState.Failed
                        Hint(MyLoader.Name & "失败：" & MyLoader.Error.GetDisplay(False), HintType.Red)
-                    Case LoadState.Interrupted
+                    Case LoadState.Canceled
                        Hint(MyLoader.Name & "已取消！", HintType.Blue)
                    Case LoadState.Loading
                        Return '不重新加载版本列表
@@ -1,4 +1,4 @@
-<local:MyPageRight
+<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" 
@@ -1,2 +1,2 @@
-Public Class PageDownloadDataPack
+Public Class PageDownloadDataPack
 End Class
@@ -1,4 +1,4 @@
-<local:MyPageRight
+<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" 
@@ -1,2 +1,2 @@
-Public Class PageDownloadMod
+Public Class PageDownloadMod
 End Class
@@ -1,4 +1,4 @@
-<local:MyPageRight
+<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" 
@@ -20,7 +20,7 @@
        <local:MyComboBoxItem Tag="4474/" Content="科幻" />
        <local:MyComboBoxItem Tag="4736/" Content="空岛" />
        <local:MyComboBoxItem Tag="5128/" Content="原版改良" />
-        <local:MyComboBoxItem Tag="4487/" Content="FTB" ToolTip="由 FTB 官方发布" ToolTipService.HorizontalOffset="70" />
+        <local:MyComboBoxItem Tag="4487/" Content="FTB" ToolTip="由 FTB 官方发布" />
        <local:MyComboBoxItem Tag="4480/" Content="基于地图" />
        <local:MyComboBoxItem Tag="4481/lightweight" Content="轻量整合" />
        <local:MyComboBoxItem Tag="4482/" Content="大型整合" />
@@ -1,2 +1,2 @@
-Public Class PageDownloadPack
+Public Class PageDownloadPack
 End Class
@@ -1,4 +1,4 @@
-<local:MyPageRight
+<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" 
@@ -1,2 +1,2 @@
-Public Class PageDownloadResourcePack
+Public Class PageDownloadResourcePack
 End Class
@@ -1,4 +1,4 @@
-<local:MyPageRight
+<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" 
@@ -27,7 +27,7 @@
        <local:MyComboBoxItem Margin="15,0,0,0" Content="高" Tag="/high" />

        <local:MyComboBoxItem Content="加载器" IsEnabled="False" />
-        <local:MyComboBoxItem Margin="15,0,0,0" Content="原版可用" Tag="/vanilla" ToolTip="作为资源包加载，可以直接在原版游戏里使用。" ToolTipService.HorizontalOffset="70" />
+        <local:MyComboBoxItem Margin="15,0,0,0" Content="原版可用" Tag="/vanilla" ToolTip="作为资源包加载，可以直接在原版游戏里使用。" />
        <local:MyComboBoxItem Margin="15,0,0,0" Content="Iris" Tag="/iris" />
        <local:MyComboBoxItem Margin="15,0,0,0" Content="OptiFine" Tag="/optifine" />
    </local:PageResource>
@@ -1,2 +1,2 @@
-Public Class PageDownloadShader
+Public Class PageDownloadShader
 End Class
@@ -1,4 +1,4 @@
-<local:MyScrollViewer x:Class="PageResource"
+<local:MyScrollViewer x:Class="PageResource"
      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
@@ -32,7 +32,7 @@
                        <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" Grid.ColumnSpan="2" IsEditable="True">
+                    <local:MyComboBox x:Name="TextSearchVersion" Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="2" IsEditable="True" IsTextSearchEnabled="False">
                        <local:MyComboBoxItem Content="全部 (也可自行输入)" IsSelected="True" />
                        <local:MyComboBoxItem Content="26.1" />
                        <local:MyComboBoxItem Content="1.21.11" />
@@ -66,7 +66,7 @@
                    <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" />
                    <local:MyButton x:Name="BtnSearchInstallModPack" Text="安装已有整合包" MinWidth="140" Padding="13,0" Margin="0,0,20,0" Grid.Column="2"
-                                    ToolTip="在当前选择的 Minecraft 文件夹下安装整合包" ToolTipService.HorizontalOffset="-55" ToolTipService.VerticalOffset="5" />
+                                    ToolTip="在当前选择的 Minecraft 文件夹下安装整合包" />
                </Grid>
            </StackPanel>
        </local:MyCard>
@@ -1,4 +1,4 @@
-Imports System.Windows.Markup
+Imports System.Windows.Markup

 <ContentProperty("SearchTags")>
 Public Class PageResource