lan/HMCL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复 Linux 平台上无法正确为安装了 Cleanroom 的游戏版本选择 Java 的问题 (#4385)

Browse Source
This commit is contained in:
Glavo
2025-09-03 16:56:47 +08:00
committed by GitHub
parent e8813fe153
commit 16816d8490
5 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
HMCLCore/src/main/java/org/jackhuang/hmcl/game/JavaVersionConstraint.java
View File

@@ -108,6 +108,14 @@ public enum JavaVersionConstraint {
&& super.appliesToVersionImpl(gameVersionNumber, version, java, analyzer);
}
},
CLEANROOM_JAVA_21(true, GameVersionNumber.between("1.12.2", "1.12.999"), VersionNumber.atLeast("21")) {
@Override
protected boolean appliesToVersionImpl(GameVersionNumber gameVersionNumber, @Nullable Version version,
@Nullable JavaRuntime java, @Nullable LibraryAnalyzer analyzer) {
return analyzer != null && analyzer.has(LibraryAnalyzer.LibraryType.CLEANROOM)
&& super.appliesToVersionImpl(gameVersionNumber, version, java, analyzer);
}
},
// LaunchWrapper<=1.12 will crash because LaunchWrapper assumes the system class loader is an instance of URLClassLoader (Java 8)
LAUNCH_WRAPPER(true, GameVersionNumber.atMost("1.12.999"), VersionNumber.atMost("1.8.999")) {
@Override
@@ -130,7 +138,8 @@ public enum JavaVersionConstraint {
@Nullable JavaRuntime java, @Nullable LibraryAnalyzer analyzer) {
return OperatingSystem.CURRENT_OS == OperatingSystem.LINUX
&& Architecture.SYSTEM_ARCH == Architecture.X86_64
&& (java == null || java.getArchitecture() == Architecture.X86_64);
&& (java == null || java.getArchitecture() == Architecture.X86_64)
&& (analyzer == null || !analyzer.has(LibraryAnalyzer.LibraryType.CLEANROOM));
}
@Override