From e4e1964dec10d4536038744ad521cae467624ad5 Mon Sep 17 00:00:00 2001
From: slprime <31038811+slprime@users.noreply.github.com>
Date: Thu, 22 Oct 2026 16:22:23 +0300
Subject: [PATCH] Fix NPE in BookmarksGridSlot when dragging a group across
 namespaces (#1086)

---
 .../codechicken/nei/bookmark/BookmarkGridGenerator.java     | 6 ++++--
 .../java/codechicken/nei/bookmark/BookmarksGridSlot.java    | 5 ++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/codechicken/nei/bookmark/BookmarkGridGenerator.java b/src/main/java/codechicken/nei/bookmark/BookmarkGridGenerator.java
index 027725a0..c5a6aa55 100644
--- a/src/main/java/codechicken/nei/bookmark/BookmarkGridGenerator.java
+++ b/src/main/java/codechicken/nei/bookmark/BookmarkGridGenerator.java
@@ -340,7 +340,8 @@ public class BookmarkGridGenerator {
                     0,
                     chainItem.getItem(),
                     null,
-                    group);
+                    group,
+                    this.grid);
         } else {
             return new BookmarksGridSlot(
                     slotIndex,
@@ -350,7 +351,8 @@ public class BookmarkGridGenerator {
                     chainItem.getCalculatedMultiplier(),
                     chainItem.getItem(),
                     chainItem.calculatedType,
-                    group);
+                    group,
+                    this.grid);
         }
     }
 
diff --git a/src/main/java/codechicken/nei/bookmark/BookmarksGridSlot.java b/src/main/java/codechicken/nei/bookmark/BookmarksGridSlot.java
index d9c8d5de..1e239394 100644
--- a/src/main/java/codechicken/nei/bookmark/BookmarksGridSlot.java
+++ b/src/main/java/codechicken/nei/bookmark/BookmarksGridSlot.java
@@ -8,7 +8,6 @@ import org.lwjgl.opengl.GL11;
 
 import codechicken.lib.vec.Rectangle4i;
 import codechicken.nei.BookmarkPanel.BookmarkViewMode;
-import codechicken.nei.ItemPanels;
 import codechicken.nei.ItemsGrid.ItemsGridSlot;
 import codechicken.nei.ItemsGrid.MouseContext;
 import codechicken.nei.NEIClientConfig;
@@ -65,7 +64,8 @@ public class BookmarksGridSlot extends ItemsGridSlot {
     protected final int rowIndex;
 
     public BookmarksGridSlot(int slotIndex, int itemIndex, long realMultiplier, long shiftAmount,
-            long calculatedMultiplier, BookmarkItem bookmarkItem, CalculatedType calculatedType, BookmarkGroup group) {
+            long calculatedMultiplier, BookmarkItem bookmarkItem, CalculatedType calculatedType, BookmarkGroup group,
+            BookmarkGrid grid) {
         super(
                 slotIndex,
                 itemIndex,
@@ -96,7 +96,6 @@ public class BookmarksGridSlot extends ItemsGridSlot {
                             : CalculatedType.RESULT;
         }
 
-        final BookmarkGrid grid = ItemPanels.bookmarkPanel.getGrid();
         final BookmarkItem prevItem = grid.getCalculatedItem(
                 grid.gridGenerator.slotToItem.getOrDefault(grid.gridGenerator.itemToSlot.get(this.itemIndex) - 1, -1));
         this.isFirstOutput = this.itemIndex >= 0 && this.bookmarkItem.type == BookmarkItemType.RESULT