feat:优化世界管理界面和世界信息界面 #4823
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -35,6 +35,7 @@ | |
| import org.jackhuang.hmcl.util.i18n.I18n; | ||
|
|
||
| import java.time.Instant; | ||
| import java.util.stream.Stream; | ||
|
|
||
| import static org.jackhuang.hmcl.ui.FXUtils.determineOptimalPopupPosition; | ||
| import static org.jackhuang.hmcl.util.StringUtils.parseColorEscapes; | ||
|
|
@@ -143,11 +144,24 @@ public void showPopupMenu(JFXPopup.PopupHPosition hPosition, double initOffsetX, | |
| } | ||
| } | ||
|
|
||
| IconedMenuItem exportMenuItem = new IconedMenuItem(SVG.OUTPUT, i18n("world.export"), item::export, popup); | ||
| IconedMenuItem deleteMenuItem = new IconedMenuItem(SVG.DELETE, i18n("world.delete"), item::delete, popup); | ||
| IconedMenuItem duplicateMenuItem = new IconedMenuItem(SVG.CONTENT_COPY, i18n("world.duplicate"), item::copy, popup); | ||
| boolean worldLocked = world.isLocked(); | ||
| Stream.of(exportMenuItem, deleteMenuItem, duplicateMenuItem) | ||
| .forEach(iconedMenuItem -> iconedMenuItem.setDisable(worldLocked)); | ||
|
|
||
| popupMenu.getContent().addAll( | ||
| new MenuSeparator(), | ||
| exportMenuItem, | ||
| deleteMenuItem, | ||
| duplicateMenuItem | ||
| ); | ||
|
|
||
| popupMenu.getContent().addAll( | ||
| new MenuSeparator(), | ||
| new IconedMenuItem(SVG.FOLDER_OPEN, i18n("folder.world"), item::reveal, popup) | ||
| ); | ||
Mine-diamond marked this conversation as resolved.
Show resolved
Hide resolved
Comment on lines
+154
to
+164
There was a problem hiding this comment. Two consecutive MenuSeparators are added to the popup menu (one at line 155 before export/delete/duplicate items, and another at line 162 before the reveal folder item). This creates an empty section in the menu which may be unintentional. Consider removing one of the separators or ensuring this visual spacing is intentional. |
||
|
|
||
| JFXPopup.PopupVPosition vPosition = determineOptimalPopupPosition(root, popup); | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||
|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -18,6 +18,7 @@ | |||||||||
| package org.jackhuang.hmcl.ui.versions; | ||||||||||
|
|
||||||||||
| import com.jfoenix.controls.JFXPopup; | ||||||||||
| import javafx.application.Platform; | ||||||||||
| import javafx.beans.property.ObjectProperty; | ||||||||||
| import javafx.beans.property.ReadOnlyObjectProperty; | ||||||||||
| import javafx.beans.property.SimpleObjectProperty; | ||||||||||
|
|
@@ -27,13 +28,15 @@ | |||||||||
| import javafx.scene.layout.VBox; | ||||||||||
| import org.jackhuang.hmcl.game.World; | ||||||||||
| import org.jackhuang.hmcl.setting.Profile; | ||||||||||
| import org.jackhuang.hmcl.ui.Controllers; | ||||||||||
| import org.jackhuang.hmcl.ui.FXUtils; | ||||||||||
| import org.jackhuang.hmcl.ui.SVG; | ||||||||||
| import org.jackhuang.hmcl.ui.animation.TransitionPane; | ||||||||||
| import org.jackhuang.hmcl.ui.construct.*; | ||||||||||
| 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 java.io.IOException; | ||||||||||
| import java.nio.channels.FileChannel; | ||||||||||
|
|
@@ -53,6 +56,8 @@ public final class WorldManagePage extends DecoratorAnimatedPage implements Deco | |||||||||
| private final Profile profile; | ||||||||||
| private final String id; | ||||||||||
|
|
||||||||||
| private boolean loadFailed = false; | ||||||||||
|
|
||||||||||
| private final TabHeader header; | ||||||||||
| private final TabHeader.Tab<WorldInfoPage> worldInfoTab = new TabHeader.Tab<>("worldInfoPage"); | ||||||||||
| private final TabHeader.Tab<WorldBackupsPage> worldBackupsTab = new TabHeader.Tab<>("worldBackupsPage"); | ||||||||||
|
|
@@ -65,25 +70,25 @@ public final class WorldManagePage extends DecoratorAnimatedPage implements Deco | |||||||||
| public WorldManagePage(World world, Path backupsDir, Profile profile, String id) { | ||||||||||
| this.world = world; | ||||||||||
| this.backupsDir = backupsDir; | ||||||||||
| this.profile = profile; | ||||||||||
| this.id = id; | ||||||||||
|
|
||||||||||
| sessionLockChannel = WorldManageUIUtils.getSessionLockChannel(world); | ||||||||||
| try { | ||||||||||
| world.reloadLevelDat(); | ||||||||||
| } catch (IOException e) { | ||||||||||
| LOG.warning("Can not load world level.dat of world: " + world.getFile(), e); | ||||||||||
| loadFailed = true; | ||||||||||
| } | ||||||||||
|
|
||||||||||
| this.worldInfoTab.setNodeSupplier(() -> new WorldInfoPage(this)); | ||||||||||
| this.worldBackupsTab.setNodeSupplier(() -> new WorldBackupsPage(this)); | ||||||||||
| this.datapackTab.setNodeSupplier(() -> new DatapackListPage(this)); | ||||||||||
|
|
||||||||||
| this.state = new SimpleObjectProperty<>(State.fromTitle(i18n("world.manage.title", StringUtils.parseColorEscapes(world.getWorldName())))); | ||||||||||
| this.header = new TabHeader(transitionPane, worldInfoTab, worldBackupsTab); | ||||||||||
| header.select(worldInfoTab); | ||||||||||
|
|
||||||||||
| setCenter(transitionPane); | ||||||||||
|
|
||||||||||
| BorderPane left = new BorderPane(); | ||||||||||
|
|
@@ -106,37 +111,81 @@ public WorldManagePage(World world, Path backupsDir, Profile profile, String id) | |||||||||
| AdvancedListBox toolbar = new AdvancedListBox(); | ||||||||||
|
|
||||||||||
| if (world.getGameVersion() != null && world.getGameVersion().isAtLeast("1.20", "23w14a")) { | ||||||||||
| toolbar.addNavigationDrawerItem(i18n("version.launch"), SVG.ROCKET_LAUNCH, this::launch, advancedListItem -> advancedListItem.setDisable(isReadOnly())); | ||||||||||
| toolbar.addNavigationDrawerItem(i18n("version.launch_script"), SVG.SCRIPT, this::generateLaunchScript, null); | ||||||||||
| } | ||||||||||
|
|
||||||||||
| if (ChunkBaseApp.isSupported(world)) { | ||||||||||
| PopupMenu chunkBasePopupMenu = new PopupMenu(); | ||||||||||
| JFXPopup chunkBasePopup = new JFXPopup(chunkBasePopupMenu); | ||||||||||
|
|
||||||||||
|
|
||||||||||
| 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 (world.getGameVersion() != null && world.getGameVersion().compareTo("1.13") >= 0) { | ||||||||||
| chunkBasePopupMenu.getContent().add( | ||||||||||
| new IconedMenuItem(SVG.LOCATION_CITY, i18n("world.chunkbase.end_city"), () -> ChunkBaseApp.openEndCityFinder(world), chunkBasePopup)); | ||||||||||
| } | ||||||||||
|
|
||||||||||
| toolbar.addNavigationDrawerItem(i18n("world.chunkbase"), SVG.EXPLORE, null, chunkBaseMenuItem -> | ||||||||||
| chunkBaseMenuItem.setOnAction(e -> | ||||||||||
| chunkBasePopup.show(chunkBaseMenuItem, | ||||||||||
| JFXPopup.PopupVPosition.BOTTOM, JFXPopup.PopupHPosition.LEFT, | ||||||||||
| chunkBaseMenuItem.getWidth(), 0))); | ||||||||||
| } | ||||||||||
|
|
||||||||||
| toolbar.addNavigationDrawerItem(i18n("settings.game.exploration"), SVG.FOLDER_OPEN, () -> FXUtils.openFolder(world.getFile()), null); | ||||||||||
|
|
||||||||||
| { | ||||||||||
| PopupMenu managePopupMenu = new PopupMenu(); | ||||||||||
| JFXPopup managePopup = new JFXPopup(managePopupMenu); | ||||||||||
|
|
||||||||||
| 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), | ||||||||||
| new IconedMenuItem(SVG.CONTENT_COPY, i18n("world.duplicate"), () -> WorldManageUIUtils.copyWorld(world, null), managePopup) | ||||||||||
| ); | ||||||||||
|
|
||||||||||
| toolbar.addNavigationDrawerItem(i18n("settings.game.management"), SVG.MENU, null, managePopupMenuItem -> | ||||||||||
| { | ||||||||||
| managePopupMenuItem.setOnAction(e -> | ||||||||||
| managePopup.show(managePopupMenuItem, | ||||||||||
| JFXPopup.PopupVPosition.BOTTOM, JFXPopup.PopupHPosition.LEFT, | ||||||||||
| managePopupMenuItem.getWidth(), 0)); | ||||||||||
| managePopupMenuItem.setDisable(isReadOnly()); | ||||||||||
| }); | ||||||||||
|
|
||||||||||
| } | ||||||||||
|
|
||||||||||
| BorderPane.setMargin(toolbar, new Insets(0, 0, 12, 0)); | ||||||||||
| left.setBottom(toolbar); | ||||||||||
|
|
||||||||||
| this.addEventHandler(Navigator.NavigationEvent.EXITED, this::onExited); | ||||||||||
| this.addEventHandler(Navigator.NavigationEvent.NAVIGATED, this::onNavigated); | ||||||||||
| } | ||||||||||
|
|
||||||||||
| private void onNavigated(Navigator.NavigationEvent event) { | ||||||||||
| if (loadFailed) { | ||||||||||
| Platform.runLater(() -> { | ||||||||||
| fireEvent(new PageCloseEvent()); | ||||||||||
| Controllers.dialog(i18n("world.load.fail"), null, MessageDialogPane.MessageType.ERROR); | ||||||||||
| }); | ||||||||||
| return; | ||||||||||
| } | ||||||||||
| if (sessionLockChannel == null || !sessionLockChannel.isOpen()) { | ||||||||||
| sessionLockChannel = WorldManageUIUtils.getSessionLockChannel(world); | ||||||||||
| } | ||||||||||
| } | ||||||||||
|
|
||||||||||
| public void onExited(Navigator.NavigationEvent event) { | ||||||||||
| try { | ||||||||||
| WorldManageUIUtils.closeSessionLockChannel(world, sessionLockChannel); | ||||||||||
| } catch (IOException ignored) { | ||||||||||
|
There was a problem hiding this comment. The onExited method doesn't reset sessionLockChannel to null after closing it. This could cause issues if onNavigated is called again, as it checks if sessionLockChannel is null but won't recreate it if it's a closed (but non-null) channel. Consider setting sessionLockChannel = null after closing it in the try block.
Suggested change
Contributor
Author
There was a problem hiding this comment. 这都onExited 了，再次打开只会重新new一个而不是再次Navigating，这个说法是错误的 |
||||||||||
| } | ||||||||||
| } | ||||||||||
|
|
||||||||||
| @Override | ||||||||||
|
|
@@ -156,19 +205,6 @@ public boolean isReadOnly() { | |||||||||
| return sessionLockChannel == null; | ||||||||||
| } | ||||||||||
|
|
||||||||||
| public void launch() { | ||||||||||
| fireEvent(new PageCloseEvent()); | ||||||||||
| Versions.launchAndEnterWorld(profile, id, world.getFileName()); | ||||||||||
|
|
||||||||||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.