Change calculateBounds (#892)

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

.github/workflows/optimize-images.yml

@@ -0,0 +1,17 @@
+name: Optimize images
+
+on:
+  pull_request:
+    branches: [ master, main, release/** ]
+    paths:
+      - "**/*.png"
+
+  push:
+    branches: [ master, main, release/** ]
+    paths:
+      - "**/*.png"
+
+jobs:
+  optimize-images:
+    uses: GTNewHorizons/GTNH-Actions-Workflows/.github/workflows/optimize-images.yml@master
+    secrets: inherit

README.md

@@ -22,6 +22,59 @@ If you have issues with NEI outside of the GTNH modpack you may report them in t
 * Cycle between Recipe, Utility, and Cheat mode by ctrl clicking on the Wrench Icon
 * GT5u Tools/Items and GT6 tools should now properly work with the Overlay Recipe Transfer
 
+### Information Page Handler
+Want to add some information about a block or item without making a massive tooltip for it? You can add information about any block or item by registering it in the Information Handler.
+
+Information page(s) are displayed when either the uses or recipes of a matching item are searched. All matching items will cycle at the top of the information page.
+
+Your mod can call:
+```java
+FMLInterModComms.sendMessage("NotEnoughItems", "addItemInfo", nbt);
+```
+Where nbt is an NBTTagCompound formatted as described below.
+
+| Tag              | Type                       | Description                                                                                                                                                                                                                |
+|------------------|----------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `filter`         | String                     | A string filter to match what items should return this information page.<br/>modname:itemname, metadata, Ore Dictionary tags, and regex can all be used. The full format may be seen in `config/NEI/collapsibleitems.cfg`. |
+| `page` / `pages` | String / String NBTTagList | The actual text to display. See below for differences between single and multi-page messages.<br/>Both formats will automatically translate provided strings.                                                              |
+
+#### Single Page Format
+
+Use the `"page"` string tag when you only want to add one page of information:
+```java
+NBTTagCompound tag = new NBTTagCompound();
+tag.setString("filter", "minecraft:log 3");
+tag.setString("page", "Exotic wood found in tropical climates.");
+
+FMLInterModComms.sendMessage("NotEnoughItems", "addItemInfo", tag);
+```
+
+#### Multiple Page Format
+
+Use the `"pages"` tag as an `NBTTagList` of strings when you want more than one page:
+```java
+NBTTagCompound tag = new NBTTagCompound();
+tag.setString("filter", "minecraft:diamond_sword");
+
+NBTTagList pages = new NBTTagList();
+pages.appendTag(new NBTTagString("A powerful melee weapon."));
+pages.appendTag(new NBTTagString("Can be enchanted for extra effects."));
+
+tag.setTag("pages", pages);
+
+FMLInterModComms.sendMessage("NotEnoughItems", "addItemInfo", tag);
+```
+* Each list entry is one page.
+* Pages will appear in NEI with buttons to scroll through them.
+
+#### Item Matching
+
+All items that match `filter` will show your information page. See `config/NEI/collapsibleitems.cfg` for the full filter format.
+
+#### Item Information Config File
+
+If you're a modpack creator and want to make custom item information pages, they can easily be added in `config/NEI/informationpages.cfg`, which has a few more examples.
+
 ## Other items of note:
 
 * Remove TMI style

addon.gradle

@@ -1,3 +1,29 @@
 compileJava {
     options.encoding = "UTF-8"
 }
+
+generateGrammarSource {
+    maxHeapSize = "128m"
+    arguments += ['-package', 'codechicken.nei.search', '-visitor', '-no-listener']
+    outputDirectory = file("${projectDir}/build/generated/sources/search/antlr/codechicken/nei/search/")
+}
+
+compileJava.dependsOn generateGrammarSource
+sourcesJar.dependsOn generateGrammarSource
+
+sourcesJar {
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+}
+
+sourceSets {
+    main {
+        java.srcDirs += ["build/generated/sources/search/antlr/"]
+    }
+}
+
+test {
+    useJUnitPlatform()
+    testLogging {
+        events "passed", "skipped", "failed"
+    }
+}

build.gradle

@@ -1,5 +1,6 @@
 //version: 1707058017
 
 plugins {
+    id 'antlr'
     id 'com.gtnewhorizons.gtnhconvention'
 }

dependencies.gradle

@@ -1,8 +1,20 @@
 // Add your dependencies here
 
 dependencies {
-    api('com.github.GTNewHorizons:CodeChickenCore:1.4.1:dev')
-    implementation('com.github.GTNewHorizons:GTNHLib:0.6.5:dev')
+    api('com.github.GTNewHorizons:CodeChickenCore:1.4.10:dev')
+    devOnlyNonPublishable('com.github.GTNewHorizons:GTNHLib:0.9.13:dev')
 
     shadowImplementation('org.apache.commons:commons-csv:1.10.0')
+
+    compileOnly('maven.modrinth:forge-essentials:7.5.1')
+
+    antlr('org.antlr:antlr4:4.13.2')
+    shadowImplementation('org.antlr:antlr4-runtime:4.13.2')
+
+    testImplementation(platform('org.junit:junit-bom:5.13.4'))
+    testImplementation('org.junit.jupiter:junit-jupiter')
+    testImplementation("org.mockito:mockito-core:5.+")
+
+    testRuntimeOnly('org.junit.platform:junit-platform-launcher')
+    testRuntimeOnly("org.lwjgl.lwjgl:lwjgl:2.9.3");
 }

gradle.properties

@@ -14,7 +14,7 @@ modId = NotEnoughItems
 modGroup = codechicken.nei
 
 # Whether to use modGroup as the maven publishing group.
-# Due to a history of using JitPack, the default is com.github.GTNewHorizons for all mods.
+# When false, com.github.GTNewHorizons is used.
 useModGroupForPublishing = false
 
 # Updates your build.gradle and settings.gradle automatically whenever an update is available.
@@ -39,9 +39,33 @@ remoteMappings = https\://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/co
 # `./gradlew runClient --username=AnotherPlayer`, or configuring this command in your IDE.
 developmentEnvironmentUserName = Developer
 
-# Enables using modern Java syntax (up to version 17) via Jabel, while still targeting JVM 8.
-# See https://github.com/bsideup/jabel for details on how this works.
-enableModernJavaSyntax = true
+# Enables modern Java syntax support. Valid values:
+# - false: No modern syntax, Java 8 only
+# - jabel: Jabel syntax-only support, compiles to J8 bytecode
+# - jvmDowngrader: Full modern Java via JVM Downgrader (syntax + stdlib APIs)
+# - modern: Native modern Java bytecode, no downgrading
+enableModernJavaSyntax = jabel
+
+# If set, ignores the above setting and compiles with the given toolchain. This may cause unexpected issues,
+# and should *not* be used in most situations. -1 disables this.
+# forceToolchainVersion = -1
+
+# Target JVM version for JVM Downgrader bytecode downgrading.
+# Only used when enableModernJavaSyntax = jvmDowngrader
+# downgradeTargetVersion = 8
+
+# Comma-separated list of Java versions for multi-release jar support (JVM Downgrader only).
+# Classes will be available in META-INF/versions/N/ for each version N in this list.
+# Default: "21,25" (J25+ gets native classes, J21-24 gets partial downgrade, J8-20 gets full downgrade).
+# jvmDowngraderMultiReleaseVersions = 21,25
+
+# Specifies how JVM Downgrader API stubs are provided. Options:
+# - shade: Shade minimized stubs into the jar
+# - gtnhlib: GTNHLib provides stubs at runtime (adds version constraint)
+# - external: Another dependency provides stubs (no constraint, no warning)
+# - (empty): Warning reminding you to configure stubs
+# Note: 'shade' option requires you to verify license compliance, see: https://github.com/unimined/JvmDowngrader/blob/main/LICENSE.md
+# jvmDowngraderStubsProvider =
 
 # Enables injecting missing generics into the decompiled source code for a better coding experience.
 # Turns most publicly visible List, Map, etc. into proper List<E>, Map<K, V> types.
@@ -96,7 +120,9 @@ usesMixinDebug = false
 # Specify the location of your implementation of IMixinConfigPlugin. Leave it empty otherwise.
 mixinPlugin =
 
-# Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail!
+# Specify the package that contains all of your Mixins. The package must exist or
+# the build will fail. If you have a package property defined in your mixins.<modid>.json,
+# it must match with this or the build will fail.
 mixinsPackage =
 
 # Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin!
@@ -151,7 +177,7 @@ modrinthProjectId = notenoughitems-unofficial
 #       type can be one of [project, version],
 #       and the name is the Modrinth project or version slug/id of the other mod.
 # Example: required-project:fplib;optional-project:gasstation;incompatible-project:gregtech
-# Note: GTNH Mixins is automatically set as a required dependency if usesMixins = true
+# Note: UniMixins is automatically set as a required dependency if usesMixins = true.
 modrinthRelations = required-project\:codechickencore-unofficial
 
 # Publishing to CurseForge requires you to set the CURSEFORGE_TOKEN environment variable to one of your CurseForge API tokens.
@@ -172,6 +198,12 @@ curseForgeRelations = requiredDependency\:codechickencore-unofficial
 # projects. New projects should not use this parameter.
 # customArchiveBaseName =
 
+# Optional parameter to customize the default working directory used by the runClient* tasks. Relative to the project directory.
+# runClientWorkingDirectory = run/client
+
+# Optional parameter to customize the default working directory used by the runServer* tasks. Relative to the project directory.
+# runServerWorkingDirectory = run/server
+
 # Optional parameter to have the build automatically fail if an illegal version is used.
 # This can be useful if you e.g. only want to allow versions in the form of '1.1.xxx'.
 # The check is ONLY performed if the version is a git tag.
@@ -201,3 +233,6 @@ curseForgeRelations = requiredDependency\:codechickencore-unofficial
 # This is meant to be set in $HOME/.gradle/gradle.properties.
 # ideaCheckSpotlessOnBuild = true
 
+# Non-GTNH properties
+org.gradle.configuration-cache = true
+org.gradle.parallel = true

gradle/gradle-daemon-jvm.properties

@@ -0,0 +1,12 @@
+#This file is generated by updateDaemonJvm
+toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/df211d3c3eefdc408b462041881bc575/redirect
+toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/b41931cf1e70bc8e08d7dd19c343ef00/redirect
+toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/4945f00643ec68e7c7a6b66f90124f89/redirect
+toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/93aeea858331bd6bb00ba94759830234/redirect
+toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/3426ffcaa54c3f62406beb1f1ab8b179/redirect
+toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/f636c800fdb3f9ae33f019dfa048ba72/redirect
+toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/df211d3c3eefdc408b462041881bc575/redirect
+toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/93aeea858331bd6bb00ba94759830234/redirect
+toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/3cd7045fca9a72cd9bc7d14a385e594c/redirect
+toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/552c7bffe0370c66410a51c55985b511/redirect
+toolchainVersion=25

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -115,7 +114,6 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 
 # Determine the Java command to use to start the JVM.
@@ -173,7 +171,6 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -206,15 +203,14 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew.bat

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

repositories.gradle

@@ -1,4 +1,8 @@
-// Add any additional repositiroes for your dependencies here
+// Add any additional repositories for your dependencies here
 
 repositories {
+    maven {
+        name = "Modrinth"
+        url = "https://api.modrinth.com/maven"
+    }
 }

settings.gradle

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

src/main/antlr/SearchExpressionLexer.g4

@@ -0,0 +1,47 @@
+lexer grammar SearchExpressionLexer;
+
+// Antlr4 generates imports with .*
+@header {
+// CHECKSTYLE:OFF
+import codechicken.nei.SearchTokenParser;
+}
+
+@members {
+private SearchTokenParser searchParser;
+
+public SearchExpressionLexer(CharStream input, SearchTokenParser searchParser) {
+    this(input);
+    this.searchParser = searchParser;
+}
+}
+
+// Lexer rules
+REGEX_LEFT         : 'r'? '/' -> pushMode(REGEX) ;
+QUOTE_LEFT         : '"' -> pushMode(QUOTED) ;
+
+DASH               : '-' ;
+
+RECIPE_INGREDIENTS : '<&' | '<' ;
+RECIPE_RESULT      : '>&' | '>' ;
+RECIPE_OTHERS      : '^&' | '^' ;
+
+OR                 : '|' ;
+LEFT_BRACKET       : '{' ;
+RIGHT_BRACKET      : '}' ;
+NEWLINE_OR_TAB     : [\t\r\n] -> skip ;
+SPACE              : ' ' ;
+ESCAPED_SYMBOL     : '\\' . ;
+
+PREFIX             : CLEAN_SYMBOL {searchParser.hasRedefinedPrefix(getText().charAt(0))}? ;
+CLEAN_SYMBOL       : ~[-<>^{}|/\\ "] ;
+
+mode REGEX;
+
+REGEX_CONTENT     : (~[/] | '\\/')+ ;
+REGEX_RIGHT       : '/' -> popMode ;
+
+mode QUOTED;
+
+QUOTED_CONTENT    : (~["] | '\\"')+ ;
+QUOTE_RIGHT       : '"' -> popMode ;
+

src/main/antlr/SearchExpressionParser.g4

@@ -0,0 +1,73 @@
+parser grammar SearchExpressionParser;
+
+// Antlr4 generates imports with .*
+@header {
+// CHECKSTYLE:OFF
+}
+
+options { tokenVocab=SearchExpressionLexer; }
+
+// Parser rules
+
+// Should only be used for recipes. Thanks to antlr inability to properly
+// inherit grammars, this is included where it's not supposed to be
+recipeSearchExpression
+    : recipeClauseExpression*
+    ;
+
+recipeClauseExpression
+    : ingredientsPrefix=RECIPE_INGREDIENTS searchExpression[0, $ingredientsPrefix.getText().length() > 1]
+    | resultPrefix=RECIPE_RESULT searchExpression[1, $resultPrefix.getText().length() > 1]
+    | othersPrefix=RECIPE_OTHERS searchExpression[2, $othersPrefix.getText().length() > 1]
+    | searchExpression[3, false]
+    ;
+
+// General search expression rules
+searchExpression[int type, boolean allRecipe]
+    : orExpression
+    ;
+
+orExpression
+    : sequenceExpression (OR sequenceExpression)*
+    ;
+
+sequenceExpression
+    : (SPACE* unaryExpression SPACE*)+
+    ;
+
+unaryExpression
+    : LEFT_BRACKET orExpression RIGHT_BRACKET?
+    | prefixedExpression
+    | negateExpression
+    | token['\0']
+    ;
+
+negateExpression
+    : DASH unaryExpression
+    ;
+
+prefixedExpression
+    locals [
+        Character prefix
+    ]
+    : prefixToken=PREFIX { $prefix =  $prefixToken.getText().charAt(0); } token[$prefix]
+    ;
+
+token[Character prefix]
+    : regex[prefix]
+    | quoted[prefix]
+    | plainText
+    ;
+
+regex[Character prefix]
+    : REGEX_LEFT REGEX_CONTENT REGEX_RIGHT?
+    ;
+
+quoted[Character prefix]
+    : QUOTE_LEFT QUOTED_CONTENT QUOTE_RIGHT?
+    ;
+
+plainText
+    : (CLEAN_SYMBOL | ESCAPED_SYMBOL)+
+    ;
+

src/main/java/codechicken/nei/AbstractSubpanel.java

@@ -0,0 +1,148 @@
+package codechicken.nei;
+
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.item.ItemStack;
+
+import org.lwjgl.opengl.GL11;
+
+import codechicken.lib.vec.Rectangle4i;
+import codechicken.nei.ItemsGrid.ItemsGridSlot;
+import codechicken.nei.api.GuiInfo;
+import codechicken.nei.api.ShortcutInputHandler;
+import codechicken.nei.drawable.DrawableBuilder;
+import codechicken.nei.drawable.DrawableResource;
+import codechicken.nei.guihook.IContainerTooltipHandler;
+import codechicken.nei.recipe.GuiRecipe;
+
+public abstract class AbstractSubpanel<T extends ItemsGrid<? extends ItemsGridSlot, ? extends ItemsGrid.MouseContext>>
+        extends Widget implements IContainerTooltipHandler {
+
+    final DrawableResource DASH = new DrawableBuilder("nei:textures/dash.png", 0, 0, 6, 1).setTextureSize(6, 1).build();
+
+    protected int mouseDownItemIndex = -1;
+    protected int splittingLineColor = 0xffffffff;
+    protected int linePaddingStart = 0;
+    protected T grid;
+
+    public boolean isEmpty() {
+        return this.grid.isEmpty();
+    }
+
+    public void draw(int mousex, int mousey) {
+        drawSplittingLine();
+        this.grid.draw(mousex, mousey);
+    }
+
+    public void update() {
+        this.grid.update();
+    }
+
+    public abstract int setPanelWidth(int width);
+
+    public void resize(GuiContainer gui) {
+        this.grid.setGridSize(x, y + 4, w, h - 8);
+        this.grid.refresh(gui);
+    }
+
+    @Override
+    public ItemStack getStackMouseOver(int mousex, int mousey) {
+        final ItemsGridSlot slot = getSlotMouseOver(mousex, mousey);
+        return slot == null ? null : slot.getItemStack();
+    }
+
+    public ItemsGridSlot getSlotMouseOver(int mousex, int mousey) {
+        return this.grid.getSlotMouseOver(mousex, mousey);
+    }
+
+    protected void updateLinePadding() {
+        GuiContainer guiContainer = NEIClientUtils.getGuiContainer();
+        this.linePaddingStart = 0;
+
+        while (GuiInfo
+                .hideItemPanelSlot(guiContainer, new Rectangle4i(this.x + this.linePaddingStart, this.y - 1, 10, 2))) {
+            this.linePaddingStart += 10;
+        }
+
+    }
+
+    protected void drawSplittingLine() {
+        float alpha = (this.splittingLineColor >> 24 & 255) / 255.0F;
+        float red = (this.splittingLineColor >> 16 & 255) / 255.0F;
+        float green = (this.splittingLineColor >> 8 & 255) / 255.0F;
+        float blue = (this.splittingLineColor & 255) / 255.0F;
+
+        int width = this.grid.columns * ItemsGrid.SLOT_SIZE - this.linePaddingStart;
+        int repeat = width / 6;
+        int shiftX = this.x + this.linePaddingStart + (this.w - width) / 2;
+
+        GL11.glColor4f(red, green, blue, alpha);
+        for (int i = 0; i < repeat; i++) {
+            DASH.draw(shiftX + i * 6, this.y);
+        }
+        GL11.glColor4f(1, 1, 1, 1);
+    }
+
+    @Override
+    public void mouseDragged(int mousex, int mousey, int button, long heldTime) {
+
+        if (this.mouseDownItemIndex >= 0 && ItemPanels.itemPanel.draggedStack == null
+                && NEIClientUtils.getHeldItem() == null
+                && NEIClientConfig.hasSMPCounterPart()) {
+
+            final ItemsGridSlot mouseOverSlot = getSlotMouseOver(mousex, mousey);
+
+            if (mouseOverSlot == null || mouseOverSlot.itemIndex != this.mouseDownItemIndex || heldTime > 500) {
+                ItemPanels.itemPanel.draggedStack = getDraggedStackWithQuantity(
+                        this.grid.getItem(this.mouseDownItemIndex));
+                this.mouseDownItemIndex = -1;
+            }
+        }
+
+    }
+
+    @Override
+    public boolean handleClick(int mousex, int mousey, int button) {
+        if (handleClickExt(mousex, mousey, button)) return true;
+
+        final ItemsGridSlot hoverSlot = this.grid.getSlotMouseOver(mousex, mousey);
+        if (hoverSlot != null) {
+
+            if (button == 2) {
+                ItemPanels.itemPanel.draggedStack = getDraggedStackWithQuantity(hoverSlot.getItemStack());
+            } else {
+                mouseDownItemIndex = hoverSlot.itemIndex;
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+
+    protected abstract ItemStack getDraggedStackWithQuantity(ItemStack itemStack);
+
+    public ItemStack getStackMouseOverWithQuantity(int mousex, int mousey) {
+        final ItemStack hoverSlot = getStackMouseOver(mousex, mousey);
+        return hoverSlot != null ? getDraggedStackWithQuantity(hoverSlot) : null;
+    }
+
+    @Override
+    public void mouseUp(int mousex, int mousey, int button) {
+        final ItemsGridSlot hoverSlot = getSlotMouseOver(mousex, mousey);
+
+        if (hoverSlot != null && hoverSlot.itemIndex == this.mouseDownItemIndex
+                && ItemPanels.itemPanel.draggedStack == null) {
+
+            if (NEIController.manager.window instanceof GuiRecipe || NEIClientUtils.shiftKey()
+                    || !NEIClientConfig.canCheatItem(hoverSlot.getItemStack())) {
+                ShortcutInputHandler.handleMouseClick(hoverSlot.getItemStack().copy());
+            } else {
+                NEIClientUtils.cheatItem(getDraggedStackWithQuantity(hoverSlot.getItemStack()), button, -1);
+            }
+
+        }
+
+        this.mouseDownItemIndex = -1;
+    }
+
+}

src/main/java/codechicken/nei/BookmarkCraftingChain.java

@@ -1,319 +0,0 @@
-package codechicken.nei;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
-
-import codechicken.nei.BookmarkPanel.ItemStackMetadata;
-import codechicken.nei.recipe.BookmarkRecipeId;
-import codechicken.nei.recipe.StackInfo;
-
-public class BookmarkCraftingChain {
-
-    public HashMap<ItemStack, ItemStack> calculatedItems = new HashMap<>();
-    public HashMap<ItemStack, Integer> multiplier = new HashMap<>();
-
-    public HashMap<ItemStack, ItemStack> inputs = new HashMap<>();
-    public HashMap<ItemStack, ItemStack> outputs = new HashMap<>();
-    public HashMap<ItemStack, ItemStack> remainder = new HashMap<>();
-    public HashMap<ItemStack, ItemStack> intermediate = new HashMap<>();
-
-    protected static class CraftingChainItem {
-
-        public String guid;
-        public int stackIndex = 0;
-        public int recipeIndex = 0;
-        public int factor = 0;
-        public int count = 0;
-        public boolean ingredient = false;
-        public int fluidCellAmount = 1;
-        public ItemStack stack = null;
-
-        public CraftingChainItem(ItemStack stack, ItemStackMetadata stackMetadata) {
-            FluidStack fluid = StackInfo.getFluid(stack);
-            this.recipeIndex = getRecipeIndex(stackMetadata.recipeId);
-            this.ingredient = stackMetadata.ingredient;
-            this.stack = stack;
-
-            if (fluid != null) {
-                this.stackIndex = getStackIndex(fluid);
-                this.count = fluid.amount * Math.max(0, stack.stackSize);
-                this.fluidCellAmount = StackInfo.isFluidContainer(stack) ? fluid.amount : 1;
-                this.factor = this.fluidCellAmount * stackMetadata.factor;
-            } else {
-                this.stackIndex = getStackIndex(stack);
-                this.count = StackInfo.itemStackToNBT(stack).getInteger("Count");
-                this.factor = stackMetadata.factor;
-            }
-
-            this.guid = this.stackIndex + " " + this.recipeIndex;
-        }
-
-        public ItemStack getItemStack(long count) {
-            return StackInfo.loadFromNBT(
-                    StackInfo.itemStackToNBT(this.stack),
-                    this.factor > 0 ? (count / this.fluidCellAmount) : 0);
-        }
-
-        public static void clearStatic() {
-            itemCache.clear();
-            fluidCache.clear();
-            recipeCache.clear();
-        }
-
-        private static HashMap<ItemStack, Integer> itemCache = new HashMap<>();
-
-        private static int getStackIndex(ItemStack stackA) {
-
-            if (!itemCache.containsKey(stackA)) {
-
-                for (ItemStack item : itemCache.keySet()) {
-                    if (StackInfo.equalItemAndNBT(stackA, item, true)) {
-                        itemCache.put(stackA, itemCache.get(item));
-                        return itemCache.get(stackA);
-                    }
-                }
-
-                itemCache.put(stackA, itemCache.size() + fluidCache.size());
-            }
-
-            return itemCache.get(stackA);
-        }
-
-        private static HashMap<FluidStack, Integer> fluidCache = new HashMap<>();
-
-        private static int getStackIndex(FluidStack fluidA) {
-
-            if (!fluidCache.containsKey(fluidA)) {
-                for (FluidStack item : fluidCache.keySet()) {
-                    if (fluidA.isFluidEqual(item)) {
-                        fluidCache.put(fluidA, fluidCache.get(item));
-                        return fluidCache.get(fluidA);
-                    }
-                }
-
-                fluidCache.put(fluidA, itemCache.size() + fluidCache.size());
-            }
-
-            return fluidCache.get(fluidA);
-        }
-
-        private static HashMap<BookmarkRecipeId, Integer> recipeCache = new HashMap<>();
-
-        private static int getRecipeIndex(BookmarkRecipeId recipe) {
-
-            if (recipe == null) {
-                return -1;
-            }
-
-            if (!recipeCache.containsKey(recipe)) {
-                for (BookmarkRecipeId item : recipeCache.keySet()) {
-                    if (item.equals(recipe)) {
-                        recipeCache.put(recipe, recipeCache.get(item));
-                        return recipeCache.get(recipe);
-                    }
-                }
-
-                recipeCache.put(recipe, recipeCache.size());
-            }
-
-            return recipeCache.get(recipe);
-        }
-
-    }
-
-    protected static class CraftingChainRequest {
-
-        public List<CraftingChainItem> items = new ArrayList<>();
-
-        public HashMap<Integer, Integer> multiplier = new HashMap<>();
-        public HashMap<String, Long> counts = new HashMap<>();
-
-        public HashMap<Integer, HashSet<CraftingChainItem>> inputs = new HashMap<>();
-        public HashMap<Integer, HashSet<CraftingChainItem>> outputs = new HashMap<>();
-
-        public HashSet<Integer> initialItems = new HashSet<>();
-        public HashSet<Integer> startedIngrs = new HashSet<>();
-
-        public CraftingChainRequest(List<ItemStack> items, List<ItemStackMetadata> metadata) {
-            HashSet<Integer> inputs = new HashSet<>();
-            HashSet<Integer> outputs = new HashSet<>();
-
-            for (int index = 0; index < items.size(); index++) {
-                CraftingChainItem item = new CraftingChainItem(items.get(index), metadata.get(index));
-                item.guid = item.ingredient ? "i" + item.guid : "r" + item.guid;
-                this.items.add(item);
-
-                if (this.multiplier.get(item.recipeIndex) == null) {
-                    this.multiplier.put(item.recipeIndex, 0);
-                }
-
-                this.counts.put(item.guid, this.counts.getOrDefault(item.guid, 0L) + item.count);
-
-                if (item.ingredient) {
-                    inputs.add(item.recipeIndex);
-
-                    if (this.inputs.get(item.stackIndex) == null) {
-                        this.inputs.put(item.stackIndex, new HashSet<>());
-                    }
-
-                    this.inputs.get(item.stackIndex).add(item);
-                } else {
-                    outputs.add(item.recipeIndex);
-
-                    if (this.outputs.get(item.stackIndex) == null) {
-                        this.outputs.put(item.stackIndex, new HashSet<>());
-                    }
-
-                    this.outputs.get(item.stackIndex).add(item);
-                }
-
-            }
-
-            for (int recipeIndex : this.multiplier.keySet()) {
-                if (recipeIndex == -1 || !inputs.contains(recipeIndex) || !outputs.contains(recipeIndex)) {
-                    this.initialItems.add(recipeIndex);
-                }
-            }
-
-            for (CraftingChainItem item : this.items) {
-                if (item.ingredient == false && !this.initialItems.contains(item.recipeIndex)) {
-                    this.startedIngrs.add(item.stackIndex);
-                }
-            }
-
-            CraftingChainItem.clearStatic();
-        }
-
-    }
-
-    public void refresh(List<ItemStack> items, List<ItemStackMetadata> metadata) {
-        CraftingChainRequest request = new CraftingChainRequest(items, metadata);
-        HashMap<Integer, Long> iShift = new HashMap<>();
-        HashMap<Integer, Long> oShift = new HashMap<>();
-        boolean change = true;
-        int iteration = 100;
-
-        while (--iteration > 0 && change) {
-            change = false;
-            for (int stackIndex : request.startedIngrs) {
-                change = calculateShift(request, stackIndex) || change;
-            }
-        }
-
-        this.inputs.clear();
-        this.outputs.clear();
-        this.remainder.clear();
-        this.intermediate.clear();
-        this.calculatedItems.clear();
-        this.multiplier.clear();
-
-        for (CraftingChainItem item : request.items) {
-            if (request.initialItems.contains(item.recipeIndex)) {
-                long iCount = calculateCount(request, request.inputs.get(item.stackIndex))
-                        - iShift.getOrDefault(item.stackIndex, 0L);
-                this.calculatedItems.put(item.stack, item.stack);
-
-                if (iCount == 0) {
-                    this.inputs.put(item.stack, item.getItemStack(0));
-                } else {
-                    long count = Math.min(iCount, item.count);
-                    this.inputs.put(item.stack, item.getItemStack(count));
-                    iShift.put(item.stackIndex, iShift.getOrDefault(item.stackIndex, 0L) + count);
-                }
-
-            }
-        }
-
-        for (CraftingChainItem item : request.items) {
-            if (!request.initialItems.contains(item.recipeIndex)) {
-                long count = item.count + item.factor * request.multiplier.get(item.recipeIndex);
-                this.calculatedItems.put(item.stack, item.getItemStack(count));
-
-                if (item.ingredient) { // input
-                    long oCount = calculateCount(request, request.outputs.get(item.stackIndex))
-                            - oShift.getOrDefault(item.stackIndex, 0L);
-
-                    if (oCount < count) {
-                        this.inputs.put(item.stack, item.getItemStack(count - oCount));
-                        oShift.put(item.stackIndex, oShift.getOrDefault(item.stackIndex, 0L) + oCount);
-                    } else if (oCount >= count) {
-                        this.intermediate.put(item.stack, item.getItemStack(0));
-                        oShift.put(item.stackIndex, oShift.getOrDefault(item.stackIndex, 0L) + count);
-                    }
-
-                } else { // output
-                    long iCalcCount = calculateCount(request, request.inputs.get(item.stackIndex));
-                    long iCount = iCalcCount - iShift.getOrDefault(item.stackIndex, 0L);
-                    this.multiplier.put(item.stack, item.factor > 0 ? (int) (count / item.factor) : 0);
-
-                    if (iCount >= count) {
-                        this.intermediate.put(item.stack, item.getItemStack(0));
-                        iShift.put(item.stackIndex, iShift.getOrDefault(item.stackIndex, 0L) + count);
-                    } else if (iCalcCount > 0) {
-                        this.remainder.put(item.stack, item.getItemStack(count - iCount));
-                        iShift.put(item.stackIndex, iShift.getOrDefault(item.stackIndex, 0L) + iCount);
-                    } else {
-                        this.outputs.put(item.stack, item.getItemStack(count - iCount));
-                        iShift.put(item.stackIndex, iShift.getOrDefault(item.stackIndex, 0L) + iCount);
-                    }
-                }
-
-            }
-        }
-
-    }
-
-    private boolean calculateShift(CraftingChainRequest request, int stackIndex) {
-
-        if (!request.outputs.containsKey(stackIndex)) {
-            return false;
-        }
-
-        int minRecipeIndex = 0;
-        int minShift = Integer.MAX_VALUE;
-
-        for (CraftingChainItem item : request.outputs.get(stackIndex)) {
-            if (!request.initialItems.contains(item.recipeIndex) && item.factor > 0) {
-                long ingrCount = calculateCount(request, request.inputs.get(item.stackIndex), item.recipeIndex);
-                long outputCount = calculateCount(request, request.outputs.get(item.stackIndex));
-                long shift = (long) Math.ceil((ingrCount - outputCount) / (double) item.factor);
-
-                if (shift > 0 && shift < minShift) {
-                    minShift = (int) shift;
-                    minRecipeIndex = item.recipeIndex;
-                }
-            }
-        }
-
-        if (minShift < Integer.MAX_VALUE) {
-            request.multiplier.put(minRecipeIndex, request.multiplier.get(minRecipeIndex) + minShift);
-            return true;
-        }
-
-        return false;
-    }
-
-    private long calculateCount(CraftingChainRequest request, HashSet<CraftingChainItem> items) {
-        return calculateCount(request, items, -1);
-    }
-
-    private long calculateCount(CraftingChainRequest request, HashSet<CraftingChainItem> items, int recipeIndex) {
-        long count = 0L;
-
-        if (items != null) {
-            for (CraftingChainItem item : items) {
-                if (item.recipeIndex != recipeIndex || recipeIndex == -1) {
-                    count += request.counts.get(item.guid) + item.factor * request.multiplier.get(item.recipeIndex);
-                }
-            }
-        }
-
-        return count;
-    }
-
-}

src/main/java/codechicken/nei/Button.java

@@ -15,7 +15,7 @@ public abstract class Button extends Widget {
     }
 
     public int contentWidth() {
-        return getRenderIcon() == null ? getStringWidth(label) : getRenderIcon().width;
+        return getRenderIcon() == null ? getStringWidth(getRenderLabel()) : getRenderIcon().width;
     }
 
     @Override

src/main/java/codechicken/nei/ClientHandler.java

@@ -1,10 +1,13 @@
 package codechicken.nei;
 
+import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.io.InputStreamReader;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -19,13 +22,17 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.EntityPlayerSP;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.GuiErrorScreen;
-import net.minecraft.client.gui.GuiMainMenu;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.gui.GuiSelectWorld;
+import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.client.multiplayer.WorldClient;
+import net.minecraft.client.resources.IResource;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.item.EntityItem;
+import net.minecraft.launchwrapper.Launch;
+import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
+import net.minecraftforge.client.event.GuiOpenEvent;
 import net.minecraftforge.client.event.RenderWorldLastEvent;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.world.WorldEvent;
@@ -36,7 +43,6 @@ import com.google.common.collect.Lists;
 
 import codechicken.core.ClassDiscoverer;
 import codechicken.core.ClientUtils;
-import codechicken.core.GuiModListScroll;
 import codechicken.lib.packet.PacketCustom;
 import codechicken.nei.api.API;
 import codechicken.nei.api.IConfigureNEI;
@@ -46,6 +52,9 @@ import codechicken.nei.recipe.GuiRecipeTab;
 import codechicken.nei.recipe.StackInfo;
 import cpw.mods.fml.client.CustomModLoadingErrorDisplayException;
 import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.common.Loader;
+import cpw.mods.fml.common.ModClassLoader;
+import cpw.mods.fml.common.discovery.ASMDataTable;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.gameevent.TickEvent;
 import cpw.mods.fml.common.gameevent.TickEvent.Phase;
@@ -57,7 +66,6 @@ public class ClientHandler {
     private static ClientHandler instance;
     private final ArrayList<EntityItem> SMPmagneticItems = new ArrayList<>();
     private World lastworld;
-    private GuiScreen lastGui;
 
     public void addSMPMagneticItem(int i, World world) {
         WorldClient cworld = (WorldClient) world;
@@ -144,6 +152,8 @@ public class ClientHandler {
         loadHeightHackHandlers();
         loadHiddenHandlers();
         loadEnableAutoFocus();
+        loadGuiCraftablesBlacklist();
+        loadDefaultBookmarkContainers();
         ItemInfo.preInit();
         StackInfo.loadGuidFilters();
     }
@@ -161,11 +171,34 @@ public class ClientHandler {
         }, callback);
     }
 
-    public static void loadSettingsFile(String resource, BiConsumer<File, FileWriter> createDefault,
+    public static boolean loadSettingsResource(String resource, Consumer<Stream<String>> callback) {
+        final ResourceLocation location = new ResourceLocation("nei", resource);
+
+        try {
+            final IResource res = Minecraft.getMinecraft().getResourceManager().getResource(location);
+
+            try (BufferedReader reader = new BufferedReader(
+                    new InputStreamReader(res.getInputStream(), StandardCharsets.UTF_8))) {
+                NEIClientConfig.logger.info("Loading '{}' from jar {}", resource, location);
+                callback.accept(
+                        IOUtils.readLines(reader).stream()
+                                .map(line -> line.contains("#") ? line.substring(0, line.indexOf('#')) : line)
+                                .map(String::trim).filter(line -> !line.isEmpty()));
+                return true;
+            }
+
+        } catch (Exception io) {
+            NEIClientConfig.logger.error("Failed to load '{}' file {}", resource, location);
+        }
+
+        return false;
+    }
+
+    public static boolean loadSettingsFile(String resource, BiConsumer<File, FileWriter> createDefault,
             Consumer<Stream<String>> callback) {
         File file = new File(NEIClientConfig.configDir, resource);
 
-        if (!file.exists()) {
+        if (!file.exists() && createDefault != null) {
             try (FileWriter writer = new FileWriter(file)) {
                 NEIClientConfig.logger.info("Creating default '{}' {}", resource, file);
                 createDefault.accept(file, writer);
@@ -174,13 +207,20 @@ public class ClientHandler {
             }
         }
 
-        try (FileReader reader = new FileReader(file)) {
-            NEIClientConfig.logger.info("Loading '{}' file {}", resource, file);
-            callback.accept(
-                    IOUtils.readLines(reader).stream().filter(line -> !line.startsWith("#") && !line.trim().isEmpty()));
-        } catch (IOException e) {
-            NEIClientConfig.logger.error("Failed to load '{}' file {}", resource, file, e);
+        if (file.exists()) {
+            try (FileReader reader = new FileReader(file)) {
+                NEIClientConfig.logger.info("Loading '{}' file {}", resource, file);
+                callback.accept(
+                        IOUtils.readLines(reader).stream()
+                                .map(line -> line.contains("#") ? line.substring(0, line.indexOf('#')) : line)
+                                .map(String::trim).filter(line -> !line.isEmpty()));
+                return true;
+            } catch (IOException e) {
+                NEIClientConfig.logger.error("Failed to load '{}' file {}", resource, file, e);
+            }
         }
+
+        return false;
     }
 
     public static void loadSerialHandlers() {
@@ -205,8 +245,27 @@ public class ClientHandler {
     public static void loadEnableAutoFocus() {
         loadSettingsFile(
                 "enableautofocus.cfg",
-                lines -> AutoFocusWidget.enableAutoFocusPrefixes = lines
-                        .collect(Collectors.toCollection(ArrayList::new)));
+                lines -> AutoFocusWidget.enableAutoFocusPrefixes = lines.collect(Collectors.toList()));
+    }
+
+    public static void loadGuiCraftablesBlacklist() {
+        loadSettingsFile(
+                "guicraftablesblacklist.cfg",
+                lines -> ItemCraftablesPanel.guiBlacklist = lines.collect(Collectors.toList()));
+    }
+
+    public static void loadDefaultBookmarkContainers() {
+        loadSettingsFile("defaultbookmarkcontainers.cfg", lines -> {
+            for (String clazz : lines.collect(Collectors.toList())) {
+                try {
+                    API.registerBookmarkContainerHandler(
+                            (Class<? extends GuiContainer>) Class.forName(clazz),
+                            new DefaultBookmarkContainerHandler());
+                } catch (Exception e) {
+                    NEIClientConfig.logger.error("Failed to load class '{}' for defaultbookmarkcontainers.cfg", clazz);
+                }
+            }
+        });
     }
 
     public static void loadHiddenItems() {
@@ -216,7 +275,6 @@ public class ClientHandler {
     public static void load() {
         instance = new ClientHandler();
 
-        GuiModListScroll.register("NotEnoughItems");
         PacketCustom.assignHandler(NEICPH.channel, new NEICPH());
         FMLCommonHandler.instance().bus().register(instance);
         MinecraftForge.EVENT_BUS.register(instance);
@@ -254,11 +312,34 @@ public class ClientHandler {
     }
 
     public static void loadPluginsList() {
-        final ClassDiscoverer classDiscoverer = new ClassDiscoverer(
-                test -> test.startsWith("NEI") && test.endsWith("Config.class"),
-                IConfigureNEI.class);
+        final boolean jarjar = Launch.blackboard.getOrDefault("jarjar.rfbPluginLoaded", Boolean.FALSE) == Boolean.TRUE;
+        if (!jarjar) {
+            // Do the old style class discovery
+            final ClassDiscoverer classDiscoverer = new ClassDiscoverer(
+                    test -> test.startsWith("NEI") && test.endsWith("Config.class"),
+                    IConfigureNEI.class);
 
-        NEIClientConfig.pluginsList.addAll(classDiscoverer.findClasses());
+            NEIClientConfig.pluginsList.addAll(classDiscoverer.findClasses());
+            NEIClientConfig.logger
+                    .info("Loading NEI Plugins via ClassDiscoverer: " + NEIClientConfig.pluginsList.size());
+
+        } else {
+            // If JarJar's loaded, the ASMDataTable now includes interfaces in addition to Annotations, so use that
+            // instead Includes a small change in behavior of no longer requiring the class to start with NEI and end
+            // with Config; This could easily be changed if desired, but the previous behavior was likely to speed
+            // things up by limiting the scope when looking at all of the jars and classes in the classpath.
+            final ASMDataTable dataTable = NEIModContainer.getAsmDataTable();
+            final ModClassLoader modClassLoader = (ModClassLoader) Loader.instance().getModClassLoader();
+            for (ASMDataTable.ASMData asmData : dataTable.getAll(IConfigureNEI.class.getName().replace('.', '/'))) {
+                final String className = asmData.getClassName().replace('/', '.');
+                try {
+                    NEIClientConfig.pluginsList.add(Class.forName(className, true, modClassLoader));
+                } catch (ClassNotFoundException e) {
+                    NEIClientConfig.logger.error("Failed to load plugin class {}", className, e);
+                }
+            }
+            NEIClientConfig.logger.info("Loading NEI Plugins via JarJar: " + NEIClientConfig.pluginsList.size());
+        }
     }
 
     @SubscribeEvent
@@ -281,18 +362,19 @@ public class ClientHandler {
             if (mc.currentScreen == null) NEIController.processCreativeCycling(mc.thePlayer.inventory);
 
             updateMagnetMode(mc.theWorld, mc.thePlayer);
+        } else {
+            lastworld = null;
         }
+    }
 
-        GuiScreen gui = mc.currentScreen;
-        if (gui != lastGui) {
-            if (gui instanceof GuiMainMenu) lastworld = null;
-            else if (gui instanceof GuiSelectWorld) NEIClientConfig.reloadSaves();
-            else if (gui == null) {
-                /* prevent WorldClient reference being held in the Gui */
-                NEIController.manager = null;
-            }
+    @SubscribeEvent
+    public void onGuiScreen(GuiOpenEvent event) {
+        if (event.gui instanceof GuiSelectWorld) {
+            NEIClientConfig.reloadSaves();
+        } else if (event.gui == null) {
+            /* prevent WorldClient reference being held in the Gui */
+            NEIController.manager = null;
         }
-        lastGui = gui;
     }
 
     @SubscribeEvent
@@ -311,14 +393,16 @@ public class ClientHandler {
         Minecraft mc = Minecraft.getMinecraft();
         if (event.world == mc.theWorld) {
             NEIClientConfig.unloadWorld();
+            ItemMobSpawner.clearEntityReferences();
         }
     }
 
     public void loadWorld(World world, boolean fromServer) {
         if (world != lastworld) {
             SMPmagneticItems.clear();
-            WorldOverlayRenderer.reset();
-
+            if (!NEIClientConfig.getBooleanSetting("world.overlays.lock")) {
+                WorldOverlayRenderer.reset();
+            }
             if (!fromServer) {
                 NEIClientConfig.setHasSMPCounterPart(false);
                 NEIClientConfig.setInternalEnabled(false);
@@ -326,8 +410,6 @@ public class ClientHandler {
                 if (!Minecraft.getMinecraft().isSingleplayer()) // wait for server to initiate in singleplayer
                     NEIClientConfig.loadWorld("remote/" + ClientUtils.getServerIP().replace(':', '~'));
             }
-            ItemMobSpawner.clearEntityReferences(world);
-
             lastworld = world;
         }
     }

src/main/java/codechicken/nei/CollapsibleItems.java

@@ -150,10 +150,16 @@ public class CollapsibleItems {
     }
 
     public static void putItem(ItemStack stack) {
-        final GroupItem group = CollapsibleItems.groups.stream().filter(g -> g.matches(stack)).findFirst().orElse(null);
+        int groupIndex = -1;
 
-        if (group != null) {
-            CollapsibleItems.cache.put(stack, CollapsibleItems.groups.indexOf(group));
+        for (int i = 0; i < CollapsibleItems.groups.size() && groupIndex == -1; i++) {
+            if (CollapsibleItems.groups.get(i).matches(stack)) {
+                groupIndex = i;
+            }
+        }
+
+        if (groupIndex != -1) {
+            CollapsibleItems.cache.put(stack, groupIndex);
         }
     }
 

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

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

src/main/java/codechicken/nei/DoubleFilteredFilter.java

@@ -1,24 +0,0 @@
-package codechicken.nei;
-
-import net.minecraft.item.ItemStack;
-
-import codechicken.nei.api.ItemFilter;
-
-public class DoubleFilteredFilter implements ItemFilter {
-
-    private ItemFilter filter;
-    private ItemList.PatternItemFilter patternFilter;
-
-    public DoubleFilteredFilter(ItemFilter filter, String itemFilter) {
-        this.filter = filter;
-        this.patternFilter = new ItemList.PatternItemFilter(SearchField.getPattern(itemFilter));
-    }
-
-    @Override
-    public boolean matches(ItemStack item) {
-        if (filter.matches(item)) {
-            return patternFilter.matches(item);
-        }
-        return false;
-    }
-}

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

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

src/main/java/codechicken/nei/FavoriteRecipes.java

@@ -0,0 +1,389 @@
+package codechicken.nei;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+
+import org.apache.commons.io.IOUtils;
+
+import com.google.common.io.Files;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import com.google.gson.JsonSyntaxException;
+
+import codechicken.core.CommonUtils;
+import codechicken.nei.api.API;
+import codechicken.nei.recipe.GuiCraftingRecipe;
+import codechicken.nei.recipe.GuiRecipeTab;
+import codechicken.nei.recipe.ICraftingHandler;
+import codechicken.nei.recipe.IRecipeHandler;
+import codechicken.nei.recipe.Recipe.RecipeId;
+import codechicken.nei.recipe.RecipeHandlerRef;
+import codechicken.nei.recipe.StackInfo;
+import codechicken.nei.util.FavoriteStorage;
+import codechicken.nei.util.NBTJson;
+
+public class FavoriteRecipes {
+
+    protected static final class FastKey {
+
+        public final ItemStack stack;
+        private int hash;
+
+        public FastKey(ItemStack stack) {
+            this.stack = stack;
+
+            this.hash = 31 + Item.getIdFromItem(stack.getItem());
+            this.hash = 31 * this.hash + stack.getItemDamage();
+        }
+
+        @Override
+        public int hashCode() {
+            return this.hash;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+
+            if (o instanceof FastKey k && this.stack.getItem() == k.stack.getItem()
+                    && this.stack.getItemDamage() == k.stack.getItemDamage()) {
+                return this.stack == k.stack || Objects.equals(this.stack.stackTagCompound, k.stack.stackTagCompound);
+            }
+
+            return false;
+        }
+    }
+
+    private static final RestartableTask singleRecipeFavoritesTask = new RestartableTask(
+            "Generate Single-Recipe Favorites") {
+
+        @Override
+        public void execute() {
+            final List<ICraftingHandler> handlers = GuiCraftingRecipe.getCraftingHandlers("all");
+            final Map<FastKey, RecipeHandlerRef> autogeneratedRecipes = new HashMap<>();
+            final Set<FastKey> whitelistItems = new HashSet<>(ItemList.items.size());
+            final FavoriteStorage storage = new FavoriteStorage();
+
+            for (ItemStack stack : ItemList.items) {
+                whitelistItems.add(new FastKey(stack));
+            }
+
+            if (interrupted()) return;
+
+            for (ICraftingHandler handler : handlers) {
+                if (!GuiRecipeTab.getHandlerInfo(handler).getShowFavoritesButton()) continue;
+
+                for (int i = 0; i < handler.numRecipes(); i++) {
+                    RecipeHandlerRef ref = null;
+
+                    for (PositionedStack result : getOutputs(handler, i)) {
+                        ItemStack stack = StackInfo.getItemStackWithMinimumDamage(result.items);
+                        final FastKey key = new FastKey(stack);
+
+                        if (!whitelistItems.contains(key)) continue;
+
+                        if (autogeneratedRecipes.get(key) == null) {
+
+                            if (ref == null) {
+                                ref = RecipeHandlerRef.of(handler, i);
+                            }
+
+                            autogeneratedRecipes.put(key, ref);
+                        } else {
+                            autogeneratedRecipes.remove(key);
+                            whitelistItems.remove(key);
+                        }
+
+                    }
+                }
+                if (interrupted()) return;
+            }
+
+            final Map<RecipeHandlerRef, RecipeId> recipesCache = new HashMap<>();
+
+            for (Map.Entry<FastKey, RecipeHandlerRef> entry : autogeneratedRecipes.entrySet()) {
+                final RecipeId recipeId = recipesCache
+                        .computeIfAbsent(entry.getValue(), r -> RecipeId.of(r.handler, r.recipeIndex));
+                storage.add(entry.getKey().stack, recipeId);
+            }
+
+            FavoriteRecipes.autoFavorites = storage;
+            updateSubsetVisibility();
+        }
+
+        protected List<PositionedStack> getOutputs(IRecipeHandler handler, int recipeIndex) {
+            final PositionedStack pStackResult = handler.getResultStack(recipeIndex);
+            return pStackResult != null ? Collections.singletonList(pStackResult) : handler.getOtherStacks(recipeIndex);
+        }
+
+    };
+
+    public static final String FAVORITE_ITEM = "FavoriteItem";
+    private static final FavoriteStorage manualFavorites = new FavoriteStorage();
+    private static FavoriteStorage autoFavorites = new FavoriteStorage();
+    private static File favoriteFile;
+    private static int revision = 0;
+
+    static {
+        API.addSubset("Favorites.Manual", manualFavorites::contains);
+        API.addSubset("Favorites.Generated", stack -> FavoriteRecipes.autoFavorites.contains(stack));
+    }
+
+    private FavoriteRecipes() {}
+
+    public static void load() {
+        String worldPath = "global";
+
+        if (NEIClientConfig.getBooleanSetting("inventory.favorites.worldSpecific")) {
+            worldPath = NEIClientConfig.getWorldPath();
+        }
+
+        final File dir = new File(CommonUtils.getMinecraftDir(), "saves/NEI/" + worldPath);
+
+        if (!dir.exists()) {
+            dir.mkdirs();
+        }
+
+        favoriteFile = new File(dir, "favorites.ini");
+
+        if (!favoriteFile.exists()) {
+            final File globalFavorites = new File(CommonUtils.getMinecraftDir(), "saves/NEI/global/favorites.ini");
+            final File configFavorites = new File(NEIClientConfig.configDir, "favorites.ini");
+            final File defaultFavorites = configFavorites.exists() ? configFavorites : globalFavorites;
+
+            if (defaultFavorites.exists()) {
+                try {
+                    if (favoriteFile.createNewFile()) {
+                        InputStream src = new FileInputStream(defaultFavorites);
+                        OutputStream dst = new FileOutputStream(favoriteFile);
+
+                        IOUtils.copy(src, dst);
+
+                        src.close();
+                        dst.close();
+                    }
+                } catch (IOException e) {}
+            }
+        }
+
+        loadData();
+    }
+
+    private static void loadData() {
+
+        if (favoriteFile == null || !favoriteFile.exists()) {
+            return;
+        }
+
+        List<String> itemStrings;
+
+        try (FileInputStream reader = new FileInputStream(favoriteFile)) {
+            NEIClientConfig.logger.info("Loading favorites from file {}", favoriteFile);
+            itemStrings = IOUtils.readLines(reader, StandardCharsets.UTF_8);
+        } catch (IOException e) {
+            NEIClientConfig.logger.error("Failed to load favorites from file {}", favoriteFile, e);
+            return;
+        }
+
+        final JsonParser parser = new JsonParser();
+        boolean hasErrors = false;
+
+        manualFavorites.clear();
+
+        for (String itemStr : itemStrings) {
+
+            if (itemStr.isEmpty() || itemStr.startsWith("#")) {
+                continue;
+            }
+
+            try {
+                JsonObject jsonObject = parser.parse(itemStr).getAsJsonObject();
+
+                if (jsonObject.get("item") != null && jsonObject.get("recipeId") != null) {
+                    final NBTTagCompound itemStackNBT = (NBTTagCompound) NBTJson.toNbt(jsonObject.get("item"));
+                    final RecipeId recipeId = RecipeId.of(jsonObject.getAsJsonObject("recipeId"));
+                    final ItemStack stack = StackInfo.loadFromNBT(itemStackNBT);
+
+                    if (recipeId == null || stack == null) {
+                        continue;
+                    }
+
+                    if (FAVORITE_ITEM.equals(recipeId.getHandleName()) || RecipeHandlerRef.of(recipeId) != null) {
+                        manualFavorites.add(stack, recipeId);
+                    } else {
+                        hasErrors = true;
+                    }
+
+                }
+
+            } catch (Exception e) {
+                NEIClientConfig.logger.error("Failed to load favorite from json string: {}", itemStr);
+                hasErrors = true;
+            }
+
+        }
+
+        if (hasErrors) {
+
+            try {
+                Files.copy(
+                        favoriteFile,
+                        new File(favoriteFile.getAbsolutePath() + ".backup-" + System.currentTimeMillis()));
+                NEIClientConfig.logger.info("Backed up invalid favorite file to {}", favoriteFile);
+            } catch (IOException e) {
+                NEIClientConfig.logger.error("Failed to backup invalid favorite file to {}", favoriteFile, e);
+            }
+
+            save();
+        }
+
+        loadAutoGeneratedRecipes();
+    }
+
+    public static RecipeId getGeneratedFavorite(ItemStack stack) {
+        if (NEIClientConfig.favoritesEnabled() && stack != null) {
+            return autoFavorites.getRecipeId(stack);
+        }
+        return null;
+    }
+
+    public static ItemStack getGeneratedFavorite(RecipeId recipeId) {
+        if (NEIClientConfig.favoritesEnabled() && recipeId != null) {
+            return autoFavorites.getItemStack(recipeId);
+        }
+        return null;
+    }
+
+    public static RecipeId getManualFavorite(ItemStack stack) {
+        if (NEIClientConfig.favoritesEnabled() && stack != null) {
+            return manualFavorites.getRecipeId(stack);
+        }
+        return null;
+    }
+
+    public static ItemStack getManualFavorite(RecipeId recipeId) {
+        if (NEIClientConfig.favoritesEnabled() && recipeId != null) {
+            return manualFavorites.getItemStack(recipeId);
+        }
+        return null;
+    }
+
+    public static RecipeId getFavorite(ItemStack stack) {
+
+        if (NEIClientConfig.favoritesEnabled() && stack != null) {
+            final RecipeId recipeId = manualFavorites.getRecipeId(stack);
+            return recipeId != null ? recipeId : autoFavorites.getRecipeId(stack);
+        }
+
+        return null;
+    }
+
+    public static ItemStack getFavorite(RecipeId recipeId) {
+
+        if (NEIClientConfig.favoritesEnabled() && recipeId != null) {
+            final ItemStack stack = manualFavorites.getItemStack(recipeId);
+            return stack != null ? stack : autoFavorites.getItemStack(recipeId);
+        }
+
+        return null;
+    }
+
+    public static int size() {
+        return manualFavorites.size() + autoFavorites.size();
+    }
+
+    public static void reload() {
+        save();
+        load();
+    }
+
+    public static boolean containsManual(ItemStack stack) {
+        return getManualFavorite(stack) != null;
+    }
+
+    public static boolean contains(ItemStack stack) {
+        return getFavorite(stack) != null;
+    }
+
+    public static void setFavorite(ItemStack stack, RecipeId recipeId) {
+        if (stack == null) return;
+
+        manualFavorites.removeItemStack(stack);
+
+        if (recipeId != null) {
+            manualFavorites.removeRecipeId(recipeId);
+            manualFavorites.add(stack, recipeId);
+        }
+
+        updateSubsetVisibility();
+    }
+
+    public static void loadAutoGeneratedRecipes() {
+        if (ItemList.loadFinished
+                && NEIClientConfig.getBooleanSetting("inventory.favorites.generateSingleRecipeFavorites")) {
+            singleRecipeFavoritesTask.restart();
+        } else {
+            singleRecipeFavoritesTask.stop();
+            autoFavorites.clear();
+
+            updateSubsetVisibility();
+        }
+    }
+
+    protected static void updateSubsetVisibility() {
+        SubsetWidget.updateHiddenItems();
+        FavoriteRecipes.revision++;
+    }
+
+    public static int getRevision() {
+        return revision;
+    }
+
+    public static void save() {
+
+        if (favoriteFile == null) {
+            return;
+        }
+
+        final List<String> strings = new ArrayList<>();
+
+        for (Map.Entry<NBTTagCompound, RecipeId> entry : manualFavorites.getAllFavorites()) {
+
+            try {
+                final JsonObject line = new JsonObject();
+
+                line.add("item", NBTJson.toJsonObject(entry.getKey()));
+                line.add("recipeId", entry.getValue().toJsonObject());
+
+                strings.add(NBTJson.toJson(line));
+            } catch (JsonSyntaxException e) {
+                NEIClientConfig.logger.error("Failed to stringify favorites ItemStack to json string");
+            }
+
+        }
+
+        try (FileOutputStream output = new FileOutputStream(favoriteFile)) {
+            IOUtils.writeLines(strings, "\n", output, StandardCharsets.UTF_8);
+        } catch (IOException e) {
+            NEIClientConfig.logger.error("Failed to save favorites list to file {}", favoriteFile, e);
+        }
+    }
+
+}

src/main/java/codechicken/nei/FormattedTextField.java

@@ -4,6 +4,7 @@ import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.Gui;
 import net.minecraft.client.gui.GuiTextField;
 import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.util.ChatAllowedCharacters;
 import net.minecraft.util.EnumChatFormatting;
 
 import org.lwjgl.opengl.GL11;
@@ -20,6 +21,7 @@ public class FormattedTextField extends GuiTextField {
     protected FontRenderer fontRenderer;
     protected String rawText = "";
     protected String formattedText = "";
+    protected String placeholder = "";
     protected boolean editable = true;
     protected int editableColor = 14737632;
     protected int notEditableColor = 7368816;
@@ -36,6 +38,14 @@ public class FormattedTextField extends GuiTextField {
         this.formatter = formatter;
     }
 
+    public TextFormatter getFormatter() {
+        return this.formatter;
+    }
+
+    public void setPlaceholder(String placeholder) {
+        this.placeholder = placeholder;
+    }
+
     @Override
     public void updateCursorCounter() {
         super.updateCursorCounter();
@@ -51,6 +61,11 @@ public class FormattedTextField extends GuiTextField {
         super.setFocused(focus);
     }
 
+    @Override
+    public void setText(String rawText) {
+        super.setText(EnumChatFormatting.getTextWithoutFormattingCodes(rawText));
+    }
+
     @Override
     public void setSelectionPos(int p_146199_1_) {
         String text = this.getText();
@@ -102,89 +117,140 @@ public class FormattedTextField extends GuiTextField {
         this.editable = p_146184_1_;
     }
 
+    protected boolean beforeWrite(String text) {
+        return true;
+    }
+
+    @Override
+    public void writeText(String textPart) {
+        String newText = "";
+        String substr = ChatAllowedCharacters.filerAllowedCharacters(textPart);
+        int cursorPosition = getCursorPosition();
+        int maxStringLength = getMaxStringLength();
+        String text = getText();
+
+        if (text.isEmpty()) {
+            newText = substr.substring(0, Math.min(maxStringLength, substr.length()));
+            cursorPosition = newText.length();
+        } else {
+            int selectionEnd = getSelectionEnd();
+            String textStart = text.substring(0, Math.min(cursorPosition, selectionEnd));
+            String textEnd = text.substring(Math.max(cursorPosition, selectionEnd));
+            newText = textStart + substr + textEnd;
+
+            if (newText.length() > maxStringLength) {
+                newText = newText.substring(0, maxStringLength);
+            }
+
+            cursorPosition = Math.min(textStart.length() + substr.length(), newText.length());
+        }
+
+        if (beforeWrite(newText)) {
+            setText(newText);
+            setCursorPosition(cursorPosition);
+        }
+    }
+
+    @Override
+    public int getNthWordFromPos(int p_146183_1_, int p_146183_2_) {
+        return this.func_146197_a(p_146183_1_, p_146183_2_, true);
+    }
+
     @Override
     public void drawTextBox() {
-        if (this.getVisible()) {
-            if (this.getEnableBackgroundDrawing()) {
-                drawRect(
-                        this.xPosition - 1,
-                        this.yPosition - 1,
-                        this.xPosition + this.width + 1,
-                        this.yPosition + this.height + 1,
-                        -6250336);
-                drawRect(
-                        this.xPosition,
-                        this.yPosition,
-                        this.xPosition + this.width,
-                        this.yPosition + this.height,
-                        -16777216);
+
+        if (!this.getVisible()) {
+            return;
+        }
+
+        if (this.getEnableBackgroundDrawing()) {
+            drawRect(
+                    this.xPosition - 1,
+                    this.yPosition - 1,
+                    this.xPosition + this.width + 1,
+                    this.yPosition + this.height + 1,
+                    -6250336);
+            drawRect(
+                    this.xPosition,
+                    this.yPosition,
+                    this.xPosition + this.width,
+                    this.yPosition + this.height,
+                    -16777216);
+        }
+
+        if (!this.rawText.equals(getText())) {
+            this.rawText = getText();
+            this.formattedText = this.formatter.format(this.rawText);
+            if (!EnumChatFormatting.getTextWithoutFormattingCodes(this.formattedText).toLowerCase()
+                    .equals(this.rawText.toLowerCase())) {
+                this.formattedText = this.rawText;
             }
+        }
 
-            if (!this.rawText.equals(getText())) {
-                this.rawText = getText();
-                this.formattedText = this.formatter.format(this.rawText);
-                if (!EnumChatFormatting.getTextWithoutFormattingCodes(this.formattedText).toLowerCase()
-                        .equals(this.rawText.toLowerCase())) {
-                    this.formattedText = this.rawText;
-                }
+        if (!isFocused() && this.formattedText.isEmpty()) {
+            int x = getEnableBackgroundDrawing() ? this.xPosition + 4 : this.xPosition;
+            int y = getEnableBackgroundDrawing() ? this.yPosition + (this.height - 8) / 2 : this.yPosition;
+            this.fontRenderer.drawStringWithShadow(
+                    this.fontRenderer.trimStringToWidth(this.placeholder, this.getWidth()),
+                    x,
+                    y,
+                    this.notEditableColor);
+            return;
+        }
+
+        int firstCharacterIndex = getFormattedTextShift(this.lineScrollOffset);
+        String rawTextClipped = this.fontRenderer
+                .trimStringToWidth(this.rawText.substring(this.lineScrollOffset), this.getWidth());
+        String textClipped = this.formattedText
+                .substring(firstCharacterIndex, getFormattedTextShift(this.lineScrollOffset + rawTextClipped.length()));
+        int cursorPosition = getFormattedTextShift(getCursorPosition());
+        int selectionEnd = getFormattedTextShift(getSelectionEnd());
+
+        int color = this.editable ? this.editableColor : this.notEditableColor;
+        int cursorA = cursorPosition - firstCharacterIndex;
+        int cursorB = selectionEnd - firstCharacterIndex;
+        boolean flag = cursorA >= 0 && cursorA <= textClipped.length();
+        boolean flag1 = isFocused() && this.frame / 6 % 2 == 0 && flag;
+        boolean flag2 = getCursorPosition() < this.rawText.length() || this.rawText.length() >= getMaxStringLength();
+        int x = getEnableBackgroundDrawing() ? this.xPosition + 4 : this.xPosition;
+        int y = getEnableBackgroundDrawing() ? this.yPosition + (this.height - 8) / 2 : this.yPosition;
+        int x2 = x;
+
+        if (cursorB > textClipped.length()) {
+            cursorB = textClipped.length();
+        }
+
+        if (textClipped.length() > 0) {
+            String s1 = flag ? textClipped.substring(0, cursorA) : textClipped;
+            String colorA = getPreviousColor(firstCharacterIndex);
+            x2 = this.fontRenderer.drawStringWithShadow(colorA + s1, x, y, color);
+        }
+
+        int k1 = x2;
+
+        if (!flag) {
+            k1 = cursorA > 0 ? x + this.width : x;
+        } else if (flag2) {
+            k1 = x2 - 1;
+            --x2;
+        }
+
+        if (textClipped.length() > 0 && flag && cursorA < textClipped.length()) {
+            String colorB = getPreviousColor(firstCharacterIndex + cursorA);
+            this.fontRenderer.drawStringWithShadow(colorB + textClipped.substring(cursorA), x2, y, color);
+        }
+
+        if (flag1) {
+            if (flag2) {
+                Gui.drawRect(k1, y - 1, k1 + 1, y + 1 + this.fontRenderer.FONT_HEIGHT, -3092272);
+            } else {
+                this.fontRenderer.drawStringWithShadow("_", k1, y, color);
             }
+        }
 
-            int firstCharacterIndex = getFormattedTextShift(this.lineScrollOffset);
-            String rawTextClipped = this.fontRenderer
-                    .trimStringToWidth(this.rawText.substring(this.lineScrollOffset), this.getWidth());
-            String textClipped = this.formattedText.substring(
-                    firstCharacterIndex,
-                    getFormattedTextShift(this.lineScrollOffset + rawTextClipped.length()));
-            int cursorPosition = getFormattedTextShift(this.getCursorPosition());
-            int selectionEnd = getFormattedTextShift(this.getSelectionEnd());
-
-            int color = this.editable ? this.editableColor : this.notEditableColor;
-            int cursorA = cursorPosition - firstCharacterIndex;
-            int cursorB = selectionEnd - firstCharacterIndex;
-            boolean flag = cursorA >= 0 && cursorA <= textClipped.length();
-            boolean flag1 = this.isFocused() && this.frame / 6 % 2 == 0 && flag;
-            boolean flag2 = this.getCursorPosition() < this.rawText.length()
-                    || this.rawText.length() >= this.getMaxStringLength();
-            int x = this.getEnableBackgroundDrawing() ? this.xPosition + 4 : this.xPosition;
-            int y = this.getEnableBackgroundDrawing() ? this.yPosition + (this.height - 8) / 2 : this.yPosition;
-            int x2 = x;
-
-            if (cursorB > textClipped.length()) {
-                cursorB = textClipped.length();
-            }
-
-            if (textClipped.length() > 0) {
-                String s1 = flag ? textClipped.substring(0, cursorA) : textClipped;
-                String colorA = getPreviousColor(firstCharacterIndex);
-                x2 = this.fontRenderer.drawStringWithShadow(colorA + s1, x, y, color);
-            }
-
-            int k1 = x2;
-
-            if (!flag) {
-                k1 = cursorA > 0 ? x + this.width : x;
-            } else if (flag2) {
-                k1 = x2 - 1;
-                --x2;
-            }
-
-            if (textClipped.length() > 0 && flag && cursorA < textClipped.length()) {
-                String colorB = getPreviousColor(firstCharacterIndex + cursorA);
-                this.fontRenderer.drawStringWithShadow(colorB + textClipped.substring(cursorA), x2, y, color);
-            }
-
-            if (flag1) {
-                if (flag2) {
-                    Gui.drawRect(k1, y - 1, k1 + 1, y + 1 + this.fontRenderer.FONT_HEIGHT, -3092272);
-                } else {
-                    this.fontRenderer.drawStringWithShadow("_", k1, y, color);
-                }
-            }
-
-            if (cursorB != cursorA) {
-                int l1 = x + this.fontRenderer.getStringWidth(textClipped.substring(0, cursorB));
-                drawCursorVertical(k1, y - 1, l1 - 1, y + 1 + this.fontRenderer.FONT_HEIGHT);
-            }
+        if (cursorB != cursorA) {
+            int l1 = x + this.fontRenderer.getStringWidth(textClipped.substring(0, cursorB));
+            drawCursorVertical(k1, y - 1, l1 - 1, y + 1 + this.fontRenderer.FONT_HEIGHT);
         }
     }
 
@@ -212,7 +278,7 @@ public class FormattedTextField extends GuiTextField {
         }
 
         Tessellator tessellator = Tessellator.instance;
-        GL11.glColor4f(0.0F, 0.0F, 255.0F, 255.0F);
+        GL11.glColor4f(0.0F, 0.0F, 1.0F, 1.0F);
         GL11.glDisable(GL11.GL_TEXTURE_2D);
         GL11.glEnable(GL11.GL_COLOR_LOGIC_OP);
         GL11.glLogicOp(GL11.GL_OR_REVERSE);

src/main/java/codechicken/nei/HUDRenderer.java

@@ -42,13 +42,11 @@ public class HUDRenderer implements IKeyStateTracker {
                 && mc.objectMouseOver != null
                 && mc.objectMouseOver.typeOfHit == MovingObjectType.BLOCK) {
             World world = mc.theWorld;
-            ItemStack[] items = ItemInfo.getIdentifierItems(world, mc.thePlayer, mc.objectMouseOver)
-                    .toArray(new ItemStack[0]);
+            final List<ItemStack> items = ItemInfo.getIdentifierItems(world, mc.thePlayer, mc.objectMouseOver);
 
-            if (items.length == 0) return;
-
-            ItemStack stack = StackInfo.getItemStackWithMinimumDamage(items);
+            if (items.isEmpty()) return;
 
+            final ItemStack stack = StackInfo.getItemStackWithMinimumDamage(items.toArray(new ItemStack[0]));
             renderOverlay(stack, ItemInfo.getText(stack, world, mc.thePlayer, mc.objectMouseOver), getPositioning());
         }
     }

src/main/java/codechicken/nei/HeldItemHandler.java

@@ -5,12 +5,12 @@ import static codechicken.nei.NEIClientUtils.translate;
 import java.util.List;
 
 import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 
 import codechicken.nei.guihook.GuiContainerManager;
 import codechicken.nei.guihook.IContainerInputHandler;
 import codechicken.nei.guihook.IContainerTooltipHandler;
+import codechicken.nei.recipe.AutoCraftingManager;
 
 public class HeldItemHandler implements IContainerInputHandler, IContainerTooltipHandler {
 
@@ -25,9 +25,10 @@ public class HeldItemHandler implements IContainerInputHandler, IContainerToolti
     }
 
     protected boolean contains(int mousex, int mousey) {
-        return NEIClientUtils.getHeldItem() != null
-                && (ItemPanels.bookmarkPanel.contains(mousex, mousey) || ItemPanels.itemPanel.contains(mousex, mousey)
-                        || ItemPanels.itemPanel.historyPanel.contains(mousex, mousey));
+        return NEIClientUtils.getHeldItem() != null && !ItemPanels.bookmarkPanel.inEditingState()
+                && !AutoCraftingManager.processing()
+                && (ItemPanels.bookmarkPanel.contains(mousex, mousey)
+                        || ItemPanels.itemPanel.containsWithSubpanels(mousex, mousey));
     }
 
     @Override
@@ -35,7 +36,8 @@ public class HeldItemHandler implements IContainerInputHandler, IContainerToolti
 
         if (contains(mousex, mousey)) {
 
-            if (NEIClientConfig.canPerformAction("delete") && NEIClientConfig.canPerformAction("item")) {
+            if (NEIClientConfig.canPerformAction("delete") && NEIClientConfig.canPerformAction("item")
+                    || NEIClientUtils.mc().playerController.isInCreativeMode()) {
                 if (button == 1) {
                     NEIClientUtils.decreaseSlotStack(-999);
                 } else {
@@ -94,24 +96,14 @@ public class HeldItemHandler implements IContainerInputHandler, IContainerToolti
 
     }
 
-    @Override
-    public List<String> handleItemDisplayName(GuiContainer gui, ItemStack itemstack, List<String> currenttip) {
-        return currenttip;
-    }
-
-    @Override
-    public List<String> handleItemTooltip(GuiContainer gui, ItemStack itemstack, int mousex, int mousey,
-            List<String> currenttip) {
-        return currenttip;
-    }
-
     @Override
     public List<String> handleTooltip(GuiContainer gui, int mousex, int mousey, List<String> currenttip) {
 
         if (contains(mousex, mousey)) {
             currenttip.clear();
 
-            if (NEIClientConfig.canPerformAction("delete") && NEIClientConfig.canPerformAction("item")) {
+            if (NEIClientConfig.canPerformAction("delete") && NEIClientConfig.canPerformAction("item")
+                    || NEIClientUtils.mc().playerController.isInCreativeMode()) {
                 currenttip.add(EnumChatFormatting.RED + translate("itempanel.deleteItem"));
             }
         }

src/main/java/codechicken/nei/ItemCraftablesPanel.java

@@ -0,0 +1,313 @@
+package codechicken.nei;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.item.ItemStack;
+
+import codechicken.lib.vec.Rectangle4i;
+import codechicken.nei.ItemsGrid.ItemsGridSlot;
+import codechicken.nei.ItemsGrid.MouseContext;
+import codechicken.nei.NEIClientUtils.Alignment;
+import codechicken.nei.recipe.AutoCraftingManager;
+import codechicken.nei.recipe.GuiCraftingRecipe;
+import codechicken.nei.recipe.GuiRecipe;
+import codechicken.nei.recipe.ICraftingHandler;
+import codechicken.nei.recipe.IRecipeHandler;
+import codechicken.nei.recipe.Recipe;
+import codechicken.nei.recipe.Recipe.RecipeId;
+import codechicken.nei.recipe.RecipeInfo;
+import codechicken.nei.recipe.StackInfo;
+import codechicken.nei.util.ReadableNumberConverter;
+
+public class ItemCraftablesPanel
+        extends AbstractSubpanel<ItemsGrid<ItemCraftablesPanel.CraftablesGridSlot, MouseContext>> {
+
+    public static class CraftablesGridSlot extends ItemsGridSlot {
+
+        protected final long realAmount;
+        protected final boolean isFluidDisplay;
+        protected final RecipeId recipeId;
+
+        public CraftablesGridSlot(int slotIndex, int itemIndex, ItemStack itemStack, RecipeId recipeId) {
+            super(slotIndex, itemIndex, itemStack);
+            this.realAmount = StackInfo.getAmount(itemStack);
+            this.isFluidDisplay = StackInfo.itemStackToNBT(itemStack).hasKey("gtFluidName");
+            this.recipeId = recipeId;
+        }
+
+        @Override
+        public RecipeId getRecipeId() {
+            return this.recipeId;
+        }
+
+        @Override
+        public <M extends MouseContext> void afterDraw(Rectangle4i rect, M mouseContext) {
+            drawStackSize(rect);
+        }
+
+        protected void drawStackSize(Rectangle4i rect) {
+            long stackSize = this.realAmount;
+
+            if (stackSize > 1) {
+                final float panelFactor = (rect.w - 2) / (DEFAULT_SLOT_SIZE - 2);
+                String amountString = "";
+
+                if (stackSize < 10_000) {
+                    amountString = String.valueOf(stackSize);
+                } else {
+                    amountString = ReadableNumberConverter.INSTANCE.toWideReadableForm(stackSize);
+                }
+
+                if (this.isFluidDisplay) {
+                    amountString += "L";
+                }
+
+                NEIClientUtils.drawNEIOverlayText(
+                        amountString,
+                        new Rectangle4i(rect.x + 1, rect.y + 1, rect.w - 2, rect.h - 2),
+                        panelFactor,
+                        0xFFFFFF,
+                        true,
+                        this.isFluidDisplay ? Alignment.BottomLeft : Alignment.BottomRight);
+            }
+        }
+
+    }
+
+    public static List<String> guiBlacklist = new ArrayList<>();
+    private final int MIN_DELAY = 600;
+
+    private Map<String, ArrayList<ICraftingHandler>> identHandlers = new HashMap<>();
+    private Map<ItemStack, RecipeId> availableRecipes = new HashMap<>();
+
+    private GuiContainer lastGuiContainer = null;
+    private ItemStackAmount lastPlayerInventory = null;
+    private long lastPlayerInventorySync = 0;
+    private int lastFavoritesCount = 0;
+
+    public ItemCraftablesPanel() {
+        this.grid = new ItemsGrid<>() {
+
+            protected List<CraftablesGridSlot> gridMask;
+
+            @Override
+            protected void onGridChanged() {
+                this.gridMask = null;
+                super.onGridChanged();
+            }
+
+            @Override
+            public List<CraftablesGridSlot> getMask() {
+
+                if (this.gridMask == null) {
+                    final int maxSlotIndex = this.rows * this.columns;
+                    final List<CraftablesGridSlot> gridMask = new ArrayList<>();
+                    this.realItems.clear();
+
+                    if (!ItemCraftablesPanel.this.availableRecipes.isEmpty()) {
+                        final List<Map.Entry<ItemStack, RecipeId>> entries = ItemCraftablesPanel.this.availableRecipes
+                                .entrySet().stream()
+                                .sorted(
+                                        Map.Entry.comparingByKey(
+                                                Comparator.comparing(FavoriteRecipes::containsManual)
+                                                        .thenComparing(FavoriteRecipes::contains).reversed()
+                                                        .thenComparing(ItemSorter.instance)))
+                                .limit(maxSlotIndex).collect(Collectors.toList());
+                        int slotIndex = 0;
+                        int itemIndex = 0;
+
+                        for (Map.Entry<ItemStack, RecipeId> entry : entries) {
+                            if (!isInvalidSlot(slotIndex)) {
+                                this.realItems.add(entry.getKey());
+                                gridMask.add(
+                                        new CraftablesGridSlot(
+                                                slotIndex,
+                                                itemIndex++,
+                                                entry.getKey(),
+                                                entry.getValue()));
+                            }
+                            if (slotIndex++ >= maxSlotIndex) {
+                                break;
+                            }
+                        }
+
+                        this.gridMask = gridMask;
+                    } else {
+                        this.gridMask = Collections.emptyList();
+                    }
+
+                    ItemCraftablesPanel.this.updateLinePadding();
+                }
+
+                return this.gridMask;
+            }
+
+            @Override
+            protected MouseContext getMouseContext(int mousex, int mousey) {
+                final ItemsGridSlot hovered = getSlotMouseOver(mousex, mousey);
+
+                if (hovered != null) {
+                    return new MouseContext(
+                            hovered.slotIndex,
+                            hovered.slotIndex / this.columns,
+                            hovered.slotIndex % this.columns);
+                }
+
+                return null;
+            }
+
+        };
+    }
+
+    @Override
+    protected ItemStack getDraggedStackWithQuantity(ItemStack itemStack) {
+        return ItemQuantityField.prepareStackWithQuantity(itemStack, StackInfo.getAmount(itemStack));
+    }
+
+    @Override
+    public void draw(int mousex, int mousey) {
+        if (!this.availableRecipes.isEmpty()) {
+            super.draw(mousex, mousey);
+        }
+    }
+
+    @Override
+    public int setPanelWidth(int width) {
+        if (getGuiContainer() != this.lastGuiContainer) updateCraftables();
+
+        final int columns = width / ItemsGrid.SLOT_SIZE;
+        final int useRows = NEIClientConfig.getIntSetting("inventory.craftables.useRows");
+        final int rows = (int) Math.min(Math.ceil(this.availableRecipes.size() * 1f / columns), useRows);
+
+        this.w = width;
+        this.h = 8 + ItemsGrid.SLOT_SIZE * Math.max(rows, 1);
+
+        return rows;
+    }
+
+    public void update() {
+        this.splittingLineColor = NEIClientConfig.getSetting("inventory.craftables.color").getHexValue();
+        updateCraftables();
+        super.update();
+    }
+
+    private void updateCraftables() {
+
+        if (!NEIClientConfig.showCraftablesPanelWidget()) {
+            clearCraftables();
+        } else if (this.lastPlayerInventory == null
+                || Math.abs(System.currentTimeMillis() - this.lastPlayerInventorySync) >= MIN_DELAY) {
+                    final GuiContainer firstGui = getGuiContainer();
+                    this.lastPlayerInventorySync = System.currentTimeMillis();
+
+                    if (firstGui != null && !ItemCraftablesPanel.guiBlacklist.contains(firstGui.getClass().getName())) {
+                        final boolean showOnlyFavorites = NEIClientConfig
+                                .getBooleanSetting("inventory.craftables.favoritesOnly");
+                        final ItemStackAmount inv = AutoCraftingManager.getInventoryItems(firstGui);
+
+                        if (this.lastGuiContainer != firstGui
+                                || showOnlyFavorites && this.lastFavoritesCount != FavoriteRecipes.size()
+                                || !inv.equals(this.lastPlayerInventory)) {
+                            this.lastPlayerInventory = inv;
+                            this.lastGuiContainer = firstGui;
+                            this.lastFavoritesCount = FavoriteRecipes.size();
+                            this.availableRecipes = generateCraftables(firstGui);
+                            this.grid.onGridChanged();
+                        }
+
+                    } else {
+                        clearCraftables();
+                    }
+
+                }
+
+    }
+
+    private void clearCraftables() {
+        if (!this.availableRecipes.isEmpty()) {
+            this.availableRecipes = Collections.emptyMap();
+            this.lastPlayerInventory = null;
+            this.grid.onGridChanged();
+        }
+    }
+
+    private GuiContainer getGuiContainer() {
+        final GuiContainer firstGui = NEIClientUtils.getGuiContainer();
+        return (firstGui instanceof GuiRecipe gui) ? gui.firstGui : firstGui;
+    }
+
+    private Map<ItemStack, RecipeId> generateCraftables(GuiContainer firstGui) {
+        final List<IRecipeHandler> availableHandlers = getAvailableHandlers(firstGui);
+        final Map<ItemStack, RecipeId> availableRecipes = new HashMap<>();
+
+        if (!availableHandlers.isEmpty()) {
+            final List<ItemStack> invStacks = ItemCraftablesPanel.this.lastPlayerInventory.values();
+
+            for (IRecipeHandler handler : availableHandlers) {
+                availableRecipes.putAll(filterHandlerRecipes(handler, firstGui, invStacks));
+            }
+
+        }
+
+        return availableRecipes;
+    }
+
+    private List<IRecipeHandler> getAvailableHandlers(GuiContainer firstGui) {
+        final List<IRecipeHandler> availableHandlers = new ArrayList<>();
+
+        for (String ident : RecipeInfo.getOverlayHandlerIdents(firstGui)) {
+            availableHandlers.addAll(identHandlers.computeIfAbsent(ident, GuiCraftingRecipe::getCraftingHandlers));
+        }
+
+        return availableHandlers;
+    }
+
+    private Map<ItemStack, RecipeId> filterHandlerRecipes(IRecipeHandler handler, GuiContainer firstGui,
+            List<ItemStack> invStacks) {
+        final Map<ItemStack, RecipeId> availableRecipes = new HashMap<>();
+        final boolean showOnlyFavorites = NEIClientConfig.getBooleanSetting("inventory.craftables.favoritesOnly");
+
+        IntStream.range(0, handler.numRecipes()).parallel().forEach(recipeIndex -> {
+            if (existsIngredients(firstGui, handler.getIngredientStacks(recipeIndex), invStacks)) {
+                final Recipe recipe = Recipe.of(handler, recipeIndex);
+
+                if (!recipe.getResults().isEmpty()
+                        && (!showOnlyFavorites || FavoriteRecipes.getFavorite(recipe.getRecipeId()) != null)) {
+                    synchronized (availableRecipes) {
+                        availableRecipes.put(recipe.getResult(), recipe.getRecipeId());
+                    }
+                }
+            }
+        });
+
+        return availableRecipes;
+    }
+
+    private boolean existsIngredients(GuiContainer firstGui, List<PositionedStack> ingredients,
+            List<ItemStack> invStacks) {
+        final Map<ItemStack, Integer> usedItems = new HashMap<>();
+
+        for (PositionedStack pStack : ingredients) {
+            final ItemStack used = invStacks.stream().filter(
+                    is -> usedItems.getOrDefault(is, is.stackSize) >= pStack.item.stackSize && pStack.contains(is))
+                    .findAny().orElse(null);
+
+            if (used != null) {
+                usedItems.put(used, usedItems.getOrDefault(used, used.stackSize) - pStack.item.stackSize);
+            } else {
+                return false;
+            }
+        }
+
+        return !usedItems.isEmpty();
+    }
+
+}

src/main/java/codechicken/nei/ItemHistoryPanel.java

@@ -1,189 +1,118 @@
 package codechicken.nei;
 
-import net.minecraft.client.gui.inventory.GuiContainer;
+import java.util.ArrayList;
+import java.util.List;
+
 import net.minecraft.item.ItemStack;
 
-import org.lwjgl.opengl.GL11;
-
-import codechicken.lib.gui.GuiDraw;
-import codechicken.nei.ItemPanel.ItemPanelSlot;
-import codechicken.nei.recipe.GuiCraftingRecipe;
-import codechicken.nei.recipe.GuiRecipe;
-import codechicken.nei.recipe.GuiUsageRecipe;
+import codechicken.nei.ItemsGrid.ItemsGridSlot;
+import codechicken.nei.ItemsGrid.MouseContext;
+import codechicken.nei.recipe.Recipe.RecipeId;
 import codechicken.nei.recipe.StackInfo;
 
-public class ItemHistoryPanel extends Widget {
+public class ItemHistoryPanel extends AbstractSubpanel<ItemsGrid<ItemHistoryPanel.HistoryGridSlot, MouseContext>> {
 
-    protected int mouseDownSlot = -1;
-    protected ItemsGrid grid;
+    public static class HistoryGridSlot extends ItemsGridSlot {
 
-    public ItemHistoryPanel() {
-        grid = new ItemsGrid();
-    }
-
-    public boolean isEmpty() {
-        return grid.isEmpty();
-    }
-
-    public void draw(int mousex, int mousey) {
-
-        if (NEIClientConfig.getIntSetting("inventory.history.splittingMode") == 0) {
-            GuiDraw.drawRect(x, y, w, h, NEIClientConfig.getSetting("inventory.history.historyColor").getHexValue());
-        } else {
-            drawSplittingArea(x, y, w, h, NEIClientConfig.getSetting("inventory.history.historyColor").getHexValue());
+        public HistoryGridSlot(int slotIndex, int itemIndex, ItemStack item) {
+            super(slotIndex, itemIndex, item);
         }
 
-        grid.draw(mousex, mousey);
+        @Override
+        public RecipeId getRecipeId() {
+            return FavoriteRecipes.getFavorite(this.item);
+        }
+    }
+
+    public ItemHistoryPanel() {
+        this.grid = new ItemsGrid<>() {
+
+            protected List<HistoryGridSlot> gridMask;
+
+            @Override
+            protected void onGridChanged() {
+                this.gridMask = null;
+                super.onGridChanged();
+            }
+
+            @Override
+            public List<HistoryGridSlot> getMask() {
+
+                if (this.gridMask == null) {
+                    this.gridMask = new ArrayList<>();
+                    int itemIndex = 0;
+                    for (int slotIndex = 0; slotIndex < this.rows * this.columns && itemIndex < size(); slotIndex++) {
+                        if (!isInvalidSlot(slotIndex)) {
+                            this.gridMask.add(new HistoryGridSlot(slotIndex, itemIndex, getItem(itemIndex)));
+                            itemIndex++;
+                        }
+                    }
+
+                    ItemHistoryPanel.this.updateLinePadding();
+                }
+
+                return this.gridMask;
+            }
+
+            @Override
+            protected MouseContext getMouseContext(int mousex, int mousey) {
+                final HistoryGridSlot hovered = getSlotMouseOver(mousex, mousey);
+
+                if (hovered != null) {
+                    return new MouseContext(
+                            hovered.slotIndex,
+                            hovered.slotIndex / this.columns,
+                            hovered.slotIndex % this.columns);
+                }
+
+                return null;
+            }
+
+        };
+    }
+
+    @Override
+    protected ItemStack getDraggedStackWithQuantity(ItemStack itemStack) {
+        return ItemQuantityField.prepareStackWithQuantity(itemStack, 0);
+    }
+
+    @Override
+    public void draw(int mousex, int mousey) {
+        if (this.grid.size() > 0) {
+            super.draw(mousex, mousey);
+        }
+    }
+
+    @Override
+    public int setPanelWidth(int width) {
+        final int columns = width / ItemsGrid.SLOT_SIZE;
+        final int useRows = NEIClientConfig.getIntSetting("inventory.history.useRows");
+        final int rows = (int) Math.min(Math.ceil(this.grid.size() * 1f / columns), useRows);
+
+        this.w = width;
+        this.h = 8 + ItemsGrid.SLOT_SIZE * Math.max(rows, 1);
+
+        return rows;
     }
 
     public void update() {
-        grid.update();
+        this.splittingLineColor = NEIClientConfig.getSetting("inventory.history.color").getHexValue();
+        super.update();
     }
 
     public void addItem(ItemStack stack) {
         if (stack != null) {
-            ItemStack is = StackInfo.loadFromNBT(StackInfo.itemStackToNBT(stack), 0);
+            ItemStack is = StackInfo.withAmount(stack, 0);
 
-            grid.realItems.removeIf(historyStack -> StackInfo.equalItemAndNBT(historyStack, stack, true));
-            grid.realItems.add(0, is);
+            this.grid.realItems.removeIf(historyStack -> StackInfo.equalItemAndNBT(historyStack, stack, true));
+            this.grid.realItems.add(0, is);
 
-            if (grid.realItems.size() > Math.max(50, grid.rows * grid.columns)) {
-                grid.realItems.remove(grid.realItems.size() - 1);
+            if (this.grid.realItems.size() > Math.max(50, this.grid.rows * this.grid.columns)) {
+                this.grid.realItems.remove(this.grid.realItems.size() - 1);
             }
 
-            grid.onItemsChanged();
+            this.grid.onItemsChanged();
         }
     }
 
-    public void resize(GuiContainer gui) {
-        grid.setGridSize(x, y, w, h);
-        grid.refresh(gui);
-    }
-
-    @Override
-    public ItemStack getStackMouseOver(int mousex, int mousey) {
-        ItemPanelSlot slot = getSlotMouseOver(mousex, mousey);
-        return slot == null ? null : slot.item;
-    }
-
-    public ItemPanelSlot getSlotMouseOver(int mousex, int mousey) {
-        return grid.getSlotMouseOver(mousex, mousey);
-    }
-
-    private void drawSplittingArea(int x, int y, int width, int height, int color) {
-
-        float alpha = (color >> 24 & 255) / 255.0F;
-        float red = (color >> 16 & 255) / 255.0F;
-        float green = (color >> 8 & 255) / 255.0F;
-        float blue = (color & 255) / 255.0F;
-
-        GL11.glPushMatrix();
-
-        GL11.glDisable(GL11.GL_TEXTURE_2D);
-        GL11.glEnable(GL11.GL_LINE_STIPPLE);
-        GL11.glColor4f(red, green, blue, alpha);
-        GL11.glLineWidth(2F);
-        GL11.glLineStipple(2, (short) 0x00FF);
-
-        GL11.glBegin(GL11.GL_LINE_LOOP);
-
-        GL11.glVertex2i(x, y);
-        GL11.glVertex2i(x + width, y);
-        GL11.glVertex2i(x + width, y + height);
-        GL11.glVertex2i(x, y + height);
-
-        GL11.glEnd();
-
-        GL11.glLineStipple(1, (short) 0xFFFF);
-        GL11.glLineWidth(1F);
-        GL11.glDisable(GL11.GL_LINE_STIPPLE);
-        GL11.glEnable(GL11.GL_TEXTURE_2D);
-        GL11.glColor4f(1F, 1F, 1F, 1F);
-
-        GL11.glPopMatrix();
-
-    }
-
-    @Override
-    public void mouseDragged(int mousex, int mousey, int button, long heldTime) {
-
-        if (mouseDownSlot >= 0 && ItemPanels.itemPanel.draggedStack == null
-                && NEIClientUtils.getHeldItem() == null
-                && NEIClientConfig.hasSMPCounterPart()) {
-
-            ItemPanelSlot mouseOverSlot = getSlotMouseOver(mousex, mousey);
-
-            if (mouseOverSlot == null || mouseOverSlot.slotIndex != mouseDownSlot || heldTime > 500) {
-                ItemPanels.itemPanel.draggedStack = getDraggedStackWithQuantity(mouseDownSlot);
-                mouseDownSlot = -1;
-            }
-        }
-
-    }
-
-    @Override
-    public boolean handleClick(int mousex, int mousey, int button) {
-        if (handleClickExt(mousex, mousey, button)) return true;
-
-        ItemPanelSlot hoverSlot = getSlotMouseOver(mousex, mousey);
-        if (hoverSlot != null) {
-
-            if (button == 2) {
-
-                if (hoverSlot.item != null) {
-                    ItemPanels.itemPanel.draggedStack = getDraggedStackWithQuantity(hoverSlot.slotIndex);
-                }
-
-            } else {
-                mouseDownSlot = hoverSlot.slotIndex;
-            }
-
-            return true;
-        }
-
-        return false;
-    }
-
-    @Override
-    public void mouseUp(int mousex, int mousey, int button) {
-        ItemPanelSlot hoverSlot = getSlotMouseOver(mousex, mousey);
-
-        if (hoverSlot != null && hoverSlot.slotIndex == mouseDownSlot && ItemPanels.itemPanel.draggedStack == null) {
-            ItemStack item = hoverSlot.item.copy();
-
-            if (NEIController.manager.window instanceof GuiRecipe || NEIClientUtils.shiftKey()
-                    || !NEIClientConfig.canCheatItem(item)) {
-
-                if (button == 0) {
-                    GuiCraftingRecipe.openRecipeGui("item", item);
-                } else if (button == 1) {
-                    GuiUsageRecipe.openRecipeGui("item", item);
-                }
-
-                mouseDownSlot = -1;
-                return;
-            }
-
-            NEIClientUtils.cheatItem(getDraggedStackWithQuantity(hoverSlot.slotIndex), button, -1);
-        }
-
-        mouseDownSlot = -1;
-    }
-
-    protected ItemStack getDraggedStackWithQuantity(int mouseDownSlot) {
-        ItemStack stack = grid.getItem(mouseDownSlot);
-
-        if (stack != null) {
-            int amount = NEIClientConfig.showItemQuantityWidget() ? NEIClientConfig.getItemQuantity() : 0;
-
-            if (amount == 0) {
-                amount = stack.getMaxStackSize();
-            }
-
-            return NEIServerUtils.copyStack(stack, amount);
-        }
-
-        return null;
-    }
-
 }

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

@@ -7,6 +7,7 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinWorkerThread;
@@ -15,10 +16,12 @@ import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 
 import net.minecraft.client.Minecraft;
+import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.IIcon;
+import net.minecraftforge.fluids.IFluidContainerItem;
 
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.ListMultimap;
@@ -27,7 +30,11 @@ import codechicken.nei.ThreadOperationTimer.TimeoutException;
 import codechicken.nei.api.ItemFilter;
 import codechicken.nei.api.ItemFilter.ItemFilterProvider;
 import codechicken.nei.api.ItemInfo;
+import codechicken.nei.recipe.InformationHandler;
+import codechicken.nei.recipe.RecipeHandlerRef;
 import codechicken.nei.search.TooltipFilter;
+import codechicken.nei.util.ItemUntranslator;
+import cpw.mods.fml.common.FMLLog;
 
 public class ItemList {
 
@@ -47,7 +54,7 @@ public class ItemList {
 
     private static final HashSet<Item> erroredItems = new HashSet<>();
     private static final HashSet<String> stackTraces = new HashSet<>();
-    private static HashMap<ItemStack, Integer> ordering = new HashMap<>();
+    private static Map<ItemStack, Integer> ordering = new HashMap<>();
     /**
      * Unlike {@link LayoutManager#itemsLoaded}, this indicates whether item loading is actually finished or not.
      */
@@ -95,7 +102,13 @@ public class ItemList {
         public boolean matches(ItemStack item) {
             String displayName = EnumChatFormatting.getTextWithoutFormattingCodes(item.getDisplayName());
 
-            if (displayName != null && !displayName.isEmpty() && pattern.matcher(displayName).find()) {
+            if (displayName != null && !displayName.isEmpty() && this.pattern.matcher(displayName).find()) {
+                return true;
+            }
+
+            displayName = ItemUntranslator.getInstance().getItemStackDisplayName(item);
+
+            if (!displayName.isEmpty() && this.pattern.matcher(displayName).find()) {
                 return true;
             }
 
@@ -103,7 +116,7 @@ public class ItemList {
                 displayName = EnumChatFormatting
                         .getTextWithoutFormattingCodes(item.getItem().getItemStackDisplayName(item));
 
-                return displayName != null && !displayName.isEmpty() && pattern.matcher(displayName).find();
+                return displayName != null && !displayName.isEmpty() && this.pattern.matcher(displayName).find();
             }
 
             return false;
@@ -213,8 +226,7 @@ public class ItemList {
                 IIcon icon = item.getIconIndex(itemstack);
                 String name = getTooltip(itemstack);
                 String s = name + "@" + (icon == null ? 0 : icon.hashCode());
-                if (!damageIconSet.contains(s)) {
-                    damageIconSet.add(s);
+                if (damageIconSet.add(s)) {
                     permutations.add(itemstack);
                 }
             } catch (TimeoutException t) {
@@ -237,12 +249,11 @@ public class ItemList {
         }
 
         private void updateOrdering(List<ItemStack> items) {
+            final Map<ItemStack, Integer> newOrdering = new HashMap<>();
             ItemSorter.sort(items);
 
-            HashMap<ItemStack, Integer> newOrdering = new HashMap<>();
-
             if (!CollapsibleItems.isEmpty()) {
-                HashMap<Integer, Integer> groups = new HashMap<>();
+                final HashMap<Integer, Integer> groups = new HashMap<>();
                 int orderIndex = 0;
 
                 for (ItemStack stack : items) {
@@ -290,11 +301,69 @@ public class ItemList {
                     .collect(Collectors.toList());
         }
 
-        // For optimization it generate itemslist, permutations, orders & collapsibleitems
+        private void runChecked(ItemStack stack, Runnable action, String reason) {
+            int hashOld = 0;
+            if (stack.hasTagCompound()) {
+                hashOld = stack.stackTagCompound.hashCode();
+            }
+
+            action.run();
+
+            if (stack.hasTagCompound() && hashOld != stack.stackTagCompound.hashCode()) {
+                FMLLog.warning(
+                        "NEI: Forced tag update with reason (" + reason
+                                + ") for "
+                                + stack
+                                + "("
+                                + stack.getItem()
+                                + ")");
+            }
+        }
+
+        private void forceTagCompoundInitialization(ItemStack stack) {
+            Item item = stack.getItem();
+            if (item == null) {
+                return;
+            }
+            if (item instanceof IFluidContainerItem) {
+                IFluidContainerItem fluidItem = (IFluidContainerItem) item;
+                runChecked(stack, () -> fluidItem.getFluid(stack), "getFluid");
+            }
+            runChecked(stack, () -> item.isDamaged(stack), "isDamaged");
+            runChecked(stack, () -> item.getDamage(stack), "getDamage");
+            runChecked(stack, () -> item.showDurabilityBar(stack), "showDurabilityBar");
+            runChecked(stack, () -> item.getAttributeModifiers(stack), "getAttributeModifiers");
+            runChecked(stack, () -> item.getDurabilityForDisplay(stack), "getDurabilityForDisplay");
+            runChecked(stack, () -> item.getItemStackLimit(stack), "getItemStackLimit");
+            runChecked(stack, () -> item.getToolClasses(stack), "getToolClasses");
+            runChecked(stack, () -> item.getUnlocalizedNameInefficiently(stack), "getUnlocalizedNameInefficiently");
+            runChecked(stack, () -> item.hasEffect(stack), "hasEffect");
+            runChecked(stack, () -> item.getDigSpeed(stack, Blocks.stone, 0), "getDigSpeed");
+
+            /*
+             * unused... for now runChecked(stack, () -> GameRegistry.getFuelValue(stack), "getFuelValue");
+             * runChecked(stack, () -> item.getUnlocalizedName(stack), "getUnlocalizedName"); runChecked(stack, () ->
+             * item.doesContainerItemLeaveCraftingGrid(stack), "doesContainerItemLeaveCraftingGrid"); runChecked(stack,
+             * () -> item.getItemUseAction(stack), "getItemUseAction"); runChecked(stack, () ->
+             * item.getMaxItemUseDuration(stack), "getMaxItemUseDuration"); runChecked(stack, () ->
+             * item.getPotionEffect(stack), "getPotionEffect"); runChecked(stack, () -> item.isPotionIngredient(stack),
+             * "isPotionIngredient"); runChecked(stack, () -> item.getRarity(stack), "getRarity"); runChecked(stack, ()
+             * -> item.hasCustomEntity(stack), "hasCustomEntity"); runChecked(stack, () ->
+             * item.getSmeltingExperience(stack), "getSmeltingExperience"); runChecked(stack, () ->
+             * item.getMaxDamage(stack), "getMaxDamage"); runChecked(stack, () -> item.getDamage(stack), "getDamage");
+             * runChecked(stack, stack::isItemDamaged, "isItemDamaged"); runChecked(stack, () -> item.hasEffect(stack,
+             * 0), "hasEffect"); runChecked(stack, () -> item.getItemEnchantability(stack), "getItemEnchantability");
+             * runChecked(stack, () -> item.isBeaconPayment(stack), "isBeaconPayment"); runChecked(stack, () ->
+             * item.getDamage(stack), "getDamage"); runChecked(stack, () -> item.getDamage(stack), "getDamage");
+             * runChecked(stack, () -> item.getDamage(stack), "getDamage");
+             */
+        }
+
+        // Generate itemlist, permutations, orders, collapsibleitems, and informationhandler stacks
         @Override
         @SuppressWarnings("unchecked")
         public void execute() {
-            if (!NEIClientConfig.isEnabled()) return;
+            if (!NEIClientConfig.isEnabled() || NEIClientUtils.mc().thePlayer == null) return;
 
             ThreadOperationTimer timer = getTimer(NEIClientConfig.getItemLoadingTimeout());
             LayoutManager.itemsLoaded = true;
@@ -304,12 +373,12 @@ public class ItemList {
             ItemSorter.instance.ordering.clear();
             CollapsibleItems.clearCache();
             TooltipFilter.clearCache();
+            InformationHandler.clearCache();
 
             List<ItemStack> items = new ArrayList<>();
             ListMultimap<Item, ItemStack> itemMap = ArrayListMultimap.create();
             ItemStackSet unique = new ItemStackSet();
 
-            timer.setLimit(NEIClientConfig.getItemLoadingTimeout());
             StreamSupport.stream(((Iterable<Item>) Item.itemRegistry).spliterator(), true).forEach(item -> {
                 if (item == null || item.delegate.name() == null || erroredItems.contains(item)) return;
 
@@ -329,7 +398,11 @@ public class ItemList {
                                 items.add(stack);
                             }
 
+                            forceTagCompoundInitialization(stack);
+
                             CollapsibleItems.putItem(stack);
+                            TooltipFilter.getSearchTooltip(stack);
+                            InformationHandler.populateStacks(stack);
                         }
                     }
 
@@ -358,13 +431,12 @@ public class ItemList {
             if (interrupted()) return;
             updateOrdering(ItemList.items);
 
-            new Thread(
-                    () -> ItemList.items.parallelStream().forEach(TooltipFilter::getSearchTooltip),
-                    "NEI Tooltip Filter Loader").start();
-
             loadFinished = true;
 
+            RecipeHandlerRef.clearCache();
+            FavoriteRecipes.reload();
             SubsetWidget.updateHiddenItems();
+            ItemPanels.bookmarkPanel.load();
             updateFilter.restart();
         }
     };
@@ -410,8 +482,7 @@ public class ItemList {
 
             if (interrupted()) return;
 
-            Comparator<ItemStack> comparator = Comparator.comparingInt(ItemList.ordering::get);
-            filtered.sort(comparator::compare);
+            filtered.sort(Comparator.comparingInt(ItemList.ordering::get));
 
             if (interrupted()) return;
 

src/main/java/codechicken/nei/ItemMobSpawner.java

@@ -1,8 +1,10 @@
 package codechicken.nei;
 
-import java.util.HashMap;
+import java.lang.reflect.Modifier;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.Entity;
@@ -15,125 +17,300 @@ import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
 import net.minecraft.tileentity.TileEntityMobSpawner;
+import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 import net.minecraftforge.client.MinecraftForgeClient;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
 public class ItemMobSpawner extends ItemBlock {
 
-    private static final Map<Integer, EntityLiving> entityHashMap = new HashMap<>();
-    private static final Map<Integer, String> IDtoNameMap = new HashMap<>();
-    public static int idPig;
-    private static boolean loaded;
+    private static final Map<Integer, EntityLiving> entityHashMap = new ConcurrentHashMap<>();
+    private static final Map<Integer, String> IDtoNameMap = new ConcurrentHashMap<>();
+    private static final Map<Class<? extends Entity>, String> ENTITY_CLASS_TO_NAME_CACHE = new ConcurrentHashMap<>();
+
+    public static int idPig = 90;
+    private static volatile boolean loaded = false;
+
+    // For asm
+    public static int placedX;
+    public static int placedY;
+    public static int placedZ;
+
+    public static void setLastPlacedPosition(int x, int y, int z) {
+        placedX = x;
+        placedY = y;
+        placedZ = z;
+    }
+
+    public static int[] getLastPlacedPosition() {
+        return new int[] { placedX, placedY, placedZ };
+    }
 
     public ItemMobSpawner() {
         super(Blocks.mob_spawner);
-
         hasSubtypes = true;
         MinecraftForgeClient.registerItemRenderer(this, new SpawnerRenderer());
     }
 
-    /**
-     * These are ASM translated from BlockMobSpawner
-     */
-    public static int placedX;
-
-    public static int placedY;
-    public static int placedZ;
-
     @Override
-    public IIcon getIconFromDamage(int par1) {
+    public IIcon getIconFromDamage(int meta) {
         return Blocks.mob_spawner.getBlockTextureFromSide(0);
     }
 
-    public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int x, int y, int z, int par7,
-            float par8, float par9, float par10) {
-        if (super.onItemUse(itemstack, entityplayer, world, x, y, z, par7, par8, par9, par10) && world.isRemote) {
-            TileEntityMobSpawner tileentitymobspawner = (TileEntityMobSpawner) world
-                    .getTileEntity(placedX, placedY, placedZ);
-            if (tileentitymobspawner != null) {
-                setDefaultTag(itemstack);
-                String mobtype = IDtoNameMap.get(itemstack.getItemDamage());
-                if (mobtype != null) {
-                    NEICPH.sendMobSpawnerID(placedX, placedY, placedZ, mobtype);
-                    tileentitymobspawner.func_145881_a().setEntityName(mobtype);
+    @Override
+    public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int x, int y, int z, int side,
+            float hitX, float hitY, float hitZ) {
+
+        placedX = x;
+        placedY = y;
+        placedZ = z;
+
+        boolean placed = super.onItemUse(itemstack, entityplayer, world, x, y, z, side, hitX, hitY, hitZ);
+
+        if (placed && !world.isRemote) {
+            TileEntity tileEntity = world.getTileEntity(x, y, z);
+            if (tileEntity instanceof TileEntityMobSpawner) {
+                TileEntityMobSpawner spawner = (TileEntityMobSpawner) tileEntity;
+                String mobType = getMobTypeFromItemStack(itemstack);
+                if (mobType != null) {
+                    spawner.func_145881_a().setEntityName(mobType);
+                    world.markBlockForUpdate(x, y, z);
+                    NEICPH.sendMobSpawnerID(x, y, z, mobType);
                 }
             }
             return true;
         }
+        return placed;
+    }
+
+    private String getMobTypeFromItemStack(ItemStack stack) {
+        int meta = getValidMetaData(stack);
+        return IDtoNameMap.get(meta);
+    }
+
+    private int getValidMetaData(ItemStack stack) {
+        int meta = stack.getItemDamage();
+        if (meta == 0 || !IDtoNameMap.containsKey(meta)) {
+            return idPig;
+        }
+        return meta;
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void addInformation(ItemStack itemstack, EntityPlayer player, List<String> tooltip, boolean advanced) {
+        int meta = getValidMetaData(itemstack);
+        EntityLiving entity = getEntity(meta);
+        String mobName = IDtoNameMap.get(meta);
+
+        if (entity != null && mobName != null) {
+            EnumChatFormatting color = (entity instanceof IMob) ? EnumChatFormatting.DARK_RED
+                    : EnumChatFormatting.DARK_AQUA;
+            tooltip.add(color + mobName);
+        }
+    }
+
+    public static EntityLiving getEntity(int id) {
+        EntityLiving cached = entityHashMap.get(id);
+        if (cached != null) {
+            return cached;
+        }
+
+        loadSpawners();
+
+        Class<?> entityClass = EntityList.IDtoClassMapping.get(id);
+        World world = NEIClientUtils.mc() != null ? NEIClientUtils.mc().theWorld : null;
+
+        if (isInvalidEntityClass(entityClass)) {
+            return cacheFallback(id);
+        }
+
+        EntityLiving entity = createEntityInstance(entityClass, world, id);
+        if (entity != null) {
+            entityHashMap.put(id, entity);
+        }
+
+        return entity;
+    }
+
+    private static boolean isInvalidEntityClass(Class<?> entityClass) {
+        if (entityClass == null) {
+            return true;
+        }
+
+        int modifiers = entityClass.getModifiers();
+        if (Modifier.isAbstract(modifiers) || Modifier.isInterface(modifiers)) {
+            NEIClientConfig.logger.warn("Skipping abstract/interface entity class: {}", entityClass.getName());
+            return true;
+        }
+
+        if (!EntityLiving.class.isAssignableFrom(entityClass)) {
+            NEIClientConfig.logger.warn("Skipping non-EntityLiving class: {}", entityClass.getName());
+            return true;
+        }
+
         return false;
     }
 
-    @Override
-    public void addInformation(ItemStack itemstack, EntityPlayer par2EntityPlayer, List<String> list, boolean par4) {
-        setDefaultTag(itemstack);
-        int meta = itemstack.getItemDamage();
-        if (meta == 0) {
-            meta = idPig;
+    @SuppressWarnings("unchecked")
+    private static EntityLiving createEntityInstance(Class<?> entityClass, World world, int id) {
+        if (entityClass == null || world == null) {
+            NEIClientConfig.logger.debug("World or entity class is null, using fallback for ID: {}", id);
+            return getFallbackEntity(id);
+        }
+
+        try {
+            Class<? extends EntityLiving> livingClass = (Class<? extends EntityLiving>) entityClass;
+            return livingClass.getConstructor(World.class).newInstance(world);
+        } catch (Throwable t) {
+            logEntityCreationError(entityClass, id, t);
+            return getFallbackEntity(id);
         }
-        Entity e = getEntity(meta);
-        list.add("\u00A7" + (e instanceof IMob ? "4" : "3") + IDtoNameMap.get(meta));
     }
 
-    public static EntityLiving getEntity(int ID) {
-        EntityLiving e = entityHashMap.get(ID);
-        if (e == null) {
-            World world = NEIClientUtils.mc().theWorld;
-            loadSpawners(world);
-            Class<?> clazz = (Class<?>) EntityList.IDtoClassMapping.get(ID);
-            try {
-                e = (EntityLiving) clazz.getConstructor(new Class[] { World.class }).newInstance(world);
-            } catch (Throwable t) {
-                if (clazz == null)
-                    NEIClientConfig.logger.error("Null class for entity (" + ID + ", " + IDtoNameMap.get(ID));
-                else NEIClientConfig.logger.error("Error creating instance of entity: " + clazz.getName(), t);
-                e = getEntity(idPig);
+    private static void logEntityCreationError(Class<?> entityClass, int id, Throwable t) {
+        String entityName = IDtoNameMap.getOrDefault(id, "unknown");
+        if (entityClass == null) {
+            NEIClientConfig.logger
+                    .error("Failed to create entity instance: Class is null for ID {}, Name {}", id, entityName, t);
+        } else {
+            NEIClientConfig.logger.error(
+                    "Failed to create instance of entity: Class {}, ID {}, Name {}",
+                    entityClass.getName(),
+                    id,
+                    entityName,
+                    t);
+        }
+    }
+
+    private static EntityLiving cacheFallback(int id) {
+        EntityLiving fallback = getFallbackEntity(id);
+        if (fallback != null) {
+            entityHashMap.put(id, fallback);
+        }
+        return fallback;
+    }
+
+    private static EntityLiving getFallbackEntity(int originalId) {
+        EntityLiving pig = entityHashMap.get(idPig);
+        if (pig == null) {
+            World world = NEIClientUtils.mc() != null ? NEIClientUtils.mc().theWorld : null;
+
+            if (world != null) {
+                try {
+                    pig = new EntityPig(world);
+                    entityHashMap.put(idPig, pig);
+                    NEIClientConfig.logger.debug("Created fallback pig entity for ID: {}", originalId);
+                } catch (Exception e) {
+                    NEIClientConfig.logger
+                            .error("Failed to create fallback pig entity for original ID: {}", originalId, e);
+                }
+            } else {
+                NEIClientConfig.logger.warn("World is null, cannot create fallback entity for ID: {}", originalId);
             }
-            entityHashMap.put(ID, e);
         }
-        return e;
+
+        return pig;
     }
 
-    public static void clearEntityReferences(World newWorld) {
-        entityHashMap.values().removeIf(e -> e.worldObj != newWorld);
+    public static void clearEntityReferences() {
+        entityHashMap.clear();
+        NEIClientConfig.logger.debug("Cleared all entity references from cache");
     }
 
-    private void setDefaultTag(ItemStack itemstack) {
-        if (!IDtoNameMap.containsKey(itemstack.getItemDamage())) itemstack.setItemDamage(idPig);
-    }
+    @SuppressWarnings("unchecked")
+    public static void loadSpawners() {
+        if (loaded) {
+            return;
+        }
 
-    public static void loadSpawners(World world) {
-        if (loaded) return;
-        loaded = true;
-        Map<Class<? extends Entity>, String> classToStringMapping = EntityList.classToStringMapping;
-        @SuppressWarnings("unchecked")
-        Map<Class<? extends Entity>, Integer> classToIDMapping = (Map<Class<? extends Entity>, Integer>) EntityList.classToIDMapping;
-        for (Class<? extends Entity> eclass : classToStringMapping.keySet()) {
-            if (!EntityLiving.class.isAssignableFrom(eclass)) continue;
+        synchronized (ItemMobSpawner.class) {
             try {
-                EntityLiving entityliving = (EntityLiving) eclass.getConstructor(new Class[] { World.class })
-                        .newInstance(world);
-                entityliving.isChild();
+                for (Map.Entry<Class<? extends Entity>, String> entry : ((Map<Class<? extends Entity>, String>) EntityList.classToStringMapping)
+                        .entrySet()) {
 
-                int id = classToIDMapping.get(eclass);
-                String name = classToStringMapping.get(eclass);
+                    Class<? extends Entity> clazz = entry.getKey();
+                    String name = entry.getValue();
 
-                if (name.equals("EnderDragon")) continue;
+                    if (shouldRegisterEntity(clazz, name)) {
+                        Integer id = (Integer) EntityList.classToIDMapping.get(clazz);
+                        if (id != null) {
+                            IDtoNameMap.put(id, name);
+                            ENTITY_CLASS_TO_NAME_CACHE.put(clazz, name);
 
-                IDtoNameMap.put(id, name);
+                            if ("Pig".equals(name)) {
+                                idPig = id;
+                                NEIClientConfig.logger.debug("Set pig entity ID to: {}", id);
+                            }
+                        }
+                    }
+                }
+                loaded = true;
+                NEIClientConfig.logger.info("Loaded {} spawner entity mappings", IDtoNameMap.size());
 
-                if (name.equals("Pig")) idPig = id;
-            } catch (Throwable ignored) {}
+            } catch (Exception e) {
+                NEIClientConfig.logger.error("Error loading spawners from entity list", e);
+            }
+        }
+    }
+
+    private static boolean shouldRegisterEntity(Class<? extends Entity> clazz, String name) {
+        if (clazz == null || name == null || name.trim().isEmpty()) {
+            return false;
         }
 
-        IDtoNameMap.entrySet()
-                .removeIf(e -> getEntity(e.getKey()).getClass() == EntityPig.class && !e.getValue().equals("Pig"));
+        if (!EntityLiving.class.isAssignableFrom(clazz)) {
+            return false;
+        }
+
+        if ("EnderDragon".equals(name) || "Giant".equals(name)) {
+            return false;
+        }
+
+        return true;
     }
 
     @Override
     public void getSubItems(Item item, CreativeTabs tab, List<ItemStack> list) {
-        if (!NEIClientConfig.hasSMPCounterPart()) list.add(new ItemStack(item));
-        else for (int i : IDtoNameMap.keySet()) list.add(new ItemStack(item, 1, i));
+        if (!NEIClientConfig.hasSMPCounterPart()) {
+            list.add(new ItemStack(item));
+        } else {
+            loadSpawners();
+            for (int id : IDtoNameMap.keySet()) {
+                ItemStack stack = new ItemStack(item, 1, id);
+                list.add(stack);
+            }
+        }
+    }
+
+    public static String getEntityNameForMeta(int meta) {
+        loadSpawners();
+        return IDtoNameMap.getOrDefault(meta, IDtoNameMap.getOrDefault(idPig, "Pig"));
+    }
+
+    public static boolean isValidEntityMeta(int meta) {
+        loadSpawners();
+        return IDtoNameMap.containsKey(meta) || meta == 0;
+    }
+
+    public static Map<Integer, String> getRegisteredSpawnerEntities() {
+        loadSpawners();
+        return Collections.unmodifiableMap(IDtoNameMap);
+    }
+
+    public static boolean isEntityValidForSpawner(Class<? extends Entity> entityClass) {
+        if (entityClass == null) return false;
+
+        String name = ENTITY_CLASS_TO_NAME_CACHE.get(entityClass);
+        if (name == null) {
+            name = (String) EntityList.classToStringMapping.get(entityClass);
+        }
+
+        return name != null && shouldRegisterEntity(entityClass, name);
     }
 }

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

@@ -1,27 +1,18 @@
 package codechicken.nei;
 
-import java.awt.Color;
 import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
-
-import javax.annotation.Nullable;
+import java.util.Map;
 
 import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.client.renderer.OpenGlHelper;
-import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumChatFormatting;
-
-import org.lwjgl.opengl.GL11;
 
 import codechicken.lib.gui.GuiDraw;
 import codechicken.lib.vec.Rectangle4i;
-import codechicken.nei.guihook.GuiContainerManager;
+import codechicken.nei.ItemsPanelGrid.ItemsPanelGridSlot;
+import codechicken.nei.util.NEIMouseUtils;
 
-public class ItemPanel extends PanelWidget {
+public class ItemPanel extends PanelWidget<ItemsPanelGrid> {
 
     /**
      * Backwards compat :-/
@@ -41,285 +32,56 @@ public class ItemPanel extends PanelWidget {
         return super.getStackMouseOver(mousex, mousey);
     }
 
-    public ItemHistoryPanel historyPanel;
-    public Button toggleGroups;
+    public ItemHistoryPanel historyPanel = new ItemHistoryPanel();
+    public ItemCraftablesPanel craftablesPanel = new ItemCraftablesPanel();
+    protected Button toggleGroups;
 
-    public static class ItemPanelSlot {
+    @Deprecated
+    public static class ItemPanelSlot extends ItemsPanelGridSlot {
 
-        public ItemStack item;
-        public int slotIndex;
-
-        public ItemPanelSlot(int idx, ItemStack stack) {
-            slotIndex = idx;
-            item = stack;
+        @Deprecated
+        public ItemPanelSlot(int idx, ItemStack item) {
+            this(idx, 0, item);
         }
 
         @Deprecated
         public ItemPanelSlot(int idx) {
-            this(idx, ItemPanels.itemPanel.getGrid().getItem(idx));
-        }
-    }
-
-    protected static class MaskMetadata {
-
-        public int groupIndex = -1;
-        public String displayName = "";
-        public boolean extended = false;
-
-        public Color bgColor = null;
-        public Color color = null;
-
-        public boolean left = false;
-        public boolean top = false;
-        public boolean right = false;
-        public boolean bottom = false;
-
-    }
-
-    protected static class ItemPanelGrid extends ItemsGrid {
-
-        public ArrayList<ItemStack> newItems;
-        public ArrayList<ItemStack> rawItems;
-
-        protected final HashMap<Integer, List<ItemStack>> groupItems = new HashMap<>();
-        protected final HashMap<Integer, MaskMetadata> maskMetadata = new HashMap<>();
-        protected boolean forceExpand = false;
-
-        public void setItems(ArrayList<ItemStack> items) {
-            newItems = items;
+            this(idx, 0, ItemPanels.itemPanel.getGrid().getItem(idx));
         }
 
-        public void refresh(GuiContainer gui) {
+        private ItemPanelSlot(int slotIndex, int itemIndex, ItemStack item) {
+            super(slotIndex, itemIndex, item);
+        }
 
-            if (this.newItems != null) {
-                this.groupItems.clear();
-                this.forceExpand = false;
+        protected static ItemPanelSlot of(ItemsPanelGridSlot slot) {
 
-                if (!CollapsibleItems.isEmpty() && !this.newItems.isEmpty()) {
-                    final Set<Integer> groups = new HashSet<>();
-                    boolean outsideGroup = false;
-
-                    this.realItems = new ArrayList<>();
-                    this.rawItems = new ArrayList<>(this.newItems);
-
-                    for (ItemStack stack : this.newItems) {
-                        final int groupIndex = CollapsibleItems.getGroupIndex(stack);
-
-                        if (groupIndex == -1) {
-                            this.realItems.add(stack);
-                            outsideGroup = true;
-                        } else {
-
-                            if (!groups.contains(groupIndex) || CollapsibleItems.isExpanded(groupIndex)) {
-                                this.realItems.add(stack);
-                                groups.add(groupIndex);
-                            }
-
-                            if (!this.groupItems.containsKey(groupIndex)) {
-                                this.groupItems.put(groupIndex, new ArrayList<>());
-                            }
-
-                            this.groupItems.get(groupIndex).add(stack);
-                        }
-                    }
-
-                    // automatically opens if there are elements from only one group
-                    if (!outsideGroup && groups.size() == 1) {
-                        this.realItems = new ArrayList<>(this.newItems);
-                        this.forceExpand = true;
-                    }
-                } else {
-                    this.realItems = new ArrayList<>(this.newItems);
-                }
-
-                this.newItems = null;
-                onItemsChanged();
+            if (slot != null) {
+                ItemPanelSlot customSlot = new ItemPanelSlot(slot.slotIndex, slot.itemIndex, slot.item);
+                customSlot.groupIndex = slot.groupIndex;
+                customSlot.displayName = slot.displayName;
+                customSlot.bgItemStack = slot.bgItemStack;
+                customSlot.groupSize = slot.groupSize;
+                customSlot.extended = slot.extended;
+                customSlot.bgColor = slot.bgColor;
+                return customSlot;
             }
 
-            super.refresh(gui);
-        }
-
-        @Override
-        protected List<Integer> getMask() {
-            final boolean updateBorders = this.gridMask == null;
-            final List<Integer> mask = super.getMask();
-
-            if (updateBorders) {
-                calculateGroupBorders(mask);
-            }
-
-            return mask;
-        }
-
-        protected void calculateGroupBorders(List<Integer> mask) {
-            this.maskMetadata.clear();
-
-            if (mask.isEmpty() || this.groupItems.isEmpty()) {
-                return;
-            }
-
-            final HashMap<Integer, Integer> maskGroup = new HashMap<>();
-            final Color collapsedColor = new Color(
-                    NEIClientConfig.getSetting("inventory.collapsibleItems.collapsedColor").getHexValue(),
-                    true);
-            final Color expandedColor = new Color(
-                    NEIClientConfig.getSetting("inventory.collapsibleItems.expandedColor").getHexValue(),
-                    true);
-
-            for (int slotIndex = 0; slotIndex < mask.size(); slotIndex++) {
-                if (mask.get(slotIndex) == null) {
-                    continue;
-                }
-
-                int idx = mask.get(slotIndex);
-                maskGroup.put(idx, CollapsibleItems.getGroupIndex(getItem(idx)));
-            }
-
-            for (int slotIndex = 0; slotIndex < mask.size(); slotIndex++) {
-                if (mask.get(slotIndex) == null) {
-                    continue;
-                }
-
-                int idx = mask.get(slotIndex);
-                int groupIndex = maskGroup.get(idx);
-
-                if (groupIndex == -1 || this.groupItems.get(groupIndex).size() == 1) {
-                    continue;
-                }
-
-                int column = slotIndex % this.columns;
-                int row = slotIndex / this.columns;
-                int prevSlotIndex = (row - 1) * this.columns + column;
-                int nextSlotIndex = (row + 1) * this.columns + column;
-                MaskMetadata metadata = new MaskMetadata();
-
-                metadata.groupIndex = groupIndex;
-                metadata.displayName = CollapsibleItems.getDisplayName(groupIndex);
-                metadata.extended = this.forceExpand || CollapsibleItems.isExpanded(groupIndex);
-                metadata.bgColor = metadata.extended ? expandedColor : collapsedColor;
-                metadata.color = darkerColor(metadata.bgColor);
-                metadata.left = column == 0 || idx == 0
-                        || mask.get(slotIndex - 1) == null
-                        || maskGroup.getOrDefault(idx - 1, -1) != groupIndex;
-                metadata.right = column == this.columns - 1 || maskGroup.getOrDefault(idx + 1, -1) != groupIndex;
-
-                if (prevSlotIndex >= 0) {
-                    Integer previdx = mask.get(prevSlotIndex);
-                    metadata.top = previdx == null || maskGroup.getOrDefault(previdx, -1) != groupIndex;
-                } else {
-                    metadata.top = true;
-                }
-
-                if (nextSlotIndex < mask.size()) {
-                    Integer nextidx = mask.get(nextSlotIndex);
-                    metadata.bottom = nextidx == null || maskGroup.getOrDefault(nextidx, -1) != groupIndex;
-                } else {
-                    metadata.bottom = true;
-                }
-
-                this.maskMetadata.put(idx, metadata);
-            }
-        }
-
-        @Override
-        protected void beforeDrawItems(int mousex, int mousey, @Nullable ItemPanelSlot focused) {
-            final List<Integer> mask = getMask();
-
-            super.beforeDrawItems(mousex, mousey, focused);
-
-            for (int i = 0; i < mask.size(); i++) {
-                if (mask.get(i) != null) {
-                    drawBorder(mask.get(i), getSlotRect(i));
-                }
-            }
-        }
-
-        protected void drawBorder(int slotIdx, Rectangle4i rect) {
-            final MaskMetadata metadata = this.maskMetadata.get(slotIdx);
-
-            if (metadata != null) {
-                final float LINE_WIDTH = 0.75f;
-
-                drawRect(rect.x, rect.y, rect.w, rect.h, metadata.bgColor);
-
-                if (metadata.left) {
-                    float leftBottom = metadata.bottom ? -LINE_WIDTH : 0;
-                    drawRect(rect.x, rect.y, LINE_WIDTH, rect.h + leftBottom, metadata.color);
-                }
-
-                if (metadata.right) {
-                    float rightTop = metadata.top ? LINE_WIDTH : 0;
-                    drawRect(rect.x + rect.w, rect.y - rightTop, LINE_WIDTH, rect.h + rightTop, metadata.color);
-                }
-
-                if (metadata.top) {
-                    drawRect(rect.x, rect.y - LINE_WIDTH, rect.w, LINE_WIDTH, metadata.color);
-                }
-
-                if (metadata.bottom) {
-                    drawRect(rect.x, rect.y + rect.h - LINE_WIDTH, rect.w, LINE_WIDTH, metadata.color);
-                }
-            }
-        }
-
-        private static Color darkerColor(Color color) {
-            return new Color(
-                    color.getRed(),
-                    color.getGreen(),
-                    color.getBlue(),
-                    Math.min((int) (color.getAlpha() + (255f / 5) * 2), 255));
-        }
-
-        private static void drawRect(double left, double top, double width, double height, Color color) {
-            Tessellator tessellator = Tessellator.instance;
-
-            GL11.glEnable(GL11.GL_BLEND);
-            GL11.glDisable(GL11.GL_TEXTURE_2D);
-            OpenGlHelper.glBlendFunc(770, 771, 1, 0);
-            GL11.glColor4f(
-                    color.getRed() / 255f,
-                    color.getGreen() / 255f,
-                    color.getBlue() / 255f,
-                    color.getAlpha() / 255f);
-            tessellator.startDrawingQuads();
-            tessellator.addVertex(left, top + height, 0.0D);
-            tessellator.addVertex(left + width, top + height, 0.0D);
-            tessellator.addVertex(left + width, top, 0.0D);
-            tessellator.addVertex(left, top, 0.0D);
-            tessellator.draw();
-            GL11.glEnable(GL11.GL_TEXTURE_2D);
-            GL11.glDisable(GL11.GL_BLEND);
-        }
-
-        @Override
-        protected void drawItem(Rectangle4i rect, int slotIdx) {
-            final MaskMetadata metadata = this.maskMetadata.get(slotIdx);
-
-            if (metadata != null && !metadata.extended) {
-                final List<ItemStack> groupItems = this.groupItems.get(metadata.groupIndex);
-
-                GuiContainerManager.drawItems.zLevel -= 10F;
-                GuiContainerManager.drawItem(rect.x + 1, rect.y - 1, groupItems.get(groupItems.size() - 1), true, "");
-                GuiContainerManager.drawItems.zLevel += 10F;
-
-                GuiContainerManager.drawItem(rect.x - 1, rect.y + 1, getItem(slotIdx), true, "");
-            } else {
-                super.drawItem(rect, slotIdx);
-            }
-        }
-
-        @Override
-        public String getMessageOnEmpty() {
-            return ItemList.loadFinished ? null : NEIClientUtils.translate("itempanel.loading");
+            return null;
         }
     }
 
     public ItemPanel() {
-        grid = new ItemPanelGrid();
+        this.grid = new ItemsPanelGrid();
     }
 
     public static void updateItemList(ArrayList<ItemStack> newItems) {
-        ((ItemPanelGrid) ItemPanels.itemPanel.getGrid()).setItems(newItems);
+        final ItemsPanelGrid grid = ItemPanels.itemPanel.getGrid();
+
+        if (grid.rawItems.size() != newItems.size()) {
+            grid.setPage(0);
+        }
+
+        grid.setItems(newItems);
         ItemPanels.itemPanel.realItems = newItems;
     }
 
@@ -329,6 +91,11 @@ public class ItemPanel extends PanelWidget {
 
         toggleGroups = new Button("G") {
 
+            @Override
+            public String getRenderLabel() {
+                return NEIClientUtils.translate("itempanel.collapsed.button");
+            }
+
             @Override
             public String getButtonTip() {
                 return NEIClientUtils.translate("itempanel.collapsed.button.tip");
@@ -342,36 +109,41 @@ public class ItemPanel extends PanelWidget {
             }
         };
 
-        historyPanel = new ItemHistoryPanel();
     }
 
-    @Deprecated
-    public void scroll(int i) {
-        grid.shiftPage(i);
+    @Override
+    public ItemPanelSlot getSlotMouseOver(int mousex, int mousey) {
+        // use ItemPanelSlot for Backwards compat
+        return ItemPanelSlot.of(this.grid.getSlotMouseOver(mousex, mousey));
     }
 
     public String getLabelText() {
         return String.format("%d/%d", getPage(), Math.max(1, getNumPages()));
     }
 
-    protected String getPositioningSettingName() {
-        return "world.panels.items";
-    }
+    @Override
+    public Rectangle4i calculateBounds(GuiContainer gui) {
+        final int maxWidth = (gui.width - 176) / 2 - PADDING * 2;
+        final int maxHeight = gui.height - PADDING * 2;
+        final int freeSpace = (gui.width - gui.xSize) / 2 - PADDING * 2;
 
-    public int getMarginLeft(GuiContainer gui) {
-        return (gui.width + gui.xSize) / 2 + PADDING;
-    }
+        final int paddingLeft = (int) Math
+                .ceil(maxWidth * NEIClientConfig.getSetting("world.panels.items.left").getIntValue() / 100000.0);
+        final int paddingTop = (int) Math
+                .ceil(maxHeight * NEIClientConfig.getSetting("world.panels.items.top").getIntValue() / 100000.0);
+        final int paddingRight = (int) Math
+                .ceil(maxWidth * NEIClientConfig.getSetting("world.panels.items.right").getIntValue() / 100000.0);
+        final int paddingBottom = (int) Math
+                .ceil(maxHeight * NEIClientConfig.getSetting("world.panels.items.bottom").getIntValue() / 100000.0);
 
-    public int getMarginTop(GuiContainer gui) {
-        return PADDING;
-    }
+        final int width = Math.max(
+                ItemsGrid.SLOT_SIZE,
+                snapDownToMultiple(
+                        Math.min(freeSpace - paddingRight, maxWidth - paddingLeft - paddingRight),
+                        ItemsGrid.SLOT_SIZE));
+        final int height = Math.max(ItemsGrid.SLOT_SIZE, maxHeight - paddingTop - paddingBottom);
 
-    public int getWidth(GuiContainer gui) {
-        return gui.width - (gui.xSize + gui.width) / 2 - PADDING * 2;
-    }
-
-    public int getHeight(GuiContainer gui) {
-        return gui.height - getMarginTop(gui) - PADDING;
+        return new Rectangle4i(gui.width - width - PADDING - paddingRight, paddingTop + PADDING, width, height);
     }
 
     @Override
@@ -387,26 +159,38 @@ public class ItemPanel extends PanelWidget {
     }
 
     protected int resizeFooter(GuiContainer gui) {
-        if (!NEIClientConfig.showItemQuantityWidget() && NEIClientConfig.isSearchWidgetCentered()
-                && !NEIClientConfig.showHistoryPanelWidget()) {
+        int footerY = y + h;
+        int footerHeight = 0;
+
+        if (grid.getPerPage() == 0) {
             return 0;
         }
 
+        if (NEIClientConfig.showItemQuantityWidget() || !NEIClientConfig.isSearchWidgetCentered()) {
+            footerY = LayoutManager.quantity.y;
+            footerHeight = LayoutManager.quantity.h + PanelWidget.PADDING;
+        }
+
         if (NEIClientConfig.showHistoryPanelWidget()) {
             historyPanel.x = x;
-            historyPanel.w = w;
-            historyPanel.h = ItemsGrid.SLOT_SIZE * NEIClientConfig.getIntSetting("inventory.history.useRows");
 
-            if (NEIClientConfig.showItemQuantityWidget() || !NEIClientConfig.isSearchWidgetCentered()) {
-                historyPanel.y = LayoutManager.quantity.y - historyPanel.h - PanelWidget.PADDING;
-                return LayoutManager.quantity.h + historyPanel.h + PanelWidget.PADDING * 2;
-            } else {
-                historyPanel.y = y + h - historyPanel.h;
-                return historyPanel.h + PanelWidget.PADDING;
+            if (historyPanel.setPanelWidth(w) != 0) {
+                footerY = historyPanel.y = footerY - historyPanel.h;
+                footerHeight += historyPanel.h;
+            }
+
+        }
+
+        if (NEIClientConfig.showCraftablesPanelWidget()) {
+            craftablesPanel.x = x;
+
+            if (craftablesPanel.setPanelWidth(w) != 0) {
+                footerY = craftablesPanel.y = footerY - craftablesPanel.h;
+                footerHeight += craftablesPanel.h;
             }
         }
 
-        return LayoutManager.quantity.h + PanelWidget.PADDING;
+        return footerHeight;
     }
 
     @Override
@@ -414,92 +198,86 @@ public class ItemPanel extends PanelWidget {
         super.setVisible();
 
         if (grid.getPerPage() > 0) {
+
             if (!CollapsibleItems.isEmpty() && !grid.isEmpty()) {
                 LayoutManager.addWidget(toggleGroups);
             }
 
-            if (NEIClientConfig.showHistoryPanelWidget() && (!grid.isEmpty() || !historyPanel.isEmpty())) {
+            if (NEIClientConfig.showCraftablesPanelWidget()) {
+                LayoutManager.addWidget(craftablesPanel);
+            }
+
+            if (NEIClientConfig.showHistoryPanelWidget()) {
                 LayoutManager.addWidget(historyPanel);
             }
+
         }
     }
 
     @Override
     public void resize(GuiContainer gui) {
         super.resize(gui);
-        historyPanel.resize(gui);
+        this.historyPanel.resize(gui);
+        this.craftablesPanel.resize(gui);
     }
 
-    protected ItemStack getDraggedStackWithQuantity(int mouseDownSlot) {
-        ItemStack stack = grid.getItem(mouseDownSlot);
-
-        if (stack != null) {
-            int amount = NEIClientConfig.showItemQuantityWidget() ? NEIClientConfig.getItemQuantity() : 0;
-
-            if (amount == 0) {
-                amount = stack.getMaxStackSize();
-            }
-
-            return NEIServerUtils.copyStack(stack, amount);
-        }
-
-        return null;
+    protected ItemStack getDraggedStackWithQuantity(ItemStack itemStack) {
+        return ItemQuantityField.prepareStackWithQuantity(itemStack, 0);
     }
 
     @Override
-    public List<String> handleItemTooltip(GuiContainer gui, ItemStack itemstack, int mousex, int mousey,
-            List<String> currenttip) {
-        final ItemPanelGrid panelGrid = ((ItemPanelGrid) this.grid);
+    public List<String> handleItemTooltip(ItemStack itemstack, int mousex, int mousey, List<String> currenttip) {
 
-        if (!panelGrid.forceExpand && !NEIClientConfig.isHidden() && !currenttip.isEmpty()) {
-            final ItemPanelSlot hoverSlot = getSlotMouseOver(mousex, mousey);
+        if (!this.grid.forceExpand && !currenttip.isEmpty()) {
+            final ItemsPanelGridSlot hoverSlot = this.grid.getSlotMouseOver(mousex, mousey);
 
-            if (hoverSlot != null) {
-                final MaskMetadata metadata = panelGrid.maskMetadata.get(hoverSlot.slotIndex);
-
-                if (metadata != null) {
-                    final List<ItemStack> items = panelGrid.groupItems.get(metadata.groupIndex);
-
-                    if (NEIClientConfig.getBooleanSetting("inventory.collapsibleItems.customName") && !metadata.extended
-                            && !"".equals(metadata.displayName)) {
-                        currenttip.clear();
-                        currenttip.add(metadata.displayName + GuiDraw.TOOLTIP_LINESPACE);
-                    }
-
-                    if (items != null && items.size() > 1) {
-                        String message = metadata.extended ? "itempanel.collapsed.hint.collapse"
-                                : "itempanel.collapsed.hint.expand";
-                        currenttip.add(
-                                1,
-                                EnumChatFormatting.GRAY + NEIClientUtils.translate(message, items.size())
-                                        + EnumChatFormatting.RESET);
-                    }
-                }
+            if (hoverSlot != null && hoverSlot.groupIndex >= 0
+                    && NEIClientConfig.getBooleanSetting("inventory.collapsibleItems.customName")
+                    && !hoverSlot.extended
+                    && !"".equals(hoverSlot.displayName)) {
+                currenttip.clear();
+                currenttip.add(hoverSlot.displayName + GuiDraw.TOOLTIP_LINESPACE);
             }
         }
 
-        return super.handleItemTooltip(gui, itemstack, mousex, mousey, currenttip);
+        return super.handleItemTooltip(itemstack, mousex, mousey, currenttip);
     }
 
     @Override
     public boolean handleClick(int mousex, int mousey, int button) {
-        final ItemPanelGrid panelGrid = ((ItemPanelGrid) this.grid);
 
-        if (NEIClientUtils.altKey() && button == 0 && !panelGrid.forceExpand) {
-            final ItemPanelSlot hoverSlot = grid.getSlotMouseOver(mousex, mousey);
+        if (button == 0 && !this.grid.forceExpand && NEIClientUtils.altKey()) {
+            final ItemsPanelGridSlot hoverSlot = this.grid.getSlotMouseOver(mousex, mousey);
 
-            if (hoverSlot != null) {
-                final MaskMetadata metadata = panelGrid.maskMetadata.get(hoverSlot.slotIndex);
-
-                if (metadata != null) {
-                    CollapsibleItems.setExpanded(metadata.groupIndex, !metadata.extended);
-                    panelGrid.setItems(panelGrid.rawItems);
-                    return true;
-                }
+            if (hoverSlot != null && hoverSlot.groupIndex >= 0) {
+                CollapsibleItems.setExpanded(hoverSlot.groupIndex, !hoverSlot.extended);
+                this.grid.setItems(this.grid.rawItems);
+                NEIClientUtils.playClickSound();
+                return true;
             }
         }
 
         return super.handleClick(mousex, mousey, button);
     }
 
+    @Override
+    public Map<String, String> handleHotkeys(int mousex, int mousey, Map<String, String> hotkeys) {
+        final ItemsPanelGridSlot hoverSlot = this.grid.getSlotMouseOver(mousex, mousey);
+
+        if (!this.grid.forceExpand && hoverSlot != null && hoverSlot.groupIndex >= 0 && hoverSlot.groupSize > 1) {
+            final String message = hoverSlot.extended ? "itempanel.collapsed.hint.collapse"
+                    : "itempanel.collapsed.hint.expand";
+            hotkeys.put(
+                    NEIClientUtils.getKeyName(NEIClientUtils.ALT_HASH, NEIMouseUtils.MOUSE_BTN_LMB),
+                    NEIClientUtils.translate(message, hoverSlot.groupSize));
+        }
+
+        return super.handleHotkeys(mousex, mousey, hotkeys);
+    }
+
+    public boolean containsWithSubpanels(int px, int py) {
+        return contains(px, py) || NEIClientConfig.showHistoryPanelWidget() && this.historyPanel.contains(px, py)
+                || NEIClientConfig.showCraftablesPanelWidget() && this.craftablesPanel.contains(px, py);
+    }
+
 }

src/main/java/codechicken/nei/ItemQuantityField.java

@@ -1,6 +1,11 @@
 package codechicken.nei;
 
-import static codechicken.nei.NEIClientUtils.translate;
+import net.minecraft.client.Minecraft;
+import net.minecraft.item.ItemStack;
+
+import org.lwjgl.input.Keyboard;
+
+import codechicken.nei.recipe.StackInfo;
 
 public class ItemQuantityField extends TextField {
 
@@ -10,18 +15,84 @@ public class ItemQuantityField extends TextField {
         field.setDisabledTextColour(0xFF303030);
     }
 
-    public int intValue() {
-        return intValue(text());
+    @Override
+    protected void initInternalTextField() {
+        field = new FormattedTextField(Minecraft.getMinecraft().fontRenderer, 0, 0, 0, 0) {
+
+            {
+                setPlaceholder(NEIClientUtils.translate("itempanel.quantity.default"));
+            }
+
+            @Override
+            public String getText() {
+                String text = super.getText();
+                return !isFocused() && "0".equals(text) ? "" : text;
+            }
+
+            @Override
+            protected boolean beforeWrite(String text) {
+                if (text == null || text.isEmpty()) return true;
+                try {
+                    return Integer.parseInt(text) >= 0;
+                } catch (NumberFormatException e) {
+                    return false;
+                }
+            }
+
+            @Override
+            public boolean textboxKeyTyped(char keyChar, int keyID) {
+                if (!isFocused()) return false;
+
+                if (super.textboxKeyTyped(keyChar, keyID)) {
+                    return true;
+                } else if (keyID == Keyboard.KEY_DOWN) {
+                    setText(Integer.toString(Math.max(0, getInteger() - 1)));
+                    return true;
+                } else if (keyID == Keyboard.KEY_UP) {
+                    setText(Integer.toString(getInteger() + 1));
+                    return true;
+                }
+
+                return false;
+            }
+
+            private int getInteger() {
+                try {
+                    return Math.max(0, Integer.parseInt(text()));
+                } catch (NumberFormatException nfe) {
+                    return 0;
+                }
+            }
+
+        };
+        field.setMaxStringLength(maxSearchLength);
+        field.setCursorPositionZero();
     }
 
-    public int intValue(String s) {
+    private int getInteger() {
         try {
-            return Math.max(0, Integer.parseInt(s));
+            return Math.max(0, Integer.parseInt(text()));
         } catch (NumberFormatException nfe) {
             return 0;
         }
     }
 
+    public static ItemStack prepareStackWithQuantity(ItemStack stack, long amount) {
+        if (stack == null) {
+            return null;
+        }
+
+        if (amount == 0) {
+            amount = NEIClientConfig.showItemQuantityWidget() ? NEIClientConfig.getItemQuantity() : 0;
+
+            if (amount == 0) {
+                amount = StackInfo.itemStackToNBT(stack).hasKey("gtFluidName") ? 144 : stack.getMaxStackSize();
+            }
+        }
+
+        return StackInfo.withAmount(stack, amount);
+    }
+
     @Override
     public void gainFocus() {
         if (text().equals("0")) {
@@ -36,36 +107,21 @@ public class ItemQuantityField extends TextField {
 
     @Override
     public void onTextChange(String oldText) {
-        NEIClientUtils.setItemQuantity(intValue());
-    }
-
-    @Override
-    public void draw(int mousex, int mousey) {
-
-        if (!focused() && intValue() == 0) {
-            field.setText(translate("itempanel.quantity.default"));
-            field.setCursorPositionZero();
-            field.setEnabled(false);
-            super.draw(mousex, mousey);
-            field.setEnabled(true);
-            field.setText("0");
-        } else {
-            super.draw(mousex, mousey);
-        }
+        NEIClientUtils.setItemQuantity(getInteger());
     }
 
     @Override
     public boolean onMouseWheel(int i, int mx, int my) {
         if (!contains(mx, my)) return false;
         int multiplier = 1;
+
         if (NEIClientUtils.shiftKey()) {
             multiplier = 10;
         } else if (NEIClientUtils.controlKey()) {
             multiplier = 64;
         }
 
-        int quantity = intValue() + i * multiplier;
-        setText(Integer.toString(quantity));
+        setText(Integer.toString(Math.max(0, getInteger() + i * multiplier)));
         return true;
     }
 

src/main/java/codechicken/nei/ItemStackAmount.java

@@ -22,6 +22,12 @@ public class ItemStackAmount {
         }
     }
 
+    public void addAll(Iterable<ItemStack> items) {
+        for (ItemStack stack : items) {
+            add(stack);
+        }
+    }
+
     public void add(ItemStack item) {
         add(item, (long) StackInfo.getAmount(item));
     }
@@ -30,7 +36,9 @@ public class ItemStackAmount {
         if (stack == null || stack.getItem() == null) return;
         final NBTTagCompound key = StackInfo.itemStackToNBT(stack, false);
 
-        this.itemMap.put(key, value + this.itemMap.getOrDefault(key, 0L));
+        if (key != null) {
+            this.itemMap.put(key, value + this.itemMap.getOrDefault(key, 0L));
+        }
     }
 
     public Long get(ItemStack stack) {
@@ -44,7 +52,9 @@ public class ItemStackAmount {
         if (stack == null || stack.getItem() == null) return;
         final NBTTagCompound key = StackInfo.itemStackToNBT(stack, false);
 
-        this.itemMap.put(key, value);
+        if (key != null) {
+            this.itemMap.put(key, value);
+        }
     }
 
     public long getOrDefault(ItemStack stack, long defaultAmount) {
@@ -53,6 +63,10 @@ public class ItemStackAmount {
         return e == null ? defaultAmount : e;
     }
 
+    public boolean contains(ItemStack stack) {
+        return get(stack) != null;
+    }
+
     public void clear() {
         this.itemMap.clear();
     }
@@ -90,6 +104,16 @@ public class ItemStackAmount {
         return this.itemMap.isEmpty();
     }
 
+    @Override
+    public boolean equals(Object obj) {
+
+        if (obj instanceof ItemStackAmount items) {
+            return this.itemMap.equals(items.itemMap);
+        }
+
+        return false;
+    }
+
     public static ItemStackAmount of(ItemStackAmount map) {
         ItemStackAmount result = new ItemStackAmount();
         result.itemMap.putAll(map.itemMap);

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

@@ -40,7 +40,7 @@ public class ItemZoom extends Widget implements IContainerInputHandler {
     @Override
     public void draw(int mx, int my) {
 
-        if (this.stack != null
+        if (this.stack != null && this.availableAreaWidth >= SLOT_SIZE * 2
                 && (NEIClientConfig.getBooleanSetting("inventory.itemzoom.enabled")
                         || NEIClientConfig.isKeyHashDown("gui.itemzoom_hold"))
                 && GuiContainerManager.shouldShowTooltip(NEIClientUtils.getGuiContainer())) {
@@ -58,7 +58,7 @@ public class ItemZoom extends Widget implements IContainerInputHandler {
 
             GL11.glPopMatrix();
 
-            GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS);
+            GL11.glPushAttrib(GL11.GL_ENABLE_BIT | GL11.GL_COLOR_BUFFER_BIT | GL11.GL_LIGHTING_BIT);
             GuiContainerManager.enable2DRender();
 
             if (NEIClientConfig.getBooleanSetting("inventory.itemzoom.showName")) {

src/main/java/codechicken/nei/ItemsGrid.java

@@ -1,12 +1,10 @@
 package codechicken.nei;
 
-import static codechicken.lib.gui.GuiDraw.drawRect;
-
+import java.awt.Color;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-
-import javax.annotation.Nullable;
+import java.util.Objects;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.ScaledResolution;
@@ -17,17 +15,16 @@ import net.minecraft.client.shader.Framebuffer;
 import net.minecraft.item.ItemStack;
 
 import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.GL30;
 
 import codechicken.lib.vec.Rectangle4i;
-import codechicken.nei.ItemPanel.ItemPanelSlot;
 import codechicken.nei.api.GuiInfo;
 import codechicken.nei.guihook.GuiContainerManager;
+import codechicken.nei.recipe.Recipe.RecipeId;
 import codechicken.nei.recipe.StackInfo;
 
-public class ItemsGrid {
+public abstract class ItemsGrid<T extends ItemsGrid.ItemsGridSlot, M extends ItemsGrid.MouseContext> {
 
-    private static class ScreenCapture {
+    protected static class ScreenCapture {
 
         private long nextCacheRefresh = 0;
         private Framebuffer framebuffer;
@@ -54,7 +51,7 @@ public class ItemsGrid {
         }
 
         public void captureScreen(Runnable callback, int mode) {
-            GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS);
+            GL11.glPushAttrib(GL11.GL_ENABLE_BIT | GL11.GL_COLOR_BUFFER_BIT | GL11.GL_LIGHTING_BIT);
 
             resetFramebuffer();
             this.framebuffer.bindFramebuffer(false);
@@ -87,21 +84,6 @@ public class ItemsGrid {
             } else {
                 this.framebuffer.framebufferClear();
             }
-
-            // copy depth buffer from MC (fix Angelica)
-            OpenGlHelper.func_153171_g(GL30.GL_READ_FRAMEBUFFER, minecraft.getFramebuffer().framebufferObject);
-            OpenGlHelper.func_153171_g(GL30.GL_DRAW_FRAMEBUFFER, this.framebuffer.framebufferObject);
-            GL30.glBlitFramebuffer(
-                    0,
-                    0,
-                    minecraft.displayWidth,
-                    minecraft.displayHeight,
-                    0,
-                    0,
-                    minecraft.displayWidth,
-                    minecraft.displayHeight,
-                    GL11.GL_DEPTH_BUFFER_BIT | GL11.GL_STENCIL_BUFFER_BIT,
-                    GL11.GL_NEAREST);
         }
 
         public void renderCapturedScreen() {
@@ -140,7 +122,130 @@ public class ItemsGrid {
 
     }
 
-    public static final int SLOT_SIZE = 18;
+    public static class ItemsGridSlot {
+
+        protected static final float DEFAULT_SLOT_SIZE = 18f;
+        protected static final float LINE_WIDTH = 0.75f;
+
+        public final ItemStack item;
+        public final int slotIndex;
+        public final int itemIndex;
+
+        public Color borderColor = Color.BLACK;
+
+        public boolean borderLeft = false;
+        public boolean borderTop = false;
+        public boolean borderRight = false;
+        public boolean borderBottom = false;
+
+        public ItemsGridSlot(int slotIndex, int itemIndex, ItemStack itemStack) {
+            this.slotIndex = slotIndex;
+            this.itemIndex = itemIndex;
+            this.item = itemStack;
+        }
+
+        public ItemStack getItemStack() {
+            return this.item;
+        }
+
+        public <M extends MouseContext> void beforeDraw(Rectangle4i rect, M mouseContext) {
+            if (mouseContext != null && mouseContext.slotIndex == this.slotIndex) {
+                NEIClientUtils.drawRect(rect.x, rect.y, rect.w, rect.h, HIGHLIGHT_COLOR);
+            }
+        }
+
+        public <M extends MouseContext> void afterDraw(Rectangle4i rect, M mouseContext) {}
+
+        public RecipeId getRecipeId() {
+            return null;
+        }
+
+        public void drawItem(Rectangle4i rect) {
+            drawItem(getItemStack(), rect);
+        }
+
+        protected void drawItem(ItemStack stack, Rectangle4i rect) {
+
+            if (rect.w != DEFAULT_SLOT_SIZE) {
+                final float panelFactor = (rect.w - 2) / (DEFAULT_SLOT_SIZE - 2);
+                GL11.glTranslatef(rect.x + 1, rect.y + 1, 0);
+                GL11.glScaled(panelFactor, panelFactor, 1);
+
+                GuiContainerManager.drawItem(0, 0, stack, true, "");
+
+                GL11.glScaled(1f / panelFactor, 1f / panelFactor, 1);
+                GL11.glTranslatef(-1 * (rect.x + 1), -1 * (rect.y + 1), 0);
+            } else {
+                GuiContainerManager.drawItem(rect.x + 1, rect.y + 1, stack, true, "");
+            }
+
+        }
+
+        public void drawBorder(Rectangle4i rect) {
+            float halfLineWidth = LINE_WIDTH / 2f;
+
+            if (this.borderLeft) {
+                NEIClientUtils
+                        .drawRect(rect.x - halfLineWidth, rect.y + halfLineWidth, LINE_WIDTH, rect.h, this.borderColor);
+            }
+
+            if (this.borderRight) {
+                NEIClientUtils.drawRect(
+                        rect.x + rect.w - halfLineWidth,
+                        rect.y - halfLineWidth,
+                        LINE_WIDTH,
+                        rect.h,
+                        this.borderColor);
+            }
+
+            if (this.borderTop) {
+                NEIClientUtils
+                        .drawRect(rect.x - halfLineWidth, rect.y - halfLineWidth, rect.w, LINE_WIDTH, this.borderColor);
+            }
+
+            if (this.borderBottom) {
+                NEIClientUtils.drawRect(
+                        rect.x + halfLineWidth,
+                        rect.y + rect.h - halfLineWidth,
+                        rect.w,
+                        LINE_WIDTH,
+                        this.borderColor);
+            }
+        }
+
+    }
+
+    public static class MouseContext {
+
+        public final int slotIndex;
+        public final int columnIndex;
+        public final int rowIndex;
+
+        public MouseContext(int slotIndex, int rowIndex, int columnIndex) {
+            this.slotIndex = slotIndex;
+            this.rowIndex = rowIndex;
+            this.columnIndex = columnIndex;
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(this.rowIndex, this.slotIndex, this.columnIndex);
+        }
+
+        public boolean equals(Object obj) {
+
+            if (obj instanceof MouseContext context) {
+                return this.columnIndex == context.columnIndex && this.rowIndex == context.rowIndex
+                        && this.slotIndex == context.slotIndex;
+            }
+
+            return false;
+        }
+
+    }
+
+    public static int SLOT_SIZE = 18;
+    public static final Color HIGHLIGHT_COLOR = new Color(0xee555555, true);
 
     protected int width;
     protected int height;
@@ -157,20 +262,17 @@ public class ItemsGrid {
 
     protected int rows;
     protected int columns;
-    protected List<Integer> gridMask = null;
 
     protected boolean[] invalidSlotMap;
 
-    protected Label messageLabel = new Label(getMessageOnEmpty(), true);
-
     protected ScreenCapture screenCapture = null;
 
     public ArrayList<ItemStack> getItems() {
         return realItems;
     }
 
-    public ItemStack getItem(int idx) {
-        return realItems.get(idx);
+    public ItemStack getItem(int itemIndex) {
+        return realItems.get(itemIndex);
     }
 
     public int size() {
@@ -222,7 +324,11 @@ public class ItemsGrid {
     }
 
     public int getLastRowIndex() {
-        return this.columns > 0 ? (int) Math.ceil((float) this.getMask().size() / this.columns) - 1 : 0;
+        final List<T> mask = getMask();
+
+        return this.columns > 0 && !mask.isEmpty()
+                ? (int) Math.ceil((float) (mask.get(mask.size() - 1).slotIndex + 1) / this.columns) - 1
+                : 0;
     }
 
     public void setGridSize(int mleft, int mtop, int w, int h) {
@@ -236,9 +342,6 @@ public class ItemsGrid {
         rows = height / SLOT_SIZE;
 
         paddingLeft = (width % SLOT_SIZE) / 2;
-
-        messageLabel.x = marginLeft + width / 2;
-        messageLabel.y = marginTop + height / 2;
     }
 
     public void shiftPage(int shift) {
@@ -270,10 +373,9 @@ public class ItemsGrid {
         if (this.screenCapture != null) {
             this.screenCapture.refreshBuffer();
         }
-        this.gridMask = null;
     }
 
-    protected void onItemsChanged() {
+    public void onItemsChanged() {
         onGridChanged();
     }
 
@@ -323,20 +425,37 @@ public class ItemsGrid {
         }
     }
 
-    public Rectangle4i getItemRect(int idx) {
-        final List<Integer> mask = getMask();
-
-        for (int i = 0; i < mask.size(); i++) {
-            if (mask.get(i) != null && idx == mask.get(i)) {
-                return getSlotRect(i);
-            }
+    public T getSlotMouseOver(int mousex, int mousey) {
+        if (!contains(mousex, mousey)) {
+            return null;
         }
 
-        return null;
+        final int overRow = getRowIndex(mousey);
+        final int overColumn = getColumnIndex(mousex);
+        final int slt = columns * overRow + overColumn;
+
+        if (overRow >= rows || overColumn >= columns) {
+            return null;
+        }
+
+        return getSlotBySlotIndex(slt);
     }
 
-    public Rectangle4i getSlotRect(int i) {
-        return getSlotRect(i / columns, i % columns);
+    public T getSlotBySlotIndex(int slotIndex) {
+        return getMask().stream().filter(item -> item.slotIndex == slotIndex).findAny().orElse(null);
+    }
+
+    public T getSlotByItemIndex(int itemIndex) {
+        return getMask().stream().filter(item -> item.itemIndex == itemIndex).findAny().orElse(null);
+    }
+
+    public Rectangle4i getItemRect(int itemIndex) {
+        final T item = getSlotByItemIndex(itemIndex);
+        return item != null ? getSlotRect(item.slotIndex) : null;
+    }
+
+    public Rectangle4i getSlotRect(int slotIndex) {
+        return getSlotRect(slotIndex / columns, slotIndex % columns);
     }
 
     public Rectangle4i getSlotRect(int row, int column) {
@@ -347,67 +466,45 @@ public class ItemsGrid {
                 SLOT_SIZE);
     }
 
+    public int getRowIndex(int mousey) {
+        return (mousey - this.marginTop) / SLOT_SIZE;
+    }
+
+    public int getColumnIndex(int mousex) {
+        return (mousex - this.marginLeft - this.paddingLeft) / SLOT_SIZE;
+    }
+
     public boolean isInvalidSlot(int index) {
         return invalidSlotMap[index];
     }
 
-    protected List<Integer> getMask() {
+    public abstract List<T> getMask();
 
-        if (this.gridMask == null) {
-            this.gridMask = new ArrayList<>();
-            int idx = page * perPage;
-
-            for (int i = 0; i < rows * columns && idx < size(); i++) {
-                this.gridMask.add(isInvalidSlot(i) ? null : idx++);
-            }
+    protected abstract M getMouseContext(int mousex, int mousey);
 
+    protected void beforeDrawItems(int mousex, int mousey, M mouseContext) {
+        for (T item : getMask()) {
+            item.beforeDraw(getSlotRect(item.slotIndex), mouseContext);
         }
-
-        return this.gridMask;
-    }
-
-    protected void beforeDrawItems(int mousex, int mousey, @Nullable ItemPanelSlot focused) {
-
-        final List<Integer> mask = getMask();
-
-        for (int i = 0; i < mask.size(); i++) {
-            if (mask.get(i) != null) {
-                beforeDrawSlot(focused, mask.get(i), getSlotRect(i));
-            }
+        for (T item : getMask()) {
+            item.drawBorder(getSlotRect(item.slotIndex));
         }
     }
 
-    protected void afterDrawItems(int mousex, int mousey, @Nullable ItemPanelSlot focused) {
-        final List<Integer> mask = getMask();
-
-        for (int i = 0; i < mask.size(); i++) {
-            if (mask.get(i) != null) {
-                afterDrawSlot(focused, mask.get(i), getSlotRect(i));
-            }
+    protected void afterDrawItems(int mousex, int mousey, M mouseContext) {
+        for (T item : getMask()) {
+            item.afterDraw(getSlotRect(item.slotIndex), mouseContext);
         }
     }
 
     public void update() {}
 
-    protected void beforeDrawSlot(@Nullable ItemPanelSlot focused, int slotIdx, Rectangle4i rect) {
-        if (focused != null && focused.slotIndex == slotIdx) {
-            drawRect(rect.x, rect.y, rect.w, rect.h, 0xee555555); // highlight
-        }
-    }
+    protected void drawItems() {
 
-    protected void afterDrawSlot(@Nullable ItemPanelSlot focused, int slotIdx, Rectangle4i rect) {}
-
-    private void drawItems() {
-        GuiContainerManager.enableMatrixStackLogging();
-
-        final List<Integer> mask = getMask();
-        for (int i = 0; i < mask.size(); i++) {
-            if (mask.get(i) != null) {
-                drawItem(getSlotRect(i), mask.get(i));
-            }
+        for (T item : getMask()) {
+            item.drawItem(getSlotRect(item.slotIndex));
         }
 
-        GuiContainerManager.disableMatrixStackLogging();
     }
 
     protected int getGridRenderingCacheMode() {
@@ -419,10 +516,10 @@ public class ItemsGrid {
             return;
         }
 
-        final ItemPanelSlot focused = getSlotMouseOver(mousex, mousey);
         final int gridRenderingCacheMode = getGridRenderingCacheMode();
+        final M mouseContext = getMouseContext(mousex, mousey);
 
-        beforeDrawItems(mousex, mousey, focused);
+        beforeDrawItems(mousex, mousey, mouseContext);
 
         if (gridRenderingCacheMode > 0) {
 
@@ -431,49 +528,21 @@ public class ItemsGrid {
             }
 
             if (this.screenCapture.needRefresh(gridRenderingCacheMode)) {
-                this.screenCapture.captureScreen(this::drawItems, gridRenderingCacheMode);
+                this.screenCapture.captureScreen(() -> {
+                    GuiContainerManager.enableMatrixStackLogging();
+                    drawItems();
+                    GuiContainerManager.disableMatrixStackLogging();
+                }, gridRenderingCacheMode);
             }
 
             this.screenCapture.renderCapturedScreen();
         } else {
+            GuiContainerManager.enableMatrixStackLogging();
             drawItems();
+            GuiContainerManager.disableMatrixStackLogging();
         }
 
-        afterDrawItems(mousex, mousey, focused);
-    }
-
-    public void setVisible() {
-        if (getItems().isEmpty() && getMessageOnEmpty() != null) {
-            LayoutManager.addWidget(messageLabel);
-        }
-    }
-
-    protected void drawItem(Rectangle4i rect, int idx) {
-        GuiContainerManager.drawItem(rect.x + 1, rect.y + 1, getItem(idx));
-    }
-
-    public ItemPanelSlot getSlotMouseOver(int mousex, int mousey) {
-        if (!contains(mousex, mousey)) {
-            return null;
-        }
-
-        final int overRow = (mousey - marginTop) / SLOT_SIZE;
-        final int overColumn = (mousex - marginLeft - paddingLeft) / SLOT_SIZE;
-        final int slt = columns * overRow + overColumn;
-
-        if (overRow >= rows || overColumn >= columns) {
-            return null;
-        }
-
-        final List<Integer> mask = getMask();
-
-        if (mask.size() > slt && mask.get(slt) != null) {
-            final int idx = mask.get(slt);
-
-            return new ItemPanelSlot(idx, getItem(idx));
-        }
-
-        return null;
+        afterDrawItems(mousex, mousey, mouseContext);
     }
 
     public boolean contains(int px, int py) {
@@ -487,13 +556,7 @@ public class ItemsGrid {
             return false;
         }
 
-        final int r = (py - marginTop) / SLOT_SIZE;
-        final int c = (px - marginLeft - paddingLeft) / SLOT_SIZE;
-
-        return !isInvalidSlot(columns * r + c);
+        return !isInvalidSlot(columns * getRowIndex(py) + getColumnIndex(px));
     }
 
-    public String getMessageOnEmpty() {
-        return null;
-    }
 }

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

@@ -0,0 +1,255 @@
+package codechicken.nei;
+
+import java.awt.Color;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+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.ItemsGrid.ItemsGridSlot;
+import codechicken.nei.guihook.GuiContainerManager;
+import codechicken.nei.recipe.Recipe.RecipeId;
+
+public class ItemsPanelGrid extends ItemsGrid<ItemsPanelGrid.ItemsPanelGridSlot, ItemsPanelGrid.MouseContext> {
+
+    public static class ItemsPanelGridSlot extends ItemsGridSlot {
+
+        protected static final float LINE_WIDTH = 0.75f;
+
+        public int groupIndex = -1;
+        public String displayName = "";
+        public ItemStack bgItemStack;
+        public int groupSize = 1;
+        public boolean extended = false;
+
+        public Color bgColor = null;
+
+        public ItemsPanelGridSlot(int slotIndex, int itemIndex, ItemStack itemStack) {
+            super(slotIndex, itemIndex, itemStack);
+        }
+
+        public ItemStack getBGItem() {
+            return this.bgItemStack;
+        }
+
+        @Override
+        public RecipeId getRecipeId() {
+            return FavoriteRecipes.getFavorite(this.item);
+        }
+
+        @Override
+        public void beforeDraw(Rectangle4i rect, MouseContext mouseContext) {
+            super.beforeDraw(rect, mouseContext);
+
+            if (this.bgColor != null) {
+                NEIClientUtils.drawRect(rect.x, rect.y, rect.w, rect.h, this.bgColor);
+            }
+
+        }
+
+        @Override
+        public void drawItem(Rectangle4i rect) {
+
+            if (!this.extended && getBGItem() != null) {
+                GuiContainerManager.drawItems.zLevel -= 10F;
+                super.drawItem(getBGItem(), rect.offset(1, -1));
+                GuiContainerManager.drawItems.zLevel += 10F;
+                super.drawItem(getItemStack(), rect.offset(-2, 2));
+            } else {
+                super.drawItem(rect);
+            }
+        }
+
+    }
+
+    public ArrayList<ItemStack> newItems;
+    public ArrayList<ItemStack> rawItems = new ArrayList<>();
+    protected List<ItemsPanelGridSlot> gridMask;
+
+    protected final Map<Integer, Integer> itemToGroup = new HashMap<>();
+    protected final Map<Integer, List<ItemStack>> groupItems = new HashMap<>();
+    protected boolean forceExpand = false;
+
+    public void setItems(ArrayList<ItemStack> items) {
+        newItems = items;
+    }
+
+    public static void updateScale() {
+        SLOT_SIZE = 2 + (int) Math.ceil(8f * NEIClientConfig.getIntSetting("inventory.itempanelScale") / 100) * 2;
+    }
+
+    @Override
+    public void refresh(GuiContainer gui) {
+
+        if (this.newItems != null) {
+            this.groupItems.clear();
+            this.itemToGroup.clear();
+            this.forceExpand = false;
+
+            if (!CollapsibleItems.isEmpty() && !this.newItems.isEmpty()) {
+                final Set<Integer> groups = new HashSet<>();
+                boolean outsideGroup = false;
+
+                this.realItems = new ArrayList<>();
+                this.rawItems = new ArrayList<>(this.newItems);
+
+                for (ItemStack stack : this.newItems) {
+                    final int groupIndex = CollapsibleItems.getGroupIndex(stack);
+
+                    if (groupIndex == -1) {
+                        this.realItems.add(stack);
+                        outsideGroup = true;
+                    } else {
+
+                        if (!groups.contains(groupIndex) || CollapsibleItems.isExpanded(groupIndex)) {
+                            this.itemToGroup.put(this.realItems.size(), groupIndex);
+                            this.realItems.add(stack);
+                            groups.add(groupIndex);
+                        }
+
+                        this.groupItems.computeIfAbsent(groupIndex, gi -> new ArrayList<>()).add(stack);
+                    }
+                }
+
+                // automatically opens if there are elements from only one group
+                if (!outsideGroup && groups.size() == 1) {
+                    final int groupIndex = groups.iterator().next();
+                    this.realItems = new ArrayList<>(this.newItems);
+                    this.itemToGroup.clear();
+                    this.forceExpand = true;
+
+                    for (int itemIndex = 0; itemIndex < this.realItems.size(); itemIndex++) {
+                        this.itemToGroup.put(itemIndex, groupIndex);
+                    }
+                }
+            } else {
+                this.realItems = new ArrayList<>(this.newItems);
+            }
+
+            this.newItems = null;
+            onItemsChanged();
+        }
+
+        super.refresh(gui);
+    }
+
+    @Override
+    protected void onGridChanged() {
+        this.gridMask = null;
+        super.onGridChanged();
+    }
+
+    @Override
+    public List<ItemsPanelGridSlot> getMask() {
+
+        if (this.gridMask == null) {
+            this.gridMask = new ArrayList<>();
+            int itemIndex = page * perPage;
+
+            for (int slotIndex = 0; slotIndex < rows * columns && itemIndex < size(); slotIndex++) {
+                if (!isInvalidSlot(slotIndex)) {
+                    this.gridMask.add(new ItemsPanelGridSlot(slotIndex, itemIndex, getItem(itemIndex)));
+                    itemIndex++;
+                }
+            }
+
+            calculateGroupBorders(this.gridMask);
+        }
+
+        return this.gridMask;
+    }
+
+    @Override
+    protected MouseContext getMouseContext(int mousex, int mousey) {
+        final ItemsPanelGridSlot hovered = getSlotMouseOver(mousex, mousey);
+
+        if (hovered != null) {
+            return new MouseContext(
+                    hovered.slotIndex,
+                    hovered.slotIndex / this.columns,
+                    hovered.slotIndex % this.columns);
+        }
+
+        return null;
+    }
+
+    protected void calculateGroupBorders(List<ItemsPanelGridSlot> gridMask) {
+
+        if (gridMask.isEmpty() || this.groupItems.isEmpty()) {
+            return;
+        }
+
+        final Color collapsedBGColor = new Color(
+                NEIClientConfig.getSetting("inventory.collapsibleItems.collapsedColor").getHexValue(),
+                true);
+        final Color expandedBGColor = new Color(
+                NEIClientConfig.getSetting("inventory.collapsibleItems.expandedColor").getHexValue(),
+                true);
+        final Color collapsedBorderColor = darkerColor(collapsedBGColor);
+        final Color expandedBorderColor = darkerColor(expandedBGColor);
+        final Map<Integer, Integer> borderGrid = new HashMap<>();
+
+        for (ItemsPanelGridSlot item : gridMask) {
+            borderGrid.put(item.slotIndex, this.itemToGroup.getOrDefault(item.itemIndex, -1));
+        }
+
+        for (ItemsPanelGridSlot item : gridMask) {
+            final int groupIndex = borderGrid.get(item.slotIndex);
+            final List<ItemStack> groupItems = this.groupItems.get(groupIndex);
+
+            if (groupItems == null || groupItems.size() == 1) {
+                continue;
+            }
+
+            int column = item.slotIndex % this.columns;
+            int row = item.slotIndex / this.columns;
+            int prevSlotIndex = (row - 1) * this.columns + column;
+            int nextSlotIndex = (row + 1) * this.columns + column;
+
+            item.groupIndex = groupIndex;
+            item.groupSize = groupItems.size();
+            item.bgItemStack = groupItems.get(groupItems.size() - 1);
+            item.displayName = CollapsibleItems.getDisplayName(groupIndex);
+            item.extended = this.forceExpand || CollapsibleItems.isExpanded(groupIndex);
+            item.bgColor = item.extended ? expandedBGColor : collapsedBGColor;
+
+            item.borderColor = item.extended ? expandedBorderColor : collapsedBorderColor;
+            item.borderLeft = column == 0 || borderGrid.getOrDefault(item.slotIndex - 1, -1) != groupIndex;
+            item.borderRight = column + 1 == this.columns
+                    || borderGrid.getOrDefault(item.slotIndex + 1, -1) != groupIndex;
+            item.borderTop = borderGrid.getOrDefault(prevSlotIndex, -1) != groupIndex;
+            item.borderBottom = borderGrid.getOrDefault(nextSlotIndex, -1) != groupIndex;
+        }
+
+    }
+
+    private static Color darkerColor(Color color) {
+        return new Color(
+                color.getRed(),
+                color.getGreen(),
+                color.getBlue(),
+                Math.min((int) (color.getAlpha() + (255f / 5) * 2), 255));
+    }
+
+    public void draw(int mousex, int mousey) {
+        if (ItemList.loadFinished) {
+            super.draw(mousex, mousey);
+        } else {
+            GuiDraw.drawStringC(
+                    NEIClientUtils
+                            .cropText(GuiDraw.fontRenderer, NEIClientUtils.translate("itempanel.loading"), width - 10),
+                    marginLeft + width / 2,
+                    marginTop + height / 2,
+                    0xffffff,
+                    true);
+        }
+    }
+
+}

src/main/java/codechicken/nei/ItemsTooltipLineHandler.java

@@ -3,15 +3,19 @@ package codechicken.nei;
 import static codechicken.lib.gui.GuiDraw.fontRenderer;
 
 import java.awt.Dimension;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 import net.minecraft.client.renderer.RenderHelper;
 import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.EnumChatFormatting;
 
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
 
+import codechicken.lib.gui.GuiDraw;
 import codechicken.lib.gui.GuiDraw.ITooltipLineHandler;
 import codechicken.nei.guihook.GuiContainerManager;
 import codechicken.nei.recipe.StackInfo;
@@ -19,12 +23,14 @@ import codechicken.nei.util.ReadableNumberConverter;
 
 public class ItemsTooltipLineHandler implements ITooltipLineHandler {
 
+    protected static final int SLOT_SIZE = 18;
     protected static final int MAX_COLUMNS = 11;
     protected static final int MARGIN_TOP = 2;
 
     protected String label;
     protected EnumChatFormatting labelColor = EnumChatFormatting.GRAY;
     protected List<ItemStack> items;
+    protected int activeStackIndex = -1;
     protected Dimension size = new Dimension();
     protected boolean saveStackSize = false;
     protected int columns = 0;
@@ -46,9 +52,8 @@ public class ItemsTooltipLineHandler implements ITooltipLineHandler {
             this.columns = Math.min(MAX_COLUMNS, this.length);
             this.rows = Math.min(maxRows, (int) Math.ceil((float) this.length / this.columns));
 
-            this.size.width = Math
-                    .max(this.columns * ItemsGrid.SLOT_SIZE, fontRenderer.getStringWidth(this.label) + 15);
-            this.size.height = this.rows * ItemsGrid.SLOT_SIZE + fontRenderer.FONT_HEIGHT + 2 + MARGIN_TOP;
+            this.size.width = Math.max(this.columns * SLOT_SIZE, fontRenderer.getStringWidth(this.label) + 15);
+            this.size.height = this.rows * SLOT_SIZE + fontRenderer.FONT_HEIGHT + 2 + MARGIN_TOP;
 
             this.count = Math.min(
                     this.length,
@@ -58,12 +63,22 @@ public class ItemsTooltipLineHandler implements ITooltipLineHandler {
 
             if (this.items.size() > this.count) {
                 String text = "+" + (this.items.size() - this.count);
-                this.count -= (int) Math.ceil((float) (fontRenderer.getStringWidth(text) - 2) / ItemsGrid.SLOT_SIZE);
+                this.count -= (int) Math.ceil((float) (fontRenderer.getStringWidth(text) - 2) / SLOT_SIZE);
             }
         }
 
     }
 
+    public void setActiveStack(ItemStack activeStack) {
+        final ItemStack realStack = items.stream().filter(stack -> NEIClientUtils.areStacksSameType(stack, activeStack))
+                .findFirst().orElse(null);
+        this.activeStackIndex = items.indexOf(realStack);
+    }
+
+    public ItemStack getActiveStack() {
+        return this.activeStackIndex == -1 ? null : this.items.get(this.activeStackIndex);
+    }
+
     public boolean isEmpty() {
         return this.items.isEmpty();
     }
@@ -85,37 +100,51 @@ public class ItemsTooltipLineHandler implements ITooltipLineHandler {
 
         fontRenderer.drawStringWithShadow(this.labelColor + this.label + ":", x, y, 0);
 
-        GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS);
-        GL11.glPushMatrix();
-        RenderHelper.enableGUIStandardItemLighting();
-
-        GL11.glScaled(1, 1, 3);
-        GL11.glTranslatef(x, y + fontRenderer.FONT_HEIGHT + 2, 0);
         GL11.glEnable(GL12.GL_RESCALE_NORMAL);
 
-        for (int i = 0; i < this.count; i++) {
-            ItemStack drawStack = this.items.get(i);
-            int col = i % this.columns;
-            int row = i / this.columns;
+        GL11.glPushAttrib(GL11.GL_ENABLE_BIT | GL11.GL_COLOR_BUFFER_BIT | GL11.GL_LIGHTING_BIT);
+        RenderHelper.enableGUIStandardItemLighting();
+
+        final int xTranslation = x;
+        final int yTranslation = y + fontRenderer.FONT_HEIGHT + 2;
+        final int zTranslation = GuiContainerManager.TOOLTIP_Z_OFFSET;
+        GL11.glTranslatef(xTranslation, yTranslation, zTranslation);
+
+        int indexShift = 0;
+
+        if (this.activeStackIndex != -1) {
+            indexShift = Math.max(0, Math.min(this.items.size() - this.count, this.activeStackIndex - this.count + 2));
+        }
+
+        for (int index = 0; index < this.count && index + indexShift < this.items.size(); index++) {
+            ItemStack drawStack = this.items.get(index + indexShift);
+            int col = index % this.columns;
+            int row = index / this.columns;
 
             String stackSize = !this.saveStackSize || drawStack.stackSize == 0 ? ""
                     : ReadableNumberConverter.INSTANCE.toWideReadableForm(drawStack.stackSize);
 
-            drawItem(col * ItemsGrid.SLOT_SIZE, row * ItemsGrid.SLOT_SIZE, drawStack, stackSize);
+            if (this.activeStackIndex == index + indexShift) {
+                NEIClientUtils.gl2DRenderContext(
+                        () -> GuiDraw.drawRect(col * SLOT_SIZE - 1, row * SLOT_SIZE - 1, 18, 18, 0x66555555));
+            }
+
+            drawItem(col * SLOT_SIZE, row * SLOT_SIZE, drawStack, stackSize);
         }
 
         if (this.count < this.items.size()) {
-            String text = "+" + (this.items.size() - this.count);
-
-            fontRenderer.drawStringWithShadow(
-                    text,
-                    MAX_COLUMNS * ItemsGrid.SLOT_SIZE - fontRenderer.getStringWidth(text) - 2,
-                    (this.rows - 1) * ItemsGrid.SLOT_SIZE + (ItemsGrid.SLOT_SIZE - fontRenderer.FONT_HEIGHT) / 2,
-                    0xee555555);
+            final String text = "+" + (this.items.size() - this.count);
 
+            NEIClientUtils.gl2DRenderContext(() -> {
+                fontRenderer.drawStringWithShadow(
+                        text,
+                        MAX_COLUMNS * SLOT_SIZE - fontRenderer.getStringWidth(text) - 2,
+                        (this.rows - 1) * SLOT_SIZE + (SLOT_SIZE - fontRenderer.FONT_HEIGHT) / 2,
+                        0xee555555);
+            });
         }
 
-        GL11.glPopMatrix();
+        GL11.glTranslatef(-xTranslation, -yTranslation, -zTranslation);
         GL11.glPopAttrib();
     }
 
@@ -124,12 +153,19 @@ public class ItemsTooltipLineHandler implements ITooltipLineHandler {
     }
 
     private List<ItemStack> groupingItemStacks(List<ItemStack> items) {
-        final List<ItemStack> result = ItemStackAmount.of(items).values();
+        final List<ItemStack> result = new ArrayList<>();
 
-        for (ItemStack stack : result) {
-            if (StackInfo.itemStackToNBT(stack).hasKey("gtFluidName")) {
+        for (Map.Entry<NBTTagCompound, Long> entry : ItemStackAmount.of(items).entrySet()) {
+            final ItemStack stack = StackInfo.loadFromNBT(entry.getKey(), Math.max(0, entry.getValue()));
+
+            if (entry.getKey().hasKey("gtFluidName")) {
                 stack.stackSize = 0;
             }
+            result.add(stack);
+        }
+
+        if (result.isEmpty()) {
+            result.addAll(items);
         }
 
         return result;

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

@@ -4,6 +4,10 @@ import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.Map.Entry;
 
+import org.lwjgl.input.Keyboard;
+
+import codechicken.nei.util.NEIKeyboardUtils;
+
 /**
  * Good old down/held/up keystate tracker
  */
@@ -26,7 +30,8 @@ public class KeyManager {
 
     public static void tickKeyStates() {
         for (Entry<String, KeyState> entry : keyStates.entrySet()) {
-            final boolean down = NEIClientConfig.isKeyHashDown(entry.getKey());
+            final int keyCode = NEIKeyboardUtils.unhash(NEIClientConfig.getKeyBinding(entry.getKey()));
+            final boolean down = keyCode > 0 && keyCode < Keyboard.KEYBOARD_SIZE && Keyboard.isKeyDown(keyCode);
             final KeyState state = entry.getValue();
 
             if (down) {

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

@@ -65,6 +65,8 @@ import codechicken.nei.guihook.IContainerDrawHandler;
 import codechicken.nei.guihook.IContainerInputHandler;
 import codechicken.nei.guihook.IContainerObjectHandler;
 import codechicken.nei.guihook.IContainerTooltipHandler;
+import codechicken.nei.recipe.AutoCraftingManager;
+import codechicken.nei.recipe.DebugHandlerWidget;
 import codechicken.nei.recipe.GuiRecipeTab;
 import codechicken.nei.recipe.RecipeCatalysts;
 
@@ -90,6 +92,7 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH
     public static SubsetWidget dropDown;
     public static SearchField searchField;
     public static ItemZoom itemZoom;
+    public static DebugHandlerWidget recipeHandlerWidget;
 
     public static ButtonCycled options;
     public static ButtonCycled bookmarksButton;
@@ -101,7 +104,7 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH
     public static Button delete;
     public static ButtonCycled gamemode;
     public static Button rain;
-    public static Button magnet;
+    public static ButtonCycled magnet;
     public static Button[] timeButtons = new Button[4];
     public static Button heal;
 
@@ -135,10 +138,8 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH
 
     @Override
     public void onPreDraw(GuiContainer gui) {
-        if (!isHidden() && isEnabled() && gui instanceof InventoryEffectRenderer) // Reset the gui to the center of the
-                                                                                  // screen, for potion effect offsets
-        // etc
-        {
+        // Reset the gui to the center of the screen, for potion effect offsets etc
+        if (isEnabled() && gui instanceof InventoryEffectRenderer) {
             gui.guiLeft = (gui.width - gui.xSize) / 2;
             gui.guiTop = (gui.height - gui.ySize) / 2;
 
@@ -234,8 +235,7 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH
             return true;
         }
 
-        if (NEIClientConfig.isKeyHashDown("gui.next_tooltip")) {
-            GuiContainerManager.incrementTooltipPage();
+        if (NEIClientConfig.isKeyHashDown("gui.next_tooltip") && GuiContainerManager.incrementTooltipPage()) {
             return true;
         }
 
@@ -293,19 +293,6 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH
         }
     }
 
-    @Override
-    public void postRenderTooltips(GuiContainer gui, int mousex, int mousey, List<String> tooltip) {
-
-        if (!isHidden() && isEnabled() && GuiContainerManager.shouldShowTooltip(gui)) {
-            final Widget focused = getWidgetUnderMouse(mousex, mousey);
-
-            if (focused != null) {
-                focused.postDrawTooltips(mousex, mousey, tooltip);
-            }
-        }
-
-    }
-
     @Override
     public List<String> handleTooltip(GuiContainer gui, int mousex, int mousey, List<String> currenttip) {
 
@@ -356,6 +343,10 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH
         if (!isHidden() && isEnabled() && GuiContainerManager.shouldShowTooltip(gui)) {
             final Widget focused = getWidgetUnderMouse(mousex, mousey);
 
+            if (focused != null) {
+                currenttip = focused.handleItemTooltip(itemstack, mousex, mousey, currenttip);
+            }
+
             if (focused instanceof IContainerTooltipHandler tip) {
                 currenttip = tip.handleItemTooltip(gui, itemstack, mousex, mousey, currenttip);
             }
@@ -370,9 +361,14 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH
         if (!isHidden() && isEnabled() && GuiContainerManager.shouldShowTooltip(gui)) {
             final Widget focused = getWidgetUnderMouse(mousex, mousey);
 
-            if (focused instanceof IContainerTooltipHandler tip) {
-                hotkeys = tip.handleHotkeys(gui, mousex, mousey, hotkeys);
+            if (focused != null) {
+                hotkeys = focused.handleHotkeys(mousex, mousey, hotkeys);
+
+                if (focused instanceof IContainerTooltipHandler tip) {
+                    hotkeys = tip.handleHotkeys(gui, mousex, mousey, hotkeys);
+                }
             }
+
         }
 
         return hotkeys;
@@ -410,6 +406,8 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH
 
         itemZoom = new ItemZoom();
 
+        recipeHandlerWidget = new DebugHandlerWidget();
+
         dropDown = new SubsetWidget();
         searchField = new SearchField("search");
         API.addItemFilter(searchField);
@@ -602,7 +600,7 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH
                 return getStateTip("rain", state);
             }
         };
-        magnet = new Button() {
+        magnet = new ButtonCycled(2) {
 
             @Override
             public boolean onButtonPress(boolean rightclick) {
@@ -785,9 +783,11 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH
         addWidget(itemZoom);
 
         if (visiblity.showSubsetDropdown) {
-            // Bookmarks or Subset/dropdown
             addWidget(dropDown);
         }
+
+        addWidget(recipeHandlerWidget);
+        recipeHandlerWidget.setVisible();
     }
 
     public static LayoutStyle getLayoutStyle(int id) {
@@ -830,7 +830,7 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH
 
     @Override
     public boolean shouldShowTooltip(GuiContainer gui) {
-        return itemPanel.draggedStack == null && !bookmarkPanel.inEditingState();
+        return itemPanel.draggedStack == null && !bookmarkPanel.inEditingState() && !AutoCraftingManager.processing();
     }
 
     /** Note: this method isn't actually used by this mod, but NEI add-ons might need it. */
@@ -858,13 +858,11 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH
             ItemStack item = slot.getStack();
 
             if (item == null ? !getSearchExpression().equals("") : !searchField.getFilter().matches(item)) {
-                GL11.glDisable(GL11.GL_LIGHTING);
-                GL11.glDisable(GL11.GL_DEPTH_TEST);
-                GL11.glTranslatef(0, 0, 150);
-                drawRect(slot.xDisplayPosition, slot.yDisplayPosition, 16, 16, 0x80000000);
-                GL11.glTranslatef(0, 0, -150);
-                GL11.glEnable(GL11.GL_LIGHTING);
-                GL11.glEnable(GL11.GL_DEPTH_TEST);
+                NEIClientUtils.gl2DRenderContext(() -> {
+                    GL11.glTranslatef(0, 0, 150);
+                    drawRect(slot.xDisplayPosition, slot.yDisplayPosition, 16, 16, 0x80000000);
+                    GL11.glTranslatef(0, 0, -150);
+                });
             }
         }
 
@@ -909,6 +907,9 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH
         final int ty2 = ty + 20 - h2 - te;
         final int tx2 = 200 - w2 - te;
 
+        final boolean is2DTexture = GL11.glGetBoolean(GL11.GL_TEXTURE_2D);
+
+        GL11.glEnable(GL11.GL_TEXTURE_2D);
         changeTexture("textures/gui/widgets.png");
         drawTexturedModalRect(x, y, tx1, ty1, w1, h1); // top left
         drawTexturedModalRect(x, y2, tx1, ty2, w1, h2); // bottom left
@@ -921,16 +922,14 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH
 
         drawTexturedModalRect(x2, y, tx2, ty1, w2, h1); // top right
         drawTexturedModalRect(x2, y2, tx2, ty2, w2, h2); // bottom right
+
+        if (!is2DTexture) GL11.glDisable(GL11.GL_TEXTURE_2D);
     }
 
     public static void drawItemPresenceOverlay(int slotX, int slotY, boolean isPresent, boolean slotHighlight) {
 
         if (slotHighlight) {
-            GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS);
-            GL11.glDisable(GL11.GL_LIGHTING);
-            GL11.glDisable(GL11.GL_DEPTH_TEST);
-            drawRect(slotX, slotY, 16, 16, isPresent ? 0x8000AA00 : 0x80AA0000);
-            GL11.glPopAttrib();
+            NEIClientUtils.gl2DRenderContext(() -> drawRect(slotX, slotY, 16, 16, isPresent ? 0x8000AA00 : 0x80AA0000));
         } else {
             Image icon = itemPresenceOverlays[isPresent ? 1 : 0];
             drawIcon(slotX + 16 - icon.width, slotY + 16 - icon.height, icon);

src/main/java/codechicken/nei/LayoutStyleMinecraft.java

@@ -31,7 +31,8 @@ public class LayoutStyleMinecraft extends LayoutStyle {
         LayoutManager.gamemode.icons[0] = new Image(132, 12, 12, 12);
         LayoutManager.gamemode.icons[1] = new Image(156, 12, 12, 12);
         LayoutManager.gamemode.icons[2] = new Image(168, 12, 12, 12);
-        LayoutManager.magnet.icon = new Image(180, 24, 12, 12);
+        LayoutManager.magnet.icons[0] = new Image(180, 24, 12, 12);
+        LayoutManager.magnet.icons[1] = new Image(180, 36, 12, 12);
         LayoutManager.timeButtons[0].icon = new Image(132, 24, 12, 12);
         LayoutManager.timeButtons[1].icon = new Image(120, 24, 12, 12);
         LayoutManager.timeButtons[2].icon = new Image(144, 24, 12, 12);
@@ -52,7 +53,7 @@ public class LayoutStyleMinecraft extends LayoutStyle {
     public void layout(GuiContainer gui, VisiblityData visiblity) {
         reset();
 
-        leftSize = ItemPanels.bookmarkPanel.getWidth(gui);
+        leftSize = (gui.width - gui.xSize) / 2 - 4;
         numButtons = Math.max(leftSize / 20, 1);
 
         LayoutManager.delete.state = 0x4;
@@ -86,6 +87,7 @@ public class LayoutStyleMinecraft extends LayoutStyle {
         LayoutManager.options.index = NEIClientConfig.getCheatMode();
 
         LayoutManager.magnet.state = 0x4 | (NEIClientConfig.getMagnetMode() ? 1 : 0);
+        LayoutManager.magnet.index = (LayoutManager.magnet.state & 0x1) != 0 ? 1 : 0;
 
         if (NEIClientConfig.canPerformAction("delete")) {
             layoutButton(LayoutManager.delete);
@@ -184,7 +186,7 @@ public class LayoutStyleMinecraft extends LayoutStyle {
         final Rectangle4i area = new Rectangle4i(0, 0, 0, BUTTON_SIZE);
 
         if (NEIClientConfig.isSearchWidgetCentered()) {
-            area.w = gui.xSize - MARGIN * 2;
+            area.w = Math.min(gui.xSize, 176) - MARGIN * 2;
             area.x = (gui.width - area.w) / 2;
             area.y = gui.height - BUTTON_SIZE - MARGIN;
         } else if (NEIClientConfig.showItemQuantityWidget()) {

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

@@ -186,6 +186,12 @@ public class NEICPH implements IClientPacketHandler {
         packet.sendToServer();
     }
 
+    public static void sendChatLink(ItemStack stackover) {
+        PacketCustom packet = new PacketCustom(channel, C2S.SEND_CHAT_ITEM_LINK);
+        packet.writeItemStack(stackover);
+        packet.sendToServer();
+    }
+
     public static void sendOpenEnchantmentWindow() {
         PacketCustom packet = new PacketCustom(channel, C2S.REQUEST_ENCHANTMENT_GUI);
         packet.sendToServer();

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

@@ -9,6 +9,7 @@ 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;
@@ -16,7 +17,6 @@ import net.minecraft.client.renderer.OpenGlHelper;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.world.World;
 import net.minecraft.world.storage.SaveFormatComparator;
 import net.minecraftforge.common.MinecraftForge;
 
@@ -45,7 +45,6 @@ import codechicken.nei.config.GuiHighlightTips;
 import codechicken.nei.config.GuiNEIOptionList;
 import codechicken.nei.config.GuiOptionList;
 import codechicken.nei.config.GuiPanelSettings;
-import codechicken.nei.config.OptionButton;
 import codechicken.nei.config.OptionCycled;
 import codechicken.nei.config.OptionGamemodes;
 import codechicken.nei.config.OptionIntegerField;
@@ -57,10 +56,14 @@ import codechicken.nei.config.OptionToggleButtonBoubs;
 import codechicken.nei.config.OptionUtilities;
 import codechicken.nei.config.preset.GuiPresetList;
 import codechicken.nei.event.NEIConfigsLoadedEvent;
+import codechicken.nei.recipe.DebugHandlerWidget;
 import codechicken.nei.recipe.GuiRecipeTab;
 import codechicken.nei.recipe.IRecipeHandler;
+import codechicken.nei.recipe.InformationHandler;
 import codechicken.nei.recipe.RecipeCatalysts;
 import codechicken.nei.recipe.RecipeInfo;
+import codechicken.nei.util.ItemUntranslator;
+import codechicken.nei.util.NEIKeyboardUtils;
 import codechicken.obfuscator.ObfuscationRun;
 
 public class NEIClientConfig {
@@ -145,6 +148,10 @@ public class NEIClientConfig {
         tag.getTag("inventory.widgetsenabled").getBooleanValue(true);
         API.addOption(new OptionToggleButton("inventory.widgetsenabled"));
 
+        tag.getTag("findFuelsParallel").getBooleanValue(true);
+
+        tag.getTag("inventory.autocrafting").getBooleanValue(true);
+        tag.getTag("inventory.dynamicFontSize").getBooleanValue(true);
         tag.getTag("inventory.hidden").getBooleanValue(false);
         tag.getTag("inventory.cheatmode").getIntValue(2);
         tag.getTag("inventory.lockmode").setComment(
@@ -178,6 +185,7 @@ public class NEIClientConfig {
             @Override
             public boolean onClick(int button) {
                 super.onClick(button);
+                ItemPanels.bookmarkPanel.save();
                 ItemPanels.bookmarkPanel.load();
                 return true;
             }
@@ -191,27 +199,43 @@ public class NEIClientConfig {
                 .getIntValue(1);
         API.addOption(new OptionCycled("inventory.bookmarks.recipeTooltipsMode", 4, true));
 
-        tag.getTag("inventory.bookmarks.showRecipeMarker").setComment("Show Recipe Marker").getBooleanValue(false);
-        API.addOption(new OptionToggleButton("inventory.bookmarks.showRecipeMarker", true));
+        tag.getTag("inventory.bookmarks.showRecipeMarkerMode").setComment("Show Recipe Marker").getIntValue(0);
+        API.addOption(new OptionCycled("inventory.bookmarks.showRecipeMarkerMode", 3, true));
 
-        tag.getTag("inventory.bookmarks.craftingChainDir").getIntValue(1);
-        API.addOption(new OptionCycled("inventory.bookmarks.craftingChainDir", 2, true));
+        tag.getTag("inventory.bookmarks.recipeMarkerColor").setComment("Color of the icon marker")
+                .getHexValue(0xADADAD);
+        API.addOption(
+                new OptionIntegerField(
+                        "inventory.bookmarks.recipeMarkerColor",
+                        0,
+                        OptionIntegerField.UNSIGNED_INT_MAX));
+
+        tag.getTag("inventory.bookmarks.showRecipeHandlerIcon").setComment("Show Recipe Handler Icon")
+                .getBooleanValue(false);
+        API.addOption(new OptionToggleButton("inventory.bookmarks.showRecipeHandlerIcon", true));
+
+        tag.getTag("inventory.bookmarks.recipeChainDir").getIntValue(1);
+        API.addOption(new OptionCycled("inventory.bookmarks.recipeChainDir", 2, true));
 
         tag.getTag("inventory.bookmarks.ignorePotionOverlap").setComment("Ignore overlap with potion effect HUD")
                 .getBooleanValue(false);
         API.addOption(new OptionToggleButton("inventory.bookmarks.ignorePotionOverlap", true));
 
+        tag.getTag("inventory.bookmarks.bookmarkItemsWithRecipe").setComment("Bookmark items with recipe")
+                .getBooleanValue(true);
+        API.addOption(new OptionToggleButton("inventory.bookmarks.bookmarkItemsWithRecipe", true));
+
+        tag.getTag("inventory.bookmarks.bookmarkRecipeWithCount").setComment("Bookmark recipe with count")
+                .getBooleanValue(false);
+        API.addOption(new OptionToggleButton("inventory.bookmarks.bookmarkRecipeWithCount", true));
+
         tag.getTag("inventory.guirecipe.jeiStyleTabs").setComment("Enable/disable JEI Style Tabs")
                 .getBooleanValue(true);
         API.addOption(new OptionToggleButtonBoubs("inventory.guirecipe.jeiStyleTabs", true));
 
-        tag.getTag("inventory.guirecipe.jeiStyleRecipeCatalyst").setComment("Enable/disable JEI Style Recipe Catalysts")
-                .getBooleanValue(true);
-        API.addOption(new OptionToggleButton("inventory.guirecipe.jeiStyleRecipeCatalyst", true));
-
-        tag.getTag("inventory.guirecipe.jeiStyleCycledIngredients").setComment("JEI styled cycled ingredients")
-                .getBooleanValue(true);
-        API.addOption(new OptionToggleButton("inventory.guirecipe.jeiStyleCycledIngredients", true));
+        tag.getTag("inventory.guirecipe.jeiStyleRecipeCatalyst")
+                .setComment("JEI Style Recipe Catalysts (0 - none, 1 - grid, 2 - scroll)").getIntValue(1);
+        API.addOption(new OptionCycled("inventory.guirecipe.jeiStyleRecipeCatalyst", 3, true));
 
         tag.getTag("inventory.guirecipe.cycledIngredientsTooltip").setComment("Show cycled ingredients tooltip")
                 .getBooleanValue(true);
@@ -229,31 +253,52 @@ public class NEIClientConfig {
                 .getBooleanValue(true);
         API.addOption(new OptionToggleButton("inventory.guirecipe.slotHighlightPresent", true));
 
+        tag.getTag("inventory.guirecipe.infiniteScroll").setComment("Use Infinite Scroll for Handlers")
+                .getBooleanValue(false);
+        API.addOption(new OptionToggleButton("inventory.guirecipe.infiniteScroll", true));
+
+        tag.getTag("inventory.guirecipe.maxHeight").setComment("Recipe GUI Max Height").getIntValue(370);
+        API.addOption(new OptionIntegerField("inventory.guirecipe.maxHeight", 166, 4000));
+
         tag.getTag("inventory.guirecipe.shiftOverlayRecipe")
                 .setComment("Require holding shift to move items when overlaying recipe").getBooleanValue(true);
         API.addOption(new OptionToggleButton("inventory.guirecipe.shiftOverlayRecipe", true));
 
+        tag.getTag("inventory.guirecipe.profile").getBooleanValue(false);
+        API.addOption(new OptionToggleButton("inventory.guirecipe.profile", true));
+
+        tag.getTag("inventory.guirecipe.handlerInfo").setComment("ADVANCED: Handler Info Widget")
+                .getBooleanValue(false);
+        API.addOption(new OptionToggleButton("inventory.guirecipe.handlerInfo", true));
+
         tag.getTag("inventory.subsets.enabled").setComment("Enable/disable Subsets Dropdown").getBooleanValue(true);
         API.addOption(new OptionToggleButton("inventory.subsets.enabled", true));
 
         tag.getTag("inventory.subsets.widgetPosition").setComment("Subsets Widget Position").getBooleanValue(true);
         API.addOption(new OptionToggleButton("inventory.subsets.widgetPosition", true));
 
-        tag.getTag("inventory.guirecipe.profile").getBooleanValue(false);
-        API.addOption(new OptionToggleButton("inventory.guirecipe.profile", true));
-
         tag.getTag("inventory.history.enabled").setComment("Enable/disable History Panel").getBooleanValue(true);
         API.addOption(new OptionToggleButton("inventory.history.enabled", true));
 
-        tag.getTag("inventory.history.historyColor").setComment("Color of the history area display")
-                .getHexValue(0xee555555);
-        API.addOption(new OptionIntegerField("inventory.history.historyColor", 0, OptionIntegerField.UNSIGNED_INT_MAX));
+        tag.getTag("inventory.history.color").setComment("Color of the history area display").getHexValue(0xee555555);
+        API.addOption(new OptionIntegerField("inventory.history.color", 0, OptionIntegerField.UNSIGNED_INT_MAX));
 
         tag.getTag("inventory.history.useRows").setComment("Rows used in historical areas").getIntValue(2);
         API.addOption(new OptionIntegerField("inventory.history.useRows", 1, 5));
 
-        tag.getTag("inventory.history.splittingMode").getIntValue(1);
-        API.addOption(new OptionCycled("inventory.history.splittingMode", 2, true));
+        tag.getTag("inventory.craftables.enabled").setComment("Enable/disable Craftables Panel").getBooleanValue(false);
+        API.addOption(new OptionToggleButton("inventory.craftables.enabled", true));
+
+        tag.getTag("inventory.craftables.color").setComment("Color of the craftables area display")
+                .getHexValue(0xee555555);
+        API.addOption(new OptionIntegerField("inventory.craftables.color", 0, OptionIntegerField.UNSIGNED_INT_MAX));
+
+        tag.getTag("inventory.craftables.useRows").setComment("Rows used in craftables areas").getIntValue(2);
+        API.addOption(new OptionIntegerField("inventory.craftables.useRows", 1, 5));
+
+        tag.getTag("inventory.craftables.favoritesOnly").setComment("Show Only Favorites Recipes")
+                .getBooleanValue(false);
+        API.addOption(new OptionToggleButton("inventory.craftables.favoritesOnly", true));
 
         tag.getTag("inventory.collapsibleItems.enabled").getBooleanValue(true);
         API.addOption(new OptionToggleButton("inventory.collapsibleItems.enabled", true) {
@@ -287,19 +332,6 @@ public class NEIClientConfig {
                         0,
                         OptionIntegerField.UNSIGNED_INT_MAX));
 
-        API.addOption(
-                new OptionButton(
-                        "inventory.collapsibleItems.reloadLabel",
-                        "inventory.collapsibleItems.reloadButton",
-                        "inventory.collapsibleItems.reloadTip") {
-
-                    @Override
-                    public boolean onClick(int button) {
-                        LayoutManager.markItemsDirty();
-                        return super.onClick(button);
-                    }
-                });
-
         tag.getTag("inventory.itemzoom.enabled").getBooleanValue(true);
         API.addOption(new OptionToggleButton("inventory.itemzoom.enabled", true));
 
@@ -325,6 +357,8 @@ public class NEIClientConfig {
         tag.getTag("inventory.itemzoom.nameColor").getHexValue(0xFFFFFFFF);
         API.addOption(new OptionIntegerField("inventory.itemzoom.nameColor", 0, OptionIntegerField.UNSIGNED_INT_MAX));
 
+        setFavoriteDefaults(tag);
+
         tag.getTag("inventory.itemIDs").getIntValue(1);
         API.addOption(new OptionCycled("inventory.itemIDs", 3, true));
 
@@ -347,6 +381,19 @@ public class NEIClientConfig {
 
         API.addOption(new OptionOpenGui("world.presets", GuiPresetList.class));
 
+        tag.getTag("world.overlays.lock").getBooleanValue(true);
+        API.addOption(new OptionToggleButton("world.overlays.lock", true));
+
+        tag.getTag("inventory.itempanelScale").getIntValue(100);
+        ItemsPanelGrid.updateScale();
+        API.addOption(new OptionIntegerField("inventory.itempanelScale", 1, 1000) {
+
+            @Override
+            public void onTextChange(String text) {
+                ItemsPanelGrid.updateScale();
+            }
+        });
+
         tag.getTag("inventory.disableMouseScrollTransfer").getBooleanValue(false);
         API.addOption(new OptionToggleButton("inventory.disableMouseScrollTransfer", true));
 
@@ -359,11 +406,24 @@ public class NEIClientConfig {
             }
         });
 
-        tag.getTag("inventory.gridRenderingCacheFPS").getIntValue(8);
-
         tag.getTag("inventory.gridRenderingCacheMode").getIntValue(0);
         API.addOption(new OptionCycled("inventory.gridRenderingCacheMode", 3, true));
 
+        tag.getTag("inventory.gridRenderingCacheFPS").getIntValue(8);
+        API.addOption(new OptionIntegerField("inventory.gridRenderingCacheFPS", 1, 144) {
+
+            @Override
+            public boolean isEnabled() {
+                return OpenGlHelper.framebufferSupported && getIntSetting("inventory.gridRenderingCacheMode") == 1;
+            }
+
+        });
+        tag.getTag("inventory.hotkeysHelpText").getBooleanValue(true);
+        API.addOption(new OptionToggleButton("inventory.hotkeysHelpText", true));
+        tag.getTag("inventory.showHotkeys").getBooleanValue(true);
+        API.addOption(new OptionToggleButton("inventory.showHotkeys", true));
+
+        tag.getTag("loadPluginsInParallel").getBooleanValue(true);
         tag.getTag("itemLoadingTimeout").getIntValue(500);
 
         tag.getTag("command.creative").setDefaultValue("/gamemode {0} {1}");
@@ -384,6 +444,27 @@ public class NEIClientConfig {
                 .getBooleanValue(false);
         API.addOption(new OptionToggleButton("inventory.optimize_gui_overlap_computation", true));
 
+        tag.getTag("inventory.autocrafting").setComment("Autocrafting").getBooleanValue(true);
+        API.addOption(new OptionToggleButton("inventory.autocrafting", true));
+
+        tag.getTag("inventory.itemUntranslator").setComment("Item Untranslator").getBooleanValue(true);
+        API.addOption(new OptionToggleButton("inventory.itemUntranslator", true) {
+
+            @Override
+            public boolean onClick(int button) {
+                super.onClick(button);
+
+                if (enableItemUntranslator()) {
+                    ItemUntranslator.getInstance().load();
+                } else {
+                    ItemUntranslator.getInstance().unload();
+                }
+
+                return true;
+            }
+
+        });
+
         tag.getTag("tools.handler_load_from_config").setComment("ADVANCED: Load handlers from config")
                 .getBooleanValue(false);
         API.addOption(new OptionToggleButton("tools.handler_load_from_config", true) {
@@ -460,12 +541,15 @@ public class NEIClientConfig {
         API.addOption(new OptionCycled("inventory.search.widgetAutofocus", 3, true));
 
         tag.getTag("inventory.search.patternMode").setComment("Search Mode").getIntValue(1);
-        API.addOption(new OptionCycled("inventory.search.patternMode", 3, true) {
+        API.addOption(new OptionCycled("inventory.search.patternMode", 4, true) {
 
             @Override
             public boolean onClick(int button) {
+                if (!super.onClick(button)) {
+                    return false;
+                }
                 SearchField.searchParser.clearCache();
-                return super.onClick(button);
+                return true;
             }
 
         });
@@ -518,7 +602,7 @@ public class NEIClientConfig {
 
             @Override
             public boolean onClick(int button) {
-                // SearchField.searchParser.clearCache();
+                SearchField.searchParser.clearCache();
                 return super.onClick(button);
             }
 
@@ -535,8 +619,11 @@ public class NEIClientConfig {
 
             @Override
             public boolean onClick(int button) {
+                if (!super.onClick(button)) {
+                    return false;
+                }
                 SearchField.searchParser.clearCache();
-                return super.onClick(button);
+                return true;
             }
 
             @Override
@@ -560,8 +647,11 @@ public class NEIClientConfig {
 
             @Override
             public boolean onClick(int button) {
+                if (!super.onClick(button)) {
+                    return false;
+                }
                 SearchField.searchParser.clearCache();
-                return super.onClick(button);
+                return true;
             }
 
             @Override
@@ -584,8 +674,11 @@ public class NEIClientConfig {
 
             @Override
             public boolean onClick(int button) {
+                if (!super.onClick(button)) {
+                    return false;
+                }
                 SearchField.searchParser.clearCache();
-                return super.onClick(button);
+                return true;
             }
 
             @Override
@@ -608,8 +701,11 @@ public class NEIClientConfig {
 
             @Override
             public boolean onClick(int button) {
+                if (!super.onClick(button)) {
+                    return false;
+                }
                 SearchField.searchParser.clearCache();
-                return super.onClick(button);
+                return true;
             }
 
             @Override
@@ -632,8 +728,11 @@ public class NEIClientConfig {
 
             @Override
             public boolean onClick(int button) {
+                if (!super.onClick(button)) {
+                    return false;
+                }
                 SearchField.searchParser.clearCache();
-                return super.onClick(button);
+                return true;
             }
 
             @Override
@@ -651,6 +750,9 @@ public class NEIClientConfig {
 
         });
 
+        tag.getTag("inventory.search.logSearchExceptions").setComment("Search exceptions for extended+")
+                .getBooleanValue(false);
+
         String prefixRedefinitions = tag.getTag("inventory.search.prefixRedefinitions").setComment(
                 "Redefine search prefixes by providing a char-to-char map (JSON). The keys are the original prefixes, the values the new ones. Example: { \"$\": \"€\", \"#\": \"+\", \"@\": \"°\", \"%\": \"!\" }")
                 .getValue("{}");
@@ -661,12 +763,54 @@ public class NEIClientConfig {
             };
             Map<Character, Character> charMap = new Gson().fromJson(prefixRedefinitions, typeToken.getType());
             SearchField.searchParser.prefixRedefinitions.putAll(charMap);
+            SearchField.searchParser.clearCache();
         } catch (JsonParseException e) {
             logger.warn("Failed to convert prefix redefinitions from JSON to CharToCharMap:", e);
         }
 
     }
 
+    private static void setFavoriteDefaults(ConfigTagParent tag) {
+
+        tag.getTag("inventory.favorites.enabled").getBooleanValue(true);
+        API.addOption(new OptionToggleButton("inventory.favorites.enabled", true));
+
+        tag.getTag("inventory.favorites.worldSpecific").setComment("Global or world specific favorites")
+                .getBooleanValue(false);
+        API.addOption(new OptionToggleButton("inventory.favorites.worldSpecific", true) {
+
+            @Override
+            public boolean onClick(int button) {
+                super.onClick(button);
+                FavoriteRecipes.reload();
+                return true;
+            }
+        });
+
+        tag.getTag("inventory.favorites.showRecipeTooltipInPanel").setComment("Show recipe tooltips in Items Panel")
+                .getBooleanValue(true);
+        API.addOption(new OptionToggleButton("inventory.favorites.showRecipeTooltipInPanel", true));
+
+        tag.getTag("inventory.favorites.showRecipeTooltipInGui").setComment("Show recipe tooltips in Recipe Gui")
+                .getBooleanValue(false);
+        API.addOption(new OptionToggleButton("inventory.favorites.showRecipeTooltipInGui", true));
+
+        tag.getTag("inventory.favorites.generateSingleRecipeFavorites")
+                .setComment("Automatically generate favorites for items with only one recipe").getBooleanValue(false);
+        API.addOption(new OptionToggleButton("inventory.favorites.generateSingleRecipeFavorites", true) {
+
+            @Override
+            public boolean onClick(int button) {
+                super.onClick(button);
+                FavoriteRecipes.loadAutoGeneratedRecipes();
+                return true;
+            }
+        });
+
+        tag.getTag("inventory.favorites.depth").setComment("Bookmark creation depth").getIntValue(9);
+        API.addOption(new OptionIntegerField("inventory.favorites.depth", 0, 100));
+    }
+
     private static void setDefaultKeyBindings() {
         API.addHashBind("gui.recipe", Keyboard.KEY_R);
         API.addHashBind("gui.usage", Keyboard.KEY_U);
@@ -681,22 +825,17 @@ public class NEIClientConfig {
         API.addKeyBind("gui.next_recipe", Keyboard.KEY_RIGHT);
         API.addHashBind("gui.hide", Keyboard.KEY_O);
         API.addHashBind("gui.search", Keyboard.KEY_F);
-        API.addHashBind("gui.bookmark", Keyboard.KEY_A);
-        API.addHashBind("gui.bookmark_recipe", Keyboard.KEY_A + NEIClientUtils.SHIFT_HASH);
+        API.addKeyBind("gui.bookmark", Keyboard.KEY_A);
+        API.addHashBind("gui.favorite", Keyboard.KEY_F + NEIClientUtils.SHIFT_HASH);
+        API.addKeyBind("gui.favorite_item", Keyboard.KEY_F);
         API.addHashBind("gui.remove_recipe", Keyboard.KEY_A + NEIClientUtils.SHIFT_HASH);
-        API.addHashBind("gui.bookmark_count", Keyboard.KEY_A + NEIClientUtils.CTRL_HASH);
-        API.addHashBind(
-                "gui.bookmark_recipe_count",
-                Keyboard.KEY_A + NEIClientUtils.SHIFT_HASH + NEIClientUtils.CTRL_HASH);
-        API.addHashBind("gui.bookmark_pull_items", Keyboard.KEY_V);
-        API.addHashBind("gui.bookmark_pull_items_ingredients", Keyboard.KEY_V + NEIClientUtils.SHIFT_HASH);
-        API.addHashBind("gui.overlay", Keyboard.KEY_S);
-        API.addHashBind("gui.overlay_use", Keyboard.KEY_S + NEIClientUtils.SHIFT_HASH);
-        API.addHashBind("gui.overlay_hide", Keyboard.KEY_S + NEIClientUtils.CTRL_HASH);
+        API.addKeyBind("gui.bookmark_pull_items", Keyboard.KEY_V);
+        API.addKeyBind("gui.overlay", Keyboard.KEY_S);
+        API.addKeyBind("gui.craft_items", Keyboard.KEY_C);
         API.addHashBind("gui.hide_bookmarks", Keyboard.KEY_B);
         API.addKeyBind("gui.getprevioussearch", Keyboard.KEY_UP);
         API.addKeyBind("gui.getnextsearch", Keyboard.KEY_DOWN);
-        API.addHashBind("gui.next_tooltip", Keyboard.KEY_Z);
+        API.addKeyBind("gui.next_tooltip", Keyboard.KEY_Z);
 
         API.addHashBind("gui.itemzoom_toggle", Keyboard.KEY_Z + NEIClientUtils.SHIFT_HASH);
         API.addHashBind("gui.itemzoom_hold", 0);
@@ -715,6 +854,8 @@ public class NEIClientConfig {
         API.addKeyBind("world.creative", 0);
         API.addHashBind("gui.copy_name", Keyboard.KEY_C + NEIClientUtils.CTRL_HASH);
         API.addHashBind("gui.copy_oredict", Keyboard.KEY_D + NEIClientUtils.CTRL_HASH);
+        API.addHashBind("gui.copy_id", Keyboard.KEY_X + NEIClientUtils.CTRL_HASH);
+        API.addHashBind("gui.chat_link_item", Keyboard.KEY_L + NEIClientUtils.CTRL_HASH);
     }
 
     public static OptionList getOptionList() {
@@ -722,24 +863,27 @@ public class NEIClientConfig {
     }
 
     public static void loadWorld(String worldPath) {
+        final File specificDir = new File(CommonUtils.getMinecraftDir(), "saves/NEI/" + worldPath);
+        final boolean newWorld = !specificDir.exists();
         unloadWorld();
         setInternalEnabled(true);
 
-        if (!worldPath.equals(NEIClientConfig.worldPath)) {
+        if (!worldPath.equals(NEIClientConfig.worldPath) || newWorld) {
             NEIClientConfig.worldPath = worldPath;
 
-            logger.debug("Loading " + (Minecraft.getMinecraft().isSingleplayer() ? "Local" : "Remote") + " World");
-
-            final File specificDir = new File(CommonUtils.getMinecraftDir(), "saves/NEI/" + worldPath);
-            final boolean newWorld = !specificDir.exists();
-
             if (newWorld) {
                 specificDir.mkdirs();
             }
 
             world = new ConfigSet(new File(specificDir, "NEI.dat"), new ConfigFile(new File(specificDir, "NEI.cfg")));
-            bootNEI(ClientUtils.getWorld());
-            onWorldLoad(newWorld);
+
+            if (newWorld && Minecraft.getMinecraft().isSingleplayer()) {
+                world.config.getTag("inventory.cheatmode")
+                        .setIntValue(NEIClientUtils.mc().playerController.isInCreativeMode() ? 2 : 0);
+            }
+
+            bootNEI();
+            onWorldLoad();
         }
     }
 
@@ -747,7 +891,7 @@ public class NEIClientConfig {
         return NEIClientConfig.worldPath;
     }
 
-    private static void onWorldLoad(boolean newWorld) {
+    private static void onWorldLoad() {
         world.config.setComment(
                 "World based configuration of NEI.\nMost of these options can be changed ingame.\nDeleting any element will restore it to it's default value");
 
@@ -755,12 +899,6 @@ public class NEIClientConfig {
         creativeInv = new ItemStack[54];
         LayoutManager.searchField.setText(getSearchExpression());
         LayoutManager.quantity.setText(Integer.toString(getItemQuantity()));
-
-        if (newWorld && Minecraft.getMinecraft().isSingleplayer()) {
-            world.config.getTag("inventory.cheatmode")
-                    .setIntValue(NEIClientUtils.mc().playerController.isInCreativeMode() ? 2 : 0);
-        }
-
         NEIInfo.load(ClientUtils.getWorld());
     }
 
@@ -774,22 +912,24 @@ public class NEIClientConfig {
     }
 
     public static void unloadWorld() {
+        if (world == null) {
+            return;
+        }
+
         if (ItemPanels.bookmarkPanel != null) {
-            ItemPanels.bookmarkPanel.saveBookmarks();
+            ItemPanels.bookmarkPanel.save();
         }
 
         SubsetWidget.saveHidden();
+        FavoriteRecipes.save();
         CollapsibleItems.saveStates();
-
-        if (world != null) {
-            world.saveNBT();
-        }
+        world.saveNBT();
     }
 
     private static final Map<String, String> keySettings = new HashMap<>();
 
     public static int getKeyBinding(String string) {
-        final String key = keySettings.computeIfAbsent(string, (s) -> "keys." + s);
+        final String key = keySettings.computeIfAbsent(string, s -> "keys." + s);
         return getSetting(key).getIntValue(Keyboard.KEY_NONE);
     }
 
@@ -799,37 +939,62 @@ public class NEIClientConfig {
 
     public static boolean isKeyHashDown(String string) {
         final int hash = getKeyBinding(string);
-        return hash != Keyboard.CHAR_NONE && hash == NEIClientUtils.getKeyHash();
+
+        if (hash != Keyboard.CHAR_NONE && Keyboard.getEventKeyState()) {
+            return KeyManager.keyStates.containsKey(string) ? Keyboard.isKeyDown(NEIKeyboardUtils.unhash(hash))
+                    : hash == NEIClientUtils.getKeyHash();
+        }
+
+        return false;
     }
 
     public static String getKeyName(String keyBind) {
+        return getKeyName(keyBind, 0);
+    }
+
+    public static String getKeyName(String keyBind, int meta, int mouseBind) {
         final int hash = getKeyBinding(keyBind);
 
         if (hash == Keyboard.CHAR_NONE) {
             return null;
         }
 
-        return NEIClientUtils.getKeyName(hash);
+        return NEIClientUtils.getKeyName(hash + meta, mouseBind);
     }
 
-    public static void bootNEI(World world) {
+    public static String getKeyName(String keyBind, int meta) {
+        final int hash = getKeyBinding(keyBind);
+
+        if (hash == Keyboard.CHAR_NONE) {
+            return null;
+        }
+
+        return NEIKeyboardUtils.getKeyName(hash + meta);
+    }
+
+    public static void bootNEI() {
+
         if (!mainNEIConfigLoaded) {
             // main NEI config loading
-            ItemInfo.load(world);
+            ItemInfo.load();
             GuiInfo.load();
             RecipeInfo.load();
             HeldItemHandler.load();
             LayoutManager.load();
             NEIController.load();
             BookmarkContainerInfo.load();
+            InformationHandler.load();
             mainNEIConfigLoaded = true;
 
             new Thread("NEI Plugin Loader") {
 
                 @Override
                 public void run() {
+                    final Stream<Class<?>> stream = NEIClientConfig.getBooleanSetting("loadPluginsInParallel")
+                            ? NEIClientConfig.pluginsList.parallelStream()
+                            : NEIClientConfig.pluginsList.stream();
 
-                    NEIClientConfig.pluginsList.parallelStream().forEach(clazz -> {
+                    stream.forEach(clazz -> {
                         try {
                             IConfigureNEI config = (IConfigureNEI) clazz.getConstructor().newInstance();
                             config.loadConfig();
@@ -841,7 +1006,7 @@ public class NEIClientConfig {
                     });
 
                     RecipeCatalysts.loadCatalystInfo();
-                    ItemPanels.bookmarkPanel.load();
+                    SubsetWidget.loadCustomSubsets();
                     SubsetWidget.loadHidden();
                     CollapsibleItems.load();
                     ItemSorter.loadConfig();
@@ -854,14 +1019,15 @@ public class NEIClientConfig {
                     pluginNEIConfigLoaded = true;
                     MinecraftForge.EVENT_BUS.post(new NEIConfigsLoadedEvent());
 
+                    DebugHandlerWidget.loadHandlerInfoPatch();
                     ItemList.loadItems.restart();
                 }
             }.start();
         } else {
-            ItemPanels.bookmarkPanel.load();
             SubsetWidget.loadHidden();
             ItemList.loadItems.restart();
         }
+
     }
 
     public static boolean isWorldSpecific(String setting) {
@@ -882,6 +1048,14 @@ public class NEIClientConfig {
         return !enabledOverride || getBooleanSetting("inventory.hidden");
     }
 
+    public static boolean autocraftingEnabled() {
+        return getBooleanSetting("inventory.autocrafting");
+    }
+
+    public static boolean favoritesEnabled() {
+        return getBooleanSetting("inventory.favorites.enabled");
+    }
+
     public static boolean isBookmarkPanelHidden() {
         return !getBooleanSetting("inventory.bookmarks.enabled");
     }
@@ -894,8 +1068,16 @@ public class NEIClientConfig {
         return getIntSetting("inventory.bookmarks.recipeTooltipsMode");
     }
 
-    public static boolean showRecipeMarker() {
-        return getBooleanSetting("inventory.bookmarks.showRecipeMarker");
+    public static boolean showRecipeTooltipInPanel() {
+        return getBooleanSetting("inventory.favorites.showRecipeTooltipInPanel");
+    }
+
+    public static boolean showRecipeTooltipInGui() {
+        return getBooleanSetting("inventory.favorites.showRecipeTooltipInGui");
+    }
+
+    public static int showRecipeMarkerMode() {
+        return getIntSetting("inventory.bookmarks.showRecipeMarkerMode");
     }
 
     public static boolean showItemQuantityWidget() {
@@ -934,8 +1116,8 @@ public class NEIClientConfig {
         return getBooleanSetting("inventory.guirecipe.slotHighlightPresent");
     }
 
-    public static boolean areJEIStyleRecipeCatalystsVisible() {
-        return getBooleanSetting("inventory.guirecipe.jeiStyleRecipeCatalyst");
+    public static int getJEIStyleRecipeCatalysts() {
+        return getIntSetting("inventory.guirecipe.jeiStyleRecipeCatalyst");
     }
 
     public static boolean useCreativeTabStyle() {
@@ -946,18 +1128,14 @@ public class NEIClientConfig {
         return getBooleanSetting("inventory.bookmarks.ignorePotionOverlap");
     }
 
-    public static int craftingChainDir() {
-        return getIntSetting("inventory.bookmarks.craftingChainDir");
+    public static int recipeChainDir() {
+        return getIntSetting("inventory.bookmarks.recipeChainDir");
     }
 
     public static boolean optimizeGuiOverlapComputation() {
         return getBooleanSetting("inventory.optimize_gui_overlap_computation");
     }
 
-    public static boolean useJEIStyledCycledIngredients() {
-        return getBooleanSetting("inventory.guirecipe.jeiStyleCycledIngredients");
-    }
-
     public static boolean showCycledIngredientsTooltip() {
         return getBooleanSetting("inventory.guirecipe.cycledIngredientsTooltip");
     }
@@ -1066,6 +1244,10 @@ public class NEIClientConfig {
         return getBooleanSetting("inventory.history.enabled");
     }
 
+    public static boolean showCraftablesPanelWidget() {
+        return getBooleanSetting("inventory.craftables.enabled");
+    }
+
     public static int getGridRenderingCacheMode() {
         return OpenGlHelper.framebufferSupported ? getIntSetting("inventory.gridRenderingCacheMode") : 0;
     }
@@ -1074,6 +1256,10 @@ public class NEIClientConfig {
         return getBooleanSetting("inventory.collapsibleItems.enabled");
     }
 
+    public static boolean enableItemUntranslator() {
+        return getBooleanSetting("inventory.itemUntranslator");
+    }
+
     public static boolean getMagnetMode() {
         return enabledActions.contains("magnet");
     }

src/main/java/codechicken/nei/NEIClientUtils.java

@@ -8,9 +8,9 @@ import static codechicken.nei.NEIClientConfig.hasSMPCounterPart;
 import static codechicken.nei.NEIClientConfig.invCreativeMode;
 import static codechicken.nei.NEIClientConfig.world;
 
+import java.awt.Color;
 import java.io.PrintWriter;
 import java.io.StringWriter;
-import java.math.BigInteger;
 import java.math.RoundingMode;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
@@ -32,6 +32,8 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.client.audio.PositionedSoundRecord;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
@@ -41,41 +43,62 @@ import net.minecraft.util.IChatComponent;
 import net.minecraft.util.ResourceLocation;
 
 import org.lwjgl.input.Keyboard;
+import org.lwjgl.opengl.GL11;
 
 import com.google.common.collect.Iterables;
+import com.gtnewhorizon.gtnhlib.util.numberformatting.NumberFormatUtil;
 
+import codechicken.lib.gui.GuiDraw;
 import codechicken.lib.inventory.InventoryRange;
 import codechicken.lib.inventory.InventoryUtils;
 import codechicken.lib.util.LangProxy;
+import codechicken.lib.vec.Rectangle4i;
 import codechicken.nei.api.GuiInfo;
 import codechicken.nei.api.IInfiniteItemHandler;
 import codechicken.nei.api.ItemInfo;
+import codechicken.nei.util.NEIKeyboardUtils;
+import codechicken.nei.util.NEIMouseUtils;
 
 public class NEIClientUtils extends NEIServerUtils {
 
+    public static class Alignment {
+
+        public final int x, y;
+
+        public static final Alignment TopLeft = new Alignment(-1, -1);
+        public static final Alignment TopCenter = new Alignment(0, -1);
+        public static final Alignment TopRight = new Alignment(1, -1);
+        public static final Alignment CenterLeft = new Alignment(-1, 0);
+        public static final Alignment Center = new Alignment(0, 0);
+        public static final Alignment CenterRight = new Alignment(1, 0);
+        public static final Alignment BottomLeft = new Alignment(-1, 1);
+        public static final Alignment BottomCenter = new Alignment(0, 1);
+        public static final Alignment BottomRight = new Alignment(1, 1);
+
+        public Alignment(int x, int y) {
+            this.x = x;
+            this.y = y;
+        }
+
+        public float getX(float parentWidth, float childWidth) {
+            final float x = (this.x + 1) / 2f;
+            return parentWidth * x - childWidth * x;
+        }
+
+        public float getY(float parentHeight, float childHeight) {
+            final float y = (this.y + 1) / 2f;
+            return parentHeight * y - childHeight * y;
+        }
+    }
+
     public static LangProxy lang = new LangProxy("nei");
 
     /** Formats a number with group separator and at most 2 fraction digits. */
     private static final Map<Locale, DecimalFormat> decimalFormatters = new HashMap<>();
-    private static final Map<Integer, Integer> keyHashMap = new HashMap<>();
 
-    public static final int ALT_HASH = 1 << 27;
-    public static final int SHIFT_HASH = 1 << 26;
-    public static final int CTRL_HASH = 1 << 25;
-
-    static {
-        keyHashMap.put(Keyboard.KEY_LSHIFT, SHIFT_HASH);
-        keyHashMap.put(Keyboard.KEY_RSHIFT, SHIFT_HASH);
-
-        keyHashMap.put(Keyboard.KEY_LCONTROL, CTRL_HASH);
-        keyHashMap.put(Keyboard.KEY_LCONTROL, CTRL_HASH);
-
-        keyHashMap.put(Keyboard.KEY_LMETA, CTRL_HASH);
-        keyHashMap.put(Keyboard.KEY_RMETA, CTRL_HASH);
-
-        keyHashMap.put(Keyboard.KEY_LMENU, ALT_HASH);
-        keyHashMap.put(Keyboard.KEY_LMENU, ALT_HASH);
-    }
+    public static final int ALT_HASH = NEIKeyboardUtils.ALT_HASH;
+    public static final int SHIFT_HASH = NEIKeyboardUtils.SHIFT_HASH;
+    public static final int CTRL_HASH = NEIKeyboardUtils.CTRL_HASH;
 
     public static Minecraft mc() {
         return Minecraft.getMinecraft();
@@ -103,16 +126,22 @@ public class NEIClientUtils extends NEIServerUtils {
         });
     }
 
-    public static String formatNumbers(BigInteger aNumber) {
+    public static String formatNumber(long aNumber) {
+
+        if (NEIModContainer.isGTNHLibLoaded()) {
+            return NumberFormatUtil.formatNumber(aNumber);
+        }
+
         return getDecimalFormat().format(aNumber);
     }
 
-    public static String formatNumbers(long aNumber) {
-        return getDecimalFormat().format(aNumber);
-    }
+    public static String formatFluid(long aNumber) {
 
-    public static String formatNumbers(double aNumber) {
-        return getDecimalFormat().format(aNumber);
+        if (NEIModContainer.isGTNHLibLoaded()) {
+            return NumberFormatUtil.formatFluid(aNumber);
+        }
+
+        return getDecimalFormat().format(aNumber) + " L";
     }
 
     public static void deleteHeldItem() {
@@ -175,7 +204,7 @@ public class NEIClientUtils extends NEIServerUtils {
     public static void cheatItem(ItemStack stack, int button, int mode) {
         if (!canCheatItem(stack)) return;
 
-        if (mode == -1 && button == 0 && shiftKey() && NEIClientConfig.hasSMPCounterPart()) {
+        if (mode == -1 && button == 0 && controlKey() && NEIClientConfig.hasSMPCounterPart()) {
             for (IInfiniteItemHandler handler : ItemInfo.infiniteHandlers) {
                 if (!handler.canHandleItem(stack)) continue;
 
@@ -347,6 +376,10 @@ public class NEIClientUtils extends NEIServerUtils {
         else sendCommand(getStringSetting("command.heal"), mc().thePlayer.getCommandSenderName());
     }
 
+    public static void sendChatItemLink(ItemStack stackover) {
+        if (hasSMPCounterPart()) NEICPH.sendChatLink(stackover);
+    }
+
     public static void toggleMagnetMode() {
         if (hasSMPCounterPart()) NEICPH.sendToggleMagnetMode();
     }
@@ -386,18 +419,11 @@ public class NEIClientUtils extends NEIServerUtils {
         if (textWidth > containerWidth) {
             int dots = fontRenderer.getStringWidth("...");
 
-            if (containerWidth > dots) {
-                textWidth += dots;
-
-                while (textWidth > containerWidth) {
-                    textWidth -= fontRenderer.getCharWidth(text.charAt(text.length() - 1));
-                    text = text.substring(0, text.length() - 1);
-                }
-
-                return text + "...";
+            if (containerWidth <= dots) {
+                return "...";
             }
 
-            return "...";
+            return fontRenderer.trimStringToWidth(text, containerWidth - dots) + "...";
         }
 
         return text;
@@ -452,7 +478,7 @@ public class NEIClientUtils extends NEIServerUtils {
         if (Keyboard.getEventKeyState()) {
             final int keycode = Keyboard.getEventKey();
 
-            if (!keyHashMap.containsKey(keycode)) {
+            if (!NEIKeyboardUtils.isHashKey(keycode)) {
                 return getMetaHash() + keycode;
             }
         }
@@ -460,45 +486,22 @@ public class NEIClientUtils extends NEIServerUtils {
         return Keyboard.CHAR_NONE;
     }
 
-    public static String getKeyHashName(int keyBind) {
+    public static String getKeyName(int keyBind, int mouseBind) {
         StringJoiner keyText = new StringJoiner(" + ");
+        String keyHash = keyBind == Keyboard.KEY_NONE ? "" : NEIKeyboardUtils.getKeyName(keyBind);
+        String mouseHash = mouseBind == NEIMouseUtils.MOUSE_BTN_NONE ? "" : NEIMouseUtils.getKeyName(mouseBind);
 
-        if ((keyBind & CTRL_HASH) != 0) {
-            keyText.add(translate(Minecraft.isRunningOnMac ? "key.ctrl.mac" : "key.ctrl"));
+        if (!keyHash.isEmpty()) {
+            keyText.add(keyHash);
         }
 
-        if ((keyBind & SHIFT_HASH) != 0) {
-            keyText.add(translate("key.shift"));
-        }
-
-        if ((keyBind & ALT_HASH) != 0) {
-            keyText.add(translate("key.alt"));
+        if (!mouseHash.isEmpty()) {
+            keyText.add(mouseHash);
         }
 
         return keyText.toString();
     }
 
-    public static String getKeyName(int keyBind) {
-        keyBind = keyHashMap.getOrDefault(keyBind, keyBind);
-        StringJoiner keyText = new StringJoiner(" + ");
-        String hashText = getKeyHashName(keyBind);
-        int keyID = unHashKey(keyBind);
-
-        if (!hashText.isEmpty()) {
-            keyText.add(hashText);
-        }
-
-        if (keyID != Keyboard.CHAR_NONE || hashText.isEmpty()) {
-            keyText.add(Keyboard.getKeyName(keyID));
-        }
-
-        return keyText.toString();
-    }
-
-    public static int unHashKey(int keyBind) {
-        return keyBind & ~(CTRL_HASH | SHIFT_HASH | ALT_HASH);
-    }
-
     public static void playClickSound() {
         mc().getSoundHandler()
                 .playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1.0F));
@@ -522,4 +525,69 @@ public class NEIClientUtils extends NEIServerUtils {
             reportErrorBuffered(e, buffer, "null");
         }
     }
+
+    public static void drawRect(double left, double top, double width, double height, Color color) {
+        final boolean is2DTexture = GL11.glGetBoolean(GL11.GL_TEXTURE_2D);
+        final boolean isBlend = GL11.glGetBoolean(GL11.GL_BLEND);
+        final Tessellator tessellator = Tessellator.instance;
+
+        GL11.glEnable(GL11.GL_BLEND);
+        GL11.glDisable(GL11.GL_TEXTURE_2D);
+        OpenGlHelper.glBlendFunc(770, 771, 1, 0);
+        GL11.glColor4f(color.getRed() / 255f, color.getGreen() / 255f, color.getBlue() / 255f, color.getAlpha() / 255f);
+        tessellator.startDrawingQuads();
+        tessellator.addVertex(left, top + height, 0.0D);
+        tessellator.addVertex(left + width, top + height, 0.0D);
+        tessellator.addVertex(left + width, top, 0.0D);
+        tessellator.addVertex(left, top, 0.0D);
+        tessellator.draw();
+        GL11.glColor4f(1, 1, 1, 1);
+        if (is2DTexture) GL11.glEnable(GL11.GL_TEXTURE_2D);
+        if (!isBlend) GL11.glDisable(GL11.GL_BLEND);
+    }
+
+    public static void drawNEIOverlayText(String text, Rectangle4i rect, float scale, int color, boolean shadow,
+            Alignment alignment) {
+        final float screenScale = mc().currentScreen.width * 1f / mc().displayWidth;
+        final double smallTextScale = Math
+                .max(screenScale, (Math.max(scale, 1f) * (GuiDraw.fontRenderer.getUnicodeFlag() ? 3F / 4F : 1F / 2F)));
+
+        NEIClientUtils.gl2DRenderContext(() -> {
+            final int width = GuiDraw.fontRenderer.getStringWidth(text);
+            final float partW = rect.w / 2f;
+            final float partH = rect.h / 2f;
+            final double offsetX = Math
+                    .ceil(rect.x + partW + partW * alignment.x - (width / 2f * (alignment.x + 1)) * smallTextScale);
+            final double offsetY = Math.ceil(
+                    rect.y + partH
+                            + partH * alignment.y
+                            - (GuiDraw.fontRenderer.FONT_HEIGHT / 2f * (alignment.y + 1)) * smallTextScale);
+
+            GL11.glTranslated(offsetX, offsetY, 0);
+            GL11.glScaled(smallTextScale, smallTextScale, 1);
+            GuiDraw.fontRenderer.drawString(text, 0, 0, color, shadow);
+            GL11.glScaled(1 / smallTextScale, 1 / smallTextScale, 1);
+            GL11.glTranslated(-1 * offsetX, -1 * offsetY, 0);
+        });
+    }
+
+    public static void drawNEIOverlayText(String text, int x, int y) {
+        drawNEIOverlayText(text, new Rectangle4i(x, y, 16, 16), 0.5f, 0xFDD835, false, Alignment.TopLeft);
+    }
+
+    public static void gl2DRenderContext(Runnable callback) {
+        boolean isLighting = GL11.glGetBoolean(GL11.GL_LIGHTING);
+        boolean isDepthTest = GL11.glGetBoolean(GL11.GL_DEPTH_TEST);
+        boolean isAlphaTest = GL11.glGetBoolean(GL11.GL_ALPHA_TEST);
+        GL11.glDisable(GL11.GL_LIGHTING);
+        GL11.glEnable(GL11.GL_ALPHA_TEST);
+        GL11.glDisable(GL11.GL_DEPTH_TEST);
+
+        callback.run();
+
+        if (isLighting) GL11.glEnable(GL11.GL_LIGHTING);
+        if (isDepthTest) GL11.glEnable(GL11.GL_DEPTH_TEST);
+        if (!isAlphaTest) GL11.glDisable(GL11.GL_ALPHA_TEST);
+    }
+
 }

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

@@ -11,16 +11,24 @@ import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Slot;
 import net.minecraft.inventory.SlotCrafting;
 import net.minecraft.item.ItemStack;
+import net.minecraftforge.client.ClientCommandHandler;
 
+import codechicken.core.CommonUtils;
+import codechicken.lib.gui.GuiDraw;
 import codechicken.nei.api.API;
 import codechicken.nei.api.GuiInfo;
 import codechicken.nei.api.IInfiniteItemHandler;
 import codechicken.nei.api.INEIGuiHandler;
 import codechicken.nei.api.ItemInfo;
+import codechicken.nei.commands.CommandBookmarkAdd;
+import codechicken.nei.commands.CommandRecipeId;
+import codechicken.nei.commands.CommandUntranslator;
 import codechicken.nei.guihook.GuiContainerManager;
 import codechicken.nei.guihook.IContainerInputHandler;
 import codechicken.nei.guihook.IContainerSlotClickHandler;
 import codechicken.nei.recipe.GuiRecipe;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 
 public class NEIController implements IContainerSlotClickHandler, IContainerInputHandler {
 
@@ -39,6 +47,8 @@ public class NEIController implements IContainerSlotClickHandler, IContainerInpu
     public static void load() {
         GuiContainerManager.addSlotClickHandler(instance);
         GuiContainerManager.addInputHandler(instance);
+
+        if (CommonUtils.isClient()) registerClientCommands();
     }
 
     public static void load(GuiContainer gui) {
@@ -56,6 +66,13 @@ public class NEIController implements IContainerSlotClickHandler, IContainerInpu
         return gui.field_147007_t && gui.field_147008_s.size() > 1;
     }
 
+    @SideOnly(Side.CLIENT)
+    public static void registerClientCommands() {
+        ClientCommandHandler.instance.registerCommand(new CommandBookmarkAdd());
+        ClientCommandHandler.instance.registerCommand(new CommandRecipeId());
+        ClientCommandHandler.instance.registerCommand(new CommandUntranslator());
+    }
+
     public static void updateUnlimitedItems(InventoryPlayer inventory) {
         if (!NEIClientConfig.canPerformAction("item") || !NEIClientConfig.hasSMPCounterPart()) return;
 
@@ -122,7 +139,7 @@ public class NEIController implements IContainerSlotClickHandler, IContainerInpu
             return true;
         }
 
-        if (button == 1 && slot instanceof SlotCrafting) // right click
+        if (button == 1 && modifier != 2 && slot instanceof SlotCrafting) // right click
         {
             for (int i1 = 0; i1 < 64; i1++) // click this slot 64 times
                 manager.handleSlotClick(slot.slotNumber, button, 0);
@@ -140,20 +157,32 @@ public class NEIController implements IContainerSlotClickHandler, IContainerInpu
 
         if (GuiInfo.hasCustomSlots(gui)) return false;
 
-        if (slotIndex >= 0 && NEIClientUtils.shiftKey()
-                && NEIClientUtils.getHeldItem() != null
-                && !slot.getHasStack()) {
-            ItemStack held = NEIClientUtils.getHeldItem();
-            manager.handleSlotClick(slot.slotNumber, button, 0);
-            if (slot.isItemValid(held) && !ItemInfo.fastTransferExemptions.contains(slot.getClass()))
-                fastTransferManager.performMassTransfer(gui, pickedUpFromSlot, slotIndex, held);
+        if (NEIClientUtils.shiftKey()) {
+            // fix small mouse movement while clicking causing slotIndex to be -999
+            if (slotIndex == -999) {
+                final Point mouse = GuiDraw.getMousePosition();
+                slot = gui.getSlotAtPosition(mouse.x, mouse.y);
 
-            return true;
-        }
+                if (slot != null) {
+                    slotIndex = slot.slotNumber;
+                }
+            }
 
-        if (slotIndex == -999 && NEIClientUtils.shiftKey() && button == 0) {
-            fastTransferManager.throwAll(gui, pickedUpFromSlot);
-            return true;
+            if (slotIndex >= 0 && NEIClientUtils.getHeldItem() != null && !slot.getHasStack()) {
+                final ItemStack held = NEIClientUtils.getHeldItem();
+                manager.handleSlotClick(slot.slotNumber, button, 0);
+
+                if (slot.isItemValid(held) && !ItemInfo.fastTransferExemptions.contains(slot.getClass())) {
+                    fastTransferManager.performMassTransfer(gui, pickedUpFromSlot, slotIndex, held);
+                }
+
+                return true;
+            }
+
+            if (slotIndex == -999 && button == 0) {
+                fastTransferManager.throwAll(gui, pickedUpFromSlot);
+                return true;
+            }
         }
 
         return false;

src/main/java/codechicken/nei/NEIModContainer.java

@@ -7,8 +7,7 @@ import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
-
-import net.minecraft.util.EnumChatFormatting;
+import java.util.concurrent.CopyOnWriteArrayList;
 
 import com.google.common.eventbus.EventBus;
 import com.google.common.eventbus.Subscribe;
@@ -18,6 +17,7 @@ import codechicken.core.launch.CodeChickenCorePlugin;
 import codechicken.nei.api.IConfigureNEI;
 import codechicken.nei.asm.NEICorePlugin;
 import codechicken.nei.config.IMCHandler;
+import codechicken.nei.guihook.HideousLinkedList;
 import codechicken.nei.recipe.GuiRecipeTab;
 import cpw.mods.fml.client.FMLFileResourcePack;
 import cpw.mods.fml.client.FMLFolderResourcePack;
@@ -25,25 +25,29 @@ import cpw.mods.fml.common.DummyModContainer;
 import cpw.mods.fml.common.LoadController;
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.ModMetadata;
+import cpw.mods.fml.common.discovery.ASMDataTable;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLInterModComms;
 import cpw.mods.fml.common.event.FMLLoadCompleteEvent;
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+import cpw.mods.fml.common.event.FMLServerAboutToStartEvent;
 import cpw.mods.fml.common.versioning.ArtifactVersion;
 import cpw.mods.fml.common.versioning.VersionParser;
 import cpw.mods.fml.common.versioning.VersionRange;
 
+@SuppressWarnings("UnstableApiUsage")
 public class NEIModContainer extends DummyModContainer {
 
-    public static LinkedList<IConfigureNEI> plugins = new LinkedList<>();
+    public static final LinkedList<IConfigureNEI> plugins = new HideousLinkedList<>(new CopyOnWriteArrayList<>());
 
     private static boolean gregTech5Loaded;
     private static boolean gtnhLibLoaded;
 
+    private static ASMDataTable asmDataTable;
+
     public NEIModContainer() {
         super(getModMetadata());
-        loadMetadata();
     }
 
     private static ModMetadata getModMetadata() {
@@ -51,7 +55,7 @@ public class NEIModContainer extends DummyModContainer {
         modMetadata.name = "NotEnoughItems";
         modMetadata.modId = "NotEnoughItems";
         modMetadata.version = Tags.VERSION;
-        modMetadata.authorList = Arrays.asList("ChickenBones", "mitchej123");
+        modMetadata.authorList = Arrays.asList("ChickenBones", "mitchej123", "SLPrime");
         modMetadata.url = "https://github.com/GTNewHorizons/NotEnoughItems";
         modMetadata.description = "Recipe Viewer, Inventory Manager, Item Spawner, Cheats and more; GTNH Version includes many enhancements.";
         return modMetadata;
@@ -76,36 +80,12 @@ public class NEIModContainer extends DummyModContainer {
     public List<ArtifactVersion> getDependencies() {
         List<ArtifactVersion> deps = new ArrayList<>();
         deps.add(VersionParser.parseVersionReference("CodeChickenCore@[" + codechicken.core.asm.Tags.VERSION + ",)"));
-        deps.add(VersionParser.parseVersionReference("gtnhlib@[0.6.0,)"));
+        deps.add(VersionParser.parseVersionReference("gtnhlib@[0.9.6,)"));
         return deps;
     }
 
     private String description;
 
-    private void loadMetadata() {
-        description = super.getMetadata().description.replace("Supporters:", EnumChatFormatting.AQUA + "Supporters:");
-    }
-
-    @Override
-    public ModMetadata getMetadata() {
-        StringBuilder s_plugins = new StringBuilder();
-        if (plugins.size() == 0) {
-            s_plugins.append(EnumChatFormatting.RED).append("No installed plugins.");
-        } else {
-            s_plugins.append(EnumChatFormatting.GREEN).append("Installed plugins: ");
-            for (int i = 0; i < plugins.size(); i++) {
-                if (i > 0) s_plugins.append(", ");
-                IConfigureNEI plugin = plugins.get(i);
-                s_plugins.append(plugin.getName()).append(" ").append(plugin.getVersion());
-            }
-            s_plugins.append(".");
-        }
-
-        ModMetadata meta = super.getMetadata();
-        meta.description = description.replace("<plugins>", s_plugins.toString());
-        return meta;
-    }
-
     @Override
     public boolean registerBus(EventBus bus, LoadController controller) {
         bus.register(this);
@@ -117,12 +97,14 @@ public class NEIModContainer extends DummyModContainer {
         gregTech5Loaded = Loader.isModLoaded("gregtech") && !Loader.isModLoaded("gregapi_post");
         gtnhLibLoaded = Loader.isModLoaded("gtnhlib");
         if (CommonUtils.isClient()) ClientHandler.preInit();
+        asmDataTable = event.getAsmData();
     }
 
     @Subscribe
     public void init(FMLInitializationEvent event) {
-        if (CommonUtils.isClient()) ClientHandler.load();
-
+        if (CommonUtils.isClient()) {
+            ClientHandler.load();
+        }
         ServerHandler.load();
     }
 
@@ -139,9 +121,15 @@ public class NEIModContainer extends DummyModContainer {
             GuiRecipeTab.loadHandlerInfo();
             ClientHandler.loadPluginsList();
             ClientHandler.loadHandlerOrdering();
+            asmDataTable = null;
         }
     }
 
+    @Subscribe
+    public void onServerAboutToStart(FMLServerAboutToStartEvent event) {
+        NEIServerConfig.resetFirstLoad();
+    }
+
     @Subscribe
     public void handleIMCMessages(FMLInterModComms.IMCEvent event) {
         IMCHandler.processIMC(event.getMessages());
@@ -161,4 +149,8 @@ public class NEIModContainer extends DummyModContainer {
     public Class<?> getCustomResourcePackClass() {
         return getSource().isDirectory() ? FMLFolderResourcePack.class : FMLFileResourcePack.class;
     }
+
+    public static ASMDataTable getAsmDataTable() {
+        return asmDataTable;
+    }
 }

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

@@ -88,9 +88,16 @@ public class NEISPH implements IServerPacketHandler {
             case C2S.SET_DUMMY_SLOT:
                 handleDummySlotSet(sender, packet);
                 break;
+            case C2S.SEND_CHAT_ITEM_LINK:
+                handleSendChatItemLink(sender, packet);
+                break;
         }
     }
 
+    private void handleSendChatItemLink(EntityPlayerMP sender, PacketCustom packet) {
+        NEIServerUtils.sendChatItemLink(sender, packet.readItemStack());
+    }
+
     private void handleDummySlotSet(EntityPlayerMP sender, PacketCustom packet) {
         int slotNumber = packet.readShort();
         ItemStack stack = packet.readItemStack(true);

src/main/java/codechicken/nei/NEIServerConfig.java

@@ -18,9 +18,10 @@ import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.JsonToNBT;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.World;
 import net.minecraftforge.common.DimensionManager;
+import net.minecraftforge.permission.PermissionLevel;
+import net.minecraftforge.permission.PermissionManager;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
@@ -35,24 +36,38 @@ import codechicken.lib.packet.PacketCustom;
 
 public class NEIServerConfig {
 
-    private static MinecraftServer server;
-
+    private static boolean firstLoad;
     public static Logger logger = LogManager.getLogger("NotEnoughItems");
     public static File saveDir;
     public static ConfigFile serverConfig;
     public static Map<Integer, NBTTagCompound> dimTags = new HashMap<>();
     public static HashMap<String, PlayerSave> playerSaves = new HashMap<>();
     public static ItemStackMap<Set<String>> bannedItems = new ItemStackMap<>();
+    private static boolean doesPermAPIExist = false;
+
+    public static void resetFirstLoad() {
+        firstLoad = true;
+    }
 
     public static void load(World world) {
-        if (MinecraftServer.getServer() != server) {
+        if (firstLoad) {
+            firstLoad = false;
             logger.debug("Loading NEI Server");
-            server = MinecraftServer.getServer();
             saveDir = new File(DimensionManager.getCurrentSaveRootDirectory(), "NEI");
 
             dimTags.clear();
             loadConfig();
             loadBannedItems();
+
+            try {
+                Class.forName("net.minecraftforge.permission.PermissionManager");
+                doesPermAPIExist = true;
+
+                NEIActions.baseActions().forEach(
+                        action -> {
+                            PermissionManager.registerPermission("nei.permissions." + action, PermissionLevel.OP);
+                        });
+            } catch (ClassNotFoundException ignored) {}
         }
         loadWorld(world);
     }
@@ -121,7 +136,12 @@ public class NEIServerConfig {
     }
 
     public static boolean canPlayerPerformAction(String playername, String name) {
-        return isPlayerInList(playername, getPlayerList("permissions." + NEIActions.base(name)), true);
+        String node = "permissions." + NEIActions.base(name);
+        boolean hasPerm = doesPermAPIExist
+                ? PermissionManager.checkPermission(ServerUtils.getPlayer(playername), "nei." + node)
+                : false;
+
+        return hasPerm || isPlayerInList(playername, getPlayerList(node), true);
     }
 
     public static boolean isPlayerInList(String playername, Set<String> list, boolean allowCards) {

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

@@ -17,6 +17,7 @@ import net.minecraft.enchantment.Enchantment;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.event.ClickEvent;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -46,9 +47,25 @@ import codechicken.nei.PacketIDs.S2C;
 import codechicken.nei.util.NBTHelper;
 import cpw.mods.fml.common.FMLLog;
 import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.ReflectionHelper;
 
 public class NEIServerUtils {
 
+    private static class GTMetaBaseItemHolder {
+
+        private static final Class<?> gtMetaBaseItem = loadMetaBaseItem();
+
+        private static Class<?> loadMetaBaseItem() {
+            try {
+                final ClassLoader loader = NEIServerUtils.class.getClassLoader();
+                return ReflectionHelper
+                        .getClass(loader, "gregtech.api.items.MetaBaseItem", "gregtech.api.items.GT_MetaBase_Item");
+            } catch (Exception ignored) {
+                return null;
+            }
+        }
+    }
+
     public static boolean isRaining(World world) {
         return world.getWorldInfo().isRaining();
     }
@@ -69,6 +86,18 @@ public class NEIServerUtils {
         player.extinguish();
     }
 
+    public static void sendChatItemLink(EntityPlayerMP sender, ItemStack stackover) {
+        ServerUtils.sendChatToAll(
+                new ChatComponentTranslation(
+                        "nei.chat.item_link.text",
+                        sender.getDisplayName(),
+                        stackover.func_151000_E().setChatStyle(
+                                stackover.func_151000_E().getChatStyle().setChatClickEvent(
+                                        new ClickEvent(
+                                                ClickEvent.Action.RUN_COMMAND,
+                                                "/nei_bookmark " + stackover.writeToNBT(new NBTTagCompound()))))));
+    }
+
     public static long getTime(World world) {
         return world.getWorldInfo().getWorldTime();
     }
@@ -146,7 +175,7 @@ public class NEIServerUtils {
 
     /**
      * NBT-friendly version of {@link #areStacksSameType(ItemStack, ItemStack)}
-     * 
+     *
      * @param stack1 The {@link ItemStack} being compared.
      * @param stack2 The {@link ItemStack} to compare to.
      * @return whether the two items are the same in terms of itemID, damage and NBT.
@@ -177,19 +206,36 @@ public class NEIServerUtils {
 
     /**
      * NBT-friendly version of {@link #areStacksSameTypeCrafting(ItemStack, ItemStack)}
-     * 
+     *
      * @param stack1 The {@link ItemStack} being compared.
      * @param stack2 The {@link ItemStack} to compare to.
      * @return whether the two items are the same from the perspective of a crafting inventory.
      */
     public static boolean areStacksSameTypeCraftingWithNBT(ItemStack stack1, ItemStack stack2) {
-        return stack1 != null && stack2 != null
-                && stack1.getItem() == stack2.getItem()
-                && (stack1.getItemDamage() == stack2.getItemDamage()
-                        || stack1.getItemDamage() == OreDictionary.WILDCARD_VALUE
-                        || stack2.getItemDamage() == OreDictionary.WILDCARD_VALUE
-                        || stack1.getItem().isDamageable())
-                && NBTHelper.matchTag(stack1.getTagCompound(), stack2.getTagCompound());
+
+        if (NEIServerUtils.areStacksSameTypeCrafting(stack2, stack1)) {
+            if (NBTHelper.matchTag(stack1.getTagCompound(), stack2.getTagCompound())) return true;
+            if (isItemTool(stack1)
+                    && (stack1.stackTagCompound == null || stack1.stackTagCompound.hasKey("GT.ToolStats"))
+                    && (stack2.stackTagCompound == null || stack2.stackTagCompound.hasKey("GT.ToolStats")))
+                return true;
+            return stack1.getMaxStackSize() == 1 && stack2.getMaxStackSize() == 1
+                    && (stack1.stackTagCompound == null ^ stack2.stackTagCompound == null);
+        }
+
+        return false;
+    }
+
+    /**
+     * GT Items don't have any NBT set for the recipe, so if either of the stacks has a NULL nbt, and the other doesn't,
+     * pretend they stack
+     *
+     * @param ItemStack stack
+     * @return
+     */
+    public static boolean isItemTool(ItemStack stack) {
+        return GTMetaBaseItemHolder.gtMetaBaseItem != null
+                && GTMetaBaseItemHolder.gtMetaBaseItem.isInstance(stack.getItem());
     }
 
     /**

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

@@ -23,6 +23,7 @@ public final class PacketIDs {
         public static final int SET_CREATIVE_PLUS_MODE = 23;
         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 class S2C {

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

@@ -1,22 +1,22 @@
 package codechicken.nei;
 
+import java.awt.Point;
 import java.util.ArrayList;
-import java.util.List;
 
 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.ItemPanel.ItemPanelSlot;
+import codechicken.nei.ItemsGrid.ItemsGridSlot;
 import codechicken.nei.api.GuiInfo;
 import codechicken.nei.api.INEIGuiHandler;
+import codechicken.nei.api.ShortcutInputHandler;
 import codechicken.nei.guihook.GuiContainerManager;
-import codechicken.nei.guihook.IContainerTooltipHandler;
-import codechicken.nei.recipe.GuiCraftingRecipe;
 import codechicken.nei.recipe.GuiRecipe;
-import codechicken.nei.recipe.GuiUsageRecipe;
 
-public abstract class PanelWidget extends Widget implements IContainerTooltipHandler {
+public abstract class PanelWidget<T extends ItemsGrid<? extends ItemsGridSlot, ? extends ItemsGrid.MouseContext>>
+        extends Widget {
 
     protected static final int PADDING = 2;
 
@@ -27,20 +27,20 @@ public abstract class PanelWidget extends Widget implements IContainerTooltipHan
     public Button pageNext;
     public Label pageLabel;
 
-    protected ItemsGrid grid;
+    protected T grid;
 
     public ArrayList<ItemStack> getItems() {
-        return grid.getItems();
+        return this.grid.getItems();
     }
 
-    public ItemsGrid getGrid() {
-        return grid;
+    public T getGrid() {
+        return this.grid;
     }
 
     public void init() {
         pageLabel = new Label("0/0", true);
 
-        pagePrev = new Button("Prev") {
+        pagePrev = new Button("<") {
 
             public boolean onButtonPress(boolean rightclick) {
 
@@ -54,11 +54,12 @@ public abstract class PanelWidget extends Widget implements IContainerTooltipHan
             }
 
             @Override
-            public String getRenderLabel() {
-                return "<";
+            public void draw(int mousex, int mousey) {
+                this.state = grid.getNumPages() <= 1 ? 2 : 0;
+                super.draw(mousex, mousey);
             }
         };
-        pageNext = new Button("Next") {
+        pageNext = new Button(">") {
 
             public boolean onButtonPress(boolean rightclick) {
 
@@ -72,61 +73,34 @@ public abstract class PanelWidget extends Widget implements IContainerTooltipHan
             }
 
             @Override
-            public String getRenderLabel() {
-                return ">";
+            public void draw(int mousex, int mousey) {
+                this.state = grid.getNumPages() <= 1 ? 2 : 0;
+                super.draw(mousex, mousey);
             }
         };
     }
 
     public abstract String getLabelText();
 
-    protected abstract String getPositioningSettingName();
+    public abstract Rectangle4i calculateBounds(GuiContainer gui);
 
-    public abstract int getMarginLeft(GuiContainer gui);
-
-    public abstract int getMarginTop(GuiContainer gui);
-
-    public abstract int getWidth(GuiContainer gui);
-
-    public abstract int getHeight(GuiContainer gui);
+    protected static int snapDownToMultiple(int value, int multiple) {
+        return (value / multiple) * multiple;
+    }
 
     public void resize(GuiContainer gui) {
-        final Rectangle4i margin = new Rectangle4i(
-                getMarginLeft(gui),
-                getMarginTop(gui),
-                getWidth(gui),
-                getHeight(gui));
+        final Rectangle4i bounds = calculateBounds(gui);
 
-        final int minWidth = 5 * ItemsGrid.SLOT_SIZE;
-        final int minHeight = 9 * ItemsGrid.SLOT_SIZE;
-
-        final String settingName = getPositioningSettingName();
-        int paddingLeft = (int) Math
-                .ceil(margin.w * NEIClientConfig.getSetting(settingName + ".left").getIntValue() / 100000.0);
-        int paddingTop = (int) Math
-                .ceil(margin.h * NEIClientConfig.getSetting(settingName + ".top").getIntValue() / 100000.0);
-        int paddingRight = (int) Math
-                .ceil(margin.w * NEIClientConfig.getSetting(settingName + ".right").getIntValue() / 100000.0);
-        int paddingBottom = (int) Math
-                .ceil(margin.h * NEIClientConfig.getSetting(settingName + ".bottom").getIntValue() / 100000.0);
-
-        int deltaHeight = Math.min(0, margin.h - paddingTop - paddingBottom - minHeight) / 2;
-
-        paddingLeft = Math.min(paddingLeft, Math.max(0, margin.w - paddingRight - minWidth));
-        paddingRight = Math.min(paddingRight, Math.max(0, margin.w - paddingLeft - minWidth));
-        paddingTop = Math.min(margin.h - minHeight, Math.max(0, paddingTop + deltaHeight));
-        paddingBottom = Math.min(margin.h - paddingTop - minHeight, Math.max(0, paddingBottom - deltaHeight));
-
-        x = margin.x + paddingLeft;
-        y = margin.y + paddingTop;
-        w = margin.w - paddingLeft - paddingRight;
-        h = margin.h - paddingTop - paddingBottom;
+        x = bounds.x;
+        y = bounds.y;
+        w = bounds.w;
+        h = bounds.h;
 
         final int header = resizeHeader(gui);
         final int footer = resizeFooter(gui);
 
-        grid.setGridSize(x, y + header, w, h - header - footer);
-        grid.refresh(gui);
+        this.grid.setGridSize(x, y + header, w, h - header - footer);
+        this.grid.refresh(gui);
     }
 
     protected int resizeHeader(GuiContainer gui) {
@@ -171,22 +145,21 @@ public abstract class PanelWidget extends Widget implements IContainerTooltipHan
     protected abstract int resizeFooter(GuiContainer gui);
 
     public void setVisible() {
-        if (grid.getPerPage() > 0 && !grid.isEmpty()) {
+        if (this.grid.getPerPage() > 0 && !this.grid.isEmpty()) {
             LayoutManager.addWidget(pagePrev);
             LayoutManager.addWidget(pageNext);
             LayoutManager.addWidget(pageLabel);
-            grid.setVisible();
         }
     }
 
     @Override
     public void update() {
-        grid.update();
+        this.grid.update();
     }
 
     @Override
     public void draw(int mousex, int mousey) {
-        grid.draw(mousex, mousey);
+        this.grid.draw(mousex, mousey);
     }
 
     @Override
@@ -200,37 +173,33 @@ public abstract class PanelWidget extends Widget implements IContainerTooltipHan
 
     @Override
     public void mouseDragged(int mousex, int mousey, int button, long heldTime) {
-        if (mouseDownSlot >= grid.realItems.size()) {
+        if (this.grid.getSlotBySlotIndex(mouseDownSlot) == null) {
             mouseDownSlot = -1;
         }
 
         if (mouseDownSlot >= 0 && draggedStack == null
                 && NEIClientUtils.getHeldItem() == null
                 && NEIClientConfig.hasSMPCounterPart()) {
-            ItemPanelSlot mouseOverSlot = getSlotMouseOver(mousex, mousey);
+            ItemsGridSlot mouseOverSlot = this.grid.getSlotMouseOver(mousex, mousey);
 
             if (mouseOverSlot == null || mouseOverSlot.slotIndex != mouseDownSlot || heldTime > 500) {
-                draggedStack = getDraggedStackWithQuantity(mouseDownSlot);
+                draggedStack = getDraggedStackWithQuantity(this.grid.getSlotBySlotIndex(mouseDownSlot).getItemStack());
                 mouseDownSlot = -1;
             }
         }
     }
 
-    protected abstract ItemStack getDraggedStackWithQuantity(int mouseDownSlot);
+    protected abstract ItemStack getDraggedStackWithQuantity(ItemStack itemStack);
 
     @Override
     public boolean handleClick(int mousex, int mousey, int button) {
         if (handleClickExt(mousex, mousey, button)) return true;
 
-        ItemPanelSlot hoverSlot = getSlotMouseOver(mousex, mousey);
+        ItemsGridSlot hoverSlot = this.grid.getSlotMouseOver(mousex, mousey);
         if (hoverSlot != null) {
 
             if (button == 2) {
-
-                if (hoverSlot.item != null) {
-                    draggedStack = getDraggedStackWithQuantity(hoverSlot.slotIndex);
-                }
-
+                draggedStack = getDraggedStackWithQuantity(hoverSlot.getItemStack());
             } else {
                 mouseDownSlot = hoverSlot.slotIndex;
             }
@@ -245,7 +214,7 @@ public abstract class PanelWidget extends Widget implements IContainerTooltipHan
     public boolean handleClickExt(int mouseX, int mouseY, int button) {
 
         if (ItemPanels.itemPanel.draggedStack != null && ItemPanels.bookmarkPanel.contains(mouseX, mouseY)) {
-            ItemPanels.bookmarkPanel.addOrRemoveItem(ItemPanels.itemPanel.draggedStack, null, null, false, true);
+            ItemPanels.bookmarkPanel.addItem(ItemPanels.itemPanel.draggedStack);
             ItemPanels.itemPanel.draggedStack = null;
             return true;
         }
@@ -311,25 +280,17 @@ public abstract class PanelWidget extends Widget implements IContainerTooltipHan
 
     @Override
     public void mouseUp(int mousex, int mousey, int button) {
-        ItemPanelSlot hoverSlot = getSlotMouseOver(mousex, mousey);
+        final ItemsGridSlot hoverSlot = this.grid.getSlotMouseOver(mousex, mousey);
 
         if (hoverSlot != null && hoverSlot.slotIndex == mouseDownSlot && draggedStack == null) {
-            ItemStack item = hoverSlot.item.copy();
 
             if (NEIController.manager.window instanceof GuiRecipe || NEIClientUtils.shiftKey()
-                    || !NEIClientConfig.canCheatItem(item)) {
-
-                if (button == 0) {
-                    GuiCraftingRecipe.openRecipeGui("item", item);
-                } else if (button == 1) {
-                    GuiUsageRecipe.openRecipeGui("item", item);
-                }
-
-                mouseDownSlot = -1;
-                return;
+                    || !NEIClientConfig.canCheatItem(hoverSlot.getItemStack())) {
+                ShortcutInputHandler.handleMouseClick(hoverSlot.getItemStack());
+            } else {
+                NEIClientUtils.cheatItem(getDraggedStackWithQuantity(hoverSlot.getItemStack()), button, -1);
             }
 
-            NEIClientUtils.cheatItem(getDraggedStackWithQuantity(hoverSlot.slotIndex), button, -1);
         }
 
         mouseDownSlot = -1;
@@ -339,20 +300,22 @@ public abstract class PanelWidget extends Widget implements IContainerTooltipHan
     public boolean onMouseWheel(int i, int mousex, int mousey) {
         if (!contains(mousex, mousey)) return false;
 
-        grid.shiftPage(-i);
+        this.grid.shiftPage(-i);
         return true;
     }
 
     @Override
     public boolean handleKeyPress(int keyID, char keyChar) {
+        final Point mouse = GuiDraw.getMousePosition();
+        if (!contains(mouse.x, mouse.y)) return false;
 
         if (NEIClientConfig.isKeyHashDown("gui.next")) {
-            grid.shiftPage(1);
+            this.grid.shiftPage(1);
             return true;
         }
 
         if (NEIClientConfig.isKeyHashDown("gui.prev")) {
-            grid.shiftPage(-1);
+            this.grid.shiftPage(-1);
             return true;
         }
 
@@ -361,41 +324,28 @@ public abstract class PanelWidget extends Widget implements IContainerTooltipHan
 
     @Override
     public ItemStack getStackMouseOver(int mousex, int mousey) {
-        ItemPanelSlot slot = getSlotMouseOver(mousex, mousey);
-        return slot == null ? null : slot.item;
+        final ItemsGridSlot slot = this.grid.getSlotMouseOver(mousex, mousey);
+        return slot == null ? null : slot.getItemStack();
     }
 
-    public ItemPanelSlot getSlotMouseOver(int mousex, int mousey) {
-        return grid.getSlotMouseOver(mousex, mousey);
+    public ItemStack getStackMouseOverWithQuantity(int mousex, int mousey) {
+        final ItemStack hoverSlot = getStackMouseOver(mousex, mousey);
+        return hoverSlot != null ? getDraggedStackWithQuantity(hoverSlot) : null;
     }
 
+    abstract ItemsGridSlot getSlotMouseOver(int mousex, int mousey);
+
     public int getPage() {
-        return grid.getPage();
+        return this.grid.getPage();
     }
 
     public int getNumPages() {
-        return grid.getNumPages();
+        return this.grid.getNumPages();
     }
 
     @Override
     public boolean contains(int px, int py) {
-        return grid.contains(px, py);
-    }
-
-    @Override
-    public List<String> handleTooltip(GuiContainer gui, int mousex, int mousey, List<String> currenttip) {
-        return currenttip;
-    }
-
-    @Override
-    public List<String> handleItemDisplayName(GuiContainer gui, ItemStack itemstack, List<String> currenttip) {
-        return currenttip;
-    }
-
-    @Override
-    public List<String> handleItemTooltip(GuiContainer gui, ItemStack itemstack, int mousex, int mousey,
-            List<String> currenttip) {
-        return currenttip;
+        return this.grid.contains(px, py);
     }
 
 }

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

@@ -2,6 +2,7 @@ package codechicken.nei;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -10,10 +11,10 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;
 
-import codechicken.nei.ItemList.AllMultiItemFilter;
 import codechicken.nei.api.ItemFilter;
 import codechicken.nei.api.ItemInfo;
 import codechicken.nei.recipe.GuiRecipe;
+import codechicken.nei.recipe.StackInfo;
 
 /**
  * Simply an {@link ItemStack} with position. Mainly used in the recipe handlers.
@@ -82,7 +83,11 @@ public class PositionedStack {
     }
 
     public PositionedStack copy() {
-        PositionedStack pStack = new PositionedStack(Arrays.asList(items), relx, rely, false);
+        PositionedStack pStack = new PositionedStack(
+                Arrays.stream(this.items).map(ItemStack::copy).toArray(ItemStack[]::new),
+                relx,
+                rely,
+                false);
         pStack.permutated = this.permutated;
         return pStack;
     }
@@ -92,40 +97,42 @@ public class PositionedStack {
     }
 
     public List<ItemStack> getFilteredPermutations(ItemFilter additionalFilter) {
-        List<ItemStack> items = Arrays.asList(this.items).stream().filter(getItemFilter(additionalFilter)::matches)
-                .collect(Collectors.toList());
+        List<ItemStack> items = Arrays.asList(this.items);
 
-        if (items.isEmpty()) {
-            items.addAll(
-                    Arrays.asList(this.items).stream().filter(item -> !ItemInfo.isHidden(item))
-                            .collect(Collectors.toList()));
-        }
-
-        if (items.isEmpty()) {
-            items.addAll(Arrays.asList(this.items));
-        }
+        items = filteringPermutations(items, item -> !ItemInfo.isHidden(item));
+        items = filteringPermutations(items, PresetsList.getItemFilter());
+        items = filteringPermutations(items, GuiRecipe.getSearchItemFilter());
+        items = filteringPermutations(items, additionalFilter);
 
+        items.sort(Comparator.comparing(FavoriteRecipes::containsManual).reversed());
         return items;
     }
 
-    private ItemFilter getItemFilter(ItemFilter additionalFilter) {
-        return new AllMultiItemFilter(
-                additionalFilter,
-                item -> !ItemInfo.isHidden(item),
-                PresetsList.getItemFilter(),
-                GuiRecipe.getSearchItemFilter());
+    private List<ItemStack> filteringPermutations(List<ItemStack> items, ItemFilter filter) {
+        if (filter == null) return items;
+        final List<ItemStack> filteredItems = items.stream().filter(filter::matches).collect(Collectors.toList());
+        return filteredItems.isEmpty() ? items : filteredItems;
     }
 
-    public boolean setPermutationToRender(ItemStack ingredient) {
+    public int getPermutationIndex(ItemStack stack) {
 
         for (int index = 0; index < this.items.length; index++) {
-            if (NEIServerUtils.areStacksSameTypeCraftingWithNBT(this.items[index], ingredient)) {
-                setPermutationToRender(index);
-                return true;
+            if (NEIServerUtils.areStacksSameType(items[index], stack)) {
+                return index;
             }
         }
 
-        return false;
+        return -1;
+    }
+
+    public boolean setPermutationToRender(ItemStack ingredient) {
+        final int stackIndex = getPermutationIndex(ingredient);
+
+        if (stackIndex >= 0) {
+            setPermutationToRender(stackIndex);
+        }
+
+        return stackIndex >= 0;
     }
 
     public void setPermutationToRender(int index) {
@@ -138,6 +145,10 @@ public class PositionedStack {
         }
     }
 
+    public boolean contains(int mx, int my) {
+        return mx >= this.relx - 1 && mx < this.relx + 17 && my >= this.rely - 1 && my < this.rely + 17;
+    }
+
     public boolean contains(ItemStack ingredient) {
         for (ItemStack item : items) if (NEIServerUtils.areStacksSameTypeCrafting(item, ingredient)) return true;
 
@@ -148,7 +159,7 @@ public class PositionedStack {
      * NBT-friendly version of {@link #contains(ItemStack)}
      */
     public boolean containsWithNBT(ItemStack ingredient) {
-        for (ItemStack item : items) if (NEIServerUtils.areStacksSameTypeCraftingWithNBT(item, ingredient)) return true;
+        for (ItemStack item : items) if (StackInfo.equalItemAndNBT(item, ingredient, true)) return true;
 
         return false;
     }

src/main/java/codechicken/nei/PresetsList.java

@@ -21,6 +21,7 @@ import com.google.gson.JsonPrimitive;
 import com.google.gson.JsonSyntaxException;
 
 import codechicken.core.CommonUtils;
+import codechicken.nei.SubsetWidget.SubsetTag;
 import codechicken.nei.api.API;
 import codechicken.nei.api.IRecipeFilter;
 import codechicken.nei.api.IRecipeFilter.IRecipeFilterProvider;
@@ -33,6 +34,7 @@ import codechicken.nei.util.NBTJson;
 public class PresetsList {
 
     public enum PresetMode {
+        SUBSET,
         HIDE,
         REMOVE,
         GROUP;
@@ -66,11 +68,11 @@ public class PresetsList {
         }
     }
 
-    protected static class RecipesFilter implements IRecipeFilterProvider, IRecipeFilter {
+    protected static class PresetRecipeFilter implements IRecipeFilterProvider, IRecipeFilter {
 
         public Set<String> cache;
 
-        public IRecipeFilter getFilter() {
+        public IRecipeFilter getRecipeFilter() {
 
             if (cache == null) {
                 cache = PresetsList.presets.stream().filter(p -> p.enabled && p.mode == PresetMode.REMOVE)
@@ -81,17 +83,20 @@ public class PresetsList {
         }
 
         @Override
-        public boolean matches(IRecipeHandler handler, List<PositionedStack> ingredients, PositionedStack result,
-                List<PositionedStack> others) {
+        public boolean matches(IRecipeHandler handler, int recipeIndex) {
 
-            if (matchPositionedStack(ingredients, false)) {
+            if (matchPositionedStack(handler.getIngredientStacks(recipeIndex), false)) {
                 return false;
             }
 
+            final PositionedStack result = handler.getResultStack(recipeIndex);
+
             if (result != null && matchPositionedStack(result)) {
                 return true;
             }
 
+            final List<PositionedStack> others = handler.getOtherStacks(recipeIndex);
+
             if (!others.isEmpty() && matchPositionedStack(others, true)) {
                 return true;
             }
@@ -143,7 +148,7 @@ public class PresetsList {
     }
 
     public static final List<Preset> presets = new ArrayList<>();
-    protected static RecipesFilter recipeFilter = new RecipesFilter();
+    protected static PresetRecipeFilter recipeFilter = new PresetRecipeFilter();
     protected static ItemPanelFilter itemFilter = new ItemPanelFilter();
 
     static {
@@ -216,6 +221,8 @@ public class PresetsList {
         if (!preset.items.isEmpty()) {
             presets.add(preset);
         }
+
+        updateSubsets();
     }
 
     public static void savePresets() {
@@ -236,14 +243,29 @@ public class PresetsList {
         try (FileOutputStream output = new FileOutputStream(presetsFile)) {
             IOUtils.writeLines(strings, "\n", output, StandardCharsets.UTF_8);
         } catch (IOException e) {
-            NEIClientConfig.logger.error("Filed to save presets list to file {}", presetsFile, e);
+            NEIClientConfig.logger.error("Failed to save presets list to file {}", presetsFile, e);
         }
 
         recipeFilter.cache = null;
         itemFilter.cache = null;
+        updateSubsets();
         CollapsibleItems.saveStates();
         CollapsibleItems.load();
         LayoutManager.markItemsDirty();
     }
 
+    private static void updateSubsets() {
+        SubsetWidget.removeTag("Presets");
+
+        for (Preset preset : PresetsList.presets) {
+            if (preset.enabled && preset.mode == PresetMode.SUBSET) {
+                SubsetWidget.addTag(
+                        new SubsetTag(
+                                "Presets." + preset.name,
+                                stack -> preset.items.contains(Preset.getIdentifier(stack))));
+            }
+        }
+
+    }
+
 }

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

@@ -3,10 +3,13 @@ package codechicken.nei;
 import net.minecraft.util.EnumChatFormatting;
 
 import codechicken.nei.SearchField.GuiSearchField;
+import codechicken.nei.api.IRecipeFilter;
+import codechicken.nei.api.IRecipeFilter.IRecipeFilterProvider;
 import codechicken.nei.api.ItemFilter;
+import codechicken.nei.api.ItemFilter.ItemFilterProvider;
 import codechicken.nei.util.TextHistory;
 
-public abstract class RecipeSearchField extends TextField {
+public abstract class RecipeSearchField extends TextField implements ItemFilterProvider, IRecipeFilterProvider {
 
     private static final TextHistory history = new TextHistory();
 
@@ -17,9 +20,12 @@ public abstract class RecipeSearchField extends TextField {
 
     @Override
     protected void initInternalTextField() {
-        field = new GuiSearchField();
+        final GuiSearchField field = new GuiSearchField();
         field.setMaxStringLength(maxSearchLength);
         field.setCursorPositionZero();
+        field.setSkipRecipeTokens(true);
+        ((SearchTextFormatter) field.getFormatter()).setContextToken("<>");
+        this.field = field;
     }
 
     public boolean isVisible() {
@@ -58,10 +64,16 @@ public abstract class RecipeSearchField extends TextField {
         return EnumChatFormatting.getTextWithoutFormattingCodes(s);
     }
 
+    @Override
     public ItemFilter getFilter() {
         return ((GuiSearchField) field).getFilter();
     }
 
+    @Override
+    public IRecipeFilter getRecipeFilter() {
+        return ((GuiSearchField) field).getRecipeFilter();
+    }
+
     @Override
     public void setFocus(boolean focus) {
         final boolean previousFocus = field.isFocused();

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

@@ -16,6 +16,8 @@ import codechicken.lib.gui.GuiDraw;
 import codechicken.nei.ItemList.NothingItemFilter;
 import codechicken.nei.SearchTokenParser.ISearchParserProvider;
 import codechicken.nei.SearchTokenParser.SearchMode;
+import codechicken.nei.api.IRecipeFilter;
+import codechicken.nei.api.IRecipeFilter.IRecipeFilterProvider;
 import codechicken.nei.api.ItemFilter;
 import codechicken.nei.api.ItemFilter.ItemFilterProvider;
 import codechicken.nei.recipe.StackInfo;
@@ -88,9 +90,10 @@ public class SearchField extends TextField implements ItemFilterProvider {
         }
     }
 
-    public static class GuiSearchField extends FormattedTextField {
+    public static class GuiSearchField extends FormattedTextField implements ItemFilterProvider, IRecipeFilterProvider {
 
         protected final SearchTokenParser searchParser;
+        protected boolean skipRecipeTokens = false;
 
         public GuiSearchField() {
             this(SearchField.searchParser);
@@ -100,14 +103,30 @@ public class SearchField extends TextField implements ItemFilterProvider {
             super(Minecraft.getMinecraft().fontRenderer, 0, 0, 0, 0);
             this.searchParser = searchParser;
             setFormatter(new SearchTextFormatter(searchParser));
+            setDisabledTextColour(0xFF303030);
+            setPlaceholder(NEIClientUtils.translate("inventory.search.placeholder"));
         }
 
+        public void setSkipRecipeTokens(boolean skipRecipeTokens) {
+            this.skipRecipeTokens = skipRecipeTokens;
+        }
+
+        @Override
         public ItemFilter getFilter() {
             return getFilter(getText());
         }
 
+        @Override
+        public IRecipeFilter getRecipeFilter() {
+            return getRecipeFilter(getText());
+        }
+
         public ItemFilter getFilter(String filterText) {
-            return this.searchParser.getFilter(filterText);
+            return this.searchParser.getFilter(filterText, this.skipRecipeTokens);
+        }
+
+        public IRecipeFilter getRecipeFilter(String filterText) {
+            return this.searchParser.getRecipeFilter(filterText);
         }
 
     }
@@ -203,7 +222,6 @@ public class SearchField extends TextField implements ItemFilterProvider {
     public void onTextChange(String oldText) {
         final String newText = text();
         if (!newText.equals(oldText)) {
-            if (newText.length() > 0) NEIClientConfig.logger.debug("Searching for " + newText);
             NEIClientConfig.setSearchExpression(newText);
             ItemList.updateFilter.restart();
         }
@@ -270,7 +288,7 @@ public class SearchField extends TextField implements ItemFilterProvider {
             default:
                 break;
         }
-
+        // regex and extended+
         if (!search.isEmpty()) {
             try {
                 return Pattern.compile(search, Pattern.MULTILINE | Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
@@ -281,7 +299,7 @@ public class SearchField extends TextField implements ItemFilterProvider {
     }
 
     public static String getEscapedSearchText(ItemStack stack) {
-        final FluidStack fluidStack = StackInfo.isFluidContainer(stack) ? null : StackInfo.getFluid(stack);
+        final FluidStack fluidStack = StackInfo.getFluid(stack);
         String displayName;
 
         if (fluidStack != null) {
@@ -296,6 +314,9 @@ public class SearchField extends TextField implements ItemFilterProvider {
     public static String getEscapedSearchText(String text) {
         text = EnumChatFormatting.getTextWithoutFormattingCodes(text);
 
+        boolean addQuotes = text.contains(" ")
+                && NEIClientConfig.getBooleanSetting("inventory.search.quoteDropItemName");
+
         switch (NEIClientConfig.getIntSetting("inventory.search.patternMode")) {
             case 1:
                 text = text.replaceAll("[\\?|\\*]", "\\\\$0");
@@ -303,11 +324,20 @@ public class SearchField extends TextField implements ItemFilterProvider {
             case 2:
                 text = text.replaceAll("[{}()\\[\\].+*?^$\\\\|]", "\\\\$0");
                 break;
+            case 3:
+                // In extended+ quotes require only quotes to be escaped
+                if (addQuotes) {
+                    text = text.replaceAll("\"", "\\\\$0");
+                } else {
+                    String prefixes = searchParser.getPrefixes();
+                    text = text.replaceAll("[-<>^{}|/\\\\\"" + Pattern.quote(prefixes) + "]", "\\\\$0");
+                }
+                break;
             default:
                 break;
         }
 
-        if (text.contains(" ") && NEIClientConfig.getBooleanSetting("inventory.search.quoteDropItemName")) {
+        if (addQuotes) {
             text = "\"" + text + "\"";
         }
 

src/main/java/codechicken/nei/SearchTextFormatter.java

@@ -1,66 +1,96 @@
 package codechicken.nei;
 
-import java.util.List;
-import java.util.StringJoiner;
-
 import net.minecraft.util.EnumChatFormatting;
 
 import codechicken.nei.FormattedTextField.TextFormatter;
-import codechicken.nei.SearchTokenParser.SearchToken;
+import codechicken.nei.search.SearchExpressionFormatVisitor;
+import codechicken.nei.search.SearchExpressionUtils;
+import codechicken.nei.search.SearchToken;
 
 public class SearchTextFormatter implements TextFormatter {
 
     protected final SearchTokenParser searchParser;
+    protected String contextToken = "";
 
     public SearchTextFormatter(SearchTokenParser searchParser) {
         this.searchParser = searchParser;
     }
 
+    public void setContextToken(String contextToken) {
+        this.contextToken = contextToken;
+    }
+
+    @Override
     public String format(String text) {
-        final String[] parts = (text + "| ").split("\\|");
-        StringJoiner formattedText = new StringJoiner(EnumChatFormatting.GRAY + "|");
+        final int patternMode = NEIClientConfig.getIntSetting("inventory.search.patternMode");
+        if (patternMode == 3) {
+            final int spaceModeEnabled = NEIClientConfig.getIntSetting("inventory.search.spaceMode");
+            if (spaceModeEnabled == 1) {
+                text = SearchTokenParser.SPACE_PATTERN.matcher(text).replaceAll("\\\\ ");
+            }
+            final SearchExpressionFormatVisitor visitor = new SearchExpressionFormatVisitor(searchParser);
+            return SearchExpressionUtils.visitRecipeSearchExpression(text, visitor);
+        } else {
+            final StringBuilder formattedText = new StringBuilder();
 
-        for (int i = 0; i < parts.length - 1; i++) {
-            final String filterText = parts[i];
-            final List<SearchToken> tokens = searchParser.splitSearchText(filterText);
-            StringBuilder formattedPart = new StringBuilder();
-            int startIndex = 0;
+            for (String[] orQuery : searchParser.splitByDelimiters(text, "|", false)) {
+                final String filterText = orQuery[1];
 
-            for (SearchToken token : tokens) {
-                formattedPart.append(filterText.substring(startIndex, token.start));
-                EnumChatFormatting tokenColor = EnumChatFormatting.RESET;
+                formattedText.append(SearchExpressionUtils.HIGHLIGHTS.OR + orQuery[0]);
 
-                if (token.firstChar != null) {
-                    tokenColor = searchParser.getProvider(token.firstChar).getHighlightedColor();
+                for (String[] contextPart : searchParser.splitByDelimiters(filterText, this.contextToken, false)) {
+
+                    if (!contextPart[0].isEmpty()) {
+                        formattedText.append(
+                                SearchExpressionUtils.HIGHLIGHTS.RECIPE + contextPart[0].substring(0, 1)
+                                        + EnumChatFormatting.RESET);
+                        contextPart[1] = contextPart[0].substring(1) + contextPart[1];
+                    }
+
+                    if (contextPart[1].isEmpty()) {
+                        continue;
+                    }
+
+                    int startIndex = 0;
+
+                    for (SearchToken token : searchParser.splitSearchText(contextPart[1])) {
+                        formattedText.append(contextPart[1].substring(startIndex, token.start));
+                        EnumChatFormatting tokenColor = EnumChatFormatting.RESET;
+
+                        if (token.firstChar != null) {
+                            tokenColor = searchParser.getProvider(token.firstChar).getHighlightedColor();
+                        }
+
+                        if (token.ignore != null) {
+                            formattedText
+                                    .append(SearchExpressionUtils.HIGHLIGHTS.NEGATE + String.valueOf(token.ignore));
+                        }
+
+                        if (token.firstChar != null) {
+                            formattedText.append(tokenColor + String.valueOf(token.firstChar));
+                        }
+
+                        if (token.quotes) {
+                            formattedText.append(SearchExpressionUtils.HIGHLIGHTS.QUOTED + "\"");
+                        }
+
+                        if (!token.rawText.isEmpty()) {
+                            formattedText.append(tokenColor + token.rawText);
+                        }
+
+                        if (token.quotes) {
+                            formattedText.append(SearchExpressionUtils.HIGHLIGHTS.QUOTED + "\"");
+                        }
+
+                        startIndex = token.end;
+                    }
+
+                    formattedText.append(contextPart[1].substring(startIndex, contextPart[1].length()));
                 }
 
-                if (token.ignore) {
-                    formattedPart.append(EnumChatFormatting.BLUE + "-");
-                }
-
-                if (token.firstChar != null) {
-                    formattedPart.append(tokenColor + String.valueOf(token.firstChar));
-                }
-
-                if (token.quotes) {
-                    formattedPart.append(EnumChatFormatting.GOLD + "\"");
-                }
-
-                if (!token.rawText.isEmpty()) {
-                    formattedPart.append(tokenColor + token.rawText);
-                }
-
-                if (token.quotes) {
-                    formattedPart.append(EnumChatFormatting.GOLD + "\"");
-                }
-
-                startIndex = token.end;
             }
 
-            formattedPart.append(filterText.substring(startIndex, filterText.length()));
-            formattedText.add(formattedPart);
+            return formattedText.toString();
         }
-
-        return formattedText.toString();
     }
 }

src/main/java/codechicken/nei/SearchTokenParser.java

@@ -1,14 +1,11 @@
 package codechicken.nei;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import java.util.stream.Collectors;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.resources.Language;
@@ -18,9 +15,16 @@ import net.minecraft.util.EnumChatFormatting;
 import codechicken.nei.ItemList.AllMultiItemFilter;
 import codechicken.nei.ItemList.AnyMultiItemFilter;
 import codechicken.nei.ItemList.EverythingItemFilter;
-import codechicken.nei.ItemList.NegatedItemFilter;
-import codechicken.nei.ItemList.NothingItemFilter;
+import codechicken.nei.api.IRecipeFilter;
 import codechicken.nei.api.ItemFilter;
+import codechicken.nei.filter.AllMultiRecipeFilter;
+import codechicken.nei.filter.AnyMultiRecipeFilter;
+import codechicken.nei.filter.RecipeFilter;
+import codechicken.nei.filter.RecipeFilter.FilterContext;
+import codechicken.nei.search.ItemFilterVisitor;
+import codechicken.nei.search.RecipeFilterVisitor;
+import codechicken.nei.search.SearchExpressionUtils;
+import codechicken.nei.search.SearchToken;
 
 public class SearchTokenParser {
 
@@ -39,20 +43,6 @@ public class SearchTokenParser {
         }
     }
 
-    public static class SearchToken {
-
-        public boolean ignore = false;
-        public boolean quotes = false;
-        public Character firstChar = null;
-
-        public String[] words;
-
-        public String rawText = "";
-        public int start = 0;
-        public int end = 0;
-
-    }
-
     public static interface ISearchParserProvider {
 
         public ItemFilter getFilter(String searchText);
@@ -83,7 +73,7 @@ public class SearchTokenParser {
         }
     }
 
-    private static class IsRegisteredItemFilter implements ItemFilter {
+    public static class IsRegisteredItemFilter implements ItemFilter {
 
         public ItemFilter filter;
 
@@ -99,10 +89,14 @@ public class SearchTokenParser {
         }
     }
 
+    public static final Pattern SPACE_PATTERN = Pattern.compile(" ");
+
     protected final LRUCache<String, ItemFilter> filtersCache = new LRUCache<>(20);
+    protected final LRUCache<String, IRecipeFilter> recipesCache = new LRUCache<>(20);
     protected final List<ISearchParserProvider> searchProviders;
     protected final ProvidersCache providersCache = new ProvidersCache();
     protected final Map<Character, Character> prefixRedefinitions = new HashMap<>();
+    protected String prefixes = null;
 
     public SearchTokenParser(List<ISearchParserProvider> searchProviders) {
         this.searchProviders = searchProviders;
@@ -114,196 +108,384 @@ public class SearchTokenParser {
 
     public void addProvider(ISearchParserProvider provider) {
         this.searchProviders.add(provider);
-        this.providersCache.clear();
-        this.filtersCache.clear();
+        clearCache();
     }
 
     public void clearCache() {
+        this.providersCache.clear();
         this.filtersCache.clear();
+        this.recipesCache.clear();
+        this.prefixes = null;
     }
 
-    protected List<ISearchParserProvider> getProviders() {
+    public List<ISearchParserProvider> getProviders() {
         Language currentLanguage = Minecraft.getMinecraft().getLanguageManager().getCurrentLanguage();
 
         if (!currentLanguage.getLanguageCode().equals(providersCache.languageCode)) {
-            Map<Character, ISearchParserProvider> providers = new HashMap<>();
+            final List<ISearchParserProvider> providersList = new ArrayList<>();
+            final Map<Character, ISearchParserProvider> providers = new HashMap<>();
 
             for (int index = this.searchProviders.size() - 1; index >= 0; index--) {
                 ISearchParserProvider provider = this.searchProviders.get(index);
 
-                if (!providers.containsKey(provider.getPrefix())
-                        && provider.getMatchingLanguages().contains(currentLanguage)) {
-                    providers.put(provider.getPrefix(), provider);
+                if (provider.getMatchingLanguages().contains(currentLanguage)) {
+                    if (provider.getSearchMode() == SearchMode.PREFIX && !providers.containsKey(provider.getPrefix())) {
+                        providers.put(provider.getPrefix(), provider);
+                    } else if (provider.getSearchMode() == SearchMode.ALWAYS) {
+                        providersList.add(provider);
+                    }
                 }
             }
 
-            providersCache.providers = new ArrayList<>(providers.values());
+            providersList.addAll(providers.values());
             providersCache.languageCode = currentLanguage.getLanguageCode();
+            providersCache.providers = providersList;
         }
 
         return providersCache.providers;
     }
 
+    public boolean hasRedefinedPrefix(char ch) {
+        return getPrefixes().indexOf(ch) >= 0;
+    }
+
     public ISearchParserProvider getProvider(char ch) {
-        return getProviders().stream()
-                .filter(
-                        provider -> provider.getSearchMode() == SearchMode.PREFIX
-                                && getRedefinedPrefix(provider.getPrefix()) == ch)
-                .findFirst().orElse(null);
+        if (!hasRedefinedPrefix(ch)) {
+            return null;
+        }
+        for (ISearchParserProvider provider : getProviders()) {
+            if (provider.getSearchMode() == SearchMode.PREFIX && getRedefinedPrefix(provider.getPrefix()) == ch) {
+                return provider;
+            }
+        }
+        return null;
+    }
+
+    public List<ItemFilter> getAlwaysProvidersFilters(String searchText) {
+        final List<ItemFilter> filters = new ArrayList<>();
+        for (ISearchParserProvider provider : getProviders()) {
+            if (provider.getSearchMode() == SearchMode.ALWAYS) {
+                filters.add(provider.getFilter(searchText));
+            }
+        }
+
+        return filters;
     }
 
     public synchronized ItemFilter getFilter(String filterText) {
+        return getFilter(filterText, false);
+    }
+
+    public synchronized ItemFilter getFilter(String rawText, boolean skipRecipeTokens) {
+        final String filterText = EnumChatFormatting.getTextWithoutFormattingCodes(rawText).toLowerCase();
+
+        if (filterText == null || filterText.isEmpty()) {
+            return new EverythingItemFilter();
+        }
+
+        final int patternMode = NEIClientConfig.getIntSetting("inventory.search.patternMode");
+
+        if (patternMode != 3) {
+            return this.filtersCache.computeIfAbsent(skipRecipeTokens + ":" + filterText, _t -> {
+                final List<ItemFilter> searchTokens = new ArrayList<>();
+
+                for (String[] subQuery : splitByDelimiters(filterText, "|", false)) {
+
+                    if (subQuery[1].isEmpty()) {
+                        continue;
+                    }
+
+                    final List<ItemFilter> tokens = new ArrayList<>();
+
+                    for (String[] contextQuery : splitByDelimiters(subQuery[1], skipRecipeTokens ? "<>" : "", false)) {
+
+                        if (contextQuery[1].isEmpty() || contextQuery[0].startsWith(">")) {
+                            continue;
+                        }
+
+                        if (!contextQuery[0].isEmpty()) {
+                            contextQuery[0] = contextQuery[0].substring(1);
+                        }
+
+                        for (SearchToken token : splitSearchText(contextQuery[0] + contextQuery[1])) {
+                            final ItemFilter result = token.getFilter(this);
+
+                            if (result != null) {
+                                tokens.add(result);
+                            }
+                        }
+                    }
+
+                    if (tokens.size() == 1) {
+                        searchTokens.add(tokens.get(0));
+                    } else if (!tokens.isEmpty()) {
+                        searchTokens.add(new AllMultiItemFilter(tokens));
+                    }
+                }
+
+                if (searchTokens.isEmpty()) {
+                    return new EverythingItemFilter();
+                } else if (searchTokens.size() == 1) {
+                    return new IsRegisteredItemFilter(searchTokens.get(0));
+                } else {
+                    return new IsRegisteredItemFilter(new AnyMultiItemFilter(searchTokens));
+                }
+            });
+        } else {
+            return this.filtersCache.computeIfAbsent(filterText, text -> {
+                final int spaceMode = NEIClientConfig.getIntSetting("inventory.search.spaceMode");
+
+                if (spaceMode == 1) {
+                    text = SearchTokenParser.SPACE_PATTERN.matcher(text).replaceAll("\\\\ ");
+                }
+                if (skipRecipeTokens) {
+                    return new IsRegisteredItemFilter(
+                            SearchExpressionUtils.visitRecipeSearchExpression(text, new ItemFilterVisitor(this)));
+                } else {
+                    return new IsRegisteredItemFilter(
+                            SearchExpressionUtils.visitSearchExpression(text, new ItemFilterVisitor(this)));
+                }
+            });
+        }
+
+    }
+
+    public synchronized IRecipeFilter getRecipeFilter(String filterText) {
         filterText = EnumChatFormatting.getTextWithoutFormattingCodes(filterText).toLowerCase();
 
-        return this.filtersCache.computeIfAbsent(filterText, text -> {
-            final String[] parts = text.split("\\|");
-            final List<ItemFilter> searchTokens = Arrays.stream(parts).map(this::parseSearchText).filter(s -> s != null)
-                    .collect(Collectors.toCollection(ArrayList::new));
+        if (filterText == null || filterText.isEmpty()) {
+            return new RecipeFilter(FilterContext.ANY, true, new EverythingItemFilter());
+        }
 
-            if (searchTokens.isEmpty()) {
-                return new EverythingItemFilter();
-            } else if (searchTokens.size() == 1) {
-                return new IsRegisteredItemFilter(searchTokens.get(0));
-            } else {
-                return new IsRegisteredItemFilter(new AnyMultiItemFilter(searchTokens));
-            }
+        final int patternMode = NEIClientConfig.getIntSetting("inventory.search.patternMode");
 
-        });
+        if (patternMode != 3) {
+            return this.recipesCache.computeIfAbsent(filterText, input -> {
+                final List<IRecipeFilter> searchTokens = new ArrayList<>();
+
+                for (String[] orQueryPart : splitByDelimiters(input, "|", false)) {
+
+                    if (orQueryPart[1].isEmpty()) {
+                        continue;
+                    }
+
+                    final List<IRecipeFilter> contextList = new ArrayList<>();
+
+                    for (String[] contextQuery : splitByDelimiters(orQueryPart[1], "<>", false)) {
+
+                        if (contextQuery[1].isEmpty()) {
+                            continue;
+                        }
+
+                        final List<IRecipeFilter> tokens = new ArrayList<>();
+                        FilterContext context = FilterContext.ANY;
+
+                        if (!contextQuery[0].isEmpty()) {
+                            context = FilterContext.fromChar(contextQuery[0].charAt(0));
+                            contextQuery[0] = contextQuery[0].substring(1);
+                        }
+
+                        for (SearchToken token : splitSearchText(contextQuery[0] + contextQuery[1])) {
+                            final ItemFilter result = token.getFilter(this);
+                            if (result != null) {
+                                tokens.add(
+                                        new RecipeFilter(context, token.ignore == null || token.ignore != '!', result));
+                            }
+                        }
+
+                        if (tokens.size() == 1) {
+                            contextList.add(tokens.get(0));
+                        } else if (!tokens.isEmpty()) {
+                            contextList.add(new AllMultiRecipeFilter(tokens));
+                        }
+                    }
+
+                    if (contextList.size() == 1) {
+                        searchTokens.add(contextList.get(0));
+                    } else if (!contextList.isEmpty()) {
+                        searchTokens.add(new AllMultiRecipeFilter(contextList));
+                    }
+                }
+
+                if (searchTokens.isEmpty()) {
+                    return new RecipeFilter(FilterContext.ANY, true, new EverythingItemFilter());
+                } else if (searchTokens.size() == 1) {
+                    return searchTokens.get(0);
+                } else {
+                    return new AnyMultiRecipeFilter(searchTokens);
+                }
+            });
+
+        } else {
+            return this.recipesCache.computeIfAbsent(filterText, text -> {
+                final int spaceMode = NEIClientConfig.getIntSetting("inventory.search.spaceMode");
+
+                if (spaceMode == 1) {
+                    text = SearchTokenParser.SPACE_PATTERN.matcher(text).replaceAll("\\\\ ");
+                }
+
+                return SearchExpressionUtils.visitRecipeSearchExpression(text, new RecipeFilterVisitor(this));
+            });
+        }
 
     }
 
     public List<SearchToken> splitSearchText(String filterText) {
-
         if (filterText.isEmpty()) {
             return Collections.emptyList();
         }
 
         final List<SearchToken> tokens = new ArrayList<>();
-        final String prefixes = getPrefixes();
         final int spaceMode = NEIClientConfig.getIntSetting("inventory.search.spaceMode");
-        // The regular expression first tries to match a string that starts with a space or the beginning of the string,
-        // followed by a sequence of characters that do not contain special characters -"@#$%&, and ends with a space
-        // and the characters -"@#$%& or the end of the string.
-        final String patternPart1 = "(?<tokenA>(^|\\s+)(?:[^" + Pattern.quote(" -\"" + prefixes)
-                + "]).+?(?=\\s+["
-                + Pattern.quote("-\"" + prefixes)
-                + "]|$))";
-        // If the first condition is not met, it tries to match a sequence of - characters, followed by @#$%&
-        // characters, then either a quoted string or non-space characters.
-        final String patternPart2 = "((?<ignore>-*)(?<firstChar>[" + Pattern.quote(prefixes)
-                + "]*)(?<tokenB>\\\".*?(?:\\\"|$)|\\S+\\s*))";
-        final Pattern pattern = Pattern.compile(spaceMode == 0 ? patternPart2 : (patternPart1 + "|" + patternPart2));
-        final Matcher filterMatcher = pattern.matcher(filterText);
+        final String prefixes = getPrefixes();
+        SearchToken lastToken = null;
+        int lastEnd = 0;
 
-        while (filterMatcher.find()) {
-            String firstChar = filterMatcher.group("firstChar");
-            SearchToken token = new SearchToken();
-            token.start = filterMatcher.start();
-            token.end = filterMatcher.end();
-            token.ignore = "-".equals(filterMatcher.group("ignore"));
-            token.rawText = spaceMode == 0 ? null : filterMatcher.group("tokenA");
+        for (String[] part : splitByDelimiters(filterText, "-!" + prefixes, true)) {
+            final SearchToken token = createToken(lastEnd, part, prefixes);
+            final int length = part[0].length() + part[1].length();
 
-            if (firstChar != null && !firstChar.isEmpty()) {
-                token.firstChar = firstChar.charAt(0);
+            if (token.isSimpleFilter() && token.rawText.isEmpty()) {
+                lastEnd += length;
+                continue;
             }
 
-            if (token.rawText == null) { // spaceMode == 0
-                token.rawText = filterMatcher.group("tokenB");
-                token.quotes = token.rawText.length() > 1 && token.rawText.startsWith("\"")
-                        && token.rawText.endsWith("\"");
+            if (spaceMode == 0) { // and
+                tokens.add(lastToken = token);
+            } else if (spaceMode == 1) { // space
 
-                if (token.quotes) {
-                    token.rawText = token.rawText.substring(1, token.rawText.length() - 1);
+                if (lastToken != null && lastToken.isSimpleFilter() && token.isSimpleFilter()) {
+                    lastToken.rawText = filterText.substring(lastToken.start, token.end).trim();
+                    lastToken.words[0] = lastToken.rawText;
+                    lastToken.end = token.end;
+                } else {
+                    tokens.add(lastToken = token);
+                }
+
+            } else if (spaceMode == 2) { // and-x
+
+                if (lastToken != null && lastToken.isSimpleFilter() && token.isSimpleFilter()) {
+                    final String[] newWords = new String[lastToken.words.length + token.words.length];
+
+                    System.arraycopy(lastToken.words, 0, newWords, 0, lastToken.words.length);
+                    System.arraycopy(token.words, 0, newWords, lastToken.words.length, token.words.length);
+
+                    lastToken.words = newWords;
+                    lastToken.rawText = filterText.substring(lastToken.start, token.end).trim();
+                    lastToken.end = token.end;
+                } else {
+                    tokens.add(lastToken = token);
                 }
 
-                token.words = new String[] { token.rawText.trim() };
-            } else if (spaceMode == 2) {
-                token.words = token.rawText.trim().split("\\s+");
-            } else {
-                token.words = new String[] { token.rawText.trim() };
             }
 
-            tokens.add(token);
+            lastEnd += length;
         }
 
         return tokens;
     }
 
-    private String getPrefixes() {
-        StringBuilder prefixes = new StringBuilder().append('\0');
+    private SearchToken createToken(int lastEnd, String[] part, String prefixes) {
+        final SearchToken token = new SearchToken();
+        String pref = part[0];
+        String query = part[1].trim();
 
-        for (ISearchParserProvider provider : getProviders()) {
-            if (provider.getSearchMode() == SearchMode.PREFIX) {
-                prefixes.append(getRedefinedPrefix(provider.getPrefix()));
+        token.start = lastEnd;
+        token.end = lastEnd + pref.length() + query.length();
+
+        if (pref.startsWith("-")) {
+            token.ignore = '-';
+            pref = pref.substring(1);
+        } else if (pref.startsWith("!")) {
+            token.ignore = '!';
+            pref = pref.substring(1);
+        }
+
+        if (!pref.isEmpty()) {
+            char firstChar = pref.charAt(0);
+
+            if (prefixes.indexOf(firstChar) >= 0) {
+                token.firstChar = firstChar;
+                pref = pref.substring(1);
             }
         }
 
-        return prefixes.toString();
+        String text = pref + query;
+        token.quotes = text.length() > 1 && text.startsWith("\"") && text.endsWith("\"");
+
+        if (token.quotes) {
+            text = text.substring(1, text.length() - 1);
+        }
+
+        token.rawText = text;
+        token.words = new String[] { token.quotes ? text.replaceAll("\\\\\"", "\"") : text };
+        return token;
+    }
+
+    public List<String[]> splitByDelimiters(String input, String delimiters, boolean space) {
+
+        if (delimiters == null || delimiters.isEmpty()) {
+            return Collections.singletonList(new String[] { "", input });
+        }
+
+        final List<String[]> tokens = new ArrayList<>();
+        final int length = input.length();
+        boolean insideQuotes = false;
+        String token = "";
+        int lastEnd = 0;
+        int index = 0;
+
+        while (index < length) {
+            final char ch = input.charAt(index);
+
+            if (!insideQuotes && delimiters.indexOf(ch) >= 0
+                    && (!space || index == 0 || input.charAt(index - 1) == ' ')) {
+
+                if (lastEnd == index) {
+                    token += String.valueOf(ch);
+                } else {
+                    tokens.add(new String[] { token, input.substring(lastEnd, index) });
+                    token = String.valueOf(ch);
+                }
+
+                lastEnd = index + 1;
+            } else if (!insideQuotes && space && ch != ' ' && (index > 0 && input.charAt(index - 1) == ' ')) {
+                tokens.add(new String[] { token, input.substring(lastEnd, index) });
+                token = "";
+
+                lastEnd = index;
+            }
+
+            if (ch == '"' && (index == 0 || input.charAt(index - 1) != '\\')) {
+                insideQuotes = !insideQuotes;
+            }
+
+            index++;
+        }
+
+        tokens.add(new String[] { token, input.substring(lastEnd) });
+
+        return tokens;
+    }
+
+    public String getPrefixes() {
+        if (this.prefixes == null) {
+            final StringBuilder builder = new StringBuilder();
+
+            for (ISearchParserProvider provider : getProviders()) {
+                if (provider.getSearchMode() == SearchTokenParser.SearchMode.PREFIX) {
+                    builder.append(getRedefinedPrefix(provider.getPrefix()));
+                }
+            }
+
+            this.prefixes = builder.toString();
+        }
+
+        return this.prefixes;
     }
 
     public char getRedefinedPrefix(char prefix) {
         return this.prefixRedefinitions.getOrDefault(prefix, prefix);
     }
 
-    private ItemFilter parseSearchText(String filterText) {
-
-        if (filterText.isEmpty()) {
-            return null;
-        }
-
-        final AllMultiItemFilter searchTokens = new AllMultiItemFilter();
-        final List<SearchToken> tokens = splitSearchText(filterText);
-
-        for (SearchToken token : tokens) {
-            if (!token.rawText.isEmpty()) {
-                ItemFilter result = parseToken(token);
-
-                if (token.ignore) {
-                    searchTokens.filters.add(new NegatedItemFilter(result));
-                } else {
-                    searchTokens.filters.add(result);
-                }
-            } else if (!token.ignore) {
-                searchTokens.filters.add(new NothingItemFilter());
-            }
-        }
-
-        return searchTokens;
-    }
-
-    private ItemFilter parseToken(SearchToken token) {
-        final ISearchParserProvider provider = token.firstChar == null ? null : this.getProvider(token.firstChar);
-
-        if (provider == null || provider.getSearchMode() == SearchMode.NEVER) {
-            final List<ItemFilter> filters = new ArrayList<>();
-
-            for (ISearchParserProvider _provider : getProviders()) {
-                if (_provider.getSearchMode() == SearchMode.ALWAYS) {
-                    AllMultiItemFilter filter = generateFilters(_provider, token.words);
-
-                    if (!filter.filters.isEmpty()) {
-                        filters.add(filter);
-                    }
-                }
-            }
-
-            return filters.isEmpty() ? new NothingItemFilter() : new AnyMultiItemFilter(filters);
-        } else {
-            return generateFilters(provider, token.words);
-        }
-    }
-
-    private AllMultiItemFilter generateFilters(ISearchParserProvider provider, String[] words) {
-        final AllMultiItemFilter filters = new AllMultiItemFilter();
-
-        for (String work : words) {
-            final ItemFilter filter = provider.getFilter(work);
-
-            if (filter != null) {
-                filters.filters.add(filter);
-            }
-        }
-
-        return filters;
-    }
 }

src/main/java/codechicken/nei/ServerHandler.java

@@ -21,10 +21,8 @@ import cpw.mods.fml.common.gameevent.TickEvent.Phase;
 
 public class ServerHandler {
 
-    private static ServerHandler instance;
-
     public static void load() {
-        instance = new ServerHandler();
+        ServerHandler instance = new ServerHandler();
 
         PacketCustom.assignHandler(NEICPH.channel, new NEISPH());
         FMLCommonHandler.instance().bus().register(instance);

src/main/java/codechicken/nei/SpawnerRenderer.java

@@ -9,7 +9,6 @@ import net.minecraft.entity.Entity;
 import net.minecraft.entity.boss.BossStatus;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
 import net.minecraftforge.client.IItemRenderer;
 
 import org.lwjgl.opengl.GL11;
@@ -27,21 +26,16 @@ public class SpawnerRenderer implements IItemRenderer {
 
     public void renderInventoryItem(RenderBlocks render, ItemStack item) {
         int meta = item.getItemDamage();
-
         if (meta == 0) meta = ItemMobSpawner.idPig;
-
         String bossName = BossStatus.bossName;
         int bossTimeout = BossStatus.statusBarTime;
         boolean bossHasColorModifier = BossStatus.hasColorModifier;
+        Entity entity = ItemMobSpawner.getEntity(meta);
         try {
-            World world = NEIClientUtils.mc().theWorld;
-            ItemMobSpawner.loadSpawners(world);
             CCRenderState.changeTexture(TextureMap.locationBlocksTexture);
             render.renderBlockAsItem(Blocks.mob_spawner, 0, 1F);
+            entity.setWorld(render.minecraftRB.theWorld);
             GL11.glPushMatrix();
-
-            Entity entity = ItemMobSpawner.getEntity(meta);
-            entity.setWorld(world);
             float f1 = 0.4375F;
             if (entity.getShadowSize() > 1.5) f1 = 0.1F;
             GL11.glRotatef((float) (ClientUtils.getRenderTime() * 10), 0.0F, 1.0F, 0.0F);
@@ -51,7 +45,6 @@ public class SpawnerRenderer implements IItemRenderer {
             entity.setLocationAndAngles(0, 0, 0, 0.0F, 0.0F);
             RenderManager.instance.renderEntityWithPosYaw(entity, 0.0D, 0.0D, 0.0D, 0.0F, 0);
             GL11.glPopMatrix();
-
             GL11.glEnable(GL12.GL_RESCALE_NORMAL);
             OpenGlHelper.setActiveTexture(OpenGlHelper.lightmapTexUnit);
             GL11.glDisable(GL11.GL_TEXTURE_2D);

src/main/java/codechicken/nei/SubsetWidget.java

@@ -1,26 +1,30 @@
 package codechicken.nei;
 
 import java.awt.Point;
+import java.io.File;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
+import java.util.Set;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTBase;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.util.EnumChatFormatting;
 
 import org.lwjgl.opengl.GL11;
 
+import com.google.gson.JsonParser;
+
 import codechicken.core.gui.GuiScrollSlot;
 import codechicken.lib.gui.GuiDraw;
 import codechicken.lib.vec.Rectangle4i;
@@ -32,17 +36,21 @@ import codechicken.nei.api.API;
 import codechicken.nei.api.ItemFilter;
 import codechicken.nei.api.ItemFilter.ItemFilterProvider;
 import codechicken.nei.guihook.GuiContainerManager;
-import codechicken.nei.guihook.IContainerTooltipHandler;
+import codechicken.nei.recipe.GuiCraftingRecipe;
+import codechicken.nei.recipe.GuiRecipeTab;
+import codechicken.nei.recipe.ICraftingHandler;
+import codechicken.nei.recipe.IRecipeHandler;
+import codechicken.nei.recipe.StackInfo;
+import codechicken.nei.util.NBTJson;
+import codechicken.nei.util.NEIMouseUtils;
 
-public class SubsetWidget extends Button implements ItemFilterProvider, IContainerTooltipHandler {
+public class SubsetWidget extends Button implements ItemFilterProvider {
 
     protected static final int SLOT_HEIGHT = 18;
     protected static final int MARGIN = 2;
     protected static final char PREFIX = '%';
 
-    protected static ReentrantReadWriteLock hiddenItemLock = new ReentrantReadWriteLock();
-    protected static Lock hiddenWriteLock = hiddenItemLock.writeLock();
-    protected static Lock hiddenReadLock = hiddenItemLock.readLock();
+    private static final Object hiddenLock = new Object();
 
     public static class SubsetTag {
 
@@ -185,7 +193,7 @@ public class SubsetWidget extends Button implements ItemFilterProvider, IContain
         }
 
         public String name() {
-            int idx = this.fullname.indexOf('.');
+            int idx = this.fullname.lastIndexOf('.');
             return idx < 0 ? this.fullname : this.fullname.substring(idx + 1);
         }
 
@@ -355,16 +363,31 @@ public class SubsetWidget extends Button implements ItemFilterProvider, IContain
     private static class DefaultParserProvider implements ISearchParserProvider {
 
         public ItemFilter getFilter(String searchText) {
+            final int patternMode = NEIClientConfig.getIntSetting("inventory.search.patternMode");
+            Pattern pattern = null;
+            if (patternMode != 3) {
+                searchText = searchText.replaceAll("\\s+", "").toLowerCase();
+            } else {
+                pattern = SearchField.getPattern(searchText, patternMode);
+            }
             final AnyMultiItemFilter filter = new AnyMultiItemFilter();
-            final String pathPart = searchText.replaceAll("\\s+", "").toLowerCase();
+            final Set<ItemStack> filteredItems = new HashSet<>();
+            final List<SubsetTag> snapshot;
 
-            for (SubsetTag tag : tags.values()) {
-                if (tag.filter != null && tag.path.contains(pathPart)) {
-                    filter.filters.add(tag.filter);
+            synchronized (tags) {
+                snapshot = new ArrayList<>(tags.values());
+            }
+
+            for (SubsetTag tag : snapshot) {
+                if (tag.filter != null && matches(tag.path, searchText, pattern)) {
+                    synchronized (tag.items) {
+                        filteredItems.addAll(tag.items);
+                        filter.filters.add(tag.filter);
+                    }
                 }
             }
 
-            return filter;
+            return stack -> filteredItems.contains(stack) || !ItemList.items.contains(stack) && filter.matches(stack);
         }
 
         public char getPrefix() {
@@ -379,12 +402,21 @@ public class SubsetWidget extends Button implements ItemFilterProvider, IContain
         public SearchMode getSearchMode() {
             return SearchMode.fromInt(NEIClientConfig.getIntSetting("inventory.search.subsetsSearchMode"));
         }
+
+        private boolean matches(String name, String searchText, Pattern pattern) {
+            if (pattern != null) {
+                return pattern.matcher(name).find();
+            } else {
+                return name.contains(searchText);
+            }
+        }
     }
 
     /**
      * All operations on this variable should be synchronised.
      */
     private static final ItemStackSet hiddenItems = new ItemStackSet();
+
     private static final Map<String, SubsetTag> tags = new HashMap<>();
     private static final SubsetTag root = new SubsetTag("");
     protected static boolean enableSearchBySubsets = false;
@@ -407,24 +439,26 @@ public class SubsetWidget extends Button implements ItemFilterProvider, IContain
             }
 
             updateHiddenItems();
+            SearchField.searchParser.clearCache();
+        }
+    }
+
+    public static void removeTag(String path) {
+        updateState.stop();
+
+        synchronized (tags) {
+            tags.keySet().removeIf(
+                    parentpath -> parentpath.equals(path.toLowerCase())
+                            || parentpath.startsWith(path.toLowerCase() + "."));
+            updateHiddenItems();
+            SearchField.searchParser.clearCache();
         }
     }
 
     public static boolean isHidden(ItemStack item) {
-        try {
-            if (hiddenReadLock.tryLock(5, TimeUnit.SECONDS)) {
-                try {
-                    return hiddenItems.contains(item);
-                } finally {
-                    hiddenReadLock.unlock();
-                }
-            } else {
-                NEIClientConfig.logger.error("Unable to obtain read lock in 'isHidden'");
-            }
-        } catch (InterruptedException e) {
-            e.printStackTrace();
+        synchronized (hiddenLock) {
+            return hiddenItems.contains(item);
         }
-        return false;
     }
 
     private static List<ItemStack> getItems(SubsetTag tag, List<ItemStack> items) {
@@ -438,90 +472,45 @@ public class SubsetWidget extends Button implements ItemFilterProvider, IContain
     }
 
     public static void showOnly(SubsetTag tag) {
-        try {
-            if (hiddenWriteLock.tryLock(5, TimeUnit.SECONDS)) {
-                try {
-                    hiddenItems.clear();
-                    hiddenItems.addAll(getItems(root, new ArrayList<>()));
-                    hiddenItems.removeAll(getItems(tag, new ArrayList<>()));
-                } finally {
-                    hiddenWriteLock.unlock();
-                }
-            } else {
-                NEIClientConfig.logger.error("Unable to obtain write lock in 'showOnly'");
-            }
-
-            calculateVisibility();
-        } catch (InterruptedException e) {
-            e.printStackTrace();
+        synchronized (hiddenLock) {
+            hiddenItems.clear();
+            hiddenItems.addAll(getItems(root, new ArrayList<>()));
+            hiddenItems.removeAll(getItems(tag, new ArrayList<>()));
         }
+
+        calculateVisibility();
     }
 
     public static void setHidden(SubsetTag tag, boolean hidden) {
-        try {
-            if (hiddenWriteLock.tryLock(5, TimeUnit.SECONDS)) {
-                try {
-                    List<ItemStack> tagItems = getItems(tag, new ArrayList<>());
+        synchronized (hiddenLock) {
+            final List<ItemStack> tagItems = getItems(tag, new ArrayList<>());
 
-                    if (hidden) {
-                        hiddenItems.addAll(tagItems);
-                    } else {
-                        hiddenItems.removeAll(tagItems);
-                    }
-
-                } finally {
-                    hiddenWriteLock.unlock();
-                }
+            if (hidden) {
+                hiddenItems.addAll(tagItems);
             } else {
-                NEIClientConfig.logger.error("Unable to obtain write lock in 'setHidden'");
+                hiddenItems.removeAll(tagItems);
             }
-
-            calculateVisibility();
-        } catch (InterruptedException e) {
-            e.printStackTrace();
         }
+
+        calculateVisibility();
     }
 
     public static void setHidden(ItemStack item, boolean hidden) {
-        try {
-            if (hiddenWriteLock.tryLock(5, TimeUnit.SECONDS)) {
-                try {
-
-                    if (hidden) {
-                        hiddenItems.add(item);
-                    } else {
-                        hiddenItems.remove(item);
-                    }
-
-                } finally {
-                    hiddenWriteLock.unlock();
-                }
+        synchronized (hiddenLock) {
+            if (hidden) {
+                hiddenItems.add(item);
             } else {
-                NEIClientConfig.logger.error("Unable to obtain write lock in 'setHidden'");
+                hiddenItems.remove(item);
             }
-
-            calculateVisibility();
-        } catch (InterruptedException e) {
-            e.printStackTrace();
         }
+        calculateVisibility();
     }
 
     public static void unhideAll() {
-        try {
-            if (hiddenWriteLock.tryLock(5, TimeUnit.SECONDS)) {
-                try {
-                    hiddenItems.clear();
-                } finally {
-                    hiddenWriteLock.unlock();
-                }
-            } else {
-                NEIClientConfig.logger.error("Unable to obtain write lock in 'unhideAll'");
-            }
-
-            calculateVisibility();
-        } catch (InterruptedException e) {
-            e.printStackTrace();
+        synchronized (hiddenLock) {
+            hiddenItems.clear();
         }
+        calculateVisibility();
     }
 
     public static void updateHiddenItems() {
@@ -530,6 +519,68 @@ public class SubsetWidget extends Button implements ItemFilterProvider, IContain
         }
     }
 
+    public static void loadCustomSubsets() {
+        File dir = new File(NEIClientConfig.configDir, "subsets");
+
+        if (!dir.exists() || !dir.isDirectory()) {
+            return;
+        }
+
+        Stream.of(dir.listFiles()).filter(file -> !file.isDirectory()).forEach(file -> {
+            ClientHandler.loadSettingsFile(
+                    "subsets/" + file.getName(),
+                    lines -> parseFile(file.getName(), lines.collect(Collectors.toList())));
+        });
+    }
+
+    private static void parseFile(String resource, List<String> itemStrings) {
+        final JsonParser parser = new JsonParser();
+        final int dotIndex = resource.lastIndexOf('.');
+        final String subsetNamespace = dotIndex > 0 ? resource.substring(0, dotIndex) : resource;
+        SubsetTag processedTag = new SubsetTag(subsetNamespace, new ItemStackSet());
+
+        for (String itemStr : itemStrings) {
+            try {
+                if (itemStr.startsWith("; ")) {
+                    addTag(processedTag);
+
+                    final String handlerName = itemStr.substring(2);
+                    final IRecipeHandler recipeHandler = Stream
+                            .concat(
+                                    GuiCraftingRecipe.craftinghandlers.stream(),
+                                    GuiCraftingRecipe.serialCraftingHandlers.stream())
+                            .filter(handler -> handlerName.equals(getHandlerName(handler))).findFirst().orElse(null);
+                    String recipeName = handlerName;
+
+                    if (recipeHandler != null) {
+                        recipeName = recipeHandler.getRecipeName().trim();
+                    }
+
+                    processedTag = new SubsetTag(
+                            subsetNamespace + "." + recipeName.replace(".", ""),
+                            new ItemStackSet());
+                } else {
+                    final NBTBase nbt = NBTJson.toNbt(parser.parse(itemStr));
+
+                    if (nbt instanceof NBTTagCompound tag) {
+                        ((ItemStackSet) processedTag.filter).add(StackInfo.loadFromNBT(tag));
+                    } else {
+                        throw new IllegalArgumentException(
+                                "Expected NBTTagCompound but got " + nbt.getClass().getSimpleName());
+                    }
+                }
+            } catch (Exception e) {
+                NEIClientConfig.logger.error("Failed to load custom subset items from json string:\n{}", itemStr);
+            }
+        }
+
+        addTag(processedTag);
+    }
+
+    private static String getHandlerName(ICraftingHandler handler) {
+        return GuiRecipeTab.getHandlerInfo(handler).getHandlerName();
+    }
+
     public static void loadHidden() {
         final List<ItemStack> itemList = new LinkedList<>();
 
@@ -544,29 +595,20 @@ public class SubsetWidget extends Button implements ItemFilterProvider, IContain
             return;
         }
 
-        try {
-            if (hiddenWriteLock.tryLock(5, TimeUnit.SECONDS)) {
-                try {
-                    hiddenItems.clear();
-                    hiddenItems.addAll(itemList);
-                } finally {
-                    hiddenWriteLock.unlock();
-                }
-            } else {
-                NEIClientConfig.logger.error("Unable to obtain second write lock in 'loadHidden'");
-            }
-        } catch (InterruptedException e) {
-            e.printStackTrace();
+        synchronized (hiddenLock) {
+            hiddenItems.clear();
+            hiddenItems.addAll(itemList);
         }
-
     }
 
     public static void saveHidden() {
         if (NEIClientConfig.world == null) return;
 
         final NBTTagList list = new NBTTagList();
-        for (ItemStack stack : hiddenItems.values()) {
-            list.appendTag(stack.writeToNBT(new NBTTagCompound()));
+        synchronized (hiddenLock) {
+            for (ItemStack stack : hiddenItems.values()) {
+                list.appendTag(stack.writeToNBT(new NBTTagCompound()));
+            }
         }
 
         NEIClientConfig.world.nbt.setTag("hiddenItems", list);
@@ -584,14 +626,22 @@ public class SubsetWidget extends Button implements ItemFilterProvider, IContain
         public void execute() {
 
             try {
-                List<SubsetTag> list = new ArrayList<>(tags.values());
+                final List<SubsetTag> list;
+
+                synchronized (tags) {
+                    list = new ArrayList<>(tags.values());
+                }
 
                 root.clearCache();
 
                 list.parallelStream().forEach(tag -> {
                     tag.clearCache();
-                    ItemList.items.stream().filter(tag.filter::matches).map(ItemStack::copy)
-                            .collect(Collectors.toCollection(() -> tag.items));
+
+                    if (!(tag.filter instanceof NothingItemFilter)) {
+                        ItemList.items.stream().filter(tag.filter::matches)
+                                .collect(Collectors.toCollection(() -> tag.items));
+                    }
+
                 });
 
                 for (SubsetTag tag : list) {
@@ -627,6 +677,7 @@ public class SubsetWidget extends Button implements ItemFilterProvider, IContain
                 e.printStackTrace();
             }
 
+            SearchField.searchParser.clearCache();
         }
     }
 
@@ -643,6 +694,11 @@ public class SubsetWidget extends Button implements ItemFilterProvider, IContain
         if (NEIClientConfig.subsetWidgetOnTop()) {
             return NEIClientUtils.translate("inventory.item_subsets");
         } else {
+            final String translated = NEIClientUtils.translate("gui.button.label.subset");
+            if (!translated.startsWith("nei.")) { // Optional localization string for resource packs
+                return translated;
+            }
+
             return EnumChatFormatting.DARK_PURPLE + String.valueOf(SearchField.searchParser.getRedefinedPrefix(PREFIX))
                     + EnumChatFormatting.RESET;
         }
@@ -684,7 +740,7 @@ public class SubsetWidget extends Button implements ItemFilterProvider, IContain
 
             root.resize(screen, parent, dropRight);
 
-            GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS);
+            GL11.glPushAttrib(GL11.GL_ENABLE_BIT | GL11.GL_COLOR_BUFFER_BIT | GL11.GL_LIGHTING_BIT);
             GuiContainerManager.enable2DRender();
             GuiContainerManager.drawItems.zLevel += 100;
 
@@ -835,27 +891,27 @@ public class SubsetWidget extends Button implements ItemFilterProvider, IContain
     }
 
     @Override
-    public Map<String, String> handleHotkeys(GuiContainer gui, int mousex, int mousey, Map<String, String> hotkeys) {
+    public Map<String, String> handleHotkeys(int mousex, int mousey, Map<String, String> hotkeys) {
 
         if (SubsetWidget.hoverStack != null) {
 
             if (NEIClientConfig.canCheatItem(SubsetWidget.hoverStack)) {
                 hotkeys.put(
-                        NEIClientUtils.translate("subsets.item.cheat.key"),
+                        NEIClientUtils.getKeyName(NEIClientUtils.CTRL_HASH, NEIMouseUtils.MOUSE_BTN_LMB),
                         NEIClientUtils.translate("subsets.item.cheat"));
             }
 
             if (SubsetWidget.enableSearchBySubsets) {
                 hotkeys.put(
-                        NEIClientUtils.translate("subsets.item.search.key"),
+                        NEIClientUtils.getKeyName(NEIClientUtils.SHIFT_HASH, NEIMouseUtils.MOUSE_BTN_LMB),
                         NEIClientUtils.translate("subsets.item.search"));
             }
 
             hotkeys.put(
-                    NEIClientUtils.translate("subsets.item.show.key"),
+                    NEIMouseUtils.getKeyName(NEIMouseUtils.MOUSE_BTN_LMB),
                     NEIClientUtils.translate("subsets.item.show"));
             hotkeys.put(
-                    NEIClientUtils.translate("subsets.item.hide.key"),
+                    NEIMouseUtils.getKeyName(NEIMouseUtils.MOUSE_BTN_RMB),
                     NEIClientUtils.translate("subsets.item.hide"));
         } else if (SubsetWidget.hoverTag != null) {
             hotkeys.put(
@@ -864,12 +920,16 @@ public class SubsetWidget extends Button implements ItemFilterProvider, IContain
 
             if (SubsetWidget.enableSearchBySubsets) {
                 hotkeys.put(
-                        NEIClientUtils.translate("subsets.tag.search.key"),
+                        NEIClientUtils.getKeyName(NEIClientUtils.SHIFT_HASH, NEIMouseUtils.MOUSE_BTN_LMB),
                         NEIClientUtils.translate("subsets.tag.search"));
             }
 
-            hotkeys.put(NEIClientUtils.translate("subsets.tag.show.key"), NEIClientUtils.translate("subsets.tag.show"));
-            hotkeys.put(NEIClientUtils.translate("subsets.tag.hide.key"), NEIClientUtils.translate("subsets.tag.hide"));
+            hotkeys.put(
+                    NEIMouseUtils.getKeyName(NEIMouseUtils.MOUSE_BTN_LMB),
+                    NEIClientUtils.translate("subsets.tag.show"));
+            hotkeys.put(
+                    NEIMouseUtils.getKeyName(NEIMouseUtils.MOUSE_BTN_RMB),
+                    NEIClientUtils.translate("subsets.tag.hide"));
         }
 
         return hotkeys;

src/main/java/codechicken/nei/TextField.java

@@ -89,7 +89,7 @@ public abstract class TextField extends Widget {
             onTextChange(oldText);
         }
 
-        return handled;
+        return handled || keyID == Keyboard.KEY_SPACE;
     }
 
     public abstract void onTextChange(String oldText);

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

@@ -1,6 +1,7 @@
 package codechicken.nei;
 
 import java.util.List;
+import java.util.Map;
 
 import net.minecraft.item.ItemStack;
 
@@ -14,8 +15,6 @@ public abstract class Widget {
 
     public void postDraw(int mx, int my) {}
 
-    public void postDrawTooltips(int mx, int my, List<String> tooltip) {}
-
     public boolean handleClick(int mx, int my, int button) {
         return true;
     }
@@ -38,6 +37,10 @@ public abstract class Widget {
         return false;
     }
 
+    public Map<String, String> handleHotkeys(int mousex, int mousey, Map<String, String> hotkeys) {
+        return hotkeys;
+    }
+
     public void update() {}
 
     public Rectangle4i bounds() {
@@ -58,6 +61,14 @@ public abstract class Widget {
         return tooltip;
     }
 
+    public List<String> handleItemTooltip(ItemStack itemstack, int mousex, int mousey, List<String> tooltip) {
+        return tooltip;
+    }
+
+    public boolean isFocused() {
+        return false;
+    }
+
     public void loseFocus() {}
 
     public void gainFocus() {}
@@ -67,4 +78,5 @@ public abstract class Widget {
     public int z;
     public int w;
     public int h;
+
 }

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

@@ -0,0 +1,254 @@
+package codechicken.nei;
+
+import java.awt.Point;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Predicate;
+
+import net.minecraft.item.ItemStack;
+
+import codechicken.lib.gui.GuiDraw;
+import codechicken.lib.vec.Rectangle4i;
+
+public class WidgetContainer extends Widget {
+
+    protected final List<Widget> widgets = new ArrayList<>();
+    protected boolean isFocused = false;
+
+    public void addWidget(Widget widget) {
+        this.widgets.add(widget);
+    }
+
+    public void setWidgets(List<Widget> widgets) {
+        final boolean isFocused = this.isFocused;
+        clear();
+        loseFocus();
+
+        for (Widget widget : widgets) {
+            addWidget(widget);
+        }
+
+        this.isFocused = isFocused;
+    }
+
+    public void clear() {
+        this.widgets.clear();
+        this.isFocused = false;
+    }
+
+    public List<Widget> getWidgets() {
+        return Collections.unmodifiableList(this.widgets);
+    }
+
+    public boolean removeIf(Predicate<Widget> filter) {
+        return this.widgets.removeIf(filter);
+    }
+
+    @Override
+    public void draw(int mousex, int mousey) {
+        drawWidgets(mousex, mousey);
+    }
+
+    protected void drawWidgets(int mousex, int mousey) {
+        final Rectangle4i bounds = bounds();
+
+        for (Widget widget : this.widgets) {
+            if (widget.bounds().intersects(bounds)) {
+                widget.draw(mousex, mousey);
+            }
+        }
+    }
+
+    @Override
+    public void update() {
+
+        for (Widget widget : this.widgets) {
+            widget.update();
+        }
+
+        Collections.sort(this.widgets, Comparator.comparingInt((Widget widget) -> widget.z));
+    }
+
+    public Widget getWidgetUnderMouse(int mousex, int mousey) {
+
+        if (!bounds().contains(mousex, mousey)) {
+            return null;
+        }
+
+        for (int index = this.widgets.size() - 1; index >= 0; index--) {
+            final Widget widget = this.widgets.get(index);
+            if (widget.contains(mousex, mousey)) {
+                return widget;
+            }
+        }
+
+        return null;
+    }
+
+    @Override
+    public boolean onMouseWheel(int scroll, int mousex, int mousey) {
+        final Widget widget = getWidgetUnderMouse(mousex, mousey);
+
+        return widget != null && widget.onMouseWheel(scroll, mousex, mousey);
+    }
+
+    @Override
+    public boolean handleClick(int mousex, int mousey, int button) {
+
+        if (contains(mousex, mousey)) {
+            gainFocus();
+        }
+
+        final Widget widget = getWidgetUnderMouse(mousex, mousey);
+
+        return widget != null && widget.handleClick(mousex, mousey, button);
+    }
+
+    @Override
+    public boolean handleClickExt(int mousex, int mousey, int button) {
+        loseFocus();
+
+        for (int index = this.widgets.size() - 1; index >= 0; index--) {
+            final Widget widget = this.widgets.get(index);
+            if (!widget.contains(mousex, mousey) && widget.handleClickExt(mousex, mousey, button)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    @Override
+    public void mouseDragged(int mousex, int mousey, int button, long heldTime) {
+
+        for (int index = this.widgets.size() - 1; index >= 0; index--) {
+            final Widget widget = this.widgets.get(index);
+            widget.mouseDragged(mousex, mousey, button, heldTime);
+        }
+    }
+
+    @Override
+    public void mouseUp(int mousex, int mousey, int button) {
+
+        for (int index = this.widgets.size() - 1; index >= 0; index--) {
+            final Widget widget = this.widgets.get(index);
+            widget.mouseUp(mousex, mousey, button);
+        }
+    }
+
+    @Override
+    public boolean handleKeyPress(int keyCode, char keyChar) {
+
+        for (int index = this.widgets.size() - 1; index >= 0; index--) {
+            final Widget widget = this.widgets.get(index);
+            if (widget.handleKeyPress(keyCode, keyChar)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    @Override
+    public void lastKeyTyped(int keyID, char keyChar) {
+
+        for (int index = this.widgets.size() - 1; index >= 0; index--) {
+            final Widget widget = this.widgets.get(index);
+            widget.lastKeyTyped(keyID, keyChar);
+        }
+
+    }
+
+    @Override
+    public boolean isFocused() {
+        return this.isFocused;
+    }
+
+    @Override
+    public void loseFocus() {
+
+        for (int index = this.widgets.size() - 1; index >= 0; index--) {
+            final Widget widget = this.widgets.get(index);
+            if (widget.isFocused()) {
+                widget.loseFocus();
+            }
+        }
+
+        this.isFocused = false;
+    }
+
+    @Override
+    public void gainFocus() {
+        final Point mouse = GuiDraw.getMousePosition();
+        final Widget widget = getWidgetUnderMouse(mouse.x, mouse.y);
+
+        if (widget != null) {
+
+            if (!widget.isFocused()) {
+                loseFocus();
+                widget.gainFocus();
+            }
+
+        } else {
+            loseFocus();
+        }
+
+        this.isFocused = true;
+    }
+
+    @Override
+    public ItemStack getStackMouseOver(int mousex, int mousey) {
+        final Widget widget = getWidgetUnderMouse(mousex, mousey);
+
+        if (widget != null) {
+            return widget.getStackMouseOver(mousex, mousey);
+        }
+
+        return null;
+    }
+
+    @Override
+    public void postDraw(int mousex, int mousey) {
+
+        for (Widget widget : this.widgets) {
+            widget.postDraw(mousex, mousey);
+        }
+
+    }
+
+    @Override
+    public void onGuiClick(int mousex, int mousey) {
+
+        for (int index = this.widgets.size() - 1; index >= 0; index--) {
+            final Widget widget = this.widgets.get(index);
+            widget.onGuiClick(mousex, mousey);
+        }
+
+    }
+
+    @Override
+    public List<String> handleTooltip(int mousex, int mousey, List<String> tooltip) {
+        final Widget widget = getWidgetUnderMouse(mousex, mousey);
+
+        if (widget != null) {
+            return widget.handleTooltip(mousex, mousey, tooltip);
+        }
+
+        return tooltip;
+    }
+
+    @Override
+    public Map<String, String> handleHotkeys(int mousex, int mousey, Map<String, String> hotkeys) {
+        final Widget widget = getWidgetUnderMouse(mousex, mousey);
+
+        if (widget != null) {
+            return widget.handleHotkeys(mousex, mousey, hotkeys);
+        }
+
+        return hotkeys;
+    }
+
+}

src/main/java/codechicken/nei/WorldOverlayRenderer.java

@@ -38,7 +38,11 @@ public class WorldOverlayRenderer implements IKeyStateTracker {
     public void tickKeyStates() {
         if (Minecraft.getMinecraft().currentScreen != null) return;
 
-        if (KeyManager.keyStates.get("world.moboverlay").down) mobOverlay = (mobOverlay + 1) % 2;
+        if (KeyManager.keyStates.get("world.moboverlay").down) {
+            mobOverlay = (mobOverlay + 1) % 2;
+            NEIClientUtils
+                    .printChatMessage(new ChatComponentText(NEIClientUtils.translate("chat.moboverlay." + mobOverlay)));
+        }
         if (KeyManager.keyStates.get("world.chunkoverlay").down) {
             chunkOverlay = (chunkOverlay + 1) % (NEIModContainer.isGT5Loaded() ? 4 : 3);
             // 0-2 (or 3 with gt)
@@ -73,9 +77,11 @@ public class WorldOverlayRenderer implements IKeyStateTracker {
         }
 
         World world = entity.worldObj;
+        int worldHeight = world.getHeight();
+
         int x1 = (int) entity.posX;
         int z1 = (int) entity.posZ;
-        int y1 = (int) MathHelper.clip(entity.posY, 16, world.getHeight() - 16);
+        int y1 = (int) MathHelper.clip(entity.posY, 16, worldHeight - 16);
 
         for (int i = 0; i <= 32; i++) {
             int x = x1 - 16 + i;
@@ -94,6 +100,12 @@ public class WorldOverlayRenderer implements IKeyStateTracker {
 
                 for (int k = 0; k <= 32; k++) {
                     int y = y1 - 16 + k;
+
+                    if (y >= worldHeight) {
+                        mobSpawnCache[bufIndex + k] = -1;
+                        continue;
+                    }
+
                     if (y > maxHeight) {
                         mobSpawnCache[bufIndex + k] = -1;
                         break;
@@ -177,6 +189,10 @@ public class WorldOverlayRenderer implements IKeyStateTracker {
     private static final AxisAlignedBB aabb = AxisAlignedBB.getBoundingBox(0, 0, 0, 0, 0, 0);
 
     private static byte getSpawnMode(Chunk chunk, int x, int y, int z) {
+        if (y >= chunk.worldObj.getHeight()) {
+            return 0;
+        }
+
         if (chunk.getSavedLightValue(EnumSkyBlock.Block, x & 15, y, z & 15) >= 8
                 || !SpawnerAnimals.canCreatureTypeSpawnAtLocation(EnumCreatureType.monster, chunk.worldObj, x, y, z)) {
             return 0;

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

@@ -3,6 +3,7 @@ package codechicken.nei.api;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Objects;
 
 import net.minecraft.block.Block;
 import net.minecraft.client.gui.inventory.GuiContainer;
@@ -164,8 +165,13 @@ public class API {
      * Add or replace the name normally shown on the item tooltip
      */
     public static void setOverrideName(ItemStack item, String name) {
-        if (!name.equals(ItemInfo.nameOverrides.get(item))) {
-            ItemInfo.nameOverrides.put(item, name);
+        String existing = ItemInfo.nameOverrides.get(item);
+        if (!Objects.equals(name, existing)) {
+            if (name == null) {
+                ItemInfo.nameOverrides.remove(item);
+            } else {
+                ItemInfo.nameOverrides.put(item, name);
+            }
             LayoutManager.markItemsDirty();
         }
     }

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

@@ -9,6 +9,7 @@ import net.minecraft.inventory.Slot;
 
 import org.lwjgl.opengl.GL11;
 
+import codechicken.nei.NEIClientUtils;
 import codechicken.nei.PositionedStack;
 import codechicken.nei.guihook.GuiContainerManager;
 
@@ -23,7 +24,7 @@ public class DefaultOverlayRenderer implements IRecipeOverlayRenderer {
 
     @Override
     public void renderOverlay(GuiContainerManager gui, Slot slot) {
-        GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS);
+        GL11.glPushAttrib(GL11.GL_ENABLE_BIT | GL11.GL_COLOR_BUFFER_BIT | GL11.GL_LIGHTING_BIT);
         GL11.glEnable(GL11.GL_BLEND);
         GL11.glBlendFunc(770, 1);
 
@@ -38,11 +39,7 @@ public class DefaultOverlayRenderer implements IRecipeOverlayRenderer {
     }
 
     private static void drawHover(int x, int y) {
-        GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS);
-        GL11.glDisable(GL11.GL_LIGHTING);
-        GL11.glDisable(GL11.GL_DEPTH_TEST);
-        drawRect(x, y, 16, 16, 0x66555555);
-        GL11.glPopAttrib();
+        NEIClientUtils.gl2DRenderContext(() -> drawRect(x, y, 16, 16, 0x66555555));
     }
 
     final IStackPositioner positioner;

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

@@ -16,7 +16,6 @@ import codechicken.nei.NEIDummySlotHandler;
 import codechicken.nei.NEIPotionGuiHandler;
 import codechicken.nei.recipe.CheatItemHandler;
 import codechicken.nei.recipe.FillFluidContainerHandler;
-import codechicken.nei.recipe.GuiRecipeCatalyst;
 import codechicken.nei.recipe.SearchInputDropHandler;
 
 public class GuiInfo {
@@ -31,7 +30,6 @@ public class GuiInfo {
         API.registerNEIGuiHandler(new NEICreativeGuiHandler());
         API.registerNEIGuiHandler(new NEIChestGuiHandler());
         API.registerNEIGuiHandler(new NEIDummySlotHandler());
-        API.registerNEIGuiHandler(new GuiRecipeCatalyst(null));
         API.registerNEIGuiHandler(new SearchInputDropHandler());
         API.registerNEIGuiHandler(new FillFluidContainerHandler());
         API.registerNEIGuiHandler(new CheatItemHandler());

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

@@ -1,11 +1,26 @@
 package codechicken.nei.api;
 
 import java.util.ArrayList;
+import java.util.List;
 
 import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
 public interface IBookmarkContainerHandler {
 
+    default List<ItemStack> getStorageStacks(GuiContainer guiContainer) {
+        final List<Slot> slots = guiContainer.inventorySlots.inventorySlots;
+        final List<ItemStack> stacks = new ArrayList<>();
+
+        for (int i = 0; i < slots.size() - 4 * 9; i++) {
+            if (slots.get(i).getHasStack()) {
+                stacks.add(slots.get(i).getStack().copy());
+            }
+        }
+
+        return stacks;
+    }
+
     void pullBookmarkItemsFromContainer(GuiContainer guiContainer, ArrayList<ItemStack> realItems);
 }

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

@@ -14,7 +14,23 @@ import codechicken.nei.recipe.IRecipeHandler;
 
 public interface IOverlayHandler {
 
-    void overlayRecipe(GuiContainer firstGui, IRecipeHandler recipe, int recipeIndex, boolean shift);
+    void overlayRecipe(GuiContainer firstGui, IRecipeHandler recipe, int recipeIndex, boolean maxTransfer);
+
+    default int transferRecipe(GuiContainer firstGui, IRecipeHandler recipe, int recipeIndex, int multiplier) {
+        return 0;
+    }
+
+    default boolean canFillCraftingGrid(GuiContainer firstGui, IRecipeHandler recipe, int recipeIndex) {
+        return true;
+    }
+
+    default boolean craft(GuiContainer firstGui, IRecipeHandler recipe, int recipeIndex, int multiplier) {
+        return false;
+    }
+
+    default boolean canCraft(GuiContainer firstGui, IRecipeHandler handler, int recipeIndex) {
+        return false;
+    }
 
     default List<ItemOverlayState> presenceOverlay(GuiContainer firstGui, IRecipeHandler recipe, int recipeIndex) {
         final List<ItemOverlayState> itemPresenceSlots = new ArrayList<>();
@@ -25,7 +41,7 @@ public interface IOverlayHandler {
                                 && s.getStack().stackSize > 0
                                 && s.isItemValid(s.getStack())
                                 && s.canTakeStack(firstGui.mc.thePlayer))
-                .map(s -> s.getStack().copy()).collect(Collectors.toCollection(ArrayList::new));
+                .map(s -> s.getStack().copy()).collect(Collectors.toList());
 
         for (PositionedStack stack : ingredients) {
             Optional<ItemStack> used = invStacks.stream().filter(is -> is.stackSize > 0 && stack.contains(is))

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

@@ -1,18 +1,14 @@
 package codechicken.nei.api;
 
-import java.util.List;
-
-import codechicken.nei.PositionedStack;
 import codechicken.nei.recipe.IRecipeHandler;
 
 public interface IRecipeFilter {
 
     public static interface IRecipeFilterProvider {
 
-        public IRecipeFilter getFilter();
+        public IRecipeFilter getRecipeFilter();
     }
 
-    public boolean matches(IRecipeHandler handler, List<PositionedStack> ingredients, PositionedStack result,
-            List<PositionedStack> others);
+    public boolean matches(IRecipeHandler handler, int recipeIndex);
 
 }

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

@@ -6,9 +6,22 @@ import net.minecraftforge.fluids.FluidStack;
 
 public interface IStackStringifyHandler {
 
-    public NBTTagCompound convertItemStackToNBT(ItemStack stack, boolean saveStackSize);
+    default NBTTagCompound convertItemStackToNBT(ItemStack stack, boolean saveStackSize) {
+        return null;
+    }
 
-    public ItemStack convertNBTToItemStack(NBTTagCompound nbtTag);
+    default ItemStack convertNBTToItemStack(NBTTagCompound nbtTag) {
+        return null;
+    }
+
+    default FluidStack getFluid(ItemStack stack) {
+        return null;
+    }
+
+    default ItemStack normalizeRecipeQueryStack(ItemStack stack) {
+        return null;
+    }
+
+    default void pauseItemDamageSound(boolean pause) {}
 
-    public FluidStack getFluid(ItemStack stack);
 }

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

@@ -5,6 +5,7 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 import java.util.Map.Entry;
 
 import net.minecraft.block.Block;
@@ -64,6 +65,7 @@ import codechicken.nei.search.IdentifierFilter;
 import codechicken.nei.search.ModNameFilter;
 import codechicken.nei.search.OreDictionaryFilter;
 import codechicken.nei.search.TooltipFilter;
+import codechicken.nei.util.ItemUntranslator;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.ModContainer;
 import cpw.mods.fml.common.registry.GameRegistry;
@@ -123,12 +125,12 @@ public class ItemInfo {
         addMobSpawnerItem();
     }
 
-    public static void load(World world) {
+    public static void load() {
         addVanillaBlockProperties();
         addDefaultDropDowns();
         searchItems();
         parseModItems();
-        ItemMobSpawner.loadSpawners(world);
+        ItemMobSpawner.loadSpawners();
         addSpawnEggs();
         addInfiniteHandlers();
         addInputHandlers();
@@ -136,6 +138,10 @@ public class ItemInfo {
         addSearchProviders();
         RecipeItemInputHandler.load();
         PresetsList.load();
+
+        if (NEIClientConfig.enableItemUntranslator()) {
+            ItemUntranslator.getInstance().load();
+        }
     }
 
     private static void addSearchProviders() {
@@ -268,7 +274,8 @@ public class ItemInfo {
 
     @SuppressWarnings("unchecked")
     private static void parseModItems() {
-        HashMap<String, ItemStackSet> modSubsets = new HashMap<>();
+        final Map<String, ItemStackSet> modSubsets = new HashMap<>();
+
         for (Item item : (Iterable<Item>) Item.itemRegistry) {
             UniqueIdentifier ident = null;
             try {
@@ -280,14 +287,12 @@ public class ItemInfo {
                 continue;
             }
 
-            String modId = ident.modId;
-            itemOwners.put(item, modId);
-            ItemStackSet itemset = modSubsets.get(modId);
-            if (itemset == null) modSubsets.put(modId, itemset = new ItemStackSet());
-            itemset.with(item);
+            itemOwners.put(item, ident.modId);
+            modSubsets.computeIfAbsent(ident.modId, i -> new ItemStackSet()).with(item);
         }
 
         API.addSubset("Mod.Minecraft", modSubsets.remove("minecraft"));
+
         for (Entry<String, ItemStackSet> entry : modSubsets.entrySet()) {
             ModContainer mc = FMLCommonHandler.instance().findContainerFor(entry.getKey());
             if (mc == null) NEIClientConfig.logger.error("Missing container for " + entry.getKey());
@@ -323,44 +328,29 @@ public class ItemInfo {
     }
 
     private static void addDefaultDropDowns() {
+        final Item mob_spawner = Item.getItemFromBlock(Blocks.mob_spawner);
         API.addSubset("Items", item -> Block.getBlockFromItem(item.getItem()) == Blocks.air);
         API.addSubset("Blocks", item -> Block.getBlockFromItem(item.getItem()) != Blocks.air);
-        API.addSubset("Blocks.MobSpawners", ItemStackSet.of(Blocks.mob_spawner));
+        API.addSubset("Blocks.MobSpawners", item -> item.getItem() == mob_spawner);
     }
 
     @SuppressWarnings("unchecked")
     private static void searchItems() {
-        ItemStackSet tools = new ItemStackSet();
-        ItemStackSet picks = new ItemStackSet();
-        ItemStackSet shovels = new ItemStackSet();
-        ItemStackSet axes = new ItemStackSet();
-        ItemStackSet hoes = new ItemStackSet();
-        ItemStackSet swords = new ItemStackSet();
-        ItemStackSet chest = new ItemStackSet();
-        ItemStackSet helmets = new ItemStackSet();
-        ItemStackSet legs = new ItemStackSet();
-        ItemStackSet boots = new ItemStackSet();
-        ItemStackSet other = new ItemStackSet();
-        ItemStackSet ranged = new ItemStackSet();
-        ItemStackSet food = new ItemStackSet();
-        ItemStackSet potioningredients = new ItemStackSet();
-
-        ArrayList<ItemStackSet> creativeTabRanges = new ArrayList<>(CreativeTabs.creativeTabArray.length);
-        List<ItemStack> stackList = new LinkedList<>();
+        final Map<Integer, ItemStackSet> creativeTabRanges = new HashMap<>();
+        final List<ItemStack> stackList = new LinkedList<>();
 
         for (Item item : (Iterable<Item>) Item.itemRegistry) {
             if (item == null) continue;
 
             for (CreativeTabs itemTab : item.getCreativeTabs()) {
                 if (itemTab != null) {
-                    while (itemTab.getTabIndex() >= creativeTabRanges.size()) creativeTabRanges.add(null);
-                    ItemStackSet set = creativeTabRanges.get(itemTab.getTabIndex());
-                    if (set == null) creativeTabRanges.set(itemTab.getTabIndex(), set = new ItemStackSet());
+                    final ItemStackSet itemset = creativeTabRanges
+                            .computeIfAbsent(itemTab.getTabIndex(), i -> new ItemStackSet());
 
                     try {
                         stackList.clear();
                         item.getSubItems(item, itemTab, stackList);
-                        for (ItemStack stack : stackList) set.add(stack);
+                        itemset.addAll(stackList);
                     } catch (Exception e) {
                         NEIClientConfig.logger
                                 .error("Error loading sub-items for: " + item + ". Tab: " + itemTab.getTabLabel(), e);
@@ -368,41 +358,13 @@ public class ItemInfo {
                 }
             }
 
-            if (item.isDamageable()) {
-                tools.with(item);
-                if (item instanceof ItemPickaxe) picks.with(item);
-                else if (item instanceof ItemSpade) shovels.with(item);
-                else if (item instanceof ItemAxe) axes.with(item);
-                else if (item instanceof ItemHoe) hoes.with(item);
-                else if (item instanceof ItemSword) swords.with(item);
-                else if (item instanceof ItemArmor) switch (((ItemArmor) item).armorType) {
-                    case 0:
-                        helmets.with(item);
-                        break;
-                    case 1:
-                        chest.with(item);
-                        break;
-                    case 2:
-                        legs.with(item);
-                        break;
-                    case 3:
-                        boots.with(item);
-                        break;
-                }
-                else if (item == Items.arrow || item == Items.bow) ranged.with(item);
-                else if (item == Items.fishing_rod || item == Items.flint_and_steel || item == Items.shears)
-                    other.with(item);
-            }
-
-            if (item instanceof ItemFood) food.with(item);
-
             try {
-                LinkedList<ItemStack> subItems = new LinkedList<>();
+                final List<ItemStack> subItems = new LinkedList<>();
                 item.getSubItems(item, null, subItems);
+
                 for (ItemStack stack : subItems) {
                     if (item.isPotionIngredient(stack) && item.getPotionEffect(stack) != null) {
                         BrewingRecipeHandler.ingredients.add(stack);
-                        potioningredients.add(stack);
                     }
                 }
 
@@ -410,25 +372,33 @@ public class ItemInfo {
                 NEIClientConfig.logger.error("Error loading brewing ingredients for: " + item, e);
             }
         }
-        API.addSubset("Items.Tools.Pickaxes", picks);
-        API.addSubset("Items.Tools.Shovels", shovels);
-        API.addSubset("Items.Tools.Axes", axes);
-        API.addSubset("Items.Tools.Hoes", hoes);
-        API.addSubset("Items.Tools.Other", other);
-        API.addSubset("Items.Weapons.Swords", swords);
-        API.addSubset("Items.Weapons.Ranged", ranged);
-        API.addSubset("Items.Armor.Chestplates", chest);
-        API.addSubset("Items.Armor.Leggings", legs);
-        API.addSubset("Items.Armor.Helmets", helmets);
-        API.addSubset("Items.Armor.Boots", boots);
-        API.addSubset("Items.Food", food);
-        API.addSubset("Items.Potions.Ingredients", potioningredients);
+
+        API.addSubset("Items.Tools.Pickaxes", item -> item.getItem() instanceof ItemPickaxe);
+        API.addSubset("Items.Tools.Shovels", item -> item.getItem() instanceof ItemSpade);
+        API.addSubset("Items.Tools.Axes", item -> item.getItem() instanceof ItemAxe);
+        API.addSubset("Items.Tools.Hoes", item -> item.getItem() instanceof ItemHoe);
+        API.addSubset(
+                "Items.Tools.Other",
+                item -> item.getItem() == Items.fishing_rod || item.getItem() == Items.flint_and_steel
+                        || item.getItem() == Items.shears);
+        API.addSubset("Items.Weapons.Swords", item -> item.getItem() instanceof ItemSword);
+        API.addSubset("Items.Weapons.Ranged", item -> item.getItem() == Items.arrow || item.getItem() == Items.bow);
+        API.addSubset("Items.Armor.Helmets", item -> item.getItem() instanceof ItemArmor armor && armor.armorType == 0);
+        API.addSubset(
+                "Items.Armor.Chestplates",
+                item -> item.getItem() instanceof ItemArmor armor && armor.armorType == 1);
+        API.addSubset(
+                "Items.Armor.Leggings",
+                item -> item.getItem() instanceof ItemArmor armor && armor.armorType == 2);
+        API.addSubset("Items.Armor.Boots", item -> item.getItem() instanceof ItemArmor armor && armor.armorType == 3);
+        API.addSubset("Items.Food", item -> item.getItem() instanceof ItemFood);
+        API.addSubset("Items.Potions.Ingredients", BrewingRecipeHandler.ingredients);
 
         for (CreativeTabs tab : CreativeTabs.creativeTabArray) {
-            if (tab.getTabIndex() >= creativeTabRanges.size()) continue;
-            ItemStackSet set = creativeTabRanges.get(tab.getTabIndex());
-            if (set != null && !set.isEmpty())
-                API.addSubset("CreativeTabs." + I18n.format(tab.getTranslatedTabLabel()), set);
+            final ItemStackSet itemset = creativeTabRanges.get(tab.getTabIndex());
+            if (itemset != null && !itemset.isEmpty()) {
+                API.addSubset("CreativeTabs." + I18n.format(tab.getTranslatedTabLabel()), itemset);
+            }
         }
 
         BrewingRecipeHandler.searchPotions();
@@ -451,30 +421,38 @@ public class ItemInfo {
         Block mouseoverBlock = world.getBlock(x, y, z);
 
         ArrayList<ItemStack> items = new ArrayList<>();
-
         ArrayList<IHighlightHandler> handlers = new ArrayList<>();
+
         if (highlightIdentifiers.containsKey(null)) handlers.addAll(highlightIdentifiers.get(null));
         if (highlightIdentifiers.containsKey(mouseoverBlock)) handlers.addAll(highlightIdentifiers.get(mouseoverBlock));
+
         for (IHighlightHandler ident : handlers) {
-            ItemStack item = ident.identifyHighlight(world, player, hit);
+            final ItemStack item = ident.identifyHighlight(world, player, hit);
             if (item != null) items.add(item);
         }
 
-        if (items.size() > 0) return items;
+        if (!items.isEmpty()) return items;
 
-        ItemStack pick = mouseoverBlock.getPickBlock(hit, world, x, y, z, player);
-        if (pick != null) items.add(pick);
+        try {
+            final ItemStack pick = mouseoverBlock.getPickBlock(hit, world, x, y, z, player);
+            if (pick != null) items.add(pick);
+        } catch (Exception ignored) {}
+
+        if (!items.isEmpty()) return items;
+
+        if (mouseoverBlock instanceof IShearable shearable) {
+            if (shearable.isShearable(new ItemStack(Items.shears), world, x, y, z)) {
+                items.addAll(shearable.onSheared(new ItemStack(Items.shears), world, x, y, z, 0));
+            }
+        }
+
+        if (!items.isEmpty()) return items;
 
         try {
             items.addAll(mouseoverBlock.getDrops(world, x, y, z, world.getBlockMetadata(x, y, z), 0));
         } catch (Exception ignored) {}
-        if (mouseoverBlock instanceof IShearable) {
-            IShearable shearable = (IShearable) mouseoverBlock;
-            if (shearable.isShearable(new ItemStack(Items.shears), world, x, y, z))
-                items.addAll(shearable.onSheared(new ItemStack(Items.shears), world, x, y, z, 0));
-        }
 
-        if (items.size() == 0) items.add(0, new ItemStack(mouseoverBlock, 1, world.getBlockMetadata(x, y, z)));
+        if (items.isEmpty()) items.add(new ItemStack(mouseoverBlock, 1, world.getBlockMetadata(x, y, z)));
 
         return items;
     }

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

@@ -1,80 +1,139 @@
 package codechicken.nei.api;
 
-import static codechicken.lib.gui.GuiDraw.getMousePosition;
-
 import java.awt.Point;
-import java.awt.Toolkit;
-import java.awt.datatransfer.StringSelection;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;
 
 import org.lwjgl.input.Mouse;
 
-import codechicken.nei.ItemPanel.ItemPanelSlot;
+import codechicken.lib.gui.GuiDraw;
+import codechicken.nei.BookmarkContainerInfo;
+import codechicken.nei.FavoriteRecipes;
 import codechicken.nei.ItemPanels;
+import codechicken.nei.ItemQuantityField;
+import codechicken.nei.ItemsGrid.ItemsGridSlot;
 import codechicken.nei.LayoutManager;
 import codechicken.nei.NEIClientConfig;
 import codechicken.nei.NEIClientUtils;
-import codechicken.nei.PositionedStack;
-import codechicken.nei.recipe.BookmarkRecipeId;
+import codechicken.nei.SearchField;
+import codechicken.nei.bookmark.BookmarkGrid;
+import codechicken.nei.bookmark.BookmarkGroup;
+import codechicken.nei.bookmark.BookmarkItem;
+import codechicken.nei.bookmark.BookmarkItem.BookmarkItemType;
+import codechicken.nei.bookmark.BookmarksGridSlot;
+import codechicken.nei.recipe.AutoCraftingManager;
 import codechicken.nei.recipe.GuiCraftingRecipe;
+import codechicken.nei.recipe.GuiFavoriteButton;
 import codechicken.nei.recipe.GuiRecipe;
 import codechicken.nei.recipe.GuiUsageRecipe;
+import codechicken.nei.recipe.Recipe;
+import codechicken.nei.recipe.Recipe.RecipeId;
+import codechicken.nei.recipe.RecipeHandlerRef;
+import codechicken.nei.recipe.StackInfo;
+import codechicken.nei.recipe.chain.RecipeChainMath;
+import codechicken.nei.util.NEIMouseUtils;
 
 public abstract class ShortcutInputHandler {
 
+    private static class HotkeysCache {
+
+        public int mousex;
+        public int mousey;
+        public ItemStack stack;
+        public int groupId;
+        public Map<String, String> hotkeys = new HashMap<>();
+
+        public boolean matches(int mousex, int mousey, ItemStack stack, int groupId) {
+            return Math.abs(this.mousex - mousex) < 16 && Math.abs(this.mousey - mousey) < 16
+                    && (this.stack == null ? stack == null && this.groupId == groupId
+                            : stack != null && NEIClientUtils.areStacksSameTypeWithNBT(stack, this.stack));
+        }
+
+        public void update(int mousex, int mousey, ItemStack stack, int groupId, Map<String, String> hotkeys) {
+            this.mousex = mousex;
+            this.mousey = mousey;
+            this.stack = stack != null ? stack.copy() : null;
+            this.groupId = groupId;
+            this.hotkeys = hotkeys;
+        }
+    }
+
+    private static HotkeysCache hotkeysCache = new HotkeysCache();
+
     public static boolean handleKeyEvent(ItemStack stackover) {
 
         if (!NEIClientConfig.isLoaded()) {
             return false;
         }
 
-        if (NEIClientConfig.isKeyHashDown("gui.overlay_hide")) {
-            return hideOverlayRecipe();
-        }
-
-        if (NEIClientConfig.isKeyHashDown("gui.bookmark_pull_items")) {
-            return ItemPanels.bookmarkPanel.pullBookmarkItems(ItemPanels.bookmarkPanel.getHoveredGroupId(true), false);
-        }
-
-        if (NEIClientConfig.isKeyHashDown("gui.bookmark_pull_items_ingredients")) {
-            return ItemPanels.bookmarkPanel.pullBookmarkItems(ItemPanels.bookmarkPanel.getHoveredGroupId(true), true);
-        }
-
-        if (stackover == null && NEIClientConfig.isKeyHashDown("gui.remove_recipe")) {
-            final int groupId = ItemPanels.bookmarkPanel.getHoveredGroupId(true);
-
-            if (groupId != -1) {
-                ItemPanels.bookmarkPanel.removeGroup(groupId);
-                return true;
-            }
+        if (NEIClientConfig.isKeyHashDown("gui.overlay") && stackover == null
+                && LayoutManager.overlayRenderer != null) {
+            LayoutManager.overlayRenderer = null;
+            return true;
         }
 
         if (stackover == null) {
+            final int groupId = ItemPanels.bookmarkPanel.getHoveredGroupId(true);
+
+            if (groupId != -1) {
+
+                if (NEIClientConfig.isKeyHashDown("gui.remove_recipe")) {
+                    ItemPanels.bookmarkPanel.removeGroup(groupId);
+                    return true;
+                }
+
+                if (NEIClientConfig.isKeyHashDown("gui.bookmark_pull_items")) {
+                    return ItemPanels.bookmarkPanel.pullBookmarkItems(groupId, NEIClientUtils.shiftKey());
+                }
+
+                if (NEIClientConfig.autocraftingEnabled() && NEIClientConfig.isKeyHashDown("gui.craft_items")
+                        && NEIClientUtils.shiftKey()
+                        && ItemPanels.bookmarkPanel.getGrid().isCraftingMode(groupId)) {
+                    final RecipeChainMath math = ItemPanels.bookmarkPanel.getGrid().createRecipeChainMath(groupId);
+
+                    if (math != null) {
+
+                        if (!NEIClientUtils.controlKey()) {
+                            autocraftingIgnoreInventory(math);
+                        }
+
+                        AutoCraftingManager.runProcessing(math);
+                        return true;
+                    }
+                }
+
+            }
+
             return false;
         }
 
         stackover = stackover.copy();
 
         if (NEIClientConfig.isKeyHashDown("gui.overlay")) {
-            return openOverlayRecipe(stackover, false);
+            return openOverlayRecipe(stackover);
         }
 
         if (NEIClientConfig.isKeyHashDown("gui.copy_name")) {
             return copyItemStackName(stackover);
         }
+        if (NEIClientConfig.isKeyHashDown("gui.copy_id")) {
+            return copyItemStackID(stackover);
+        }
 
         if (NEIClientConfig.isKeyHashDown("gui.copy_oredict")) {
             return copyItemStackOreDictionary(stackover);
         }
 
-        if (NEIClientConfig.isKeyHashDown("gui.overlay_use")) {
-            return openOverlayRecipe(stackover, true);
+        if (NEIClientConfig.isKeyHashDown("gui.chat_link_item")) {
+            return sendItemStackChatLink(stackover);
         }
 
         if (NEIClientConfig.isKeyHashDown("gui.recipe")) {
@@ -85,20 +144,21 @@ public abstract class ShortcutInputHandler {
             return GuiUsageRecipe.openRecipeGui("item", stackover);
         }
 
+        if (NEIClientConfig.isKeyHashDown("gui.favorite")) {
+            return saveFavoriteTree(stackover);
+        }
+
         if (NEIClientConfig.isKeyHashDown("gui.bookmark")) {
-            return saveRecipeInBookmark(stackover, false, false);
+            return saveRecipeInBookmark(stackover, NEIClientUtils.shiftKey(), NEIClientUtils.controlKey());
         }
 
-        if (NEIClientConfig.isKeyHashDown("gui.bookmark_recipe")) {
-            return saveRecipeInBookmark(stackover, true, false);
+        if (NEIClientConfig.isKeyHashDown("gui.bookmark_pull_items")) {
+            return pullRecipeItems(stackover, NEIClientUtils.shiftKey());
         }
 
-        if (NEIClientConfig.isKeyHashDown("gui.bookmark_count")) {
-            return saveRecipeInBookmark(stackover, false, true);
-        }
-
-        if (NEIClientConfig.isKeyHashDown("gui.bookmark_recipe_count")) {
-            return saveRecipeInBookmark(stackover, true, true);
+        if (NEIClientConfig.autocraftingEnabled() && NEIClientConfig.isKeyHashDown("gui.craft_items")
+                && NEIClientUtils.shiftKey()) {
+            return runAutoCrafting(stackover, !NEIClientUtils.controlKey());
         }
 
         return false;
@@ -114,28 +174,32 @@ public abstract class ShortcutInputHandler {
             final int button = Mouse.getEventButton();
 
             if (button == 0) {
-                return GuiCraftingRecipe.openRecipeGui("item", stackover);
+                return GuiCraftingRecipe.openRecipeGui("item", stackover.copy());
             } else if (button == 1) {
-                return GuiUsageRecipe.openRecipeGui("item", stackover);
+                return GuiUsageRecipe.openRecipeGui("item", stackover.copy());
             }
         }
 
         return false;
     }
 
-    private static boolean hideOverlayRecipe() {
-
-        if (LayoutManager.overlayRenderer != null) {
-            LayoutManager.overlayRenderer = null;
-            return true;
-        }
-
-        return false;
+    private static boolean copyItemStackName(ItemStack stackover) {
+        GuiScreen.setClipboardString(SearchField.getEscapedSearchText(stackover));
+        return true;
     }
 
-    private static boolean copyItemStackName(ItemStack stackover) {
-        Toolkit.getDefaultToolkit().getSystemClipboard()
-                .setContents(new StringSelection(stackover.getDisplayName()), null);
+    private static boolean copyItemStackID(ItemStack stackover) {
+        if (stackover == null || stackover.getItem() == null) return false;
+        GuiScreen.setClipboardString(
+                stackover.getItem().delegate.name()
+                        + (stackover.getItemDamage() != 0 ? "/" + stackover.getItemDamage() : ""));
+        return true;
+    }
+
+    private static boolean sendItemStackChatLink(ItemStack stackover) {
+        if (stackover == null) return false;
+
+        NEIClientUtils.sendChatItemLink(stackover); // I wish clients could just send formatted messages
         return true;
     }
 
@@ -153,56 +217,482 @@ public abstract class ShortcutInputHandler {
             builder.deleteCharAt(builder.length() - 1);
         }
 
-        Toolkit.getDefaultToolkit().getSystemClipboard().setContents(new StringSelection(builder.toString()), null);
+        GuiScreen.setClipboardString(builder.toString());
         return true;
     }
 
-    private static boolean openOverlayRecipe(ItemStack stackover, boolean shift) {
-        final GuiContainer gui = NEIClientUtils.getGuiContainer();
-
-        if (gui == null || gui instanceof GuiRecipe) {
-            return false;
-        }
-
-        final Point mouseover = getMousePosition();
-        ItemPanelSlot panelSlot = ItemPanels.bookmarkPanel.getSlotMouseOver(mouseover.x, mouseover.y);
-        BookmarkRecipeId recipeId = null;
-
-        if (panelSlot != null) {
-            recipeId = ItemPanels.bookmarkPanel.getBookmarkRecipeId(panelSlot.slotIndex);
-        } else {
-            recipeId = ItemPanels.bookmarkPanel.getBookmarkRecipeId(stackover);
-        }
+    private static boolean runAutoCrafting(ItemStack stackover, boolean ignoreInventory) {
+        final RecipeId recipeId = GuiCraftingRecipe.getRecipeId(NEIClientUtils.getGuiContainer(), stackover);
 
         if (recipeId != null) {
-            return GuiCraftingRecipe.overlayRecipe(stackover, recipeId, shift);
+            final Point mouseover = GuiDraw.getMousePosition();
+            final BookmarksGridSlot slot = ItemPanels.bookmarkPanel.getSlotMouseOver(mouseover.x, mouseover.y);
+            RecipeChainMath math = null;
+
+            if (slot == null) {
+                final Recipe recipe = Recipe.of(recipeId);
+                if (recipe != null) {
+                    math = RecipeChainMath.of(recipe, 1);
+                }
+            } else if (slot.getRecipeId() != null && slot.getType() != BookmarkItemType.INGREDIENT) {
+
+                if (slot.getGroup().crafting == null) {
+                    final Recipe recipe = Recipe.of(slot.getRecipeId());
+                    if (recipe != null) {
+                        math = RecipeChainMath.of(recipe, Math.max(1, slot != null ? slot.getMultiplier() : 1));
+                    }
+                } else {
+                    math = ItemPanels.bookmarkPanel.getGrid()
+                            .createRecipeChainMath(slot.getGroupId(), slot.getRecipeId());
+                }
+
+            }
+
+            if (math != null) {
+
+                if (ignoreInventory) {
+                    autocraftingIgnoreInventory(math);
+                }
+
+                AutoCraftingManager.runProcessing(math);
+                return true;
+            }
         }
 
         return false;
     }
 
-    private static boolean saveRecipeInBookmark(ItemStack stack, boolean saveIngredients, boolean saveStackSize) {
+    private static boolean openOverlayRecipe(ItemStack stackover) {
+        final GuiContainer gui = NEIClientUtils.getGuiContainer();
+        final RecipeId recipeId = GuiCraftingRecipe.getRecipeId(gui, stackover);
 
-        if (stack != null) {
-            final GuiContainer gui = NEIClientUtils.getGuiContainer();
-            List<PositionedStack> ingredients = null;
-            String handlerName = "";
+        if (recipeId != null) {
+            final RecipeHandlerRef handlerRef = RecipeHandlerRef.of(recipeId);
 
-            if (gui instanceof GuiRecipe) {
-                ingredients = ((GuiRecipe<?>) gui).getFocusedRecipeIngredients();
-                handlerName = ((GuiRecipe<?>) gui).getHandlerName();
-                stack.stackSize = ((GuiRecipe<?>) gui).prepareFocusedRecipeResultStackSize(stack);
+            if (handlerRef != null) {
+
+                if (NEIClientUtils.shiftKey() && handlerRef.canFillCraftingGrid(gui)) {
+                    int multiplier = 0;
+
+                    if (NEIClientUtils.controlKey()) {
+                        final Point mouseover = GuiDraw.getMousePosition();
+                        final BookmarksGridSlot slot = ItemPanels.bookmarkPanel
+                                .getSlotMouseOver(mouseover.x, mouseover.y);
+                        multiplier = slot != null ? (int) Math.min(64, slot.getMultiplier()) : 1;
+                    }
+
+                    handlerRef.fillCraftingGrid(gui, multiplier);
+                } else if (!NEIClientUtils.shiftKey() && handlerRef.canUseOverlayRenderer(gui)) {
+                    handlerRef.useOverlayRenderer(gui);
+                }
+            }
+        }
+
+        return false;
+    }
+
+    private static boolean saveFavoriteTree(ItemStack stackover) {
+        final Point mouse = GuiDraw.getMousePosition();
+
+        if (ItemPanels.itemPanel.contains(mouse.x, mouse.y)
+                || ItemPanels.itemPanel.historyPanel.contains(mouse.x, mouse.y)) {
+            final RecipeHandlerRef handlerRef = RecipeHandlerRef.of(FavoriteRecipes.getFavorite(stackover));
+
+            if (handlerRef != null) {
+                final GuiFavoriteButton button = new GuiFavoriteButton(handlerRef, 0, 0);
+                button.saveRecipeInBookmark();
+                return true;
             }
 
-            ItemPanels.bookmarkPanel.addOrRemoveItem(stack, handlerName, ingredients, saveIngredients, saveStackSize);
             return true;
         }
 
         return false;
     }
 
-    public static Map<String, String> handleHotkeys(GuiContainer gui, int mousex, int mousey, ItemStack stack) {
-        return new HashMap<>();
+    private static boolean saveRecipeInBookmark(ItemStack stackover, boolean saveIngredients, boolean saveStackSize) {
+        final Point mousePos = GuiDraw.getMousePosition();
+
+        // If no slot was removed from the bookmark panel on click:
+        if (!ItemPanels.bookmarkPanel.removeSlot(mousePos.x, mousePos.y, saveIngredients)) {
+            final Recipe recipe = getFocusedRecipe(stackover, mousePos.x, mousePos.y, saveIngredients);
+
+            // --- Case 1: saving a recipe (with ingredients) ---
+            if (recipe != null && saveIngredients) {
+
+                // If the recipe is not already bookmarked, add it
+                if (!ItemPanels.bookmarkPanel.removeRecipe(recipe.getRecipeId(), BookmarkGrid.DEFAULT_GROUP_ID)) {
+                    final Recipe singleRecipe = Recipe.of(
+                            Arrays.asList(recipe.getResult(stackover)),
+                            recipe.getHandlerName(),
+                            recipe.getIngredients());
+                    singleRecipe.setCustomRecipeId(recipe.getRecipeId());
+
+                    ItemPanels.bookmarkPanel.addRecipe(
+                            singleRecipe,
+                            // Determine if stack size should be saved
+                            saveStackSize
+                                    || NEIClientConfig.getBooleanSetting("inventory.bookmarks.bookmarkRecipeWithCount")
+                                            ? 1
+                                            : 0,
+                            BookmarkGrid.DEFAULT_GROUP_ID);
+                }
+
+                // --- Case 2: saving an item only ---
+            } else {
+                final RecipeId recipeId = recipe != null ? recipe.getRecipeId() : null;
+
+                // Determine if the item is associated with a recipe and should be saved with it
+                final boolean existsRecipe = recipeId != null
+                        && ItemPanels.bookmarkPanel.existsRecipe(recipeId, BookmarkGrid.DEFAULT_GROUP_ID)
+                        || NEIClientConfig.getBooleanSetting("inventory.bookmarks.bookmarkItemsWithRecipe");
+
+                // If the item was not removed from the bookmarks, add it
+                if (!ItemPanels.bookmarkPanel
+                        .removeItem(stackover, existsRecipe ? recipeId : null, BookmarkGrid.DEFAULT_GROUP_ID)) {
+
+                    // Determine whether to preserve the item count
+                    saveStackSize = saveStackSize || saveIngredients
+                            || ItemPanels.bookmarkPanel.existsRecipe(recipeId, BookmarkGrid.DEFAULT_GROUP_ID);
+
+                    if (!saveStackSize) {
+                        stackover = StackInfo.withAmount(stackover, 0);
+                    } else if (ItemPanels.itemPanel.containsWithSubpanels(mousePos.x, mousePos.y)) {
+                        stackover = ItemQuantityField.prepareStackWithQuantity(stackover, 0);
+                    }
+
+                    ItemPanels.bookmarkPanel
+                            .addItem(stackover, existsRecipe ? recipeId : null, BookmarkGrid.DEFAULT_GROUP_ID);
+                }
+
+            }
+        }
+
+        return true;
+    }
+
+    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) {
+            recipe = guiRecipe.getFocusedRecipe();
+        }
+
+        return recipe;
+    }
+
+    private static boolean pullRecipeItems(ItemStack stackover, boolean shift) {
+        final Point mousePos = GuiDraw.getMousePosition();
+
+        if (ItemPanels.bookmarkPanel.contains(mousePos.x, mousePos.y)) {
+            stackover = ItemPanels.bookmarkPanel.getStackMouseOverWithQuantity(mousePos.x, mousePos.y);
+        } else if (ItemPanels.itemPanel.contains(mousePos.x, mousePos.y)) {
+            stackover = ItemPanels.itemPanel.getStackMouseOverWithQuantity(mousePos.x, mousePos.y);
+        } else if (ItemPanels.itemPanel.historyPanel.contains(mousePos.x, mousePos.y)) {
+            stackover = ItemPanels.itemPanel.historyPanel.getStackMouseOverWithQuantity(mousePos.x, mousePos.y);
+        } else {
+            stackover = ItemQuantityField.prepareStackWithQuantity(stackover, 0);
+        }
+
+        final RecipeChainMath math = RecipeChainMath
+                .of(Arrays.asList(BookmarkItem.of(-3, stackover)), Collections.emptySet());
+        return ItemPanels.bookmarkPanel.pullBookmarkItems(math, shift);
+    }
+
+    public static Map<String, String> handleHotkeys(int mousex, int mousey, ItemStack stack) {
+        final int groupId = ItemPanels.bookmarkPanel.getHoveredGroupId(true);
+
+        if (hotkeysCache.matches(mousex, mousey, stack, groupId)) {
+            return hotkeysCache.hotkeys;
+        }
+
+        final GuiContainer gui = NEIClientUtils.getGuiContainer();
+        final Map<String, String> hotkeys = new HashMap<>();
+
+        if (groupId != -1) {
+
+            hotkeys.put(
+                    NEIClientConfig.getKeyName("gui.remove_recipe"),
+                    NEIClientUtils.translate("bookmark.group.remove_recipe"));
+
+            if (BookmarkContainerInfo.getBookmarkContainerHandler(gui) != null) {
+                hotkeys.put(
+                        NEIClientConfig.getKeyName("gui.bookmark_pull_items"),
+                        NEIClientUtils.translate("bookmark.group.pull_items"));
+                hotkeys.put(
+                        NEIClientConfig.getKeyName("gui.bookmark_pull_items", NEIClientUtils.SHIFT_HASH),
+                        NEIClientUtils.translate("bookmark.group.pull_items_shift"));
+            }
+
+            if (NEIClientConfig.autocraftingEnabled() && ItemPanels.bookmarkPanel.getGrid().isCraftingMode(groupId)) {
+                hotkeys.put(
+                        NEIClientConfig
+                                .getKeyName("gui.craft_items", NEIClientUtils.SHIFT_HASH + NEIClientUtils.CTRL_HASH),
+                        NEIClientUtils.translate("bookmark.group.craft_missing"));
+                hotkeys.put(
+                        NEIClientConfig.getKeyName("gui.craft_items", NEIClientUtils.SHIFT_HASH),
+                        NEIClientUtils.translate("bookmark.group.craft_all"));
+            }
+
+            hotkeysCache.update(mousex, mousey, stack, groupId, hotkeys);
+            return hotkeys;
+        }
+
+        if (stack == null) {
+            hotkeysCache.update(mousex, mousey, stack, groupId, hotkeys);
+            return hotkeys;
+        }
+
+        final BookmarksGridSlot slot = ItemPanels.bookmarkPanel.getSlotMouseOver(mousex, mousey);
+        final RecipeId recipeId = getHotkeyRecipeId(gui, mousex, mousey, stack, slot);
+
+        if (slot != null) {
+            final BookmarkGroup group = slot.getGroup();
+
+            if (group.crafting != null && group.collapsed) {
+                hotkeys.put(
+                        NEIClientConfig.getKeyName("gui.bookmark", NEIClientUtils.SHIFT_HASH),
+                        NEIClientUtils.translate("bookmark.group.remove_recipe"));
+            } else if (slot.getRecipeId() == null || slot.getType() == BookmarkItemType.ITEM) {
+                hotkeys.put(
+                        NEIClientConfig.getKeyName("gui.bookmark"),
+                        NEIClientUtils.translate("bookmark.remove_item"));
+            } else if (group.crafting != null && group.crafting.recipeRelations.entrySet().stream().anyMatch(
+                    entry -> entry.getKey().equals(slot.getRecipeId())
+                            || entry.getValue().contains(slot.getRecipeId()))) {
+                                hotkeys.put(
+                                        NEIClientConfig.getKeyName("gui.bookmark", NEIClientUtils.SHIFT_HASH),
+                                        NEIClientUtils.translate("bookmark.remove_recipe"));
+                            } else {
+                                hotkeys.put(
+                                        NEIClientConfig.getKeyName("gui.bookmark", NEIClientUtils.SHIFT_HASH),
+                                        NEIClientUtils.translate("bookmark.remove_recipe"));
+
+                                if (slot.getType() == BookmarkItemType.INGREDIENT) {
+                                    hotkeys.put(
+                                            NEIClientConfig.getKeyName("gui.bookmark"),
+                                            NEIClientUtils.translate("bookmark.remove_item"));
+
+                                    hotkeys.put(
+                                            NEIClientConfig.getKeyName("gui.bookmark", NEIClientUtils.SHIFT_HASH),
+                                            NEIClientUtils.translate("bookmark.remove_recipe"));
+                                } else {
+                                    final BookmarkItem item = slot.getBookmarkItem();
+
+                                    if (ItemPanels.bookmarkPanel.getGrid().createChainItems(groupId).values().stream()
+                                            .noneMatch(
+                                                    m -> m.type == BookmarkItemType.RESULT && !m.equals(item)
+                                                            && item.equalsRecipe(m))) {
+                                        hotkeys.put(
+                                                NEIClientConfig.getKeyName("gui.bookmark"),
+                                                NEIClientUtils.translate("bookmark.remove_recipe"));
+                                    } else {
+                                        hotkeys.put(
+                                                NEIClientConfig.getKeyName("gui.bookmark"),
+                                                NEIClientUtils.translate("bookmark.remove_item"));
+                                        hotkeys.put(
+                                                NEIClientConfig.getKeyName("gui.bookmark", NEIClientUtils.SHIFT_HASH),
+                                                NEIClientUtils.translate("bookmark.remove_recipe"));
+                                    }
+
+                                }
+
+                            }
+
+            if (BookmarkContainerInfo.getBookmarkContainerHandler(gui) != null) {
+                hotkeys.put(
+                        NEIClientConfig.getKeyName("gui.bookmark_pull_items"),
+                        NEIClientUtils.translate("bookmark.group.pull_items"));
+                hotkeys.put(
+                        NEIClientConfig.getKeyName("gui.bookmark_pull_items", NEIClientUtils.SHIFT_HASH),
+                        NEIClientUtils.translate("bookmark.group.pull_items_shift"));
+            }
+
+        } else {
+            hotkeys.put(NEIClientConfig.getKeyName("gui.bookmark"), NEIClientUtils.translate("bookmark.add_item"));
+
+            if (StackInfo.getAmount(stack) > 0) {
+                hotkeys.put(
+                        NEIClientConfig.getKeyName("gui.bookmark", NEIClientUtils.CTRL_HASH),
+                        NEIClientUtils.translate("bookmark.add_item_with_count"));
+            }
+
+            if (recipeId != null) {
+                hotkeys.put(
+                        NEIClientConfig
+                                .getKeyName("gui.bookmark", NEIClientUtils.SHIFT_HASH + NEIClientUtils.CTRL_HASH),
+                        NEIClientUtils.translate("bookmark.add_item_with_recipe_and_count"));
+                hotkeys.put(
+                        NEIClientConfig.getKeyName("gui.bookmark", NEIClientUtils.SHIFT_HASH),
+                        NEIClientUtils.translate("bookmark.add_item_with_recipe"));
+            }
+
+            if ((ItemPanels.itemPanel.contains(mousex, mousey)
+                    || ItemPanels.itemPanel.historyPanel.contains(mousex, mousey)) && FavoriteRecipes.contains(stack)) {
+                hotkeys.put(
+                        NEIClientConfig.getKeyName("gui.favorite"),
+                        NEIClientUtils.translate("recipe.favorite.bookmark_recipe"));
+            }
+
+        }
+
+        hotkeys.put(NEIClientConfig.getKeyName("gui.recipe"), NEIClientUtils.translate("itempanel.open_crafting"));
+        hotkeys.put(NEIClientConfig.getKeyName("gui.usage"), NEIClientUtils.translate("itempanel.open_usage"));
+
+        hotkeys.put(NEIClientConfig.getKeyName("gui.copy_name"), NEIClientUtils.translate("itempanel.copy_name"));
+        hotkeys.put(NEIClientConfig.getKeyName("gui.copy_oredict"), NEIClientUtils.translate("itempanel.copy_oredict"));
+        hotkeys.put(NEIClientConfig.getKeyName("gui.copy_id"), NEIClientUtils.translate("itempanel.copy_id"));
+        hotkeys.put(
+                NEIClientConfig.getKeyName("gui.chat_link_item"),
+                NEIClientUtils.translate("itempanel.chat_link_item"));
+
+        if (!(gui instanceof GuiRecipe) && NEIClientConfig.canCheatItem(stack)) {
+            hotkeys.put(
+                    NEIClientUtils.getKeyName(NEIClientUtils.SHIFT_HASH, NEIMouseUtils.MOUSE_BTN_LMB),
+                    NEIClientUtils.translate("itempanel.open_crafting"));
+            hotkeys.put(
+                    NEIClientUtils.getKeyName(NEIClientUtils.SHIFT_HASH, NEIMouseUtils.MOUSE_BTN_RMB),
+                    NEIClientUtils.translate("itempanel.open_usage"));
+            hotkeys.put(
+                    NEIClientUtils.getKeyName(NEIClientUtils.CTRL_HASH, NEIMouseUtils.MOUSE_BTN_LMB),
+                    NEIClientUtils.translate("itempanel.infinite_item"));
+        } else {
+            hotkeys.put(
+                    NEIMouseUtils.getKeyName(NEIMouseUtils.MOUSE_BTN_LMB),
+                    NEIClientUtils.translate("itempanel.open_crafting"));
+            hotkeys.put(
+                    NEIMouseUtils.getKeyName(NEIMouseUtils.MOUSE_BTN_RMB),
+                    NEIClientUtils.translate("itempanel.open_usage"));
+        }
+
+        if (recipeId != null) {
+            final RecipeHandlerRef handlerRef = RecipeHandlerRef.of(recipeId);
+
+            if (handlerRef != null) {
+
+                if (handlerRef.canUseOverlayRenderer(gui)) {
+                    hotkeys.put(
+                            NEIClientConfig.getKeyName("gui.overlay"),
+                            NEIClientUtils.translate("itempanel.overlay_recipe"));
+                }
+
+                if (handlerRef.canFillCraftingGrid(gui)) {
+                    hotkeys.put(
+                            NEIClientConfig.getKeyName("gui.overlay", NEIClientUtils.SHIFT_HASH),
+                            NEIClientUtils.translate("itempanel.fill_crafting_grid"));
+
+                    if (handlerRef.allowedTransferAlghoritm(gui)) {
+                        hotkeys.put(
+                                NEIClientConfig.getKeyName(
+                                        "gui.overlay",
+                                        NEIClientUtils.SHIFT_HASH + NEIClientUtils.CTRL_HASH),
+                                NEIClientUtils.translate("itempanel.fill_crafting_grid_quantity"));
+                    }
+                }
+
+                if (NEIClientConfig.autocraftingEnabled()) {
+                    hotkeys.put(
+                            NEIClientConfig.getKeyName(
+                                    "gui.craft_items",
+                                    NEIClientUtils.SHIFT_HASH + NEIClientUtils.CTRL_HASH),
+                            NEIClientUtils.translate("itempanel.craft_missing"));
+                    hotkeys.put(
+                            NEIClientConfig.getKeyName("gui.craft_items", NEIClientUtils.SHIFT_HASH),
+                            NEIClientUtils.translate("itempanel.craft_all"));
+                }
+            }
+
+        }
+
+        hotkeysCache.update(mousex, mousey, stack, groupId, hotkeys);
+
+        return hotkeys;
+    }
+
+    private static void autocraftingIgnoreInventory(RecipeChainMath math) {
+        final GuiContainer guiContainer = NEIClientUtils.getGuiContainer();
+        final List<ItemStack> playerInventory = AutoCraftingManager.getInventoryItems(guiContainer).values();
+        final RecipeId rootRecipeId = math.createMasterRoot();
+
+        for (BookmarkItem item : math.recipeIngredients) {
+            if (item.amount > 0 && rootRecipeId.equals(item.recipeId)) {
+                long amount = 0;
+
+                for (ItemStack stack : playerInventory) {
+                    if (NEIClientUtils.areStacksSameTypeCraftingWithNBT(stack, item.itemStack)) {
+                        amount += StackInfo.getAmount(stack);
+                    }
+                }
+
+                if (amount >= item.amount) {
+                    item.factor = item.amount = amount + item.amount - (amount % item.amount);
+                }
+            }
+        }
+    }
+
+    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

@@ -413,7 +413,7 @@ public class NEITransformer implements IClassTransformer {
                 if (name.equals("net.minecraftforge.oredict.OreDictionary")) {
                     ClassReader cr = new ClassReader(bytes);
                     ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_FRAMES);
-                    cr.accept(new OreDictionaryVisitor(ASM5, cw), ClassReader.SKIP_DEBUG | ClassReader.SKIP_FRAMES);
+                    cr.accept(new OreDictionaryVisitor(ASM5, cw), 0);
                     bytes = cw.toByteArray();
                 }
                 bytes = transformSubclasses(name, bytes);

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

@@ -0,0 +1,390 @@
+package codechicken.nei.bookmark;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import codechicken.nei.BookmarkPanel.BookmarkViewMode;
+import codechicken.nei.ItemSorter;
+import codechicken.nei.bookmark.BookmarkItem.BookmarkItemType;
+import codechicken.nei.bookmark.RecipeChainDetails.BookmarkChainItem;
+import codechicken.nei.bookmark.RecipeChainDetails.CalculatedType;
+import codechicken.nei.recipe.Recipe.RecipeId;
+import codechicken.nei.recipe.StackInfo;
+
+public class BookmarkGridGenerator {
+
+    protected final BookmarkGrid grid;
+    public List<BookmarksGridSlot> gridMask = null;
+
+    public final Map<Integer, Integer> rowToGroupId = new HashMap<>();
+    public final Map<Integer, RecipeId> itemToRecipe = new HashMap<>();
+
+    public final Map<Integer, Integer> slotToItem = new LinkedHashMap<>();
+    public final Map<Integer, Integer> itemToSlot = new LinkedHashMap<>();
+
+    public final Map<Integer, BookmarkChainItem> caclulatedItems = new HashMap<>();
+
+    public int pageCount = 0;
+    public int maxAbsoluteSlotIndex = 0;
+
+    public BookmarkGridGenerator(BookmarkGrid grid) {
+        this.grid = grid;
+    }
+
+    public int getRowGroupId(int rowIndex) {
+        final int absoluteRowIndex = rowIndex + (this.grid.getPage() - 1) * this.grid.getRows();
+        return rowToGroupId.getOrDefault(absoluteRowIndex, BookmarkGrid.DEFAULT_GROUP_ID);
+    }
+
+    public void generate() {
+        BookmarkItem prevBookmarkItem = null;
+        Map<Integer, String> borderGrid = new HashMap<>();
+        int gridColumns = this.grid.getColumns();
+        int size = this.grid.size();
+        int absoluteSlotIndex = -2;
+        int itemIndex = 0;
+
+        this.pageCount = 0;
+        this.maxAbsoluteSlotIndex = 0;
+        this.gridMask = new ArrayList<>();
+        this.itemToRecipe.clear();
+        this.caclulatedItems.clear();
+        this.slotToItem.clear();
+        this.itemToSlot.clear();
+        this.rowToGroupId.clear();
+
+        if (this.grid.isEmpty() || this.grid.getPerPage() == 0) {
+            return;
+        }
+
+        while (itemIndex < size && absoluteSlotIndex != -1) {
+            final BookmarkItem bookmarkItem = this.grid.getBookmarkItem(itemIndex);
+            final BookmarkGroup group = this.grid.getGroup(bookmarkItem.groupId);
+
+            if (group.crafting != null && (!group.crafting.calculatedItems.containsKey(itemIndex)
+                    || bookmarkItem.recipeId != null && !bookmarkItem.recipeId
+                            .equals(group.crafting.itemToRecipe.getOrDefault(itemIndex, bookmarkItem.recipeId)))) {
+                itemIndex++;
+            } else if (group.collapsed) {
+                final List<Integer> results = getGroupResults(bookmarkItem.groupId, itemIndex, size);
+                final String groupKey = "group:" + bookmarkItem.groupId;
+
+                for (int index = 0; index < results.size(); index++) {
+                    final int collapsedItemIndex = results.get(index);
+                    final BookmarkItem item = this.grid.getBookmarkItem(collapsedItemIndex);
+                    final int nextSlotIndex = nextSlotIndex(
+                            absoluteSlotIndex + 1,
+                            prevBookmarkItem,
+                            item,
+                            BookmarkViewMode.DEFAULT);
+
+                    if (nextSlotIndex == -1 || index > 0 && (nextSlotIndex % gridColumns) == 0) {
+                        break;
+                    }
+
+                    prevBookmarkItem = item;
+                    absoluteSlotIndex = nextSlotIndex;
+                    this.slotToItem.put(absoluteSlotIndex, collapsedItemIndex);
+                    this.itemToSlot.put(collapsedItemIndex, absoluteSlotIndex);
+                    this.caclulatedItems.put(collapsedItemIndex, getItem(group, collapsedItemIndex));
+                    borderGrid.put(absoluteSlotIndex, groupKey);
+                }
+
+                while (itemIndex < size && this.grid.getBookmarkItem(itemIndex).groupId == bookmarkItem.groupId) {
+                    itemIndex++;
+                }
+
+            } else if (group.crafting != null && group.viewMode == BookmarkViewMode.DEFAULT) {
+                final List<Integer> results = getGroupResults(bookmarkItem.groupId, itemIndex, size);
+                List<Integer> shadows;
+
+                for (int index = 0; index < results.size() && absoluteSlotIndex != -1; index++) {
+                    final int collapsedItemIndex = results.get(index);
+                    final BookmarkItem item = this.grid.getBookmarkItem(collapsedItemIndex);
+
+                    if ((absoluteSlotIndex = nextSlotIndex(
+                            absoluteSlotIndex + 1,
+                            prevBookmarkItem,
+                            item,
+                            BookmarkViewMode.DEFAULT)) != -1) {
+                        prevBookmarkItem = item;
+                        this.slotToItem.put(absoluteSlotIndex, collapsedItemIndex);
+                        this.itemToSlot.put(collapsedItemIndex, absoluteSlotIndex);
+                        this.caclulatedItems.put(collapsedItemIndex, getItem(group, collapsedItemIndex));
+
+                        if (item.recipeId != null && !(shadows = getShadows(group, item.recipeId)).isEmpty()) {
+                            borderGrid.put(absoluteSlotIndex, "recipe:" + shadows.get(0));
+                        }
+                    }
+                }
+
+                while (itemIndex < size && this.grid.getBookmarkItem(itemIndex).groupId == bookmarkItem.groupId) {
+                    itemIndex++;
+                }
+
+            } else if (group.crafting != null && group.crafting.itemToRecipe.values().contains(bookmarkItem.recipeId)) {
+                absoluteSlotIndex = generateCollapsedRecipe(prevBookmarkItem, itemIndex, absoluteSlotIndex, borderGrid);
+                prevBookmarkItem = bookmarkItem;
+
+                while (itemIndex < size && bookmarkItem.equalsRecipe(this.grid.getBookmarkItem(itemIndex))) {
+                    itemIndex++;
+                }
+
+            } else if ((absoluteSlotIndex = nextSlotIndex(
+                    absoluteSlotIndex + 1,
+                    prevBookmarkItem,
+                    bookmarkItem,
+                    group.viewMode)) != -1) {
+                        prevBookmarkItem = bookmarkItem;
+                        this.slotToItem.put(absoluteSlotIndex, itemIndex);
+                        this.itemToSlot.put(itemIndex, absoluteSlotIndex);
+                        this.caclulatedItems.put(itemIndex, getItem(group, itemIndex));
+                        itemIndex++;
+                    }
+        }
+
+        this.maxAbsoluteSlotIndex = this.slotToItem.keySet().stream().mapToInt(index -> index).max().orElse(-1) + 1;
+        generateGroups();
+        splitGridMask();
+        calculateGroupBorders(borderGrid);
+    }
+
+    private List<Integer> getGroupResults(int groupId, int itemIndex, int size) {
+        final BookmarkGroup group = this.grid.getGroup(groupId);
+        final List<Integer> results = new ArrayList<>();
+
+        while (itemIndex < size) {
+            final BookmarkItem bookmarkItem = this.grid.getBookmarkItem(itemIndex);
+
+            if (bookmarkItem == null || bookmarkItem.groupId != groupId) {
+                break;
+            }
+
+            if (bookmarkItem.type != BookmarkItemType.INGREDIENT
+                    && (group.crafting == null || group.crafting.calculatedItems.containsKey(itemIndex))) {
+                results.add(itemIndex);
+            }
+
+            itemIndex++;
+        }
+
+        return results;
+    }
+
+    private int generateCollapsedRecipe(BookmarkItem prevBookmarkItem, int itemIndex, int absoluteSlotIndex,
+            Map<Integer, String> borderGrid) {
+        final BookmarkItem bookmarkItem = this.grid.getBookmarkItem(itemIndex);
+        final BookmarkGroup group = this.grid.getGroup(bookmarkItem.groupId);
+        final List<Integer> shadows = getShadows(group, bookmarkItem.recipeId);
+        final String borderId = "recipe:" + shadows.get(0);
+
+        shadows.sort(generateSortingComparator(group.crafting.calculatedItems));
+
+        for (int shadowIndex : shadows) {
+            final boolean isIngredient = shadows.get(0) != shadowIndex
+                    || group.crafting.calculatedItems.get(shadowIndex).calculatedType == CalculatedType.INGREDIENT;
+            final BookmarkItem shadowBookmarkItem = BookmarkItem.of(
+                    bookmarkItem.groupId,
+                    bookmarkItem.itemStack,
+                    1,
+                    bookmarkItem.recipeId,
+                    isIngredient ? BookmarkItemType.INGREDIENT : BookmarkItemType.RESULT,
+                    Collections.emptyMap());
+
+            if ((absoluteSlotIndex = nextSlotIndex(
+                    absoluteSlotIndex + 1,
+                    prevBookmarkItem,
+                    shadowBookmarkItem,
+                    group.viewMode)) != -1) {
+                this.slotToItem.put(absoluteSlotIndex, shadowIndex);
+                this.itemToSlot.put(shadowIndex, absoluteSlotIndex);
+                this.caclulatedItems.put(shadowIndex, getItem(group, shadowIndex));
+                this.itemToRecipe.put(shadowIndex, bookmarkItem.recipeId);
+                borderGrid.put(absoluteSlotIndex, borderId);
+                prevBookmarkItem = shadowBookmarkItem;
+            }
+
+        }
+
+        return absoluteSlotIndex;
+    }
+
+    private List<Integer> getShadows(BookmarkGroup group, RecipeId recipeId) {
+        return group.crafting.itemToRecipe.entrySet().stream().filter(entry -> recipeId.equals(entry.getValue()))
+                .map(entry -> entry.getKey()).collect(Collectors.toList());
+    }
+
+    private int nextSlotIndex(int index, BookmarkItem previousMeta, BookmarkItem meta, BookmarkViewMode viewMode) {
+        int gridColumns = this.grid.getColumns();
+        int maxIndex = this.grid.getRows() * gridColumns;
+        int j = 0;
+
+        index = Math.max(0, index);
+
+        while (j++ < maxIndex) {
+            final boolean isFirstColumn = (index % gridColumns) == 0;
+
+            if (this.grid.isInvalidSlot(index % maxIndex)) {
+                index++;
+            } else if (!isFirstColumn && (previousMeta == null || previousMeta.groupId != meta.groupId)) {
+                // new group must start on a new line
+                index++;
+            } else if (viewMode == BookmarkViewMode.DEFAULT) {
+                return index;
+            } else if (isFirstColumn && (meta.recipeId == null || previousMeta == null
+                    || previousMeta.groupId != meta.groupId
+                    || meta.type != BookmarkItemType.INGREDIENT
+                    || !meta.recipeId.equals(previousMeta.recipeId)
+                    || index + 1 < maxIndex && this.grid.isInvalidSlot((index + 1) % maxIndex))) {
+                        // In first column must be an item without recipe, a recipe result, or an ingredient
+                        // if the second column is occupied
+                        return index;
+                    } else
+                if (!isFirstColumn && meta.type != BookmarkItemType.ITEM
+                        && previousMeta.type != BookmarkItemType.ITEM
+                        && meta.groupId == previousMeta.groupId
+                        && meta.recipeId != null
+                        && meta.recipeId.equals(previousMeta.recipeId)) {
+                            return index;
+                        } else {
+                            index++;
+                        }
+
+        }
+
+        return -1;
+    }
+
+    private void generateGroups() {
+        int gridColumns = this.grid.getColumns();
+        int previousGroupId = BookmarkGrid.DEFAULT_GROUP_ID;
+
+        for (int absoluteSlotIndex = 0; absoluteSlotIndex < this.maxAbsoluteSlotIndex; absoluteSlotIndex++) {
+            int absoluteRowIndex = absoluteSlotIndex / gridColumns;
+            if (this.rowToGroupId.getOrDefault(absoluteRowIndex, BookmarkGrid.DEFAULT_GROUP_ID)
+                    == BookmarkGrid.DEFAULT_GROUP_ID) {
+                int groupId = BookmarkGrid.DEFAULT_GROUP_ID;
+
+                if (this.slotToItem.containsKey(absoluteSlotIndex)) {
+                    groupId = this.caclulatedItems.get(this.slotToItem.get(absoluteSlotIndex)).getItem().groupId;
+                }
+
+                this.rowToGroupId.put(absoluteRowIndex, groupId);
+
+                if (groupId != BookmarkGrid.DEFAULT_GROUP_ID && previousGroupId == (previousGroupId = groupId)) {
+                    while ((--absoluteRowIndex) >= 0
+                            && this.rowToGroupId.get(absoluteRowIndex) == BookmarkGrid.DEFAULT_GROUP_ID) {
+                        this.rowToGroupId.put(absoluteRowIndex, groupId);
+                    }
+                }
+
+            }
+        }
+
+    }
+
+    private Comparator<Integer> generateSortingComparator(Map<Integer, BookmarkChainItem> calculatedItems) {
+        return Comparator.comparingInt((Integer index) -> calculatedItems.get(index).calculatedType.toInt())
+                .thenComparing(index -> StackInfo.getFluid(calculatedItems.get(index).getItem().itemStack) != null)
+                .thenComparing(
+                        (i1, i2) -> ItemSorter.instance.compare(
+                                calculatedItems.get(i1).getItem().itemStack,
+                                calculatedItems.get(i2).getItem().itemStack));
+    }
+
+    private void splitGridMask() {
+        int gridColumns = this.grid.getColumns();
+        int rows = this.grid.getRows();
+        int perPage = rows * gridColumns;
+
+        this.pageCount = (int) Math.ceil(this.maxAbsoluteSlotIndex / (float) perPage);
+        int page = Math.max(0, Math.min(this.grid.getPage(), this.pageCount) - 1);
+
+        for (int absoluteSlotIndex = page * perPage; absoluteSlotIndex
+                < Math.min(this.maxAbsoluteSlotIndex, (page + 1) * perPage); absoluteSlotIndex++) {
+            if (this.slotToItem.get(absoluteSlotIndex) != null) {
+                this.gridMask
+                        .add(getBookmarkGridSlot(absoluteSlotIndex % perPage, this.slotToItem.get(absoluteSlotIndex)));
+            }
+        }
+    }
+
+    private BookmarkChainItem getItem(BookmarkGroup group, int itemIndex) {
+        if (group.crafting != null) {
+            return group.crafting.calculatedItems.get(itemIndex);
+        } else {
+            BookmarkChainItem item = BookmarkChainItem.of(this.grid.getBookmarkItem(itemIndex));
+            item.setRealAmount(item.getShiftAmount());
+            return item;
+        }
+    }
+
+    private BookmarksGridSlot getBookmarkGridSlot(int slotIndex, int itemIndex) {
+        final BookmarkChainItem chainItem = this.caclulatedItems.get(itemIndex);
+        final BookmarkGroup group = this.grid.getGroup(chainItem.getItem().groupId);
+
+        if (group.crafting == null) {
+            return new BookmarksGridSlot(
+                    slotIndex,
+                    itemIndex,
+                    chainItem.getRealAmount(),
+                    0,
+                    0,
+                    chainItem.getItem(),
+                    null,
+                    group);
+        } else {
+            return new BookmarksGridSlot(
+                    slotIndex,
+                    itemIndex,
+                    chainItem.getRealAmount(),
+                    chainItem.getShiftAmount(),
+                    chainItem.getCalculatedAmount(),
+                    chainItem.getItem(),
+                    chainItem.calculatedType,
+                    group);
+        }
+    }
+
+    protected void calculateGroupBorders(Map<Integer, String> borderGrid) {
+        int gridColumns = this.grid.getColumns();
+        int page = Math.max(1, Math.min(this.grid.getPage(), this.pageCount)) - 1;
+        int shiftIndex = page * this.grid.getRows() * gridColumns;
+
+        for (BookmarksGridSlot slot : this.gridMask) {
+            if (borderGrid.get(shiftIndex + slot.slotIndex) == null) {
+                continue;
+            }
+
+            String groupIndex = borderGrid.get(shiftIndex + slot.slotIndex);
+            int column = slot.slotIndex % gridColumns;
+            int row = slot.slotIndex / gridColumns;
+            int prevSlotIndex = shiftIndex + (row - 1) * gridColumns + column;
+            int nextSlotIndex = shiftIndex + (row + 1) * gridColumns + column;
+            BookmarkGroup group = slot.getGroup();
+
+            if (group.crafting == null) {
+                slot.borderColor = BookmarkGrid.GROUP_NONE_COLOR;
+            } else if (group.collapsed) {
+                slot.borderColor = BookmarkGrid.GROUP_CHAIN_COLOR;
+            } else {
+                slot.borderColor = BookmarkGrid.RECIPE_COLOR;
+            }
+
+            slot.borderLeft = column == 0 || !groupIndex.equals(borderGrid.get(shiftIndex + slot.slotIndex - 1));
+            slot.borderRight = column + 1 == gridColumns
+                    || !groupIndex.equals(borderGrid.get(shiftIndex + slot.slotIndex + 1));
+
+            slot.borderTop = !groupIndex.equals(borderGrid.get(prevSlotIndex));
+            slot.borderBottom = !groupIndex.equals(borderGrid.get(nextSlotIndex));
+        }
+
+    }
+
+}

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

@@ -0,0 +1,58 @@
+package codechicken.nei.bookmark;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import codechicken.nei.BookmarkPanel.BookmarkViewMode;
+import codechicken.nei.recipe.Recipe.RecipeId;
+
+public class BookmarkGroup {
+
+    public RecipeChainDetails crafting = null;
+    public BookmarkViewMode viewMode;
+    public boolean collapsed = false;
+    public Set<RecipeId> collapsedRecipes = new HashSet<>();
+
+    public BookmarkGroup(BookmarkViewMode viewMode) {
+        this.viewMode = viewMode;
+    }
+
+    public BookmarkGroup(BookmarkViewMode viewMode, boolean crafting) {
+        this.viewMode = viewMode;
+        setCraftingMode(crafting);
+    }
+
+    public void toggleViewMode() {
+        if (this.viewMode == BookmarkViewMode.DEFAULT) {
+            this.viewMode = BookmarkViewMode.TODO_LIST;
+        } else {
+            this.viewMode = BookmarkViewMode.DEFAULT;
+        }
+    }
+
+    public void setCraftingMode(boolean crafting) {
+        if ((this.crafting != null) != crafting) {
+            this.crafting = crafting ? new RecipeChainDetails() : null;
+        }
+    }
+
+    public void toggleCraftingMode() {
+        setCraftingMode(this.crafting == null);
+    }
+
+    public void toggleCollapsedState() {
+        this.collapsed = !this.collapsed;
+    }
+
+    public void toggleCollapsedRecipe(RecipeId recipeId) {
+        if (this.collapsedRecipes.contains(recipeId)) {
+            this.collapsedRecipes.remove(recipeId);
+        } else {
+            this.collapsedRecipes.add(recipeId);
+        }
+    }
+
+    public BookmarkGroup copy() {
+        return new BookmarkGroup(this.viewMode);
+    }
+}

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

@@ -0,0 +1,231 @@
+package codechicken.nei.bookmark;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.fluids.FluidStack;
+
+import codechicken.nei.NEIClientUtils;
+import codechicken.nei.recipe.Recipe;
+import codechicken.nei.recipe.Recipe.RecipeId;
+import codechicken.nei.recipe.Recipe.RecipeIngredient;
+import codechicken.nei.recipe.StackInfo;
+
+public class BookmarkItem {
+
+    public enum BookmarkItemType {
+
+        INGREDIENT,
+        RESULT,
+        ITEM;
+
+        public static BookmarkItemType fromInt(int type) {
+            return type == 0 ? ITEM : type == 1 ? RESULT : INGREDIENT;
+        }
+
+        public int toInt() {
+            return this == ITEM ? 0 : this == RESULT ? 1 : 2;
+        }
+    }
+
+    private static Map<ItemStack, String> fuzzyPermutations = new HashMap<>();
+
+    public int groupId;
+
+    public long amount = 0L;
+    public final int fluidCellAmount;
+    public ItemStack itemStack;
+    public Map<String, ItemStack> permutations;
+
+    public long factor;
+    public RecipeId recipeId;
+    public BookmarkItemType type = BookmarkItemType.ITEM;
+
+    protected BookmarkItem(int groupId, long amount, int fluidCellAmount, ItemStack itemStack,
+            Map<String, ItemStack> permutations, long factor, RecipeId recipeId, BookmarkItemType type) {
+        this.groupId = groupId;
+
+        this.amount = amount;
+        this.fluidCellAmount = fluidCellAmount;
+        this.itemStack = itemStack;
+        this.permutations = permutations;
+
+        this.factor = factor;
+        this.recipeId = recipeId;
+        this.type = type == null ? BookmarkItemType.ITEM : type;
+    }
+
+    public static BookmarkItem of(int groupId, ItemStack stack, long factor, RecipeId recipeId, BookmarkItemType type,
+            Map<String, ItemStack> permutations) {
+        final FluidStack fluidStack = StackInfo.getFluid(stack);
+        int fluidCellAmount = 1;
+        long amount;
+
+        if (fluidStack != null) {
+            amount = fluidStack.amount * (long) Math.max(0, stack.stackSize);
+            fluidCellAmount = Math.max(1, StackInfo.isFluidContainer(stack) ? fluidStack.amount : 1);
+        } else {
+            amount = StackInfo.getAmount(stack);
+        }
+
+        return new BookmarkItem(
+                groupId,
+                amount,
+                fluidCellAmount,
+                stack,
+                permutations,
+                factor * fluidCellAmount,
+                recipeId,
+                type);
+    }
+
+    public static BookmarkItem of(int groupId, ItemStack stack, long factor, RecipeId recipeId, BookmarkItemType type) {
+        return of(
+                groupId,
+                stack,
+                factor,
+                recipeId,
+                type,
+                generatePermutations(stack, recipeId, type == BookmarkItemType.INGREDIENT));
+    }
+
+    public static BookmarkItem of(int groupId, ItemStack stack) {
+        final NBTTagCompound nbTag = StackInfo.itemStackToNBT(stack);
+        final long factor = nbTag.hasKey("gtFluidName") ? Math.min(144, nbTag.getInteger("Count")) : 1;
+        return BookmarkItem.of(
+                groupId,
+                stack,
+                factor,
+                null,
+                BookmarkItemType.ITEM,
+                Collections.singletonMap(getItemGUID(stack), stack));
+    }
+
+    public BookmarkItem copyWithAmount(long amount) {
+        return new BookmarkItem(
+                this.groupId,
+                amount,
+                this.fluidCellAmount,
+                this.itemStack,
+                this.permutations,
+                this.factor,
+                this.recipeId,
+                this.type);
+    }
+
+    public BookmarkItem copy() {
+        return copyWithAmount(this.amount);
+    }
+
+    public static Map<String, ItemStack> generatePermutations(ItemStack stack, RecipeId recipeId,
+            boolean isIngredient) {
+
+        if (isIngredient && recipeId != null) {
+            return generatePermutations(stack, Recipe.of(recipeId));
+        }
+
+        return Collections.singletonMap(getItemGUID(stack), stack);
+    }
+
+    public static Map<String, ItemStack> generatePermutations(ItemStack stack, Recipe recipe) {
+
+        if (recipe != null) {
+            final RecipeIngredient ingr = recipe.getIngredients().stream()
+                    .filter(ingredient -> ingredient.contains(stack)).findAny().orElse(null);
+
+            if (ingr != null) {
+                final Map<String, ItemStack> permutations = new HashMap<>();
+                for (ItemStack ingrStack : ingr.getPermutations()) {
+                    permutations.put(getItemGUID(ingrStack), ingrStack);
+                }
+                return permutations;
+            }
+        }
+
+        return Collections.singletonMap(getItemGUID(stack), stack);
+    }
+
+    private static synchronized String getItemGUID(ItemStack stack) {
+        final FluidStack fluidStack = StackInfo.getFluid(stack);
+
+        if (fluidStack != null) {
+            return fluidStack.getFluid().getName() + ":" + fluidStack.tag;
+        } else {
+
+            for (Map.Entry<ItemStack, String> entry : BookmarkItem.fuzzyPermutations.entrySet()) {
+                if (NEIClientUtils.areStacksSameTypeCraftingWithNBT(stack, entry.getKey())) {
+                    BookmarkItem.fuzzyPermutations.put(stack, entry.getValue());
+                    return entry.getValue();
+                }
+            }
+
+            final String stackGUID = StackInfo.getItemStackGUID(stack);
+            BookmarkItem.fuzzyPermutations.put(stack, stackGUID);
+
+            return stackGUID;
+        }
+    }
+
+    public boolean containsItems(BookmarkItem item) {
+        return this.permutations.keySet().stream().anyMatch(item.permutations::containsKey);
+    }
+
+    public ItemStack getItemStack() {
+        return getItemStack(this.amount);
+    }
+
+    public ItemStack getItemStack(long amount) {
+        return StackInfo.withAmount(this.itemStack, getStackSize(amount));
+    }
+
+    public long getStackSize() {
+        return getStackSize(this.amount);
+    }
+
+    public long getStackSize(long amount) {
+        return (long) (this.factor > 0 ? Math.ceil(amount / (double) this.fluidCellAmount) : 0);
+    }
+
+    public long getMultiplier() {
+        return getMultiplier(this.amount);
+    }
+
+    public long getMultiplier(long amount) {
+        return (long) (this.factor > 0 ? Math.ceil(amount / (double) this.factor) : 0);
+    }
+
+    public long getFactor() {
+        return this.factor / this.fluidCellAmount;
+    }
+
+    public boolean equalsRecipe(BookmarkItem meta) {
+        return equalsRecipe(meta.recipeId, meta.groupId);
+    }
+
+    public boolean equalsRecipe(RecipeId recipeId, int groupId) {
+        return groupId == this.groupId && recipeId != null && recipeId.equals(this.recipeId);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(this.groupId, this.fluidCellAmount, this.type.toInt(), this.recipeId);
+    }
+
+    @Override
+    public boolean equals(Object object) {
+
+        if (object instanceof BookmarkItem item) {
+            return this.groupId == item.groupId && this.type == item.type
+                    && this.fluidCellAmount == item.fluidCellAmount
+                    && StackInfo.equalItemAndNBT(this.itemStack, item.itemStack, true)
+                    && (this.recipeId == item.recipeId || this.recipeId != null && this.recipeId.equals(item.recipeId));
+        }
+
+        return false;
+    }
+
+}

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

@@ -0,0 +1,350 @@
+package codechicken.nei.bookmark;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+
+import org.apache.commons.io.IOUtils;
+
+import com.google.common.io.Files;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.JsonSyntaxException;
+
+import codechicken.nei.BookmarkPanel.BookmarkViewMode;
+import codechicken.nei.NEIClientConfig;
+import codechicken.nei.bookmark.BookmarkItem.BookmarkItemType;
+import codechicken.nei.recipe.Recipe.RecipeId;
+import codechicken.nei.recipe.StackInfo;
+import codechicken.nei.util.NBTJson;
+
+public class BookmarkStorage {
+
+    protected List<BookmarkGrid> namespaces = new ArrayList<>();
+    protected int activeNamespaceIndex = 0;
+    protected File bookmarkFile = null;
+
+    public BookmarkStorage() {
+        this.namespaces.add(new BookmarkGrid());
+    }
+
+    public boolean prevNamespace() {
+        getNamespaceSize();
+        removeEmptyNamespaces();
+
+        if (this.activeNamespaceIndex == 0) {
+            setNamespace(getNamespaceSize() - 1);
+        } else {
+            setNamespace(this.activeNamespaceIndex - 1);
+        }
+
+        return true;
+    }
+
+    public boolean nextNamespace() {
+
+        if (removeEmptyNamespaces()) {
+            return true;
+        }
+
+        if (this.activeNamespaceIndex == getNamespaceSize() - 1) {
+            setNamespace(0);
+        } else {
+            setNamespace(this.activeNamespaceIndex + 1);
+        }
+
+        return true;
+    }
+
+    private void setNamespace(int namespaceIndex) {
+        this.activeNamespaceIndex = Math.min(namespaceIndex, this.namespaces.size() - 1);
+        BookmarkGrid grid = this.namespaces.get(this.activeNamespaceIndex);
+
+        if (grid.size() == 0 && this.activeNamespaceIndex > 0) {
+            grid.setViewMode(
+                    BookmarkGrid.DEFAULT_GROUP_ID,
+                    this.namespaces.get(this.activeNamespaceIndex - 1).getViewMode(BookmarkGrid.DEFAULT_GROUP_ID));
+        }
+
+    }
+
+    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);
+        }
+
+        return this.namespaces.size();
+    }
+
+    public boolean isEmpty() {
+        return this.namespaces.size() <= 1 && getActiveGrid().isEmpty();
+    }
+
+    public int getActiveIndex() {
+        return this.activeNamespaceIndex;
+    }
+
+    public BookmarkGrid getActiveGrid() {
+        return this.namespaces.get(this.activeNamespaceIndex);
+    }
+
+    private boolean removeEmptyNamespaces() {
+
+        if (this.activeNamespaceIndex != this.namespaces.size() - 1 && getActiveGrid().size() == 0) {
+            this.namespaces.remove(this.activeNamespaceIndex);
+            setNamespace(this.activeNamespaceIndex);
+            return true;
+        }
+
+        return false;
+    }
+
+    public void load(File bookmarkFile) {
+
+        if (bookmarkFile.equals(this.bookmarkFile)) {
+            return;
+        }
+
+        List<String> itemStrings = Collections.emptyList();
+
+        if (bookmarkFile.exists()) {
+            try (FileInputStream reader = new FileInputStream(bookmarkFile)) {
+                NEIClientConfig.logger.info("Loading bookmarks from file {}", bookmarkFile);
+                itemStrings = IOUtils.readLines(reader, StandardCharsets.UTF_8);
+            } catch (IOException e) {
+                NEIClientConfig.logger.error("Failed to load bookmarks from file {}", bookmarkFile, e);
+                return;
+            }
+        }
+
+        final JsonParser parser = new JsonParser();
+        final List<BookmarkGrid> namespaces = new ArrayList<>();
+        NBTTagCompound navigation = new NBTTagCompound();
+        namespaces.add(new BookmarkGrid());
+        BookmarkGrid grid = namespaces.get(0);
+        boolean wasError = false;
+
+        if (NEIClientConfig.world.nbt.hasKey("bookmark")) {
+            navigation = NEIClientConfig.world.nbt.getCompoundTag("bookmark");
+        }
+
+        for (String itemStr : itemStrings) {
+
+            try {
+
+                if (itemStr.isEmpty()) {
+                    itemStr = "; {}";
+                }
+
+                if (itemStr.startsWith("; ")) {
+
+                    if (grid.size() > 0) {
+                        // do not create empty namespaces
+                        grid = new BookmarkGrid();
+
+                        if (navigation.hasKey("namespacePage." + namespaces.size())) {
+                            grid.setPage(navigation.getInteger("namespacePage." + namespaces.size()));
+                        }
+
+                        namespaces.add(grid);
+                    }
+
+                    final JsonObject settings = parser.parse(itemStr.substring(2)).getAsJsonObject();
+
+                    if (settings.get("viewmode") != null) {
+                        grid.groups.get(BookmarkGrid.DEFAULT_GROUP_ID).viewMode = BookmarkViewMode
+                                .valueOf(settings.get("viewmode").getAsString());
+                    } else if (settings.get("groups") instanceof JsonObject jsonObject) {
+                        BookmarkGroup group;
+
+                        for (Map.Entry<String, JsonElement> jsonEntry : jsonObject.entrySet()) {
+                            if (jsonEntry.getValue() instanceof JsonObject value) {
+                                group = new BookmarkGroup(
+                                        value.has("viewmode")
+                                                ? BookmarkViewMode.valueOf(value.get("viewmode").getAsString())
+                                                : BookmarkViewMode.DEFAULT,
+                                        value.has("crafting") && value.get("crafting").getAsBoolean());
+
+                                group.collapsed = value.has("collapsed") && value.get("collapsed").getAsBoolean();
+
+                                if (value.has("collapsedRecipes")) {
+                                    for (JsonElement recipeId : value.get("collapsedRecipes").getAsJsonArray()) {
+                                        if (recipeId instanceof JsonObject item) {
+                                            group.collapsedRecipes.add(RecipeId.of(item));
+                                        }
+                                    }
+                                }
+
+                                grid.groups.put(Integer.valueOf(jsonEntry.getKey()), group);
+                            }
+                        }
+                    }
+
+                    continue;
+                }
+
+                if (!addItemToGrid(grid, parser.parse(itemStr).getAsJsonObject())) {
+                    wasError = true;
+                    NEIClientConfig.logger.warn(
+                            "Failed to load bookmarked ItemStack from json string, the item no longer exists:\n{}",
+                            itemStr);
+                }
+
+            } catch (Exception e) {
+                wasError = true;
+                NEIClientConfig.logger.error("Failed to load bookmarked ItemStack from json string:\n{}", itemStr);
+            }
+        }
+
+        if (wasError) {
+            try {
+                Files.copy(
+                        bookmarkFile,
+                        new File(bookmarkFile.getAbsolutePath() + ".backup-" + System.currentTimeMillis()));
+                NEIClientConfig.logger.info("Backed up invalid bookmark file to {}", bookmarkFile);
+            } catch (IOException e) {
+                NEIClientConfig.logger.error("Failed to backup invalid bookmark file to {}", bookmarkFile, e);
+            }
+        }
+
+        for (BookmarkGrid gr : namespaces) {
+            gr.onItemsChanged();
+        }
+
+        this.namespaces = namespaces;
+
+        if (navigation.hasKey("namespaceIndex")) {
+            setNamespace(navigation.getInteger("namespaceIndex"));
+        } else {
+            setNamespace(0);
+        }
+
+        this.bookmarkFile = bookmarkFile;
+    }
+
+    private boolean addItemToGrid(BookmarkGrid grid, JsonObject jsonObject) {
+        NBTTagCompound itemStackNBT;
+
+        if (jsonObject.get("item") != null) {
+            itemStackNBT = (NBTTagCompound) NBTJson.toNbt(jsonObject.get("item"));
+        } else { // old format
+            itemStackNBT = (NBTTagCompound) NBTJson.toNbt(jsonObject);
+        }
+
+        ItemStack itemStack = StackInfo.loadFromNBT(itemStackNBT);
+
+        if (itemStack != null) {
+            RecipeId recipeId = null;
+            boolean isFluid = itemStackNBT.hasKey("gtFluidName");
+            int groupId = jsonObject.has("groupId") ? jsonObject.get("groupId").getAsInt()
+                    : BookmarkGrid.DEFAULT_GROUP_ID;
+            int factor = jsonObject.has("factor") ? Math.abs(jsonObject.get("factor").getAsInt()) : (isFluid ? 144 : 1);
+            BookmarkItemType type = jsonObject.has("type") ? BookmarkItemType.fromInt(jsonObject.get("type").getAsInt())
+                    : null;
+
+            if (type == null) {
+                // old format
+                type = jsonObject.has("ingredient") && jsonObject.get("ingredient").getAsBoolean()
+                        ? BookmarkItemType.INGREDIENT
+                        : BookmarkItemType.RESULT;
+            }
+
+            if (jsonObject.get("recipeId") instanceof JsonObject recipeJson) {
+                recipeId = RecipeId.of(recipeJson);
+            }
+
+            if (!grid.groups.containsKey(groupId)) {
+                groupId = BookmarkGrid.DEFAULT_GROUP_ID;
+            }
+
+            grid.addItem(BookmarkItem.of(groupId, itemStack, factor, recipeId, type), false);
+        }
+
+        return itemStack != null;
+    }
+
+    public void save() {
+
+        if (this.bookmarkFile == null) {
+            return;
+        }
+
+        List<String> strings = new ArrayList<>();
+        NBTTagCompound navigation = new NBTTagCompound();
+        navigation.setInteger("namespaceIndex", this.activeNamespaceIndex);
+
+        for (int grpIdx = 0; grpIdx < namespaces.size(); grpIdx++) {
+            BookmarkGrid grid = namespaces.get(grpIdx);
+            JsonObject settings = new JsonObject();
+            JsonObject groups = new JsonObject();
+
+            for (int groupId : grid.groups.keySet()) {
+                BookmarkGroup group = grid.groups.get(groupId);
+                JsonObject groupJson = new JsonObject();
+                groupJson.add("viewmode", new JsonPrimitive(group.viewMode.toString()));
+                groupJson.add("crafting", new JsonPrimitive(group.crafting != null));
+                groupJson.add("collapsed", new JsonPrimitive(group.collapsed));
+
+                if (!group.collapsedRecipes.isEmpty()) {
+                    JsonArray collapsedRecipes = new JsonArray();
+                    for (RecipeId recipeId : group.collapsedRecipes) {
+                        collapsedRecipes.add(recipeId.toJsonObject());
+                    }
+                    groupJson.add("collapsedRecipes", collapsedRecipes);
+                }
+
+                groups.add(String.valueOf(groupId), groupJson);
+            }
+
+            settings.add("groups", groups);
+            strings.add("; " + NBTJson.toJson(settings));
+
+            navigation.setInteger("namespacePage." + grpIdx, grid.getPage() - 1);
+
+            for (BookmarkItem item : grid.bookmarkItems) {
+                try {
+                    JsonObject row = new JsonObject();
+
+                    row.add("item", NBTJson.toJsonObject(StackInfo.itemStackToNBT(item.getItemStack())));
+                    row.add("factor", new JsonPrimitive(item.getFactor()));
+                    row.add("type", new JsonPrimitive(item.type.toInt()));
+
+                    if (item.groupId != BookmarkGrid.DEFAULT_GROUP_ID) {
+                        row.add("groupId", new JsonPrimitive(item.groupId));
+                    }
+
+                    if (item.recipeId != null) {
+                        row.add("recipeId", item.recipeId.toJsonObject());
+                    }
+
+                    strings.add(NBTJson.toJson(row));
+                } catch (JsonSyntaxException e) {
+                    NEIClientConfig.logger.error("Failed to stringify bookmarked ItemStack to json string");
+                }
+            }
+        }
+
+        try (FileOutputStream output = new FileOutputStream(bookmarkFile)) {
+            IOUtils.writeLines(strings, "\n", output, StandardCharsets.UTF_8);
+            NEIClientConfig.world.nbt.setTag("bookmark", navigation);
+        } catch (IOException e) {
+            NEIClientConfig.logger.error("Failed to save bookmarks list to file {}", bookmarkFile, e);
+        }
+    }
+
+}

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

@@ -0,0 +1,383 @@
+package codechicken.nei.bookmark;
+
+import java.awt.Color;
+
+import net.minecraft.item.ItemStack;
+
+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;
+import codechicken.nei.NEIClientUtils;
+import codechicken.nei.NEIClientUtils.Alignment;
+import codechicken.nei.bookmark.BookmarkGrid.BookmarkMouseContext;
+import codechicken.nei.bookmark.BookmarkItem.BookmarkItemType;
+import codechicken.nei.bookmark.RecipeChainDetails.CalculatedType;
+import codechicken.nei.guihook.GuiContainerManager;
+import codechicken.nei.recipe.GuiRecipeTab;
+import codechicken.nei.recipe.HandlerInfo;
+import codechicken.nei.recipe.Recipe.RecipeId;
+import codechicken.nei.recipe.StackInfo;
+import codechicken.nei.util.ReadableNumberConverter;
+
+public class BookmarksGridSlot extends ItemsGridSlot {
+
+    protected enum ShownItemType {
+        REAL,
+        SHIFT,
+        CALCULATED
+    }
+
+    protected static final float LINE_WIDTH = 0.75f;
+
+    protected static final Color INGREDIENTS_COLOR = new Color(0x6645DA75, true);
+
+    protected static final Color RESULTS_COLOR = new Color(0x9966CCFF, true);
+    protected static final Color RESULTS_BG_COLOR = new Color(0x3366CCFF, true);
+    protected static final Color RESULTS_BG_FLUID_COLOR = new Color(0x5566CCFF, true);
+
+    protected static final Color REMAINDER_COLOR = new Color(0x55A033A0, true);
+    protected static final Color REMAINDER_BG_COLOR = new Color(0x33A033A0, true);
+    protected static final Color REMAINDER_BG_FLUID_COLOR = new Color(0x44A033A0, true);
+
+    protected final ItemStack emptyItemStack;
+    protected final long realAmount;
+    protected final long shiftAmount;
+    protected final long calculatedAmount;
+
+    protected final long realMultiplier;
+    protected final long calculatedMultiplier;
+
+    protected final BookmarkGroup group;
+    protected final boolean isFluidDisplay;
+    protected final CalculatedType calculatedType;
+    protected final CalculatedType realType;
+    protected final BookmarkItem bookmarkItem;
+    protected HandlerInfo handlerInfo = null;
+
+    protected final boolean isOutputRecipe;
+    protected final boolean isFirstOutput;
+    protected final int rowIndex;
+
+    public BookmarksGridSlot(int slotIndex, int itemIndex, long realAmount, long shiftAmount, long calculatedAmount,
+            BookmarkItem bookmarkItem, CalculatedType calculatedType, BookmarkGroup group) {
+        super(
+                slotIndex,
+                itemIndex,
+                calculatedType != null ? bookmarkItem.getItemStack(calculatedAmount)
+                        : bookmarkItem.getItemStack(realAmount));
+
+        this.emptyItemStack = bookmarkItem.getItemStack(0);
+        this.realAmount = realAmount;
+        this.shiftAmount = shiftAmount;
+        this.calculatedAmount = calculatedAmount;
+
+        this.group = group;
+        this.calculatedType = calculatedType;
+        this.bookmarkItem = bookmarkItem;
+
+        this.isOutputRecipe = group.crafting != null && group.crafting.outputRecipes.contains(bookmarkItem.recipeId);
+        this.isFluidDisplay = StackInfo.itemStackToNBT(bookmarkItem.itemStack).hasKey("gtFluidName");
+
+        this.realMultiplier = bookmarkItem.getMultiplier(realAmount);
+        this.calculatedMultiplier = bookmarkItem.getMultiplier(calculatedAmount);
+
+        if (this.group.crafting != null && this.group.crafting.calculatedItems.containsKey(this.itemIndex)) {
+            this.realType = this.group.crafting.calculatedItems.get(this.itemIndex).calculatedType
+                    == CalculatedType.INGREDIENT ? CalculatedType.INGREDIENT : CalculatedType.RESULT;
+        } else {
+            this.realType = this.bookmarkItem.type == BookmarkItemType.INGREDIENT
+                    || this.group.crafting != null && this.bookmarkItem.recipeId == null ? CalculatedType.INGREDIENT
+                            : 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
+                && ((this.slotIndex % grid.getColumns()) == 0 || group.viewMode == BookmarkViewMode.DEFAULT)
+                && (prevItem == null || prevItem.type == BookmarkItemType.INGREDIENT
+                        || !this.bookmarkItem.equalsRecipe(prevItem));
+        this.rowIndex = this.slotIndex / grid.getColumns();
+    }
+
+    public long getMultiplier() {
+        return this.calculatedType != null ? this.calculatedMultiplier : this.realMultiplier;
+    }
+
+    public BookmarkItem getBookmarkItem() {
+        return this.bookmarkItem;
+    }
+
+    @Override
+    public RecipeId getRecipeId() {
+        return this.bookmarkItem.recipeId;
+    }
+
+    public BookmarkItemType getType() {
+        return this.bookmarkItem.type;
+    }
+
+    public BookmarkGroup getGroup() {
+        return this.group;
+    }
+
+    public int getGroupId() {
+        return this.bookmarkItem.groupId;
+    }
+
+    protected ShownItemType getShownItemType(BookmarkMouseContext mouseContext) {
+
+        if (mouseContext != null) {
+            if (this.showShiftItem(mouseContext)) {
+                return ShownItemType.SHIFT;
+            } else if (this.showRealItem(mouseContext)) {
+                return ShownItemType.REAL;
+            }
+        }
+
+        if (this.calculatedType != null) {
+            return ShownItemType.CALCULATED;
+        }
+
+        return null;
+    }
+
+    protected boolean showShiftItem(BookmarkMouseContext mouseContext) {
+
+        if (!mouseContext.shiftKey || this.bookmarkItem.groupId != mouseContext.groupId) {
+            return false;
+        }
+
+        if (this.slotIndex == mouseContext.slotIndex || this.group.crafting != null) {
+            return true;
+        }
+
+        if (this.bookmarkItem.type == BookmarkItemType.ITEM && this.group.viewMode == BookmarkViewMode.TODO_LIST
+                && mouseContext.rowIndex == this.rowIndex) {
+            return true;
+        }
+
+        return this.bookmarkItem.type != BookmarkItemType.ITEM
+                && this.bookmarkItem.equalsRecipe(mouseContext.recipeId, mouseContext.groupId);
+    }
+
+    protected boolean showRealItem(BookmarkMouseContext mouseContext) {
+
+        if (!mouseContext.controlKey || this.bookmarkItem.groupId != mouseContext.groupId) {
+            return false;
+        }
+
+        if (this.slotIndex == mouseContext.slotIndex || this.group.collapsed) {
+            return true;
+        }
+
+        if (mouseContext.recipeId == null && this.group.viewMode == BookmarkViewMode.TODO_LIST
+                && mouseContext.rowIndex == this.rowIndex) {
+            return true;
+        }
+
+        if (this.bookmarkItem.type != BookmarkItemType.ITEM
+                && this.bookmarkItem.equalsRecipe(mouseContext.recipeId, mouseContext.groupId)) {
+            return true;
+        }
+
+        return this.group.crafting != null && mouseContext.recipeId != null
+                && mouseContext.recipeId.equals(this.group.crafting.itemToRecipe.get(this.itemIndex));
+    }
+
+    protected HandlerInfo getHandlerInfo() {
+        if (this.bookmarkItem.recipeId != null && this.handlerInfo == null) {
+            this.handlerInfo = GuiRecipeTab.getHandlerInfo(this.bookmarkItem.recipeId.getHandleName(), null);
+        }
+        return this.handlerInfo;
+    }
+
+    @Override
+    public void drawItem(Rectangle4i rect) {
+        super.drawItem(this.emptyItemStack, rect);
+    }
+
+    @Override
+    public <M extends MouseContext> void beforeDraw(Rectangle4i rect, M mouseContext) {
+        final ShownItemType shownItemType = getShownItemType((BookmarkMouseContext) mouseContext);
+        boolean showMarker = NEIClientConfig.showRecipeMarkerMode() == 2;
+        CalculatedType calculatedType = null;
+
+        if (shownItemType == ShownItemType.REAL) {
+            calculatedType = this.realType;
+        } else if (shownItemType == ShownItemType.SHIFT) {
+
+            if (this.calculatedType != null) {
+                calculatedType = this.shiftAmount > 0 ? this.calculatedType : null;
+                showMarker = false;
+            } else if (group.crafting == null) {
+                calculatedType = this.realType;
+            }
+
+        }
+
+        if (this.bookmarkItem.type != BookmarkItemType.INGREDIENT && this.bookmarkItem.recipeId != null
+                && calculatedType == null
+                && showMarker
+                && (mouseContext == null || mouseContext.slotIndex != this.slotIndex)) {
+            drawMerkerBackground(rect);
+        }
+
+        if (calculatedType == null || !drawBackground(rect, calculatedType)) {
+            super.beforeDraw(rect, mouseContext);
+        }
+    }
+
+    protected boolean drawBackground(Rectangle4i rect, CalculatedType calculatedType) {
+
+        switch (calculatedType) {
+            case INGREDIENT:
+                NEIClientUtils.drawRect(rect.x, rect.y, rect.w, rect.h, INGREDIENTS_COLOR);
+                break;
+            case RESULT:
+                NEIClientUtils.drawRect(rect.x, rect.y, rect.w, rect.h, RESULTS_COLOR);
+                break;
+            case REMAINDER:
+                NEIClientUtils.drawRect(rect.x, rect.y, rect.w, rect.h, REMAINDER_COLOR);
+                break;
+            default:
+                return false;
+        }
+
+        return true;
+    }
+
+    protected void drawMerkerBackground(Rectangle4i rect) {
+        Color color = this.isFluidDisplay ? RESULTS_BG_FLUID_COLOR : RESULTS_BG_COLOR;
+
+        if (this.shiftAmount > 0 && this.calculatedType == CalculatedType.REMAINDER) {
+            color = this.isFluidDisplay ? REMAINDER_BG_FLUID_COLOR : REMAINDER_BG_COLOR;
+        }
+
+        NEIClientUtils.drawRect(rect.x, rect.y, rect.w, rect.h, color);
+    }
+
+    @Override
+    public <M extends MouseContext> void afterDraw(Rectangle4i rect, M mouseContext) {
+        final ShownItemType shownItemType = getShownItemType((BookmarkMouseContext) mouseContext);
+
+        drawStackSize(rect, shownItemType);
+
+        if (this.bookmarkItem.type == BookmarkItemType.INGREDIENT || this.bookmarkItem.recipeId == null) {
+            return;
+        }
+
+        if (this.isFirstOutput) {
+            if (shownItemType == ShownItemType.REAL) {
+                drawMarker(
+                        rect,
+                        "x" + ReadableNumberConverter.INSTANCE.toWideReadableForm(this.realMultiplier),
+                        0xFFFFFF,
+                        Alignment.TopLeft);
+            } else if (shownItemType == ShownItemType.SHIFT) {
+                drawMarker(
+                        rect,
+                        "x" + ReadableNumberConverter.INSTANCE.toWideReadableForm(getMultiplier()),
+                        0xFFFFFF,
+                        Alignment.TopLeft);
+            } else if (this.isOutputRecipe || this.realMultiplier > 1) {
+                drawMarker(
+                        rect,
+                        "x" + ReadableNumberConverter.INSTANCE.toWideReadableForm(this.realMultiplier),
+                        NEIClientConfig.getSetting("inventory.bookmarks.recipeMarkerColor").getHexValue(),
+                        Alignment.TopLeft);
+            }
+        }
+
+        if (this.isFirstOutput || NEIClientConfig.showRecipeMarkerMode() == 1) {
+            drawRecipeMarker(rect);
+        }
+    }
+
+    protected void drawRecipeMarker(Rectangle4i rect) {
+        if (NEIClientConfig.getBooleanSetting("inventory.bookmarks.showRecipeHandlerIcon")
+                && getHandlerInfo() != null) {
+            drawHandlerIcon(rect);
+        } else if (NEIClientConfig.showRecipeMarkerMode() == 1) {
+            drawMarker(
+                    rect,
+                    "R",
+                    NEIClientConfig.getSetting("inventory.bookmarks.recipeMarkerColor").getHexValue(),
+                    Alignment.TopRight);
+        }
+    }
+
+    protected void drawHandlerIcon(Rectangle4i rect) {
+        float panelFactor = 1;
+
+        if (rect.w != DEFAULT_SLOT_SIZE) {
+            panelFactor = (rect.w - 2) / (DEFAULT_SLOT_SIZE - 2);
+        }
+
+        panelFactor *= 0.4f;
+        float x = rect.x + 2 + 16 - 16 * panelFactor;
+
+        GL11.glTranslatef(x, rect.y, 0);
+        GL11.glScaled(panelFactor, panelFactor, 1.5f);
+
+        if (this.handlerInfo.getImage() != null) {
+            this.handlerInfo.getImage().draw(0, 0);
+        } else {
+            GuiContainerManager.drawItem(0, 0, this.handlerInfo.getItemStack(), true, "");
+        }
+
+        GL11.glScaled(1f / panelFactor, 1f / panelFactor, 1f / 1.5f);
+        GL11.glTranslatef(-1 * x, -1 * rect.y, 0);
+    }
+
+    protected void drawMarker(Rectangle4i rect, String text, int color, Alignment alignment) {
+        final float panelFactor = (rect.w - 2) / (DEFAULT_SLOT_SIZE - 2);
+        NEIClientUtils.drawNEIOverlayText(
+                text,
+                new Rectangle4i(rect.x + 1, rect.y + 1, rect.w - 2, rect.h - 2),
+                panelFactor,
+                color,
+                true,
+                alignment);
+    }
+
+    protected void drawStackSize(Rectangle4i rect, ShownItemType shownItemType) {
+        long amount = this.calculatedAmount;
+
+        if (shownItemType == null || shownItemType == ShownItemType.REAL || this.calculatedType == null) {
+            amount = this.realAmount;
+        } else if (shownItemType == ShownItemType.SHIFT) {
+            amount = this.shiftAmount;
+        }
+
+        if (amount > 0 || shownItemType == ShownItemType.REAL && this.bookmarkItem.factor > 0) {
+            final float panelFactor = (rect.w - 2) / (DEFAULT_SLOT_SIZE - 2);
+            final long stackSize = this.bookmarkItem.getStackSize(amount);
+            String amountString = "";
+
+            if (stackSize < 10_000) {
+                amountString = String.valueOf(stackSize);
+            } else {
+                amountString = ReadableNumberConverter.INSTANCE.toWideReadableForm(stackSize);
+            }
+
+            if (this.isFluidDisplay) {
+                amountString += "L";
+            }
+
+            NEIClientUtils.drawNEIOverlayText(
+                    amountString,
+                    new Rectangle4i(rect.x + 1, rect.y + 1, rect.w - 2, rect.h - 2),
+                    panelFactor,
+                    0xFFFFFF,
+                    true,
+                    this.isFluidDisplay ? Alignment.BottomLeft : Alignment.BottomRight);
+        }
+    }
+
+}

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

@@ -0,0 +1,193 @@
+package codechicken.nei.bookmark;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import codechicken.nei.BookmarkPanel.BookmarkViewMode;
+import codechicken.nei.bookmark.BookmarkItem.BookmarkItemType;
+import codechicken.nei.recipe.Recipe.RecipeId;
+
+public class GroupingItem {
+
+    public static class PointEntry {
+
+        public int cursorRowIndex;
+        public int topRowIndex;
+        public int bottomRowIndex;
+
+        public PointEntry(int clickSlotIndex, int topSlotIndex, int bottomSlotIndex) {
+            this.cursorRowIndex = clickSlotIndex;
+            this.topRowIndex = topSlotIndex;
+            this.bottomRowIndex = bottomSlotIndex;
+        }
+    }
+
+    public BookmarkGrid grid;
+
+    public int groupId = -1;
+    public PointEntry startPoint;
+    public PointEntry endPoint;
+
+    public GroupingItem(BookmarkGrid grid, int groupId, int overRowIndex) {
+        this.groupId = groupId;
+        this.grid = grid;
+        setStartPoint(overRowIndex);
+    }
+
+    public void setStartPoint(int overRowIndex) {
+
+        if (this.grid.getRowItemIndex(overRowIndex, true) != Integer.MIN_VALUE) {
+            this.startPoint = new PointEntry(
+                    overRowIndex + getRowShift(),
+                    getTopRowIndex(overRowIndex),
+                    getBottomRowIndex(overRowIndex));
+        } else {
+            this.startPoint = new PointEntry(overRowIndex + getRowShift(), -1, -1);
+        }
+
+    }
+
+    public void setEndPoint(int overRowIndex) {
+        if (this.grid.getRowItemIndex(overRowIndex, true) != Integer.MIN_VALUE) {
+            this.endPoint = new PointEntry(
+                    overRowIndex + getRowShift(),
+                    getTopRowIndex(overRowIndex),
+                    getBottomRowIndex(overRowIndex));
+        }
+    }
+
+    public int getStartSlotIndex() {
+        return this.startPoint.cursorRowIndex - getRowShift();
+    }
+
+    public int getEndSlotIndex() {
+        return this.endPoint != null ? this.endPoint.cursorRowIndex - getRowShift() : 0;
+    }
+
+    public boolean hasEndRow() {
+        return this.endPoint != null;
+    }
+
+    private int getRowShift() {
+        return (this.grid.getPage() - 1) * this.grid.getRows();
+    }
+
+    public Map<Integer, Integer> prepareGroups(Map<Integer, Integer> groups) {
+        final int topRowIndex = Math.min(this.startPoint.topRowIndex, this.endPoint.topRowIndex);
+        final int bottomRowIndex = Math.max(this.startPoint.bottomRowIndex, this.endPoint.bottomRowIndex);
+        groups = new HashMap<>(groups);
+
+        if (this.groupId != BookmarkGrid.DEFAULT_GROUP_ID) {
+
+            if (this.startPoint.cursorRowIndex > this.endPoint.cursorRowIndex) {
+                int rowIndex = this.endPoint.topRowIndex - 1;
+
+                while (groups.containsKey(rowIndex) && groups.get(rowIndex) == this.groupId) {
+                    groups.put(rowIndex--, BookmarkGrid.DEFAULT_GROUP_ID);
+                }
+
+            } else if (this.startPoint.cursorRowIndex < this.endPoint.cursorRowIndex) {
+                int rowIndex = this.endPoint.bottomRowIndex + 1;
+
+                while (groups.containsKey(rowIndex) && groups.get(rowIndex) == this.groupId) {
+                    groups.put(rowIndex++, BookmarkGrid.DEFAULT_GROUP_ID);
+                }
+            }
+
+        } else if (groups.containsKey(topRowIndex - 1)
+                && groups.get(topRowIndex - 1).equals(groups.get(bottomRowIndex + 1))) {
+                    int groupId = groups.get(bottomRowIndex);
+                    int rowIndex = bottomRowIndex + 1;
+
+                    while (groups.containsKey(rowIndex) && groups.get(rowIndex) == groupId) {
+                        groups.put(rowIndex, -1 * groups.get(rowIndex));
+                        rowIndex++;
+                    }
+                }
+
+        for (int rowIndex = topRowIndex; rowIndex <= bottomRowIndex && groups.containsKey(rowIndex); rowIndex++) {
+            groups.put(rowIndex, this.groupId);
+        }
+
+        return groups;
+    }
+
+    protected int getTopRowIndex(int overRowIndex) {
+        final int rowShift = getRowShift();
+        int itemIndex = this.grid.getRowItemIndex(overRowIndex, true);
+
+        if (itemIndex == Integer.MIN_VALUE) {
+            return -1;
+        }
+
+        final BookmarkItem item = this.grid.getCalculatedItem(itemIndex);
+
+        if (item.recipeId != null && item.type != BookmarkItemType.ITEM) {
+            final List<Integer> sortedItems = this.grid.getSortedItems();
+            final BookmarkGroup group = this.grid.getGroup(item.groupId);
+            final boolean isCollapsedGroup = group.collapsed
+                    || group.crafting != null && group.viewMode == BookmarkViewMode.DEFAULT;
+            final RecipeId recipeId = group.crafting != null
+                    ? group.crafting.itemToRecipe.getOrDefault(itemIndex, item.recipeId)
+                    : item.recipeId;
+            final Set<RecipeId> recipeRelations = group.crafting != null
+                    ? group.crafting.recipeRelations.getOrDefault(recipeId, Collections.singleton(recipeId))
+                    : Collections.singleton(recipeId);
+
+            for (Integer rItemIndex : sortedItems) {
+                final BookmarkItem rItem = this.grid.getCalculatedItem(rItemIndex);
+
+                if (rItem.groupId == item.groupId && (isCollapsedGroup
+                        || rItem.type != BookmarkItemType.ITEM && recipeRelations.contains(rItem.recipeId))) {
+                    return this.grid.getAbsoluteSlotIndex(rItemIndex) / this.grid.getColumns();
+                }
+            }
+
+            return -1;
+        }
+
+        return rowShift + overRowIndex;
+    }
+
+    protected int getBottomRowIndex(int overRowIndex) {
+        final int rowShift = getRowShift();
+        final int itemIndex = this.grid.getRowItemIndex(overRowIndex, false);
+
+        if (itemIndex == Integer.MIN_VALUE) {
+            return -1;
+        }
+
+        final BookmarkItem item = this.grid.getCalculatedItem(itemIndex);
+
+        if (item.recipeId != null && item.type != BookmarkItemType.ITEM) {
+            final List<Integer> sortedItems = this.grid.getSortedItems();
+            final BookmarkGroup group = this.grid.getGroup(item.groupId);
+            final boolean isCollapsedGroup = group.collapsed
+                    || group.crafting != null && group.viewMode == BookmarkViewMode.DEFAULT;
+            final RecipeId recipeId = group.crafting != null
+                    ? group.crafting.itemToRecipe.getOrDefault(itemIndex, item.recipeId)
+                    : item.recipeId;
+            final Set<RecipeId> recipeRelations = group.crafting != null
+                    ? group.crafting.recipeRelations.getOrDefault(recipeId, Collections.singleton(recipeId))
+                    : Collections.singleton(recipeId);
+
+            for (int index = sortedItems.size() - 1; index >= 0; index--) {
+                final int rItemIndex = sortedItems.get(index);
+                final BookmarkItem rItem = this.grid.getCalculatedItem(rItemIndex);
+
+                if (rItem.groupId == item.groupId && (isCollapsedGroup
+                        || rItem.type != BookmarkItemType.ITEM && recipeRelations.contains(rItem.recipeId))) {
+                    return this.grid.getAbsoluteSlotIndex(rItemIndex) / this.grid.getColumns();
+                }
+            }
+
+            return -1;
+        }
+
+        return rowShift + overRowIndex;
+    }
+
+}

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

@@ -0,0 +1,375 @@
+package codechicken.nei.bookmark;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import net.minecraft.item.ItemStack;
+
+import codechicken.nei.bookmark.BookmarkItem.BookmarkItemType;
+import codechicken.nei.recipe.Recipe.RecipeId;
+import codechicken.nei.recipe.StackInfo;
+import codechicken.nei.recipe.chain.RecipeChainMath;
+
+public class RecipeChainDetails {
+
+    public enum CalculatedType {
+
+        INGREDIENT,
+        RESULT,
+        REMAINDER;
+
+        public int toInt() {
+            switch (this) {
+                case RESULT:
+                    return 0;
+                case REMAINDER:
+                    return 1;
+                case INGREDIENT:
+                    return 2;
+            }
+            return -1;
+        }
+    }
+
+    public static class BookmarkChainItem {
+
+        private final BookmarkItem item;
+
+        private long realAmount = 0L;
+        private long shiftAmount = 0L;
+        private long calculatedAmount = 0L;
+
+        public CalculatedType calculatedType;
+
+        protected BookmarkChainItem(BookmarkItem item, long shiftItem, long calculatedItem,
+                CalculatedType calculatedType) {
+            this.item = item.copy();
+            this.shiftAmount = shiftItem;
+            this.calculatedAmount = calculatedItem;
+            this.calculatedType = calculatedType;
+        }
+
+        public static BookmarkChainItem of(BookmarkItem item, long shiftItem, long calculatedAmount,
+                CalculatedType calculatedType) {
+            return new BookmarkChainItem(item, shiftItem, calculatedAmount, calculatedType);
+        }
+
+        public static BookmarkChainItem of(BookmarkItem item, long shiftItem, CalculatedType calculatedType) {
+            return new BookmarkChainItem(item, shiftItem, item.amount, calculatedType);
+        }
+
+        public static BookmarkChainItem of(BookmarkItem item) {
+            return new BookmarkChainItem(
+                    item,
+                    item.amount,
+                    item.amount,
+                    item.type == BookmarkItemType.INGREDIENT ? CalculatedType.INGREDIENT : CalculatedType.RESULT);
+        }
+
+        public ItemStack getItemStack(long amount) {
+            return this.item.getItemStack(amount);
+        }
+
+        public void setRealAmount(long amount) {
+            this.realAmount = amount;
+        }
+
+        public long getRealAmount() {
+            return this.realAmount;
+        }
+
+        public long getShiftAmount() {
+            return this.shiftAmount;
+        }
+
+        public long getCalculatedAmount() {
+            return this.calculatedAmount;
+        }
+
+        public BookmarkItem getItem() {
+            return this.item;
+        }
+
+        public void append(long amount, long calculatedAmount) {
+            this.shiftAmount += amount;
+            this.calculatedAmount += calculatedAmount;
+            this.item.amount = this.calculatedAmount;
+        }
+    }
+
+    public final Map<Integer, BookmarkChainItem> calculatedItems = new HashMap<>();
+    public final Map<Integer, RecipeId> itemToRecipe = new HashMap<>();
+    public final Set<RecipeId> outputRecipes = new HashSet<>();
+    public final Set<RecipeId> recipeInMiddle = new HashSet<>();
+
+    public final Map<RecipeId, Set<RecipeId>> recipeRelations = new HashMap<>();
+
+    public void refresh(Map<Integer, BookmarkItem> chainItems, Set<RecipeId> collapsedRecipes) {
+        final Map<BookmarkItem, Integer> sortingChainItems = new HashMap<>();
+
+        for (Map.Entry<Integer, BookmarkItem> entry : chainItems.entrySet()) {
+            sortingChainItems.put(entry.getValue(), entry.getKey());
+        }
+
+        this.itemToRecipe.clear();
+        this.outputRecipes.clear();
+        this.recipeInMiddle.clear();
+        this.calculatedItems.clear();
+        this.recipeRelations.clear();
+        final RecipeChainMath math = RecipeChainMath.of(new ArrayList<>(chainItems.values()), collapsedRecipes)
+                .refresh();
+
+        this.outputRecipes.addAll(math.outputRecipes.keySet());
+
+        for (BookmarkItem item : math.preferredItems.values()) {
+            if (item != null && item.recipeId != null) {
+                this.recipeInMiddle.add(item.recipeId);
+            }
+        }
+
+        for (BookmarkItem item : math.initialItems) {
+            this.calculatedItems.put(
+                    sortingChainItems.get(item),
+                    BookmarkChainItem.of(item, math.requiredAmount.getOrDefault(item, 0L), CalculatedType.INGREDIENT));
+        }
+
+        if (collapsedRecipes.isEmpty()) {
+
+            for (BookmarkItem item : math.recipeResults) {
+                generateResult(math, item, sortingChainItems.get(item));
+            }
+
+            for (BookmarkItem item : math.recipeIngredients) {
+                generateIngredient(math, item, sortingChainItems.get(item));
+            }
+
+        } else {
+            final Set<RecipeId> topLevelRecipes = findTopLevelRecipes(math, collapsedRecipes);
+
+            for (RecipeId recipeId : collapsedRecipes) {
+                this.recipeRelations.put(
+                        recipeId,
+                        getRecipeRelations(math, recipeId, topLevelRecipes, new HashSet<>(Arrays.asList(recipeId))));
+                generateCollapsedRecipe(math, recipeId, topLevelRecipes, sortingChainItems);
+                generateShadowItems(recipeId, chainItems.values(), sortingChainItems);
+            }
+
+            for (BookmarkItem item : math.recipeResults) {
+                if (!collapsedRecipes.contains(item.recipeId) && topLevelRecipes.contains(item.recipeId)) {
+                    generateResult(math, item, sortingChainItems.get(item));
+                }
+            }
+
+            for (BookmarkItem item : math.recipeIngredients) {
+                if (!collapsedRecipes.contains(item.recipeId) && topLevelRecipes.contains(item.recipeId)) {
+                    generateIngredient(math, item, sortingChainItems.get(item));
+                }
+            }
+
+        }
+
+        for (Map.Entry<Integer, BookmarkItem> entry : chainItems.entrySet()) {
+            final int itemIndex = entry.getKey();
+            if (itemIndex >= 0 && this.calculatedItems.containsKey(itemIndex)) {
+                final BookmarkItem item = entry.getValue();
+                if (this.recipeInMiddle.contains(item.recipeId)) {
+                    this.calculatedItems.get(itemIndex)
+                            .setRealAmount(Math.max(0, item.factor * (item.getMultiplier() - 1)));
+                } else {
+                    this.calculatedItems.get(itemIndex).setRealAmount(item.amount);
+                }
+            }
+        }
+
+    }
+
+    private Set<RecipeId> getRecipeRelations(RecipeChainMath math, RecipeId recipeId, Set<RecipeId> topLevelRecipes,
+            Set<RecipeId> recipes) {
+
+        for (BookmarkItem item : math.recipeIngredients) {
+            if (item.recipeId.equals(recipeId)) {
+                final BookmarkItem prefItem = math.preferredItems.get(item);
+                if (prefItem != null && !topLevelRecipes.contains(prefItem.recipeId)
+                        && recipes.add(prefItem.recipeId)) {
+                    getRecipeRelations(math, prefItem.recipeId, topLevelRecipes, recipes);
+                }
+            }
+        }
+
+        return recipes;
+    }
+
+    private void generateCollapsedRecipe(RecipeChainMath math, RecipeId recipeId, Set<RecipeId> topLevelRecipes,
+            Map<BookmarkItem, Integer> sortingChainItems) {
+
+        final List<BookmarkChainItem> items = collectItems(
+                math,
+                recipeId,
+                this.recipeRelations.get(recipeId),
+                topLevelRecipes);
+
+        for (BookmarkChainItem value : items) {
+            int itemIndex = sortingChainItems.get(value.getItem());
+
+            if (value.getItem().type == BookmarkItemType.INGREDIENT || !recipeId.equals(value.getItem().recipeId)) {
+                itemIndex *= -1;
+            }
+
+            if (value.getItem().type == BookmarkItemType.RESULT
+                    && !math.outputRecipes.containsKey(value.getItem().recipeId)) {
+                value.calculatedType = CalculatedType.REMAINDER;
+            }
+
+            this.itemToRecipe.put(itemIndex, recipeId);
+            this.calculatedItems.put(itemIndex, value);
+        }
+    }
+
+    private void generateShadowItems(RecipeId recipeId, Iterable<BookmarkItem> chainItems,
+            Map<BookmarkItem, Integer> sortingChainItems) {
+        final Set<RecipeId> recipeRelations = this.recipeRelations.get(recipeId);
+        final List<BookmarkItem> subChainItems = new ArrayList<>();
+
+        for (BookmarkItem item : chainItems) {
+            if (recipeRelations.contains(item.recipeId)) {
+                subChainItems.add(item.copyWithAmount(recipeId.equals(item.recipeId) ? item.amount : 0));
+            }
+        }
+
+        final RecipeChainMath math = RecipeChainMath.of(subChainItems, Collections.emptySet()).refresh();
+        final List<BookmarkChainItem> items = collectItems(
+                math,
+                recipeId,
+                this.recipeRelations.get(recipeId),
+                Collections.emptySet());
+
+        for (BookmarkChainItem value : items) {
+            int itemIndex = sortingChainItems.get(value.getItem());
+
+            if (value.getItem().type == BookmarkItemType.INGREDIENT || !recipeId.equals(value.getItem().recipeId)) {
+                itemIndex *= -1;
+            }
+
+            if (this.calculatedItems.containsKey(itemIndex)) {
+                this.calculatedItems.get(itemIndex).setRealAmount(value.getShiftAmount());
+            }
+        }
+
+    }
+
+    private List<BookmarkChainItem> collectItems(RecipeChainMath math, RecipeId recipeId, Set<RecipeId> recipeRelations,
+            Set<RecipeId> topLevelRecipes) {
+        final Map<String, BookmarkChainItem> items = new HashMap<>();
+        final Map<RecipeId, Long> multiplier = new HashMap<>();
+
+        for (RecipeId relRecipeId : recipeRelations) {
+            for (BookmarkItem item : math.recipeResults) {
+                if (item.recipeId.equals(relRecipeId)) {
+                    final long amount = item.amount - math.requiredAmount.getOrDefault(item, 0L);
+
+                    if (item.recipeId.equals(recipeId)) {
+                        multiplier.put(item.recipeId, item.getMultiplier());
+                        items.computeIfAbsent(
+                                StackInfo.getItemStackGUID(item.itemStack),
+                                is -> BookmarkChainItem.of(item, 0, 0, CalculatedType.RESULT))
+                                .append(amount, item.amount);
+                    } else if (amount > 0) {
+                        items.computeIfAbsent(
+                                StackInfo.getItemStackGUID(item.itemStack),
+                                is -> BookmarkChainItem.of(item, 0, 0, CalculatedType.RESULT)).append(amount, amount);
+                    }
+                }
+            }
+
+            for (BookmarkItem item : math.recipeIngredients) {
+                if (item.recipeId.equals(relRecipeId)) {
+                    final BookmarkItem prefItem = math.preferredItems.get(item);
+                    final long amount = math.requiredAmount.containsKey(prefItem) ? 0
+                            : math.requiredAmount.getOrDefault(item, item.amount);
+                    final long refAmount = prefItem != null && !topLevelRecipes.contains(prefItem.recipeId)
+                            ? math.requiredAmount.getOrDefault(prefItem, 0L)
+                            : 0;
+
+                    if (amount != 0 || item.amount > refAmount && math.requiredAmount.containsKey(prefItem)
+                            || recipeId.equals(item.recipeId) && multiplier.get(recipeId) == 0) {
+                        items.computeIfAbsent(
+                                StackInfo.getItemStackGUID(item.itemStack),
+                                is -> BookmarkChainItem.of(item, 0, 0, CalculatedType.INGREDIENT))
+                                .append(amount, item.amount - refAmount);
+                    }
+                }
+            }
+        }
+
+        return new ArrayList<>(items.values());
+    }
+
+    private void generateResult(RecipeChainMath math, BookmarkItem item, int itemIndex) {
+        final long amount = item.amount - math.requiredAmount.getOrDefault(item, 0L);
+        final CalculatedType calculatedType = math.outputRecipes.containsKey(item.recipeId) ? CalculatedType.RESULT
+                : CalculatedType.REMAINDER;
+
+        this.calculatedItems.put(itemIndex, BookmarkChainItem.of(item, amount, calculatedType));
+    }
+
+    private void generateIngredient(RecipeChainMath math, BookmarkItem item, int itemIndex) {
+        final BookmarkItem prefItem = math.preferredItems.get(item);
+        final long amount = math.requiredAmount.containsKey(prefItem) ? 0
+                : math.requiredAmount.getOrDefault(item, item.amount);
+
+        this.calculatedItems.put(itemIndex, BookmarkChainItem.of(item, amount, CalculatedType.INGREDIENT));
+    }
+
+    private Set<RecipeId> findTopLevelRecipes(RecipeChainMath math, Set<RecipeId> collapsedRecipes) {
+        final Set<RecipeId> result = new HashSet<>(math.outputRecipes.keySet());
+
+        for (BookmarkItem item : math.recipeResults) {
+            if (!result.contains(item.recipeId)) {
+                final Set<RecipeId> parents = getRecipeParents(
+                        math,
+                        item.recipeId,
+                        new HashSet<>(),
+                        new HashSet<>(Arrays.asList(item.recipeId)));
+
+                if (parents.size() != 1 || parents.stream().noneMatch(collapsedRecipes::contains)) {
+                    result.add(item.recipeId);
+                }
+            }
+        }
+
+        return result;
+    }
+
+    private Set<RecipeId> getRecipeParents(RecipeChainMath math, RecipeId recipeId, Set<RecipeId> parents,
+            Set<RecipeId> visited) {
+        final Set<RecipeId> recipeIds = math.preferredItems.entrySet().stream()
+                .filter(entry -> entry.getValue() != null && recipeId.equals(entry.getValue().recipeId))
+                .map(entry -> entry.getKey().recipeId).collect(Collectors.toSet());
+
+        if (recipeIds.isEmpty()) {
+            parents.add(recipeId);
+        } else {
+
+            for (RecipeId ingrRecipeId : recipeIds) {
+                if (visited.add(ingrRecipeId)) {
+                    if (math.outputRecipes.containsKey(ingrRecipeId)) {
+                        parents.add(ingrRecipeId);
+                    } else {
+                        getRecipeParents(math, ingrRecipeId, parents, visited);
+                    }
+                }
+            }
+
+        }
+
+        return parents;
+    }
+
+}

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

@@ -0,0 +1,83 @@
+package codechicken.nei.bookmark;
+
+import java.awt.Point;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.lwjgl.opengl.GL11;
+
+import codechicken.lib.vec.Rectangle4i;
+import codechicken.nei.guihook.GuiContainerManager;
+
+public class SortableGroup {
+
+    public int groupId;
+    public BookmarkGrid grid;
+
+    public int shiftX = 0;
+    public int shiftY = 0;
+
+    public SortableGroup(BookmarkGrid grid, int groupId) {
+        this.grid = grid;
+        this.groupId = groupId;
+    }
+
+    public void postDraw(int mousex, int mousey) {
+        Point startRect = null;
+
+        GuiContainerManager.drawItems.zLevel += 100;
+
+        for (BookmarksGridSlot slot : this.grid.getMask()) {
+            if (slot.getGroupId() == this.groupId) {
+                final Rectangle4i rect = this.grid.getSlotRect(slot.slotIndex);
+
+                if (startRect == null) {
+                    startRect = new Point(rect.x - this.shiftX, rect.y - this.shiftY);
+                }
+
+                GuiContainerManager.drawItem(
+                        mousex + rect.x - startRect.x + 1,
+                        mousey + rect.y - startRect.y + 1,
+                        slot.getItemStack(),
+                        true,
+                        "");
+
+            }
+        }
+
+        if (startRect != null) {
+            int startRowIndex = -1;
+            int endRowIndex = 0;
+
+            for (int rowIndex = 0; rowIndex < this.grid.getRows(); rowIndex++) {
+                if (this.grid.getRowGroupId(rowIndex) == this.groupId) {
+
+                    if (startRowIndex == -1) {
+                        startRowIndex = rowIndex;
+                    }
+
+                    endRowIndex = rowIndex;
+                }
+            }
+
+            GL11.glPushMatrix();
+            GL11.glTranslated(mousex - startRect.x, mousey - startRect.y, 0);
+            this.grid.drawGroup(this.groupId, startRowIndex, endRowIndex);
+            GL11.glPopMatrix();
+        }
+
+        GuiContainerManager.drawItems.zLevel -= 100;
+    }
+
+    public List<BookmarkItem> getBookmarkItems() {
+        final List<BookmarkItem> items = new ArrayList<>();
+
+        for (BookmarkItem item : this.grid.bookmarkItems) {
+            if (item.groupId == this.groupId) {
+                items.add(item);
+            }
+        }
+
+        return items;
+    }
+}

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

@@ -0,0 +1,251 @@
+package codechicken.nei.bookmark;
+
+import java.awt.Point;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import codechicken.lib.vec.Rectangle4i;
+import codechicken.nei.BookmarkPanel.BookmarkViewMode;
+import codechicken.nei.ItemsGrid;
+import codechicken.nei.bookmark.BookmarkItem.BookmarkItemType;
+import codechicken.nei.bookmark.RecipeChainDetails.BookmarkChainItem;
+import codechicken.nei.guihook.GuiContainerManager;
+import codechicken.nei.recipe.Recipe.RecipeId;
+
+public class SortableItem {
+
+    public final BookmarkGrid grid;
+    public final BookmarkItem bookmarkItem;
+    public final boolean moveRecipe;
+    public final boolean crossGroup;
+    public final boolean isCollapsedRecipe;
+    public List<Integer> items = new ArrayList<>();
+
+    public int shiftX = -8;
+    public int shiftY = -8;
+
+    public SortableItem(BookmarkGrid grid, BookmarkItem bookmarkItem) {
+        final BookmarkGroup group = grid.getGroup(bookmarkItem.groupId);
+
+        this.grid = grid;
+        this.bookmarkItem = bookmarkItem.copy();
+        this.moveRecipe = bookmarkItem.recipeId != null && bookmarkItem.type == BookmarkItemType.RESULT
+                && (group.viewMode == BookmarkViewMode.TODO_LIST || group.crafting != null);
+        this.crossGroup = !group.collapsed && group.viewMode == BookmarkViewMode.TODO_LIST
+                && bookmarkItem.type != BookmarkItemType.INGREDIENT;
+        this.isCollapsedRecipe = group.crafting != null && group.crafting.itemToRecipe.values().stream()
+                .anyMatch(recipeId -> this.bookmarkItem.equalsRecipe(recipeId, this.bookmarkItem.groupId));
+
+        this.update();
+    }
+
+    public void postDraw(int mousex, int mousey) {
+        Point startRect = null;
+
+        GuiContainerManager.drawItems.zLevel += 100;
+
+        for (Integer itemIndex : this.grid.getSortedItems()) {
+            if (this.items.contains(itemIndex)) {
+                final BookmarkItem item = this.grid.getCalculatedItem(itemIndex);
+                final int slotIndex = this.grid.gridGenerator.itemToSlot.get(itemIndex);
+                final Rectangle4i rect = this.grid
+                        .getSlotRect(slotIndex % (this.grid.getRows() * this.grid.getColumns()));
+
+                if (startRect == null) {
+                    startRect = new Point(rect.x - this.shiftX, rect.y - this.shiftY);
+                }
+
+                GuiContainerManager.drawItem(
+                        mousex + rect.x - startRect.x + 1,
+                        mousey + rect.y - startRect.y + 1,
+                        item.getItemStack(),
+                        true,
+                        "");
+
+            }
+        }
+
+        GuiContainerManager.drawItems.zLevel -= 100;
+    }
+
+    public void update() {
+        final BookmarkGroup group = this.grid.getGroup(this.bookmarkItem.groupId);
+
+        this.items.clear();
+
+        if (group.collapsed) {
+            return;
+        }
+
+        for (Map.Entry<Integer, BookmarkChainItem> entry : this.grid.gridGenerator.caclulatedItems.entrySet()) {
+            if (containsItem(entry.getValue().getItem())) {
+                this.items.add(entry.getKey());
+            }
+        }
+
+        if (this.isCollapsedRecipe && group.crafting != null) {
+            for (Map.Entry<Integer, RecipeId> entry : group.crafting.itemToRecipe.entrySet()) {
+                if (this.bookmarkItem.equalsRecipe(entry.getValue(), this.bookmarkItem.groupId)) {
+                    this.items.add(entry.getKey());
+                }
+            }
+        }
+
+    }
+
+    public boolean isEmpty() {
+        return this.items.isEmpty();
+    }
+
+    public int getItemIndex() {
+        return this.items.isEmpty() ? -1 : this.items.get(0);
+    }
+
+    private boolean canInsert(BookmarkGroup group) {
+        return group.viewMode == BookmarkViewMode.TODO_LIST && !group.collapsed;
+    }
+
+    public void mouseDragged(int mousex, int mousey) {
+        final BookmarkViewMode sortViewMode = this.grid.getViewMode(this.bookmarkItem.groupId);
+        BookmarksGridSlot mouseOverSlot = this.grid.getSlotMouseOver(mousex, mousey);
+
+        if (this.crossGroup) {
+            final Rectangle4i topLeftSlot = this.grid.getSlotRect(0);
+            mouseOverSlot = this.grid.getSlotMouseOver(topLeftSlot.x, mousey);
+
+            if (mouseOverSlot != null) {
+                float ySlot = (float) (mousey - topLeftSlot.y) / ItemsGrid.SLOT_SIZE;
+                int overRowIndex = (int) ySlot;
+                int beforeGroupId = this.grid.getRowGroupId(overRowIndex - 1);
+                int afterGroupId = this.grid.getRowGroupId(overRowIndex + 1);
+                int overGroupId = mouseOverSlot.getGroupId();
+                ySlot -= overRowIndex;
+
+                if (overGroupId == this.bookmarkItem.groupId && !this.items.contains(mouseOverSlot.itemIndex)) {
+                    this.grid.moveItem(this, mouseOverSlot.itemIndex);
+                } else if (ySlot <= 0.25) {
+                    final BookmarkGroup group = this.grid.getGroup(beforeGroupId);
+
+                    if (beforeGroupId != overGroupId && canInsert(group)
+                            && !existsRecipe(this.bookmarkItem.recipeId, beforeGroupId)) {
+                        this.grid.moveItem(this, overRowIndex, beforeGroupId, false);
+                    }
+
+                } else if (ySlot > 0.25 && ySlot <= 0.5) {
+
+                    if (beforeGroupId == overGroupId) {
+                        return;
+                    }
+
+                    if (overGroupId != BookmarkGrid.DEFAULT_GROUP_ID
+                            && beforeGroupId != BookmarkGrid.DEFAULT_GROUP_ID) {
+                        beforeGroupId = BookmarkGrid.DEFAULT_GROUP_ID;
+                    }
+
+                    if (overGroupId == BookmarkGrid.DEFAULT_GROUP_ID && beforeGroupId != BookmarkGrid.DEFAULT_GROUP_ID
+                            && afterGroupId != BookmarkGrid.DEFAULT_GROUP_ID) {
+                        return;
+                    }
+
+                    if (canInsert(this.grid.getGroup(beforeGroupId))
+                            && !existsRecipe(this.bookmarkItem.recipeId, beforeGroupId)) {
+                        this.grid.moveItem(this, overRowIndex, beforeGroupId, false);
+                    }
+
+                } else if (ySlot > 0.5 && ySlot < 0.75) {
+
+                    if (afterGroupId == overGroupId) {
+                        return;
+                    }
+
+                    if (overGroupId != BookmarkGrid.DEFAULT_GROUP_ID && afterGroupId != BookmarkGrid.DEFAULT_GROUP_ID) {
+                        afterGroupId = BookmarkGrid.DEFAULT_GROUP_ID;
+                    }
+
+                    if (overGroupId == BookmarkGrid.DEFAULT_GROUP_ID && beforeGroupId != BookmarkGrid.DEFAULT_GROUP_ID
+                            && afterGroupId != BookmarkGrid.DEFAULT_GROUP_ID) {
+                        return;
+                    }
+
+                    if (canInsert(this.grid.getGroup(afterGroupId))
+                            && !existsRecipe(this.bookmarkItem.recipeId, afterGroupId)) {
+                        this.grid.moveItem(this, overRowIndex, afterGroupId, true);
+                    }
+
+                } else if (ySlot >= 0.75) {
+                    final BookmarkGroup group = this.grid.getGroup(afterGroupId);
+
+                    if (afterGroupId != overGroupId && canInsert(group)
+                            && !existsRecipe(this.bookmarkItem.recipeId, afterGroupId)) {
+                        this.grid.moveItem(this, overRowIndex, afterGroupId, true);
+                    }
+
+                }
+
+            } else {
+                final int overRowIndex = this.grid.getHoveredRowIndex(false);
+                final int overGroupId = this.grid.getRowGroupId(overRowIndex);
+
+                if (overRowIndex != -1 && overGroupId == this.bookmarkItem.groupId) {
+                    final int absoluteSlotIndex = ((this.grid.getPage() - 1) * this.grid.getRows() + overRowIndex)
+                            * this.grid.getColumns();
+
+                    if (absoluteSlotIndex < this.grid.gridGenerator.itemToSlot.getOrDefault(getItemIndex(), -1)) {
+                        this.grid.moveItem(this, overRowIndex, overGroupId, true);
+                    } else {
+                        this.grid.moveItem(this, overRowIndex, overGroupId, false);
+                    }
+
+                }
+
+            }
+
+        } else if (mouseOverSlot != null && !this.items.contains(mouseOverSlot.itemIndex)
+                && mouseOverSlot.getGroupId() == this.bookmarkItem.groupId
+                && (sortViewMode == BookmarkViewMode.DEFAULT || sortViewMode == BookmarkViewMode.TODO_LIST
+                        && mouseOverSlot.getBookmarkItem().equalsRecipe(this.bookmarkItem))) {
+                            this.grid.moveItem(this, mouseOverSlot.itemIndex);
+                        }
+
+    }
+
+    private boolean existsRecipe(RecipeId recipeId, int groupId) {
+        if (recipeId == null) return false;
+
+        for (int itemIndex = 0; itemIndex < this.grid.bookmarkItems.size(); itemIndex++) {
+            if (!this.items.contains(itemIndex)
+                    && this.grid.bookmarkItems.get(itemIndex).equalsRecipe(recipeId, groupId)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public List<BookmarkItem> getBookmarkItems() {
+        final BookmarkGroup group = this.grid.getGroup(this.bookmarkItem.groupId);
+        final List<BookmarkItem> items = new ArrayList<>();
+        final List<RecipeId> recipeRelations = new ArrayList<>();
+
+        if (this.isCollapsedRecipe && group.crafting != null) {
+            recipeRelations.addAll(
+                    group.crafting.recipeRelations.getOrDefault(this.bookmarkItem.recipeId, Collections.emptySet()));
+        }
+
+        for (BookmarkItem item : this.grid.bookmarkItems) {
+            if (containsItem(item)
+                    || item.groupId == this.bookmarkItem.groupId && recipeRelations.contains(item.recipeId)) {
+                items.add(item);
+            }
+        }
+
+        return items;
+    }
+
+    public boolean containsItem(BookmarkItem slotItem) {
+        return this.moveRecipe ? this.bookmarkItem.equalsRecipe(slotItem) : this.bookmarkItem.equals(slotItem);
+    }
+
+}

src/main/java/codechicken/nei/commands/CommandBookmarkAdd.java

@@ -0,0 +1,48 @@
+package codechicken.nei.commands;
+
+import net.minecraft.command.CommandBase;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.JsonToNBT;
+import net.minecraft.nbt.NBTException;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.ChatComponentTranslation;
+
+import codechicken.nei.ItemPanels;
+
+public class CommandBookmarkAdd extends CommandBase {
+
+    @Override
+    public String getCommandName() {
+        return "nei_bookmark";
+    }
+
+    @Override
+    public String getCommandUsage(ICommandSender sender) {
+        return "/nei_bookmark <nbt>";
+    }
+
+    @Override
+    public int getRequiredPermissionLevel() {
+        return 0;
+    }
+
+    @Override
+    public void processCommand(ICommandSender sender, String[] args) {
+
+        if (args.length < 1 || args[0].length() < 3) {
+            sender.addChatMessage(new ChatComponentText("§c/nei_bookmark <nbt>"));
+            return;
+        }
+
+        try {
+            ItemPanels.bookmarkPanel.addItem(
+                    ItemStack.loadItemStackFromNBT((NBTTagCompound) JsonToNBT.func_150315_a(String.join(" ", args))));
+            sender.addChatMessage(new ChatComponentTranslation("nei.chat.bookmark_added.text"));
+        } catch (NBTException e) {
+            sender.addChatMessage(new ChatComponentText(e.toString()));
+        }
+    }
+
+}

src/main/java/codechicken/nei/commands/CommandRecipeId.java

@@ -0,0 +1,296 @@
+package codechicken.nei.commands;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.TreeSet;
+import java.util.stream.Collectors;
+
+import net.minecraft.command.CommandBase;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.ChatComponentTranslation;
+import net.minecraft.util.ChatStyle;
+import net.minecraft.util.EnumChatFormatting;
+
+import org.apache.commons.io.IOUtils;
+
+import com.google.gson.JsonParser;
+
+import codechicken.core.CommonUtils;
+import codechicken.nei.ClientHandler;
+import codechicken.nei.ItemList;
+import codechicken.nei.NEIClientConfig;
+import codechicken.nei.NEIClientUtils;
+import codechicken.nei.recipe.GuiCraftingRecipe;
+import codechicken.nei.recipe.GuiRecipeTab;
+import codechicken.nei.recipe.ICraftingHandler;
+import codechicken.nei.recipe.Recipe;
+import codechicken.nei.recipe.RecipeHandlerQuery;
+import codechicken.nei.util.NBTJson;
+
+public class CommandRecipeId extends CommandBase {
+
+    protected static class ProcessDiffThread extends Thread {
+
+        protected final ICommandSender sender;
+        protected final File prevFile;
+        protected final File currFile;
+        protected final File diffFile;
+
+        public ProcessDiffThread(ICommandSender sender, File prevFile, File currFile, File diffFile) {
+            this.sender = sender;
+            this.prevFile = prevFile;
+            this.currFile = currFile;
+            this.diffFile = diffFile;
+        }
+
+        @Override
+        public void run() {
+            sendChatInfoMessage(sender, "nei.chat.recipeid.diff.start");
+
+            final Set<String> prevRecipes = loadFileContent(this.prevFile);
+            final Set<String> currRecipes = loadFileContent(this.currFile);
+            final Set<String> notAllowedRecipes = prevRecipes.stream().filter(recipe -> !currRecipes.contains(recipe))
+                    .collect(Collectors.toCollection(TreeSet::new));
+            final List<String> subsetsList = new ArrayList<>();
+
+            generateSubsets(notAllowedRecipes).forEach((handlerName, recipes) -> {
+                subsetsList.add("; " + handlerName);
+                subsetsList.addAll(recipes);
+            });
+
+            saveFile(this.diffFile, subsetsList);
+            saveFile(getFile("not-allowed-recipes"), new ArrayList<>(notAllowedRecipes));
+
+            sendChatInfoMessage(sender, "nei.chat.recipeid.diff.finish");
+        }
+
+        private Set<String> loadFileContent(File file) {
+            try (FileReader reader = new FileReader(file)) {
+                return new HashSet<>(IOUtils.readLines(reader));
+            } catch (IOException e) {
+                NEIClientConfig.logger.error("Failed to load '{}' file {}", file.getName(), file, e);
+            }
+            return new HashSet<>();
+        }
+
+        private Map<String, Set<String>> generateSubsets(Set<String> notAllowedRecipes) {
+            final JsonParser parser = new JsonParser();
+            final Map<String, Set<String>> subsetsBuilder = new TreeMap<>();
+
+            for (String recipeStr : notAllowedRecipes) {
+                try {
+                    final NBTTagCompound nbtRecipe = (NBTTagCompound) NBTJson.toNbt(parser.parse(recipeStr));
+
+                    if (nbtRecipe.hasKey("result")) {
+                        final NBTTagCompound nbtStack = nbtRecipe.getCompoundTag("result");
+                        nbtStack.removeTag("Count");
+                        subsetsBuilder.computeIfAbsent(nbtRecipe.getString("handlerName"), rn -> new TreeSet<>())
+                                .add(NBTJson.toJson(nbtStack));
+                    } else {
+                        NEIClientConfig.logger.error("Found Broken RecipeId {}", recipeStr);
+                    }
+                } catch (Exception ex) {
+                    NEIClientConfig.logger.error("Found Broken RecipeId {}", recipeStr, ex);
+                }
+            }
+
+            return subsetsBuilder;
+        }
+
+        private void saveFile(File file, List<String> content) {
+            try (FileOutputStream output = new FileOutputStream(file)) {
+                IOUtils.writeLines(content, "\n", output, StandardCharsets.UTF_8);
+            } catch (IOException e) {
+                NEIClientConfig.logger.error("Failed to save recipeid diff list to file {}", file, e);
+            }
+        }
+
+    }
+
+    protected static class ProcessDumpThread extends Thread {
+
+        private ArrayList<ICraftingHandler> craftinghandlers = new ArrayList<>();
+        private ArrayList<ICraftingHandler> serialCraftingHandlers = new ArrayList<>();
+        protected final ICommandSender sender;
+        protected final File currFile;
+
+        public ProcessDumpThread(ICommandSender sender, File currFile) {
+            this.sender = sender;
+            this.currFile = currFile;
+            ClientHandler.loadSettingsFile("recipeidblacklist.cfg", lines -> {
+                final Set<String> names = lines.collect(Collectors.toSet());
+
+                this.craftinghandlers = GuiCraftingRecipe.craftinghandlers.stream()
+                        .filter(h -> !names.contains(GuiRecipeTab.getHandlerInfo(h).getHandlerName()))
+                        .collect(Collectors.toCollection(ArrayList::new));
+
+                this.serialCraftingHandlers = GuiCraftingRecipe.serialCraftingHandlers.stream()
+                        .filter(h -> !names.contains(GuiRecipeTab.getHandlerInfo(h).getHandlerName()))
+                        .collect(Collectors.toCollection(ArrayList::new));
+            });
+        }
+
+        @Override
+        public void run() {
+            NEIClientConfig.logger.info("Start processing recipe handlers!");
+            sendChatInfoMessage(sender, "nei.chat.recipeid.dump.start");
+
+            try (BufferedWriter writer = Files.newBufferedWriter(currFile.toPath(), StandardCharsets.UTF_8)) {
+                int total = ItemList.items.size();
+                int count = 0;
+
+                for (ItemStack stack : ItemList.items) {
+
+                    if (count % 1000 == 0) {
+                        NEIClientConfig.logger.info(
+                                "({}/{}). Processing {} crafting recipes...",
+                                count,
+                                total,
+                                stack.getDisplayName());
+                    }
+
+                    count++;
+
+                    for (ICraftingHandler handler : getCraftingHandlers(stack)) {
+                        for (int index = 0, num = handler.numRecipes(); index < num; index++) {
+                            try {
+                                final Recipe recipe = Recipe.of(handler, index);
+                                if (!recipe.getIngredients().isEmpty() && !recipe.getResults().isEmpty()) {
+                                    writer.write(NBTJson.toJson(recipe.getRecipeId().toJsonObject()));
+                                    writer.newLine();
+                                }
+                            } catch (Exception ex) {
+                                NEIClientConfig.logger.error(
+                                        "Found Broken RecipeId {}:{}",
+                                        GuiRecipeTab.getHandlerInfo(handler).getHandlerName(),
+                                        stack,
+                                        ex);
+                            }
+                        }
+                    }
+                }
+
+            } catch (Exception e) {
+                NEIClientConfig.logger.error("Error dumping RecipeId", e);
+            }
+
+            NEIClientConfig.logger.info("Finished processing recipe handlers!");
+            sendChatInfoMessage(sender, "nei.chat.recipeid.dump.finish");
+        }
+
+        private ArrayList<ICraftingHandler> getCraftingHandlers(Object... results) {
+            return new RecipeHandlerQuery<>(
+                    h -> h.getRecipeHandler("item", results),
+                    this.craftinghandlers,
+                    this.serialCraftingHandlers,
+                    "Error while looking up crafting recipe",
+                    "outputId: item",
+                    "results: " + Arrays.toString(results))
+                            .runWithProfiling(NEIClientUtils.translate("recipe.concurrent.crafting"));
+        }
+
+    }
+
+    @Override
+    public String getCommandName() {
+        return "recipeid";
+    }
+
+    @Override
+    public String getCommandUsage(ICommandSender sender) {
+        return "/recipeid dump <filename> OR /recipeid diff <prev-filename> <curr-filename> [subset name]";
+    }
+
+    @Override
+    public int getRequiredPermissionLevel() {
+        return 0;
+    }
+
+    @Override
+    public void processCommand(ICommandSender sender, String[] args) {
+        final String command = args.length == 0 ? null : args[0];
+
+        if ("dump".equals(command)) {
+            processDumpCommand(sender, args);
+        } else if ("diff".equals(command)) {
+            processDiffCommand(sender, args);
+        } else {
+            sendChatErrorMessage(sender, getCommandUsage(sender));
+        }
+
+    }
+
+    protected void processDiffCommand(ICommandSender sender, String[] args) {
+
+        if (args.length > 4) {
+            sendChatErrorMessage(sender, "nei.chat.recipeid.many_params", getCommandUsage(sender));
+            return;
+        }
+
+        if (args.length < 3) {
+            sendChatErrorMessage(sender, getCommandUsage(sender));
+            return;
+        }
+
+        final File prevFilename = getFile(args[1]);
+        final File currFilename = getFile(args[2]);
+        final File diffFilename = getFile(args.length > 3 ? args[3] : "changelog");
+
+        if (!prevFilename.exists()) {
+            sendChatErrorMessage(sender, "nei.chat.recipeid.not_found", prevFilename.getName());
+            return;
+        }
+
+        if (!currFilename.exists()) {
+            sendChatErrorMessage(sender, "nei.chat.recipeid.not_found", currFilename.getName());
+            return;
+        }
+
+        (new ProcessDiffThread(sender, prevFilename, currFilename, diffFilename)).start();
+    }
+
+    protected void processDumpCommand(ICommandSender sender, String[] args) {
+
+        if (args.length > 2) {
+            sendChatErrorMessage(sender, "nei.chat.recipeid.many_params", getCommandUsage(sender));
+            return;
+        }
+
+        final File dir = new File(CommonUtils.getMinecraftDir(), "recipeid");
+        final String currFilename = args.length == 2 ? args[1] : "recipeId";
+        if (!dir.exists()) dir.mkdirs();
+
+        (new ProcessDumpThread(sender, getFile(currFilename))).start();
+    }
+
+    private static File getFile(String filename) {
+        return new File(CommonUtils.getMinecraftDir(), "recipeid/" + filename + ".json");
+    }
+
+    private static void sendChatInfoMessage(ICommandSender sender, String translationKey, Object... args) {
+        sender.addChatMessage(
+                new ChatComponentTranslation(translationKey, args)
+                        .setChatStyle(new ChatStyle().setColor(EnumChatFormatting.AQUA)));
+    }
+
+    private static void sendChatErrorMessage(ICommandSender sender, String translationKey, Object... args) {
+        sender.addChatMessage(
+                new ChatComponentTranslation(translationKey, args)
+                        .setChatStyle(new ChatStyle().setColor(EnumChatFormatting.RED)));
+    }
+
+}

src/main/java/codechicken/nei/commands/CommandUntranslator.java

@@ -0,0 +1,78 @@
+package codechicken.nei.commands;
+
+import java.io.File;
+
+import net.minecraft.command.CommandBase;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.util.ChatComponentTranslation;
+import net.minecraft.util.ChatStyle;
+import net.minecraft.util.EnumChatFormatting;
+
+import codechicken.nei.ItemList;
+import codechicken.nei.NEIClientConfig;
+import codechicken.nei.util.ItemUntranslator;
+
+public class CommandUntranslator extends CommandBase {
+
+    @Override
+    public String getCommandName() {
+        return "untranslator";
+    }
+
+    @Override
+    public String getCommandUsage(ICommandSender sender) {
+        return "/untranslator dump OR /untranslator clear";
+    }
+
+    @Override
+    public int getRequiredPermissionLevel() {
+        return 0;
+    }
+
+    @Override
+    public void processCommand(ICommandSender sender, String[] args) {
+        final String command = args.length == 0 ? null : args[0];
+
+        if ("dump".equals(command)) {
+            if (ItemList.items.isEmpty()) {
+                sendChatErrorMessage(sender, "nei.chat.untranslator.dump.error");
+                return;
+            } else {
+                sendChatInfoMessage(sender, "nei.chat.untranslator.dump.start");
+                ItemUntranslator.getInstance().generateUntranslatedNames();
+                sendChatInfoMessage(sender, "nei.chat.untranslator.dump.finish");
+
+                if (NEIClientConfig.enableItemUntranslator()) {
+                    ItemUntranslator.getInstance().load();
+                }
+            }
+        } else if ("clear".equals(command)) {
+            final File file = new File(NEIClientConfig.configDir, "untranslator.cfg");
+
+            if (file.exists() && file.delete()) {
+                sendChatInfoMessage(sender, "nei.chat.untranslator.clear");
+                if (NEIClientConfig.enableItemUntranslator()) {
+                    ItemUntranslator.getInstance().load();
+                }
+            } else {
+                sendChatErrorMessage(sender, "nei.chat.untranslator.clear.error");
+            }
+        } else {
+            sendChatErrorMessage(sender, getCommandUsage(sender));
+        }
+
+    }
+
+    private static void sendChatInfoMessage(ICommandSender sender, String translationKey, Object... args) {
+        sender.addChatMessage(
+                new ChatComponentTranslation(translationKey, args)
+                        .setChatStyle(new ChatStyle().setColor(EnumChatFormatting.AQUA)));
+    }
+
+    private static void sendChatErrorMessage(ICommandSender sender, String translationKey, Object... args) {
+        sender.addChatMessage(
+                new ChatComponentTranslation(translationKey, args)
+                        .setChatStyle(new ChatStyle().setColor(EnumChatFormatting.RED)));
+    }
+
+}

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

@@ -1,9 +1,7 @@
 package codechicken.nei.config;
 
-import static codechicken.lib.gui.GuiDraw.getMousePosition;
-
 import java.awt.Point;
-import java.util.ArrayList;
+import java.util.List;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.RenderHelper;
@@ -14,6 +12,7 @@ import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
 
 import codechicken.core.gui.GuiScreenWidget;
+import codechicken.lib.gui.GuiDraw;
 import codechicken.lib.render.CCRenderState;
 import codechicken.lib.vec.Rectangle4i;
 import codechicken.nei.ItemPanels;
@@ -114,8 +113,8 @@ public class GuiPanelSettings extends GuiScreenWidget {
         }
 
         protected int[] getPaddings() {
-            final int minWidth = 5 * ItemsGrid.SLOT_SIZE;
-            final int minHeight = 9 * ItemsGrid.SLOT_SIZE;
+            final int minWidth = ItemsGrid.SLOT_SIZE;
+            final int minHeight = ItemsGrid.SLOT_SIZE;
 
             int paddingLeft = (int) Math.ceil(margin.w * opt.renderTag(name + ".left").getIntValue() / 100000.0);
             int paddingTop = (int) Math.ceil(margin.h * opt.renderTag(name + ".top").getIntValue() / 100000.0);
@@ -123,7 +122,7 @@ public class GuiPanelSettings extends GuiScreenWidget {
             int paddingBottom = (int) Math.ceil(margin.h * opt.renderTag(name + ".bottom").getIntValue() / 100000.0);
 
             if (dragDir != null) {
-                final Point mouse = getMousePosition();
+                final Point mouse = GuiDraw.getMousePosition();
                 Point drag = new Point(mouse.x - dragDown.x, mouse.y - dragDown.y);
 
                 if (dragDir == "left") {
@@ -161,16 +160,15 @@ public class GuiPanelSettings extends GuiScreenWidget {
         }
 
         protected void drawItems() {
-            final int columns = w / ItemsGrid.SLOT_SIZE;
-            final int rows = (h - (PANEL_SIZE + 2) * 2) / ItemsGrid.SLOT_SIZE;
+            final int columns = (w - 2) / ItemsGrid.SLOT_SIZE;
+            final int rows = (h - (PANEL_SIZE + 2) * 2 - 2) / ItemsGrid.SLOT_SIZE;
             final int paddingLeft = (w % ItemsGrid.SLOT_SIZE) / 2;
-            final ArrayList<ItemStack> items = ItemPanels.itemPanel.getItems();
+            final List<ItemStack> items = ItemPanels.itemPanel.getItems();
             if (items.isEmpty()) return;
 
             for (int r = 0; r < rows; r++) {
                 for (int c = 0; c < columns; c++) {
-
-                    GuiContainerManager.drawItem(
+                    drawItem(
                             x + paddingLeft + ItemsGrid.SLOT_SIZE * c + 1,
                             y + PANEL_SIZE + 2 + ItemsGrid.SLOT_SIZE * r + 1,
                             items.get((r * columns + c) % items.size()));
@@ -178,6 +176,21 @@ public class GuiPanelSettings extends GuiScreenWidget {
             }
         }
 
+        protected void drawItem(int x, int y, ItemStack stack) {
+            final float scale = ItemsGrid.SLOT_SIZE / 18f;
+            final float inverseScaleFactor = 1.0f / scale;
+            final float shiftX = x * inverseScaleFactor;
+            final float shiftY = y * inverseScaleFactor;
+
+            GL11.glScaled(scale, scale, 1);
+            GL11.glTranslated(shiftX, shiftY, 0);
+
+            GuiContainerManager.drawItem(0, 0, stack, true, "");
+
+            GL11.glTranslated(-1 * shiftX, -1 * shiftY, 0);
+            GL11.glScaled(inverseScaleFactor, inverseScaleFactor, 1);
+        }
+
         public boolean contains(int pointX, int pointY) {
             return (new Rectangle4i(x, y, w, h)).contains(pointX, pointY);
         }
@@ -185,7 +198,7 @@ public class GuiPanelSettings extends GuiScreenWidget {
         protected void mouseClicked(int x, int y, int button) {
 
             if (contains(x, y)) {
-                dragDown = getMousePosition();
+                dragDown = GuiDraw.getMousePosition();
 
                 if (leftButton.contains(x, y)) {
                     dragDir = "left";

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

@@ -97,7 +97,7 @@ public class HandlerDumper extends DataDumper {
             }
             writer.close();
         } catch (IOException e) {
-            NEIClientConfig.logger.error("Filed to save dump handler list to file {}", file, e);
+            NEIClientConfig.logger.error("Failed to save dump handler list to file {}", file, e);
         }
     }
 

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

@@ -1,13 +1,13 @@
 package codechicken.nei.config;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
 
 import codechicken.core.CommonUtils;
 import codechicken.nei.NEIClientConfig;
@@ -15,6 +15,7 @@ import codechicken.nei.NEIServerUtils;
 import codechicken.nei.recipe.CatalystInfo;
 import codechicken.nei.recipe.GuiRecipeTab;
 import codechicken.nei.recipe.HandlerInfo;
+import codechicken.nei.recipe.InformationHandler;
 import codechicken.nei.recipe.RecipeCatalysts;
 import cpw.mods.fml.common.FMLLog;
 import cpw.mods.fml.common.Loader;
@@ -33,18 +34,11 @@ public class IMCHandler {
             if (type == null || type.isEmpty()) continue;
             if (CommonUtils.isClient()) {
                 switch (type) {
-                    case "registerHandlerInfo":
-                        handleRegisterHandlerInfo(message);
-                        break;
-                    case "removeHandlerInfo":
-                        handleRemoveHandlerInfo(message);
-                        break;
-                    case "registerCatalystInfo":
-                        handleRegisterCatalystInfo(message);
-                        break;
-                    case "removeCatalystInfo":
-                        handleRemoveCatalystInfo(message);
-                        break;
+                    case "registerHandlerInfo" -> handleRegisterHandlerInfo(message);
+                    case "removeHandlerInfo" -> handleRemoveHandlerInfo(message);
+                    case "registerCatalystInfo" -> handleRegisterCatalystInfo(message);
+                    case "removeCatalystInfo" -> handleRemoveCatalystInfo(message);
+                    case "addItemInfo" -> handleAddItemInfo(message);
                 }
             }
         }
@@ -57,14 +51,14 @@ public class IMCHandler {
         }
         final NBTTagCompound tag = message.getNBTValue();
         final String handler = tag.getString("handler");
-        NEIClientConfig.logger.info("Processing registerHandlerInfo `" + handler + "` from " + message.getSender());
+        NEIClientConfig.logger.info("Processing registerHandlerInfo `{}` from {}", handler, message.getSender());
 
         final String modName = tag.getString("modName");
         final String modId = tag.getString("modId");
         final boolean requiresMod = tag.getBoolean("modRequired");
         final String excludedModId = tag.hasKey("excludedModId") ? tag.getString("excludedModId") : null;
 
-        if (handler.equals("") || modName.equals("") || modId.equals("")) {
+        if (handler.isEmpty() || modName.isEmpty() || modId.isEmpty()) {
             NEIClientConfig.logger.warn("Missing relevant information to registerHandlerInfo!");
             return;
         }
@@ -74,7 +68,7 @@ public class IMCHandler {
 
         HandlerInfo info = new HandlerInfo(handler, modName, modId, requiresMod, excludedModId);
         final String imageResource = tag.hasKey("imageResource") ? tag.getString("imageResource") : null;
-        if (imageResource != null && !imageResource.equals("")) {
+        if (imageResource != null && !imageResource.isEmpty()) {
             info.setImage(
                     imageResource,
                     tag.getInteger("imageX"),
@@ -84,7 +78,7 @@ public class IMCHandler {
         }
         if (!info.hasImageOrItem()) {
             final String itemName = tag.getString("itemName");
-            if (itemName != null && !itemName.equals("")) {
+            if (itemName != null && !itemName.isEmpty()) {
                 info.setItem(itemName, tag.hasKey("nbtInfo") ? tag.getString("nbtInfo") : null);
             }
         }
@@ -92,17 +86,23 @@ public class IMCHandler {
         info.setYShift(yShift);
 
         try {
-            final int imageHeight = tag.hasKey("handlerHeight") ? tag.getInteger("handlerHeight")
+            final int handlerHeight = tag.hasKey("handlerHeight") ? tag.getInteger("handlerHeight")
                     : HandlerInfo.DEFAULT_HEIGHT;
-            final int imageWidth = tag.hasKey("handlerWidth") ? tag.getInteger("handlerWidth")
+            final int handlerWidth = tag.hasKey("handlerWidth") ? tag.getInteger("handlerWidth")
                     : HandlerInfo.DEFAULT_WIDTH;
-            final int maxRecipesPerPage = tag.hasKey("maxRecipesPerPage") ? tag.getInteger("maxRecipesPerPage")
-                    : HandlerInfo.DEFAULT_MAX_PER_PAGE;
-            info.setHandlerDimensions(imageHeight, imageWidth, maxRecipesPerPage);
+            final boolean multipleWidgetsAllowed = tag.hasKey("multipleWidgetsAllowed")
+                    ? tag.getBoolean("multipleWidgetsAllowed")
+                    : tag.hasKey("maxRecipesPerPage") && tag.getInteger("maxRecipesPerPage") > 1;
+            info.setHandlerDimensions(handlerWidth, handlerHeight, multipleWidgetsAllowed);
         } catch (NumberFormatException ignored) {
-            NEIClientConfig.logger.info("Error setting handler dimensions for " + handler);
+            NEIClientConfig.logger.info("Error setting handler dimensions for {}", handler);
         }
 
+        // true if not set to false
+        info.setUseCustomScroll(tag.hasKey("useCustomScroll") && tag.getBoolean("useCustomScroll"));
+        info.setShowFavoritesButton(!tag.hasKey("showFavoritesButton") || tag.getBoolean("showFavoritesButton"));
+        info.setShowOverlayButton(!tag.hasKey("showOverlayButton") || tag.getBoolean("showOverlayButton"));
+
         GuiRecipeTab.handlerAdderFromIMC.remove(handler);
         GuiRecipeTab.handlerAdderFromIMC.put(handler, info);
     }
@@ -114,7 +114,7 @@ public class IMCHandler {
         }
         final NBTTagCompound tag = message.getNBTValue();
         final String handler = tag.getString("handler");
-        NEIClientConfig.logger.info("Processing removeHandlerInfo `" + handler + "` from " + message.getSender());
+        NEIClientConfig.logger.info("Processing removeHandlerInfo `{}` from {}", handler, message.getSender());
 
         GuiRecipeTab.handlerRemoverFromIMC.add(handler);
     }
@@ -126,7 +126,7 @@ public class IMCHandler {
         }
 
         if (!processedCatalystSenders.contains(message.getSender())) {
-            NEIClientConfig.logger.info("Processing registerCatalystInfo from " + message.getSender());
+            NEIClientConfig.logger.info("Processing registerCatalystInfo from {}", message.getSender());
             processedCatalystSenders.add(message.getSender());
         }
         final NBTTagCompound tag = message.getNBTValue();
@@ -135,23 +135,14 @@ public class IMCHandler {
             NEIClientConfig.logger.warn("Missing handlerID for registerCatalystInfo!");
             return;
         }
-        final String itemName = tag.getString("itemName");
-        final String nbtInfo = tag.hasKey("nbtInfo") ? tag.getString("nbtInfo") : null;
-        if (itemName.isEmpty()) {
-            NEIClientConfig.logger.warn(String.format("Missing itemName for registerCatalystInfo in `%s`!", handlerID));
-            return;
-        }
-        final ItemStack itemStack = NEIServerUtils.getModdedItem(itemName, nbtInfo);
+        final ItemStack itemStack = getItemStackFromIMC(message, "registerCatalystInfo");
         if (itemStack == null) {
-            NEIClientConfig.logger.warn(String.format("Cannot find item `%s`!", itemName));
             return;
         }
         final int priority = tag.getInteger("priority");
-
         RecipeCatalysts
                 .addOrPut(RecipeCatalysts.catalystsAdderFromIMC, handlerID, new CatalystInfo(itemStack, priority));
-        NEIClientConfig.logger
-                .info(String.format("Added catalyst `%s` to handler %s", itemStack.getDisplayName(), handlerID));
+        NEIClientConfig.logger.info("Added catalyst `{}` to handler {}", itemStack.getDisplayName(), handlerID);
     }
 
     private static void handleRemoveCatalystInfo(IMCMessage message) {
@@ -160,33 +151,62 @@ public class IMCHandler {
             return;
         }
 
-        NEIClientConfig.logger.info("Processing removeCatalystInfo from " + message.getSender());
         final NBTTagCompound tag = message.getNBTValue();
         final String handlerID = tag.getString("handlerID");
         if (handlerID.isEmpty()) {
-            NEIClientConfig.logger.warn("Missing handlerID for registerCatalystInfo!");
+            NEIClientConfig.logger.warn("Missing handlerID for removeCatalystInfo!");
             return;
         }
-        final String itemName = tag.getString("itemName");
-        final String nbtInfo = tag.hasKey("nbtInfo") ? tag.getString("nbtInfo") : null;
-        if (itemName.isEmpty()) {
-            NEIClientConfig.logger.warn(String.format("Missing itemName for registerCatalystInfo in `%s`!", handlerID));
-            return;
-        }
-        final ItemStack itemStack = NEIServerUtils.getModdedItem(itemName, nbtInfo);
+        final ItemStack itemStack = getItemStackFromIMC(message, "removeCatalystInfo");
         if (itemStack == null) {
-            NEIClientConfig.logger.warn(String.format("Cannot find item `%s`!", itemName));
             return;
         }
 
-        if (RecipeCatalysts.catalystsRemoverFromIMC.containsKey(handlerID)) {
-            RecipeCatalysts.catalystsRemoverFromIMC.get(handlerID).add(itemStack);
-        } else {
-            RecipeCatalysts.catalystsRemoverFromIMC
-                    .put(handlerID, new ArrayList<>(Collections.singletonList(itemStack)));
+        RecipeCatalysts.catalystsRemoverFromIMC.computeIfAbsent(handlerID, k -> new ArrayList<>()).add(itemStack);
+        NEIClientConfig.logger.info("Removed catalyst `{}` from handler {}", itemStack.getDisplayName(), handlerID);
+    }
+
+    private static void handleAddItemInfo(IMCMessage message) {
+        if (!message.isNBTMessage()) {
+            logInvalidMessage(message, "NBT");
+            return;
         }
-        NEIClientConfig.logger
-                .info(String.format("Removed catalyst `%s` from handler %s", itemStack.getDisplayName(), handlerID));
+
+        final NBTTagCompound tag = message.getNBTValue();
+        if (tag.hasKey("pages")) addMultipleInfoPages(message);
+        if (tag.hasKey("page")) addSingleInfoPage(message);
+    }
+
+    private static void addMultipleInfoPages(IMCMessage message) {
+        final NBTTagCompound tag = message.getNBTValue();
+        final String filter = tag.getString("filter");
+        final NBTTagList pages = tag.getTagList("pages", 8); // 8 = TAG_String
+        for (int i = 0; i < pages.tagCount(); i++) {
+            String page = pages.getStringTagAt(i);
+            InformationHandler.addInformationPage(filter, page);
+        }
+    }
+
+    private static void addSingleInfoPage(IMCMessage message) {
+        final NBTTagCompound tag = message.getNBTValue();
+        String filter = tag.getString("filter");
+        String page = tag.getString("page");
+        InformationHandler.addInformationPage(filter, page);
+    }
+
+    private static ItemStack getItemStackFromIMC(IMCMessage message, String logAction) {
+        final NBTTagCompound tag = message.getNBTValue();
+        final String itemName = tag.getString("itemName");
+        final String nbtInfo = tag.hasKey("nbtInfo") ? tag.getString("nbtInfo") : null;
+
+        NEIClientConfig.logger.info("Processing {} for item `{}` from {}", logAction, itemName, message.getSender());
+        final ItemStack itemStack = NEIServerUtils.getModdedItem(itemName, nbtInfo);
+
+        if (itemStack == null) {
+            NEIClientConfig.logger.warn("Cannot find item `{}`!", itemName);
+        }
+
+        return itemStack;
     }
 
     private static void logInvalidMessage(FMLInterModComms.IMCMessage message, String type) {

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

@@ -8,6 +8,7 @@ import java.awt.Rectangle;
 import org.lwjgl.input.Keyboard;
 
 import codechicken.nei.NEIClientUtils;
+import codechicken.nei.util.NEIKeyboardUtils;
 
 public class OptionKeyBind extends OptionButton {
 
@@ -123,10 +124,10 @@ public class OptionKeyBind extends OptionButton {
     public String getButtonText() {
 
         if (editing) {
-            return NEIClientUtils.getKeyHashName(NEIClientUtils.getMetaHash());
+            return NEIKeyboardUtils.getHashName(NEIClientUtils.getMetaHash());
         }
 
-        return NEIClientUtils.getKeyName(Math.max(getValue(), 0));
+        return NEIKeyboardUtils.getKeyName(Math.max(getValue(), 0));
     }
 
     @Override

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

@@ -8,7 +8,7 @@ import codechicken.nei.TextField;
 
 public class OptionTextField extends Option {
 
-    protected final TextField textField = new TextField("test") {
+    protected final TextField textField = new TextField("option-text-field") {
 
         {
             this.h = 20;
@@ -19,6 +19,7 @@ public class OptionTextField extends Option {
             // don't override global if text hasn't changed
             if (focused() && isValidValue(text()) && (!defaulting() || !text().equals(getTag().getValue()))) {
                 getTag().setValue(text());
+                OptionTextField.this.onTextChange(text());
             }
         }
 
@@ -27,12 +28,20 @@ public class OptionTextField extends Option {
             if (!focus && !isValidValue(text())) setText(renderTag().getValue());
             super.setFocus(focus);
         }
+
+        @Override
+        public void draw(int mousex, int mousey) {
+            this.field.setEnabled(isEnabled());
+            super.draw(mousex, mousey);
+        }
     };
 
     public OptionTextField(String name) {
         super(name);
     }
 
+    public void onTextChange(String text) {}
+
     @Override
     public void update() {
         textField.update();
@@ -47,6 +56,10 @@ public class OptionTextField extends Option {
         return slot.slotWidth();
     }
 
+    public boolean isEnabled() {
+        return true;
+    }
+
     @Override
     public void draw(int mousex, int mousey, float frame) {
         GuiDraw.drawString(getPrefix(), 10, 6, -1);
@@ -59,12 +72,14 @@ public class OptionTextField extends Option {
 
     @Override
     public void keyTyped(char c, int keycode) {
-        textField.handleKeyPress(keycode, c);
+        if (isEnabled()) {
+            textField.handleKeyPress(keycode, c);
+        }
     }
 
     @Override
     public void mouseClicked(int mousex, int mousey, int button) {
-        if (textField.contains(mousex, mousey)) textField.handleClick(mousex, mousey, button);
+        if (isEnabled() && textField.contains(mousex, mousey)) textField.handleClick(mousex, mousey, button);
     }
 
     @Override
@@ -74,7 +89,7 @@ public class OptionTextField extends Option {
 
     @Override
     public List<String> handleTooltip(int mousex, int mousey, List<String> currenttip) {
-        if (new Rectangle4i(10, 0, textField.x - 10, 20).contains(mousex, mousey)) {
+        if (isEnabled() && new Rectangle4i(10, 0, textField.x - 10, 20).contains(mousex, mousey)) {
             String tip = translateN(name + ".tip");
             if (!tip.equals(namespaced(name + ".tip"))) currenttip.add(tip);
         }

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

@@ -47,7 +47,7 @@ public class OptionUtilities extends OptionStringSet {
         LayoutManager.drawIcon(x + 4, 4, new Image(132, 12, 12, 12));
         x += 24;
 
-        GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS);
+        GL11.glPushAttrib(GL11.GL_ENABLE_BIT | GL11.GL_COLOR_BUFFER_BIT | GL11.GL_LIGHTING_BIT);
         RenderHelper.enableGUIStandardItemLighting();
         GL11.glEnable(GL12.GL_RESCALE_NORMAL);
         ItemStack sword = new ItemStack(Items.diamond_sword);

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

@@ -207,6 +207,10 @@ public class GuiPresetList extends GuiOptionPane {
                 modeName = EnumChatFormatting.GOLD + NEIClientUtils.translate("presets.mode.hide.char")
                         + EnumChatFormatting.RESET;
                 break;
+            case SUBSET:
+                modeName = EnumChatFormatting.DARK_PURPLE + NEIClientUtils.translate("presets.mode.subset.char")
+                        + EnumChatFormatting.RESET;
+                break;
             case REMOVE:
                 modeName = EnumChatFormatting.RED + NEIClientUtils.translate("presets.mode.remove.char")
                         + EnumChatFormatting.RESET;

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

@@ -13,8 +13,8 @@ import org.lwjgl.opengl.GL12;
 import codechicken.core.gui.GuiWidget;
 import codechicken.lib.gui.GuiDraw;
 import codechicken.lib.vec.Rectangle4i;
-import codechicken.nei.ItemPanel.ItemPanelSlot;
 import codechicken.nei.ItemsGrid;
+import codechicken.nei.ItemsGrid.ItemsGridSlot;
 import codechicken.nei.Label;
 import codechicken.nei.NEIClientUtils;
 import codechicken.nei.PresetsList.Preset;
@@ -49,7 +49,7 @@ public class LeftPanel extends GuiWidget {
 
         @Override
         protected ItemFilter getFilter() {
-            Set<String> identifiers = preset.items;
+            final Set<String> identifiers = preset.items;
             return item -> identifiers.contains(Preset.getIdentifier(item));
         }
 
@@ -57,6 +57,20 @@ public class LeftPanel extends GuiWidget {
         protected boolean isSelected(ItemStack stack) {
             return mouseSelection != null && mouseSelection.items.contains(stack);
         }
+
+        @Override
+        protected MouseContext getMouseContext(int mousex, int mousey) {
+            final ItemsGridSlot hovered = getSlotMouseOver(mousex, mousey);
+
+            if (hovered != null) {
+                return new MouseContext(
+                        hovered.slotIndex,
+                        hovered.slotIndex / this.columns,
+                        hovered.slotIndex % this.columns);
+            }
+
+            return null;
+        }
     };
 
     protected Label nameLabel = new Label(NEIClientUtils.translate("presets.name"), false);
@@ -72,6 +86,7 @@ public class LeftPanel extends GuiWidget {
     protected Label modeLabel = new Label(NEIClientUtils.translate("presets.mode"), false);
 
     protected CheckboxButton modeHide;
+    protected CheckboxButton modeSubset;
     protected CheckboxButton modeRemove;
     protected CheckboxButton modeGroup;
 
@@ -100,6 +115,19 @@ public class LeftPanel extends GuiWidget {
             }
         };
 
+        modeSubset = new CheckboxButton(NEIClientUtils.translate("presets.mode.subset")) {
+
+            @Override
+            public boolean isChecked() {
+                return preset.mode == PresetMode.SUBSET;
+            }
+
+            @Override
+            protected void onChange() {
+                preset.mode = this.checked ? PresetMode.SUBSET : null;
+            }
+        };
+
         modeRemove = new CheckboxButton(NEIClientUtils.translate("presets.mode.remove")) {
 
             @Override
@@ -150,6 +178,10 @@ public class LeftPanel extends GuiWidget {
             modeHide.handleClick(x, y, button);
         }
 
+        if (modeSubset.contains(x, y)) {
+            modeSubset.handleClick(x, y, button);
+        }
+
         if (modeRemove.contains(x, y)) {
             modeRemove.handleClick(x, y, button);
         }
@@ -169,10 +201,10 @@ public class LeftPanel extends GuiWidget {
         }
 
         if (mouseSelection == null && button == 0) {
-            ItemPanelSlot slot = grid.getSlotMouseOver(x, y);
+            final ItemsGridSlot slot = grid.getSlotMouseOver(x, y);
 
             if (slot != null) {
-                mouseSelection = new MouseSelection(slot.slotIndex, grid.getItemRect(slot.slotIndex));
+                mouseSelection = new MouseSelection(slot.itemIndex, grid.getItemRect(slot.itemIndex));
             }
         }
 
@@ -185,10 +217,10 @@ public class LeftPanel extends GuiWidget {
         nameField.mouseUp(x, y, button);
 
         if (mouseSelection != null && button == 0) {
-            ItemPanelSlot hoverSlot = grid.getSlotMouseOver(x, y);
+            final ItemsGridSlot hoverSlot = grid.getSlotMouseOver(x, y);
 
-            if (hoverSlot != null && hoverSlot.slotIndex == mouseSelection.startIndex) {
-                preset.items.remove(Preset.getIdentifier(hoverSlot.item));
+            if (hoverSlot != null && hoverSlot.itemIndex == mouseSelection.startIndex) {
+                preset.items.remove(Preset.getIdentifier(hoverSlot.getItemStack()));
             } else if (!mouseSelection.items.isEmpty()) {
 
                 for (ItemStack stack : mouseSelection.items) {
@@ -206,13 +238,13 @@ public class LeftPanel extends GuiWidget {
         nameField.mouseDragged(x, y, button, time);
 
         if (mouseSelection != null && button == 0) {
-            final ItemPanelSlot slot = grid.getSlotMouseOver(x, y);
+            final ItemsGridSlot slot = grid.getSlotMouseOver(x, y);
 
-            if (slot != null && slot.slotIndex != mouseSelection.endIndex) {
-                mouseSelection.endIndex = slot.slotIndex;
+            if (slot != null && slot.itemIndex != mouseSelection.endIndex) {
+                mouseSelection.endIndex = slot.itemIndex;
                 mouseSelection.items.clear();
 
-                final Rectangle4i rec = grid.getItemRect(slot.slotIndex);
+                final Rectangle4i rec = grid.getItemRect(slot.itemIndex);
                 final Rectangle4i sel = new Rectangle4i(
                         Math.min(rec.x, mouseSelection.startX),
                         Math.min(rec.y, mouseSelection.startY),
@@ -221,10 +253,10 @@ public class LeftPanel extends GuiWidget {
 
                 for (int ix = sel.x; ix <= sel.x + sel.w; ix += ItemsGrid.SLOT_SIZE) {
                     for (int iy = sel.y; iy <= sel.y + sel.h; iy += ItemsGrid.SLOT_SIZE) {
-                        ItemPanelSlot over = grid.getSlotMouseOver(ix, iy);
+                        final ItemsGridSlot over = grid.getSlotMouseOver(ix, iy);
 
                         if (over != null) {
-                            mouseSelection.items.add(over.item);
+                            mouseSelection.items.add(over.getItemStack());
                         }
                     }
                 }
@@ -234,7 +266,7 @@ public class LeftPanel extends GuiWidget {
 
     @Override
     public void update() {
-        int CHECKBOX_WIDTH = (this.width - 12) / 3;
+        int CHECKBOX_WIDTH = (this.width - 12) / 4;
         nameLabel.x = this.x + 2;
         nameLabel.y = this.y + 4;
         nameLabel.w = this.width;
@@ -255,12 +287,13 @@ public class LeftPanel extends GuiWidget {
         modeLabel.w = this.width;
         modeLabel.h = 10;
 
-        modeHide.w = modeRemove.w = modeGroup.w = CHECKBOX_WIDTH;
-        modeHide.h = modeRemove.h = modeGroup.h = INPUT_HEIGHT;
-        modeHide.y = modeRemove.y = modeGroup.y = modeLabel.y + modeLabel.h;
+        modeHide.w = modeSubset.w = modeRemove.w = modeGroup.w = CHECKBOX_WIDTH;
+        modeHide.h = modeSubset.h = modeRemove.h = modeGroup.h = INPUT_HEIGHT;
+        modeHide.y = modeSubset.y = modeRemove.y = modeGroup.y = modeLabel.y + modeLabel.h;
 
         modeHide.x = this.x + 1;
-        modeRemove.x = modeHide.x + modeHide.w + 6;
+        modeSubset.x = modeHide.x + modeHide.w + 6;
+        modeRemove.x = modeSubset.x + modeSubset.w + 6;
         modeGroup.x = modeRemove.x + modeRemove.w + 6;
 
         grid.setGridSize(
@@ -278,6 +311,7 @@ public class LeftPanel extends GuiWidget {
 
         modeLabel.draw(mousex, mousey);
         modeHide.draw(mousex, mousey);
+        modeSubset.draw(mousex, mousey);
         modeRemove.draw(mousex, mousey);
         modeGroup.draw(mousex, mousey);
 
@@ -295,14 +329,14 @@ public class LeftPanel extends GuiWidget {
     }
 
     public List<String> handleTooltip(int mousex, int mousey, List<String> tooltip) {
-        ItemPanelSlot over = grid.getSlotMouseOver(mousex, mousey);
+        final ItemsGridSlot over = grid.getSlotMouseOver(mousex, mousey);
 
         if (over != null) {
-            tooltip = GuiContainerManager.itemDisplayNameMultiline(over.item, null, true);
+            tooltip = GuiContainerManager.itemDisplayNameMultiline(over.getItemStack(), null, true);
 
             synchronized (GuiContainerManager.tooltipHandlers) {
                 for (IContainerTooltipHandler handler : GuiContainerManager.tooltipHandlers) {
-                    tooltip = handler.handleItemTooltip(null, over.item, mousex, mousey, tooltip);
+                    tooltip = handler.handleItemTooltip(null, over.getItemStack(), mousex, mousey, tooltip);
                 }
             }
 
@@ -312,6 +346,8 @@ public class LeftPanel extends GuiWidget {
 
         } else if (modeHide.contains(mousex, mousey)) {
             tooltip.add(NEIClientUtils.translate("presets.mode.hide.tip"));
+        } else if (modeSubset.contains(mousex, mousey)) {
+            tooltip.add(NEIClientUtils.translate("presets.mode.subset.tip"));
         } else if (modeRemove.contains(mousex, mousey)) {
             tooltip.add(NEIClientUtils.translate("presets.mode.remove.tip"));
         } else if (modeGroup.contains(mousex, mousey)) {

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

@@ -5,31 +5,45 @@ import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.stream.Collectors;
 
-import javax.annotation.Nullable;
-
 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.Button;
 import codechicken.nei.ItemList;
-import codechicken.nei.ItemPanel.ItemPanelSlot;
 import codechicken.nei.ItemSorter;
 import codechicken.nei.ItemsGrid;
+import codechicken.nei.ItemsGrid.ItemsGridSlot;
 import codechicken.nei.Label;
+import codechicken.nei.NEIClientUtils;
 import codechicken.nei.RestartableTask;
 import codechicken.nei.api.ItemFilter;
 
-public abstract class PresetItemsGrid extends ItemsGrid {
+public abstract class PresetItemsGrid extends ItemsGrid<PresetItemsGrid.PresetsGridSlot, ItemsGrid.MouseContext> {
 
     protected static final int BUTTON_SIZE = 16;
 
+    public class PresetsGridSlot extends ItemsGridSlot {
+
+        public PresetsGridSlot(int slotIndex, int itemIndex, ItemStack itemStack) {
+            super(slotIndex, itemIndex, itemStack);
+        }
+
+        @Override
+        public void beforeDraw(Rectangle4i rect, MouseContext mouseContext) {
+            if (mouseContext != null && mouseContext.slotIndex == this.slotIndex || isSelected(getItemStack())) {
+                NEIClientUtils.drawRect(rect.x, rect.y, rect.w, rect.h, HIGHLIGHT_COLOR);
+            }
+        }
+
+    }
+
     public Button pagePrev;
     public Label pageLabel;
     public Button pageNext;
 
     protected ArrayList<ItemStack> newItems;
+    protected List<PresetsGridSlot> gridMask;
 
     protected final RestartableTask updateFilter = new RestartableTask("NEI Presets Item Filtering") {
 
@@ -139,6 +153,28 @@ public abstract class PresetItemsGrid extends ItemsGrid {
         this.newItems = new ArrayList<>(newItems);
     }
 
+    @Override
+    protected void onGridChanged() {
+        this.gridMask = null;
+        super.onGridChanged();
+    }
+
+    @Override
+    public List<PresetsGridSlot> getMask() {
+
+        if (this.gridMask == null) {
+            this.gridMask = new ArrayList<>();
+            int itemIndex = page * perPage;
+
+            for (int slotIndex = 0; slotIndex < rows * columns && itemIndex < size(); slotIndex++) {
+                this.gridMask.add(new PresetsGridSlot(slotIndex, itemIndex, getItem(itemIndex)));
+                itemIndex++;
+            }
+        }
+
+        return this.gridMask;
+    }
+
     @Override
     public void refresh(GuiContainer gui) {
 
@@ -151,15 +187,6 @@ public abstract class PresetItemsGrid extends ItemsGrid {
         super.refresh(gui);
     }
 
-    @Override
-    protected void beforeDrawSlot(@Nullable ItemPanelSlot focused, int slotIdx, Rectangle4i rect) {
-        if (isSelected(getItem(slotIdx))) {
-            GuiDraw.drawRect(rect.x, rect.y, rect.w, rect.h, 0xee555555);
-        } else {
-            super.beforeDrawSlot(focused, slotIdx, rect);
-        }
-    }
-
     protected abstract boolean isSelected(ItemStack stack);
 
     protected abstract ItemFilter getFilter();

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

@@ -19,8 +19,8 @@ import codechicken.nei.CollapsibleItems;
 import codechicken.nei.ItemList.AllMultiItemFilter;
 import codechicken.nei.ItemList.AnyMultiItemFilter;
 import codechicken.nei.ItemList.NegatedItemFilter;
-import codechicken.nei.ItemPanel.ItemPanelSlot;
 import codechicken.nei.ItemsGrid;
+import codechicken.nei.ItemsGrid.ItemsGridSlot;
 import codechicken.nei.NEIClientConfig;
 import codechicken.nei.NEIClientUtils;
 import codechicken.nei.PresetsList;
@@ -133,12 +133,12 @@ public class RightPanel extends GuiWidget {
 
         @Override
         protected ItemFilter getFilter() {
-            AllMultiItemFilter filter = new AllMultiItemFilter(searchField.getFilter());
+            final AllMultiItemFilter filter = new AllMultiItemFilter(searchField.getFilter());
 
             if (enabledPresets.isChecked()) {
-                AllMultiItemFilter andFilter = new AllMultiItemFilter();
-                AnyMultiItemFilter orFilter = new AnyMultiItemFilter();
-                Set<String> identifiers = PresetsList.presets.stream().flatMap(p -> p.items.stream())
+                final AllMultiItemFilter andFilter = new AllMultiItemFilter();
+                final AnyMultiItemFilter orFilter = new AnyMultiItemFilter();
+                final Set<String> identifiers = PresetsList.presets.stream().flatMap(p -> p.items.stream())
                         .collect(Collectors.toSet());
 
                 andFilter.filters.add(item -> !identifiers.contains(Preset.getIdentifier(item)));
@@ -164,6 +164,20 @@ public class RightPanel extends GuiWidget {
 
             return preset.items.contains(Preset.getIdentifier(stack));
         }
+
+        @Override
+        protected MouseContext getMouseContext(int mousex, int mousey) {
+            final ItemsGridSlot hovered = getSlotMouseOver(mousex, mousey);
+
+            if (hovered != null) {
+                return new MouseContext(
+                        hovered.slotIndex,
+                        hovered.slotIndex / this.columns,
+                        hovered.slotIndex % this.columns);
+            }
+
+            return null;
+        }
     };
 
     protected CheckboxButton enabledPresets;
@@ -218,10 +232,10 @@ public class RightPanel extends GuiWidget {
         }
 
         if (mouseSelection == null && (button == 0 || button == 1)) {
-            ItemPanelSlot slot = grid.getSlotMouseOver(x, y);
+            final ItemsGridSlot slot = grid.getSlotMouseOver(x, y);
 
             if (slot != null) {
-                mouseSelection = new MouseSelection(slot.slotIndex, grid.getItemRect(slot.slotIndex), button == 0);
+                mouseSelection = new MouseSelection(slot.itemIndex, grid.getItemRect(slot.itemIndex), button == 0);
             }
         }
 
@@ -234,10 +248,10 @@ public class RightPanel extends GuiWidget {
         searchField.mouseUp(x, y, button);
 
         if (mouseSelection != null && (button == 0 || button == 1)) {
-            ItemPanelSlot hoverSlot = grid.getSlotMouseOver(x, y);
+            final ItemsGridSlot hoverSlot = grid.getSlotMouseOver(x, y);
 
-            if (hoverSlot != null && hoverSlot.slotIndex == mouseSelection.startIndex) {
-                setHidden(hoverSlot.item, button == 0);
+            if (hoverSlot != null && hoverSlot.itemIndex == mouseSelection.startIndex) {
+                setHidden(hoverSlot.getItemStack(), button == 0);
             } else if (!mouseSelection.items.isEmpty()) {
 
                 for (ItemStack stack : mouseSelection.items) {
@@ -304,13 +318,13 @@ public class RightPanel extends GuiWidget {
         searchField.mouseDragged(x, y, button, time);
 
         if (mouseSelection != null && (button == 0 || button == 1)) {
-            final ItemPanelSlot slot = grid.getSlotMouseOver(x, y);
+            final ItemsGridSlot slot = grid.getSlotMouseOver(x, y);
 
-            if (slot != null && slot.slotIndex != mouseSelection.endIndex) {
-                mouseSelection.endIndex = slot.slotIndex;
+            if (slot != null && slot.itemIndex != mouseSelection.endIndex) {
+                mouseSelection.endIndex = slot.itemIndex;
                 mouseSelection.items.clear();
 
-                final Rectangle4i rec = grid.getItemRect(slot.slotIndex);
+                final Rectangle4i rec = grid.getItemRect(slot.itemIndex);
                 final Rectangle4i sel = new Rectangle4i(
                         Math.min(rec.x, mouseSelection.startX),
                         Math.min(rec.y, mouseSelection.startY),
@@ -319,10 +333,10 @@ public class RightPanel extends GuiWidget {
 
                 for (int ix = sel.x; ix <= sel.x + sel.w; ix += ItemsGrid.SLOT_SIZE) {
                     for (int iy = sel.y; iy <= sel.y + sel.h; iy += ItemsGrid.SLOT_SIZE) {
-                        ItemPanelSlot over = grid.getSlotMouseOver(ix, iy);
+                        final ItemsGridSlot over = grid.getSlotMouseOver(ix, iy);
 
                         if (over != null) {
-                            mouseSelection.items.add(over.item);
+                            mouseSelection.items.add(over.getItemStack());
                         }
                     }
                 }
@@ -363,14 +377,14 @@ public class RightPanel extends GuiWidget {
     }
 
     public List<String> handleTooltip(int mousex, int mousey, List<String> tooltip) {
-        ItemPanelSlot over = grid.getSlotMouseOver(mousex, mousey);
+        final ItemsGridSlot over = grid.getSlotMouseOver(mousex, mousey);
 
         if (over != null) {
-            tooltip = GuiContainerManager.itemDisplayNameMultiline(over.item, null, true);
+            tooltip = GuiContainerManager.itemDisplayNameMultiline(over.getItemStack(), null, true);
 
             synchronized (GuiContainerManager.tooltipHandlers) {
                 for (IContainerTooltipHandler handler : GuiContainerManager.tooltipHandlers) {
-                    tooltip = handler.handleItemTooltip(null, over.item, mousex, mousey, tooltip);
+                    tooltip = handler.handleItemTooltip(null, over.getItemStack(), mousex, mousey, tooltip);
                 }
             }
 

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

@@ -4,6 +4,8 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Gui;
 import net.minecraft.util.ResourceLocation;
 
+import org.lwjgl.opengl.GL11;
+
 import codechicken.nei.Image;
 
 public class DrawableResource extends Image {
@@ -43,15 +45,160 @@ public class DrawableResource extends Image {
     }
 
     public void draw(int xOffset, int yOffset, int maskTop, int maskBottom, int maskLeft, int maskRight) {
-        Minecraft.getMinecraft().getTextureManager().bindTexture(this.resourceLocation);
-
-        final int x = xOffset + this.paddingLeft + maskLeft;
-        final int y = yOffset + this.paddingTop + maskTop;
-        final int textureX = this.x + maskLeft;
-        final int textureY = this.y + maskTop;
+        final boolean is2DTexture = GL11.glGetBoolean(GL11.GL_TEXTURE_2D);
         final int width = this.width - maskRight - maskLeft;
         final int height = this.height - maskBottom - maskTop;
-        // drawModalRectWithCustomSizedTexture
-        Gui.func_146110_a(x, y, textureX, textureY, width, height, textureWidth, textureHeight);
+
+        GL11.glEnable(GL11.GL_TEXTURE_2D);
+        Minecraft.getMinecraft().getTextureManager().bindTexture(this.resourceLocation);
+        drawModalRectWithCustomSizedTexture(xOffset + maskLeft, yOffset + maskTop, maskLeft, maskTop, width, height);
+        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;
+
+        if (middleWidth > 0 && middleHeight > 0 && tileWidth > 0 && tileHeight > 0) {
+            final boolean is2DTexture = GL11.glGetBoolean(GL11.GL_TEXTURE_2D);
+            final int tileWidthCount = tileWidth / middleWidth;
+            final int remainderWidth = tileWidth - (tileWidthCount * middleWidth);
+            final int tileHeightCount = tileHeight / middleHeight;
+            final int remainderHeight = tileHeight - (tileHeightCount * middleHeight);
+
+            GL11.glEnable(GL11.GL_TEXTURE_2D);
+            Minecraft.getMinecraft().getTextureManager().bindTexture(this.resourceLocation);
+
+            // middle parts
+            for (int tileW = 0; tileW <= tileWidthCount; tileW++) {
+                final int tileWidthSize = (tileW == tileWidthCount) ? remainderWidth : middleWidth;
+                final int x = xOffset + sliceLeft + tileW * middleWidth;
+
+                for (int tileH = 0; tileH <= tileHeightCount; tileH++) {
+                    final int tileHeightSize = (tileH == tileHeightCount) ? remainderHeight : middleHeight;
+                    drawModalRectWithCustomSizedTexture(
+                            x,
+                            yOffset + sliceTop + tileH * middleHeight,
+                            sliceLeft,
+                            sliceTop,
+                            tileWidthSize,
+                            tileHeightSize);
+                }
+            }
+
+            // 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);
+                }
+            }
+
+            // 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);
+                }
+            }
+
+            // angle left-top
+            if (sliceLeft > 0 && sliceTop > 0) {
+                drawModalRectWithCustomSizedTexture(xOffset, yOffset, 0, 0, sliceLeft, sliceTop);
+            }
+
+            // angle right-top
+            if (sliceRight > 0 && sliceTop > 0) {
+                drawModalRectWithCustomSizedTexture(
+                        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);
+            }
+
+            // angle right-bottom
+            if (sliceRight > 0 && sliceBottom > 0) {
+                drawModalRectWithCustomSizedTexture(
+                        xOffset + sliceLeft + tileWidth,
+                        yOffset + sliceTop + tileHeight,
+                        sliceLeft + middleWidth,
+                        sliceTop + middleHeight,
+                        sliceRight,
+                        sliceBottom);
+            }
+
+            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);
+    }
+
 }

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

@@ -1,93 +0,0 @@
-package codechicken.nei.drawable;
-
-import net.minecraft.client.gui.GuiScreen;
-
-import org.lwjgl.opengl.GL11;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-/*
- * Taken from Mantle 1.12-1.3.3.49 under the MIT License The MIT License (MIT) Copyright (c) 2013-2014 Slime Knights
- * (mDiyo, fuj1n, Sunstrike, progwml6, pillbox, alexbegt) Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software
- * without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute,
- * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions: The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE
- * AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-@SideOnly(Side.CLIENT)
-public class GuiElementDuex {
-
-    // this is totally completely ugly but it's a simple solution that doesn't clutter everything too much >_>
-    public static int defaultTexW = 256;
-    public static int defaultTexH = 256;
-
-    public final int x;
-    public final int y;
-    public final int w;
-    public final int h;
-
-    public int texW;
-    public int texH;
-
-    public GuiElementDuex(int x, int y, int w, int h, int texW, int texH) {
-        this(x, y, w, h);
-        setTextureSize(texW, texH);
-
-        defaultTexW = texW;
-        defaultTexH = texH;
-    }
-
-    public GuiElementDuex(int x, int y, int w, int h) {
-        this.x = x;
-        this.y = y;
-        this.w = w;
-        this.h = h;
-        setTextureSize(defaultTexW, defaultTexH);
-    }
-
-    public GuiElementDuex setTextureSize(int w, int h) {
-        texW = w;
-        texH = h;
-
-        return this;
-    }
-
-    public GuiElementDuex shift(int xd, int yd) {
-        return new GuiElementDuex(this.x + xd, this.y + yd, this.w, this.h, this.texW, this.texH);
-    }
-
-    /**
-     * Draws the element at the given x/y coordinates
-     *
-     * @param xPos X-Coordinate on the screen
-     * @param yPos Y-Coordinate on the screen
-     */
-    public int draw(int xPos, int yPos) {
-        // drawModalRectWithCustomSizedTexture
-        GL11.glColor4f(1, 1, 1, 1);
-        GuiScreen.func_146110_a(xPos, yPos, x, y, w, h, texW, texH);
-        return w;
-    }
-
-    public static class Builder {
-
-        public int w;
-        public int h;
-
-        public Builder(int w, int h) {
-            this.w = w;
-            this.h = h;
-        }
-
-        public GuiElementDuex get(int x, int y, int w, int h) {
-            return new GuiElementDuex(x, y, w, h, this.w, this.h);
-        }
-    }
-}