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

Update JavaVersionConstraint

Browse Source
This commit is contained in:
Glavo
2022-06-13 10:57:52 +08:00
committed by Yuhui Huang
parent d1bc41e1f1
commit 29cff02f3c
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -120,7 +120,8 @@ public enum JavaVersionConstraint {
@Override @Override
protected boolean appliesToVersionImpl(VersionNumber gameVersionNumber, @Nullable Version version, protected boolean appliesToVersionImpl(VersionNumber gameVersionNumber, @Nullable Version version,
@Nullable JavaVersion javaVersion) { @Nullable JavaVersion javaVersion) {
return javaVersion != null && !javaVersion.getArchitecture().isX86(); return javaVersion != null && !javaVersion.getArchitecture().isX86()
&& (OperatingSystem.CURRENT_OS != OperatingSystem.OSX || gameVersionNumber.compareTo(VersionNumber.asVersion("1.19")) < 0);
} }
@Override @Override
@@ -240,7 +241,8 @@ public enum JavaVersionConstraint {
JavaVersion suggested = null; JavaVersion suggested = null;
for (JavaVersion javaVersion : JavaVersion.getJavas()) { for (JavaVersion javaVersion : JavaVersion.getJavas()) {
// select the latest x86 java that this version accepts. // select the latest x86 java that this version accepts.
if (!javaVersion.getArchitecture().isX86()) if (!javaVersion.getArchitecture().isX86()
&& (OperatingSystem.CURRENT_OS != OperatingSystem.OSX || gameVersion.compareTo(VersionNumber.asVersion("1.19")) < 0))
continue; continue;
VersionNumber javaVersionNumber = javaVersion.getVersionNumber(); VersionNumber javaVersionNumber = javaVersion.getVersionNumber();