refactor(launch): 根据 LWJGL 版本判断是否使用 LWJGL Unsafe Agent
This commit is contained in:
@@ -1330,6 +1330,23 @@ Retry:
|
|||||||
|
|
||||||
#End Region
|
#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 "启动参数"
|
#Region "启动参数"
|
||||||
Private McLaunchArgument As String
|
Private McLaunchArgument As String
|
||||||
|
|
||||||
@@ -1447,7 +1464,7 @@ NextInstance:
|
|||||||
'LUA
|
'LUA
|
||||||
Dim UseLUA As Boolean =
|
Dim UseLUA As Boolean =
|
||||||
Not Settings.Get("LaunchAdvanceDisableLUA") AndAlso Not Settings.Get("VersionAdvanceDisableLUA", McInstanceSelected) AndAlso
|
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")}""")
|
If UseLUA Then Args.Add($"-javaagent:""{ExtractPatch("LUA")}""")
|
||||||
McLaunchLog("使用 LUA:" & UseLUA)
|
McLaunchLog("使用 LUA:" & UseLUA)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user