AstralTransRocketries/HMCL
1
0
Fork 0
mirror of https://github.com/HMCL-dev/HMCL.git synced 2025-09-07 19:11:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix #2934: 修复无法读取远古版本版本号的问题 (#2936)

Browse Source 
* update

* update
This commit is contained in:
Glavo 2024-03-15 20:57:45 +08:00 committed by GitHub
parent 78f080b6cc
commit 8efdc536ee
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
HMCL/src/main/java/org/jackhuang/hmcl/game/LauncherHelper.java
View File

@ -333,7 +333,8 @@ public final class LauncherHelper {
} }
private static Task<JavaVersion> checkGameState(Profile profile, VersionSetting setting, Version version) { private static Task<JavaVersion> checkGameState(Profile profile, VersionSetting setting, Version version) {
GameVersionNumber gameVersion = GameVersionNumber.asGameVersion(profile.getRepository().getGameVersion(version)); LibraryAnalyzer analyzer = LibraryAnalyzer.analyze(version, profile.getRepository().getGameVersion(version).orElse(null));
GameVersionNumber gameVersion = GameVersionNumber.asGameVersion(analyzer.getVersion(LibraryAnalyzer.LibraryType.MINECRAFT));
if (setting.isNotCheckJVM()) { if (setting.isNotCheckJVM()) {
return Task.composeAsync(() -> setting.getJavaVersion(gameVersion, version)) return Task.composeAsync(() -> setting.getJavaVersion(gameVersion, version))
@ -417,7 +418,6 @@ public final class LauncherHelper {
JavaVersionConstraint violatedMandatoryConstraint = null; JavaVersionConstraint violatedMandatoryConstraint = null;
List<JavaVersionConstraint> violatedSuggestedConstraints = null; List<JavaVersionConstraint> violatedSuggestedConstraints = null;
LibraryAnalyzer analyzer = LibraryAnalyzer.analyze(version, gameVersion.toString());
for (JavaVersionConstraint constraint : JavaVersionConstraint.ALL) { for (JavaVersionConstraint constraint : JavaVersionConstraint.ALL) {
if (constraint.appliesToVersion(gameVersion, version, javaVersion, analyzer)) { if (constraint.appliesToVersion(gameVersion, version, javaVersion, analyzer)) {
if (!constraint.checkJava(gameVersion, version, javaVersion)) { if (!constraint.checkJava(gameVersion, version, javaVersion)) {

7
HMCLCore/src/main/java/org/jackhuang/hmcl/game/GameVersion.java
View File

@ -104,8 +104,13 @@ final class GameVersion {
if (minecraft != null) { if (minecraft != null) {
try (InputStream is = gameJar.getInputStream(minecraft)) { try (InputStream is = gameJar.getInputStream(minecraft)) {
Optional<String> result = getVersionOfClassMinecraft(is); Optional<String> result = getVersionOfClassMinecraft(is);
if (result.isPresent()) if (result.isPresent()) {
String version = result.get();
if (version.startsWith("Beta ")) {
result = Optional.of("b" + version.substring("Beta ".length()));
}
return result; return result;
}
} }
} }