Skip to content

Commit 57a582e

Browse files
authored
fix: 修复部分版本无法正确归一化的问题 (#5091)
1 parent 7c0faf2 commit 57a582e

File tree

3 files changed

+17
-13
lines changed

3 files changed

+17
-13
lines changed

HMCLCore/src/main/resources/assets/game/version-alias.csv

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,13 @@
1010
1.16_combat-4,Combat Test 8
1111
1.16_combat-5,Combat Test 8b
1212
1.16_combat-6,Combat Test 8c
13-
1.18_experimental-snapshot-1,1.18 Experimental Snapshot 1
14-
1.18_experimental-snapshot-2,1.18 Experimental Snapshot 2
15-
1.18_experimental-snapshot-3,1.18 Experimental Snapshot 3
16-
1.18_experimental-snapshot-4,1.18 Experimental Snapshot 4
17-
1.18_experimental-snapshot-5,1.18 Experimental Snapshot 5
18-
1.18_experimental-snapshot-6,1.18 Experimental Snapshot 6
13+
1.18_experimental-snapshot-1,1.18 Experimental Snapshot 1,1.18 experimental snapshot 1
14+
1.18_experimental-snapshot-2,1.18 Experimental Snapshot 2,1.18 experimental snapshot 2
15+
1.18_experimental-snapshot-3,1.18 Experimental Snapshot 3,1.18 experimental snapshot 3
16+
1.18_experimental-snapshot-4,1.18 Experimental Snapshot 4,1.18 experimental snapshot 4
17+
1.18_experimental-snapshot-5,1.18 Experimental Snapshot 5,1.18 experimental snapshot 5
18+
1.18_experimental-snapshot-6,1.18 Experimental Snapshot 6,1.18 experimental snapshot 6
19+
1.18_experimental-snapshot-7,1.18 Experimental Snapshot 7,1.18 experimental snapshot 7
1920
1.19_deep_dark_experimental_snapshot-1,Deep Dark Experimental Snapshot 1
20-
20w14infinite,20w14~
21+
20w14infinite,20w14~
22+
22w13oneBlockAtATime,22w13oneblockatatime

HMCLCore/src/main/resources/assets/game/versions.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -647,7 +647,7 @@
647647
1.18.2-pre3
648648
1.18.2-rc1
649649
1.18.2
650-
22w13oneblockatatime
650+
22w13oneBlockAtATime
651651
22w11a
652652
22w12a
653653
22w13a

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -451,13 +451,15 @@ public void testToNormalizedString() {
451451
assertNormalized("1.16_combat-5", "Combat Test 8b");
452452
assertNormalized("1.16_combat-6", "Combat Test 8c");
453453
assertNormalized("1.18_experimental-snapshot-1", "1.18 Experimental Snapshot 1");
454-
assertNormalized("1.18_experimental-snapshot-2", "1.18 Experimental Snapshot 2");
455-
assertNormalized("1.18_experimental-snapshot-3", "1.18 Experimental Snapshot 3");
456-
assertNormalized("1.18_experimental-snapshot-4", "1.18 Experimental Snapshot 4");
457-
assertNormalized("1.18_experimental-snapshot-5", "1.18 Experimental Snapshot 5");
458-
assertNormalized("1.18_experimental-snapshot-6", "1.18 Experimental Snapshot 6");
454+
assertNormalized("1.18_experimental-snapshot-2", "1.18 experimental snapshot 2");
455+
assertNormalized("1.18_experimental-snapshot-3", "1.18 experimental snapshot 3");
456+
assertNormalized("1.18_experimental-snapshot-4", "1.18 experimental snapshot 4");
457+
assertNormalized("1.18_experimental-snapshot-5", "1.18 experimental snapshot 5");
458+
assertNormalized("1.18_experimental-snapshot-6", "1.18 experimental snapshot 6");
459+
assertNormalized("1.18_experimental-snapshot-7", "1.18 experimental snapshot 7");
459460
assertNormalized("1.19_deep_dark_experimental_snapshot-1", "Deep Dark Experimental Snapshot 1");
460461
assertNormalized("20w14infinite", "20w14~");
462+
assertNormalized("22w13oneBlockAtATime", "22w13oneblockatatime");
461463
}
462464

463465
@Test

0 commit comments

Comments
 (0)