2.5.0

2023-02-16 22:21:04 +08:00
parent a9bf0b682a
commit 6dc8789ac0
32 changed files with 3605 additions and 2453 deletions
@@ -63,7 +63,7 @@
        End Try
        PossibleLogs.Add(VersionPathIndie & "logs\latest.log") 'Minecraft 日志
        PossibleLogs.Add(VersionPathIndie & "logs\debug.log") 'Minecraft Debug 日志
-        PossibleLogs = ArrayNoDouble(PossibleLogs)
+        PossibleLogs = PossibleLogs.Distinct.ToList

        '确定最新的日志文件
        Dim RightLogs As New List(Of String)
@@ -238,7 +238,7 @@
                        '创建文件名词典
                        Dim FileNameDict As New Dictionary(Of String, KeyValuePair(Of String, String()))
                        For Each SelectedFile In SelectedFiles
-                            DictionaryAdd(FileNameDict, GetFileNameFromPath(SelectedFile.Key).ToLower, SelectedFile)
+                            FileNameDict(GetFileNameFromPath(SelectedFile.Key).ToLower) = SelectedFile
                            OutputFiles.Add(SelectedFile.Key)
                            Log("[Crash] 输出报告：" & SelectedFile.Key & "，作为 Minecraft 或启动器日志")
                        Next
@@ -399,7 +399,7 @@
                        Keywords.AddRange(AnalyzeStackKeyword(Fatal))
                    Next
                    If Keywords.Count > 0 Then
-                        AppendReason(CrashReason.MC日志堆栈分析发现关键字, ArrayNoDouble(Keywords))
+                        AppendReason(CrashReason.MC日志堆栈分析发现关键字, Keywords.Distinct.ToList)
                        GoTo Done
                    End If
                End If
@@ -429,7 +429,7 @@ Done:
        If CrashReasons.ContainsKey(Reason) Then
            If Additional IsNot Nothing Then
                CrashReasons(Reason).AddRange(Additional)
-                CrashReasons(Reason) = ArrayNoDouble(CrashReasons(Reason))
+                CrashReasons(Reason) = CrashReasons(Reason).Distinct.ToList
            End If
        Else
            CrashReasons.Add(Reason, New List(Of String)(If(Additional, {})))
@@ -464,6 +464,8 @@ Done:
            If LogMc.Contains("java.lang.ClassCastException: java.base/jdk") Then AppendReason(CrashReason.使用JDK)
            If LogMc.Contains("java.lang.ClassCastException: class jdk.") Then AppendReason(CrashReason.使用JDK)
            If LogMc.Contains("TRANSFORMER/net.optifine/net.optifine.reflect.Reflector.<clinit>(Reflector.java") Then AppendReason(CrashReason.OptiFine与Forge不兼容)
+            If LogMc.Contains("java.lang.NoSuchMethodError: 'void net.minecraft.client.renderer.block.model.BakedQuad.<init>(int[], int, net.minecraft.core.Direction, net.minecraft.client.renderer.texture.TextureAtlasSprite, boolean, boolean)'") Then AppendReason(CrashReason.OptiFine与Forge不兼容)
+            If LogMc.Contains("java.lang.NoSuchMethodError: 'void net.minecraft.server.level.DistanceManager.addRegionTicket(net.minecraft.server.level.TicketType, net.minecraft.world.level.ChunkPos, int, java.lang.Object, boolean)'") Then AppendReason(CrashReason.OptiFine与Forge不兼容)
            If LogMc.Contains("Open J9 is not supported") OrElse LogMc.Contains("OpenJ9 is incompatible") OrElse LogMc.Contains(".J9VMInternals.") Then AppendReason(CrashReason.使用OpenJ9)
            If LogMc.Contains("java.lang.NoSuchFieldException: ucp") Then AppendReason(CrashReason.Java版本过高)
            If LogMc.Contains("because module java.base does not export") Then AppendReason(CrashReason.Java版本过高)
@@ -584,7 +586,7 @@ Done:
            PossibleStacks.Add(Stack.Trim) '.Split("$").First)
 NextStack:
        Next
-        PossibleStacks = ArrayNoDouble(PossibleStacks)
+        PossibleStacks = PossibleStacks.Distinct.ToList
        Log("[Crash] 找到 " & PossibleStacks.Count & " 条可能的堆栈信息")
        If PossibleStacks.Count = 0 Then Return New List(Of String)
        For Each Stack As String In PossibleStacks
@@ -608,7 +610,7 @@ NextStack:
                PossibleWords.Add(Word.Trim)
            Next
        Next
-        PossibleWords = ArrayNoDouble(PossibleWords)
+        PossibleWords = PossibleWords.Distinct.ToList
        Log("[Crash] 从堆栈信息中找到 " & PossibleWords.Count & " 个可能的 Mod ID 关键词")
        If PossibleWords.Count > 0 Then Log("[Crash]  - " & Join(PossibleWords, ", "))
        If PossibleWords.Count > 10 Then
@@ -666,7 +668,7 @@ NextStack:
                Exit For
            Next
        Next
-        HintLines = ArrayNoDouble(HintLines)
+        HintLines = HintLines.Distinct.ToList
        Log("[Crash] 找到 " & HintLines.Count & " 个可能的崩溃 Mod 匹配行")
        For Each ModName As String In HintLines
            Log("[Crash]  - " & ModName)
@@ -682,7 +684,7 @@ NextStack:
            End If
            If Name IsNot Nothing Then ModFileNames.Add(Name)
        Next
-        ModFileNames = ArrayNoDouble(ModFileNames)
+        ModFileNames = ModFileNames.Distinct.ToList
        Log("[Crash] 找到 " & ModFileNames.Count & " 个可能的崩溃 Mod 文件名")
        For Each ModFileName As String In ModFileNames
            Log("[Crash]  - " & ModFileName)
@@ -335,7 +335,7 @@
        ''' </summary>
        Public ReleaseTime As String
        ''' <summary>
-        ''' 需要的最低 Forge 版本。空字符串为无限制，“28.1.56” 表示版本号，“1161” 表示版本号的最后一位。
+        ''' 需要的最低 Forge 版本。空字符串为无限制，Nothing 为不兼容，“28.1.56” 表示版本号，“1161” 表示版本号的最后一位。
        ''' </summary>
        Public RequiredForgeVersion As String
    End Class
@@ -389,6 +389,7 @@
                         .Inherit = Name(i).ToString.Split(" ")(0),
                         .NameFile = If(Name(i).ToLower.Contains("pre"), "preview_", "") & "OptiFine_" & Name(i).Replace(" ", "_") & ".jar",
                         .RequiredForgeVersion = Forge(i).Replace("Forge ", "").Replace("#", "")}
+            If Entry.RequiredForgeVersion.Contains("N/A") Then Entry.RequiredForgeVersion = Nothing
            Entry.NameVersion = Entry.Inherit & "-OptiFine_" & Name(i).ToString.Replace(" ", "_").Replace(Entry.Inherit & "_", "")
            Versions.Add(Entry)
        Next
@@ -413,6 +414,7 @@
                             .NameFile = Token("filename").ToString,
                             .RequiredForgeVersion = If(Token("forge"), "").ToString.Replace("Forge ", "").Replace("#", "")
                         }
+                If Entry.RequiredForgeVersion.Contains("N/A") Then Entry.RequiredForgeVersion = Nothing
                Entry.NameVersion = Entry.Inherit & "-OptiFine_" & (Token("type").ToString & " " & Token("patch").ToString).Replace(".0 ", " ").Replace(" ", "_").Replace(Entry.Inherit & "_", "")
                Versions.Add(Entry)
            Next
@@ -944,719 +946,14 @@
    ''' <summary>
    ''' Fabric API 列表，官方源。
    ''' </summary>
-    Public DlFabricApiLoader As New LoaderTask(Of Integer, List(Of DlCfFile))("Fabric API List Loader",
-        Sub(Task As LoaderTask(Of Integer, List(Of DlCfFile))) Task.Output = DlCfGetFiles(306612, False))
+    Public DlFabricApiLoader As New LoaderTask(Of Integer, List(Of CompFile))("Fabric API List Loader",
+        Sub(Task As LoaderTask(Of Integer, List(Of CompFile))) Task.Output = CompFilesGet("fabric-api", False))

    ''' <summary>
    ''' OptiFabric 列表，官方源。
    ''' </summary>
-    Public DlOptiFabricLoader As New LoaderTask(Of Integer, List(Of DlCfFile))("OptiFabric List Loader",
-        Sub(Task As LoaderTask(Of Integer, List(Of DlCfFile))) Task.Output = DlCfGetFiles(322385, False))
-
-#End Region
-
-#Region "DlCfProject | CurseForge 工程"
-
-    Private DlCfProjectDb As Dictionary(Of String, DlCfDbEntry) = Nothing
-    Private DlCfProjectCache As New Dictionary(Of Integer, DlCfProject)
-
-    ''' <summary>
-    ''' CurseForge 工程列表获取、搜索请求。
-    ''' </summary>
-    Public Class DlCfProjectRequest
-        Public CategoryId As Integer = 0 '421: Mod(?), 4780: Fabric
-        Public IsModPack As Boolean = False
-        Public GameVersion As String = Nothing
-        Public PageSize As Integer = 50
-        Public SearchFilter As String = Nothing
-        Public Index As Integer? = Nothing
-        Public ModLoader As Integer? = Nothing
-        Public Function GetAddress() As String
-            GetAddress = "https://api.curseforge.com/v1/mods/search?gameId=432&sortField=Featured&sortOrder=desc" &
-                         "&pageSize=" & PageSize &
-                         "&categoryId=" & CategoryId &
-                         If(IsModPack, "&classId=4471", "&classId=6") &
-                         If(String.IsNullOrEmpty(GameVersion), "", "&gameVersion=" & GameVersion) &
-                         If(String.IsNullOrEmpty(SearchFilter), "", "&searchFilter=" & Net.WebUtility.UrlEncode(SearchFilter)) &
-                         If(Index IsNot Nothing, "&index=" & Index, "") &
-                         If(ModLoader IsNot Nothing AndAlso ModLoader > 0, "&modLoaderType=" & ModLoader, "")
-        End Function
-
-#Region "相同判断"
-
-        Public Overrides Function Equals(obj As Object) As Boolean
-            Dim request = TryCast(obj, DlCfProjectRequest)
-            Return request IsNot Nothing AndAlso request.GetAddress = GetAddress()
-        End Function
-        Public Shared Operator =(left As DlCfProjectRequest, right As DlCfProjectRequest) As Boolean
-            Return EqualityComparer(Of DlCfProjectRequest).Default.Equals(left, right)
-        End Operator
-        Public Shared Operator <>(left As DlCfProjectRequest, right As DlCfProjectRequest) As Boolean
-            Return Not left = right
-        End Operator
-
-#End Region
-
-    End Class
-
-    ''' <summary>
-    ''' CurseForge 工程信息。
-    ''' </summary>
-    Public Class DlCfProject
-
-        Public Id As Integer
-        Public Name As String
-        Public Description As String
-        Public Website As String
-        Public DateUpdate As Date
-        Public DownloadCount As Integer
-        Public ModLoaders As New List(Of String)
-        Public GameVersionDesc As String
-        Private CategoryDesc As List(Of String)
-        Private Thumb As String
-        Public IsModPack As Boolean
-        Public FileIndexes As New List(Of Integer)
-        Public Files As List(Of DlCfFile)
-        Private _MCBBS As Integer?
-        Public Property MCBBS As Integer?
-            Get
-                ReleaseCfDatabase()
-                If _MCBBS Is Nothing Then
-                    If Website IsNot Nothing Then
-                        Dim Keyword As String = Website.TrimEnd("/").Split("/").Last
-                        If DlCfProjectDb.ContainsKey(Keyword) Then _MCBBS = DlCfProjectDb(Keyword).MCBBS
-                    End If
-                End If
-                Return _MCBBS
-            End Get
-            Set(value As Integer?)
-                _MCBBS = value
-            End Set
-        End Property
-        Private _ChineseName As String
-        Public Property ChineseName As String
-            Get
-                ReleaseCfDatabase()
-                If _ChineseName Is Nothing Then
-                    _ChineseName = Name
-                    If Website IsNot Nothing Then
-                        Dim Keyword As String = Website.TrimEnd("/").Split("/").Last
-                        If DlCfProjectDb.ContainsKey(Keyword) Then
-                            Dim Result = DlCfProjectDb(Keyword)
-                            If Not String.IsNullOrEmpty(Result.ChineseName) Then '使用原名
-                                _ChineseName = Result.ChineseName
-                            End If
-                        End If
-                    End If
-                End If
-                Return _ChineseName
-            End Get
-            Set(value As String)
-                _ChineseName = value
-            End Set
-        End Property
-        Private _WikiId As Integer = -1
-        ''' <summary>
-        ''' MCMOD 的页面 ID。若为 0 则代表没有对应页面。
-        ''' </summary>
-        Public Property WikiId As Integer
-            Get
-                ReleaseCfDatabase()
-                If _WikiId = -1 Then
-                    If Website IsNot Nothing Then
-                        Dim Keyword As String = Website.TrimEnd("/").Split("/").Last
-                        If DlCfProjectDb.ContainsKey(Keyword) Then
-                            _WikiId = DlCfProjectDb(Keyword).WikiId
-                        Else
-                            _WikiId = 0
-                        End If
-                    End If
-                End If
-                Return _WikiId
-            End Get
-            Set(value As Integer)
-                _WikiId = value
-            End Set
-        End Property
-
-        ''' <summary>
-        ''' 从 CurseForge 工程 Json 项中初始化实例。若出错会抛出异常。
-        ''' </summary>
-        Public Sub New(Data As JObject)
-            'https://api.curseforge.com/v1/mods/search?gameId=432&pageSize=5&categoryID=421
-            Id = Data("id")
-            Name = Data("name")
-            Description = Data("summary")
-            Website = Data("links")("websiteUrl")
-            DateUpdate = Data("dateModified")
-            DownloadCount = Data("downloadCount")
-            IsModPack = Not Website.Contains("/mc-mods/")
-            '获取 Mod Loader 列表
-            ModLoaders = New List(Of String)
-            For Each File In If(Data("latestFiles"), {})
-                Dim NewFile As New DlCfFile(File, IsModPack)
-                If Not NewFile.IsAvailable Then Continue For
-                ModLoaders.AddRange(NewFile.ModLoaders)
-            Next
-            ModLoaders = ModLoaders.Distinct.ToList
-            '用一个偷懒的方式让 Forge 排在 Fabric 的前面
-            ModLoaders = ModLoaders.Select(Function(s) s.Replace("Forge", "Aorge")).ToList()
-            ModLoaders.Sort()
-            ModLoaders = ModLoaders.Select(Function(s) s.Replace("Aorge", "Forge")).ToList()
-            '获取游戏版本
-            Dim GameVersions As New List(Of Integer)
-            For Each File In If(Data("latestFilesIndexes"), {})
-                Dim Version As String = File("gameVersion")
-                If Not Version.Contains("1.") Then Continue For
-                GameVersions.Add(Version.Split(".")(1).Split("-").First)
-                FileIndexes.Add(File("fileId"))
-            Next
-            GameVersions = Sort(GameVersions.Distinct.ToList, AddressOf VersionSortBoolean)
-            If GameVersions.Count = 0 Then
-                GameVersionDesc = ""
-            Else
-                Dim SpaVersions As New List(Of String)
-                For i = 0 To GameVersions.Count - 1
-                    Dim StartVersion As Integer = GameVersions(i), EndVersion As Integer = GameVersions(i)
-                    For ii = i + 1 To GameVersions.Count - 1
-                        If GameVersions(ii) = EndVersion - 1 Then
-                            EndVersion = GameVersions(ii)
-                            i = ii
-                        Else
-                            Exit For
-                        End If
-                    Next
-                    If StartVersion = EndVersion Then
-                        SpaVersions.Add("1." & StartVersion)
-                    ElseIf StartVersion >= McVersionHighest Then
-                        SpaVersions.Add("1." & EndVersion & "+")
-                    ElseIf EndVersion <= 7 Then
-                        SpaVersions.Add("1." & StartVersion & "-")
-                        Exit For
-                    ElseIf StartVersion - EndVersion = 1 Then
-                        SpaVersions.Add("1." & StartVersion & ", 1." & EndVersion)
-                    Else
-                        SpaVersions.Add("1." & StartVersion & "~1." & EndVersion)
-                    End If
-                Next
-                GameVersionDesc = "[" & Join(SpaVersions, ", ") & "] "
-            End If
-            '获取分类
-            Dim Categories = Data("categories")
-            Dim CategoryId As New List(Of Integer)
-            For Each CategoryToken In Categories
-                CategoryId.Add(CategoryToken("id"))
-            Next
-            CategoryId = ArrayNoDouble(CategoryId)
-            CategoryId.Sort()
-            CategoryDesc = New List(Of String)
-            For Each Category In CategoryId
-                Dim Desc As String
-                Select Case Category
-
-                    Case 406 : Desc = "世界生成"
-                    Case 407 : Desc = "生物群系"
-                    Case 409 : Desc = "天然结构"
-                    Case 410 : Desc = "维度"
-                    Case 411 : Desc = "生物"
-                    Case 412 : Desc = "科技"
-                    Case 414 : Desc = "交通与移动"
-                    Case 415 : Desc = "管道与物流"
-                    Case 417 : Desc = "能源"
-                    Case 4558 : Desc = "红石"
-                    Case 420 : Desc = "仓储"
-                    Case 416 : Desc = "农业"
-                    Case 436 : Desc = "食物"
-                    Case 419 : Desc = "魔法"
-                    Case 434 : Desc = "装备与工具"
-                    Case 422 : Desc = "冒险与探索"
-                    Case 424 : Desc = "建筑与装饰"
-                    Case 423 : Desc = "信息显示"
-                    Case 425 : Desc = "杂项"
-                    Case 421 : Desc = "支持库"
-                    Case 435 : Desc = "服务器"
-
-                    Case 4471 : Desc = "科幻"
-                    Case 4483 : Desc = "战斗"
-                    Case 4477 : Desc = "小游戏"
-                    Case 4478 : Desc = "任务"
-                    Case 4484 : Desc = "多人"
-                    Case 4476 : Desc = "探索"
-                    Case 4736 : Desc = "空岛"
-                    Case 4475 : Desc = "冒险"
-                    Case 4487 : Desc = "FTB"
-                    Case 4480 : Desc = "基于地图"
-                    Case 4479 : Desc = "硬核"
-                    Case 4472 : Desc = "科技"
-                    Case 4473 : Desc = "魔法"
-                    Case 4481 : Desc = "小型整合"
-                    Case 4482 : Desc = "大型整合"
-
-                    Case Else : Continue For
-                End Select
-                CategoryDesc.Add(Desc)
-            Next
-            If CategoryDesc.Count = 0 Then CategoryDesc.Add("杂类")
-            '获取图片
-            If Data("logo").Count > 0 Then
-                If GetPixelSize(1) > 1.25 Then
-                    Thumb = Data("logo")("thumbnailUrl").ToString '使用 256x256 图标
-                Else
-                    Thumb = Data("logo")("thumbnailUrl").ToString.Replace("/256/256/", "/64/64/") '使用 64x64 图标
-                End If
-            End If
-            '保存缓存
-            If Not DlCfProjectCache.ContainsKey(Id) OrElse DlCfProjectCache(Id).Files Is Nothing Then DictionaryAdd(DlCfProjectCache, Id, Me)
-        End Sub
-
-        Public Function ToCfItem(ShowVersionDesc As Boolean, ShowLoaderDesc As Boolean, Optional OnClick As MyCfItem.ClickEventHandler = Nothing) As MyCfItem
-            Dim NewItem As New MyCfItem With {.Tag = Me}
-            NewItem.LabTitle.Text = ChineseName
-            NewItem.LabInfo.Text = Description.Replace(vbCr, "").Replace(vbLf, "")
-            NewItem.LabLeft.Text = (If(ModLoaders.Count > 0 AndAlso ShowLoaderDesc, "[" & Join(ModLoaders, "/") & "] ", "") &
-                                   If(ShowVersionDesc, GameVersionDesc, "")).Replace("] [", " ") &
-                                   Join(CategoryDesc, "，") & " (" &
-                                   GetTimeSpanString(DateUpdate - Date.Now) & "更新，" &
-                                   If(DownloadCount > 100000, Math.Round(DownloadCount / 10000) & " 万次下载", DownloadCount & " 次下载") & "）"
-            If Thumb Is Nothing Then
-                NewItem.Logo = "pack://application:,,,/images/Icons/NoIcon.png"
-            Else
-                NewItem.Logo = Thumb
-            End If
-            If OnClick IsNot Nothing Then
-                AddHandler NewItem.Click, OnClick
-                NewItem.HasAnimation = True
-            Else
-                NewItem.HasAnimation = False
-            End If
-            '结束
-            Return NewItem
-        End Function
-
-        Public Overrides Function Equals(obj As Object) As Boolean
-            Dim project = TryCast(obj, DlCfProject)
-            Return project IsNot Nothing AndAlso Id = project.Id
-        End Function
-        Public Shared Operator =(left As DlCfProject, right As DlCfProject) As Boolean
-            Return EqualityComparer(Of DlCfProject).Default.Equals(left, right)
-        End Operator
-        Public Shared Operator <>(left As DlCfProject, right As DlCfProject) As Boolean
-            Return Not left = right
-        End Operator
-    End Class
-
-    Public Class DlCfProjectResult
-        Public Projects As List(Of DlCfProject)
-        Public Index As Integer
-        Public RealCount As Long
-    End Class
-    ''' <summary>
-    ''' CurseForge 工程列表获取事件。
-    ''' </summary>
-    Public Sub DlCfProjectSub(Task As LoaderTask(Of DlCfProjectRequest, DlCfProjectResult))
-        '拒绝 1.13- Quilt（这个版本根本没有 Quilt）
-        If Not Task.Input.IsModPack AndAlso
-            If(Task.Input.ModLoader, 0) = 5 AndAlso VersionSortInteger(If(Task.Input.GameVersion, "1.15"), "1.14") = -1 Then
-            Throw New Exception("Quilt 不支持 Minecraft " & Task.Input.GameVersion)
-        End If
-
-        Dim RawFilter As String = If(Task.Input.SearchFilter, "").Trim
-        Task.Input.SearchFilter = RawFilter
-        RawFilter = RawFilter.ToLower
-        Log("[Download] CurseForge 工程列表搜索原始文本：" & RawFilter)
-        '中文请求关键字处理
-        Dim IsChineseSearch As Boolean = RegexCheck(RawFilter, "[\u4e00-\u9fbb]")
-        If IsChineseSearch AndAlso Not String.IsNullOrEmpty(RawFilter) Then
-            If Task.Input.IsModPack Then Throw New Exception("整合包搜索仅支持英文")
-            ReleaseCfDatabase()
-            '构造搜索请求
-            Dim SearchEntries As New List(Of SearchEntry(Of DlCfDbEntry))
-            For Each Entry In DlCfProjectDb.Values
-                If Entry.ChineseName.Contains("动态的树") Then Continue For '傻逼 Mod 的附属太多了
-                SearchEntries.Add(New SearchEntry(Of DlCfDbEntry) With {
-                    .Item = Entry,
-                    .SearchSource = New List(Of KeyValuePair(Of String, Double)) From {
-                        New KeyValuePair(Of String, Double)(Entry.ChineseName & Entry.CurseForgeId, 1)
-                    }
-                })
-            Next
-            '获取搜索结果
-            Dim SearchResults = Search(SearchEntries, Task.Input.SearchFilter, 3)
-            If SearchResults.Count = 0 Then Throw New Exception("无搜索结果，请尝试搜索英文名称")
-            Dim SearchResult As String = ""
-            For i = 0 To Math.Min(4, SearchResults.Count - 1) '就算全是准确的，也最多只要 5 个
-                If Not SearchResults(i).AbsoluteRight AndAlso i >= Math.Min(2, SearchResults.Count - 1) Then Exit For '把 3 个结果拼合以提高准确度
-                SearchResult += SearchResults(i).Item.CurseForgeId.Replace("-", " ") & " "
-                SearchResult += SearchResults(i).Item.ChineseName.Replace(" (", "|").Split("|").Last.TrimEnd(") ").Replace(" - ", "§").Split("§").First & " "
-            Next
-            Log("[Download] CurseForge 中文搜索原始关键词：" & SearchResult, LogLevel.Developer)
-            '去除常见连接词
-            Dim RealFilter As String = ""
-            For Each Word In SearchResult.Split(" ")
-                If {"the", "of", "a", "mod"}.Contains(Word.ToLower) OrElse Val(Word) > 0 Then Continue For
-                If SearchResult.Split(" ").Count > 3 AndAlso {"ftb"}.Contains(Word.ToLower) Then Continue For
-                RealFilter += Word.TrimStart("{[(").TrimEnd("}])") & " "
-            Next
-            Task.Input.SearchFilter = RealFilter
-            Log("[Download] CurseForge 中文搜索最终关键词：" & RealFilter, LogLevel.Developer)
-        End If
-        '驼峰英文请求关键字处理
-        Dim SpacedKeywords = RegexReplace(Task.Input.SearchFilter, "$& ", "([A-Z]+|[a-z]+?)(?=[A-Z]+[a-z]+[a-z ]*)")
-        Dim ConnectedKeywords = Task.Input.SearchFilter.Replace(" ", "")
-        Dim AllPossibleKeywords = (SpacedKeywords & " " & If(IsChineseSearch, Task.Input.SearchFilter, ConnectedKeywords & " " & RawFilter)).ToLower
-        '最终处理关键字：分割、去重
-        Dim RightKeywords As New List(Of String)
-        For Each Keyword In AllPossibleKeywords.Split(" ")
-            If Keyword.Trim = "" Then Continue For
-            If {"forge", "fabric", "for", "mod",
-                "forge/fabric", "fabric/forge", "fabric/quilt", "quilt/fabric"}.Contains(Keyword) Then 'https://github.com/Hex-Dragon/PCL2/issues/208
-                Log("[Download] 已跳过搜索关键词：" & Keyword, LogLevel.Developer)
-                Continue For
-            End If
-            RightKeywords.Add(Keyword)
-        Next
-        If RawFilter.Length > 0 AndAlso RightKeywords.Count = 0 Then
-            Task.Input.SearchFilter = RawFilter '全都被过滤掉了
-        Else
-            Task.Input.SearchFilter = Join(ArrayNoDouble(RightKeywords), " ").ToLower
-        End If
-        '例外项：OptiForge、OptiFabric（拆词后因为包含 Forge/Fabric 导致无法搜到实际的 Mod）
-        If RawFilter.Replace(" ", "").ToLower.Contains("optiforge") Then Task.Input.SearchFilter = "optiforge"
-        If RawFilter.Replace(" ", "").ToLower.Contains("optifabric") Then Task.Input.SearchFilter = "optifabric"
-        Log("[Download] CurseForge 工程列表搜索最终文本：" & Task.Input.SearchFilter, LogLevel.Developer)
-        '正式获取
-        Dim Url = Task.Input.GetAddress()
-        Log("[Download] 开始获取 CurseForge 工程列表：" & Url)
-        Dim RequestResult As JObject = NetGetCodeByRequestRetry(Url, IsJson:=True, Encode:=Encoding.UTF8)
-        Dim FileList = GetCfProjectListFromJson(RequestResult("data"), Task.Input.IsModPack)
-        If FileList.Count = 0 Then Throw New Exception("无搜索结果")
-        '重新排序
-        If Not String.IsNullOrEmpty(Task.Input.SearchFilter) Then
-            '排序分 = 搜索相对相似度 + 默认排序相对活跃度
-            Dim Scores As New Dictionary(Of DlCfProject, Double)
-            Dim Entry As New List(Of SearchEntry(Of DlCfProject))
-            For i = 1 To FileList.Count
-                Dim File = FileList(i - 1)
-                Scores.Add(File, (1 - (i / FileList.Count)))
-                Entry.Add(New SearchEntry(Of DlCfProject) With {.Item = File, .SearchSource = New List(Of KeyValuePair(Of String, Double)) From {
-                          New KeyValuePair(Of String, Double)(If(IsChineseSearch, File.ChineseName, File.Name), 1),
-                          New KeyValuePair(Of String, Double)(File.Description, 0.05)}})
-            Next
-            Dim SearchResult = Search(Entry, RawFilter, 101, -1)
-            For Each OneResult In SearchResult
-                Scores(OneResult.Item) += OneResult.Similarity / SearchResult(0).Similarity
-            Next
-            '根据排序分得出结果
-            Dim ResultList = Sort(Scores.ToList, Function(Left As KeyValuePair(Of DlCfProject, Double), Right As KeyValuePair(Of DlCfProject, Double))
-                                                     Return Left.Value > Right.Value
-                                                 End Function)
-            FileList = New List(Of DlCfProject)
-            For Each Result In ResultList
-                FileList.Add(Result.Key)
-            Next
-        End If
-        Task.Output = New DlCfProjectResult With {.Projects = FileList, .Index = RequestResult("pagination")("index"), .RealCount = RequestResult("pagination")("totalCount")}
-    End Sub
-    ''' <summary>
-    ''' 从 API 返回的 Json 数组中获取工程信息数组。
-    ''' </summary>
-    Private Function GetCfProjectListFromJson(Json As JArray, IsModPack As Boolean) As List(Of DlCfProject)
-        Dim FileList As New List(Of DlCfProject)
-        For Each JsonEntry As JObject In Json
-            Dim Result = GetCfProjectFromJson(JsonEntry, IsModPack)
-            If Result IsNot Nothing Then FileList.Add(Result)
-        Next
-        Return FileList
-    End Function
-    ''' <summary>
-    ''' 从 API 返回的 Json 中获取工程信息。
-    ''' </summary>
-    Private Function GetCfProjectFromJson(Json As JObject, IsModPack As Boolean) As DlCfProject
-        If Json("links")("websiteUrl") Is Nothing Then
-            Log("[Download] 发现关键项为 Nothing 的工程：" & If(Json, "").ToString, LogLevel.Debug)
-            Return Nothing
-        End If
-        If IsModPack = Json("links")("websiteUrl").ToString.Contains("curseforge.com/minecraft/mc-mods") Then
-            Log("[Download] 返回的工程与要求的类别不一致：" & Json("links")("websiteUrl").ToString, LogLevel.Debug)
-            Return Nothing
-        End If
-        Return New DlCfProject(Json)
-    End Function
-
-    ''' <summary>
-    ''' 读取 Mod 数据库。
-    ''' </summary>
-    Private Sub ReleaseCfDatabase()
-        If DlCfProjectDb IsNot Nothing Then Exit Sub
-        DlCfProjectDb = New Dictionary(Of String, DlCfDbEntry)
-        Dim i As Integer = 0
-        For Each Line In DecodeBytes(GetResources("ModData")).Split(vbLf)
-            i += 1
-            If Line = "" Then Continue For
-            For Each EntryData As String In Line.Split("¨")
-                Dim Entry = New DlCfDbEntry
-                Dim SplitedLine = EntryData.Split("|")
-                Entry.CurseForgeId = SplitedLine(0)
-                Entry.WikiId = i
-                If SplitedLine.Count >= 2 Then
-                    Entry.ChineseName = SplitedLine(1)
-                    Entry.MCBBS = If(SplitedLine.Count >= 3, SplitedLine(2), Nothing)
-                    If Entry.ChineseName.Contains("*") Then '处理 *
-                        Entry.ChineseName = Entry.ChineseName.Replace("*", " (" &
-                            String.Join(" ", Entry.CurseForgeId.Split("-").Select(Function(w) w.Substring(0, 1).ToUpper & w.Substring(1, w.Length - 1))) & ")")
-                    End If
-                End If
-                DlCfProjectDb(Entry.CurseForgeId) = Entry
-            Next
-        Next
-    End Sub
-    Public Class DlCfDbEntry
-        ''' <summary>
-        ''' McMod 的 ID。
-        ''' </summary>
-        Public WikiId As Integer
-        ''' <summary>
-        ''' 中文译名。若为空字符串则使用英文名。
-        ''' </summary>
-        Public ChineseName As String = ""
-        ''' <summary>
-        ''' MCBBS 发布帖编号（例如 195107）。若为 Nothing 则没有发布帖。
-        ''' </summary>
-        Public MCBBS As Integer?
-        ''' <summary>
-        ''' CurseForge ID（例如 advanced-solar-panels）。
-        ''' </summary>
-        Public CurseForgeId As String
-        Public Overrides Function ToString() As String
-            Return CurseForgeId & "|" & WikiId & "|" & ChineseName & If(MCBBS Is Nothing, "", "|" & MCBBS)
-        End Function
-    End Class
-
-#End Region
-
-#Region "DlCfFile | CurseForge Files"
-
-    Public DlCfFileLoader As New LoaderTask(Of KeyValuePair(Of Integer, Boolean), List(Of DlCfFile))("DlCfFile Main", Sub(Task As LoaderTask(Of KeyValuePair(Of Integer, Boolean), List(Of DlCfFile))) Task.Output = DlCfGetFiles(Task.Input.Key, Task.Input.Value))
-
-    ''' <summary>
-    ''' CurseForge 工程下的单一版本文件。
-    ''' </summary>
-    Public Class DlCfFile
-
-        Public IsModPack As Boolean
-        Public FileId As Integer
-        Public DisplayName As String
-        Public [Date] As Date
-        Public GameVersion As String()
-        Public ModLoaders As New List(Of String)
-        Public ReleaseType As Integer
-        Public FileName As String
-        Public DownloadCount As Integer
-        Public Dependencies As New List(Of Integer)
-        Private DownloadAddress As String()
-
-        Public ReadOnly Property ReleaseTypeString As String
-            Get
-                Select Case ReleaseType
-                    Case 1
-                        Return "正式版"
-                    Case 2
-                        Return If(ModeDebug, "Beta 测试版", "测试版")
-                    Case Else
-                        Return If(ModeDebug, "Alpha 测试版", "测试版")
-                End Select
-            End Get
-        End Property
-        Public ReadOnly Property IsAvailable As Boolean
-            Get
-                Return DisplayName IsNot Nothing AndAlso GameVersion IsNot Nothing AndAlso FileName IsNot Nothing AndAlso DownloadAddress(0).StartsWith("http")
-            End Get
-        End Property
-
-        ''' <summary>
-        ''' 从 CurseForge 文件 Json 项中初始化实例。若出错会抛出异常。
-        ''' </summary>
-        Public Sub New(Data As JObject, IsModPack As Boolean)
-            FileId = Data("id")
-            DisplayName = Data("displayName").ToString.Replace("	", "").Trim(" ")
-            [Date] = Data("fileDate")
-            ReleaseType = Data("releaseType")
-            DownloadCount = Data("downloadCount")
-            FileName = Data("fileName")
-            Me.IsModPack = IsModPack
-            '获取下载地址
-            Dim Url = Data("downloadUrl").ToString
-            If Url = "" Then Url = "https://media.forgecdn.net/files/" & FileId.ToString.Substring(0, 4) & "/" & FileId.ToString.Substring(4).TrimStart("0") & "/" & FileName
-            Url = Url.Replace(FileName, Net.WebUtility.UrlEncode(FileName)) '对文件名进行编码
-            DownloadAddress = ArrayNoDouble({Url.Replace("-service.overwolf.wtf", ".forgecdn.net").Replace("://edge", "://media"), Url.Replace("-service.overwolf.wtf", ".forgecdn.net"), Url.Replace("://edge", "://media"), Url})
-            '获取前置 Mod 的 Addon ID
-            If Not IsModPack Then
-                For Each Dep In Data("dependencies")
-                    If Dep("relationType").ToObject(Of Integer) = 3 AndAlso '是一个依赖
-                        Dep("modId").ToObject(Of Integer) <> 306612 Then '排除 Fabric API
-                        Dependencies.Add(Dep("modId"))
-                    End If
-                Next
-            End If
-            '获取游戏版本与 Mod 加载器列表
-            Dim Versions As New List(Of String)
-            For Each Version In Data("gameVersions").Select(Function(t) t.ToString.Trim.ToLower)
-                If Version.StartsWith("1.") OrElse Version.Contains("w") Then
-                    Versions.Add(Version.Replace("-snapshot", " 快照"))
-                ElseIf Version = "forge" OrElse Version = "fabric" OrElse Version = "quilt" OrElse Version = "rift" Then
-                    ModLoaders.Add(Version.First.ToString.ToUpper & Version.Substring(1))
-                End If
-            Next
-            If Versions.Count > 1 Then
-                GameVersion = Sort(Versions, AddressOf VersionSortBoolean).ToArray
-                If IsModPack Then GameVersion = {GameVersion(0)}
-            ElseIf Versions.Count = 1 Then
-                GameVersion = Versions.ToArray
-            Else
-                GameVersion = {"未知版本"}
-            End If
-            '用一个偷懒的方式让 Forge 排在 Fabric 的前面
-            ModLoaders = ModLoaders.Select(Function(s) s.Replace("Forge", "Aorge")).ToList()
-            ModLoaders.Sort()
-            ModLoaders = ModLoaders.Select(Function(s) s.Replace("Aorge", "Forge")).ToList()
-        End Sub
-
-        ''' <summary>
-        ''' 获取对应的下载文件信息。
-        ''' </summary>
-        ''' <param name="LocalAddress">本地文件夹或文件地址。</param>
-        Public Function GetDownloadFile(LocalAddress As String, IsFullPath As Boolean) As NetFile
-            Return New NetFile(DownloadAddress, LocalAddress & If(IsFullPath, "", FileName))
-        End Function
-
-        Public Function ToListItem(OnClick As MyListItem.ClickEventHandler, Optional OnSaveClick As MyIconButton.ClickEventHandler = Nothing) As MyListItem
-
-            '获取描述信息
-            Dim Info As String = ""
-            If Not IsModPack Then
-                Info += If(ModLoaders.Count > 0, Join(ModLoaders, "/"), "") &
-                        If(GameVersion.Count > 1, If(ModLoaders.Count > 0, " ", "") & Join(GameVersion, "、").Replace("-snapshot", " 快照"), "")
-                If Info <> "" Then Info = "适用于 " & Info & "，"
-                Info += If(ModeDebug AndAlso Dependencies.Count > 0, Dependencies.Count & " 个前置 Mod，", "")
-            End If
-            'If DownloadCount > 0 Then 'DownloadCount 目前的返回内容完全不正确，经常是 0，干脆不显示了
-            '    Info += If(DownloadCount > 100000, Math.Round(DownloadCount / 10000) & " 万次下载，", DownloadCount & " 次下载，")
-            'End If
-            Info += GetTimeSpanString([Date] - Date.Now) & "更新"
-            Info += If(ReleaseType <> 1, "，" & ReleaseTypeString, "")
-
-            '建立控件
-            Dim NewItem As New MyListItem With {
-                .Title = DisplayName, .SnapsToDevicePixels = True, .Height = 42, .Type = MyListItem.CheckType.Clickable, .Tag = Me,
-                .Info = Info
-            }
-            Select Case ReleaseType
-                Case 1 'R
-                    NewItem.Logo = "pack://application:,,,/images/Icons/R.png"
-                Case 2 'B
-                    NewItem.Logo = "pack://application:,,,/images/Icons/B.png"
-                Case Else 'A
-                    NewItem.Logo = "pack://application:,,,/images/Icons/A.png"
-            End Select
-            AddHandler NewItem.Click, OnClick
-
-            '建立另存为按钮
-            If OnSaveClick IsNot Nothing Then
-                Dim BtnSave As New MyIconButton With {.Logo = Logo.IconButtonSave, .ToolTip = "另存为"}
-                ToolTipService.SetPlacement(BtnSave, Primitives.PlacementMode.Center)
-                ToolTipService.SetVerticalOffset(BtnSave, 30)
-                ToolTipService.SetHorizontalOffset(BtnSave, 2)
-                AddHandler BtnSave.Click, OnSaveClick
-                NewItem.Buttons = {BtnSave}
-                NewItem.PaddingRight = 35
-            End If
-
-            '结束
-            Return NewItem
-        End Function
-        Public Overrides Function ToString() As String
-            Return DisplayName
-        End Function
-
-    End Class
-
-    ''' <summary>
-    ''' 获取某个 CurseForge 工程下的全部文件列表。
-    ''' 必须在工作线程执行，失败会抛出异常。
-    ''' </summary>
-    Public Function DlCfGetFiles(ProjectId As Integer, IsModPack As Boolean) As List(Of DlCfFile)
-        '获取工程对象
-        Dim TargetProject As DlCfProject
-        If DlCfProjectCache.ContainsKey(ProjectId) Then
-            TargetProject = DlCfProjectCache(ProjectId)
-        Else
-            TargetProject = GetCfProjectFromJson(NetGetCodeByRequestRetry("https://api.curseforge.com/v1/mods/" & ProjectId, IsJson:=True, Encode:=Encoding.UTF8)("data"), IsModPack)
-        End If
-        '获取工程对象的文件列表
-        If TargetProject.Files Is Nothing Then
-            Log("[Download] 开始获取 CurseForge 工程 ID 为 " & ProjectId & " 的文件列表")
-            Dim Json As JArray
-            If TargetProject.IsModPack Then
-                '整合包使用全部文件
-                Json = NetGetCodeByRequestRetry("https://api.curseforge.com/v1/mods/" & ProjectId & "/files?pageSize=999", Accept:="application/json", IsJson:=True)("data")
-            Else
-                'Mod 使用每个版本最新的文件
-                Json = GetJson(NetRequestRetry("https://api.curseforge.com/v1/mods/files", "POST", "{""fileIds"": [" & Join(TargetProject.FileIndexes, ",") & "]}", "application/json"))("data")
-            End If
-            Dim Files As New Dictionary(Of Integer, DlCfFile)
-            For Each JsonEntry As JObject In Json
-                Dim NewFile As New DlCfFile(JsonEntry, IsModPack)
-                If NewFile.IsAvailable AndAlso Not Files.ContainsKey(NewFile.FileId) Then Files.Add(NewFile.FileId, NewFile)
-            Next
-            TargetProject.Files = Files.Values.ToList
-        End If
-        '获取前置 Mod 列表
-        If IsModPack Then GoTo ExitSub
-        Dim Deps As New List(Of Integer)
-        For Each File In TargetProject.Files
-            For Each AddonId In File.Dependencies
-                If Not Deps.Contains(AddonId) AndAlso Not DlCfProjectCache.ContainsKey(AddonId) Then Deps.Add(AddonId)
-            Next
-        Next
-        If Deps.Count > 0 Then
-            '获取前置 Mod 工程信息
-            Log("[Download] 文件列表中需要获取的前置 Mod：" & Join(Deps, "，"))
-            GetCfProjectListFromJson(GetJson(NetRequestRetry("https://api.curseforge.com/v1/mods", "POST", "{""modIds"": [" & Join(Deps, ",") & "]}", "application/json"))("data"), False)
-        End If
-        '返回
-ExitSub:
-        Return TargetProject.Files
-    End Function
-
-    Public Sub DlCfFilesPreload(Stack As StackPanel, Entrys As List(Of DlCfFile), OnClick As MyListItem.ClickEventHandler)
-        '获取卡片对应的前置 ID
-        '如果为整合包就不会有 Dependencies 信息，所以不用管
-        Dim Deps As New List(Of Integer)
-        For Each File In Entrys
-            For Each AddonId In If(File.Dependencies, New List(Of Integer))
-                If Not Deps.Contains(AddonId) Then
-                    If Not DlCfProjectCache.ContainsKey(AddonId) Then
-                        Log("[Download] 未找到 ID 为 " & AddonId & " 的前置 Mod 信息", LogLevel.Developer)
-                        Continue For
-                    End If
-                    Deps.Add(AddonId)
-                End If
-            Next
-        Next
-        Deps.Remove(306612) '移除 Fabric API
-        If Deps.Count = 0 Then Exit Sub
-        Deps.Sort()
-        '添加开头间隔
-        Stack.Children.Add(New TextBlock With {.Text = "前置 Mod", .FontSize = 14, .HorizontalAlignment = HorizontalAlignment.Left, .Margin = New Thickness(6, 2, 0, 5)})
-        '添加前置 Mod 列表
-        For Each Dep In Deps
-            Dim Item = DlCfProjectCache(Dep).ToCfItem(False, True, AddressOf FrmDownloadMod.ProjectClick)
-            'Item.Margin = New Thickness(5, 0, 0, 0)
-            Stack.Children.Add(Item)
-        Next
-        '添加结尾间隔
-        Stack.Children.Add(New TextBlock With {.Text = "可选版本", .FontSize = 14, .HorizontalAlignment = HorizontalAlignment.Left, .Margin = New Thickness(6, 12, 0, 5)})
-    End Sub
+    Public DlOptiFabricLoader As New LoaderTask(Of Integer, List(Of CompFile))("OptiFabric List Loader",
+        Sub(Task As LoaderTask(Of Integer, List(Of CompFile))) Task.Output = CompFilesGet("322385", True))

 #End Region

@@ -1457,7 +1457,7 @@ NextVersion:
        Next

        '去重
-        Dim Result As String = Join(ArrayNoDouble(DeDuplicateDataList), " ")
+        Dim Result As String = Join(DeDuplicateDataList.Distinct.ToList, " ")

        '添加 MainClass
        If Version.JsonObject("mainClass") Is Nothing Then
@@ -1549,7 +1549,7 @@ NextVersion:
            DeDuplicateDataList.Add(CurrentEntry)
        Next
        '去重
-        McLaunchArgumentsGameNew = Join(ArrayNoDouble(DeDuplicateDataList), " ")
+        McLaunchArgumentsGameNew = Join(DeDuplicateDataList.Distinct.ToList, " ")

        '特别改变 OptiFineTweaker
        If (Version.Version.HasForge OrElse Version.Version.HasLiteLoader) AndAlso Version.Version.HasOptiFine Then
@@ -1592,7 +1592,7 @@ NextVersion:
        GameArguments.Add("${auth_access_token}", McLoginLoader.Output.AccessToken)
        GameArguments.Add("${access_token}", McLoginLoader.Output.AccessToken)
        GameArguments.Add("${auth_session}", McLoginLoader.Output.AccessToken)
-        GameArguments.Add("${user_type}", If(McLoginLoader.Output.Type = "Legacy", "Legacy", "Mojang"))
+        GameArguments.Add("${user_type}", "msa") '#1221
        Dim GameSize As Size = Setup.GetLaunchArgumentWindowSize()
        GameArguments.Add("${resolution_width}", GameSize.Width)
        GameArguments.Add("${resolution_height}", GameSize.Height)
@@ -1982,7 +1982,7 @@ IgnoreCustomSkin:
        End If
        Dim Paths As New List(Of String)(StartInfo.EnvironmentVariables("Path").Split(";"))
        Paths.Add(McLaunchJavaSelected.PathFolder)
-        StartInfo.EnvironmentVariables("Path") = Join(ArrayNoDouble(Paths), ";")
+        StartInfo.EnvironmentVariables("Path") = Join(Paths.Distinct.ToList, ";")

        '设置其他参数
        StartInfo.WorkingDirectory = McVersionCurrent.PathIndie
@@ -220,7 +220,7 @@ Public Module ModMinecraft
                PathInEnv = PathInEnv.Trim(" """.ToCharArray())
                If Not PathInEnv.EndsWith("\") Then PathInEnv += "\"
                '粗略检查有效性
-                If File.Exists(PathInEnv & "javaw.exe") Then DictionaryAdd(JavaPreList, PathInEnv, False)
+                If File.Exists(PathInEnv & "javaw.exe") Then JavaPreList(PathInEnv) = False
            Next
            '查找磁盘中的 Java
            For Each Disk As DriveInfo In DriveInfo.GetDrives()
@@ -272,7 +272,7 @@ Public Module ModMinecraft
            Try
                For Each JavaJsonObject In GetJson(ImportedJava)
                    Dim Entry = JavaEntry.FromJson(JavaJsonObject)
-                    If Entry.IsUserImport Then DictionaryAdd(JavaPreList, Entry.PathFolder, True)
+                    If Entry.IsUserImport Then JavaPreList(Entry.PathFolder) = True
                Next
            Catch ex As Exception
                Log(ex, "Java 列表已损坏", LogLevel.Feedback)
@@ -283,10 +283,7 @@ Public Module ModMinecraft

            '确保可用并获取详细信息，转入正式列表
            Dim NewJavaList As New List(Of JavaEntry)
-            For Each Entry In ArrayNoDouble(JavaPreList.ToList,
-                                            Function(a As KeyValuePair(Of String, Boolean), b As KeyValuePair(Of String, Boolean))
-                                                Return a.Key.ToLower = b.Key.ToLower '#794
-                                            End Function)
+            For Each Entry In Distinct(JavaPreList.ToList, Function(a, b) a.Key.ToLower = b.Key.ToLower) '#794
                NewJavaList.Add(New JavaEntry(Entry.Key, Entry.Value))
            Next
            NewJavaList = Sort(JavaCheckList(NewJavaList), AddressOf JavaSorter)
@@ -373,7 +370,7 @@ Wait:
            Dim Path As String = OriginalPath.FullName.Replace("\\", "\")
            If Not Path.EndsWith("\") Then Path += "\"
            '若该目录有 Java，则加入结果
-            If File.Exists(Path & "javaw.exe") Then DictionaryAdd(Results, Path, Source)
+            If File.Exists(Path & "javaw.exe") Then Results(Path) = Source
            '查找其下的所有文件夹
            For Each FolderInfo As DirectoryInfo In OriginalPath.EnumerateDirectories
                If FolderInfo.Attributes.HasFlag(FileAttributes.ReparsePoint) Then Continue For '跳过符号链接
@@ -473,7 +470,7 @@ RetryGet:
            Dim UserJava As JavaEntry = Nothing

            '获取版本独立设置中指定的 Java
-            If RelatedVersion IsNot Nothing AndAlso Setup.Get("VersionArgumentJavaSelect", Version:=RelatedVersion) <> "使用全局设置" Then
+            If RelatedVersion IsNot Nothing AndAlso Setup.Get("VersionArgumentJavaSelect", Version:=RelatedVersion).ToString.StartsWith("{") Then
                Try
                    UserJava = JavaEntry.FromJson(GetJson(Setup.Get("VersionArgumentJavaSelect", Version:=RelatedVersion)))
                    '确保版本独立设置中指定的 Java 在 Java 列表中（#978）
@@ -533,6 +530,7 @@ RetryGet:
            Else
                Select Case MyMsgBox("你在设置中手动指定了使用 Java " & JavaCurrent & "，但当前" & Requirement & "。" & vbCrLf &
                            "如果强制使用该 Java，可能会导致出现异常。" & vbCrLf &
+                            "你可以将 游戏 Java 设置修改为 自动选择合适的 Java 来避免这一提示。" & vbCrLf &
                            vbCrLf &
                            " - 指定的 Java：" & UserJava.ToString,
                            "Java 兼容性警告", "让 PCL2 自动选择", "强制使用该 Java", "取消")
@@ -853,7 +851,7 @@ NoUserJava:
            _McVersionLast = value
            If value Is Nothing Then Exit Property
            '重置缓存的 Mod 文件夹
-            PageDownloadCfDetail.CachedFolder = Nothing
+            PageDownloadCompDetail.CachedFolder = Nothing
            '统一通行证重判
            If AniControlEnabled = 0 AndAlso
               Setup.Get("VersionServerNide", Version:=value) <> Setup.Get("CacheNideServer") AndAlso
@@ -2644,12 +2642,10 @@ NextVersion:
                '普通文件
                Urls.AddRange(DlSourceLibraryGet("https://libraries.minecraft.net" & Token.LocalPath.Replace(If(Token.IsJumpLoader, JumpLoaderFolder, CustomMcFolder) & "libraries", "").Replace("\", "/")))
            End If
-            Result.Add(New NetFile(ArrayNoDouble(Urls.ToArray()), Token.LocalPath, Checker))
+            Result.Add(New NetFile(Urls.Distinct.ToArray, Token.LocalPath, Checker))
        Next
        '去重并返回
-        Return ArrayNoDouble(Result, Function(Left As NetFile, Right As NetFile)
-                                         Return Left.LocalPath = Right.LocalPath
-                                     End Function)
+        Return Distinct(Result, Function(a, b) a.LocalPath = b.LocalPath)
    End Function
    ''' <summary>
    ''' 获取对应的支持库文件地址。
@@ -3268,7 +3264,7 @@ NextVersion:
                            '不知道是个啥玩意儿，直接存储
                            Value = RawValue
                        End If
-                        DictionaryAdd(TomlData.Last.Value, Key, Value)
+                        TomlData.Last.Value(Key) = Value
                    Else
                        '不知道是个啥玩意儿
                        Exit Try
@@ -5,7 +5,7 @@
    ''' 弹窗要求选择一个整合包文件并进行安装。
    ''' </summary>
    Public Sub ModpackInstall()
-        Dim File As String = SelectFile("压缩包文件(*.rar;*.zip)|*.rar;*.zip", "选择整合包压缩文件") '选择整合包文件
+        Dim File As String = SelectFile("整合包文件(*.rar;*.zip;*.mrpack)|*.rar;*.zip;*.mrpack", "选择整合包压缩文件") '选择整合包文件
        If String.IsNullOrEmpty(File) Then Exit Sub
        RunInThread(Sub() ModpackInstall(File))
    End Sub
@@ -23,6 +23,7 @@
                Archive = New Compression.ZipArchive(New FileStream(File, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
                '从根目录判断整合包类型
                If Archive.GetEntry("mcbbs.packmeta") IsNot Nothing Then PackType = 3 : Exit Try 'MCBBS 整合包（优先于 manifest.json 判断）
+                If Archive.GetEntry("modrinth.index.json") IsNot Nothing Then PackType = 4 : Exit Try 'Modrinth 整合包
                If Archive.GetEntry("manifest.json") IsNot Nothing Then
                    Dim Json As JObject = GetJson(ReadFile(Archive.GetEntry("manifest.json").Open, Encoding.UTF8))
                    If Json("addons") Is Nothing Then
@@ -42,6 +43,7 @@
                    If FullNames.Count <> 2 Then Continue For
                    '判断是否为关键文件
                    If FullNames(1) = "mcbbs.packmeta" Then PackType = 3 : Exit Try 'MCBBS 整合包（优先于 manifest.json 判断）
+                    If FullNames(1) = "modrinth.index.json" Then PackType = 4 : Exit Try 'Modrinth 整合包
                    If FullNames(1) = "manifest.json" Then
                        Dim Json As JObject = GetJson(ReadFile(Entry.Open, Encoding.UTF8))
                        If Json("addons") Is Nothing Then
@@ -79,6 +81,9 @@
                Case 3
                    Log("[ModPack] 整合包种类：MCBBS")
                    InstallPackMCBBS(File, Archive, ArchiveBaseFolder)
+                Case 4
+                    Log("[ModPack] 整合包种类：Modrinth")
+                    InstallPackModrinth(File, Archive, ArchiveBaseFolder, VersionName, Logo)
                Case 9
                    Log("[ModPack] 整合包种类：压缩包")
                    Archive.Dispose()
@@ -152,11 +157,8 @@ Retry:
 #Region "不同类型整合包的安装方法"

    'CurseForge
-    ''' <summary>
-    ''' 获取安装 CurseForge 整合包的加载器，若失败或跳过则返回 Nothing。
-    ''' 加载器以安装目标版本文件夹为输入。
-    ''' </summary>
-    Private Function InstallPackCurseForgeLoader(FileAddress As String, Archive As Compression.ZipArchive, ArchiveBaseFolder As String, VersionName As String, Optional Logo As String = Nothing) As LoaderCombo(Of String)
+    Private Sub InstallPackCurseForge(FileAddress As String, Archive As Compression.ZipArchive, ArchiveBaseFolder As String, Optional VersionName As String = Nothing, Optional Logo As String = Nothing)
+
        '读取 Json 文件
        Dim Json As JObject
        Try
@@ -164,8 +166,19 @@ Retry:
            If Json("minecraft") Is Nothing OrElse Json("minecraft")("version") Is Nothing Then Throw New Exception("整合包未提供 Minecraft 版本信息")
        Catch ex As Exception
            Log(ex, "整合包安装信息存在问题", LogLevel.Hint)
-            Return Nothing
+            Exit Sub
        End Try
+
+        '获取版本名
+        Dim ShowRibble As Boolean = VersionName Is Nothing
+        If VersionName Is Nothing Then
+            Dim PackName As String = If(Json("name"), "")
+            Dim Validate As New ValidateFolderName(PathMcFolder & "versions")
+            If Validate.Validate(PackName) <> "" Then PackName = ""
+            VersionName = MyMsgBoxInput("输入版本名称", "", PackName, New ObjectModel.Collection(Of Validate) From {Validate})
+            If String.IsNullOrEmpty(VersionName) Then Exit Sub
+        End If
+
        '获取 Mod API 版本信息
        Dim ForgeVersion As String = Nothing
        Dim FabricVersion As String = Nothing
@@ -175,7 +188,7 @@ Retry:
                'Forge 指定
                If Id.Contains("recommended") Then
                    Log("[ModPack] 该整合包版本过老，已不支持进行安装！", LogLevel.Hint)
-                    Return Nothing
+                    Exit Sub
                End If
                Try
                    Log("[ModPack] 整合包 Forge 版本：" & Id)
@@ -250,8 +263,8 @@ Retry:
                        IsResourcePack = False
                    End If
                    '实际的添加
-                    FileList.Add(ModJson("id"), New DlCfFile(ModJson, False).GetDownloadFile(
-                                 PathMcFolder & "versions\" & VersionName & "\" & If(IsResourcePack, "resourcepacks", "mods") & "\", False))
+                    FileList.Add(ModJson("id"), New CompFile(ModJson, CompType.Mod).ToNetFile(
+                                 PathMcFolder & "versions\" & VersionName & "\" & If(IsResourcePack, "resourcepacks", "mods") & "\"))
                    Task.Progress += 1 / (1 + ModFileList.Count)
                Next
                Task.Output = FileList.Values.ToList
@@ -259,6 +272,7 @@ Retry:
            '下载 Mod 文件
            InstallLoaders.Add(New LoaderDownload("下载 Mod", New List(Of NetFile)) With {.ProgressWeight = ModFileList.Count * 1.5}) '每个 Mod 需要 1.5s
        End If
+
        '构造加载器
        Dim Request As New McInstallRequest With {
            .TargetVersionName = VersionName,
@@ -271,7 +285,7 @@ Retry:
            InstallExpectTime += InstallLoader.ProgressWeight
        Next
        Dim MergeLoaders As List(Of LoaderBase) = McInstallLoader(Request, True)
-        If MergeLoaders Is Nothing Then Return Nothing
+        If MergeLoaders Is Nothing Then Exit Sub
        Dim MergeExpectTime As Double = 0
        For Each MergeLoader In MergeLoaders
            MergeExpectTime += MergeLoader.ProgressWeight
@@ -293,14 +307,15 @@ Retry:
                                                              File.Copy(Logo, VersionFolder & "PCL\Logo.png", True)
                                                              WriteIni(VersionFolder & "PCL\Setup.ini", "Logo", "PCL\Logo.png")
                                                              WriteIni(VersionFolder & "PCL\Setup.ini", "LogoCustom", "True")
-                                                              Log("[Download] 已设置整合包 Logo：" & Logo)
+                                                              Log("[ModPack] 已设置整合包 Logo：" & Logo)
                                                          End If
                                                          '删除原始整合包文件
-                                                          Dim Target As String = VersionFolder & "原始整合包.zip"
-                                                          If Not Setup.Get("ToolDownloadKeepModpack") AndAlso File.Exists(Target) Then
-                                                              Log("[Download] 根据设置要求删除原始整合包文件：" & Target)
-                                                              File.Delete(Target)
-                                                          End If
+                                                          For Each Target As String In {VersionFolder & "原始整合包.zip", VersionFolder & "原始整合包.mrpack"}
+                                                              If Not Setup.Get("ToolDownloadKeepModpack") AndAlso File.Exists(Target) Then
+                                                                  Log("[ModPack] 根据设置要求删除原始整合包文件：" & Target)
+                                                                  File.Delete(Target)
+                                                              End If
+                                                          Next
                                                      End Sub) With {.ProgressWeight = 0.1, .Show = False})

        '重复任务检查
@@ -309,38 +324,166 @@ Retry:
            For i = 0 To LoaderTaskbar.Count - 1
                If LoaderTaskbar(i).Name = LoaderName Then
                    Hint("该整合包正在安装中！", HintType.Critical)
-                    Return Nothing
+                    Exit Sub
                End If
            Next
        End SyncLock

        '启动
        Dim Loader As New LoaderCombo(Of String)(LoaderName, Loaders) With {.OnStateChanged = AddressOf McInstallState}
-        Return Loader
-    End Function
-    Private Sub InstallPackCurseForge(FileAddress As String, Archive As Compression.ZipArchive, ArchiveBaseFolder As String, Optional VersionName As String = Nothing, Optional Logo As String = Nothing)
+        Loader.Start(PathMcFolder & "versions\" & VersionName & "\")
+        LoaderTaskbarAdd(Loader)
+        FrmMain.BtnExtraDownload.ShowRefresh()
+        If ShowRibble Then FrmMain.BtnExtraDownload.Ribble()

+    End Sub
+
+    'Modrinth
+    Private Sub InstallPackModrinth(FileAddress As String, Archive As Compression.ZipArchive, ArchiveBaseFolder As String, Optional VersionName As String = Nothing, Optional Logo As String = Nothing)
+
+        '读取 Json 文件
+        Dim Json As JObject
+        Try
+            Json = GetJson(ReadFile(Archive.GetEntry(ArchiveBaseFolder & "modrinth.index.json").Open))
+            If Json("dependencies") Is Nothing OrElse Json("dependencies")("minecraft") Is Nothing Then Throw New Exception("整合包未提供 Minecraft 版本信息")
+        Catch ex As Exception
+            Log(ex, "整合包安装信息存在问题", LogLevel.Hint)
+            Exit Sub
+        End Try
+        '获取 Mod API 版本信息
+        Dim MinecraftVersion As String = Nothing
+        Dim ForgeVersion As String = Nothing
+        Dim FabricVersion As String = Nothing
+        For Each Entry As JProperty In If(Json("dependencies"), {})
+            Select Case Entry.Name.ToLower
+                Case "minecraft"
+                    MinecraftVersion = Entry.Value.ToString
+                Case "forge" 'eg. 14.23.5.2859
+                    ForgeVersion = Entry.Value.ToString
+                    Log("[ModPack] 整合包 Forge 版本：" & ForgeVersion)
+                Case "fabric-loader" 'eg. 0.14.14
+                    FabricVersion = Entry.Value.ToString
+                    Log("[ModPack] 整合包 Fabric 版本：" & FabricVersion)
+                Case "quilt-loader" 'eg. 1.0.0
+                    Hint("PCL 暂不支持安装需要 Quilt 的整合包！", HintType.Critical)
+                    Exit Sub
+                Case Else
+                    Hint($"无法安装整合包，其中出现了未知的 Mod 加载器 {Entry.Value}！", HintType.Critical)
+                    Exit Sub
+            End Select
+        Next
        '获取版本名
        Dim ShowRibble As Boolean = VersionName Is Nothing
        If VersionName Is Nothing Then
-            Dim Json As JObject
-            Try
-                Json = GetJson(ReadFile(Archive.GetEntry(ArchiveBaseFolder & "manifest.json").Open))
-                If Json("minecraft") Is Nothing OrElse Json("minecraft")("version") Is Nothing Then Throw New Exception("整合包未提供 Minecraft 版本信息")
-            Catch ex As Exception
-                Log(ex, "整合包安装信息存在问题", LogLevel.Hint)
-                Exit Sub
-            End Try
            Dim PackName As String = If(Json("name"), "")
            Dim Validate As New ValidateFolderName(PathMcFolder & "versions")
            If Validate.Validate(PackName) <> "" Then PackName = ""
            VersionName = MyMsgBoxInput("输入版本名称", "", PackName, New ObjectModel.Collection(Of Validate) From {Validate})
            If String.IsNullOrEmpty(VersionName) Then Exit Sub
        End If
+        '解压和配置文件
+        Dim InstallTemp As String = PathTemp & "PackInstall\" & RandomInteger(0, 100000) & "\"
+        Dim InstallLoaders As New List(Of LoaderBase)
+        InstallLoaders.Add(New LoaderTask(Of String, Integer)("解压整合包文件",
+            Sub(Task As LoaderTask(Of String, Integer))
+                UnpackFiles(InstallTemp, FileAddress)
+                Task.Progress = 0.5
+                '复制 overrides 文件夹和 client-overrides 文件夹
+                If Directory.Exists(InstallTemp & ArchiveBaseFolder & "overrides") Then
+                    CopyDirectory(InstallTemp & ArchiveBaseFolder & "overrides", PathMcFolder & "versions\" & VersionName)
+                Else
+                    Log("[ModPack] 整合包中未找到 override 目录，已跳过")
+                End If
+                Task.Progress = 0.8
+                If Directory.Exists(InstallTemp & ArchiveBaseFolder & "client-overrides") Then
+                    CopyDirectory(InstallTemp & ArchiveBaseFolder & "client-overrides", PathMcFolder & "versions\" & VersionName)
+                End If
+                Task.Progress = 0.9
+                '开启版本隔离
+                WriteIni(PathMcFolder & "versions\" & VersionName & "\PCL\Setup.ini", "VersionArgumentIndie", 1)
+            End Sub) With {.ProgressWeight = New FileInfo(FileAddress).Length / 1024 / 1024 / 6, .Block = False}) '每 6M 需要 1s
+        '获取下载文件列表
+        Dim FileList As New List(Of NetFile)
+        For Each File In If(Json("files"), {})
+            '检查是否需要该文件
+            If File("env") IsNot Nothing Then
+                Select Case File("env")("client").ToString
+                    Case "optional"
+                        If MyMsgBox("是否要下载整合包中的可选文件 " & GetFileNameFromPath(File("path").ToString) & "？",
+                                    "下载可选文件", "是", "否") = 2 Then
+                            Continue For
+                        End If
+                    Case "unsupported"
+                        Continue For
+                End Select
+            End If
+            '添加下载文件
+            FileList.Add(New NetFile(File("downloads").Select(Function(t) t.ToString).ToArray,
+                                     PathMcFolder & "versions\" & VersionName & "\" & File("path").ToString,
+                                     New FileChecker(ActualSize:=File("fileSize").ToObject(Of Long), Hash:=File("hashes")("sha1").ToString)))
+        Next
+        If FileList.Count > 0 Then
+            InstallLoaders.Add(New LoaderDownload("下载额外文件", FileList) With {.ProgressWeight = FileList.Count * 1.5}) '每个 Mod 需要 1.5s
+        End If

-        '启动加载器
-        Dim Loader = InstallPackCurseForgeLoader(FileAddress, Archive, ArchiveBaseFolder, VersionName, Logo)
-        If Loader Is Nothing Then Exit Sub
+        '构造加载器
+        Dim Request As New McInstallRequest With {
+            .TargetVersionName = VersionName,
+            .MinecraftName = MinecraftVersion,
+            .ForgeVersion = ForgeVersion,
+            .FabricVersion = FabricVersion
+        }
+        Dim InstallExpectTime As Double = 0
+        For Each InstallLoader In InstallLoaders
+            InstallExpectTime += InstallLoader.ProgressWeight
+        Next
+        Dim MergeLoaders As List(Of LoaderBase) = McInstallLoader(Request, True)
+        If MergeLoaders Is Nothing Then Exit Sub
+        Dim MergeExpectTime As Double = 0
+        For Each MergeLoader In MergeLoaders
+            MergeExpectTime += MergeLoader.ProgressWeight
+        Next
+        '构造 Libraries 加载器（为了使得 Mods 下载结束后再构造，这样才会下载 JumpLoader 文件）
+        Dim LoadersLib As New List(Of LoaderBase)
+        LoadersLib.Add(New LoaderTask(Of String, List(Of NetFile))("分析游戏支持库文件（副加载器）", Sub(Task As LoaderTask(Of String, List(Of NetFile))) Task.Output = McLibFix(New McVersion(VersionName))) With {.ProgressWeight = 1, .Show = False})
+        LoadersLib.Add(New LoaderDownload("下载游戏支持库文件（副加载器）", New List(Of NetFile)) With {.ProgressWeight = 7, .Show = False})
+        '构造总加载器
+        Dim Loaders As New List(Of LoaderBase)
+        Loaders.Add(New LoaderCombo(Of String)("整合包安装", InstallLoaders) With {.Show = False, .Block = False, .ProgressWeight = InstallExpectTime})
+        Loaders.Add(New LoaderCombo(Of String)("游戏安装", MergeLoaders) With {.Show = False, .ProgressWeight = MergeExpectTime})
+        Loaders.Add(New LoaderCombo(Of String)("下载游戏支持库文件", LoadersLib) With {.ProgressWeight = 8})
+        Loaders.Add(New LoaderTask(Of String, String)("最终整理文件",
+                                                      Sub(Task As LoaderTask(Of String, String))
+                                                          '设置图标
+                                                          Dim VersionFolder As String = PathMcFolder & "versions\" & VersionName & "\"
+                                                          If Logo IsNot Nothing AndAlso File.Exists(Logo) Then
+                                                              File.Copy(Logo, VersionFolder & "PCL\Logo.png", True)
+                                                              WriteIni(VersionFolder & "PCL\Setup.ini", "Logo", "PCL\Logo.png")
+                                                              WriteIni(VersionFolder & "PCL\Setup.ini", "LogoCustom", "True")
+                                                              Log("[ModPack] 已设置整合包 Logo：" & Logo)
+                                                          End If
+                                                          '删除原始整合包文件
+                                                          For Each Target As String In {VersionFolder & "原始整合包.zip", VersionFolder & "原始整合包.mrpack"}
+                                                              If Not Setup.Get("ToolDownloadKeepModpack") AndAlso File.Exists(Target) Then
+                                                                  Log("[ModPack] 根据设置要求删除原始整合包文件：" & Target)
+                                                                  File.Delete(Target)
+                                                              End If
+                                                          Next
+                                                      End Sub) With {.ProgressWeight = 0.1, .Show = False})
+
+        '重复任务检查
+        Dim LoaderName As String = "Modrinth 整合包安装：" & VersionName & " "
+        SyncLock LoaderTaskbarLock
+            For i = 0 To LoaderTaskbar.Count - 1
+                If LoaderTaskbar(i).Name = LoaderName Then
+                    Hint("该整合包正在安装中！", HintType.Critical)
+                    Exit Sub
+                End If
+            Next
+        End SyncLock
+
+        '启动
+        Dim Loader As New LoaderCombo(Of String)(LoaderName, Loaders) With {.OnStateChanged = AddressOf McInstallState}
        Loader.Start(PathMcFolder & "versions\" & VersionName & "\")
        LoaderTaskbarAdd(Loader)
        FrmMain.BtnExtraDownload.ShowRefresh()
@@ -382,7 +525,10 @@ Retry:
            WriteIni(PathMcFolder & "versions\" & VersionName & "\PCL\Setup.ini", "VersionArgumentIndie", 1)
        End Sub) With {.ProgressWeight = New FileInfo(FileAddress).Length / 1024 / 1024 / 6, .Block = False}) '每 6M 需要 1s
        '构造加载器
-        If Json("gameVersion") Is Nothing Then Throw New Exception("整合包未提供游戏版本信息")
+        If Json("gameVersion") Is Nothing Then
+            Hint("该整合包未提供游戏版本信息，无法安装！", HintType.Critical)
+            Exit Sub
+        End If
        Dim Request As New McInstallRequest With {
            .TargetVersionName = VersionName,
            .MinecraftName = Json("gameVersion").ToString
@@ -477,7 +623,10 @@ Retry:
            WriteIni(PathMcFolder & "versions\" & VersionName & "\PCL\Setup.ini", "VersionArgumentIndie", 1)
        End Sub) With {.ProgressWeight = New FileInfo(FileAddress).Length / 1024 / 1024 / 6, .Block = False}) '每 6M 需要 1s
        '构造版本安装请求
-        If PackJson("components") Is Nothing Then Throw New Exception("整合包未提供游戏版本信息")
+        If PackJson("components") Is Nothing Then
+            Hint("该整合包未提供游戏版本信息，无法安装！", HintType.Critical)
+            Exit Sub
+        End If
        Dim Request As New McInstallRequest With {.TargetVersionName = VersionName}
        For Each Component In PackJson("components")
            Select Case If(Component("uid"), "").ToString
@@ -564,12 +713,18 @@ Retry:
            WriteIni(PathMcFolder & "versions\" & VersionName & "\PCL\Setup.ini", "VersionArgumentIndie", 1)
        End Sub) With {.ProgressWeight = New FileInfo(FileAddress).Length / 1024 / 1024 / 6, .Block = False}) '每 6M 需要 1s
        '构造加载器
-        If Json("addons") Is Nothing Then Throw New Exception("整合包未提供游戏版本信息")
+        If Json("addons") Is Nothing Then
+            Hint("该整合包未提供游戏版本附加信息，无法安装！", HintType.Critical)
+            Exit Sub
+        End If
        Dim Addons As New Dictionary(Of String, String)
        For Each Entry In Json("addons")
            Addons.Add(Entry("id"), Entry("version"))
        Next
-        If Not Addons.ContainsKey("game") Then Throw New Exception("整合包未提供游戏版本信息")
+        If Not Addons.ContainsKey("game") Then
+            Hint("该整合包未提供游戏版本信息，无法安装！", HintType.Critical)
+            Exit Sub
+        End If
        Dim Request As New McInstallRequest With {
            .TargetVersionName = VersionName,
            .MinecraftName = Addons("game"),
@@ -0,0 +1,45 @@
+<Grid x:Class="MyCompItem"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Name="PanBack" Height="59"
+             RenderTransformOrigin="0.5,0.5" Background="{StaticResource ColorBrushSemiTransparent}" SnapsToDevicePixels="True">
+    <Grid.ColumnDefinitions>
+        <ColumnDefinition Width="7" />
+        <ColumnDefinition Width="Auto" />
+        <ColumnDefinition Width="9" />
+        <ColumnDefinition Width="1*"/>
+        <ColumnDefinition Width="Auto"/>
+        <ColumnDefinition Width="7" />
+    </Grid.ColumnDefinitions>
+    <Grid.RowDefinitions>
+        <RowDefinition Height="1*" />
+        <RowDefinition Height="17" />
+        <RowDefinition Height="14" />
+        <RowDefinition Height="14" />
+        <RowDefinition Height="1*" />
+    </Grid.RowDefinitions>
+    <!--<Rectangle Height="45" Width="45" RadiusX="4" RadiusY="4" Fill="White" Grid.Column="1" Grid.Row="1" IsHitTestVisible="False" SnapsToDevicePixels="True" UseLayoutRounding="False" Grid.RowSpan="3" />-->
+    <Border Height="45" Width="45" Grid.Column="1" Grid.Row="1" IsHitTestVisible="False" SnapsToDevicePixels="True" UseLayoutRounding="True" Grid.RowSpan="3">
+        <Border.Clip>
+            <RectangleGeometry Rect="0,0,45,45" RadiusX="6" RadiusY="6" />
+        </Border.Clip>
+        <Image x:Name="PathLogo" RenderOptions.BitmapScalingMode="HighQuality" />
+    </Border>
+    <TextBlock x:Name="LabTitle" Grid.Row="1" Grid.Column="3" Grid.ColumnSpan="2" IsHitTestVisible="False" SnapsToDevicePixels="False" UseLayoutRounding="False" 
+               Margin="0,0,0,1" HorizontalAlignment="Left" VerticalAlignment="Center" TextTrimming="CharacterEllipsis" 
+               FontSize="14" Foreground="{StaticResource ColorBrush1}" />
+    <TextBlock x:Name="LabLeft" Grid.Row="2" Grid.Column="3" IsHitTestVisible="False" SnapsToDevicePixels="False" UseLayoutRounding="False" 
+               HorizontalAlignment="Left" VerticalAlignment="Center" TextTrimming="CharacterEllipsis"
+               FontSize="12" Foreground="{StaticResource ColorBrushGray3}" />
+    <!--<TextBlock x:Name="LabRight" Grid.Row="2" Grid.Column="4" IsHitTestVisible="False" SnapsToDevicePixels="False" UseLayoutRounding="False" 
+               HorizontalAlignment="Right" VerticalAlignment="Center" TextTrimming="CharacterEllipsis" 
+               FontSize="12" Foreground="{StaticResource ColorBrushGray3}" />-->
+    <TextBlock x:Name="LabInfo" Grid.Row="3" Grid.Column="3" Grid.ColumnSpan="2" IsHitTestVisible="True" SnapsToDevicePixels="False" UseLayoutRounding="False" 
+               HorizontalAlignment="Left" VerticalAlignment="Center" TextTrimming="CharacterEllipsis" 
+               FontSize="12" Foreground="{StaticResource ColorBrushGray3}"
+               ToolTipService.InitialShowDelay="80" ToolTipService.Placement="Relative" ToolTipService.PlacementRectangle="-8,-6,500,10000">
+        <TextBlock.ToolTip>
+            <ToolTip x:Name="ToolTipInfo" Style="{StaticResource ExtendTextToolTip}" />
+        </TextBlock.ToolTip>
+    </TextBlock>
+</Grid>
@@ -0,0 +1,207 @@
+Public Class MyCompItem
+    Public Uuid As Integer = GetUuid()
+
+#Region "Logo"
+
+    Private _Logo As String = ""
+    Public Property Logo As String
+        Get
+            Return _Logo
+        End Get
+        Set(value As String)
+            If _Logo = value OrElse value Is Nothing Then Exit Property
+            _Logo = value
+            Dim FileAddress = PathTemp & "CompLogo\" & GetHash(_Logo) & ".png"
+            Try
+                If _Logo.ToLower.StartsWith("http") Then
+                    '网络图片
+                    If File.Exists(FileAddress) Then
+                        PathLogo.Source = New MyBitmap(FileAddress)
+                    ElseIf _Logo.ToLower.EndsWith(".webp") Then 'Modrinth 林业 Mod 使用了不支持的 WebP 格式 Logo
+                        Log($"[Comp] 发现不支持的 WebP 格式图标，已更改为默认图标：{_Logo}")
+                        PathLogo.Source = New MyBitmap("pack://application:,,,/images/Icons/NoIcon.png")
+                    Else
+                        PathLogo.Source = New MyBitmap("pack://application:,,,/images/Icons/NoIcon.png")
+                        RunInNewThread(Sub() LogoLoader(FileAddress), "Comp Logo Loader " & Uuid & "#", ThreadPriority.BelowNormal)
+                    End If
+                Else
+                    '位图
+                    PathLogo.Source = New MyBitmap(_Logo)
+                End If
+            Catch ex As IOException
+                Log(ex, "加载资源工程图标时读取失败（" & FileAddress & "）")
+            Catch ex As ArgumentException
+                '考虑缓存的图片本身可能有误
+                Log(ex, "可视化资源工程图标失败（" & FileAddress & "）")
+                Try
+                    File.Delete(FileAddress)
+                    Log("[Comp] 已清理损坏的资源工程图标：" & FileAddress)
+                Catch exx As Exception
+                    Log(exx, "清理损坏的资源工程图标缓存失败（" & FileAddress & "）", LogLevel.Hint)
+                End Try
+            Catch ex As Exception
+                Log(ex, "加载资源工程图标失败（" & value & "）")
+            End Try
+        End Set
+    End Property
+
+    Private Sub LogoLoader(Address As String)
+        Dim Retry As Boolean = False
+        Dim DownloadEnd As String = GetUuid()
+RetryStart:
+        Try
+            NetDownload(_Logo, Address & DownloadEnd)
+            Dim LoadError As Exception = Nothing
+            RunInUiWait(Sub()
+                            Try
+                                '在地址更换时取消加载
+                                If Not Address = PathTemp & "CompLogo\" & GetHash(_Logo) & ".png" Then Exit Sub
+                                '在完成正常加载后才保存缓存图片
+                                PathLogo.Source = New MyBitmap(Address & DownloadEnd)
+                            Catch ex As Exception
+                                Log(ex, "读取资源工程图标失败（" & Address & "）")
+                                File.Delete(Address & DownloadEnd)
+                                LoadError = ex
+                            End Try
+                        End Sub)
+            If LoadError IsNot Nothing Then Throw LoadError
+            If File.Exists(Address) Then
+                File.Delete(Address & DownloadEnd)
+            Else
+                FileIO.FileSystem.MoveFile(Address & DownloadEnd, Address)
+            End If
+        Catch ex As Exception
+            If Not Retry Then
+                Retry = True
+                GoTo RetryStart
+            Else
+                Log(ex, $"下载资源工程图标失败（{_Logo}）")
+                RunInUi(Sub() PathLogo.Source = New MyBitmap("pack://application:,,,/images/Icons/NoIcon.png"))
+            End If
+        End Try
+    End Sub
+
+#End Region
+
+#Region "点击"
+
+    '触发点击事件
+    Public Event Click(sender As Object, e As MouseButtonEventArgs)
+    Private Sub Button_MouseUp(sender As Object, e As MouseButtonEventArgs) Handles Me.PreviewMouseLeftButtonUp
+        If IsMouseDown Then
+            RaiseEvent Click(sender, e)
+            If e.Handled Then Exit Sub
+            Log("[Control] 按下资源工程列表项：" & LabTitle.Text)
+        End If
+    End Sub
+
+    '鼠标点击判定
+    Private IsMouseDown As Boolean = False
+    Private Sub Button_MouseDown(sender As Object, e As MouseButtonEventArgs) Handles Me.PreviewMouseLeftButtonDown
+        If IsMouseOver Then IsMouseDown = True
+    End Sub
+    Private Sub Button_MouseLeave(sender As Object, e As Object) Handles Me.MouseLeave, Me.PreviewMouseLeftButtonUp
+        IsMouseDown = False
+    End Sub
+
+#End Region
+
+#Region "后加载指向背景"
+
+    Private _RectBack As Border = Nothing
+    Public ReadOnly Property RectBack As Border
+        Get
+            If _RectBack Is Nothing Then
+                Dim Rect As New Border With {
+                    .Name = "RectBack",
+                    .CornerRadius = New CornerRadius(3),
+                    .RenderTransform = New ScaleTransform(0.8, 0.8),
+                    .RenderTransformOrigin = New Point(0.5, 0.5),
+                    .BorderThickness = New Thickness(GetWPFSize(1)),
+                    .SnapsToDevicePixels = True,
+                    .IsHitTestVisible = False,
+                    .Opacity = 0
+                }
+                Rect.SetResourceReference(Border.BackgroundProperty, "ColorBrush7")
+                Rect.SetResourceReference(Border.BorderBrushProperty, "ColorBrush6")
+                SetColumnSpan(Rect, 999)
+                SetRowSpan(Rect, 999)
+                Children.Insert(0, Rect)
+                _RectBack = Rect
+                '<!--<Border x:Name = "RectBack" CornerRadius="3" RenderTransformOrigin="0.5,0.5" SnapsToDevicePixels="True" 
+                'IsHitTestVisible = "False" Opacity="0" BorderThickness="1" 
+                'Grid.ColumnSpan = "4" Background="{DynamicResource ColorBrush7}" BorderBrush="{DynamicResource ColorBrush6}"/>-->
+            End If
+            Return _RectBack
+        End Get
+    End Property
+
+#End Region
+
+    Private StateLast As String
+    Public HasAnimation As Boolean = True
+    Public Sub RefreshColor(sender As Object, e As EventArgs) Handles Me.MouseEnter, Me.MouseLeave, Me.MouseLeftButtonDown, Me.MouseLeftButtonUp
+        If Not HasAnimation Then Exit Sub
+        '判断当前颜色
+        Dim StateNew As String, Time As Integer
+        If IsMouseOver Then
+            If IsMouseDown Then
+                StateNew = "MouseDown"
+                Time = 120
+            Else
+                StateNew = "MouseOver"
+                Time = 120
+            End If
+        Else
+            StateNew = "Idle"
+            Time = 180
+        End If
+        If StateLast = StateNew Then Exit Sub
+        StateLast = StateNew
+        '触发颜色动画
+        If IsLoaded AndAlso AniControlEnabled = 0 Then '防止默认属性变更触发动画
+            '有动画
+            Dim Ani As New List(Of AniData)
+            If IsMouseOver Then
+                Ani.AddRange({
+                             AaColor(RectBack, Border.BackgroundProperty, If(IsMouseDown, "ColorBrush6", "ColorBrushBg1"), Time),
+                             AaOpacity(RectBack, 1 - RectBack.Opacity, Time,, New AniEaseOutFluent)
+                         })
+                If IsMouseDown Then
+                    Ani.Add(AaScaleTransform(RectBack, 0.996 - CType(RectBack.RenderTransform, ScaleTransform).ScaleX, Time * 1.2,, New AniEaseOutFluent))
+                Else
+                    Ani.Add(AaScaleTransform(RectBack, 1 - CType(RectBack.RenderTransform, ScaleTransform).ScaleX, Time * 1.2,, New AniEaseOutFluent))
+                End If
+            Else
+                Ani.AddRange({
+                             AaOpacity(RectBack, -RectBack.Opacity, Time),
+                             AaColor(RectBack, Border.BackgroundProperty, If(IsMouseDown, "ColorBrush6", "ColorBrush7"), Time),
+                             AaScaleTransform(RectBack, 0.996 - CType(RectBack.RenderTransform, ScaleTransform).ScaleX, Time,, New AniEaseOutFluent),
+                             AaScaleTransform(RectBack, -0.196, 1,,, True)
+                         })
+            End If
+            AniStart(Ani, "CompItem Color " & Uuid)
+        Else
+            '无动画
+            AniStop("CompItem Color " & Uuid)
+            If _RectBack IsNot Nothing Then RectBack.Opacity = 0
+        End If
+    End Sub
+
+    '指向时扩展描述
+    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
+    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
+
+End Class