Skip to content

Commit 4877573

Browse files
authored
Merge pull request PCL-Community#263 from PCL-Community/main
更改Java Wrapper启用逻辑
2 parents bdf63b1 + fd1ed63 commit 4877573

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb

+3-1
Original file line numberDiff line numberDiff line change
@@ -500,6 +500,7 @@ NextInner:
500500
End Sub
501501

502502
#End Region
503+
503504
#Region "分方式登录模块"
504505

505506
'各个登录方式的主对象与输入构造
@@ -1486,7 +1487,8 @@ NextVersion:
14861487

14871488
'添加 Java Wrapper 作为主 Jar
14881489
If McLaunchJavaSelected.VersionCode >= 9 Then DataList.Add("--add-exports cpw.mods.bootstraplauncher/cpw.mods.bootstraplauncher=ALL-UNNAMED")
1489-
If Not IsArm64System AndAlso (Not Setup.Get("LaunchAdvanceDisableJlw") AndAlso Not Setup.Get("VersionAdvanceDisableJlw", Version)) Then '检查禁用 Java Wrapper 设置项
1490+
Dim JWLEnabled = System.Globalization.CultureInfo.CurrentCulture.TextInfo.ANSICodePage = 65001 AndAlso Not (Setup.Get("LaunchAdvanceDisableJlw") Or Setup.Get("VersionAdvanceDisableJlw", Version))
1491+
If JWLEnabled Then '检查禁用 Java Wrapper 设置项
14901492
DataList.Add("-Doolloo.jlw.tmpdir=""" & PathPure.TrimEnd("\") & """")
14911493
DataList.Add("-jar """ & ExtractJavaWrapper() & """")
14921494
End If

0 commit comments

Comments
 (0)