diff --git a/src/main/java/codechicken/nei/BookmarkPanel.java b/src/main/java/codechicken/nei/BookmarkPanel.java index 9ffc7b71..78c1a33a 100644 --- a/src/main/java/codechicken/nei/BookmarkPanel.java +++ b/src/main/java/codechicken/nei/BookmarkPanel.java @@ -572,7 +572,7 @@ public class BookmarkPanel extends PanelWidget { return; } else if (this.sortableGroup != null) { - final int overRowIndex = grid.getRowIndex(mousey); + final int overRowIndex = Math.min(grid.getRowIndex(mousey), grid.getRows() - 1); if (overRowIndex >= 0 && this.sortableGroup.groupId != this.grid.getRowGroupId(overRowIndex)) { this.grid.moveGroup(this.sortableGroup, overRowIndex); @@ -1105,7 +1105,7 @@ public class BookmarkPanel extends PanelWidget { } if (super.onMouseWheel(shift, mousex, mousey)) { - final int overRowIndex = grid.getRowIndex(mousey); + final int overRowIndex = Math.min(grid.getRowIndex(mousey), grid.getRows() - 1); if (this.sortableGroup != null && overRowIndex >= 0 && this.sortableGroup.groupId != this.grid.getRowGroupId(overRowIndex)) { diff --git a/src/main/java/codechicken/nei/bookmark/BookmarkGrid.java b/src/main/java/codechicken/nei/bookmark/BookmarkGrid.java index 942fcfa8..ecb7c4c1 100644 --- a/src/main/java/codechicken/nei/bookmark/BookmarkGrid.java +++ b/src/main/java/codechicken/nei/bookmark/BookmarkGrid.java @@ -799,6 +799,7 @@ public class BookmarkGrid extends ItemsGrid