update

dependencies.gradle

@@ -2,7 +2,7 @@
 
 dependencies {
     api('com.github.GTNewHorizons:CodeChickenCore:1.4.7:dev')
-    implementation('com.github.GTNewHorizons:GTNHLib:0.7.3:dev')
+    implementation('com.github.GTNewHorizons:GTNHLib:0.7.7:dev')
 
     shadowImplementation('org.apache.commons:commons-csv:1.10.0')
 

gradle.properties

@@ -174,6 +174,12 @@ curseForgeRelations = requiredDependency\:codechickencore-unofficial
 # projects. New projects should not use this parameter.
 # customArchiveBaseName =
 
+# Optional parameter to customize the default working directory used by the runClient* tasks. Relative to the project directory.
+# runClientWorkingDirectory = run/client
+
+# Optional parameter to customize the default working directory used by the runServer* tasks. Relative to the project directory.
+# runServerWorkingDirectory = run/server
+
 # Optional parameter to have the build automatically fail if an illegal version is used.
 # This can be useful if you e.g. only want to allow versions in the form of '1.1.xxx'.
 # The check is ONLY performed if the version is a git tag.

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew.bat

@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

settings.gradle

@@ -17,7 +17,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.47'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.48'
 }
 
 

src/main/java/codechicken/nei/BookmarkPanel.java

@@ -29,6 +29,7 @@ import codechicken.nei.api.IBookmarkContainerHandler;
 import codechicken.nei.bookmark.BookmarkGrid;
 import codechicken.nei.bookmark.BookmarkGroup;
 import codechicken.nei.bookmark.BookmarkItem;
+import codechicken.nei.bookmark.BookmarkItem.BookmarkItemType;
 import codechicken.nei.bookmark.BookmarkStorage;
 import codechicken.nei.bookmark.BookmarksGridSlot;
 import codechicken.nei.bookmark.GroupingItem;
@@ -184,8 +185,8 @@ public class BookmarkPanel extends PanelWidget<BookmarkGrid> {
             final boolean existsRecipe = recipeId != null
                     && this.grid.existsRecipe(recipeId, BookmarkGrid.DEFAULT_GROUP_ID);
             final NBTTagCompound nbTag = StackInfo.itemStackToNBT(itemStack);
-            long factor = nbTag.getInteger("Count");
-            long count = factor;
+            long count = nbTag.getInteger("Count");
+            long factor = existsRecipe ? Math.max(count, 1) : 1;
 
             if (existsRecipe) {
                 for (int i = 0; i < this.grid.size(); i++) {
@@ -196,12 +197,13 @@ public class BookmarkPanel extends PanelWidget<BookmarkGrid> {
                 }
             }
 
-            if (factor == 0) {
-                factor = nbTag.hasKey("gtFluidName") ? Math.min(144, nbTag.getInteger("Count")) : 1;
-            }
-
             this.grid.addItem(
-                    BookmarkItem.of(groupId, StackInfo.withAmount(itemStack, count), factor, recipeId, false),
+                    BookmarkItem.of(
+                            groupId,
+                            StackInfo.withAmount(itemStack, count),
+                            factor,
+                            recipeId,
+                            existsRecipe ? BookmarkItemType.RESULT : BookmarkItemType.ITEM),
                     true);
             return true;
         }
@@ -244,7 +246,8 @@ public class BookmarkPanel extends PanelWidget<BookmarkGrid> {
 
                 if (stack != null && uniqueRecipe.add(recipeId)) {
                     this.grid.addItem(
-                            BookmarkItem.of(groupId, stack, StackInfo.getAmount(stack), recipeId, false),
+                            BookmarkItem
+                                    .of(groupId, stack, StackInfo.getAmount(stack), recipeId, BookmarkItemType.ITEM),
                             true);
                     uniqueStack.add(stack);
                 }
@@ -304,7 +307,7 @@ public class BookmarkPanel extends PanelWidget<BookmarkGrid> {
         }
 
         final int groupId = slot.getGroupId();
-        final RecipeId recipeId = slot.getRecipeId();
+        final RecipeId recipeId = slot.getType() == BookmarkItemType.ITEM ? null : slot.getRecipeId();
         final BookmarkGroup group = slot.getGroup();
 
         if (group.crafting != null && group.collapsed) {
@@ -368,7 +371,7 @@ public class BookmarkPanel extends PanelWidget<BookmarkGrid> {
 
     public RecipeId getRecipeId(int itemIndex) {
         BookmarkItem meta = this.grid.getCalculatedItem(itemIndex);
-        return meta.isIngredient ? null : meta.recipeId;
+        return meta.type == BookmarkItemType.INGREDIENT ? null : meta.recipeId;
     }
 
     public boolean existsRecipe(RecipeId recipeId, int groupId) {
@@ -922,7 +925,8 @@ public class BookmarkPanel extends PanelWidget<BookmarkGrid> {
 
         if (slot != null) {
 
-            if (slot.isIngredient() && slot.getRecipeId() != null && slot.getBookmarkItem().permutations.size() > 1) {
+            if (slot.getType() == BookmarkItemType.INGREDIENT && slot.getRecipeId() != null
+                    && slot.getBookmarkItem().permutations.size() > 1) {
                 RecipeId recipeId = slot.getRecipeId();
 
                 if (recipeId == null) {
@@ -1020,7 +1024,8 @@ public class BookmarkPanel extends PanelWidget<BookmarkGrid> {
                 if (NEIClientUtils.altKey()) {
                     multiplier = NEIClientConfig.showItemQuantityWidget() ? NEIClientConfig.getItemQuantity() : 0;
                     if (multiplier == 0) {
-                        multiplier = slot.getItemStack().getMaxStackSize();
+                        multiplier = StackInfo.itemStackToNBT(slot.getItemStack()).hasKey("gtFluidName") ? 144
+                                : slot.getItemStack().getMaxStackSize();
                     }
                 }
 
@@ -1182,7 +1187,15 @@ public class BookmarkPanel extends PanelWidget<BookmarkGrid> {
         }
 
         if (!items.isEmpty()) {
-            containerHandler.pullBookmarkItemsFromContainer(guiContainer, items);
+            final int helmStackIndex = FastTransferManager.dropHeldItem(guiContainer);
+
+            if (guiContainer.mc.thePlayer.inventory.getItemStack() == null) {
+                containerHandler.pullBookmarkItemsFromContainer(guiContainer, items);
+
+                if (helmStackIndex != -1) {
+                    FastTransferManager.clickSlot(guiContainer, helmStackIndex, 0, 0);
+                }
+            }
         }
 
         return true;
@@ -1253,7 +1266,7 @@ public class BookmarkPanel extends PanelWidget<BookmarkGrid> {
     @Deprecated
     public BookmarkRecipeId getBookmarkRecipeId(int itemIndex) {
         BookmarkItem item = this.grid.getCalculatedItem(itemIndex);
-        return item == null || item.isIngredient || item.recipeId == null ? null
+        return item == null || item.type == BookmarkItemType.INGREDIENT || item.recipeId == null ? null
                 : new BookmarkRecipeId(item.recipeId.getHandleName(), item.recipeId.getIngredients());
     }
 

src/main/java/codechicken/nei/DefaultBookmarkContainerHandler.java

@@ -1,7 +1,7 @@
 package codechicken.nei;
 
 import java.util.ArrayList;
-import java.util.LinkedList;
+import java.util.List;
 
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.item.ItemStack;
@@ -12,36 +12,19 @@ public class DefaultBookmarkContainerHandler implements IBookmarkContainerHandle
 
     @Override
     public void pullBookmarkItemsFromContainer(GuiContainer guiContainer, ArrayList<ItemStack> bookmarkItems) {
-        FastTransferManager manager = new FastTransferManager();
-        LinkedList<ItemStack> containerStacks = manager.saveContainer(guiContainer.inventorySlots);
+        final FastTransferManager manager = new FastTransferManager();
+        final List<ItemStack> containerStacks = getStorageStacks(guiContainer);
 
         for (ItemStack bookmarkItem : bookmarkItems) {
-
-            int bookmarkSizeBackup = bookmarkItem.stackSize;
-
-            for (int i = 0; i < containerStacks.size() - 4 * 9; i++) { // Last 36 slots are player inventory
-                ItemStack containerItem = containerStacks.get(i);
-
-                if (containerItem == null) {
-                    continue;
-                }
+            for (int i = 0; i < containerStacks.size() && bookmarkItem.stackSize > 0; i++) {
+                final ItemStack containerItem = containerStacks.get(i);
 
                 if (bookmarkItem.isItemEqual(containerItem)) {
-                    if (bookmarkItem.stackSize <= 0) {
-                        break;
-                    }
-
-                    int transferAmount = Math.min(bookmarkItem.stackSize, containerItem.stackSize);
-
+                    final int transferAmount = Math.min(bookmarkItem.stackSize, containerItem.stackSize);
                     manager.transferItems(guiContainer, i, transferAmount);
                     bookmarkItem.stackSize -= transferAmount;
-
-                    if (bookmarkItem.stackSize == 0) {
-                        break;
-                    }
                 }
             }
-            bookmarkItem.stackSize = bookmarkSizeBackup;
         }
     }
 }

src/main/java/codechicken/nei/FastTransferManager.java

@@ -9,7 +9,9 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedList;
 
+import net.minecraft.client.entity.EntityPlayerSP;
 import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
@@ -281,6 +283,27 @@ public class FastTransferManager {
         GuiContainerManager.getManager(window).handleSlotClick(slotIndex, button, modifier);
     }
 
+    public static int dropHeldItem(GuiContainer window) {
+        final EntityPlayerSP player = window.mc.thePlayer;
+        final ItemStack held = player.inventory.getItemStack();
+
+        if (held == null) return -1;
+
+        for (int i = 0; held != null && i < window.inventorySlots.inventorySlots.size(); i++) {
+            final Slot slot = window.inventorySlots.inventorySlots.get(i);
+
+            if (slot.inventory instanceof InventoryPlayer && !slot.getHasStack() && slot.isItemValid(held)) {
+                clickSlot(window, i, 0, 0);
+
+                if (player.inventory.getItemStack() == null) {
+                    return i;
+                }
+            }
+        }
+
+        return -1;
+    }
+
     private boolean fillZoneWithHeldItem(GuiContainer window, int zoneIndex) {
         for (int transferTo : slotZones.get(zoneIndex)) {
             ItemStack held = NEIClientUtils.getHeldItem();

src/main/java/codechicken/nei/NEIClientConfig.java

@@ -225,6 +225,10 @@ public class NEIClientConfig {
                 .getBooleanValue(true);
         API.addOption(new OptionToggleButton("inventory.bookmarks.bookmarkItemsWithRecipe", true));
 
+        tag.getTag("inventory.bookmarks.bookmarkRecipeWithCount").setComment("Bookmark recipe with count")
+                .getBooleanValue(false);
+        API.addOption(new OptionToggleButton("inventory.bookmarks.bookmarkRecipeWithCount", true));
+
         tag.getTag("inventory.guirecipe.jeiStyleTabs").setComment("Enable/disable JEI Style Tabs")
                 .getBooleanValue(true);
         API.addOption(new OptionToggleButtonBoubs("inventory.guirecipe.jeiStyleTabs", true));

src/main/java/codechicken/nei/NEIController.java

@@ -14,6 +14,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.client.ClientCommandHandler;
 
 import codechicken.core.CommonUtils;
+import codechicken.lib.gui.GuiDraw;
 import codechicken.nei.api.API;
 import codechicken.nei.api.GuiInfo;
 import codechicken.nei.api.IInfiniteItemHandler;
@@ -156,20 +157,32 @@ public class NEIController implements IContainerSlotClickHandler, IContainerInpu
 
         if (GuiInfo.hasCustomSlots(gui)) return false;
 
-        if (slotIndex >= 0 && NEIClientUtils.shiftKey()
-                && NEIClientUtils.getHeldItem() != null
-                && !slot.getHasStack()) {
-            ItemStack held = NEIClientUtils.getHeldItem();
-            manager.handleSlotClick(slot.slotNumber, button, 0);
-            if (slot.isItemValid(held) && !ItemInfo.fastTransferExemptions.contains(slot.getClass()))
-                fastTransferManager.performMassTransfer(gui, pickedUpFromSlot, slotIndex, held);
+        if (NEIClientUtils.shiftKey()) {
+            // fix small mouse movement while clicking causing slotIndex to be -999
+            if (slotIndex == -999) {
+                final Point mouse = GuiDraw.getMousePosition();
+                slot = gui.getSlotAtPosition(mouse.x, mouse.y);
 
-            return true;
-        }
+                if (slot != null) {
+                    slotIndex = slot.slotNumber;
+                }
+            }
 
-        if (slotIndex == -999 && NEIClientUtils.shiftKey() && button == 0) {
-            fastTransferManager.throwAll(gui, pickedUpFromSlot);
-            return true;
+            if (slotIndex >= 0 && NEIClientUtils.getHeldItem() != null && !slot.getHasStack()) {
+                final ItemStack held = NEIClientUtils.getHeldItem();
+                manager.handleSlotClick(slot.slotNumber, button, 0);
+
+                if (slot.isItemValid(held) && !ItemInfo.fastTransferExemptions.contains(slot.getClass())) {
+                    fastTransferManager.performMassTransfer(gui, pickedUpFromSlot, slotIndex, held);
+                }
+
+                return true;
+            }
+
+            if (slotIndex == -999 && button == 0) {
+                fastTransferManager.throwAll(gui, pickedUpFromSlot);
+                return true;
+            }
         }
 
         return false;

src/main/java/codechicken/nei/NEIServerUtils.java

@@ -51,15 +51,18 @@ import cpw.mods.fml.relauncher.ReflectionHelper;
 
 public class NEIServerUtils {
 
-    private static Class<?> gtMetaBaseItem;
+    private static class GTMetaBaseItemHolder {
 
-    static {
-        try {
-            final ClassLoader loader = NEIServerUtils.class.getClassLoader();
-            NEIServerUtils.gtMetaBaseItem = ReflectionHelper
-                    .getClass(loader, "gregtech.api.items.MetaBaseItem", "gregtech.api.items.GT_MetaBase_Item");
-        } catch (Exception ignored) {
-            /* Do nothing */
+        private static final Class<?> gtMetaBaseItem = loadMetaBaseItem();
+
+        private static Class<?> loadMetaBaseItem() {
+            try {
+                final ClassLoader loader = NEIServerUtils.class.getClassLoader();
+                return ReflectionHelper
+                        .getClass(loader, "gregtech.api.items.MetaBaseItem", "gregtech.api.items.GT_MetaBase_Item");
+            } catch (Exception ignored) {
+                return null;
+            }
         }
     }
 
@@ -231,7 +234,8 @@ public class NEIServerUtils {
      * @return
      */
     public static boolean isItemTool(ItemStack stack) {
-        return NEIServerUtils.gtMetaBaseItem != null && NEIServerUtils.gtMetaBaseItem.isInstance(stack.getItem());
+        return GTMetaBaseItemHolder.gtMetaBaseItem != null
+                && GTMetaBaseItemHolder.gtMetaBaseItem.isInstance(stack.getItem());
     }
 
     /**

src/main/java/codechicken/nei/PositionedStack.java

@@ -146,7 +146,7 @@ public class PositionedStack {
     }
 
     public boolean contains(int mx, int my) {
-        return this.relx <= mx && this.rely <= my && this.relx + 16 >= mx && this.rely + 16 >= my;
+        return mx >= this.relx - 1 && mx < this.relx + 17 && my >= this.rely - 1 && my < this.rely + 17;
     }
 
     public boolean contains(ItemStack ingredient) {

src/main/java/codechicken/nei/api/IBookmarkContainerHandler.java

@@ -15,7 +15,7 @@ public interface IBookmarkContainerHandler {
 
         for (int i = 0; i < slots.size() - 4 * 9; i++) {
             if (slots.get(i).getHasStack()) {
-                stacks.add(slots.get(i).getStack());
+                stacks.add(slots.get(i).getStack().copy());
             }
         }
 

src/main/java/codechicken/nei/api/IStackStringifyHandler.java

@@ -18,6 +18,10 @@ public interface IStackStringifyHandler {
         return null;
     }
 
+    default ItemStack normalizeRecipeQueryStack(ItemStack stack) {
+        return null;
+    }
+
     default void pauseItemDamageSound(boolean pause) {}
 
 }

src/main/java/codechicken/nei/api/ShortcutInputHandler.java

@@ -27,6 +27,7 @@ import codechicken.nei.SearchField;
 import codechicken.nei.bookmark.BookmarkGrid;
 import codechicken.nei.bookmark.BookmarkGroup;
 import codechicken.nei.bookmark.BookmarkItem;
+import codechicken.nei.bookmark.BookmarkItem.BookmarkItemType;
 import codechicken.nei.bookmark.BookmarksGridSlot;
 import codechicken.nei.recipe.AutoCraftingManager;
 import codechicken.nei.recipe.GuiCraftingRecipe;
@@ -233,7 +234,7 @@ public abstract class ShortcutInputHandler {
                 if (recipe != null) {
                     math = RecipeChainMath.of(recipe, 1);
                 }
-            } else if (slot.getRecipeId() != null && !slot.isIngredient()) {
+            } else if (slot.getRecipeId() != null && slot.getType() == BookmarkItemType.RESULT) {
 
                 if (slot.getGroup().crafting == null) {
                     final Recipe recipe = Recipe.of(slot.getRecipeId());
@@ -312,11 +313,14 @@ public abstract class ShortcutInputHandler {
     private static boolean saveRecipeInBookmark(ItemStack stackover, boolean saveIngredients, boolean saveStackSize) {
         final Point mousePos = GuiDraw.getMousePosition();
 
+        // If no slot was removed from the bookmark panel on click:
         if (!ItemPanels.bookmarkPanel.removeSlot(mousePos.x, mousePos.y, saveIngredients)) {
             final Recipe recipe = getFocusedRecipe(stackover, mousePos.x, mousePos.y, saveIngredients);
 
+            // --- Case 1: saving a recipe (with ingredients) ---
             if (recipe != null && saveIngredients) {
 
+                // If the recipe is not already bookmarked, add it
                 if (!ItemPanels.bookmarkPanel.removeRecipe(recipe.getRecipeId(), BookmarkGrid.DEFAULT_GROUP_ID)) {
                     final Recipe singleRecipe = Recipe.of(
                             Arrays.asList(recipe.getResult(stackover)),
@@ -324,18 +328,30 @@ public abstract class ShortcutInputHandler {
                             recipe.getIngredients());
                     singleRecipe.setCustomRecipeId(recipe.getRecipeId());
 
-                    ItemPanels.bookmarkPanel
-                            .addRecipe(singleRecipe, saveStackSize ? 1 : 0, BookmarkGrid.DEFAULT_GROUP_ID);
+                    ItemPanels.bookmarkPanel.addRecipe(
+                            singleRecipe,
+                            // Determine if stack size should be saved
+                            saveStackSize
+                                    || NEIClientConfig.getBooleanSetting("inventory.bookmarks.bookmarkRecipeWithCount")
+                                            ? 1
+                                            : 0,
+                            BookmarkGrid.DEFAULT_GROUP_ID);
                 }
 
+                // --- Case 2: saving an item only ---
             } else {
                 final RecipeId recipeId = recipe != null ? recipe.getRecipeId() : null;
+
+                // Determine if the item is associated with a recipe and should be saved with it
                 final boolean existsRecipe = recipeId != null
                         && ItemPanels.bookmarkPanel.existsRecipe(recipeId, BookmarkGrid.DEFAULT_GROUP_ID)
                         || NEIClientConfig.getBooleanSetting("inventory.bookmarks.bookmarkItemsWithRecipe");
 
+                // If the item was not removed from the bookmarks, add it
                 if (!ItemPanels.bookmarkPanel
                         .removeItem(stackover, existsRecipe ? recipeId : null, BookmarkGrid.DEFAULT_GROUP_ID)) {
+
+                    // Determine whether to preserve the item count
                     saveStackSize = saveStackSize || saveIngredients
                             || ItemPanels.bookmarkPanel.existsRecipe(recipeId, BookmarkGrid.DEFAULT_GROUP_ID);
 
@@ -469,7 +485,7 @@ public abstract class ShortcutInputHandler {
                 hotkeys.put(
                         NEIClientConfig.getKeyName("gui.bookmark", NEIClientUtils.SHIFT_HASH),
                         NEIClientUtils.translate("bookmark.group.remove_recipe"));
-            } else if (slot.getRecipeId() == null) {
+            } else if (slot.getRecipeId() == null || slot.getType() == BookmarkItemType.ITEM) {
                 hotkeys.put(
                         NEIClientConfig.getKeyName("gui.bookmark"),
                         NEIClientUtils.translate("bookmark.remove_item"));
@@ -484,7 +500,7 @@ public abstract class ShortcutInputHandler {
                                         NEIClientConfig.getKeyName("gui.bookmark", NEIClientUtils.SHIFT_HASH),
                                         NEIClientUtils.translate("bookmark.remove_recipe"));
 
-                                if (slot.isIngredient()) {
+                                if (slot.getType() == BookmarkItemType.INGREDIENT) {
                                     hotkeys.put(
                                             NEIClientConfig.getKeyName("gui.bookmark"),
                                             NEIClientUtils.translate("bookmark.remove_item"));
@@ -497,7 +513,8 @@ public abstract class ShortcutInputHandler {
 
                                     if (ItemPanels.bookmarkPanel.getGrid().createChainItems(groupId).values().stream()
                                             .noneMatch(
-                                                    m -> !m.isIngredient && !m.equals(item) && item.equalsRecipe(m))) {
+                                                    m -> m.type == BookmarkItemType.RESULT && !m.equals(item)
+                                                            && item.equalsRecipe(m))) {
                                         hotkeys.put(
                                                 NEIClientConfig.getKeyName("gui.bookmark"),
                                                 NEIClientUtils.translate("bookmark.remove_recipe"));
@@ -647,7 +664,7 @@ public abstract class ShortcutInputHandler {
             BookmarksGridSlot slot) {
 
         if (slot != null) {
-            return slot.isIngredient() ? null : slot.getRecipeId();
+            return slot.getType() == BookmarkItemType.INGREDIENT ? null : slot.getRecipeId();
         }
 
         ItemsGridSlot itemSlot = ItemPanels.itemPanel.getSlotMouseOver(mousex, mousey);

src/main/java/codechicken/nei/bookmark/BookmarkGrid.java

@@ -30,6 +30,7 @@ import codechicken.nei.ItemsGrid.MouseContext;
 import codechicken.nei.LayoutManager;
 import codechicken.nei.NEIClientConfig;
 import codechicken.nei.NEIClientUtils;
+import codechicken.nei.bookmark.BookmarkItem.BookmarkItemType;
 import codechicken.nei.recipe.Recipe;
 import codechicken.nei.recipe.Recipe.RecipeId;
 import codechicken.nei.recipe.StackInfo;
@@ -367,19 +368,26 @@ public class BookmarkGrid extends ItemsGrid<BookmarksGridSlot, BookmarkGrid.Book
             }
 
             for (BookmarkItem item : this.bookmarkItems) {
-                if (item.groupId == groupId && item.recipeId != null) {
+                if (item.recipeId == null && item.type != BookmarkItemType.ITEM) {
+                    item.type = BookmarkItemType.ITEM;
+                } else if (item.groupId == groupId && item.recipeId != null && item.type != BookmarkItemType.ITEM) {
                     recipeState.put(
                             item.recipeId,
-                            recipeState.getOrDefault(item.recipeId, 0) | (item.isIngredient ? 1 : 2));
+                            recipeState.getOrDefault(item.recipeId, 0)
+                                    | (item.type == BookmarkItemType.INGREDIENT ? 1 : 2));
                 }
             }
 
             for (BookmarkItem item : this.bookmarkItems) {
-                if (item.groupId == groupId && item.isIngredient
-                        && (item.recipeId == null || recipeState.getOrDefault(item.recipeId, 1) == 1)) {
+                if (item.groupId == groupId && item.type != BookmarkItemType.ITEM
+                        && recipeState.getOrDefault(item.recipeId, 0) != 3) {
+
+                    if (item.type == BookmarkItemType.INGREDIENT) {
+                        item.recipeId = null;
+                    }
+
                     recipeState.remove(item.recipeId);
-                    item.isIngredient = false;
-                    item.recipeId = null;
+                    item.type = BookmarkItemType.ITEM;
                 }
             }
 
@@ -405,7 +413,8 @@ public class BookmarkGrid extends ItemsGrid<BookmarksGridSlot, BookmarkGrid.Book
 
                 for (int index = itemIndex; index < size; index++) {
                     if (item.equalsRecipe(this.bookmarkItems.get(index))) {
-                        sortingRank.put(index, this.bookmarkItems.get(index).isIngredient ? 1 : -1);
+                        sortingRank
+                                .put(index, this.bookmarkItems.get(index).type == BookmarkItemType.INGREDIENT ? 1 : -1);
                         items.add(index);
                     }
                 }
@@ -632,6 +641,7 @@ public class BookmarkGrid extends ItemsGrid<BookmarksGridSlot, BookmarkGrid.Book
 
         if (group.crafting == null) {
             for (BookmarkItem item : chainItems) {
+                item.type = BookmarkItemType.ITEM;
                 item.recipeId = null;
             }
         }
@@ -820,7 +830,7 @@ public class BookmarkGrid extends ItemsGrid<BookmarksGridSlot, BookmarkGrid.Book
 
         for (int itemIndex = 0; itemIndex < this.bookmarkItems.size(); itemIndex++) {
             final BookmarkItem item = this.bookmarkItems.get(itemIndex);
-            if (item.groupId == groupId && item.isIngredient == ingredient
+            if (item.groupId == groupId && ingredient == (item.type == BookmarkItemType.INGREDIENT)
                     && (recipeId == item.recipeId || recipeId != null && recipeId.equals(item.recipeId))
                     && StackInfo.equalItemAndNBT(stackA, item.itemStack, true)) {
                 return itemIndex;
@@ -876,7 +886,12 @@ public class BookmarkGrid extends ItemsGrid<BookmarksGridSlot, BookmarkGrid.Book
         for (ItemStack stack : ItemStackAmount.of(results).values()) {
             long factor = StackInfo.getAmount(stack);
             this.addItem(
-                    BookmarkItem.of(groupId, StackInfo.withAmount(stack, factor * multiplier), factor, recipeId, false),
+                    BookmarkItem.of(
+                            groupId,
+                            StackInfo.withAmount(stack, factor * multiplier),
+                            factor,
+                            recipeId,
+                            BookmarkItemType.RESULT),
                     true);
         }
 
@@ -888,7 +903,7 @@ public class BookmarkGrid extends ItemsGrid<BookmarksGridSlot, BookmarkGrid.Book
                             StackInfo.withAmount(stack, factor * multiplier),
                             factor,
                             recipeId,
-                            true,
+                            BookmarkItemType.INGREDIENT,
                             BookmarkItem.generatePermutations(stack, recipe)),
                     true);
         }
@@ -901,12 +916,12 @@ public class BookmarkGrid extends ItemsGrid<BookmarksGridSlot, BookmarkGrid.Book
             return;
         }
 
-        if (!removeFullRecipe && item.recipeId != null && !item.isIngredient) {
+        if (!removeFullRecipe && item.recipeId != null && item.type == BookmarkItemType.RESULT) {
             removeFullRecipe = this.bookmarkItems.stream()
-                    .noneMatch(m -> !m.isIngredient && !m.equals(item) && item.equalsRecipe(m));
+                    .noneMatch(m -> m.type == BookmarkItemType.RESULT && !m.equals(item) && item.equalsRecipe(m));
         }
 
-        if (item.recipeId != null && removeFullRecipe) {
+        if (item.recipeId != null && item.type != BookmarkItemType.ITEM && removeFullRecipe) {
             removeRecipe(item.recipeId, item.groupId);
         } else if (itemIndex >= 0) {
             this.bookmarkItems.remove(itemIndex);
@@ -925,7 +940,8 @@ public class BookmarkGrid extends ItemsGrid<BookmarksGridSlot, BookmarkGrid.Book
     }
 
     public boolean existsRecipe(RecipeId recipeId, int groupId) {
-        return this.bookmarkItems.stream().anyMatch(item -> item.equalsRecipe(recipeId, groupId));
+        return this.bookmarkItems.stream()
+                .anyMatch(item -> item.type != BookmarkItemType.ITEM && item.equalsRecipe(recipeId, groupId));
     }
 
     public RecipeId getRecipeId(int itemIndex) {
@@ -1028,8 +1044,14 @@ public class BookmarkGrid extends ItemsGrid<BookmarksGridSlot, BookmarkGrid.Book
         }
 
         if (bookmarkItem != null && (group.crafting != null && group.viewMode == BookmarkViewMode.DEFAULT
-                || group.viewMode == BookmarkViewMode.TODO_LIST && !sortableItem.bookmarkItem.isIngredient)) {
-            while (sortIndex > 0 && bookmarkItem.equalsRecipe(getCalculatedItem(sortedIndexes.get(sortIndex - 1)))) {
+                || group.viewMode == BookmarkViewMode.TODO_LIST
+                        && sortableItem.bookmarkItem.type == BookmarkItemType.RESULT)) {
+            BookmarkItem prevBookmarkItem = sortIndex > 1 ? getCalculatedItem(sortedIndexes.get(sortIndex - 1)) : null;
+
+            while (sortIndex > 0 && prevBookmarkItem != null
+                    && prevBookmarkItem.type != BookmarkItemType.ITEM
+                    && bookmarkItem.equalsRecipe(prevBookmarkItem)) {
+                prevBookmarkItem = sortIndex > 1 ? getCalculatedItem(sortedIndexes.get(sortIndex - 1)) : null;
                 sortIndex--;
             }
 
@@ -1058,7 +1080,7 @@ public class BookmarkGrid extends ItemsGrid<BookmarksGridSlot, BookmarkGrid.Book
         if (nextSortIndex < sortedIndexes.size()) {
             final int nextItemIndex = sortedIndexes.get(nextSortIndex);
 
-            if (group.viewMode == BookmarkViewMode.TODO_LIST && !target.isIngredient
+            if (group.viewMode == BookmarkViewMode.TODO_LIST && target.type == BookmarkItemType.RESULT
                     && target.equalsRecipe(getCalculatedItem(nextItemIndex))) {
                 return -1;
             }
@@ -1149,7 +1171,7 @@ public class BookmarkGrid extends ItemsGrid<BookmarksGridSlot, BookmarkGrid.Book
 
         if (group.collapsed) {
             shiftGroupAmount(targetItem.groupId, shift);
-        } else if (targetItem.recipeId != null) {
+        } else if (targetItem.recipeId != null && targetItem.type != BookmarkItemType.ITEM) {
             final RecipeId recipeId = this.gridGenerator.itemToRecipe
                     .getOrDefault(targetItemIndex, targetItem.recipeId);
             final boolean recipeInMiddle = group.crafting != null && group.crafting.recipeInMiddle.contains(recipeId);

src/main/java/codechicken/nei/bookmark/BookmarkGridGenerator.java

@@ -11,6 +11,7 @@ import java.util.stream.Collectors;
 
 import codechicken.nei.BookmarkPanel.BookmarkViewMode;
 import codechicken.nei.ItemSorter;
+import codechicken.nei.bookmark.BookmarkItem.BookmarkItemType;
 import codechicken.nei.bookmark.RecipeChainDetails.BookmarkChainItem;
 import codechicken.nei.bookmark.RecipeChainDetails.CalculatedType;
 import codechicken.nei.recipe.Recipe.RecipeId;
@@ -165,7 +166,7 @@ public class BookmarkGridGenerator {
                 break;
             }
 
-            if (!bookmarkItem.isIngredient
+            if (bookmarkItem.type != BookmarkItemType.INGREDIENT
                     && (group.crafting == null || group.crafting.calculatedItems.containsKey(itemIndex))) {
                 results.add(itemIndex);
             }
@@ -193,7 +194,7 @@ public class BookmarkGridGenerator {
                     bookmarkItem.itemStack,
                     1,
                     bookmarkItem.recipeId,
-                    isIngredient,
+                    isIngredient ? BookmarkItemType.INGREDIENT : BookmarkItemType.RESULT,
                     Collections.emptyMap());
 
             if ((absoluteSlotIndex = nextSlotIndex(
@@ -238,17 +239,21 @@ public class BookmarkGridGenerator {
                 return index;
             } else if (isFirstColumn && (meta.recipeId == null || previousMeta == null
                     || previousMeta.groupId != meta.groupId
+                    || meta.type == BookmarkItemType.ITEM
                     || !meta.recipeId.equals(previousMeta.recipeId)
                     || index + 1 < maxIndex && this.grid.isInvalidSlot((index + 1) % maxIndex))) {
                         // In first column must be an item without recipe, a recipe result, or an ingredient
                         // if the second column is occupied
                         return index;
                     } else
-                if (!isFirstColumn && meta.recipeId != null && meta.recipeId.equals(previousMeta.recipeId)) {
-                    return index;
-                } else {
-                    index++;
-                }
+                if (!isFirstColumn && meta.type != BookmarkItemType.ITEM
+                        && previousMeta.type != BookmarkItemType.ITEM
+                        && meta.recipeId != null
+                        && meta.recipeId.equals(previousMeta.recipeId)) {
+                            return index;
+                        } else {
+                            index++;
+                        }
 
         }
 

src/main/java/codechicken/nei/bookmark/BookmarkItem.java

@@ -17,6 +17,21 @@ import codechicken.nei.recipe.StackInfo;
 
 public class BookmarkItem {
 
+    public enum BookmarkItemType {
+
+        INGREDIENT,
+        RESULT,
+        ITEM;
+
+        public static BookmarkItemType fromInt(int type) {
+            return type == 0 ? ITEM : type == 1 ? RESULT : INGREDIENT;
+        }
+
+        public int toInt() {
+            return this == ITEM ? 0 : this == RESULT ? 1 : 2;
+        }
+    }
+
     private static Map<ItemStack, String> fuzzyPermutations = new HashMap<>();
 
     public int groupId;
@@ -28,10 +43,10 @@ public class BookmarkItem {
 
     public long factor;
     public RecipeId recipeId;
-    public boolean isIngredient = false;
+    public BookmarkItemType type = BookmarkItemType.ITEM;
 
     protected BookmarkItem(int groupId, long amount, int fluidCellAmount, ItemStack itemStack,
-            Map<String, ItemStack> permutations, long factor, RecipeId recipeId, boolean isIngredient) {
+            Map<String, ItemStack> permutations, long factor, RecipeId recipeId, BookmarkItemType type) {
         this.groupId = groupId;
 
         this.amount = amount;
@@ -41,10 +56,10 @@ public class BookmarkItem {
 
         this.factor = factor;
         this.recipeId = recipeId;
-        this.isIngredient = isIngredient;
+        this.type = type == null ? BookmarkItemType.ITEM : type;
     }
 
-    public static BookmarkItem of(int groupId, ItemStack stack, long factor, RecipeId recipeId, boolean isIngredient,
+    public static BookmarkItem of(int groupId, ItemStack stack, long factor, RecipeId recipeId, BookmarkItemType type,
             Map<String, ItemStack> permutations) {
         final FluidStack fluidStack = StackInfo.getFluid(stack);
         int fluidCellAmount = 1;
@@ -65,18 +80,29 @@ public class BookmarkItem {
                 permutations,
                 factor * fluidCellAmount,
                 recipeId,
-                isIngredient);
+                type);
     }
 
-    public static BookmarkItem of(int groupId, ItemStack stack, long factor, RecipeId recipeId, boolean isIngredient) {
-        return of(groupId, stack, factor, recipeId, isIngredient, generatePermutations(stack, recipeId, isIngredient));
+    public static BookmarkItem of(int groupId, ItemStack stack, long factor, RecipeId recipeId, BookmarkItemType type) {
+        return of(
+                groupId,
+                stack,
+                factor,
+                recipeId,
+                type,
+                generatePermutations(stack, recipeId, type == BookmarkItemType.INGREDIENT));
     }
 
     public static BookmarkItem of(int groupId, ItemStack stack) {
         final NBTTagCompound nbTag = StackInfo.itemStackToNBT(stack);
         final long factor = nbTag.hasKey("gtFluidName") ? Math.min(144, nbTag.getInteger("Count")) : 1;
-        return BookmarkItem
-                .of(groupId, stack, factor, null, false, Collections.singletonMap(getItemGUID(stack), stack));
+        return BookmarkItem.of(
+                groupId,
+                stack,
+                factor,
+                null,
+                BookmarkItemType.ITEM,
+                Collections.singletonMap(getItemGUID(stack), stack));
     }
 
     public BookmarkItem copyWithAmount(long amount) {
@@ -88,7 +114,7 @@ public class BookmarkItem {
                 this.permutations,
                 this.factor,
                 this.recipeId,
-                this.isIngredient);
+                this.type);
     }
 
     public BookmarkItem copy() {
@@ -186,14 +212,14 @@ public class BookmarkItem {
 
     @Override
     public int hashCode() {
-        return Objects.hash(this.groupId, this.fluidCellAmount, this.isIngredient, this.recipeId);
+        return Objects.hash(this.groupId, this.fluidCellAmount, this.type.toInt(), this.recipeId);
     }
 
     @Override
     public boolean equals(Object object) {
 
         if (object instanceof BookmarkItem item) {
-            return this.groupId == item.groupId && this.isIngredient == item.isIngredient
+            return this.groupId == item.groupId && this.type == item.type
                     && this.fluidCellAmount == item.fluidCellAmount
                     && StackInfo.equalItemAndNBT(this.itemStack, item.itemStack, true)
                     && (this.recipeId == item.recipeId || this.recipeId != null && this.recipeId.equals(item.recipeId));

src/main/java/codechicken/nei/bookmark/BookmarkStorage.java

@@ -25,6 +25,7 @@ import com.google.gson.JsonSyntaxException;
 
 import codechicken.nei.BookmarkPanel.BookmarkViewMode;
 import codechicken.nei.NEIClientConfig;
+import codechicken.nei.bookmark.BookmarkItem.BookmarkItemType;
 import codechicken.nei.recipe.Recipe.RecipeId;
 import codechicken.nei.recipe.StackInfo;
 import codechicken.nei.util.NBTJson;
@@ -239,7 +240,15 @@ public class BookmarkStorage {
             int groupId = jsonObject.has("groupId") ? jsonObject.get("groupId").getAsInt()
                     : BookmarkGrid.DEFAULT_GROUP_ID;
             int factor = jsonObject.has("factor") ? Math.abs(jsonObject.get("factor").getAsInt()) : (isFluid ? 144 : 1);
-            boolean isIngredient = jsonObject.has("ingredient") && jsonObject.get("ingredient").getAsBoolean();
+            BookmarkItemType type = jsonObject.has("type") ? BookmarkItemType.fromInt(jsonObject.get("type").getAsInt())
+                    : null;
+
+            if (type == null) {
+                // old format
+                type = jsonObject.has("ingredient") && jsonObject.get("ingredient").getAsBoolean()
+                        ? BookmarkItemType.INGREDIENT
+                        : BookmarkItemType.RESULT;
+            }
 
             if (jsonObject.get("recipeId") instanceof JsonObject recipeJson) {
                 recipeId = RecipeId.of(recipeJson);
@@ -249,7 +258,7 @@ public class BookmarkStorage {
                 groupId = BookmarkGrid.DEFAULT_GROUP_ID;
             }
 
-            grid.addItem(BookmarkItem.of(groupId, itemStack, factor, recipeId, isIngredient), false);
+            grid.addItem(BookmarkItem.of(groupId, itemStack, factor, recipeId, type), false);
         }
 
         return itemStack != null;
@@ -266,7 +275,8 @@ public class BookmarkStorage {
             final Map<String, RecipeId> recipes = new HashMap<>();
 
             for (BookmarkItem item : grid.bookmarkItems) {
-                if (item.recipeId != null && !item.isIngredient && item.recipeId.getResult() == null) {
+                if (item.recipeId != null && item.type != BookmarkItemType.INGREDIENT
+                        && item.recipeId.getResult() == null) {
                     final JsonObject recipeJson = item.recipeId.toJsonObject();
                     final String recipeGUID = item.groupId + ":" + NBTJson.toJson(recipeJson);
 
@@ -284,8 +294,10 @@ public class BookmarkStorage {
 
                     if (recipes.containsKey(recipeGUID)) {
                         item.recipeId = recipes.get(recipeGUID).copy();
-                        item.permutations = BookmarkItem
-                                .generatePermutations(item.itemStack, item.recipeId, item.isIngredient);
+                        item.permutations = BookmarkItem.generatePermutations(
+                                item.itemStack,
+                                item.recipeId,
+                                item.type == BookmarkItemType.INGREDIENT);
                     } else {
                         item.recipeId = null;
                     }
@@ -338,7 +350,7 @@ public class BookmarkStorage {
 
                     row.add("item", NBTJson.toJsonObject(StackInfo.itemStackToNBT(item.getItemStack())));
                     row.add("factor", new JsonPrimitive(item.getFactor()));
-                    row.add("ingredient", new JsonPrimitive(item.isIngredient));
+                    row.add("type", new JsonPrimitive(item.type.toInt()));
 
                     if (item.groupId != BookmarkGrid.DEFAULT_GROUP_ID) {
                         row.add("groupId", new JsonPrimitive(item.groupId));

src/main/java/codechicken/nei/bookmark/BookmarksGridSlot.java

@@ -15,6 +15,7 @@ import codechicken.nei.NEIClientConfig;
 import codechicken.nei.NEIClientUtils;
 import codechicken.nei.NEIClientUtils.Alignment;
 import codechicken.nei.bookmark.BookmarkGrid.BookmarkMouseContext;
+import codechicken.nei.bookmark.BookmarkItem.BookmarkItemType;
 import codechicken.nei.bookmark.RecipeChainDetails.CalculatedType;
 import codechicken.nei.guihook.GuiContainerManager;
 import codechicken.nei.recipe.GuiRecipeTab;
@@ -89,7 +90,7 @@ public class BookmarksGridSlot extends ItemsGridSlot {
             this.realType = this.group.crafting.calculatedItems.get(this.itemIndex).calculatedType
                     == CalculatedType.INGREDIENT ? CalculatedType.INGREDIENT : CalculatedType.RESULT;
         } else {
-            this.realType = this.bookmarkItem.isIngredient
+            this.realType = this.bookmarkItem.type == BookmarkItemType.INGREDIENT
                     || this.group.crafting != null && this.bookmarkItem.recipeId == null ? CalculatedType.INGREDIENT
                             : CalculatedType.RESULT;
         }
@@ -97,9 +98,10 @@ public class BookmarksGridSlot extends ItemsGridSlot {
         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.isIngredient
+        this.isFirstOutput = this.itemIndex >= 0 && this.bookmarkItem.type == BookmarkItemType.RESULT
                 && ((this.slotIndex % grid.getColumns()) == 0 || group.viewMode == BookmarkViewMode.DEFAULT)
-                && (prevItem == null || prevItem.isIngredient || !this.bookmarkItem.equalsRecipe(prevItem));
+                && (prevItem == null || prevItem.type == BookmarkItemType.INGREDIENT
+                        || !this.bookmarkItem.equalsRecipe(prevItem));
         this.rowIndex = this.slotIndex / grid.getColumns();
     }
 
@@ -116,8 +118,8 @@ public class BookmarksGridSlot extends ItemsGridSlot {
         return this.bookmarkItem.recipeId;
     }
 
-    public boolean isIngredient() {
-        return this.bookmarkItem.isIngredient;
+    public BookmarkItemType getType() {
+        return this.bookmarkItem.type;
     }
 
     public BookmarkGroup getGroup() {
@@ -151,11 +153,17 @@ public class BookmarksGridSlot extends ItemsGridSlot {
             return false;
         }
 
-        if (this.group.crafting != null) {
+        if (this.slotIndex == mouseContext.slotIndex || this.group.crafting != null) {
             return true;
         }
 
-        return this.bookmarkItem.equalsRecipe(mouseContext.recipeId, mouseContext.groupId);
+        if (this.bookmarkItem.type == BookmarkItemType.ITEM && this.group.viewMode == BookmarkViewMode.TODO_LIST
+                && mouseContext.rowIndex == this.rowIndex) {
+            return true;
+        }
+
+        return this.bookmarkItem.type != BookmarkItemType.ITEM
+                && this.bookmarkItem.equalsRecipe(mouseContext.recipeId, mouseContext.groupId);
     }
 
     protected boolean showRealItem(BookmarkMouseContext mouseContext) {
@@ -173,7 +181,8 @@ public class BookmarksGridSlot extends ItemsGridSlot {
             return true;
         }
 
-        if (this.bookmarkItem.equalsRecipe(mouseContext.recipeId, mouseContext.groupId)) {
+        if (this.bookmarkItem.type != BookmarkItemType.ITEM
+                && this.bookmarkItem.equalsRecipe(mouseContext.recipeId, mouseContext.groupId)) {
             return true;
         }
 
@@ -212,7 +221,7 @@ public class BookmarksGridSlot extends ItemsGridSlot {
 
         }
 
-        if (!this.bookmarkItem.isIngredient && this.bookmarkItem.recipeId != null
+        if (this.bookmarkItem.type != BookmarkItemType.INGREDIENT && this.bookmarkItem.recipeId != null
                 && calculatedType == null
                 && showMarker
                 && (mouseContext == null || mouseContext.slotIndex != this.slotIndex)) {
@@ -259,7 +268,7 @@ public class BookmarksGridSlot extends ItemsGridSlot {
 
         drawStackSize(rect, shownItemType);
 
-        if (this.bookmarkItem.isIngredient || this.bookmarkItem.recipeId == null) {
+        if (this.bookmarkItem.type == BookmarkItemType.INGREDIENT || this.bookmarkItem.recipeId == null) {
             return;
         }
 
@@ -283,18 +292,17 @@ public class BookmarksGridSlot extends ItemsGridSlot {
                         NEIClientConfig.getSetting("inventory.bookmarks.recipeMarkerColor").getHexValue(),
                         Alignment.TopLeft);
             }
+        }
 
-            if (NEIClientConfig.getBooleanSetting("inventory.bookmarks.showRecipeHandlerIcon")
-                    && getHandlerInfo() != null) {
-                drawHandlerIcon(rect);
-            } else if (NEIClientConfig.showRecipeMarkerMode() == 1) {
-                drawMarker(
-                        rect,
-                        "R",
-                        NEIClientConfig.getSetting("inventory.bookmarks.recipeMarkerColor").getHexValue(),
-                        Alignment.TopRight);
-            }
+        if (this.isFirstOutput || NEIClientConfig.showRecipeMarkerMode() == 1) {
+            drawRecipeMarker(rect);
+        }
+    }
 
+    protected void drawRecipeMarker(Rectangle4i rect) {
+        if (NEIClientConfig.getBooleanSetting("inventory.bookmarks.showRecipeHandlerIcon")
+                && getHandlerInfo() != null) {
+            drawHandlerIcon(rect);
         } else if (NEIClientConfig.showRecipeMarkerMode() == 1) {
             drawMarker(
                     rect,
@@ -302,7 +310,6 @@ public class BookmarksGridSlot extends ItemsGridSlot {
                     NEIClientConfig.getSetting("inventory.bookmarks.recipeMarkerColor").getHexValue(),
                     Alignment.TopRight);
         }
-
     }
 
     protected void drawHandlerIcon(Rectangle4i rect) {

src/main/java/codechicken/nei/bookmark/GroupingItem.java

@@ -7,6 +7,7 @@ import java.util.Map;
 import java.util.Set;
 
 import codechicken.nei.BookmarkPanel.BookmarkViewMode;
+import codechicken.nei.bookmark.BookmarkItem.BookmarkItemType;
 import codechicken.nei.recipe.Recipe.RecipeId;
 
 public class GroupingItem {
@@ -124,7 +125,7 @@ public class GroupingItem {
 
         final BookmarkItem item = this.grid.getCalculatedItem(itemIndex);
 
-        if (item.recipeId != null) {
+        if (item.recipeId != null && item.type != BookmarkItemType.ITEM) {
             final List<Integer> sortedItems = this.grid.getSortedItems();
             final BookmarkGroup group = this.grid.getGroup(item.groupId);
             final boolean isCollapsedGroup = group.collapsed
@@ -139,7 +140,8 @@ public class GroupingItem {
             for (Integer rItemIndex : sortedItems) {
                 final BookmarkItem rItem = this.grid.getCalculatedItem(rItemIndex);
 
-                if (rItem.groupId == item.groupId && (isCollapsedGroup || recipeRelations.contains(rItem.recipeId))) {
+                if (rItem.groupId == item.groupId && (isCollapsedGroup
+                        || rItem.type != BookmarkItemType.ITEM && recipeRelations.contains(rItem.recipeId))) {
                     return this.grid.getAbsoluteSlotIndex(rItemIndex) / this.grid.getColumns();
                 }
             }
@@ -160,7 +162,7 @@ public class GroupingItem {
 
         final BookmarkItem item = this.grid.getCalculatedItem(itemIndex);
 
-        if (item.recipeId != null) {
+        if (item.recipeId != null && item.type != BookmarkItemType.ITEM) {
             final List<Integer> sortedItems = this.grid.getSortedItems();
             final BookmarkGroup group = this.grid.getGroup(item.groupId);
             final boolean isCollapsedGroup = group.collapsed
@@ -176,7 +178,8 @@ public class GroupingItem {
                 final int rItemIndex = sortedItems.get(index);
                 final BookmarkItem rItem = this.grid.getCalculatedItem(rItemIndex);
 
-                if (rItem.groupId == item.groupId && (isCollapsedGroup || recipeRelations.contains(rItem.recipeId))) {
+                if (rItem.groupId == item.groupId && (isCollapsedGroup
+                        || rItem.type != BookmarkItemType.ITEM && recipeRelations.contains(rItem.recipeId))) {
                     return this.grid.getAbsoluteSlotIndex(rItemIndex) / this.grid.getColumns();
                 }
             }

src/main/java/codechicken/nei/bookmark/RecipeChainDetails.java

@@ -12,6 +12,7 @@ import java.util.stream.Collectors;
 
 import net.minecraft.item.ItemStack;
 
+import codechicken.nei.bookmark.BookmarkItem.BookmarkItemType;
 import codechicken.nei.recipe.Recipe.RecipeId;
 import codechicken.nei.recipe.StackInfo;
 import codechicken.nei.recipe.chain.RecipeChainMath;
@@ -69,7 +70,7 @@ public class RecipeChainDetails {
                     item,
                     item.amount,
                     item.amount,
-                    item.isIngredient ? CalculatedType.INGREDIENT : CalculatedType.RESULT);
+                    item.type == BookmarkItemType.INGREDIENT ? CalculatedType.INGREDIENT : CalculatedType.RESULT);
         }
 
         public ItemStack getItemStack(long amount) {
@@ -217,11 +218,12 @@ public class RecipeChainDetails {
         for (BookmarkChainItem value : items) {
             int itemIndex = sortingChainItems.get(value.getItem());
 
-            if (value.getItem().isIngredient || !recipeId.equals(value.getItem().recipeId)) {
+            if (value.getItem().type == BookmarkItemType.INGREDIENT || !recipeId.equals(value.getItem().recipeId)) {
                 itemIndex *= -1;
             }
 
-            if (!value.getItem().isIngredient && !math.outputRecipes.containsKey(value.getItem().recipeId)) {
+            if (value.getItem().type == BookmarkItemType.RESULT
+                    && !math.outputRecipes.containsKey(value.getItem().recipeId)) {
                 value.calculatedType = CalculatedType.REMAINDER;
             }
 
@@ -251,7 +253,7 @@ public class RecipeChainDetails {
         for (BookmarkChainItem value : items) {
             int itemIndex = sortingChainItems.get(value.getItem());
 
-            if (value.getItem().isIngredient || !recipeId.equals(value.getItem().recipeId)) {
+            if (value.getItem().type == BookmarkItemType.INGREDIENT || !recipeId.equals(value.getItem().recipeId)) {
                 itemIndex *= -1;
             }
 

src/main/java/codechicken/nei/bookmark/SortableItem.java

@@ -9,6 +9,7 @@ import java.util.Map;
 import codechicken.lib.vec.Rectangle4i;
 import codechicken.nei.BookmarkPanel.BookmarkViewMode;
 import codechicken.nei.ItemsGrid;
+import codechicken.nei.bookmark.BookmarkItem.BookmarkItemType;
 import codechicken.nei.bookmark.RecipeChainDetails.BookmarkChainItem;
 import codechicken.nei.guihook.GuiContainerManager;
 import codechicken.nei.recipe.Recipe.RecipeId;
@@ -30,10 +31,10 @@ public class SortableItem {
 
         this.grid = grid;
         this.bookmarkItem = bookmarkItem.copy();
-        this.moveRecipe = bookmarkItem.recipeId != null && !bookmarkItem.isIngredient
+        this.moveRecipe = bookmarkItem.recipeId != null && bookmarkItem.type == BookmarkItemType.RESULT
                 && (group.viewMode == BookmarkViewMode.TODO_LIST || group.crafting != null);
         this.crossGroup = !group.collapsed && group.viewMode == BookmarkViewMode.TODO_LIST
-                && !this.bookmarkItem.isIngredient;
+                && bookmarkItem.type != BookmarkItemType.INGREDIENT;
         this.isCollapsedRecipe = group.crafting != null && group.crafting.itemToRecipe.values().stream()
                 .anyMatch(recipeId -> this.bookmarkItem.equalsRecipe(recipeId, this.bookmarkItem.groupId));
 

src/main/java/codechicken/nei/config/IMCHandler.java

@@ -86,13 +86,14 @@ public class IMCHandler {
         info.setYShift(yShift);
 
         try {
-            final int imageHeight = tag.hasKey("handlerHeight") ? tag.getInteger("handlerHeight")
+            final int handlerHeight = tag.hasKey("handlerHeight") ? tag.getInteger("handlerHeight")
                     : HandlerInfo.DEFAULT_HEIGHT;
-            final int imageWidth = tag.hasKey("handlerWidth") ? tag.getInteger("handlerWidth")
+            final int handlerWidth = tag.hasKey("handlerWidth") ? tag.getInteger("handlerWidth")
                     : HandlerInfo.DEFAULT_WIDTH;
-            final int maxRecipesPerPage = tag.hasKey("maxRecipesPerPage") ? tag.getInteger("maxRecipesPerPage")
-                    : HandlerInfo.DEFAULT_MAX_PER_PAGE;
-            info.setHandlerDimensions(imageHeight, imageWidth, maxRecipesPerPage);
+            final boolean multipleWidgetsAllowed = tag.hasKey("multipleWidgetsAllowed")
+                    ? tag.getBoolean("multipleWidgetsAllowed")
+                    : tag.hasKey("maxRecipesPerPage") && tag.getInteger("maxRecipesPerPage") > 1;
+            info.setHandlerDimensions(handlerWidth, handlerHeight, multipleWidgetsAllowed);
         } catch (NumberFormatException ignored) {
             NEIClientConfig.logger.info("Error setting handler dimensions for {}", handler);
         }

src/main/java/codechicken/nei/recipe/DebugHandlerWidget.java

@@ -125,7 +125,7 @@ public class DebugHandlerWidget extends Widget implements IContainerInputHandler
     private IntegerField yShift;
     private IntegerField handlerHeight;
     private IntegerField handlerWidth;
-    private IntegerField maxRecipesPerPage;
+    private Button multipleWidgetsAllowed;
     private Button useCustomScroll;
 
     private Point dragPoint = null;
@@ -166,15 +166,27 @@ public class DebugHandlerWidget extends Widget implements IContainerInputHandler
             }
         };
 
-        this.maxRecipesPerPage = new IntegerField("maxRecipesPerPage", HandlerInfo.DEFAULT_MAX_PER_PAGE) {
+        this.multipleWidgetsAllowed = new Button() {
+
+            {
+                this.h = LINE_HEIGHT;
+                this.z = 2;
+            }
+
+            public String getRenderLabel() {
+                return handlerInfo.isMultipleWidgetsAllowed() ? "On" : "Off";
+            }
 
             @Override
-            public void onTextChange(String oldText) {
-                if (getInteger() != handlerInfo.getMaxRecipesPerPage()) {
-                    handlerInfo.setHandlerDimensions(handlerInfo.getHeight(), handlerInfo.getWidth(), getInteger());
-                    updatePatch(4, getInteger(), this.defaultValue);
-                }
+            public boolean onButtonPress(boolean rightclick) {
+                handlerInfo.setHandlerDimensions(
+                        handlerInfo.getWidth(),
+                        handlerInfo.getHeight(),
+                        !handlerInfo.isMultipleWidgetsAllowed());
+                updatePatch(4, handlerInfo.isMultipleWidgetsAllowed() ? 1 : 0, 1);
+                return true;
             }
+
         };
 
         this.handlerHeight = new IntegerField("handlerHeight", HandlerInfo.DEFAULT_HEIGHT) {
@@ -189,9 +201,9 @@ public class DebugHandlerWidget extends Widget implements IContainerInputHandler
             public void onTextChange(String oldText) {
                 if (getInteger() != handlerInfo.getHeight()) {
                     handlerInfo.setHandlerDimensions(
-                            getInteger(),
                             handlerInfo.getWidth(),
-                            handlerInfo.getMaxRecipesPerPage());
+                            getInteger(),
+                            handlerInfo.isMultipleWidgetsAllowed());
                     updatePatch(2, getInteger(), this.defaultValue);
                 }
             }
@@ -203,9 +215,9 @@ public class DebugHandlerWidget extends Widget implements IContainerInputHandler
             public void onTextChange(String oldText) {
                 if (getInteger() != handlerInfo.getWidth()) {
                     handlerInfo.setHandlerDimensions(
-                            handlerInfo.getHeight(),
                             getInteger(),
-                            handlerInfo.getMaxRecipesPerPage());
+                            handlerInfo.getHeight(),
+                            handlerInfo.isMultipleWidgetsAllowed());
                     updatePatch(3, getInteger(), this.defaultValue);
                 }
             }
@@ -327,7 +339,7 @@ public class DebugHandlerWidget extends Widget implements IContainerInputHandler
             drawControl("yShift", this.yShift, topShift, spaceWidth);
             topShift += LINE_HEIGHT;
 
-            drawControl("Per Page", this.maxRecipesPerPage, topShift, spaceWidth);
+            drawControl("Multi Widgets", this.multipleWidgetsAllowed, topShift, spaceWidth);
             topShift += LINE_HEIGHT;
 
             drawControl("Height", this.handlerHeight, topShift, spaceWidth);
@@ -364,7 +376,7 @@ public class DebugHandlerWidget extends Widget implements IContainerInputHandler
             LayoutManager.addWidget(this.yShift);
             LayoutManager.addWidget(this.handlerHeight);
             LayoutManager.addWidget(this.handlerWidth);
-            LayoutManager.addWidget(this.maxRecipesPerPage);
+            LayoutManager.addWidget(this.multipleWidgetsAllowed);
             LayoutManager.addWidget(this.useCustomScroll);
         }
     }
@@ -383,7 +395,6 @@ public class DebugHandlerWidget extends Widget implements IContainerInputHandler
                 this.yShift.setText(String.valueOf(this.handlerInfo.getYShift()));
                 this.handlerHeight.setText(String.valueOf(this.handlerInfo.getHeight()));
                 this.handlerWidth.setText(String.valueOf(this.handlerInfo.getWidth()));
-                this.maxRecipesPerPage.setText(String.valueOf(this.handlerInfo.getMaxRecipesPerPage()));
             }
 
         } else {
@@ -467,8 +478,7 @@ public class DebugHandlerWidget extends Widget implements IContainerInputHandler
         } else if (this.handler != null) {
             return this.order.focused() || this.yShift.focused()
                     || this.handlerHeight.focused()
-                    || this.handlerWidth.focused()
-                    || this.maxRecipesPerPage.focused();
+                    || this.handlerWidth.focused();
         }
 
         return false;
@@ -528,6 +538,10 @@ public class DebugHandlerWidget extends Widget implements IContainerInputHandler
                     widget.h,
                     COLORS[widget.handlerRef.recipeIndex % COLORS.length]);
 
+            // center cross
+            GuiDraw.drawRect(widget.x + widget.w / 2 - 1, widget.y, 1, widget.h, 0x88ffffff);
+            GuiDraw.drawRect(widget.x, widget.y + widget.h / 2 - 1, widget.w, 1, 0x88ffffff);
+
             // blue-line-top (grid-top)
             GuiDraw.drawRect(widget.x + 14, widget.y + 5, widget.w - 38, 1, 0xff0000aa);
 
@@ -592,12 +606,14 @@ public class DebugHandlerWidget extends Widget implements IContainerInputHandler
                     final int yShift = intOrDefault(parts[1], info.getYShift());
                     final int height = intOrDefault(parts[2], info.getHeight());
                     final int width = intOrDefault(parts[3], info.getWidth());
-                    final int maxRecipesPerPage = intOrDefault(parts[4], info.getMaxRecipesPerPage());
+                    final boolean isMultipleWidgetsAllowed = intOrDefault(
+                            parts[4],
+                            info.isMultipleWidgetsAllowed() ? 1 : 0) == 1;
                     final int order = intOrDefault(parts[5], NEIClientConfig.handlerOrdering.getOrDefault(handler, 0));
                     final boolean useCustomScroll = intOrDefault(parts[6], info.getUseCustomScroll() ? 1 : 0) == 1;
 
                     info.setYShift(yShift);
-                    info.setHandlerDimensions(height, width, maxRecipesPerPage);
+                    info.setHandlerDimensions(width, height, isMultipleWidgetsAllowed);
                     info.setUseCustomScroll(useCustomScroll);
                     NEIClientConfig.handlerOrdering.put(handler, order);
                 }

src/main/java/codechicken/nei/recipe/DefaultOverlayHandler.java

@@ -6,10 +6,10 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
-import net.minecraft.client.entity.EntityClientPlayerMP;
 import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Slot;
 import net.minecraft.inventory.SlotCrafting;
@@ -50,17 +50,17 @@ public class DefaultOverlayHandler implements IOverlayHandler {
         public Slot[] slots;
     }
 
-    public DefaultOverlayHandler(int x, int y) {
-        offsetx = x;
-        offsety = y;
-    }
+    public int offsetx;
+    public int offsety;
 
     public DefaultOverlayHandler() {
         this(5, 11);
     }
 
-    public int offsetx;
-    public int offsety;
+    public DefaultOverlayHandler(int x, int y) {
+        this.offsetx = x;
+        this.offsety = y;
+    }
 
     @Override
     public void overlayRecipe(GuiContainer gui, IRecipeHandler handler, int recipeIndex, boolean maxTransfer) {
@@ -72,7 +72,7 @@ public class DefaultOverlayHandler implements IOverlayHandler {
         final List<PositionedStack> ingredients = handler.getIngredientStacks(recipeIndex);
         final List<DistributedIngred> ingredStacks = getPermutationIngredients(ingredients);
 
-        if (!clearIngredients(gui)) return 0;
+        if (!clearIngredients(gui, handler)) return 0;
 
         findInventoryQuantities(gui, ingredStacks);
 
@@ -99,12 +99,17 @@ public class DefaultOverlayHandler implements IOverlayHandler {
     }
 
     @Override
-    public boolean craft(GuiContainer firstGui, IRecipeHandler recipe, int recipeIndex, int multiplier) {
-        final EntityClientPlayerMP thePlayer = NEIClientUtils.mc().thePlayer;
-        boolean craft = false;
+    public boolean craft(GuiContainer firstGui, IRecipeHandler handler, int recipeIndex, int multiplier) {
+        final Slot craftingSlot = firstGui.inventorySlots.inventorySlots.stream()
+                .filter(slot -> slot instanceof SlotCrafting).findFirst().orElse(null);
 
+        if (craftingSlot == null) {
+            return false;
+        }
+
+        boolean craft = false;
         while (multiplier > 0) {
-            final int transfer = transferRecipe(firstGui, recipe, recipeIndex, multiplier);
+            final int transfer = transferRecipe(firstGui, handler, recipeIndex, multiplier);
 
             if (transfer <= 0) {
                 break;
@@ -112,43 +117,88 @@ public class DefaultOverlayHandler implements IOverlayHandler {
 
             multiplier -= transfer;
 
-            for (Slot slot : firstGui.inventorySlots.inventorySlots) {
-                if (slot.getHasStack() && slot instanceof SlotCrafting && slot.canTakeStack(thePlayer)) {
-                    FastTransferManager.clickSlot(firstGui, slot.slotNumber, 0, 1);
-                    craft = true;
-                    break;
-                }
+            if (craftingSlot.getHasStack() && craftingSlot.canTakeStack(firstGui.mc.thePlayer)) {
+                FastTransferManager.clickSlot(firstGui, craftingSlot.slotNumber, 0, 1);
+                craft = true;
             }
 
         }
 
-        clearIngredients(firstGui);
+        clearIngredients(firstGui, handler);
 
         return craft;
     }
 
-    private boolean clearIngredients(GuiContainer gui) {
-        final EntityClientPlayerMP thePlayer = NEIClientUtils.mc().thePlayer;
+    protected boolean clearIngredients(GuiContainer gui, IRecipeHandler handler) {
 
-        for (Slot slot : gui.inventorySlots.inventorySlots) {
-            if (slot.getHasStack() && !canMoveFrom(slot, gui)
-                    && !(slot instanceof SlotCrafting)
-                    && slot.canTakeStack(thePlayer)) {
+        for (Slot slot : getCraftMatrixSlots(gui, handler)) {
+            if (slot.canTakeStack(gui.mc.thePlayer)) {
                 FastTransferManager.clickSlot(gui, slot.slotNumber, 0, 1);
                 if (slot.getHasStack()) return false;
             }
         }
 
-        return dropOffMouseStack(thePlayer, gui);
+        FastTransferManager.dropHeldItem(gui);
+
+        return gui.mc.thePlayer.inventory.getItemStack() == null;
+    }
+
+    /**
+     * Gets the slots in the crafting matrix for the given GUI and recipe handler.
+     * 
+     * @param gui
+     * @param handler
+     * @return
+     */
+    protected Set<Slot> getCraftMatrixSlots(GuiContainer gui, IRecipeHandler handler) {
+        final PositionedStack firstIngr = handler.getIngredientStacks(0).get(0);
+        final Map<Integer, Slot> grid = new HashMap<>();
+        final Set<Slot> ingredSlots = new HashSet<>();
+
+        for (Slot slot : gui.inventorySlots.inventorySlots) {
+            final int key = (slot.xDisplayPosition - this.offsetx) * 10_000 + (slot.yDisplayPosition - this.offsety);
+            grid.put(key, slot);
+        }
+
+        int left = firstIngr.relx;
+        int top = firstIngr.rely;
+        int right = left;
+        int bottom = top;
+
+        while (grid.containsKey((left - 18) * 10_000 + firstIngr.rely)) {
+            left -= 18;
+        }
+
+        while (grid.containsKey((right + 18) * 10_000 + firstIngr.rely)) {
+            right += 18;
+        }
+
+        while (grid.containsKey(firstIngr.relx * 10_000 + (top - 18))) {
+            top -= 18;
+        }
+
+        while (grid.containsKey(firstIngr.relx * 10_000 + (bottom + 18))) {
+            bottom += 18;
+        }
+
+        for (int x = left; x <= right; x += 18) {
+            for (int y = top; y <= bottom; y += 18) {
+                final Slot slot = grid.get(x * 10_000 + y);
+                if (slot != null && !(slot.inventory instanceof InventoryPlayer)) {
+                    ingredSlots.add(slot);
+                }
+            }
+        }
+
+        return ingredSlots;
     }
 
     private void moveIngredients(GuiContainer gui, List<IngredientDistribution> assignedIngredients, int multiplier) {
-        final EntityClientPlayerMP thePlayer = NEIClientUtils.mc().thePlayer;
 
         for (Slot slot : gui.inventorySlots.inventorySlots) {
             if (slot instanceof SlotCrafting || !slot.getHasStack()
                     || !canMoveFrom(slot, gui)
-                    || !slot.canTakeStack(thePlayer))
+                    || !slot.canTakeStack(gui.mc.thePlayer))
                 continue;
             ItemStack stack = slot.getStack();
             int slotTransferCap = stack.getMaxStackSize();
@@ -186,7 +236,7 @@ public class DefaultOverlayHandler implements IOverlayHandler {
 
                 }
 
-                if (thePlayer.inventory.getItemStack() != null) {
+                if (gui.mc.thePlayer.inventory.getItemStack() != null) {
                     FastTransferManager.clickSlot(gui, slot.slotNumber);
                 }
             }
@@ -194,33 +244,6 @@ public class DefaultOverlayHandler implements IOverlayHandler {
         }
     }
 
-    protected boolean dropOffMouseStack(EntityPlayer entityPlayer, GuiContainer gui) {
-
-        if (entityPlayer.inventory.getItemStack() == null) {
-            return true;
-        }
-
-        for (int i = 0; i < gui.inventorySlots.inventorySlots.size(); i++) {
-            Slot slot = gui.inventorySlots.inventorySlots.get(i);
-
-            if (slot.inventory == entityPlayer.inventory) {
-                ItemStack mouseItem = entityPlayer.inventory.getItemStack();
-                ItemStack slotStack = slot.getStack();
-
-                if (slotStack == null || NEIClientUtils.areStacksSameType(mouseItem, slotStack)) {
-                    FastTransferManager.clickSlot(gui, i, 0, 0);
-                }
-
-                if (entityPlayer.inventory.getItemStack() == null) {
-                    return true;
-                }
-
-            }
-        }
-
-        return entityPlayer.inventory.getItemStack() == null;
-    }
-
     private int calculateRecipeQuantity(List<IngredientDistribution> assignedIngredients) {
         int quantity = Integer.MAX_VALUE;
 

src/main/java/codechicken/nei/recipe/GuiCraftingRecipe.java

@@ -18,9 +18,9 @@ import codechicken.nei.ItemPanels;
 import codechicken.nei.ItemsGrid.ItemsGridSlot;
 import codechicken.nei.NEIClientConfig;
 import codechicken.nei.NEIClientUtils;
+import codechicken.nei.bookmark.BookmarkItem.BookmarkItemType;
 import codechicken.nei.bookmark.BookmarksGridSlot;
 import codechicken.nei.recipe.Recipe.RecipeId;
-import codechicken.nei.recipe.stackinfo.GTFluidStackStringifyHandler;
 
 public class GuiCraftingRecipe extends GuiRecipe<ICraftingHandler> {
 
@@ -36,10 +36,13 @@ public class GuiCraftingRecipe extends GuiRecipe<ICraftingHandler> {
         final Minecraft mc = NEIClientUtils.mc();
         final RecipeId recipeId;
 
-        if ("item".equals(outputId)) {
-            for (int i = 0; i < results.length; i++) {
-                results[i] = normalizeItemStack((ItemStack) results[i]);
+        for (int i = 0; i < results.length; i++) {
+            if (results[i] instanceof ItemStack stack) {
+                results[i] = StackInfo.normalizeRecipeQueryStack(stack.copy());
             }
+        }
+
+        if ("item".equals(outputId)) {
             recipeId = getRecipeId(mc.currentScreen, (ItemStack) results[0]);
         } else if ("recipeId".equals(outputId)) {
             recipeId = (RecipeId) results[1];
@@ -105,13 +108,6 @@ public class GuiCraftingRecipe extends GuiRecipe<ICraftingHandler> {
         return GuiRecipeTab.getHandlerInfo(handler).getHandlerName();
     }
 
-    private static ItemStack normalizeItemStack(ItemStack stack) {
-        GTFluidStackStringifyHandler.replaceAE2FCFluidDrop = true;
-        stack = StackInfo.loadFromNBT(StackInfo.itemStackToNBT(stack));
-        GTFluidStackStringifyHandler.replaceAE2FCFluidDrop = false;
-        return stack;
-    }
-
     public static RecipeId getRecipeId(GuiScreen gui, ItemStack stackover) {
 
         if (gui instanceof GuiRecipe guiRecipe) {
@@ -126,7 +122,8 @@ public class GuiCraftingRecipe extends GuiRecipe<ICraftingHandler> {
         final BookmarksGridSlot panelSlot = ItemPanels.bookmarkPanel.getSlotMouseOver(mouseover.x, mouseover.y);
 
         if (panelSlot != null) {
-            return panelSlot.isIngredient() || panelSlot.getRecipeId() == null ? FavoriteRecipes.getFavorite(stackover)
+            return panelSlot.getType() == BookmarkItemType.INGREDIENT || panelSlot.getRecipeId() == null
+                    ? FavoriteRecipes.getFavorite(stackover)
                     : panelSlot.getRecipeId();
         }
 

src/main/java/codechicken/nei/recipe/GuiFavoriteButton.java

@@ -72,7 +72,7 @@ public class GuiFavoriteButton extends GuiRecipeButton {
     }
 
     public boolean isFavorite() {
-        return favorite;
+        return this.favorite;
     }
 
     public void toggleFavorite() {
@@ -86,6 +86,11 @@ public class GuiFavoriteButton extends GuiRecipeButton {
                 .setFavorite(this.favoriteResult.getItemStack(), this.favorite ? this.recipe.getRecipeId() : null);
     }
 
+    @Override
+    public void update() {
+        this.favorite = this.favorite && FavoriteRecipes.getFavorite(this.recipe.getRecipeId()) != null;
+    }
+
     @Override
     protected void drawContent(Minecraft minecraft, int y, int x, boolean mouseOver) {
         final DrawableResource icon = isFavorite() ? ICON_STATE_ON : ICON_STATE_OFF;

src/main/java/codechicken/nei/recipe/GuiOverlayButton.java

@@ -313,8 +313,11 @@ public class GuiOverlayButton extends GuiRecipeButton {
         final Recipe recipe = getRecipe();
 
         if (!ItemPanels.bookmarkPanel.removeRecipe(recipe.getRecipeId(), BookmarkGrid.DEFAULT_GROUP_ID)) {
-            ItemPanels.bookmarkPanel
-                    .addRecipe(recipe, NEIClientUtils.controlKey() ? 1 : 0, BookmarkGrid.DEFAULT_GROUP_ID);
+            ItemPanels.bookmarkPanel.addRecipe(
+                    recipe,
+                    NEIClientUtils.controlKey()
+                            || NEIClientConfig.getBooleanSetting("inventory.bookmarks.bookmarkRecipeWithCount") ? 1 : 0,
+                    BookmarkGrid.DEFAULT_GROUP_ID);
         }
     }
 

src/main/java/codechicken/nei/recipe/GuiRecipe.java

@@ -52,7 +52,6 @@ import codechicken.nei.scroll.ScrollBar;
 import codechicken.nei.scroll.ScrollBar.OverflowType;
 import codechicken.nei.scroll.ScrollBar.ScrollPlace;
 import codechicken.nei.scroll.ScrollContainer;
-import codechicken.nei.util.NEIMouseUtils;
 import codechicken.nei.util.SlotInaccessible;
 
 public abstract class GuiRecipe<H extends IRecipeHandler> extends GuiContainer implements IGuiContainerOverlay,
@@ -65,16 +64,14 @@ public abstract class GuiRecipe<H extends IRecipeHandler> extends GuiContainer i
     private static final int BUTTON_WIDTH = 13;
     private static final int BUTTON_HEIGHT = 12;
 
-    protected static final ScrollBar VERTICAL_SCROLLBAR = new ScrollBar().setScrollbarSize(14).setMarginStart(-6)
+    protected static final ScrollBar VERTICAL_SCROLLBAR = new ScrollBar().setTrackWidth(14)
             .setOverflowType(OverflowType.AUTO).setScrollPlace(ScrollPlace.END)
             .setTrackTexture(new DrawableBuilder("nei:textures/nei_sprites.png", 42, 90, 13, 21).build(), 9, 9)
-            .setThumbTexture(new DrawableBuilder("nei:textures/nei_sprites.png", 21, 96, 8, 9).build(), 3, 2)
-            .setThumbPadding(6);
+            .setThumbTexture(new DrawableBuilder("nei:textures/nei_sprites.png", 22, 96, 6, 9).build(), 3, 2)
+            .setThumbPadding(1, 6, 0, 6);
 
     public static final List<IRecipeFilterProvider> recipeFilterers = new LinkedList<>();
 
-    protected AcceptsFollowingTooltipLineHandler acceptsFollowingTooltipLineHandler;
-
     // some mods reflect this properties
     public ArrayList<H> currenthandlers = new ArrayList<>();
     public int page;
@@ -89,12 +86,12 @@ public abstract class GuiRecipe<H extends IRecipeHandler> extends GuiContainer i
     private GuiButton prevtype;
     private GuiButton nexttype;
 
-    protected String recipePageCacheKey = "";
-
+    private int lastPage = -1;
     private final GuiRecipeTabs recipeTabs;
     private final GuiRecipeCatalyst recipeCatalyst;
     private SearchRecipeHandler<H> handler;
     private HandlerInfo handlerInfo;
+    private RecipePageManager handlerPages;
 
     protected static final RestartableTask updateFilter = new RestartableTask("NEI Recipe Filtering") {
 
@@ -109,7 +106,6 @@ public abstract class GuiRecipe<H extends IRecipeHandler> extends GuiContainer i
 
                     if (GuiRecipe.searchField.text().isEmpty()) {
                         searchHandler.setSearchIndices(null);
-                        guiRecipe.changePage(0);
                     } else {
                         final IRecipeFilter filter = GuiRecipe.searchField.getRecipeFilter();
                         final List<Integer> filtered = searchHandler.getSearchResult(filter);
@@ -120,10 +116,8 @@ public abstract class GuiRecipe<H extends IRecipeHandler> extends GuiContainer i
 
                         if (interrupted()) return;
                         searchHandler.setSearchIndices(filtered);
-                        guiRecipe.changePage(0);
                     }
 
-                    guiRecipe.recipePageCacheKey = "";
                 }
 
             }
@@ -137,7 +131,8 @@ public abstract class GuiRecipe<H extends IRecipeHandler> extends GuiContainer i
         @Override
         protected boolean noResults() {
             final GuiScreen currentScreen = NEIClientUtils.mc().currentScreen;
-            return !(currentScreen instanceof GuiRecipe) || ((GuiRecipe<?>) currentScreen).numRecipes() > 0;
+            return !(currentScreen instanceof GuiRecipe)
+                    || ((GuiRecipe<?>) currentScreen).handlerPages.getNumRecipes() > 0;
         }
 
         @Override
@@ -199,6 +194,36 @@ public abstract class GuiRecipe<H extends IRecipeHandler> extends GuiContainer i
             this.firstGui = gui.getFirstScreen();
             this.firstGuiGeneral = gui.getFirstScreenGeneral();
         }
+
+        this.prevtype = new GuiNEIButton(0, 0, 0, BUTTON_WIDTH, BUTTON_HEIGHT, "<") {
+
+            @Override
+            public void mouseReleased(int mouseX, int mouseY) {
+                prevType();
+            }
+        };
+        this.nexttype = new GuiNEIButton(1, 0, 0, BUTTON_WIDTH, BUTTON_HEIGHT, ">") {
+
+            @Override
+            public void mouseReleased(int mouseX, int mouseY) {
+                nextType();
+            }
+        };
+
+        this.prevpage = new GuiNEIButton(2, 0, 0, BUTTON_WIDTH, BUTTON_HEIGHT, "<") {
+
+            @Override
+            public void mouseReleased(int mouseX, int mouseY) {
+                prevPage();
+            }
+        };
+        this.nextpage = new GuiNEIButton(3, 0, 0, BUTTON_WIDTH, BUTTON_HEIGHT, ">") {
+
+            @Override
+            public void mouseReleased(int mouseX, int mouseY) {
+                nextPage();
+            }
+        };
     }
 
     /**
@@ -272,7 +297,19 @@ public abstract class GuiRecipe<H extends IRecipeHandler> extends GuiContainer i
         }
     }
 
-    private ScrollContainer container = new ScrollContainer();
+    private ScrollContainer container = new ScrollContainer() {
+
+        @Override
+        public Widget getWidgetUnderMouse(int mousex, int mousey) {
+
+            if (handlerInfo.getUseCustomScroll() && !this.widgets.isEmpty()) {
+                return this.widgets.get(0);
+            }
+
+            return super.getWidgetUnderMouse(mousex, mousey);
+        }
+
+    };
 
     @Override
     public void initGui() {
@@ -292,35 +329,14 @@ public abstract class GuiRecipe<H extends IRecipeHandler> extends GuiContainer i
         final int rightButtonX = this.guiLeft + this.xSize - BORDER_PADDING - BUTTON_WIDTH + 1;
         final int leftButtonX = this.guiLeft + BORDER_PADDING;
 
-        this.prevtype = new GuiNEIButton(0, leftButtonX, guiTop + 3, BUTTON_WIDTH, BUTTON_HEIGHT, "<") {
-
-            @Override
-            public void mouseReleased(int mouseX, int mouseY) {
-                prevType();
-            }
-        };
-        this.nexttype = new GuiNEIButton(1, rightButtonX, guiTop + 3, BUTTON_WIDTH, BUTTON_HEIGHT, ">") {
-
-            @Override
-            public void mouseReleased(int mouseX, int mouseY) {
-                nextType();
-            }
-        };
-
-        this.prevpage = new GuiNEIButton(2, leftButtonX, guiTop + 17, BUTTON_WIDTH, BUTTON_HEIGHT, "<") {
-
-            @Override
-            public void mouseReleased(int mouseX, int mouseY) {
-                prevPage();
-            }
-        };
-        this.nextpage = new GuiNEIButton(3, rightButtonX, guiTop + 17, BUTTON_WIDTH, BUTTON_HEIGHT, ">") {
-
-            @Override
-            public void mouseReleased(int mouseX, int mouseY) {
-                nextPage();
-            }
-        };
+        this.prevtype.xPosition = leftButtonX;
+        this.prevtype.yPosition = guiTop + 3;
+        this.nexttype.xPosition = rightButtonX;
+        this.nexttype.yPosition = guiTop + 3;
+        this.prevpage.xPosition = leftButtonX;
+        this.prevpage.yPosition = guiTop + 17;
+        this.nextpage.xPosition = rightButtonX;
+        this.nextpage.yPosition = guiTop + 17;
 
         this.container.x = this.guiLeft + 3;
         this.container.y = this.guiTop + 32;
@@ -337,9 +353,8 @@ public abstract class GuiRecipe<H extends IRecipeHandler> extends GuiContainer i
         GuiRecipe.searchField.h = 14;
 
         this.buttonList.addAll(Arrays.asList(this.prevtype, this.nexttype, this.prevpage, this.nextpage));
-        this.recipePageCacheKey = "";
 
-        if (currenthandlers.size() == 1) {
+        if (this.currenthandlers.size() == 1) {
             this.prevtype.visible = false;
             this.nexttype.visible = false;
         }
@@ -347,34 +362,11 @@ public abstract class GuiRecipe<H extends IRecipeHandler> extends GuiContainer i
         this.recipeTabs.update(this);
     }
 
-    private void updateRecipePage() {
-        final List<Integer> indices = getRecipeIndices();
-        final String cacheKey = indices.isEmpty() ? "empty"
-                : handlerInfo.getHandlerName() + ":" + indices.get(0) + ":" + indices.get(indices.size() - 1);
+    protected void refreshContainer() {
 
-        if (!cacheKey.equals(this.recipePageCacheKey)) {
-            this.recipePageCacheKey = cacheKey;
-
-            final boolean expandVertically = this.handlerInfo.expandVertically();
-            final List<Widget> widgets = new ArrayList<>();
-            int shiftY = 0;
-
-            for (int recipeIndex : indices) {
-                final NEIRecipeWidget widget = RecipeHandlerRef.of(this.handler.original, recipeIndex)
-                        .getRecipeWidget();
-                widget.setLocation(Math.max(0, (this.container.w - widget.w) / 2), shiftY);
-
-                if (expandVertically) {
-                    widget.h = Math.min(
-                            this.handlerInfo.getHeight() + this.handlerInfo.getYShift(),
-                            this.container.getVisibleHeight());
-                }
-
-                widgets.add(widget);
-                shiftY += widget.h;
-            }
-
-            this.container.setWidgets(widgets);
+        if (this.handlerPages.rebuildPages() || this.lastPage != this.handlerPages.getCurrentPageIndex()) {
+            this.lastPage = this.handlerPages.getCurrentPageIndex();
+            this.container.setWidgets(this.handlerPages.getCurrentPageWidgets());
 
             if (this.handlerInfo.getUseCustomScroll()) {
                 this.container.setVerticalScroll(null);
@@ -383,10 +375,12 @@ public abstract class GuiRecipe<H extends IRecipeHandler> extends GuiContainer i
             } else {
                 this.container.setVerticalScroll(
                         ScrollBar.defaultVerticalBar().setOverflowType(OverflowType.OVERLAY)
-                                .setScrollPlace(ScrollPlace.END));
+                                .setTrackPadding(-8, 0, 0, 0));
             }
         }
 
+        this.recipeCatalyst.setCatalysts(RecipeCatalysts.getRecipeCatalysts(this.handler.original));
+        this.container.update();
     }
 
     public static IRecipeFilter getRecipeListFilter() {
@@ -412,23 +406,20 @@ public abstract class GuiRecipe<H extends IRecipeHandler> extends GuiContainer i
         return GuiRecipe.searchField.getFilter();
     }
 
-    public void setRecipePage(int idx) {
-        setRecipePage(idx, 0);
-    }
-
-    public void setRecipePage(int idx, int refIndex) {
+    protected void setRecipePage(int idx) {
         this.recipetype = (this.currenthandlers.size() + idx) % this.currenthandlers.size();
         this.handler = new SearchRecipeHandler<>(this.currenthandlers.get(this.recipetype));
         this.handlerInfo = GuiRecipeTab.getHandlerInfo(this.handler.original);
+        this.container.w = Math.max(this.xSize - 6, this.handlerInfo.getWidth());
+        this.handlerPages = new RecipePageManager(this.handler, this.handlerInfo, this.container);
+        this.prevpage.enabled = this.nextpage.enabled = this.handlerPages.getNumPages() > 1;
+        this.lastPage = -1;
 
         GuiRecipe.searchField.setText("");
         GuiRecipe.searchField.setVisible(false);
         GuiRecipe.toggleSearch.state = 0;
 
         this.container.setVerticalScrollOffset(0);
-        this.page = Math.min(Math.max(0, refIndex), this.numRecipes() - 1) / getRecipesPerPage();
-        changePage(0);
-
         this.recipeTabs.update(this);
     }
 
@@ -458,7 +449,8 @@ public abstract class GuiRecipe<H extends IRecipeHandler> extends GuiContainer i
             }
         }
 
-        setRecipePage(recipetype, Math.max(0, refIndex));
+        setRecipePage(recipetype);
+        this.handlerPages.gotoRefIndex(Math.max(0, refIndex));
 
         return refIndex;
     }
@@ -523,20 +515,7 @@ public abstract class GuiRecipe<H extends IRecipeHandler> extends GuiContainer i
     }
 
     public List<Integer> getRecipeIndices() {
-        final int recipesPerPage = getRecipesPerPage();
-        final int minIndex = this.page * recipesPerPage;
-        final int maxIndex = Math.min(this.numRecipes(), (this.page + 1) * recipesPerPage);
-        final List<Integer> range = new ArrayList<>();
-
-        for (int index = minIndex; index < maxIndex; index++) {
-            range.add(this.handler.ref(index));
-        }
-
-        return range;
-    }
-
-    private int numRecipes() {
-        return this.handler == null ? 0 : this.handler.numRecipes();
+        return this.handlerPages.getRecipeIndices();
     }
 
     @Override
@@ -702,11 +681,8 @@ public abstract class GuiRecipe<H extends IRecipeHandler> extends GuiContainer i
     public void updateScreen() {
         super.updateScreen();
 
-        this.container.w = Math.max(this.xSize - 6, this.handlerInfo.getWidth());
-
         this.handler.original.onUpdate();
-        refreshPage();
-        this.container.update();
+        refreshContainer();
 
         this.recipeCatalyst.setAvailableHeight(this.ySize - 5);
         this.recipeCatalyst.y = this.guiTop;
@@ -732,7 +708,7 @@ public abstract class GuiRecipe<H extends IRecipeHandler> extends GuiContainer i
                         .contains(mousex - this.guiLeft, mousey - this.guiTop)) {
 
             final String pageInfo = String
-                    .format("%d/%d", page + 1, Math.max(1, this.numRecipes() - 1) / getRecipesPerPage() + 1);
+                    .format("%d/%d", this.handlerPages.getCurrentPageIndex() + 1, this.handlerPages.getNumPages());
 
             if (this.fontRendererObj.getStringWidth(pageInfo) >= 45) {
                 currenttip.add(pageInfo);
@@ -751,30 +727,6 @@ public abstract class GuiRecipe<H extends IRecipeHandler> extends GuiContainer i
             currenttip = recipeWidget.handleItemTooltip(itemstack, mousex, mousey, currenttip);
         }
 
-        if (NEIClientConfig.showCycledIngredientsTooltip() && itemstack != null) {
-            PositionedStack hovered = null;
-
-            if (activeWidget instanceof NEIRecipeWidget recipeWidget) {
-                hovered = recipeWidget.getPositionedStackMouseOver(mousex, mousey);
-            }
-
-            if (hovered == null || hovered.items.length <= 1) {
-                this.acceptsFollowingTooltipLineHandler = null;
-            } else if (this.acceptsFollowingTooltipLineHandler == null
-                    || this.acceptsFollowingTooltipLineHandler.tooltipGUID != hovered) {
-                        this.acceptsFollowingTooltipLineHandler = AcceptsFollowingTooltipLineHandler
-                                .of(hovered, hovered.getFilteredPermutations(), hovered.item);
-                    }
-        } else if (this.acceptsFollowingTooltipLineHandler != null) {
-            this.acceptsFollowingTooltipLineHandler = null;
-        }
-
-        if (this.acceptsFollowingTooltipLineHandler != null) {
-            this.acceptsFollowingTooltipLineHandler
-                    .setActiveStack(((PositionedStack) this.acceptsFollowingTooltipLineHandler.tooltipGUID).item);
-            currenttip.add(GuiDraw.TOOLTIP_HANDLER + GuiDraw.getTipLineId(this.acceptsFollowingTooltipLineHandler));
-        }
-
         return currenttip;
     }
 
@@ -789,23 +741,15 @@ public abstract class GuiRecipe<H extends IRecipeHandler> extends GuiContainer i
             hotkeys = this.container.handleHotkeys(mousex, mousey, hotkeys);
         }
 
-        if (this.acceptsFollowingTooltipLineHandler != null) {
-            hotkeys.put(
-                    NEIClientUtils.getKeyName(
-                            NEIClientUtils.SHIFT_HASH,
-                            NEIMouseUtils.MOUSE_BTN_NONE + NEIMouseUtils.MOUSE_SCROLL),
-                    NEIClientUtils.translate("recipe.accepts.scroll"));
-        }
-
         return hotkeys;
     }
 
     private void nextPage() {
-        changePage(1);
+        this.handlerPages.changePage(1);
     }
 
     private void prevPage() {
-        changePage(-1);
+        this.handlerPages.changePage(-1);
     }
 
     protected void nextType() {
@@ -816,46 +760,18 @@ public abstract class GuiRecipe<H extends IRecipeHandler> extends GuiContainer i
         setRecipePage(--recipetype);
     }
 
-    protected void changePage(int shift) {
-        final int recipesPerPage = getRecipesPerPage();
-        final int numRecipes = this.numRecipes();
-        final int oldPage = this.page;
-
-        if (numRecipes > 0) {
-            final int numPages = (int) Math.ceil(numRecipes / (float) recipesPerPage);
-            this.page = Math.min(Math.max(0, this.page), numPages);
-            this.page = (numPages + this.page + shift) % numPages;
-        } else {
-            this.page = 0;
-        }
-
-        if (this.page != oldPage) {
-            this.container.setVerticalScrollOffset(0);
-        }
-
-    }
-
     public GuiRecipeCatalyst getRecipeCatalystWidget() {
         return this.recipeCatalyst;
     }
 
-    public void forceRefreshPage() {
-        this.buttonList.removeIf(Arrays.asList(this.overlayButtons)::contains);
-        this.overlayButtons = new GuiOverlayButton[0];
+    protected void forceRefreshPage() {
         this.currenthandlers.sort(NEIClientConfig.HANDLER_COMPARATOR);
-        this.recipePageCacheKey = "";
-        refreshPage();
-    }
 
-    public void refreshPage() {
-        changePage(0);
-        final int recipesPerPage = getRecipesPerPage();
-        final boolean multiplepages = this.numRecipes() > recipesPerPage;
+        final int currentPage = this.handlerPages.getCurrentPageIndex();
+        setRecipePage(this.recipetype);
+        this.handlerPages.changePage(currentPage);
 
-        this.prevpage.enabled = this.nextpage.enabled = multiplepages;
-        this.recipeCatalyst.setCatalysts(RecipeCatalysts.getRecipeCatalysts(this.handler.original));
-
-        updateRecipePage();
+        refreshContainer();
     }
 
     @Override
@@ -886,7 +802,6 @@ public abstract class GuiRecipe<H extends IRecipeHandler> extends GuiContainer i
     }
 
     private void drawJEITabs(int mouseX, int mouseY) {
-        final int recipesPerPage = getRecipesPerPage();
         final int textMiddle = (BUTTON_WIDTH - this.fontRendererObj.FONT_HEIGHT) / 2;
 
         drawRect(
@@ -920,7 +835,10 @@ public abstract class GuiRecipe<H extends IRecipeHandler> extends GuiContainer i
         if (GuiRecipe.searchField.isVisible()) {
             final String recipePage = NEIClientUtils.cropText(
                     this.fontRendererObj,
-                    String.format("%d/%d", this.page + 1, Math.max(0, numRecipes() - 1) / recipesPerPage + 1),
+                    String.format(
+                            "%d/%d",
+                            this.handlerPages.getCurrentPageIndex() + 1,
+                            this.handlerPages.getNumPages()),
                     45);
             drawCenteredString(
                     this.fontRendererObj,
@@ -929,8 +847,10 @@ public abstract class GuiRecipe<H extends IRecipeHandler> extends GuiContainer i
                     this.prevpage.yPosition + textMiddle,
                     0xffffff);
         } else {
-            final String recipePage = NEIClientUtils
-                    .translate("recipe.page", this.page + 1, Math.max(0, numRecipes() - 1) / recipesPerPage + 1);
+            final String recipePage = NEIClientUtils.translate(
+                    "recipe.page",
+                    this.handlerPages.getCurrentPageIndex() + 1,
+                    this.handlerPages.getNumPages());
             drawCenteredString(
                     this.fontRendererObj,
                     recipePage,
@@ -957,19 +877,6 @@ public abstract class GuiRecipe<H extends IRecipeHandler> extends GuiContainer i
         return this.firstGuiGeneral;
     }
 
-    private int getRecipesPerPage() {
-
-        if (this.handlerInfo.getMaxRecipesPerPage() <= 1) {
-            return 1;
-        }
-
-        if (NEIClientConfig.getBooleanSetting("inventory.guirecipe.infiniteScroll")) {
-            return Math.max(1, this.handler.numRecipes());
-        }
-
-        return Math.max(this.container.h / (this.handlerInfo.getHeight() + this.handlerInfo.getYShift()), 1);
-    }
-
     public Point getRecipePosition(int recipe) {
         return getRefIndexPosition(getRecipeIndices().indexOf(recipe));
     }
@@ -1029,16 +936,12 @@ public abstract class GuiRecipe<H extends IRecipeHandler> extends GuiContainer i
             return true;
         }
 
-        if (getRecipesPerPage() == 1 && !this.container.getWidgets().isEmpty()) {
-            return this.container.getWidgets().get(0).bounds().intersects(rect);
-        }
-
         return this.container.boundsOutside().intersects(rect);
     }
 
     protected static RecipeId getCurrentRecipeId(GuiScreen gui) {
 
-        if (gui instanceof GuiRecipe<?>gRecipe && gRecipe.handler.numRecipes() > 0) {
+        if (gui instanceof GuiRecipe<?>gRecipe && gRecipe.handlerPages.getNumRecipes() > 0) {
             final List<Integer> indices = gRecipe.getRecipeIndices();
             final int curRecipe = indices.isEmpty() ? 0 : indices.get(0);
             final Recipe recipe = Recipe.of(gRecipe.handler.original, curRecipe);

src/main/java/codechicken/nei/recipe/GuiRecipeButton.java

@@ -61,6 +61,10 @@ public abstract class GuiRecipeButton extends GuiNEIButton {
 
     public abstract void drawItemOverlay();
 
+    public void update() {
+
+    }
+
     public boolean mouseScrolled(int scroll) {
         return false;
     }

src/main/java/codechicken/nei/recipe/GuiRecipeCatalyst.java

@@ -60,10 +60,10 @@ public class GuiRecipeCatalyst extends ScrollContainer {
             .setTextureSize(18, 18).build();
 
     private static final ScrollBar VERTICAL_SCROLLBAR = ScrollBar.defaultVerticalBar()
-            .setOverflowType(ScrollBar.OverflowType.AUTO).setMarginStart(BORDER_PADDING).setMarginEnd(BORDER_PADDING)
-            .setPadding(-13).setScrollPlace(ScrollBar.ScrollPlace.START);
+            .setOverflowType(ScrollBar.OverflowType.AUTO).setTrackPadding(0, BORDER_PADDING, -13, BORDER_PADDING)
+            .setScrollPlace(ScrollBar.ScrollPlace.START);
 
-    private final List<PositionedStack> items = new ArrayList<>();
+    private PositionedStack[] items = new PositionedStack[0];
     private boolean showWidget = false;
     private int availableHeight = 0;
 
@@ -72,8 +72,7 @@ public class GuiRecipeCatalyst extends ScrollContainer {
     }
 
     public void setCatalysts(List<PositionedStack> items) {
-        this.items.clear();
-        this.items.addAll(items);
+        this.items = items.toArray(new PositionedStack[0]);
         createWidgets();
     }
 
@@ -95,14 +94,14 @@ public class GuiRecipeCatalyst extends ScrollContainer {
     public int getColumnCount() {
         if (NEIClientConfig.getJEIStyleRecipeCatalysts() == 1) {
             final int maxItemsPerColumn = Math.max(0, this.availableHeight - 2 - BORDER_PADDING * 2) / SLOT_SIZE;
-            return maxItemsPerColumn > 0 ? NEIServerUtils.divideCeil(this.items.size(), maxItemsPerColumn) : 0;
+            return maxItemsPerColumn > 0 ? NEIServerUtils.divideCeil(this.items.length, maxItemsPerColumn) : 0;
         }
         return 1;
     }
 
     public int getRowCount() {
         final int columnCount = getColumnCount();
-        return columnCount > 0 ? NEIServerUtils.divideCeil(this.items.size(), columnCount) : 0;
+        return columnCount > 0 ? NEIServerUtils.divideCeil(this.items.length, columnCount) : 0;
     }
 
     protected void createWidgets() {
@@ -118,10 +117,10 @@ public class GuiRecipeCatalyst extends ScrollContainer {
         if (NEIClientConfig.getJEIStyleRecipeCatalysts() == 2
                 && rows * SLOT_SIZE + this.paddingBlockStart + this.paddingBlockEnd > this.availableHeight) {
             this.h = Math.min(this.h, this.availableHeight);
-            this.w += VERTICAL_SCROLLBAR.getScrollbarSize();
+            this.w += VERTICAL_SCROLLBAR.getTrackWidth();
 
             setVerticalScroll(VERTICAL_SCROLLBAR);
-            setPaddingInline(BORDER_PADDING + 1 + VERTICAL_SCROLLBAR.getScrollbarSize(), this.paddingInlineEnd);
+            setPaddingInline(BORDER_PADDING + 1 + VERTICAL_SCROLLBAR.getTrackWidth(), this.paddingInlineEnd);
         }
 
         this.showWidget = rows * columns > 0;

src/main/java/codechicken/nei/recipe/GuiRecipeTab.java

@@ -255,12 +255,10 @@ public abstract class GuiRecipeTab extends Widget {
                 if (yShift != null && !yShift.equals("")) info.setYShift(Integer.parseInt(yShift));
 
                 try {
-                    final int imageHeight = intOrDefault(record.get("handlerHeight"), HandlerInfo.DEFAULT_HEIGHT);
-                    final int imageWidth = intOrDefault(record.get("handlerWidth"), HandlerInfo.DEFAULT_WIDTH);
-                    final int maxRecipesPerPage = intOrDefault(
-                            record.get("maxRecipesPerPage"),
-                            HandlerInfo.DEFAULT_MAX_PER_PAGE);
-                    info.setHandlerDimensions(imageHeight, imageWidth, maxRecipesPerPage);
+                    final int handlerHeight = intOrDefault(record.get("handlerHeight"), HandlerInfo.DEFAULT_HEIGHT);
+                    final int handlerWidth = intOrDefault(record.get("handlerWidth"), HandlerInfo.DEFAULT_WIDTH);
+                    final boolean multipleWidgetsAllowed = intOrDefault(record.get("maxRecipesPerPage"), 1) > 1;
+                    info.setHandlerDimensions(handlerWidth, handlerHeight, multipleWidgetsAllowed);
                 } catch (NumberFormatException ignored) {
                     NEIClientConfig.logger.info("Error setting handler dimensions for " + handler);
                 }
@@ -298,10 +296,7 @@ public abstract class GuiRecipeTab extends Widget {
 
     private static HandlerInfo getDefaultHandlerInfo() {
         final HandlerInfo info = new HandlerInfo("Unknown", "Unknown", "Unknown", false, "");
-        info.setHandlerDimensions(
-                HandlerInfo.DEFAULT_HEIGHT,
-                HandlerInfo.DEFAULT_WIDTH,
-                HandlerInfo.DEFAULT_MAX_PER_PAGE);
+        info.setHandlerDimensions(HandlerInfo.DEFAULT_WIDTH, HandlerInfo.DEFAULT_HEIGHT, false);
         return info;
     }
 

src/main/java/codechicken/nei/recipe/GuiUsageRecipe.java

@@ -12,7 +12,6 @@ import codechicken.nei.ItemPanels;
 import codechicken.nei.NEIClientConfig;
 import codechicken.nei.NEIClientUtils;
 import codechicken.nei.recipe.Recipe.RecipeId;
-import codechicken.nei.recipe.stackinfo.GTFluidStackStringifyHandler;
 
 public class GuiUsageRecipe extends GuiRecipe<IUsageHandler> {
 
@@ -22,9 +21,9 @@ public class GuiUsageRecipe extends GuiRecipe<IUsageHandler> {
 
     public static boolean openRecipeGui(String inputId, Object... ingredients) {
 
-        if ("item".equals(inputId)) {
-            for (int i = 0; i < ingredients.length; i++) {
-                ingredients[i] = normalizeItemStack((ItemStack) ingredients[i]);
+        for (int i = 0; i < ingredients.length; i++) {
+            if (ingredients[i] instanceof ItemStack stack) {
+                ingredients[i] = StackInfo.normalizeRecipeQueryStack(stack.copy());
             }
         }
 
@@ -66,13 +65,6 @@ public class GuiUsageRecipe extends GuiRecipe<IUsageHandler> {
         return recipeQuery.runWithProfiling(NEIClientUtils.translate("recipe.concurrent.usage"));
     }
 
-    private static ItemStack normalizeItemStack(ItemStack stack) {
-        GTFluidStackStringifyHandler.replaceAE2FCFluidDrop = true;
-        stack = StackInfo.loadFromNBT(StackInfo.itemStackToNBT(stack));
-        GTFluidStackStringifyHandler.replaceAE2FCFluidDrop = false;
-        return stack;
-    }
-
     public static void registerUsageHandler(IUsageHandler handler) {
         final String handlerId = handler.getHandlerId();
 

src/main/java/codechicken/nei/recipe/HandlerInfo.java

@@ -12,6 +12,8 @@ public class HandlerInfo {
 
     public static int DEFAULT_HEIGHT = 65;
     public static int DEFAULT_WIDTH = 166;
+
+    @Deprecated
     public static int DEFAULT_MAX_PER_PAGE = 1;
 
     private String handlerName;
@@ -24,7 +26,10 @@ public class HandlerInfo {
     private int yShift = 0;
     private int height = DEFAULT_HEIGHT;
     private int width = DEFAULT_WIDTH;
+
+    @Deprecated
     private int maxRecipesPerPage = DEFAULT_MAX_PER_PAGE;
+    private boolean multipleWidgetsAllowed = false;
     private boolean showFavoritesButton = true;
     private boolean showOverlayButton = true;
     private boolean useCustomScroll = false;
@@ -40,10 +45,15 @@ public class HandlerInfo {
         this.excludedModId = excludedModId;
     }
 
+    @Deprecated
     public void setHandlerDimensions(int height, int width, int maxRecipesPerPage) {
+        setHandlerDimensions(width, height, maxRecipesPerPage > 1);
+    }
+
+    public void setHandlerDimensions(int width, int height, boolean multipleWidgetsAllowed) {
         this.height = height;
         this.width = width;
-        this.maxRecipesPerPage = maxRecipesPerPage;
+        this.multipleWidgetsAllowed = multipleWidgetsAllowed;
     }
 
     public boolean setItem(String itemId, String nbtString) {
@@ -89,8 +99,13 @@ public class HandlerInfo {
         return this.width;
     }
 
+    @Deprecated
     public int getMaxRecipesPerPage() {
-        return Math.max(this.maxRecipesPerPage, 1);
+        return this.multipleWidgetsAllowed ? Integer.MAX_VALUE : 1;
+    }
+
+    public boolean isMultipleWidgetsAllowed() {
+        return this.multipleWidgetsAllowed;
     }
 
     public int getYShift() {
@@ -133,10 +148,6 @@ public class HandlerInfo {
         this.useCustomScroll = useCustomScroll;
     }
 
-    public boolean expandVertically() {
-        return this.useCustomScroll && this.maxRecipesPerPage <= 1;
-    }
-
     public static class Builder {
 
         private final HandlerInfo info;
@@ -151,51 +162,57 @@ public class HandlerInfo {
         }
 
         public Builder setDisplayStack(ItemStack stack) {
-            info.image = null;
-            info.itemStack = stack;
+            this.info.image = null;
+            this.info.itemStack = stack;
             return this;
         }
 
         public Builder setDisplayImage(DrawableResource drawable) {
-            info.itemStack = null;
-            info.image = drawable;
+            this.info.itemStack = null;
+            this.info.image = drawable;
             return this;
         }
 
         public Builder setDisplayImage(ResourceLocation location, int imageX, int imageY, int imageWidth,
                 int imageHeight) {
-            info.itemStack = null;
-            info.setImage(location.toString(), imageX, imageY, imageWidth, imageHeight);
+            this.info.itemStack = null;
+            this.info.setImage(location.toString(), imageX, imageY, imageWidth, imageHeight);
             return this;
         }
 
         public Builder setUseCustomScroll(boolean useCustomScroll) {
-            info.setUseCustomScroll(useCustomScroll);
+            this.info.setUseCustomScroll(useCustomScroll);
             return this;
         }
 
         public Builder setShiftY(int shiftY) {
-            info.setYShift(shiftY);
+            this.info.setYShift(shiftY);
             return this;
         }
 
         public Builder setWidth(int width) {
-            info.setHandlerDimensions(info.height, width, info.maxRecipesPerPage);
+            this.info.width = width;
             return this;
         }
 
         public Builder setHeight(int height) {
-            info.setHandlerDimensions(height, info.width, info.maxRecipesPerPage);
+            this.info.height = height;
             return this;
         }
 
+        @Deprecated
         public Builder setMaxRecipesPerPage(int maxRecipesPerPage) {
-            info.setHandlerDimensions(info.height, info.width, maxRecipesPerPage);
+            this.info.multipleWidgetsAllowed = maxRecipesPerPage > 1;
+            return this;
+        }
+
+        public Builder setMultipleWidgetsAllowed(boolean multipleWidgetsAllowed) {
+            this.info.multipleWidgetsAllowed = multipleWidgetsAllowed;
             return this;
         }
 
         public HandlerInfo build() {
-            return info;
+            return this.info;
         }
     }
 }

src/main/java/codechicken/nei/recipe/NEIRecipeWidget.java

@@ -2,6 +2,7 @@ package codechicken.nei.recipe;
 
 import java.awt.Point;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -30,13 +31,15 @@ import codechicken.nei.api.IGuiContainerOverlay;
 import codechicken.nei.api.ShortcutInputHandler;
 import codechicken.nei.guihook.GuiContainerManager;
 import codechicken.nei.recipe.GuiRecipeButton.UpdateRecipeButtonsEvent;
+import codechicken.nei.util.NEIMouseUtils;
 
 public class NEIRecipeWidget extends Widget {
 
+    protected AcceptsFollowingTooltipLineHandler acceptsFollowingTooltipLineHandler;
     protected final WeakHashMap<PositionedStack, List<ItemStack>> permutations = new WeakHashMap<>();
-    protected boolean needUpdate = true;
+    protected boolean update = true;
     protected int cycleticks = 0;
-    protected int lastcycle = 0;
+    protected int lastcycle = -1;
 
     protected final RecipeHandlerRef handlerRef;
     protected final HandlerInfo handlerInfo;
@@ -56,25 +59,21 @@ public class NEIRecipeWidget extends Widget {
     }
 
     public void update() {
-        this.w = Math.max(166, this.handlerInfo.getWidth());
 
-        if (this.showAsWidget || !this.handlerInfo.expandVertically()) {
+        if (this.showAsWidget || !this.handlerInfo.getUseCustomScroll()) {
             final int recipeHeight = this.handlerRef.handler.getRecipeHeight(this.handlerRef.recipeIndex);
+            this.w = Math.max(166, this.handlerInfo.getWidth());
             this.h = recipeHeight > 0 ? recipeHeight : this.handlerInfo.getHeight();
             this.h += this.handlerInfo.getYShift();
         }
 
-        if (!this.needUpdate && !NEIClientUtils.shiftKey() && (this.cycleticks++) / 20 != this.lastcycle) {
-            this.lastcycle = this.cycleticks / 20;
-            this.needUpdate = true;
-        }
+        this.update = true;
     }
 
     public List<GuiRecipeButton> getRecipeButtons() {
 
         if (this.recipeButtons == null) {
-            if (this.handlerRef.handler.getResultStack(this.handlerRef.recipeIndex) != null
-                    || !this.handlerRef.handler.getOtherStacks(this.handlerRef.recipeIndex).isEmpty()) {
+            if (!getOutputs().isEmpty()) {
                 this.recipeButtons = initButtons();
             } else {
                 this.recipeButtons = Collections.emptyList();
@@ -163,9 +162,17 @@ public class NEIRecipeWidget extends Widget {
     public void draw(int mouseX, int mouseY) {
         final int yShift = this.handlerInfo.getYShift();
 
-        if (this.needUpdate) {
-            this.needUpdate = false;
-            updatePermutations();
+        if (this.update) {
+            this.update = false;
+
+            if (!NEIClientUtils.shiftKey() && (this.cycleticks++) / 20 != this.lastcycle || this.lastcycle == -1) {
+                this.lastcycle = this.cycleticks / 20;
+                updatePermutations();
+            }
+
+            for (GuiRecipeButton button : getRecipeButtons()) {
+                button.update();
+            }
         }
 
         GL11.glPushAttrib(GL11.GL_ENABLE_BIT | GL11.GL_COLOR_BUFFER_BIT | GL11.GL_LIGHTING_BIT);
@@ -179,7 +186,7 @@ public class NEIRecipeWidget extends Widget {
 
         GuiContainerManager.enableMatrixStackLogging();
 
-        for (PositionedStack pStack : this.handlerRef.handler.getIngredientStacks(this.handlerRef.recipeIndex)) {
+        for (PositionedStack pStack : getInputs()) {
             GuiContainerManager.drawItem(pStack.relx, pStack.rely, pStack.item);
 
             if (pStack.contains(mouseX - this.x, mouseY - this.y - yShift)) {
@@ -187,7 +194,7 @@ public class NEIRecipeWidget extends Widget {
             }
         }
 
-        for (PositionedStack pStack : this.handlerRef.handler.getOtherStacks(this.handlerRef.recipeIndex)) {
+        for (PositionedStack pStack : getCatalysts()) {
             GuiContainerManager.drawItem(pStack.relx, pStack.rely, pStack.item);
 
             if (pStack.contains(mouseX - this.x, mouseY - this.y - yShift)) {
@@ -195,12 +202,11 @@ public class NEIRecipeWidget extends Widget {
             }
         }
 
-        final PositionedStack pStackResult = this.handlerRef.handler.getResultStack(this.handlerRef.recipeIndex);
-        if (pStackResult != null) {
-            GuiContainerManager.drawItem(pStackResult.relx, pStackResult.rely, pStackResult.item);
-            if (pStackResult.contains(mouseX - this.x, mouseY - this.y - yShift)) {
-                NEIClientUtils.gl2DRenderContext(
-                        () -> GuiDraw.drawRect(pStackResult.relx, pStackResult.rely, 16, 16, 0x80FFFFFF));
+        for (PositionedStack pStack : getOutputs()) {
+            GuiContainerManager.drawItem(pStack.relx, pStack.rely, pStack.item);
+
+            if (pStack.contains(mouseX - this.x, mouseY - this.y - yShift)) {
+                NEIClientUtils.gl2DRenderContext(() -> GuiDraw.drawRect(pStack.relx, pStack.rely, 16, 16, 0x80FFFFFF));
             }
         }
 
@@ -312,14 +318,60 @@ public class NEIRecipeWidget extends Widget {
             return tooltip;
         }
 
-        return this.handlerRef.handler.handleItemTooltip(guiRecipe, itemstack, tooltip, this.handlerRef.recipeIndex);
+        tooltip = this.handlerRef.handler.handleItemTooltip(guiRecipe, itemstack, tooltip, this.handlerRef.recipeIndex);
+
+        if (NEIClientConfig.showCycledIngredientsTooltip() && itemstack != null) {
+            final int yShift = this.handlerInfo.getYShift();
+            PositionedStack hovered = null;
+
+            for (PositionedStack pStack : getInputs()) {
+                if (pStack.contains(mousex - this.x, mousey - this.y - yShift)) {
+                    hovered = pStack;
+                    break;
+                }
+            }
+
+            if (hovered == null) {
+                for (PositionedStack pStack : getCatalysts()) {
+                    if (pStack.contains(mousex - this.x, mousey - this.y - yShift)) {
+                        hovered = pStack;
+                    }
+                }
+            }
+
+            if (hovered == null || hovered.items.length <= 1) {
+                this.acceptsFollowingTooltipLineHandler = null;
+            } else if (this.acceptsFollowingTooltipLineHandler == null
+                    || this.acceptsFollowingTooltipLineHandler.tooltipGUID != hovered) {
+                        this.acceptsFollowingTooltipLineHandler = AcceptsFollowingTooltipLineHandler
+                                .of(hovered, hovered.getFilteredPermutations(), hovered.item);
+                    }
+        } else if (this.acceptsFollowingTooltipLineHandler != null) {
+            this.acceptsFollowingTooltipLineHandler = null;
+        }
+
+        if (this.acceptsFollowingTooltipLineHandler != null) {
+            tooltip.add(GuiDraw.TOOLTIP_HANDLER + GuiDraw.getTipLineId(this.acceptsFollowingTooltipLineHandler));
+        }
+
+        return tooltip;
     }
 
     @Override
     public Map<String, String> handleHotkeys(int mouseX, int mouseY, Map<String, String> hotkeys) {
-        return forEachButtons(
+        final Map<String, String> buttonHotkeys = forEachButtons(
                 button -> button.contains(mouseX, mouseY) ? button.handleHotkeys(mouseX, mouseY, hotkeys) : null,
                 hotkeys);
+
+        if (this.acceptsFollowingTooltipLineHandler != null) {
+            buttonHotkeys.put(
+                    NEIClientUtils.getKeyName(
+                            NEIClientUtils.SHIFT_HASH,
+                            NEIMouseUtils.MOUSE_BTN_NONE + NEIMouseUtils.MOUSE_SCROLL),
+                    NEIClientUtils.translate("recipe.accepts.scroll"));
+        }
+
+        return buttonHotkeys;
     }
 
     @Override
@@ -348,12 +400,14 @@ public class NEIRecipeWidget extends Widget {
             final int stackIndex = indexOf(items, overStack.item);
             final ItemStack stack = items.get((items.size() - scroll + stackIndex) % items.size());
 
-            Stream.concat(
-                    this.handlerRef.handler.getIngredientStacks(this.handlerRef.recipeIndex).stream(),
-                    this.handlerRef.handler.getOtherStacks(this.handlerRef.recipeIndex).stream())
-                    .filter(pStack -> pStack.containsWithNBT(stack))
+            Stream.concat(getInputs().stream(), getCatalysts().stream()).filter(pStack -> pStack.containsWithNBT(stack))
                     .forEach(pStack -> pStack.setPermutationToRender(stack));
 
+            if (this.acceptsFollowingTooltipLineHandler != null) {
+                this.acceptsFollowingTooltipLineHandler
+                        .setActiveStack(((PositionedStack) this.acceptsFollowingTooltipLineHandler.tooltipGUID).item);
+            }
+
             return true;
         }
 
@@ -391,12 +445,7 @@ public class NEIRecipeWidget extends Widget {
     public boolean isFocusedRecipe(int mx, int my) {
         final int yShift = this.handlerInfo.getYShift();
 
-        final PositionedStack pStackResult = this.handlerRef.handler.getResultStack(this.handlerRef.recipeIndex);
-        if (pStackResult != null && pStackResult.contains(mx - this.x, my - this.y - yShift)) {
-            return true;
-        }
-
-        for (PositionedStack pStackOver : this.handlerRef.handler.getOtherStacks(this.handlerRef.recipeIndex)) {
+        for (PositionedStack pStackOver : getOutputs()) {
             if (pStackOver.contains(mx - this.x, my - this.y - yShift)) {
                 return true;
             }
@@ -408,21 +457,22 @@ public class NEIRecipeWidget extends Widget {
     public PositionedStack getPositionedStackMouseOver(int mx, int my) {
         final int yShift = this.handlerInfo.getYShift();
 
-        for (PositionedStack pStack : this.handlerRef.handler.getIngredientStacks(this.handlerRef.recipeIndex)) {
+        for (PositionedStack pStack : getInputs()) {
             if (pStack.contains(mx - this.x, my - this.y - yShift)) {
                 return pStack;
             }
         }
 
-        for (PositionedStack pStack : this.handlerRef.handler.getOtherStacks(this.handlerRef.recipeIndex)) {
+        for (PositionedStack pStack : getCatalysts()) {
             if (pStack.contains(mx - this.x, my - this.y - yShift)) {
                 return pStack;
             }
         }
 
-        final PositionedStack pStackResult = this.handlerRef.handler.getResultStack(this.handlerRef.recipeIndex);
-        if (pStackResult != null && pStackResult.contains(mx - this.x, my - this.y - yShift)) {
-            return pStackResult;
+        for (PositionedStack pStack : getOutputs()) {
+            if (pStack.contains(mx - this.x, my - this.y - yShift)) {
+                return pStack;
+            }
         }
 
         return null;
@@ -456,7 +506,7 @@ public class NEIRecipeWidget extends Widget {
 
     protected void updatePermutations() {
 
-        for (PositionedStack pStack : this.handlerRef.handler.getIngredientStacks(this.handlerRef.recipeIndex)) {
+        for (PositionedStack pStack : getInputs()) {
             if (pStack.items.length > 1) {
                 final List<ItemStack> permutations = this.permutations
                         .computeIfAbsent(pStack, stack -> stack.getFilteredPermutations(FavoriteRecipes::contains));
@@ -464,7 +514,7 @@ public class NEIRecipeWidget extends Widget {
             }
         }
 
-        for (PositionedStack pStack : this.handlerRef.handler.getOtherStacks(this.handlerRef.recipeIndex)) {
+        for (PositionedStack pStack : getCatalysts()) {
             if (pStack.items.length > 1) {
                 final List<ItemStack> permutations = this.permutations
                         .computeIfAbsent(pStack, stack -> stack.getFilteredPermutations(FavoriteRecipes::contains));
@@ -472,13 +522,28 @@ public class NEIRecipeWidget extends Widget {
             }
         }
 
-        final PositionedStack pStackResult = this.handlerRef.handler.getResultStack(this.handlerRef.recipeIndex);
-        if (pStackResult != null && pStackResult.items.length > 1) {
-            final List<ItemStack> permutations = this.permutations
-                    .computeIfAbsent(pStackResult, stack -> stack.getFilteredPermutations(FavoriteRecipes::contains));
-            pStackResult.setPermutationToRender(permutations.get(this.lastcycle % permutations.size()));
+        if (this.acceptsFollowingTooltipLineHandler != null) {
+            this.acceptsFollowingTooltipLineHandler
+                    .setActiveStack(((PositionedStack) this.acceptsFollowingTooltipLineHandler.tooltipGUID).item);
         }
 
     }
 
+    protected List<PositionedStack> getInputs() {
+        return this.handlerRef.handler.getIngredientStacks(this.handlerRef.recipeIndex);
+    }
+
+    protected List<PositionedStack> getOutputs() {
+        final PositionedStack pStackResult = this.handlerRef.handler.getResultStack(this.handlerRef.recipeIndex);
+        return pStackResult != null ? Arrays.asList(pStackResult)
+                : this.handlerRef.handler.getOtherStacks(this.handlerRef.recipeIndex);
+    }
+
+    protected List<PositionedStack> getCatalysts() {
+        if (this.handlerRef.handler.getResultStack(this.handlerRef.recipeIndex) == null) {
+            return Collections.emptyList();
+        }
+        return this.handlerRef.handler.getOtherStacks(this.handlerRef.recipeIndex);
+    }
+
 }

src/main/java/codechicken/nei/recipe/Recipe.java

@@ -236,11 +236,6 @@ public class Recipe {
                     return false;
                 }
 
-                if (this.result != null && anRecipeId.result != null
-                        && !StackInfo.equalItemAndNBT(this.result, anRecipeId.result, true)) {
-                    return false;
-                }
-
                 for (int idx = 0; idx < this.ingredients.size(); idx++) {
                     if (!StackInfo.equalItemAndNBT(this.ingredients.get(idx), anRecipeId.ingredients.get(idx), true)) {
                         return false;

src/main/java/codechicken/nei/recipe/RecipeItemInputHandler.java

@@ -14,6 +14,7 @@ import codechicken.nei.ItemPanels;
 import codechicken.nei.ItemsGrid.ItemsGridSlot;
 import codechicken.nei.NEIClientConfig;
 import codechicken.nei.api.ShortcutInputHandler;
+import codechicken.nei.bookmark.BookmarkItem.BookmarkItemType;
 import codechicken.nei.bookmark.BookmarksGridSlot;
 import codechicken.nei.guihook.GuiContainerManager;
 import codechicken.nei.guihook.IContainerInputHandler;
@@ -81,7 +82,7 @@ public class RecipeItemInputHandler implements IContainerInputHandler, IContaine
             final BookmarksGridSlot slot = ItemPanels.bookmarkPanel.getSlotMouseOver(mousex, mousey);
 
             if (slot != null && slot.getRecipeId() != null
-                    && !slot.isIngredient()
+                    && slot.getType() != BookmarkItemType.INGREDIENT
                     && NEIClientConfig.getRecipeTooltipsMode() != 0) {
                 final int tooltipMode = NEIClientConfig.getRecipeTooltipsMode();
                 final BookmarkViewMode viewMode = slot.getGroup().viewMode;

src/main/java/codechicken/nei/recipe/RecipePageManager.java

@@ -0,0 +1,158 @@
+package codechicken.nei.recipe;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import codechicken.nei.NEIClientConfig;
+import codechicken.nei.Widget;
+import codechicken.nei.scroll.ScrollContainer;
+
+public class RecipePageManager {
+
+    private SearchRecipeHandler<?> handler;
+    private ScrollContainer container;
+    private HandlerInfo handlerInfo;
+
+    private String cacheKey = "";
+    private int currentPageIndex = -1;
+    private List<Integer> recipeIndices = new ArrayList<>();
+    private List<List<Widget>> pageWidgets = new ArrayList<>();
+
+    public RecipePageManager(SearchRecipeHandler<?> handler, HandlerInfo handlerInfo, ScrollContainer container) {
+        this.handler = handler;
+        this.handlerInfo = handlerInfo;
+        this.container = container;
+
+        rebuildPages();
+    }
+
+    public boolean rebuildPages() {
+        final String cacheKey = handlerInfo.getHandlerName() + ":"
+                + getNumRecipes()
+                + ":"
+                + this.container.getVisibleHeight()
+                + ":"
+                + GuiRecipe.searchField.text();
+
+        if (cacheKey.equals(this.cacheKey)) {
+            return false;
+        }
+
+        this.cacheKey = cacheKey;
+        this.pageWidgets.clear();
+
+        final boolean useCustomScroll = this.handlerInfo.getUseCustomScroll();
+        final int handlerHeight = this.handlerInfo.getHeight() + this.handlerInfo.getYShift();
+        final boolean multipleWidgetsAllowed = !useCustomScroll && handlerInfo.isMultipleWidgetsAllowed();
+        final boolean infiniteScroll = !useCustomScroll
+                && NEIClientConfig.getBooleanSetting("inventory.guirecipe.infiniteScroll");
+
+        final int heightAvailable = this.container.getVisibleHeight();
+        final int width = Math.max(166, this.handlerInfo.getWidth());
+        final int numRecipes = getNumRecipes();
+        List<Widget> widgets = new ArrayList<>();
+        int shiftY = 0;
+
+        for (int i = 0; i < numRecipes; i++) {
+            final int recipeIndex = this.handler.ref(i);
+            final NEIRecipeWidget widget = RecipeHandlerRef.of(this.handler.original, recipeIndex).getRecipeWidget();
+            widget.w = width;
+
+            if (useCustomScroll) {
+                widget.h = Math.min(handlerHeight, heightAvailable);
+            }
+
+            if (!widgets.isEmpty()
+                    && (!multipleWidgetsAllowed || !infiniteScroll && shiftY + widget.h > heightAvailable)) {
+                this.pageWidgets.add(widgets);
+                widgets = new ArrayList<>();
+                shiftY = 0;
+            }
+
+            widgets.add(widget);
+            shiftY += widget.h;
+        }
+
+        if (!widgets.isEmpty()) {
+            this.pageWidgets.add(widgets);
+        }
+
+        changePage(0);
+
+        return true;
+    }
+
+    public boolean isMultipleWidgetsAllowed() {
+        return !this.handlerInfo.getUseCustomScroll() && this.handlerInfo.isMultipleWidgetsAllowed();
+    }
+
+    public int getNumRecipes() {
+        return this.handler.numRecipes();
+    }
+
+    public int getCurrentPageIndex() {
+        return this.currentPageIndex;
+    }
+
+    public int getNumPages() {
+        return this.pageWidgets.size();
+    }
+
+    public void changePage(int delta) {
+        final int numPages = getNumPages();
+        final int page = numPages > 0 ? (numPages + Math.max(0, this.currentPageIndex) + delta) % numPages : 0;
+
+        if (this.currentPageIndex == page) {
+            return;
+        }
+
+        this.currentPageIndex = page;
+        this.recipeIndices = new ArrayList<>();
+
+        for (Widget widget : getCurrentPageWidgets()) {
+            if (widget instanceof NEIRecipeWidget recipeWidget) {
+                this.recipeIndices.add(recipeWidget.getRecipeHandlerRef().recipeIndex);
+            }
+        }
+
+        this.container.setVerticalScrollOffset(0);
+    }
+
+    public void gotoRefIndex(int refIndex) {
+        int page = 0;
+
+        for (int i = 0; i < this.pageWidgets.size(); i++) {
+            refIndex -= this.pageWidgets.get(i).size();
+            if (refIndex < 0) {
+                page = i;
+                break;
+            }
+        }
+
+        changePage(page);
+    }
+
+    public List<Widget> getCurrentPageWidgets() {
+        if (this.pageWidgets.isEmpty()) {
+            return Collections.emptyList();
+        }
+
+        List<Widget> currentWidgets = this.pageWidgets.get(this.currentPageIndex);
+        int shiftY = 0;
+
+        for (Widget widget : currentWidgets) {
+            if (widget instanceof NEIRecipeWidget recipeWidget) {
+                recipeWidget.setLocation(0, shiftY);
+            }
+            shiftY += widget.h;
+        }
+
+        return currentWidgets;
+    }
+
+    public List<Integer> getRecipeIndices() {
+        return this.recipeIndices;
+    }
+
+}

src/main/java/codechicken/nei/recipe/StackInfo.java

@@ -76,6 +76,16 @@ public class StackInfo {
         return stack;
     }
 
+    public static ItemStack normalizeRecipeQueryStack(ItemStack stack) {
+        ItemStack result = null;
+
+        for (int i = stackStringifyHandlers.size() - 1; i >= 0 && result == null; i--) {
+            result = stackStringifyHandlers.get(i).normalizeRecipeQueryStack(stack);
+        }
+
+        return result == null ? stack : result;
+    }
+
     public static void pauseItemDamageSound(boolean pause) {
         if (isPausedItemDamageSound != (isPausedItemDamageSound = pause)) {
             for (IStackStringifyHandler handler : stackStringifyHandlers) {

src/main/java/codechicken/nei/recipe/chain/RecipeChainMath.java

@@ -16,6 +16,7 @@ import net.minecraft.nbt.NBTTagCompound;
 import codechicken.nei.ItemStackAmount;
 import codechicken.nei.NEIClientUtils;
 import codechicken.nei.bookmark.BookmarkItem;
+import codechicken.nei.bookmark.BookmarkItem.BookmarkItemType;
 import codechicken.nei.recipe.Recipe;
 import codechicken.nei.recipe.Recipe.RecipeId;
 import codechicken.nei.recipe.Recipe.RecipeIngredient;
@@ -52,20 +53,12 @@ public class RecipeChainMath {
     private final List<ItemStack> containerItemsBlacklist = new ArrayList<>();
 
     private RecipeChainMath(List<BookmarkItem> recipeItems, Set<RecipeId> collapsedRecipes) {
-        final Map<RecipeId, Integer> recipeState = new HashMap<>();
         final Map<RecipeId, Long> multipliers = new HashMap<>();
 
         for (BookmarkItem item : recipeItems) {
-            if (item.recipeId != null) {
-                recipeState
-                        .put(item.recipeId, recipeState.getOrDefault(item.recipeId, 0) | (item.isIngredient ? 1 : 2));
-            }
-        }
-
-        for (BookmarkItem item : recipeItems) {
-            if (recipeState.getOrDefault(item.recipeId, 0) != 3) {
+            if (item.recipeId == null || item.type == BookmarkItemType.ITEM) {
                 this.initialItems.add(item.copy());
-            } else if (item.isIngredient) {
+            } else if (item.type == BookmarkItemType.INGREDIENT) {
                 this.recipeIngredients.add(item.copyWithAmount(0));
             } else {
                 this.recipeResults.add(item.copyWithAmount(0));
@@ -209,7 +202,7 @@ public class RecipeChainMath {
                                 item.getItemStack(amount),
                                 item.getStackSize(amount),
                                 ROOT_RECIPE_ID,
-                                true,
+                                BookmarkItemType.INGREDIENT,
                                 BookmarkItem.generatePermutations(item.itemStack, null)));
             }
         }
@@ -217,7 +210,7 @@ public class RecipeChainMath {
         this.outputRecipes.clear();
         this.outputRecipes.put(ROOT_RECIPE_ID, 1L);
         this.recipeResults.removeIf(item -> ROOT_RECIPE_ID.equals(item.recipeId));
-        this.recipeResults.add(BookmarkItem.of(-1, ROOT_ITEM, 1, ROOT_RECIPE_ID, false));
+        this.recipeResults.add(BookmarkItem.of(-1, ROOT_ITEM, 1, ROOT_RECIPE_ID, BookmarkItemType.RESULT));
         this.recipeIngredients.addAll(rootIngredients);
 
         return ROOT_RECIPE_ID;
@@ -236,7 +229,7 @@ public class RecipeChainMath {
         final RecipeId recipeId = recipe.getRecipeId();
         final ItemStack result = recipe.getResult();
 
-        chainItems.add(BookmarkItem.of(-1, result, StackInfo.getAmount(result), recipeId, false));
+        chainItems.add(BookmarkItem.of(-1, result, StackInfo.getAmount(result), recipeId, BookmarkItemType.RESULT));
 
         for (RecipeIngredient ingr : recipe.getIngredients()) {
             chainItems.add(
@@ -245,7 +238,7 @@ public class RecipeChainMath {
                             ingr.getItemStack(),
                             ingr.getAmount(),
                             recipeId,
-                            true,
+                            BookmarkItemType.INGREDIENT,
                             BookmarkItem.generatePermutations(ingr.getItemStack(), recipe)));
         }
 

src/main/java/codechicken/nei/recipe/stackinfo/GTFluidStackStringifyHandler.java

@@ -19,9 +19,8 @@ public class GTFluidStackStringifyHandler implements IStackStringifyHandler {
     protected static Class<?> itemFluidDisplay = null;
     protected static Method getFluidDisplayStack = null;
     protected static Method getFluidFromDisplayStack = null;
-    public static boolean replaceAE2FCFluidDrop = false;
-    private static Class<?> gtMetaGeneratedTool = null;
-    private static Field playSound = null;
+    protected static Class<?> gtMetaGeneratedTool = null;
+    protected static Field playSound = null;
 
     static {
         try {
@@ -48,7 +47,7 @@ public class GTFluidStackStringifyHandler implements IStackStringifyHandler {
 
     public NBTTagCompound convertItemStackToNBT(ItemStack stack, boolean saveStackSize) {
 
-        if (replaceAE2FCFluidDrop || stack.getItem() != GameRegistry.findItem("ae2fc", "fluid_drop")) {
+        if (stack.getItem() != GameRegistry.findItem("ae2fc", "fluid_drop")) {
             final FluidStack fluidStack = getFluid(stack);
 
             if (fluidStack != null) {
@@ -69,14 +68,11 @@ public class GTFluidStackStringifyHandler implements IStackStringifyHandler {
             final Fluid fluid = FluidRegistry.getFluid(fluidName);
             final int amount = nbtTag.getInteger("Count");
 
-            try {
-                final Object obj = getFluidDisplayStack.invoke(null, new FluidStack(fluid, amount), true);
-
-                if (obj != null) {
-                    return (ItemStack) obj;
-                }
-
-            } catch (Exception e) {}
+            if (fluid != null) {
+                try {
+                    return (ItemStack) getFluidDisplayStack.invoke(null, new FluidStack(fluid, amount), true);
+                } catch (Exception e) {}
+            }
         }
 
         return null;
@@ -114,6 +110,21 @@ public class GTFluidStackStringifyHandler implements IStackStringifyHandler {
         return null;
     }
 
+    public ItemStack normalizeRecipeQueryStack(ItemStack stack) {
+
+        if (stack.getItem() == GameRegistry.findItem("ae2fc", "fluid_drop")) {
+            final FluidStack fluidStack = getFluid(stack);
+
+            if (fluidStack != null) {
+                try {
+                    return (ItemStack) getFluidDisplayStack.invoke(null, fluidStack, true);
+                } catch (Exception e) {}
+            }
+        }
+
+        return null;
+    }
+
     @Override
     public void pauseItemDamageSound(boolean pause) {
         if (playSound != null) {

src/main/java/codechicken/nei/scroll/ScrollBar.java

@@ -40,12 +40,17 @@ public class ScrollBar {
     private ScrollPlace scrollPlace = ScrollPlace.END;
     private float handleClickOffset = -1;
 
-    private int scrollbarSize = 6;
-    private int thumbPadding = 0;
+    private int trackWidth = 6;
 
-    private int padding = 0;
-    private int marginStart = 0;
-    private int marginEnd = 0;
+    private int thumbPaddingLeft = 0;
+    private int thumbPaddingRight = 0;
+    private int thumbPaddingTop = 0;
+    private int thumbPaddingBottom = 0;
+
+    private int trackPaddingLeft = 0;
+    private int trackPaddingRight = 0;
+    private int trackPaddingTop = 0;
+    private int trackPaddingBottom = 0;
 
     private DrawableResource thumbTexture;
     private int thumbSliceStart;
@@ -60,58 +65,65 @@ public class ScrollBar {
     }
 
     public static ScrollBar defaultVerticalBar() {
-        return new ScrollBar().setScrollbarSize(8)
-                .setTrackTexture(new DrawableBuilder("nei:textures/nei_sprites.png", 28, 95, 11, 11).build(), 3, 4)
-                .setThumbTexture(new DrawableBuilder("nei:textures/nei_sprites.png", 21, 96, 7, 9).build(), 3, 2)
-                .setThumbPadding(1);
+        return new ScrollBar().setTrackWidth(8)
+                .setTrackTexture(new DrawableBuilder("nei:textures/nei_sprites.png", 29, 95, 8, 11).build(), 3, 4)
+                .setThumbTexture(new DrawableBuilder("nei:textures/nei_sprites.png", 22, 96, 6, 9).build(), 3, 2)
+                .setThumbPadding(1, 1, 1, 1);
     }
 
     public static ScrollBar defaultHorizontalBar() {
-        return new ScrollBar().setScrollbarSize(8).setOverflowType(OverflowType.SCROLL).setScrollPlace(ScrollPlace.END)
+        return new ScrollBar().setTrackWidth(8).setOverflowType(OverflowType.SCROLL)
                 .setTrackTexture(new DrawableBuilder("nei:textures/nei_sprites.png", 0, 97, 11, 8).build(), 3, 4)
-                .setThumbTexture(new DrawableBuilder("nei:textures/nei_sprites.png", 12, 97, 9, 7).build(), 3, 2)
-                .setThumbPadding(1);
+                .setThumbTexture(new DrawableBuilder("nei:textures/nei_sprites.png", 12, 98, 9, 6).build(), 3, 2)
+                .setThumbPadding(1, 1, 1, 1);
     }
 
-    public ScrollBar setScrollbarSize(int scrollbarSize) {
-        this.scrollbarSize = scrollbarSize;
+    /**
+     * Sets the size of the scrollbar without texture in the non-scrolling axis (width for vertical, height for
+     * horizontal).
+     * 
+     * @param trackWidth
+     * @return
+     */
+    public ScrollBar setTrackWidth(int trackWidth) {
+        this.trackWidth = trackWidth;
         return this;
     }
 
-    public ScrollBar setThumbPadding(int thumbPadding) {
-        this.thumbPadding = thumbPadding;
+    public ScrollBar setTrackPadding(int left, int top, int right, int bottom) {
+        this.trackPaddingLeft = left;
+        this.trackPaddingRight = right;
+        this.trackPaddingTop = top;
+        this.trackPaddingBottom = bottom;
         return this;
     }
 
-    public ScrollBar setPadding(int padding) {
-        this.padding = padding;
+    public ScrollBar setThumbPadding(int left, int top, int right, int bottom) {
+        this.thumbPaddingLeft = left;
+        this.thumbPaddingRight = right;
+        this.thumbPaddingTop = top;
+        this.thumbPaddingBottom = bottom;
         return this;
     }
 
-    public int getPadding() {
-        return this.padding;
+    public int getTrackWidth() {
+
+        if (this.trackTexture != null) {
+            return this.scrollType == ScrollType.HORIZONTAL ? this.trackTexture.getHeight()
+                    : this.trackTexture.getWidth();
+        }
+
+        return this.trackWidth;
     }
 
-    public ScrollBar setMarginStart(int start) {
-        this.marginStart = start;
-        return this;
-    }
+    protected int getThumbWidth() {
 
-    public int getMarginStart() {
-        return this.marginStart;
-    }
+        if (this.thumbTexture != null) {
+            return this.scrollType == ScrollType.HORIZONTAL ? this.thumbTexture.getHeight()
+                    : this.thumbTexture.getWidth();
+        }
 
-    public ScrollBar setMarginEnd(int end) {
-        this.marginEnd = end;
-        return this;
-    }
-
-    public int getMarginEnd() {
-        return this.marginEnd;
-    }
-
-    public int getScrollbarSize() {
-        return this.scrollbarSize;
+        return getTrackWidth();
     }
 
     public ScrollBar setThumbTexture(DrawableResource texture, int sliceStart, int sliceEnd) {
@@ -168,14 +180,18 @@ public class ScrollBar {
     }
 
     private int getMaxThumbSize(ScrollContainer container) {
-        return getMaxTrackSize(container) - this.thumbPadding * 2;
+        if (this.scrollType == ScrollType.HORIZONTAL) {
+            return getMaxTrackSize(container) - this.thumbPaddingLeft - this.thumbPaddingRight;
+        } else {
+            return getMaxTrackSize(container) - this.thumbPaddingTop - this.thumbPaddingBottom;
+        }
     }
 
     private int getMaxTrackSize(ScrollContainer container) {
         if (this.scrollType == ScrollType.HORIZONTAL) {
-            return container.w - this.marginStart - this.marginEnd;
+            return container.w - this.trackPaddingLeft - this.trackPaddingRight;
         } else {
-            return container.h - this.marginStart - this.marginEnd;
+            return container.h - this.trackPaddingTop - this.trackPaddingBottom;
         }
     }
 
@@ -212,38 +228,19 @@ public class ScrollBar {
     }
 
     public Rectangle4i trackBounds(ScrollContainer container) {
+        int trackWidth = getTrackWidth();
 
         if (this.scrollType == ScrollType.HORIZONTAL) {
+            final int y = this.scrollPlace == ScrollPlace.START ? container.y - trackWidth - this.trackPaddingBottom
+                    : container.y + container.h + this.trackPaddingTop;
 
-            if (this.scrollPlace == ScrollPlace.START) {
-                return new Rectangle4i(
-                        container.x + this.marginStart,
-                        container.y - this.padding - this.scrollbarSize,
-                        getMaxTrackSize(container),
-                        this.scrollbarSize);
-            } else {
-                return new Rectangle4i(
-                        container.x + this.marginStart,
-                        container.y + container.h + this.padding,
-                        getMaxTrackSize(container),
-                        this.scrollbarSize);
-            }
+            return new Rectangle4i(container.x + this.trackPaddingLeft, y, getMaxTrackSize(container), trackWidth);
 
         } else {
+            final int x = this.scrollPlace == ScrollPlace.START ? container.x - trackWidth - this.trackPaddingRight
+                    : container.x + container.w + this.trackPaddingLeft;
 
-            if (this.scrollPlace == ScrollPlace.START) {
-                return new Rectangle4i(
-                        container.x - this.padding - this.scrollbarSize,
-                        container.y + this.marginStart,
-                        this.scrollbarSize,
-                        getMaxTrackSize(container));
-            } else {
-                return new Rectangle4i(
-                        container.x + container.w + this.padding,
-                        container.y + this.marginStart,
-                        this.scrollbarSize,
-                        getMaxTrackSize(container));
-            }
+            return new Rectangle4i(x, container.y + this.trackPaddingTop, trackWidth, getMaxTrackSize(container));
 
         }
 
@@ -255,9 +252,25 @@ public class ScrollBar {
         final Rectangle4i bounds = trackBounds(container);
 
         if (this.scrollType == ScrollType.HORIZONTAL) {
-            return new Rectangle4i(bounds.x + this.thumbPadding + offset, bounds.y, mainAxisSize, bounds.h);
+            final int y = this.scrollPlace == ScrollPlace.START
+                    ? bounds.y + bounds.h - getThumbWidth() - this.thumbPaddingBottom
+                    : bounds.y + this.thumbPaddingTop;
+
+            return new Rectangle4i(
+                    bounds.x + this.thumbPaddingLeft + offset,
+                    y,
+                    mainAxisSize,
+                    bounds.h - this.thumbPaddingTop - this.thumbPaddingBottom);
         } else {
-            return new Rectangle4i(bounds.x, bounds.y + this.thumbPadding + offset, bounds.w, mainAxisSize);
+            final int x = this.scrollPlace == ScrollPlace.START
+                    ? bounds.x + bounds.w - getThumbWidth() - this.thumbPaddingRight
+                    : bounds.x + this.thumbPaddingLeft;
+
+            return new Rectangle4i(
+                    x,
+                    bounds.y + this.thumbPaddingTop + offset,
+                    bounds.w - this.thumbPaddingLeft - this.thumbPaddingRight,
+                    mainAxisSize);
         }
     }
 
@@ -278,7 +291,7 @@ public class ScrollBar {
             final Rectangle4i thumbBounds = thumbBounds(container);
 
             if (this.scrollType == ScrollType.HORIZONTAL) {
-                final int relativeX = mx - bounds.x - this.thumbPadding;
+                final int relativeX = mx - bounds.x - this.thumbPaddingLeft;
 
                 if (mx < thumbBounds.x || mx > thumbBounds.x + thumbBounds.w) {
                     this.handleClickOffset = mainAxisSize / 2;
@@ -290,7 +303,7 @@ public class ScrollBar {
                         * (container.getActualWidth() - container.getVisibleWidth())) / thumbSize;
                 container.setHorizontalScrollOffset((int) newOffset);
             } else {
-                final int relativeY = my - bounds.y - this.thumbPadding;
+                final int relativeY = my - bounds.y - this.thumbPaddingTop;
 
                 if (my < thumbBounds.y || my > thumbBounds.y + thumbBounds.h) {
                     this.handleClickOffset = mainAxisSize / 2f;
@@ -318,12 +331,12 @@ public class ScrollBar {
             final float thumbSize = getMaxThumbSize(container) - mainAxisSize;
 
             if (this.scrollType == ScrollType.HORIZONTAL) {
-                final int relativeX = mx - bounds.x - this.thumbPadding;
+                final int relativeX = mx - bounds.x - this.thumbPaddingLeft;
                 final float newOffset = ((relativeX - this.handleClickOffset)
                         * (container.getActualWidth() - container.getVisibleWidth())) / thumbSize;
                 container.setHorizontalScrollOffset((int) newOffset);
             } else {
-                int relativeY = my - bounds.y - this.thumbPadding;
+                int relativeY = my - bounds.y - this.thumbPaddingTop;
                 final float newOffset = ((relativeY - this.handleClickOffset)
                         * (container.getActualHeight() - container.getVisibleHeight())) / thumbSize;
 
@@ -379,7 +392,7 @@ public class ScrollBar {
     }
 
     private void drawTrackRect(ScrollContainer container, Rectangle4i bounds, float opacity) {
-        final float trackSize = scrollbarSize / 3f;
+        final float trackSize = this.trackWidth / 3f;
         final Color trackColor = new Color(
                 BACKGROUND_COLOR.getRed(),
                 BACKGROUND_COLOR.getGreen(),
@@ -413,36 +426,9 @@ public class ScrollBar {
         GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
 
         if (this.scrollType == ScrollType.HORIZONTAL) {
-
-            if (this.scrollPlace == ScrollPlace.START) {
-                texture.draw(
-                        bounds.x,
-                        bounds.y + (bounds.h - texture.getHeight()) / 2,
-                        bounds.w,
-                        texture.getHeight(),
-                        sliceStart,
-                        sliceEnd,
-                        0,
-                        0);
-            } else {
-                texture.draw(bounds.x, bounds.y, bounds.w, texture.getHeight(), sliceStart, sliceEnd, 0, 0);
-            }
-
+            texture.draw(bounds.x, bounds.y, bounds.w, texture.getHeight(), sliceStart, sliceEnd, 0, 0);
         } else {
-
-            if (this.scrollPlace == ScrollPlace.START) {
-                texture.draw(
-                        bounds.x + (bounds.w - texture.getWidth()) / 2,
-                        bounds.y,
-                        texture.getWidth(),
-                        bounds.h,
-                        0,
-                        0,
-                        sliceStart,
-                        sliceEnd);
-            } else {
-                texture.draw(bounds.x, bounds.y, texture.getWidth(), bounds.h, 0, 0, sliceStart, sliceEnd);
-            }
+            texture.draw(bounds.x, bounds.y, texture.getWidth(), bounds.h, 0, 0, sliceStart, sliceEnd);
         }
 
     }

src/main/resources/assets/nei/lang/en_US.lang

@@ -247,6 +247,9 @@ nei.options.inventory.bookmarks.worldSpecific.false=No
 nei.options.inventory.bookmarks.bookmarkItemsWithRecipe=Bookmark items with recipe
 nei.options.inventory.bookmarks.bookmarkItemsWithRecipe.true=Yes
 nei.options.inventory.bookmarks.bookmarkItemsWithRecipe.false=No
+nei.options.inventory.bookmarks.bookmarkRecipeWithCount=Bookmark recipe with count
+nei.options.inventory.bookmarks.bookmarkRecipeWithCount.true=Yes
+nei.options.inventory.bookmarks.bookmarkRecipeWithCount.false=No
 nei.options.inventory.favorites=Favorites
 nei.options.inventory.favorites.enabled=Visibility
 nei.options.inventory.favorites.enabled.true=Visible