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

fix(java): test forge installation instead of main class.

Browse Source
This commit is contained in:
huanghongxun
2021-10-19 23:11:13 +08:00
parent f70ec8a090
commit 2631f3a007
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,6 +18,7 @@
package org.jackhuang.hmcl.game; package org.jackhuang.hmcl.game;
import org.apache.commons.lang3.Range; import org.apache.commons.lang3.Range;
import org.jackhuang.hmcl.download.LibraryAnalyzer;
import org.jackhuang.hmcl.util.Lang; import org.jackhuang.hmcl.util.Lang;
import org.jackhuang.hmcl.util.platform.Architecture; import org.jackhuang.hmcl.util.platform.Architecture;
import org.jackhuang.hmcl.util.platform.JavaVersion; import org.jackhuang.hmcl.util.platform.JavaVersion;
@@ -44,7 +45,8 @@ public enum JavaVersionConstraint {
protected boolean appliesToVersionImpl(VersionNumber gameVersionNumber, @Nullable Version version, protected boolean appliesToVersionImpl(VersionNumber gameVersionNumber, @Nullable Version version,
@Nullable JavaVersion javaVersion) { @Nullable JavaVersion javaVersion) {
if (version == null) return false; if (version == null) return false;
return LAUNCH_WRAPPER_MAIN.equals(version.getMainClass()); LibraryAnalyzer analyzer = LibraryAnalyzer.analyze(version);
return analyzer.has(LibraryAnalyzer.LibraryType.FORGE);
} }
}, },
// LaunchWrapper<=1.12 will crash because of assuming the system class loader is an instance of URLClassLoader (Java 8) // LaunchWrapper<=1.12 will crash because of assuming the system class loader is an instance of URLClassLoader (Java 8)