feat:优化世界管理界面和世界信息界面

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/WorldListItem.java

@@ -19,22 +19,12 @@
 
 import javafx.scene.control.Control;
 import javafx.scene.control.Skin;
-import javafx.stage.FileChooser;
 import org.jackhuang.hmcl.game.World;
-import org.jackhuang.hmcl.game.WorldLockedException;
-import org.jackhuang.hmcl.task.Schedulers;
-import org.jackhuang.hmcl.task.Task;
 import org.jackhuang.hmcl.ui.Controllers;
 import org.jackhuang.hmcl.ui.FXUtils;
-import org.jackhuang.hmcl.ui.construct.MessageDialogPane.MessageType;
-import org.jackhuang.hmcl.ui.wizard.SinglePageWizardProvider;
-import org.jackhuang.hmcl.util.StringUtils;
-import org.jackhuang.hmcl.util.io.FileUtils;
 
 import java.nio.file.Path;
 
-import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
-
 public final class WorldListItem extends Control {
     private final World world;
     private final Path backupsDir;
@@ -56,34 +46,11 @@ public World getWorld() {
     }
 
     public void export() {
-        FileChooser fileChooser = new FileChooser();
-        fileChooser.setTitle(i18n("world.export.title"));
-        fileChooser.getExtensionFilters().add(new FileChooser.ExtensionFilter(i18n("world"), "*.zip"));
-        fileChooser.setInitialFileName(world.getWorldName());
-        Path file = FileUtils.toPath(fileChooser.showSaveDialog(Controllers.getStage()));
-        if (file == null) {
-            return;
-        }
-
-        Controllers.getDecorator().startWizard(new SinglePageWizardProvider(controller -> new WorldExportPage(world, file, controller::onFinish)));
+        WorldManageUIUtils.export(world);
     }
 
     public void delete() {
-        Controllers.confirm(
-                i18n("button.remove.confirm"),
-                i18n("world.delete"),
-                () -> Task.runAsync(world::delete)
-                        .whenComplete(Schedulers.javafx(), (result, exception) -> {
-                            if (exception == null) {
-                                parent.remove(this);
-                            } else if (exception instanceof WorldLockedException) {
-                                Controllers.dialog(i18n("world.locked.failed"), null, MessageType.WARNING);
-                            } else {
-                                Controllers.dialog(i18n("world.delete.failed", StringUtils.getStackTrace(exception)), null, MessageType.WARNING);
-                            }
-                        }).start(),
-                null
-        );
+        WorldManageUIUtils.delete(world, () -> parent.remove(this));
     }
 
     public void reveal() {

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

@@ -33,6 +33,7 @@
 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.StringUtils;
 import org.jackhuang.hmcl.util.versioning.GameVersionNumber;
 
 import java.io.IOException;
@@ -68,7 +69,7 @@ public WorldManagePage(World world, Path backupsDir) {
         this.worldBackupsTab.setNodeSupplier(() -> new WorldBackupsPage(this));
         this.datapackTab.setNodeSupplier(() -> new DatapackListPage(this));
 
-        this.state = new SimpleObjectProperty<>(State.fromTitle(i18n("world.manage.title", world.getWorldName())));
+        this.state = new SimpleObjectProperty<>(State.fromTitle(i18n("world.manage.title", StringUtils.parseColorEscapes(world.getWorldName()))));
         this.header = new TabHeader(transitionPane, worldInfoTab, worldBackupsTab);
         header.select(worldInfoTab);
 
@@ -93,25 +94,39 @@ public WorldManagePage(World world, Path backupsDir) {
 
         AdvancedListBox toolbar = new AdvancedListBox();
         if (ChunkBaseApp.isSupported(world)) {
-            PopupMenu popupMenu = new PopupMenu();
-            JFXPopup popup = new JFXPopup(popupMenu);
+            PopupMenu chunkBasePopupMenu = new PopupMenu();
+            JFXPopup chunkBasePopup = new JFXPopup(chunkBasePopupMenu);
 
-            popupMenu.getContent().addAll(
-                    new IconedMenuItem(SVG.EXPLORE, i18n("world.chunkbase.seed_map"), () -> ChunkBaseApp.openSeedMap(world), popup),
-                    new IconedMenuItem(SVG.VISIBILITY, i18n("world.chunkbase.stronghold"), () -> ChunkBaseApp.openStrongholdFinder(world), popup),
-                    new IconedMenuItem(SVG.FORT, i18n("world.chunkbase.nether_fortress"), () -> ChunkBaseApp.openNetherFortressFinder(world), popup)
+            PopupMenu managePopupMenu = new PopupMenu();
+            JFXPopup managePopup = new JFXPopup(managePopupMenu);
+
+            chunkBasePopupMenu.getContent().addAll(
+                    new IconedMenuItem(SVG.EXPLORE, i18n("world.chunkbase.seed_map"), () -> ChunkBaseApp.openSeedMap(world), chunkBasePopup),
+                    new IconedMenuItem(SVG.VISIBILITY, i18n("world.chunkbase.stronghold"), () -> ChunkBaseApp.openStrongholdFinder(world), chunkBasePopup),
+                    new IconedMenuItem(SVG.FORT, i18n("world.chunkbase.nether_fortress"), () -> ChunkBaseApp.openNetherFortressFinder(world), chunkBasePopup)
             );
 
             if (GameVersionNumber.compare(world.getGameVersion(), "1.13") >= 0) {
-                popupMenu.getContent().add(
-                        new IconedMenuItem(SVG.LOCATION_CITY, i18n("world.chunkbase.end_city"), () -> ChunkBaseApp.openEndCityFinder(world), popup));
+                chunkBasePopupMenu.getContent().add(
+                        new IconedMenuItem(SVG.LOCATION_CITY, i18n("world.chunkbase.end_city"), () -> ChunkBaseApp.openEndCityFinder(world), chunkBasePopup));
             }
 
+            managePopupMenu.getContent().addAll(
+                    new IconedMenuItem(SVG.OUTPUT, i18n("world.export"), () -> WorldManageUIUtils.export(world, sessionLockChannel), managePopup),
+                    new IconedMenuItem(SVG.DELETE, i18n("world.delete"), () -> WorldManageUIUtils.delete(world, () -> fireEvent(new PageCloseEvent()), sessionLockChannel), managePopup)
+            );
+
             toolbar.addNavigationDrawerItem(i18n("world.chunkbase"), SVG.EXPLORE, null, chunkBaseMenuItem ->
                     chunkBaseMenuItem.setOnAction(e ->
-                            popup.show(chunkBaseMenuItem,
+                            chunkBasePopup.show(chunkBaseMenuItem,
                                     JFXPopup.PopupVPosition.BOTTOM, JFXPopup.PopupHPosition.LEFT,
                                     chunkBaseMenuItem.getWidth(), 0)));
+
+            toolbar.addNavigationDrawerItem("管理", SVG.MENU, null, managePopupMenuItem ->
+                    managePopupMenuItem.setOnAction(e ->
+                            managePopup.show(managePopupMenuItem,
+                                    JFXPopup.PopupVPosition.BOTTOM, JFXPopup.PopupHPosition.LEFT,
+                                    managePopupMenuItem.getWidth(), 0)));
         }
         toolbar.addNavigationDrawerItem(i18n("settings.game.exploration"), SVG.FOLDER_OPEN, () -> FXUtils.openFolder(world.getFile()), null);
 
@@ -124,6 +139,16 @@ public WorldManagePage(World world, Path backupsDir) {
             LOG.info("Acquired lock on world " + world.getFileName());
         } catch (IOException ignored) {
         }
+
+        this.addEventHandler(Navigator.NavigationEvent.NAVIGATED, this::onNavigated);
+    }
+
+    private void onNavigated(Navigator.NavigationEvent event) {
+        try {
+            sessionLockChannel = world.lock();
+            LOG.info("Acquired lock on world " + world.getFileName());
+        } catch (IOException ignored) {
+        }
     }
 
     @Override

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/WorldManageUIUtils.java

@@ -0,0 +1,82 @@
+package org.jackhuang.hmcl.ui.versions;
+
+import javafx.stage.FileChooser;
+import org.jackhuang.hmcl.game.World;
+import org.jackhuang.hmcl.game.WorldLockedException;
+import org.jackhuang.hmcl.task.Schedulers;
+import org.jackhuang.hmcl.task.Task;
+import org.jackhuang.hmcl.ui.Controllers;
+import org.jackhuang.hmcl.ui.construct.MessageDialogPane;
+import org.jackhuang.hmcl.ui.wizard.SinglePageWizardProvider;
+import org.jackhuang.hmcl.util.StringUtils;
+import org.jackhuang.hmcl.util.io.FileUtils;
+
+import java.io.IOException;
+import java.nio.channels.FileChannel;
+import java.nio.file.Path;
+
+import static org.jackhuang.hmcl.util.i18n.I18n.i18n;
+import static org.jackhuang.hmcl.util.logging.Logger.LOG;
+
+public final class WorldManageUIUtils {
+    private WorldManageUIUtils() {
+    }
+
+    public static void delete(World world, Runnable runnable) {
+        delete(world, runnable, null);
+    }
+
+    public static void delete(World world, Runnable runnable, FileChannel sessionLockChannel) {
+        Controllers.confirm(
+                i18n("button.remove.confirm"),
+                i18n("world.delete"),
+                () -> Task.runAsync(() -> closeSessionLockChannel(world, sessionLockChannel))
+                        .thenRunAsync(world::delete)
+                        .whenComplete(Schedulers.javafx(), (result, exception) -> {
+                            if (exception == null) {
+                                runnable.run();
+                            } else if (exception instanceof WorldLockedException) {
+                                Controllers.dialog(i18n("world.locked.failed"), null, MessageDialogPane.MessageType.WARNING);
+                            } else {
+                                Controllers.dialog(i18n("world.delete.failed", StringUtils.getStackTrace(exception)), null, MessageDialogPane.MessageType.WARNING);
+                            }
+                        }).start(),
+                null
+        );
+    }
+
+    public static void export(World world) {
+        export(world, null);
+    }
+
+    public static void export(World world, FileChannel sessionLockChannel) {
+        FileChooser fileChooser = new FileChooser();
+        fileChooser.setTitle(i18n("world.export.title"));
+        fileChooser.getExtensionFilters().add(new FileChooser.ExtensionFilter(i18n("world"), "*.zip"));
+        fileChooser.setInitialFileName(world.getWorldName());
+        Path file = FileUtils.toPath(fileChooser.showSaveDialog(Controllers.getStage()));
+        if (file == null) {
+            return;
+        }
+
+        try {
+            closeSessionLockChannel(world, sessionLockChannel);
+        } catch (IOException e) {
+            return;
+        }
+
+        Controllers.getDecorator().startWizard(new SinglePageWizardProvider(controller -> new WorldExportPage(world, file, controller::onFinish)));
+    }
+
+    private static void closeSessionLockChannel(World world, FileChannel sessionLockChannel) throws IOException {
+        if (sessionLockChannel != null) {
+            try {
+                sessionLockChannel.close();
+                LOG.info("Releases the lock on world " + world.getFileName());
+            } catch (IOException e) {
+                throw new IOException("Failed to close session lock channel", e);
+            }
+        }
+    }
+
+}

HMCL/src/main/resources/assets/lang/I18N.properties

@@ -1139,6 +1139,7 @@ world.export.location=Save As
 world.export.wizard=Export World "%s"
 world.extension=World Archive
 world.game_version=Game Version
+world.icon=World Icon
 world.import.already_exists=This world already exists.
 world.import.choose=Choose world archive you want to import
 world.import.failed=Failed to import this world: %s
@@ -1153,6 +1154,7 @@ world.info.difficulty.peaceful=Peaceful
 world.info.difficulty.easy=Easy
 world.info.difficulty.normal=Normal
 world.info.difficulty.hard=Hard
+world.info.difficulty_lock=Lock Difficulty
 world.info.failed=Failed to read the world info
 world.info.game_version=Game Version
 world.info.last_played=Last Played

HMCL/src/main/resources/assets/lang/I18N_zh.properties

@@ -935,6 +935,7 @@ world.export.title=選取該世界的儲存位置
 world.export.location=儲存到
 world.export.wizard=匯出世界「%s」
 world.extension=存檔壓縮檔
+world.icon=世界圖標
 world.import.already_exists=此世界已經存在
 world.import.choose=選取要匯入的存檔壓縮檔
 world.import.failed=無法匯入此世界: %s
@@ -949,6 +950,7 @@ world.info.difficulty.peaceful=和平
 world.info.difficulty.easy=簡單
 world.info.difficulty.normal=普通
 world.info.difficulty.hard=困難
+world.info.difficulty_lock=鎖定難度
 world.info.failed=讀取世界資訊失敗
 world.info.game_version=遊戲版本
 world.info.last_played=上一次遊戲時間

HMCL/src/main/resources/assets/lang/I18N_zh_CN.properties

@@ -946,6 +946,7 @@ world.export.location=保存到
 world.export.wizard=导出世界“%s”
 world.extension=世界压缩包
 world.game_version=游戏版本
+world.icon=世界图标
 world.import.already_exists=此世界已经存在
 world.import.choose=选择要导入的存档压缩包
 world.import.failed=无法导入此世界：%s
@@ -960,6 +961,7 @@ world.info.difficulty.peaceful=和平
 world.info.difficulty.easy=简单
 world.info.difficulty.normal=普通
 world.info.difficulty.hard=困难
+world.info.difficult_lock=锁定难度
 world.info.failed=读取世界信息失败
 world.info.game_version=游戏版本
 world.info.last_played=上一次游戏时间

HMCLCore/src/main/java/org/jackhuang/hmcl/game/World.java

@@ -96,6 +96,10 @@ public String getWorldName() {
         return worldName;
     }
 
+    public void setWorldName(String worldName) {
+        this.worldName = worldName;
+    }
+
     public Path getLevelDatFile() {
         return file.resolve("level.dat");
     }