2.12.8.1
This commit is contained in:
龙腾猫跃
@@ -333,7 +333,7 @@ NextInner:
|
||||
Me.Type = Type
|
||||
End Sub
|
||||
Public Overrides Function GetHashCode() As Integer
|
||||
Return GetHash(UserName & Password & BaseUrl & Token & Type) Mod Integer.MaxValue
|
||||
Return (UserName & Password & BaseUrl & Token & Type).GetStableHashCode() Mod Integer.MaxValue
|
||||
End Function
|
||||
|
||||
End Class
|
||||
@@ -353,7 +353,7 @@ NextInner:
|
||||
Type = McLoginType.Ms
|
||||
End Sub
|
||||
Public Overrides Function GetHashCode() As Integer
|
||||
Return GetHash(OAuthRefreshToken & AccessToken & Uuid & UserName & ProfileJson) Mod Integer.MaxValue
|
||||
Return (OAuthRefreshToken & AccessToken & Uuid & UserName & ProfileJson).GetStableHashCode() Mod Integer.MaxValue
|
||||
End Function
|
||||
End Class
|
||||
Public Class McLoginLegacy
|
||||
@@ -375,7 +375,7 @@ NextInner:
|
||||
Type = McLoginType.Legacy
|
||||
End Sub
|
||||
Public Overrides Function GetHashCode() As Integer
|
||||
Return GetHash(UserName & SkinType & SkinName & Type) Mod Integer.MaxValue
|
||||
Return (UserName & SkinType & SkinName & Type).GetStableHashCode() Mod Integer.MaxValue
|
||||
End Function
|
||||
End Class
|
||||
|
||||
@@ -535,21 +535,15 @@ NextInner:
|
||||
Data.Progress = 0.05
|
||||
'检查是否已经登录完成
|
||||
Dim ExpiresAt = Settings.Get(Of Long)("CacheMsV2Expires")
|
||||
|
||||
If Not Data.IsForceRestarting AndAlso '不要求强行重启
|
||||
ExpiresAt > 0 AndAlso ExpiresAt > GetUnixTimestampUtc() Then 'AccessToken 尚未过期
|
||||
'https://github.com/Meloong-Git/PCL/issues/8638
|
||||
'如果是程序刚启动时调用的登录，此时加载器的状态为 Waiting，GetLoginData 函数会返回不带 ProfileJson 的数据作为输入
|
||||
If String.IsNullOrEmpty(Input.ProfileJson) Then
|
||||
Input = PageLoginMsSkin.GetLoginData(True)
|
||||
End If
|
||||
ExpiresAt > 0 AndAlso ExpiresAt > GetUnixTimestampUtc() AndAlso 'AccessToken 尚未过期
|
||||
Input.UserName = Settings.Get(Of String)("CacheMsV2Name") Then
|
||||
Data.Output = New McLoginResult With {
|
||||
.AccessToken = Input.AccessToken,
|
||||
.Name = Input.UserName,
|
||||
.Uuid = Input.Uuid,
|
||||
.Type = "Microsoft",
|
||||
.ClientToken = Input.Uuid,
|
||||
.ProfileJson = Input.ProfileJson
|
||||
.Name = Input.UserName, .Type = "Microsoft",
|
||||
.AccessToken = Settings.Get(Of String)("CacheMsV2Access"),
|
||||
.Uuid = Settings.Get(Of String)("CacheMsV2Uuid"),
|
||||
.ClientToken = Settings.Get(Of String)("CacheMsV2Uuid"),
|
||||
.ProfileJson = Settings.Get(Of String)("CacheMsV2ProfileJson")
|
||||
}
|
||||
McLaunchLog("无需登录，AccessToken 尚未过期")
|
||||
GoTo SkipLogin
|
||||
@@ -1018,16 +1012,18 @@ Retry:
|
||||
Result = NetRequestByClientRetry("https://api.minecraftservices.com/authentication/login_with_xbox", HttpMethod.Post,
|
||||
Content:=Request, ContentType:="application/json", RequireJson:=True)
|
||||
Catch ex As HttpRequestCodeException
|
||||
Select Case ex.StatusCode
|
||||
Case 429
|
||||
Logger.Warn(ex, "微软登录第 4 步汇报 429")
|
||||
Throw New Exception("$登录尝试太过频繁，请等待几分钟后再试！")
|
||||
Case HttpStatusCode.Forbidden
|
||||
Logger.Warn(ex, "微软登录第 4 步汇报 403")
|
||||
Throw New Exception("$当前 IP 的登录尝试异常。" & vbCrLf & "如果你使用了 VPN 或加速器，请把它们关掉或更换节点后再试！")
|
||||
Case Else
|
||||
Throw
|
||||
End Select
|
||||
If ex.StatusCode = 429 Then
|
||||
Logger.Warn(ex, "微软登录第 4 步汇报 429")
|
||||
Throw New Exception("$登录尝试太过频繁，请等待几分钟后再试！")
|
||||
ElseIf ex.StatusCode = HttpStatusCode.Forbidden Then
|
||||
Logger.Warn(ex, "微软登录第 4 步汇报 403")
|
||||
Throw New Exception("$当前 IP 的登录尝试异常。" & vbCrLf & "如果你使用了 VPN 或加速器，请把它们关掉或更换节点后再试！")
|
||||
ElseIf ex.Response?.Contains("ACCOUNT_SUSPENDED") Then '#8655
|
||||
MyMsgBox("该账号似乎已被微软封禁，无法登录。", "登录失败", "我知道了", IsWarn:=True)
|
||||
Throw New Exception("$$")
|
||||
Else
|
||||
Throw
|
||||
End If
|
||||
End Try
|
||||
|
||||
Dim ResultJson As JObject = GetJson(Result)
|
||||
@@ -1152,7 +1148,7 @@ Retry:
|
||||
Return Uuid
|
||||
End Function
|
||||
Public Function McLoginLegacyUuid(Name As String)
|
||||
Dim FullUuid As String = Name.Length.ToString("X").EnsureLength("0", 16) & GetHash(Name).ToString("X").EnsureLength("0", 16)
|
||||
Dim FullUuid As String = Name.Length.ToString("X").EnsureLength("0", 16) & Name.GetStableHashCode().ToString("X").EnsureLength("0", 16)
|
||||
Return FullUuid.Substring(0, 12) & "3" & FullUuid.Substring(13, 3) & "9" & FullUuid.Substring(17, 15)
|
||||
End Function
|
||||
|
||||
@@ -1445,14 +1441,13 @@ NextInstance:
|
||||
End If
|
||||
|
||||
'JLW
|
||||
'修复 Java 18- 在 Windows UTF-8 Beta 模式（非 GBK 编码）下命令行参数乱码的问题（JDK-8272352）
|
||||
'非 GBK 编码下命令行参数乱码的问题（JDK-8272352）
|
||||
Dim UseJLW As Boolean =
|
||||
Not Settings.Get(Of Boolean)("LaunchAdvanceDisableJLW") AndAlso Not Settings.Get(Of Boolean)("VersionAdvanceDisableJLW", McInstanceSelected) AndAlso
|
||||
McLaunchJavaSelected.MajorVersion <= 18 AndAlso 'Java 19+ 已经修复了该 Bug
|
||||
Not IsGBKEncoding AndAlso Not McFolderSelected.IsAsciiOnly() '仅在该环境下才会触发该 Bug
|
||||
If UseJLW AndAlso CustomArg.Contains("-javaagent") Then
|
||||
UseJLW = False
|
||||
McLaunchLog("由于使用自定义 javaagent，已禁用 JLW，这可能导致游戏崩溃！", LogLevel.Warn)
|
||||
McLaunchLog("由于使用了自定义 javaagent，已禁用 JLW，这可能导致游戏崩溃！", LogLevel.Warn)
|
||||
End If
|
||||
If UseJLW Then
|
||||
If McLaunchJavaSelected.MajorVersion >= 9 Then
|
||||
|
||||
@@ -1286,7 +1286,7 @@ ExitDataLoad:
|
||||
GoTo OnLoaded
|
||||
End If
|
||||
'有可用版本
|
||||
Dim FolderListCheck As Integer = GetHash(Versions.MCINSTANCE_CACHE_VERSION & "#" & FolderList.Join("#"c)) Mod (Integer.MaxValue - 1) '根据文件夹名列表生成辨识码
|
||||
Dim FolderListCheck As Integer = (Versions.MCINSTANCE_CACHE_VERSION & "#" & FolderList.Join("#"c)).GetStableHashCode() Mod (Integer.MaxValue - 1) '根据文件夹名列表生成辨识码
|
||||
If Not McInstanceListForceRefresh AndAlso Val(ReadIni(PathMc & "PCL.ini", "InstanceCache")) = FolderListCheck Then
|
||||
'可以使用缓存
|
||||
Dim Result = InitMcInstanceListWithCache(PathMc)
|
||||
@@ -1747,7 +1747,7 @@ OnLoaded:
|
||||
''' </summary>
|
||||
Public Function McSkinDownload(Address As String) As String
|
||||
Dim SkinName As String = PathUtils.GetLastPart(Address)
|
||||
Dim FileAddress As String = PathTemp & "Cache\Skin\" & GetHash(Address) & ".png"
|
||||
Dim FileAddress As String = PathTemp & "Cache\Skin\" & Address.GetStableHashCode() & ".png"
|
||||
SyncLock McSkinDownloadLock
|
||||
If Not FileUtils.Exists(FileAddress) Then
|
||||
NetDownloadByClient(Address, FileAddress & ".PCLDownloading")
|
||||
|
||||
@@ -162,11 +162,11 @@
|
||||
'Else
|
||||
If State = MinecraftState.Loading Then
|
||||
'窗口未出现
|
||||
WatcherLog("Minecraft 尚未加载完成，可能已崩溃")
|
||||
WatcherLog("Minecraft 尚未加载完成，可能已崩溃", LogLevel.Error)
|
||||
Crashed()
|
||||
ElseIf GameProcess.ExitCode <> 0 AndAlso State = MinecraftState.Running AndAlso Instance.ReleaseTime.Year >= 2012 Then
|
||||
'返回值不为 0 且未结束
|
||||
WatcherLog("Minecraft 返回值异常，可能已崩溃")
|
||||
WatcherLog("Minecraft 返回值异常，可能已崩溃", LogLevel.Error)
|
||||
Crashed()
|
||||
ElseIf State <> MinecraftState.Crashed Then
|
||||
'正常关闭
|
||||
@@ -215,15 +215,15 @@
|
||||
ElseIf Text.Contains("Crash report saved to") OrElse Text.Contains("This crash report has been saved to:") Then
|
||||
' Text.Contains("Minecraft ran into a problem! Report saved to:") Then
|
||||
'Minecraft 崩溃，忽略 VanillaFix
|
||||
WatcherLog("识别为崩溃的 Log：" & Text)
|
||||
WatcherLog("识别为崩溃的 Log：" & Text, LogLevel.Error)
|
||||
Crashed()
|
||||
ElseIf Text.Contains("Could not save crash report to") Then
|
||||
'Minecraft 崩溃，无法保存崩溃日志
|
||||
WatcherLog("识别为崩溃的 Log：" & Text)
|
||||
WatcherLog("识别为崩溃的 Log：" & Text, LogLevel.Error)
|
||||
Crashed()
|
||||
ElseIf Text.Contains("/ERROR]: Unable to launch") OrElse Text.Contains("An exception was thrown, the game will display an error screen and halt.") Then
|
||||
'Forge 崩溃
|
||||
WatcherLog("识别为崩溃的 Log：" & Text)
|
||||
WatcherLog("识别为崩溃的 Log：" & Text, LogLevel.Error)
|
||||
Crashed()
|
||||
'ElseIf Text.Contains("Shutdown failure!") Then
|
||||
' 'Minecraft 强行崩溃，由于点 X 强行关闭也会触发这句话，所以不可用
|
||||
@@ -231,8 +231,8 @@
|
||||
End If
|
||||
End If
|
||||
End Sub
|
||||
Private Sub WatcherLog(Text As String)
|
||||
McLaunchLog("[" & PID & "] " & Text)
|
||||
Private Sub WatcherLog(Text As String, Optional Level As LogLevel = LogLevel.Info)
|
||||
McLaunchLog("[" & PID & "] " & Text, Level)
|
||||
End Sub
|
||||
|
||||
'进度更新
|
||||
@@ -349,7 +349,7 @@
|
||||
If State = MinecraftState.Crashed OrElse State = MinecraftState.Ended Then Return
|
||||
State = MinecraftState.Crashed
|
||||
'崩溃分析
|
||||
WatcherLog("Minecraft 已崩溃，将在 2 秒后开始崩溃分析")
|
||||
WatcherLog("Minecraft 已崩溃，将在 2 秒后开始崩溃分析", LogLevel.Error)
|
||||
Hint("检测到 Minecraft 出现错误，错误分析已开始……", HintType.Red)
|
||||
FeedbackInfo()
|
||||
RunInNewThread(
|
||||
|
||||
Reference in New Issue
Block a user