From 24e46bb43e3820b5ee69fa786cec8b583ddee250 Mon Sep 17 00:00:00 2001
From: slprime <31038811+slprime@users.noreply.github.com>
Date: Tue, 16 Dec 2025 23:39:32 +0200
Subject: [PATCH] Add the ability to move bookmark groups between namespaces
 (#803)

Co-authored-by: Martin Robertz <dream-master@gmx.net>
---
 .../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 cebf28d0..ae48545d 100644
--- a/src/main/java/codechicken/nei/BookmarkPanel.java
+++ b/src/main/java/codechicken/nei/BookmarkPanel.java
@@ -996,7 +996,7 @@ public class BookmarkPanel extends PanelWidget<BookmarkGrid> {
     @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 513b34b6..f6d3a052 100644
--- a/src/main/java/codechicken/nei/bookmark/BookmarkGrid.java
+++ b/src/main/java/codechicken/nei/bookmark/BookmarkGrid.java
@@ -771,6 +771,25 @@ public class BookmarkGrid extends ItemsGrid<BookmarksGridSlot, BookmarkGrid.Book
         int absoluteSlotIndex = absoluteRowIndex * this.columns;
         int overGroupId = getRowGroupId(overRowIndex);
 
+        // move group to same grid
+        if (this != sortableGroup.grid) {
+            final BookmarkGroup sourceGroup = sortableGroup.grid.getGroup(sortableGroup.groupId);
+            final List<BookmarkItem> 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;
         }