2.6.11

2023-11-27 00:49:59 +08:00
parent e2a3dd3281
commit 2c7b532188
50 changed files with 1552 additions and 782 deletions
@@ -3,17 +3,17 @@
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:local="clr-namespace:PCL" AnimatedControl="{Binding ElementName=PanItem, Mode=OneWay}">
    <StackPanel Margin="0,12,0,0" Name="PanItem">
-        <local:MyListItem x:Name="ItemOverall" IsScaleAnimationEnabled="False" Checked="True" Type="RadioBox" Tag="0" PaddingRight="35" Height="36" VerticalAlignment="Top" Title="概览"
+        <local:MyListItem x:Name="ItemOverall" IsScaleAnimationEnabled="False" Checked="True" Type="RadioBox" Tag="0" MinPaddingRight="35" Height="36" VerticalAlignment="Top" Title="概览"
                          Logo="M12 0l-11 6v12.131l11 5.869 11-5.869v-12.066l-11-6.065zm-1 21.2l-6.664-3.555 4.201-2.801c1.08-.719-.066-2.359-1.243-1.575l-4.294 2.862v-7.901l8 4.363v8.607zm-6.867-14.63l6.867-3.746v4.426c0 1.323 2 1.324 2 0v-4.415l6.91 3.811-7.905 4.218-7.872-4.294zm8.867 6.03l8-4.269v7.8l-4.263-2.842c-1.181-.785-2.323.855-1.245 1.574l4.172 2.781-6.664 3.556v-8.6z" />
-        <local:MyListItem x:Name="ItemSetup" IsScaleAnimationEnabled="False" Tag="1" PaddingRight="38" Height="36" VerticalAlignment="Top" Title="设置" Type="RadioBox"
+        <local:MyListItem x:Name="ItemSetup" IsScaleAnimationEnabled="False" Tag="1" MinPaddingRight="35" Height="36" VerticalAlignment="Top" Title="设置" Type="RadioBox"
                          LogoScale="1.02" Logo="M292.693 787.627c0 30.72-24.746 55.466-55.466 55.466s-55.467-24.746-55.467-55.466 24.747-55.467 55.467-55.467c30.72-0.853 55.466 24.747 55.466 55.467z M1000.96 241.493c-2.56-5.973-4.267-11.946-6.827-17.92-0.853-6.826-4.266-12.8-8.533-17.92-7.68-9.386-18.773-15.36-31.573-15.36-6.827 0-13.654 1.707-19.627 5.12l-15.36 15.36-17.067 17.067-21.333 21.333L749.227 381.44c-14.507 14.507-38.4 14.507-52.907 0l-54.613-54.613c-14.507-14.507-14.507-38.4 0-52.907l132.266-132.267 14.507-14.506 20.48-20.48 16.213-16.214c3.414-5.973 5.12-11.946 5.12-19.626 0-12.8-5.973-24.747-16.213-32.427-5.973-4.267-11.947-6.827-18.773-7.68-5.12-2.56-10.24-4.267-16.214-5.973-36.693-12.8-76.8-19.627-117.76-19.627-7.68 0-14.506 0-22.186 0.853-188.587 11.947-337.92 168.107-337.92 360.96 0 16.214 0.853 32.427 3.413 48.64L56.32 663.04c-73.387 74.24-73.387 193.707 0 267.093l33.28 33.28c73.387 73.387 193.707 73.387 267.093 0l240.64-241.493c21.334 4.267 42.667 5.973 64 5.973 190.294 0 346.454-146.773 360.107-333.653 0.853-8.533 0.853-17.92 0.853-27.307 0.854-44.373-6.826-86.186-21.333-125.44zM658.773 639.147c-28.16 0-54.613-4.267-79.36-11.094-4.266 7.68-10.24 14.507-16.213 21.334l-258.56 258.56c-43.52 43.52-115.2 43.52-158.72 0l-29.013-29.014c-43.52-44.373-43.52-115.2 0-158.72l212.48-212.48 46.08-46.08c5.973-5.973 12.8-11.093 19.626-15.36-8.533-26.453-12.8-54.613-12.8-83.626v-1.707c0-152.747 123.734-275.627 276.48-275.627 18.774 0 37.547 1.707 55.467 5.974L597.333 207.36c-52.053 52.053-52.053 137.387 0 189.44l29.867 29.867c52.053 52.053 137.387 52.053 189.44 0L930.987 312.32c2.56 16.213 4.266 33.28 4.266 50.347 0 152.746-123.733 276.48-276.48 276.48z">
            <local:MyListItem.Buttons>
                <x:Array Type="{x:Type local:MyIconButton}">
-                    <local:MyIconButton Tag="1" ToolTip="初始化" ToolTipService.Placement="Right" ToolTipService.InitialShowDelay="200" ToolTipService.VerticalOffset="-1" Click="Reset" Logo="M835.072 184.32l-77.824 81.92c-64.512-66.56-153.6-106.496-251.904-106.496-195.584 0-355.328 159.744-355.328 354.304 0 195.584 159.744 354.304 355.328 354.304 147.456 0 304.128-80.896 337.92-245.76 3.072-15.36-9.216-23.552-21.504-23.552l-72.704 0c-15.36 0-28.672 14.336-29.696 24.576 0 2.048 0 3.072-1.024 3.072-32.768 96.256-107.52 119.808-212.992 119.808-128 0-232.448-104.448-232.448-232.448s104.448-231.424 232.448-231.424c64.512 0 121.856 26.624 165.888 69.632l-101.376 100.352c-1.024 0-1.024 1.024-2.048 1.024-20.48 22.528-12.288 37.888 11.264 37.888l256 0c22.528 0 36.864-15.36 36.864-37.888L871.936 193.536C870.912 174.08 857.6 166.912 835.072 184.32z" LogoScale="0.9" />
+                    <local:MyIconButton Tag="1" ToolTip="初始化" ToolTipService.Placement="Right" ToolTipService.InitialShowDelay="200" ToolTipService.VerticalOffset="-1" Click="Reset" Logo="M530 0c287 0 521 229 521 511s-233 511-521 511c-233 0-436-151-500-368a63 63 0 0 1 44-79 65 65 0 0 1 80 43c48 162 200 276 375 276 215 0 390-171 390-383s-174-383-390-383c-103 0-199 39-270 106l21-5a63 63 0 0 1 33 123l-157 42a65 65 0 0 1-90-42l-49-183a65 65 0 1 1 126-33l6 26A524 524 0 0 1 530 0z" LogoScale="0.9" />
                </x:Array>
            </local:MyListItem.Buttons>
        </local:MyListItem>
-        <local:MyListItem x:Name="ItemMod" IsScaleAnimationEnabled="False" Type="RadioBox" Tag="2" PaddingRight="35" Height="36" VerticalAlignment="Top" Title="Mod 管理"
+        <local:MyListItem x:Name="ItemMod" IsScaleAnimationEnabled="False" Type="RadioBox" Tag="2" MinPaddingRight="35" Height="36" VerticalAlignment="Top" Title="Mod 管理"
                          Logo="M789.504 912.896h-195.072a35.328 35.328 0 0 1-34.816-35.328v-77.312a39.936 39.936 0 0 0-40.448-39.936H481.28a40.448 40.448 0 0 0-40.448 39.936v77.312a34.816 34.816 0 0 1-34.816 35.328H204.8a41.984 41.984 0 0 1-40.448-42.496v-200.192a35.328 35.328 0 0 1 35.328-35.328h72.704a39.936 39.936 0 0 0 39.936-39.936v-37.888a39.936 39.936 0 0 0-39.936-40.448H199.68a35.328 35.328 0 0 1-35.328-35.328V287.744A41.984 41.984 0 0 1 204.8 245.76h176.64v-32.768a102.4 102.4 0 0 1 102.4-102.4h33.792a102.4 102.4 0 0 1 102.4 102.4v32.768h170.496a41.984 41.984 0 0 1 41.984 41.984V460.8h28.672a102.4 102.4 0 0 1 102.4 102.4v33.792a102.4 102.4 0 0 1-102.4 102.4h-28.672V870.4a41.984 41.984 0 0 1-43.008 42.496z m-159.744-70.144h131.584V665.6a34.304 34.304 0 0 1 34.816-34.816h64a31.744 31.744 0 0 0 31.744-31.744V563.2a31.744 31.744 0 0 0-31.744-31.744h-64a34.816 34.816 0 0 1-34.816-35.328V316.416h-177.152a35.328 35.328 0 0 1-35.328-35.328V212.992a31.744 31.744 0 0 0-31.744-31.744h-33.792a31.744 31.744 0 0 0-31.744 31.744v68.096a35.328 35.328 0 0 1-34.816 35.328H234.496v130.048h37.888a110.592 110.592 0 0 1 110.08 110.592v37.888a110.592 110.592 0 0 1-110.08 110.592h-37.888v137.216h136.192v-42.496a110.592 110.592 0 0 1 110.592-110.08h37.888a110.592 110.592 0 0 1 110.592 110.08z" >
            <local:MyListItem.Buttons>
                <x:Array Type="{x:Type local:MyIconButton}">
@@ -21,7 +21,7 @@
                </x:Array>
            </local:MyListItem.Buttons>
        </local:MyListItem>
-        <local:MyListItem x:Name="ItemModDisabled" IsScaleAnimationEnabled="False" Type="RadioBox" Tag="3" PaddingRight="35" Height="36" VerticalAlignment="Top" Title="Mod 管理"
+        <local:MyListItem x:Name="ItemModDisabled" IsScaleAnimationEnabled="False" Type="RadioBox" Tag="3" MinPaddingRight="35" Height="36" VerticalAlignment="Top" Title="Mod 管理"
                          Logo="M789.504 912.896h-195.072a35.328 35.328 0 0 1-34.816-35.328v-77.312a39.936 39.936 0 0 0-40.448-39.936H481.28a40.448 40.448 0 0 0-40.448 39.936v77.312a34.816 34.816 0 0 1-34.816 35.328H204.8a41.984 41.984 0 0 1-40.448-42.496v-200.192a35.328 35.328 0 0 1 35.328-35.328h72.704a39.936 39.936 0 0 0 39.936-39.936v-37.888a39.936 39.936 0 0 0-39.936-40.448H199.68a35.328 35.328 0 0 1-35.328-35.328V287.744A41.984 41.984 0 0 1 204.8 245.76h176.64v-32.768a102.4 102.4 0 0 1 102.4-102.4h33.792a102.4 102.4 0 0 1 102.4 102.4v32.768h170.496a41.984 41.984 0 0 1 41.984 41.984V460.8h28.672a102.4 102.4 0 0 1 102.4 102.4v33.792a102.4 102.4 0 0 1-102.4 102.4h-28.672V870.4a41.984 41.984 0 0 1-43.008 42.496z m-159.744-70.144h131.584V665.6a34.304 34.304 0 0 1 34.816-34.816h64a31.744 31.744 0 0 0 31.744-31.744V563.2a31.744 31.744 0 0 0-31.744-31.744h-64a34.816 34.816 0 0 1-34.816-35.328V316.416h-177.152a35.328 35.328 0 0 1-35.328-35.328V212.992a31.744 31.744 0 0 0-31.744-31.744h-33.792a31.744 31.744 0 0 0-31.744 31.744v68.096a35.328 35.328 0 0 1-34.816 35.328H234.496v130.048h37.888a110.592 110.592 0 0 1 110.08 110.592v37.888a110.592 110.592 0 0 1-110.08 110.592h-37.888v137.216h136.192v-42.496a110.592 110.592 0 0 1 110.592-110.08h37.888a110.592 110.592 0 0 1 110.592 110.08z" />
    </StackPanel>
 </local:MyPageLeft>
@@ -89,7 +89,14 @@

    Public Sub Refresh(sender As Object, e As EventArgs) '由边栏按钮匿名调用
        '强制刷新
-        If FrmVersionMod IsNot Nothing Then FrmVersionMod.RefreshList(True) '没有 Else，还没加载刷个鬼的新
+        Try
+            CompProjectCache.Clear()
+            File.Delete(PathTemp & "Cache\LocalMod.json")
+            Log("[Mod] 由于点击刷新按钮，清理本地 Mod 信息缓存")
+        Catch ex As Exception
+            Log(ex, "强制刷新时清理本地 Mod 信息缓存失败")
+        End Try
+        If FrmVersionMod IsNot Nothing Then FrmVersionMod.RefreshList(True) '无需 Else，还没加载刷个鬼的新
        ItemMod.Checked = True
        Hint("正在刷新……", Log:=False)
    End Sub
@@ -9,23 +9,21 @@
            <local:MyScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled" x:Name="PanBack">
                <StackPanel x:Name="PanMain" Margin="25,10,25,10" Grid.IsSharedSizeScope="True"> <!-- 若显示多选模块则为 92 -->
                    <local:MySearchBox Margin="0,15" HintText="搜索 Mod" x:Name="SearchBox" />
-                    <local:MyCard Grid.Row="0" Margin="0,0,0,15" Title="管理" x:Name="PanManage">
-                        <StackPanel Margin="25,40,15,20">
-                            <TextBlock Margin="0,0,0,11" Text="点击红石灯图标可以快速启用或禁用单个 Mod。将 Mod 文件拖入窗口即可快速安装。" TextWrapping="Wrap" />
-                            <Grid Height="35">
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto" SharedSizeGroup="Button" />
-                                    <ColumnDefinition Width="Auto" SharedSizeGroup="Button" />
-                                    <ColumnDefinition Width="Auto" SharedSizeGroup="Button" />
-                                </Grid.ColumnDefinitions>
-                                <local:MyButton x:Name="BtnManageOpen" Grid.Column="0" MinWidth="140" Text="打开 Mod 文件夹" Padding="13,0" Margin="0,0,20,0" HorizontalAlignment="Left" ColorType="Highlight" />
-                                <local:MyButton x:Name="BtnManageSelectAll" Grid.Column="1" MinWidth="140" Text="全选" Padding="13,0" Margin="0,0,20,0" HorizontalAlignment="Left" />
-                                <local:MyButton x:Name="BtnManageCheck" Grid.Column="2" MinWidth="140" Text="检查 Mod" Padding="13,0" Margin="0,0,20,0" HorizontalAlignment="Left" ToolTip="快速检查 Mod 的版本要求、重复、前置缺失等问题。&#xa;结果仅供参考，由于部分 Mod 标注的信息有误，可能并不准确。" Visibility="Collapsed" />
-                            </Grid>
-                        </StackPanel>
+                    <local:MyCard Grid.Row="0" Margin="0,0,0,15" x:Name="PanManage">
+                        <Grid Margin="15,15,0,15" Height="35">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto" SharedSizeGroup="Button" />
+                                <ColumnDefinition Width="Auto" SharedSizeGroup="Button" />
+                                <ColumnDefinition Width="Auto" SharedSizeGroup="Button" />
+                                <ColumnDefinition Width="Auto" SharedSizeGroup="Button" />
+                            </Grid.ColumnDefinitions>
+                            <local:MyButton x:Name="BtnManageOpen" Grid.Column="0" MinWidth="140" Text="打开 Mod 文件夹" Padding="13,0" Margin="0,0,20,0" HorizontalAlignment="Left" ColorType="Highlight" />
+                            <local:MyButton x:Name="BtnManageSelectAll" Grid.Column="1" MinWidth="140" Text="全选" Padding="13,0" Margin="0,0,20,0" HorizontalAlignment="Left" />
+                            <local:MyButton x:Name="BtnManageInstall" Grid.Column="2" MinWidth="140" Text="安装 Mod" Padding="13,0" Margin="0,0,20,0" HorizontalAlignment="Left" ToolTip="将 Mod 文件直接拖入 PCL 窗口即可快捷安装！" ToolTipService.InitialShowDelay="0" />
+                            <local:MyButton x:Name="BtnManageCheck" Grid.Column="3" MinWidth="140" Text="检查 Mod" Padding="13,0" Margin="0,0,20,0" HorizontalAlignment="Left" ToolTip="快速检查 Mod 的版本要求、重复、前置缺失等问题。&#xa;结果仅供参考，由于部分 Mod 标注的信息有误，可能并不准确。" Visibility="Collapsed" />
+                        </Grid>
                    </local:MyCard>
                    <Grid>
-                        <!--虽然不知道为什么但是删掉这个 Grid 在搜索结束的时候就会出现显示问题-->
                        <local:MyCard x:Name="PanSearch" Visibility="Collapsed" VerticalAlignment="Top" Opacity="0" Margin="0,0,0,15" Title=" " MinHeight="40">
                            <StackPanel Margin="20,40,18,18" Name="PanSearchList" VerticalAlignment="Top" />
                        </local:MyCard>
@@ -67,7 +67,7 @@

            SearchBox.Text = ""
            '建立 StackPanel
-            PanItems = New StackPanel With {.Margin = New Thickness(18, MyCard.SwapedHeight, 18, If(List.Count > 0, 20, 0)), .VerticalAlignment = VerticalAlignment.Top, .RenderTransform = New TranslateTransform(0, 0)}
+            PanItems = New StackPanel With {.Margin = New Thickness(20, 38, 18, If(List.Count > 0, 20, 0)), .VerticalAlignment = VerticalAlignment.Top, .RenderTransform = New TranslateTransform(0, 0)}
            For Each ModEntity As McMod In List
                PanItems.Children.Add(McModListItem(ModEntity))
            Next
@@ -95,63 +95,20 @@
        If Counter(McMod.McModState.Unavaliable) > 0 Then TypeList.Add("错误 " & Counter(McMod.McModState.Unavaliable))
        Return "Mod 列表（" & Join(TypeList, "，") & "）"
    End Function
-    Private Function McModListItem(Entry As McMod) As MyListItem
-        '图标
-        Dim Logo As String
-        Select Case Entry.State
-            Case McMod.McModState.Fine
-                Logo = "pack://application:,,,/images/Blocks/RedstoneLampOn.png"
-            Case McMod.McModState.Disabled
-                Logo = "pack://application:,,,/images/Blocks/RedstoneLampOff.png"
-            Case Else '出错
-                Logo = "pack://application:,,,/images/Blocks/RedstoneBlock.png"
-        End Select
-        '文本
-        Dim Title As String
-        If Entry.State = McMod.McModState.Disabled Then
-            Title = GetFileNameWithoutExtentionFromPath(Entry.Path.Substring(0, Entry.Path.Count - ".disabled".Count)) & "（已禁用）"
-        Else
-            Title = GetFileNameWithoutExtentionFromPath(Entry.Path)
-        End If
-        Dim Desc As String
-        If Entry.Version Is Nothing OrElse Entry.Description IsNot Nothing Then
-            Desc = Entry.Name & If(Entry.Version Is Nothing, "", " (" & Entry.Version & ")") & " : " & If(Entry.Description, Entry.Path)
-        ElseIf Entry.IsFileAvailable Then
-            Desc = Entry.Path
-        Else
-            Desc = "存在错误 : " & Entry.Path
-        End If
-        'Desc = If(Entry.ModId, "无可用名称") & " (" & If(Entry.Version, "无可用版本") & ")"
-        'If Entry.Dependencies.Count > 0 Then
-        '    Dim DepList As New List(Of String)
-        '    For Each Dep In Entry.Dependencies
-        '        DepList.Add(Dep.Key & If(Dep.Value Is Nothing, "", "@" & Dep.Value))
-        '    Next
-        '    Desc += " : " & Join(DepList, ", ")
-        'End If
-        '实例化
+    Private Function McModListItem(Entry As McMod) As MyLocalModItem
        AniControlEnabled += 1
-        Dim NewItem As New MyListItem With {
-            .LogoClickable = True, .Logo = Logo, .SnapsToDevicePixels = True, .Title = Title, .Info = Desc, .Height = 42, .Tag = Entry,
-            .Type = MyListItem.CheckType.CheckBox, .IsScaleAnimationEnabled = False,
-            .PaddingRight = 73,
-            .ContentHandler = AddressOf McModContent, .Checked = SelectedMods.Contains(Entry.RawFileName)
-        }
+        Dim NewItem As New MyLocalModItem With {.SnapsToDevicePixels = True, .Entry = Entry,
+            .ButtonHandler = AddressOf McModContent, .Checked = SelectedMods.Contains(Entry.RawFileName)}
+        AddHandler Entry.OnGetCompProject, AddressOf NewItem.Refresh
+        NewItem.Refresh()
        AniControlEnabled -= 1
        Return NewItem
    End Function
-    Private Sub McModContent(sender As MyListItem, e As EventArgs)
-        Dim ModEntity As McMod = sender.Tag
-        '注册点击事件
+    Private Sub McModContent(sender As MyLocalModItem, e As EventArgs)
+        '点击事件
        AddHandler sender.Changed, AddressOf CheckChanged
-        AddHandler sender.LogoClick, AddressOf ItemLogo_Click
+        AddHandler sender.Click, Sub(ss As MyLocalModItem, ee As EventArgs) ss.Checked = Not ss.Checked
        '图标按钮
-        Dim BtnDel As New MyIconButton With {.LogoScale = 1.1, .Logo = Logo.IconButtonDelete, .Tag = sender}
-        BtnDel.ToolTip = "删除"
-        ToolTipService.SetPlacement(BtnDel, Primitives.PlacementMode.Center)
-        ToolTipService.SetVerticalOffset(BtnDel, 30)
-        ToolTipService.SetHorizontalOffset(BtnDel, 2)
-        AddHandler BtnDel.Click, AddressOf Delete_Click
        Dim BtnOpen As New MyIconButton With {.LogoScale = 1.15, .Logo = Logo.IconButtonOpen, .Tag = sender}
        BtnOpen.ToolTip = "打开文件位置"
        ToolTipService.SetPlacement(BtnOpen, Primitives.PlacementMode.Center)
@@ -165,7 +122,7 @@
        ToolTipService.SetHorizontalOffset(BtnCont, 2)
        AddHandler BtnCont.Click, AddressOf Info_Click
        AddHandler sender.MouseRightButtonDown, AddressOf Info_Click
-        sender.Buttons = {BtnCont, BtnOpen, BtnDel}
+        sender.Buttons = {BtnCont, BtnOpen}
    End Sub

 #End Region
@@ -206,7 +163,11 @@
    ''' 全选。
    ''' </summary>
    Private Sub BtnManageSelectAll_Click(sender As Object, e As MouseButtonEventArgs) Handles BtnManageSelectAll.Click
-        ChangeAllSelected(True)
+        If SelectedMods.Count < If(IsSearching, PanSearchList.Children.Count, McModLoader.Output.Count) Then
+            ChangeAllSelected(True)
+        Else
+            ChangeAllSelected(False)
+        End If
    End Sub

 #End Region
@@ -217,10 +178,10 @@
    Public SelectedMods As New List(Of String)

    '单项切换选择状态
-    Public Sub CheckChanged(sender As MyListItem, e As RouteEventArgs)
+    Public Sub CheckChanged(sender As MyLocalModItem, e As RouteEventArgs)
        If AniControlEnabled <> 0 Then Return
        '更新选择了的内容
-        Dim SelectedKey As String = CType(sender.Tag, McMod).RawFileName
+        Dim SelectedKey As String = sender.Entry.RawFileName
        If sender.Checked Then
            If Not SelectedMods.Contains(SelectedKey) Then SelectedMods.Add(SelectedKey)
        Else
@@ -304,13 +265,13 @@
        SelectedMods.Clear()
        If IsSearching Then
            '搜索中
-            For Each Item As MyListItem In PanSearchList.Children
+            For Each Item As MyLocalModItem In PanSearchList.Children
                Item.Checked = Value
-                If Value Then SelectedMods.Add(CType(Item.Tag, McMod).RawFileName)
+                If Value Then SelectedMods.Add(Item.Entry.RawFileName)
            Next
            If Not Value Then '只取消选择
                If PanItems IsNot Nothing Then
-                    For Each Item As MyListItem In PanItems.Children
+                    For Each Item As MyLocalModItem In PanItems.Children
                        Item.Checked = Value
                    Next
                End If
@@ -318,9 +279,9 @@
        Else
            '非搜索中
            If PanItems IsNot Nothing Then
-                For Each Item As MyListItem In PanItems.Children
+                For Each Item As MyLocalModItem In PanItems.Children
                    Item.Checked = Value
-                    If Value Then SelectedMods.Add(CType(Item.Tag, McMod).RawFileName)
+                    If Value Then SelectedMods.Add(Item.Entry.RawFileName)
                Next
            End If
        End If
@@ -372,11 +333,12 @@
            End Try
            '更改 Loader 和 UI 中的列表
            Dim NewModEntity As New McMod(NewPath)
+            NewModEntity.Comp = ModEntity.Comp
            Dim IndexOfLoader As Integer = McModLoader.Output.IndexOf(ModEntity)
            McModLoader.Output.RemoveAt(IndexOfLoader)
            McModLoader.Output.Insert(IndexOfLoader, NewModEntity)
            Dim List = If(IsSearching, PanSearchList, PanItems).Children
-            Dim IndexOfUi As Integer = List.IndexOf(List.OfType(Of MyListItem).FirstOrDefault(Function(i) CType(i.Tag, McMod) Is ModEntity))
+            Dim IndexOfUi As Integer = List.IndexOf(List.OfType(Of MyLocalModItem).FirstOrDefault(Function(i) i.Entry Is ModEntity))
            If IndexOfUi = -1 Then Continue For '因为未知原因 Mod 的状态已经切换完了
            List.RemoveAt(IndexOfUi)
            List.Insert(IndexOfUi, McModListItem(NewModEntity))
@@ -419,7 +381,7 @@
            '更改 Loader 和 UI 中的列表
            McModLoader.Output.Remove(ModEntity)
            Dim Parent As StackPanel = If(IsSearching, PanSearchList, PanItems)
-            Dim IndexOfUi As Integer = Parent.Children.IndexOf(Parent.Children.OfType(Of MyListItem).First(Function(i) CType(i.Tag, McMod) Is ModEntity))
+            Dim IndexOfUi As Integer = Parent.Children.IndexOf(Parent.Children.OfType(Of MyLocalModItem).First(Function(i) i.Entry Is ModEntity))
            Parent.Children.RemoveAt(IndexOfUi)
        Next
        If Not IsSearching Then
@@ -454,165 +416,69 @@

 #Region "单个 Mod 项"

-    '点击 Logo：切换可用状态 / 显示错误原因
-    Public Sub ItemLogo_Click(sender As MyListItem, e As EventArgs)
-        Try
-
-            Dim ModEntity As McMod = sender.Tag
-            Dim NewPath As String = Nothing
-            Select Case ModEntity.State
-                Case McMod.McModState.Fine
-                    '前置检测警告
-                    If ModEntity.IsPresetMod Then
-                        If MyMsgBox("该 Mod 可能为其他 Mod 的前置，如果禁用可能导致其他 Mod 无法使用。" & vbCrLf & "你确定要继续禁用吗？", "警告", "禁用", "取消") = 2 Then Exit Sub
-                    End If
-                    NewPath = ModEntity.Path & ".disabled"
-                Case McMod.McModState.Disabled
-                    NewPath = ModEntity.Path.Substring(0, ModEntity.Path.Count - ".disabled".Count)
-                Case McMod.McModState.Unavaliable
-                    MyMsgBox("无法读取此 Mod 的信息。" & vbCrLf & vbCrLf & "详细的错误信息：" & GetExceptionDetail(ModEntity.FileUnavailableReason), "Mod 读取失败")
-                    Exit Sub
-            End Select
-            '重命名
-            Dim NewModEntity As New McMod(NewPath)
-            Try
-                File.Delete(NewPath)
-                FileSystem.Rename(ModEntity.Path, NewPath)
-            Catch ex As FileNotFoundException
-                Log(ex, "未找到理应存在的 Mod 文件（" & ModEntity.Path & "）")
-                FileSystem.Rename(NewPath, ModEntity.Path)
-                NewModEntity = New McMod(ModEntity.Path)
-            End Try
-            '更改 Loader 中的列表
-            Dim IndexOfLoader As Integer = McModLoader.Output.IndexOf(ModEntity)
-            McModLoader.Output.RemoveAt(IndexOfLoader)
-            McModLoader.Output.Insert(IndexOfLoader, NewModEntity)
-            '更改 UI 中的列表
-            Dim Parent As StackPanel = sender.Parent
-            Dim IndexOfUi As Integer = Parent.Children.IndexOf(sender)
-            Parent.Children.RemoveAt(IndexOfUi)
-            Parent.Children.Insert(IndexOfUi, McModListItem(NewModEntity))
-            '仅在非搜索页面才执行，以确保搜索页内外显示一致
-            If Not IsSearching Then
-                '改变禁用数量的显示
-                CType(Parent.Parent, MyCard).Title = McModGetTitle(McModLoader.Output)
-                '更新加载器状态
-                LoaderFolderRun(McModLoader, PageVersionLeft.Version.PathIndie & "mods\", LoaderFolderRunType.UpdateOnly)
-            End If
-            RefreshBottomBar()
-
-        Catch ex As Exception
-            Log(ex, "单个状态改变中重命名 Mod 失败")
-            Hint("切换 Mod 状态失败，请尝试关闭正在运行的游戏后再试！")
-            LoaderFolderRun(McModLoader, PageVersionLeft.Version.PathIndie & "mods\", LoaderFolderRunType.UpdateOnly)
-        End Try
-    End Sub
-    '删除
-    Public Sub Delete_Click(sender As MyIconButton, e As EventArgs)
-        Try
-
-            Dim IsShiftPressed As Boolean = My.Computer.Keyboard.ShiftKeyDown
-            Dim ListItem As MyListItem = sender.Tag
-            Dim ModEntity As McMod = ListItem.Tag
-            '前置检测警告
-            If ModEntity.IsPresetMod Then
-                If MyMsgBox("该 Mod 可能为其他 Mod 的前置，如果删除可能导致其他 Mod 无法使用。" & vbCrLf & "你确定要继续删除吗？", "警告", "删除", "取消", IsWarn:=True) = 2 Then Exit Sub
-            End If
-            '删除
-            If File.Exists(ModEntity.Path) Then
-                If IsShiftPressed Then
-                    File.Delete(ModEntity.Path)
-                Else
-                    My.Computer.FileSystem.DeleteFile(ModEntity.Path, FileIO.UIOption.OnlyErrorDialogs, FileIO.RecycleOption.SendToRecycleBin)
-                End If
-            Else
-                '在不明原因下删除的文件可能还在列表里，如果玩家又点了一次就会出错，总之加个判断也不碍事
-                Log("[System] 需要删除的 Mod 文件不存在（" & ModEntity.Path & "）", LogLevel.Hint)
-                Exit Sub
-            End If
-            '更改 Loader 中的列表
-            McModLoader.Output.Remove(ModEntity)
-            '更改 UI 中的列表
-            Dim Parent As StackPanel = ListItem.Parent
-            Parent.Children.Remove(ListItem)
-            If Parent.Children.Count = 0 Then
-                RefreshList(True)
-            Else
-                CType(Parent.Parent, MyCard).Title = McModGetTitle(McModLoader.Output)
-            End If
-            '显示提示
-            If IsShiftPressed Then
-                Hint("已删除 " & ModEntity.FileName & "！", HintType.Finish)
-            Else
-                Hint("已将 " & ModEntity.FileName & " 删除到回收站！", HintType.Finish)
-            End If
-            LoaderFolderRun(McModLoader, PageVersionLeft.Version.PathIndie & "mods\", LoaderFolderRunType.UpdateOnly)
-
-        Catch ex As OperationCanceledException
-            Log(ex, "删除 Mod 被主动取消")
-        Catch ex As Exception
-            Log(ex, "删除 Mod 失败", LogLevel.Feedback)
-        End Try
-    End Sub
    '详情
    Public Sub Info_Click(sender As Object, e As EventArgs)
        Try

-            Dim ListItem As MyListItem
-            ListItem = If(TypeOf sender Is MyIconButton, sender.Tag, sender)
-            Dim ModEntity As McMod = ListItem.Tag
+            Dim ModEntry As McMod = CType(If(TypeOf sender Is MyIconButton, sender.Tag, sender), MyLocalModItem).Entry
            '加载失败信息
-            If ModEntity.State = McMod.McModState.Unavaliable Then
-                MyMsgBox("无法读取此 Mod 的信息。" & vbCrLf & vbCrLf & "详细的错误信息：" & GetExceptionDetail(ModEntity.FileUnavailableReason), "Mod 读取失败")
+            If ModEntry.State = McMod.McModState.Unavaliable Then
+                MyMsgBox("无法读取此 Mod 的信息。" & vbCrLf & vbCrLf & "详细的错误信息：" & GetExceptionDetail(ModEntry.FileUnavailableReason), "Mod 读取失败")
                Return
            End If
-            '获取信息
-            Dim ContentLines As New List(Of String)
-            If ModEntity.Description IsNot Nothing Then ContentLines.Add(ModEntity.Description & vbCrLf)
-            If ModEntity.Authors IsNot Nothing Then ContentLines.Add("作者：" & ModEntity.Authors)
-            ContentLines.Add("文件：" & ModEntity.FileName & "（" & GetString(New FileInfo(ModEntity.Path).Length) & "）")
-            If ModEntity.Version IsNot Nothing Then ContentLines.Add("版本：" & ModEntity.Version)
-            Dim DebugInfo As New List(Of String)
-            If ModEntity.ModId IsNot Nothing Then
-                DebugInfo.Add("Mod ID：" & ModEntity.ModId)
-            End If
-            If ModEntity.Dependencies.Count > 0 Then
-                DebugInfo.Add("依赖于：")
-                For Each Dep In ModEntity.Dependencies
-                    DebugInfo.Add(" - " & Dep.Key & If(Dep.Value Is Nothing, "", "，版本：" & Dep.Value))
-                Next
-            End If
-            If DebugInfo.Count > 0 Then
-                ContentLines.Add("")
-                ContentLines.AddRange(DebugInfo)
-            End If
-            '获取用于搜索的 Mod 名称
-            Dim ModOriginalName As String = ModEntity.Name.Replace(" ", "+")
-            Dim ModSearchName As String = ModOriginalName.Substring(0, 1)
-            For i = 1 To ModOriginalName.Count - 1
-                Dim IsLastLower As Boolean = ModOriginalName(i - 1).ToString.ToLower.Equals(ModOriginalName(i - 1).ToString)
-                Dim IsCurrentLower As Boolean = ModOriginalName(i).ToString.ToLower.Equals(ModOriginalName(i).ToString)
-                If IsLastLower AndAlso Not IsCurrentLower Then
-                    '上一个字母为小写，这一个字母为大写
-                    ModSearchName += "+"
-                End If
-                ModSearchName += ModOriginalName(i)
-            Next
-            ModSearchName = ModSearchName.Replace("++", "+").Replace("pti+Fine", "ptiFine")
-            '显示
-            If ModEntity.Url Is Nothing Then
-                If MyMsgBox(Join(ContentLines, vbCrLf), ModEntity.Name, "百科搜索", "返回") = 1 Then
-                    OpenWebsite("https://www.mcmod.cn/s?key=" & ModSearchName & "&site=all&filter=0")
-                End If
+            If ModEntry.Comp IsNot Nothing Then
+                '跳转到 Mod 下载页面
+                FrmMain.PageChange(New FormMain.PageStackData With {.Page = FormMain.PageType.CompDetail,
+                                   .Additional = {ModEntry.Comp, New List(Of String), PageVersionLeft.Version.Version.McName,
+                                   If(PageVersionLeft.Version.Version.HasForge, CompModLoaderType.Forge, If(PageVersionLeft.Version.Version.HasFabric, CompModLoaderType.Fabric, CompModLoaderType.Any))}})
            Else
-                Select Case MyMsgBox(Join(ContentLines, vbCrLf), ModEntity.Name, "打开官网", "百科搜索", "返回")
-                    Case 1
-                        OpenWebsite(ModEntity.Url)
-                    Case 2
+                '获取信息
+                Dim ContentLines As New List(Of String)
+                If ModEntry.Description IsNot Nothing Then ContentLines.Add(ModEntry.Description & vbCrLf)
+                If ModEntry.Authors IsNot Nothing Then ContentLines.Add("作者：" & ModEntry.Authors)
+                ContentLines.Add("文件：" & ModEntry.FileName & "（" & GetString(New FileInfo(ModEntry.Path).Length) & "）")
+                If ModEntry.Version IsNot Nothing Then ContentLines.Add("版本：" & ModEntry.Version)
+                Dim DebugInfo As New List(Of String)
+                If ModEntry.ModId IsNot Nothing Then
+                    DebugInfo.Add("Mod ID：" & ModEntry.ModId)
+                End If
+                If ModEntry.Dependencies.Count > 0 Then
+                    DebugInfo.Add("依赖于：")
+                    For Each Dep In ModEntry.Dependencies
+                        DebugInfo.Add(" - " & Dep.Key & If(Dep.Value Is Nothing, "", "，版本：" & Dep.Value))
+                    Next
+                End If
+                If DebugInfo.Count > 0 Then
+                    ContentLines.Add("")
+                    ContentLines.AddRange(DebugInfo)
+                End If
+                '获取用于搜索的 Mod 名称
+                Dim ModOriginalName As String = ModEntry.Name.Replace(" ", "+")
+                Dim ModSearchName As String = ModOriginalName.Substring(0, 1)
+                For i = 1 To ModOriginalName.Count - 1
+                    Dim IsLastLower As Boolean = ModOriginalName(i - 1).ToString.ToLower.Equals(ModOriginalName(i - 1).ToString)
+                    Dim IsCurrentLower As Boolean = ModOriginalName(i).ToString.ToLower.Equals(ModOriginalName(i).ToString)
+                    If IsLastLower AndAlso Not IsCurrentLower Then
+                        '上一个字母为小写，这一个字母为大写
+                        ModSearchName += "+"
+                    End If
+                    ModSearchName += ModOriginalName(i)
+                Next
+                ModSearchName = ModSearchName.Replace("++", "+").Replace("pti+Fine", "ptiFine")
+                '显示
+                If ModEntry.Url Is Nothing Then
+                    If MyMsgBox(Join(ContentLines, vbCrLf), ModEntry.Name, "百科搜索", "返回") = 1 Then
                        OpenWebsite("https://www.mcmod.cn/s?key=" & ModSearchName & "&site=all&filter=0")
-                End Select
+                    End If
+                Else
+                    Select Case MyMsgBox(Join(ContentLines, vbCrLf), ModEntry.Name, "打开官网", "百科搜索", "返回")
+                        Case 1
+                            OpenWebsite(ModEntry.Url)
+                        Case 2
+                            OpenWebsite("https://www.mcmod.cn/s?key=" & ModSearchName & "&site=all&filter=0")
+                    End Select
+                End If
            End If
-
        Catch ex As Exception
            Log(ex, "获取 Mod 详情失败", LogLevel.Feedback)
        End Try
@@ -621,9 +487,8 @@
    Public Sub Open_Click(sender As MyIconButton, e As EventArgs)
        Try

-            Dim ListItem As MyListItem = sender.Tag
-            Dim ModEntity As McMod = ListItem.Tag
-            OpenExplorer("/select,""" & ModEntity.Path & """")
+            Dim ListItem As MyLocalModItem = sender.Tag
+            OpenExplorer("/select,""" & ListItem.Entry.Path & """")

        Catch ex As Exception
            Log(ex, "打开 Mod 文件位置失败", LogLevel.Feedback)
@@ -632,6 +497,8 @@

 #End Region

+#Region "搜索"
+
    Public ReadOnly Property IsSearching As Boolean
        Get
            Return Not String.IsNullOrWhiteSpace(SearchBox.Text)
@@ -643,17 +510,22 @@
            '构造请求
            Dim QueryList As New List(Of SearchEntry(Of McMod))
            For Each Entry As McMod In McModLoader.Output
-                QueryList.Add(New SearchEntry(Of McMod) With {
-                    .Item = Entry,
-                    .SearchSource = New List(Of KeyValuePair(Of String, Double)) From {
-                        New KeyValuePair(Of String, Double)(Entry.Name, 1),
-                        New KeyValuePair(Of String, Double)(Entry.FileName, 1),
-                        New KeyValuePair(Of String, Double)(If(Entry.Description, ""), 0.5)
-                    }
-                })
+                Dim SearchSource As New List(Of KeyValuePair(Of String, Double))
+                SearchSource.Add(New KeyValuePair(Of String, Double)(Entry.Name, 1))
+                SearchSource.Add(New KeyValuePair(Of String, Double)(Entry.FileName, 1))
+                If Entry.Version IsNot Nothing Then SearchSource.Add(New KeyValuePair(Of String, Double)(Entry.Version, 0.2))
+                If Entry.Description IsNot Nothing AndAlso Entry.Description <> "" Then
+                    SearchSource.Add(New KeyValuePair(Of String, Double)(Entry.Description, 0.4))
+                End If
+                If Entry.Comp IsNot Nothing Then
+                    If Entry.Comp.RawName <> Entry.Name Then SearchSource.Add(New KeyValuePair(Of String, Double)(Entry.Comp.RawName, 1))
+                    If Entry.Comp.TranslatedName <> Entry.Comp.RawName Then SearchSource.Add(New KeyValuePair(Of String, Double)(Entry.Comp.TranslatedName, 1))
+                    If Entry.Comp.Description <> Entry.Description Then SearchSource.Add(New KeyValuePair(Of String, Double)(Entry.Comp.Description, 0.4))
+                End If
+                QueryList.Add(New SearchEntry(Of McMod) With {.Item = Entry, .SearchSource = SearchSource})
            Next
            '进行搜索，构造列表
-            Dim SearchResult = Search(QueryList, SearchBox.Text, MaxBlurCount:=5, MinBlurSimilarity:=0.35)
+            Dim SearchResult = Search(QueryList, SearchBox.Text, MaxBlurCount:=6, MinBlurSimilarity:=0.35)
            PanSearchList.Children.Clear()
            If SearchResult.Count = 0 Then
                PanSearch.Title = "无搜索结果"
@@ -662,7 +534,7 @@
                PanSearch.Title = "搜索结果"
                For Each Result In SearchResult
                    Dim Item = McModListItem(Result.Item)
-                    If ModeDebug Then Item.Info = If(Result.AbsoluteRight, "完全匹配，", "") & "相似度：" & Math.Round(Result.Similarity, 3) & "，" & Item.Info
+                    If ModeDebug Then Item.Description = If(Result.AbsoluteRight, "完全匹配，", "") & "相似度：" & Math.Round(Result.Similarity, 3) & "，" & Item.Description
                    PanSearchList.Children.Add(Item)
                Next
                PanSearchList.Visibility = Visibility.Visible
@@ -692,4 +564,6 @@
        End If
    End Sub

+#End Region
+
 End Class