Skip to content

Commit 25c9ef0

Browse files
authored
修复无法解析类似 "26.1 Snapshot 1" 的版本号的问题 (#5002)
1 parent d45d994 commit 25c9ef0

2 files changed

Lines changed: 5 additions & 0 deletions

File tree

HMCLCore/src/main/java/org/jackhuang/hmcl/util/versioning/GameVersionNumber.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,10 @@ static Release parse(String value) {
337337
} else if (suffix.startsWith("-snapshot-")) {
338338
releaseType = ReleaseType.SNAPSHOT;
339339
eaVersion = VersionNumber.asVersion(suffix.substring("-snapshot-".length()));
340+
} else if (suffix.startsWith(" Snapshot ")) {
341+
needNormalize = true;
342+
releaseType = ReleaseType.SNAPSHOT;
343+
eaVersion = VersionNumber.asVersion(suffix.substring(" Snapshot ".length()));
340344
} else if (suffix.startsWith("-pre")) {
341345
releaseType = ReleaseType.PRE_RELEASE;
342346
eaVersion = VersionNumber.asVersion(suffix.substring("-pre".length()));

HMCLCore/src/test/java/org/jackhuang/hmcl/util/versioning/GameVersionNumberTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -432,6 +432,7 @@ public void testToNormalizedString() {
432432
assertNormalized(version, version);
433433
}
434434

435+
assertNormalized("26.1-snapshot-1", "26.1 Snapshot 1");
435436
assertNormalized("1.21.11-pre3", "1.21.11 Pre-Release 3");
436437
assertNormalized("1.21.11-pre3_unobfuscated", "1.21.11 Pre-Release 3 Unobfuscated");
437438
assertNormalized("1.21.11-pre3_unobfuscated", "1.21.11-pre3 Unobfuscated");

0 commit comments

Comments
 (0)