更新 GameVersionNumber 解析规则 (#4917)

Glavo · web-flow · commit 456d13959e6a · 2025-12-06T20:55:11.000+08:00
1. 支持 [Minecraft 新版本号方案](https://www.minecraft.net/en-us/article/minecraft-new-version-numbering-system) 2. 支持对版本号进行归一化处理。
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLGameRepository.java b/HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLGameRepository.java
@@ -338,7 +338,7 @@ else if (libraryAnalyzer.has(LibraryAnalyzer.LibraryType.OPTIFINE))
                 GameVersionNumber versionNumber = GameVersionNumber.asGameVersion(gameVersion);
                 if (versionNumber.isAprilFools()) {
                     return VersionIconType.APRIL_FOOLS.getIcon();
-                } else if (versionNumber instanceof GameVersionNumber.Snapshot) {
+                } else if (versionNumber instanceof GameVersionNumber.LegacySnapshot) {
                     return VersionIconType.COMMAND.getIcon();
                 } else if (versionNumber instanceof GameVersionNumber.Old) {
                     return VersionIconType.CRAFT_TABLE.getIcon();
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/VersionsPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/download/VersionsPage.java
@@ -233,7 +233,7 @@ public void updateItem(RemoteVersion remoteVersion, boolean empty) {
             }
             setGraphic(pane);
 
-            twoLineListItem.setTitle(I18n.getDisplaySelfVersion(remoteVersion));
+            twoLineListItem.setTitle(I18n.getDisplayVersion(remoteVersion));
             if (remoteVersion.getReleaseDate() != null) {
                 twoLineListItem.setSubtitle(I18n.formatDateTime(remoteVersion.getReleaseDate()));
             } else {
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/WorldBackupsPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/WorldBackupsPage.java
@@ -39,6 +39,7 @@
 import org.jackhuang.hmcl.ui.construct.TwoLineListItem;
 import org.jackhuang.hmcl.util.Pair;
 import org.jackhuang.hmcl.util.StringUtils;
+import org.jackhuang.hmcl.util.i18n.I18n;
 import org.jetbrains.annotations.NotNull;
 
 import java.nio.file.*;
@@ -245,7 +246,7 @@ private static final class BackupInfoSkin extends SkinBase<BackupInfo> {
                 item.setSubtitle(formatDateTime(skinnable.getBackupTime()) + (skinnable.count == 0 ? "" : " (" + skinnable.count + ")"));
 
                 if (world.getGameVersion() != null)
-                    item.addTag(world.getGameVersion());
+                    item.addTag(I18n.getDisplayVersion(world.getGameVersion()));
             }
 
             {
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/WorldExportPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/WorldExportPage.java
@@ -23,6 +23,7 @@
 import org.jackhuang.hmcl.game.World;
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.ui.wizard.WizardSinglePage;
+import org.jackhuang.hmcl.util.i18n.I18n;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -41,7 +42,8 @@ public WorldExportPage(World world, Path export, Runnable onFinish) {
         this.world = world;
 
         path.set(export.toString());
-        gameVersion.set(world.getGameVersion());
+        if (world.getGameVersion() != null)
+            gameVersion.set(I18n.getDisplayVersion(world.getGameVersion()));
         worldName.set(world.getWorldName());
     }
 
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/WorldInfoPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/WorldInfoPage.java
@@ -122,7 +122,8 @@ private void updateControls() {
 
                 Label gameVersionLabel = new Label();
                 FXUtils.copyOnDoubleClick(gameVersionLabel);
-                gameVersionLabel.setText(world.getGameVersion());
+                if (world.getGameVersion() != null)
+                    gameVersionLabel.setText(world.getGameVersion().toNormalizedString());
                 BorderPane.setAlignment(gameVersionLabel, Pos.CENTER_RIGHT);
                 gameVersionPane.setRight(gameVersionLabel);
             }
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/WorldListItemSkin.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/WorldListItemSkin.java
@@ -32,7 +32,7 @@
 import org.jackhuang.hmcl.ui.SVG;
 import org.jackhuang.hmcl.ui.construct.*;
 import org.jackhuang.hmcl.util.ChunkBaseApp;
-import org.jackhuang.hmcl.util.versioning.GameVersionNumber;
+import org.jackhuang.hmcl.util.i18n.I18n;
 
 import java.time.Instant;
 
@@ -72,10 +72,10 @@ public WorldListItemSkin(WorldListItem skinnable) {
             item.setMouseTransparent(true);
             if (world.getWorldName() != null)
                 item.setTitle(parseColorEscapes(world.getWorldName()));
-            item.setSubtitle(i18n("world.datetime", formatDateTime(Instant.ofEpochMilli(world.getLastPlayed())), world.getGameVersion() == null ? i18n("message.unknown") : world.getGameVersion()));
+            item.setSubtitle(i18n("world.datetime", formatDateTime(Instant.ofEpochMilli(world.getLastPlayed()))));
 
             if (world.getGameVersion() != null)
-                item.addTag(world.getGameVersion());
+                item.addTag(I18n.getDisplayVersion(world.getGameVersion()));
             if (world.isLocked())
                 item.addTag(i18n("world.locked"));
         }
@@ -126,7 +126,7 @@ public void showPopupMenu(JFXPopup.PopupHPosition hPosition, double initOffsetX,
                     new IconedMenuItem(SVG.FORT, i18n("world.chunkbase.nether_fortress"), () -> ChunkBaseApp.openNetherFortressFinder(world), popup)
             );
 
-            if (GameVersionNumber.compare(world.getGameVersion(), "1.13") >= 0) {
+            if (world.getGameVersion() != null && world.getGameVersion().compareTo("1.13") >= 0) {
                 popupMenu.getContent().add(new IconedMenuItem(SVG.LOCATION_CITY, i18n("world.chunkbase.end_city"),
                         () -> ChunkBaseApp.openEndCityFinder(world), popup));
             }
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/WorldListPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/WorldListPage.java
@@ -28,6 +28,7 @@
 import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.ui.*;
 import org.jackhuang.hmcl.util.io.FileUtils;
+import org.jackhuang.hmcl.util.versioning.GameVersionNumber;
 
 import java.io.IOException;
 import java.nio.file.FileAlreadyExistsException;
@@ -49,7 +50,7 @@ public final class WorldListPage extends ListPageBase<WorldListItem> implements
     private List<World> worlds;
     private Profile profile;
     private String id;
-    private String gameVersion;
+    private GameVersionNumber gameVersion;
 
     public WorldListPage() {
         FXUtils.applyDragListener(this, it -> "zip".equals(FileUtils.getExtension(it)), modpacks -> {
@@ -87,7 +88,7 @@ public void refresh() {
             return;
 
         setLoading(true);
-        Task.runAsync(() -> gameVersion = profile.getRepository().getGameVersion(id).orElse(null))
+        Task.runAsync(() -> gameVersion = profile.getRepository().getGameVersion(id).map(GameVersionNumber::asGameVersion).orElse(null))
                 .thenApplyAsync(unused -> {
                     try (Stream<World> stream = World.getWorlds(savesDir)) {
                         return stream.parallel().collect(Collectors.toList());
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/WorldManagePage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/WorldManagePage.java
@@ -33,7 +33,6 @@
 import org.jackhuang.hmcl.ui.decorator.DecoratorAnimatedPage;
 import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
 import org.jackhuang.hmcl.util.ChunkBaseApp;
-import org.jackhuang.hmcl.util.versioning.GameVersionNumber;
 
 import java.io.IOException;
 import java.nio.channels.FileChannel;
@@ -84,7 +83,7 @@ public WorldManagePage(World world, Path backupsDir) {
                 .addNavigationDrawerTab(header, worldBackupsTab, i18n("world.backup"), SVG.ARCHIVE, SVG.ARCHIVE_FILL);
 
         if (world.getGameVersion() != null && // old game will not write game version to level.dat
-                GameVersionNumber.asGameVersion(world.getGameVersion()).isAtLeast("1.13", "17w43a")) {
+                world.getGameVersion().isAtLeast("1.13", "17w43a")) {
             header.getTabs().add(datapackTab);
             sideBar.addNavigationDrawerTab(header, datapackTab, i18n("world.datapack"), SVG.EXTENSION, SVG.EXTENSION_FILL);
         }
@@ -102,7 +101,7 @@ public WorldManagePage(World world, Path backupsDir) {
                     new IconedMenuItem(SVG.FORT, i18n("world.chunkbase.nether_fortress"), () -> ChunkBaseApp.openNetherFortressFinder(world), popup)
             );
 
-            if (GameVersionNumber.compare(world.getGameVersion(), "1.13") >= 0) {
+            if (world.getGameVersion() != null && world.getGameVersion().compareTo("1.13") >= 0) {
                 popupMenu.getContent().add(
                         new IconedMenuItem(SVG.LOCATION_CITY, i18n("world.chunkbase.end_city"), () -> ChunkBaseApp.openEndCityFinder(world), popup));
             }
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/util/ChunkBaseApp.java b/HMCL/src/main/java/org/jackhuang/hmcl/util/ChunkBaseApp.java
@@ -49,7 +49,7 @@ public final class ChunkBaseApp {
 
     public static boolean isSupported(@NotNull World world) {
         return world.getSeed() != null && world.getGameVersion() != null &&
-                GameVersionNumber.asGameVersion(world.getGameVersion()).compareTo(MIN_GAME_VERSION) >= 0;
+                world.getGameVersion().compareTo(MIN_GAME_VERSION) >= 0;
     }
 
     public static ChunkBaseApp newBuilder(String app, long seed) {
@@ -60,31 +60,31 @@ public static void openSeedMap(World world) {
         assert isSupported(world);
 
         newBuilder("seed-map", Objects.requireNonNull(world.getSeed()))
-                .addPlatform(GameVersionNumber.asGameVersion(world.getGameVersion()), world.isLargeBiomes(), SEED_MAP_GAME_VERSIONS)
+                .addPlatform(world.getGameVersion(), world.isLargeBiomes(), SEED_MAP_GAME_VERSIONS)
                 .open();
     }
 
     public static void openStrongholdFinder(World world) {
         assert isSupported(world);
 
         newBuilder("stronghold-finder", Objects.requireNonNull(world.getSeed()))
-                .addPlatform(GameVersionNumber.asGameVersion(world.getGameVersion()), world.isLargeBiomes(), STRONGHOLD_FINDER_GAME_VERSIONS)
+                .addPlatform(world.getGameVersion(), world.isLargeBiomes(), STRONGHOLD_FINDER_GAME_VERSIONS)
                 .open();
     }
 
     public static void openNetherFortressFinder(World world) {
         assert isSupported(world);
 
         newBuilder("nether-fortress-finder", Objects.requireNonNull(world.getSeed()))
-                .addPlatform(GameVersionNumber.asGameVersion(world.getGameVersion()), false, NETHER_FORTRESS_GAME_VERSIONS)
+                .addPlatform(world.getGameVersion(), false, NETHER_FORTRESS_GAME_VERSIONS)
                 .open();
     }
 
     public static void openEndCityFinder(World world) {
         assert isSupported(world);
 
         newBuilder("endcity-finder", Objects.requireNonNull(world.getSeed()))
-                .addPlatform(GameVersionNumber.asGameVersion(world.getGameVersion()), false, END_CITY_GAME_VERSIONS)
+                .addPlatform(world.getGameVersion(), false, END_CITY_GAME_VERSIONS)
                 .open();
     }
 
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/util/i18n/I18n.java b/HMCL/src/main/java/org/jackhuang/hmcl/util/i18n/I18n.java
@@ -20,6 +20,7 @@
 import org.jackhuang.hmcl.download.RemoteVersion;
 import org.jackhuang.hmcl.download.game.GameRemoteVersion;
 import org.jackhuang.hmcl.util.i18n.translator.Translator;
+import org.jackhuang.hmcl.util.versioning.GameVersionNumber;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.PropertyKey;
 
@@ -76,7 +77,11 @@ public static String formatSpeed(long bytes) {
         return getTranslator().formatSpeed(bytes);
     }
 
-    public static String getDisplaySelfVersion(RemoteVersion version) {
+    public static String getDisplayVersion(RemoteVersion version) {
+        return getTranslator().getDisplayVersion(version);
+    }
+
+    public static String getDisplayVersion(GameVersionNumber version) {
         return getTranslator().getDisplayVersion(version);
     }
 
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/util/i18n/MinecraftWiki.java b/HMCL/src/main/java/org/jackhuang/hmcl/util/i18n/MinecraftWiki.java
@@ -72,7 +72,7 @@ else if (wikiVersion.startsWith("1.0.0-rc2"))
                 else if (wikiVersion.startsWith("1.0.0-rc2"))
                     wikiVersion = "1.0.0-rc2";
             }
-        } else if (gameVersion instanceof GameVersionNumber.Snapshot) {
+        } else if (gameVersion instanceof GameVersionNumber.LegacySnapshot) {
             return locale.i18n("wiki.version.game.snapshot", wikiVersion) + variantSuffix;
         } else {
             if (wikiVersion.length() >= 6 && wikiVersion.charAt(2) == 'w') {
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/util/i18n/translator/Translator.java b/HMCL/src/main/java/org/jackhuang/hmcl/util/i18n/translator/Translator.java
@@ -19,6 +19,7 @@
 
 import org.jackhuang.hmcl.download.RemoteVersion;
 import org.jackhuang.hmcl.util.i18n.SupportedLocale;
+import org.jackhuang.hmcl.util.versioning.GameVersionNumber;
 
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
@@ -47,6 +48,10 @@ public String getDisplayVersion(RemoteVersion remoteVersion) {
         return remoteVersion.getSelfVersion();
     }
 
+    public String getDisplayVersion(GameVersionNumber versionNumber) {
+        return versionNumber.toNormalizedString();
+    }
+
     /// @see [#formatDateTime(TemporalAccessor)]
     protected DateTimeFormatter dateTimeFormatter;
 
diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/util/i18n/translator/Translator_lzh.java b/HMCL/src/main/java/org/jackhuang/hmcl/util/i18n/translator/Translator_lzh.java
@@ -92,22 +92,38 @@ public static String translateGameVersion(GameVersionNumber gameVersion) {
                 appendDigitByDigit(builder, String.valueOf(release.getPatch()));
             }
 
-            //noinspection StatementWithEmptyBody
-            if (release.getEaType() == GameVersionNumber.Release.TYPE_GA) {
-                // do nothing
-            } else if (release.getEaType() == GameVersionNumber.Release.TYPE_PRE) {
-                builder.append("之預");
-                appendDigitByDigit(builder, release.getEaVersion().toString());
-            } else if (release.getEaType() == GameVersionNumber.Release.TYPE_RC) {
-                builder.append("之候");
-                appendDigitByDigit(builder, release.getEaVersion().toString());
-            } else {
-                // Unsupported
-                return gameVersion.toString();
+            switch (release.getEaType()) {
+                case GA -> {
+                    // do nothing
+                }
+                case PRE_RELEASE -> {
+                    builder.append("之預");
+                    appendDigitByDigit(builder, release.getEaVersion().toString());
+                }
+                case RELEASE_CANDIDATE -> {
+                    builder.append("之候");
+                    appendDigitByDigit(builder, release.getEaVersion().toString());
+                }
+                default -> {
+                    // Unsupported
+                    return gameVersion.toString();
+                }
+            }
+
+            switch (release.getAdditional()) {
+                case NONE -> {
+                }
+                case UNOBFUSCATED -> {
+                    builder.append("涇渭");
+                }
+                default -> {
+                    // Unsupported
+                    return gameVersion.toString();
+                }
             }
 
             return builder.toString();
-        } else if (gameVersion instanceof GameVersionNumber.Snapshot snapshot) {
+        } else if (gameVersion instanceof GameVersionNumber.LegacySnapshot snapshot) {
             StringBuilder builder = new StringBuilder();
 
             appendDigitByDigit(builder, String.valueOf(snapshot.getYear()));
@@ -120,6 +136,9 @@ public static String translateGameVersion(GameVersionNumber gameVersion) {
             else
                 builder.append(suffix);
 
+            if (snapshot.isUnobfuscated())
+                builder.append("涇渭");
+
             return builder.toString();
         } else if (gameVersion instanceof GameVersionNumber.Special) {
             String version = gameVersion.toString();
@@ -130,6 +149,7 @@ public static String translateGameVersion(GameVersionNumber gameVersion) {
                 case "2.0_purple" -> "二點〇紫";
                 case "1.rv-pre1" -> "一點真視之預一";
                 case "3d shareware v1.34" -> "躍然享件一點三四";
+                case "13w12~" -> "一三週一二閏";
                 case "20w14infinite", "20w14~", "20w14∞" -> "二〇週一四宇";
                 case "22w13oneblockatatime" -> "二二週一三典";
                 case "23w13a_or_b" -> "二三週一三暨";
@@ -179,6 +199,11 @@ public String getDisplayVersion(RemoteVersion remoteVersion) {
             return translateGenericVersion(remoteVersion.getSelfVersion());
     }
 
+    @Override
+    public String getDisplayVersion(GameVersionNumber versionNumber) {
+        return translateGameVersion(versionNumber);
+    }
+
     @Override
     public String formatDateTime(TemporalAccessor time) {
         LocalDateTime localDateTime;
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/game/World.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/game/World.java
@@ -24,6 +24,7 @@
 import com.github.steveice10.opennbt.tag.builtin.Tag;
 import javafx.scene.image.Image;
 import org.jackhuang.hmcl.util.io.*;
+import org.jackhuang.hmcl.util.versioning.GameVersionNumber;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.IOException;
@@ -48,7 +49,7 @@ public final class World {
     private final Path file;
     private String fileName;
     private String worldName;
-    private String gameVersion;
+    private GameVersionNumber gameVersion;
     private long lastPlayed;
     private Image icon;
     private Long seed;
@@ -108,7 +109,7 @@ public long getLastPlayed() {
         return lastPlayed;
     }
 
-    public String getGameVersion() {
+    public @Nullable GameVersionNumber getGameVersion() {
         return gameVersion;
     }
 
@@ -188,7 +189,7 @@ private void loadWorldInfo(Path levelDat) throws IOException {
             CompoundTag version = data.get("Version");
 
             if (version.get("Name") instanceof StringTag)
-                gameVersion = version.<StringTag>get("Name").getValue();
+                gameVersion = GameVersionNumber.asGameVersion(version.<StringTag>get("Name").getValue());
         }
 
         Tag worldGenSettings = data.get("WorldGenSettings");
diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/versioning/GameVersionNumber.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/versioning/GameVersionNumber.java
diff --git a/HMCLCore/src/main/resources/assets/game/unlisted-versions.json b/HMCLCore/src/main/resources/assets/game/unlisted-versions.json
diff --git a/HMCLCore/src/main/resources/assets/game/version-alias.csv b/HMCLCore/src/main/resources/assets/game/version-alias.csv
diff --git a/HMCLCore/src/main/resources/assets/game/versions.txt b/HMCLCore/src/main/resources/assets/game/versions.txt
diff --git a/HMCLCore/src/test/java/org/jackhuang/hmcl/util/versioning/GameVersionNumberTest.java b/HMCLCore/src/test/java/org/jackhuang/hmcl/util/versioning/GameVersionNumberTest.java

Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,7 @@ public void updateItem(RemoteVersion remoteVersion, boolean empty) {`
`233`	`233`	`}`
`234`	`234`	`setGraphic(pane);`
`235`	`235`
`236`		`- twoLineListItem.setTitle(I18n.getDisplaySelfVersion(remoteVersion));`
	`236`	`+ twoLineListItem.setTitle(I18n.getDisplayVersion(remoteVersion));`
`237`	`237`	`if (remoteVersion.getReleaseDate() != null) {`
`238`	`238`	`twoLineListItem.setSubtitle(I18n.formatDateTime(remoteVersion.getReleaseDate()));`
`239`	`239`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@`
`39`	`39`	`import org.jackhuang.hmcl.ui.construct.TwoLineListItem;`
`40`	`40`	`import org.jackhuang.hmcl.util.Pair;`
`41`	`41`	`import org.jackhuang.hmcl.util.StringUtils;`
	`42`	`+import org.jackhuang.hmcl.util.i18n.I18n;`
`42`	`43`	`import org.jetbrains.annotations.NotNull;`
`43`	`44`
`44`	`45`	`import java.nio.file.*;`
`@@ -245,7 +246,7 @@ private static final class BackupInfoSkin extends SkinBase<BackupInfo> {`
`245`	`246`	`item.setSubtitle(formatDateTime(skinnable.getBackupTime()) + (skinnable.count == 0 ? "" : " (" + skinnable.count + ")"));`
`246`	`247`
`247`	`248`	`if (world.getGameVersion() != null)`
`248`		`- item.addTag(world.getGameVersion());`
	`249`	`+ item.addTag(I18n.getDisplayVersion(world.getGameVersion()));`
`249`	`250`	`}`
`250`	`251`
`251`	`252`	`{`
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,8 @@ private void updateControls() {`
`122`	`122`
`123`	`123`	`Label gameVersionLabel = new Label();`
`124`	`124`	`FXUtils.copyOnDoubleClick(gameVersionLabel);`
`125`		`- gameVersionLabel.setText(world.getGameVersion());`
	`125`	`+ if (world.getGameVersion() != null)`
	`126`	`+ gameVersionLabel.setText(world.getGameVersion().toNormalizedString());`
`126`	`127`	`BorderPane.setAlignment(gameVersionLabel, Pos.CENTER_RIGHT);`
`127`	`128`	`gameVersionPane.setRight(gameVersionLabel);`
`128`	`129`	`}`