Skip to content

refactor(launch): 根据 LWJGL 版本判断是否使用 LWJGL Unsafe Agent #8464

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

Open
Big-Cake-jpg wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor(launch): 根据 LWJGL 版本判断是否使用 LWJGL Unsafe Agent #8464

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 18 additions & 1 deletion Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1330,6 +1330,23 @@ Retry:

#End Region

#Region "获取 LWJGL 版本"
Private Function McLaunchGetLwjglVersion(Mc As McInstance) As String
For Each library As McLibToken In McLibListGet(Mc, False)
If String.IsNullOrWhiteSpace(library.OriginalName) Then Continue For

Dim parts = library.OriginalName.Split(":"c)
If parts.Length >= 3 AndAlso
parts(0).Equals("org.lwjgl", StringComparison.OrdinalIgnoreCase) AndAlso
parts(1).Equals("lwjgl", StringComparison.OrdinalIgnoreCase) Then
Return parts(2)
End If
Next

Return Nothing
End Function
#End Region

#Region "启动参数"
Private McLaunchArgument As String

Expand Down Expand Up @@ -1447,7 +1464,7 @@ NextInstance:
'LUA
Dim UseLUA As Boolean =
Not Settings.Get("LaunchAdvanceDisableLUA") AndAlso Not Settings.Get("VersionAdvanceDisableLUA", McInstanceSelected) AndAlso
McLaunchJavaSelected.MajorVersion >= 25 AndAlso McInstanceSelected.Version.Drop >= 261
McLaunchGetLwjglVersion(McInstanceSelected) = "3.4.1"
If UseLUA Then Args.Add($"-javaagent:""{ExtractPatch("LUA")}""")
McLaunchLog("使用 LUA：" & UseLUA)

Expand Down