From c79ee9fc19fec43a1de4611c614866e6f59f190e Mon Sep 17 00:00:00 2001 From: slprime Date: Thu, 6 Nov 2025 18:45:23 +0200 Subject: [PATCH] Add the ability to move bookmark groups between namespaces --- .../java/codechicken/nei/BookmarkPanel.java | 2 +- .../nei/bookmark/BookmarkGrid.java | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/src/main/java/codechicken/nei/BookmarkPanel.java b/src/main/java/codechicken/nei/BookmarkPanel.java index dedd3a65..1abe9c68 100644 --- a/src/main/java/codechicken/nei/BookmarkPanel.java +++ b/src/main/java/codechicken/nei/BookmarkPanel.java @@ -992,7 +992,7 @@ public class BookmarkPanel extends PanelWidget { @Override public boolean onMouseWheel(int shift, int mousex, int mousey) { - if (!inEditingState() && new Rectangle4i( + if ((!inEditingState() || this.sortableGroup != null) && new Rectangle4i( namespacePrev.x, namespacePrev.y, namespaceNext.x + namespaceNext.w - namespacePrev.x, diff --git a/src/main/java/codechicken/nei/bookmark/BookmarkGrid.java b/src/main/java/codechicken/nei/bookmark/BookmarkGrid.java index b027ff78..19944862 100644 --- a/src/main/java/codechicken/nei/bookmark/BookmarkGrid.java +++ b/src/main/java/codechicken/nei/bookmark/BookmarkGrid.java @@ -761,6 +761,25 @@ public class BookmarkGrid extends ItemsGrid itemsToMove = sortableGroup.getBookmarkItems(); + + sortableGroup.grid.removeGroup(sortableGroup.groupId); + + final int groupId = this.addGroup(sourceGroup); + for (BookmarkItem item : itemsToMove) { + item.groupId = groupId; + this.bookmarkItems.add(item); + } + + sortableGroup.grid = this; + sortableGroup.groupId = groupId; + this.onItemsChanged(); + this.getMask();// force generate grid + } + if (sortableGroup.groupId == overGroupId) { return; }