Skip to content

Commit b44404c

Browse files
GlavoGlavo
authored
[release/3.8] 更新 GameVersionNumber 解析规则 (#5027)
#4917 #5002
1 parent 0d53d52 commit b44404c

19 files changed

Lines changed: 681 additions & 253 deletions

File tree

‎HMCL/src/main/java/org/jackhuang/hmcl/game/HMCLGameRepository.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ else if (libraryAnalyzer.has(LibraryAnalyzer.LibraryType.OPTIFINE))
338338
GameVersionNumber versionNumber = GameVersionNumber.asGameVersion(gameVersion);
339339
if (versionNumber.isAprilFools()) {
340340
return VersionIconType.APRIL_FOOLS.getIcon();
341-
} else if (versionNumber instanceof GameVersionNumber.Snapshot) {
341+
} else if (versionNumber instanceof GameVersionNumber.LegacySnapshot) {
342342
return VersionIconType.COMMAND.getIcon();
343343
} else if (versionNumber instanceof GameVersionNumber.Old) {
344344
return VersionIconType.CRAFT_TABLE.getIcon();

‎HMCL/src/main/java/org/jackhuang/hmcl/ui/download/VersionsPage.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ public void updateItem(RemoteVersion remoteVersion, boolean empty) {
233233
}
234234
setGraphic(pane);
235235

236-
twoLineListItem.setTitle(I18n.getDisplaySelfVersion(remoteVersion));
236+
twoLineListItem.setTitle(I18n.getDisplayVersion(remoteVersion));
237237
if (remoteVersion.getReleaseDate() != null) {
238238
twoLineListItem.setSubtitle(I18n.formatDateTime(remoteVersion.getReleaseDate()));
239239
} else {

‎HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/WorldBackupsPage.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
import org.jackhuang.hmcl.ui.construct.TwoLineListItem;
4141
import org.jackhuang.hmcl.util.Pair;
4242
import org.jackhuang.hmcl.util.StringUtils;
43+
import org.jackhuang.hmcl.util.i18n.I18n;
4344
import org.jetbrains.annotations.NotNull;
4445

4546
import java.nio.file.*;
@@ -246,7 +247,7 @@ private static final class BackupInfoSkin extends SkinBase<BackupInfo> {
246247
item.setSubtitle(formatDateTime(skinnable.getBackupTime()) + (skinnable.count == 0 ? "" : " (" + skinnable.count + ")"));
247248

248249
if (world.getGameVersion() != null)
249-
item.addTag(world.getGameVersion());
250+
item.addTag(I18n.getDisplayVersion(world.getGameVersion()));
250251
}
251252

252253
{

‎HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/WorldExportPage.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import org.jackhuang.hmcl.game.World;
2424
import org.jackhuang.hmcl.task.Task;
2525
import org.jackhuang.hmcl.ui.wizard.WizardSinglePage;
26+
import org.jackhuang.hmcl.util.i18n.I18n;
2627

2728
import java.nio.file.Path;
2829
import java.nio.file.Paths;
@@ -41,7 +42,8 @@ public WorldExportPage(World world, Path export, Runnable onFinish) {
4142
this.world = world;
4243

4344
path.set(export.toString());
44-
gameVersion.set(world.getGameVersion());
45+
if (world.getGameVersion() != null)
46+
gameVersion.set(I18n.getDisplayVersion(world.getGameVersion()));
4547
worldName.set(world.getWorldName());
4648
}
4749

‎HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/WorldInfoPage.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,8 @@ private void updateControls() {
123123

124124
Label gameVersionLabel = new Label();
125125
FXUtils.copyOnDoubleClick(gameVersionLabel);
126-
gameVersionLabel.setText(world.getGameVersion());
126+
if (world.getGameVersion() != null)
127+
gameVersionLabel.setText(world.getGameVersion().toNormalizedString());
127128
BorderPane.setAlignment(gameVersionLabel, Pos.CENTER_RIGHT);
128129
gameVersionPane.setRight(gameVersionLabel);
129130
}

‎HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/WorldListItemSkin.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import org.jackhuang.hmcl.ui.SVG;
3434
import org.jackhuang.hmcl.ui.construct.*;
3535
import org.jackhuang.hmcl.util.ChunkBaseApp;
36-
import org.jackhuang.hmcl.util.versioning.GameVersionNumber;
36+
import org.jackhuang.hmcl.util.i18n.I18n;
3737

3838
import java.time.Instant;
3939

@@ -73,10 +73,10 @@ public WorldListItemSkin(WorldListItem skinnable) {
7373
item.setMouseTransparent(true);
7474
if (world.getWorldName() != null)
7575
item.setTitle(parseColorEscapes(world.getWorldName()));
76-
item.setSubtitle(i18n("world.datetime", formatDateTime(Instant.ofEpochMilli(world.getLastPlayed())), world.getGameVersion() == null ? i18n("message.unknown") : world.getGameVersion()));
76+
item.setSubtitle(i18n("world.datetime", formatDateTime(Instant.ofEpochMilli(world.getLastPlayed()))));
7777

7878
if (world.getGameVersion() != null)
79-
item.addTag(world.getGameVersion());
79+
item.addTag(I18n.getDisplayVersion(world.getGameVersion()));
8080
if (world.isLocked())
8181
item.addTag(i18n("world.locked"));
8282
}
@@ -127,7 +127,7 @@ public void showPopupMenu(JFXPopup.PopupHPosition hPosition, double initOffsetX,
127127
new IconedMenuItem(SVG.FORT, i18n("world.chunkbase.nether_fortress"), () -> ChunkBaseApp.openNetherFortressFinder(world), popup)
128128
);
129129

130-
if (GameVersionNumber.compare(world.getGameVersion(), "1.13") >= 0) {
130+
if (world.getGameVersion() != null && world.getGameVersion().compareTo("1.13") >= 0) {
131131
popupMenu.getContent().add(new IconedMenuItem(SVG.LOCATION_CITY, i18n("world.chunkbase.end_city"),
132132
() -> ChunkBaseApp.openEndCityFinder(world), popup));
133133
}

‎HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/WorldListPage.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import org.jackhuang.hmcl.ui.*;
3030
import org.jackhuang.hmcl.ui.animation.TransitionPane;
3131
import org.jackhuang.hmcl.util.io.FileUtils;
32+
import org.jackhuang.hmcl.util.versioning.GameVersionNumber;
3233

3334
import java.io.IOException;
3435
import java.nio.file.FileAlreadyExistsException;
@@ -50,7 +51,7 @@ public final class WorldListPage extends ListPageBase<WorldListItem> implements
5051
private List<World> worlds;
5152
private Profile profile;
5253
private String id;
53-
private String gameVersion;
54+
private GameVersionNumber gameVersion;
5455

5556
public WorldListPage() {
5657
FXUtils.applyDragListener(this, it -> "zip".equals(FileUtils.getExtension(it)), modpacks -> {
@@ -88,7 +89,7 @@ public void refresh() {
8889
return;
8990

9091
setLoading(true);
91-
Task.runAsync(() -> gameVersion = profile.getRepository().getGameVersion(id).orElse(null))
92+
Task.runAsync(() -> gameVersion = profile.getRepository().getGameVersion(id).map(GameVersionNumber::asGameVersion).orElse(null))
9293
.thenApplyAsync(unused -> {
9394
try (Stream<World> stream = World.getWorlds(savesDir)) {
9495
return stream.parallel().collect(Collectors.toList());

‎HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/WorldManagePage.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
import org.jackhuang.hmcl.ui.decorator.DecoratorAnimatedPage;
3434
import org.jackhuang.hmcl.ui.decorator.DecoratorPage;
3535
import org.jackhuang.hmcl.util.ChunkBaseApp;
36-
import org.jackhuang.hmcl.util.versioning.GameVersionNumber;
3736

3837
import java.io.IOException;
3938
import java.nio.channels.FileChannel;
@@ -84,7 +83,7 @@ public WorldManagePage(World world, Path backupsDir) {
8483
.addNavigationDrawerTab(header, worldBackupsTab, i18n("world.backup"), SVG.ARCHIVE, SVG.ARCHIVE_FILL);
8584

8685
if (world.getGameVersion() != null && // old game will not write game version to level.dat
87-
GameVersionNumber.asGameVersion(world.getGameVersion()).isAtLeast("1.13", "17w43a")) {
86+
world.getGameVersion().isAtLeast("1.13", "17w43a")) {
8887
header.getTabs().add(datapackTab);
8988
sideBar.addNavigationDrawerTab(header, datapackTab, i18n("world.datapack"), SVG.EXTENSION, SVG.EXTENSION_FILL);
9089
}
@@ -102,7 +101,7 @@ public WorldManagePage(World world, Path backupsDir) {
102101
new IconedMenuItem(SVG.FORT, i18n("world.chunkbase.nether_fortress"), () -> ChunkBaseApp.openNetherFortressFinder(world), popup)
103102
);
104103

105-
if (GameVersionNumber.compare(world.getGameVersion(), "1.13") >= 0) {
104+
if (world.getGameVersion() != null && world.getGameVersion().compareTo("1.13") >= 0) {
106105
popupMenu.getContent().add(
107106
new IconedMenuItem(SVG.LOCATION_CITY, i18n("world.chunkbase.end_city"), () -> ChunkBaseApp.openEndCityFinder(world), popup));
108107
}

‎HMCL/src/main/java/org/jackhuang/hmcl/util/ChunkBaseApp.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public final class ChunkBaseApp {
4949

5050
public static boolean isSupported(@NotNull World world) {
5151
return world.getSeed() != null && world.getGameVersion() != null &&
52-
GameVersionNumber.asGameVersion(world.getGameVersion()).compareTo(MIN_GAME_VERSION) >= 0;
52+
world.getGameVersion().compareTo(MIN_GAME_VERSION) >= 0;
5353
}
5454

5555
public static ChunkBaseApp newBuilder(String app, long seed) {
@@ -60,31 +60,31 @@ public static void openSeedMap(World world) {
6060
assert isSupported(world);
6161

6262
newBuilder("seed-map", Objects.requireNonNull(world.getSeed()))
63-
.addPlatform(GameVersionNumber.asGameVersion(world.getGameVersion()), world.isLargeBiomes(), SEED_MAP_GAME_VERSIONS)
63+
.addPlatform(world.getGameVersion(), world.isLargeBiomes(), SEED_MAP_GAME_VERSIONS)
6464
.open();
6565
}
6666

6767
public static void openStrongholdFinder(World world) {
6868
assert isSupported(world);
6969

7070
newBuilder("stronghold-finder", Objects.requireNonNull(world.getSeed()))
71-
.addPlatform(GameVersionNumber.asGameVersion(world.getGameVersion()), world.isLargeBiomes(), STRONGHOLD_FINDER_GAME_VERSIONS)
71+
.addPlatform(world.getGameVersion(), world.isLargeBiomes(), STRONGHOLD_FINDER_GAME_VERSIONS)
7272
.open();
7373
}
7474

7575
public static void openNetherFortressFinder(World world) {
7676
assert isSupported(world);
7777

7878
newBuilder("nether-fortress-finder", Objects.requireNonNull(world.getSeed()))
79-
.addPlatform(GameVersionNumber.asGameVersion(world.getGameVersion()), false, NETHER_FORTRESS_GAME_VERSIONS)
79+
.addPlatform(world.getGameVersion(), false, NETHER_FORTRESS_GAME_VERSIONS)
8080
.open();
8181
}
8282

8383
public static void openEndCityFinder(World world) {
8484
assert isSupported(world);
8585

8686
newBuilder("endcity-finder", Objects.requireNonNull(world.getSeed()))
87-
.addPlatform(GameVersionNumber.asGameVersion(world.getGameVersion()), false, END_CITY_GAME_VERSIONS)
87+
.addPlatform(world.getGameVersion(), false, END_CITY_GAME_VERSIONS)
8888
.open();
8989
}
9090

‎HMCL/src/main/java/org/jackhuang/hmcl/util/i18n/I18n.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import org.jackhuang.hmcl.download.RemoteVersion;
2121
import org.jackhuang.hmcl.download.game.GameRemoteVersion;
2222
import org.jackhuang.hmcl.util.i18n.translator.Translator;
23+
import org.jackhuang.hmcl.util.versioning.GameVersionNumber;
2324
import org.jetbrains.annotations.Nullable;
2425

2526
import java.io.IOException;
@@ -75,7 +76,11 @@ public static String formatSpeed(long bytes) {
7576
return getTranslator().formatSpeed(bytes);
7677
}
7778

78-
public static String getDisplaySelfVersion(RemoteVersion version) {
79+
public static String getDisplayVersion(RemoteVersion version) {
80+
return getTranslator().getDisplayVersion(version);
81+
}
82+
83+
public static String getDisplayVersion(GameVersionNumber version) {
7984
return getTranslator().getDisplayVersion(version);
8085
}
8186

0 commit comments

Comments
 (0)