2.7.4
This commit is contained in:
龙腾猫跃
@@ -1,4 +1,6 @@
|
||||
Public Module ModMinecraft
|
||||
Imports System.IO.Compression
|
||||
|
||||
Public Module ModMinecraft
|
||||
|
||||
#Region "文件夹"
|
||||
|
||||
@@ -149,7 +151,7 @@
|
||||
|
||||
#Region "版本处理"
|
||||
|
||||
Public Const McVersionCacheVersion As Integer = 27
|
||||
Public Const McVersionCacheVersion As Integer = 29
|
||||
|
||||
Private _McVersionCurrent As McVersion
|
||||
Private _McVersionLast = 0 '为 0 以保证与 Nothing 不相同，使得 UI 显示可以正常初始化
|
||||
@@ -391,6 +393,29 @@
|
||||
_Version.McName = JsonObject("jar").ToString
|
||||
GoTo VersionSearchFinish
|
||||
End If
|
||||
'从 jar 文件的 version.json 中获取版本号
|
||||
If File.Exists(Path & Name & ".jar") Then
|
||||
Try
|
||||
Using JarArchive As New ZipArchive(New FileStream(Path & Name & ".jar", FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
|
||||
Dim VersionJson As ZipArchiveEntry = JarArchive.GetEntry("version.json")
|
||||
If VersionJson IsNot Nothing Then
|
||||
Using VersionJsonStream As New StreamReader(VersionJson.Open)
|
||||
Dim VersionJsonObj As JObject = GetJson(VersionJsonStream.ReadToEnd)
|
||||
If VersionJsonObj("id") IsNot Nothing Then
|
||||
Dim VersionId As String = VersionJsonObj("id").ToString
|
||||
If VersionId.Length < 32 Then '因为 wiki 说这玩意儿可能是个 hash，虽然我没发现
|
||||
_Version.McName = VersionId
|
||||
Log("[Minecraft] 从版本 jar 中的 version.json 获取到版本号：" & VersionId)
|
||||
GoTo VersionSearchFinish
|
||||
End If
|
||||
End If
|
||||
End Using
|
||||
End If
|
||||
End Using
|
||||
Catch ex As Exception
|
||||
Log(ex, "从版本 jar 中的 version.json 获取版本号失败")
|
||||
End Try
|
||||
End If
|
||||
'非准确的版本判断警告
|
||||
Log("[Minecraft] 无法完全确认 MC 版本号的版本：" & Name)
|
||||
'从文件夹名中获取
|
||||
@@ -1034,7 +1059,7 @@ ExitDataLoad:
|
||||
Dim Path As String = Loader.Input
|
||||
Try
|
||||
'初始化
|
||||
McVersionList.Clear()
|
||||
McVersionList = New Dictionary(Of McVersionCardType, List(Of McVersion))
|
||||
|
||||
'检测缓存是否需要更新
|
||||
Dim FolderList As New List(Of String)
|
||||
@@ -1075,10 +1100,10 @@ Reload:
|
||||
|
||||
'改变当前选择的版本
|
||||
OnLoaded:
|
||||
If McVersionList.Any(Function(v) v.Key <> McVersionCardType.Error) Then '不能判断 Count = 0，这在只有错误版本时导致了误判
|
||||
If McVersionList.Any(Function(v) v.Key <> McVersionCardType.Error) Then
|
||||
'尝试读取已储存的选择
|
||||
Dim SavedSelection As String = ReadIni(Path & "PCL.ini", "Version")
|
||||
If Not SavedSelection = "" Then
|
||||
If SavedSelection <> "" Then
|
||||
For Each Card As KeyValuePair(Of McVersionCardType, List(Of McVersion)) In McVersionList
|
||||
For Each Version As McVersion In Card.Value
|
||||
If Version.Name = SavedSelection AndAlso Not Version.State = McVersionState.Error Then
|
||||
@@ -1190,7 +1215,7 @@ OnLoaded:
|
||||
End Try
|
||||
Next
|
||||
|
||||
ResultVersionList.Add(CardType, VersionList)
|
||||
If VersionList.Any Then ResultVersionList.Add(CardType, VersionList)
|
||||
Next
|
||||
Return ResultVersionList
|
||||
Catch ex As Exception
|
||||
@@ -1200,10 +1225,14 @@ OnLoaded:
|
||||
End Function
|
||||
Private Function McVersionListLoadNoCache(Path As String) As Dictionary(Of McVersionCardType, List(Of McVersion))
|
||||
Dim VersionList As New List(Of McVersion)
|
||||
Dim ResultVersionList As New Dictionary(Of McVersionCardType, List(Of McVersion))
|
||||
|
||||
#Region "循环加载每个版本的信息"
|
||||
Dim Dirs As DirectoryInfo() = New DirectoryInfo(Path & "versions").GetDirectories
|
||||
For Each Folder As DirectoryInfo In Dirs
|
||||
If Not Folder.EnumerateFiles.Any Then
|
||||
Log("[Minecraft] 跳过空文件夹：" & Folder.FullName)
|
||||
Continue For
|
||||
End If
|
||||
If (Folder.Name = "cache" OrElse Folder.Name = "BLClient" OrElse Folder.Name = "PCL") AndAlso Not File.Exists(Folder.FullName & "\" & Folder.Name & ".json") Then
|
||||
Log("[Minecraft] 跳过可能不是版本文件夹的项目：" & Folder.FullName)
|
||||
Continue For
|
||||
@@ -1223,6 +1252,9 @@ OnLoaded:
|
||||
Version.Load()
|
||||
Next
|
||||
#End Region
|
||||
|
||||
Dim ResultVersionList As New Dictionary(Of McVersionCardType, List(Of McVersion))
|
||||
|
||||
#Region "将版本分类到各个卡片"
|
||||
Try
|
||||
|
||||
@@ -1236,7 +1268,7 @@ OnLoaded:
|
||||
Next
|
||||
If StaredVersions.Any Then VersionListOriginal.Add(McVersionCardType.Star, StaredVersions)
|
||||
|
||||
'预先筛选出愚人节的版本
|
||||
'预先筛选出愚人节和错误的版本
|
||||
McVersionFilter(VersionList, VersionListOriginal, {McVersionState.Error}, McVersionCardType.Error)
|
||||
McVersionFilter(VersionList, VersionListOriginal, {McVersionState.Fool}, McVersionCardType.Fool)
|
||||
|
||||
@@ -1347,9 +1379,7 @@ OnLoaded:
|
||||
Next
|
||||
If Not IsNothing(Snapshot) Then OldList.Remove(Snapshot)
|
||||
'按版本号排序
|
||||
Dim NewList As List(Of McVersion) = Sort(OldList, Function(Left As McVersion, Right As McVersion)
|
||||
Return Left.Version.McCodeMain > Right.Version.McCodeMain
|
||||
End Function)
|
||||
Dim NewList As List(Of McVersion) = Sort(OldList, Function(Left, Right) Left.Version.McCodeMain > Right.Version.McCodeMain)
|
||||
'回设
|
||||
If Not IsNothing(Snapshot) Then NewList.Insert(0, Snapshot)
|
||||
ResultVersionList(McVersionCardType.OriginalLike) = NewList
|
||||
@@ -1357,43 +1387,45 @@ OnLoaded:
|
||||
|
||||
'不常用版本：按发布时间新旧排序，如果不可用则按名称排序
|
||||
If ResultVersionList.ContainsKey(McVersionCardType.Rubbish) Then
|
||||
ResultVersionList(McVersionCardType.Rubbish) = Sort(ResultVersionList(McVersionCardType.Rubbish), Function(Left As McVersion, Right As McVersion)
|
||||
Dim LeftYear As Integer = Left.ReleaseTime.Year '+ If(Left.State = McVersionState.Original OrElse Left.Version.HasOptiFine, 100, 0)
|
||||
Dim RightYear As Integer = Right.ReleaseTime.Year '+ If(Right.State = McVersionState.Original OrElse Left.Version.HasOptiFine, 100, 0)
|
||||
If LeftYear > 2000 AndAlso RightYear > 2000 Then
|
||||
If LeftYear <> RightYear Then
|
||||
Return LeftYear > RightYear
|
||||
Else
|
||||
Return Left.ReleaseTime > Right.ReleaseTime
|
||||
End If
|
||||
ElseIf LeftYear > 2000 AndAlso RightYear < 2000 Then
|
||||
Return True
|
||||
ElseIf LeftYear < 2000 AndAlso RightYear > 2000 Then
|
||||
Return False
|
||||
Else
|
||||
Return Left.Name > Right.Name
|
||||
End If
|
||||
End Function)
|
||||
ResultVersionList(McVersionCardType.Rubbish) = Sort(ResultVersionList(McVersionCardType.Rubbish),
|
||||
Function(Left As McVersion, Right As McVersion)
|
||||
Dim LeftYear As Integer = Left.ReleaseTime.Year '+ If(Left.State = McVersionState.Original OrElse Left.Version.HasOptiFine, 100, 0)
|
||||
Dim RightYear As Integer = Right.ReleaseTime.Year '+ If(Right.State = McVersionState.Original OrElse Left.Version.HasOptiFine, 100, 0)
|
||||
If LeftYear > 2000 AndAlso RightYear > 2000 Then
|
||||
If LeftYear <> RightYear Then
|
||||
Return LeftYear > RightYear
|
||||
Else
|
||||
Return Left.ReleaseTime > Right.ReleaseTime
|
||||
End If
|
||||
ElseIf LeftYear > 2000 AndAlso RightYear < 2000 Then
|
||||
Return True
|
||||
ElseIf LeftYear < 2000 AndAlso RightYear > 2000 Then
|
||||
Return False
|
||||
Else
|
||||
Return Left.Name > Right.Name
|
||||
End If
|
||||
End Function)
|
||||
End If
|
||||
|
||||
'API 版本：优先按版本排序，此后【先放 Fabric，再放 Forge（按版本号从高到低排序），最后放 LiteLoader（按名称排序）】
|
||||
If ResultVersionList.ContainsKey(McVersionCardType.API) Then
|
||||
ResultVersionList(McVersionCardType.API) = Sort(ResultVersionList(McVersionCardType.API), Function(Left As McVersion, Right As McVersion)
|
||||
Dim Basic = VersionSortInteger(Left.Version.McName, Right.Version.McName)
|
||||
If Basic <> 0 Then
|
||||
Return Basic > 0
|
||||
Else
|
||||
If Left.Version.HasFabric Xor Right.Version.HasFabric Then
|
||||
Return Left.Version.HasFabric
|
||||
ElseIf Left.Version.HasForge Xor Right.Version.HasForge Then
|
||||
Return Left.Version.HasForge
|
||||
ElseIf Not Left.Version.SortCode <> Right.Version.SortCode Then
|
||||
Return Left.Version.SortCode > Right.Version.SortCode
|
||||
Else
|
||||
Return Left.Name > Right.Name
|
||||
End If
|
||||
End If
|
||||
End Function)
|
||||
ResultVersionList(McVersionCardType.API) = Sort(ResultVersionList(McVersionCardType.API),
|
||||
Function(Left As McVersion, Right As McVersion)
|
||||
Dim Basic = VersionSortInteger(Left.Version.McName, Right.Version.McName)
|
||||
If Basic <> 0 Then
|
||||
Return Basic > 0
|
||||
Else
|
||||
If Left.Version.HasFabric Xor Right.Version.HasFabric Then
|
||||
Return Left.Version.HasFabric
|
||||
ElseIf Left.Version.HasForge Xor Right.Version.HasForge Then
|
||||
Return Left.Version.HasForge
|
||||
ElseIf Not Left.Version.SortCode <> Right.Version.SortCode Then
|
||||
Return Left.Version.SortCode > Right.Version.SortCode
|
||||
Else
|
||||
Return Left.Name > Right.Name
|
||||
End If
|
||||
End If
|
||||
End Function)
|
||||
End If
|
||||
|
||||
#End Region
|
||||
@@ -1417,17 +1449,7 @@ OnLoaded:
|
||||
''' <param name="Formula">需要筛选出的版本类型。-2 代表隐藏的版本。</param>
|
||||
''' <param name="CardType">卡片的名称。</param>
|
||||
Private Sub McVersionFilter(ByRef VersionList As List(Of McVersion), ByRef Target As Dictionary(Of McVersionCardType, List(Of McVersion)), Formula As McVersionState(), CardType As McVersionCardType)
|
||||
'将某种版本筛选出来
|
||||
Dim KeepList As New List(Of McVersion)
|
||||
For Each Version As McVersion In VersionList
|
||||
For Each Type As Integer In Formula
|
||||
If Type = Version.State Then
|
||||
KeepList.Add(Version)
|
||||
GoTo NextVersion
|
||||
End If
|
||||
Next
|
||||
NextVersion:
|
||||
Next
|
||||
Dim KeepList = VersionList.Where(Function(v) Formula.Contains(v.State)).ToList
|
||||
'加入版本列表，并从剩余中删除
|
||||
If KeepList.Any Then
|
||||
Target.Add(CardType, KeepList)
|
||||
@@ -1443,13 +1465,8 @@ NextVersion:
|
||||
''' <param name="Formula">需要筛选出的版本类型。-2 代表隐藏的版本。</param>
|
||||
''' <param name="KeepList">传入需要增加入的列表。</param>
|
||||
Private Sub McVersionFilter(ByRef VersionList As List(Of McVersion), Formula As McVersionState(), ByRef KeepList As List(Of McVersion))
|
||||
For Each Version As McVersion In VersionList
|
||||
For Each Type As McVersionState In Formula
|
||||
If Type <> Version.State Then Continue For
|
||||
KeepList.Add(Version) : Exit For
|
||||
Next
|
||||
NextVersion:
|
||||
Next
|
||||
KeepList.AddRange(VersionList.Where(Function(v) Formula.Contains(v.State)))
|
||||
'加入版本列表，并从剩余中删除
|
||||
If KeepList.Any Then
|
||||
For Each Version As McVersion In KeepList
|
||||
VersionList.Remove(Version)
|
||||
|
||||
Reference in New Issue
Block a user