Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] main from PCL-Community:main #23

Merged
merged 2 commits into from
Feb 6, 2025
+7 −4
Merged

[pull] main from PCL-Community:main #23

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a66527
Fix:第三方登录 Bug
mqingxue Feb 6, 2025
0ddf1e7
Merge pull request #208 from mqingxue/main
wuliaodexiaoluo Feb 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Imports System.IO.Compression
Imports System.IO.Compression
Public Module ModLaunch

#Region "开始"
@@ -697,12 +697,15 @@ LoginFinish:
McLaunchLog("验证登录成功（Validate, " & Data.Input.Token & "）")
End Sub
Private Sub McLoginRequestRefresh(ByRef Data As LoaderTask(Of McLoginServer, McLoginResult), RequestUser As Boolean)

Dim RefreshInfo As JObject = New JObject

RefreshInfo.Add(New JProperty("accessToken", Setup.Get($"Cache{Data.Input.Token}Access")))
Dim SelectProfile As JObject = New JObject()
SelectProfile.Add(New JProperty("name", Setup.Get("Cache" & Data.Input.Token & "Name")))
SelectProfile.Add(New JProperty("id", Setup.Get("Cache" & Data.Input.Token & "Uuid")))
RefreshInfo.Add("selectedProfile", SelectProfile)
RefreshInfo.Add(New JProperty("accessToken", Setup.Get("Cache" & Data.Input.Token & "Access")))
RefreshInfo.Add(New JProperty("requestUser", True))


McLaunchLog("刷新登录开始（Refresh, " & Data.Input.Token & "）")
Dim LoginJson As JObject = GetJson(NetRequestRetry(
Url:=Data.Input.BaseUrl & "/refresh",