ci: run build and test on release branches

Co-authored-by: Martin Robertz <[email protected]>
Co-authored-by: slprime <[email protected]>

.github/ISSUE_TEMPLATE/000-report-bug.yml

@@ -33,12 +33,10 @@ body:
       description: What Java version are you using? It's worth mentioning that if you play on Java9+ you should try update to latest minor release (e.g. prefer Java 17.0.6 over 17.0.2) of that version.
       options:
         - Java 8
-        - Java 9
-        - Java 11
         - Java 17
-        - Java 19
-        - Java 20
         - Java 21
+        - java 25
+        - java 26
         - Other (Please Specify)
     validations:
       required: true

.github/workflows/build-and-test.yml

@@ -3,9 +3,9 @@ name: Build and test
 
 on:
   pull_request:
-    branches: [ master, main ]
+    branches: [ master, main, release/** ]
   push:
-    branches: [ master, main ]
+    branches: [ master, main, release/** ]
 
 jobs:
   build-and-test:

dependencies.gradle

@@ -5,8 +5,8 @@ configurations.create('gtnhlibEmbed') {
 }
 
 dependencies {
-    api('com.github.GTNewHorizons:CodeChickenCore:1.4.21:dev')
-    devOnlyNonPublishable('com.github.GTNewHorizons:GTNHLib:0.11.49:dev')
+    api('com.github.GTNewHorizons:CodeChickenCore:1.4.22:dev')
+    devOnlyNonPublishable('com.github.GTNewHorizons:GTNHLib:0.11.54:dev')
 
     shadowImplementation('org.apache.commons:commons-csv:1.10.0')
 
@@ -23,8 +23,8 @@ dependencies {
     testRuntimeOnly('org.junit.platform:junit-platform-launcher')
     testRuntimeOnly("org.lwjgl.lwjgl:lwjgl:2.9.3");
 
-    compileOnly("com.github.GTNewHorizons:GTNHLib:0.11.49") { transitive = false }
-    gtnhlibEmbed("com.github.GTNewHorizons:GTNHLib:0.11.49") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:GTNHLib:0.11.54") { transitive = false }
+    gtnhlibEmbed("com.github.GTNewHorizons:GTNHLib:0.11.54") { transitive = false }
 }
 
 def embedArchiveOperations = gtnhGradle.archiveOperations

settings.gradle

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

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

@@ -574,7 +574,8 @@ public class BookmarkPanel extends PanelWidget<BookmarkGrid> {
         } else if (this.sortableGroup != null) {
             final int overRowIndex = Math.min(grid.getRowIndex(mousey), grid.getRows() - 1);
 
-            if (overRowIndex >= 0 && this.sortableGroup.groupId != this.grid.getRowGroupId(overRowIndex)) {
+            if (overRowIndex >= 0 && !isOverNamespaceControls(mousex, mousey)
+                    && !this.sortableGroup.matches(this.grid, this.grid.getRowGroupId(overRowIndex))) {
                 this.grid.moveGroup(this.sortableGroup, overRowIndex);
             }
 
@@ -1022,14 +1023,18 @@ public class BookmarkPanel extends PanelWidget<BookmarkGrid> {
         this.mouseDownSlot = -1;
     }
 
-    @Override
-    public boolean onMouseWheel(int shift, int mousex, int mousey) {
-
-        if ((!inEditingState() || this.sortableGroup != null) && new Rectangle4i(
+    private boolean isOverNamespaceControls(int mousex, int mousey) {
+        return new Rectangle4i(
                 namespacePrev.x,
                 namespacePrev.y,
                 namespaceNext.x + namespaceNext.w - namespacePrev.x,
-                namespacePrev.h).contains(mousex, mousey)) {
+                namespacePrev.h).contains(mousex, mousey);
+    }
+
+    @Override
+    public boolean onMouseWheel(int shift, int mousex, int mousey) {
+
+        if ((!inEditingState() || this.sortableGroup != null) && isOverNamespaceControls(mousex, mousey)) {
 
             if (shift > 0) {
                 this.storage.prevNamespace();
@@ -1108,7 +1113,7 @@ public class BookmarkPanel extends PanelWidget<BookmarkGrid> {
             final int overRowIndex = Math.min(grid.getRowIndex(mousey), grid.getRows() - 1);
 
             if (this.sortableGroup != null && overRowIndex >= 0
-                    && this.sortableGroup.groupId != this.grid.getRowGroupId(overRowIndex)) {
+                    && !this.sortableGroup.matches(this.grid, this.grid.getRowGroupId(overRowIndex))) {
                 this.grid.moveGroup(this.sortableGroup, overRowIndex);
             }
 

src/main/java/codechicken/nei/GuiNEIButton.java

@@ -7,40 +7,36 @@ import net.minecraft.util.ResourceLocation;
 
 import org.lwjgl.opengl.GL11;
 
+import codechicken.nei.drawable.DrawableBuilder;
+import codechicken.nei.drawable.DrawableResource;
+
 public class GuiNEIButton extends GuiButton {
 
     protected static final ResourceLocation guiTex = new ResourceLocation("textures/gui/widgets.png");
+    private static final DrawableResource[] BACKGROUNDS = new DrawableResource[3];
+
+    static {
+        for (int state = 0; state < BACKGROUNDS.length; state++) {
+            BACKGROUNDS[state] = new DrawableBuilder(guiTex, 0, 46 + state * 20, 200, 20).setSlices(2, 2, 2, 2).build();
+        }
+    }
 
     public GuiNEIButton(int i, int j, int k, int l, int i1, String s) {
         super(i, j, k, l, i1, s);
     }
 
+    protected DrawableResource getBackground(int mouseX, int mouseY, boolean mouseOver) {
+        return BACKGROUNDS[getHoverState(mouseOver)];
+    }
+
     public void drawButton(Minecraft minecraft, int x, int y) {
         if (!visible) return;
 
-        minecraft.renderEngine.bindTexture(guiTex);
-        GL11.glColor4f(1, 1, 1, 1);
         boolean mouseOver = x >= xPosition && y >= yPosition && x < xPosition + width && y < yPosition + height;
-        int k = getHoverState(mouseOver);
-        drawTexturedModalRect(xPosition, yPosition, 0, 46 + k * 20, width / 2, height / 2); // top left
-        drawTexturedModalRect(xPosition + width / 2, yPosition, 200 - width / 2, 46 + k * 20, width / 2, height / 2); // top
-                                                                                                                      // right
-        drawTexturedModalRect(
-                xPosition,
-                yPosition + height / 2,
-                0,
-                46 + k * 20 + 20 - height / 2,
-                width / 2,
-                height / 2); // bottom left
-        drawTexturedModalRect(
-                xPosition + width / 2,
-                yPosition + height / 2,
-                200 - width / 2,
-                46 + k * 20 + 20 - height / 2,
-                width / 2,
-                height / 2); // bottom right
-        mouseDragged(minecraft, x, y);
 
+        GL11.glColor4f(1, 1, 1, 1);
+        getBackground(x, y, mouseOver).draw(xPosition, yPosition, width, height);
+        mouseDragged(minecraft, x, y);
         drawContent(minecraft, x, y, mouseOver);
     }
 
@@ -55,7 +51,7 @@ public class GuiNEIButton extends GuiButton {
         return ColorUtils.buttonLabelNormal.getColor();
     }
 
-    protected void drawContent(Minecraft minecraft, int y, int x, boolean mouseOver) {
+    protected void drawContent(Minecraft minecraft, int x, int y, boolean mouseOver) {
         FontRenderer fontrenderer = minecraft.fontRenderer;
         int color = getTextColour(mouseOver);
 

src/main/java/codechicken/nei/ItemList.java

@@ -11,6 +11,7 @@ import java.util.regex.Pattern;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.StatCollector;
 
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.ListMultimap;
@@ -103,7 +104,7 @@ public class ItemList {
             }
 
             for (String alias : ItemInfo.getAliases(item)) {
-                if (this.pattern.matcher(alias).find()) {
+                if (this.pattern.matcher(StatCollector.translateToLocal(alias)).find()) {
                     return true;
                 }
             }

src/main/java/codechicken/nei/ItemPanel.java

@@ -75,13 +75,7 @@ public class ItemPanel extends PanelWidget<ItemsPanelGrid> {
     }
 
     public static void updateItemList(ArrayList<ItemStack> newItems) {
-        final ItemsPanelGrid grid = ItemPanels.itemPanel.getGrid();
-
-        if (grid.rawItems.size() != newItems.size()) {
-            grid.setPage(0);
-        }
-
-        grid.setItems(newItems);
+        ItemPanels.itemPanel.getGrid().setItems(newItems);
         ItemPanels.itemPanel.realItems = newItems;
     }
 

src/main/java/codechicken/nei/ItemZoom.java

@@ -219,6 +219,11 @@ public class ItemZoom extends Widget implements IContainerInputHandler {
 
     @Override
     public boolean lastKeyTyped(GuiContainer gui, char keyChar, int keyID) {
+        return false;
+    }
+
+    @Override
+    public boolean onHotkeyPressed(GuiContainer gui) {
 
         if (KeyManager.isHashDown("itemzoom.toggle", NEIClientUtils.SHIFT_HASH)) {
             NEIClientConfig.getSetting("inventory.itemzoom.enabled")

src/main/java/codechicken/nei/ItemsPanelGrid.java

@@ -89,6 +89,10 @@ public class ItemsPanelGrid extends ItemsGrid<ItemsPanelGrid.ItemsPanelGridSlot,
     public void refresh(GuiContainer gui) {
 
         if (this.newItems != null) {
+            if (this.rawItems.size() != this.newItems.size()) {
+                this.page = 0;
+            }
+
             this.groupItems.clear();
             this.itemToGroup.clear();
             this.forceExpand = false;

src/main/java/codechicken/nei/KeyManager.java

@@ -4,6 +4,7 @@ import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.Map;
 import java.util.StringJoiner;
+import java.util.function.BooleanSupplier;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.settings.KeyBinding;
@@ -29,6 +30,7 @@ public class KeyManager {
     private static final Map<String, KeyBinding> keyBindings = new HashMap<>();
     private static final Map<String, String> keyAliases = new HashMap<>();
     private static volatile boolean pendingOptionsReload = false;
+    private static int clickedButton = -1;
 
     static {
         // Aliases for legacy keybinds
@@ -73,7 +75,8 @@ public class KeyManager {
             final int keyCode = binding.getKeyCode();
 
             if (keyCode < 0) {
-                return Mouse.isButtonDown(keyCode + 100);
+                final int button = keyCode + 100;
+                return Mouse.isButtonDown(button) || button == clickedButton;
             } else if (keyCode > Keyboard.KEY_NONE && keyCode < Keyboard.KEYBOARD_SIZE) {
                 return Keyboard.isKeyDown(keyCode);
             }
@@ -82,6 +85,40 @@ public class KeyManager {
         return false;
     }
 
+    /**
+     * Whether any NEI key binding is assigned to the given mouse button.
+     */
+    public static boolean isMouseBound(int button) {
+        for (KeyBinding binding : keyBindings.values()) {
+            if (binding.getKeyCode() == button - 100) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Runs a hotkey handler for a click of the given mouse button if the button is bound to any NEI key binding. The
+     * button is reported as down by {@link #isKeyDown} for the duration of the call, because the LWJGL button state can
+     * already be released when a quick click is processed.
+     *
+     * @return true if the click was consumed by the handler
+     */
+    public static boolean handleMouseHotkey(int button, BooleanSupplier handler) {
+        if (!isMouseBound(button)) {
+            return false;
+        }
+
+        final int previous = clickedButton;
+        clickedButton = button;
+
+        try {
+            return handler.getAsBoolean();
+        } finally {
+            clickedButton = previous;
+        }
+    }
+
     public static boolean isHashDown(String ident) {
         return isHashDown(ident, 0);
     }
@@ -107,18 +144,23 @@ public class KeyManager {
 
     public static String getKeyName(String ident, int meta) {
         final int keyCode = getKeyCode(ident);
-        return keyCode == Keyboard.KEY_NONE ? null : NEIKeyboardUtils.getKeyName(keyCode + meta);
+        return keyCode == Keyboard.KEY_NONE ? null : NEIKeyboardUtils.getKeyName(keyCode, meta);
     }
 
     public static String getKeyName(String ident, int meta, int mouseBind) {
         final int keyCode = getKeyCode(ident);
         return keyCode == Keyboard.KEY_NONE && mouseBind == NEIMouseUtils.MOUSE_BTN_NONE ? null
-                : getKeyName(keyCode + meta, mouseBind);
+                : getKeyName(keyCode, meta, mouseBind);
     }
 
     public static String getKeyName(int keyBind, int mouseBind) {
+        final int keyCode = NEIKeyboardUtils.unhash(keyBind);
+        return getKeyName(keyCode, keyBind - keyCode, mouseBind);
+    }
+
+    private static String getKeyName(int keyCode, int hash, int mouseBind) {
         StringJoiner keyText = new StringJoiner(" + ");
-        String keyHash = keyBind == Keyboard.KEY_NONE ? "" : NEIKeyboardUtils.getKeyName(keyBind);
+        String keyHash = keyCode == Keyboard.KEY_NONE && hash == 0 ? "" : NEIKeyboardUtils.getKeyName(keyCode, hash);
         String mouseHash = mouseBind == NEIMouseUtils.MOUSE_BTN_NONE ? "" : NEIMouseUtils.getKeyName(mouseBind);
 
         if (!keyHash.isEmpty()) {

src/main/java/codechicken/nei/LayoutManager.java

@@ -220,6 +220,20 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH
     @Override
     public boolean lastKeyTyped(GuiContainer gui, char keyChar, int keyID) {
 
+        if (isEnabled() && !isHidden()) {
+            for (Widget widget : controlWidgets) {
+                if (inputFocused == null) {
+                    widget.lastKeyTyped(keyID, keyChar);
+                }
+            }
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean onHotkeyPressed(GuiContainer gui) {
+
         if (KeyManager.isKeyDown("gui.hide")) {
             toggleBooleanSetting("inventory.hidden");
             return true;
@@ -234,8 +248,12 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH
             return true;
         }
 
-        if (isEnabled() && !isHidden()) {
-            for (Widget widget : controlWidgets) if (inputFocused == null) widget.lastKeyTyped(keyID, keyChar);
+        if (isEnabled() && !isHidden() && inputFocused == null) {
+            for (Widget widget : controlWidgets) {
+                if (widget.onHotkeyPressed()) {
+                    return true;
+                }
+            }
         }
 
         return false;

src/main/java/codechicken/nei/NEICPH.java

@@ -61,6 +61,9 @@ public class NEICPH implements IClientPacketHandler {
             case S2C.CACHE_BOOKMARK_DATA:
                 handleCacheBookmarkData(packet);
                 break;
+            case S2C.SYNC:
+                ServerSync.onReply(packet.readInt());
+                break;
         }
     }
 

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

@@ -9,7 +9,6 @@ import java.util.Map;
 import java.util.Set;
 import java.util.function.Function;
 import java.util.regex.Pattern;
-import java.util.stream.Stream;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiScreen;
@@ -37,7 +36,6 @@ import codechicken.lib.config.ConfigTag;
 import codechicken.lib.config.ConfigTagParent;
 import codechicken.nei.api.API;
 import codechicken.nei.api.GuiInfo;
-import codechicken.nei.api.IConfigureNEI;
 import codechicken.nei.api.ItemInfo;
 import codechicken.nei.api.NEIInfo;
 import codechicken.nei.config.ConfigSet;
@@ -1026,20 +1024,11 @@ public class NEIClientConfig {
 
                 @Override
                 public void run() {
-                    final Stream<Class<?>> stream = NEIClientConfig.getBooleanSetting("loadPluginsInParallel")
-                            ? NEIClientConfig.pluginsList.parallelStream()
-                            : NEIClientConfig.pluginsList.stream();
-
-                    stream.forEach(clazz -> {
-                        try {
-                            IConfigureNEI config = (IConfigureNEI) clazz.getConstructor().newInstance();
-                            config.loadConfig();
-                            NEIModContainer.plugins.add(config);
-                            logger.debug("Loaded {}", clazz.getName());
-                        } catch (Throwable e) {
-                            logger.error("Failed to Load {}", clazz.getName(), e);
-                        }
-                    });
+                    PluginLoader.load(
+                            NEIClientConfig.pluginsList,
+                            NEIClientConfig.getBooleanSetting("loadPluginsInParallel"),
+                            NEIModContainer.plugins,
+                            logger);
 
                     KeyManager.requestOptionsReload();
                     RecipeCatalysts.loadCatalystInfo();

src/main/java/codechicken/nei/NEISPH.java

@@ -92,9 +92,17 @@ public class NEISPH implements IServerPacketHandler {
             case C2S.SEND_CHAT_ITEM_LINK:
                 handleSendChatItemLink(sender, packet);
                 break;
+            case C2S.SYNC:
+                handleSync(sender, packet.readInt());
+                break;
         }
     }
 
+    private void handleSync(EntityPlayerMP sender, int id) {
+        sender.sendContainerAndContentsToPlayer(sender.openContainer, sender.openContainer.getInventory());
+        new PacketCustom(channel, S2C.SYNC).writeInt(id).sendToPlayer(sender);
+    }
+
     private void handleSendChatItemLink(EntityPlayerMP sender, PacketCustom packet) {
         final NBTTagCompound payloadTag = packet.readNBTTagCompound();
         NEIServerUtils.sendChatItemLink(sender, payloadTag);

src/main/java/codechicken/nei/PacketIDs.java

@@ -24,6 +24,7 @@ public final class PacketIDs {
         public static final int REQUEST_POTION_GUI = 24;
         public static final int SET_DUMMY_SLOT = 25;
         public static final int SEND_CHAT_ITEM_LINK = 26;
+        public static final int SYNC = 27;
     }
 
     public static final class S2C {
@@ -38,5 +39,6 @@ public final class PacketIDs {
         public static final int SET_CREATIVE_PLUS_MODE = 23;
         public static final int OPEN_POTION_GUI = 24;
         public static final int CACHE_BOOKMARK_DATA = 25;
+        public static final int SYNC = 26;
     }
 }

src/main/java/codechicken/nei/PanelWidget.java

@@ -305,7 +305,7 @@ public abstract class PanelWidget<T extends ItemsGrid<? extends ItemsGridSlot, ?
     }
 
     @Override
-    public boolean handleKeyPress(int keyID, char keyChar) {
+    public boolean onHotkeyPressed() {
         final Point mouse = GuiDraw.getMousePosition();
         if (!contains(mouse.x, mouse.y)) return false;
 

src/main/java/codechicken/nei/PluginLoader.java

@@ -0,0 +1,66 @@
+package codechicken.nei;
+
+import java.util.Collection;
+import java.util.concurrent.ForkJoinPool;
+import java.util.concurrent.ForkJoinWorkerThread;
+
+import org.apache.logging.log4j.Logger;
+
+import codechicken.nei.api.IConfigureNEI;
+
+final class PluginLoader {
+
+    private PluginLoader() {}
+
+    static void load(Collection<Class<?>> plugins, boolean parallel, Collection<IConfigureNEI> loadedPlugins,
+            Logger logger) {
+        if (parallel && canSetContextClassLoader()) {
+            // Common pool workers use the system loader, which cannot see FML-only classes (old Log4j then throws
+            // while logging a plugin's stack frames), and under a SecurityManager they forbid changing it.
+            final ClassLoader classLoader = IConfigureNEI.class.getClassLoader();
+            final ForkJoinPool pool = new ForkJoinPool(Runtime.getRuntime().availableProcessors(), owner -> {
+                final ForkJoinWorkerThread worker = ForkJoinPool.defaultForkJoinWorkerThreadFactory.newThread(owner);
+                worker.setContextClassLoader(classLoader);
+                return worker;
+            }, null, false);
+
+            try {
+                pool.submit(() -> plugins.parallelStream().forEach(clazz -> load(clazz, loadedPlugins, logger))).join();
+            } finally {
+                pool.shutdown();
+            }
+        } else {
+            if (parallel) {
+                logger.warn("Context class loader cannot be changed, loading plugins sequentially");
+            }
+
+            plugins.forEach(clazz -> load(clazz, loadedPlugins, logger));
+        }
+    }
+
+    private static void load(Class<?> clazz, Collection<IConfigureNEI> loadedPlugins, Logger logger) {
+        try {
+            IConfigureNEI config = (IConfigureNEI) clazz.getConstructor().newInstance();
+            config.loadConfig();
+            loadedPlugins.add(config);
+            logger.debug("Loaded {}", clazz.getName());
+        } catch (Throwable e) {
+            logger.error("Failed to Load {}", clazz.getName(), e);
+        }
+    }
+
+    private static boolean canSetContextClassLoader() {
+        final SecurityManager securityManager = System.getSecurityManager();
+
+        if (securityManager == null) {
+            return true;
+        }
+
+        try {
+            securityManager.checkPermission(new RuntimePermission("setContextClassLoader"));
+            return true;
+        } catch (SecurityException e) {
+            return false;
+        }
+    }
+}

src/main/java/codechicken/nei/PopupInputHandler.java

@@ -23,6 +23,11 @@ public class PopupInputHandler implements IContainerInputHandler {
 
     @Override
     public boolean lastKeyTyped(GuiContainer gui, char keyChar, int keyID) {
+        return false;
+    }
+
+    @Override
+    public boolean onHotkeyPressed(GuiContainer gui) {
 
         if (KeyManager.isHashDown("gui.enchant") && canPerformAction("enchant")) {
             NEICPH.sendOpenEnchantmentWindow();

src/main/java/codechicken/nei/RecipeSearchField.java

@@ -48,15 +48,19 @@ public abstract class RecipeSearchField extends TextField implements ItemFilterP
     }
 
     @Override
-    public void lastKeyTyped(int keyID, char keyChar) {
+    public boolean onHotkeyPressed() {
 
         if (focused() && KeyManager.isKeyDown("gui.getprevioussearch")) {
             handleNavigateHistory(TextHistory.Direction.PREVIOUS);
+            return true;
         }
 
         if (focused() && KeyManager.isKeyDown("gui.getnextsearch")) {
             handleNavigateHistory(TextHistory.Direction.NEXT);
+            return true;
         }
+
+        return false;
     }
 
     @Override

src/main/java/codechicken/nei/SearchField.java

@@ -227,18 +227,24 @@ public class SearchField extends TextField implements ItemFilterProvider {
     }
 
     @Override
-    public void lastKeyTyped(int keyID, char keyChar) {
+    public boolean onHotkeyPressed() {
 
         if (isVisible() && KeyManager.isHashDown("gui.search")) {
             setFocus(true);
+            return true;
         }
+
         if (focused() && KeyManager.isKeyDown("gui.getprevioussearch")) {
             handleNavigateHistory(TextHistory.Direction.PREVIOUS);
+            return true;
         }
 
         if (focused() && KeyManager.isKeyDown("gui.getnextsearch")) {
             handleNavigateHistory(TextHistory.Direction.NEXT);
+            return true;
         }
+
+        return false;
     }
 
     @Override

src/main/java/codechicken/nei/ServerSync.java

@@ -0,0 +1,36 @@
+package codechicken.nei;
+
+import codechicken.lib.packet.PacketCustom;
+import codechicken.nei.PacketIDs.C2S;
+
+/**
+ * Waits until the server has processed everything the client sent before. The server handles slot clicks and NEI
+ * packets in the order they came and answers after it has sent the slot updates, so once the answer is here the client
+ * container holds what the server computed.
+ */
+public final class ServerSync {
+
+    private static int lastId;
+    private static volatile int awaiting;
+
+    private ServerSync() {}
+
+    public static void request() {
+
+        if (!NEIClientConfig.hasSMPCounterPart()) {
+            awaiting = 0;
+            return;
+        }
+
+        awaiting = ++lastId;
+        new PacketCustom(NEICPH.channel, C2S.SYNC).writeInt(awaiting).sendToServer();
+    }
+
+    public static boolean pending() {
+        return awaiting != 0;
+    }
+
+    static void onReply(int id) {
+        if (id == awaiting) awaiting = 0;
+    }
+}

src/main/java/codechicken/nei/Widget.java

@@ -29,6 +29,10 @@ public abstract class Widget {
 
     public void lastKeyTyped(int keyID, char keyChar) {}
 
+    public boolean onHotkeyPressed() {
+        return false;
+    }
+
     public boolean handleClickExt(int mx, int my, int button) {
         return false;
     }

src/main/java/codechicken/nei/WidgetContainer.java

@@ -162,6 +162,19 @@ public class WidgetContainer extends Widget {
 
     }
 
+    @Override
+    public boolean onHotkeyPressed() {
+
+        for (int index = this.widgets.size() - 1; index >= 0; index--) {
+            final Widget widget = this.widgets.get(index);
+            if (widget.onHotkeyPressed()) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     @Override
     public boolean isFocused() {
         return this.isFocused;

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

@@ -180,6 +180,8 @@ public class API {
 
     /**
      * Add an alias name that this item can be found by in the search field, in addition to its display name.
+     *
+     * @param aliases translation keys, localized at search time
      */
     public static void setAliases(ItemStack item, String... aliases) {
         final List<String> list = Arrays.asList(aliases).stream().filter(Objects::nonNull).map(String::trim)

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

@@ -19,7 +19,6 @@ import codechicken.nei.BookmarkContainerInfo;
 import codechicken.nei.FavoriteRecipes;
 import codechicken.nei.ItemPanels;
 import codechicken.nei.ItemQuantityField;
-import codechicken.nei.ItemsGrid.ItemsGridSlot;
 import codechicken.nei.KeyManager;
 import codechicken.nei.LayoutManager;
 import codechicken.nei.NEIClientConfig;
@@ -38,6 +37,7 @@ import codechicken.nei.recipe.GuiCraftingRecipe;
 import codechicken.nei.recipe.GuiFavoriteButton;
 import codechicken.nei.recipe.GuiRecipe;
 import codechicken.nei.recipe.GuiUsageRecipe;
+import codechicken.nei.recipe.HoveredRecipe;
 import codechicken.nei.recipe.Recipe;
 import codechicken.nei.recipe.Recipe.RecipeId;
 import codechicken.nei.recipe.RecipeHandlerRef;
@@ -343,7 +343,6 @@ public abstract class ShortcutInputHandler {
             if (handlerRef != null) {
                 final GuiFavoriteButton button = new GuiFavoriteButton(handlerRef, 0, 0);
                 button.saveRecipeInBookmark();
-                return true;
             }
 
             return true;
@@ -415,41 +414,37 @@ public abstract class ShortcutInputHandler {
 
     private static Recipe getFocusedRecipe(ItemStack stackover, int mousex, int mousey, boolean useFavorites) {
         final GuiContainer gui = NEIClientUtils.getGuiContainer();
-        Recipe recipe = null;
 
-        if (useFavorites) {
-            ItemsGridSlot itemSlot = ItemPanels.itemPanel.getSlotMouseOver(mousex, mousey);
-
-            if (itemSlot == null) {
-                itemSlot = ItemPanels.itemPanel.historyPanel.getSlotMouseOver(mousex, mousey);
-            }
-
-            if (itemSlot == null) {
-                itemSlot = ItemPanels.itemPanel.craftablesPanel.getSlotMouseOver(mousex, mousey);
-            }
-
-            if (itemSlot != null) {
-                final RecipeId recipeId = itemSlot.getRecipeId();
-
-                if (recipeId != null && (recipe = Recipe.of(recipeId)) != null) {
-
-                    recipe.getIngredients().stream().forEach(ingr -> {
-                        final List<ItemStack> permutations = ingr.getPermutations();
-                        for (int index = 0; index < permutations.size(); index++) {
-                            if (FavoriteRecipes.contains(permutations.get(index))) {
-                                ingr.setActiveIndex(index);
-                                break;
-                            }
-                        }
-                    });
-
-                }
+        if (gui instanceof GuiRecipe<?>guiRecipe) {
+            final Recipe focusedRecipe = guiRecipe.getFocusedRecipe();
 
+            if (focusedRecipe != null) {
+                return focusedRecipe;
             }
         }
 
-        if (gui instanceof GuiRecipe<?>guiRecipe) {
-            recipe = guiRecipe.getFocusedRecipe();
+        if (!useFavorites) {
+            return null;
+        }
+
+        final HoveredRecipe hovered = HoveredRecipe.of(gui, stackover);
+
+        if (hovered == null || hovered.source != HoveredRecipe.Source.ITEM_PANEL) {
+            return null;
+        }
+
+        final Recipe recipe = Recipe.of(hovered.recipeId);
+
+        if (recipe != null) {
+            recipe.getIngredients().stream().forEach(ingr -> {
+                final List<ItemStack> permutations = ingr.getPermutations();
+                for (int index = 0; index < permutations.size(); index++) {
+                    if (FavoriteRecipes.contains(permutations.get(index))) {
+                        ingr.setActiveIndex(index);
+                        break;
+                    }
+                }
+            });
         }
 
         return recipe;
@@ -529,7 +524,9 @@ public abstract class ShortcutInputHandler {
         }
 
         final BookmarksGridSlot slot = ItemPanels.bookmarkPanel.getSlotMouseOver(mousex, mousey);
-        final RecipeId recipeId = getHotkeyRecipeId(gui, mousex, mousey, stack, slot);
+        final HoveredRecipe hovered = HoveredRecipe.of(gui, stack);
+        final RecipeId recipeId = hovered == null || hovered.source == HoveredRecipe.Source.OTHER
+                || hovered.source == HoveredRecipe.Source.BOOKMARK && hovered.favorite ? null : hovered.recipeId;
 
         if (slot != null) {
             final BookmarkGroup group = slot.getGroup();
@@ -729,36 +726,4 @@ public abstract class ShortcutInputHandler {
         }
     }
 
-    private static RecipeId getHotkeyRecipeId(GuiContainer gui, int mousex, int mousey, ItemStack stack,
-            BookmarksGridSlot slot) {
-
-        if (slot != null) {
-            return slot.getType() == BookmarkItemType.INGREDIENT ? null : slot.getRecipeId();
-        }
-
-        ItemsGridSlot itemSlot = ItemPanels.itemPanel.getSlotMouseOver(mousex, mousey);
-
-        if (itemSlot == null) {
-            itemSlot = ItemPanels.itemPanel.historyPanel.getSlotMouseOver(mousex, mousey);
-        }
-
-        if (itemSlot == null) {
-            itemSlot = ItemPanels.itemPanel.craftablesPanel.getSlotMouseOver(mousex, mousey);
-        }
-
-        if (itemSlot != null) {
-            return itemSlot.getRecipeId();
-        }
-
-        if (gui instanceof GuiRecipe<?>guiRecipe) {
-            final Recipe focusedRecipe = guiRecipe.getFocusedRecipe();
-
-            if (focusedRecipe != null) {
-                return focusedRecipe.getRecipeId();
-            }
-        }
-
-        return null;
-    }
-
 }

src/main/java/codechicken/nei/asm/NEITransformer.java

@@ -14,6 +14,7 @@ import static org.objectweb.asm.Opcodes.ILOAD;
 import static org.objectweb.asm.Opcodes.INVOKESPECIAL;
 import static org.objectweb.asm.Opcodes.INVOKEVIRTUAL;
 import static org.objectweb.asm.Opcodes.IRETURN;
+import static org.objectweb.asm.Opcodes.NEW;
 
 import java.util.Map;
 
@@ -22,11 +23,14 @@ import net.minecraft.launchwrapper.IClassTransformer;
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.Type;
+import org.objectweb.asm.tree.AbstractInsnNode;
 import org.objectweb.asm.tree.ClassNode;
 import org.objectweb.asm.tree.FieldInsnNode;
 import org.objectweb.asm.tree.InsnList;
 import org.objectweb.asm.tree.InsnNode;
+import org.objectweb.asm.tree.MethodInsnNode;
 import org.objectweb.asm.tree.MethodNode;
+import org.objectweb.asm.tree.TypeInsnNode;
 import org.objectweb.asm.tree.VarInsnNode;
 
 import codechicken.lib.asm.ASMBlock;
@@ -98,6 +102,48 @@ public class NEITransformer implements IClassTransformer {
                     }
                 });
 
+        if (Boolean.getBoolean("nei.recipeOrigins")) {
+            // Replace the plain ArrayList CraftingManager's constructor builds its recipe list with, so every recipe
+            // added anywhere (including vanilla's own, added in that same constructor) is observed for
+            // codechicken.nei.recipe.debug.RecipeOrigins. Must be done at classload time, since by the time any mod
+            // code runs vanilla has already populated the list. Capturing a stack trace per recipe is slow, so this is
+            // opt-in via -Dnei.recipeOrigins=true.
+            transformer.add(
+                    new MethodTransformer(
+                            new ObfMapping("net/minecraft/item/crafting/CraftingManager", "<init>", "()V")) {
+
+                        @Override
+                        public void transform(MethodNode mv) {
+                            ASMHelper.logger.debug("NEI: Hooking CraftingManager recipe list for origin tracking");
+
+                            TypeInsnNode newInsn = null;
+                            MethodInsnNode initInsn = null;
+
+                            // only the first ArrayList construction, the recipe list field
+                            for (AbstractInsnNode insn : mv.instructions.toArray()) {
+                                if (newInsn == null) {
+                                    if (insn.getOpcode() == NEW
+                                            && "java/util/ArrayList".equals(((TypeInsnNode) insn).desc)) {
+                                        newInsn = (TypeInsnNode) insn;
+                                    }
+                                } else if (insn.getOpcode() == INVOKESPECIAL
+                                        && "java/util/ArrayList".equals(((MethodInsnNode) insn).owner)
+                                        && "<init>".equals(((MethodInsnNode) insn).name)) {
+                                            initInsn = (MethodInsnNode) insn;
+                                            break;
+                                        }
+                            }
+
+                            if (newInsn == null || initInsn == null) {
+                                ASMHelper.logger.warn("NEI: CraftingManager recipe list not found, origins disabled");
+                                return;
+                            }
+
+                            newInsn.desc = initInsn.owner = "codechicken/nei/recipe/debug/RecipeOrigins$TrackingList";
+                        }
+                    });
+        }
+
         // put glint alpha into the buffer correctly for exporting
         transformer.add(
                 new MethodReplacer(

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

@@ -452,8 +452,9 @@ public class BookmarkGrid extends ItemsGrid<BookmarksGridSlot, BookmarkGrid.Book
         if (!this.isEmpty() && this.gridGenerator.maxAbsoluteSlotIndex > 0) {
             final GroupingItem groupingItem = ItemPanels.bookmarkPanel.groupingItem;
             final int sortableGroupId = ItemPanels.bookmarkPanel.sortableGroup != null
-                    ? ItemPanels.bookmarkPanel.sortableGroup.groupId
-                    : -3;
+                    && ItemPanels.bookmarkPanel.sortableGroup.grid == this
+                            ? ItemPanels.bookmarkPanel.sortableGroup.groupId
+                            : -3;
             final int rowShift = this.page * this.rows;
             Map<Integer, Integer> groups = this.gridGenerator.rowToGroupId;
 
@@ -795,8 +796,7 @@ public class BookmarkGrid extends ItemsGrid<BookmarksGridSlot, BookmarkGrid.Book
                 this.bookmarkItems.add(item);
             }
 
-            sortableGroup.grid = this;
-            sortableGroup.groupId = groupId;
+            sortableGroup.update(this, groupId);
             this.onItemsChanged();
             this.getMask();// force generate grid
             overGroupId = getRowGroupId(overRowIndex);
@@ -1285,7 +1285,7 @@ public class BookmarkGrid extends ItemsGrid<BookmarksGridSlot, BookmarkGrid.Book
             for (BookmarksGridSlot slot : getMask()) {
                 Rectangle4i rect = getSlotRect(slot.slotIndex);
 
-                if (sortableGroup != null && slot.getGroupId() == sortableGroup.groupId) {
+                if (sortableGroup != null && sortableGroup.matches(this, slot.getGroupId())) {
                     NEIClientUtils.drawRect(rect.x, rect.y, rect.w, rect.h, DRAG_COLOR);
                 } else if (sortableItem != null && sortableItem.items.contains(slot.itemIndex)) {
                     NEIClientUtils.drawRect(rect.x, rect.y, rect.w, rect.h, DRAG_COLOR);
@@ -1314,7 +1314,7 @@ public class BookmarkGrid extends ItemsGrid<BookmarksGridSlot, BookmarkGrid.Book
             final SortableItem sortableItem = LayoutManager.bookmarkPanel.sortableItem;
 
             for (BookmarksGridSlot slot : getMask()) {
-                if ((sortableGroup == null || slot.getGroupId() != sortableGroup.groupId)
+                if ((sortableGroup == null || !sortableGroup.matches(this, slot.getGroupId()))
                         && (sortableItem == null || !sortableItem.items.contains(slot.itemIndex))) {
                     slot.afterDraw(getSlotRect(slot.slotIndex), mouseContext);
                 }
@@ -1331,7 +1331,7 @@ public class BookmarkGrid extends ItemsGrid<BookmarksGridSlot, BookmarkGrid.Book
 
         for (BookmarksGridSlot slot : getMask()) {
 
-            if ((sortableGroup == null || slot.getGroupId() != sortableGroup.groupId)
+            if ((sortableGroup == null || !sortableGroup.matches(this, slot.getGroupId()))
                     && (sortableItem == null || !sortableItem.items.contains(slot.itemIndex))) {
                 final BookmarkItem item = slot.getBookmarkItem();
 

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

@@ -340,7 +340,8 @@ public class BookmarkGridGenerator {
                     0,
                     chainItem.getItem(),
                     null,
-                    group);
+                    group,
+                    this.grid);
         } else {
             return new BookmarksGridSlot(
                     slotIndex,
@@ -350,7 +351,8 @@ public class BookmarkGridGenerator {
                     chainItem.getCalculatedMultiplier(),
                     chainItem.getItem(),
                     chainItem.calculatedType,
-                    group);
+                    group,
+                    this.grid);
         }
     }
 

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

@@ -23,6 +23,7 @@ import com.google.gson.JsonPrimitive;
 import com.google.gson.JsonSyntaxException;
 
 import codechicken.nei.BookmarkPanel.BookmarkViewMode;
+import codechicken.nei.ItemPanels;
 import codechicken.nei.NEIClientConfig;
 import codechicken.nei.recipe.Recipe.RecipeId;
 import codechicken.nei.util.NBTJson;
@@ -79,10 +80,21 @@ public class BookmarkStorage {
 
     public int getNamespaceSize() {
 
-        if (this.namespaces.get(this.namespaces.size() - 1).size() > 0) {
-            this.namespaces.add(new BookmarkGrid());
-        } else if (this.activeNamespaceIndex == this.namespaces.size() - 2 && getActiveGrid().size() == 0) {
-            this.namespaces.remove(this.namespaces.size() - 1);
+        final int lastIndex = this.namespaces.size() - 1;
+        final BookmarkGrid lastGrid = this.namespaces.get(lastIndex);
+        final SortableGroup sortableGroup = ItemPanels.bookmarkPanel.sortableGroup;
+
+        if (lastGrid.size() > 0) {
+            if (sortableGroup == null || sortableGroup.grid != lastGrid || !sortableGroup.aloneInGrid) {
+                this.namespaces.add(new BookmarkGrid());
+            }
+        } else if (lastIndex > 0 && this.activeNamespaceIndex != lastIndex) {
+            final BookmarkGrid prevGrid = this.namespaces.get(lastIndex - 1);
+
+            if (sortableGroup != null && sortableGroup.grid == prevGrid && sortableGroup.aloneInGrid
+                    || prevGrid == getActiveGrid() && prevGrid.size() == 0) {
+                this.namespaces.remove(lastIndex);
+            }
         }
 
         return this.namespaces.size();

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

@@ -8,7 +8,6 @@ import org.lwjgl.opengl.GL11;
 
 import codechicken.lib.vec.Rectangle4i;
 import codechicken.nei.BookmarkPanel.BookmarkViewMode;
-import codechicken.nei.ItemPanels;
 import codechicken.nei.ItemsGrid.ItemsGridSlot;
 import codechicken.nei.ItemsGrid.MouseContext;
 import codechicken.nei.NEIClientConfig;
@@ -65,7 +64,8 @@ public class BookmarksGridSlot extends ItemsGridSlot {
     protected final int rowIndex;
 
     public BookmarksGridSlot(int slotIndex, int itemIndex, long realMultiplier, long shiftAmount,
-            long calculatedMultiplier, BookmarkItem bookmarkItem, CalculatedType calculatedType, BookmarkGroup group) {
+            long calculatedMultiplier, BookmarkItem bookmarkItem, CalculatedType calculatedType, BookmarkGroup group,
+            BookmarkGrid grid) {
         super(
                 slotIndex,
                 itemIndex,
@@ -96,7 +96,6 @@ public class BookmarksGridSlot extends ItemsGridSlot {
                             : CalculatedType.RESULT;
         }
 
-        final BookmarkGrid grid = ItemPanels.bookmarkPanel.getGrid();
         final BookmarkItem prevItem = grid.getCalculatedItem(
                 grid.gridGenerator.slotToItem.getOrDefault(grid.gridGenerator.itemToSlot.get(this.itemIndex) - 1, -1));
         this.isFirstOutput = this.itemIndex >= 0 && this.bookmarkItem.type == BookmarkItemType.RESULT

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

@@ -13,13 +13,23 @@ public class SortableGroup {
 
     public int groupId;
     public BookmarkGrid grid;
+    public boolean aloneInGrid;
 
     public int shiftX = 0;
     public int shiftY = 0;
 
     public SortableGroup(BookmarkGrid grid, int groupId) {
+        update(grid, groupId);
+    }
+
+    public void update(BookmarkGrid grid, int groupId) {
         this.grid = grid;
         this.groupId = groupId;
+        this.aloneInGrid = grid.bookmarkItems.stream().allMatch(item -> item.groupId == groupId);
+    }
+
+    public boolean matches(BookmarkGrid grid, int groupId) {
+        return this.grid == grid && this.groupId == groupId;
     }
 
     public void postDraw(int mousex, int mousey) {

src/main/java/codechicken/nei/bookmark/tree/Camera.java

@@ -2,6 +2,8 @@ package codechicken.nei.bookmark.tree;
 
 import java.awt.geom.Point2D;
 
+import org.lwjgl.input.Mouse;
+
 class Camera {
 
     private static final float ZOOM_MIN = 0.1f;
@@ -39,23 +41,34 @@ class Camera {
                 && y < this.widgetY + this.widgetH;
     }
 
-    public void startDrag(int mouseX, int mouseY) {
+    public void startDrag(Point2D mouse) {
         this.dragging = true;
-        this.lastDragX = mouseX;
-        this.lastDragY = mouseY;
+        this.lastDragX = (float) mouse.getX();
+        this.lastDragY = (float) mouse.getY();
     }
 
-    public void drag(int mouseX, int mouseY) {
+    public void drag(Point2D mouse) {
         if (!this.dragging) {
             return;
         }
 
+        final float mouseX = (float) mouse.getX();
+        final float mouseY = (float) mouse.getY();
+
         this.scrollX -= (mouseX - this.lastDragX) / this.zoomLevel;
         this.scrollY -= (mouseY - this.lastDragY) / this.zoomLevel;
         this.lastDragX = mouseX;
         this.lastDragY = mouseY;
     }
 
+    public void update(Point2D mouse, int treeWidth, int treeHeight) {
+        if (this.dragging && Mouse.isButtonDown(0)) {
+            drag(mouse);
+        }
+
+        clampToBounds(treeWidth, treeHeight);
+    }
+
     public void endDrag() {
         this.dragging = false;
     }
@@ -79,7 +92,6 @@ class Camera {
         } else {
             this.scrollY -= direction * this.widgetH / (SCROLL_STEP_DIVISOR * this.zoomLevel);
         }
-
     }
 
     public void centerOn(float worldX, float worldY) {

src/main/java/codechicken/nei/bookmark/tree/CraftingTreeCanvas.java

@@ -169,12 +169,12 @@ class CraftingTreeCanvas {
                 : -FIT_MARGIN;
     }
 
-    public void startDrag(int mouseX, int mouseY) {
-        this.camera.startDrag(mouseX, mouseY);
+    public void startDrag(Point2D mouse) {
+        this.camera.startDrag(mouse);
     }
 
-    public void drag(int mouseX, int mouseY) {
-        this.camera.drag(mouseX, mouseY);
+    public void drag(Point2D mouse) {
+        this.camera.drag(mouse);
     }
 
     public void endDrag() {
@@ -259,7 +259,7 @@ class CraftingTreeCanvas {
 
     public void draw(Point2D mouse, Set<BookmarkItem> collapsedItems, SearchResult searchResult,
             boolean useInventorySnapshot, ItemTreeSlot hoveredNode, ItemTreeSlot deleteHoverNode) {
-        this.camera.clampToBounds(this.treeWidth, this.treeHeight);
+        this.camera.update(mouse, this.treeWidth, this.treeHeight);
 
         final float zScrollX = this.camera.scrollX * this.camera.zoomLevel;
         final float zScrollY = this.camera.scrollY * this.camera.zoomLevel;

src/main/java/codechicken/nei/bookmark/tree/GuiCraftingTree.java

@@ -58,6 +58,7 @@ import codechicken.nei.drawable.DrawableResource;
 import codechicken.nei.guihook.IContainerTooltipHandler;
 import codechicken.nei.guihook.IGuiClientSide;
 import codechicken.nei.guihook.IGuiHandleMouseWheel;
+import codechicken.nei.guihook.IGuiHotkeyListener;
 import codechicken.nei.recipe.AcceptsFollowingTooltipLineHandler;
 import codechicken.nei.recipe.AutoCraftingManager;
 import codechicken.nei.recipe.GuiCraftingRecipe;
@@ -77,7 +78,7 @@ import codechicken.nei.util.SlotInaccessible;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 
 public class GuiCraftingTree extends GuiContainer implements INEIGuiHandler, IGuiClientSide, IGuiHandleMouseWheel,
-        IContainerTooltipHandler, IGuiContainerOverlay {
+        IGuiHotkeyListener, IContainerTooltipHandler, IGuiContainerOverlay {
 
     public static class EventHandler {
 
@@ -102,20 +103,20 @@ public class GuiCraftingTree extends GuiContainer implements INEIGuiHandler, IGu
         }
     }
 
+    private static final int MARGIN = 4;
+    private static final int PADDING = 9;
+    private static final int PADDING_TOP = 22;
+
     private static final DrawableResource BG_TEXTURE = new DrawableBuilder(
             "nei:textures/gui/craftingtree.png",
             0,
             0,
             64,
-            64).build();
+            64).setSlices(PADDING, PADDING, PADDING_TOP, PADDING).build();
 
     private static final DateTimeFormatter SCREENSHOT_DATE_FORMAT = DateTimeFormatter
             .ofPattern("yyyy-MM-dd_HH.mm.ss", Locale.ROOT);
 
-    private static final int MARGIN = 4;
-    private static final int PADDING = 9;
-    private static final int PADDING_TOP = 22;
-
     private final LRUCache<String, String> handlerTitleCache = new LRUCache<>(100);
 
     private GuiScreen prevGui;
@@ -338,15 +339,7 @@ public class GuiCraftingTree extends GuiContainer implements INEIGuiHandler, IGu
         this.hoveredNode = canHover && hoveredBadgeHandler == null ? this.canvas.getNodeMouseOver(getMousePosition())
                 : null;
 
-        BG_TEXTURE.draw(
-                MARGIN,
-                MARGIN,
-                this.width - MARGIN * 2,
-                this.height - MARGIN * 2,
-                PADDING,
-                PADDING,
-                PADDING_TOP,
-                PADDING);
+        BG_TEXTURE.draw(MARGIN, MARGIN, this.width - MARGIN * 2, this.height - MARGIN * 2);
 
         if (this.math.outputRecipes.isEmpty()) {
             drawCenteredString(
@@ -765,7 +758,7 @@ public class GuiCraftingTree extends GuiContainer implements INEIGuiHandler, IGu
                 return true;
             }
 
-            this.canvas.startDrag(mouseX, mouseY);
+            this.canvas.startDrag(getMousePosition());
         }
 
         return false;
@@ -786,7 +779,7 @@ public class GuiCraftingTree extends GuiContainer implements INEIGuiHandler, IGu
 
         }
 
-        this.canvas.drag(mouseX, mouseY);
+        this.canvas.drag(getMousePosition());
     }
 
     @Override
@@ -919,6 +912,12 @@ public class GuiCraftingTree extends GuiContainer implements INEIGuiHandler, IGu
             return;
         }
 
+        super.keyTyped(typedChar, keyCode);
+    }
+
+    @Override
+    public boolean onHotkeyPressed() {
+
         if (this.statsPanelVisible && KeyManager.isKeyDown("recipe.recipe")) {
             final Point2D mouse = getMousePosition();
             final Widget widget = this.statsPanel.getWidgetUnderMouse((int) mouse.getX(), (int) mouse.getY());
@@ -926,11 +925,11 @@ public class GuiCraftingTree extends GuiContainer implements INEIGuiHandler, IGu
             if (widget != null && widget instanceof StatsPanel.ItemStatsSlot itemStatsSlot
                     && itemStatsSlot.recipeId != null) {
                 GuiCraftingRecipe.openRecipeGui("recipeId", itemStatsSlot.recipeId.getResult(), itemStatsSlot.recipeId);
-                return;
+                return true;
             }
         }
 
-        super.keyTyped(typedChar, keyCode);
+        return false;
     }
 
     private String getHandlerTitle(String handlerName) {

src/main/java/codechicken/nei/bookmark/tree/StatsPanel.java

@@ -242,7 +242,7 @@ class StatsPanel extends ScrollContainer {
             26,
             84,
             46,
-            16).build();
+            16).setSlices(0, 0, 2, 0).build();
 
     private static final DrawableResource SLOT_DEFAULT = new DrawableBuilder(
             "nei:textures/gui/craftingtree.png",
@@ -290,8 +290,8 @@ class StatsPanel extends ScrollContainer {
 
     public StatsPanel() {
         final ScrollBar scrollbar = new ScrollBar().setTrackWidth(4)
-                .setThumbTexture(new DrawableBuilder("nei:textures/gui/craftingtree.png", 26, 100, 24, 4).build(), 0, 0)
-                .setTrackTexture(new DrawableBuilder("nei:textures/gui/craftingtree.png", 26, 104, 24, 4).build(), 0, 0)
+                .setThumbTexture(new DrawableBuilder("nei:textures/gui/craftingtree.png", 26, 100, 24, 4).build())
+                .setTrackTexture(new DrawableBuilder("nei:textures/gui/craftingtree.png", 26, 104, 24, 4).build())
                 .setTrackPadding(1, -5, 1, 0).setOverflowType(ScrollBar.OverflowType.AUTO);
 
         setHorizontalScroll(scrollbar);
@@ -589,7 +589,7 @@ class StatsPanel extends ScrollContainer {
         RenderHelper.enableGUIStandardItemLighting();
         GL11.glDisable(GL11.GL_LIGHTING);
 
-        BG_TEXTURE.draw(this.x, this.y, this.w, this.h, 0, 0, 2, 0);
+        BG_TEXTURE.draw(this.x, this.y, this.w, this.h);
 
         super.draw(mouseX, mouseY);
 

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

@@ -74,7 +74,11 @@ public class IMCHandler {
                     tag.getInteger("imageX"),
                     tag.getInteger("imageY"),
                     tag.getInteger("imageWidth"),
-                    tag.getInteger("imageHeight"));
+                    tag.getInteger("imageHeight"),
+                    tag.hasKey("imageTextureWidth") ? tag.getInteger("imageTextureWidth")
+                            : HandlerInfo.DEFAULT_IMAGE_TEXTURE_SIZE,
+                    tag.hasKey("imageTextureHeight") ? tag.getInteger("imageTextureHeight")
+                            : HandlerInfo.DEFAULT_IMAGE_TEXTURE_SIZE);
         }
         if (!info.hasImageOrItem()) {
             final String itemName = tag.getString("itemName");

src/main/java/codechicken/nei/config/preset/RightPanel.java

@@ -79,19 +79,24 @@ public class RightPanel extends GuiWidget {
         }
 
         @Override
-        public void lastKeyTyped(int keyID, char keyChar) {
+        public boolean onHotkeyPressed() {
 
             if (!focused() && KeyManager.isHashDown("gui.search")) {
                 setFocus(true);
+                return true;
             }
 
             if (focused() && KeyManager.isKeyDown("gui.getprevioussearch")) {
                 handleNavigateHistory(TextHistory.Direction.PREVIOUS);
+                return true;
             }
 
             if (focused() && KeyManager.isKeyDown("gui.getnextsearch")) {
                 handleNavigateHistory(TextHistory.Direction.NEXT);
+                return true;
             }
+
+            return false;
         }
 
         @Override

src/main/java/codechicken/nei/drawable/DrawableBuilder.java

@@ -15,13 +15,21 @@ public class DrawableBuilder {
     private int paddingBottom = 0;
     private int paddingLeft = 0;
     private int paddingRight = 0;
+    private int sliceLeft = 0;
+    private int sliceRight = 0;
+    private int sliceTop = 0;
+    private int sliceBottom = 0;
 
     public DrawableBuilder(String resourceLocation, int u, int v, int width, int height) {
+        this(new ResourceLocation(resourceLocation), u, v, width, height);
+    }
+
+    public DrawableBuilder(ResourceLocation resource, int u, int v, int width, int height) {
         this.u = u;
         this.v = v;
         this.width = width;
         this.height = height;
-        this.resourceLocation = new ResourceLocation(resourceLocation);
+        this.resourceLocation = resource;
     }
 
     public DrawableBuilder setTextureSize(int width, int height) {
@@ -38,6 +46,14 @@ public class DrawableBuilder {
         return this;
     }
 
+    public DrawableBuilder setSlices(int sliceLeft, int sliceRight, int sliceTop, int sliceBottom) {
+        this.sliceLeft = sliceLeft;
+        this.sliceRight = sliceRight;
+        this.sliceTop = sliceTop;
+        this.sliceBottom = sliceBottom;
+        return this;
+    }
+
     public DrawableBuilder trim(int trimTop, int trimBottom, int trimLeft, int trimRight) {
         this.u += trimLeft;
         this.v += trimTop;
@@ -58,6 +74,10 @@ public class DrawableBuilder {
                 paddingLeft,
                 paddingRight,
                 textureWidth,
-                textureHeight);
+                textureHeight,
+                sliceLeft,
+                sliceRight,
+                sliceTop,
+                sliceBottom);
     }
 }

src/main/java/codechicken/nei/drawable/DrawableResource.java

@@ -1,7 +1,7 @@
 package codechicken.nei.drawable;
 
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.Gui;
+import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.util.ResourceLocation;
 
 import org.lwjgl.opengl.GL11;
@@ -19,9 +19,42 @@ public class DrawableResource extends Image {
     private final int paddingLeft;
     private final int paddingRight;
 
+    private final int sliceLeft;
+    private final int sliceRight;
+    private final int sliceTop;
+    private final int sliceBottom;
+
     public DrawableResource(ResourceLocation resourceLocation, int u, int v, int width, int height, int paddingTop,
             int paddingBottom, int paddingLeft, int paddingRight, int textureWidth, int textureHeight) {
+        this(
+                resourceLocation,
+                u,
+                v,
+                width,
+                height,
+                paddingTop,
+                paddingBottom,
+                paddingLeft,
+                paddingRight,
+                textureWidth,
+                textureHeight,
+                0,
+                0,
+                0,
+                0);
+    }
+
+    // negative padding lets the texture overflow the box it is drawn into
+    public DrawableResource(ResourceLocation resourceLocation, int u, int v, int width, int height, int paddingTop,
+            int paddingBottom, int paddingLeft, int paddingRight, int textureWidth, int textureHeight, int sliceLeft,
+            int sliceRight, int sliceTop, int sliceBottom) {
         super(u, v, width, height);
+
+        this.sliceLeft = sliceLeft;
+        this.sliceRight = sliceRight;
+        this.sliceTop = sliceTop;
+        this.sliceBottom = sliceBottom;
+
         this.resourceLocation = resourceLocation;
         this.textureWidth = textureWidth;
         this.textureHeight = textureHeight;
@@ -40,6 +73,14 @@ public class DrawableResource extends Image {
         return height + paddingTop + paddingBottom;
     }
 
+    public int getTextureWidth() {
+        return this.textureWidth;
+    }
+
+    public int getTextureHeight() {
+        return this.textureHeight;
+    }
+
     public void bindTexture() {
         Minecraft.getMinecraft().getTextureManager().bindTexture(this.resourceLocation);
     }
@@ -55,18 +96,28 @@ public class DrawableResource extends Image {
 
         GL11.glEnable(GL11.GL_TEXTURE_2D);
         bindTexture();
-        drawModalRectWithCustomSizedTexture(xOffset + maskLeft, yOffset + maskTop, maskLeft, maskTop, width, height);
+        final Tessellator tessellator = Tessellator.instance;
+        tessellator.startDrawingQuads();
+        addQuad(tessellator, xOffset + maskLeft, yOffset + maskTop, maskLeft, maskTop, width, height);
+        tessellator.draw();
         if (!is2DTexture) GL11.glDisable(GL11.GL_TEXTURE_2D);
     }
 
-    public void draw(int xOffset, int yOffset, int width, int height, int sliceLeft, int sliceRight, int sliceTop,
-            int sliceBottom) {
-        final int textureWidth = getWidth();
-        final int textureHeight = getHeight();
-        final int middleWidth = textureWidth - sliceLeft - sliceRight;
-        final int middleHeight = textureHeight - sliceTop - sliceBottom;
-        final int tileWidth = width - sliceLeft - sliceRight;
-        final int tileHeight = height - sliceTop - sliceBottom;
+    public void draw(int xOffset, int yOffset, int width, int height) {
+
+        if (width == getWidth() && height == getHeight()) {
+            draw(xOffset, yOffset);
+            return;
+        }
+
+        final int sliceLeft = this.sliceLeft;
+        final int sliceRight = this.sliceRight;
+        final int sliceTop = this.sliceTop;
+        final int sliceBottom = this.sliceBottom;
+        final int middleWidth = this.width - sliceLeft - sliceRight;
+        final int middleHeight = this.height - sliceTop - sliceBottom;
+        final int tileWidth = width - this.paddingLeft - this.paddingRight - sliceLeft - sliceRight;
+        final int tileHeight = height - this.paddingTop - this.paddingBottom - sliceTop - sliceBottom;
 
         if (middleWidth > 0 && middleHeight > 0 && tileWidth > 0 && tileHeight > 0) {
             final boolean is2DTexture = GL11.glGetBoolean(GL11.GL_TEXTURE_2D);
@@ -78,14 +129,30 @@ public class DrawableResource extends Image {
             GL11.glEnable(GL11.GL_TEXTURE_2D);
             bindTexture();
 
-            // middle parts
+            final Tessellator tessellator = Tessellator.instance;
+            tessellator.startDrawingQuads();
+
             for (int tileW = 0; tileW <= tileWidthCount; tileW++) {
                 final int tileWidthSize = (tileW == tileWidthCount) ? remainderWidth : middleWidth;
                 final int x = xOffset + sliceLeft + tileW * middleWidth;
 
+                // border top
+                addQuad(tessellator, x, yOffset, sliceLeft, 0, tileWidthSize, sliceTop);
+                // border bottom
+                addQuad(
+                        tessellator,
+                        x,
+                        yOffset + sliceTop + tileHeight,
+                        sliceLeft,
+                        sliceTop + middleHeight,
+                        tileWidthSize,
+                        sliceBottom);
+
+                // middle parts
                 for (int tileH = 0; tileH <= tileHeightCount; tileH++) {
                     final int tileHeightSize = (tileH == tileHeightCount) ? remainderHeight : middleHeight;
-                    drawModalRectWithCustomSizedTexture(
+                    addQuad(
+                            tessellator,
                             x,
                             yOffset + sliceTop + tileH * middleHeight,
                             sliceLeft,
@@ -95,114 +162,75 @@ public class DrawableResource extends Image {
                 }
             }
 
-            // border top
-            if (sliceTop > 0) {
-                for (int tileW = 0; tileW <= tileWidthCount; tileW++) {
-                    final int tileWidthSize = (tileW == tileWidthCount) ? remainderWidth : middleWidth;
-                    drawModalRectWithCustomSizedTexture(
-                            xOffset + sliceLeft + tileW * middleWidth,
-                            yOffset,
-                            sliceLeft,
-                            0,
-                            tileWidthSize,
-                            sliceTop);
-                }
-            }
+            for (int tileH = 0; tileH <= tileHeightCount; tileH++) {
+                final int tileHeightSize = (tileH == tileHeightCount) ? remainderHeight : middleHeight;
+                final int y = yOffset + sliceTop + tileH * middleHeight;
 
-            // border bottom
-            if (sliceBottom > 0) {
-                for (int tileW = 0; tileW <= tileWidthCount; tileW++) {
-                    final int tileWidthSize = (tileW == tileWidthCount) ? remainderWidth : middleWidth;
-                    drawModalRectWithCustomSizedTexture(
-                            xOffset + sliceLeft + tileW * middleWidth,
-                            yOffset + sliceTop + tileHeight,
-                            sliceLeft,
-                            sliceTop + middleHeight,
-                            tileWidthSize,
-                            sliceBottom);
-                }
-            }
-
-            // border left
-            if (sliceLeft > 0) {
-                for (int tileH = 0; tileH <= tileHeightCount; tileH++) {
-                    final int tileHeightSize = (tileH == tileHeightCount) ? remainderHeight : middleHeight;
-                    drawModalRectWithCustomSizedTexture(
-                            xOffset,
-                            yOffset + sliceTop + tileH * middleHeight,
-                            0,
-                            sliceTop,
-                            sliceLeft,
-                            tileHeightSize);
-                }
-            }
-
-            // border right
-            if (sliceRight > 0) {
-                for (int tileH = 0; tileH <= tileHeightCount; tileH++) {
-                    final int tileHeightSize = (tileH == tileHeightCount) ? remainderHeight : middleHeight;
-                    drawModalRectWithCustomSizedTexture(
-                            xOffset + sliceLeft + tileWidth,
-                            yOffset + sliceTop + tileH * middleHeight,
-                            sliceLeft + middleWidth,
-                            sliceTop,
-                            sliceRight,
-                            tileHeightSize);
-                }
+                // border left
+                addQuad(tessellator, xOffset, y, 0, sliceTop, sliceLeft, tileHeightSize);
+                // border right
+                addQuad(
+                        tessellator,
+                        xOffset + sliceLeft + tileWidth,
+                        y,
+                        sliceLeft + middleWidth,
+                        sliceTop,
+                        sliceRight,
+                        tileHeightSize);
             }
 
             // angle left-top
-            if (sliceLeft > 0 && sliceTop > 0) {
-                drawModalRectWithCustomSizedTexture(xOffset, yOffset, 0, 0, sliceLeft, sliceTop);
-            }
-
+            addQuad(tessellator, xOffset, yOffset, 0, 0, sliceLeft, sliceTop);
             // angle right-top
-            if (sliceRight > 0 && sliceTop > 0) {
-                drawModalRectWithCustomSizedTexture(
-                        xOffset + sliceLeft + tileWidth,
-                        yOffset,
-                        sliceLeft + middleWidth,
-                        0,
-                        sliceRight,
-                        sliceTop);
-            }
-
+            addQuad(
+                    tessellator,
+                    xOffset + sliceLeft + tileWidth,
+                    yOffset,
+                    sliceLeft + middleWidth,
+                    0,
+                    sliceRight,
+                    sliceTop);
             // angle left-bottom
-            if (sliceLeft > 0 && sliceBottom > 0) {
-                drawModalRectWithCustomSizedTexture(
-                        xOffset,
-                        yOffset + sliceTop + tileHeight,
-                        0,
-                        sliceTop + middleHeight,
-                        sliceLeft,
-                        sliceBottom);
-            }
-
+            addQuad(
+                    tessellator,
+                    xOffset,
+                    yOffset + sliceTop + tileHeight,
+                    0,
+                    sliceTop + middleHeight,
+                    sliceLeft,
+                    sliceBottom);
             // angle right-bottom
-            if (sliceRight > 0 && sliceBottom > 0) {
-                drawModalRectWithCustomSizedTexture(
-                        xOffset + sliceLeft + tileWidth,
-                        yOffset + sliceTop + tileHeight,
-                        sliceLeft + middleWidth,
-                        sliceTop + middleHeight,
-                        sliceRight,
-                        sliceBottom);
-            }
+            addQuad(
+                    tessellator,
+                    xOffset + sliceLeft + tileWidth,
+                    yOffset + sliceTop + tileHeight,
+                    sliceLeft + middleWidth,
+                    sliceTop + middleHeight,
+                    sliceRight,
+                    sliceBottom);
+
+            tessellator.draw();
 
             if (!is2DTexture) GL11.glDisable(GL11.GL_TEXTURE_2D);
         }
     }
 
-    private void drawModalRectWithCustomSizedTexture(int xOffset, int yOffset, int u, int v, int width, int height) {
-        Gui.func_146110_a(
-                xOffset + this.paddingLeft,
-                yOffset + this.paddingTop,
-                this.x + u,
-                this.y + v,
-                width,
-                height,
-                this.textureWidth,
-                this.textureHeight);
+    private void addQuad(Tessellator tessellator, int xOffset, int yOffset, int u, int v, int width, int height) {
+        if (width <= 0 || height <= 0) return;
+
+        final float scaleU = 1.0F / this.textureWidth;
+        final float scaleV = 1.0F / this.textureHeight;
+        final int x = xOffset + this.paddingLeft;
+        final int y = yOffset + this.paddingTop;
+        final float u0 = (this.x + u) * scaleU;
+        final float u1 = (this.x + u + width) * scaleU;
+        final float v0 = (this.y + v) * scaleV;
+        final float v1 = (this.y + v + height) * scaleV;
+
+        tessellator.addVertexWithUV(x, y + height, 0.0D, u0, v1);
+        tessellator.addVertexWithUV(x + width, y + height, 0.0D, u1, v1);
+        tessellator.addVertexWithUV(x + width, y, 0.0D, u1, v0);
+        tessellator.addVertexWithUV(x, y, 0.0D, u0, v0);
     }
 
 }

src/main/java/codechicken/nei/guihook/GuiContainerManager.java

@@ -449,6 +449,7 @@ public class GuiContainerManager {
     }
 
     private int clickHandled = 0;
+    private int hotkeyHandled = 0;
     public final List<IContainerTooltipHandler> instanceTooltipHandlers;
 
     public GuiContainerManager(GuiContainer screen) {
@@ -483,6 +484,7 @@ public class GuiContainerManager {
 
     public void load() {
         clickHandled = 0;
+        hotkeyHandled = 0;
         for (IContainerObjectHandler objectHandler : objectHandlers) objectHandler.load(window);
     }
 
@@ -499,9 +501,60 @@ public class GuiContainerManager {
     public boolean lastKeyTyped(int keyID, char keyChar) {
         if (keyID == 1) return false;
 
+        // hotkeys go before lastKeyTyped, otherwise a third-party handler that consumes every key blocks them
+        if (handleHotkeys()) return true;
+
         for (IContainerInputHandler inputhander : inputHandlers)
             if (inputhander.lastKeyTyped(window, keyChar, keyID)) return true;
 
+        return handleScreenHotkeys();
+    }
+
+    public boolean onHotkeyPressed() {
+        return handleHotkeys() || handleScreenHotkeys();
+    }
+
+    private boolean handleHotkeys() {
+
+        if (window instanceof IGuiHotkeyListener && ((IGuiHotkeyListener) window).onHotkeyPressed()) {
+            return true;
+        }
+
+        for (IContainerInputHandler inputhander : inputHandlers) {
+            if (inputhander.onHotkeyPressed(window)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    private boolean handleScreenHotkeys() {
+        return window instanceof IGuiHotkeyListener && ((IGuiHotkeyListener) window).onScreenHotkeyPressed();
+    }
+
+    public boolean handleMouseHotkey() {
+        final int button = Mouse.getEventButton();
+
+        if (button < 0) {
+            return false;
+        }
+
+        if (!Mouse.getEventButtonState()) {
+            // the press has been consumed, so the release must not reach the screen either
+            if ((hotkeyHandled & 1 << button) == 0) {
+                return false;
+            }
+
+            hotkeyHandled &= ~(1 << button);
+            return true;
+        }
+
+        if (KeyManager.handleMouseHotkey(button, this::onHotkeyPressed)) {
+            hotkeyHandled |= 1 << button;
+            return true;
+        }
+
         return false;
     }
 

src/main/java/codechicken/nei/guihook/IContainerInputHandler.java

@@ -36,6 +36,18 @@ public interface IContainerInputHandler {
      */
     public boolean lastKeyTyped(GuiContainer gui, char keyChar, int keyID);
 
+    /**
+     * Called when a key or a mouse button is pressed and the event has not been handled by the first pass. Use this for
+     * key bindings that work globally and check them with {@link codechicken.nei.KeyManager#isKeyDown}, so they work
+     * the same for keyboard keys and mouse buttons.
+     *
+     * @param gui An instance of the currentscreen
+     * @return true to terminate further processing of this event.
+     */
+    default boolean onHotkeyPressed(GuiContainer gui) {
+        return false;
+    }
+
     /**
      * Called when the mouse is clicked in the gui
      * 

src/main/java/codechicken/nei/guihook/IGuiHotkeyListener.java

@@ -0,0 +1,27 @@
+package codechicken.nei.guihook;
+
+/**
+ * Interface for GuiContainers to receive NEI compatible hotkey events from both keyboard keys and mouse buttons
+ */
+public interface IGuiHotkeyListener {
+
+    /**
+     * Called before the input handlers when a key or a mouse button is pressed, check key bindings with
+     * {@link codechicken.nei.KeyManager#isKeyDown}
+     *
+     * @return true to terminate further processing of this event.
+     */
+    default boolean onHotkeyPressed() {
+        return false;
+    }
+
+    /**
+     * Called after the input handlers for screen-wide hotkeys that do not depend on the hovered object, so they never
+     * take priority over more specific actions
+     *
+     * @return true to terminate further processing of this event.
+     */
+    default boolean onScreenHotkeyPressed() {
+        return false;
+    }
+}

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

@@ -5,13 +5,18 @@ import java.util.List;
 import java.util.Map;
 
 import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Slot;
 import net.minecraft.inventory.SlotCrafting;
+import net.minecraft.item.ItemStack;
 
+import codechicken.nei.FastTransferManager;
 import codechicken.nei.ItemPanels;
 import codechicken.nei.ItemStackAmount;
 import codechicken.nei.NEIClientUtils;
+import codechicken.nei.NEIServerUtils;
 import codechicken.nei.RestartableTask;
+import codechicken.nei.ServerSync;
 import codechicken.nei.bookmark.BookmarkItem;
 import codechicken.nei.recipe.Recipe.RecipeId;
 import codechicken.nei.recipe.chain.RecipeChainIterator;
@@ -26,6 +31,7 @@ public class AutoCraftingManager {
         @Override
         public void execute() {
             final GuiContainer guiContainer = NEIClientUtils.getGuiContainer();
+            final ItemStack[] layout = snapshotLayout(guiContainer);
             final List<BookmarkItem> initialItems = prepareInitialItems(math, getInventoryItems(guiContainer));
             boolean processed = false;
             boolean changed = false;
@@ -69,6 +75,11 @@ public class AutoCraftingManager {
 
                 } while (changed && !interrupted(guiContainer));
 
+                if (!interrupted(guiContainer)) {
+                    restoreLayout(guiContainer, layout);
+                    ServerSync.request();
+                }
+
             } finally {
                 StackInfo.pauseItemDamageSound(false);
             }
@@ -112,6 +123,11 @@ public class AutoCraftingManager {
         AutoCraftingManager.math = math;
 
         if (AutoCraftingManager.math != null) {
+
+            if (NEIClientUtils.getGuiContainer() instanceof GuiRecipe<?>gui && gui.firstGui != null) {
+                gui.mc.displayGuiScreen(gui.firstGui);
+            }
+
             ItemPanels.bookmarkPanel.clearTooltips();
             math.createMasterRoot();
             task.restart();
@@ -134,4 +150,70 @@ public class AutoCraftingManager {
         return inventory;
     }
 
+    private static ItemStack[] snapshotLayout(GuiContainer guiContainer) {
+        final List<Slot> slots = guiContainer.inventorySlots.inventorySlots;
+        final ItemStack[] layout = new ItemStack[slots.size()];
+
+        for (int index = 0; index < slots.size(); index++) {
+            final Slot slot = slots.get(index);
+
+            if (slot.getHasStack() && !(slot instanceof SlotCrafting)) {
+                layout[index] = slot.getStack().copy();
+            }
+        }
+
+        return layout;
+    }
+
+    private static void restoreLayout(GuiContainer guiContainer, ItemStack[] layout) {
+        final List<Slot> slots = guiContainer.inventorySlots.inventorySlots;
+        final EntityPlayer player = guiContainer.mc.thePlayer;
+
+        for (int index = 0; index < slots.size() && player.inventory.getItemStack() == null
+                && guiContainer.mc.currentScreen == guiContainer; index++) {
+            final ItemStack expected = layout[index];
+            final Slot target = slots.get(index);
+
+            if (expected == null || inPlace(slots, layout, index)
+                    || !target.isItemValid(expected)
+                    || target.getHasStack() && !target.canTakeStack(player)) {
+                continue;
+            }
+
+            final Slot source = findMisplaced(slots, layout, expected, player);
+            if (source == null) continue;
+
+            FastTransferManager.clickSlot(guiContainer, source.slotNumber);
+            FastTransferManager.clickSlot(guiContainer, target.slotNumber);
+
+            if (player.inventory.getItemStack() != null) {
+                FastTransferManager.clickSlot(guiContainer, source.slotNumber);
+            }
+        }
+
+        FastTransferManager.dropHeldItem(guiContainer);
+    }
+
+    private static boolean inPlace(List<Slot> slots, ItemStack[] layout, int index) {
+        final ItemStack stack = slots.get(index).getStack();
+        return stack != null && layout[index] != null
+                && NEIServerUtils.areStacksSameTypeCraftingWithNBT(layout[index], stack);
+    }
+
+    private static Slot findMisplaced(List<Slot> slots, ItemStack[] layout, ItemStack expected, EntityPlayer player) {
+
+        for (int index = 0; index < slots.size(); index++) {
+            final Slot slot = slots.get(index);
+
+            if (slot.getHasStack() && !(slot instanceof SlotCrafting)
+                    && !inPlace(slots, layout, index)
+                    && slot.canTakeStack(player)
+                    && NEIServerUtils.areStacksSameTypeCraftingWithNBT(expected, slot.getStack())) {
+                return slot;
+            }
+        }
+
+        return null;
+    }
+
 }

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

@@ -1,6 +1,7 @@
 package codechicken.nei.recipe;
 
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -20,10 +21,13 @@ import codechicken.lib.inventory.InventoryUtils;
 import codechicken.nei.FastTransferManager;
 import codechicken.nei.NEIClientUtils;
 import codechicken.nei.PositionedStack;
+import codechicken.nei.ServerSync;
 import codechicken.nei.api.IOverlayHandler;
 
 public class DefaultOverlayHandler implements IOverlayHandler {
 
+    private static final long SYNC_TIMEOUT_MILLIS = 5000;
+
     public static class DistributedIngred {
 
         public DistributedIngred(ItemStack item) {
@@ -113,7 +117,8 @@ public class DefaultOverlayHandler implements IOverlayHandler {
         }
 
         boolean craft = false;
-        while (multiplier > 0) {
+        while (multiplier > 0 && firstGui.mc.currentScreen == firstGui
+                && presenceOverlay(firstGui, handler, recipeIndex).stream().allMatch(s -> s.isPresent())) {
             final int transfer = transferRecipe(firstGui, handler, recipeIndex, multiplier);
 
             if (transfer <= 0) {
@@ -122,6 +127,10 @@ public class DefaultOverlayHandler implements IOverlayHandler {
 
             multiplier -= transfer;
 
+            if (!craftingSlot.getHasStack() && !awaitServer(firstGui)) {
+                break;
+            }
+
             if (craftingSlot.getHasStack() && craftingSlot.canTakeStack(firstGui.mc.thePlayer)) {
                 FastTransferManager.clickSlot(firstGui, craftingSlot.slotNumber, 0, 1);
 
@@ -139,9 +148,30 @@ public class DefaultOverlayHandler implements IOverlayHandler {
         return craft;
     }
 
+    private boolean awaitServer(GuiContainer gui) {
+        final long deadline = System.currentTimeMillis() + SYNC_TIMEOUT_MILLIS;
+        ServerSync.request();
+
+        while (ServerSync.pending()) {
+            if (gui.mc.currentScreen != gui || System.currentTimeMillis() > deadline) {
+                return false;
+            }
+
+            try {
+                Thread.sleep(1);
+            } catch (InterruptedException e) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
     protected boolean clearIngredients(GuiContainer gui, IRecipeHandler handler) {
 
         for (Slot slot : getCraftMatrixSlots(gui, handler)) {
+            if (gui.mc.currentScreen != gui) return false;
+
             if (slot.canTakeStack(gui.mc.thePlayer)) {
                 FastTransferManager.clickSlot(gui, slot.slotNumber, 0, 1);
                 if (slot.getHasStack()) return false;
@@ -206,7 +236,9 @@ public class DefaultOverlayHandler implements IOverlayHandler {
     protected void moveIngredients(GuiContainer gui, List<IngredientDistribution> assignedIngredients, int multiplier) {
         final Slot craftingSlot = getCraftingResultSlot(gui);
 
-        for (Slot slot : gui.inventorySlots.inventorySlots) {
+        for (Slot slot : getSourceSlots(gui)) {
+            if (gui.mc.currentScreen != gui) return;
+
             if (slot == craftingSlot || !slot.getHasStack()
                     || !canMoveFrom(slot, gui)
                     || !slot.canTakeStack(gui.mc.thePlayer))
@@ -240,6 +272,10 @@ public class DefaultOverlayHandler implements IOverlayHandler {
                                 FastTransferManager.clickSlot(gui, slot.slotNumber);
                             }
 
+                            // A right click with an empty or foreign cursor would take half of the dest stack
+                            final ItemStack held = gui.mc.thePlayer.inventory.getItemStack();
+                            if (held == null || !canStack(distrib.permutation, held)) break;
+
                             FastTransferManager.clickSlot(gui, dest.slotNumber, 1);
                             stackSize--;
                         }
@@ -370,7 +406,7 @@ public class DefaultOverlayHandler implements IOverlayHandler {
     }
 
     protected void findInventoryQuantities(GuiContainer gui, List<DistributedIngred> ingredStacks) {
-        for (Slot slot : gui.inventorySlots.inventorySlots) /* work out how much we have to go round */ {
+        for (Slot slot : getSourceSlots(gui)) /* work out how much we have to go round */ {
             if (slot.getHasStack() && canMoveFrom(slot, gui)) {
                 final ItemStack pstack = slot.getStack();
                 final DistributedIngred istack = findIngred(ingredStacks, pstack);
@@ -408,6 +444,25 @@ public class DefaultOverlayHandler implements IOverlayHandler {
         }
     }
 
+    protected List<Slot> getSourceSlots(GuiContainer gui) {
+        final List<Slot> slots = new ArrayList<>(gui.inventorySlots.inventorySlots);
+        slots.sort(Comparator.comparingLong(slot -> getRemainingDurability(slot.getStack())));
+        return slots;
+    }
+
+    private static long getRemainingDurability(ItemStack stack) {
+        if (stack == null || stack.getMaxStackSize() != 1) return Long.MAX_VALUE;
+
+        final NBTTagCompound tagCompound = stack.getTagCompound();
+
+        if (tagCompound != null && tagCompound.hasKey("GT.ToolStats")) {
+            final NBTTagCompound toolStats = tagCompound.getCompoundTag("GT.ToolStats");
+            return toolStats.getLong("MaxDamage") - toolStats.getLong("Damage");
+        }
+
+        return stack.isItemStackDamageable() ? stack.getMaxDamage() - stack.getItemDamage() : Long.MAX_VALUE;
+    }
+
     private int getGTToolDamagePerContainerCraft(ItemStack aStack) {
 
         try {

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

@@ -1,6 +1,5 @@
 package codechicken.nei.recipe;
 
-import java.awt.Point;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
@@ -13,14 +12,9 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.item.ItemStack;
 
-import codechicken.lib.gui.GuiDraw;
-import codechicken.nei.FavoriteRecipes;
 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;
 
 public class GuiCraftingRecipe extends GuiRecipe<ICraftingHandler> {
@@ -138,39 +132,8 @@ public class GuiCraftingRecipe extends GuiRecipe<ICraftingHandler> {
     }
 
     public static RecipeId getRecipeId(GuiScreen gui, ItemStack stackover) {
-
-        if (gui instanceof GuiRecipe<?>guiRecipe) {
-            final Recipe focusedRecipe = guiRecipe.getFocusedRecipe();
-
-            if (focusedRecipe != null) {
-                return focusedRecipe.getRecipeId();
-            }
-        }
-
-        final Point mouseover = GuiDraw.getMousePosition();
-        final BookmarksGridSlot panelSlot = ItemPanels.bookmarkPanel.getSlotMouseOver(mouseover.x, mouseover.y);
-
-        if (panelSlot != null) {
-            return panelSlot.getType() == BookmarkItemType.INGREDIENT || panelSlot.getRecipeId() == null
-                    ? FavoriteRecipes.getFavorite(stackover)
-                    : panelSlot.getRecipeId();
-        }
-
-        ItemsGridSlot itemSlot = ItemPanels.itemPanel.getSlotMouseOver(mouseover.x, mouseover.y);
-
-        if (itemSlot == null) {
-            itemSlot = ItemPanels.itemPanel.historyPanel.getSlotMouseOver(mouseover.x, mouseover.y);
-        }
-
-        if (itemSlot == null) {
-            itemSlot = ItemPanels.itemPanel.craftablesPanel.getSlotMouseOver(mouseover.x, mouseover.y);
-        }
-
-        if (itemSlot != null) {
-            return itemSlot.getRecipeId();
-        }
-
-        return null;
+        final HoveredRecipe hovered = HoveredRecipe.of(gui, stackover);
+        return hovered != null ? hovered.recipeId : null;
     }
 
     private GuiCraftingRecipe(ArrayList<ICraftingHandler> handlers) {

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

@@ -122,18 +122,25 @@ public class GuiFavoriteButton extends GuiRecipeButton {
         return Recipe.of(this.handlerRef);
     }
 
-    public void lastKeyTyped(char keyChar, int keyID) {
+    @Override
+    public void lastKeyTyped(char keyChar, int keyID) {}
+
+    @Override
+    public boolean onHotkeyPressed() {
 
         if (KeyManager.isKeyDown("bookmark.add") && NEIClientUtils.shiftKey()) {
             saveRecipeInBookmark();
+            return true;
         }
 
         if (KeyManager.isKeyDown("bookmark.open_crafting_tree") && NEIClientUtils.shiftKey()
                 && saveRecipeInBookmark()) {
             final int groupId = ItemPanels.bookmarkPanel.getGrid().getNextGroupId() - 1;
             GuiCraftingTree.openCraftingTreeGui(ItemPanels.bookmarkPanel.getGrid(), groupId);
+            return true;
         }
 
+        return false;
     }
 
     @Override

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

@@ -177,12 +177,20 @@ public class GuiOverlayButton extends GuiRecipeButton {
                 hotkeys.put(
                         NEIClientUtils.getKeyName(NEIClientUtils.SHIFT_HASH, NEIMouseUtils.MOUSE_BTN_LMB),
                         NEIClientUtils.translate("recipe.overlay.fillCraftingGrid"));
+                hotkeys.put(
+                        NEIClientUtils.getKeyName(
+                                NEIClientUtils.SHIFT_HASH + NEIClientUtils.CTRL_HASH,
+                                NEIMouseUtils.MOUSE_BTN_LMB),
+                        NEIClientUtils.translate("recipe.overlay.fillCraftingGridOnce"));
             }
 
         } else if (canFillCraftingGrid()) {
             hotkeys.put(
                     NEIMouseUtils.getKeyName(NEIMouseUtils.MOUSE_BTN_LMB),
                     NEIClientUtils.translate("recipe.overlay.fillCraftingGrid"));
+            hotkeys.put(
+                    NEIClientUtils.getKeyName(NEIClientUtils.CTRL_HASH, NEIMouseUtils.MOUSE_BTN_LMB),
+                    NEIClientUtils.translate("recipe.overlay.fillCraftingGridOnce"));
         }
 
         hotkeys.put(
@@ -329,7 +337,7 @@ public class GuiOverlayButton extends GuiRecipeButton {
 
         if (!requireShiftForOverlayRecipe() || shift) {
             if (this.canFillCraftingGrid) {
-                this.handlerRef.fillCraftingGrid(this.firstGui, 0);
+                this.handlerRef.fillCraftingGrid(this.firstGui, NEIClientUtils.controlKey() ? 1 : 0);
             }
         } else if (hasOverlay() && useOverlayRenderer()) {
             this.handlerRef.useOverlayRenderer(this.firstGui);
@@ -338,14 +346,21 @@ public class GuiOverlayButton extends GuiRecipeButton {
     }
 
     @Override
-    public void lastKeyTyped(char keyChar, int keyID) {
+    public void lastKeyTyped(char keyChar, int keyID) {}
+
+    @Override
+    public boolean onHotkeyPressed() {
         if (KeyManager.isKeyDown("bookmark.add") && NEIClientUtils.shiftKey()) {
             saveRecipeInBookmark();
+            return true;
         }
 
         if (KeyManager.isKeyDown("bookmark.chat_link") && NEIClientUtils.controlKey() && NEIClientUtils.shiftKey()) {
             sendRecipeChatLink();
+            return true;
         }
+
+        return false;
     }
 
     public void saveRecipeInBookmark() {

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

@@ -51,6 +51,7 @@ import codechicken.nei.guihook.GuiContainerManager;
 import codechicken.nei.guihook.IContainerTooltipHandler;
 import codechicken.nei.guihook.IGuiClientSide;
 import codechicken.nei.guihook.IGuiHandleMouseWheel;
+import codechicken.nei.guihook.IGuiHotkeyListener;
 import codechicken.nei.recipe.Recipe.RecipeId;
 import codechicken.nei.recipe.widget.RecipeWidget;
 import codechicken.nei.scroll.ScrollBar;
@@ -62,7 +63,7 @@ import codechicken.nei.util.EmptyContainer;
 import codechicken.nei.util.SlotInaccessible;
 
 public abstract class GuiRecipe<H extends IRecipeHandler> extends GuiContainer implements IGuiContainerOverlay,
-        IGuiClientSide, IGuiHandleMouseWheel, IContainerTooltipHandler, INEIGuiHandler {
+        IGuiClientSide, IGuiHandleMouseWheel, IGuiHotkeyListener, IContainerTooltipHandler, INEIGuiHandler {
 
     private static final int BORDER_PADDING = 5;
     private static final int TRANSPARENCY_BORDER = 4;
@@ -71,15 +72,23 @@ public abstract class GuiRecipe<H extends IRecipeHandler> extends GuiContainer i
             0,
             0,
             176 + TRANSPARENCY_BORDER * 2,
-            166 + TRANSPARENCY_BORDER * 2).build();
+            166 + TRANSPARENCY_BORDER * 2)
+                    .setSlices(
+                            BORDER_PADDING + TRANSPARENCY_BORDER,
+                            BORDER_PADDING + TRANSPARENCY_BORDER,
+                            BORDER_PADDING + TRANSPARENCY_BORDER,
+                            BORDER_PADDING + TRANSPARENCY_BORDER)
+                    .build();
 
     private static final int BUTTON_WIDTH = 13;
     private static final int BUTTON_HEIGHT = 12;
 
     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", 22, 96, 6, 9).build(), 3, 2)
+            .setTrackTexture(
+                    new DrawableBuilder("nei:textures/nei_sprites.png", 42, 90, 13, 21).setSlices(0, 0, 9, 9).build())
+            .setThumbTexture(
+                    new DrawableBuilder("nei:textures/nei_sprites.png", 22, 96, 6, 9).setSlices(0, 0, 3, 2).build())
             .setThumbPadding(1, 6, 0, 6);
 
     public static final List<IRecipeFilterProvider> recipeFilterers = new LinkedList<>();
@@ -689,6 +698,7 @@ public abstract class GuiRecipe<H extends IRecipeHandler> extends GuiContainer i
 
         if (GuiRecipe.searchField.isVisible() && GuiRecipe.searchField.focused()) {
             GuiRecipe.searchField.lastKeyTyped(i, c);
+            GuiRecipe.searchField.onHotkeyPressed();
             return;
         }
 
@@ -713,7 +723,24 @@ public abstract class GuiRecipe<H extends IRecipeHandler> extends GuiContainer i
         if (i == mc.gameSettings.keyBindInventory.getKeyCode()) {
             this.mc.displayGuiScreen(getFirstScreenGeneral());
             NEICPH.sendRequestContainer();
-        } else if (KeyManager.isKeyDown("recipe.back")) {
+        }
+    }
+
+    @Override
+    public boolean onHotkeyPressed() {
+        if (GuiRecipe.searchField.isVisible() && GuiRecipe.searchField.onHotkeyPressed()
+                || this.recipeCatalyst.isShowWidget() && this.recipeCatalyst.onHotkeyPressed()
+                || this.container.onHotkeyPressed()) {
+            return true;
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean onScreenHotkeyPressed() {
+
+        if (KeyManager.isKeyDown("recipe.back")) {
             this.mc.displayGuiScreen(this.prevGui);
         } else if (KeyManager.isKeyDown("recipe.prev_machine")) {
             prevType();
@@ -723,7 +750,11 @@ public abstract class GuiRecipe<H extends IRecipeHandler> extends GuiContainer i
             prevPage();
         } else if (KeyManager.isKeyDown("recipe.next_recipe")) {
             nextPage();
+        } else {
+            return false;
         }
+
+        return true;
     }
 
     @Override
@@ -958,11 +989,7 @@ public abstract class GuiRecipe<H extends IRecipeHandler> extends GuiContainer i
                 this.guiLeft - TRANSPARENCY_BORDER,
                 this.guiTop - TRANSPARENCY_BORDER,
                 this.xSize + TRANSPARENCY_BORDER * 2,
-                this.ySize + TRANSPARENCY_BORDER * 2,
-                BORDER_PADDING + TRANSPARENCY_BORDER,
-                BORDER_PADDING + TRANSPARENCY_BORDER,
-                BORDER_PADDING + TRANSPARENCY_BORDER,
-                BORDER_PADDING + TRANSPARENCY_BORDER);
+                this.ySize + TRANSPARENCY_BORDER * 2);
 
         drawJEITabs(mouseX, mouseY);
     }

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

@@ -64,6 +64,10 @@ public abstract class GuiRecipeButton extends GuiNEIButton {
 
     public abstract void lastKeyTyped(char keyChar, int keyID);
 
+    public boolean onHotkeyPressed() {
+        return false;
+    }
+
     public abstract void drawItemOverlay();
 
     public void update() {

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

@@ -55,11 +55,17 @@ public class GuiRecipeCatalyst extends ScrollContainer {
             0,
             0,
             28 + TRANSPARENCY_BORDER * 2,
-            28 + TRANSPARENCY_BORDER * 2).setTextureSize(28 + TRANSPARENCY_BORDER * 2, 28 + TRANSPARENCY_BORDER * 2)
+            28 + TRANSPARENCY_BORDER * 2)
+                    .setTextureSize(28 + TRANSPARENCY_BORDER * 2, 28 + TRANSPARENCY_BORDER * 2)
+                    .setSlices(
+                            BORDER_PADDING + TRANSPARENCY_BORDER,
+                            BORDER_PADDING + TRANSPARENCY_BORDER,
+                            BORDER_PADDING + TRANSPARENCY_BORDER,
+                            BORDER_PADDING + TRANSPARENCY_BORDER)
                     .build();
 
     private static final DrawableResource FG_TEXTURE = new DrawableBuilder("nei:textures/slot.png", 0, 0, 18, 18)
-            .setTextureSize(18, 18).build();
+            .setTextureSize(18, 18).setSlices(1, 1, 1, 1).build();
 
     private static final ScrollBar VERTICAL_SCROLLBAR = ScrollBar.defaultVerticalBar()
             .setOverflowType(ScrollBar.OverflowType.AUTO).setTrackPadding(0, BORDER_PADDING, -13, BORDER_PADDING)
@@ -155,20 +161,12 @@ public class GuiRecipeCatalyst extends ScrollContainer {
                 this.x - TRANSPARENCY_BORDER,
                 this.y - TRANSPARENCY_BORDER,
                 this.w + TRANSPARENCY_BORDER * 2,
-                this.h + TRANSPARENCY_BORDER * 2,
-                BORDER_PADDING + TRANSPARENCY_BORDER,
-                BORDER_PADDING + TRANSPARENCY_BORDER,
-                BORDER_PADDING + TRANSPARENCY_BORDER,
-                BORDER_PADDING + TRANSPARENCY_BORDER);
+                this.h + TRANSPARENCY_BORDER * 2);
         FG_TEXTURE.draw(
                 this.x + this.paddingInlineStart - 1,
                 this.y + this.paddingBlockStart - 1,
                 this.w - this.paddingInlineStart - this.paddingInlineEnd + 2,
-                this.h - this.paddingBlockStart - this.paddingBlockEnd + 2,
-                1,
-                1,
-                1,
-                1);
+                this.h - this.paddingBlockStart - this.paddingBlockEnd + 2);
 
         super.draw(mx, my);
     }

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

@@ -12,6 +12,7 @@ public class HandlerInfo {
 
     public static int DEFAULT_HEIGHT = 65;
     public static int DEFAULT_WIDTH = 166;
+    public static final int DEFAULT_IMAGE_TEXTURE_SIZE = 256;
 
     @Deprecated
     public static int DEFAULT_MAX_PER_PAGE = 1;
@@ -70,9 +71,22 @@ public class HandlerInfo {
     }
 
     public boolean setImage(String resourceLocation, int imageX, int imageY, int imageWidth, int imageHeight) {
+        return setImage(
+                resourceLocation,
+                imageX,
+                imageY,
+                imageWidth,
+                imageHeight,
+                DEFAULT_IMAGE_TEXTURE_SIZE,
+                DEFAULT_IMAGE_TEXTURE_SIZE);
+    }
+
+    public boolean setImage(String resourceLocation, int imageX, int imageY, int imageWidth, int imageHeight,
+            int textureWidth, int textureHeight) {
         if (hasImageOrItem()) return false;
 
-        this.image = new DrawableBuilder(resourceLocation, imageX, imageY, imageWidth, imageHeight).build();
+        this.image = new DrawableBuilder(resourceLocation, imageX, imageY, imageWidth, imageHeight)
+                .setTextureSize(textureWidth, textureHeight).build();
         return true;
     }
 
@@ -211,6 +225,20 @@ public class HandlerInfo {
             return this;
         }
 
+        public Builder setDisplayImage(ResourceLocation location, int imageX, int imageY, int imageWidth,
+                int imageHeight, int textureWidth, int textureHeight) {
+            this.info.itemStack = null;
+            this.info.setImage(
+                    location.toString(),
+                    imageX,
+                    imageY,
+                    imageWidth,
+                    imageHeight,
+                    textureWidth,
+                    textureHeight);
+            return this;
+        }
+
         @Deprecated
         public Builder setUseCustomScroll(boolean useCustomScroll) {
             this.info.setUseCustomScroll(useCustomScroll);

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

@@ -0,0 +1,87 @@
+package codechicken.nei.recipe;
+
+import java.awt.Point;
+
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.item.ItemStack;
+
+import codechicken.lib.gui.GuiDraw;
+import codechicken.nei.FavoriteRecipes;
+import codechicken.nei.ItemPanels;
+import codechicken.nei.ItemsGrid.ItemsGridSlot;
+import codechicken.nei.bookmark.BookmarkItem.BookmarkItemType;
+import codechicken.nei.bookmark.BookmarksGridSlot;
+import codechicken.nei.recipe.Recipe.RecipeId;
+
+public final class HoveredRecipe {
+
+    public enum Source {
+        RECIPE_GUI,
+        BOOKMARK,
+        ITEM_PANEL,
+        OTHER
+    }
+
+    public final RecipeId recipeId;
+    public final Source source;
+    public final boolean favorite;
+
+    private HoveredRecipe(RecipeId recipeId, Source source, boolean favorite) {
+        this.recipeId = recipeId;
+        this.source = source;
+        this.favorite = favorite;
+    }
+
+    public static HoveredRecipe of(GuiScreen gui, ItemStack stackover) {
+
+        if (gui instanceof GuiRecipe<?>guiRecipe) {
+            final Recipe focusedRecipe = guiRecipe.getFocusedRecipe();
+
+            if (focusedRecipe != null) {
+                return new HoveredRecipe(focusedRecipe.getRecipeId(), Source.RECIPE_GUI, false);
+            }
+        }
+
+        final Point mouseover = GuiDraw.getMousePosition();
+        final BookmarksGridSlot bookmarkSlot = ItemPanels.bookmarkPanel.getSlotMouseOver(mouseover.x, mouseover.y);
+
+        if (bookmarkSlot != null) {
+
+            if (bookmarkSlot.getType() != BookmarkItemType.INGREDIENT && bookmarkSlot.getRecipeId() != null) {
+                return new HoveredRecipe(bookmarkSlot.getRecipeId(), Source.BOOKMARK, false);
+            }
+
+            return favorite(stackover, Source.BOOKMARK);
+        }
+
+        ItemsGridSlot itemSlot = ItemPanels.itemPanel.getSlotMouseOver(mouseover.x, mouseover.y);
+
+        if (itemSlot == null) {
+            itemSlot = ItemPanels.itemPanel.historyPanel.getSlotMouseOver(mouseover.x, mouseover.y);
+        }
+
+        if (itemSlot == null) {
+            itemSlot = ItemPanels.itemPanel.craftablesPanel.getSlotMouseOver(mouseover.x, mouseover.y);
+        }
+
+        if (itemSlot != null) {
+
+            if (itemSlot.getRecipeId() != null) {
+                return new HoveredRecipe(itemSlot.getRecipeId(), Source.ITEM_PANEL, false);
+            }
+
+            return favorite(stackover, Source.ITEM_PANEL);
+        }
+
+        if (gui instanceof GuiRecipe<?>guiRecipe && guiRecipe.getSlotAtPosition(mouseover.x, mouseover.y) != null) {
+            return favorite(stackover, Source.RECIPE_GUI);
+        }
+
+        return favorite(stackover, Source.OTHER);
+    }
+
+    private static HoveredRecipe favorite(ItemStack stackover, Source source) {
+        final RecipeId recipeId = FavoriteRecipes.getFavorite(stackover);
+        return recipeId != null ? new HoveredRecipe(recipeId, source, true) : null;
+    }
+}

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

@@ -1,5 +1,6 @@
 package codechicken.nei.recipe;
 
+import java.lang.reflect.Method;
 import java.util.Collections;
 import java.util.List;
 
@@ -148,6 +149,7 @@ public class RecipeHandlerRef {
         if (overlayHandler != null && overlayHandler.canCraft(firstGui, this.handler, this.recipeIndex)) {
 
             if (!firstGui.equals(firstGui.mc.currentScreen)) {
+                if (!firstGui.mc.func_152345_ab()) return false;
                 firstGui.mc.displayGuiScreen(firstGui);
             }
 
@@ -167,6 +169,8 @@ public class RecipeHandlerRef {
         return transferAlghoritmCache.computeIfAbsent(overlayHandler.getClass(), clazz -> {
 
             try {
+                final Method transferRecipe = overlayHandler.getClass()
+                        .getMethod("transferRecipe", GuiContainer.class, IRecipeHandler.class, int.class, int.class);
 
                 if (overlayHandler instanceof DefaultOverlayHandler) {
                     final Class<?> overlayRecipeClazz = overlayHandler.getClass()
@@ -178,14 +182,11 @@ public class RecipeHandlerRef {
                                     boolean.class)
                             .getDeclaringClass();
 
-                    if (overlayRecipeClazz.equals(DefaultOverlayHandler.class)) {
-                        return true;
-                    }
+                    return overlayRecipeClazz.equals(DefaultOverlayHandler.class)
+                            || !transferRecipe.getDeclaringClass().equals(DefaultOverlayHandler.class);
                 }
 
-                return !overlayHandler.getClass()
-                        .getMethod("transferRecipe", GuiContainer.class, IRecipeHandler.class, int.class, int.class)
-                        .isDefault();
+                return !transferRecipe.isDefault();
             } catch (NoSuchMethodException e) {}
 
             return false;

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

@@ -7,14 +7,10 @@ import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.item.ItemStack;
 
 import codechicken.lib.gui.GuiDraw;
-import codechicken.lib.vec.Rectangle4i;
 import codechicken.nei.BookmarkPanel.BookmarkViewMode;
-import codechicken.nei.FavoriteRecipes;
 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;
@@ -33,6 +29,11 @@ public class RecipeItemInputHandler implements IContainerInputHandler, IContaine
 
     @Override
     public boolean lastKeyTyped(GuiContainer gui, char keyChar, int keyCode) {
+        return false;
+    }
+
+    @Override
+    public boolean onHotkeyPressed(GuiContainer gui) {
         return ShortcutInputHandler.handleKeyEvent(GuiContainerManager.getStackMouseOver(gui));
     }
 
@@ -58,7 +59,9 @@ public class RecipeItemInputHandler implements IContainerInputHandler, IContaine
             List<String> currenttip) {
 
         if (itemstack != null) {
-            final RecipeId recipeId = getHoveredRecipeId(gui, itemstack, mousex, mousey);
+            final HoveredRecipe hovered = HoveredRecipe.of(gui, itemstack);
+            final RecipeId recipeId = hovered != null && showRecipeTooltip(hovered, mousex, mousey) ? hovered.recipeId
+                    : null;
 
             if (recipeId == null) {
                 recipeTooltipLineHandler = null;
@@ -76,49 +79,21 @@ public class RecipeItemInputHandler implements IContainerInputHandler, IContaine
         return currenttip;
     }
 
-    private RecipeId getHoveredRecipeId(GuiContainer gui, ItemStack itemstack, int mousex, int mousey) {
+    private boolean showRecipeTooltip(HoveredRecipe hovered, int mousex, int mousey) {
+        return switch (hovered.source) {
+            case BOOKMARK -> !hovered.favorite && showRecipeTooltipInBookmarks(mousex, mousey);
+            case ITEM_PANEL -> NEIClientConfig.showRecipeTooltipInPanel();
+            case RECIPE_GUI -> hovered.favorite && NEIClientConfig.showRecipeTooltipInGui();
+            default -> false;
+        };
+    }
 
-        if (ItemPanels.bookmarkPanel.contains(mousex, mousey)) {
-            final BookmarksGridSlot slot = ItemPanels.bookmarkPanel.getSlotMouseOver(mousex, mousey);
-
-            if (slot != null && slot.getRecipeId() != null
-                    && slot.getType() != BookmarkItemType.INGREDIENT
-                    && NEIClientConfig.getRecipeTooltipsMode() != 0) {
-                final int tooltipMode = NEIClientConfig.getRecipeTooltipsMode();
-                final BookmarkViewMode viewMode = slot.getGroup().viewMode;
-                if (tooltipMode == 3 || viewMode == BookmarkViewMode.DEFAULT && tooltipMode == 1
-                        || viewMode == BookmarkViewMode.TODO_LIST && tooltipMode == 2) {
-                    return slot.getRecipeId();
-                }
-            }
-
-            return null;
-        }
-
-        if (NEIClientConfig.showRecipeTooltipInPanel()) {
-            ItemsGridSlot panelSlot = ItemPanels.itemPanel.getSlotMouseOver(mousex, mousey);
-
-            if (panelSlot == null) {
-                panelSlot = ItemPanels.itemPanel.historyPanel.getSlotMouseOver(mousex, mousey);
-            }
-
-            if (panelSlot == null) {
-                panelSlot = ItemPanels.itemPanel.craftablesPanel.getSlotMouseOver(mousex, mousey);
-            }
-
-            if (panelSlot != null) {
-                return panelSlot.getRecipeId();
-            }
-        }
-
-        if (gui instanceof GuiRecipe<?>guiRecipe
-                && new Rectangle4i(gui.guiLeft, gui.guiTop, gui.xSize, gui.ySize).contains(mousex, mousey)
-                && NEIClientConfig.showRecipeTooltipInGui()
-                && guiRecipe.getFocusedRecipe() == null) {
-            return FavoriteRecipes.getFavorite(itemstack);
-        }
-
-        return null;
+    private boolean showRecipeTooltipInBookmarks(int mousex, int mousey) {
+        final BookmarksGridSlot slot = ItemPanels.bookmarkPanel.getSlotMouseOver(mousex, mousey);
+        final int tooltipMode = NEIClientConfig.getRecipeTooltipsMode();
+        final BookmarkViewMode viewMode = slot.getGroup().viewMode;
+        return tooltipMode == 3 || viewMode == BookmarkViewMode.DEFAULT && tooltipMode == 1
+                || viewMode == BookmarkViewMode.TODO_LIST && tooltipMode == 2;
     }
 
     @Override

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

@@ -25,7 +25,13 @@ public class RecipeTooltipLineHandler implements ITooltipLineHandler {
             0,
             0,
             176 + TRANSPARENCY_BORDER * 2,
-            166 + TRANSPARENCY_BORDER * 2).build();
+            166 + TRANSPARENCY_BORDER * 2)
+                    .setSlices(
+                            BG_PADDING + TRANSPARENCY_BORDER,
+                            BG_PADDING + TRANSPARENCY_BORDER,
+                            BG_PADDING + TRANSPARENCY_BORDER,
+                            BG_PADDING + TRANSPARENCY_BORDER)
+                    .build();
 
     protected long lastUpdate = System.currentTimeMillis();
     protected String recipeName = "";
@@ -105,11 +111,7 @@ public class RecipeTooltipLineHandler implements ITooltipLineHandler {
                 -TRANSPARENCY_BORDER,
                 -TRANSPARENCY_BORDER,
                 size.width + TRANSPARENCY_BORDER * 2,
-                size.height + TRANSPARENCY_BORDER * 2,
-                BG_PADDING + TRANSPARENCY_BORDER,
-                BG_PADDING + TRANSPARENCY_BORDER,
-                BG_PADDING + TRANSPARENCY_BORDER,
-                BG_PADDING + TRANSPARENCY_BORDER);
+                size.height + TRANSPARENCY_BORDER * 2);
 
         GL11.glEnable(GL11.GL_ALPHA_TEST);
 

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

@@ -287,6 +287,11 @@ public abstract class TemplateRecipeHandler implements ICraftingHandler, IUsageH
 
         @Override
         public boolean lastKeyTyped(GuiContainer gui, char keyChar, int keyCode) {
+            return false;
+        }
+
+        @Override
+        public boolean onHotkeyPressed(GuiContainer gui) {
             if (!canHandle(gui)) return false;
 
             if (KeyManager.isKeyDown("recipe.recipe")) {

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

@@ -3,11 +3,9 @@ package codechicken.nei.recipe.chain;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.IdentityHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.item.ItemStack;
@@ -23,7 +21,6 @@ import codechicken.nei.ItemSorter;
 import codechicken.nei.ItemStackAmount;
 import codechicken.nei.ItemsTooltipLineHandler;
 import codechicken.nei.ItemsTooltipLineHandler.AmountRenderer;
-import codechicken.nei.ItemsTooltipLineHandler.StacksAmountRenderer;
 import codechicken.nei.ItemsTooltipLineHandler.TotalAmountRenderer;
 import codechicken.nei.NEIClientConfig;
 import codechicken.nei.NEIClientUtils;
@@ -39,25 +36,6 @@ import codechicken.nei.recipe.StackInfo;
 
 public class RecipeChainTooltipLineHandler extends CompositeTooltipLineHandler {
 
-    protected static class MissingStacksAmountRenderer extends StacksAmountRenderer {
-
-        protected static final int MISSING_COLOR = 0xFF5555;
-
-        protected final Set<NBTTagCompound> missing;
-        private final Map<ItemStack, Boolean> cache = new IdentityHashMap<>();
-
-        public MissingStacksAmountRenderer(Set<NBTTagCompound> missing) {
-            this.missing = missing;
-        }
-
-        @Override
-        protected int getColor(ItemStack stack) {
-            return this.cache.computeIfAbsent(stack, key -> this.missing.contains(StackInfo.itemStackToNBT(key, false)))
-                    ? MISSING_COLOR
-                    : super.getColor(stack);
-        }
-    }
-
     protected static class HandlerIconRenderer extends TotalAmountRenderer {
 
         protected static final int ICON_SIZE = 16;
@@ -285,35 +263,15 @@ public class RecipeChainTooltipLineHandler extends CompositeTooltipLineHandler {
             }
         }
 
-        final Set<NBTTagCompound> missing = new HashSet<>();
-
-        if (this.lastShiftKey) {
-            for (ItemStack stack : inputs) {
-                missing.add(StackInfo.itemStackToNBT(stack, false));
-            }
-        }
-
-        // items with a shortage are already in the inputs list, holding the missing amount instead of the required one
-        final List<ItemStack> covered = new ArrayList<>();
-
-        for (ItemStack stack : available) {
-            if (!missing.contains(StackInfo.itemStackToNBT(stack, false))) {
-                covered.add(stack);
-            }
-        }
-
         final Comparator<ItemStack> comparator = Comparator
                 .comparing((ItemStack stack) -> StackInfo.getFluid(stack) != null)
                 .thenComparingInt(stack -> -1 * stack.stackSize).thenComparing(ItemSorter.instance);
 
         inputs.sort(comparator);
-        covered.sort(comparator);
+        available.sort(comparator);
         outputs.sort(comparator);
         remainder.sort(comparator);
 
-        // missing items stay on top of the list
-        inputs.addAll(covered);
-
         if (this.lastShiftKey) {
             outputs.addAll(remainder);
         }
@@ -332,12 +290,21 @@ public class RecipeChainTooltipLineHandler extends CompositeTooltipLineHandler {
                 EnumChatFormatting.BLUE,
                 new HandlerIconRenderer(craftingHandlers));
 
+        if (this.lastShiftKey) {
+            addLine(
+                    NEIClientUtils.translate("bookmark.crafting_chain.missing"),
+                    inputs,
+                    true,
+                    EnumChatFormatting.RED,
+                    new TotalAmountRenderer());
+        }
+
         addLine(
                 NEIClientUtils.translate("bookmark.crafting_chain.input"),
-                inputs,
+                this.lastShiftKey ? available : inputs,
                 this.lastShiftKey,
                 EnumChatFormatting.YELLOW,
-                this.lastShiftKey ? new MissingStacksAmountRenderer(missing) : new TotalAmountRenderer());
+                new TotalAmountRenderer());
     }
 
     protected static void putHandlerInfo(Map<NBTTagCompound, HandlerInfo> handlers, ItemStack stack,

src/main/java/codechicken/nei/recipe/debug/CheckboxWidget.java

@@ -25,6 +25,7 @@ public class CheckboxWidget extends Button implements IUpdatableWidget {
 
     @Override
     public boolean onButtonPress(boolean rightclick) {
+        if (this.state == 2) return false;
         this.value = !this.value;
         onChange.accept(this);
         return true;

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

@@ -30,19 +30,24 @@ import codechicken.nei.ClientHandler;
 import codechicken.nei.NEIClientConfig;
 import codechicken.nei.NEIClientUtils;
 import codechicken.nei.Widget;
+import codechicken.nei.api.API;
 import codechicken.nei.drawable.DrawableBuilder;
 import codechicken.nei.drawable.DrawableResource;
+import codechicken.nei.guihook.GuiContainerManager;
+import codechicken.nei.guihook.IContainerTooltipHandler;
 import codechicken.nei.recipe.GuiRecipe;
 import codechicken.nei.recipe.GuiRecipeButton;
 import codechicken.nei.recipe.GuiRecipeTab;
 import codechicken.nei.recipe.HandlerInfo;
 import codechicken.nei.recipe.IRecipeHandler;
+import codechicken.nei.recipe.RecipeHandlerRef;
+import codechicken.nei.recipe.ShapedRecipeHandler;
 import codechicken.nei.recipe.TemplateRecipeHandler;
 import codechicken.nei.recipe.TemplateRecipeHandler.RecipeTransferRect;
 import codechicken.nei.recipe.widget.RecipeWidget;
 import codechicken.nei.scroll.ScrollContainer;
 
-public class DebugHandlerWidget extends Widget {
+public class DebugHandlerWidget extends Widget implements IContainerTooltipHandler {
 
     private static class HandlerInfoRecord {
 
@@ -152,6 +157,9 @@ public class DebugHandlerWidget extends Widget {
     private Map<String, HandlerInfoRecord> patches = new HashMap<>();
 
     private HandlerInfoRecord record;
+    private RecipeWidget hoveredRecipe;
+    private boolean duplicatesOnly = false;
+    private String duplicatesHandlerId;
 
     private Point dragPoint = null;
     private boolean showWidget = false;
@@ -162,11 +170,19 @@ public class DebugHandlerWidget extends Widget {
             0,
             0,
             176 + TRANSPARENCY_BORDER * 2,
-            166 + TRANSPARENCY_BORDER * 2).build();
+            166 + TRANSPARENCY_BORDER * 2)
+                    .setSlices(
+                            BORDER_PADDING + TRANSPARENCY_BORDER,
+                            BORDER_PADDING + TRANSPARENCY_BORDER,
+                            BORDER_PADDING + TRANSPARENCY_BORDER,
+                            BORDER_PADDING + TRANSPARENCY_BORDER)
+                    .build();
     private static final int BORDER_PADDING = 6;
     private static final int TRANSPARENCY_BORDER = 4;
 
-    public DebugHandlerWidget() {
+    protected DebugHandlerWidget() {
+        GuiContainerManager.addTooltipHandler(this);
+
         this.w = WINDOW_WIDTH;
         this.x = 10;
         this.y = 50;
@@ -242,6 +258,20 @@ public class DebugHandlerWidget extends Widget {
             saveHandlerInfoPatch();
         }, y);
 
+        if (Boolean.getBoolean("nei.recipeOrigins")) {
+            y = addCheckboxWidget("DuplicatesOnly", button -> {
+                this.duplicatesOnly = button.value;
+
+                if (NEIClientUtils.getGuiContainer() instanceof GuiRecipe<?>recipe) {
+                    this.duplicatesHandlerId = getHandlerID(recipe.getHandler());
+                    recipe.forceRefreshPage();
+                }
+            }, y + LINE_HEIGHT / 2);
+
+            // only the handler the checkbox was toggled on is filtered, so switching handlers does not pay for a rescan
+            API.addRecipeFilter(() -> this.duplicatesOnly ? this::isDuplicate : null);
+        }
+
         this.h = 10 + LINE_HEIGHT + y;
         this.container.h = this.h - INLINE_PADDING * 2 - LINE_HEIGHT;
     }
@@ -355,11 +385,7 @@ public class DebugHandlerWidget extends Widget {
                     this.x - TRANSPARENCY_BORDER,
                     this.y - TRANSPARENCY_BORDER,
                     this.w + TRANSPARENCY_BORDER * 2,
-                    this.h + TRANSPARENCY_BORDER * 2,
-                    BORDER_PADDING + TRANSPARENCY_BORDER,
-                    BORDER_PADDING + TRANSPARENCY_BORDER,
-                    BORDER_PADDING + TRANSPARENCY_BORDER,
-                    BORDER_PADDING + TRANSPARENCY_BORDER);
+                    this.h + TRANSPARENCY_BORDER * 2);
             GuiDraw.drawRect(
                     this.x + INLINE_PADDING,
                     this.y + BORDER_PADDING,
@@ -417,6 +443,11 @@ public class DebugHandlerWidget extends Widget {
 
                 updateOverride();
 
+                if (this.values.get("duplicatesonly") instanceof CheckboxWidget duplicates) {
+                    duplicates.state = handler instanceof ShapedRecipeHandler ? 0 : 2;
+                    resetDuplicatesOnly();
+                }
+
                 this.container.removeIf(
                         widget -> this.values.get("height") == widget || this.values.get("height_readonly") == widget);
                 if (handler.getRecipeHeight(0) > 0) {
@@ -430,11 +461,26 @@ public class DebugHandlerWidget extends Widget {
         } else {
             this.record = null;
             this.showWidget = false;
+            resetDuplicatesOnly();
         }
 
         this.container.update();
     }
 
+    private void resetDuplicatesOnly() {
+        if (!this.duplicatesOnly) return;
+
+        this.duplicatesOnly = false;
+
+        if (this.values.get("duplicatesonly") instanceof CheckboxWidget duplicates) {
+            duplicates.updateValue("false");
+        }
+
+        if (NEIClientUtils.getGuiContainer() instanceof GuiRecipe<?>recipe) {
+            recipe.forceRefreshPage();
+        }
+    }
+
     @Override
     public List<String> handleTooltip(int mx, int my, List<String> tooltip) {
         return this.record != null ? this.container.handleTooltip(mx, my, tooltip) : tooltip;
@@ -466,6 +512,11 @@ public class DebugHandlerWidget extends Widget {
         return false;
     }
 
+    @Override
+    public boolean onHotkeyPressed() {
+        return this.record != null && this.container.onHotkeyPressed();
+    }
+
     @Override
     public void onGuiClick(int mx, int my) {
         if (this.record != null) {
@@ -532,9 +583,51 @@ public class DebugHandlerWidget extends Widget {
         }
     }
 
+    @Override
+    public List<String> handleTooltip(GuiContainer gui, int mousex, int mousey, List<String> tooltip) {
+        final RecipeWidget widget = this.hoveredRecipe;
+        this.hoveredRecipe = null;
+
+        if (widget == null || !this.showWidget || !tooltip.isEmpty()) {
+            return tooltip;
+        }
+
+        final RecipeHandlerRef ref = widget.getRecipeHandlerRef();
+
+        for (List<String> origin : RecipeOrigins.findOrigins(ref.handler, ref.recipeIndex)) {
+            addOriginLines(tooltip, origin);
+        }
+
+        return tooltip;
+    }
+
+    private static void addOriginLines(List<String> tooltip, List<String> lines) {
+        tooltip.add(
+                EnumChatFormatting.WHITE + NEIClientUtils.translate("debug.RecipeHandler.RegisteredBy", lines.get(0))
+                        + GuiDraw.TOOLTIP_LINESPACE);
+
+        for (int i = 1; i < lines.size(); i++) {
+            tooltip.add(EnumChatFormatting.GRAY + lines.get(i));
+        }
+
+        tooltip.add("");
+    }
+
+    // only the handler the checkbox was toggled on is filtered
+    private boolean isDuplicate(IRecipeHandler handler, int recipeIndex) {
+        return !getHandlerID(handler).equals(this.duplicatesHandlerId)
+                || RecipeOrigins.hasDuplicates(handler, recipeIndex);
+    }
+
     public void drawGuiPlaceholder(RecipeWidget widget) {
         if (!this.showWidget) return;
 
+        final Point mouse = GuiDraw.getMousePosition();
+        if (widget.getRecipeHandlerRef().handler instanceof ShapedRecipeHandler && widget.contains(mouse.x, mouse.y)
+                && widget.getStackMouseOver(mouse.x, mouse.y) == null) {
+            this.hoveredRecipe = widget;
+        }
+
         NEIClientUtils.gl2DRenderContext(() -> {
 
             // background

src/main/java/codechicken/nei/recipe/debug/RecipeOrigins.java

@@ -0,0 +1,317 @@
+package codechicken.nei.recipe.debug;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.IdentityHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.WeakHashMap;
+
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.crafting.CraftingManager;
+import net.minecraft.item.crafting.IRecipe;
+import net.minecraft.item.crafting.ShapedRecipes;
+import net.minecraft.item.crafting.ShapelessRecipes;
+import net.minecraftforge.oredict.ShapedOreRecipe;
+import net.minecraftforge.oredict.ShapelessOreRecipe;
+
+import codechicken.nei.NEIServerUtils;
+import codechicken.nei.PositionedStack;
+import codechicken.nei.recipe.IRecipeHandler;
+import codechicken.nei.recipe.ShapedRecipeHandler;
+import codechicken.nei.recipe.ShapedRecipeHandler.CachedShapedRecipe;
+import codechicken.nei.recipe.TemplateRecipeHandler.CachedRecipe;
+import cpw.mods.fml.common.Loader;
+import cpw.mods.fml.common.ModContainer;
+
+/**
+ * Tracks which mod registered each crafting recipe, so the recipe handler debug widget can show it in the recipe
+ * tooltip. {@link TrackingList} is spliced in as the type of {@link CraftingManager}'s internal recipe list by
+ * {@link codechicken.nei.asm.NEITransformer} (see the {@code <init>} transform there) in place of the plain
+ * {@code ArrayList} vanilla constructs it with. Patching the constructor itself, rather than swapping the field later
+ * on, means every single recipe is observed, including vanilla's own, which are added by that same constructor before
+ * any mod code ever runs. Opt-in via {@code -Dnei.recipeOrigins=true}, since capturing a stack trace per recipe slows
+ * down loading.
+ */
+public class RecipeOrigins {
+
+    private static final int MAX_FRAMES = 10;
+
+    private static final Map<IRecipe, List<String>> origins = Collections.synchronizedMap(new IdentityHashMap<>());
+
+    private static class OutputIndex {
+
+        final int size;
+        final Map<Item, List<IRecipe>> byItem;
+
+        OutputIndex(int size, Map<Item, List<IRecipe>> byItem) {
+            this.size = size;
+            this.byItem = byItem;
+        }
+    }
+
+    private static final Map<CachedRecipe, List<List<String>>> cache = new WeakHashMap<>();
+
+    private static volatile OutputIndex outputIndex = new OutputIndex(-1, Collections.emptyMap());
+
+    private RecipeOrigins() {}
+
+    public static List<List<String>> findOrigins(IRecipeHandler handler, int recipeIndex) {
+        if (!(handler instanceof ShapedRecipeHandler shaped)) return Collections.emptyList();
+
+        final CachedRecipe recipe = shaped.arecipes.get(recipeIndex);
+        List<List<String>> found;
+
+        synchronized (cache) {
+            found = cache.get(recipe);
+        }
+
+        if (found == null) {
+            found = findOrigins(shaped, recipe.getResult(), recipe.getIngredients());
+
+            synchronized (cache) {
+                cache.put(recipe, found);
+            }
+        }
+
+        return found;
+    }
+
+    public static boolean hasDuplicates(IRecipeHandler handler, int recipeIndex) {
+        return handler instanceof ShapedRecipeHandler shaped
+                && hasDuplicateCandidates(shaped.arecipes.get(recipeIndex).getResult())
+                && findOrigins(handler, recipeIndex).size() > 1;
+    }
+
+    private static boolean hasDuplicateCandidates(PositionedStack result) {
+        if (origins.isEmpty() || result == null || result.item == null) return false;
+
+        int count = 0;
+
+        for (IRecipe recipe : getRecipesByOutput(result.item.getItem())) {
+            if (origins.containsKey(recipe)
+                    && NEIServerUtils.areStacksSameTypeCrafting(recipe.getRecipeOutput(), result.item)
+                    && ++count > 1) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    private static List<List<String>> findOrigins(ShapedRecipeHandler handler, PositionedStack result,
+            List<PositionedStack> ingredients) {
+        if (origins.isEmpty() || result == null || result.item == null) return Collections.emptyList();
+        final List<List<String>> found = new ArrayList<>();
+
+        for (IRecipe recipe : getRecipesByOutput(result.item.getItem())) {
+            final List<String> origin = origins.get(recipe);
+
+            if (origin != null && NEIServerUtils.areStacksSameTypeCrafting(recipe.getRecipeOutput(), result.item)
+                    && matchesIngredients(handler, recipe, ingredients)) {
+                final List<String> entry = new ArrayList<>(origin);
+                entry.add(recipe.getClass().getName() + "@" + Integer.toHexString(System.identityHashCode(recipe)));
+                found.add(entry);
+            }
+        }
+
+        return found;
+    }
+
+    private static List<IRecipe> getRecipesByOutput(Item item) {
+        final List<IRecipe> recipes = CraftingManager.getInstance().getRecipeList();
+        OutputIndex index = outputIndex;
+
+        if (recipes.size() != index.size) {
+            synchronized (RecipeOrigins.class) {
+                index = outputIndex;
+
+                if (recipes.size() != index.size) {
+                    final Map<Item, List<IRecipe>> byItem = new HashMap<>();
+
+                    for (IRecipe recipe : recipes) {
+                        final ItemStack output = recipe.getRecipeOutput();
+                        if (output != null)
+                            byItem.computeIfAbsent(output.getItem(), k -> new ArrayList<>()).add(recipe);
+                    }
+
+                    outputIndex = index = new OutputIndex(recipes.size(), byItem);
+                }
+            }
+        }
+
+        return index.byItem.getOrDefault(item, Collections.emptyList());
+    }
+
+    private static boolean matchesIngredients(ShapedRecipeHandler handler, IRecipe recipe,
+            List<PositionedStack> ingredients) {
+        if (recipe instanceof ShapedRecipes shaped) {
+            return matchesGrid(handler.new CachedShapedRecipe(shaped), ingredients);
+        }
+        if (recipe instanceof ShapedOreRecipe shaped)
+            return matchesGrid(handler.forgeShapedRecipe(shaped), ingredients);
+        if (recipe instanceof ShapelessRecipes shapeless) return matchesUnordered(shapeless.recipeItems, ingredients);
+        if (recipe instanceof ShapelessOreRecipe shapeless) return matchesUnordered(shapeless.getInput(), ingredients);
+        return false;
+    }
+
+    private static boolean matchesGrid(CachedShapedRecipe reference, List<PositionedStack> ingredients) {
+        if (reference == null || reference.ingredients.size() != ingredients.size()) return false;
+
+        for (PositionedStack expected : reference.ingredients) {
+            final PositionedStack actual = ingredients.stream()
+                    .filter(stack -> stack.relx == expected.relx && stack.rely == expected.rely).findFirst()
+                    .orElse(null);
+
+            if (actual == null || !matchesItems(expected.items, actual.items)) return false;
+        }
+
+        return true;
+    }
+
+    private static boolean matchesItems(ItemStack[] expected, ItemStack[] actual) {
+        for (ItemStack candidate : expected) {
+            for (ItemStack item : actual) {
+                if (NEIServerUtils.areStacksSameTypeCrafting(candidate, item)) return true;
+            }
+        }
+
+        return false;
+    }
+
+    private static boolean matchesUnordered(List<?> inputs, List<PositionedStack> ingredients) {
+        final List<PositionedStack> remaining = new ArrayList<>(ingredients);
+
+        for (Object input : inputs) {
+            if (input == null) continue;
+
+            final PositionedStack match = remaining.stream().filter(stack -> matchesInput(input, stack)).findFirst()
+                    .orElse(null);
+            if (match == null) return false;
+            remaining.remove(match);
+        }
+
+        return remaining.isEmpty();
+    }
+
+    private static boolean matchesInput(Object input, PositionedStack stack) {
+        final List<?> candidates = input instanceof List<?>list ? list : Collections.singletonList(input);
+
+        for (Object candidate : candidates) {
+            if (!(candidate instanceof ItemStack candidateStack)) continue;
+            for (ItemStack item : stack.items) {
+                if (NEIServerUtils.areStacksSameTypeCrafting(candidateStack, item)) return true;
+            }
+        }
+
+        return false;
+    }
+
+    public static class TrackingList extends ArrayList<IRecipe> {
+
+        @Override
+        public boolean add(IRecipe recipe) {
+            origins.put(recipe, captureOrigin());
+            return super.add(recipe);
+        }
+
+        @Override
+        public void add(int index, IRecipe recipe) {
+            origins.put(recipe, captureOrigin());
+            super.add(index, recipe);
+        }
+
+        @Override
+        public IRecipe set(int index, IRecipe recipe) {
+            origins.put(recipe, captureOrigin());
+            return super.set(index, recipe);
+        }
+
+        @Override
+        public boolean addAll(Collection<? extends IRecipe> recipes) {
+            final List<String> origin = captureOrigin();
+            for (IRecipe recipe : recipes) origins.put(recipe, origin);
+            return super.addAll(recipes);
+        }
+
+        @Override
+        public boolean addAll(int index, Collection<? extends IRecipe> recipes) {
+            final List<String> origin = captureOrigin();
+            for (IRecipe recipe : recipes) origins.put(recipe, origin);
+            return super.addAll(index, recipes);
+        }
+
+        @Override
+        public IRecipe remove(int index) {
+            final IRecipe removed = super.remove(index);
+            origins.remove(removed);
+            return removed;
+        }
+
+        @Override
+        public boolean remove(Object recipe) {
+            final boolean removed = super.remove(recipe);
+            if (removed) origins.remove(recipe);
+            return removed;
+        }
+
+        @Override
+        public void clear() {
+            origins.clear();
+            super.clear();
+        }
+    }
+
+    private static List<String> captureOrigin() {
+        final List<StackTraceElement> frames = findCallerFrames();
+
+        if (frames.isEmpty()) return Collections.singletonList("Unknown");
+
+        final ModContainer container = Loader.instance().activeModContainer();
+        final List<String> lines = new ArrayList<>(frames.size() + 1);
+
+        lines.add(container != null ? container.getName() : "Unknown");
+
+        for (int i = 0; i < frames.size(); i++) {
+            lines.add(formatFrame(frames.get(i)));
+        }
+
+        return lines;
+    }
+
+    private static String formatFrame(StackTraceElement frame) {
+        return frame.getFileName() != null ? frame.getClassName() + "."
+                + frame.getMethodName()
+                + "("
+                + frame.getFileName()
+                + ":"
+                + frame.getLineNumber()
+                + ")" : frame.getClassName() + "." + frame.getMethodName();
+    }
+
+    private static List<StackTraceElement> findCallerFrames() {
+        final List<StackTraceElement> frames = new ArrayList<>(MAX_FRAMES);
+
+        for (StackTraceElement element : Thread.currentThread().getStackTrace()) {
+            final String className = element.getClassName();
+
+            if (className.startsWith("java.") || className.startsWith("net.minecraft.")
+                    || className.startsWith("net.minecraftforge.")
+                    || className.startsWith("cpw.mods.fml.")
+                    || className.startsWith("sun.")
+                    || className.startsWith("jdk.")
+                    || className.startsWith("org.spongepowered.")
+                    || className.startsWith("codechicken.nei.recipe.debug.RecipeOrigins")) {
+                continue;
+            }
+
+            frames.add(element);
+            if (frames.size() >= MAX_FRAMES) break;
+        }
+
+        return frames;
+    }
+}

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

@@ -21,7 +21,6 @@ public class GTFluidStackStringifyHandler implements IStackStringifyHandler {
     protected static Method getFluidFromDisplayStack = null;
     protected static Class<?> gtMetaGeneratedTool = null;
     protected static Field playSound = null;
-    private static boolean loggedNoNbtDisplay = false;
 
     static {
         try {

src/main/java/codechicken/nei/recipe/widget/RecipeWidget.java

@@ -456,25 +456,6 @@ public class RecipeWidget extends Widget {
         }
     }
 
-    @Override
-    public boolean handleKeyPress(int keyID, char keyChar) {
-
-        if (NEIClientConfig.favoritesEnabled()
-                && KeyManager.isHashDown("bookmark.favorite_item", NEIClientUtils.SHIFT_HASH)) {
-            final Point mouse = GuiDraw.getMousePosition();
-            final PositionedStack hovered = getCyclingStackMouseOver(mouse.x, mouse.y);
-
-            if (hovered != null && getPermutations(hovered).size() > 1) {
-                FavoriteRecipes.toggleFavoriteItem(hovered.item);
-                setPaused(false);
-                return true;
-            }
-
-        }
-
-        return false;
-    }
-
     @Override
     public void lastKeyTyped(int keyID, char keyChar) {
         final Point mouse = GuiDraw.getMousePosition();
@@ -490,6 +471,27 @@ public class RecipeWidget extends Widget {
 
     }
 
+    @Override
+    public boolean onHotkeyPressed() {
+        final Point mouse = GuiDraw.getMousePosition();
+
+        if (NEIClientConfig.favoritesEnabled()
+                && KeyManager.isHashDown("bookmark.favorite_item", NEIClientUtils.SHIFT_HASH)) {
+            final PositionedStack hovered = getCyclingStackMouseOver(mouse.x, mouse.y);
+
+            if (hovered != null && getPermutations(hovered).size() > 1) {
+                FavoriteRecipes.toggleFavoriteItem(hovered.item);
+                setPaused(false);
+                return true;
+            }
+
+        }
+
+        return forEachButtons(
+                button -> button.contains(mouse.x, mouse.y) && button.onHotkeyPressed() ? true : null,
+                false);
+    }
+
     @Override
     public boolean handleClick(int mouseX, int mouseY, int button) {
 

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

@@ -53,28 +53,26 @@ public class ScrollBar {
     private int trackPaddingBottom = 0;
 
     private DrawableResource thumbTexture;
-    private int thumbSliceStart;
-    private int thumbSliceEnd;
-
     private DrawableResource trackTexture;
-    private int trackSliceStart;
-    private int trackSliceEnd;
 
     public static ScrollBar defaultScrollBar() {
         return new ScrollBar();
     }
 
     public static ScrollBar defaultVerticalBar() {
-        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)
+        return new ScrollBar().setTrackWidth(8).setTrackTexture(
+                new DrawableBuilder("nei:textures/nei_sprites.png", 29, 95, 8, 11).setSlices(0, 0, 3, 4).build())
+                .setThumbTexture(
+                        new DrawableBuilder("nei:textures/nei_sprites.png", 22, 96, 6, 9).setSlices(0, 0, 3, 2).build())
                 .setThumbPadding(1, 1, 1, 1);
     }
 
     public static ScrollBar defaultHorizontalBar() {
         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, 98, 9, 6).build(), 3, 2)
+                .setTrackTexture(
+                        new DrawableBuilder("nei:textures/nei_sprites.png", 0, 97, 11, 8).setSlices(3, 4, 0, 0).build())
+                .setThumbTexture(
+                        new DrawableBuilder("nei:textures/nei_sprites.png", 12, 98, 9, 6).setSlices(3, 2, 0, 0).build())
                 .setThumbPadding(1, 1, 1, 1);
     }
 
@@ -126,17 +124,13 @@ public class ScrollBar {
         return getTrackWidth();
     }
 
-    public ScrollBar setThumbTexture(DrawableResource texture, int sliceStart, int sliceEnd) {
+    public ScrollBar setThumbTexture(DrawableResource texture) {
         this.thumbTexture = texture;
-        this.thumbSliceStart = sliceStart;
-        this.thumbSliceEnd = sliceEnd;
         return this;
     }
 
-    public ScrollBar setTrackTexture(DrawableResource texture, int sliceStart, int sliceEnd) {
+    public ScrollBar setTrackTexture(DrawableResource texture) {
         this.trackTexture = texture;
-        this.trackSliceStart = sliceStart;
-        this.trackSliceEnd = sliceEnd;
         return this;
     }
 
@@ -379,13 +373,13 @@ public class ScrollBar {
         final boolean disabled = getVisibleSize(container) >= getActualSize(container);
 
         if (this.trackTexture != null) {
-            drawTexture(this.trackTexture, this.trackSliceStart, this.trackSliceEnd, trackBounds, false, opacity);
+            drawTexture(this.trackTexture, trackBounds, false, opacity);
         } else {
             drawTrackRect(container, trackBounds, opacity);
         }
 
         if (this.thumbTexture != null) {
-            drawTexture(this.thumbTexture, this.thumbSliceStart, this.thumbSliceEnd, thumbBounds, disabled, opacity);
+            drawTexture(this.thumbTexture, thumbBounds, disabled, opacity);
         } else {
             drawThumbRect(container, thumbBounds, selected, opacity);
         }
@@ -417,8 +411,7 @@ public class ScrollBar {
         NEIClientUtils.drawRect(bounds.x, bounds.y, bounds.w, bounds.h, thumbColor);
     }
 
-    private void drawTexture(DrawableResource texture, int sliceStart, int sliceEnd, Rectangle4i bounds,
-            boolean disabled, float opacity) {
+    private void drawTexture(DrawableResource texture, Rectangle4i bounds, boolean disabled, float opacity) {
         final float c = disabled ? 0.65f : 1f;
 
         GL11.glColor4f(c, c, c, opacity);
@@ -426,9 +419,9 @@ public class ScrollBar {
         GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
 
         if (this.scrollType == ScrollType.HORIZONTAL) {
-            texture.draw(bounds.x, bounds.y, bounds.w, texture.getHeight(), sliceStart, sliceEnd, 0, 0);
+            texture.draw(bounds.x, bounds.y, bounds.w, texture.getHeight());
         } 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);
         }
 
     }

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

@@ -7,6 +7,7 @@ import java.util.Map;
 import java.util.function.Predicate;
 
 import org.lwjgl.input.Keyboard;
+import org.lwjgl.input.Mouse;
 import org.lwjgl.opengl.GL11;
 
 import codechicken.lib.gui.GuiDraw;
@@ -249,6 +250,8 @@ public class ScrollContainer extends WidgetContainer {
         final boolean canScrollHorizontal = canScrollHorizontal();
 
         if (canScrollVertical || canScrollHorizontal) {
+            dragScrollBars(mousex, mousey, canScrollVertical, canScrollHorizontal);
+
             GuiHelper.useScissor(
                     this.x + this.paddingInlineStart,
                     this.y + this.paddingBlockStart,
@@ -273,6 +276,20 @@ public class ScrollContainer extends WidgetContainer {
 
     }
 
+    private void dragScrollBars(int mousex, int mousey, boolean canScrollVertical, boolean canScrollHorizontal) {
+        if (!Mouse.isButtonDown(0)) {
+            return;
+        }
+
+        if (canScrollVertical) {
+            this.verticalScrollBar.onMouseDragged(this, mousex, mousey, 0, 0);
+        }
+
+        if (canScrollHorizontal) {
+            this.horizontalScrollBar.onMouseDragged(this, mousex, mousey, 0, 0);
+        }
+    }
+
     protected void drawContent(int mousex, int mousey) {
         GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS);
         GL11.glPushMatrix();

src/main/java/codechicken/nei/util/ItemStackFilterParser.java

@@ -14,6 +14,9 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraftforge.oredict.OreDictionary;
 
+import com.google.common.base.Supplier;
+import com.google.common.base.Suppliers;
+
 import codechicken.nei.ItemList.AllMultiItemFilter;
 import codechicken.nei.ItemList.AnyMultiItemFilter;
 import codechicken.nei.ItemList.NegatedItemFilter;
@@ -197,9 +200,9 @@ public class ItemStackFilterParser {
     }
 
     private static ItemFilter getStrictIdentifierFilter(String rule) {
-        ItemStack item = NEIServerUtils.getModdedItem(rule, null);
+        Supplier<ItemStack> item = Suppliers.memoize(() -> NEIServerUtils.getModdedItem(rule, null));
 
-        return stack -> OreDictionary.itemMatches(item, stack, false);
+        return stack -> OreDictionary.itemMatches(item.get(), stack, false);
     }
 
     protected static ItemFilter getStringIdentifierFilter(String rule) {

src/main/java/codechicken/nei/util/NEIKeyboardUtils.java

@@ -56,18 +56,24 @@ public class NEIKeyboardUtils {
         return keyText.toString();
     }
 
-    public static String getKeyName(int keyBind) {
-        keyBind = keyHashMap.getOrDefault(keyBind, keyBind);
-        StringJoiner keyText = new StringJoiner(" + ");
-        String hashText = getHashName(keyBind);
-        int keyID = unhash(keyBind);
+    /**
+     * Mouse buttons are negative key codes, so the hash can not be packed into them and is passed separately.
+     */
+    public static String getKeyName(int keyCode, int hash) {
+        if (hash == 0 && keyHashMap.containsKey(keyCode)) {
+            hash = keyHashMap.get(keyCode);
+            keyCode = Keyboard.CHAR_NONE;
+        }
+
+        final StringJoiner keyText = new StringJoiner(" + ");
+        final String hashText = getHashName(hash);
 
         if (!hashText.isEmpty()) {
             keyText.add(hashText);
         }
 
-        if (keyID != Keyboard.CHAR_NONE || hashText.isEmpty()) {
-            keyText.add(keyID < 0 ? NEIMouseUtils.getKeyName(keyID + 100) : Keyboard.getKeyName(keyID));
+        if (keyCode != Keyboard.CHAR_NONE || hashText.isEmpty()) {
+            keyText.add(keyCode < 0 ? NEIMouseUtils.getKeyName(keyCode + 100) : Keyboard.getKeyName(keyCode));
         }
 
         return keyText.toString();

src/main/resources/assets/nei/asm/blocks.asm

@@ -121,6 +121,12 @@ RETURN
 
 list m_handleMouseInput
 ALOAD 0
+GETFIELD net/minecraft/client/gui/inventory/GuiContainer.manager : Lcodechicken/nei/guihook/GuiContainerManager;
+INVOKEVIRTUAL codechicken/nei/guihook/GuiContainerManager.handleMouseHotkey ()Z
+IFEQ LCONT
+RETURN
+LCONT
+ALOAD 0
 INVOKESPECIAL net/minecraft/client/gui/GuiScreen.func_146274_d ()V
 ALOAD 0
 GETFIELD net/minecraft/client/gui/inventory/GuiContainer.manager : Lcodechicken/nei/guihook/GuiContainerManager;

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

@@ -48,6 +48,7 @@ nei.bookmark.recipe.toggle_collapse=Toggle Collapse/Expand
 nei.bookmark.recipe.chat_link=Send Recipe to Chat
 nei.bookmark.crafting_chain=Crafting Chain
 nei.bookmark.crafting_chain.input=Ingredients
+nei.bookmark.crafting_chain.missing=Missing Items
 nei.bookmark.crafting_chain.needed=Required Crafts
 nei.bookmark.tree.title=Crafting Tree
 nei.bookmark.tree.empty=No crafting chain to display
@@ -628,6 +629,7 @@ nei.debug.RecipeHandler.Width=Width
 nei.debug.RecipeHandler.ShowFavorites=Show Favorites
 nei.debug.RecipeHandler.ShowOverlay=Show Overlays
 nei.debug.RecipeHandler.ShowBadge=Show Badge
+nei.debug.RecipeHandler.DuplicatesOnly=Duplicates Only
 nei.debug.RecipeHandler.AllowOverflowY=Allow Overflow Y
 nei.debug.RecipeHandler.AllowOverflowX=Allow Overflow X
 nei.debug.RecipeHandler.Override=Override
@@ -636,6 +638,7 @@ nei.debug.RecipeHandler.checkbox.off=Off
 nei.debug.RecipeHandler.yes=Yes
 nei.debug.RecipeHandler.no=No
 nei.debug.RecipeHandler.reset=Reset
+nei.debug.RecipeHandler.RegisteredBy=Registered by: %s
 
 nei.recipe.page=Page %s/%s
 nei.recipe.tooltip=Recipes
@@ -704,6 +707,7 @@ nei.recipe.overlay.missing=Missing following
 nei.recipe.overlay.mismatch=Mismatch Crafting Grid
 nei.recipe.overlay.overlayRecipe=Overlay Recipe
 nei.recipe.overlay.fillCraftingGrid=Fill Crafting Grid
+nei.recipe.overlay.fillCraftingGridOnce=Fill Crafting Grid (single recipe)
 nei.recipe.overlay.bookmarkRecipe=Save with Recipe
 nei.recipe.overlay.bookmarkRecipeAndCount=Save with Recipe & Count
 nei.recipe.overlay.sendRecipeToChat=Send Recipe to Chat

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

@@ -438,6 +438,7 @@ nei.recipe.overlay=отображение рецепта
 nei.recipe.overlay.missing=Отсутствует следующее
 nei.recipe.overlay.mismatch=Несоответствие сетки крафта
 nei.recipe.overlay.fillCraftingGrid=Заполнить сетку крафта
+nei.recipe.overlay.fillCraftingGridOnce=Заполнить сетку крафта (один рецепт)
 nei.recipe.overlay.bookmarkRecipe=Сохранить с рецептом
 nei.recipe.overlay.sendRecipeToChat=Отправить рецепт в чат
 

src/test/java/codechicken/nei/PluginLoaderTest.java

@@ -0,0 +1,107 @@
+package codechicken.nei;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.ForkJoinPool;
+import java.util.concurrent.ForkJoinWorkerThread;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.logging.log4j.Logger;
+import org.junit.jupiter.api.Test;
+
+import codechicken.nei.api.IConfigureNEI;
+
+class PluginLoaderTest {
+
+    @Test
+    void loadsPluginsInParallelAndLogsFailuresWithTheGameClassLoader() throws Exception {
+        ClassLoader workerClassLoader = new ClassLoader(null) {};
+        Set<Thread> workers = ConcurrentHashMap.newKeySet();
+        ForkJoinPool pool = new ForkJoinPool(2, owner -> {
+            ForkJoinWorkerThread worker = ForkJoinPool.defaultForkJoinWorkerThreadFactory.newThread(owner);
+            worker.setContextClassLoader(workerClassLoader);
+            workers.add(worker);
+            return worker;
+        }, null, false);
+        Logger logger = mock(Logger.class);
+        doAnswer(invocation -> {
+            assertSame(IConfigureNEI.class.getClassLoader(), Thread.currentThread().getContextClassLoader());
+            return null;
+        }).when(logger).error(eq("Failed to Load {}"), anyString(), any(Throwable.class));
+
+        List<Class<?>> plugins = new ArrayList<>();
+        for (int i = 0; i < 16; i++) {
+            plugins.add(HealthyPlugin.class);
+            plugins.add(ConstructorFailurePlugin.class);
+            plugins.add(ConfigurationFailurePlugin.class);
+        }
+        List<IConfigureNEI> loaded = new CopyOnWriteArrayList<>();
+
+        try {
+            pool.submit(() -> PluginLoader.load(plugins, true, loaded, logger)).get(10, TimeUnit.SECONDS);
+
+            assertEquals(16, loaded.size());
+            verify(logger, times(32)).error(eq("Failed to Load {}"), anyString(), any(Throwable.class));
+            workers.forEach(worker -> assertSame(workerClassLoader, worker.getContextClassLoader()));
+        } finally {
+            pool.shutdownNow();
+        }
+    }
+
+    public static class HealthyPlugin implements IConfigureNEI {
+
+        public HealthyPlugin() {
+            checkClassLoader();
+        }
+
+        @Override
+        public void loadConfig() {
+            checkClassLoader();
+        }
+
+        private static void checkClassLoader() {
+            if (Thread.currentThread().getContextClassLoader() != IConfigureNEI.class.getClassLoader()) {
+                throw new IllegalStateException("Plugin cannot see the game classloader");
+            }
+        }
+
+        @Override
+        public String getName() {
+            return "Test plugin";
+        }
+
+        @Override
+        public String getVersion() {
+            return "1";
+        }
+    }
+
+    public static class ConstructorFailurePlugin extends HealthyPlugin {
+
+        public ConstructorFailurePlugin() {
+            throw new IllegalStateException("Constructor failed");
+        }
+    }
+
+    public static class ConfigurationFailurePlugin extends HealthyPlugin {
+
+        @Override
+        public void loadConfig() {
+            super.loadConfig();
+            throw new IllegalStateException("Configuration failed");
+        }
+    }
+}