From c49f8808fd62e11b4ee081d3668cd06c365eeec5 Mon Sep 17 00:00:00 2001
From: slprime <31038811+slprime@users.noreply.github.com>
Date: Thu, 15 Oct 2026 18:59:55 +0300
Subject: [PATCH] Fix NPE in item panel getMask (#1078)

---
 src/main/java/codechicken/nei/ItemPanel.java      | 8 +-------
 src/main/java/codechicken/nei/ItemsPanelGrid.java | 4 ++++
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/main/java/codechicken/nei/ItemPanel.java b/src/main/java/codechicken/nei/ItemPanel.java
index ef89305e..9265598c 100644
--- a/src/main/java/codechicken/nei/ItemPanel.java
+++ b/src/main/java/codechicken/nei/ItemPanel.java
@@ -75,13 +75,7 @@ public class ItemPanel extends PanelWidget<ItemsPanelGrid> {
     }
 
     public static void updateItemList(ArrayList<ItemStack> newItems) {
-        final ItemsPanelGrid grid = ItemPanels.itemPanel.getGrid();
-
-        if (grid.rawItems.size() != newItems.size()) {
-            grid.setPage(0);
-        }
-
-        grid.setItems(newItems);
+        ItemPanels.itemPanel.getGrid().setItems(newItems);
         ItemPanels.itemPanel.realItems = newItems;
     }
 
diff --git a/src/main/java/codechicken/nei/ItemsPanelGrid.java b/src/main/java/codechicken/nei/ItemsPanelGrid.java
index dbc22ea2..79ef0ef7 100644
--- a/src/main/java/codechicken/nei/ItemsPanelGrid.java
+++ b/src/main/java/codechicken/nei/ItemsPanelGrid.java
@@ -89,6 +89,10 @@ public class ItemsPanelGrid extends ItemsGrid<ItemsPanelGrid.ItemsPanelGridSlot,
     public void refresh(GuiContainer gui) {
 
         if (this.newItems != null) {
+            if (this.rawItems.size() != this.newItems.size()) {
+                this.page = 0;
+            }
+
             this.groupItems.clear();
             this.itemToGroup.clear();
             this.forceExpand = false;