Added keyboard shortcuts to NEI And More... (#271)

* Added keyboard shortcuts to NEI

* OptionButton: Add Tooltip to long prefix

* fix formatting

* Tooltip shown when shift is held

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

@@ -0,0 +1,13 @@
+
+name: Build and test
+
+on:
+  pull_request:
+    branches: [ master, main ]
+  push:
+    branches: [ master, main ]
+
+jobs:
+  build-and-test:
+    uses: GTNewHorizons/GTNH-Actions-Workflows/.github/workflows/build-and-test.yml@master
+    secrets: inherit

.github/workflows/release-tags.yml

@@ -0,0 +1,14 @@
+
+name: Release tagged build
+
+on:
+  push:
+    tags: [ '*' ]
+
+permissions:
+  contents: write
+
+jobs:
+  release-tags:
+    uses: GTNewHorizons/GTNH-Actions-Workflows/.github/workflows/release-tags.yml@master
+    secrets: inherit

.gitignore

@@ -1,3 +1,29 @@
-/build/build
-/build/.gradle
-.idea/**
+.gradle
+.settings
+/.idea/
+/run/
+/build/
+/eclipse/
+.classpath
+.project
+/bin/
+/config/
+/crash-reports/
+/logs/
+options.txt
+/saves/
+usernamecache.json
+banned-ips.json
+banned-players.json
+eula.txt
+ops.json
+server.properties
+servers.dat
+usercache.json
+whitelist.json
+/out/
+*.iml
+*.ipr
+*.iws
+src/main/resources/mixins.*.json
+*.bat

CODEOWNERS

@@ -0,0 +1,3 @@
+# Any Github changes require admin approval
+/.github/** @GTNewHorizons/admin
+

LICENSE.txt

@@ -1,21 +1,165 @@
-The MIT License (MIT)
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
 
-Copyright (c) 2014 ChickenBones
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
 
-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.
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
 
-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.
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.

README.md

@@ -0,0 +1,38 @@
+# NotEnoughItems Unofficial - By the GTNH Team
+
+A continuation of NotEnoughItems for 1.7.10 by the developers of Gregtech: New Horizons modpack, with features either inspired and/or backported from JustEnoughItems
+
+We've tested this against all of the mods included in GTNH, as well as a limited set of other mods (like Reika's mods). Every effort has been made to maintain backwards compatibility, however the focus is on the mods contained in the GTNH modpack.
+
+If you have issues with NEI outside of the GTNH modpack you may report them in the [GTNH NEI GitHub](https://github.com/GTNewHorizons/NotEnoughItems).
+
+## New Features:
+
+* Speed
+  - Uses a parallel stream to search the item list over multiple cores, resulting in 2-6x faster searches on average
+  - Loads the recipe handlers in parallel
+* A textbox for search with most of the features you'd expect - moving forward, backwards, selection, etc
+* Bookmarks!  What are you in the process of crafting? Bookmark it using either 'A' or configure your own key.
+* Toggle bookmark pane.  Default shortcut key `B`.  Item Subsets menu is only available if bookmarks are not visible.
+* Utility/Cheat buttons line up and wrap based on GUI size
+* ItemList is no longer regenerated from the ItemRegistry on every inventory load
+* JEI (Or Creative) Style tabs [Optional]  Note: Requires explicit support to be added for an ItemStack to render, otherwise falls back to the first two letters of the handler name.
+* Tabs/Handlers are loaded from a CSV config in the JAR (or optionally from the config folder).  NBT IMCEvents `registerHandlerInfo` and `removeHandlerInfo` are available for mod authors to add handler information, using the same fields as the CSV file
+* `@[Mod]->[item]` searching.  ex: `@Mod.gregtech->iron ingot`
+* 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
+
+## Other items of note:
+
+* Remove TMI style
+* Removed inventory Load/Save state
+
+## License
+
+GTNH Modifications Copyright (c) 2019-2022 mitchej123 and the GTNH Team
+
+Licensed under LGPL-3.0 or later - use this however you want, but please give back any modifications
+
+Parts inspired/borrowed/backported from [JEI](https://github.com/mezz/JustEnoughItems/tree/1.12) under the MIT License.
+
+Originial code Copyright (c) 2014-2015 mezz and was licensed under the MIT License.

addon.gradle

@@ -0,0 +1,3 @@
+compileJava {
+	options.encoding = "UTF-8"
+}

build.gradle

@@ -0,0 +1,932 @@
+//version: 1656003794
+/*
+DO NOT CHANGE THIS FILE!
+
+Also, you may replace this file at any time if there is an update available.
+Please check https://github.com/GTNewHorizons/ExampleMod1.7.10/blob/main/build.gradle for updates.
+*/
+
+
+import com.github.jengelman.gradle.plugins.shadow.tasks.ConfigureShadowRelocation
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+import org.gradle.internal.logging.text.StyledTextOutput.Style
+import org.gradle.internal.logging.text.StyledTextOutputFactory
+
+import java.nio.file.Files
+import java.nio.file.Paths
+import java.util.concurrent.TimeUnit
+import java.util.zip.ZipEntry
+import java.util.zip.ZipInputStream
+import java.util.zip.ZipOutputStream
+
+buildscript {
+    repositories {
+        maven {
+            name 'forge'
+            url 'https://maven.minecraftforge.net'
+        }
+        maven {
+            name 'sonatype'
+            url 'https://oss.sonatype.org/content/repositories/snapshots/'
+        }
+        maven {
+            name 'Scala CI dependencies'
+            url 'https://repo1.maven.org/maven2/'
+        }
+        maven {
+            name 'jitpack'
+            url 'https://jitpack.io'
+        }
+    }
+    dependencies {
+        classpath 'com.github.GTNewHorizons:ForgeGradle:1.2.7'
+    }
+}
+
+plugins {
+    id 'java-library'
+    id 'idea'
+    id 'eclipse'
+    id 'scala'
+    id 'maven-publish'
+    id 'org.jetbrains.kotlin.jvm'        version '1.5.30'       apply false
+    id 'org.jetbrains.kotlin.kapt'       version '1.5.30'       apply false
+    id 'com.google.devtools.ksp'         version '1.5.30-1.0.0' apply false
+    id 'org.ajoberstar.grgit'            version '4.1.1'
+    id 'com.github.johnrengelman.shadow' version '4.0.4'
+    id 'com.palantir.git-version'        version '0.13.0'       apply false
+    id 'de.undercouch.download'          version '5.0.1'
+    id 'com.github.gmazzo.buildconfig'   version '3.0.3'        apply false
+    id "com.diffplug.spotless"           version "6.7.2"
+}
+
+if (project.file('.git/HEAD').isFile()) {
+    apply plugin: 'com.palantir.git-version'
+}
+
+def out = services.get(StyledTextOutputFactory).create('an-output')
+
+apply plugin: 'forge'
+
+def projectJavaVersion = JavaLanguageVersion.of(8)
+
+java {
+    toolchain {
+        languageVersion.set(projectJavaVersion)
+    }
+}
+
+idea {
+    module {
+        inheritOutputDirs = true
+        downloadJavadoc = true
+        downloadSources = true
+    }
+}
+
+// Spotless autoformatter
+// See https://github.com/diffplug/spotless/tree/main/plugin-gradle
+// Can be locally toggled via spotless:off/spotless:on comments
+spotless {
+    encoding 'UTF-8'
+
+    format 'misc', {
+        target '*.md', '.gitignore'
+
+        trimTrailingWhitespace()
+        indentWithSpaces(4)
+        endWithNewline()
+    }
+    java {
+        toggleOffOn()
+        importOrder()
+        removeUnusedImports()
+        palantirJavaFormat('1.1.0') // last version supporting jvm 8
+    }
+    kotlin {
+        toggleOffOn()
+        ktfmt('0.39')
+    }
+    groovyGradle {
+        toggleOffOn()
+        importOrder()
+        target '*.gradle'
+        greclipse('4.19.0') // last version supporting jvm 8
+    }
+}
+
+if(JavaVersion.current() != JavaVersion.VERSION_1_8) {
+    throw new GradleException("This project requires Java 8, but it's running on " + JavaVersion.current())
+}
+
+checkPropertyExists("modName")
+checkPropertyExists("modId")
+checkPropertyExists("modGroup")
+checkPropertyExists("autoUpdateBuildScript")
+checkPropertyExists("minecraftVersion")
+checkPropertyExists("forgeVersion")
+checkPropertyExists("replaceGradleTokenInFile")
+checkPropertyExists("gradleTokenModId")
+checkPropertyExists("gradleTokenModName")
+checkPropertyExists("gradleTokenVersion")
+checkPropertyExists("gradleTokenGroupName")
+checkPropertyExists("apiPackage")
+checkPropertyExists("accessTransformersFile")
+checkPropertyExists("usesMixins")
+checkPropertyExists("mixinPlugin")
+checkPropertyExists("mixinsPackage")
+checkPropertyExists("coreModClass")
+checkPropertyExists("containsMixinsAndOrCoreModOnly")
+checkPropertyExists("usesShadowedDependencies")
+checkPropertyExists("developmentEnvironmentUserName")
+
+boolean noPublishedSources = project.findProperty("noPublishedSources") ? project.noPublishedSources.toBoolean() : false
+boolean usesMixinDebug = project.findProperty('usesMixinDebug') ?: project.usesMixins.toBoolean()
+String channel = project.findProperty('channel') ? project.channel : 'stable'
+String mappingsVersion = project.findProperty('mappingsVersion') ? project.mappingsVersion : '12'
+String remoteMappings = project.findProperty('remoteMappings') ? project.remoteMappings : 'https://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/'
+
+String javaSourceDir = "src/main/java/"
+String scalaSourceDir = "src/main/scala/"
+String kotlinSourceDir = "src/main/kotlin/"
+
+String targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/")
+String targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/")
+String targetPackageKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/")
+if(!(getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists() || getFile(targetPackageKotlin).exists())) {
+    throw new GradleException("Could not resolve \"modGroup\"! Could not find " + targetPackageJava + " or " + targetPackageScala + " or " + targetPackageKotlin)
+}
+
+if(apiPackage) {
+    targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/")
+    targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/")
+    targetPackageKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/")
+    if(!(getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists() || getFile(targetPackageKotlin).exists())) {
+        throw new GradleException("Could not resolve \"apiPackage\"! Could not find " + targetPackageJava + " or " + targetPackageScala + " or " + targetPackageKotlin)
+    }
+}
+
+if(accessTransformersFile) {
+    String targetFile = "src/main/resources/META-INF/" + accessTransformersFile
+    if(!getFile(targetFile).exists()) {
+        throw new GradleException("Could not resolve \"accessTransformersFile\"! Could not find " + targetFile)
+    }
+}
+
+if(usesMixins.toBoolean()) {
+    if(mixinsPackage.isEmpty() || mixinPlugin.isEmpty()) {
+        throw new GradleException("\"mixinPlugin\" requires \"mixinsPackage\" and \"mixinPlugin\" to be set!")
+    }
+
+    targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/")
+    targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/")
+    targetPackageKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/")
+    if(!(getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists() || getFile(targetPackageKotlin).exists())) {
+        throw new GradleException("Could not resolve \"mixinsPackage\"! Could not find " + targetPackageJava + " or " + targetPackageScala  + " or " + targetPackageKotlin)
+    }
+
+    String targetFileJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".java"
+    String targetFileScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".scala"
+    String targetFileScalaJava = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".java"
+    String targetFileKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".kt"
+    if(!(getFile(targetFileJava).exists() || getFile(targetFileScala).exists() || getFile(targetFileScalaJava).exists() || getFile(targetFileKotlin).exists())) {
+        throw new GradleException("Could not resolve \"mixinPlugin\"! Could not find " + targetFileJava + " or " + targetFileScala + " or " + targetFileScalaJava + " or " + targetFileKotlin)
+    }
+}
+
+if(coreModClass) {
+    String targetFileJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".java"
+    String targetFileScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".scala"
+    String targetFileScalaJava = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".java"
+    String targetFileKotlin = kotlinSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".kt"
+    if(!(getFile(targetFileJava).exists() || getFile(targetFileScala).exists() || getFile(targetFileScalaJava).exists() || getFile(targetFileKotlin).exists())) {
+        throw new GradleException("Could not resolve \"coreModClass\"! Could not find " + targetFileJava + " or " + targetFileScala + " or " + targetFileScalaJava + " or " + targetFileKotlin)
+    }
+}
+
+configurations.all {
+    resolutionStrategy.cacheChangingModulesFor(0, TimeUnit.SECONDS)
+
+    // Make sure GregTech build won't time out
+    System.setProperty("org.gradle.internal.http.connectionTimeout", 120000 as String)
+    System.setProperty("org.gradle.internal.http.socketTimeout", 120000 as String)
+}
+
+// Fix Jenkins' Git: chmod a file should not be detected as a change and append a '.dirty' to the version
+try {
+    'git config core.fileMode false'.execute()
+}
+catch (Exception ignored) {
+    out.style(Style.Failure).println("git isn't installed at all")
+}
+
+// Pulls version first from the VERSION env and then git tag
+String identifiedVersion
+String versionOverride = System.getenv("VERSION") ?: null
+try {
+    identifiedVersion = versionOverride == null ? gitVersion() : versionOverride
+}
+catch (Exception ignored) {
+    out.style(Style.Failure).text(
+        'This mod must be version controlled by Git AND the repository must provide at least one tag,\n' +
+        'or the VERSION override must be set! ').style(Style.SuccessHeader).text('(Do NOT download from GitHub using the ZIP option, instead\n' +
+        'clone the repository, see ').style(Style.Info).text('https://gtnh.miraheze.org/wiki/Development').style(Style.SuccessHeader).println(' for details.)'
+    )
+    versionOverride = 'NO-GIT-TAG-SET'
+    identifiedVersion = versionOverride
+}
+version = minecraftVersion + '-' + identifiedVersion
+ext {
+    modVersion = identifiedVersion
+}
+
+if(identifiedVersion == versionOverride) {
+    out.style(Style.Failure).text('Override version to ').style(Style.Identifier).text(modVersion).style(Style.Failure).println('!\7')
+}
+
+group = modGroup
+if(project.hasProperty("customArchiveBaseName") && customArchiveBaseName) {
+    archivesBaseName = customArchiveBaseName
+}
+else {
+    archivesBaseName = modId
+}
+
+def arguments = []
+def jvmArguments = []
+
+if (usesMixins.toBoolean()) {
+    arguments += [
+        "--tweakClass org.spongepowered.asm.launch.MixinTweaker"
+    ]
+    if (usesMixinDebug.toBoolean()) {
+        jvmArguments += [
+            "-Dmixin.debug.countInjections=true",
+            "-Dmixin.debug.verbose=true",
+            "-Dmixin.debug.export=true"
+        ]
+    }
+}
+
+minecraft {
+    version = minecraftVersion + '-' + forgeVersion + '-' + minecraftVersion
+    runDir = 'run'
+
+    if (replaceGradleTokenInFile) {
+        replaceIn replaceGradleTokenInFile
+        if(gradleTokenModId) {
+            replace gradleTokenModId, modId
+        }
+        if(gradleTokenModName) {
+            replace gradleTokenModName, modName
+        }
+        if(gradleTokenVersion) {
+            replace gradleTokenVersion, modVersion
+        }
+        if(gradleTokenGroupName) {
+            replace gradleTokenGroupName, modGroup
+        }
+    }
+
+    clientIntellijRun {
+        args(arguments)
+        jvmArgs(jvmArguments)
+
+        if(developmentEnvironmentUserName) {
+            args("--username", developmentEnvironmentUserName)
+        }
+    }
+
+    serverIntellijRun {
+        args(arguments)
+        jvmArgs(jvmArguments)
+    }
+}
+
+if(file('addon.gradle').exists()) {
+    apply from: 'addon.gradle'
+}
+
+apply from: 'repositories.gradle'
+
+configurations {
+    implementation.extendsFrom(shadowImplementation)  // TODO: remove after all uses are refactored
+    implementation.extendsFrom(shadowCompile)
+    implementation.extendsFrom(shadeCompile)
+}
+
+repositories {
+    maven {
+        name 'Overmind forge repo mirror'
+        url 'https://gregtech.overminddl1.com/'
+    }
+    if(usesMixins.toBoolean()) {
+        maven {
+            name 'sponge'
+            url 'https://repo.spongepowered.org/repository/maven-public'
+        }
+        maven {
+            url 'https://jitpack.io'
+        }
+    }
+}
+
+dependencies {
+    if(usesMixins.toBoolean()) {
+        annotationProcessor('org.ow2.asm:asm-debug-all:5.0.3')
+        annotationProcessor('com.google.guava:guava:24.1.1-jre')
+        annotationProcessor('com.google.code.gson:gson:2.8.6')
+        annotationProcessor('org.spongepowered:mixin:0.8-SNAPSHOT')
+        // using 0.8 to workaround a issue in 0.7 which fails mixin application
+        compile('com.github.GTNewHorizons:SpongePoweredMixin:0.7.12-GTNH') {
+            // Mixin includes a lot of dependencies that are too up-to-date
+            exclude module: 'launchwrapper'
+            exclude module: 'guava'
+            exclude module: 'gson'
+            exclude module: 'commons-io'
+            exclude module: 'log4j-core'
+        }
+        compile('com.github.GTNewHorizons:SpongeMixins:1.5.0')
+    }
+}
+
+apply from: 'dependencies.gradle'
+
+def mixingConfigRefMap = 'mixins.' + modId + '.refmap.json'
+def refMap = "${tasks.compileJava.temporaryDir}" + File.separator + mixingConfigRefMap
+def mixinSrg = "${tasks.reobf.temporaryDir}" + File.separator + "mixins.srg"
+
+task generateAssets {
+    if (usesMixins.toBoolean()) {
+        def mixinConfigFile = getFile("/src/main/resources/mixins." + modId + ".json");
+        if (!mixinConfigFile.exists()) {
+            mixinConfigFile.text = """{
+  "required": true,
+  "minVersion": "0.7.11",
+  "package": "${modGroup}.${mixinsPackage}",
+  "plugin": "${modGroup}.${mixinPlugin}",
+  "refmap": "${mixingConfigRefMap}",
+  "target": "@env(DEFAULT)",
+  "compatibilityLevel": "JAVA_8",
+  "mixins": [],
+  "client": [],
+  "server": []
+}
+"""
+        }
+    }
+}
+
+task relocateShadowJar(type: ConfigureShadowRelocation) {
+    target = tasks.shadowJar
+    prefix = modGroup + ".shadow"
+}
+
+shadowJar {
+    project.configurations.shadeCompile.each { dep ->
+        from(project.zipTree(dep)) {
+            exclude 'META-INF', 'META-INF/**'
+        }
+    }
+
+    manifest {
+        attributes(getManifestAttributes())
+    }
+
+    minimize()  // This will only allow shading for actually used classes
+    configurations = [project.configurations.shadowImplementation, project.configurations.shadowCompile]
+    dependsOn(relocateShadowJar)
+}
+
+jar {
+    project.configurations.shadeCompile.each { dep ->
+        from(project.zipTree(dep)) {
+            exclude 'META-INF', 'META-INF/**'
+        }
+    }
+
+    manifest {
+        attributes(getManifestAttributes())
+    }
+
+    if(usesShadowedDependencies.toBoolean()) {
+        dependsOn(shadowJar)
+        enabled = false
+    }
+}
+
+reobf {
+    if(usesMixins.toBoolean()) {
+        addExtraSrgFile mixinSrg
+    }
+}
+
+afterEvaluate {
+    if(usesMixins.toBoolean()) {
+        tasks.compileJava {
+            options.compilerArgs += [
+                    "-AreobfSrgFile=${tasks.reobf.srg}",
+                    "-AoutSrgFile=${mixinSrg}",
+                    "-AoutRefMapFile=${refMap}",
+                    // Elan: from what I understand they are just some linter configs so you get some warning on how to properly code
+                    "-XDenableSunApiLintControl",
+                    "-XDignore.symbol.file"
+            ]
+        }
+    }
+}
+
+runClient {
+    if(developmentEnvironmentUserName) {
+        arguments += [
+                "--username",
+                developmentEnvironmentUserName
+        ]
+    }
+
+    args(arguments)
+    jvmArgs(jvmArguments)
+}
+
+runServer {
+    args(arguments)
+    jvmArgs(jvmArguments)
+}
+
+tasks.withType(JavaExec).configureEach {
+    javaLauncher.set(
+            javaToolchains.launcherFor {
+                languageVersion = projectJavaVersion
+            }
+    )
+}
+
+processResources {
+    // this will ensure that this task is redone when the versions change.
+    inputs.property "version", project.version
+    inputs.property "mcversion", project.minecraft.version
+
+    // replace stuff in mcmod.info, nothing else
+    from(sourceSets.main.resources.srcDirs) {
+        include 'mcmod.info'
+
+        // replace modVersion and minecraftVersion
+        expand "minecraftVersion": project.minecraft.version,
+            "modVersion": modVersion,
+            "modId": modId,
+            "modName": modName
+    }
+
+    if(usesMixins.toBoolean()) {
+        from refMap
+    }
+
+    // copy everything else that's not the mcmod.info
+    from(sourceSets.main.resources.srcDirs) {
+        exclude 'mcmod.info'
+    }
+}
+
+def getManifestAttributes() {
+    def manifestAttributes = [:]
+    if(!containsMixinsAndOrCoreModOnly.toBoolean() && (usesMixins.toBoolean() || coreModClass)) {
+        manifestAttributes += ["FMLCorePluginContainsFMLMod": true]
+    }
+
+    if(accessTransformersFile) {
+        manifestAttributes += ["FMLAT" : accessTransformersFile.toString()]
+    }
+
+    if(coreModClass) {
+        manifestAttributes += ["FMLCorePlugin": modGroup + "." + coreModClass]
+    }
+
+    if(usesMixins.toBoolean()) {
+        manifestAttributes += [
+                "TweakClass" : "org.spongepowered.asm.launch.MixinTweaker",
+                "MixinConfigs" : "mixins." + modId + ".json",
+                "ForceLoadAsMod" : !containsMixinsAndOrCoreModOnly.toBoolean()
+        ]
+    }
+    return manifestAttributes
+}
+
+task sourcesJar(type: Jar) {
+    from (sourceSets.main.allSource)
+    from (file("$projectDir/LICENSE"))
+    getArchiveClassifier().set('sources')
+}
+
+task shadowDevJar(type: ShadowJar) {
+    project.configurations.shadeCompile.each { dep ->
+        from(project.zipTree(dep)) {
+            exclude 'META-INF', 'META-INF/**'
+        }
+    }
+
+    from sourceSets.main.output
+    getArchiveClassifier().set("dev")
+
+    manifest {
+        attributes(getManifestAttributes())
+    }
+
+    minimize()  // This will only allow shading for actually used classes
+    configurations = [project.configurations.shadowImplementation, project.configurations.shadowCompile]
+}
+
+task relocateShadowDevJar(type: ConfigureShadowRelocation) {
+    target = tasks.shadowDevJar
+    prefix = modGroup + ".shadow"
+}
+
+task circularResolverJar(type: Jar) {
+    dependsOn(relocateShadowDevJar)
+    dependsOn(shadowDevJar)
+    enabled = false
+}
+
+task devJar(type: Jar) {
+    project.configurations.shadeCompile.each { dep ->
+        from(project.zipTree(dep)) {
+            exclude 'META-INF', 'META-INF/**'
+        }
+    }
+
+    from sourceSets.main.output
+    getArchiveClassifier().set("dev")
+
+    manifest {
+        attributes(getManifestAttributes())
+    }
+
+    if(usesShadowedDependencies.toBoolean()) {
+        dependsOn(circularResolverJar)
+        enabled = false
+    }
+}
+
+task apiJar(type: Jar) {
+    from (sourceSets.main.allSource) {
+        include modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") + '/**'
+    }
+
+    from (sourceSets.main.output) {
+        include modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") + '/**'
+    }
+
+    from (sourceSets.main.resources.srcDirs) {
+        include("LICENSE")
+    }
+
+    getArchiveClassifier().set('api')
+}
+
+artifacts {
+    if(!noPublishedSources) {
+        archives sourcesJar
+    }
+    archives devJar
+    if(apiPackage) {
+        archives apiJar
+    }
+}
+
+// The gradle metadata includes all of the additional deps that we disabled from POM generation (including forgeBin with no groupID),
+// and isn't strictly needed with the POM so just disable it.
+tasks.withType(GenerateModuleMetadata) {
+    enabled = false
+}
+
+// workaround variable hiding in pom processing
+def projectConfigs = project.configurations
+
+publishing {
+    publications {
+        maven(MavenPublication) {
+            from components.java
+            if(usesShadowedDependencies.toBoolean()) {
+                artifact source: shadowJar, classifier: ""
+            }
+            if(!noPublishedSources) {
+                artifact source: sourcesJar, classifier: "sources"
+            }
+            artifact source: usesShadowedDependencies.toBoolean() ? shadowDevJar : devJar, classifier: "dev"
+            if (apiPackage) {
+                artifact source: apiJar, classifier: "api"
+            }
+
+            groupId = System.getenv("ARTIFACT_GROUP_ID") ?: "com.github.GTNewHorizons"
+            artifactId = System.getenv("ARTIFACT_ID") ?: project.name
+            // Using the identified version, not project.version as it has the prepended 1.7.10
+            version = System.getenv("RELEASE_VERSION") ?: identifiedVersion
+
+            // remove extra garbage from minecraft and minecraftDeps configuration
+            pom.withXml {
+                def badArtifacts = [:].withDefault {[] as Set<String>}
+                for (configuration in [projectConfigs.minecraft, projectConfigs.minecraftDeps]) {
+                    for (dependency in configuration.allDependencies) {
+                        badArtifacts[dependency.group == null ? "" : dependency.group] += dependency.name
+                    }
+                }
+                // example for specifying extra stuff to ignore
+                // badArtifacts["org.example.group"] += "artifactName"
+
+                Node pomNode = asNode()
+                pomNode.dependencies.'*'.findAll() {
+                    badArtifacts[it.groupId.text()].contains(it.artifactId.text())
+                }.each() {
+                    it.parent().remove(it)
+                }
+            }
+        }
+    }
+
+    repositories {
+        maven {
+            url = "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases"
+            credentials {
+                username = System.getenv("MAVEN_USER") ?: "NONE"
+                password = System.getenv("MAVEN_PASSWORD") ?: "NONE"
+            }
+        }
+    }
+}
+
+// Updating
+task updateBuildScript {
+    doLast {
+        if (performBuildScriptUpdate(projectDir.toString())) return
+
+        print("Build script already up-to-date!")
+    }
+}
+
+if (isNewBuildScriptVersionAvailable(projectDir.toString())) {
+    if (autoUpdateBuildScript.toBoolean()) {
+        performBuildScriptUpdate(projectDir.toString())
+    } else {
+        out.style(Style.SuccessHeader).println("Build script update available! Run 'gradle updateBuildScript'")
+    }
+}
+
+static URL availableBuildScriptUrl() {
+    new URL("https://raw.githubusercontent.com/GTNewHorizons/ExampleMod1.7.10/main/build.gradle")
+}
+
+boolean performBuildScriptUpdate(String projectDir) {
+    if (isNewBuildScriptVersionAvailable(projectDir)) {
+        def buildscriptFile = getFile("build.gradle")
+        availableBuildScriptUrl().withInputStream { i -> buildscriptFile.withOutputStream { it << i } }
+        out.style(Style.Success).print("Build script updated. Please REIMPORT the project or RESTART your IDE!")
+        return true
+    }
+    return false
+}
+
+boolean isNewBuildScriptVersionAvailable(String projectDir) {
+    Map parameters = ["connectTimeout": 2000, "readTimeout": 2000]
+
+    String currentBuildScript = getFile("build.gradle").getText()
+    String currentBuildScriptHash = getVersionHash(currentBuildScript)
+    String availableBuildScript = availableBuildScriptUrl().newInputStream(parameters).getText()
+    String availableBuildScriptHash = getVersionHash(availableBuildScript)
+
+    boolean isUpToDate = currentBuildScriptHash.empty || availableBuildScriptHash.empty || currentBuildScriptHash == availableBuildScriptHash
+    return !isUpToDate
+}
+
+static String getVersionHash(String buildScriptContent) {
+    String versionLine = buildScriptContent.find("^//version: [a-z0-9]*")
+    if(versionLine != null) {
+        return versionLine.split(": ").last()
+    }
+    return ""
+}
+
+configure(updateBuildScript) {
+    group = 'forgegradle'
+    description = 'Updates the build script to the latest version'
+}
+
+// Parameter Deobfuscation
+
+task deobfParams {
+    doLast {
+
+        String mcpDir = "$project.gradle.gradleUserHomeDir/caches/minecraft/de/oceanlabs/mcp/mcp_$channel/$mappingsVersion"
+        String mcpZIP = "$mcpDir/mcp_$channel-$mappingsVersion-${minecraftVersion}.zip"
+        String paramsCSV = "$mcpDir/params.csv"
+
+        download.run {
+            src "https://maven.minecraftforge.net/de/oceanlabs/mcp/mcp_$channel/$mappingsVersion-$minecraftVersion/mcp_$channel-$mappingsVersion-${minecraftVersion}.zip"
+            dest mcpZIP
+            overwrite false
+        }
+
+        if(!file(paramsCSV).exists()) {
+            println("Extracting MCP archive ...")
+            unzip(mcpZIP, mcpDir)
+        }
+
+        println("Parsing params.csv ...")
+        Map<String, String> params = new HashMap<>()
+        Files.lines(Paths.get(paramsCSV)).forEach{line ->
+            String[] cells = line.split(",")
+            if(cells.length > 2 && cells[0].matches("p_i?\\d+_\\d+_")) {
+                params.put(cells[0], cells[1])
+            }
+        }
+
+        out.style(Style.Success).println("Modified ${replaceParams(file("$projectDir/src/main/java"), params)} files!")
+        out.style(Style.Failure).println("Don't forget to verify that the code still works as before!\n It could be broken due to duplicate variables existing now\n or parameters taking priority over other variables.")
+    }
+}
+
+static int replaceParams(File file, Map<String, String> params) {
+    int fileCount = 0
+
+    if(file.isDirectory()) {
+        for(File f : file.listFiles()) {
+            fileCount += replaceParams(f, params)
+        }
+        return fileCount
+    }
+    println("Visiting ${file.getName()} ...")
+    try {
+        String content = new String(Files.readAllBytes(file.toPath()))
+        int hash = content.hashCode()
+        params.forEach{key, value ->
+            content = content.replaceAll(key, value)
+        }
+        if(hash != content.hashCode()) {
+            Files.write(file.toPath(), content.getBytes("UTF-8"))
+            return 1
+        }
+    } catch(Exception e) {
+        e.printStackTrace()
+    }
+    return 0
+}
+
+// Credit: bitsnaps (https://gist.github.com/bitsnaps/00947f2dce66f4bbdabc67d7e7b33681)
+static unzip(String zipFileName, String outputDir) {
+    byte[] buffer = new byte[16384]
+    ZipInputStream zis = new ZipInputStream(new FileInputStream(zipFileName))
+    ZipEntry zipEntry = zis.getNextEntry()
+    while (zipEntry != null) {
+         File newFile = new File(outputDir + File.separator, zipEntry.name)
+         if (zipEntry.isDirectory()) {
+             if (!newFile.isDirectory() && !newFile.mkdirs()) {
+                 throw new IOException("Failed to create directory $newFile")
+             }
+         } else {
+             // fix for Windows-created archives
+             File parent = newFile.parentFile
+             if (!parent.isDirectory() && !parent.mkdirs()) {
+                 throw new IOException("Failed to create directory $parent")
+             }
+             // write file content
+             FileOutputStream fos = new FileOutputStream(newFile)
+             int len = 0
+             while ((len = zis.read(buffer)) > 0) {
+                 fos.write(buffer, 0, len)
+             }
+             fos.close()
+         }
+     zipEntry = zis.getNextEntry()
+     }
+    zis.closeEntry()
+    zis.close()
+}
+
+configure(deobfParams) {
+    group = 'forgegradle'
+    description = 'Rename all obfuscated parameter names inherited from Minecraft classes'
+}
+
+// Dependency Deobfuscation
+
+def deobf(String sourceURL) {
+    try {
+        URL url = new URL(sourceURL)
+        String fileName = url.getFile()
+
+        //get rid of directories:
+        int lastSlash = fileName.lastIndexOf("/")
+        if(lastSlash > 0) {
+            fileName = fileName.substring(lastSlash + 1)
+        }
+        //get rid of extension:
+        if(fileName.endsWith(".jar") || fileName.endsWith(".litemod")) {
+            fileName = fileName.substring(0, fileName.lastIndexOf("."))
+        }
+
+        String hostName = url.getHost()
+        if(hostName.startsWith("www.")) {
+            hostName = hostName.substring(4)
+        }
+        List parts = Arrays.asList(hostName.split("\\."))
+        Collections.reverse(parts)
+        hostName = String.join(".", parts)
+
+        return deobf(sourceURL, "$hostName/$fileName")
+    } catch(Exception e) {
+        return deobf(sourceURL, "deobf/${sourceURL.hashCode()}")
+    }
+}
+
+// The method above is to be preferred. Use this method if the filename is not at the end of the URL.
+def deobf(String sourceURL, String rawFileName) {
+    String bon2Version = "2.5.1"
+    String fileName = URLDecoder.decode(rawFileName, "UTF-8")
+    String cacheDir = "$project.gradle.gradleUserHomeDir/caches"
+    String bon2Dir = "$cacheDir/forge_gradle/deobf"
+    String bon2File = "$bon2Dir/BON2-${bon2Version}.jar"
+    String obfFile = "$cacheDir/modules-2/files-2.1/${fileName}.jar"
+    String deobfFile = "$cacheDir/modules-2/files-2.1/${fileName}-deobf.jar"
+
+    if(file(deobfFile).exists()) {
+        return files(deobfFile)
+    }
+
+    String mappingsVer
+    if(remoteMappings) {
+        String id = "${forgeVersion.split("\\.")[3]}-$minecraftVersion"
+        String mappingsZIP = "$cacheDir/forge_gradle/maven_downloader/de/oceanlabs/mcp/mcp_snapshot_nodoc/$id/mcp_snapshot_nodoc-${id}.zip"
+
+        zipMappings(mappingsZIP, remoteMappings, bon2Dir)
+
+        mappingsVer = "snapshot_$id"
+    } else {
+        mappingsVer = "${channel}_$mappingsVersion"
+    }
+
+    download.run {
+        src "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases/com/github/parker8283/BON2/$bon2Version-CUSTOM/BON2-$bon2Version-CUSTOM-all.jar"
+        dest bon2File
+        quiet true
+        overwrite false
+    }
+
+    download.run {
+        src sourceURL
+        dest obfFile
+        quiet true
+        overwrite false
+    }
+
+    exec {
+        commandLine 'java', '-jar', bon2File, '--inputJar', obfFile, '--outputJar', deobfFile, '--mcVer', minecraftVersion, '--mappingsVer', mappingsVer, '--notch'
+        workingDir bon2Dir
+        standardOutput = new FileOutputStream("${deobfFile}.log")
+    }
+
+    return files(deobfFile)
+}
+
+def zipMappings(String zipPath, String url, String bon2Dir) {
+    File zipFile = new File(zipPath)
+    if(zipFile.exists()) {
+        return
+    }
+
+    String fieldsCache = "$bon2Dir/data/fields.csv"
+    String methodsCache = "$bon2Dir/data/methods.csv"
+
+    download.run {
+        src "${url}fields.csv"
+        dest fieldsCache
+        quiet true
+    }
+    download.run {
+        src "${url}methods.csv"
+        dest methodsCache
+        quiet true
+    }
+
+    zipFile.getParentFile().mkdirs()
+    ZipOutputStream zos = new ZipOutputStream(new FileOutputStream(zipFile))
+
+    zos.putNextEntry(new ZipEntry("fields.csv"))
+    Files.copy(Paths.get(fieldsCache), zos)
+    zos.closeEntry()
+
+    zos.putNextEntry(new ZipEntry("methods.csv"))
+    Files.copy(Paths.get(methodsCache), zos)
+    zos.closeEntry()
+
+    zos.close()
+}
+
+// Helper methods
+
+def checkPropertyExists(String propertyName) {
+    if (!project.hasProperty(propertyName)) {
+        throw new GradleException("This project requires a property \"" + propertyName + "\"! Please add it your \"gradle.properties\". You can find all properties and their description here: https://github.com/GTNewHorizons/ExampleMod1.7.10/blob/main/gradle.properties")
+    }
+}
+
+def getFile(String relativePath) {
+    return new File(projectDir, relativePath)
+}

build/build.gradle

@@ -1,121 +0,0 @@
-buildscript {
-    repositories {
-        mavenCentral()
-        maven {
-            name = "forge"
-            url = "http://files.minecraftforge.net/maven"
-        }
-        maven {
-            name = "sonatype"
-            url = "https://oss.sonatype.org/content/repositories/snapshots/"
-        }
-    }
-    dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
-    }
-}
-
-//add dependency repositories
-repositories {
-	maven {
-		name = "chickenbones"
-		url = "http://chickenbones.net/maven"
-	}
-}
-
-apply plugin: 'forge'
-
-group = "codechicken" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
-archivesBaseName = "NotEnoughItems"
-
-// Define properties file
-ext.configFile = file "build.properties"
-
-configFile.withReader {
-    // Load config.  It shall from now be referenced as simply config or project.config
-    def prop = new Properties()
-    prop.load(it)
-    project.ext.config = new ConfigSlurper().parse prop
-}
-
-dependencies {
-    compile "codechicken:CodeChickenLib:${config.mc_version}-${config.ccl_version}:dev"
-    compile "codechicken:CodeChickenCore:${config.mc_version}-${config.ccc_version}:dev"
-}
-
-version =  "${project.config.mod_version}"
-
-println  config.mc_version + "-" + config.forge_version
-// Setup the forge minecraft plugin data. Specify the preferred forge/minecraft version here
-minecraft {
-    version = config.mc_version + "-" + config.forge_version
-}
-
-def root = project.projectDir.parentFile
-sourceSets {
-    main {
-        java {
-            srcDir new File(root, "src")
-        }
-        resources {
-            srcDir new File(root, "resources")
-        }
-    }
-}
-
-processResources {
-    //redo task if any of these properties change
-    inputs.property "version", project.version
-    inputs.property "mc_version", config.mc_version
-
-    // Replace properties in info files
-    from(sourceSets.main.resources.srcDirs) {
-        include '*.info'
-        expand 'version':project.version,'mc_version':config.mc_version
-    }
-
-    // Move access transformer to META-INF
-    rename '(.+_at.cfg)', 'META-INF/$1'
-}
-
-version = "${project.minecraft.version}-${project.version}"
-def commonManifest = {
-    attributes 'FMLCorePlugin': 'codechicken.nei.asm.NEICorePlugin'
-    attributes 'FMLAT': 'nei_at.cfg'
-}
-
-jar {
-    classifier = 'universal'
-    manifest commonManifest
-}
-
-task sourceJar(type: Jar) {
-    from sourceSets.main.java
-    from new File(root, "dev")
-    classifier = 'src'
-}
-
-task devJar(type: Jar) {
-    from sourceSets.main.output
-    classifier = 'dev'
-    manifest commonManifest
-}
-
-// Tell the artifact system about our extra jars
-artifacts {
-    archives sourceJar, devJar
-}
-
-// Configure an upload task.
-uploadArchives {
-    dependsOn 'reobf'
-	if (project.hasProperty("local_maven")) {
-		repositories {
-			logger.info('Publishing to local maven repo')
-
-			mavenDeployer {
-				repository(url: "file://${local_maven}")
-			}
-		}
-	}
-}

build/build.properties

@@ -1,5 +0,0 @@
-mc_version=1.7.10
-forge_version=10.13.4.1448-1.7.10
-ccl_version=1.1.3.138
-ccc_version=1.0.7.+
-mod_version=1.0.6-GTNH

build/settings.gradle

@@ -1,19 +0,0 @@
-/*
- * This settings file was auto generated by the Gradle buildInit task
- * by 'sunstrike' at '21/11/13 14:14' with Gradle 1.9
- *
- * The settings file is used to specify which projects to include in your build.
- * In a single project build this file can be empty or even removed.
- *
- * Detailed information about configuring a multi-project build in Gradle can be found
- * in the user guide at http://gradle.org/docs/1.9/userguide/multi_project_builds.html
- */
-
-/*
-// To declare projects as part of a multi-project build use the 'include' method
-include 'shared'
-include 'api'
-include 'services:webservice'
-*/
-
-rootProject.name = 'NotEnoughItems'

dependencies.gradle

@@ -0,0 +1,7 @@
+// Add your dependencies here
+
+dependencies {
+	compile('com.github.GTNewHorizons:CodeChickenLib:1.1.5.3:dev')
+	compile('com.github.GTNewHorizons:CodeChickenCore:1.1.3:dev')
+	shadowImplementation('org.apache.commons:commons-csv:1.8')
+}

dev/net/minecraft/client/gui/inventory/GuiContainer.java

@@ -1,808 +0,0 @@
-package net.minecraft.client.gui.inventory;
-
-import codechicken.nei.guihook.GuiContainerManager;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.FontRenderer;
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.client.renderer.OpenGlHelper;
-import net.minecraft.client.renderer.RenderHelper;
-import net.minecraft.client.renderer.texture.TextureMap;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.Container;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.IIcon;
-import net.minecraft.util.MathHelper;
-import net.minecraft.util.ResourceLocation;
-import org.lwjgl.input.Keyboard;
-import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.GL12;
-
-@SideOnly(Side.CLIENT)
-public abstract class GuiContainer extends GuiScreen
-{
-    protected static final ResourceLocation field_147001_a = new ResourceLocation("textures/gui/container/inventory.png");
-    /** The X size of the inventory window in pixels. */
-    public int xSize = 176;
-    /** The Y size of the inventory window in pixels. */
-    public int ySize = 166;
-    /** A list of the players inventory slots */
-    public Container inventorySlots;
-    /**
-     * Starting X position for the Gui. Inconsistent use for Gui backgrounds.
-     */
-    public int guiLeft;
-    /**
-     * Starting Y position for the Gui. Inconsistent use for Gui backgrounds.
-     */
-    public int guiTop;
-    private Slot theSlot;
-    /** Used when touchscreen is enabled. */
-    private Slot clickedSlot;
-    /** Used when touchscreen is enabled. */
-    private boolean isRightMouseClick;
-    /** Used when touchscreen is enabled */
-    private ItemStack draggedStack;
-    private int field_147011_y;
-    private int field_147010_z;
-    private Slot returningStackDestSlot;
-    private long returningStackTime;
-    /** Used when touchscreen is enabled */
-    private ItemStack returningStack;
-    private Slot field_146985_D;
-    private long field_146986_E;
-    protected final Set field_147008_s = new HashSet();
-    protected boolean field_147007_t;
-    private int field_146987_F;
-    private int field_146988_G;
-    private boolean field_146995_H;
-    private int field_146996_I;
-    private long field_146997_J;
-    private Slot field_146998_K;
-    private int field_146992_L;
-    private boolean field_146993_M;
-    private ItemStack field_146994_N;
-    private static final String __OBFID = "CL_00000737";
-
-    public GuiContainerManager manager;
-
-    public GuiContainer(Container par1Container)
-    {
-        this.inventorySlots = par1Container;
-        this.field_146995_H = true;
-    }
-
-    /**
-     * Adds the buttons (and other controls) to the screen in question.
-     */
-    public void initGui()
-    {
-        super.initGui();
-        this.mc.thePlayer.openContainer = this.inventorySlots;
-        this.guiLeft = (this.width - this.xSize) / 2;
-        this.guiTop = (this.height - this.ySize) / 2;
-    }
-
-    /**
-     * Draws the screen and all the components in it.
-     */
-    public void drawScreen(int par1, int par2, float par3)
-    {
-        manager.preDraw();
-        
-        this.drawDefaultBackground();
-        int k = this.guiLeft;
-        int l = this.guiTop;
-        this.drawGuiContainerBackgroundLayer(par3, par1, par2);
-        GL11.glDisable(GL12.GL_RESCALE_NORMAL);
-        RenderHelper.disableStandardItemLighting();
-        GL11.glDisable(GL11.GL_LIGHTING);
-        GL11.glDisable(GL11.GL_DEPTH_TEST);
-        super.drawScreen(par1, par2, par3);
-        RenderHelper.enableGUIStandardItemLighting();
-        GL11.glPushMatrix();
-        GL11.glTranslatef((float)k, (float)l, 0.0F);
-        GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
-        GL11.glEnable(GL12.GL_RESCALE_NORMAL);
-        this.theSlot = null;
-        short short1 = 240;
-        short short2 = 240;
-        OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, (float)short1 / 1.0F, (float)short2 / 1.0F);
-        GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
-        int k1;
-
-        for (int i1 = 0; i1 < this.inventorySlots.inventorySlots.size(); ++i1)
-        {
-            Slot slot = (Slot)this.inventorySlots.inventorySlots.get(i1);
-            this.func_146977_a(slot);
-
-            if (this.isMouseOverSlot(slot, par1, par2) && slot.func_111238_b() && !manager.objectUnderMouse(par1, par2))
-            {
-                this.theSlot = slot;
-                GL11.glDisable(GL11.GL_LIGHTING);
-                GL11.glDisable(GL11.GL_DEPTH_TEST);
-                int j1 = slot.xDisplayPosition;
-                k1 = slot.yDisplayPosition;
-                GL11.glColorMask(true, true, true, false);
-                this.drawGradientRect(j1, k1, j1 + 16, k1 + 16, -2130706433, -2130706433);
-                GL11.glColorMask(true, true, true, true);
-                GL11.glEnable(GL11.GL_LIGHTING);
-                GL11.glEnable(GL11.GL_DEPTH_TEST);
-            }
-        }
-
-        //Forge: Force lighting to be disabled as there are some issue where lighting would
-        //incorrectly be applied based on items that are in the inventory.
-        GL11.glDisable(GL11.GL_LIGHTING);
-        this.drawGuiContainerForegroundLayer(par1, par2);
-        GL11.glEnable(GL11.GL_LIGHTING);
-        
-        manager.renderObjects(par1, par2);
-
-        InventoryPlayer inventoryplayer = this.mc.thePlayer.inventory;
-        ItemStack itemstack = this.draggedStack == null ? inventoryplayer.getItemStack() : this.draggedStack;
-
-        if (itemstack != null)
-        {
-            byte b0 = 8;
-            k1 = this.draggedStack == null ? 8 : 16;
-            String s = null;
-
-            if (this.draggedStack != null && this.isRightMouseClick)
-            {
-                itemstack = itemstack.copy();
-                itemstack.stackSize = MathHelper.ceiling_float_int((float)itemstack.stackSize / 2.0F);
-            }
-            else if (this.field_147007_t && this.field_147008_s.size() > 1)
-            {
-                itemstack = itemstack.copy();
-                itemstack.stackSize = this.field_146996_I;
-
-                if (itemstack.stackSize == 0)
-                {
-                    s = "" + EnumChatFormatting.YELLOW + "0";
-                }
-            }
-
-            this.drawItemStack(itemstack, par1 - k - b0, par2 - l - k1, s);
-        }
-
-        if (this.returningStack != null)
-        {
-            float f1 = (float)(Minecraft.getSystemTime() - this.returningStackTime) / 100.0F;
-
-            if (f1 >= 1.0F)
-            {
-                f1 = 1.0F;
-                this.returningStack = null;
-            }
-
-            k1 = this.returningStackDestSlot.xDisplayPosition - this.field_147011_y;
-            int j2 = this.returningStackDestSlot.yDisplayPosition - this.field_147010_z;
-            int l1 = this.field_147011_y + (int)((float)k1 * f1);
-            int i2 = this.field_147010_z + (int)((float)j2 * f1);
-            this.drawItemStack(this.returningStack, l1, i2, (String)null);
-        }
-
-        GL11.glPopMatrix();
-        /*
-        if (inventoryplayer.getItemStack() == null && this.theSlot != null && this.theSlot.getHasStack())
-        {
-            ItemStack itemstack1 = this.theSlot.getStack();
-            this.renderToolTip(itemstack1, par1, par2);
-        }
-        */
-        manager.renderToolTips(par1, par2);
-
-        GL11.glEnable(GL11.GL_LIGHTING);
-        GL11.glEnable(GL11.GL_DEPTH_TEST);
-        RenderHelper.enableStandardItemLighting();
-    }
-
-    private void drawItemStack(ItemStack p_146982_1_, int p_146982_2_, int p_146982_3_, String p_146982_4_)
-    {
-        GL11.glTranslatef(0.0F, 0.0F, 32.0F);
-        this.zLevel = 500.0F;
-        itemRender.zLevel = 500.0F;
-        FontRenderer font = null;
-        if (p_146982_1_ != null) font = p_146982_1_.getItem().getFontRenderer(p_146982_1_);
-        if (font == null) font = fontRendererObj;
-        itemRender.renderItemAndEffectIntoGUI(font, this.mc.getTextureManager(), p_146982_1_, p_146982_2_, p_146982_3_);
-        itemRender.renderItemOverlayIntoGUI(font, this.mc.getTextureManager(), p_146982_1_, p_146982_2_, p_146982_3_ - (this.draggedStack == null ? 0 : 8), p_146982_4_);
-        this.zLevel = 0.0F;
-        itemRender.zLevel = 0.0F;
-    }
-
-    /**
-     * Draw the foreground layer for the GuiContainer (everything in front of the items)
-     */
-    protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) {}
-
-    protected abstract void drawGuiContainerBackgroundLayer(float var1, int var2, int var3);
-
-    private void func_146977_a(Slot p_146977_1_)
-    {
-        int i = p_146977_1_.xDisplayPosition;
-        int j = p_146977_1_.yDisplayPosition;
-        ItemStack itemstack = p_146977_1_.getStack();
-        boolean flag = false;
-        boolean flag1 = p_146977_1_ == this.clickedSlot && this.draggedStack != null && !this.isRightMouseClick;
-        ItemStack itemstack1 = this.mc.thePlayer.inventory.getItemStack();
-        String s = null;
-
-        if (p_146977_1_ == this.clickedSlot && this.draggedStack != null && this.isRightMouseClick && itemstack != null)
-        {
-            itemstack = itemstack.copy();
-            itemstack.stackSize /= 2;
-        }
-        else if (this.field_147007_t && this.field_147008_s.contains(p_146977_1_) && itemstack1 != null)
-        {
-            if (this.field_147008_s.size() == 1)
-            {
-                return;
-            }
-
-            if (Container.func_94527_a(p_146977_1_, itemstack1, true) && this.inventorySlots.canDragIntoSlot(p_146977_1_))
-            {
-                itemstack = itemstack1.copy();
-                flag = true;
-                Container.func_94525_a(this.field_147008_s, this.field_146987_F, itemstack, p_146977_1_.getStack() == null ? 0 : p_146977_1_.getStack().stackSize);
-
-                if (itemstack.stackSize > itemstack.getMaxStackSize())
-                {
-                    s = EnumChatFormatting.YELLOW + "" + itemstack.getMaxStackSize();
-                    itemstack.stackSize = itemstack.getMaxStackSize();
-                }
-
-                if (itemstack.stackSize > p_146977_1_.getSlotStackLimit())
-                {
-                    s = EnumChatFormatting.YELLOW + "" + p_146977_1_.getSlotStackLimit();
-                    itemstack.stackSize = p_146977_1_.getSlotStackLimit();
-                }
-            }
-            else
-            {
-                this.field_147008_s.remove(p_146977_1_);
-                this.func_146980_g();
-            }
-        }
-
-        this.zLevel = 100.0F;
-        itemRender.zLevel = 100.0F;
-
-        if (itemstack == null)
-        {
-            IIcon iicon = p_146977_1_.getBackgroundIconIndex();
-
-            if (iicon != null)
-            {
-                GL11.glDisable(GL11.GL_LIGHTING);
-                this.mc.getTextureManager().bindTexture(TextureMap.locationItemsTexture);
-                this.drawTexturedModelRectFromIcon(i, j, iicon, 16, 16);
-                GL11.glEnable(GL11.GL_LIGHTING);
-                flag1 = true;
-            }
-        }
-
-        if (!flag1)
-        {
-            if (flag)
-            {
-                drawRect(i, j, i + 16, j + 16, -2130706433);
-            }
-
-            GL11.glEnable(GL11.GL_DEPTH_TEST);
-            manager.renderSlotUnderlay(p_146977_1_);
-            manager.drawSlotItem(p_146977_1_, itemstack, i, j, s);
-            manager.renderSlotOverlay(p_146977_1_);
-        }
-
-        itemRender.zLevel = 0.0F;
-        this.zLevel = 0.0F;
-    }
-
-    private void func_146980_g()
-    {
-        ItemStack itemstack = this.mc.thePlayer.inventory.getItemStack();
-
-        if (itemstack != null && this.field_147007_t)
-        {
-            this.field_146996_I = itemstack.stackSize;
-            ItemStack itemstack1;
-            int i;
-
-            for (Iterator iterator = this.field_147008_s.iterator(); iterator.hasNext(); this.field_146996_I -= itemstack1.stackSize - i)
-            {
-                Slot slot = (Slot)iterator.next();
-                itemstack1 = itemstack.copy();
-                i = slot.getStack() == null ? 0 : slot.getStack().stackSize;
-                Container.func_94525_a(this.field_147008_s, this.field_146987_F, itemstack1, i);
-
-                if (itemstack1.stackSize > itemstack1.getMaxStackSize())
-                {
-                    itemstack1.stackSize = itemstack1.getMaxStackSize();
-                }
-
-                if (itemstack1.stackSize > slot.getSlotStackLimit())
-                {
-                    itemstack1.stackSize = slot.getSlotStackLimit();
-                }
-            }
-        }
-    }
-
-    /**
-     * Returns the slot at the given coordinates or null if there is none.
-     */
-    public Slot getSlotAtPosition(int p_146975_1_, int p_146975_2_)
-    {
-        for (int k = 0; k < this.inventorySlots.inventorySlots.size(); ++k)
-        {
-            Slot slot = (Slot)this.inventorySlots.inventorySlots.get(k);
-
-            if (this.isMouseOverSlot(slot, p_146975_1_, p_146975_2_))
-            {
-                return slot;
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Called when the mouse is clicked.
-     */
-    protected void mouseClicked(int par1, int par2, int par3)
-    {
-        if (manager.mouseClicked(par1, par2, par3))
-            return;
-
-        super.mouseClicked(par1, par2, par3);
-        
-        boolean flag = par3 == this.mc.gameSettings.keyBindPickBlock.getKeyCode() + 100;
-        Slot slot = this.getSlotAtPosition(par1, par2);
-        long l = Minecraft.getSystemTime();
-        this.field_146993_M = this.field_146998_K == slot && l - this.field_146997_J < 250L && this.field_146992_L == par3;
-        this.field_146995_H = false;
-
-        if (par3 == 0 || par3 == 1 || flag)
-        {
-            int i1 = this.guiLeft;
-            int j1 = this.guiTop;
-            boolean flag1 = par1 < i1 || par2 < j1 || par1 >= i1 + this.xSize || par2 >= j1 + this.ySize;
-            int k1 = -1;
-
-            if (slot != null)
-            {
-                k1 = slot.slotNumber;
-            }
-
-            if (flag1)
-            {
-                k1 = -999;
-            }
-
-            if (this.mc.gameSettings.touchscreen && flag1 && this.mc.thePlayer.inventory.getItemStack() == null)
-            {
-                this.mc.displayGuiScreen((GuiScreen)null);
-                return;
-            }
-
-            if (k1 != -1)
-            {
-                if (this.mc.gameSettings.touchscreen)
-                {
-                    if (slot != null && slot.getHasStack())
-                    {
-                        this.clickedSlot = slot;
-                        this.draggedStack = null;
-                        this.isRightMouseClick = par3 == 1;
-                    }
-                    else
-                    {
-                        this.clickedSlot = null;
-                    }
-                }
-                else if (!this.field_147007_t)
-                {
-                    if (this.mc.thePlayer.inventory.getItemStack() == null)
-                    {
-                        if (par3 == this.mc.gameSettings.keyBindPickBlock.getKeyCode() + 100)
-                        {
-                            managerHandleMouseClick(slot, k1, par3, 3);
-                        }
-                        else
-                        {
-                            boolean flag2 = k1 != -999 && (Keyboard.isKeyDown(42) || Keyboard.isKeyDown(54));
-                            byte b0 = 0;
-
-                            if (flag2)
-                            {
-                                this.field_146994_N = slot != null && slot.getHasStack() ? slot.getStack() : null;
-                                b0 = 1;
-                            }
-                            else if (k1 == -999)
-                            {
-                                b0 = 4;
-                            }
-
-                            managerHandleMouseClick(slot, k1, par3, b0);
-                        }
-
-                        this.field_146995_H = true;
-                    }
-                    else
-                    {
-                        this.field_147007_t = true;
-                        this.field_146988_G = par3;
-                        this.field_147008_s.clear();
-
-                        if (par3 == 0)
-                        {
-                            this.field_146987_F = 0;
-                        }
-                        else if (par3 == 1)
-                        {
-                            this.field_146987_F = 1;
-                        }
-                    }
-                }
-            }
-        }
-
-        this.field_146998_K = slot;
-        this.field_146997_J = l;
-        this.field_146992_L = par3;
-    }
-
-    /**
-     * Called when a mouse button is pressed and the mouse is moved around. Parameters are : mouseX, mouseY,
-     * lastButtonClicked & timeSinceMouseClick.
-     */
-    protected void mouseClickMove(int p_146273_1_, int p_146273_2_, int p_146273_3_, long p_146273_4_)
-    {
-        Slot slot = this.getSlotAtPosition(p_146273_1_, p_146273_2_);
-        ItemStack itemstack = this.mc.thePlayer.inventory.getItemStack();
-        
-        manager.mouseDragged(p_146273_1_, p_146273_2_, p_146273_3_, p_146273_4_);
-
-        if (this.clickedSlot != null && this.mc.gameSettings.touchscreen)
-        {
-            if (p_146273_3_ == 0 || p_146273_3_ == 1)
-            {
-                if (this.draggedStack == null)
-                {
-                    if (slot != this.clickedSlot)
-                    {
-                        this.draggedStack = this.clickedSlot.getStack().copy();
-                    }
-                }
-                else if (this.draggedStack.stackSize > 1 && slot != null && Container.func_94527_a(slot, this.draggedStack, false))
-                {
-                    long i1 = Minecraft.getSystemTime();
-
-                    if (this.field_146985_D == slot)
-                    {
-                        if (i1 - this.field_146986_E > 500L)
-                        {
-                            managerHandleMouseClick(this.clickedSlot, this.clickedSlot.slotNumber, 0, 0);
-                            managerHandleMouseClick(slot, slot.slotNumber, 1, 0);
-                            managerHandleMouseClick(this.clickedSlot, this.clickedSlot.slotNumber, 0, 0);
-                            this.field_146986_E = i1 + 750L;
-                            --this.draggedStack.stackSize;
-                        }
-                    }
-                    else
-                    {
-                        this.field_146985_D = slot;
-                        this.field_146986_E = i1;
-                    }
-                }
-            }
-        }
-        else if (this.field_147007_t && slot != null && itemstack != null && itemstack.stackSize > this.field_147008_s.size() && Container.func_94527_a(slot, itemstack, true) && slot.isItemValid(itemstack) && this.inventorySlots.canDragIntoSlot(slot))
-        {
-            this.field_147008_s.add(slot);
-            this.func_146980_g();
-        }
-    }
-
-    /**
-     * Called when the mouse is moved or a mouse button is released.  Signature: (mouseX, mouseY, which) which==-1 is
-     * mouseMove, which==0 or which==1 is mouseUp
-     */
-    protected void mouseMovedOrUp(int p_146286_1_, int p_146286_2_, int p_146286_3_)
-    {
-        if(manager.overrideMouseUp(p_146286_1_, p_146286_2_, p_146286_3_))
-            return;
-
-        Slot slot = this.getSlotAtPosition(p_146286_1_, p_146286_2_);
-        int l = this.guiLeft;
-        int i1 = this.guiTop;
-        boolean flag = p_146286_1_ < l || p_146286_2_ < i1 || p_146286_1_ >= l + this.xSize || p_146286_2_ >= i1 + this.ySize;
-        int j1 = -1;
-
-        if (slot != null)
-        {
-            j1 = slot.slotNumber;
-        }
-
-        if (flag)
-        {
-            j1 = -999;
-        }
-
-        Slot slot1;
-        Iterator iterator;
-
-        if (this.field_146993_M && slot != null && p_146286_3_ == 0 && this.inventorySlots.func_94530_a((ItemStack)null, slot))
-        {
-            if (isShiftKeyDown())
-            {
-                if (slot != null && slot.inventory != null && this.field_146994_N != null)
-                {
-                    iterator = this.inventorySlots.inventorySlots.iterator();
-
-                    while (iterator.hasNext())
-                    {
-                        slot1 = (Slot)iterator.next();
-
-                        if (slot1 != null && slot1.canTakeStack(this.mc.thePlayer) && slot1.getHasStack() && slot1.inventory == slot.inventory && Container.func_94527_a(slot1, this.field_146994_N, true))
-                        {
-                            managerHandleMouseClick(slot1, slot1.slotNumber, p_146286_3_, 1);
-                        }
-                    }
-                }
-            }
-            else
-            {
-                managerHandleMouseClick(slot, j1, p_146286_3_, 6);
-            }
-
-            this.field_146993_M = false;
-            this.field_146997_J = 0L;
-        }
-        else
-        {
-            if (this.field_147007_t && this.field_146988_G != p_146286_3_)
-            {
-                this.field_147007_t = false;
-                this.field_147008_s.clear();
-                this.field_146995_H = true;
-                return;
-            }
-
-            if (this.field_146995_H)
-            {
-                this.field_146995_H = false;
-                return;
-            }
-
-            boolean flag1;
-
-            if (this.clickedSlot != null && this.mc.gameSettings.touchscreen)
-            {
-                if (p_146286_3_ == 0 || p_146286_3_ == 1)
-                {
-                    if (this.draggedStack == null && slot != this.clickedSlot)
-                    {
-                        this.draggedStack = this.clickedSlot.getStack();
-                    }
-
-                    flag1 = Container.func_94527_a(slot, this.draggedStack, false);
-
-                    if (j1 != -1 && this.draggedStack != null && flag1)
-                    {
-                        managerHandleMouseClick(this.clickedSlot, this.clickedSlot.slotNumber, p_146286_3_, 0);
-                        managerHandleMouseClick(slot, j1, 0, 0);
-
-                        if (this.mc.thePlayer.inventory.getItemStack() != null)
-                        {
-                            managerHandleMouseClick(this.clickedSlot, this.clickedSlot.slotNumber, p_146286_3_, 0);
-                            this.field_147011_y = p_146286_1_ - l;
-                            this.field_147010_z = p_146286_2_ - i1;
-                            this.returningStackDestSlot = this.clickedSlot;
-                            this.returningStack = this.draggedStack;
-                            this.returningStackTime = Minecraft.getSystemTime();
-                        }
-                        else
-                        {
-                            this.returningStack = null;
-                        }
-                    }
-                    else if (this.draggedStack != null)
-                    {
-                        this.field_147011_y = p_146286_1_ - l;
-                        this.field_147010_z = p_146286_2_ - i1;
-                        this.returningStackDestSlot = this.clickedSlot;
-                        this.returningStack = this.draggedStack;
-                        this.returningStackTime = Minecraft.getSystemTime();
-                    }
-
-                    this.draggedStack = null;
-                    this.clickedSlot = null;
-                }
-            }
-            else if (this.field_147007_t && !this.field_147008_s.isEmpty())
-            {
-                managerHandleMouseClick((Slot)null, -999, Container.func_94534_d(0, this.field_146987_F), 5);
-                iterator = this.field_147008_s.iterator();
-
-                while (iterator.hasNext())
-                {
-                    slot1 = (Slot)iterator.next();
-                    managerHandleMouseClick(slot1, slot1.slotNumber, Container.func_94534_d(1, this.field_146987_F), 5);
-                }
-
-                managerHandleMouseClick((Slot)null, -999, Container.func_94534_d(2, this.field_146987_F), 5);
-            }
-            else if (this.mc.thePlayer.inventory.getItemStack() != null)
-            {
-                if (p_146286_3_ == this.mc.gameSettings.keyBindPickBlock.getKeyCode() + 100)
-                {
-                    managerHandleMouseClick(slot, j1, p_146286_3_, 3);
-                }
-                else
-                {
-                    flag1 = j1 != -999 && (Keyboard.isKeyDown(42) || Keyboard.isKeyDown(54));
-
-                    if (flag1)
-                    {
-                        this.field_146994_N = slot != null && slot.getHasStack() ? slot.getStack() : null;
-                    }
-
-                    managerHandleMouseClick(slot, j1, p_146286_3_, flag1 ? 1 : 0);
-                }
-            }
-            else if(p_146286_3_ >= 0)
-                manager.mouseUp(p_146286_1_, p_146286_2_, p_146286_3_);
-        }
-
-        if (this.mc.thePlayer.inventory.getItemStack() == null)
-        {
-            this.field_146997_J = 0L;
-        }
-
-        this.field_147007_t = false;
-    }
-
-    /**
-     * Returns if the passed mouse position is over the specified slot.
-     */
-    private boolean isMouseOverSlot(Slot p_146981_1_, int p_146981_2_, int p_146981_3_)
-    {
-        return this.func_146978_c(p_146981_1_.xDisplayPosition, p_146981_1_.yDisplayPosition, 16, 16, p_146981_2_, p_146981_3_);
-    }
-
-    protected boolean func_146978_c(int p_146978_1_, int p_146978_2_, int p_146978_3_, int p_146978_4_, int p_146978_5_, int p_146978_6_)
-    {
-        int k1 = this.guiLeft;
-        int l1 = this.guiTop;
-        p_146978_5_ -= k1;
-        p_146978_6_ -= l1;
-        return p_146978_5_ >= p_146978_1_ - 1 && p_146978_5_ < p_146978_1_ + p_146978_3_ + 1 && p_146978_6_ >= p_146978_2_ - 1 && p_146978_6_ < p_146978_2_ + p_146978_4_ + 1;
-    }
-
-    protected void handleMouseClick(Slot p_146984_1_, int p_146984_2_, int p_146984_3_, int p_146984_4_)
-    {
-        if (p_146984_1_ != null)
-        {
-            p_146984_2_ = p_146984_1_.slotNumber;
-        }
-
-        manager.handleSlotClick(p_146984_2_, p_146984_3_, p_146984_4_);
-    }
-
-    /**
-     * Fired when a key is typed. This is the equivalent of KeyListener.keyTyped(KeyEvent e).
-     */
-    protected void keyTyped(char par1, int par2)
-    {
-        if(manager.lastKeyTyped(par2, par1))
-            return;
-
-        if (par2 == 1 || par2 == this.mc.gameSettings.keyBindInventory.getKeyCode())
-        {
-            this.mc.thePlayer.closeScreen();
-        }
-
-        this.checkHotbarKeys(par2);
-
-        if (this.theSlot != null && this.theSlot.getHasStack())
-        {
-            if (par2 == this.mc.gameSettings.keyBindPickBlock.getKeyCode())
-            {
-                managerHandleMouseClick(this.theSlot, this.theSlot.slotNumber, 0, 3);
-            }
-            else if (par2 == this.mc.gameSettings.keyBindDrop.getKeyCode())
-            {
-                managerHandleMouseClick(this.theSlot, this.theSlot.slotNumber, isCtrlKeyDown() ? 1 : 0, 4);
-            }
-        }
-    }
-
-    /**
-     * This function is what controls the hotbar shortcut check when you press a number key when hovering a stack.
-     */
-    protected boolean checkHotbarKeys(int p_146983_1_)
-    {
-        if (this.mc.thePlayer.inventory.getItemStack() == null && this.theSlot != null)
-        {
-            for (int j = 0; j < 9; ++j)
-            {
-                if (p_146983_1_ == this.mc.gameSettings.keyBindsHotbar[j].getKeyCode())
-                {
-                    managerHandleMouseClick(this.theSlot, this.theSlot.slotNumber, j, 2);
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Called when the screen is unloaded. Used to disable keyboard repeat events
-     */
-    public void onGuiClosed()
-    {
-        if (this.mc.thePlayer != null)
-        {
-            this.inventorySlots.onContainerClosed(this.mc.thePlayer);
-        }
-    }
-
-    /**
-     * Returns true if this GUI should pause the game when it is displayed in single-player
-     */
-    public boolean doesGuiPauseGame()
-    {
-        return false;
-    }
-
-    /**
-     * Called from the main game loop to update the screen.
-     */
-    public void updateScreen()
-    {
-        super.updateScreen();
-        manager.updateScreen();
-
-        if (!this.mc.thePlayer.isEntityAlive() || this.mc.thePlayer.isDead)
-        {
-            this.mc.thePlayer.closeScreen();
-        }
-    }
-    
-    public void setWorldAndResolution(Minecraft mc, int i, int j)
-    {
-        super.setWorldAndResolution(mc, i, j);
-        if(mc.currentScreen == this)
-        {
-            manager = new GuiContainerManager(this);
-            manager.load();
-        }
-    }
-    
-    public void handleKeyboardInput()
-    {
-        manager.handleKeyboardInput();
-    }
-    
-    public void handleMouseInput()
-    {
-        super.handleMouseInput();
-        manager.handleMouseWheel();
-    }
-
-	public void managerHandleMouseClick(Slot slot, int slotIndex, int button, int modifiers)
-    {
-        manager.handleMouseClick(slot, slotIndex, button, modifiers);
-    }
-}

gradle.properties

@@ -0,0 +1,60 @@
+modName = NotEnoughItems
+
+# This is a case-sensitive string to identify your mod. Convention is to use lower case.
+modId = NotEnoughItems
+
+modGroup = codechicken.nei
+
+# WHY is there no version field?
+# The build script relies on git to provide a version via tags. It is super easy and will enable you to always know the
+# code base or your binary. Check out this tutorial: https://blog.mattclemente.com/2017/10/13/versioning-with-git-tags/
+
+# Will update your build.gradle automatically whenever an update is available
+autoUpdateBuildScript = false
+
+minecraftVersion = 1.7.10
+forgeVersion = 10.13.4.1614
+
+# Select a username for testing your mod with breakpoints. You may leave this empty for a random username each time you
+# restart Minecraft in development. Choose this dependent on your mod:
+# Do you need consistent player progressing (for example Thaumcraft)? -> Select a name
+# Do you need to test how your custom blocks interacts with a player that is not the owner? -> leave name empty
+developmentEnvironmentUserName = Developer
+
+# Define a source file of your project with:
+# public static final String VERSION = "GRADLETOKEN_VERSION";
+# The string's content will be replaced with your mod's version when compiled. You should use this to specify your mod's
+# version in @Mod([...], version = VERSION, [...])
+# Leave these properties empty to skip individual token replacements
+replaceGradleTokenInFile = NEIModContainer.java
+gradleTokenModId = GRADLETOKEN_MODID
+gradleTokenModName = GRADLETOKEN_MODNAME
+gradleTokenVersion = GRADLETOKEN_VERSION
+gradleTokenGroupName =
+
+# In case your mod provides an API for other mods to implement you may declare its package here. Otherwise, you can
+# leave this property empty.
+# Example value: apiPackage = api + modGroup = com.myname.mymodid -> com.myname.mymodid.api
+apiPackage =
+
+# Specify the configuration file for Forge's access transformers here. It must be placed into /src/main/resources/META-INF/
+# Example value: mymodid_at.cfg
+accessTransformersFile = nei_at.cfg
+
+# Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
+usesMixins = false
+# Specify the location of your implementation of IMixinPlugin. 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!
+mixinsPackage =
+# Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin!
+# This parameter is for legacy compatibility only
+# Example value: coreModClass = asm.FMLPlugin + modGroup = com.myname.mymodid -> com.myname.mymodid.asm.FMLPlugin
+coreModClass = asm.NEICorePlugin
+# If your project is only a consolidation of mixins or a core mod and does NOT contain a 'normal' mod ( = some class
+# that is annotated with @Mod) you want this to be true. When in doubt: leave it on false!
+containsMixinsAndOrCoreModOnly = true
+
+# If enabled, you may use 'shadowImplementation' for dependencies. They will be integrated in your jar. It is your
+# responsibility check the licence and request permission for distribution, if required.
+usesShadowedDependencies = true

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-bin.zip

gradlew

@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -109,8 +125,8 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     JAVACMD=`cygpath --unix "$JAVACMD"`

gradlew.bat

@@ -1,84 +1,100 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-: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 %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+: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 %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

jitpack.yml

@@ -0,0 +1,2 @@
+before_install:
+  - ./gradlew setupCIWorkspace

repositories.gradle

@@ -0,0 +1,18 @@
+// Add any additional repositiroes for your dependencies here
+
+repositories {
+	mavenCentral()
+	maven {
+		name 'GTNH Maven'
+		url 'http://jenkins.usrv.eu:8081/nexus/content/groups/public/'
+	}
+	maven {
+		url 'https://cursemaven.com'
+		content {
+			includeGroup 'curse.maven'
+		}
+	}
+	maven {
+		url 'https://jitpack.io'
+	}
+}

resources/neimod.info

@@ -1,19 +0,0 @@
-[
-{
-  "modid": "NotEnoughItems",
-  "name": "Not Enough Items",
-  "version": "${version}",
-  "mcversion": "${mc_version}",
-  "description": "Recipe Viewer, Inventory Manager, Item Spawner, Cheats and more.
-
-<plugins>
-
-Supporters: EmuCraft Team, Victor Zimmer, lexi85, Ace_Trainer_Tullius, Bacon_Donut, Iarinu",
-  "url": "http://www.minecraftforum.net/topic/909223",
-  "credits": "Alexandria - original idea",
-  "authorList": [ "ChickenBones" ],
-  "dependencies": [
-     "CodeChickenCore"
-  ]
-}
-]

src/codechicken/nei/ButtonCycled.java

@@ -1,13 +0,0 @@
-package codechicken.nei;
-
-public abstract class ButtonCycled extends Button
-{    
-    @Override
-    public Image getRenderIcon()
-    {
-        return icons[index];
-    }
-
-    public int index;
-    public Image[] icons;
-}

src/codechicken/nei/ClientHandler.java

@@ -1,226 +0,0 @@
-package codechicken.nei;
-
-import codechicken.core.ClientUtils;
-import codechicken.core.GuiModListScroll;
-import codechicken.lib.packet.PacketCustom;
-import codechicken.nei.api.API;
-import codechicken.nei.api.ItemInfo;
-import cpw.mods.fml.client.CustomModLoadingErrorDisplayException;
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import cpw.mods.fml.common.gameevent.TickEvent;
-import cpw.mods.fml.common.gameevent.TickEvent.Phase;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.entity.EntityPlayerSP;
-import net.minecraft.client.gui.*;
-import net.minecraft.client.multiplayer.WorldClient;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.item.EntityItem;
-import net.minecraft.world.World;
-import net.minecraftforge.client.event.RenderWorldLastEvent;
-import net.minecraftforge.common.MinecraftForge;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-public class ClientHandler
-{
-    private static ClientHandler instance;
-
-    private ArrayList<EntityItem> SMPmagneticItems = new ArrayList<EntityItem>();
-    private World lastworld;
-    private GuiScreen lastGui;
-
-    public void addSMPMagneticItem(int i, World world) {
-        WorldClient cworld = (WorldClient) world;
-        Entity e = cworld.getEntityByID(i);
-        if (e == null || !(e instanceof EntityItem)) {
-            return;
-        }
-        SMPmagneticItems.add((EntityItem) e);
-    }
-
-    private void updateMagnetMode(World world, EntityPlayerSP player) {
-        if (!NEIClientConfig.getMagnetMode()) return;
-
-        float distancexz = 16;
-        float distancey = 8;
-        double maxspeedxz = 0.5;
-        double maxspeedy = 0.5;
-        double speedxz = 0.05;
-        double speedy = 0.07;
-
-        List<EntityItem> items;
-        if (world.isRemote) {
-            items = SMPmagneticItems;
-        } else {
-            items = world.getEntitiesWithinAABB(EntityItem.class, player.boundingBox.expand(distancexz, distancey, distancexz));
-        }
-        for (Iterator<EntityItem> iterator = items.iterator(); iterator.hasNext(); ) {
-            EntityItem item = iterator.next();
-
-            if (item.delayBeforeCanPickup > 0) continue;
-            if (item.isDead && world.isRemote) iterator.remove();
-
-            if (!NEIClientUtils.canItemFitInInventory(player, item.getEntityItem())) continue;
-
-            double dx = player.posX - item.posX;
-            double dy = player.posY + player.getEyeHeight() - item.posY;
-            double dz = player.posZ - item.posZ;
-            double absxz = Math.sqrt(dx * dx + dz * dz);
-            double absy = Math.abs(dy);
-            if (absxz > distancexz) {
-                continue;
-            }
-
-            if (absxz > 1) {
-                dx /= absxz;
-                dz /= absxz;
-            }
-
-            if (absy > 1) {
-                dy /= absy;
-            }
-
-            double vx = item.motionX + speedxz * dx;
-            double vy = item.motionY + speedy * dy;
-            double vz = item.motionZ + speedxz * dz;
-
-            double absvxz = Math.sqrt(vx * vx + vz * vz);
-            double absvy = Math.abs(vy);
-
-            double rationspeedxz = absvxz / maxspeedxz;
-            if (rationspeedxz > 1) {
-                vx /= rationspeedxz;
-                vz /= rationspeedxz;
-            }
-
-            double rationspeedy = absvy / maxspeedy;
-            if (rationspeedy > 1) {
-                vy /= rationspeedy;
-            }
-
-            if (absvxz < 0.2 && absxz < 0.2 && world.isRemote) {
-                item.setDead();
-            }
-
-            item.setVelocity(vx, vy, vz);
-        }
-    }
-
-    public static void preInit() {
-        ItemInfo.preInit();
-    }
-
-    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);
-
-        API.registerHighlightHandler(new DefaultHighlightHandler(), ItemInfo.Layout.HEADER);
-        HUDRenderer.load();
-        WorldOverlayRenderer.load();
-    }
-
-    @SubscribeEvent
-    public void tickEvent(TickEvent.ClientTickEvent event) {
-        if(event.phase == Phase.END)
-            return;
-
-        Minecraft mc = Minecraft.getMinecraft();
-        if(mc.theWorld != null) {
-            loadWorld(mc.theWorld, false);
-
-            if (!NEIClientConfig.isEnabled())
-                return;
-
-            KeyManager.tickKeyStates();
-
-            NEIController.updateUnlimitedItems(mc.thePlayer.inventory);
-            if (mc.currentScreen == null)
-                NEIController.processCreativeCycling(mc.thePlayer.inventory);
-
-            updateMagnetMode(mc.theWorld, mc.thePlayer);
-        }
-
-        GuiScreen gui = mc.currentScreen;
-        if (gui != lastGui) {
-            if (gui instanceof GuiMainMenu)
-                lastworld = null;
-            else if (gui instanceof GuiSelectWorld)
-                NEIClientConfig.reloadSaves();
-        }
-        lastGui = gui;
-    }
-
-    @SubscribeEvent
-    public void tickEvent(TickEvent.RenderTickEvent event) {
-        if(event.phase == Phase.END && NEIClientConfig.isEnabled())
-            HUDRenderer.renderOverlay();
-    }
-
-
-    @SubscribeEvent
-    public void renderLastEvent(RenderWorldLastEvent event) {
-        if (NEIClientConfig.isEnabled())
-            WorldOverlayRenderer.render(event.partialTicks);
-    }
-
-
-    public void loadWorld(World world, boolean fromServer) {
-        if (world != lastworld) {
-            SMPmagneticItems.clear();
-            WorldOverlayRenderer.reset();
-
-            if (!fromServer) {
-                NEIClientConfig.setHasSMPCounterPart(false);
-                NEIClientConfig.setInternalEnabled(false);
-
-                if (!Minecraft.getMinecraft().isSingleplayer())//wait for server to initiate in singleplayer
-                    NEIClientConfig.loadWorld("remote/" + ClientUtils.getServerIP().replace(':', '~'));
-            }
-
-            lastworld = world;
-        }
-    }
-
-    public static ClientHandler instance() {
-        return instance;
-    }
-
-    public static RuntimeException throwCME(final String message) {
-        final GuiScreen errorGui = new GuiErrorScreen(null, null)
-        {
-            @Override
-            public void handleMouseInput() {}
-
-            @Override
-            public void handleKeyboardInput() {}
-
-            @Override
-            public void drawScreen(int par1, int par2, float par3) {
-                drawDefaultBackground();
-                String[] s_msg = message.split("\n");
-                for (int i = 0; i < s_msg.length; ++i)
-                    drawCenteredString(fontRendererObj, s_msg[i], width / 2, height / 3 + 12 * i, 0xFFFFFFFF);
-            }
-        };
-
-        @SuppressWarnings("serial")
-        CustomModLoadingErrorDisplayException e = new CustomModLoadingErrorDisplayException()
-        {
-            @Override
-            public void initGui(GuiErrorScreen errorScreen, FontRenderer fontRenderer) {
-                Minecraft.getMinecraft().displayGuiScreen(errorGui);
-            }
-
-            @Override
-            public void drawScreen(GuiErrorScreen errorScreen, FontRenderer fontRenderer, int mouseRelX, int mouseRelY, float tickTime) {}
-        };
-        throw e;
-    }
-}

src/codechicken/nei/GuiNEIButton.java

@@ -1,41 +0,0 @@
-package codechicken.nei;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.FontRenderer;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.util.ResourceLocation;
-import org.lwjgl.opengl.GL11;
-
-public class GuiNEIButton extends GuiButton
-{
-    protected static ResourceLocation guiTex = new ResourceLocation("textures/gui/widgets.png");
-    
-    public GuiNEIButton(int i, int j, int k, int l, int i1, String s)
-    {
-        super(i, j, k, l, i1, s);
-    }
-    
-    public void drawButton(Minecraft minecraft, int i, int j)
-    {
-        if(!visible)
-            return;
-
-        FontRenderer fontrenderer = minecraft.fontRenderer;
-        minecraft.renderEngine.bindTexture(guiTex);
-        GL11.glColor4f(1, 1, 1, 1);
-        boolean flag = i >= xPosition && j >= yPosition && i < xPosition + width && j < yPosition + height;
-        int k = getHoverState(flag);
-        drawTexturedModalRect(xPosition, yPosition, 0, 46 + k * 20, width / 2, height / 2);//top left
-        drawTexturedModalRect(xPosition + width / 2, yPosition, 200 - width / 2, 46 + k * 20, width / 2, height / 2);//top right
-        drawTexturedModalRect(xPosition, yPosition + height / 2, 0, 46 + k * 20 + 20 - height / 2, width / 2, height / 2);//bottom left
-        drawTexturedModalRect(xPosition + width / 2, yPosition + height / 2, 200 - width / 2, 46 + k * 20 + 20 - height / 2, width / 2, height / 2);//bottom right
-        mouseDragged(minecraft, i, j);
-        
-        if(!enabled)
-            drawCenteredString(fontrenderer, displayString, xPosition + width / 2, yPosition + (height - 8) / 2, 0xffa0a0a0);
-        else if(flag)
-            drawCenteredString(fontrenderer, displayString, xPosition + width / 2, yPosition + (height - 8) / 2, 0xffffa0);
-        else
-            drawCenteredString(fontrenderer, displayString, xPosition + width / 2, yPosition + (height - 8) / 2, 0xe0e0e0);
-    }
-}

src/codechicken/nei/Image.java

@@ -1,17 +0,0 @@
-package codechicken.nei;
-
-public class Image
-{
-    public int x;
-    public int y;
-    public int width;
-    public int height;
-
-    public Image(int i, int j, int k, int l)
-    {
-        x = i;
-        y = j;
-        width = k;
-        height = l;
-    }
-}

src/codechicken/nei/InventoryCraftingDummy.java

@@ -1,20 +0,0 @@
-package codechicken.nei;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.Container;
-import net.minecraft.inventory.InventoryCrafting;
-
-public class InventoryCraftingDummy extends InventoryCrafting
-{
-    public InventoryCraftingDummy()
-    {
-        super(new Container()
-        {
-            @Override
-            public boolean canInteractWith(EntityPlayer entityplayer)
-            {
-                return true;
-            }
-        }, 3, 3);
-    }
-}

src/codechicken/nei/ItemPanel.java

@@ -1,347 +0,0 @@
-package codechicken.nei;
-
-import codechicken.lib.vec.Rectangle4i;
-import codechicken.nei.api.GuiInfo;
-import codechicken.nei.api.INEIGuiHandler;
-import codechicken.nei.guihook.GuiContainerManager;
-import codechicken.nei.recipe.GuiCraftingRecipe;
-import codechicken.nei.recipe.GuiRecipe;
-import codechicken.nei.recipe.GuiUsageRecipe;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-
-import java.util.ArrayList;
-
-import static codechicken.lib.gui.GuiDraw.drawRect;
-
-public class ItemPanel extends Widget
-{
-    /**
-     * Should not be externally modified, use updateItemList
-     */
-    public static ArrayList<ItemStack> items = new ArrayList<ItemStack>();
-    /**
-     * Swapped into visible items on update
-     */
-    private static ArrayList<ItemStack> _items = items;
-
-    public static void updateItemList(ArrayList<ItemStack> newItems) {
-        _items = newItems;
-    }
-
-    public class ItemPanelSlot
-    {
-        public ItemStack item;
-        public int slotIndex;
-
-        public ItemPanelSlot(int index) {
-            item = items.get(index);
-            slotIndex = index;
-        }
-    }
-
-    public ItemStack draggedStack;
-    public int mouseDownSlot = -1;
-
-    private int marginLeft;
-    private int marginTop;
-    private int rows;
-    private int columns;
-
-    private boolean[] validSlotMap;
-    private int firstIndex;
-    private int itemsPerPage;
-
-    private int page;
-    private int numPages;
-
-    public void resize() {
-        items = _items;
-
-        marginLeft = x + (w % 18) / 2;
-        marginTop = y + (h % 18) / 2;
-        columns = w / 18;
-        rows = h / 18;
-        //sometimes width and height can be negative with certain resizing
-        if(rows < 0) rows = 0;
-        if(columns < 0) columns = 0;
-
-        calculatePage();
-        updateValidSlots();
-    }
-
-    private void calculatePage() {
-        if (itemsPerPage == 0)
-            numPages = 0;
-        else
-            numPages = (int) Math.ceil((float) items.size() / (float) itemsPerPage);
-
-        if (firstIndex >= items.size())
-            firstIndex = 0;
-
-        if (numPages == 0)
-            page = 0;
-        else
-            page = firstIndex / itemsPerPage + 1;
-    }
-
-    private void updateValidSlots() {
-        GuiContainer gui = NEIClientUtils.getGuiContainer();
-        validSlotMap = new boolean[rows * columns];
-        itemsPerPage = 0;
-        for (int i = 0; i < validSlotMap.length; i++)
-            if (slotValid(gui, i)) {
-                validSlotMap[i] = true;
-                itemsPerPage++;
-            }
-    }
-
-    private boolean slotValid(GuiContainer gui, int i) {
-        Rectangle4i rect = getSlotRect(i);
-        for (INEIGuiHandler handler : GuiInfo.guiHandlers)
-            if (handler.hideItemPanelSlot(gui, rect.x, rect.y, rect.w, rect.h))
-                return false;
-        return true;
-    }
-
-    public Rectangle4i getSlotRect(int i) {
-        return getSlotRect(i / columns, i % columns);
-    }
-
-    public Rectangle4i getSlotRect(int row, int column) {
-        return new Rectangle4i(marginLeft + column * 18, marginTop + row * 18, 18, 18);
-    }
-
-    @Override
-    public void draw(int mousex, int mousey) {
-        if (itemsPerPage == 0)
-            return;
-
-        GuiContainerManager.enableMatrixStackLogging();
-        int index = firstIndex;
-        for (int i = 0; i < rows * columns && index < items.size(); i++) {
-            if (validSlotMap[i]) {
-                Rectangle4i rect = getSlotRect(i);
-                if (rect.contains(mousex, mousey))
-                    drawRect(rect.x, rect.y, rect.w, rect.h, 0xee555555);//highlight
-
-                GuiContainerManager.drawItem(rect.x + 1, rect.y + 1, items.get(index));
-
-                index++;
-            }
-        }
-        GuiContainerManager.disableMatrixStackLogging();
-    }
-
-    @Override
-    public void postDraw(int mousex, int mousey) {
-        if (draggedStack != null) {
-            GuiContainerManager.drawItems.zLevel += 100;
-            GuiContainerManager.drawItem(mousex - 8, mousey - 8, draggedStack);
-            GuiContainerManager.drawItems.zLevel -= 100;
-        }
-    }
-
-    @Override
-    public void mouseDragged(int mousex, int mousey, int button, long heldTime) {
-        if (mouseDownSlot >= 0 && draggedStack == null && NEIClientUtils.getHeldItem() == null &&
-                NEIClientConfig.hasSMPCounterPart() && !GuiInfo.hasCustomSlots(NEIClientUtils.getGuiContainer())) {
-            ItemPanelSlot mouseOverSlot = getSlotMouseOver(mousex, mousey);
-            ItemStack stack = new ItemPanelSlot(mouseDownSlot).item;
-            if (stack != null && (mouseOverSlot == null || mouseOverSlot.slotIndex != mouseDownSlot || heldTime > 500)) {
-                int amount = NEIClientConfig.getItemQuantity();
-                if (amount == 0)
-                    amount = stack.getMaxStackSize();
-
-                draggedStack = NEIServerUtils.copyStack(stack, amount);
-            }
-        }
-    }
-
-    @Override
-    public boolean handleClick(int mousex, int mousey, int button) {
-        if (handleDraggedClick(mousex, mousey, button))
-            return true;
-
-        if (NEIClientUtils.getHeldItem() != null) {
-            for (INEIGuiHandler handler : GuiInfo.guiHandlers)
-                if (handler.hideItemPanelSlot(NEIClientUtils.getGuiContainer(), mousex, mousey, 1, 1))
-                    return false;
-
-            if (NEIClientConfig.canPerformAction("delete") && NEIClientConfig.canPerformAction("item"))
-                if (button == 1)
-                    NEIClientUtils.decreaseSlotStack(-999);
-                else
-                    NEIClientUtils.deleteHeldItem();
-            else
-                NEIClientUtils.dropHeldItem();
-
-            return true;
-        }
-
-        ItemPanelSlot hoverSlot = getSlotMouseOver(mousex, mousey);
-        if (hoverSlot != null) {
-            if (button == 2) {
-                ItemStack stack = hoverSlot.item;
-                if (stack != null) {
-                    int amount = NEIClientConfig.getItemQuantity();
-                    if (amount == 0)
-                        amount = stack.getMaxStackSize();
-
-                    draggedStack = NEIServerUtils.copyStack(stack, amount);
-                }
-            } else {
-                mouseDownSlot = hoverSlot.slotIndex;
-            }
-            return true;
-        }
-        return false;
-    }
-
-    private boolean handleDraggedClick(int mousex, int mousey, int button) {
-        if (draggedStack == null)
-            return false;
-
-        GuiContainer gui = NEIClientUtils.getGuiContainer();
-        boolean handled = false;
-        for (INEIGuiHandler handler : GuiInfo.guiHandlers)
-            if (handler.handleDragNDrop(gui, mousex, mousey, draggedStack, button)) {
-                handled = true;
-                if (draggedStack.stackSize == 0) {
-                    draggedStack = null;
-                    return true;
-                }
-            }
-
-        if (handled)
-            return true;
-
-        Slot overSlot = gui.getSlotAtPosition(mousex, mousey);
-        if (overSlot != null && overSlot.isItemValid(draggedStack)) {
-            if (NEIClientConfig.canCheatItem(draggedStack)) {
-                int contents = overSlot.getHasStack() ? overSlot.getStack().stackSize : 0;
-                int add = button == 0 ? draggedStack.stackSize : 1;
-                if (overSlot.getHasStack() && !NEIServerUtils.areStacksSameType(draggedStack, overSlot.getStack()))
-                    contents = 0;
-                int total = Math.min(contents + add, Math.min(overSlot.getSlotStackLimit(), draggedStack.getMaxStackSize()));
-
-                if (total > contents) {
-                    NEIClientUtils.setSlotContents(overSlot.slotNumber, NEIServerUtils.copyStack(draggedStack, total), true);
-                    NEICPH.sendGiveItem(NEIServerUtils.copyStack(draggedStack, total), false, false);
-                    draggedStack.stackSize -= total - contents;
-                }
-                if (draggedStack.stackSize == 0)
-                    draggedStack = null;
-            } else {
-                draggedStack = null;
-            }
-        } else if (mousex < gui.guiLeft || mousey < gui.guiTop || mousex >= gui.guiLeft + gui.xSize || mousey >= gui.guiTop + gui.ySize) {
-            draggedStack = null;
-        }
-
-        return true;
-    }
-
-    @Override
-    public boolean handleClickExt(int mousex, int mousey, int button) {
-        return handleDraggedClick(mousex, mousey, button);
-    }
-
-    @Override
-    public void mouseUp(int mousex, int mousey, int button) {
-        ItemPanelSlot hoverSlot = getSlotMouseOver(mousex, mousey);
-        if (hoverSlot != null && hoverSlot.slotIndex == mouseDownSlot && draggedStack == null) {
-            ItemStack item = hoverSlot.item;
-            if (NEIController.manager.window instanceof GuiRecipe || !NEIClientConfig.canCheatItem(item)) {
-                if (button == 0)
-                    GuiCraftingRecipe.openRecipeGui("item", item);
-                else if (button == 1)
-                    GuiUsageRecipe.openRecipeGui("item", item);
-
-                draggedStack = null;
-                mouseDownSlot = -1;
-                return;
-            }
-
-            NEIClientUtils.cheatItem(item, button, -1);
-        }
-
-        mouseDownSlot = -1;
-    }
-
-    @Override
-    public boolean onMouseWheel(int i, int mousex, int mousey) {
-        if (!contains(mousex, mousey))
-            return false;
-
-        scroll(-i);
-        return true;
-    }
-
-    @Override
-    public boolean handleKeyPress(int keyID, char keyChar) {
-        if (keyID == NEIClientConfig.getKeyBinding("gui.next")) {
-            scroll(1);
-            return true;
-        }
-        if (keyID == NEIClientConfig.getKeyBinding("gui.prev")) {
-            scroll(-1);
-            return true;
-        }
-        return false;
-    }
-
-    @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) {
-        int index = firstIndex;
-        for (int i = 0; i < rows * columns && index < items.size(); i++)
-            if (validSlotMap[i]) {
-                if (getSlotRect(i).contains(mousex, mousey))
-                    return new ItemPanelSlot(index);
-                index++;
-            }
-
-        return null;
-    }
-
-    public void scroll(int i) {
-        if (itemsPerPage != 0) {
-            int oldIndex = firstIndex;
-            firstIndex += i * itemsPerPage;
-            if (firstIndex >= items.size())
-                firstIndex = 0;
-            if (firstIndex < 0)
-                if (oldIndex > 0)
-                    firstIndex = 0;
-                else
-                    firstIndex = (items.size() - 1) / itemsPerPage * itemsPerPage;
-
-            calculatePage();
-        }
-    }
-
-    public int getPage() {
-        return page;
-    }
-
-    public int getNumPages() {
-        return numPages;
-    }
-
-    @Override
-    public boolean contains(int px, int py) {
-        GuiContainer gui = NEIClientUtils.getGuiContainer();
-        Rectangle4i rect = new Rectangle4i(px, py, 1, 1);
-        for (INEIGuiHandler handler : GuiInfo.guiHandlers)
-            if (handler.hideItemPanelSlot(gui, rect.x, rect.y, rect.w, rect.h))
-                return false;
-
-        return super.contains(px, py);
-    }
-}

src/codechicken/nei/ItemQuantityField.java

@@ -1,44 +0,0 @@
-package codechicken.nei;
-
-public class ItemQuantityField extends TextField
-{
-    public ItemQuantityField(String ident) {
-        super(ident);
-        centered = true;
-    }
-
-    @Override
-    public boolean isValid(String string) {
-        if (string.equals(""))
-            return true;
-
-        try {
-            return Integer.parseInt(string) >= 0;
-        } catch (NumberFormatException nfe) {
-            return false;
-        }
-    }
-
-    public int intValue() {
-        return intValue(text());
-    }
-
-    public int intValue(String s) {
-        try {
-            return Integer.parseInt(s);
-        } catch (NumberFormatException nfe) {
-            return 0;
-        }
-    }
-
-    @Override
-    public void loseFocus() {
-        setText(Integer.toString(NEIClientConfig.getItemQuantity()));
-    }
-
-    @Override
-    public void onTextChange(String oldText) {
-        if (intValue(oldText) != intValue())//hacky recursion stopper
-            NEIClientUtils.setItemQuantity(intValue());
-    }
-}

src/codechicken/nei/ItemSorter.java

@@ -1,192 +0,0 @@
-package codechicken.nei;
-
-import codechicken.lib.config.ConfigTagParent;
-import codechicken.nei.ItemList.ItemsLoadedCallback;
-import codechicken.nei.api.API;
-import codechicken.nei.api.ItemInfo;
-import codechicken.nei.config.GuiItemSorter;
-import codechicken.nei.config.OptionOpenGui;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.StatCollector;
-
-import java.util.*;
-
-public class ItemSorter implements Comparator<ItemStack>, ItemsLoadedCallback
-{
-    public static class SortEntry
-    {
-        public String name;
-        public Comparator<ItemStack> comparator;
-
-        public SortEntry(String name, Comparator<ItemStack> comparator) {
-            this.name = name;
-            this.comparator = comparator;
-        }
-
-        public String getLocalisedName() {
-            return StatCollector.translateToLocal(name);
-        }
-
-        public String getTooltip() {
-            String tipname = name+".tip";
-            String tip = StatCollector.translateToLocal(tipname);
-            return !tip.equals(tipname) ? tip : null;
-        }
-    }
-
-    public static ArrayList<SortEntry> entries = new ArrayList<SortEntry>();
-    public static ArrayList<SortEntry> list = new ArrayList<SortEntry>();
-    public static final ItemSorter instance = new ItemSorter();
-
-    //optimisations
-    public HashMap<ItemStack, Integer> ordering = null;
-
-    public static void sort(ArrayList<ItemStack> items) {
-        try {
-            Collections.sort(items, instance);
-        } catch (Exception e) {
-            NEIClientConfig.logger.error("Exception sorting item list", e);
-        }
-    }
-
-    @Override
-    public int compare(ItemStack o1, ItemStack o2) {
-        for(SortEntry e : list) {
-            int c = e.comparator.compare(o1, o2);
-            if(c != 0) return c;
-        }
-        return 0;
-    }
-
-    @Override
-    public void itemsLoaded() {
-        HashMap<ItemStack, Integer> newMap = new HashMap<ItemStack, Integer>();
-        int i = 0;
-        for(ItemStack stack : ItemList.items)
-            newMap.put(stack, i++);
-        ordering = newMap;
-    }
-
-    public static SortEntry find(String name) {
-        for(SortEntry e : entries)
-            if(e.name.equals(name))
-                return e;
-
-        return null;
-    }
-
-    public static int compareInt(int a, int b) {
-        return a == b ? 0 : a < b ? -1 : 1;
-    }
-
-    public static void add(String name, Comparator<ItemStack> comparator) {
-        SortEntry e = new SortEntry(name, comparator);
-        entries.add(e);
-        ArrayList<SortEntry> nlist = new ArrayList<SortEntry>(list);
-        nlist.add(e);
-        list = nlist;//concurrency
-    }
-
-    public static void initConfig(ConfigTagParent tag) {
-        //minecraft, mod, id, default, meta, name
-        API.addSortOption("nei.itemsort.minecraft", new Comparator<ItemStack>()
-        {
-            @Override
-            public int compare(ItemStack o1, ItemStack o2) {
-                boolean m1 = "minecraft".equals(ItemInfo.itemOwners.get(o1.getItem()));
-                boolean m2 = "minecraft".equals(ItemInfo.itemOwners.get(o2.getItem()));
-                return m1 == m2 ? 0 : m1 ? -1 : 1;
-            }
-        });
-        API.addSortOption("nei.itemsort.mod", new Comparator<ItemStack>()
-        {
-            @Override
-            public int compare(ItemStack o1, ItemStack o2) {
-                String mod1 = ItemInfo.itemOwners.get(o1.getItem());
-                String mod2 = ItemInfo.itemOwners.get(o2.getItem());
-                if(mod1 == null) return mod2 == null ? 0 : 1;
-                if(mod2 == null) return -1;
-                return mod1.compareTo(mod2);
-            }
-        });
-        API.addSortOption("nei.itemsort.id", new Comparator<ItemStack>()
-        {
-            @Override
-            public int compare(ItemStack o1, ItemStack o2) {
-                int id1 = Item.getIdFromItem(o1.getItem());
-                int id2 = Item.getIdFromItem(o2.getItem());
-                return compareInt(id1, id2);
-            }
-        });
-        API.addSortOption("nei.itemsort.default", new Comparator<ItemStack>()
-        {
-            @Override
-            public int compare(ItemStack o1, ItemStack o2) {
-                Integer order1 = instance.ordering.get(o1);
-                Integer order2 = instance.ordering.get(o2);
-                if(order1 == null) return order2 == null ? 0 : 1;
-                if(order2 == null) return -1;
-                return compareInt(order1, order2);
-            }
-        });
-        API.addSortOption("nei.itemsort.damage", new Comparator<ItemStack>()
-        {
-            @Override
-            public int compare(ItemStack o1, ItemStack o2) {
-                int id1 = o1.getItemDamage();
-                int id2 = o2.getItemDamage();
-                return compareInt(id1, id2);
-            }
-        });
-        API.addSortOption("nei.itemsort.name", new Comparator<ItemStack>()
-        {
-            @Override
-            public int compare(ItemStack o1, ItemStack o2) {
-                String name1 = ItemInfo.getSearchName(o1);
-                String name2 = ItemInfo.getSearchName(o2);
-                return name1.compareTo(name2);
-            }
-        });
-        tag.getTag("inventory.itemsort").setDefaultValue(getSaveString(list));
-        API.addOption(new OptionOpenGui("inventory.itemsort", GuiItemSorter.class) {
-            @Override
-            public void useGlobals() {
-                super.useGlobals();
-                list = fromSaveString(activeTag().getValue());
-            }
-        });
-        ItemList.loadCallbacks.add(instance);
-    }
-
-    public static String getSaveString(List<SortEntry> list) {
-        StringBuilder sb = new StringBuilder();
-        for(SortEntry e : list) {
-            if(sb.length() > 0)
-                sb.append(',');
-            sb.append(e.name);
-        }
-        return sb.toString();
-    }
-
-    public static ArrayList<SortEntry> fromSaveString(String s) {
-        if(s == null)
-            return new ArrayList<SortEntry>(entries);
-
-        ArrayList<SortEntry> list = new ArrayList<SortEntry>();
-        for(String s2 : s.split(",")) {
-            SortEntry e = find(s2.trim());
-            if(e != null)
-                list.add(e);
-        }
-        for(SortEntry e : entries)
-            if(!list.contains(e))
-                list.add(e);
-
-        return list;
-    }
-
-    public static void loadConfig() {
-        list = fromSaveString(NEIClientConfig.getStringSetting("inventory.itemsort"));
-    }
-}

src/codechicken/nei/KeyManager.java

@@ -1,52 +0,0 @@
-package codechicken.nei;
-
-import org.lwjgl.input.Keyboard;
-
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.Map.Entry;
-
-/**
- * Good old down/held/up keystate tracker
- */
-public class KeyManager
-{
-    public static interface IKeyStateTracker
-    {
-        public void tickKeyStates();
-    }
-    
-    public static class KeyState
-    {
-        public boolean down;
-        public boolean held;
-        public boolean up;
-    }
-    
-    public static HashMap<String, KeyState> keyStates = new HashMap<String, KeyState>();
-    public static LinkedList<IKeyStateTracker> trackers = new LinkedList<IKeyStateTracker>();
-    
-    public static void tickKeyStates()
-    {
-        for(Entry<String, KeyState> entry : keyStates.entrySet())
-        {
-            int keyCode = NEIClientConfig.getKeyBinding(entry.getKey());
-            boolean down = keyCode != 0 && Keyboard.isKeyDown(keyCode);
-            KeyState state = entry.getValue();
-            if(down)
-            {
-                state.down = !state.held;
-                state.up = false;
-            }
-            else
-            {
-                state.up = state.held;
-                state.down = false;
-            }
-            state.held = down;
-        }
-        
-        for(IKeyStateTracker tracker : trackers)
-            tracker.tickKeyStates();
-    }
-}

src/codechicken/nei/Label.java

@@ -1,32 +0,0 @@
-package codechicken.nei;
-
-import static codechicken.lib.gui.GuiDraw.drawString;
-import static codechicken.lib.gui.GuiDraw.drawStringC;
-
-public class Label extends Widget
-{
-    boolean centered;
-    int colour;
-    String text;
-    
-    public Label(String s, boolean center, int color)
-    {
-        text = s;
-        centered = center;
-        colour = color;
-    }
-    
-    public Label(String s, boolean center)
-    {
-        this(s, center, 0xFFFFFFFF);
-    }
-    
-    @Override
-    public void draw(int mousex, int mousey)
-    {
-        if(centered)
-            drawStringC(text, x, y, colour);
-        else
-            drawString(text, x, y, colour);
-    }
-}

src/codechicken/nei/LayoutManager.java

@@ -1,801 +0,0 @@
-package codechicken.nei;
-
-import codechicken.lib.gui.GuiDraw;
-import codechicken.nei.KeyManager.IKeyStateTracker;
-import codechicken.nei.api.*;
-import codechicken.nei.guihook.*;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.client.gui.inventory.GuiContainerCreative;
-import net.minecraft.client.renderer.InventoryEffectRenderer;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import org.lwjgl.opengl.GL11;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.TreeSet;
-
-import static codechicken.lib.gui.GuiDraw.*;
-import static codechicken.nei.NEIClientConfig.*;
-import static codechicken.nei.NEIClientUtils.*;
-
-public class LayoutManager implements IContainerInputHandler, IContainerTooltipHandler, IContainerDrawHandler, IContainerObjectHandler, IKeyStateTracker
-{
-    private static LayoutManager instance;
-
-    private static Widget inputFocused;
-    /**
-     * Sorted bottom first
-     */
-    private static TreeSet<Widget> drawWidgets;
-    /**
-     * Sorted top first
-     */
-    private static TreeSet<Widget> controlWidgets;
-
-    public static ItemPanel itemPanel;
-    public static SubsetWidget dropDown;
-    public static TextField searchField;
-
-    public static Button options;
-
-    public static Button prev;
-    public static Button next;
-    public static Label pageLabel;
-    public static Button more;
-    public static Button less;
-    public static ItemQuantityField quantity;
-
-    public static SaveLoadButton[] stateButtons;
-    public static Button[] deleteButtons;
-
-    public static Button delete;
-    public static ButtonCycled gamemode;
-    public static Button rain;
-    public static Button magnet;
-    public static Button[] timeButtons = new Button[4];
-    public static Button heal;
-
-    public static IRecipeOverlayRenderer overlayRenderer;
-
-    public static HashMap<Integer, LayoutStyle> layoutStyles = new HashMap<Integer, LayoutStyle>();
-
-    public static void load() {
-        API.addLayoutStyle(0, new LayoutStyleMinecraft());
-        API.addLayoutStyle(1, new LayoutStyleTMIOld());
-
-        instance = new LayoutManager();
-        KeyManager.trackers.add(instance);
-        GuiContainerManager.addInputHandler(instance);
-        GuiContainerManager.addTooltipHandler(instance);
-        GuiContainerManager.addDrawHandler(instance);
-        GuiContainerManager.addObjectHandler(instance);
-        init();
-    }
-
-    @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
-        {
-            gui.guiLeft = (gui.width - gui.xSize) / 2;
-            gui.guiTop = (gui.height - gui.ySize) / 2;
-
-            if (gui instanceof GuiContainerCreative && gui.buttonList.size() >= 2) {
-                GuiButton button1 = (GuiButton) gui.buttonList.get(0);
-                GuiButton button2 = (GuiButton) gui.buttonList.get(1);
-                button1.xPosition = gui.guiLeft;
-                button2.xPosition = gui.guiLeft + gui.xSize - 20;
-            }
-        }
-    }
-
-    @Override
-    public void onMouseClicked(GuiContainer gui, int mousex, int mousey, int button) {
-        if (isHidden())
-            return;
-
-        for (Widget widget : controlWidgets)
-            widget.onGuiClick(mousex, mousey);
-    }
-
-    @Override
-    public boolean mouseClicked(GuiContainer gui, int mousex, int mousey, int button) {
-        if (isHidden())
-            return false;
-
-        if (!isEnabled())
-            return options.contains(mousex, mousey) && options.handleClick(mousex, mousey, button);
-
-        for (Widget widget : controlWidgets) {
-            widget.onGuiClick(mousex, mousey);
-            if (widget.contains(mousex, mousey) ? widget.handleClick(mousex, mousey, button) : widget.handleClickExt(mousex, mousey, button))
-                return true;
-        }
-
-        return false;
-    }
-
-    @Override
-    public boolean objectUnderMouse(GuiContainer gui, int mousex, int mousey) {
-        if (!isHidden() && isEnabled())
-            for (Widget widget : controlWidgets)
-                if (widget.contains(mousex, mousey))
-                    return true;
-
-        return false;
-    }
-
-    public boolean keyTyped(GuiContainer gui, char keyChar, int keyID) {
-        if (isEnabled() && !isHidden()) {
-            if (inputFocused != null)
-                return inputFocused.handleKeyPress(keyID, keyChar);
-
-            for (Widget widget : controlWidgets)
-                if (widget.handleKeyPress(keyID, keyChar))
-                    return true;
-        }
-
-        return false;
-    }
-
-    @Override
-    public void onKeyTyped(GuiContainer gui, char keyChar, int keyID) {
-    }
-
-    @Override
-    public boolean lastKeyTyped(GuiContainer gui, char keyChar, int keyID) {
-        if (keyID == getKeyBinding("gui.hide")) {
-            toggleBooleanSetting("inventory.hidden");
-            return true;
-        }
-        if (isEnabled() && !isHidden()) {
-            for (Widget widget : controlWidgets)
-                if (inputFocused == null)
-                    widget.lastKeyTyped(keyID, keyChar);
-        }
-        return false;
-    }
-
-    public void onMouseUp(GuiContainer gui, int mx, int my, int button) {
-        if (!isHidden() && isEnabled()) {
-            for (Widget widget : controlWidgets)
-                widget.mouseUp(mx, my, button);
-        }
-    }
-
-    @Override
-    public void onMouseDragged(GuiContainer gui, int mx, int my, int button, long heldTime) {
-        if (!isHidden() && isEnabled()) {
-            for (Widget widget : controlWidgets)
-                widget.mouseDragged(mx, my, button, heldTime);
-        }
-    }
-
-    @Override
-    public ItemStack getStackUnderMouse(GuiContainer gui, int mousex, int mousey) {
-        if (!isHidden() && isEnabled()) {
-            for (Widget widget : controlWidgets) {
-                ItemStack stack = widget.getStackMouseOver(mousex, mousey);
-                if (stack != null)
-                    return stack;
-            }
-        }
-        return null;
-    }
-
-    public void renderObjects(GuiContainer gui, int mousex, int mousey) {
-        if (!isHidden()) {
-            layout(gui);
-            if (isEnabled()) {
-                getLayoutStyle().drawBackground(GuiContainerManager.getManager(gui));
-                for (Widget widget : drawWidgets)
-                    widget.draw(mousex, mousey);
-            } else {
-                options.draw(mousex, mousey);
-            }
-
-            GL11.glEnable(GL11.GL_LIGHTING);
-            GL11.glEnable(GL11.GL_DEPTH_TEST);
-        }
-    }
-
-    @Override
-    public void postRenderObjects(GuiContainer gui, int mousex, int mousey) {
-        if (!isHidden() && isEnabled()) {
-            for (Widget widget : drawWidgets)
-                widget.postDraw(mousex, mousey);
-        }
-    }
-
-    @Override
-    public List<String> handleTooltip(GuiContainer gui, int mousex, int mousey, List<String> currenttip) {
-        if (!isHidden() && isEnabled() && GuiContainerManager.shouldShowTooltip(gui)) {
-            for (Widget widget : controlWidgets)
-                currenttip = widget.handleTooltip(mousex, mousey, currenttip);
-        }
-        return currenttip;
-    }
-
-    @Override
-    public List<String> handleItemDisplayName(GuiContainer gui, ItemStack stack, List<String> currenttip) {
-        String overridename = ItemInfo.getNameOverride(stack);
-        if (overridename != null)
-            currenttip.set(0, overridename);
-
-        String mainname = currenttip.get(0);
-        if (showIDs()) {
-            mainname += " " + Item.getIdFromItem(stack.getItem());
-            if (stack.getItemDamage() != 0)
-                mainname += ":" + stack.getItemDamage();
-
-            currenttip.set(0, mainname);
-        }
-
-        return currenttip;
-    }
-
-    @Override
-    public List<String> handleItemTooltip(GuiContainer gui, ItemStack itemstack, int mousex, int mousey, List<String> currenttip) {
-        return currenttip;
-    }
-
-    public static void layout(GuiContainer gui) {
-        VisiblityData visiblity = new VisiblityData();
-        if (isHidden())
-            visiblity.showNEI = false;
-        if (gui.height - gui.ySize <= 40)
-            visiblity.showSearchSection = false;
-        if (gui.guiLeft - 4 < 76)
-            visiblity.showWidgets = false;
-
-        for (INEIGuiHandler handler : GuiInfo.guiHandlers)
-            handler.modifyVisiblity(gui, visiblity);
-
-        visiblity.translateDependancies();
-
-        getLayoutStyle().layout(gui, visiblity);
-
-        updateWidgetVisiblities(gui, visiblity);
-    }
-
-    private static void init() {
-        itemPanel = new ItemPanel();
-        dropDown = new SubsetWidget();
-        searchField = new SearchField("search");
-
-        options = new Button("Options")
-        {
-            @Override
-            public boolean onButtonPress(boolean rightclick) {
-                if (!rightclick) {
-                    getOptionList().openGui(getGuiContainer(), false);
-                    return true;
-                }
-                return false;
-            }
-
-            @Override
-            public String getRenderLabel() {
-                return translate("inventory.options");
-            }
-        };
-        prev = new Button("Prev")
-        {
-            public boolean onButtonPress(boolean rightclick) {
-                if (!rightclick) {
-                    LayoutManager.itemPanel.scroll(-1);
-                    return true;
-                }
-                return false;
-            }
-
-            @Override
-            public String getRenderLabel() {
-                return translate("inventory.prev");
-            }
-        };
-        next = new Button("Next")
-        {
-            public boolean onButtonPress(boolean rightclick) {
-                if (!rightclick) {
-                    LayoutManager.itemPanel.scroll(1);
-                    return true;
-                }
-                return false;
-            }
-
-            @Override
-            public String getRenderLabel() {
-                return translate("inventory.next");
-            }
-        };
-        pageLabel = new Label("(0/0)", true);
-        more = new Button("+")
-        {
-            @Override
-            public boolean onButtonPress(boolean rightclick) {
-                if (rightclick)
-                    return false;
-
-                int modifier = controlKey() ? 64 : shiftKey() ? 10 : 1;
-
-                int quantity = getItemQuantity() + modifier;
-                if (quantity < 0)
-                    quantity = 0;
-
-                setItemQuantity(quantity);
-                return true;
-            }
-        };
-        less = new Button("-")
-        {
-            @Override
-            public boolean onButtonPress(boolean rightclick) {
-                if (rightclick)
-                    return false;
-
-                int modifier = controlKey() ? -64 : shiftKey() ? -10 : -1;
-
-                int quantity = getItemQuantity() + modifier;
-                if (quantity < 0)
-                    quantity = 0;
-
-                setItemQuantity(quantity);
-                return true;
-            }
-        };
-        quantity = new ItemQuantityField("quantity");
-
-        stateButtons = new SaveLoadButton[7];
-        deleteButtons = new Button[7];
-
-        for (int i = 0; i < 7; i++) {
-            final int savestate = i;
-            stateButtons[i] = new SaveLoadButton("")
-            {
-                @Override
-                public boolean onButtonPress(boolean rightclick) {
-                    if (isStateSaved(savestate))
-                        loadState(savestate);
-                    else
-                        saveState(savestate);
-                    return true;
-                }
-
-                @Override
-                public void onTextChange() {
-                    NBTTagCompound statelist = global.nbt.getCompoundTag("statename");
-                    global.nbt.setTag("statename", statelist);
-
-                    statelist.setString("" + savestate, label);
-                    global.saveNBT();
-                }
-            };
-            deleteButtons[i] = new Button("x")
-            {
-                @Override
-                public boolean onButtonPress(boolean rightclick) {
-                    if (!rightclick) {
-                        clearState(savestate);
-                        return true;
-                    }
-                    return false;
-                }
-            };
-        }
-
-        delete = new Button()
-        {
-            @Override
-            public boolean onButtonPress(boolean rightclick) {
-                if ((state & 0x3) == 2)
-                    return false;
-
-                ItemStack held = getHeldItem();
-                if (held != null) {
-                    if (shiftKey()) {
-                        deleteHeldItem();
-                        deleteItemsOfType(held);
-                    } else if (rightclick)
-                        decreaseSlotStack(-999);
-                    else
-                        deleteHeldItem();
-                } else if (shiftKey())
-                    deleteEverything();
-                else
-                    NEIController.toggleDeleteMode();
-
-                return true;
-            }
-
-            public String getButtonTip() {
-                if ((state & 0x3) != 2) {
-                    if (shiftKey())
-                        return translate("inventory.delete.inv");
-                    if (NEIController.canUseDeleteMode())
-                        return getStateTip("delete", state);
-                }
-                return null;
-            }
-
-            @Override
-            public void postDraw(int mousex, int mousey) {
-                if(contains(mousex, mousey) && getHeldItem() != null && (state & 0x3) != 2)
-                    GuiDraw.drawTip(mousex + 9, mousey, translate("inventory.delete." + (shiftKey() ? "all" : "one"), GuiContainerManager.itemDisplayNameShort(getHeldItem())));
-            }
-        };
-        gamemode = new ButtonCycled()
-        {
-            @Override
-            public boolean onButtonPress(boolean rightclick) {
-                if (!rightclick) {
-                    cycleGamemode();
-                    return true;
-                }
-                return false;
-            }
-
-            public String getButtonTip() {
-                return translate("inventory.gamemode." + getNextGamemode());
-            }
-        };
-        gamemode.icons = new Image[3];
-        rain = new Button()
-        {
-            @Override
-            public boolean onButtonPress(boolean rightclick) {
-                if (handleDisabledButtonPress("rain", rightclick))
-                    return true;
-
-                if (!rightclick) {
-                    toggleRaining();
-                    return true;
-                }
-                return false;
-            }
-
-            public String getButtonTip() {
-                return getStateTip("rain", state);
-            }
-        };
-        magnet = new Button()
-        {
-            @Override
-            public boolean onButtonPress(boolean rightclick) {
-                if (!rightclick) {
-                    toggleMagnetMode();
-                    return true;
-                }
-                return false;
-            }
-
-            public String getButtonTip() {
-                return getStateTip("magnet", state);
-            }
-        };
-        for (int i = 0; i < 4; i++) {
-            final int zone = i;
-            timeButtons[i] = new Button()
-            {
-                @Override
-                public boolean onButtonPress(boolean rightclick) {
-                    if (handleDisabledButtonPress(NEIActions.timeZones[zone], rightclick))
-                        return true;
-
-                    if (!rightclick) {
-                        setHourForward(zone * 6);
-                        return true;
-                    }
-                    return false;
-                }
-
-                @Override
-                public String getButtonTip() {
-                    return getTimeTip(NEIActions.timeZones[zone], state);
-                }
-
-            };
-        }
-        heal = new Button()
-        {
-            @Override
-            public boolean onButtonPress(boolean rightclick) {
-                if (!rightclick) {
-                    healPlayer();
-                    return true;
-                }
-                return false;
-            }
-
-            @Override
-            public String getButtonTip() {
-                return translate("inventory.heal");
-            }
-        };
-
-        delete.state |= 0x4;
-        gamemode.state |= 0x4;
-        rain.state |= 0x4;
-        magnet.state |= 0x4;
-    }
-
-    private static String getStateTip(String name, int state) {
-        String sfx = (state & 0x3) == 2 ? "enable" :
-                (state & 0x3) == 1 ? "0" : "1";
-
-        return translate("inventory." + name + "." + sfx);
-    }
-
-    private static String getTimeTip(String name, int state) {
-        String sfx = (state & 0x3) == 2 ? "enable" : "set";
-        return translate("inventory." + name + "." + sfx);
-    }
-
-    private static boolean handleDisabledButtonPress(String ident, boolean rightclick) {
-        if (!NEIActions.canDisable.contains(ident))
-            return false;
-        if (rightclick != disabledActions.contains(ident))
-            return setPropertyDisabled(ident, rightclick);
-        return false;
-    }
-
-    private static boolean setPropertyDisabled(String ident, boolean disable) {
-        if (disable && NEIActions.base(ident).equals("time")) {
-            int count = 0;
-            for (int i = 0; i < 4; i++) {
-                if (disabledActions.contains(NEIActions.timeZones[i]))
-                    count++;
-            }
-            if (count == 3)
-                return false;
-        }
-        if (hasSMPCounterPart())
-            NEICPH.sendSetPropertyDisabled(ident, disable);
-
-        return true;
-    }
-
-    @Override
-    public void load(GuiContainer gui) {
-        if (isEnabled()) {
-            setInputFocused(null);
-
-            ItemList.loadItems.restart();
-            overlayRenderer = null;
-
-            getLayoutStyle().init();
-            layout(gui);
-        }
-
-        NEIController.load(gui);
-
-        if (checkCreativeInv(gui) && gui.mc.currentScreen instanceof GuiContainerCreative)//override creative with creative+
-            gui.mc.displayGuiScreen(null);//close the screen and wait for the server to open it for us
-    }
-
-    @Override
-    public void refresh(GuiContainer gui) {
-    }
-
-    public boolean checkCreativeInv(GuiContainer gui) {
-        if (gui instanceof GuiContainerCreative && invCreativeMode()) {
-            NEICPH.sendCreativeInv(true);
-            return true;
-        } else if (gui instanceof GuiExtendedCreativeInv && !invCreativeMode()) {
-            NEICPH.sendCreativeInv(false);
-            return true;
-        }
-        return false;
-    }
-
-    public static void updateWidgetVisiblities(GuiContainer gui, VisiblityData visiblity) {
-        drawWidgets = new TreeSet<Widget>(new WidgetZOrder(false));
-        controlWidgets = new TreeSet<Widget>(new WidgetZOrder(true));
-
-        if (!visiblity.showNEI)
-            return;
-
-        addWidget(options);
-        if (visiblity.showItemPanel) {
-            addWidget(itemPanel);
-            addWidget(prev);
-            addWidget(next);
-            addWidget(pageLabel);
-            if (canPerformAction("item")) {
-                addWidget(more);
-                addWidget(less);
-                addWidget(quantity);
-            }
-        }
-
-        if (visiblity.showSearchSection) {
-            addWidget(dropDown);
-            addWidget(searchField);
-        }
-
-        if (canPerformAction("item") && hasSMPCounterPart() && visiblity.showStateButtons) {
-            for (int i = 0; i < 7; i++) {
-                addWidget(stateButtons[i]);
-                if (isStateSaved(i))
-                    addWidget(deleteButtons[i]);
-            }
-        }
-        if (visiblity.showUtilityButtons) {
-            if (canPerformAction("time")) {
-                for (int i = 0; i < 4; i++)
-                    addWidget(timeButtons[i]);
-            }
-            if (canPerformAction("rain"))
-                addWidget(rain);
-            if (canPerformAction("heal"))
-                addWidget(heal);
-            if (canPerformAction("magnet"))
-                addWidget(magnet);
-            if (isValidGamemode("creative") ||
-                    isValidGamemode("creative+") ||
-                    isValidGamemode("adventure"))
-                addWidget(gamemode);
-            if (canPerformAction("delete"))
-                addWidget(delete);
-        }
-    }
-
-
-    public static LayoutStyle getLayoutStyle(int id) {
-        LayoutStyle style = layoutStyles.get(id);
-        if (style == null)
-            style = layoutStyles.get(0);
-        return style;
-    }
-
-    public static LayoutStyle getLayoutStyle() {
-        return getLayoutStyle(NEIClientConfig.getLayoutStyle());
-    }
-
-    private static void addWidget(Widget widget) {
-        drawWidgets.add(widget);
-        controlWidgets.add(widget);
-    }
-
-    @Override
-    public void guiTick(GuiContainer gui) {
-        if (checkCreativeInv(gui))
-            return;
-
-        if (!isEnabled())
-            return;
-
-        for (Widget widget : controlWidgets)
-            widget.update();
-    }
-
-    @Override
-    public boolean mouseScrolled(GuiContainer gui, int mousex, int mousey, int scrolled) {
-        if (isHidden() || !isEnabled())
-            return false;
-
-        for (Widget widget : controlWidgets)
-            if (widget.onMouseWheel(scrolled, mousex, mousey))
-                return true;
-
-        return false;
-    }
-
-    @Override
-    public void onMouseScrolled(GuiContainer gui, int mousex, int mousey, int scrolled) {
-    }
-
-    @Override
-    public boolean shouldShowTooltip(GuiContainer gui) {
-        return itemPanel.draggedStack == null;
-    }
-
-    public static Widget getInputFocused() {
-        return inputFocused;
-    }
-
-    public static void setInputFocused(Widget widget) {
-        if (inputFocused != null)
-            inputFocused.loseFocus();
-
-        inputFocused = widget;
-        if (inputFocused != null)
-            inputFocused.gainFocus();
-    }
-
-    @Override
-    public void renderSlotUnderlay(GuiContainer gui, Slot slot) {
-        if (overlayRenderer != null)
-            overlayRenderer.renderOverlay(GuiContainerManager.getManager(gui), slot);
-    }
-
-    @Override
-    public void renderSlotOverlay(GuiContainer window, Slot slot) {
-        ItemStack item = slot.getStack();
-        if (world.nbt.getBoolean("searchinventories") && (item == null ? !getSearchExpression().equals("") : !ItemList.itemMatches(item))) {
-            GL11.glDisable(GL11.GL_LIGHTING);
-            GL11.glTranslatef(0, 0, 150);
-            drawRect(slot.xDisplayPosition, slot.yDisplayPosition, 16, 16, 0x80000000);
-            GL11.glTranslatef(0, 0, -150);
-            GL11.glEnable(GL11.GL_LIGHTING);
-        }
-    }
-
-    public static void drawIcon(int x, int y, Image image) {
-        changeTexture("nei:textures/nei_sprites.png");
-        GL11.glColor4f(1, 1, 1, 1);
-        GL11.glEnable(GL11.GL_BLEND);
-        GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
-        drawTexturedModalRect(x, y, image.x, image.y, image.width, image.height);
-        GL11.glDisable(GL11.GL_BLEND);
-    }
-
-    public static void drawButtonBackground(int x, int y, int w, int h, boolean edges, int type) {
-        int wtiles = 0;
-        int ew = w;//end width
-        if (w / 2 > 100) {
-            wtiles = (w - 200) / 50 + 1;
-            ew = 200;
-        }
-
-        int w1 = ew / 2;
-        int h1 = h / 2;
-        int w2 = (ew + 1) / 2;
-        int h2 = (h + 1) / 2;
-
-        int x2 = x + w - w2;
-        int y2 = y + h - h2;
-
-        int ty = 46 + type * 20;
-        int te = (edges ? 0 : 1);//tex edges
-
-        int ty1 = ty + te;
-        int tx1 = te;
-        int tx3 = 75;
-        //halfway the 1 is for odd number adjustment
-        int ty2 = ty + 20 - h2 - te;
-        int tx2 = 200 - w2 - te;
-
-        changeTexture("textures/gui/widgets.png");
-        drawTexturedModalRect(x, y, tx1, ty1, w1, h1);//top left
-        drawTexturedModalRect(x, y2, tx1, ty2, w1, h2);//bottom left
-
-        for (int tile = 0; tile < wtiles; tile++) {
-            int tilex = x + w1 + 50 * tile;
-            drawTexturedModalRect(tilex, y, tx3, ty1, 50, h1);//top
-            drawTexturedModalRect(tilex, y2, tx3, ty2, 50, h2);//bottom
-        }
-
-        drawTexturedModalRect(x2, y, tx2, ty1, w2, h1);//top right
-        drawTexturedModalRect(x2, y2, tx2, ty2, w2, h2);//bottom right
-    }
-
-    public static LayoutManager instance() {
-        return instance;
-    }
-
-    @Override
-    public void tickKeyStates() {
-        if (Minecraft.getMinecraft().currentScreen != null)
-            return;
-
-        if (KeyManager.keyStates.get("world.dawn").down)
-            timeButtons[0].onButtonPress(false);
-        if (KeyManager.keyStates.get("world.noon").down)
-            timeButtons[1].onButtonPress(false);
-        if (KeyManager.keyStates.get("world.dusk").down)
-            timeButtons[2].onButtonPress(false);
-        if (KeyManager.keyStates.get("world.midnight").down)
-            timeButtons[3].onButtonPress(false);
-        if (KeyManager.keyStates.get("world.rain").down)
-            rain.onButtonPress(false);
-        if (KeyManager.keyStates.get("world.heal").down)
-            heal.onButtonPress(false);
-        if (KeyManager.keyStates.get("world.creative").down)
-            gamemode.onButtonPress(false);
-    }
-}

src/codechicken/nei/LayoutStyleDefault.java

@@ -1,153 +0,0 @@
-package codechicken.nei;
-
-import codechicken.nei.api.LayoutStyle;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.nbt.NBTTagCompound;
-
-import static codechicken.lib.gui.GuiDraw.getStringWidth;
-import static codechicken.nei.LayoutManager.*;
-import static codechicken.nei.NEIClientConfig.*;
-
-public abstract class LayoutStyleDefault extends LayoutStyle
-{
-    @Override
-    public void layout(GuiContainer gui, VisiblityData visiblity) {
-        int windowWidth = gui.width;
-        int windowHeight = gui.height;
-        int containerWidth = gui.xSize;
-        int containerLeft = gui.guiLeft;
-
-        reset();
-
-        prev.y = 2;
-        prev.h = 16;
-        prev.w = containerLeft / 3;
-        prev.x = (containerWidth + windowWidth) / 2 + 2;
-        next.x = windowWidth - prev.w - 2;
-
-        next.y = prev.y;
-        next.w = prev.w;
-        next.h = prev.h;
-        pageLabel.x = containerLeft * 3 / 2 + containerWidth + 1;
-        pageLabel.y = prev.y + 5;
-        pageLabel.text = "(" + itemPanel.getPage() + "/" + itemPanel.getNumPages() + ")";
-
-        itemPanel.y = prev.h + prev.y;
-        itemPanel.x = (containerWidth + windowWidth) / 2 + 3;
-        itemPanel.w = windowWidth - 3 - itemPanel.x;
-        itemPanel.h = windowHeight - 15 - itemPanel.y;
-        if (!canPerformAction("item"))
-            itemPanel.h += 15;
-        itemPanel.resize();
-
-        more.w = more.h = less.w = less.h = 16;
-        less.x = prev.x;
-        more.x = windowWidth - less.w - 2;
-        more.y = less.y = windowHeight - more.h - 2;
-
-        quantity.x = less.x + less.w + 2;
-        quantity.y = less.y;
-        quantity.w = more.x - quantity.x - 2;
-        quantity.h = less.h;
-
-        options.x = isEnabled() ? 0 : 6;
-        options.y = isEnabled() ? windowHeight - 22 : windowHeight - 28;
-        options.w = 80;
-        options.h = 22;
-
-        delete.state = 0x4;
-        if (NEIController.getDeleteMode())
-            delete.state |= 1;
-        else if (!visiblity.enableDeleteMode)
-            delete.state |= 2;
-
-        rain.state = 0x4;
-        if (disabledActions.contains("rain"))
-            rain.state |= 2;
-        else if (NEIClientUtils.isRaining())
-            rain.state |= 1;
-
-        gamemode.state = 0x4;
-        if (NEIClientUtils.getGamemode() != 0) {
-            gamemode.state |= 0x1;
-            gamemode.index = NEIClientUtils.getGamemode() - 1;
-        } else {
-            if (NEIClientUtils.isValidGamemode("creative"))
-                gamemode.index = 0;
-            else if (NEIClientUtils.isValidGamemode("creative+"))
-                gamemode.index = 1;
-            else if (NEIClientUtils.isValidGamemode("adventure"))
-                gamemode.index = 2;
-        }
-
-        magnet.state = 0x4 | (getMagnetMode() ? 1 : 0);
-
-        if (canPerformAction("delete"))
-            layoutButton(delete);
-        if (canPerformAction("rain"))
-            layoutButton(rain);
-        if (NEIClientUtils.isValidGamemode("creative") ||
-                NEIClientUtils.isValidGamemode("creative+") ||
-                NEIClientUtils.isValidGamemode("adventure"))
-            layoutButton(gamemode);
-        if (canPerformAction("magnet"))
-            layoutButton(magnet);
-        if (canPerformAction("time")) {
-            for (int i = 0; i < 4; i++) {
-                timeButtons[i].state = disabledActions.contains(NEIActions.timeZones[i]) ? 2 : 0;
-                layoutButton(timeButtons[i]);
-            }
-        }
-        if (canPerformAction("heal"))
-            layoutButton(heal);
-
-        searchField.y = windowHeight - searchField.h - 2;
-
-        dropDown.h = 20;
-        dropDown.w = prev.x - dropDown.x - 3;
-        searchField.h = 20;
-        searchField.w = 150;
-        searchField.x = (windowWidth - searchField.w) / 2;
-
-        if (!visiblity.showItemSection) {
-            //TODO dropDown.setDropDown(0);
-            searchField.setFocus(false);
-        }
-
-        int maxWidth = 0;
-        for (int i = 0; i < 7; i++) {
-            deleteButtons[i].w = 16;
-            deleteButtons[i].h = 16;
-
-            NBTTagCompound statelist = global.nbt.getCompoundTag("statename");
-            global.nbt.setTag("statename", statelist);
-            String name = statelist.getString("" + i);
-            if (statelist.getTag("" + i) == null) {
-                name = "" + (i + 1);
-                statelist.setString("" + i, name);
-            }
-            stateButtons[i].label = name;
-            stateButtons[i].saved = isStateSaved(i);
-
-            int width = getStringWidth(stateButtons[i].getRenderLabel()) + 26;
-            if (width + 22 > containerLeft)
-                width = containerLeft - 22;
-
-            if (width > maxWidth)
-                maxWidth = width;
-        }
-
-        for (int i = 0; i < 7; i++) {
-            stateButtons[i].x = 0;
-            stateButtons[i].y = 58 + i * 22;
-            stateButtons[i].h = 20;
-
-            stateButtons[i].x = 0;
-            stateButtons[i].w = maxWidth;
-            deleteButtons[i].x = stateButtons[i].w + 3;
-            deleteButtons[i].y = stateButtons[i].y + 2;
-        }
-    }
-
-    public abstract void layoutButton(Button button);
-}

src/codechicken/nei/LayoutStyleMinecraft.java

@@ -1,95 +0,0 @@
-package codechicken.nei;
-
-import org.lwjgl.opengl.GL11;
-
-import static codechicken.lib.gui.GuiDraw.drawStringC;
-import static codechicken.nei.LayoutManager.*;
-
-public class LayoutStyleMinecraft extends LayoutStyleDefault
-{
-    int stateButtonCount;
-    int clickButtonCount;
-
-    @Override
-    public String getName() {
-        return "minecraft";
-    }
-
-    @Override
-    public void init() {
-        delete.icon = new Image(144, 12, 12, 12);
-        gamemode.icons[0] = new Image(132, 12, 12, 12);
-        gamemode.icons[1] = new Image(156, 12, 12, 12);
-        gamemode.icons[2] = new Image(168, 12, 12, 12);
-        rain.icon = new Image(120, 12, 12, 12);
-        magnet.icon = new Image(180, 24, 12, 12);
-        timeButtons[0].icon = new Image(132, 24, 12, 12);
-        timeButtons[1].icon = new Image(120, 24, 12, 12);
-        timeButtons[2].icon = new Image(144, 24, 12, 12);
-        timeButtons[3].icon = new Image(156, 24, 12, 12);
-        heal.icon = new Image(168, 24, 12, 12);
-        dropDown.x = 90;
-    }
-
-    @Override
-    public void reset() {
-        stateButtonCount = clickButtonCount = 0;
-    }
-
-    @Override
-    public void layoutButton(Button button) {
-        if ((button.state & 0x4) != 0) {
-            button.x = 6 + stateButtonCount * 20;
-            button.y = 3;
-            stateButtonCount++;
-        } else {
-            button.x = 6 + (clickButtonCount % 4) * 20;
-            button.y = 3 + (1 + clickButtonCount / 4) * 18;
-            clickButtonCount++;
-        }
-
-        button.h = 17;
-        button.w = button.contentWidth() + 6;
-    }
-
-    @Override
-    public void drawButton(Button b, int mousex, int mousey) {
-        GL11.glDisable(GL11.GL_LIGHTING);
-        GL11.glColor4f(1, 1, 1, 1);
-
-        int tex;
-        if ((b.state & 0x3) == 2)
-            tex = 0;
-        else if ((b.state & 0x4) == 0 && b.contains(mousex, mousey) ||//not a state button and mouseover
-                (b.state & 0x3) == 1)//state active
-            tex = 2;
-        else
-            tex = 1;
-        LayoutManager.drawButtonBackground(b.x, b.y, b.w, b.h, true, tex);
-
-        Image icon = b.getRenderIcon();
-        if (icon == null) {
-            int colour = tex == 2 ? 0xffffa0 :
-                    tex == 0 ? 0x601010 : 0xe0e0e0;
-
-            drawStringC(b.getRenderLabel(), b.x + b.w / 2, b.y + (b.h - 8) / 2, colour);
-        } else {
-            GL11.glColor4f(1, 1, 1, 1);
-
-            int iconx = b.x + (b.w - icon.width) / 2;
-            int icony = b.y + (b.h - icon.height) / 2;
-            LayoutManager.drawIcon(iconx, icony, icon);
-        }
-    }
-
-    @Override
-    public void drawSubsetTag(String text, int x, int y, int w, int h, int state, boolean mouseover) {
-        if(state == 1)
-            GL11.glColor4f(0.65F, 0.65F, 0.65F, 1.0F);
-        else
-            GL11.glColor4f(1, 1, 1, 1);
-        LayoutManager.drawButtonBackground(x, y, w, h, false, state == 0 ? 0 : 1);
-        if(text != null)
-            drawStringC(text, x, y, w, h, state == 2 ? 0xFFE0E0E0 : 0xFFA0A0A0);
-    }
-}

src/codechicken/nei/LayoutStyleTMIOld.java

@@ -1,135 +0,0 @@
-package codechicken.nei;
-
-import codechicken.nei.guihook.GuiContainerManager;
-
-import static codechicken.lib.gui.GuiDraw.drawRect;
-import static codechicken.lib.gui.GuiDraw.drawString;
-import static codechicken.lib.gui.GuiDraw.drawStringC;
-import static codechicken.nei.LayoutManager.*;
-
-public class LayoutStyleTMIOld extends LayoutStyleDefault
-{
-    public static final Image stateOff = new Image(48, 0, 8, 12);
-    public static final Image stateOn = new Image(56, 0, 8, 12);
-    public static final Image stateDisabled = new Image(64, 0, 8, 12);
-    
-    int stateButtonCount;
-    int clickButtonCount;
-
-    @Override
-    public String getName()
-    {
-        return "oldtmi";
-    }
-    
-    @Override
-    public void init()
-    {
-        delete.icon = new Image(24, 12, 12, 12);        
-        gamemode.icons[0] = new Image(12, 12, 12, 12);
-        gamemode.icons[1] = new Image(36, 12, 12, 12);
-        gamemode.icons[2] = new Image(48, 12, 12, 12);
-        rain.icon = new Image(0, 12, 12, 12);        
-        magnet.icon = new Image(60, 24, 12, 12);        
-        timeButtons[0].icon = new Image(12, 24, 12, 12);
-        timeButtons[1].icon = new Image(0, 24, 12, 12);
-        timeButtons[2].icon = new Image(24, 24, 12, 12);
-        timeButtons[3].icon = new Image(36, 24, 12, 12);        
-        heal.icon = new Image(48, 24, 12, 12);
-        dropDown.x = 93;
-    }
-    
-    @Override
-    public void reset()
-    {
-        stateButtonCount = clickButtonCount = 0;
-    }
-
-    @Override
-    public void layoutButton(Button button)
-    {
-        int offsetx = 2;
-        int offsety = 2;
-        
-        if((button.state & 0x4) != 0)
-        {
-            button.x = offsetx + stateButtonCount*22;
-            button.y = offsety;
-            stateButtonCount++;
-        }
-        else
-        {
-            button.x = offsetx + (clickButtonCount%4)*22;
-            button.y = offsety + (1+clickButtonCount/4)*17;
-            clickButtonCount++;
-        }
-        
-        button.h = 14;
-        button.w = button.contentWidth() + 2;
-        if((button.state & 0x4) != 0)
-            button.w += stateOff.width;
-    }
-    
-    @Override
-    public void drawBackground(GuiContainerManager gui)
-    {
-        if(clickButtonCount == 0 && stateButtonCount == 0)
-            return;
-        
-        int maxx = Math.max(stateButtonCount, clickButtonCount);
-        if(maxx > 4)maxx = 4;
-        int maxy = clickButtonCount == 0 ? 1 : (clickButtonCount / 4 + 2);
-        
-        drawRect(0, 0, 2+22*maxx, 1+maxy*17, 0xFF000000);
-    }
-    
-    @Override
-    public void drawButton(Button b, int mousex, int mousey)
-    {
-        int cwidth = b.contentWidth();
-        if((b.state & 0x4) != 0)
-            cwidth += stateOff.width;
-        int textx = b.x + (b.w - cwidth) / 2;
-        int texty = b.y + (b.h - 8) / 2;
-        
-        drawRect(b.x, b.y, b.w, b.h, b.contains(mousex, mousey) ? 0xee401008 : 0xee000000);
-        
-        Image icon = b.getRenderIcon();
-        if(icon == null)
-        {
-            drawString(b.getRenderLabel(), textx, texty, -1);
-        }
-        else
-        {
-            int icony = b.y + (b.h - icon.height) / 2;
-            LayoutManager.drawIcon(textx, icony, icon);
-            if((b.state & 0x3) == 2)
-                drawRect(textx, icony, icon.width, icon.height, 0x80000000);
-        
-            if((b.state & 0x4) != 0)
-            {
-                Image stateimage;
-                if((b.state & 0x3) == 1)
-                    stateimage = stateOn;
-                else if((b.state & 0x3) == 2)
-                    stateimage = stateDisabled;
-                else
-                    stateimage = stateOff;
-                LayoutManager.drawIcon(textx+icon.width, icony, stateimage);
-            }
-        }
-    }
-
-    @Override
-    public void drawSubsetTag(String text, int x, int y, int w, int h, int state, boolean mouseover) {
-        drawRect(x, y, w, h, mouseover ? 0xFF401008 : 0xFF000000);
-        if(text != null) {
-            int colour = -1;
-            if (state == 0)
-                colour = 0xFF601010;
-            else if (state == 1)
-                colour = 0xFF807070;
-            drawStringC(text, x, y, w, h, colour, state == 0);
-        }
-    }
-}

src/codechicken/nei/NEIClientConfig.java

@@ -1,543 +0,0 @@
-package codechicken.nei;
-
-import codechicken.core.*;
-import codechicken.lib.config.ConfigFile;
-import codechicken.lib.config.ConfigTag;
-import codechicken.lib.config.ConfigTagParent;
-import codechicken.nei.api.*;
-import codechicken.nei.config.*;
-import codechicken.nei.recipe.RecipeInfo;
-import codechicken.obfuscator.ObfuscationRun;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.nbt.NBTTagList;
-import net.minecraft.world.World;
-import net.minecraft.world.storage.SaveFormatComparator;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.lwjgl.input.Keyboard;
-
-import java.io.File;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map.Entry;
-
-public class NEIClientConfig
-{
-    private static boolean configLoaded;
-    private static boolean enabledOverride;
-
-    public static Logger logger = LogManager.getLogger("NotEnoughItems");
-    public static File configDir = new File(CommonUtils.getMinecraftDir(), "config/NEI/");
-    public static ConfigSet global = new ConfigSet(
-            new File("saves/NEI/client.dat"),
-            new ConfigFile(new File(configDir, "client.cfg")));
-    public static ConfigSet world;
-
-    public static ItemStack creativeInv[];
-    private static boolean statesSaved[] = new boolean[7];
-
-    public static boolean hasSMPCounterpart;
-    public static HashSet<String> permissableActions = new HashSet<String>();
-    public static HashSet<String> disabledActions = new HashSet<String>();
-    public static HashSet<String> enabledActions = new HashSet<String>();
-
-    public static ItemStackSet bannedBlocks = new ItemStackSet();
-
-    static {
-        if (global.config.getTag("checkUpdates").getBooleanValue(true))
-            CCUpdateChecker.updateCheck("NotEnoughItems");
-        linkOptionList();
-        setDefaults();
-    }
-
-    private static void setDefaults() {
-        ConfigTagParent tag = global.config;
-        tag.setComment("Main configuration of NEI.\nMost of these options can be changed ingame.\nDeleting any element will restore it to it's default value");
-
-        tag.getTag("command").useBraces().setComment("Change these options if you have a different mod installed on the server that handles the commands differently, Eg. Bukkit Essentials");
-        tag.setNewLineMode(1);
-
-        tag.getTag("inventory.widgetsenabled").getBooleanValue(true);
-        API.addOption(new OptionToggleButton("inventory.widgetsenabled"));
-
-        tag.getTag("inventory.hidden").getBooleanValue(false);
-        tag.getTag("inventory.cheatmode").getIntValue(2);
-        tag.getTag("inventory.lockmode").setComment("For those who can't help themselves.\nSet this to a mode and you will be unable to change it ingame").getIntValue(-1);
-        API.addOption(new OptionCycled("inventory.cheatmode", 3)
-        {
-            @Override
-            public boolean optionValid(int index) {
-                return getLockedMode() == -1 || getLockedMode() == index && NEIInfo.isValidMode(index);
-            }
-        });
-        checkCheatMode();
-
-        tag.getTag("inventory.utilities").setDefaultValue("delete, magnet");
-        API.addOption(new OptionUtilities("inventory.utilities"));
-
-        tag.getTag("inventory.gamemodes").setDefaultValue("creative, creative+, adventure");
-        API.addOption(new OptionGamemodes("inventory.gamemodes"));
-
-        tag.getTag("inventory.layoutstyle").getIntValue(0);
-        API.addOption(new OptionCycled("inventory.layoutstyle", 0)
-        {
-            @Override
-            public String getPrefix() {
-                return translateN(name);
-            }
-
-            @Override
-            public String getButtonText() {
-                return NEIClientUtils.translate("layoutstyle." +
-                        LayoutManager.getLayoutStyle(renderTag().getIntValue()).getName());
-            }
-
-            @Override
-            public boolean cycle() {
-                LinkedList<Integer> list = new LinkedList<Integer>();
-                for (Entry<Integer, LayoutStyle> entry : LayoutManager.layoutStyles.entrySet())
-                    list.add(entry.getKey());
-
-                Collections.sort(list);
-
-                int nextLayout = renderTag().getIntValue();
-                if (nextLayout == list.getLast())//loop list
-                    nextLayout = -1;
-                for (Integer i : list) {
-                    if (i > nextLayout) {
-                        nextLayout = i;
-                        break;
-                    }
-                }
-
-                getTag().setIntValue(nextLayout);
-                return true;
-            }
-        });
-
-        ItemSorter.initConfig(tag);
-
-        tag.getTag("inventory.itemIDs").getIntValue(1);
-        API.addOption(new OptionCycled("inventory.itemIDs", 3, true));
-
-        tag.getTag("inventory.searchmode").getIntValue(1);
-        API.addOption(new OptionCycled("inventory.searchmode", 3, true));
-
-        tag.getTag("world.highlight_tips").getBooleanValue(false);
-        tag.getTag("world.highlight_tips.x").getIntValue(5000);
-        tag.getTag("world.highlight_tips.y").getIntValue(100);
-        API.addOption(new OptionOpenGui("world.highlight_tips", GuiHighlightTips.class));
-
-        tag.getTag("inventory.profileRecipes").getBooleanValue(false);
-        API.addOption(new OptionToggleButton("inventory.profileRecipes", true));
-
-        tag.getTag("command.creative").setDefaultValue("/gamemode {0} {1}");
-        API.addOption(new OptionTextField("command.creative"));
-        tag.getTag("command.item").setDefaultValue("/give {0} {1} {2} {3} {4}");
-        API.addOption(new OptionTextField("command.item"));
-        tag.getTag("command.time").setDefaultValue("/time set {0}");
-        API.addOption(new OptionTextField("command.time"));
-        tag.getTag("command.rain").setDefaultValue("/toggledownfall");
-        API.addOption(new OptionTextField("command.rain"));
-        tag.getTag("command.heal").setDefaultValue("");
-        API.addOption(new OptionTextField("command.heal"));
-
-        setDefaultKeyBindings();
-    }
-
-    private static void linkOptionList() {
-        OptionList.setOptionList(new OptionList("nei.options")
-        {
-            @Override
-            public ConfigSet globalConfigSet() {
-                return global;
-            }
-
-            @Override
-            public ConfigSet worldConfigSet() {
-                return world;
-            }
-
-            @Override
-            public OptionList configBase() {
-                return this;
-            }
-
-            @Override
-            public GuiOptionList getGui(GuiScreen parent, OptionList list, boolean world) {
-                return new GuiNEIOptionList(parent, list, world);
-            }
-        });
-    }
-
-    private static void setDefaultKeyBindings() {
-        API.addKeyBind("gui.recipe", Keyboard.KEY_R);
-        API.addKeyBind("gui.usage", Keyboard.KEY_U);
-        API.addKeyBind("gui.back", Keyboard.KEY_BACK);
-        API.addKeyBind("gui.enchant", Keyboard.KEY_X);
-        API.addKeyBind("gui.potion", Keyboard.KEY_P);
-        API.addKeyBind("gui.prev", Keyboard.KEY_PRIOR);
-        API.addKeyBind("gui.next", Keyboard.KEY_NEXT);
-        API.addKeyBind("gui.hide", Keyboard.KEY_O);
-        API.addKeyBind("gui.search", Keyboard.KEY_F);
-        API.addKeyBind("world.chunkoverlay", Keyboard.KEY_F9);
-        API.addKeyBind("world.moboverlay", Keyboard.KEY_F7);
-        API.addKeyBind("world.highlight_tips", Keyboard.KEY_NUMPAD0);
-        API.addKeyBind("world.dawn", 0);
-        API.addKeyBind("world.noon", 0);
-        API.addKeyBind("world.dusk", 0);
-        API.addKeyBind("world.midnight", 0);
-        API.addKeyBind("world.rain", 0);
-        API.addKeyBind("world.heal", 0);
-        API.addKeyBind("world.creative", 0);
-    }
-
-    public static OptionList getOptionList() {
-        return OptionList.getOptionList("nei.options");
-    }
-
-    public static void loadWorld(String saveName) {
-        setInternalEnabled(true);
-        logger.debug("Loading "+(Minecraft.getMinecraft().isSingleplayer() ? "Local" : "Remote")+" World");
-        bootNEI(ClientUtils.getWorld());
-
-        File saveDir = new File(CommonUtils.getMinecraftDir(), "saves/NEI/" + saveName);
-        boolean newWorld = !saveDir.exists();
-        if (newWorld)
-            saveDir.mkdirs();
-
-        world = new ConfigSet(new File(saveDir, "NEI.dat"), new ConfigFile(new File(saveDir, "NEI.cfg")));
-        onWorldLoad(newWorld);
-    }
-
-    private static void onWorldLoad(boolean newWorld) {
-        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");
-
-        setWorldDefaults();
-        creativeInv = new ItemStack[54];
-        LayoutManager.searchField.setText(getSearchExpression());
-        LayoutManager.quantity.setText(Integer.toString(getItemQuantity()));
-        SubsetWidget.loadHidden();
-
-        if (newWorld && Minecraft.getMinecraft().isSingleplayer())
-            world.config.getTag("inventory.cheatmode").setIntValue(NEIClientUtils.mc().playerController.isInCreativeMode() ? 2 : 0);
-
-        NEIInfo.load(ClientUtils.getWorld());
-    }
-
-    private static void setWorldDefaults() {
-        NBTTagCompound nbt = world.nbt;
-        if (!nbt.hasKey("search")) nbt.setString("search", "");
-        if (!nbt.hasKey("quantity")) nbt.setInteger("quantity", 0);
-        if (!nbt.hasKey("validateenchantments")) nbt.setBoolean("validateenchantments", false);
-
-        world.saveNBT();
-    }
-
-    public static int getKeyBinding(String string) {
-        return getSetting("keys." + string).getIntValue();
-    }
-
-    public static void setDefaultKeyBinding(String string, int key) {
-        getSetting("keys." + string).getIntValue(key);
-    }
-
-    public static void bootNEI(World world) {
-        if (configLoaded)
-            return;
-
-        loadStates();
-        //ItemVisibilityHash.loadStates();
-        //vishash = new ItemVisibilityHash();
-        ItemInfo.load(world);
-        GuiInfo.load();
-        RecipeInfo.load();
-        LayoutManager.load();
-        NEIController.load();
-
-        configLoaded = true;
-
-        ClassDiscoverer classDiscoverer = new ClassDiscoverer(new IStringMatcher()
-        {
-            public boolean matches(String test) {
-                return test.startsWith("NEI") && test.endsWith("Config.class");
-            }
-        }, IConfigureNEI.class);
-
-        classDiscoverer.findClasses();
-
-        for (Class<?> clazz : classDiscoverer.classes) {
-            try {
-                IConfigureNEI config = (IConfigureNEI) clazz.newInstance();
-                config.loadConfig();
-                NEIModContainer.plugins.add(config);
-                logger.debug("Loaded " + clazz.getName());
-            } catch (Exception e) {
-                logger.error("Failed to Load " + clazz.getName(), e);
-            }
-        }
-
-        ItemSorter.loadConfig();
-    }
-
-    public static void loadStates() {
-        for (int state = 0; state < 7; state++)
-            statesSaved[state] = !global.nbt.getCompoundTag("save" + state).hasNoTags();
-    }
-
-    public static boolean isWorldSpecific(String setting) {
-        if(world == null) return false;
-        ConfigTag tag = world.config.getTag(setting, false);
-        return tag != null && tag.value != null;
-    }
-
-    public static boolean isStateSaved(int i) {
-        return statesSaved[i];
-    }
-
-    public static ConfigTag getSetting(String s) {
-        return isWorldSpecific(s) ? world.config.getTag(s) : global.config.getTag(s);
-    }
-
-    public static boolean getBooleanSetting(String s) {
-        return getSetting(s).getBooleanValue();
-    }
-
-    public static boolean isHidden() {
-        return !enabledOverride || getBooleanSetting("inventory.hidden");
-    }
-
-    public static boolean isEnabled() {
-        return enabledOverride && getBooleanSetting("inventory.widgetsenabled");
-    }
-
-    public static void setEnabled(boolean flag) {
-        getSetting("inventory.widgetsenabled").setBooleanValue(flag);
-    }
-
-    public static int getItemQuantity() {
-        return world.nbt.getInteger("quantity");
-    }
-
-    public static int getCheatMode() {
-        return getIntSetting("inventory.cheatmode");
-    }
-
-    private static void checkCheatMode() {
-        if (getLockedMode() != -1)
-            setIntSetting("inventory.cheatmode", getLockedMode());
-    }
-
-    public static int getLockedMode() {
-        return getIntSetting("inventory.lockmode");
-    }
-
-    public static int getLayoutStyle() {
-        return getIntSetting("inventory.layoutstyle");
-    }
-
-    public static String getStringSetting(String s) {
-        return getSetting(s).getValue();
-    }
-
-    public static boolean showIDs() {
-        int i = getIntSetting("inventory.itemIDs");
-        return i == 2 || (i == 1 && isEnabled() && !isHidden());
-    }
-
-    public static void toggleBooleanSetting(String setting) {
-        ConfigTag tag = getSetting(setting);
-        tag.setBooleanValue(!tag.getBooleanValue());
-    }
-
-    public static void cycleSetting(String setting, int max) {
-        ConfigTag tag = getSetting(setting);
-        tag.setIntValue((tag.getIntValue() + 1) % max);
-    }
-
-    public static int getIntSetting(String setting) {
-        return getSetting(setting).getIntValue();
-    }
-
-    public static void setIntSetting(String setting, int val) {
-        getSetting(setting).setIntValue(val);
-    }
-
-    public static String getSearchExpression() {
-        return world.nbt.getString("search");
-    }
-
-    public static void setSearchExpression(String expression) {
-        world.nbt.setString("search", expression);
-        world.saveNBT();
-    }
-
-    public static boolean getMagnetMode() {
-        return enabledActions.contains("magnet");
-    }
-
-    public static boolean invCreativeMode() {
-        return enabledActions.contains("creative+") && canPerformAction("creative+");
-    }
-
-    public static boolean areDamageVariantsShown() {
-        return hasSMPCounterPart() || getSetting("command.item").getValue().contains("{3}");
-    }
-
-    public static void clearState(int state) {
-        statesSaved[state] = false;
-        global.nbt.setTag("save" + state, new NBTTagCompound());
-        global.saveNBT();
-    }
-
-    public static void loadState(int state) {
-        if (!statesSaved[state])
-            return;
-
-        NBTTagCompound statesave = global.nbt.getCompoundTag("save" + state);
-        GuiContainer currentContainer = NEIClientUtils.getGuiContainer();
-        LinkedList<TaggedInventoryArea> saveAreas = new LinkedList<TaggedInventoryArea>();
-        saveAreas.add(new TaggedInventoryArea(NEIClientUtils.mc().thePlayer.inventory));
-
-        for (INEIGuiHandler handler : GuiInfo.guiHandlers) {
-            List<TaggedInventoryArea> areaList = handler.getInventoryAreas(currentContainer);
-            if (areaList != null)
-                saveAreas.addAll(areaList);
-        }
-
-        for (TaggedInventoryArea area : saveAreas) {
-            if (!statesave.hasKey(area.tagName))
-                continue;
-
-            for (int slot : area.slots) {
-                NEIClientUtils.setSlotContents(slot, null, area.isContainer());
-            }
-
-            NBTTagList areaTag = statesave.getTagList(area.tagName, 10);
-            for (int i = 0; i < areaTag.tagCount(); i++) {
-                NBTTagCompound stacksave = areaTag.getCompoundTagAt(i);
-                int slot = stacksave.getByte("Slot") & 0xFF;
-                if (!area.slots.contains(slot))
-                    continue;
-
-                NEIClientUtils.setSlotContents(slot, ItemStack.loadItemStackFromNBT(stacksave), area.isContainer());
-            }
-        }
-    }
-
-    public static void saveState(int state) {
-        NBTTagCompound statesave = global.nbt.getCompoundTag("save" + state);
-        GuiContainer currentContainer = NEIClientUtils.getGuiContainer();
-        LinkedList<TaggedInventoryArea> saveAreas = new LinkedList<TaggedInventoryArea>();
-        saveAreas.add(new TaggedInventoryArea(NEIClientUtils.mc().thePlayer.inventory));
-
-        for (INEIGuiHandler handler : GuiInfo.guiHandlers) {
-            List<TaggedInventoryArea> areaList = handler.getInventoryAreas(currentContainer);
-            if (areaList != null)
-                saveAreas.addAll(areaList);
-        }
-
-        for (TaggedInventoryArea area : saveAreas) {
-            NBTTagList areaTag = new NBTTagList();
-
-            for (int i : area.slots) {
-                ItemStack stack = area.getStackInSlot(i);
-                if (stack == null)
-                    continue;
-                NBTTagCompound stacksave = new NBTTagCompound();
-                stacksave.setByte("Slot", (byte) i);
-                stack.writeToNBT(stacksave);
-                areaTag.appendTag(stacksave);
-            }
-            statesave.setTag(area.tagName, areaTag);
-        }
-
-        global.nbt.setTag("save" + state, statesave);
-        global.saveNBT();
-        statesSaved[state] = true;
-    }
-
-    public static boolean hasSMPCounterPart() {
-        return hasSMPCounterpart;
-    }
-
-    public static void setHasSMPCounterPart(boolean flag) {
-        hasSMPCounterpart = flag;
-        permissableActions.clear();
-        bannedBlocks.clear();
-        disabledActions.clear();
-        enabledActions.clear();
-    }
-
-    public static boolean canCheatItem(ItemStack stack) {
-        return canPerformAction("item") && !bannedBlocks.contains(stack);
-    }
-
-    public static boolean canPerformAction(String name) {
-        if (!isEnabled())
-            return false;
-
-        if (!modePermitsAction(name))
-            return false;
-
-        String base = NEIActions.base(name);
-        if (hasSMPCounterpart)
-            return permissableActions.contains(base);
-
-        if (NEIActions.smpRequired(name))
-            return false;
-
-        String cmd = getStringSetting("command." + base);
-        if (cmd == null || !cmd.startsWith("/"))
-            return false;
-
-        return true;
-    }
-
-    private static boolean modePermitsAction(String name) {
-        if (getCheatMode() == 0) return false;
-        if (getCheatMode() == 2) return true;
-
-        String[] actions = getStringArrSetting("inventory.utilities");
-        for (String action : actions)
-            if (action.equalsIgnoreCase(name))
-                return true;
-
-        return false;
-    }
-
-    public static String[] getStringArrSetting(String s) {
-        return getStringSetting(s).replace(" ", "").split(",");
-    }
-
-    public static void setInternalEnabled(boolean b) {
-        enabledOverride = b;
-    }
-
-    public static void reloadSaves() {
-        File saveDir = new File(CommonUtils.getMinecraftDir(), "saves/NEI/local");
-        if (!saveDir.exists())
-            return;
-
-        List<SaveFormatComparator> saves;
-        try {
-            saves = Minecraft.getMinecraft().getSaveLoader().getSaveList();
-        } catch (Exception e) {
-            logger.error("Error loading saves", e);
-            return;
-        }
-        HashSet<String> saveFileNames = new HashSet<String>();
-        for (SaveFormatComparator save : saves)
-            saveFileNames.add(save.getFileName());
-
-        for (File file : saveDir.listFiles())
-            if (file.isDirectory() && !saveFileNames.contains(file.getName()))
-                ObfuscationRun.deleteDir(file, true);
-    }
-}

src/codechicken/nei/NEICompatibility.java

@@ -1,5 +0,0 @@
-package codechicken.nei;
-
-public class NEICompatibility
-{    
-}

src/codechicken/nei/PositionedStack.java

@@ -1,119 +0,0 @@
-package codechicken.nei;
-
-import net.minecraft.init.Blocks;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.oredict.OreDictionary;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Simply an {@link ItemStack} with position.
- * Mainly used in the recipe handlers.
- */
-public class PositionedStack
-{    
-    public int relx;
-    public int rely;
-    public ItemStack items[];
-    //compatibility dummy
-    public ItemStack item;
-    
-    private boolean permutated = false;
-    
-    public PositionedStack(Object object, int x, int y, boolean genPerms)
-    {
-        items = NEIServerUtils.extractRecipeItems(object);
-        relx = x;
-        rely = y;
-        
-        if(genPerms)
-            generatePermutations();
-        else
-            setPermutationToRender(0);
-    }
-    
-    public PositionedStack(Object object, int x, int y)
-    {
-        this(object, x, y, true);
-    }
-
-    public void generatePermutations()
-    {
-        if(permutated)
-            return;
-        
-        ArrayList<ItemStack> stacks = new ArrayList<ItemStack>();
-        for(ItemStack item : items)
-        {
-            if(item == null || item.getItem() == null)
-                continue;
-            
-            if(item.getItemDamage() == Short.MAX_VALUE)
-            {
-                List<ItemStack> permutations = ItemList.itemMap.get(item.getItem());
-                if(!permutations.isEmpty())
-                {
-                    for(ItemStack stack : permutations)
-                        stacks.add(stack.copy());
-                }
-                else
-                {
-                    ItemStack base = new ItemStack(item.getItem(), item.stackSize);
-                    base.stackTagCompound = item.stackTagCompound;
-                    stacks.add(base);
-                }
-                continue;
-            }
-            
-            stacks.add(item.copy());
-        }
-        items = stacks.toArray(new ItemStack[0]);
-
-        if(items.length == 0)
-            items = new ItemStack[]{new ItemStack(Blocks.fire)};
-        
-        permutated = true;
-        setPermutationToRender(0);
-    }
-
-    public void setMaxSize(int i)
-    {
-        for(ItemStack item : items)
-            if(item.stackSize > i)
-                item.stackSize = i;
-    }
-    
-    public PositionedStack copy()
-    {
-        return new PositionedStack(items, relx, rely);
-    }
-    
-    public void setPermutationToRender(int index)
-    {
-        item = items[index].copy();
-        if(item.getItem() == null)
-            item = new ItemStack(Blocks.fire);
-        else if(item.getItemDamage() == OreDictionary.WILDCARD_VALUE && item.getItem() != null && item.getItem().isRepairable())
-            item.setItemDamage(0);
-    }
-
-    public boolean contains(ItemStack ingredient)
-    {
-        for(ItemStack item : items)
-            if(NEIServerUtils.areStacksSameTypeCrafting(item, ingredient))
-                return true;
-        
-        return false;
-    }
-
-    public boolean contains(Item ingred)
-    {
-        for(ItemStack item : items)
-            if(item.getItem() == ingred)
-                return true;
-        
-        return false;
-    }
-}

src/codechicken/nei/SaveLoadButton.java

@@ -1,120 +0,0 @@
-package codechicken.nei;
-
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.util.ChatAllowedCharacters;
-import org.lwjgl.input.Keyboard;
-
-import static codechicken.lib.gui.GuiDraw.drawString;
-import static codechicken.lib.gui.GuiDraw.getStringWidth;
-import static codechicken.nei.NEIClientUtils.translate;
-
-public abstract class SaveLoadButton extends Button
-{
-    public SaveLoadButton(String s)
-    {
-        super(s);
-    }
-
-    @Override
-    public boolean handleClick(int mousex, int mousey, int button)
-    {
-        if(button == 1)
-        {
-            label = "";
-            onTextChange();
-            focused = true;
-            NEIClientUtils.playClickSound();
-            return true;
-        }
-        return super.handleClick(mousex, mousey, button);
-    }
-
-    public abstract void onTextChange();
-
-    @Override
-    public void onGuiClick(int i, int j)
-    {
-        if(!contains(i, j))
-            focused = false;
-    }
-
-    @Override
-    public boolean handleKeyPress(int keyID, char keyChar)
-    {
-        if(!focused)
-            return false;
-        
-        if(keyID == Keyboard.KEY_BACK)
-        {
-            if(label.length() > 0)
-            {
-                label = label.substring(0, label.length() - 1);
-                onTextChange();
-                backdowntime = System.currentTimeMillis();
-            }
-        }
-        else if(keyID == Keyboard.KEY_RETURN)
-        {
-            focused = false;
-        }        
-        else if(keyChar == 22)//paste
-        {
-            String pastestring = GuiScreen.getClipboardString();
-            if(pastestring == null) 
-                pastestring = "";
-
-            label = label + pastestring;
-            onTextChange();
-        }
-        else if(ChatAllowedCharacters.isAllowedCharacter(keyChar))
-        {
-            label = label + keyChar;
-            onTextChange();
-        }
-        return true;
-    }
-
-    @Override
-    public void update()
-    {
-        cursorCounter++;
-        if(backdowntime > 0)
-        {
-            if(Keyboard.isKeyDown(Keyboard.KEY_BACK) && label.length() > 5)
-            {
-                if(System.currentTimeMillis() - backdowntime > 200 / (1+backs * 0.3F))
-                {
-                    label = label.substring(0, label.length() - 1);
-                    onTextChange();
-                    backdowntime = System.currentTimeMillis();
-                    backs++;
-                }
-            }
-            else
-            {
-                backdowntime = 0;
-                backs = 0;
-            }
-        }
-    }
-    
-    @Override
-    public void draw(int mousex, int mousey)
-    {    
-        super.draw(mousex, mousey);
-        if(focused && (cursorCounter / 6) % 2 == 0)
-            drawString("_", x + (w + getStringWidth(getRenderLabel())) / 2, y + (h - 8) / 2, 0xFFFFFFFF);
-    }
-    
-    @Override
-    public String getRenderLabel()
-    {
-        return translate(saved ? "load" : "save") + " " + label;
-    }
-    
-    public boolean saved;
-    public long backdowntime;
-    public int backs;
-    public int cursorCounter;
-    public boolean focused;
-}

src/codechicken/nei/TextField.java

@@ -1,143 +0,0 @@
-package codechicken.nei;
-
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.util.ChatAllowedCharacters;
-import org.lwjgl.input.Keyboard;
-
-import static codechicken.lib.gui.GuiDraw.*;
-
-public abstract class TextField extends Widget
-{
-    public TextField(String ident) {
-        identifier = ident;
-    }
-
-    public int getTextColour() {
-        return focused() ? 0xFFE0E0E0 : 0xFF909090;
-    }
-
-    public void drawBox() {
-        drawRect(x, y, w, h, 0xffA0A0A0);
-        drawRect(x + 1, y + 1, w - 2, h - 2, 0xFF000000);
-    }
-
-    @Override
-    public void draw(int mousex, int mousey) {
-        drawBox();
-
-        String drawtext = text;
-
-        int textWidth;
-        while((textWidth = getStringWidth(drawtext)) > w - 14)
-            drawtext = drawtext.substring(1);
-
-        if (focused() && (cursorCounter / 6) % 2 == 0)
-            drawtext = drawtext + '_';
-
-        int textx = centered ? x + (w - textWidth) / 2 : x + 4;
-        int texty = y + (h + 1) / 2 - 3;
-
-        drawString(drawtext, textx, texty, getTextColour());
-    }
-
-    @Override
-    public void onGuiClick(int mousex, int mousey) {
-        if (!contains(mousex, mousey))
-            setFocus(false);
-    }
-
-    @Override
-    public boolean handleClick(int mousex, int mousey, int button) {
-        if (button == 1)
-            setText("");
-        setFocus(true);
-        return true;
-    }
-
-    @Override
-    public boolean handleKeyPress(int keyID, char keyChar) {
-        if (!focused())
-            return false;
-
-        if (keyID == Keyboard.KEY_BACK) {
-            if (text.length() > 0) {
-                setText(text.substring(0, text.length() - 1));
-                backdowntime = System.currentTimeMillis();
-            }
-        } else if (keyID == Keyboard.KEY_RETURN || keyID == Keyboard.KEY_ESCAPE) {
-            setFocus(false);
-            onExit();
-        } else if (keyChar == 22)//paste
-        {
-            String pastestring = GuiScreen.getClipboardString();
-            if (pastestring == null)
-                pastestring = "";
-
-            if (isValid(text + pastestring))
-                setText(text + pastestring);
-        } else if (isValid(text + keyChar))
-            setText(text + keyChar);
-
-        return true;
-    }
-
-    public void onExit() {
-    }
-
-    public abstract void onTextChange(String oldText);
-
-    public boolean isValid(String string) {
-        // Solve the problem that Minecraft can't post Chinese characters
-        return ChatAllowedCharacters.isAllowedCharacter(string.charAt(string.length() - 1));
-    }
-
-    @Override
-    public void update() {
-        cursorCounter++;
-        if (backdowntime > 0) {
-            if (Keyboard.isKeyDown(Keyboard.KEY_BACK) && text.length() > 0) {
-                if (System.currentTimeMillis() - backdowntime > 200 / (1 + backs * 0.3F)) {
-                    setText(text.substring(0, text.length() - 1));
-                    backdowntime = System.currentTimeMillis();
-                    backs++;
-                }
-            } else {
-                backdowntime = 0;
-                backs = 0;
-            }
-        }
-    }
-
-    public void setText(String s) {
-        String oldText = text;
-        text = filterText(s);
-        onTextChange(oldText);
-    }
-
-    public String filterText(String s) {
-        return s;
-    }
-
-    public void setFocus(boolean focus) {
-        if (focus) {
-            LayoutManager.setInputFocused(this);
-        } else if (focused()) {
-            LayoutManager.setInputFocused(null);
-        }
-    }
-
-    public boolean focused() {
-        return LayoutManager.getInputFocused() == this;
-    }
-
-    public String text() {
-        return text;
-    }
-
-    private String text = "";
-    public boolean centered;
-    public long backdowntime;
-    public int backs;
-    public String identifier;
-    public int cursorCounter;
-}

src/codechicken/nei/VisiblityData.java

@@ -1,38 +0,0 @@
-package codechicken.nei;
-
-public class VisiblityData
-{
-    public boolean showUtilityButtons = true;
-    public boolean showStateButtons = true;
-    /**
-     * Item panel and associated buttons
-     */
-    public boolean showItemPanel = true;
-    /**
-     * Item and search section
-     */
-    public boolean showItemSection = true;
-    /**
-     * Dropdown and Item search field
-     */
-    public boolean showSearchSection = true;
-    /**
-     * All widgets except options button
-     */
-    public boolean showWidgets = true;
-    /**
-     * The entire NEI interface, aka hidden
-     */
-    public boolean showNEI = true;
-    public boolean enableDeleteMode = true;
-    
-    public void translateDependancies()
-    {
-        if(!showNEI)
-            showWidgets = false;
-        if(!showWidgets)
-            showItemSection = showUtilityButtons = showStateButtons = false;
-        if(!showItemSection)
-            showSearchSection = showItemPanel = false;
-    }
-}

src/codechicken/nei/WorldOverlayRenderer.java

@@ -1,222 +0,0 @@
-package codechicken.nei;
-
-import codechicken.lib.math.MathHelper;
-import codechicken.lib.render.RenderUtils;
-import codechicken.nei.KeyManager.IKeyStateTracker;
-import net.minecraft.client.Minecraft;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EnumCreatureType;
-import net.minecraft.entity.passive.EntityPig;
-import net.minecraft.util.AxisAlignedBB;
-import net.minecraft.world.EnumSkyBlock;
-import net.minecraft.world.SpawnerAnimals;
-import net.minecraft.world.World;
-import net.minecraft.world.biome.BiomeGenBase;
-import net.minecraft.world.chunk.Chunk;
-import org.lwjgl.opengl.GL11;
-
-public class WorldOverlayRenderer implements IKeyStateTracker
-{
-    public static int mobOverlay = 0;
-    public static int chunkOverlay = 0;
-
-    public static void reset() {
-        mobOverlay = 0;
-        chunkOverlay = 0;
-    }
-
-    @Override
-    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.chunkoverlay").down)
-            chunkOverlay = (chunkOverlay + 1) % 3;
-    }
-
-    public static void render(float frame) {
-        GL11.glPushMatrix();
-        Entity entity = Minecraft.getMinecraft().renderViewEntity;
-        RenderUtils.translateToWorldCoords(entity, frame);
-
-        renderChunkBounds(entity);
-        renderMobSpawnOverlay(entity);
-        GL11.glPopMatrix();
-    }
-
-    private static void renderMobSpawnOverlay(Entity entity) {
-        if (mobOverlay == 0)
-            return;
-
-        GL11.glDisable(GL11.GL_TEXTURE_2D);
-        GL11.glEnable(GL11.GL_BLEND);
-        GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
-        GL11.glDisable(GL11.GL_LIGHTING);
-        GL11.glLineWidth(1.5F);
-        GL11.glBegin(GL11.GL_LINES);
-
-        GL11.glColor4f(1, 0, 0, 1);
-        int curSpawnMode = 2;
-
-        World world = entity.worldObj;
-        int x1 = (int) entity.posX;
-        int z1 = (int) entity.posZ;
-        int y1 = (int) MathHelper.clip(entity.posY, 16, world.getHeight() - 16);
-
-        for (int x = x1 - 16; x <= x1 + 16; x++)
-            for (int z = z1 - 16; z <= z1 + 16; z++) {
-                Chunk chunk = world.getChunkFromBlockCoords(x, z);
-                BiomeGenBase biome = world.getBiomeGenForCoords(x, z);
-                if (biome.getSpawnableList(EnumCreatureType.monster).isEmpty() || biome.getSpawningChance() <= 0)
-                    continue;
-
-                for (int y = y1 - 16; y < y1 + 16; y++) {
-                    int spawnMode = getSpawnMode(chunk, x, y, z);
-                    if (spawnMode == 0)
-                        continue;
-
-                    if (spawnMode != curSpawnMode) {
-                        if (spawnMode == 1)
-                            GL11.glColor4f(1, 1, 0, 1);
-                        else
-                            GL11.glColor4f(1, 0, 0, 1);
-                        curSpawnMode = spawnMode;
-                    }
-
-                    GL11.glVertex3d(x, y + 0.004, z);
-                    GL11.glVertex3d(x + 1, y + 0.004, z + 1);
-                    GL11.glVertex3d(x + 1, y + 0.004, z);
-                    GL11.glVertex3d(x, y + 0.004, z + 1);
-                }
-            }
-
-        GL11.glEnd();
-        GL11.glEnable(GL11.GL_LIGHTING);
-        GL11.glEnable(GL11.GL_TEXTURE_2D);
-        GL11.glDisable(GL11.GL_BLEND);
-    }
-
-    private static Entity dummyEntity = new EntityPig(null);
-    private static AxisAlignedBB aabb = AxisAlignedBB.getBoundingBox(0, 0, 0, 0, 0, 0);
-    private static int getSpawnMode(Chunk chunk, int x, int y, int z) {
-        if (!SpawnerAnimals.canCreatureTypeSpawnAtLocation(EnumCreatureType.monster, chunk.worldObj, x, y, z) ||
-                chunk.getSavedLightValue(EnumSkyBlock.Block, x & 15, y, z & 15) >= 8)
-            return 0;
-
-        aabb.minX = x + 0.2;
-        aabb.maxX = x + 0.8;
-        aabb.minY = y + 0.01;
-        aabb.maxY = y + 1.8;
-        aabb.minZ = z + 0.2;
-        aabb.maxZ = z + 0.8;
-        if (!chunk.worldObj.checkNoEntityCollision(aabb) ||
-                !chunk.worldObj.getCollidingBoundingBoxes(dummyEntity, aabb).isEmpty() ||
-                chunk.worldObj.isAnyLiquid(aabb))
-            return 0;
-
-        if (chunk.getSavedLightValue(EnumSkyBlock.Sky, x & 15, y, z & 15) >= 8)
-            return 1;
-        return 2;
-    }
-
-    private static void renderChunkBounds(Entity entity) {
-        if (chunkOverlay == 0)
-            return;
-
-        GL11.glDisable(GL11.GL_TEXTURE_2D);
-        GL11.glEnable(GL11.GL_BLEND);
-        GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
-        GL11.glDisable(GL11.GL_LIGHTING);
-        GL11.glLineWidth(1.5F);
-        GL11.glBegin(GL11.GL_LINES);
-
-        for (int cx = -4; cx <= 4; cx++)
-            for (int cz = -4; cz <= 4; cz++) {
-                double x1 = (entity.chunkCoordX + cx) << 4;
-                double z1 = (entity.chunkCoordZ + cz) << 4;
-                double x2 = x1 + 16;
-                double z2 = z1 + 16;
-
-                double dy = 128;
-                double y1 = Math.floor(entity.posY - dy / 2);
-                double y2 = y1 + dy;
-                if (y1 < 0) {
-                    y1 = 0;
-                    y2 = dy;
-                }
-
-                if (y1 > entity.worldObj.getHeight()) {
-                    y2 = entity.worldObj.getHeight();
-                    y1 = y2 - dy;
-                }
-
-                double dist = Math.pow(1.5, -(cx * cx + cz * cz));
-
-                GL11.glColor4d(0.9, 0, 0, dist);
-                if (cx >= 0 && cz >= 0) {
-                    GL11.glVertex3d(x2, y1, z2);
-                    GL11.glVertex3d(x2, y2, z2);
-                }
-                if (cx >= 0 && cz <= 0) {
-                    GL11.glVertex3d(x2, y1, z1);
-                    GL11.glVertex3d(x2, y2, z1);
-                }
-                if (cx <= 0 && cz >= 0) {
-                    GL11.glVertex3d(x1, y1, z2);
-                    GL11.glVertex3d(x1, y2, z2);
-                }
-                if (cx <= 0 && cz <= 0) {
-                    GL11.glVertex3d(x1, y1, z1);
-                    GL11.glVertex3d(x1, y2, z1);
-                }
-
-                if (chunkOverlay == 2 && cx == 0 && cz == 0) {
-                    dy = 32;
-                    y1 = Math.floor(entity.posY - dy / 2);
-                    y2 = y1 + dy;
-                    if (y1 < 0) {
-                        y1 = 0;
-                        y2 = dy;
-                    }
-
-                    if (y1 > entity.worldObj.getHeight()) {
-                        y2 = entity.worldObj.getHeight();
-                        y1 = y2 - dy;
-                    }
-
-                    GL11.glColor4d(0, 0.9, 0, 0.4);
-                    for (double y = (int) y1; y <= y2; y++) {
-                        GL11.glVertex3d(x2, y, z1);
-                        GL11.glVertex3d(x2, y, z2);
-                        GL11.glVertex3d(x1, y, z1);
-                        GL11.glVertex3d(x1, y, z2);
-                        GL11.glVertex3d(x1, y, z2);
-                        GL11.glVertex3d(x2, y, z2);
-                        GL11.glVertex3d(x1, y, z1);
-                        GL11.glVertex3d(x2, y, z1);
-                    }
-                    for (double h = 1; h <= 15; h++) {
-                        GL11.glVertex3d(x1 + h, y1, z1);
-                        GL11.glVertex3d(x1 + h, y2, z1);
-                        GL11.glVertex3d(x1 + h, y1, z2);
-                        GL11.glVertex3d(x1 + h, y2, z2);
-                        GL11.glVertex3d(x1, y1, z1 + h);
-                        GL11.glVertex3d(x1, y2, z1 + h);
-                        GL11.glVertex3d(x2, y1, z1 + h);
-                        GL11.glVertex3d(x2, y2, z1 + h);
-                    }
-                }
-            }
-
-        GL11.glEnd();
-        GL11.glEnable(GL11.GL_LIGHTING);
-        GL11.glEnable(GL11.GL_TEXTURE_2D);
-        GL11.glDisable(GL11.GL_BLEND);
-    }
-
-    public static void load() {
-        KeyManager.trackers.add(new WorldOverlayRenderer());
-    }
-}

src/codechicken/nei/api/GuiInfo.java

@@ -1,34 +0,0 @@
-package codechicken.nei.api;
-
-import codechicken.nei.NEIChestGuiHandler;
-import codechicken.nei.NEICreativeGuiHandler;
-import codechicken.nei.NEIDummySlotHandler;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.client.gui.inventory.GuiContainerCreative;
-
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-
-public class GuiInfo
-{
-    public static LinkedList<INEIGuiHandler> guiHandlers = new LinkedList<INEIGuiHandler>();
-    public static HashSet<Class<? extends GuiContainer>> customSlotGuis = new HashSet<Class<? extends GuiContainer>>();
-
-    public static void load() {
-        API.registerNEIGuiHandler(new NEICreativeGuiHandler());
-        API.registerNEIGuiHandler(new NEIChestGuiHandler());
-        API.registerNEIGuiHandler(new NEIDummySlotHandler());
-        customSlotGuis.add(GuiContainerCreative.class);
-    }
-
-    public static void clearGuiHandlers() {
-        for (Iterator<INEIGuiHandler> iterator = guiHandlers.iterator(); iterator.hasNext(); )
-            if (iterator.next() instanceof GuiContainer)
-                iterator.remove();
-    }
-
-    public static boolean hasCustomSlots(GuiContainer gui) {
-        return customSlotGuis.contains(gui.getClass());
-    }
-}

src/codechicken/nei/api/IGuiContainerOverlay.java

@@ -1,8 +0,0 @@
-package codechicken.nei.api;
-
-import net.minecraft.client.gui.inventory.GuiContainer;
-
-public interface IGuiContainerOverlay
-{
-    public GuiContainer getFirstScreen();
-}

src/codechicken/nei/asm/NEITransformer.java

@@ -1,247 +0,0 @@
-package codechicken.nei.asm;
-
-import codechicken.lib.asm.*;
-import codechicken.lib.asm.ModularASMTransformer.*;
-import cpw.mods.fml.relauncher.FMLLaunchHandler;
-import net.minecraft.launchwrapper.IClassTransformer;
-import org.objectweb.asm.Type;
-import org.objectweb.asm.tree.*;
-
-import java.util.Map;
-
-import static codechicken.lib.asm.InsnComparator.*;
-import static org.objectweb.asm.ClassWriter.COMPUTE_FRAMES;
-import static org.objectweb.asm.ClassWriter.COMPUTE_MAXS;
-import static org.objectweb.asm.Opcodes.*;
-
-public class NEITransformer implements IClassTransformer
-{
-    static {
-        ASMInit.init();
-    }
-
-    private ModularASMTransformer transformer = new ModularASMTransformer();
-    private Map<String, ASMBlock> asmblocks = ASMReader.loadResource("/assets/nei/asm/blocks.asm");
-
-    public NEITransformer() {
-        if(FMLLaunchHandler.side().isClient()) {
-            //Generates method to set the placed position of a mob spawner for the item callback. More portable than copying vanilla placement code
-            transformer.add(new MethodWriter(ACC_PUBLIC,
-                    new ObfMapping("net/minecraft/block/BlockMobSpawner", "func_149689_a", "(Lnet/minecraft/world/World;IIILnet/minecraft/entity/EntityLivingBase;Lnet/minecraft/item/ItemStack;)V"),
-                    asmblocks.get("spawnerPlaced")));
-
-            //Make MobSpawnerBaseLogic use getSpawnerWorld when creating new entities
-            transformer.add(new MethodReplacer(new ObfMapping("net/minecraft/tileentity/MobSpawnerBaseLogic", "func_98281_h", "()Lnet/minecraft/entity/Entity;"),
-                    asmblocks.get("d_spawnerWorld"), asmblocks.get("spawnerWorld")));
-        }
-
-        //Removes trailing seperators from NBTTagList/Compound.toString because OCD
-        transformer.add(new MethodInjector(new ObfMapping("net/minecraft/nbt/NBTTagCompound", "toString", "()Ljava/lang/String;"),
-                asmblocks.get("n_commaFix"), asmblocks.get("commaFix"), true));
-        transformer.add(new MethodInjector(new ObfMapping("net/minecraft/nbt/NBTTagList", "toString", "()Ljava/lang/String;"),
-                asmblocks.get("n_commaFix"), asmblocks.get("commaFix"), true));
-
-        //fix workbench container losing items on shift click output without room for the full stack
-        transformer.add(new MethodTransformer(new ObfMapping("net/minecraft/inventory/ContainerWorkbench", "func_82846_b", "(Lnet/minecraft/entity/player/EntityPlayer;I)Lnet/minecraft/item/ItemStack;"))
-        {
-            @Override
-            public void transform(MethodNode mv) {
-                ASMHelper.logger.debug("NEI: Applying workbench fix");
-                InsnListSection key = findN(mv.instructions, asmblocks.get("n_workbenchFix").list).get(0);
-                key.insertBefore(asmblocks.get("workbenchFix").rawListCopy());
-            }
-        });
-
-        //put glint alpha into the buffer correctly for exporting
-        transformer.add(new MethodReplacer(new ObfMapping("net/minecraft/client/renderer/entity/RenderItem", "func_77018_a", "(IIIII)V"),
-                asmblocks.get("d_glintAlphaFix"), asmblocks.get("glintAlphaFix")));
-
-
-        String GuiContainer = "net/minecraft/client/gui/inventory/GuiContainer";
-        //add manager field
-        transformer.add(new FieldWriter(ACC_PUBLIC, new ObfMapping(GuiContainer, "manager", "Lcodechicken/nei/guihook/GuiContainerManager;")));
-
-        //Fill out getManager in GuiContainerManager
-        transformer.add(new MethodWriter(ACC_PUBLIC | ACC_STATIC,
-                new ObfMapping("codechicken/nei/guihook/GuiContainerManager", "getManager", "(Lnet/minecraft/client/gui/inventory/GuiContainer;)Lcodechicken/nei/guihook/GuiContainerManager;"),
-                asmblocks.get("m_getManager")));
-
-
-        //Generate load method
-        transformer.add(new MethodWriter(ACC_PUBLIC, new ObfMapping(GuiContainer, "func_146280_a", "(Lnet/minecraft/client/Minecraft;II)V"), asmblocks.get("m_setWorldAndResolution")));
-
-        //Generate handleKeyboardInput method
-        transformer.add(new MethodWriter(ACC_PUBLIC, new ObfMapping(GuiContainer, "func_146282_l", "()V"), asmblocks.get("m_handleKeyboardInput")));
-
-        //Generate handleKeyboardInput method
-        transformer.add(new MethodWriter(ACC_PUBLIC, new ObfMapping(GuiContainer, "func_146282_l", "()V"), asmblocks.get("m_handleKeyboardInput")));
-
-        //Generate handleKeyboardInput method
-        transformer.add(new MethodWriter(ACC_PUBLIC, new ObfMapping(GuiContainer, "func_146282_l", "()V"), asmblocks.get("m_handleKeyboardInput")));
-
-        //Generate handleMouseInput method
-        transformer.add(new MethodWriter(ACC_PUBLIC, new ObfMapping(GuiContainer, "func_146274_d", "()V"), asmblocks.get("m_handleMouseInput")));
-
-        addProtectedForwarder(
-                new ObfMapping(GuiContainer, "func_73869_a", "(CI)V"),
-                new ObfMapping("codechicken/nei/guihook/GuiContainerManager", "callKeyTyped", "(Lnet/minecraft/client/gui/inventory/GuiContainer;CI)V"));
-
-        addProtectedForwarder(
-                new ObfMapping(GuiContainer, "func_146984_a", "(Lnet/minecraft/inventory/Slot;III)V"),
-                new ObfMapping("codechicken/nei/guihook/DefaultSlotClickHandler", "callHandleMouseClick", "(Lnet/minecraft/client/gui/inventory/GuiContainer;Lnet/minecraft/inventory/Slot;III)V"));
-
-        //Inject preDraw at the start of drawScreen
-        transformer.add(new MethodInjector(new ObfMapping(GuiContainer, "func_73863_a", "(IIF)V"), asmblocks.get("preDraw"), true));
-
-        //Inject objectUnderMouse check before drawing slot highlights
-        transformer.add(new MethodInjector(new ObfMapping(GuiContainer, "func_73863_a", "(IIF)V"), asmblocks.get("n_objectUnderMouse"), asmblocks.get("objectUnderMouse"), false));
-
-        //Inject renderObjects after drawGuiContainerForegroundLayer
-        transformer.add(new MethodInjector(new ObfMapping(GuiContainer, "func_73863_a", "(IIF)V"), asmblocks.get("n_renderObjects"), asmblocks.get("renderObjects"), false));
-
-        //Replace default renderToolTip with delegate
-        transformer.add(new MethodReplacer(new ObfMapping(GuiContainer, "func_73863_a", "(IIF)V"), asmblocks.get("d_renderToolTip"), asmblocks.get("renderTooltips")));
-
-        //Replace zLevel = 200 with zLevel = 500 in drawItemStack
-        transformer.add(new MethodReplacer(new ObfMapping(GuiContainer, "func_146982_a", "(Lnet/minecraft/item/ItemStack;IILjava/lang/String;)V"),
-                asmblocks.get("d_zLevel"), asmblocks.get("zLevel")));
-
-        //Replace default renderItem with delegate and slot overlay/underlay
-        transformer.add(new MethodReplacer(new ObfMapping(GuiContainer, "func_146977_a", "(Lnet/minecraft/inventory/Slot;)V"), asmblocks.get("d_drawSlot"), asmblocks.get("drawSlot")));
-
-        //Inject mouseClicked hook at the start of mouseClicked
-        transformer.add(new MethodInjector(new ObfMapping(GuiContainer, "func_73864_a", "(III)V"), asmblocks.get("mouseClicked"), true));
-
-        //Replace general handleMouseClicked call with delegate
-        transformer.add(new MethodReplacer(new ObfMapping(GuiContainer, "func_73864_a", "(III)V"), asmblocks.get("d_handleMouseClick"), asmblocks.get("handleMouseClick")));//mouseClicked
-        transformer.add(new MethodReplacer(new ObfMapping(GuiContainer, "func_146273_a", "(IIIJ)V"), asmblocks.get("d_handleMouseClick"), asmblocks.get("handleMouseClick")));//mouseClickMove
-        transformer.add(new MethodReplacer(new ObfMapping(GuiContainer, "func_146286_b", "(III)V"), asmblocks.get("d_handleMouseClick"), asmblocks.get("handleMouseClick")));//mouseMovedOrUp
-        transformer.add(new MethodReplacer(new ObfMapping(GuiContainer, "func_73869_a", "(CI)V"), asmblocks.get("d_handleMouseClick"), asmblocks.get("handleMouseClick")));//keyTyped
-        transformer.add(new MethodReplacer(new ObfMapping(GuiContainer, "func_146983_a", "(I)Z"), asmblocks.get("d_handleMouseClick"), asmblocks.get("handleMouseClick")));//checkHotbarKeys
-
-        //Write delegate for handleMouseClicked
-        transformer.add(new MethodWriter(ACC_PUBLIC, new ObfMapping(GuiContainer, "managerHandleMouseClick", "(Lnet/minecraft/inventory/Slot;III)V"), asmblocks.get("m_managerHandleMouseClick")));
-
-        //Inject mouseDragged hook after super call in mouseDragged
-        transformer.add(new MethodInjector(new ObfMapping(GuiContainer, "func_146273_a", "(IIIJ)V"), asmblocks.get("n_mouseDragged"), asmblocks.get("mouseDragged"), false));
-
-        //Inject overrideMouseUp at the start of mouseMovedOrUp
-        transformer.add(new MethodInjector(new ObfMapping(GuiContainer, "func_146286_b", "(III)V"), asmblocks.get("overrideMouseUp"), true));
-
-        //Inject mouseUp at the end of main elseif chain in mouseMovedOrUp
-        transformer.add(new MethodTransformer(new ObfMapping(GuiContainer, "func_146286_b", "(III)V"))
-        {
-            @Override
-            public void transform(MethodNode mv) {
-                ASMHelper.logger.debug("NEI: Injecting mouseUp call");
-                ASMBlock gotoBlock = asmblocks.get("n_mouseUpGoto");
-                ASMBlock needleBlock = asmblocks.get("n_mouseUp");
-                ASMBlock injectionBlock = asmblocks.get("mouseUp");
-
-                gotoBlock.mergeLabels(injectionBlock);
-                findOnce(mv.instructions, gotoBlock.list).replace(gotoBlock.list.list);
-
-                InsnListSection needle = findOnce(mv.instructions, needleBlock.list);
-                injectionBlock.mergeLabels(needleBlock.applyLabels(needle));
-                needle.insertBefore(injectionBlock.list.list);
-            }
-        });
-
-        //Replace general handleSlotClick call with delegate
-        transformer.add(new MethodReplacer(new ObfMapping(GuiContainer, "func_146984_a", "(Lnet/minecraft/inventory/Slot;III)V"),
-                asmblocks.get("d_handleSlotClick"), asmblocks.get("handleSlotClick")));
-
-        //Inject lastKeyTyped at the start of keyTyped
-        transformer.add(new MethodInjector(new ObfMapping(GuiContainer, "func_73869_a", "(CI)V"), asmblocks.get("lastKeyTyped"), true));
-
-        //Inject updateScreen hook after super call
-        transformer.add(new MethodInjector(new ObfMapping(GuiContainer, "func_73876_c", "()V"), asmblocks.get("n_updateScreen"), asmblocks.get("updateScreen"), false));
-
-        //Cancel tab click calls when tabs are obscured
-        transformer.add(new MethodInjector(new ObfMapping("net/minecraft/client/gui/inventory/GuiContainerCreative", "func_147049_a", "(Lnet/minecraft/creativetab/CreativeTabs;II)Z"),
-                asmblocks.get("handleTabClick"), true));
-
-        //Cancel tab tooltip rendering when tabs are obscured
-        transformer.add(new MethodInjector(new ObfMapping("net/minecraft/client/gui/inventory/GuiContainerCreative", "func_147052_b", "(Lnet/minecraft/creativetab/CreativeTabs;II)Z"),
-                asmblocks.get("renderTabTooltip"), true));
-
-        String[] buttons = new String[]{"CancelButton", "ConfirmButton", "PowerButton"};
-        String[] this_fields = new String[]{"field_146146_o", "field_146147_o", "field_146150_o"};
-        for(int i = 0; i < 3; i++) {
-            ObfMapping m = new ObfMapping("net/minecraft/client/gui/inventory/GuiBeacon$"+buttons[i], "func_146111_b", "(II)V");
-            InsnListSection l = asmblocks.get("beaconButtonObscured").list.copy();
-            FieldInsnNode this_ref = ((FieldInsnNode)l.get(1));
-            this_ref.owner = m.toClassloading().s_owner;
-            if(ObfMapping.obfuscated) //missing srg mappings for inner outer reference fields
-                this_ref.name = ObfMapping.obfMapper.mapFieldName(null, this_fields[i], null);
-            transformer.add(new MethodInjector(m, l.list, true));
-        }
-    }
-
-    private void addProtectedForwarder(ObfMapping called, ObfMapping caller) {
-
-        InsnList forward1 = new InsnList();
-        InsnList forward2 = new InsnList();
-
-        ObfMapping publicCall = new ObfMapping(called.s_owner, "public_"+called.s_name, called.s_desc);
-        Type[] args = Type.getArgumentTypes(caller.s_desc);
-        for(int i = 0; i < args.length; i++) {
-            forward1.add(new VarInsnNode(args[i].getOpcode(ILOAD), i));
-            forward2.add(new VarInsnNode(args[i].getOpcode(ILOAD), i));
-        }
-
-        forward1.add(publicCall.toInsn(INVOKEVIRTUAL));
-        forward2.add(called.toClassloading().toInsn(INVOKEVIRTUAL));
-        forward1.add(new InsnNode(Type.getReturnType(called.s_desc).getOpcode(IRETURN)));
-        forward2.add(new InsnNode(Type.getReturnType(called.s_desc).getOpcode(IRETURN)));
-
-        transformer.add(new MethodWriter(ACC_PUBLIC|ACC_STATIC, caller, forward1));
-        transformer.add(new MethodWriter(ACC_PUBLIC, publicCall, forward2));
-    }
-
-    private ObfMapping c_GuiContainer = new ObfMapping("net/minecraft/client/gui/inventory/GuiContainer").toClassloading();
-    /**
-     * Adds super.updateScreen() to non implementing GuiContainer subclasses
-     */
-    public byte[] transformSubclasses(String name, byte[] bytes) {
-        if (ClassHeirachyManager.classExtends(name, c_GuiContainer.javaClass())) {
-            ClassNode cnode = ASMHelper.createClassNode(bytes);
-
-            ObfMapping methodmap = new ObfMapping(cnode.superName, "func_73876_c", "()V").toClassloading();
-
-            InsnListSection supercall = new InsnListSection();
-            supercall.add(new VarInsnNode(ALOAD, 0));
-            supercall.add(methodmap.toInsn(INVOKESPECIAL));
-
-            boolean changed = false;
-            for (MethodNode mv : cnode.methods) {
-                if (methodmap.matches(mv)) {
-                    if (matches(new InsnListSection(mv.instructions), supercall, getControlFlowLabels(mv.instructions)) == null) {
-                        mv.instructions.insert(supercall.list);
-                        ASMHelper.logger.debug("Inserted super call into " + methodmap);
-                        changed = true;
-                    }
-                }
-            }
-
-            if (changed)
-                bytes = ASMHelper.createBytes(cnode, COMPUTE_MAXS | COMPUTE_FRAMES);
-        }
-        return bytes;
-    }
-
-    @Override
-    public byte[] transform(String name, String tname, byte[] bytes) {
-        if (bytes == null) return null;
-        try {
-            if (FMLLaunchHandler.side().isClient())
-                bytes = transformSubclasses(name, bytes);
-
-            bytes = transformer.transform(name, bytes);
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-
-        return bytes;
-    }
-}

src/codechicken/nei/config/GuiNEIOptionList.java

@@ -1,54 +0,0 @@
-package codechicken.nei.config;
-
-import codechicken.core.gui.GuiCCButton;
-import codechicken.nei.NEIClientConfig;
-import net.minecraft.client.gui.GuiConfirmOpenLink;
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.client.gui.GuiYesNoCallback;
-
-import java.awt.*;
-import java.net.URI;
-
-public class GuiNEIOptionList extends GuiOptionList implements GuiYesNoCallback
-{
-    private GuiCCButton patreonButton;
-
-    public GuiNEIOptionList(GuiScreen parent, OptionList optionList, boolean world) {
-        super(parent, optionList, world);
-    }
-
-    @Override
-    public void resize() {
-        super.resize();
-        patreonButton.x = width-73;
-        patreonButton.y = height-23;
-    }
-
-    @Override
-    public void addWidgets() {
-        super.addWidgets();
-        add(patreonButton = new PatreonButton(0, 0, 70, 20).setActionCommand("patreon"));
-    }
-
-    @Override
-    public void actionPerformed(String ident, Object... params) {
-        if (ident.equals("patreon")) {
-            GuiConfirmOpenLink gui = new GuiConfirmOpenLink(this, "patreon.com/cb", 0, true);
-            gui.func_146358_g();
-            mc.displayGuiScreen(gui);
-        } else
-            super.actionPerformed(ident, params);
-    }
-
-    @Override
-    public void confirmClicked(boolean yes, int id) {
-        if(yes && id == 0) {
-            try {
-                Desktop.getDesktop().browse(new URI("http://patreon.com/cb"));
-            } catch (Exception e) {
-                NEIClientConfig.logger.error("Failed to open patreon page", e);
-            }
-        }
-        mc.displayGuiScreen(this);
-    }
-}

src/codechicken/nei/config/OptionGamemodes.java

@@ -1,25 +0,0 @@
-package codechicken.nei.config;
-
-import codechicken.nei.Image;
-import codechicken.nei.LayoutManager;
-
-public class OptionGamemodes extends OptionStringSet
-{
-    public OptionGamemodes(String name)
-    {
-        super(name);
-
-        options.add("creative");
-        options.add("creative+");
-        options.add("adventure");
-    }
-    
-    @Override
-    public void drawIcons()
-    {
-        int x = buttonX();
-        LayoutManager.drawIcon(x+4, 4, new Image(132, 12, 12, 12)); x+=24;
-        LayoutManager.drawIcon(x+4, 4, new Image(156, 12, 12, 12)); x+=24;
-        LayoutManager.drawIcon(x+4, 4, new Image(168, 12, 12, 12)); x+=24;
-    }
-}

src/codechicken/nei/config/OptionKeyBind.java

@@ -1,79 +0,0 @@
-package codechicken.nei.config;
-
-import net.minecraft.util.EnumChatFormatting;
-import org.lwjgl.input.Keyboard;
-
-public class OptionKeyBind extends OptionButton
-{
-    private boolean hasFocus = false;
-
-    public OptionKeyBind(String name) {
-        super("keys." + name);
-    }
-
-    @Override
-    public void onMouseClicked(int mousex, int mousey, int button) {
-        hasFocus = false;
-    }
-
-    @Override
-    public void keyTyped(char c, int keycode) {
-        if (hasFocus) {
-            setValue(keycode);
-            hasFocus = false;
-        }
-    }
-
-    @Override
-    public boolean onClick(int button) {
-        if (button == 0) {
-            hasFocus = true;
-            return true;
-        }
-        if (button == 1 && getValue() != 0) {
-            setValue(0);
-            return true;
-        }
-        return false;
-    }
-
-    public boolean conflicted() {
-        if (getValue() == 0)
-            return false;
-
-        for (Option o : slot.options)
-            if (o instanceof OptionKeyBind && o != this && ((OptionKeyBind) o).getValue() == getValue())
-                return true;
-
-        return false;
-    }
-
-    public void setValue(int keycode) {
-        getTag().setIntValue(keycode);
-    }
-
-    public int getValue() {
-        return renderTag().getIntValue();
-    }
-
-    @Override
-    public String getPrefix() {
-        return translateN(name);
-    }
-
-    @Override
-    public String getButtonText() {
-        if (hasFocus)
-            return EnumChatFormatting.WHITE + "> " + EnumChatFormatting.YELLOW + "??? " + EnumChatFormatting.WHITE + "<";
-
-        if (conflicted())
-            return EnumChatFormatting.RED + Keyboard.getKeyName(getValue());
-
-        return Keyboard.getKeyName(getValue());
-    }
-
-    @Override
-    public int getTextColour(int mousex, int mousey) {
-        return -1;
-    }
-}

src/codechicken/nei/config/PatreonButton.java

@@ -1,23 +0,0 @@
-package codechicken.nei.config;
-
-import codechicken.core.gui.GuiCCButton;
-import codechicken.lib.render.CCRenderState;
-import org.lwjgl.opengl.GL11;
-
-public class PatreonButton extends GuiCCButton
-{
-    public PatreonButton(int x, int y, int width, int height) {
-        super(x, y, width, height, null);
-    }
-
-    @Override
-    public void drawButtonTex(int mousex, int mousey) {
-        super.drawButtonTex(mousex, mousey);
-
-        GL11.glColor4f(1, 1, 1, 1);
-        CCRenderState.changeTexture("nei:textures/patreonNeon.png");
-        int texh = height-4;
-        int texw = texh*4;
-        func_146110_a(x+width/2-texw/2, y+height/2-texh/2, 0, 0, texw, texh, texw, texh);
-    }
-}

src/codechicken/nei/recipe/DefaultOverlayHandler.java

@@ -1,321 +0,0 @@
-package codechicken.nei.recipe;
-
-import codechicken.lib.inventory.InventoryUtils;
-import codechicken.nei.FastTransferManager;
-import codechicken.nei.PositionedStack;
-import codechicken.nei.api.IOverlayHandler;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-
-import java.util.*;
-
-public class DefaultOverlayHandler implements IOverlayHandler
-{
-    public static class DistributedIngred
-    {
-        public DistributedIngred(ItemStack item)
-        {
-            stack = InventoryUtils.copyStack(item, 1);
-        }
-        
-        public ItemStack stack;
-        public int invAmount;
-        public int distributed;
-        public int numSlots;
-        public int recipeAmount;
-    }
-    
-    public static class IngredientDistribution
-    {
-        public IngredientDistribution(DistributedIngred distrib, ItemStack permutation)
-        {
-            this.distrib = distrib;
-            this.permutation = permutation;
-        }
-        
-        public DistributedIngred distrib;
-        public ItemStack permutation;
-        public Slot[] slots;
-    }
-    
-    public DefaultOverlayHandler(int x, int y)
-    {
-        offsetx = x;
-        offsety = y;
-    }
-    
-    public DefaultOverlayHandler()
-    {
-        this(5, 11);
-    }
-
-    public int offsetx;
-    public int offsety;
-    
-    @Override
-    public void overlayRecipe(GuiContainer gui, IRecipeHandler recipe, int recipeIndex, boolean shift)
-    {
-        List<PositionedStack> ingredients = recipe.getIngredientStacks(recipeIndex);
-        List<DistributedIngred> ingredStacks = getPermutationIngredients(ingredients);
-
-        if(!clearIngredients(gui, ingredients))
-            return;
-        
-        findInventoryQuantities(gui, ingredStacks);
-        
-        List<IngredientDistribution> assignedIngredients = assignIngredients(ingredients, ingredStacks);
-        if(assignedIngredients == null)
-            return;
-        
-        assignIngredSlots(gui, ingredients, assignedIngredients);
-        int quantity = calculateRecipeQuantity(assignedIngredients);
-        
-        if(quantity != 0)
-            moveIngredients(gui, assignedIngredients, quantity);             
-    }
-    
-    @SuppressWarnings("unchecked")
-    private boolean clearIngredients(GuiContainer gui, List<PositionedStack> ingreds) {
-        for(PositionedStack pstack : ingreds)
-            for(Slot slot : (List<Slot>)gui.inventorySlots.inventorySlots)
-                if(slot.xDisplayPosition == pstack.relx+offsetx && slot.yDisplayPosition == pstack.rely+offsety) {
-                    if(!slot.getHasStack())
-                        continue;
-                    
-                    FastTransferManager.clickSlot(gui, slot.slotNumber, 0, 1);
-                    if(slot.getHasStack())
-                        return false;
-                }
-        
-        return true;
-    }
-
-    @SuppressWarnings("unchecked")
-    private void moveIngredients(GuiContainer gui, List<IngredientDistribution> assignedIngredients, int quantity)
-    {        
-        for(IngredientDistribution distrib : assignedIngredients)
-        {
-            ItemStack pstack = distrib.permutation;
-            int transferCap = quantity*pstack.stackSize;
-            int transferred = 0;
-            
-            int destSlotIndex = 0;
-            Slot dest = distrib.slots[0];
-            int slotTransferred = 0;
-            int slotTransferCap = pstack.getMaxStackSize();
-            
-            for(Slot slot : (List<Slot>)gui.inventorySlots.inventorySlots)
-            {
-                if(!slot.getHasStack() || !canMoveFrom(slot, gui))
-                    continue;
-                
-                ItemStack stack = slot.getStack();
-                if(!canStack(stack, pstack))
-                    continue;
-                
-                FastTransferManager.clickSlot(gui, slot.slotNumber);
-                int amount = Math.min(transferCap-transferred, stack.stackSize);
-                for(int c = 0; c < amount; c++)
-                {
-                    FastTransferManager.clickSlot(gui, dest.slotNumber, 1);
-                    transferred++;
-                    slotTransferred++;
-                    if(slotTransferred >= slotTransferCap)
-                    {
-                        destSlotIndex++;
-                        if(destSlotIndex == distrib.slots.length)
-                        {
-                            dest = null;
-                            break;
-                        }
-                        dest = distrib.slots[destSlotIndex];
-                        slotTransferred = 0;
-                    }
-                }
-                FastTransferManager.clickSlot(gui, slot.slotNumber);
-                if(transferred >= transferCap || dest == null)
-                    break;
-            }
-        }       
-    }
-
-    private int calculateRecipeQuantity(List<IngredientDistribution> assignedIngredients)
-    {
-        int quantity = Integer.MAX_VALUE;
-        for(IngredientDistribution distrib : assignedIngredients)
-        {
-            DistributedIngred istack = distrib.distrib;
-            if(istack.numSlots == 0)
-                return 0;
-            
-            int allSlots = istack.invAmount;
-            if(allSlots/istack.numSlots > istack.stack.getMaxStackSize())
-                allSlots = istack.numSlots*istack.stack.getMaxStackSize();
-            
-            quantity = Math.min(quantity, allSlots/istack.distributed);
-        }
-        
-        return quantity;
-    }
-
-    private Slot[][] assignIngredSlots(GuiContainer gui, List<PositionedStack> ingredients, List<IngredientDistribution> assignedIngredients)
-    {
-        Slot[][] recipeSlots = mapIngredSlots(gui, ingredients);//setup the slot map
-        
-        HashMap<Slot, Integer> distribution = new HashMap<Slot, Integer>();
-        for(int i = 0; i < recipeSlots.length; i++)
-            for(Slot slot : recipeSlots[i])
-                if(!distribution.containsKey(slot))
-                    distribution.put(slot, -1);
-        
-        HashSet<Slot> avaliableSlots = new HashSet<Slot>(distribution.keySet());
-        HashSet<Integer> remainingIngreds = new HashSet<Integer>();
-        ArrayList<LinkedList<Slot>> assignedSlots = new ArrayList<LinkedList<Slot>>();
-        for(int i = 0; i < ingredients.size(); i++)
-        {
-            remainingIngreds.add(i);
-            assignedSlots.add(new LinkedList<Slot>());
-        }
-                
-        while(avaliableSlots.size() > 0 && remainingIngreds.size() > 0)
-        {
-            for(Iterator<Integer> iterator = remainingIngreds.iterator(); iterator.hasNext();)
-            {
-                int i = iterator.next();
-                boolean assigned = false;
-                DistributedIngred istack = assignedIngredients.get(i).distrib;
-                
-                for(Slot slot : recipeSlots[i])
-                {
-                    if(avaliableSlots.contains(slot))
-                    {
-                        avaliableSlots.remove(slot);
-                        if(slot.getHasStack())
-                            continue;
-                        
-                        istack.numSlots++;
-                        assignedSlots.get(i).add(slot);
-                        assigned = true;
-                        break;
-                    }
-                }
-                
-                if(!assigned || istack.numSlots*istack.stack.getMaxStackSize() >= istack.invAmount)
-                    iterator.remove();
-            }
-        }
-        
-        for(int i = 0; i < ingredients.size(); i++)
-            assignedIngredients.get(i).slots = assignedSlots.get(i).toArray(new Slot[0]);
-        return recipeSlots;
-    }
-
-    private List<IngredientDistribution> assignIngredients(List<PositionedStack> ingredients, List<DistributedIngred> ingredStacks)
-    {
-        ArrayList<IngredientDistribution> assignedIngredients = new ArrayList<IngredientDistribution>();
-        for(PositionedStack posstack : ingredients)//assign what we need and have
-        {
-            DistributedIngred biggestIngred = null;
-            ItemStack permutation = null;
-            int biggestSize = 0;
-            for(ItemStack pstack : posstack.items)
-            {
-                for(int j = 0; j < ingredStacks.size(); j++)
-                {
-                    DistributedIngred istack = ingredStacks.get(j);
-                    if(!canStack(pstack, istack.stack) || istack.invAmount-istack.distributed < pstack.stackSize)
-                        continue;
-                    
-                    int relsize = (istack.invAmount-istack.invAmount/istack.recipeAmount*istack.distributed)/pstack.stackSize;
-                    if(relsize > biggestSize)
-                    {
-                        biggestSize = relsize;
-                        biggestIngred = istack;
-                        permutation = pstack;
-                        break;
-                    }
-                }
-            }
-            
-            if(biggestIngred == null)//not enough ingreds
-                return null;
-
-            biggestIngred.distributed+=permutation.stackSize;
-            assignedIngredients.add(new IngredientDistribution(biggestIngred, permutation));
-        }
-        
-        return assignedIngredients;
-    }
-
-    @SuppressWarnings("unchecked")
-    private void findInventoryQuantities(GuiContainer gui, List<DistributedIngred> ingredStacks)
-    {
-        for(Slot slot : (List<Slot>)gui.inventorySlots.inventorySlots)//work out how much we have to go round
-        {
-            if(slot.getHasStack() && canMoveFrom(slot, gui))
-            {
-                ItemStack pstack = slot.getStack();
-                DistributedIngred istack = findIngred(ingredStacks, pstack);
-                if(istack != null)
-                    istack.invAmount+=pstack.stackSize;
-            }
-        }
-    }
-
-    private List<DistributedIngred> getPermutationIngredients(List<PositionedStack> ingredients)
-    {
-        ArrayList<DistributedIngred> ingredStacks = new ArrayList<DistributedIngred>();
-        for(PositionedStack posstack : ingredients)//work out what we need
-        {
-            for(ItemStack pstack : posstack.items)
-            {
-                DistributedIngred istack = findIngred(ingredStacks, pstack);
-                if(istack == null)
-                    ingredStacks.add(istack = new DistributedIngred(pstack));
-                istack.recipeAmount+=pstack.stackSize;
-            }
-        }
-        return ingredStacks;
-    }
-
-    public boolean canMoveFrom(Slot slot, GuiContainer gui) {
-        return slot.inventory instanceof InventoryPlayer;
-    }
-
-    @SuppressWarnings("unchecked")
-    public Slot[][] mapIngredSlots(GuiContainer gui, List<PositionedStack> ingredients)
-    {
-        Slot[][] recipeSlotList = new Slot[ingredients.size()][];
-        for(int i = 0; i < ingredients.size(); i++)//identify slots
-        {
-            LinkedList<Slot> recipeSlots = new LinkedList<Slot>();
-            PositionedStack pstack = ingredients.get(i);
-            for(Slot slot : (List<Slot>)gui.inventorySlots.inventorySlots)
-            {
-                if(slot.xDisplayPosition == pstack.relx+offsetx && slot.yDisplayPosition == pstack.rely+offsety)
-                {
-                    recipeSlots.add(slot);
-                    break;
-                }
-            }
-            recipeSlotList[i] = recipeSlots.toArray(new Slot[0]);
-        }
-        return recipeSlotList;
-    }
-
-    public DistributedIngred findIngred(List<DistributedIngred> ingredStacks, ItemStack pstack)
-    {
-        for(DistributedIngred istack : ingredStacks)
-            if(canStack(pstack, istack.stack))
-                return istack;
-        return null;
-    }
-
-    protected boolean canStack(ItemStack stack1, ItemStack stack2) {
-        if (stack1 == null || stack2 == null)
-            return true;
-        return stack1.getItem() == stack2.getItem() && stack1.getItemDamage() == stack2.getItemDamage() && ItemStack.areItemStackTagsEqual(stack2, stack1);
-    }
-}

src/codechicken/nei/recipe/FuelRecipeHandler.java

@@ -1,99 +0,0 @@
-package codechicken.nei.recipe;
-
-import codechicken.nei.NEIClientUtils;
-import codechicken.nei.PositionedStack;
-import net.minecraft.item.ItemStack;
-import net.minecraft.item.crafting.FurnaceRecipes;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import static codechicken.nei.NEIClientUtils.translate;
-
-public class FuelRecipeHandler extends FurnaceRecipeHandler
-{
-    public class CachedFuelRecipe extends CachedRecipe
-    {
-        public FuelPair fuel;
-
-        public CachedFuelRecipe(FuelPair fuel) {
-            this.fuel = fuel;
-        }
-
-        @Override
-        public PositionedStack getIngredient() {
-            return mfurnace.get(cycleticks / 48 % mfurnace.size()).ingred;
-        }
-
-        @Override
-        public PositionedStack getResult() {
-            return mfurnace.get(cycleticks / 48 % mfurnace.size()).result;
-        }
-
-        @Override
-        public PositionedStack getOtherStack() {
-            return fuel.stack;
-        }
-    }
-
-    private ArrayList<SmeltingPair> mfurnace = new ArrayList<FurnaceRecipeHandler.SmeltingPair>();
-
-    public FuelRecipeHandler() {
-        super();
-        loadAllSmelting();
-    }
-
-    public String getRecipeName() {
-        return NEIClientUtils.translate("recipe.fuel");
-    }
-
-    private void loadAllSmelting() {
-        Map<ItemStack, ItemStack> recipes = (Map<ItemStack, ItemStack>) FurnaceRecipes.smelting().getSmeltingList();
-
-        for (Entry<ItemStack, ItemStack> recipe : recipes.entrySet())
-            mfurnace.add(new SmeltingPair(recipe.getKey(), recipe.getValue()));
-    }
-
-    @Override
-    public void loadCraftingRecipes(String outputId, Object... results) {
-        if (outputId.equals("fuel") && getClass() == FuelRecipeHandler.class)
-            for (FuelPair fuel : afuels)
-                arecipes.add(new CachedFuelRecipe(fuel));
-    }
-
-    public void loadUsageRecipes(ItemStack ingredient) {
-        for (FuelPair fuel : afuels)
-            if (fuel.stack.contains(ingredient))
-                arecipes.add(new CachedFuelRecipe(fuel));
-    }
-
-    public String getOverlayIdentifier() {
-        return "fuel";
-    }
-
-    @Override
-    public List<String> handleItemTooltip(GuiRecipe gui, ItemStack stack, List<String> currenttip, int recipe) {
-        CachedFuelRecipe crecipe = (CachedFuelRecipe) arecipes.get(recipe);
-        FuelPair fuel = crecipe.fuel;
-        float burnTime = fuel.burnTime / 200F;
-
-        if (gui.isMouseOver(fuel.stack, recipe) && burnTime < 1) {
-            burnTime = 1F / burnTime;
-            String s_time = Float.toString(burnTime);
-            if (burnTime == Math.round(burnTime))
-                s_time = Integer.toString((int) burnTime);
-
-            currenttip.add(translate("recipe.fuel.required", s_time));
-        } else if ((gui.isMouseOver(crecipe.getResult(), recipe) || gui.isMouseOver(crecipe.getIngredient(), recipe)) && burnTime > 1) {
-            String s_time = Float.toString(burnTime);
-            if (burnTime == Math.round(burnTime))
-                s_time = Integer.toString((int) burnTime);
-
-            currenttip.add(translate("recipe.fuel." + (gui.isMouseOver(crecipe.getResult(), recipe) ? "produced" : "processed"), s_time));
-        }
-
-        return currenttip;
-    }
-}

src/codechicken/nei/recipe/GuiCraftingRecipe.java

@@ -1,52 +0,0 @@
-package codechicken.nei.recipe;
-
-import codechicken.core.TaskProfiler;
-import codechicken.nei.NEIClientUtils;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.inventory.GuiContainer;
-
-import java.util.ArrayList;
-
-public class GuiCraftingRecipe extends GuiRecipe
-{
-    public static boolean openRecipeGui(String outputId, Object... results) {
-        Minecraft mc = NEIClientUtils.mc();
-        GuiContainer prevscreen = mc.currentScreen instanceof GuiContainer ? (GuiContainer) mc.currentScreen : null;
-
-        TaskProfiler profiler = ProfilerRecipeHandler.getProfiler();
-        ArrayList<ICraftingHandler> handlers = new ArrayList<ICraftingHandler>();
-        for (ICraftingHandler craftinghandler : craftinghandlers) {
-            profiler.start(craftinghandler.getRecipeName());
-            ICraftingHandler handler = craftinghandler.getRecipeHandler(outputId, results);
-            if (handler.numRecipes() > 0)
-                handlers.add(handler);
-        }
-        profiler.end();
-        if (handlers.isEmpty())
-            return false;
-
-        mc.displayGuiScreen(new GuiCraftingRecipe(prevscreen, handlers));
-        return true;
-    }
-
-    private GuiCraftingRecipe(GuiContainer prevgui, ArrayList<ICraftingHandler> handlers) {
-        super(prevgui);
-        currenthandlers = handlers;
-    }
-
-    public static void registerRecipeHandler(ICraftingHandler handler) {
-        for (ICraftingHandler handler1 : craftinghandlers)
-            if (handler1.getClass() == handler.getClass())
-                return;
-
-        craftinghandlers.add(handler);
-    }
-
-    public ArrayList<? extends IRecipeHandler> getCurrentRecipeHandlers() {
-        return currenthandlers;
-    }
-
-    public ArrayList<ICraftingHandler> currenthandlers;
-
-    public static ArrayList<ICraftingHandler> craftinghandlers = new ArrayList<ICraftingHandler>();
-}

src/codechicken/nei/recipe/GuiRecipe.java

@@ -1,303 +0,0 @@
-package codechicken.nei.recipe;
-
-import codechicken.lib.gui.GuiDraw;
-import codechicken.lib.render.CCRenderState;
-import codechicken.nei.*;
-import codechicken.nei.LayoutManager;
-import codechicken.nei.api.IGuiContainerOverlay;
-import codechicken.nei.api.IOverlayHandler;
-import codechicken.nei.api.IRecipeOverlayRenderer;
-import codechicken.nei.guihook.GuiContainerManager;
-import codechicken.nei.guihook.IContainerTooltipHandler;
-import codechicken.nei.guihook.IGuiClientSide;
-import codechicken.nei.guihook.IGuiHandleMouseWheel;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-import org.lwjgl.opengl.GL11;
-
-import java.awt.*;
-import java.util.ArrayList;
-import java.util.List;
-
-public abstract class GuiRecipe extends GuiContainer implements IGuiContainerOverlay, IGuiClientSide, IGuiHandleMouseWheel, IContainerTooltipHandler
-{
-    public ArrayList<? extends IRecipeHandler> currenthandlers = new ArrayList<IRecipeHandler>();
-
-    public int page;
-    public int recipetype;
-    public ContainerRecipe slotcontainer;
-    public GuiContainer firstGui;
-    public GuiContainer prevGui;
-    public GuiButton nextpage;
-    public GuiButton prevpage;
-    public GuiButton overlay1;
-    public GuiButton overlay2;
-
-    protected GuiRecipe(GuiContainer prevgui) {
-        super(new ContainerRecipe());
-        slotcontainer = (ContainerRecipe) inventorySlots;
-
-        this.prevGui = prevgui;
-        this.firstGui = prevgui;
-        if (prevgui instanceof IGuiContainerOverlay)
-            this.firstGui = ((IGuiContainerOverlay) prevgui).getFirstScreen();
-    }
-
-    @Override
-    public void initGui() {
-        super.initGui();
-
-        currenthandlers = getCurrentRecipeHandlers();
-        GuiButton nexttype = new GuiNEIButton(0, width / 2 - 70, (height - ySize) / 2 + 3, 13, 12, "<");
-        GuiButton prevtype = new GuiNEIButton(1, width / 2 + 57, (height - ySize) / 2 + 3, 13, 12, ">");
-        nextpage = new GuiNEIButton(2, width / 2 - 70, (height + ySize) / 2 - 18, 13, 12, "<");
-        prevpage = new GuiNEIButton(3, width / 2 + 57, (height + ySize) / 2 - 18, 13, 12, ">");
-        overlay1 = new GuiNEIButton(4, width / 2 + 65, (height - ySize) / 2 + 63, 13, 12, "?");
-        overlay2 = new GuiNEIButton(5, width / 2 + 65, (height - ySize) / 2 + 128, 13, 12, "?");
-        buttonList.add(nexttype);
-        buttonList.add(prevtype);
-        buttonList.add(nextpage);
-        buttonList.add(prevpage);
-        buttonList.add(overlay1);
-        buttonList.add(overlay2);
-
-        if (currenthandlers.size() == 1) {
-            nexttype.visible = false;
-            prevtype.visible = false;
-        }
-        refreshPage();
-    }
-
-    @Override
-    public void keyTyped(char c, int i) {
-        if (i == 1)//esc
-        {
-            mc.displayGuiScreen(firstGui);
-            return;
-        }
-        if (GuiContainerManager.getManager(this).lastKeyTyped(i, c))
-            return;
-
-        IRecipeHandler recipehandler = currenthandlers.get(recipetype);
-        for (int recipe = page * recipehandler.recipiesPerPage(); recipe < recipehandler.numRecipes() && recipe < (page + 1) * recipehandler.recipiesPerPage(); recipe++)
-            if (recipehandler.keyTyped(this, c, i, recipe))
-                return;
-
-        if (i == mc.gameSettings.keyBindInventory.getKeyCode())
-            mc.displayGuiScreen(firstGui);
-        else if (i == NEIClientConfig.getKeyBinding("gui.back"))
-            mc.displayGuiScreen(prevGui);
-
-    }
-
-    @Override
-    protected void mouseClicked(int par1, int par2, int par3) {
-        IRecipeHandler recipehandler = currenthandlers.get(recipetype);
-        for (int recipe = page * recipehandler.recipiesPerPage(); recipe < recipehandler.numRecipes() && recipe < (page + 1) * recipehandler.recipiesPerPage(); recipe++)
-            if (recipehandler.mouseClicked(this, par3, recipe))
-                return;
-
-        super.mouseClicked(par1, par2, par3);
-    }
-
-    @Override
-    protected void actionPerformed(GuiButton guibutton) {
-        super.actionPerformed(guibutton);
-        switch (guibutton.id) {
-            case 0:
-                prevType();
-                break;
-            case 1:
-                nextType();
-                break;
-            case 2:
-                prevPage();
-                break;
-            case 3:
-                nextPage();
-                break;
-            case 4:
-                overlayRecipe(page * currenthandlers.get(recipetype).recipiesPerPage());
-                break;
-            case 5:
-                overlayRecipe(page * currenthandlers.get(recipetype).recipiesPerPage() + 1);
-                break;
-        }
-    }
-
-    @Override
-    public void updateScreen() {
-        super.updateScreen();
-        currenthandlers.get(recipetype).onUpdate();
-        refreshPage();
-    }
-
-    @Override
-    public List<String> handleTooltip(GuiContainer gui, int mousex, int mousey, List<String> currenttip) {
-        IRecipeHandler recipehandler = currenthandlers.get(recipetype);
-        for (int i = page * recipehandler.recipiesPerPage(); i < recipehandler.numRecipes() && i < (page + 1) * recipehandler.recipiesPerPage(); i++)
-            currenttip = recipehandler.handleTooltip(this, currenttip, i);
-
-        return currenttip;
-    }
-
-    @Override
-    public List<String> handleItemTooltip(GuiContainer gui, ItemStack stack, int mousex, int mousey, List<String> currenttip) {
-        IRecipeHandler recipehandler = currenthandlers.get(recipetype);
-        for (int i = page * recipehandler.recipiesPerPage(); i < recipehandler.numRecipes() && i < (page + 1) * recipehandler.recipiesPerPage(); i++)
-            currenttip = recipehandler.handleItemTooltip(this, stack, currenttip, i);
-
-        return currenttip;
-    }
-
-    @Override
-    public List<String> handleItemDisplayName(GuiContainer gui, ItemStack itemstack, List<String> currenttip) {
-        return currenttip;
-    }
-
-    private void nextPage() {
-        page++;
-        if (page > (currenthandlers.get(recipetype).numRecipes() - 1) / currenthandlers.get(recipetype).recipiesPerPage())
-            page = 0;
-    }
-
-    private void prevPage() {
-        page--;
-        if (page < 0)
-            page = (currenthandlers.get(recipetype).numRecipes() - 1) / currenthandlers.get(recipetype).recipiesPerPage();
-    }
-
-    private void nextType() {
-        recipetype++;
-        if (recipetype >= currenthandlers.size())
-            recipetype = 0;
-        page = 0;
-    }
-
-    private void prevType() {
-        recipetype--;
-        if (recipetype < 0)
-            recipetype = currenthandlers.size() - 1;
-        page = 0;
-    }
-
-    private void overlayRecipe(int recipe) {
-        IRecipeOverlayRenderer renderer = currenthandlers.get(recipetype).getOverlayRenderer(firstGui, recipe);
-        IOverlayHandler handler = currenthandlers.get(recipetype).getOverlayHandler(firstGui, recipe);
-        boolean shift = NEIClientUtils.shiftKey();
-
-        if (handler != null && (renderer == null || shift)) {
-            mc.displayGuiScreen(firstGui);
-            handler.overlayRecipe(firstGui, currenthandlers.get(recipetype), recipe, shift);
-        } else if (renderer != null) {
-            mc.displayGuiScreen(firstGui);
-            LayoutManager.overlayRenderer = renderer;
-        }
-    }
-
-    public void refreshPage() {
-        refreshSlots();
-
-        IRecipeHandler handler = currenthandlers.get(recipetype);
-        boolean multiplepages = handler.numRecipes() > handler.recipiesPerPage();
-        nextpage.visible = multiplepages;
-        prevpage.visible = multiplepages;
-
-        if(firstGui != null) {
-            overlay1.yPosition = (height - ySize) / 2 + (handler.recipiesPerPage() == 2 ? 63 : 128);
-            overlay1.visible = handler.hasOverlay(firstGui, firstGui.inventorySlots, page * handler.recipiesPerPage());
-            overlay2.visible = handler.recipiesPerPage() == 2 && page * handler.recipiesPerPage() + 1 < handler.numRecipes() &&
-                    handler.hasOverlay(firstGui, firstGui.inventorySlots, page * handler.recipiesPerPage() + 1);
-        } else {
-            overlay1.visible = overlay2.visible = false;
-        }
-    }
-
-    private void refreshSlots() {
-        slotcontainer.inventorySlots.clear();
-        IRecipeHandler recipehandler = currenthandlers.get(recipetype);
-        for (int i = page * recipehandler.recipiesPerPage(); i < recipehandler.numRecipes() && i < (page + 1) * recipehandler.recipiesPerPage(); i++) {
-            Point p = getRecipePosition(i);
-
-            List<PositionedStack> stacks = recipehandler.getIngredientStacks(i);
-            for (PositionedStack stack : stacks)
-                slotcontainer.addSlot(stack, p.x, p.y);
-
-            stacks = recipehandler.getOtherStacks(i);
-            for (PositionedStack stack : stacks)
-                slotcontainer.addSlot(stack, p.x, p.y);
-
-            PositionedStack result = recipehandler.getResultStack(i);
-            if (result != null)
-                slotcontainer.addSlot(result, p.x, p.y);
-        }
-    }
-
-    @Override
-    protected void drawGuiContainerForegroundLayer(int par1, int par2) {
-        GuiContainerManager.enable2DRender();
-
-        IRecipeHandler recipehandler = currenthandlers.get(recipetype);
-        String s = recipehandler.getRecipeName();
-        fontRendererObj.drawString(s, (xSize - fontRendererObj.getStringWidth(s)) / 2, 5, 0x404040);
-        s = NEIClientUtils.translate("recipe.page", page + 1, (currenthandlers.get(recipetype).numRecipes() - 1) / recipehandler.recipiesPerPage() + 1);
-        fontRendererObj.drawString(s, (xSize - fontRendererObj.getStringWidth(s)) / 2, ySize - 16, 0x404040);
-
-        GL11.glPushMatrix();
-        GL11.glTranslatef(5, 16, 0);
-        for (int i = page * recipehandler.recipiesPerPage(); i < recipehandler.numRecipes() && i < (page + 1) * recipehandler.recipiesPerPage(); i++) {
-            recipehandler.drawForeground(i);
-            GL11.glTranslatef(0, 65, 0);
-        }
-        GL11.glPopMatrix();
-    }
-
-    @Override
-    protected void drawGuiContainerBackgroundLayer(float f, int mx, int my) {
-        GL11.glColor4f(1, 1, 1, 1);
-        CCRenderState.changeTexture("nei:textures/gui/recipebg.png");
-        int j = (width - xSize) / 2;
-        int k = (height - ySize) / 2;
-        drawTexturedModalRect(j, k, 0, 0, xSize, ySize);
-
-        GL11.glPushMatrix();
-        GL11.glTranslatef(j + 5, k + 16, 0);
-        IRecipeHandler recipehandler = currenthandlers.get(recipetype);
-        for (int i = page * recipehandler.recipiesPerPage(); i < recipehandler.numRecipes() && i < (page + 1) * recipehandler.recipiesPerPage(); i++) {
-            recipehandler.drawBackground(i);
-            GL11.glTranslatef(0, 65, 0);
-        }
-        GL11.glPopMatrix();
-    }
-
-    @Override
-    public GuiContainer getFirstScreen() {
-        return firstGui;
-    }
-
-    public boolean isMouseOver(PositionedStack stack, int recipe) {
-        Slot stackSlot = slotcontainer.getSlotWithStack(stack, getRecipePosition(recipe).x, getRecipePosition(recipe).y);
-        Point mousepos = GuiDraw.getMousePosition();
-        Slot mouseoverSlot = getSlotAtPosition(mousepos.x, mousepos.y);
-
-        return stackSlot == mouseoverSlot;
-    }
-
-    public Point getRecipePosition(int recipe) {
-        return new Point(5, 16 + (recipe % currenthandlers.get(recipetype).recipiesPerPage()) * 65);
-    }
-
-    @Override
-    public void mouseScrolled(int i) {
-        if (new Rectangle(guiLeft, guiTop, xSize, ySize).contains(GuiDraw.getMousePosition())) {
-            if (i > 0)
-                prevPage();
-            else
-                nextPage();
-        }
-    }
-
-    public abstract ArrayList<? extends IRecipeHandler> getCurrentRecipeHandlers();
-}

src/codechicken/nei/recipe/GuiUsageRecipe.java

@@ -1,53 +0,0 @@
-package codechicken.nei.recipe;
-
-import codechicken.core.TaskProfiler;
-import codechicken.nei.NEIClientUtils;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.inventory.GuiContainer;
-
-import java.util.ArrayList;
-
-public class GuiUsageRecipe extends GuiRecipe
-{
-    public static boolean openRecipeGui(String inputId, Object... ingredients) {
-        Minecraft mc = NEIClientUtils.mc();
-        GuiContainer prevscreen = mc.currentScreen instanceof GuiContainer ? (GuiContainer) mc.currentScreen : null;
-
-        TaskProfiler profiler = ProfilerRecipeHandler.getProfiler();
-        ArrayList<IUsageHandler> handlers = new ArrayList<IUsageHandler>();
-        for (IUsageHandler usagehandler : usagehandlers) {
-            profiler.start(usagehandler.getRecipeName());
-            IUsageHandler handler = usagehandler.getUsageHandler(inputId, ingredients);
-            if (handler.numRecipes() > 0)
-                handlers.add(handler);
-        }
-        profiler.end();
-        if (handlers.isEmpty())
-            return false;
-
-        mc.displayGuiScreen(new GuiUsageRecipe(prevscreen, handlers));
-        return true;
-    }
-
-    private GuiUsageRecipe(GuiContainer prevgui, ArrayList<IUsageHandler> handlers) {
-        super(prevgui);
-        currenthandlers = handlers;
-    }
-
-    public static void registerUsageHandler(IUsageHandler handler) {
-        for (IUsageHandler handler1 : usagehandlers) {
-            if (handler1.getClass() == handler.getClass())
-                return;
-        }
-
-        usagehandlers.add(handler);
-    }
-
-    public ArrayList<? extends IRecipeHandler> getCurrentRecipeHandlers() {
-        return currenthandlers;
-    }
-
-    public ArrayList<IUsageHandler> currenthandlers;
-
-    public static ArrayList<IUsageHandler> usagehandlers = new ArrayList<IUsageHandler>();
-}

src/codechicken/nei/recipe/ProfilerRecipeHandler.java

@@ -1,175 +0,0 @@
-package codechicken.nei.recipe;
-
-import codechicken.core.TaskProfiler;
-import codechicken.core.TaskProfiler.ProfilerResult;
-import codechicken.nei.NEIClientConfig;
-import codechicken.nei.NEIClientUtils;
-import codechicken.nei.PositionedStack;
-import codechicken.nei.api.IOverlayHandler;
-import codechicken.nei.api.IRecipeOverlayRenderer;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.inventory.Container;
-import net.minecraft.item.ItemStack;
-
-import java.text.DecimalFormat;
-import java.util.*;
-
-import static codechicken.lib.gui.GuiDraw.drawString;
-import static codechicken.lib.gui.GuiDraw.getStringWidth;
-
-public class ProfilerRecipeHandler implements ICraftingHandler, IUsageHandler
-{
-    private static TaskProfiler profiler = new TaskProfiler();
-
-    public static TaskProfiler getProfiler()
-    {
-        profiler.clear();
-        return profiler;
-    }
-    
-    private boolean crafting;
-    
-    public ProfilerRecipeHandler(boolean crafting)
-    {
-        this.crafting = crafting;
-    }
-    
-    @Override
-    public String getRecipeName()
-    {
-        return NEIClientUtils.translate("recipe.profiler."+(crafting ? "crafting" : "usage"));
-    }
-
-    @Override
-    public int numRecipes()
-    {
-        if(!NEIClientConfig.getBooleanSetting("inventory.profileRecipes"))
-            return 0;
-        
-        return (int) Math.ceil(((crafting ? 
-                GuiCraftingRecipe.craftinghandlers.size() : 
-                GuiUsageRecipe.usagehandlers.size())-1)/6D);
-    }
-
-    @Override
-    public void drawBackground(int recipe)
-    {
-    }
-
-    @Override
-    public void drawForeground(int recipe)
-    {
-        List<ProfilerResult> results = profiler.getResults();
-        for(Iterator<ProfilerResult> it = results.iterator(); it.hasNext();)
-            if(it.next().name.equals(getRecipeName()))
-                it.remove();
-        
-        Collections.sort(results, new Comparator<ProfilerResult>()
-        {
-            @Override
-            public int compare(ProfilerResult o1, ProfilerResult o2)
-            {
-                return o1.time < o2.time ? 1 : -1;
-            }
-        });
-        
-        for(int i = recipe*6; i < results.size() && i < (recipe+1)*6; i++)
-        {
-            ProfilerResult r = results.get(i);
-            int y = (i%6)*20+6;
-            drawString(r.name, 8, y, 0xFF808080, false);
-
-            DecimalFormat format = new DecimalFormat("0.00");
-            String s = format.format(r.fraction*100)+"%";
-            if(r.time < 1000000L)
-                s+= " ("+(r.time/1000)+"us)";
-            else
-                s+= " ("+(r.time/1000000)+"ms)";
-            
-            drawString(s, 156-getStringWidth(s), y+10, 0xFF404040, false);
-        }
-    }
-
-    @Override
-    public ArrayList<PositionedStack> getIngredientStacks(int recipe)
-    {
-        return new ArrayList<PositionedStack>();
-    }
-
-    @Override
-    public ArrayList<PositionedStack> getOtherStacks(int recipetype)
-    {
-        return new ArrayList<PositionedStack>();
-    }
-
-    @Override
-    public PositionedStack getResultStack(int recipe)
-    {
-        return null;
-    }
-
-    @Override
-    public void onUpdate()
-    {
-    }
-
-    @Override
-    public boolean hasOverlay(GuiContainer gui, Container container, int recipe)
-    {
-        return false;
-    }
-
-    @Override
-    public IRecipeOverlayRenderer getOverlayRenderer(GuiContainer gui, int recipe)
-    {
-        return null;
-    }
-
-    @Override
-    public IOverlayHandler getOverlayHandler(GuiContainer gui, int recipe)
-    {
-        return null;
-    }
-
-    @Override
-    public int recipiesPerPage()
-    {
-        return 1;
-    }
-
-    @Override
-    public List<String> handleTooltip(GuiRecipe gui, List<String> currenttip, int recipe)
-    {
-        return currenttip;
-    }
-
-    @Override
-    public List<String> handleItemTooltip(GuiRecipe gui, ItemStack stack, List<String> currenttip, int recipe)
-    {
-        return currenttip;
-    }
-
-    @Override
-    public boolean keyTyped(GuiRecipe gui, char keyChar, int keyCode, int recipe)
-    {
-        return false;
-    }
-
-    @Override
-    public boolean mouseClicked(GuiRecipe gui, int button, int recipe)
-    {
-        return false;
-    }
-
-    @Override
-    public IUsageHandler getUsageHandler(String inputId, Object... ingredients)
-    {
-        return this;
-    }
-
-    @Override
-    public ICraftingHandler getRecipeHandler(String outputId, Object... results)
-    {
-        return this;
-    }
-}

src/codechicken/nei/recipe/RecipeItemInputHandler.java

@@ -1,80 +0,0 @@
-package codechicken.nei.recipe;
-
-import codechicken.nei.NEIClientConfig;
-import codechicken.nei.NEIClientUtils;
-import codechicken.nei.guihook.GuiContainerManager;
-import codechicken.nei.guihook.IContainerInputHandler;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.item.ItemStack;
-
-public class RecipeItemInputHandler implements IContainerInputHandler
-{
-    @Override
-    public boolean lastKeyTyped(GuiContainer gui, char keyChar, int keyCode)
-    {
-        ItemStack stackover = GuiContainerManager.getStackMouseOver(gui);
-        if(stackover == null)
-            return false;
-                
-        if(keyCode == NEIClientConfig.getKeyBinding("gui.usage") || (keyCode == NEIClientConfig.getKeyBinding("gui.recipe") && NEIClientUtils.shiftKey()))
-            return GuiUsageRecipe.openRecipeGui("item", stackover.copy());
-        
-        if(keyCode == NEIClientConfig.getKeyBinding("gui.recipe"))
-            return GuiCraftingRecipe.openRecipeGui("item", stackover.copy());
-        
-        return false;
-    }
-
-    @Override
-    public boolean mouseClicked(GuiContainer gui, int mousex, int mousey, int button)
-    {
-        ItemStack stackover = GuiContainerManager.getStackMouseOver(gui);
-        if(stackover == null || !(gui instanceof GuiRecipe))
-            return false;
-        
-        if(button == 0)
-            return GuiCraftingRecipe.openRecipeGui("item", stackover.copy());
-
-        if(button == 1)
-            return GuiUsageRecipe.openRecipeGui("item", stackover.copy());
-        
-        return false;
-    }
-
-    @Override
-    public void onKeyTyped(GuiContainer gui, char keyChar, int keyID) 
-    {
-    }
-
-    @Override
-    public void onMouseClicked(GuiContainer gui, int mousex, int mousey, int button) 
-    {
-    }
-
-    @Override
-    public void onMouseUp(GuiContainer gui, int mousex, int mousey, int button) 
-    {
-    }
-
-    @Override
-    public boolean keyTyped(GuiContainer gui, char keyChar, int keyID)
-    {
-        return false;
-    }
-    
-    @Override
-    public boolean mouseScrolled(GuiContainer gui, int mousex, int mousey, int scrolled)
-    {
-        return false;
-    }
-    
-    @Override
-    public void onMouseScrolled(GuiContainer gui, int mousex, int mousey, int scrolled)
-    {
-    }
-    
-    @Override
-    public void onMouseDragged(GuiContainer gui, int mousex, int mousey, int button, long heldTime)
-    {
-    }
-}

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

@@ -1,11 +1,10 @@
 package codechicken.nei;
 
-import java.util.List;
-
 import static codechicken.lib.gui.GuiDraw.getStringWidth;
 
-public abstract class Button extends Widget
-{
+import java.util.List;
+
+public abstract class Button extends Widget {
     public Button(String s) {
         label = s;
     }
@@ -25,9 +24,7 @@ public abstract class Button extends Widget
 
     @Override
     public boolean handleClick(int mx, int my, int button) {
-        if (button == 1 || button == 0)
-            if (onButtonPress(button == 1))
-                NEIClientUtils.playClickSound();
+        if (button == 1 || button == 0) if (onButtonPress(button == 1)) NEIClientUtils.playClickSound();
         return true;
     }
 
@@ -39,12 +36,13 @@ public abstract class Button extends Widget
 
     @Override
     public List<String> handleTooltip(int mx, int my, List<String> tooltip) {
-        if (!contains(mx, my))
-            return tooltip;
+        if (!contains(mx, my)) return tooltip;
+
+        final String tip = getButtonTip();
+        if (tip != null) tooltip.add(tip);
+
+        addTooltips(tooltip);
 
-        String tip = getButtonTip();
-        if (tip != null)
-            tooltip.add(tip);
         return tooltip;
     }
 
@@ -52,11 +50,13 @@ public abstract class Button extends Widget
         return null;
     }
 
+    public void addTooltips(List<String> tooltip) {}
+
     public String getRenderLabel() {
         return label;
     }
 
-    public String label;
+    public final String label;
     public Image icon;
 
     /**

src/main/java/codechicken/nei/ButtonCycled.java

@@ -0,0 +1,20 @@
+package codechicken.nei;
+
+public abstract class ButtonCycled extends Button {
+    public ButtonCycled() {}
+
+    public ButtonCycled(int num) {
+        icons = new Image[num];
+        init();
+    }
+
+    @Override
+    public Image getRenderIcon() {
+        return icons[index];
+    }
+
+    public void init() {}
+
+    public int index;
+    public Image[] icons;
+}

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

@@ -0,0 +1,369 @@
+package codechicken.nei;
+
+import codechicken.core.ClientUtils;
+import codechicken.core.GuiModListScroll;
+import codechicken.lib.packet.PacketCustom;
+import codechicken.nei.api.API;
+import codechicken.nei.api.ItemInfo;
+import codechicken.nei.recipe.GuiRecipeTab;
+import codechicken.nei.recipe.StackInfo;
+import com.google.common.collect.Lists;
+import cpw.mods.fml.client.CustomModLoadingErrorDisplayException;
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.common.Loader;
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import cpw.mods.fml.common.gameevent.TickEvent;
+import cpw.mods.fml.common.gameevent.TickEvent.Phase;
+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.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+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.multiplayer.WorldClient;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.world.World;
+import net.minecraftforge.client.event.RenderWorldLastEvent;
+import net.minecraftforge.common.MinecraftForge;
+import org.apache.commons.csv.CSVFormat;
+import org.apache.commons.csv.CSVParser;
+import org.apache.commons.csv.CSVRecord;
+import org.apache.commons.io.IOUtils;
+
+public class ClientHandler {
+    private static String[] defaultSerialHandlers = {"WayofTime.alchemicalWizardry.client.nei.NEIAlchemyRecipeHandler"};
+    private static String[] defaultHeightHackHandlerRegex = {
+        "buildcraft.compat.nei.*",
+        "cofh.thermalexpansion.plugins.nei.handlers.*",
+        "crazypants.enderio.nei.*",
+        "forestry.factory.recipes.nei.*",
+        "ic2.neiIntegration.core.recipehandler.*",
+        "mariculture.plugins.nei.*",
+        "redgear.brewcraft.plugins.nei.*",
+        "tconstruct.plugins.nei.*",
+        "WayofTime.alchemicalWizardry.client.nei.*",
+    };
+    private static String[] defaultHandlerOrdering = {
+        "# Each line in this file should either be a comment (starts with '#') or an ordering.",
+        "# Ordering lines are <handler ID>,<ordering number>.",
+        "# Handlers will be sorted in order of number ascending, so smaller numbers first.",
+        "# Any handlers that are missing from this file will be assigned to 0.",
+        "# Negative numbers are fine.",
+        "# If you delete this file, it will be regenerated with all registered handler IDs.",
+    };
+    private static ClientHandler instance;
+
+    private ArrayList<EntityItem> SMPmagneticItems = new ArrayList<>();
+    private World lastworld;
+    private GuiScreen lastGui;
+
+    public void addSMPMagneticItem(int i, World world) {
+        WorldClient cworld = (WorldClient) world;
+        Entity e = cworld.getEntityByID(i);
+        if (!(e instanceof EntityItem)) {
+            return;
+        }
+        SMPmagneticItems.add((EntityItem) e);
+    }
+
+    private void updateMagnetMode(World world, EntityPlayerSP player) {
+        if (!NEIClientConfig.getMagnetMode()) return;
+
+        float distancexz = 16;
+        float distancey = 8;
+        double maxspeedxz = 0.5;
+        double maxspeedy = 0.5;
+        double speedxz = 0.05;
+        double speedy = 0.07;
+
+        List<EntityItem> items;
+        if (world.isRemote) {
+            items = SMPmagneticItems;
+        } else {
+            items = world.getEntitiesWithinAABB(
+                    EntityItem.class, player.boundingBox.expand(distancexz, distancey, distancexz));
+        }
+        for (Iterator<EntityItem> iterator = items.iterator(); iterator.hasNext(); ) {
+            EntityItem item = iterator.next();
+
+            if (item.delayBeforeCanPickup > 0) continue;
+            if (item.isDead && world.isRemote) iterator.remove();
+
+            if (!NEIClientUtils.canItemFitInInventory(player, item.getEntityItem())) continue;
+
+            double dx = player.posX - item.posX;
+            double dy = player.posY + player.getEyeHeight() - item.posY;
+            double dz = player.posZ - item.posZ;
+            double absxz = Math.sqrt(dx * dx + dz * dz);
+            double absy = Math.abs(dy);
+            if (absxz > distancexz) {
+                continue;
+            }
+
+            if (absxz > 1) {
+                dx /= absxz;
+                dz /= absxz;
+            }
+
+            if (absy > 1) {
+                dy /= absy;
+            }
+
+            double vx = item.motionX + speedxz * dx;
+            double vy = item.motionY + speedy * dy;
+            double vz = item.motionZ + speedxz * dz;
+
+            double absvxz = Math.sqrt(vx * vx + vz * vz);
+            double absvy = Math.abs(vy);
+
+            double rationspeedxz = absvxz / maxspeedxz;
+            if (rationspeedxz > 1) {
+                vx /= rationspeedxz;
+                vz /= rationspeedxz;
+            }
+
+            double rationspeedy = absvy / maxspeedy;
+            if (rationspeedy > 1) {
+                vy /= rationspeedy;
+            }
+
+            if (absvxz < 0.2 && absxz < 0.2 && world.isRemote) {
+                item.setDead();
+            }
+
+            item.setVelocity(vx, vy, vz);
+        }
+    }
+
+    public static void preInit() {
+        loadSerialHandlers();
+        loadHeightHackHandlers();
+        ItemInfo.preInit();
+        StackInfo.loadGuidFilters();
+    }
+
+    public static void loadSerialHandlers() {
+        File file = NEIClientConfig.serialHandlersFile;
+        if (!file.exists()) {
+            try (FileWriter writer = new FileWriter(file)) {
+                NEIClientConfig.logger.info("Creating default serial handlers list {}", file);
+                Collection<String> toSave = Loader.isModLoaded("dreamcraft")
+                        ? Collections.singletonList("")
+                        : Arrays.asList(defaultSerialHandlers);
+                IOUtils.writeLines(toSave, "\n", writer);
+            } catch (IOException e) {
+                NEIClientConfig.logger.error("Failed to save default serial handlers list to file {}", file, e);
+            }
+        }
+        try (FileReader reader = new FileReader(file)) {
+            NEIClientConfig.logger.info("Loading serial handlers from file {}", file);
+            NEIClientConfig.serialHandlers = new HashSet<>(IOUtils.readLines(reader));
+        } catch (IOException e) {
+            NEIClientConfig.logger.error("Failed to load serial handlers from file {}", file, e);
+        }
+    }
+
+    public static void loadHeightHackHandlers() {
+        File file = NEIClientConfig.heightHackHandlersFile;
+        if (!file.exists()) {
+            try (FileWriter writer = new FileWriter(file)) {
+                NEIClientConfig.logger.info("Creating default height hack handlers list {}", file);
+                Collection<String> toSave = Arrays.asList(defaultHeightHackHandlerRegex);
+                IOUtils.writeLines(toSave, "\n", writer);
+            } catch (IOException e) {
+                NEIClientConfig.logger.error("Failed to save default height hack handlers list to file {}", file, e);
+            }
+        }
+
+        try (FileReader reader = new FileReader(file)) {
+            NEIClientConfig.logger.info("Loading height hack handlers from file {}", file);
+            NEIClientConfig.heightHackHandlerRegex = IOUtils.readLines(reader).stream()
+                    .map(Pattern::compile)
+                    .collect(Collectors.toCollection(HashSet::new));
+        } catch (IOException e) {
+            NEIClientConfig.logger.error("Failed to load height hack handlers from file {}", file, e);
+        }
+    }
+
+    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);
+
+        API.registerHighlightHandler(new DefaultHighlightHandler(), ItemInfo.Layout.HEADER);
+        HUDRenderer.load();
+        WorldOverlayRenderer.load();
+    }
+
+    public static void postInit() {
+        loadHandlerOrdering();
+    }
+
+    public static void loadHandlerOrdering() {
+        File file = NEIClientConfig.handlerOrderingFile;
+        if (!file.exists()) {
+            try (FileWriter writer = new FileWriter(file)) {
+                NEIClientConfig.logger.info("Creating default handler ordering CSV {}", file);
+
+                List<String> toWrite = Lists.newArrayList(defaultHandlerOrdering);
+                GuiRecipeTab.handlerMap.keySet().stream()
+                        .sorted()
+                        .forEach(handlerId -> toWrite.add(String.format("%s,0", handlerId)));
+
+                IOUtils.writeLines(toWrite, "\n", writer);
+            } catch (IOException e) {
+                NEIClientConfig.logger.error("Failed to save default handler ordering to file {}", file, e);
+            }
+        }
+
+        URL url;
+        try {
+            url = file.toURI().toURL();
+        } catch (MalformedURLException e) {
+            NEIClientConfig.logger.info("Invalid URL for handler ordering CSV.");
+            e.printStackTrace();
+            return;
+        }
+
+        try (BufferedReader reader = new BufferedReader(new InputStreamReader(url.openStream()))) {
+            NEIClientConfig.logger.info("Loading handler ordering from file {}", file);
+            CSVParser csvParser = CSVFormat.EXCEL.withCommentMarker('#').parse(reader);
+            for (CSVRecord record : csvParser) {
+                final String handlerId = record.get(0);
+
+                int ordering;
+                try {
+                    ordering = Integer.parseInt(record.get(1));
+                } catch (NumberFormatException e) {
+                    NEIClientConfig.logger.error("Error parsing CSV record {}: {}", record, e);
+                    continue;
+                }
+
+                NEIClientConfig.handlerOrdering.put(handlerId, ordering);
+            }
+        } catch (Exception e) {
+            NEIClientConfig.logger.info("Error parsing CSV");
+            e.printStackTrace();
+        }
+    }
+
+    @SubscribeEvent
+    public void tickEvent(TickEvent.ClientTickEvent event) {
+        if (event.phase == Phase.END) return;
+
+        Minecraft mc = Minecraft.getMinecraft();
+        if (mc.theWorld != null) {
+            loadWorld(mc.theWorld, false);
+
+            if (!NEIClientConfig.isEnabled()) return;
+
+            KeyManager.tickKeyStates();
+
+            NEIController.updateUnlimitedItems(mc.thePlayer.inventory);
+            if (mc.currentScreen == null) NEIController.processCreativeCycling(mc.thePlayer.inventory);
+
+            updateMagnetMode(mc.theWorld, mc.thePlayer);
+        }
+
+        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;
+            }
+        }
+        lastGui = gui;
+    }
+
+    @SubscribeEvent
+    public void tickEvent(TickEvent.RenderTickEvent event) {
+        if (event.phase == Phase.END && NEIClientConfig.isEnabled()) HUDRenderer.renderOverlay();
+    }
+
+    @SubscribeEvent
+    public void renderLastEvent(RenderWorldLastEvent event) {
+        if (NEIClientConfig.isEnabled()) WorldOverlayRenderer.render(event.partialTicks);
+    }
+
+    public void loadWorld(World world, boolean fromServer) {
+        if (world != lastworld) {
+            SMPmagneticItems.clear();
+            WorldOverlayRenderer.reset();
+
+            if (!fromServer) {
+                NEIClientConfig.setHasSMPCounterPart(false);
+                NEIClientConfig.setInternalEnabled(false);
+
+                if (!Minecraft.getMinecraft().isSingleplayer()) // wait for server to initiate in singleplayer
+                NEIClientConfig.loadWorld("remote/" + ClientUtils.getServerIP().replace(':', '~'));
+
+                ItemMobSpawner.clearEntityReferences(world);
+            }
+
+            lastworld = world;
+        }
+    }
+
+    public static ClientHandler instance() {
+        return instance;
+    }
+
+    public static RuntimeException throwCME(final String message) {
+        final GuiScreen errorGui = new GuiErrorScreen(null, null) {
+            @Override
+            public void handleMouseInput() {}
+
+            @Override
+            public void handleKeyboardInput() {}
+
+            @Override
+            public void drawScreen(int par1, int par2, float par3) {
+                drawDefaultBackground();
+                String[] s_msg = message.split("\n");
+                for (int i = 0; i < s_msg.length; ++i)
+                    drawCenteredString(fontRendererObj, s_msg[i], width / 2, height / 3 + 12 * i, 0xFFFFFFFF);
+            }
+        };
+
+        @SuppressWarnings("serial")
+        CustomModLoadingErrorDisplayException e = new CustomModLoadingErrorDisplayException() {
+            @Override
+            public void initGui(GuiErrorScreen errorScreen, FontRenderer fontRenderer) {
+                Minecraft.getMinecraft().displayGuiScreen(errorGui);
+            }
+
+            @Override
+            public void drawScreen(
+                    GuiErrorScreen errorScreen,
+                    FontRenderer fontRenderer,
+                    int mouseRelX,
+                    int mouseRelY,
+                    float tickTime) {}
+        };
+        throw e;
+    }
+}

src/main/java/codechicken/nei/ContainerCreativeInv.java

@@ -11,11 +11,9 @@ import net.minecraft.item.ItemArmor;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 
-public class ContainerCreativeInv extends Container
-{
-    private class SlotArmor extends Slot
-    {
-        int armorType;
+public class ContainerCreativeInv extends Container {
+    private class SlotArmor extends Slot {
+        final int armorType;
 
         public SlotArmor(IInventory inv, int x, int y, int slot, int armor) {
             super(inv, x, y, slot);
@@ -39,15 +37,15 @@ public class ContainerCreativeInv extends Container
         }
     }
 
-    private class SlotBlockArmor extends SlotArmor
-    {
+    private class SlotBlockArmor extends SlotArmor {
         public SlotBlockArmor(IInventory inv, int x, int y, int slot, int armor) {
             super(inv, x, y, slot, armor);
         }
 
         @Override
         public boolean isItemValid(ItemStack stack) {
-            return super.isItemValid(stack) || stack != null;// && Block.getBlockFromItem(stack.getItem()) != Blocks.air;
+            return super.isItemValid(stack)
+                    || stack != null; // && Block.getBlockFromItem(stack.getItem()) != Blocks.air;
         }
     }
 
@@ -64,12 +62,12 @@ public class ContainerCreativeInv extends Container
             for (int col = 0; col < 9; ++col)
                 addSlotToContainer(new Slot(invPlayer, col + row * 9 + 9, 8 + col * 18, 118 + row * 18));
 
-        for (int col = 0; col < 9; ++col)
-            addSlotToContainer(new Slot(invPlayer, col, 8 + col * 18, 176));
+        for (int col = 0; col < 9; ++col) addSlotToContainer(new Slot(invPlayer, col, 8 + col * 18, 176));
 
         addSlotToContainer(new SlotBlockArmor(invPlayer, invPlayer.getSizeInventory() - 1, -15, 23, 0));
         for (int armorType = 1; armorType < 4; armorType++)
-            addSlotToContainer(new SlotArmor(invPlayer, invPlayer.getSizeInventory() - 1 - armorType, -15, 23 + armorType * 18, armorType));
+            addSlotToContainer(new SlotArmor(
+                    invPlayer, invPlayer.getSizeInventory() - 1 - armorType, -15, 23 + armorType * 18, armorType));
     }
 
     @Override
@@ -91,16 +89,13 @@ public class ContainerCreativeInv extends Container
             }
 
             if (slotIndex < 54) {
-                if (!this.mergeItemStack(stack, 54, 90, true))
-                    return null;
+                if (!this.mergeItemStack(stack, 54, 90, true)) return null;
             } else if (!this.mergeItemStack(stack, 0, 54, false)) {
                 return null;
             }
 
-            if (stack.stackSize == 0)
-                slot.putStack(null);
-            else
-                slot.onSlotChanged();
+            if (stack.stackSize == 0) slot.putStack(null);
+            else slot.onSlotChanged();
         }
 
         return transferredStack;

src/main/java/codechicken/nei/ContainerEnchantmentModifier.java

@@ -1,6 +1,7 @@
 package codechicken.nei;
 
 import codechicken.lib.render.CCRenderState;
+import java.util.ArrayList;
 import net.minecraft.client.gui.Gui;
 import net.minecraft.enchantment.Enchantment;
 import net.minecraft.entity.player.EntityPlayer;
@@ -14,27 +15,23 @@ import net.minecraft.nbt.NBTTagList;
 import net.minecraft.world.World;
 import org.lwjgl.opengl.GL11;
 
-import java.util.ArrayList;
-
 /**
  * This is crap code, don't ever do this.
  */
-public class ContainerEnchantmentModifier extends ContainerEnchantment
-{
-    public static class EnchantmentHash
-    {
+public class ContainerEnchantmentModifier extends ContainerEnchantment {
+    public static class EnchantmentHash {
         public EnchantmentHash(Enchantment e, int i, int l) {
             enchantment = e;
             state = i;
             level = l;
         }
 
-        Enchantment enchantment;
+        final Enchantment enchantment;
         int state;
-        int level;
+        final int level;
     }
 
-    public ArrayList<EnchantmentHash> slotEnchantment = new ArrayList<EnchantmentHash>();
+    public final ArrayList<EnchantmentHash> slotEnchantment = new ArrayList<>();
     int level = 5;
 
     public int scrollclicky = -1;
@@ -60,11 +57,7 @@ public class ContainerEnchantmentModifier extends ContainerEnchantment
         int sbarh = (int) ((height / (float) getContentHeight()) * height);
         if (sbarh > height) {
             return height;
-        } else if (sbarh < height / 15) {
-            return height / 15;
-        } else {
-            return sbarh;
-        }
+        } else return Math.max(sbarh, height / 15);
     }
 
     public int getScrollBarWidth() {
@@ -108,10 +101,13 @@ public class ContainerEnchantmentModifier extends ContainerEnchantment
         int barempty = height - getScrollBarHeight();
         int sbary = rely + (int) (barempty * percentscrolled + 0.5);
 
-        if (button == 0 &&
-                getScrollBarHeight() < height && //the scroll bar can move (not full length)
-                mousex >= relx + cwidth && mousex < relx + cwidth + getScrollBarWidth() &&
-                mousey >= rely && mousey < rely + height)//in the scroll pane
+        if (button == 0
+                && getScrollBarHeight() < height
+                && // the scroll bar can move (not full length)
+                mousex >= relx + cwidth
+                && mousex < relx + cwidth + getScrollBarWidth()
+                && mousey >= rely
+                && mousey < rely + height) // in the scroll pane
         {
             if (mousey < sbary) {
                 percentscrolled = (mousey - rely) / (float) barempty;
@@ -130,7 +126,7 @@ public class ContainerEnchantmentModifier extends ContainerEnchantment
     }
 
     public void mouseUp(int mousex, int mousey, int button) {
-        if (scrollclicky >= 0 && button == 0)//we were scrolling and we released mouse
+        if (scrollclicky >= 0 && button == 0) // we were scrolling and we released mouse
         {
             scrollclicky = -1;
         }
@@ -139,8 +135,7 @@ public class ContainerEnchantmentModifier extends ContainerEnchantment
     public boolean clickButton(int mousex, int mousey, int button) {
         mousex -= parentscreen.guiLeft;
         mousey -= parentscreen.guiTop;
-        if (mousex >= relx && mousex < relx + cwidth &&
-                mousey >= rely && mousey <= rely + height)//in the box
+        if (mousex >= relx && mousex < relx + cwidth && mousey >= rely && mousey <= rely + height) // in the box
         {
             int slot = getClickedSlot(mousey);
             if (slot >= getNumSlots()) return false;
@@ -180,10 +175,8 @@ public class ContainerEnchantmentModifier extends ContainerEnchantment
                 int ID = nbttaglist.getCompoundTagAt(i).getShort("id");
                 if (ID == e) {
                     nbttaglist.removeTag(i);
-                    if (nbttaglist.tagCount() == 0)
-                        stack.getTagCompound().removeTag("ench");
-                    if (stack.getTagCompound().hasNoTags())
-                        stack.setTagCompound(null);
+                    if (nbttaglist.tagCount() == 0) stack.getTagCompound().removeTag("ench");
+                    if (stack.getTagCompound().hasNoTags()) stack.setTagCompound(null);
                     return;
                 }
             }
@@ -195,8 +188,7 @@ public class ContainerEnchantmentModifier extends ContainerEnchantment
     }
 
     public void onCraftMatrixChanged(IInventory iinventory) {
-        if (parentscreen != null)
-            updateEnchantmentOptions(GuiEnchantmentModifier.validateEnchantments());
+        if (parentscreen != null) updateEnchantmentOptions(GuiEnchantmentModifier.validateEnchantments());
     }
 
     public void updateEnchantmentOptions(boolean validate) {
@@ -225,7 +217,8 @@ public class ContainerEnchantmentModifier extends ContainerEnchantment
             if (NEIServerUtils.stackHasEnchantment(toolstack, e.effectId)) {
                 state = 2;
                 level = NEIServerUtils.getEnchantmentLevel(toolstack, e.effectId);
-            } else if (NEIServerUtils.doesEnchantmentConflict(NEIServerUtils.getEnchantments(toolstack), e) && validate) {
+            } else if (NEIServerUtils.doesEnchantmentConflict(NEIServerUtils.getEnchantments(toolstack), e)
+                    && validate) {
                 state = 1;
             }
             slotEnchantment.add(new EnchantmentHash(e, state, level));
@@ -237,7 +230,7 @@ public class ContainerEnchantmentModifier extends ContainerEnchantment
 
     public void drawSlots(GuiEnchantmentModifier gui) {
         for (int slot = 0; slot < 3; slot++) {
-            int shade = 0;
+            int shade;
             String text = "";
 
             int containerslot = slot + getScrolledSlots();
@@ -261,10 +254,18 @@ public class ContainerEnchantmentModifier extends ContainerEnchantment
             CCRenderState.changeTexture("textures/gui/container/enchanting_table.png");
             GL11.glColor3f(1, 1, 1);
             if (hasScrollBar()) {
-                gui.drawTexturedModalRect(relx, rely + slot * slotheight, 0, gui.ySize + slotheight * shade, cwidth - 30, slotheight);
-                gui.drawTexturedModalRect(relx + cwidth - 30, rely + slot * slotheight, cwidth - 23, gui.ySize + slotheight * shade, 30, slotheight);
+                gui.drawTexturedModalRect(
+                        relx, rely + slot * slotheight, 0, gui.ySize + slotheight * shade, cwidth - 30, slotheight);
+                gui.drawTexturedModalRect(
+                        relx + cwidth - 30,
+                        rely + slot * slotheight,
+                        cwidth - 23,
+                        gui.ySize + slotheight * shade,
+                        30,
+                        slotheight);
             } else {
-                gui.drawTexturedModalRect(relx, rely + slot * slotheight, 0, gui.ySize + slotheight * shade, cwidth + 7, slotheight);
+                gui.drawTexturedModalRect(
+                        relx, rely + slot * slotheight, 0, gui.ySize + slotheight * shade, cwidth + 7, slotheight);
             }
 
             gui.getFontRenderer().drawString(text, relx + 4, rely + slot * slotheight + 5, textColourFromState(shade));
@@ -281,18 +282,36 @@ public class ContainerEnchantmentModifier extends ContainerEnchantment
         int sbary = rely + (int) ((height - getScrollBarHeight()) * percentscrolled + 0.5);
         int sbarx = relx + cwidth;
 
-        Gui.drawRect(sbarx, rely, sbarx + getScrollBarWidth(), rely + height, 0xFF202020);//background
-        Gui.drawRect(sbarx, sbary, sbarx + getScrollBarWidth(), sbary + getScrollBarHeight(), 0xFF8B8B8B);//corners
-        Gui.drawRect(sbarx, sbary, sbarx + getScrollBarWidth() - 1, sbary + getScrollBarHeight() - 1, 0xFFF0F0F0);//topleft up
-        Gui.drawRect(sbarx + 1, sbary + 1, sbarx + getScrollBarWidth() - 1, sbary + getScrollBarHeight() - 1, 0xFF555555);//bottom right down
-        Gui.drawRect(sbarx + 1, sbary + 1, sbarx + getScrollBarWidth() - 2, sbary + getScrollBarHeight() - 2, 0xFFC6C6C6);//scrollbar
+        Gui.drawRect(sbarx, rely, sbarx + getScrollBarWidth(), rely + height, 0xFF202020); // background
+        Gui.drawRect(sbarx, sbary, sbarx + getScrollBarWidth(), sbary + getScrollBarHeight(), 0xFF8B8B8B); // corners
+        Gui.drawRect(
+                sbarx,
+                sbary,
+                sbarx + getScrollBarWidth() - 1,
+                sbary + getScrollBarHeight() - 1,
+                0xFFF0F0F0); // topleft up
+        Gui.drawRect(
+                sbarx + 1,
+                sbary + 1,
+                sbarx + getScrollBarWidth() - 1,
+                sbary + getScrollBarHeight() - 1,
+                0xFF555555); // bottom right down
+        Gui.drawRect(
+                sbarx + 1,
+                sbary + 1,
+                sbarx + getScrollBarWidth() - 2,
+                sbary + getScrollBarHeight() - 2,
+                0xFFC6C6C6); // scrollbar
     }
 
     private int textColourFromState(int shade) {
-        switch(shade) {
-            case 0: return 0x685e4a;
-            case 1: return 0x407f10;
-            default: return 0xffff80;
+        switch (shade) {
+            case 0:
+                return 0x685e4a;
+            case 1:
+                return 0x407f10;
+            default:
+                return 0xffff80;
         }
     }
 

src/main/java/codechicken/nei/ContainerPotionCreator.java

@@ -1,9 +1,9 @@
 package codechicken.nei;
 
 import codechicken.lib.inventory.ContainerExtended;
-import codechicken.lib.inventory.SlotHandleClicks;
 import codechicken.lib.inventory.InventoryNBT;
 import codechicken.lib.inventory.InventoryUtils;
+import codechicken.lib.inventory.SlotHandleClicks;
 import codechicken.lib.packet.PacketCustom;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
@@ -16,10 +16,8 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.potion.PotionEffect;
 
-public class ContainerPotionCreator extends ContainerExtended
-{
-    public class SlotPotion extends Slot
-    {
+public class ContainerPotionCreator extends ContainerExtended {
+    public class SlotPotion extends Slot {
         public SlotPotion(IInventory inv, int slotIndex, int x, int y) {
             super(inv, slotIndex, x, y);
         }
@@ -34,16 +32,14 @@ public class ContainerPotionCreator extends ContainerExtended
             super.onSlotChanged();
             if (getHasStack()) {
                 ItemStack stack = getStack();
-                if (!stack.hasTagCompound())
-                    stack.setTagCompound(new NBTTagCompound());
+                if (!stack.hasTagCompound()) stack.setTagCompound(new NBTTagCompound());
                 if (!stack.getTagCompound().hasKey("CustomPotionEffects"))
                     stack.getTagCompound().setTag("CustomPotionEffects", new NBTTagList());
             }
         }
     }
 
-    public class SlotPotionStore extends SlotHandleClicks
-    {
+    public class SlotPotionStore extends SlotHandleClicks {
         public SlotPotionStore(IInventory inv, int slotIndex, int x, int y) {
             super(inv, slotIndex, x, y);
         }
@@ -60,8 +56,7 @@ public class ContainerPotionCreator extends ContainerExtended
                     putStack(InventoryUtils.copyStack(held, 1));
                     player.inventory.setItemStack(null);
                 }
-            } else if (getHasStack())
-                player.inventory.setItemStack(getStack());
+            } else if (getHasStack()) player.inventory.setItemStack(getStack());
 
             return null;
         }
@@ -72,8 +67,7 @@ public class ContainerPotionCreator extends ContainerExtended
         }
     }
 
-    public static class InventoryPotionStore extends InventoryNBT
-    {
+    public static class InventoryPotionStore extends InventoryNBT {
         public InventoryPotionStore() {
             super(9, NEIClientConfig.global.nbt.getCompoundTag("potionStore"));
         }
@@ -86,9 +80,9 @@ public class ContainerPotionCreator extends ContainerExtended
         }
     }
 
-    InventoryPlayer playerInv;
-    InventoryBasic potionInv;
-    IInventory potionStoreInv;
+    final InventoryPlayer playerInv;
+    final InventoryBasic potionInv;
+    final IInventory potionStoreInv;
 
     public ContainerPotionCreator(InventoryPlayer inventoryPlayer, IInventory potionStoreInv) {
         playerInv = inventoryPlayer;
@@ -96,15 +90,13 @@ public class ContainerPotionCreator extends ContainerExtended
         this.potionStoreInv = potionStoreInv;
 
         addSlotToContainer(new SlotPotion(potionInv, 0, 25, 102));
-        for (int i = 0; i < 9; i++)
-            addSlotToContainer(new SlotPotionStore(potionStoreInv, i, 8 + i * 18, 14));
+        for (int i = 0; i < 9; i++) addSlotToContainer(new SlotPotionStore(potionStoreInv, i, 8 + i * 18, 14));
         bindPlayerInventory(inventoryPlayer, 8, 125);
     }
 
     @Override
     public boolean doMergeStackAreas(int slotIndex, ItemStack stack) {
-        if (slotIndex < 10)
-            return mergeItemStack(stack, 10, 46, true);
+        if (slotIndex < 10) return mergeItemStack(stack, 10, 46, true);
         return mergeItemStack(stack, 0, 1, false);
     }
 
@@ -117,30 +109,28 @@ public class ContainerPotionCreator extends ContainerExtended
     public void onContainerClosed(EntityPlayer player) {
         super.onContainerClosed(player);
 
-        if (!player.worldObj.isRemote)
-            InventoryUtils.dropOnClose(player, potionInv);
+        if (!player.worldObj.isRemote) InventoryUtils.dropOnClose(player, potionInv);
     }
 
     @SuppressWarnings("unchecked")
     @Override
     public void handleServerPacket(PacketCustom packet) {
         ItemStack potion = potionInv.getStackInSlot(0);
-        if (potion == null)
-            return;
+        if (potion == null) return;
 
         boolean add = packet.getType() == 3;
         int effectID = packet.readUByte();
 
         NBTTagList effects = potion.getTagCompound().getTagList("CustomPotionEffects", 10);
         NBTTagList newEffects = new NBTTagList();
-        for(int i = 0; i < effects.tagCount(); i++) {
+        for (int i = 0; i < effects.tagCount(); i++) {
             NBTTagCompound tag = effects.getCompoundTagAt(i);
             PotionEffect e = PotionEffect.readCustomPotionEffectFromNBT(tag);
-            if(e.getPotionID() != effectID)
-                newEffects.appendTag(tag);
+            if (e.getPotionID() != effectID) newEffects.appendTag(tag);
         }
-        if(add)
-            newEffects.appendTag(new PotionEffect(effectID, packet.readInt(), packet.readUByte()).writeCustomPotionEffectToNBT(new NBTTagCompound()));
+        if (add)
+            newEffects.appendTag(new PotionEffect(effectID, packet.readInt(), packet.readUByte())
+                    .writeCustomPotionEffectToNBT(new NBTTagCompound()));
         potion.getTagCompound().setTag("CustomPotionEffects", newEffects);
     }
 
@@ -157,4 +147,4 @@ public class ContainerPotionCreator extends ContainerExtended
         packet.writeByte(effectID);
         packet.sendToServer();
     }
-}
+}

src/main/java/codechicken/nei/DefaultHighlightHandler.java

@@ -3,33 +3,35 @@ package codechicken.nei;
 import codechicken.nei.api.IHighlightHandler;
 import codechicken.nei.api.ItemInfo;
 import codechicken.nei.guihook.GuiContainerManager;
+import java.util.List;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.world.World;
 
-import java.util.List;
-
-public class DefaultHighlightHandler implements IHighlightHandler
-{
+public class DefaultHighlightHandler implements IHighlightHandler {
     @Override
-    public List<String> handleTextData(ItemStack stack, World world, EntityPlayer player, MovingObjectPosition mop, List<String> currenttip, ItemInfo.Layout layout) {
+    public List<String> handleTextData(
+            ItemStack stack,
+            World world,
+            EntityPlayer player,
+            MovingObjectPosition mop,
+            List<String> currenttip,
+            ItemInfo.Layout layout) {
         String name = null;
         try {
             String s = GuiContainerManager.itemDisplayNameShort(stack);
-            if (s != null && !s.endsWith("Unnamed"))
-                name = s;
+            if (s != null && !s.endsWith("Unnamed")) name = s;
 
-            if (name != null)
-                currenttip.add(name);
-        } catch (Exception ignored) {}
+            if (name != null) currenttip.add(name);
+        } catch (Exception ignored) {
+        }
 
         if (name != null && stack.getItem() == Items.redstone) {
             int md = world.getBlockMetadata(mop.blockX, mop.blockY, mop.blockZ);
             String s = "" + md;
-            if (s.length() < 2)
-                s = " " + s;
+            if (s.length() < 2) s = " " + s;
             currenttip.set(currenttip.size() - 1, name + " " + s);
         }
 

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

@@ -0,0 +1,22 @@
+package codechicken.nei;
+
+import codechicken.nei.api.ItemFilter;
+import net.minecraft.item.ItemStack;
+
+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/ExtendedCreativeInv.java

@@ -5,10 +5,9 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
 
-public class ExtendedCreativeInv implements IInventory
-{
-    PlayerSave playerSave;
-    Side side;
+public class ExtendedCreativeInv implements IInventory {
+    final PlayerSave playerSave;
+    final Side side;
 
     public ExtendedCreativeInv(PlayerSave playerSave, Side side) {
         this.playerSave = playerSave;
@@ -22,8 +21,7 @@ public class ExtendedCreativeInv implements IInventory
 
     @Override
     public ItemStack getStackInSlot(int slot) {
-        if (side.isClient())
-            return NEIClientConfig.creativeInv[slot];
+        if (side.isClient()) return NEIClientConfig.creativeInv[slot];
         return playerSave.creativeInv[slot];
     }
 
@@ -33,10 +31,9 @@ public class ExtendedCreativeInv implements IInventory
 
         if (item != null) {
             if (item.stackSize <= size) {
-                ItemStack itemstack = item;
                 setInventorySlotContents(slot, null);
                 markDirty();
-                return itemstack;
+                return item;
             }
             ItemStack itemstack1 = item.splitStack(size);
             if (item.stackSize == 0) {
@@ -59,10 +56,8 @@ public class ExtendedCreativeInv implements IInventory
 
     @Override
     public void setInventorySlotContents(int slot, ItemStack stack) {
-        if (side.isClient())
-            NEIClientConfig.creativeInv[slot] = stack;
-        else
-            playerSave.creativeInv[slot] = stack;
+        if (side.isClient()) NEIClientConfig.creativeInv[slot] = stack;
+        else playerSave.creativeInv[slot] = stack;
 
         markDirty();
     }
@@ -79,8 +74,7 @@ public class ExtendedCreativeInv implements IInventory
 
     @Override
     public void markDirty() {
-        if (side.isServer())
-            playerSave.setCreativeDirty();
+        if (side.isServer()) playerSave.setCreativeDirty();
     }
 
     @Override
@@ -89,12 +83,10 @@ public class ExtendedCreativeInv implements IInventory
     }
 
     @Override
-    public void openInventory() {
-    }
+    public void openInventory() {}
 
     @Override
-    public void closeInventory() {
-    }
+    public void closeInventory() {}
 
     @Override
     public boolean isItemValidForSlot(int slot, ItemStack stack) {
@@ -105,5 +97,4 @@ public class ExtendedCreativeInv implements IInventory
     public boolean hasCustomInventoryName() {
         return true;
     }
-
 }

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

@@ -1,23 +1,25 @@
 package codechicken.nei;
 
+import static codechicken.nei.NEIServerUtils.areStacksIdentical;
+import static codechicken.nei.NEIServerUtils.areStacksSameType;
+import static codechicken.nei.NEIServerUtils.copyStack;
+
 import codechicken.nei.guihook.GuiContainerManager;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
-import java.util.*;
-
-import static codechicken.nei.NEIServerUtils.*;
-
-public class FastTransferManager
-{
+public class FastTransferManager {
     /**
      * Based on the general assumption that we want to fill top to bottom, left to right
      */
-    public static class SlotPositionComparator implements Comparator<Integer>
-    {
-        Container container;
+    public static class SlotPositionComparator implements Comparator<Integer> {
+        final Container container;
 
         public SlotPositionComparator(Container c) {
             container = c;
@@ -34,22 +36,21 @@ public class FastTransferManager
         }
     }
 
-    public LinkedList<LinkedList<Integer>> slotZones = new LinkedList<LinkedList<Integer>>();
-    public HashMap<Integer, Integer> slotZoneMap = new HashMap<Integer, Integer>();
+    public LinkedList<LinkedList<Integer>> slotZones = new LinkedList<>();
+    public HashMap<Integer, Integer> slotZoneMap = new HashMap<>();
 
     private void generateSlotMap(Container container, ItemStack stack) {
         stack = stack.copy();
         stack.stackSize = 1;
 
         for (int slotNo = 0; slotNo < container.inventorySlots.size(); slotNo++) {
-            if (slotZoneMap.containsKey(slotNo) || !container.getSlot(slotNo).isItemValid(stack))
-                continue;
+            if (slotZoneMap.containsKey(slotNo) || !container.getSlot(slotNo).isItemValid(stack)) continue;
 
-            HashSet<Integer> connectedSlots = new HashSet<Integer>();
+            HashSet<Integer> connectedSlots = new HashSet<>();
             findConnectedSlots(container, slotNo, connectedSlots);
 
-            LinkedList<Integer> zoneSlots = new LinkedList<Integer>(connectedSlots);
-            Collections.sort(zoneSlots, new SlotPositionComparator(container));
+            LinkedList<Integer> zoneSlots = new LinkedList<>(connectedSlots);
+            zoneSlots.sort(new SlotPositionComparator(container));
             slotZones.add(zoneSlots);
 
             for (int i : zoneSlots) {
@@ -64,11 +65,11 @@ public class FastTransferManager
         final int threshold = 18;
 
         for (int i = 0; i < container.inventorySlots.size(); i++) {
-            if (connectedSlots.contains(i))
-                continue;
+            if (connectedSlots.contains(i)) continue;
 
             Slot slot1 = container.getSlot(i);
-            if (Math.abs(slot.xDisplayPosition - slot1.xDisplayPosition) <= threshold && Math.abs(slot.yDisplayPosition - slot1.yDisplayPosition) <= threshold) {
+            if (Math.abs(slot.xDisplayPosition - slot1.xDisplayPosition) <= threshold
+                    && Math.abs(slot.yDisplayPosition - slot1.yDisplayPosition) <= threshold) {
                 findConnectedSlots(container, i, connectedSlots);
             }
         }
@@ -77,8 +78,7 @@ public class FastTransferManager
     public static int findSlotWithItem(Container container, ItemStack teststack) {
         for (int slotNo = 0; slotNo < container.inventorySlots.size(); slotNo++) {
             ItemStack stack = container.getSlot(slotNo).getStack();
-            if (stack != null && areStacksSameType(stack, teststack))
-                return slotNo;
+            if (areStacksSameType(stack, teststack)) return slotNo;
         }
         return -1;
     }
@@ -94,20 +94,17 @@ public class FastTransferManager
         Integer fromZone = slotZoneMap.get(fromSlot);
         Integer toZone = slotZoneMap.get(toSlot);
 
-        if (fromZone == null || toZone == null || fromZone.equals(toZone))
-            return;
+        if (fromZone == null || toZone == null || fromZone.equals(toZone)) return;
 
-        if (NEIClientUtils.getHeldItem() != null && !areStacksSameType(heldStack, NEIClientUtils.getHeldItem()))
-            return;
+        if (NEIClientUtils.getHeldItem() != null && !areStacksSameType(heldStack, NEIClientUtils.getHeldItem())) return;
 
-        if (!fillZoneWithHeldItem(window, toZone))
-            return;
+        if (!fillZoneWithHeldItem(window, toZone)) return;
 
         for (int transferFrom : slotZones.get(fromZone)) {
-            ItemStack transferStack = window.inventorySlots.getSlot(transferFrom).getStack();
+            ItemStack transferStack =
+                    window.inventorySlots.getSlot(transferFrom).getStack();
 
-            if (!areStacksSameType(heldStack, transferStack))
-                continue;
+            if (!areStacksSameType(heldStack, transferStack)) continue;
 
             clickSlot(window, transferFrom);
             if (!fillZoneWithHeldItem(window, toZone)) {
@@ -125,8 +122,7 @@ public class FastTransferManager
 
         Slot slot = container.getSlot(fromSlot);
         ItemStack stack = slot.getStack();
-        if (stack == null)
-            return -1;
+        if (stack == null) return -1;
 
         stack.stackSize = 1;
         slot.putStack(stack.copy());
@@ -136,20 +132,22 @@ public class FastTransferManager
         LinkedList<ItemStack> compareAfter = saveContainer(container);
 
         try {
-            //if(compareAfter.get(fromSlot) != null)//transfer failed
-            //return -1;
+            // if(compareAfter.get(fromSlot) != null)//transfer failed
+            // return -1;
 
             for (int i = 0; i < compareBefore.size(); i++) {
-                if (i == fromSlot)
-                    continue;
+                if (i == fromSlot) continue;
 
                 ItemStack before = compareBefore.get(i);
                 ItemStack after = compareAfter.get(i);
 
                 if (!areStacksIdentical(before, after) && after != null)
-                    if (before == null ? areStacksSameType(stack, after) ://transfered into this empty slot
-                            areStacksSameType(stack, after) && after.stackSize - before.stackSize > 0)//it added to this stack
-                        return i;
+                    if (before == null
+                            ? areStacksSameType(stack, after)
+                            : // transfered into this empty slot
+                            areStacksSameType(stack, after)
+                                    && after.stackSize - before.stackSize > 0) // it added to this stack
+                    return i;
             }
 
             return -1;
@@ -159,7 +157,7 @@ public class FastTransferManager
     }
 
     public LinkedList<ItemStack> saveContainer(Container container) {
-        LinkedList<ItemStack> stacks = new LinkedList<ItemStack>();
+        LinkedList<ItemStack> stacks = new LinkedList<>();
         for (int i = 0; i < container.inventorySlots.size(); i++)
             stacks.add(copyStack(container.getSlot(i).getStack()));
 
@@ -176,46 +174,43 @@ public class FastTransferManager
 
     public void transferItem(GuiContainer window, int fromSlot) {
         int toSlot = findShiftClickDestinationSlot(window.inventorySlots, fromSlot);
-        if (toSlot == -1)
-            return;
+        if (toSlot == -1) return;
 
         Slot from = window.inventorySlots.getSlot(fromSlot);
 
-        if (from.isItemValid(from.getStack()))
-            moveOneItem(window, fromSlot, toSlot);
-        else//slots that you can't put stuff in
-            moveOutputSet(window, fromSlot, toSlot);
+        if (from.isItemValid(from.getStack())) moveOneItem(window, fromSlot, toSlot);
+        else // slots that you can't put stuff in
+        moveOutputSet(window, fromSlot, toSlot);
     }
 
     public void moveOutputSet(GuiContainer window, int fromSlot, int toSlot) {
-        if (NEIClientUtils.getHeldItem() != null)
-            return;
+        if (NEIClientUtils.getHeldItem() != null) return;
 
-        clickSlot(window, fromSlot);//pickup fromSlot
-        if (NEIClientUtils.getHeldItem() == null)//maybe this container does auto transfers. No need to pick up the final item
-            return;
-        clickSlot(window, toSlot);//place one in toSlot
+        clickSlot(window, fromSlot); // pickup fromSlot
+        if (NEIClientUtils.getHeldItem()
+                == null) // maybe this container does auto transfers. No need to pick up the final item
+        return;
+        clickSlot(window, toSlot); // place one in toSlot
     }
 
     public void moveOneItem(GuiContainer window, int fromSlot, int toSlot) {
-        clickSlot(window, fromSlot);//pickup fromSlot
-        clickSlot(window, toSlot, 1);//place one in toSlot
-        clickSlot(window, fromSlot);//place down in fromSlot
+        clickSlot(window, fromSlot); // pickup fromSlot
+        clickSlot(window, toSlot, 1); // place one in toSlot
+        clickSlot(window, fromSlot); // place down in fromSlot
     }
 
     public void retrieveItem(GuiContainer window, int toSlot) {
         Slot slot = window.inventorySlots.getSlot(toSlot);
         ItemStack slotStack = slot.getStack();
-        if (slotStack == null ||
-                slotStack.stackSize == slot.getSlotStackLimit() ||
-                slotStack.stackSize == slotStack.getMaxStackSize())
-            return;
+        if (slotStack == null
+                || slotStack.stackSize == slot.getSlotStackLimit()
+                || slotStack.stackSize == slotStack.getMaxStackSize()) return;
 
         generateSlotMap(window.inventorySlots, slotStack);
 
         Integer destZone = slotZoneMap.get(toSlot);
-        if (destZone == null)//slots that don't accept
-            return;
+        if (destZone == null) // slots that don't accept
+        return;
 
         int firstZoneSlot = findShiftClickDestinationSlot(window.inventorySlots, toSlot);
         int firstZone = -1;
@@ -223,17 +218,14 @@ public class FastTransferManager
             Integer integer = slotZoneMap.get(firstZoneSlot);
             if (integer != null) {
                 firstZone = integer;
-                if (retrieveItemFromZone(window, firstZone, toSlot))
-                    return;
+                if (retrieveItemFromZone(window, firstZone, toSlot)) return;
             }
         }
 
         for (int zone = 0; zone < slotZones.size(); zone++) {
-            if (zone == destZone || zone == firstZone)
-                continue;
+            if (zone == destZone || zone == firstZone) continue;
 
-            if (retrieveItemFromZone(window, zone, toSlot))
-                return;
+            if (retrieveItemFromZone(window, zone, toSlot)) return;
         }
 
         retrieveItemFromZone(window, destZone, toSlot);
@@ -242,14 +234,14 @@ public class FastTransferManager
     private boolean retrieveItemFromZone(GuiContainer window, int zone, int toSlot) {
         ItemStack stack = window.inventorySlots.getSlot(toSlot).getStack();
         for (int i : slotZones.get(zone)) {
-            if (i == toSlot)
-                continue;
+            if (i == toSlot) continue;
 
             Slot slot = window.inventorySlots.getSlot(i);
             ItemStack stack1 = slot.getStack();
 
-            if (areStacksSameType(stack, stack1) &&
-                    stack1.stackSize != slot.getSlotStackLimit() && //get from full stacks on second pass
+            if (areStacksSameType(stack, stack1)
+                    && stack1.stackSize != slot.getSlotStackLimit()
+                    && // get from full stacks on second pass
                     stack1.stackSize != stack1.getMaxStackSize()) {
                 moveOneItem(window, i, toSlot);
                 return true;
@@ -257,8 +249,7 @@ public class FastTransferManager
         }
 
         for (int i : slotZones.get(zone)) {
-            if (i == toSlot)
-                continue;
+            if (i == toSlot) continue;
 
             Slot slot = window.inventorySlots.getSlot(i);
             ItemStack stack1 = slot.getStack();
@@ -287,28 +278,24 @@ public class FastTransferManager
         for (int transferTo : slotZones.get(zoneIndex)) {
             ItemStack held = NEIClientUtils.getHeldItem();
 
-            if (held == null)
-                break;
+            if (held == null) break;
 
             ItemStack inToSlot = window.inventorySlots.getSlot(transferTo).getStack();
 
-            if (!areStacksSameType(inToSlot, held))
-                continue;
+            if (!areStacksSameType(inToSlot, held)) continue;
 
             clickSlot(window, transferTo);
         }
 
-        for (int transferTo : slotZones.get(zoneIndex))//repeat on empty slots
+        for (int transferTo : slotZones.get(zoneIndex)) // repeat on empty slots
         {
             ItemStack held = NEIClientUtils.getHeldItem();
 
-            if (held == null)
-                break;
+            if (held == null) break;
 
             ItemStack inToSlot = window.inventorySlots.getSlot(transferTo).getStack();
 
-            if (inToSlot != null)
-                continue;
+            if (inToSlot != null) continue;
 
             clickSlot(window, transferTo);
         }
@@ -318,15 +305,14 @@ public class FastTransferManager
 
     public void throwAll(GuiContainer window, int pickedUpFromSlot) {
         ItemStack held = NEIClientUtils.getHeldItem();
-        if (held == null)
-            return;
+        if (held == null) return;
 
         clickSlot(window, -999);
 
         generateSlotMap(window.inventorySlots, held);
         Integer zone = slotZoneMap.get(pickedUpFromSlot);
-        if(zone == null) //something went wrong and we can't work out where the item was picked up from
-            return;
+        if (zone == null) // something went wrong and we can't work out where the item was picked up from
+        return;
 
         for (int slotIndex : slotZones.get(zone)) {
             Slot slot = window.inventorySlots.getSlot(slotIndex);

src/main/java/codechicken/nei/GuiEnchantmentModifier.java

@@ -1,5 +1,7 @@
 package codechicken.nei;
 
+import static codechicken.nei.NEIClientUtils.translate;
+
 import codechicken.lib.render.CCRenderState;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.GuiButton;
@@ -8,11 +10,8 @@ import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.world.World;
 import org.lwjgl.opengl.GL11;
 
-import static codechicken.nei.NEIClientUtils.translate;
-
-public class GuiEnchantmentModifier extends GuiContainer
-{
-    ContainerEnchantmentModifier container;
+public class GuiEnchantmentModifier extends GuiContainer {
+    final ContainerEnchantmentModifier container;
 
     public GuiEnchantmentModifier(InventoryPlayer inventoryplayer, World world, int i, int j, int k) {
         super(new ContainerEnchantmentModifier(inventoryplayer, world, i, j, k));

src/main/java/codechicken/nei/GuiExtendedCreativeInv.java

@@ -1,18 +1,18 @@
 package codechicken.nei;
 
 import codechicken.lib.render.CCRenderState;
+import codechicken.lib.vec.Rectangle4i;
 import codechicken.nei.api.INEIGuiHandler;
 import codechicken.nei.api.TaggedInventoryArea;
+import java.util.Collections;
+import java.util.List;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.inventory.Container;
+import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 import org.lwjgl.opengl.GL11;
 
-import java.util.Arrays;
-import java.util.List;
-
-public class GuiExtendedCreativeInv extends GuiContainer implements INEIGuiHandler
-{
+public class GuiExtendedCreativeInv extends GuiContainer implements INEIGuiHandler {
     public GuiExtendedCreativeInv(Container par1Container) {
         super(par1Container);
         ySize = 198;
@@ -41,7 +41,7 @@ public class GuiExtendedCreativeInv extends GuiContainer implements INEIGuiHandl
 
     @Override
     public List<TaggedInventoryArea> getInventoryAreas(GuiContainer gui) {
-        return Arrays.asList(new TaggedInventoryArea("ExtendedCreativeInv", 0, 54, inventorySlots));
+        return Collections.singletonList(new TaggedInventoryArea("ExtendedCreativeInv", 0, 54, inventorySlots));
     }
 
     @Override
@@ -51,6 +51,17 @@ public class GuiExtendedCreativeInv extends GuiContainer implements INEIGuiHandl
 
     @Override
     public boolean hideItemPanelSlot(GuiContainer gui, int x, int y, int w, int h) {
-        return false;
+        return (new Rectangle4i(guiLeft - 15, guiTop + 18, 18, 18 * 4 + 4)).intersects(new Rectangle4i(x, y, w, h));
+    }
+
+    @Override
+    protected void handleMouseClick(Slot p_146984_1_, int p_146984_2_, int p_146984_3_, int p_146984_4_) {
+
+        // Hack for armor slots, because they are outside the container
+        if (p_146984_1_ != null && p_146984_4_ == 4 && p_146984_1_.xDisplayPosition < 0) {
+            p_146984_4_ = 0;
+        }
+
+        super.handleMouseClick(p_146984_1_, p_146984_2_, p_146984_3_, p_146984_4_);
     }
 }

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

@@ -0,0 +1,53 @@
+package codechicken.nei;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.util.ResourceLocation;
+import org.lwjgl.opengl.GL11;
+
+public class GuiNEIButton extends GuiButton {
+    protected static final ResourceLocation guiTex = new ResourceLocation("textures/gui/widgets.png");
+
+    public GuiNEIButton(int i, int j, int k, int l, int i1, String s) {
+        super(i, j, k, l, i1, s);
+    }
+
+    public void drawButton(Minecraft minecraft, int i, int j) {
+        if (!visible) return;
+
+        FontRenderer fontrenderer = minecraft.fontRenderer;
+        minecraft.renderEngine.bindTexture(guiTex);
+        GL11.glColor4f(1, 1, 1, 1);
+        boolean flag = i >= xPosition && j >= yPosition && i < xPosition + width && j < yPosition + height;
+        int k = getHoverState(flag);
+        drawTexturedModalRect(xPosition, yPosition, 0, 46 + k * 20, width / 2, height / 2); // top left
+        drawTexturedModalRect(
+                xPosition + width / 2, yPosition, 200 - width / 2, 46 + k * 20, width / 2, height / 2); // top right
+        drawTexturedModalRect(
+                xPosition,
+                yPosition + height / 2,
+                0,
+                46 + k * 20 + 20 - height / 2,
+                width / 2,
+                height / 2); // bottom left
+        drawTexturedModalRect(
+                xPosition + width / 2,
+                yPosition + height / 2,
+                200 - width / 2,
+                46 + k * 20 + 20 - height / 2,
+                width / 2,
+                height / 2); // bottom right
+        mouseDragged(minecraft, i, j);
+
+        if (!enabled)
+            drawCenteredString(
+                    fontrenderer, displayString, xPosition + width / 2, yPosition + (height - 8) / 2, 0xffa0a0a0);
+        else if (flag)
+            drawCenteredString(
+                    fontrenderer, displayString, xPosition + width / 2, yPosition + (height - 8) / 2, 0xffffa0);
+        else
+            drawCenteredString(
+                    fontrenderer, displayString, xPosition + width / 2, yPosition + (height - 8) / 2, 0xe0e0e0);
+    }
+}

src/main/java/codechicken/nei/GuiPotionCreator.java

@@ -1,11 +1,15 @@
 package codechicken.nei;
 
+import static codechicken.nei.NEIClientUtils.translate;
+
 import codechicken.core.gui.GuiCCButton;
 import codechicken.core.gui.GuiCCTextField;
 import codechicken.core.gui.GuiScrollSlot;
 import codechicken.core.inventory.GuiContainerWidget;
 import codechicken.lib.render.CCRenderState;
 import codechicken.lib.render.FontUtils;
+import java.awt.Dimension;
+import java.util.ArrayList;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagList;
@@ -14,24 +18,15 @@ import net.minecraft.potion.PotionEffect;
 import net.minecraft.util.StatCollector;
 import org.lwjgl.opengl.GL11;
 
-import java.awt.*;
-import java.util.ArrayList;
-
-import static codechicken.nei.NEIClientUtils.translate;
-
-public class GuiPotionCreator extends GuiContainerWidget
-{
-    public class GuiSlotPotionEffects extends GuiScrollSlot
-    {
+public class GuiPotionCreator extends GuiContainerWidget {
+    public class GuiSlotPotionEffects extends GuiScrollSlot {
         public int selectedslot = -1;
         public boolean enabled = true;
-        private ArrayList<Potion> validPotions = new ArrayList<Potion>();
+        private final ArrayList<Potion> validPotions = new ArrayList<>();
 
         public GuiSlotPotionEffects(int x, int y) {
             super(x, y, 108, 76);
-            for (Potion p : Potion.potionTypes)
-                if (p != null)
-                    validPotions.add(p);
+            for (Potion p : Potion.potionTypes) if (p != null) validPotions.add(p);
             setSmoothScroll(false);
             setMargins(0, 0, 0, 0);
         }
@@ -48,8 +43,7 @@ public class GuiPotionCreator extends GuiContainerWidget
         }
 
         @Override
-        public void drawOverlay(float frame) {
-        }
+        public void drawOverlay(float frame) {}
 
         @Override
         public int scrollbarGuideAlignment() {
@@ -69,13 +63,13 @@ public class GuiPotionCreator extends GuiContainerWidget
             Potion potion = validPotions.get(slot);
             PotionEffect effect = getEffect(potion.id);
             boolean blank = effect == null;
-            if (effect == null)
-                effect = new PotionEffect(potion.id, 1200, 0);
+            if (effect == null) effect = new PotionEffect(potion.id, 1200, 0);
             int shade = selectedslot == slot ? 2 : blank ? 1 : 0;
 
             CCRenderState.changeTexture("textures/gui/container/enchanting_table.png");
             drawTexturedModalRect(x, y, 0, 166 + getSlotHeight(slot) * shade, width - 30, getSlotHeight(slot));
-            drawTexturedModalRect(x + width - 30, y, width - 23, 166 + getSlotHeight(slot) * shade, 30, getSlotHeight(slot));
+            drawTexturedModalRect(
+                    x + width - 30, y, width - 23, 166 + getSlotHeight(slot) * shade, 30, getSlotHeight(slot));
 
             if (potion.hasStatusIcon()) {
                 CCRenderState.changeTexture("textures/gui/container/inventory.png");
@@ -100,12 +94,13 @@ public class GuiPotionCreator extends GuiContainerWidget
 
         private PotionEffect getEffect(int id) {
             ItemStack potion = container.potionInv.getStackInSlot(0);
-            if (potion != null && potion.hasTagCompound() && potion.getTagCompound().hasKey("CustomPotionEffects")) {
+            if (potion != null
+                    && potion.hasTagCompound()
+                    && potion.getTagCompound().hasKey("CustomPotionEffects")) {
                 NBTTagList potionTagList = potion.getTagCompound().getTagList("CustomPotionEffects", 10);
                 for (int i = 0; i < potionTagList.tagCount(); i++) {
                     PotionEffect effect = PotionEffect.readCustomPotionEffectFromNBT(potionTagList.getCompoundTagAt(i));
-                    if (effect.getPotionID() == id)
-                        return effect;
+                    if (effect.getPotionID() == id) return effect;
                 }
             }
             return null;
@@ -118,8 +113,7 @@ public class GuiPotionCreator extends GuiContainerWidget
 
         @Override
         protected void slotClicked(int slot, int button, int mx, int my, int count) {
-            if (!enabled)
-                return;
+            if (!enabled) return;
 
             if (button == 0) {
                 select(slot);
@@ -145,19 +139,16 @@ public class GuiPotionCreator extends GuiContainerWidget
         }
 
         public void setEnabled(boolean b) {
-            if (b == enabled)
-                return;
+            if (b == enabled) return;
             enabled = b;
-            if (!enabled)
-                deselect();
+            if (!enabled) deselect();
         }
 
         private void select(int slot) {
             selectedslot = slot;
             durationField.setEnabled(true);
             PotionEffect effect = getEffect(validPotions.get(slot).id);
-            if (effect == null)
-                effect = new PotionEffect(validPotions.get(slot).id, 1200, 0);
+            if (effect == null) effect = new PotionEffect(validPotions.get(slot).id, 1200, 0);
             durationField.setDurationTicks(effect.getDuration());
             amplifier = effect.getAmplifier();
             validateInputButtons();
@@ -175,8 +166,7 @@ public class GuiPotionCreator extends GuiContainerWidget
         }
     }
 
-    public class GuiDurationField extends GuiCCTextField
-    {
+    public class GuiDurationField extends GuiCCTextField {
         private String baseValue;
 
         public GuiDurationField(int x, int y, int width, int height) {
@@ -190,27 +180,22 @@ public class GuiPotionCreator extends GuiContainerWidget
             i /= 20;
             String minutes = Integer.toString(i / 60);
             String seconds = Integer.toString(i % 60);
-            if (seconds.length() == 1)
-                seconds = '0' + seconds;
+            if (seconds.length() == 1) seconds = '0' + seconds;
             setText(minutes + seconds);
         }
 
         @Override
         public void setEnabled(boolean b) {
             super.setEnabled(b);
-            if (!isEnabled())
-                setText("100");
+            if (!isEnabled()) setText("100");
         }
 
         @Override
         public void onFocusChanged() {
-            if (isFocused())
-                baseValue = getText();
+            if (isFocused()) baseValue = getText();
             else {
-                if (!validateValue())
-                    setText(baseValue);
-                else
-                    applyEffect();
+                if (!validateValue()) setText(baseValue);
+                else applyEffect();
             }
         }
 
@@ -231,7 +216,8 @@ public class GuiPotionCreator extends GuiContainerWidget
         @Override
         public void drawText() {
             String s = getText();
-            String seconds = s.substring(Math.max(0, s.length() - 2), Math.max(0, s.length() - 2) + Math.min(s.length(), 2));
+            String seconds =
+                    s.substring(Math.max(0, s.length() - 2), Math.max(0, s.length() - 2) + Math.min(s.length(), 2));
             String minutes = s.length() < 3 ? "" : s.substring(0, s.length() - 2);
             int ty = y + height / 2 - 4;
             int tcolour = getTextColour();
@@ -256,7 +242,7 @@ public class GuiPotionCreator extends GuiContainerWidget
     GuiCCButton ampUp;
     GuiSlotPotionEffects slotPotionEffects;
     GuiDurationField durationField;
-    ContainerPotionCreator container;
+    final ContainerPotionCreator container;
 
     public GuiPotionCreator(InventoryPlayer inventoryplayer) {
         super(new ContainerPotionCreator(inventoryplayer, new ContainerPotionCreator.InventoryPotionStore()), 176, 208);
@@ -316,10 +302,8 @@ public class GuiPotionCreator extends GuiContainerWidget
 
     @Override
     public void actionPerformed(String ident, Object... params) {
-        if (ident.equals("ampDown"))
-            amplifier--;
-        else if (ident.equals("ampUp"))
-            amplifier++;
+        if (ident.equals("ampDown")) amplifier--;
+        else if (ident.equals("ampUp")) amplifier++;
         applyEffect();
         validateInputButtons();
     }

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

@@ -1,9 +1,18 @@
 package codechicken.nei;
 
+import static codechicken.lib.gui.GuiDraw.displaySize;
+import static codechicken.lib.gui.GuiDraw.drawString;
+import static codechicken.lib.gui.GuiDraw.drawTooltipBox;
+import static codechicken.lib.gui.GuiDraw.getStringWidth;
+
 import codechicken.lib.config.ConfigTag;
 import codechicken.nei.KeyManager.IKeyStateTracker;
 import codechicken.nei.api.ItemInfo;
 import codechicken.nei.guihook.GuiContainerManager;
+import codechicken.nei.recipe.StackInfo;
+import java.awt.Dimension;
+import java.awt.Point;
+import java.util.List;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.RenderHelper;
 import net.minecraft.item.ItemStack;
@@ -12,16 +21,7 @@ import net.minecraft.world.World;
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
 
-import java.awt.*;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-import static codechicken.lib.gui.GuiDraw.*;
-
-public class HUDRenderer implements IKeyStateTracker
-{
+public class HUDRenderer implements IKeyStateTracker {
     @Override
     public void tickKeyStates() {
         if (KeyManager.keyStates.get("world.highlight_tips").down) {
@@ -32,37 +32,29 @@ public class HUDRenderer implements IKeyStateTracker
 
     public static void renderOverlay() {
         Minecraft mc = Minecraft.getMinecraft();
-        if (mc.currentScreen == null &&
-                mc.theWorld != null &&
-                !mc.gameSettings.keyBindPlayerList.getIsKeyPressed() &&
-                NEIClientConfig.getBooleanSetting("world.highlight_tips") &&
-                mc.objectMouseOver != null &&
-                mc.objectMouseOver.typeOfHit == MovingObjectType.BLOCK) {
+        if (mc.currentScreen == null
+                && mc.theWorld != null
+                && !mc.gameSettings.keyBindPlayerList.getIsKeyPressed()
+                && NEIClientConfig.getBooleanSetting("world.highlight_tips")
+                && mc.objectMouseOver != null
+                && mc.objectMouseOver.typeOfHit == MovingObjectType.BLOCK) {
             World world = mc.theWorld;
-            ArrayList<ItemStack> items = ItemInfo.getIdentifierItems(world, mc.thePlayer, mc.objectMouseOver);
-            if (items.isEmpty())
-                return;
+            ItemStack[] items = ItemInfo.getIdentifierItems(world, mc.thePlayer, mc.objectMouseOver)
+                    .toArray(new ItemStack[0]);
 
-            int minDamage = Integer.MAX_VALUE;
-            ItemStack stack = null;
-            for(ItemStack astack : items) {
-                if(astack.getItem() != null && astack.getItemDamage() < minDamage) {
-                    stack = astack;
-                    minDamage = stack.getItemDamage();
-                }
-            }
+            if (items.length == 0) return;
+
+            ItemStack stack = StackInfo.getItemStackWithMinimumDamage(items);
 
             renderOverlay(stack, ItemInfo.getText(stack, world, mc.thePlayer, mc.objectMouseOver), getPositioning());
         }
     }
 
     public static void renderOverlay(ItemStack stack, List<String> textData, Point pos) {
-        if((stack == null || stack.getItem() == null) && textData.isEmpty())
-            return;
+        if ((stack == null || stack.getItem() == null) && textData.isEmpty()) return;
 
         int w = 0;
-        for (String s : textData)
-            w = Math.max(w, getStringWidth(s) + 29);
+        for (String s : textData) w = Math.max(w, getStringWidth(s) + 29);
         int h = Math.max(24, 10 + 10 * textData.size());
 
         Dimension size = displaySize();
@@ -83,8 +75,7 @@ public class HUDRenderer implements IKeyStateTracker
         RenderHelper.enableGUIStandardItemLighting();
         GL11.glEnable(GL12.GL_RESCALE_NORMAL);
 
-        if (stack != null && stack.getItem() != null)
-            GuiContainerManager.drawItem(x + 5, y + h / 2 - 8, stack);
+        if (stack != null && stack.getItem() != null) GuiContainerManager.drawItem(x + 5, y + h / 2 - 8, stack);
     }
 
     private static Point getPositioning() {
@@ -96,4 +87,4 @@ public class HUDRenderer implements IKeyStateTracker
     public static void load() {
         KeyManager.trackers.add(new HUDRenderer());
     }
-}
+}

src/main/java/codechicken/nei/Image.java

@@ -0,0 +1,15 @@
+package codechicken.nei;
+
+public class Image {
+    public int x;
+    public int y;
+    public int width;
+    public int height;
+
+    public Image(int x, int y, int w, int h) {
+        this.x = x;
+        this.y = y;
+        width = w;
+        height = h;
+    }
+}

src/main/java/codechicken/nei/InfiniteStackSizeHandler.java

@@ -5,51 +5,41 @@ import codechicken.nei.api.IInfiniteItemHandler;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
 
-public class InfiniteStackSizeHandler implements IInfiniteItemHandler
-{
+public class InfiniteStackSizeHandler implements IInfiniteItemHandler {
     @Override
-    public void onPickup(ItemStack heldItem)
-    {
+    public void onPickup(ItemStack heldItem) {
         heldItem.stackSize = 1;
     }
 
     @Override
-    public void onPlaceInfinite(ItemStack heldItem)
-    {
+    public void onPlaceInfinite(ItemStack heldItem) {
         heldItem.stackSize = 111;
     }
 
     @Override
-    public boolean canHandleItem(ItemStack stack)
-    {
+    public boolean canHandleItem(ItemStack stack) {
         return !stack.isItemStackDamageable();
     }
 
     @Override
-    public boolean isItemInfinite(ItemStack stack)
-    {
+    public boolean isItemInfinite(ItemStack stack) {
         return stack.stackSize == -1 || stack.stackSize > 100;
     }
 
     @Override
-    public void replenishInfiniteStack(InventoryPlayer inv, int slotNo)
-    {
+    public void replenishInfiniteStack(InventoryPlayer inv, int slotNo) {
         ItemStack stack = inv.getStackInSlot(slotNo);
         stack.stackSize = 111;
-        
-        for(int i = 0; i < inv.getSizeInventory(); i++)
-        {
-            if(i == slotNo)
-                continue;
-            
-            if(NEIServerUtils.areStacksSameType(stack, inv.getStackInSlot(i)))
-                inv.setInventorySlotContents(i, null);
+
+        for (int i = 0; i < inv.getSizeInventory(); i++) {
+            if (i == slotNo) continue;
+
+            if (NEIServerUtils.areStacksSameType(stack, inv.getStackInSlot(i))) inv.setInventorySlotContents(i, null);
         }
     }
 
     @Override
-    public ItemStack getInfiniteItem(ItemStack typeStack)
-    {
+    public ItemStack getInfiniteItem(ItemStack typeStack) {
         return InventoryUtils.copyStack(typeStack, -1);
     }
 }

src/main/java/codechicken/nei/InfiniteToolHandler.java

@@ -4,8 +4,7 @@ import codechicken.nei.api.IInfiniteItemHandler;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
 
-public class InfiniteToolHandler implements IInfiniteItemHandler
-{
+public class InfiniteToolHandler implements IInfiniteItemHandler {
     @Override
     public void onPickup(ItemStack heldItem) {
         heldItem.setItemDamage(0);

src/main/java/codechicken/nei/InventoryCraftingDummy.java

@@ -0,0 +1,19 @@
+package codechicken.nei;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.InventoryCrafting;
+
+public class InventoryCraftingDummy extends InventoryCrafting {
+    public InventoryCraftingDummy() {
+        super(
+                new Container() {
+                    @Override
+                    public boolean canInteractWith(EntityPlayer entityplayer) {
+                        return true;
+                    }
+                },
+                3,
+                3);
+    }
+}

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

@@ -7,22 +7,23 @@ import codechicken.nei.api.ItemInfo;
 import codechicken.nei.guihook.GuiContainerManager;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.ListMultimap;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
-
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ForkJoinPool;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
 
-public class ItemList
-{
+public class ItemList {
     /**
      * Fields are replaced atomically and contents never modified.
      */
-    public static volatile List<ItemStack> items = new ArrayList<ItemStack>();
+    public static volatile List<ItemStack> items = new ArrayList<>();
     /**
      * Fields are replaced atomically and contents never modified.
      */
@@ -30,30 +31,28 @@ public class ItemList
     /**
      * Updates to this should be synchronised on this
      */
-    public static final List<ItemFilterProvider> itemFilterers = new LinkedList<ItemFilterProvider>();
-    public static final List<ItemsLoadedCallback> loadCallbacks = new LinkedList<ItemsLoadedCallback>();
+    public static final List<ItemFilterProvider> itemFilterers = new LinkedList<>();
 
-    private static HashSet<Item> erroredItems = new HashSet<Item>();
-    private static HashSet<String> stackTraces = new HashSet<String>();
+    public static final List<ItemsLoadedCallback> loadCallbacks = new LinkedList<>();
 
-    public static class EverythingItemFilter implements ItemFilter
-    {
+    private static final HashSet<Item> erroredItems = new HashSet<>();
+    private static final HashSet<String> stackTraces = new HashSet<>();
+
+    public static class EverythingItemFilter implements ItemFilter {
         @Override
         public boolean matches(ItemStack item) {
             return true;
         }
     }
 
-    public static class NothingItemFilter implements ItemFilter
-    {
+    public static class NothingItemFilter implements ItemFilter {
         @Override
         public boolean matches(ItemStack item) {
             return false;
         }
     }
 
-    public static class PatternItemFilter implements ItemFilter
-    {
+    public static class PatternItemFilter implements ItemFilter {
         public Pattern pattern;
 
         public PatternItemFilter(Pattern pattern) {
@@ -66,68 +65,64 @@ public class ItemList
         }
     }
 
-    public static class AllMultiItemFilter implements ItemFilter
-    {
-        public List<ItemFilter> filters = new LinkedList<ItemFilter>();
+    public static class AllMultiItemFilter implements ItemFilter {
+        public List<ItemFilter> filters;
 
         public AllMultiItemFilter(List<ItemFilter> filters) {
             this.filters = filters;
         }
 
         public AllMultiItemFilter() {
-            this(new LinkedList<ItemFilter>());
+            this(new LinkedList<>());
         }
 
         @Override
         public boolean matches(ItemStack item) {
-            for(ItemFilter filter : filters)
+            for (ItemFilter filter : filters)
                 try {
                     if (!filter.matches(item)) return false;
                 } catch (Exception e) {
-                    NEIClientConfig.logger.error("Exception filtering "+item+" with "+filter, e);
+                    NEIClientConfig.logger.error("Exception filtering " + item + " with " + filter, e);
                 }
 
             return true;
         }
     }
 
-    public static class AnyMultiItemFilter implements ItemFilter
-    {
-        public List<ItemFilter> filters = new LinkedList<ItemFilter>();
+    public static class AnyMultiItemFilter implements ItemFilter {
+        public List<ItemFilter> filters;
 
         public AnyMultiItemFilter(List<ItemFilter> filters) {
             this.filters = filters;
         }
 
         public AnyMultiItemFilter() {
-            this(new LinkedList<ItemFilter>());
+            this(new LinkedList<>());
         }
 
         @Override
         public boolean matches(ItemStack item) {
-            for(ItemFilter filter : filters)
+            for (ItemFilter filter : filters)
                 try {
                     if (filter.matches(item)) return true;
                 } catch (Exception e) {
-                    NEIClientConfig.logger.error("Exception filtering "+item+" with "+filter, e);
+                    NEIClientConfig.logger.error("Exception filtering " + item + " with " + filter, e);
                 }
 
             return false;
         }
     }
 
-    public static interface ItemsLoadedCallback
-    {
+    public static interface ItemsLoadedCallback {
         public void itemsLoaded();
     }
 
     public static boolean itemMatchesAll(ItemStack item, List<ItemFilter> filters) {
-        for(ItemFilter filter : filters) {
+        for (ItemFilter filter : filters) {
             try {
-                if (!filter.matches(item))
-                    return false;
+                if (!filter.matches(item)) return false;
             } catch (Exception e) {
-                NEIClientConfig.logger.error("Exception filtering "+item+" with "+filter, e);
+                NEIClientConfig.logger.error("Exception filtering " + item + " with " + filter, e);
             }
         }
 
@@ -147,18 +142,16 @@ public class ItemList
     }
 
     public static List<ItemFilter> getItemFilters() {
-        LinkedList<ItemFilter> filters = new LinkedList<ItemFilter>();
+        LinkedList<ItemFilter> filters = new LinkedList<>();
         synchronized (itemFilterers) {
-            for(ItemFilterProvider p : itemFilterers)
-                filters.add(p.getFilter());
+            for (ItemFilterProvider p : itemFilterers) filters.add(p.getFilter());
         }
         return filters;
     }
 
-    public static final RestartableTask loadItems = new RestartableTask("NEI Item Loading")
-    {
+    public static final RestartableTask loadItems = new RestartableTask("NEI Item Loading") {
         private void damageSearch(Item item, List<ItemStack> permutations) {
-            HashSet<String> damageIconSet = new HashSet<String>();
+            HashSet<String> damageIconSet = new HashSet<>();
             for (int damage = 0; damage < 16; damage++)
                 try {
                     ItemStack itemstack = new ItemStack(item, 1, damage);
@@ -169,29 +162,33 @@ public class ItemList
                         damageIconSet.add(s);
                         permutations.add(itemstack);
                     }
-                }
-                catch(TimeoutException t) {
+                } catch (TimeoutException t) {
                     throw t;
-                }
-                catch(Throwable t) {
-                    NEIServerUtils.logOnce(t, stackTraces, "Ommiting "+item+":"+damage+" "+item.getClass().getSimpleName(), item.toString());
+                } catch (Throwable t) {
+                    NEIServerUtils.logOnce(
+                            t,
+                            stackTraces,
+                            "Ommiting " + item + ":" + damage + " "
+                                    + item.getClass().getSimpleName(),
+                            item.toString());
                 }
         }
 
         @Override
+        @SuppressWarnings("unchecked")
         public void execute() {
-            ThreadOperationTimer timer = getTimer(500);
+            // System.out.println("Executing NEI Item Loading");
+            ThreadOperationTimer timer = getTimer(NEIClientConfig.getItemLoadingTimeout());
 
-            LinkedList<ItemStack> items = new LinkedList<ItemStack>();
-            LinkedList<ItemStack> permutations = new LinkedList<ItemStack>();
+            LinkedList<ItemStack> items = new LinkedList<>();
+            LinkedList<ItemStack> permutations = new LinkedList<>();
             ListMultimap<Item, ItemStack> itemMap = ArrayListMultimap.create();
 
-            timer.setLimit(500);
+            timer.setLimit(NEIClientConfig.getItemLoadingTimeout());
             for (Item item : (Iterable<Item>) Item.itemRegistry) {
                 if (interrupted()) return;
 
-                if (item == null || erroredItems.contains(item))
-                    continue;
+                if (item == null || erroredItems.contains(item)) continue;
 
                 try {
                     timer.reset(item);
@@ -199,11 +196,9 @@ public class ItemList
                     permutations.clear();
                     permutations.addAll(ItemInfo.itemOverrides.get(item));
 
-                    if (permutations.isEmpty())
-                        item.getSubItems(item, null, permutations);
+                    if (permutations.isEmpty()) item.getSubItems(item, null, permutations);
 
-                    if (permutations.isEmpty())
-                        damageSearch(item, permutations);
+                    if (permutations.isEmpty()) damageSearch(item, permutations);
 
                     permutations.addAll(ItemInfo.itemVariants.get(item));
 
@@ -217,32 +212,47 @@ public class ItemList
                 }
             }
 
-            if(interrupted()) return;
+            if (interrupted()) return;
             ItemList.items = items;
             ItemList.itemMap = itemMap;
-            for(ItemsLoadedCallback callback : loadCallbacks)
-                callback.itemsLoaded();
+            for (ItemsLoadedCallback callback : loadCallbacks) callback.itemsLoaded();
 
             updateFilter.restart();
         }
     };
 
-    public static final RestartableTask updateFilter = new RestartableTask("NEI Item Filtering")
-    {
+    public static ForkJoinPool getPool(int poolSize) {
+        if (poolSize < 1) poolSize = 1;
+
+        return new ForkJoinPool(poolSize);
+    }
+
+    public static final int numProcessors = Runtime.getRuntime().availableProcessors();
+    public static ForkJoinPool forkJoinPool = getPool(numProcessors * 2 / 3);
+
+    public static final RestartableTask updateFilter = new RestartableTask("NEI Item Filtering") {
         @Override
         public void execute() {
-            ArrayList<ItemStack> filtered = new ArrayList<ItemStack>();
+            // System.out.println("Executing NEI Item Filtering");
+            ArrayList<ItemStack> filtered;
             ItemFilter filter = getItemListFilter();
-            for(ItemStack item : items) {
-                if (interrupted()) return;
 
-                if(filter.matches(item))
-                    filtered.add(item);
+            try {
+                filtered = ItemList.forkJoinPool
+                        .submit(() -> items.parallelStream()
+                                .filter(PresetsWidget::matches)
+                                .filter(filter::matches)
+                                .collect(Collectors.toCollection(ArrayList::new)))
+                        .get();
+            } catch (InterruptedException | ExecutionException e) {
+                filtered = new ArrayList<>();
+                e.printStackTrace();
+                stop();
             }
 
-            if(interrupted()) return;
+            if (interrupted()) return;
             ItemSorter.sort(filtered);
-            if(interrupted()) return;
+            if (interrupted()) return;
             ItemPanel.updateItemList(filtered);
         }
     };

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

@@ -1,5 +1,8 @@
 package codechicken.nei;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityList;
@@ -16,14 +19,7 @@ import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 import net.minecraftforge.client.MinecraftForgeClient;
 
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-public class ItemMobSpawner extends ItemBlock
-{
+public class ItemMobSpawner extends ItemBlock {
     private static Map<Integer, EntityLiving> entityHashMap;
     private static Map<Integer, String> IDtoNameMap;
     public static int idPig;
@@ -35,14 +31,15 @@ public class ItemMobSpawner extends ItemBlock
         hasSubtypes = true;
         MinecraftForgeClient.registerItemRenderer(this, new SpawnerRenderer());
 
-        entityHashMap = new HashMap<Integer, EntityLiving>();
-        IDtoNameMap = new HashMap<Integer, String>();
+        entityHashMap = new HashMap<>();
+        IDtoNameMap = new HashMap<>();
     }
 
     /**
      * These are ASM translated from BlockMobSpawner
      */
     public static int placedX;
+
     public static int placedY;
     public static int placedZ;
 
@@ -51,9 +48,20 @@ public class ItemMobSpawner extends ItemBlock
         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) {
+    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);
+            TileEntityMobSpawner tileentitymobspawner =
+                    (TileEntityMobSpawner) world.getTileEntity(placedX, placedY, placedZ);
             if (tileentitymobspawner != null) {
                 setDefaultTag(itemstack);
                 String mobtype = IDtoNameMap.get(itemstack.getItemDamage());
@@ -85,12 +93,12 @@ public class ItemMobSpawner extends ItemBlock
             loadSpawners(world);
             Class<?> clazz = (Class<?>) EntityList.IDtoClassMapping.get(ID);
             try {
-                e = (EntityLiving) clazz.getConstructor(new Class[]{World.class}).newInstance(world);
+                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);
+                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);
             }
             entityHashMap.put(ID, e);
@@ -98,50 +106,48 @@ public class ItemMobSpawner extends ItemBlock
         return e;
     }
 
+    public static void clearEntityReferences(World newWorld) {
+        entityHashMap.values().removeIf(e -> e.worldObj != newWorld);
+    }
+
     private void setDefaultTag(ItemStack itemstack) {
-        if (!IDtoNameMap.containsKey(itemstack.getItemDamage()))
-            itemstack.setItemDamage(idPig);
+        if (!IDtoNameMap.containsKey(itemstack.getItemDamage())) itemstack.setItemDamage(idPig);
     }
 
     public static void loadSpawners(World world) {
         if (loaded) return;
         loaded = true;
-        HashMap<Class<Entity>, String> classToStringMapping = (HashMap<Class<Entity>, String>) EntityList.classToStringMapping;
-        HashMap<Class<Entity>, Integer> classToIDMapping = (HashMap<Class<Entity>, Integer>) EntityList.classToIDMapping;
+        HashMap<Class<Entity>, String> classToStringMapping =
+                (HashMap<Class<Entity>, String>) EntityList.classToStringMapping;
+        HashMap<Class<Entity>, Integer> classToIDMapping =
+                (HashMap<Class<Entity>, Integer>) EntityList.classToIDMapping;
         for (Class<Entity> eclass : classToStringMapping.keySet()) {
-            if (!EntityLiving.class.isAssignableFrom(eclass))
-                continue;
+            if (!EntityLiving.class.isAssignableFrom(eclass)) continue;
             try {
-                EntityLiving entityliving = (EntityLiving) eclass.getConstructor(new Class[]{World.class}).newInstance(world);
+                EntityLiving entityliving = (EntityLiving)
+                        eclass.getConstructor(new Class[] {World.class}).newInstance(world);
                 entityliving.isChild();
 
                 int id = classToIDMapping.get(eclass);
                 String name = classToStringMapping.get(eclass);
 
-                if (name.equals("EnderDragon"))
-                    continue;
+                if (name.equals("EnderDragon")) continue;
 
                 IDtoNameMap.put(id, name);
 
-                if (name.equals("Pig"))
-                    idPig = id;
+                if (name.equals("Pig")) idPig = id;
             } catch (Throwable ignored) {
             }
         }
 
-        for(Iterator<Entry<Integer, String>> it = IDtoNameMap.entrySet().iterator(); it.hasNext();) {
-            Entry<Integer, String> e = it.next();
-            if(getEntity(e.getKey()).getClass() == EntityPig.class && !e.getValue().equals("Pig"))
-                it.remove();
-        }
+        IDtoNameMap.entrySet()
+                .removeIf(e -> getEntity(e.getKey()).getClass() == EntityPig.class
+                        && !e.getValue().equals("Pig"));
     }
 
     @Override
     public void getSubItems(Item item, CreativeTabs tab, List 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 for (int i : IDtoNameMap.keySet()) list.add(new ItemStack(item, 1, i));
     }
 }

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

@@ -0,0 +1,200 @@
+package codechicken.nei;
+
+import static codechicken.lib.gui.GuiDraw.drawRect;
+
+import codechicken.lib.vec.Rectangle4i;
+import java.util.ArrayList;
+import javax.annotation.Nullable;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.item.ItemStack;
+
+public class ItemPanel extends PanelWidget {
+
+    /**
+     *  Backwards compat :-/
+     */
+    @SuppressWarnings("unused")
+    @Deprecated
+    private int itemsPerPage = 0;
+
+    @Deprecated
+    public static ArrayList<ItemStack> items = new ArrayList<>();
+
+    @Deprecated
+    public ArrayList<ItemStack> realItems = new ArrayList<>();
+
+    public ItemStack getStackMouseOver(int mousex, int mousey) {
+        // *looks angrily at AppleCore*
+        return super.getStackMouseOver(mousex, mousey);
+    }
+
+    public Button more;
+    public Button less;
+    public ItemQuantityField quantity;
+
+    public static class ItemPanelSlot {
+        public ItemStack item;
+        public int slotIndex;
+
+        public ItemPanelSlot(int idx, ItemStack stack) {
+            slotIndex = idx;
+            item = stack;
+        }
+
+        @Deprecated
+        public ItemPanelSlot(int idx) {
+            this(idx, ItemPanels.itemPanel.getGrid().getItem(idx));
+        }
+    }
+
+    protected static class ItemPanelGrid extends ItemsGrid {
+        public ArrayList<ItemStack> newItems;
+
+        public void setItems(ArrayList<ItemStack> items) {
+            newItems = items;
+        }
+
+        public void refresh(GuiContainer gui) {
+
+            if (newItems != null) {
+                realItems = newItems;
+                newItems = null;
+                onGridChanged();
+            }
+
+            super.refresh(gui);
+        }
+
+        @Override
+        protected void drawSlotOutline(@Nullable ItemPanelSlot focused, int slotIdx, Rectangle4i rect) {
+            if (PresetsWidget.inEditMode()) {
+                if (!PresetsWidget.isHidden(getItem(slotIdx))) drawRect(rect.x, rect.y, rect.w, rect.h, 0xee555555);
+            } else {
+                super.drawSlotOutline(focused, slotIdx, rect);
+            }
+        }
+    }
+
+    public ItemPanel() {
+        grid = new ItemPanelGrid();
+    }
+
+    public static void updateItemList(ArrayList<ItemStack> newItems) {
+        ((ItemPanelGrid) ItemPanels.itemPanel.getGrid()).setItems(newItems);
+        ItemPanels.itemPanel.realItems = newItems;
+    }
+
+    @Override
+    public void init() {
+        super.init();
+
+        more = new Button("+") {
+            @Override
+            public boolean onButtonPress(boolean rightclick) {
+                if (rightclick) return false;
+
+                int modifier = NEIClientUtils.controlKey() ? 64 : NEIClientUtils.shiftKey() ? 10 : 1;
+                int quantity = NEIClientConfig.getItemQuantity() + modifier;
+
+                if (quantity < 0) {
+                    quantity = 0;
+                }
+
+                ItemPanels.itemPanel.quantity.setText(Integer.toString(quantity));
+                return true;
+            }
+        };
+        less = new Button("-") {
+            @Override
+            public boolean onButtonPress(boolean rightclick) {
+                if (rightclick) return false;
+
+                int modifier = NEIClientUtils.controlKey() ? -64 : NEIClientUtils.shiftKey() ? -10 : -1;
+                int quantity = NEIClientConfig.getItemQuantity() + modifier;
+
+                if (quantity < 0) {
+                    quantity = 0;
+                }
+
+                ItemPanels.itemPanel.quantity.setText(Integer.toString(quantity));
+                return true;
+            }
+        };
+
+        quantity = new ItemQuantityField("quantity");
+    }
+
+    @Deprecated
+    public void scroll(int i) {
+        grid.shiftPage(i);
+    }
+
+    public String getLabelText() {
+        return String.format("(%d/%d)", getPage(), Math.max(1, getNumPages()));
+    }
+
+    protected String getPositioningSettingName() {
+        return "world.panels.items";
+    }
+
+    public int getMarginLeft(GuiContainer gui) {
+        return (gui.width + gui.xSize) / 2 + PADDING;
+    }
+
+    public int getMarginTop(GuiContainer gui) {
+        return PADDING;
+    }
+
+    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;
+    }
+
+    protected int resizeFooter(GuiContainer gui) {
+        if (!NEIClientConfig.showItemQuantityWidget()) return 0;
+
+        final int BUTTON_SIZE = 16;
+
+        more.w = less.w = BUTTON_SIZE;
+        more.h = less.h = quantity.h = BUTTON_SIZE;
+
+        less.x = x;
+        more.x = x + w - BUTTON_SIZE;
+        more.y = less.y = quantity.y = y + h - BUTTON_SIZE;
+
+        quantity.x = x + BUTTON_SIZE + 2;
+        quantity.w = more.x - quantity.x - 2;
+
+        return BUTTON_SIZE + 2;
+    }
+
+    @Override
+    public void setVisible() {
+        super.setVisible();
+
+        if (grid.getPerPage() > 0 && NEIClientConfig.showItemQuantityWidget()) {
+            LayoutManager.addWidget(more);
+            LayoutManager.addWidget(less);
+            LayoutManager.addWidget(quantity);
+        }
+    }
+
+    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/ItemPanels.java

@@ -0,0 +1,6 @@
+package codechicken.nei;
+
+public class ItemPanels {
+    public static final ItemPanel itemPanel = new ItemPanel();
+    public static final BookmarkPanel bookmarkPanel = new BookmarkPanel();
+}

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

@@ -0,0 +1,54 @@
+package codechicken.nei;
+
+import static codechicken.nei.NEIClientUtils.translate;
+
+public class ItemQuantityField extends TextField {
+    public ItemQuantityField(String ident) {
+        super(ident);
+        centered = true;
+        field.setDisabledTextColour(0xFF303030);
+    }
+
+    public int intValue() {
+        return intValue(text());
+    }
+
+    public int intValue(String s) {
+        try {
+            return Math.max(0, Integer.parseInt(s));
+        } catch (NumberFormatException nfe) {
+            return 0;
+        }
+    }
+
+    @Override
+    public void gainFocus() {
+        if (text().equals("0")) {
+            setText("");
+        }
+    }
+
+    @Override
+    public void loseFocus() {
+        setText(Integer.toString(NEIClientConfig.getItemQuantity()));
+    }
+
+    @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.setEnabled(false);
+            super.draw(mousex, mousey);
+            field.setEnabled(true);
+            field.setText("0");
+        } else {
+            super.draw(mousex, mousey);
+        }
+    }
+}

src/main/java/codechicken/nei/ItemSorter.java

@@ -0,0 +1,162 @@
+package codechicken.nei;
+
+import codechicken.lib.config.ConfigTagParent;
+import codechicken.nei.ItemList.ItemsLoadedCallback;
+import codechicken.nei.api.API;
+import codechicken.nei.api.ItemInfo;
+import codechicken.nei.config.GuiItemSorter;
+import codechicken.nei.config.OptionOpenGui;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.StatCollector;
+
+public class ItemSorter implements Comparator<ItemStack>, ItemsLoadedCallback {
+    public static class SortEntry {
+        public final String name;
+        public final Comparator<ItemStack> comparator;
+
+        public SortEntry(String name, Comparator<ItemStack> comparator) {
+            this.name = name;
+            this.comparator = comparator;
+        }
+
+        public String getLocalisedName() {
+            return StatCollector.translateToLocal(name);
+        }
+
+        public String getTooltip() {
+            String tipname = name + ".tip";
+            String tip = StatCollector.translateToLocal(tipname);
+            return !tip.equals(tipname) ? tip : null;
+        }
+    }
+
+    public static final ArrayList<SortEntry> entries = new ArrayList<>();
+    public static ArrayList<SortEntry> list = new ArrayList<>();
+    public static final ItemSorter instance = new ItemSorter();
+
+    // optimisations
+    public HashMap<ItemStack, Integer> ordering = null;
+
+    public static void sort(ArrayList<ItemStack> items) {
+        try {
+            //            items = (ArrayList<ItemStack>)
+            // items.parallelStream().sorted(instance).collect(Collectors.toList());
+            items.sort(instance);
+        } catch (Exception e) {
+            NEIClientConfig.logger.error("Exception sorting item list", e);
+        }
+    }
+
+    @Override
+    public int compare(ItemStack o1, ItemStack o2) {
+        for (SortEntry e : list) {
+            int c = e.comparator.compare(o1, o2);
+            if (c != 0) return c;
+        }
+        return 0;
+    }
+
+    @Override
+    public void itemsLoaded() {
+        HashMap<ItemStack, Integer> newMap = new HashMap<>();
+        int i = 0;
+        for (ItemStack stack : ItemList.items) newMap.put(stack, i++);
+        ordering = newMap;
+    }
+
+    public static SortEntry find(String name) {
+        for (SortEntry e : entries) if (e.name.equals(name)) return e;
+
+        return null;
+    }
+
+    public static int compareInt(int a, int b) {
+        return Integer.compare(a, b);
+    }
+
+    public static void add(String name, Comparator<ItemStack> comparator) {
+        SortEntry e = new SortEntry(name, comparator);
+        entries.add(e);
+        ArrayList<SortEntry> nlist = new ArrayList<>(list);
+        nlist.add(e);
+        list = nlist; // concurrency
+    }
+
+    public static void initConfig(ConfigTagParent tag) {
+        // minecraft, mod, id, default, meta, name
+        API.addSortOption("nei.itemsort.minecraft", (o1, o2) -> {
+            boolean m1 = "minecraft".equals(ItemInfo.itemOwners.get(o1.getItem()));
+            boolean m2 = "minecraft".equals(ItemInfo.itemOwners.get(o2.getItem()));
+            return m1 == m2 ? 0 : m1 ? -1 : 1;
+        });
+        API.addSortOption("nei.itemsort.mod", (o1, o2) -> {
+            String mod1 = ItemInfo.itemOwners.get(o1.getItem());
+            String mod2 = ItemInfo.itemOwners.get(o2.getItem());
+            if (mod1 == null) return mod2 == null ? 0 : 1;
+            if (mod2 == null) return -1;
+            return mod1.compareTo(mod2);
+        });
+        API.addSortOption("nei.itemsort.id", (o1, o2) -> {
+            int id1 = Item.getIdFromItem(o1.getItem());
+            int id2 = Item.getIdFromItem(o2.getItem());
+            return compareInt(id1, id2);
+        });
+        API.addSortOption("nei.itemsort.default", (o1, o2) -> {
+            Integer order1 = instance.ordering.get(o1);
+            Integer order2 = instance.ordering.get(o2);
+            if (order1 == null) return order2 == null ? 0 : 1;
+            if (order2 == null) return -1;
+            return compareInt(order1, order2);
+        });
+        API.addSortOption("nei.itemsort.damage", (o1, o2) -> {
+            int id1 = o1.getItemDamage();
+            int id2 = o2.getItemDamage();
+            return compareInt(id1, id2);
+        });
+        API.addSortOption("nei.itemsort.name", (o1, o2) -> {
+            String name1 = ItemInfo.getSearchName(o1);
+            String name2 = ItemInfo.getSearchName(o2);
+            return name1.compareTo(name2);
+        });
+        tag.getTag("inventory.itemsort").setDefaultValue(getSaveString(list));
+        API.addOption(new OptionOpenGui("inventory.itemsort", GuiItemSorter.class) {
+            @Override
+            public void useGlobals() {
+                super.useGlobals();
+                list = fromSaveString(activeTag().getValue());
+            }
+        });
+        ItemList.loadCallbacks.add(instance);
+    }
+
+    public static String getSaveString(List<SortEntry> list) {
+        StringBuilder sb = new StringBuilder();
+        for (SortEntry e : list) {
+            if (sb.length() > 0) sb.append(',');
+            sb.append(e.name);
+        }
+        return sb.toString();
+    }
+
+    public static ArrayList<SortEntry> fromSaveString(String s) {
+        if (s == null) return new ArrayList<>(entries);
+
+        ArrayList<SortEntry> list = new ArrayList<>();
+        for (String s2 : s.split(",")) {
+            SortEntry e = find(s2.trim());
+            if (e != null) list.add(e);
+        }
+        for (SortEntry e : entries) if (!list.contains(e)) list.add(e);
+
+        return list;
+    }
+
+    public static void loadConfig() {
+        list = fromSaveString(NEIClientConfig.getStringSetting("inventory.itemsort"));
+    }
+}

src/main/java/codechicken/nei/ItemStackMap.java

@@ -1,28 +1,25 @@
 package codechicken.nei;
 
-import com.google.common.base.*;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
 import static codechicken.lib.inventory.InventoryUtils.actualDamage;
 import static codechicken.lib.inventory.InventoryUtils.newItemStack;
 import static net.minecraftforge.oredict.OreDictionary.WILDCARD_VALUE;
 
+import com.google.common.base.Objects;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+
 /**
  * A maplike class for ItemStack keys with wildcard damage/NBT. Optimised for lookup
  */
-public class ItemStackMap<T>
-{
-    public static class StackMetaKey
-    {
-        public int damage;
-        public NBTTagCompound tag;
+public class ItemStackMap<T> {
+    public static class StackMetaKey {
+        public final int damage;
+        public final NBTTagCompound tag;
 
         public StackMetaKey(int damage, NBTTagCompound tag) {
             this.damage = damage;
@@ -38,17 +35,15 @@ public class ItemStackMap<T>
         }
 
         public boolean equals(Object o) {
-            if (!(o instanceof StackMetaKey))
-                return false;
+            if (!(o instanceof StackMetaKey)) return false;
             StackMetaKey t = (StackMetaKey) o;
             return damage == t.damage && Objects.equal(tag, t.tag);
         }
     }
 
-    public static class Entry<T>
-    {
-        public ItemStack key;
-        public T value;
+    public static class Entry<T> {
+        public final ItemStack key;
+        public final T value;
 
         public Entry(ItemStack key, T value) {
             this.key = key;
@@ -56,8 +51,7 @@ public class ItemStackMap<T>
         }
     }
 
-    public class DetailMap
-    {
+    public class DetailMap {
         private boolean hasWildcard;
         private T wildcard;
         private HashMap<Integer, T> damageMap;
@@ -66,19 +60,17 @@ public class ItemStackMap<T>
         private int size;
 
         public T get(ItemStack key) {
-            if (wildcard != null)
-                return wildcard;
+            if (wildcard != null) return wildcard;
 
             if (damageMap != null) {
-                T ret = damageMap.get(actualDamage(key));
+                final T ret = damageMap.get(actualDamage(key));
                 if (ret != null) return ret;
             }
             if (tagMap != null) {
-                T ret = tagMap.get(key.stackTagCompound);
+                final T ret = tagMap.get(key.stackTagCompound);
                 if (ret != null) return ret;
             }
-            if (metaMap != null)
-                return metaMap.get(new StackMetaKey(key));
+            if (metaMap != null) return metaMap.get(new StackMetaKey(key));
 
             return null;
         }
@@ -87,13 +79,13 @@ public class ItemStackMap<T>
             try {
                 switch (getKeyType(actualDamage(key), key.stackTagCompound)) {
                     case 0:
-                        if (metaMap == null) metaMap = new HashMap<StackMetaKey, T>();
+                        if (metaMap == null) metaMap = new HashMap<>();
                         return metaMap.put(new StackMetaKey(key), value);
                     case 1:
-                        if (tagMap == null) tagMap = new HashMap<NBTTagCompound, T>();
+                        if (tagMap == null) tagMap = new HashMap<>();
                         return tagMap.put(key.stackTagCompound, value);
                     case 2:
-                        if (damageMap == null) damageMap = new HashMap<Integer, T>();
+                        if (damageMap == null) damageMap = new HashMap<>();
                         return damageMap.put(actualDamage(key), value);
                     case 3:
                         T ret = wildcard;
@@ -129,63 +121,55 @@ public class ItemStackMap<T>
         }
 
         private void updateSize() {
-            int newSize = (hasWildcard ? 1 : 0) +
-                    (metaMap != null ? metaMap.size() : 0) +
-                    (tagMap != null ? tagMap.size() : 0) +
-                    (damageMap != null ? damageMap.size() : 0);
+            int newSize = (hasWildcard ? 1 : 0)
+                    + (metaMap != null ? metaMap.size() : 0)
+                    + (tagMap != null ? tagMap.size() : 0)
+                    + (damageMap != null ? damageMap.size() : 0);
 
-            if(newSize != size) {
-                ItemStackMap.this.size += newSize-size;
+            if (newSize != size) {
+                ItemStackMap.this.size += newSize - size;
                 size = newSize;
             }
         }
 
         public void addKeys(Item item, List<ItemStack> list) {
-            if (wildcard != null)
-                list.add(wildcard(item));
+            if (wildcard != null) list.add(wildcard(item));
             if (damageMap != null)
-                for (int damage : damageMap.keySet())
-                    list.add(newItemStack(item, 1, damage, WILDCARD_TAG));
+                for (int damage : damageMap.keySet()) list.add(newItemStack(item, 1, damage, WILDCARD_TAG));
             if (tagMap != null)
-                for (NBTTagCompound tag : tagMap.keySet())
-                    list.add(newItemStack(item, 1, WILDCARD_VALUE, tag));
+                for (NBTTagCompound tag : tagMap.keySet()) list.add(newItemStack(item, 1, WILDCARD_VALUE, tag));
             if (metaMap != null)
-                for (StackMetaKey key : metaMap.keySet())
-                    list.add(newItemStack(item, 1, key.damage, key.tag));
+                for (StackMetaKey key : metaMap.keySet()) list.add(newItemStack(item, 1, key.damage, key.tag));
         }
 
         public void addValues(List<T> list) {
-            if (wildcard != null)
-                list.add(wildcard);
-            if (damageMap != null)
-                list.addAll(damageMap.values());
-            if (tagMap != null)
-                list.addAll(tagMap.values());
-            if (metaMap != null)
-                list.addAll(metaMap.values());
+            if (wildcard != null) list.add(wildcard);
+            if (damageMap != null) list.addAll(damageMap.values());
+            if (tagMap != null) list.addAll(tagMap.values());
+            if (metaMap != null) list.addAll(metaMap.values());
         }
 
         public void addEntries(Item item, List<Entry<T>> list) {
-            if (wildcard != null)
-                list.add(new Entry<T>(newItemStack(item, 1, WILDCARD_VALUE, WILDCARD_TAG), wildcard));
+            if (wildcard != null) list.add(new Entry<>(newItemStack(item, 1, WILDCARD_VALUE, WILDCARD_TAG), wildcard));
             if (damageMap != null)
                 for (Map.Entry<Integer, T> entry : damageMap.entrySet())
-                    list.add(new Entry<T>(newItemStack(item, 1, entry.getKey(), WILDCARD_TAG), entry.getValue()));
+                    list.add(new Entry<>(newItemStack(item, 1, entry.getKey(), WILDCARD_TAG), entry.getValue()));
             if (tagMap != null)
                 for (Map.Entry<NBTTagCompound, T> entry : tagMap.entrySet())
-                    list.add(new Entry<T>(newItemStack(item, 1, WILDCARD_VALUE, entry.getKey()), entry.getValue()));
+                    list.add(new Entry<>(newItemStack(item, 1, WILDCARD_VALUE, entry.getKey()), entry.getValue()));
             if (metaMap != null)
                 for (Map.Entry<StackMetaKey, T> entry : metaMap.entrySet())
-                    list.add(new Entry<T>(newItemStack(item, 1, entry.getKey().damage, entry.getKey().tag), entry.getValue()));
+                    list.add(new Entry<>(
+                            newItemStack(item, 1, entry.getKey().damage, entry.getKey().tag), entry.getValue()));
         }
     }
 
     public static int getKeyType(int damage, NBTTagCompound tag) {
-             int i = 0;
-             if (isWildcard(damage)) i = 1;
-             if (isWildcard(tag)) i |= 2;
-             return i;
-         }
+        int i = 0;
+        if (isWildcard(damage)) i = 1;
+        if (isWildcard(tag)) i |= 2;
+        return i;
+    }
 
     public static ItemStack wildcard(Item item) {
         return newItemStack(item, 1, WILDCARD_VALUE, WILDCARD_TAG);
@@ -199,31 +183,30 @@ public class ItemStackMap<T>
         return tag != null && tag.getBoolean("*");
     }
 
-    public static NBTTagCompound WILDCARD_TAG;
+    public static final NBTTagCompound WILDCARD_TAG;
 
     static {
         WILDCARD_TAG = new NBTTagCompound();
         WILDCARD_TAG.setBoolean("*", true);
     }
 
-    private HashMap<Item, DetailMap> itemMap = new HashMap<Item, DetailMap>();
+    private final HashMap<Item, DetailMap> itemMap = new HashMap<>();
     private int size;
 
     public T get(ItemStack key) {
-        if (key == null || key.getItem() == null)
-            return null;
+        if (key == null) return null;
+        final Item item = key.getItem();
+        if (item == null) return null;
 
-        DetailMap map = itemMap.get(key.getItem());
+        final DetailMap map = itemMap.get(item);
         return map == null ? null : map.get(key);
     }
 
     public void put(ItemStack key, T value) {
-        if (key == null || key.getItem() == null)
-            return;
+        if (key == null || key.getItem() == null) return;
 
         DetailMap map = itemMap.get(key.getItem());
-        if (map == null)
-            itemMap.put(key.getItem(), map = new DetailMap());
+        if (map == null) itemMap.put(key.getItem(), map = new DetailMap());
         map.put(key, value);
     }
 
@@ -232,29 +215,27 @@ public class ItemStackMap<T>
     }
 
     public T remove(ItemStack key) {
-        if (key == null || key.getItem() == null)
-            return null;
+        if (key == null || key.getItem() == null) return null;
 
         DetailMap map = itemMap.get(key.getItem());
         return map == null ? null : map.remove(key);
     }
 
     public List<ItemStack> keys() {
-        LinkedList<ItemStack> list = new LinkedList<ItemStack>();
+        LinkedList<ItemStack> list = new LinkedList<>();
         for (Map.Entry<Item, DetailMap> entry : itemMap.entrySet())
             entry.getValue().addKeys(entry.getKey(), list);
         return list;
     }
 
     public List<T> values() {
-        LinkedList<T> list = new LinkedList<T>();
-        for (DetailMap map : itemMap.values())
-            map.addValues(list);
+        LinkedList<T> list = new LinkedList<>();
+        for (DetailMap map : itemMap.values()) map.addValues(list);
         return list;
     }
 
     public List<Entry<T>> entries() {
-        LinkedList<Entry<T>> list = new LinkedList<Entry<T>>();
+        LinkedList<Entry<T>> list = new LinkedList<>();
         for (Map.Entry<Item, DetailMap> entry : itemMap.entrySet())
             entry.getValue().addEntries(entry.getKey(), list);
         return list;

src/main/java/codechicken/nei/ItemStackSet.java

@@ -5,23 +5,19 @@ import net.minecraft.block.Block;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 
-public class ItemStackSet extends ItemStackMap<ItemStack> implements ItemFilter
-{
+public class ItemStackSet extends ItemStackMap<ItemStack> implements ItemFilter {
     public ItemStackSet with(ItemStack... items) {
-        for(ItemStack item : items)
-            add(item);
+        for (ItemStack item : items) add(item);
         return this;
     }
 
     public ItemStackSet with(Item... items) {
-        for(Item item : items)
-            add(ItemStackMap.wildcard(item));
+        for (Item item : items) add(ItemStackMap.wildcard(item));
         return this;
     }
 
     public ItemStackSet with(Block... blocks) {
-        for(Block block : blocks)
-            add(ItemStackMap.wildcard(Item.getItemFromBlock(block)));
+        for (Block block : blocks) add(ItemStackMap.wildcard(Item.getItemFromBlock(block)));
         return this;
     }
 

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

@@ -0,0 +1,348 @@
+package codechicken.nei;
+
+import static codechicken.lib.gui.GuiDraw.drawRect;
+
+import codechicken.lib.vec.Rectangle4i;
+import codechicken.nei.ItemPanel.ItemPanelSlot;
+import codechicken.nei.api.GuiInfo;
+import codechicken.nei.guihook.GuiContainerManager;
+import codechicken.nei.recipe.StackInfo;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import javax.annotation.Nullable;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.ScaledResolution;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.shader.Framebuffer;
+import net.minecraft.item.ItemStack;
+import org.lwjgl.opengl.GL11;
+
+public class ItemsGrid {
+    public static final int SLOT_SIZE = 18;
+
+    protected int width;
+    protected int height;
+
+    protected int marginLeft;
+    protected int marginTop;
+
+    protected int paddingLeft;
+
+    protected ArrayList<ItemStack> realItems = new ArrayList<>();
+
+    protected int page;
+    protected int perPage;
+
+    protected int rows;
+    protected int columns;
+
+    protected boolean[] invalidSlotMap;
+
+    @Nullable
+    private Framebuffer framebuffer = null;
+
+    protected boolean refreshBuffer = true;
+
+    public ArrayList<ItemStack> getItems() {
+        return realItems;
+    }
+
+    public ItemStack getItem(int idx) {
+        return realItems.get(idx);
+    }
+
+    public int size() {
+        return realItems.size();
+    }
+
+    public int indexOf(ItemStack stackA, boolean useNBT) {
+
+        for (int idx = 0; idx < realItems.size(); idx++) {
+            if (StackInfo.equalItemAndNBT(stackA, realItems.get(idx), useNBT)) {
+                return idx;
+            }
+        }
+
+        return -1;
+    }
+
+    public int getPage() {
+        return page + 1;
+    }
+
+    public int getPerPage() {
+        return perPage;
+    }
+
+    public int getNumPages() {
+        if (perPage > 0) {
+            return (int) Math.ceil((float) realItems.size() / (float) perPage);
+        }
+
+        return 0;
+    }
+
+    public int getRows() {
+        return rows;
+    }
+
+    public int getColumns() {
+        return columns;
+    }
+
+    public void setGridSize(int mleft, int mtop, int w, int h) {
+        marginLeft = mleft;
+        marginTop = mtop;
+
+        width = Math.max(0, w);
+        height = Math.max(0, h);
+
+        columns = width / SLOT_SIZE;
+        rows = height / SLOT_SIZE;
+
+        paddingLeft = (width % SLOT_SIZE) / 2;
+    }
+
+    public void shiftPage(int shift) {
+        if (perPage == 0) {
+            page = 0;
+            return;
+        }
+
+        final int numPages = getNumPages();
+        final int oldPage = page;
+        page += shift;
+
+        if (page >= numPages) {
+            page = page - numPages;
+        }
+
+        if (page < 0) {
+            page = numPages + page;
+        }
+
+        page = Math.max(0, Math.min(page, numPages - 1));
+
+        if (page != oldPage) {
+            onGridChanged();
+        }
+    }
+
+    protected void onGridChanged() {
+        refreshBuffer = true;
+    }
+
+    public void refresh(GuiContainer gui) {
+        updateGuiOverlapSlots(gui);
+        shiftPage(0);
+    }
+
+    protected void updateGuiOverlapSlots(GuiContainer gui) {
+        final boolean[] oldSlotMap = invalidSlotMap;
+        final int oldRows = rows;
+        final int oldColumns = columns;
+
+        invalidSlotMap = new boolean[rows * columns];
+        perPage = columns * rows;
+
+        checkGuiOverlap(gui, 0, columns - 2, 1);
+        checkGuiOverlap(gui, columns - 1, 1, -1);
+
+        if (oldRows != rows || oldColumns != columns || !Arrays.equals(oldSlotMap, invalidSlotMap)) {
+            onGridChanged();
+        }
+    }
+
+    private void checkGuiOverlap(GuiContainer gui, int start, int end, int dir) {
+        boolean validColumn = false;
+
+        for (int c = start; c != end && !validColumn; c += dir) {
+            validColumn = true;
+
+            for (int r = 0; r < rows; r++) {
+                final int idx = columns * r + c;
+                if (GuiInfo.hideItemPanelSlot(gui, getSlotRect(r, c))
+                        && idx >= 0
+                        && idx < invalidSlotMap.length
+                        && !invalidSlotMap[idx]) {
+                    invalidSlotMap[idx] = true;
+                    validColumn = false;
+                    perPage--;
+                }
+            }
+        }
+    }
+
+    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);
+            }
+        }
+
+        return null;
+    }
+
+    public Rectangle4i getSlotRect(int i) {
+        return getSlotRect(i / columns, i % columns);
+    }
+
+    public Rectangle4i getSlotRect(int row, int column) {
+        return new Rectangle4i(
+                marginLeft + paddingLeft + column * SLOT_SIZE, marginTop + row * SLOT_SIZE, SLOT_SIZE, SLOT_SIZE);
+    }
+
+    public boolean isInvalidSlot(int index) {
+        return invalidSlotMap[index];
+    }
+
+    protected List<Integer> getMask() {
+        List<Integer> mask = new ArrayList<>();
+
+        int idx = page * perPage;
+        for (int i = 0; i < rows * columns && idx < size(); i++) {
+            mask.add(isInvalidSlot(i) ? null : idx++);
+        }
+
+        return mask;
+    }
+
+    private void drawSlotOutlines(int mousex, int mousey) {
+        ItemPanelSlot focused = getSlotMouseOver(mousex, mousey);
+        final List<Integer> mask = getMask();
+
+        for (int i = 0; i < mask.size(); i++) {
+            if (mask.get(i) != null) {
+                drawSlotOutline(focused, mask.get(i), getSlotRect(i));
+            }
+        }
+    }
+
+    protected void drawSlotOutline(@Nullable ItemPanelSlot focused, int slotIdx, Rectangle4i rect) {
+        if (focused != null && focused.slotIndex == slotIdx) {
+            drawRect(rect.x, rect.y, rect.w, rect.h, 0xee555555); // highlight
+        }
+    }
+
+    private void blitExistingBuffer() {
+        Minecraft minecraft = Minecraft.getMinecraft();
+        GL11.glEnable(GL11.GL_BLEND);
+        OpenGlHelper.glBlendFunc(GL11.GL_ONE, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ONE_MINUS_SRC_ALPHA);
+        GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+        getFrameBuffer().bindFramebufferTexture();
+        GL11.glEnable(GL11.GL_TEXTURE_2D);
+        ScaledResolution res = new ScaledResolution(minecraft, minecraft.displayWidth, minecraft.displayHeight);
+        Tessellator tessellator = Tessellator.instance;
+        tessellator.startDrawingQuads();
+        tessellator.addVertexWithUV(0, res.getScaledHeight_double(), 0.0, 0, 0);
+        tessellator.addVertexWithUV(res.getScaledWidth_double(), res.getScaledHeight_double(), 0.0, 1, 0);
+        tessellator.addVertexWithUV(res.getScaledWidth_double(), 0, 0.0, 1, 1);
+        tessellator.addVertexWithUV(0, 0, 0, 0, 1);
+        tessellator.draw();
+        OpenGlHelper.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO);
+    }
+
+    private Framebuffer getFrameBuffer() {
+
+        if (framebuffer == null) {
+            framebuffer = new Framebuffer(1, 1, true);
+            framebuffer.setFramebufferColor(0.0F, 0.0F, 0.0F, 0.0F);
+        }
+
+        return framebuffer;
+    }
+
+    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));
+            }
+        }
+
+        GuiContainerManager.disableMatrixStackLogging();
+    }
+
+    public void draw(int mousex, int mousey) {
+        if (getPerPage() == 0) {
+            return;
+        }
+
+        if (NEIClientConfig.shouldCacheItemRendering()) {
+
+            if (refreshBuffer) {
+                Minecraft minecraft = Minecraft.getMinecraft();
+                Framebuffer framebuffer = getFrameBuffer();
+                framebuffer.createBindFramebuffer(minecraft.displayWidth, minecraft.displayHeight);
+                framebuffer.framebufferClear();
+                framebuffer.bindFramebuffer(false);
+
+                /* Set up some rendering state needed for items to work correctly */
+                GL11.glDisable(GL11.GL_BLEND);
+                GL11.glDepthMask(true);
+                OpenGlHelper.glBlendFunc(
+                        GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
+                GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+
+                drawItems();
+
+                Minecraft.getMinecraft().getFramebuffer().bindFramebuffer(false);
+                refreshBuffer = false;
+            }
+
+            drawSlotOutlines(mousex, mousey);
+            blitExistingBuffer();
+        } else {
+            drawSlotOutlines(mousex, mousey);
+            drawItems();
+        }
+    }
+
+    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 = (int) ((mousey - marginTop) / SLOT_SIZE);
+        final int overColumn = (int) ((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;
+    }
+
+    public boolean contains(int px, int py) {
+
+        if (!(new Rectangle4i(marginLeft + paddingLeft, marginTop, columns * SLOT_SIZE, height)).contains(px, py)) {
+            return false;
+        }
+
+        final int r = (int) ((py - marginTop) / SLOT_SIZE);
+        final int c = (int) ((px - marginLeft - paddingLeft) / SLOT_SIZE);
+        final int slt = columns * r + c;
+
+        return r >= rows || c >= columns || !isInvalidSlot(slt);
+    }
+}

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

@@ -0,0 +1,42 @@
+package codechicken.nei;
+
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.Map.Entry;
+
+/**
+ * Good old down/held/up keystate tracker
+ */
+public class KeyManager {
+    public static interface IKeyStateTracker {
+        public void tickKeyStates();
+    }
+
+    public static class KeyState {
+        public boolean down;
+        public boolean held;
+        public boolean up;
+    }
+
+    public static HashMap<String, KeyState> keyStates = new HashMap<>();
+    public static LinkedList<IKeyStateTracker> trackers = new LinkedList<>();
+
+    public static void tickKeyStates() {
+        for (Entry<String, KeyState> entry : keyStates.entrySet()) {
+            final boolean down = NEIClientConfig.isKeyHashDown(entry.getKey());
+            final KeyState state = entry.getValue();
+
+            if (down) {
+                state.down = !state.held;
+                state.up = false;
+            } else {
+                state.up = state.held;
+                state.down = false;
+            }
+
+            state.held = down;
+        }
+
+        for (IKeyStateTracker tracker : trackers) tracker.tickKeyStates();
+    }
+}

src/main/java/codechicken/nei/Label.java

@@ -0,0 +1,26 @@
+package codechicken.nei;
+
+import static codechicken.lib.gui.GuiDraw.drawString;
+import static codechicken.lib.gui.GuiDraw.drawStringC;
+
+public class Label extends Widget {
+    final boolean centered;
+    final int colour;
+    public String text;
+
+    public Label(String s, boolean center, int color) {
+        text = s;
+        centered = center;
+        colour = color;
+    }
+
+    public Label(String s, boolean center) {
+        this(s, center, 0xFFFFFFFF);
+    }
+
+    @Override
+    public void draw(int mousex, int mousey) {
+        if (centered) drawStringC(text, x, y, colour);
+        else drawString(text, x, y, colour);
+    }
+}

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

@@ -0,0 +1,813 @@
+package codechicken.nei;
+
+import static codechicken.lib.gui.GuiDraw.changeTexture;
+import static codechicken.lib.gui.GuiDraw.drawRect;
+import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect;
+import static codechicken.nei.NEIClientConfig.canPerformAction;
+import static codechicken.nei.NEIClientConfig.disabledActions;
+import static codechicken.nei.NEIClientConfig.getOptionList;
+import static codechicken.nei.NEIClientConfig.getSearchExpression;
+import static codechicken.nei.NEIClientConfig.hasSMPCounterPart;
+import static codechicken.nei.NEIClientConfig.invCreativeMode;
+import static codechicken.nei.NEIClientConfig.isBookmarkPanelHidden;
+import static codechicken.nei.NEIClientConfig.isEnabled;
+import static codechicken.nei.NEIClientConfig.isHidden;
+import static codechicken.nei.NEIClientConfig.showIDs;
+import static codechicken.nei.NEIClientConfig.toggleBooleanSetting;
+import static codechicken.nei.NEIClientConfig.world;
+import static codechicken.nei.NEIClientUtils.cycleGamemode;
+import static codechicken.nei.NEIClientUtils.decreaseSlotStack;
+import static codechicken.nei.NEIClientUtils.deleteEverything;
+import static codechicken.nei.NEIClientUtils.deleteHeldItem;
+import static codechicken.nei.NEIClientUtils.deleteItemsOfType;
+import static codechicken.nei.NEIClientUtils.getGamemode;
+import static codechicken.nei.NEIClientUtils.getGuiContainer;
+import static codechicken.nei.NEIClientUtils.getHeldItem;
+import static codechicken.nei.NEIClientUtils.getNextGamemode;
+import static codechicken.nei.NEIClientUtils.healPlayer;
+import static codechicken.nei.NEIClientUtils.isValidGamemode;
+import static codechicken.nei.NEIClientUtils.setHourForward;
+import static codechicken.nei.NEIClientUtils.shiftKey;
+import static codechicken.nei.NEIClientUtils.toggleMagnetMode;
+import static codechicken.nei.NEIClientUtils.toggleRaining;
+import static codechicken.nei.NEIClientUtils.translate;
+
+import codechicken.lib.gui.GuiDraw;
+import codechicken.nei.KeyManager.IKeyStateTracker;
+import codechicken.nei.api.API;
+import codechicken.nei.api.GuiInfo;
+import codechicken.nei.api.IRecipeOverlayRenderer;
+import codechicken.nei.api.ItemInfo;
+import codechicken.nei.api.LayoutStyle;
+import codechicken.nei.drawable.DrawableBuilder;
+import codechicken.nei.drawable.DrawableResource;
+import codechicken.nei.guihook.GuiContainerManager;
+import codechicken.nei.guihook.IContainerDrawHandler;
+import codechicken.nei.guihook.IContainerInputHandler;
+import codechicken.nei.guihook.IContainerObjectHandler;
+import codechicken.nei.guihook.IContainerTooltipHandler;
+import codechicken.nei.recipe.GuiRecipeTab;
+import codechicken.nei.recipe.RecipeCatalysts;
+import java.util.HashMap;
+import java.util.List;
+import java.util.TreeSet;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.client.gui.inventory.GuiContainerCreative;
+import net.minecraft.client.renderer.InventoryEffectRenderer;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
+import org.lwjgl.input.Keyboard;
+import org.lwjgl.opengl.GL11;
+
+public class LayoutManager
+        implements IContainerInputHandler,
+                IContainerTooltipHandler,
+                IContainerDrawHandler,
+                IContainerObjectHandler,
+                IKeyStateTracker {
+    private static LayoutManager instance;
+
+    /** Note: this variable isn't actually used by this mod, but NEI add-ons might need it. */
+    private static Widget inputFocused;
+
+    /**
+     * Sorted bottom first
+     */
+    private static TreeSet<Widget> drawWidgets = new TreeSet<>(new WidgetZOrder(false));
+    /**
+     * Sorted top first
+     */
+    private static TreeSet<Widget> controlWidgets = new TreeSet<>(new WidgetZOrder(true));
+
+    public static ItemPanel itemPanel;
+    public static BookmarkPanel bookmarkPanel;
+    public static SubsetWidget dropDown;
+    public static PresetsWidget presetsPanel;
+    public static SearchField searchField;
+
+    public static ButtonCycled options;
+    public static ButtonCycled bookmarksButton;
+
+    @Deprecated
+    public static Button more;
+
+    @Deprecated
+    public static Button less;
+
+    @Deprecated
+    public static ItemQuantityField quantity;
+
+    public static Button delete;
+    public static ButtonCycled gamemode;
+    public static Button rain;
+    public static Button magnet;
+    public static Button[] timeButtons = new Button[4];
+    public static Button heal;
+
+    public static IRecipeOverlayRenderer overlayRenderer;
+
+    public static HashMap<Integer, LayoutStyle> layoutStyles = new HashMap<>();
+
+    public static boolean itemsLoaded = false;
+
+    /**
+     * Not present, Present
+     */
+    public static Image[] itemPresenceOverlays = new Image[2];
+
+    public static void load() {
+        API.addLayoutStyle(0, new LayoutStyleMinecraft());
+
+        instance = new LayoutManager();
+        KeyManager.trackers.add(instance);
+        GuiContainerManager.addInputHandler(instance);
+        GuiContainerManager.addTooltipHandler(instance);
+        GuiContainerManager.addDrawHandler(instance);
+        GuiContainerManager.addObjectHandler(instance);
+        init();
+    }
+
+    @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
+        {
+            gui.guiLeft = (gui.width - gui.xSize) / 2;
+            gui.guiTop = (gui.height - gui.ySize) / 2;
+
+            if (gui instanceof GuiContainerCreative && gui.buttonList.size() >= 2) {
+                GuiButton button1 = (GuiButton) gui.buttonList.get(0);
+                GuiButton button2 = (GuiButton) gui.buttonList.get(1);
+                button1.xPosition = gui.guiLeft;
+                button2.xPosition = gui.guiLeft + gui.xSize - 20;
+            }
+        }
+    }
+
+    @Deprecated
+    public static int getSideWidth(GuiContainer gui) {
+        return gui.width - 3;
+    }
+
+    @Deprecated
+    public static int getLeftSize(GuiContainer gui) {
+        return getSideWidth(gui);
+    }
+
+    @Override
+    public void onMouseClicked(GuiContainer gui, int mousex, int mousey, int button) {
+        if (isHidden()) return;
+
+        for (Widget widget : controlWidgets) widget.onGuiClick(mousex, mousey);
+    }
+
+    @Override
+    public boolean mouseClicked(GuiContainer gui, int mousex, int mousey, int button) {
+        if (isHidden()) return false;
+
+        if (!isEnabled()) return options.contains(mousex, mousey) && options.handleClick(mousex, mousey, button);
+
+        for (Widget widget : controlWidgets) {
+            widget.onGuiClick(mousex, mousey);
+            if (widget.contains(mousex, mousey)
+                    ? widget.handleClick(mousex, mousey, button)
+                    : widget.handleClickExt(mousex, mousey, button)) return true;
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean objectUnderMouse(GuiContainer gui, int mousex, int mousey) {
+        if (!isHidden() && isEnabled())
+            for (Widget widget : drawWidgets) if (widget.contains(mousex, mousey)) return true;
+
+        return false;
+    }
+
+    public boolean keyTyped(GuiContainer gui, char keyChar, int keyID) {
+        if (isEnabled() && !isHidden()) {
+            if (inputFocused != null) return inputFocused.handleKeyPress(keyID, keyChar);
+
+            for (Widget widget : controlWidgets) if (widget.handleKeyPress(keyID, keyChar)) return true;
+        }
+
+        return false;
+    }
+
+    @Override
+    public void onKeyTyped(GuiContainer gui, char keyChar, int keyID) {}
+
+    @Override
+    public boolean lastKeyTyped(GuiContainer gui, char keyChar, int keyID) {
+
+        if (NEIClientConfig.isKeyHashDown("gui.hide")) {
+            toggleBooleanSetting("inventory.hidden");
+            return true;
+        }
+
+        if (NEIClientConfig.isKeyHashDown("gui.hide_bookmarks")) {
+            toggleBooleanSetting("inventory.bookmarksEnabled");
+            return true;
+        }
+
+        if (isEnabled() && !isHidden()) {
+            for (Widget widget : controlWidgets) if (inputFocused == null) widget.lastKeyTyped(keyID, keyChar);
+        }
+
+        return false;
+    }
+
+    public void onMouseUp(GuiContainer gui, int mx, int my, int button) {
+        if (!isHidden() && isEnabled()) {
+            for (Widget widget : controlWidgets) widget.mouseUp(mx, my, button);
+        }
+    }
+
+    @Override
+    public void onMouseDragged(GuiContainer gui, int mx, int my, int button, long heldTime) {
+        if (!isHidden() && isEnabled()) {
+            for (Widget widget : controlWidgets) widget.mouseDragged(mx, my, button, heldTime);
+        }
+    }
+
+    @Override
+    public ItemStack getStackUnderMouse(GuiContainer gui, int mousex, int mousey) {
+        if (!isHidden() && isEnabled()) {
+            for (Widget widget : drawWidgets) {
+                ItemStack stack = widget.getStackMouseOver(mousex, mousey);
+                if (stack != null) return stack;
+            }
+        }
+        return null;
+    }
+
+    public void renderObjects(GuiContainer gui, int mousex, int mousey) {
+        if (!isHidden()) {
+            layout(gui);
+            if (isEnabled()) {
+                getLayoutStyle().drawBackground(GuiContainerManager.getManager(gui));
+                for (Widget widget : drawWidgets) widget.draw(mousex, mousey);
+            } else {
+                options.draw(mousex, mousey);
+                bookmarksButton.draw(mousex, mousey);
+            }
+
+            GL11.glEnable(GL11.GL_LIGHTING);
+            GL11.glEnable(GL11.GL_DEPTH_TEST);
+        }
+    }
+
+    @Override
+    public void postRenderObjects(GuiContainer gui, int mousex, int mousey) {
+        if (!isHidden() && isEnabled()) {
+            for (Widget widget : drawWidgets) widget.postDraw(mousex, mousey);
+        }
+    }
+
+    @Override
+    public List<String> handleTooltip(GuiContainer gui, int mousex, int mousey, List<String> currenttip) {
+        if (!isHidden() && isEnabled() && GuiContainerManager.shouldShowTooltip(gui)) {
+            for (Widget widget : drawWidgets) currenttip = widget.handleTooltip(mousex, mousey, currenttip);
+        }
+        return currenttip;
+    }
+
+    @Override
+    public List<String> handleItemDisplayName(GuiContainer gui, ItemStack stack, List<String> currenttip) {
+        String overridename = ItemInfo.getNameOverride(stack);
+        if (overridename != null) currenttip.set(0, overridename);
+
+        String mainname = currenttip.get(0);
+        if (showIDs()) {
+            mainname += " " + Item.getIdFromItem(stack.getItem());
+            if (stack.getItemDamage() != 0) mainname += ":" + stack.getItemDamage();
+
+            currenttip.set(0, mainname);
+        }
+
+        return currenttip;
+    }
+
+    @Override
+    public List<String> handleItemTooltip(
+            GuiContainer gui, ItemStack itemstack, int mousex, int mousey, List<String> currenttip) {
+        return currenttip;
+    }
+
+    public static void layout(GuiContainer gui) {
+        VisiblityData visiblity = new VisiblityData();
+
+        if (isHidden()) visiblity.showNEI = false;
+
+        if (isBookmarkPanelHidden()) visiblity.showBookmarkPanel = false;
+
+        if (gui.height - gui.ySize <= 40) visiblity.showSearchSection = false;
+
+        if (visiblity.showBookmarkPanel || gui.guiTop <= 20) visiblity.showSubsetDropdown = false;
+
+        if (!visiblity.showBookmarkPanel || gui.guiTop <= 20) visiblity.showPresetsDropdown = false;
+
+        if (gui.guiLeft - 4 < 76) visiblity.showWidgets = false;
+
+        try {
+            GuiInfo.readLock.lock();
+            GuiInfo.guiHandlers.forEach(handler -> handler.modifyVisiblity(gui, visiblity));
+        } finally {
+            GuiInfo.readLock.unlock();
+        }
+
+        visiblity.translateDependancies();
+
+        getLayoutStyle().layout(gui, visiblity);
+
+        updateWidgetVisiblities(gui, visiblity);
+    }
+
+    private static void init() {
+        itemPanel = ItemPanels.itemPanel;
+        itemPanel.init();
+
+        bookmarkPanel = ItemPanels.bookmarkPanel;
+        bookmarkPanel.init();
+
+        dropDown = new SubsetWidget();
+        presetsPanel = new PresetsWidget();
+        searchField = new SearchField("search");
+
+        options = new ButtonCycled(3) {
+            @Override
+            public void init() {
+                this.icons[0] = new DrawableBuilder("nei:textures/nei_tabbed_sprites.png", 32, 0, 16, 16).build();
+                this.icons[1] = new DrawableBuilder("nei:textures/nei_tabbed_sprites.png", 48, 0, 16, 16).build();
+                this.icons[2] = new DrawableBuilder("nei:textures/nei_tabbed_sprites.png", 64, 0, 16, 16).build();
+            }
+
+            @Override
+            public boolean onButtonPress(boolean rightclick) {
+                if (!rightclick) {
+                    if (Keyboard.getEventKeyState()
+                            && (Keyboard.getEventKey() == Keyboard.KEY_LCONTROL
+                                    || Keyboard.getEventKey() == Keyboard.KEY_RCONTROL)) {
+                        NEIClientConfig.cycleSetting("inventory.cheatmode", 3);
+                    } else {
+                        if (Keyboard.getEventKeyState()
+                                && (Keyboard.getEventKey() == Keyboard.KEY_LSHIFT
+                                        || Keyboard.getEventKey() == Keyboard.KEY_RSHIFT)) {
+                            GuiRecipeTab.loadHandlerInfo();
+                            RecipeCatalysts.loadCatalystInfo();
+                        }
+                        getOptionList().openGui(getGuiContainer(), false);
+                    }
+                    return true;
+                }
+                return false;
+            }
+
+            @Override
+            public void addTooltips(List<String> tooltip) {
+                tooltip.add(translate("inventory.options.tip"));
+                String modeColor = "";
+                final int cheatMode = NEIClientConfig.getCheatMode();
+                if (cheatMode == 1) modeColor = EnumChatFormatting.GOLD.toString();
+                else if (cheatMode == 2) modeColor = EnumChatFormatting.RED.toString();
+                String controlKeyLocalization = translate(Minecraft.isRunningOnMac ? "key.ctrl.mac" : "key.ctrl");
+                tooltip.add(modeColor + translate("inventory.options.tip.cheatmode." + cheatMode));
+                tooltip.add(modeColor + translate("inventory.options.tip.cheatmode.disable", controlKeyLocalization));
+            }
+
+            @Override
+            public String getRenderLabel() {
+                return translate("inventory.options");
+            }
+        };
+
+        bookmarksButton = new ButtonCycled(2) {
+            @Override
+            public void init() {
+                this.icons[0] = new DrawableBuilder("nei:textures/nei_tabbed_sprites.png", 0, 0, 16, 16).build();
+                this.icons[1] = new DrawableBuilder("nei:textures/nei_tabbed_sprites.png", 16, 0, 16, 16).build();
+            }
+
+            @Override
+            public boolean onButtonPress(boolean rightclick) {
+                NEIClientConfig.toggleBooleanSetting("inventory.bookmarksEnabled");
+                return true;
+            }
+
+            public String getButtonTip() {
+                return translate("bookmark.toggle.tip");
+            }
+
+            @Override
+            public String getRenderLabel() {
+                return translate("bookmark.toggle");
+            }
+        };
+
+        more = ItemPanels.itemPanel.more;
+        less = ItemPanels.itemPanel.less;
+        quantity = ItemPanels.itemPanel.quantity;
+        delete = new Button() {
+            @Override
+            public boolean onButtonPress(boolean rightclick) {
+                if ((state & 0x3) == 2) return false;
+
+                ItemStack held = getHeldItem();
+                if (held != null) {
+                    if (shiftKey()) {
+                        deleteHeldItem();
+                        deleteItemsOfType(held);
+                    } else if (rightclick) decreaseSlotStack(-999);
+                    else deleteHeldItem();
+                } else if (shiftKey()) deleteEverything();
+                else NEIController.toggleDeleteMode();
+
+                return true;
+            }
+
+            public String getButtonTip() {
+                if ((state & 0x3) != 2) {
+                    if (shiftKey()) return translate("inventory.delete.inv");
+                    if (NEIController.canUseDeleteMode()) return getStateTip("delete", state);
+                }
+                return null;
+            }
+
+            @Override
+            public void postDraw(int mousex, int mousey) {
+                if (contains(mousex, mousey) && getHeldItem() != null && (state & 0x3) != 2)
+                    GuiDraw.drawTip(
+                            mousex + 9,
+                            mousey,
+                            translate(
+                                    "inventory.delete." + (shiftKey() ? "all" : "one"),
+                                    GuiContainerManager.itemDisplayNameShort(getHeldItem())));
+            }
+        };
+        gamemode = new ButtonCycled(3) {
+            @Override
+            public boolean onButtonPress(boolean rightclick) {
+                if (!rightclick) {
+                    cycleGamemode();
+                    return true;
+                }
+                return false;
+            }
+
+            public void addTooltips(List<String> tooltip) {
+                tooltip.add(translate("inventory.current.gamemode." + getGamemode()));
+                tooltip.add(EnumChatFormatting.GRAY + translate("inventory.gamemode." + getNextGamemode()));
+            }
+        };
+        rain = new Button() {
+            @Override
+            public boolean onButtonPress(boolean rightclick) {
+                if (handleDisabledButtonPress("rain", rightclick)) return true;
+
+                if (!rightclick) {
+                    toggleRaining();
+                    return true;
+                }
+                return false;
+            }
+
+            public String getButtonTip() {
+                return getStateTip("rain", state);
+            }
+        };
+        magnet = new Button() {
+            @Override
+            public boolean onButtonPress(boolean rightclick) {
+                if (!rightclick) {
+                    toggleMagnetMode();
+                    return true;
+                }
+                return false;
+            }
+
+            public String getButtonTip() {
+                return getStateTip("magnet", state);
+            }
+        };
+        for (int i = 0; i < 4; i++) {
+            final int zone = i;
+            timeButtons[i] = new Button() {
+                @Override
+                public boolean onButtonPress(boolean rightclick) {
+                    if (handleDisabledButtonPress(NEIActions.timeZones[zone], rightclick)) return true;
+
+                    if (!rightclick) {
+                        setHourForward(zone * 6);
+                        return true;
+                    }
+                    return false;
+                }
+
+                @Override
+                public String getButtonTip() {
+                    return getTimeTip(NEIActions.timeZones[zone], state);
+                }
+            };
+        }
+        heal = new Button() {
+            @Override
+            public boolean onButtonPress(boolean rightclick) {
+                if (!rightclick) {
+                    healPlayer();
+                    return true;
+                }
+                return false;
+            }
+
+            @Override
+            public String getButtonTip() {
+                return translate("inventory.heal");
+            }
+        };
+
+        delete.state |= 0x4;
+        gamemode.state |= 0x4;
+        rain.state |= 0x4;
+        magnet.state |= 0x4;
+    }
+
+    private static String getStateTip(String name, int state) {
+        String sfx = (state & 0x3) == 2 ? "enable" : (state & 0x3) == 1 ? "0" : "1";
+
+        return translate("inventory." + name + "." + sfx);
+    }
+
+    private static String getTimeTip(String name, int state) {
+        String sfx = (state & 0x3) == 2 ? "enable" : "set";
+        return translate("inventory." + name + "." + sfx);
+    }
+
+    private static boolean handleDisabledButtonPress(String ident, boolean rightclick) {
+        if (!NEIActions.canDisable.contains(ident)) return false;
+        if (rightclick != disabledActions.contains(ident)) return setPropertyDisabled(ident, rightclick);
+        return false;
+    }
+
+    private static boolean setPropertyDisabled(String ident, boolean disable) {
+        if (disable && NEIActions.base(ident).equals("time")) {
+            int count = 0;
+            for (int i = 0; i < 4; i++) {
+                if (disabledActions.contains(NEIActions.timeZones[i])) count++;
+            }
+            if (count == 3) return false;
+        }
+        if (hasSMPCounterPart()) NEICPH.sendSetPropertyDisabled(ident, disable);
+
+        return true;
+    }
+
+    public static void markItemsDirty() {
+        // If anything has modified data this depends on, we'll need to reload the item list
+        itemsLoaded = false;
+    }
+
+    @Override
+    public void load(GuiContainer gui) {
+        if (isEnabled()) {
+            setInputFocused(null);
+
+            if (!itemsLoaded) {
+                ItemList.loadItems.restart();
+                itemsLoaded = true;
+            }
+            overlayRenderer = null;
+
+            getLayoutStyle().init();
+            layout(gui);
+        }
+
+        NEIController.load(gui);
+
+        if (checkCreativeInv(gui)
+                && gui.mc.currentScreen instanceof GuiContainerCreative) // override creative with creative+
+        gui.mc.displayGuiScreen(null); // close the screen and wait for the server to open it for us
+    }
+
+    @Override
+    public void refresh(GuiContainer gui) {}
+
+    public boolean checkCreativeInv(GuiContainer gui) {
+        if (gui instanceof GuiContainerCreative && invCreativeMode()) {
+            NEICPH.sendCreativeInv(true);
+            return true;
+        } else if (gui instanceof GuiExtendedCreativeInv && !invCreativeMode()) {
+            NEICPH.sendCreativeInv(false);
+            return true;
+        }
+        return false;
+    }
+
+    public static void updateWidgetVisiblities(GuiContainer gui, VisiblityData visiblity) {
+        drawWidgets = new TreeSet<>(new WidgetZOrder(false));
+        controlWidgets = new TreeSet<>(new WidgetZOrder(true));
+
+        if (!visiblity.showNEI) return;
+
+        addWidget(options);
+        addWidget(bookmarksButton);
+        if (visiblity.showItemPanel) {
+
+            if (PresetsWidget.inEditMode()) {
+                drawWidgets.add(itemPanel);
+            } else {
+                addWidget(itemPanel);
+            }
+
+            itemPanel.setVisible();
+        }
+
+        if (visiblity.showBookmarkPanel) {
+            addWidget(bookmarkPanel);
+            bookmarkPanel.setVisible();
+        }
+
+        if (visiblity.showPresetsDropdown) {
+            addWidget(presetsPanel);
+        }
+
+        searchField.setVisible(visiblity.showSearchSection);
+        if (visiblity.showSearchSection) {
+            addWidget(searchField);
+        }
+
+        if (visiblity.showUtilityButtons) {
+            if (canPerformAction("time")) {
+                for (int i = 0; i < 4; i++) addWidget(timeButtons[i]);
+            }
+            if (canPerformAction("rain")) addWidget(rain);
+            if (canPerformAction("heal")) addWidget(heal);
+            if (canPerformAction("magnet")) addWidget(magnet);
+            if (isValidGamemode("creative") || isValidGamemode("creative+") || isValidGamemode("adventure"))
+                addWidget(gamemode);
+            if (canPerformAction("delete")) addWidget(delete);
+        }
+
+        if (visiblity.showSubsetDropdown) {
+            // Bookmarks or Subset/dropdown
+            addWidget(dropDown);
+        }
+    }
+
+    public static LayoutStyle getLayoutStyle(int id) {
+        LayoutStyle style = layoutStyles.get(id);
+        if (style == null) style = layoutStyles.get(0);
+        return style;
+    }
+
+    public static LayoutStyle getLayoutStyle() {
+        return getLayoutStyle(0);
+    }
+
+    public static void addWidget(Widget widget) {
+        drawWidgets.add(widget);
+        controlWidgets.add(widget);
+    }
+
+    @Override
+    public void guiTick(GuiContainer gui) {
+        if (checkCreativeInv(gui)) return;
+
+        if (!isEnabled()) return;
+
+        for (Widget widget : drawWidgets) widget.update();
+    }
+
+    @Override
+    public boolean mouseScrolled(GuiContainer gui, int mousex, int mousey, int scrolled) {
+        if (isHidden() || !isEnabled()) return false;
+
+        for (Widget widget : drawWidgets) if (widget.onMouseWheel(scrolled, mousex, mousey)) return true;
+
+        return false;
+    }
+
+    @Override
+    public void onMouseScrolled(GuiContainer gui, int mousex, int mousey, int scrolled) {}
+
+    @Override
+    public boolean shouldShowTooltip(GuiContainer gui) {
+        return itemPanel.draggedStack == null && bookmarkPanel.sortedStackIndex == -1;
+    }
+
+    /** Note: this method isn't actually used by this mod, but NEI add-ons might need it. */
+    public static Widget getInputFocused() {
+        return inputFocused;
+    }
+
+    /** Note: this method isn't actually used by this mod, but NEI add-ons might need it. */
+    public static void setInputFocused(Widget widget) {
+        if (inputFocused != null) inputFocused.loseFocus();
+
+        inputFocused = widget;
+        if (inputFocused != null) inputFocused.gainFocus();
+    }
+
+    @Override
+    public void renderSlotUnderlay(GuiContainer gui, Slot slot) {
+        if (overlayRenderer != null) overlayRenderer.renderOverlay(GuiContainerManager.getManager(gui), slot);
+    }
+
+    @Override
+    public void renderSlotOverlay(GuiContainer window, Slot slot) {
+        ItemStack item = slot.getStack();
+        if (world.nbt.getBoolean("searchinventories")
+                && (item == null
+                        ? !getSearchExpression().equals("")
+                        : !((SearchField) searchField).getFilter().matches(item))) {
+            GL11.glDisable(GL11.GL_LIGHTING);
+            GL11.glTranslatef(0, 0, 150);
+            drawRect(slot.xDisplayPosition, slot.yDisplayPosition, 16, 16, 0x80000000);
+            GL11.glTranslatef(0, 0, -150);
+            GL11.glEnable(GL11.GL_LIGHTING);
+        }
+    }
+
+    public static void drawIcon(int x, int y, Image image) {
+        final boolean isDrawableResource = image instanceof DrawableResource;
+
+        if (!isDrawableResource) changeTexture("nei:textures/nei_sprites.png");
+
+        GL11.glColor4f(1, 1, 1, 1);
+        GL11.glEnable(GL11.GL_BLEND);
+        GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
+        if (!isDrawableResource) drawTexturedModalRect(x, y, image.x, image.y, image.width, image.height);
+        else ((DrawableResource) image).draw(x, y);
+        GL11.glDisable(GL11.GL_BLEND);
+    }
+
+    public static void drawButtonBackground(int x, int y, int w, int h, boolean edges, int type) {
+        int wTiles = 0;
+        int ew = w; // end width
+        if (w / 2 > 100) {
+            wTiles = (w - 200) / 50 + 1;
+            ew = 200;
+        }
+
+        final int w1 = ew / 2;
+        final int h1 = h / 2;
+        final int w2 = (ew + 1) / 2;
+        final int h2 = (h + 1) / 2;
+
+        final int x2 = x + w - w2;
+        final int y2 = y + h - h2;
+
+        final int ty = 46 + type * 20;
+        final int te = (edges ? 0 : 1); // tex edges
+
+        final int ty1 = ty + te;
+        final int tx1 = te;
+        final int tx3 = 75;
+        // halfway the 1 is for odd number adjustment
+        final int ty2 = ty + 20 - h2 - te;
+        final int tx2 = 200 - w2 - te;
+
+        changeTexture("textures/gui/widgets.png");
+        drawTexturedModalRect(x, y, tx1, ty1, w1, h1); // top left
+        drawTexturedModalRect(x, y2, tx1, ty2, w1, h2); // bottom left
+
+        for (int tile = 0; tile < wTiles; tile++) {
+            final int tileX = x + w1 + 50 * tile;
+            drawTexturedModalRect(tileX, y, tx3, ty1, 50, h1); // top
+            drawTexturedModalRect(tileX, y2, tx3, ty2, 50, h2); // bottom
+        }
+
+        drawTexturedModalRect(x2, y, tx2, ty1, w2, h1); // top right
+        drawTexturedModalRect(x2, y2, tx2, ty2, w2, h2); // bottom right
+    }
+
+    public static void drawItemPresenceOverlay(int slotX, int slotY, boolean isPresent) {
+        Image icon = itemPresenceOverlays[isPresent ? 1 : 0];
+        drawIcon(slotX + 16 - icon.width, slotY + 16 - icon.height, icon);
+    }
+
+    public static LayoutManager instance() {
+        return instance;
+    }
+
+    @Override
+    public void tickKeyStates() {
+        if (Minecraft.getMinecraft().currentScreen != null) return;
+
+        if (KeyManager.keyStates.get("world.dawn").down) timeButtons[0].onButtonPress(false);
+        if (KeyManager.keyStates.get("world.noon").down) timeButtons[1].onButtonPress(false);
+        if (KeyManager.keyStates.get("world.dusk").down) timeButtons[2].onButtonPress(false);
+        if (KeyManager.keyStates.get("world.midnight").down) timeButtons[3].onButtonPress(false);
+        if (KeyManager.keyStates.get("world.rain").down) rain.onButtonPress(false);
+        if (KeyManager.keyStates.get("world.heal").down) heal.onButtonPress(false);
+        if (KeyManager.keyStates.get("world.creative").down) gamemode.onButtonPress(false);
+    }
+}

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

@@ -0,0 +1,182 @@
+package codechicken.nei;
+
+import static codechicken.lib.gui.GuiDraw.drawStringC;
+import static codechicken.nei.LayoutManager.bookmarkPanel;
+import static codechicken.nei.LayoutManager.bookmarksButton;
+import static codechicken.nei.LayoutManager.delete;
+import static codechicken.nei.LayoutManager.dropDown;
+import static codechicken.nei.LayoutManager.gamemode;
+import static codechicken.nei.LayoutManager.heal;
+import static codechicken.nei.LayoutManager.itemPanel;
+import static codechicken.nei.LayoutManager.itemPresenceOverlays;
+import static codechicken.nei.LayoutManager.magnet;
+import static codechicken.nei.LayoutManager.options;
+import static codechicken.nei.LayoutManager.presetsPanel;
+import static codechicken.nei.LayoutManager.rain;
+import static codechicken.nei.LayoutManager.searchField;
+import static codechicken.nei.LayoutManager.timeButtons;
+import static codechicken.nei.NEIClientConfig.canPerformAction;
+import static codechicken.nei.NEIClientConfig.disabledActions;
+import static codechicken.nei.NEIClientConfig.getMagnetMode;
+import static codechicken.nei.NEIClientConfig.isEnabled;
+
+import codechicken.nei.api.LayoutStyle;
+import codechicken.nei.drawable.DrawableBuilder;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import org.lwjgl.opengl.GL11;
+
+public class LayoutStyleMinecraft extends LayoutStyle {
+    public int buttonCount;
+    public int leftSize;
+    public int numButtons;
+
+    @Override
+    public String getName() {
+        return "minecraft";
+    }
+
+    @Override
+    public void init() {
+        delete.icon = new Image(144, 12, 12, 12);
+        rain.icon = new Image(120, 12, 12, 12);
+        gamemode.icons[0] = new Image(132, 12, 12, 12);
+        gamemode.icons[1] = new Image(156, 12, 12, 12);
+        gamemode.icons[2] = new Image(168, 12, 12, 12);
+        magnet.icon = new Image(180, 24, 12, 12);
+        timeButtons[0].icon = new Image(132, 24, 12, 12);
+        timeButtons[1].icon = new Image(120, 24, 12, 12);
+        timeButtons[2].icon = new Image(144, 24, 12, 12);
+        timeButtons[3].icon = new Image(156, 24, 12, 12);
+        heal.icon = new Image(168, 24, 12, 12);
+        itemPresenceOverlays[0] = new DrawableBuilder("nei:textures/nei_tabbed_sprites.png", 0, 40, 8, 8).build();
+        itemPresenceOverlays[1] = new DrawableBuilder("nei:textures/nei_tabbed_sprites.png", 8, 40, 8, 8).build();
+    }
+
+    @Override
+    public void reset() {
+        buttonCount = 0;
+    }
+
+    @Override
+    public void layout(GuiContainer gui, VisiblityData visiblity) {
+        reset();
+
+        leftSize = ItemPanels.bookmarkPanel.getWidth(gui);
+        numButtons = Math.max(leftSize / 18, 1);
+
+        delete.state = 0x4;
+        if (NEIController.getDeleteMode()) delete.state |= 1;
+        else if (!visiblity.enableDeleteMode) delete.state |= 2;
+
+        rain.state = 0x4;
+        if (disabledActions.contains("rain")) rain.state |= 2;
+        else if (NEIClientUtils.isRaining()) rain.state |= 1;
+
+        gamemode.state = 0x4;
+        if (NEIClientUtils.getGamemode() != 0) {
+            gamemode.state |= 0x1;
+            gamemode.index = NEIClientUtils.getGamemode() - 1;
+        } else {
+            if (NEIClientUtils.isValidGamemode("creative")) gamemode.index = 0;
+            else if (NEIClientUtils.isValidGamemode("creative+")) gamemode.index = 1;
+            else if (NEIClientUtils.isValidGamemode("adventure")) gamemode.index = 2;
+        }
+        bookmarksButton.index = NEIClientConfig.isBookmarkPanelHidden() ? 0 : 1;
+        options.index = NEIClientConfig.getCheatMode();
+
+        magnet.state = 0x4 | (getMagnetMode() ? 1 : 0);
+
+        if (canPerformAction("delete")) layoutButton(delete);
+        if (canPerformAction("rain")) layoutButton(rain);
+        if (NEIClientUtils.isValidGamemode("creative")
+                || NEIClientUtils.isValidGamemode("creative+")
+                || NEIClientUtils.isValidGamemode("adventure")) layoutButton(gamemode);
+        if (canPerformAction("magnet")) layoutButton(magnet);
+        if (canPerformAction("time")) {
+            for (int i = 0; i < 4; i++) {
+                timeButtons[i].state = disabledActions.contains(NEIActions.timeZones[i]) ? 2 : 0;
+                layoutButton(timeButtons[i]);
+            }
+        }
+        if (canPerformAction("heal")) layoutButton(heal);
+
+        itemPanel.resize(gui);
+        bookmarkPanel.resize(gui);
+
+        options.x = isEnabled() ? 0 : 6;
+        options.y = isEnabled() ? gui.height - 22 : gui.height - 28;
+        options.w = 22;
+        options.h = 22;
+
+        bookmarksButton.x = 24 + (isEnabled() ? 0 : 6);
+        bookmarksButton.y = isEnabled() ? gui.height - 22 : gui.height - 28;
+        bookmarksButton.w = 22;
+        bookmarksButton.h = 22;
+
+        dropDown.h = 18;
+        dropDown.w = 150;
+        dropDown.y = 0;
+        dropDown.x = (gui.width - gui.xSize) / 2 + gui.xSize - dropDown.w;
+
+        presetsPanel.h = 16;
+        presetsPanel.w = 150;
+        presetsPanel.y = 2;
+        presetsPanel.x = (gui.width - gui.xSize) / 2 + gui.xSize - presetsPanel.w;
+
+        searchField.h = 20;
+        searchField.w = 150;
+        searchField.x = (gui.width - searchField.w) / 2;
+        searchField.y = gui.height - searchField.h - 2;
+
+        if (!visiblity.showItemSection) {
+            searchField.setFocus(false);
+        }
+    }
+
+    public void layoutButton(Button button) {
+        button.x = 2 + (buttonCount % numButtons) * 19;
+        button.y = 2 + (buttonCount / numButtons) * 18;
+
+        button.h = 17;
+        button.w = button.contentWidth() + 6;
+
+        buttonCount++;
+    }
+
+    @Override
+    public void drawButton(Button b, int mousex, int mousey) {
+        GL11.glDisable(GL11.GL_LIGHTING);
+        GL11.glColor4f(1, 1, 1, 1);
+
+        int tex;
+        if ((b.state & 0x3) == 2) tex = 0;
+        else if ((b.state & 0x4) == 0 && b.contains(mousex, mousey)
+                || // not a state button and mouseover
+                (b.state & 0x3) == 1) // state active
+        tex = 2;
+        else tex = 1;
+        LayoutManager.drawButtonBackground(b.x, b.y, b.w, b.h, true, tex);
+
+        Image icon = b.getRenderIcon();
+        if (icon == null) {
+            int colour = tex == 2 ? 0xffffa0 : tex == 0 ? 0x601010 : 0xe0e0e0;
+
+            drawStringC(b.getRenderLabel(), b.x + b.w / 2, b.y + (b.h - 8) / 2, colour);
+        } else {
+            GL11.glColor4f(1, 1, 1, 1);
+
+            final int iconX = b.x + (b.w - icon.width) / 2;
+            final int iconY = b.y + (b.h - icon.height) / 2;
+
+            LayoutManager.drawIcon(iconX, iconY, icon);
+        }
+    }
+
+    @Override
+    public void drawSubsetTag(String text, int x, int y, int w, int h, int state, boolean mouseover) {
+        if (state == 1) GL11.glColor4f(0.65F, 0.65F, 0.65F, 1.0F);
+        else GL11.glColor4f(1, 1, 1, 1);
+        LayoutManager.drawButtonBackground(x, y, w, h, false, state == 0 ? 0 : 1);
+        if (text != null) drawStringC(text, x, y, w, h, state == 2 ? 0xFFE0E0E0 : 0xFFA0A0A0);
+    }
+}

src/main/java/codechicken/nei/NEIActions.java

@@ -5,47 +5,39 @@ import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 
-public class NEIActions
-{
+public class NEIActions {
     public static final int protocol = 0;
-    
-    public static HashMap<String, NEIActions> nameActionMap = new HashMap<String, NEIActions>();
-    public static HashSet<String> canDisable = new HashSet<String>();
 
-    public static void addAction(String name, String base, boolean smpreq)
-    {
+    public static HashMap<String, NEIActions> nameActionMap = new HashMap<>();
+    public static HashSet<String> canDisable = new HashSet<>();
+
+    public static void addAction(String name, String base, boolean smpreq) {
         NEIActions action = new NEIActions(name, base, smpreq);
         nameActionMap.put(name, action);
     }
-    
-    private static void addAction(String name, String base)
-    {
+
+    private static void addAction(String name, String base) {
         addAction(name, base, false);
     }
 
-    public static void addAction(String name)
-    {
+    public static void addAction(String name) {
         addAction(name, name);
     }
 
-    private static void addAction(String name, boolean smpreq)
-    {
+    private static void addAction(String name, boolean smpreq) {
         addAction(name, name, smpreq);
     }
-    
-    public static String base(String name)
-    {
+
+    public static String base(String name) {
         NEIActions action = nameActionMap.get(name);
         return action == null ? name : action.base;
     }
 
-    public static boolean smpRequired(String name)
-    {
+    public static boolean smpRequired(String name) {
         return nameActionMap.get(name).smpreq;
     }
-    
-    public static void init()
-    {
+
+    public static void init() {
         addAction("time");
         addAction("dawn", "time");
         addAction("noon", "time");
@@ -68,27 +60,23 @@ public class NEIActions
         canDisable.add("midnight");
         canDisable.add("rain");
     }
-    
-    public static final String[] timeZones = new String[]{"dawn", "noon", "dusk", "midnight"};
-    public static final String[] gameModes = new String[]{"survival", "creative", "creative+", "adventure"};
+
+    public static final String[] timeZones = new String[] {"dawn", "noon", "dusk", "midnight"};
+    public static final String[] gameModes = new String[] {"survival", "creative", "creative+", "adventure"};
 
     public String name;
     public String base;
     public boolean smpreq;
-    
-    public NEIActions(String name, String base, boolean smpreq)
-    {
+
+    public NEIActions(String name, String base, boolean smpreq) {
         this.name = name;
         this.base = base;
         this.smpreq = smpreq;
     }
 
-    public static List<String> baseActions()
-    {
-        List<String> list = new LinkedList<String>();
-        for(NEIActions a : nameActionMap.values())
-            if(a.base.equals(a.name))
-                list.add(a.name);
+    public static List<String> baseActions() {
+        List<String> list = new LinkedList<>();
+        for (NEIActions a : nameActionMap.values()) if (a.base.equals(a.name)) list.add(a.name);
         return list;
     }
 }

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

@@ -12,8 +12,7 @@ import net.minecraft.network.play.INetHandlerPlayClient;
 import net.minecraft.util.ChatComponentTranslation;
 import net.minecraft.world.World;
 
-public class NEICPH implements IClientPacketHandler
-{
+public class NEICPH implements IClientPacketHandler {
     public static final String channel = "NEI";
 
     @Override
@@ -38,13 +37,16 @@ public class NEICPH implements IClientPacketHandler
                 handleGamemode(mc, packet.readUByte());
                 break;
             case 21:
-                ClientUtils.openSMPGui(packet.readUByte(), new GuiEnchantmentModifier(mc.thePlayer.inventory, mc.theWorld, 0, 0, 0));
+                ClientUtils.openSMPGui(
+                        packet.readUByte(), new GuiEnchantmentModifier(mc.thePlayer.inventory, mc.theWorld, 0, 0, 0));
                 break;
             case 23:
                 if (packet.readBoolean())
-                    ClientUtils.openSMPGui(packet.readUByte(), new GuiExtendedCreativeInv(new ContainerCreativeInv(mc.thePlayer, new ExtendedCreativeInv(null, Side.CLIENT))));
-                else
-                    mc.displayGuiScreen(new GuiInventory(mc.thePlayer));
+                    ClientUtils.openSMPGui(
+                            packet.readUByte(),
+                            new GuiExtendedCreativeInv(new ContainerCreativeInv(
+                                    mc.thePlayer, new ExtendedCreativeInv(null, Side.CLIENT))));
+                else mc.displayGuiScreen(new GuiInventory(mc.thePlayer));
                 break;
             case 24:
                 ClientUtils.openSMPGui(packet.readUByte(), new GuiPotionCreator(mc.thePlayer.inventory));
@@ -58,40 +60,32 @@ public class NEICPH implements IClientPacketHandler
 
     private void handleActionEnabled(PacketCustom packet) {
         String name = packet.readString();
-        if (packet.readBoolean())
-            NEIClientConfig.enabledActions.add(name);
-        else
-            NEIClientConfig.enabledActions.remove(name);
+        if (packet.readBoolean()) NEIClientConfig.enabledActions.add(name);
+        else NEIClientConfig.enabledActions.remove(name);
     }
 
     private void handleActionDisabled(PacketCustom packet) {
         String name = packet.readString();
-        if (packet.readBoolean())
-            NEIClientConfig.disabledActions.add(name);
-        else
-            NEIClientConfig.disabledActions.remove(name);
+        if (packet.readBoolean()) NEIClientConfig.disabledActions.add(name);
+        else NEIClientConfig.disabledActions.remove(name);
     }
 
     private void handleLoginState(PacketCustom packet) {
         NEIClientConfig.permissableActions.clear();
         int num = packet.readUByte();
-        for (int i = 0; i < num; i++)
-            NEIClientConfig.permissableActions.add(packet.readString());
+        for (int i = 0; i < num; i++) NEIClientConfig.permissableActions.add(packet.readString());
 
         NEIClientConfig.disabledActions.clear();
         num = packet.readUByte();
-        for (int i = 0; i < num; i++)
-            NEIClientConfig.disabledActions.add(packet.readString());
+        for (int i = 0; i < num; i++) NEIClientConfig.disabledActions.add(packet.readString());
 
         NEIClientConfig.enabledActions.clear();
         num = packet.readUByte();
-        for (int i = 0; i < num; i++)
-            NEIClientConfig.enabledActions.add(packet.readString());
+        for (int i = 0; i < num; i++) NEIClientConfig.enabledActions.add(packet.readString());
 
         NEIClientConfig.bannedBlocks.clear();
         num = packet.readInt();
-        for(int i = 0; i < num; i++)
-            NEIClientConfig.bannedBlocks.add(packet.readItemStack());
+        for (int i = 0; i < num; i++) NEIClientConfig.bannedBlocks.add(packet.readItemStack());
 
         if (NEIClientUtils.getGuiContainer() != null)
             LayoutManager.instance().refresh(NEIClientUtils.getGuiContainer());
@@ -115,8 +109,7 @@ public class NEICPH implements IClientPacketHandler
     }
 
     private static String getSaveName(String worldName) {
-        if (Minecraft.getMinecraft().isSingleplayer())
-            return "local/" + ClientUtils.getWorldSaveName();
+        if (Minecraft.getMinecraft().isSingleplayer()) return "local/" + ClientUtils.getWorldSaveName();
 
         return "remote/" + ClientUtils.getServerIP().replace(':', '~') + "/" + worldName;
     }
@@ -203,9 +196,7 @@ public class NEICPH implements IClientPacketHandler
     }
 
     public static void sendGamemode(int mode) {
-        new PacketCustom(channel, 13)
-                .writeByte(mode)
-                .sendToServer();
+        new PacketCustom(channel, 13).writeByte(mode).sendToServer();
     }
 
     public static void sendCreativeInv(boolean open) {
@@ -229,10 +220,11 @@ public class NEICPH implements IClientPacketHandler
 
     public static void sendOpenPotionWindow() {
         ItemStack[] potionStore = new ItemStack[9];
-        InventoryUtils.readItemStacksFromTag(potionStore, NEIClientConfig.global.nbt.getCompoundTag("potionStore").getTagList("items", 10));
+        InventoryUtils.readItemStacksFromTag(
+                potionStore,
+                NEIClientConfig.global.nbt.getCompoundTag("potionStore").getTagList("items", 10));
         PacketCustom packet = new PacketCustom(channel, 24);
-        for (ItemStack stack : potionStore)
-            packet.writeItemStack(stack);
+        for (ItemStack stack : potionStore) packet.writeItemStack(stack);
         packet.sendToServer();
     }
 

src/main/java/codechicken/nei/NEIChestGuiHandler.java

@@ -2,28 +2,27 @@ package codechicken.nei;
 
 import codechicken.nei.api.INEIGuiAdapter;
 import codechicken.nei.api.TaggedInventoryArea;
+import java.util.Collections;
+import java.util.List;
 import net.minecraft.client.gui.inventory.GuiChest;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.inventory.ContainerChest;
 import net.minecraft.item.ItemStack;
 
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-public class NEIChestGuiHandler extends INEIGuiAdapter
-{
+public class NEIChestGuiHandler extends INEIGuiAdapter {
     public int chestSize(GuiContainer gui) {
         return ((ContainerChest) gui.inventorySlots).getLowerChestInventory().getSizeInventory();
     }
 
     @Override
     public Iterable<Integer> getItemSpawnSlots(GuiContainer gui, ItemStack item) {
-        return gui instanceof GuiChest ? NEIServerUtils.getRange(0, chestSize(gui)) : Collections.<Integer>emptyList();
+        return gui instanceof GuiChest ? NEIServerUtils.getRange(0, chestSize(gui)) : Collections.emptyList();
     }
 
     @Override
     public List<TaggedInventoryArea> getInventoryAreas(GuiContainer gui) {
-        return gui instanceof GuiChest ? Arrays.asList(new TaggedInventoryArea("Chest", 0, chestSize(gui), gui.inventorySlots)) : null;
+        return gui instanceof GuiChest
+                ? Collections.singletonList(new TaggedInventoryArea("Chest", 0, chestSize(gui), gui.inventorySlots))
+                : null;
     }
 }

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

@@ -0,0 +1,688 @@
+package codechicken.nei;
+
+import codechicken.core.CCUpdateChecker;
+import codechicken.core.ClassDiscoverer;
+import codechicken.core.ClientUtils;
+import codechicken.core.CommonUtils;
+import codechicken.lib.config.ConfigFile;
+import codechicken.lib.config.ConfigTag;
+import codechicken.lib.config.ConfigTagParent;
+import codechicken.nei.api.API;
+import codechicken.nei.api.GuiInfo;
+import codechicken.nei.api.IConfigureNEI;
+import codechicken.nei.api.ItemInfo;
+import codechicken.nei.api.NEIInfo;
+import codechicken.nei.config.ConfigSet;
+import codechicken.nei.config.GuiHighlightTips;
+import codechicken.nei.config.GuiNEIOptionList;
+import codechicken.nei.config.GuiOptionList;
+import codechicken.nei.config.GuiPanelSettings;
+import codechicken.nei.config.OptionCycled;
+import codechicken.nei.config.OptionGamemodes;
+import codechicken.nei.config.OptionList;
+import codechicken.nei.config.OptionOpenGui;
+import codechicken.nei.config.OptionTextField;
+import codechicken.nei.config.OptionToggleButton;
+import codechicken.nei.config.OptionToggleButtonBoubs;
+import codechicken.nei.config.OptionUtilities;
+import codechicken.nei.event.NEIConfigsLoadedEvent;
+import codechicken.nei.recipe.GuiRecipeTab;
+import codechicken.nei.recipe.IRecipeHandler;
+import codechicken.nei.recipe.RecipeCatalysts;
+import codechicken.nei.recipe.RecipeInfo;
+import codechicken.obfuscator.ObfuscationRun;
+import com.google.common.base.Objects;
+import java.io.File;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.function.Function;
+import java.util.regex.Pattern;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.world.World;
+import net.minecraft.world.storage.SaveFormatComparator;
+import net.minecraftforge.common.MinecraftForge;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.lwjgl.input.Keyboard;
+
+public class NEIClientConfig {
+    private static boolean configLoaded;
+    private static boolean enabledOverride;
+    private static String worldPath;
+
+    public static Logger logger = LogManager.getLogger("NotEnoughItems");
+    public static File configDir = new File(CommonUtils.getMinecraftDir(), "config/NEI/");
+    public static ConfigSet global =
+            new ConfigSet(new File("saves/NEI/client.dat"), new ConfigFile(new File(configDir, "client.cfg")));
+    public static ConfigSet world;
+    public static final File handlerFile = new File(configDir, "handlers.csv");
+    public static final File catalystFile = new File(configDir, "catalysts.csv");
+    public static final File serialHandlersFile = new File(configDir, "serialhandlers.cfg");
+    public static final File heightHackHandlersFile = new File(configDir, "heighthackhandlers.cfg");
+    public static final File handlerOrderingFile = new File(configDir, "handlerordering.csv");
+
+    @Deprecated
+    public static File bookmarkFile;
+
+    // Set of handlers that need to be run in serial
+    public static HashSet<String> serialHandlers = new HashSet<>();
+
+    // Set of regexes matching handler ID of handlers that need the hack in GuiRecipe.startHeightHack().
+    // We use regex here so that we can apply the height hack to entire mods with one entry.
+    public static HashSet<Pattern> heightHackHandlerRegex = new HashSet<>();
+
+    // Map of handler ID to sort order.
+    // Handlers will be sorted in ascending order, so smaller numbers show up earlier.
+    // Any handler not in the map will be assigned to 0, and negative numbers are fine.
+    public static HashMap<String, Integer> handlerOrdering = new HashMap<>();
+
+    // Function that extracts the handler ID from a handler, with special logic for
+    // TemplateRecipeHandler: prefer using the overlay ID if it exists.
+    public static final Function<IRecipeHandler, String> HANDLER_ID_FUNCTION =
+            handler -> Objects.firstNonNull(handler.getOverlayIdentifier(), handler.getHandlerId());
+
+    // Comparator that compares handlers using the handlerOrdering map.
+    public static final Comparator<IRecipeHandler> HANDLER_COMPARATOR =
+            Comparator.comparingInt(handler -> handlerOrdering.getOrDefault(HANDLER_ID_FUNCTION.apply(handler), 0));
+
+    public static ItemStack[] creativeInv;
+
+    public static boolean hasSMPCounterpart;
+    public static HashSet<String> permissableActions = new HashSet<>();
+    public static HashSet<String> disabledActions = new HashSet<>();
+    public static HashSet<String> enabledActions = new HashSet<>();
+
+    public static ItemStackSet bannedBlocks = new ItemStackSet();
+
+    static {
+        if (global.config.getTag("checkUpdates").getBooleanValue(true)) CCUpdateChecker.updateCheck("NotEnoughItems");
+        linkOptionList();
+        setDefaults();
+    }
+
+    private static void setDefaults() {
+        ConfigTagParent tag = global.config;
+        tag.setComment(
+                "Main configuration of NEI.\nMost of these options can be changed ingame.\nDeleting any element will restore it to it's default value");
+
+        tag.getTag("command")
+                .useBraces()
+                .setComment(
+                        "Change these options if you have a different mod installed on the server that handles the commands differently, Eg. Bukkit Essentials");
+        tag.setNewLineMode(1);
+
+        tag.getTag("inventory.widgetsenabled").getBooleanValue(true);
+        API.addOption(new OptionToggleButton("inventory.widgetsenabled"));
+
+        tag.getTag("inventory.hidden").getBooleanValue(false);
+        tag.getTag("inventory.cheatmode").getIntValue(2);
+        tag.getTag("inventory.lockmode")
+                .setComment(
+                        "For those who can't help themselves.\nSet this to a mode and you will be unable to change it ingame")
+                .getIntValue(-1);
+        API.addOption(new OptionCycled("inventory.cheatmode", 3) {
+            @Override
+            public boolean optionValid(int index) {
+                return getLockedMode() == -1 || getLockedMode() == index && NEIInfo.isValidMode(index);
+            }
+        });
+        checkCheatMode();
+
+        tag.getTag("inventory.utilities").setDefaultValue("delete, magnet");
+        API.addOption(new OptionUtilities("inventory.utilities"));
+
+        tag.getTag("inventory.gamemodes").setDefaultValue("creative, creative+, adventure");
+        API.addOption(new OptionGamemodes("inventory.gamemodes"));
+
+        ItemSorter.initConfig(tag);
+
+        tag.getTag("inventory.itemIDs").getIntValue(1);
+        API.addOption(new OptionCycled("inventory.itemIDs", 3, true));
+
+        tag.getTag("inventory.searchmode").getIntValue(1);
+        API.addOption(new OptionCycled("inventory.searchmode", 3, true));
+
+        tag.getTag("world.highlight_tips").getBooleanValue(false);
+        tag.getTag("world.highlight_tips.x").getIntValue(5000);
+        tag.getTag("world.highlight_tips.y").getIntValue(100);
+        API.addOption(new OptionOpenGui("world.highlight_tips", GuiHighlightTips.class));
+
+        tag.getTag("world.panels.bookmarks.left").getIntValue(0);
+        tag.getTag("world.panels.bookmarks.right").getIntValue(0);
+        tag.getTag("world.panels.bookmarks.top").getIntValue(0);
+        tag.getTag("world.panels.bookmarks.bottom").getIntValue(0);
+
+        tag.getTag("world.panels.items.left").getIntValue(0);
+        tag.getTag("world.panels.items.right").getIntValue(0);
+        tag.getTag("world.panels.items.top").getIntValue(0);
+        tag.getTag("world.panels.items.bottom").getIntValue(0);
+
+        API.addOption(new OptionOpenGui("world.panels", GuiPanelSettings.class));
+
+        tag.getTag("inventory.profileRecipes").getBooleanValue(false);
+        API.addOption(new OptionToggleButton("inventory.profileRecipes", true));
+
+        tag.getTag("inventory.disableMouseScrollTransfer").getBooleanValue(false);
+        API.addOption(new OptionToggleButton("inventory.disableMouseScrollTransfer", true));
+
+        tag.getTag("inventory.invertMouseScrollTransfer").getBooleanValue(false);
+        API.addOption(new OptionToggleButton("inventory.invertMouseScrollTransfer", true) {
+            @Override
+            public boolean isEnabled() {
+                return isMouseScrollTransferEnabled();
+            }
+        });
+
+        tag.getTag("inventory.cacheItemRendering").getBooleanValue(false);
+        API.addOption(new OptionToggleButton("inventory.cacheItemRendering", true));
+
+        tag.getTag("itemLoadingTimeout").getIntValue(500);
+
+        tag.getTag("command.creative").setDefaultValue("/gamemode {0} {1}");
+        API.addOption(new OptionTextField("command.creative"));
+        tag.getTag("command.item").setDefaultValue("/give {0} {1} {2} {3} {4}");
+        API.addOption(new OptionTextField("command.item"));
+        tag.getTag("command.time").setDefaultValue("/time set {0}");
+        API.addOption(new OptionTextField("command.time"));
+        tag.getTag("command.rain").setDefaultValue("/toggledownfall");
+        API.addOption(new OptionTextField("command.rain"));
+        tag.getTag("command.heal").setDefaultValue("");
+        API.addOption(new OptionTextField("command.heal"));
+
+        tag.getTag("inventory.worldSpecificBookmarks")
+                .setComment("Global or world specific bookmarks")
+                .getBooleanValue(false);
+        API.addOption(new OptionToggleButton("inventory.worldSpecificBookmarks", true) {
+            @Override
+            public boolean onClick(int button) {
+                super.onClick(button);
+                initBookmarkFile(worldPath);
+                return true;
+            }
+        });
+
+        tag.getTag("inventory.worldSpecificPresets")
+                .setComment("Global or world specific presets")
+                .getBooleanValue(false);
+        API.addOption(new OptionToggleButton("inventory.worldSpecificPresets", true) {
+            @Override
+            public boolean onClick(int button) {
+                super.onClick(button);
+                initPresetsFile(worldPath);
+                return true;
+            }
+        });
+
+        tag.getTag("inventory.bookmarksEnabled")
+                .setComment("Enable/disable bookmarks")
+                .getBooleanValue(true);
+        API.addOption(new OptionToggleButton("inventory.bookmarksEnabled", true));
+        tag.getTag("inventory.useNBTInBookmarks")
+                .setComment("Use NBT in Bookmarks")
+                .getBooleanValue(true);
+        API.addOption(new OptionToggleButton("inventory.useNBTInBookmarks", true));
+        tag.getTag("inventory.showRecipeMarker")
+                .setComment("Show Recipe Marker")
+                .getBooleanValue(false);
+        API.addOption(new OptionToggleButton("inventory.showRecipeMarker", true));
+
+        tag.getTag("inventory.showItemQuantityWidget")
+                .setComment("Show Item Quantity Widget")
+                .getBooleanValue(true);
+        API.addOption(new OptionToggleButton("inventory.showItemQuantityWidget", true));
+
+        tag.getTag("inventory.jei_style_tabs")
+                .setComment("Enable/disable JEI Style Tabs")
+                .getBooleanValue(true);
+        API.addOption(new OptionToggleButtonBoubs("inventory.jei_style_tabs", true));
+        tag.getTag("inventory.jei_style_item_presence_overlay")
+                .setComment("Enable/disable JEI Style item presence overlay on ?-hover")
+                .getBooleanValue(true);
+        API.addOption(new OptionToggleButton("inventory.jei_style_item_presence_overlay", true));
+        tag.getTag("inventory.jei_style_recipe_catalyst")
+                .setComment("Enable/disable JEI Style Recipe Catalysts")
+                .getBooleanValue(true);
+        API.addOption(new OptionToggleButton("inventory.jei_style_recipe_catalyst", true));
+
+        tag.getTag("inventory.creative_tab_style")
+                .setComment("Creative or JEI style tabs")
+                .getBooleanValue(false);
+        API.addOption(new OptionToggleButton("inventory.creative_tab_style", true));
+
+        tag.getTag("inventory.ignore_potion_overlap")
+                .setComment("Ignore overlap with potion effect HUD")
+                .getBooleanValue(false);
+        API.addOption(new OptionToggleButton("inventory.ignore_potion_overlap", 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) {
+            @Override
+            public boolean onClick(int button) {
+                super.onClick(button);
+                GuiRecipeTab.loadHandlerInfo();
+                return true;
+            }
+        });
+
+        tag.getTag("tools.catalyst_load_from_config")
+                .setComment("ADVANCED: Load catalysts from config")
+                .getBooleanValue(false);
+        API.addOption(new OptionToggleButton("tools.catalyst_load_from_config", true) {
+            @Override
+            public boolean onClick(int button) {
+                super.onClick(button);
+                RecipeCatalysts.loadCatalystInfo();
+                return true;
+            }
+        });
+
+        setDefaultKeyBindings();
+    }
+
+    private static void linkOptionList() {
+        OptionList.setOptionList(new OptionList("nei.options") {
+            @Override
+            public ConfigSet globalConfigSet() {
+                return global;
+            }
+
+            @Override
+            public ConfigSet worldConfigSet() {
+                return world;
+            }
+
+            @Override
+            public OptionList configBase() {
+                return this;
+            }
+
+            @Override
+            public GuiOptionList getGui(GuiScreen parent, OptionList list, boolean world) {
+                return new GuiNEIOptionList(parent, list, world);
+            }
+        });
+    }
+
+    private static void setDefaultKeyBindings() {
+        API.addHashBind("gui.recipe", Keyboard.KEY_R);
+        API.addHashBind("gui.usage", Keyboard.KEY_U);
+        API.addKeyBind("gui.back", Keyboard.KEY_BACK);
+        API.addHashBind("gui.enchant", Keyboard.KEY_X);
+        API.addHashBind("gui.potion", Keyboard.KEY_P);
+        API.addKeyBind("gui.prev", Keyboard.KEY_PRIOR);
+        API.addKeyBind("gui.next", Keyboard.KEY_NEXT);
+        API.addKeyBind("gui.prev_machine", Keyboard.KEY_UP);
+        API.addKeyBind("gui.next_machine", Keyboard.KEY_DOWN);
+        API.addKeyBind("gui.prev_recipe", Keyboard.KEY_LEFT);
+        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.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.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.addHashBind("gui.hide_bookmarks", Keyboard.KEY_B);
+
+        API.addKeyBind("world.chunkoverlay", Keyboard.KEY_F9);
+        API.addKeyBind("world.moboverlay", Keyboard.KEY_F7);
+        API.addKeyBind("world.highlight_tips", Keyboard.KEY_NUMPAD0);
+        API.addKeyBind("world.dawn", 0);
+        API.addKeyBind("world.noon", 0);
+        API.addKeyBind("world.dusk", 0);
+        API.addKeyBind("world.midnight", 0);
+        API.addKeyBind("world.rain", 0);
+        API.addKeyBind("world.heal", 0);
+        API.addKeyBind("world.creative", 0);
+    }
+
+    public static OptionList getOptionList() {
+        return OptionList.getOptionList("nei.options");
+    }
+
+    public static void loadWorld(String worldPath) {
+        NEIClientConfig.worldPath = worldPath;
+
+        setInternalEnabled(true);
+        logger.debug("Loading " + (Minecraft.getMinecraft().isSingleplayer() ? "Local" : "Remote") + " World");
+        bootNEI(ClientUtils.getWorld());
+
+        final File specificDir = new File(CommonUtils.getMinecraftDir(), "saves/NEI/" + worldPath);
+        final boolean newWorld = !specificDir.exists();
+
+        if (newWorld) {
+            specificDir.mkdirs();
+        }
+
+        initBookmarkFile(worldPath);
+        initPresetsFile(worldPath);
+        world = new ConfigSet(new File(specificDir, "NEI.dat"), new ConfigFile(new File(specificDir, "NEI.cfg")));
+        onWorldLoad(newWorld);
+    }
+
+    private static void onWorldLoad(boolean newWorld) {
+        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");
+
+        setWorldDefaults();
+        creativeInv = new ItemStack[54];
+        LayoutManager.searchField.setText(getSearchExpression());
+        ItemPanels.itemPanel.quantity.setText(Integer.toString(getItemQuantity()));
+        SubsetWidget.loadHidden();
+
+        if (newWorld && Minecraft.getMinecraft().isSingleplayer())
+            world.config
+                    .getTag("inventory.cheatmode")
+                    .setIntValue(NEIClientUtils.mc().playerController.isInCreativeMode() ? 2 : 0);
+
+        NEIInfo.load(ClientUtils.getWorld());
+    }
+
+    private static void setWorldDefaults() {
+        NBTTagCompound nbt = world.nbt;
+        if (!nbt.hasKey("search")) nbt.setString("search", "");
+        if (!nbt.hasKey("quantity")) nbt.setInteger("quantity", 0);
+        if (!nbt.hasKey("validateenchantments")) nbt.setBoolean("validateenchantments", false);
+
+        world.saveNBT();
+    }
+
+    public static int getKeyBinding(String string) {
+        return getSetting("keys." + string).getIntValue();
+    }
+
+    public static void setDefaultKeyBinding(String string, int key) {
+        getSetting("keys." + string).getIntValue(key);
+    }
+
+    public static boolean isKeyHashDown(String string) {
+        final int hash = getKeyBinding(string);
+        return hash != Keyboard.CHAR_NONE && hash == NEIClientUtils.getKeyHash();
+    }
+
+    public static void bootNEI(World world) {
+        if (configLoaded) return;
+
+        ItemInfo.load(world);
+        GuiInfo.load();
+        RecipeInfo.load();
+        LayoutManager.load();
+        NEIController.load();
+        RecipeCatalysts.loadCatalystInfo();
+
+        configLoaded = true;
+
+        new Thread("NEI Plugin Loader") {
+            @Override
+            public void run() {
+                ClassDiscoverer classDiscoverer = new ClassDiscoverer(
+                        test -> test.startsWith("NEI") && test.endsWith("Config.class"), IConfigureNEI.class);
+
+                classDiscoverer.findClasses();
+
+                for (Class<?> clazz : classDiscoverer.classes) {
+                    try {
+                        IConfigureNEI config = (IConfigureNEI) clazz.newInstance();
+                        config.loadConfig();
+                        NEIModContainer.plugins.add(config);
+                        logger.debug("Loaded " + clazz.getName());
+                    } catch (Exception e) {
+                        logger.error("Failed to Load " + clazz.getName(), e);
+                    }
+                }
+
+                MinecraftForge.EVENT_BUS.post(new NEIConfigsLoadedEvent());
+            }
+        }.start();
+        ItemSorter.loadConfig();
+    }
+
+    private static void initBookmarkFile(String worldPath) {
+
+        if (!global.config.getTag("inventory.worldSpecificBookmarks").getBooleanValue()) {
+            worldPath = "global";
+        }
+
+        ItemPanels.bookmarkPanel.setBookmarkFile(worldPath);
+    }
+
+    private static void initPresetsFile(String worldPath) {
+
+        if (!global.config.getTag("inventory.worldSpecificPresets").getBooleanValue()) {
+            worldPath = "global";
+        }
+
+        PresetsWidget.loadPresets(worldPath);
+    }
+
+    public static boolean isWorldSpecific(String setting) {
+        if (world == null) return false;
+        ConfigTag tag = world.config.getTag(setting, false);
+        return tag != null && tag.value != null;
+    }
+
+    public static ConfigTag getSetting(String s) {
+        return isWorldSpecific(s) ? world.config.getTag(s) : global.config.getTag(s);
+    }
+
+    public static boolean getBooleanSetting(String s) {
+        return getSetting(s).getBooleanValue();
+    }
+
+    public static boolean isHidden() {
+        return !enabledOverride || getBooleanSetting("inventory.hidden");
+    }
+
+    public static boolean isBookmarkPanelHidden() {
+        return !getBooleanSetting("inventory.bookmarksEnabled");
+    }
+
+    public static boolean useNBTInBookmarks() {
+        return getBooleanSetting("inventory.useNBTInBookmarks");
+    }
+
+    public static boolean showRecipeMarker() {
+        return getBooleanSetting("inventory.showRecipeMarker");
+    }
+
+    public static boolean showItemQuantityWidget() {
+        return getBooleanSetting("inventory.showItemQuantityWidget");
+    }
+
+    public static boolean areJEIStyleTabsVisible() {
+        return getBooleanSetting("inventory.jei_style_tabs");
+    }
+
+    public static boolean isJEIStyleItemPresenceOverlayVisible() {
+        return getBooleanSetting("inventory.jei_style_item_presence_overlay");
+    }
+
+    public static boolean areJEIStyleRecipeCatalystsVisible() {
+        return getBooleanSetting("inventory.jei_style_recipe_catalyst");
+    }
+
+    public static boolean useCreativeTabStyle() {
+        return getBooleanSetting("inventory.creative_tab_style");
+    }
+
+    public static boolean ignorePotionOverlap() {
+        return getBooleanSetting("inventory.ignore_potion_overlap");
+    }
+
+    public static boolean isEnabled() {
+        return enabledOverride && getBooleanSetting("inventory.widgetsenabled");
+    }
+
+    public static boolean loadHandlersFromJar() {
+        return !getBooleanSetting("tools.handler_load_from_config");
+    }
+
+    public static boolean loadCatalystsFromJar() {
+        return !getBooleanSetting("tools.catalyst_load_from_config");
+    }
+
+    public static void setEnabled(boolean flag) {
+        getSetting("inventory.widgetsenabled").setBooleanValue(flag);
+    }
+
+    public static int getItemQuantity() {
+        return world.nbt.getInteger("quantity");
+    }
+
+    public static int getCheatMode() {
+        return getIntSetting("inventory.cheatmode");
+    }
+
+    private static void checkCheatMode() {
+        if (getLockedMode() != -1) setIntSetting("inventory.cheatmode", getLockedMode());
+    }
+
+    public static int getLockedMode() {
+        return getIntSetting("inventory.lockmode");
+    }
+
+    public static int getLayoutStyle() {
+        return getIntSetting("inventory.layoutstyle");
+    }
+
+    public static String getStringSetting(String s) {
+        return getSetting(s).getValue();
+    }
+
+    public static boolean showIDs() {
+        int i = getIntSetting("inventory.itemIDs");
+        return i == 2 || (i == 1 && isEnabled() && !isHidden());
+    }
+
+    public static int getItemLoadingTimeout() {
+        return getIntSetting("itemLoadingTimeout");
+    }
+
+    public static void toggleBooleanSetting(String setting) {
+        ConfigTag tag = getSetting(setting);
+        tag.setBooleanValue(!tag.getBooleanValue());
+    }
+
+    public static void cycleSetting(String setting, int max) {
+        ConfigTag tag = getSetting(setting);
+        tag.setIntValue((tag.getIntValue() + 1) % max);
+    }
+
+    public static int getIntSetting(String setting) {
+        return getSetting(setting).getIntValue();
+    }
+
+    public static void setIntSetting(String setting, int val) {
+        getSetting(setting).setIntValue(val);
+    }
+
+    public static String getSearchExpression() {
+        return world.nbt.getString("search");
+    }
+
+    public static void setSearchExpression(String expression) {
+        world.nbt.setString("search", expression);
+        world.saveNBT();
+    }
+
+    public static boolean isMouseScrollTransferEnabled() {
+        return !getBooleanSetting("inventory.disableMouseScrollTransfer");
+    }
+
+    public static boolean shouldInvertMouseScrollTransfer() {
+        return !getBooleanSetting("inventory.invertMouseScrollTransfer");
+    }
+
+    public static boolean shouldCacheItemRendering() {
+        return getBooleanSetting("inventory.cacheItemRendering") && OpenGlHelper.framebufferSupported;
+    }
+
+    public static boolean getMagnetMode() {
+        return enabledActions.contains("magnet");
+    }
+
+    public static boolean invCreativeMode() {
+        return enabledActions.contains("creative+") && canPerformAction("creative+");
+    }
+
+    public static boolean areDamageVariantsShown() {
+        return hasSMPCounterPart() || getSetting("command.item").getValue().contains("{3}");
+    }
+
+    public static boolean hasSMPCounterPart() {
+        return hasSMPCounterpart;
+    }
+
+    public static void setHasSMPCounterPart(boolean flag) {
+        hasSMPCounterpart = flag;
+        permissableActions.clear();
+        bannedBlocks.clear();
+        disabledActions.clear();
+        enabledActions.clear();
+    }
+
+    public static boolean canCheatItem(ItemStack stack) {
+        return canPerformAction("item") && !bannedBlocks.contains(stack);
+    }
+
+    public static boolean canPerformAction(String name) {
+        if (!isEnabled()) return false;
+
+        if (!modePermitsAction(name)) return false;
+
+        String base = NEIActions.base(name);
+        if (hasSMPCounterpart) return permissableActions.contains(base);
+
+        if (NEIActions.smpRequired(name)) return false;
+
+        String cmd = getStringSetting("command." + base);
+        return cmd != null && cmd.startsWith("/");
+    }
+
+    private static boolean modePermitsAction(String name) {
+        if (getCheatMode() == 0) return false;
+        if (getCheatMode() == 2) return true;
+
+        String[] actions = getStringArrSetting("inventory.utilities");
+        for (String action : actions) if (action.equalsIgnoreCase(name)) return true;
+
+        return false;
+    }
+
+    public static String[] getStringArrSetting(String s) {
+        return getStringSetting(s).replace(" ", "").split(",");
+    }
+
+    public static void setInternalEnabled(boolean b) {
+        enabledOverride = b;
+    }
+
+    public static void reloadSaves() {
+        File saveDir = new File(CommonUtils.getMinecraftDir(), "saves/NEI/local");
+        if (!saveDir.exists()) return;
+
+        List<SaveFormatComparator> saves;
+        try {
+            saves = Minecraft.getMinecraft().getSaveLoader().getSaveList();
+        } catch (Exception e) {
+            logger.error("Error loading saves", e);
+            return;
+        }
+        HashSet<String> saveFileNames = new HashSet<>();
+        for (SaveFormatComparator save : saves) saveFileNames.add(save.getFileName());
+
+        for (File file : saveDir.listFiles())
+            if (file.isDirectory() && !saveFileNames.contains(file.getName())) ObfuscationRun.deleteDir(file, true);
+    }
+}

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

@@ -1,15 +1,38 @@
 package codechicken.nei;
 
+import static codechicken.nei.NEIClientConfig.canCheatItem;
+import static codechicken.nei.NEIClientConfig.canPerformAction;
+import static codechicken.nei.NEIClientConfig.getStringArrSetting;
+import static codechicken.nei.NEIClientConfig.getStringSetting;
+import static codechicken.nei.NEIClientConfig.hasSMPCounterPart;
+import static codechicken.nei.NEIClientConfig.invCreativeMode;
+import static codechicken.nei.NEIClientConfig.world;
+
 import codechicken.lib.inventory.InventoryRange;
 import codechicken.lib.inventory.InventoryUtils;
 import codechicken.lib.util.LangProxy;
 import codechicken.nei.api.GuiInfo;
 import codechicken.nei.api.IInfiniteItemHandler;
-import codechicken.nei.api.INEIGuiHandler;
 import codechicken.nei.api.ItemInfo;
 import com.google.common.collect.Iterables;
+import java.math.BigInteger;
+import java.math.RoundingMode;
+import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+import java.text.MessageFormat;
+import java.text.NumberFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.stream.Collectors;
 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.entity.player.EntityPlayer;
 import net.minecraft.inventory.Container;
@@ -20,16 +43,16 @@ import net.minecraft.util.IChatComponent;
 import net.minecraft.util.ResourceLocation;
 import org.lwjgl.input.Keyboard;
 
-import java.text.MessageFormat;
-import java.text.NumberFormat;
-import java.util.*;
-
-import static codechicken.nei.NEIClientConfig.*;
-
-public class NEIClientUtils extends NEIServerUtils
-{
+public class NEIClientUtils extends NEIServerUtils {
     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<>();
+
+    public static final int ALT_HASH = 1 << 27;
+    public static final int SHIFT_HASH = 1 << 26;
+    public static final int CTRL_HASH = 1 << 25;
+
     public static Minecraft mc() {
         return Minecraft.getMinecraft();
     }
@@ -39,8 +62,33 @@ public class NEIClientUtils extends NEIServerUtils
     }
 
     public static void printChatMessage(IChatComponent msg) {
-        if (mc().ingameGUI != null)
-            mc().ingameGUI.getChatGUI().printChatMessage(msg);
+        if (mc().ingameGUI != null) mc().ingameGUI.getChatGUI().printChatMessage(msg);
+    }
+
+    private static DecimalFormat getDecimalFormat() {
+        return decimalFormatters.computeIfAbsent(Locale.getDefault(Locale.Category.FORMAT), locale -> {
+            DecimalFormat numberFormat = new DecimalFormat(); // uses the necessary locale inside anyway
+            numberFormat.setGroupingUsed(true);
+            numberFormat.setMaximumFractionDigits(2);
+            numberFormat.setRoundingMode(RoundingMode.HALF_UP);
+            DecimalFormatSymbols decimalFormatSymbols = numberFormat.getDecimalFormatSymbols();
+            decimalFormatSymbols.setGroupingSeparator(','); // Use sensible separator for best clarity.
+            numberFormat.setDecimalFormatSymbols(decimalFormatSymbols);
+
+            return numberFormat;
+        });
+    }
+
+    public static String formatNumbers(BigInteger aNumber) {
+        return getDecimalFormat().format(aNumber);
+    }
+
+    public static String formatNumbers(long aNumber) {
+        return getDecimalFormat().format(aNumber);
+    }
+
+    public static String formatNumbers(double aNumber) {
+        return getDecimalFormat().format(aNumber);
     }
 
     public static void deleteHeldItem() {
@@ -48,7 +96,8 @@ public class NEIClientUtils extends NEIServerUtils
     }
 
     public static void dropHeldItem() {
-        mc().playerController.windowClick(((GuiContainer) mc().currentScreen).inventorySlots.windowId, -999, 0, 0, mc().thePlayer);
+        mc().playerController
+                .windowClick(((GuiContainer) mc().currentScreen).inventorySlots.windowId, -999, 0, 0, mc().thePlayer);
     }
 
     public static void deleteSlotStack(int slotNumber) {
@@ -56,12 +105,12 @@ public class NEIClientUtils extends NEIServerUtils
     }
 
     public static void decreaseSlotStack(int slotNumber) {
-        ItemStack stack = slotNumber == -999 ? getHeldItem() : mc().thePlayer.openContainer.getSlot(slotNumber).getStack();
-        if (stack == null)
-            return;
+        ItemStack stack = slotNumber == -999
+                ? getHeldItem()
+                : mc().thePlayer.openContainer.getSlot(slotNumber).getStack();
+        if (stack == null) return;
 
-        if (stack.stackSize == 1)
-            deleteSlotStack(slotNumber);
+        if (stack.stackSize == 1) deleteSlotStack(slotNumber);
         else {
             stack = stack.copy();
             stack.stackSize--;
@@ -77,8 +126,7 @@ public class NEIClientUtils extends NEIServerUtils
         Container c = getGuiContainer().inventorySlots;
         for (int i = 0; i < c.inventorySlots.size(); i++) {
             Slot slot = c.getSlot(i);
-            if (slot == null)
-                continue;
+            if (slot == null) continue;
 
             ItemStack stack = slot.getStack();
             if (stack != null && stack.getItem() == type.getItem() && stack.getItemDamage() == type.getItemDamage()) {
@@ -95,21 +143,18 @@ public class NEIClientUtils extends NEIServerUtils
     public static void setSlotContents(int slot, ItemStack item, boolean containerInv) {
         NEICPH.sendSetSlot(slot, item, containerInv);
 
-        if (slot == -999)
-            mc().thePlayer.inventory.setItemStack(item);
+        if (slot == -999) mc().thePlayer.inventory.setItemStack(item);
     }
 
     /**
      * @param mode      -1 = normal cheats, 0 = no infinites, 1 = replenish stack
      */
     public static void cheatItem(ItemStack stack, int button, int mode) {
-        if (!canCheatItem(stack))
-            return;
+        if (!canCheatItem(stack)) return;
 
         if (mode == -1 && button == 0 && shiftKey() && NEIClientConfig.hasSMPCounterPart()) {
             for (IInfiniteItemHandler handler : ItemInfo.infiniteHandlers) {
-                if (!handler.canHandleItem(stack))
-                    continue;
+                if (!handler.canHandleItem(stack)) continue;
 
                 ItemStack inf = handler.getInfiniteItem(stack);
                 if (inf != null) {
@@ -124,10 +169,7 @@ public class NEIClientUtils extends NEIServerUtils
             if (mode == 1 && stack.stackSize < stack.getMaxStackSize()) {
                 giveStack(stack, stack.getMaxStackSize() - stack.stackSize);
             } else {
-                int amount = getItemQuantity();
-                if (amount == 0)
-                    amount = stack.getMaxStackSize();
-                giveStack(stack, amount);
+                giveStack(stack);
             }
         }
     }
@@ -144,18 +186,26 @@ public class NEIClientUtils extends NEIServerUtils
         ItemStack stack = copyStack(base, i);
         if (hasSMPCounterPart()) {
             ItemStack typestack = copyStack(stack, 1);
-            if (!infinite && !canItemFitInInventory(mc().thePlayer, stack) && (mc().currentScreen instanceof GuiContainer)) {
+            if (!infinite
+                    && !canItemFitInInventory(mc().thePlayer, stack)
+                    && (mc().currentScreen instanceof GuiContainer)) {
                 GuiContainer gui = getGuiContainer();
-                List<Iterable<Integer>> handlerSlots = new LinkedList<Iterable<Integer>>();
-                for(INEIGuiHandler handler : GuiInfo.guiHandlers)
-                    handlerSlots.add(handler.getItemSpawnSlots(gui, typestack));
+                final List<Iterable<Integer>> handlerSlots;
+                try {
+                    GuiInfo.readLock.lock();
+                    handlerSlots = GuiInfo.guiHandlers.stream()
+                            .map(handler -> handler.getItemSpawnSlots(gui, typestack))
+                            .filter(x -> x != null)
+                            .collect(Collectors.toCollection(LinkedList::new));
+                } finally {
+                    GuiInfo.readLock.unlock();
+                }
 
                 int increment = typestack.getMaxStackSize();
                 int given = 0;
-                for(int slotNo : Iterables.concat(handlerSlots)) {
+                for (int slotNo : Iterables.concat(handlerSlots)) {
                     Slot slot = gui.inventorySlots.getSlot(slotNo);
-                    if(!slot.isItemValid(typestack) || !InventoryUtils.canStack(slot.getStack(), typestack))
-                        continue;
+                    if (!slot.isItemValid(typestack) || !InventoryUtils.canStack(slot.getStack(), typestack)) continue;
 
                     int qty = Math.min(stack.stackSize - given, increment);
                     int current = slot.getHasStack() ? slot.getStack().stackSize : 0;
@@ -165,17 +215,15 @@ public class NEIClientUtils extends NEIServerUtils
                     slot.putStack(newStack);
                     setSlotContents(slotNo, newStack, true);
                     given += qty;
-                    if(given >= stack.stackSize)
-                        break;
+                    if (given >= stack.stackSize) break;
                 }
-                if(given > 0)
-                    NEICPH.sendGiveItem(copyStack(typestack, given), false, false);
-            } else
-                NEICPH.sendGiveItem(stack, infinite, true);
+                if (given > 0) NEICPH.sendGiveItem(copyStack(typestack, given), false, false);
+            } else NEICPH.sendGiveItem(stack, infinite, true);
         } else {
             for (int given = 0; given < stack.stackSize; ) {
                 int qty = Math.min(stack.stackSize - given, stack.getMaxStackSize());
-                sendCommand(getStringSetting("command.item"),
+                sendCommand(
+                        getStringSetting("command.item"),
                         mc().thePlayer.getCommandSenderName(),
                         Item.getIdFromItem(stack.getItem()),
                         qty,
@@ -200,20 +248,17 @@ public class NEIClientUtils extends NEIServerUtils
     }
 
     public static int getGamemode() {
-        if (invCreativeMode())
-            return 2;
-        else if (mc().playerController.isInCreativeMode())
-            return 1;
-        else if (mc().playerController.currentGameType.isAdventure())
-            return 3;
-        else
-            return 0;
+        if (invCreativeMode()) return 2;
+        else if (mc().playerController.isInCreativeMode()) return 1;
+        else if (mc().playerController.currentGameType.isAdventure()) return 3;
+        else return 0;
     }
 
     public static boolean isValidGamemode(String s) {
-        return s.equals("survival") ||
-                canPerformAction(s) &&
-                        Arrays.asList(getStringArrSetting("inventory.gamemodes")).contains(s);
+        return s.equals("survival")
+                || canPerformAction(s)
+                        && Arrays.asList(getStringArrSetting("inventory.gamemodes"))
+                                .contains(s);
     }
 
     public static int getNextGamemode() {
@@ -221,8 +266,7 @@ public class NEIClientUtils extends NEIServerUtils
         int nmode = mode;
         while (true) {
             nmode = (nmode + 1) % NEIActions.gameModes.length;
-            if (nmode == mode || isValidGamemode(NEIActions.gameModes[nmode]))
-                break;
+            if (nmode == mode || isValidGamemode(NEIActions.gameModes[nmode])) break;
         }
         return nmode;
     }
@@ -230,13 +274,14 @@ public class NEIClientUtils extends NEIServerUtils
     public static void cycleGamemode() {
         int mode = getGamemode();
         int nmode = getNextGamemode();
-        if (mode == nmode)
-            return;
+        if (mode == nmode) return;
 
-        if (hasSMPCounterPart())
-            NEICPH.sendGamemode(nmode);
+        if (hasSMPCounterPart()) NEICPH.sendGamemode(nmode);
         else
-            sendCommand(getStringSetting("command.creative"), getGameType(nmode), mc().thePlayer.getCommandSenderName());
+            sendCommand(
+                    getStringSetting("command.creative"),
+                    getGameType(nmode),
+                    mc().thePlayer.getCommandSenderName());
     }
 
     public static long getTime() {
@@ -251,15 +296,12 @@ public class NEIClientUtils extends NEIServerUtils
         long day = (getTime() / 24000L) * 24000L;
         long newTime = day + 24000L + hour * 1000;
 
-        if (hasSMPCounterPart())
-            NEICPH.sendSetTime(hour);
-        else
-            sendCommand(getStringSetting("command.time"), newTime);
+        if (hasSMPCounterPart()) NEICPH.sendSetTime(hour);
+        else sendCommand(getStringSetting("command.time"), newTime);
     }
 
     public static void sendCommand(String command, Object... args) {
-        if (command.length() == 0)
-            return;
+        if (command.length() == 0) return;
 
         NumberFormat numberformat = NumberFormat.getIntegerInstance();
         numberformat.setGroupingUsed(false);
@@ -276,26 +318,21 @@ public class NEIClientUtils extends NEIServerUtils
     }
 
     public static void toggleRaining() {
-        if (hasSMPCounterPart())
-            NEICPH.sendToggleRain();
-        else
-            sendCommand(getStringSetting("command.rain"), isRaining() ? 0 : 1);
+        if (hasSMPCounterPart()) NEICPH.sendToggleRain();
+        else sendCommand(getStringSetting("command.rain"), isRaining() ? 0 : 1);
     }
 
     public static void healPlayer() {
-        if (hasSMPCounterPart())
-            NEICPH.sendHeal();
-        else
-            sendCommand(getStringSetting("command.heal"), mc().thePlayer.getCommandSenderName());
+        if (hasSMPCounterPart()) NEICPH.sendHeal();
+        else sendCommand(getStringSetting("command.heal"), mc().thePlayer.getCommandSenderName());
     }
 
     public static void toggleMagnetMode() {
-        if (hasSMPCounterPart())
-            NEICPH.sendToggleMagnetMode();
+        if (hasSMPCounterPart()) NEICPH.sendToggleMagnetMode();
     }
 
     public static ArrayList<int[]> concatIntegersToRanges(List<Integer> damages) {
-        ArrayList<int[]> ranges = new ArrayList<int[]>();
+        ArrayList<int[]> ranges = new ArrayList<>();
         if (damages.size() == 0) return ranges;
 
         Collections.sort(damages);
@@ -307,24 +344,40 @@ public class NEIClientUtils extends NEIServerUtils
                 continue;
             }
             if (next + 1 != i) {
-                ranges.add(new int[]{start, next});
+                ranges.add(new int[] {start, next});
                 start = next = i;
                 continue;
             }
             next = i;
         }
-        ranges.add(new int[]{start, next});
+        ranges.add(new int[] {start, next});
         return ranges;
     }
 
     public static ArrayList<int[]> addIntegersToRanges(List<int[]> ranges, List<Integer> damages) {
-        for (int[] range : ranges)
-            for (int integer = range[0]; integer <= range[1]; integer++)
-                damages.add(integer);
+        for (int[] range : ranges) for (int integer = range[0]; integer <= range[1]; integer++) damages.add(integer);
 
         return concatIntegersToRanges(damages);
     }
 
+    public static String cropText(FontRenderer fontRenderer, String text, int containerWidth) {
+
+        int textWidth = fontRenderer.getStringWidth(text);
+
+        if (textWidth > containerWidth) {
+            textWidth += fontRenderer.getStringWidth("...");
+
+            while (textWidth > containerWidth) {
+                textWidth -= fontRenderer.getCharWidth(text.charAt(text.length() - 1));
+                text = text.substring(0, text.length() - 1);
+            }
+
+            return text + "...";
+        }
+
+        return text;
+    }
+
     public static boolean safeKeyDown(int keyCode) {
         try {
             return Keyboard.isKeyDown(keyCode);
@@ -336,12 +389,10 @@ public class NEIClientUtils extends NEIServerUtils
     public static void setItemQuantity(int i) {
         world.nbt.setInteger("quantity", i);
         world.saveNBT();
-        LayoutManager.quantity.setText(Integer.toString(i));
     }
 
     public static GuiContainer getGuiContainer() {
-        if (mc().currentScreen instanceof GuiContainer)
-            return (GuiContainer) mc().currentScreen;
+        if (mc().currentScreen instanceof GuiContainer) return (GuiContainer) mc().currentScreen;
 
         return null;
     }
@@ -350,7 +401,48 @@ public class NEIClientUtils extends NEIServerUtils
         return Keyboard.isKeyDown(Keyboard.KEY_LMENU) || Keyboard.isKeyDown(Keyboard.KEY_RMENU);
     }
 
+    public static int getMetaHash() {
+        if (Keyboard.getEventKeyState()) {
+            int hash = 0;
+
+            if (altKey()) {
+                hash = hash | ALT_HASH;
+            }
+
+            if (shiftKey()) {
+                hash = hash | SHIFT_HASH;
+            }
+
+            if (controlKey()) {
+                hash = hash | CTRL_HASH;
+            }
+
+            return hash;
+        }
+
+        return 0;
+    }
+
+    public static int getKeyHash() {
+
+        if (Keyboard.getEventKeyState()) {
+            final int keycode = Keyboard.getEventKey();
+
+            if (keycode != Keyboard.KEY_LSHIFT
+                    && keycode != Keyboard.KEY_RSHIFT
+                    && keycode != Keyboard.KEY_LCONTROL
+                    && keycode != Keyboard.KEY_RCONTROL
+                    && keycode != Keyboard.KEY_LMENU
+                    && keycode != Keyboard.KEY_RMENU) {
+                return getMetaHash() + keycode;
+            }
+        }
+
+        return Keyboard.CHAR_NONE;
+    }
+
     public static void playClickSound() {
-        mc().getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1.0F));
+        mc().getSoundHandler()
+                .playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1.0F));
     }
 }

src/main/java/codechicken/nei/NEICompatibility.java

@@ -0,0 +1,3 @@
+package codechicken.nei;
+
+public class NEICompatibility {}

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

@@ -1,9 +1,18 @@
 package codechicken.nei;
 
-import codechicken.nei.api.*;
+import static codechicken.lib.gui.GuiDraw.getMousePosition;
+
+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.guihook.GuiContainerManager;
 import codechicken.nei.guihook.IContainerInputHandler;
 import codechicken.nei.guihook.IContainerSlotClickHandler;
+import codechicken.nei.recipe.GuiRecipe;
+import java.awt.Point;
+import java.util.LinkedList;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.client.gui.inventory.GuiContainerCreative;
 import net.minecraft.entity.player.InventoryPlayer;
@@ -11,14 +20,8 @@ import net.minecraft.inventory.Slot;
 import net.minecraft.inventory.SlotCrafting;
 import net.minecraft.item.ItemStack;
 
-import java.awt.*;
-import java.util.LinkedList;
-
-import static codechicken.lib.gui.GuiDraw.getMousePosition;
-
-public class NEIController implements IContainerSlotClickHandler, IContainerInputHandler
-{
-    private static NEIController instance = new NEIController();
+public class NEIController implements IContainerSlotClickHandler, IContainerInputHandler {
+    private static final NEIController instance = new NEIController();
 
     public static GuiContainerManager manager;
     public static FastTransferManager fastTransferManager;
@@ -40,12 +43,10 @@ public class NEIController implements IContainerSlotClickHandler, IContainerInpu
         deleteMode = false;
         GuiInfo.clearGuiHandlers();
         fastTransferManager = null;
-        if (!NEIClientConfig.isEnabled())
-            return;
+        if (!NEIClientConfig.isEnabled()) return;
 
         fastTransferManager = new FastTransferManager();
-        if (gui instanceof INEIGuiHandler)
-            API.registerNEIGuiHandler((INEIGuiHandler) gui);
+        if (gui instanceof INEIGuiHandler) API.registerNEIGuiHandler((INEIGuiHandler) gui);
     }
 
     public static boolean isSpreading(GuiContainer gui) {
@@ -53,17 +54,15 @@ public class NEIController implements IContainerSlotClickHandler, IContainerInpu
     }
 
     public static void updateUnlimitedItems(InventoryPlayer inventory) {
-        if (!NEIClientConfig.canPerformAction("item") || !NEIClientConfig.hasSMPCounterPart())
-            return;
+        if (!NEIClientConfig.canPerformAction("item") || !NEIClientConfig.hasSMPCounterPart()) return;
 
-        LinkedList<ItemStack> beforeStacks = new LinkedList<ItemStack>();
+        LinkedList<ItemStack> beforeStacks = new LinkedList<>();
         for (int i = 0; i < inventory.getSizeInventory(); i++)
             beforeStacks.add(NEIServerUtils.copyStack(inventory.getStackInSlot(i)));
 
         for (int i = 0; i < inventory.getSizeInventory(); i++) {
             ItemStack stack = inventory.getStackInSlot(i);
-            if (stack == null)
-                continue;
+            if (stack == null) continue;
 
             for (IInfiniteItemHandler handler : ItemInfo.infiniteHandlers)
                 if (handler.canHandleItem(stack) && handler.isItemInfinite(stack))
@@ -74,8 +73,8 @@ public class NEIController implements IContainerSlotClickHandler, IContainerInpu
             ItemStack newstack = inventory.getStackInSlot(i);
 
             if (!NEIServerUtils.areStacksIdentical(beforeStacks.get(i), newstack)) {
-                inventory.setInventorySlotContents(i, beforeStacks.get(i));//restore in case of SMP fail
-                NEIClientUtils.setSlotContents(i, newstack, false);//sends via SMP handler ;)
+                inventory.setInventorySlotContents(i, beforeStacks.get(i)); // restore in case of SMP fail
+                NEIClientUtils.setSlotContents(i, newstack, false); // sends via SMP handler ;)
             }
         }
     }
@@ -83,11 +82,13 @@ public class NEIController implements IContainerSlotClickHandler, IContainerInpu
     public static void processCreativeCycling(InventoryPlayer inventory) {
         if (NEIClientConfig.invCreativeMode() && NEIClientUtils.controlKey()) {
             if (selectedItem != inventory.currentItem) {
-                if (inventory.currentItem == selectedItem + 1 || (inventory.currentItem == 0 && selectedItem == 8))//foward
+                if (inventory.currentItem == selectedItem + 1
+                        || (inventory.currentItem == 0 && selectedItem == 8)) // foward
                 {
                     NEICPH.sendCreativeScroll(1);
                     inventory.currentItem = selectedItem;
-                } else if (inventory.currentItem == selectedItem - 1 || (inventory.currentItem == 8 && selectedItem == 0)) {
+                } else if (inventory.currentItem == selectedItem - 1
+                        || (inventory.currentItem == 8 && selectedItem == 0)) {
                     NEICPH.sendCreativeScroll(-1);
                     inventory.currentItem = selectedItem;
                 }
@@ -99,50 +100,48 @@ public class NEIController implements IContainerSlotClickHandler, IContainerInpu
 
     @Override
     public void beforeSlotClick(GuiContainer gui, int slotIndex, int button, Slot slot, int modifier) {
-        if (!NEIClientConfig.isEnabled())
-            return;
+        if (!NEIClientConfig.isEnabled()) return;
 
         firstheld = NEIClientUtils.getHeldItem();
     }
 
     @Override
-    public boolean handleSlotClick(GuiContainer gui, int slotIndex, int button, Slot slot, int modifier, boolean eventconsumed) {
-        if (eventconsumed ||
-                !NEIClientConfig.isEnabled() ||
-                isSpreading(gui))
-            return eventconsumed;
+    public boolean handleSlotClick(
+            GuiContainer gui, int slotIndex, int button, Slot slot, int modifier, boolean eventconsumed) {
+        if (eventconsumed || !NEIClientConfig.isEnabled() || isSpreading(gui)) return eventconsumed;
 
         if (deleteMode && slotIndex >= 0 && slot != null) {
             if (NEIClientUtils.shiftKey() && button == 0) {
                 ItemStack itemstack1 = slot.getStack();
-                if (itemstack1 != null)
-                    NEIClientUtils.deleteItemsOfType(itemstack1);
+                if (itemstack1 != null) NEIClientUtils.deleteItemsOfType(itemstack1);
 
-            } else if (button == 1)
-                NEIClientUtils.decreaseSlotStack(slot.slotNumber);
-            else
-                NEIClientUtils.deleteSlotStack(slot.slotNumber);
+            } else if (button == 1) NEIClientUtils.decreaseSlotStack(slot.slotNumber);
+            else NEIClientUtils.deleteSlotStack(slot.slotNumber);
             return true;
         }
 
-        if (button == 1 && slot instanceof SlotCrafting)//right click
+        if (button == 1 && slot instanceof SlotCrafting) // right click
         {
-            for (int i1 = 0; i1 < 64; i1++)//click this slot 64 times
-                manager.handleSlotClick(slot.slotNumber, button, 0);
+            for (int i1 = 0; i1 < 64; i1++) // click this slot 64 times
+            manager.handleSlotClick(slot.slotNumber, button, 0);
             return true;
         }
 
         if (NEIClientUtils.controlKey()
-                && slot != null && slot.getStack() != null
+                && modifier != 4 // Drop key pressed: net.minecraft.client.gui.inventory.GuiContainer.keyTyped
+                && slot != null
+                && slot.getStack() != null
                 && slot.isItemValid(slot.getStack())) {
             NEIClientUtils.cheatItem(slot.getStack(), button, 1);
             return true;
         }
 
-        if(GuiInfo.hasCustomSlots(gui))
-            return false;
+        if (GuiInfo.hasCustomSlots(gui)) return false;
 
-        if (slotIndex >= 0 && NEIClientUtils.shiftKey() && NEIClientUtils.getHeldItem() != null && !slot.getHasStack()) {
+        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()))
@@ -161,16 +160,16 @@ public class NEIController implements IContainerSlotClickHandler, IContainerInpu
 
     @Override
     public void afterSlotClick(GuiContainer gui, int slotIndex, int button, Slot slot, int modifier) {
-        if (!NEIClientConfig.isEnabled())
-            return;
+        if (!NEIClientConfig.isEnabled()) return;
 
         ItemStack nowHeld = NEIClientUtils.getHeldItem();
 
-        if (firstheld != nowHeld)
-            pickedUpFromSlot = slotIndex;
+        if (firstheld != nowHeld) pickedUpFromSlot = slotIndex;
 
         if (NEIClientConfig.canPerformAction("item") && NEIClientConfig.hasSMPCounterPart()) {
-            if (heldStackInfinite != null && slot != null && slot.inventory == NEIClientUtils.mc().thePlayer.inventory) {
+            if (heldStackInfinite != null
+                    && slot != null
+                    && slot.inventory == NEIClientUtils.mc().thePlayer.inventory) {
                 ItemStack stack = slot.getStack();
                 if (stack != null) {
                     heldStackInfinite.onPlaceInfinite(stack);
@@ -178,8 +177,7 @@ public class NEIController implements IContainerSlotClickHandler, IContainerInpu
                 NEIClientUtils.setSlotContents(slotIndex, stack, true);
             }
 
-            if (firstheld != nowHeld)
-                heldStackInfinite = null;
+            if (firstheld != nowHeld) heldStackInfinite = null;
 
             if (firstheld != nowHeld && nowHeld != null) {
                 for (IInfiniteItemHandler handler : ItemInfo.infiniteHandlers) {
@@ -196,14 +194,10 @@ public class NEIController implements IContainerSlotClickHandler, IContainerInpu
 
     @Override
     public boolean lastKeyTyped(GuiContainer gui, char keyChar, int keyCode) {
-        if (!NEIClientConfig.isEnabled() ||
-                GuiInfo.hasCustomSlots(gui) ||
-                isSpreading(gui))
-            return false;
+        if (!NEIClientConfig.isEnabled() || GuiInfo.hasCustomSlots(gui) || isSpreading(gui)) return false;
 
         Slot slot = GuiContainerManager.getSlotMouseOver(gui);
-        if (slot == null)
-            return false;
+        if (slot == null) return false;
 
         int slotIndex = slot.slotNumber;
 
@@ -220,16 +214,22 @@ public class NEIController implements IContainerSlotClickHandler, IContainerInpu
 
     @Override
     public boolean mouseScrolled(GuiContainer gui, int mousex, int mousey, int scrolled) {
-        if (!NEIClientConfig.isEnabled() || GuiInfo.hasCustomSlots(gui))
-            return false;
+        if (!NEIClientConfig.isEnabled()
+                || GuiInfo.hasCustomSlots(gui)
+                || !NEIClientConfig.isMouseScrollTransferEnabled()) return false;
+
+        // slot in GuiRecipe does not contain actual stack
+        // and scroll should be handled by GuiRecipe, not here
+        if (gui instanceof GuiRecipe) return false;
 
         Point mousePos = getMousePosition();
         Slot mouseover = manager.window.getSlotAtPosition(mousePos.x, mousePos.y);
         if (mouseover != null && mouseover.getHasStack()) {
-            if (scrolled > 0)
-                fastTransferManager.transferItem(manager.window, mouseover.slotNumber);
-            else
-                fastTransferManager.retrieveItem(manager.window, mouseover.slotNumber);
+            if (NEIClientConfig.shouldInvertMouseScrollTransfer()) {
+                scrolled = -scrolled;
+            }
+            if (scrolled > 0) fastTransferManager.transferItem(manager.window, mouseover.slotNumber);
+            else fastTransferManager.retrieveItem(manager.window, mouseover.slotNumber);
             return true;
         }
         return false;
@@ -246,32 +246,26 @@ public class NEIController implements IContainerSlotClickHandler, IContainerInpu
     }
 
     @Override
-    public void onKeyTyped(GuiContainer gui, char keyChar, int keyID) {
-    }
+    public void onKeyTyped(GuiContainer gui, char keyChar, int keyID) {}
 
     @Override
-    public void onMouseClicked(GuiContainer gui, int mousex, int mousey, int button) {
-    }
+    public void onMouseClicked(GuiContainer gui, int mousex, int mousey, int button) {}
 
     @Override
-    public void onMouseDragged(GuiContainer gui, int mousex, int mousey, int button, long heldTime) {
-    }
+    public void onMouseDragged(GuiContainer gui, int mousex, int mousey, int button, long heldTime) {}
 
     @Override
-    public void onMouseScrolled(GuiContainer gui, int mousex, int mousey, int scrolled) {
-    }
+    public void onMouseScrolled(GuiContainer gui, int mousex, int mousey, int scrolled) {}
 
     @Override
-    public void onMouseUp(GuiContainer gui, int mousex, int mousey, int button) {
-    }
+    public void onMouseUp(GuiContainer gui, int mousex, int mousey, int button) {}
 
     public static boolean canUseDeleteMode() {
         return !(NEIClientUtils.getGuiContainer() instanceof GuiContainerCreative);
     }
 
     public static void toggleDeleteMode() {
-        if(canUseDeleteMode())
-            deleteMode = !deleteMode;
+        if (canUseDeleteMode()) deleteMode = !deleteMode;
     }
 
     public static boolean getDeleteMode() {

src/main/java/codechicken/nei/NEICreativeGuiHandler.java

@@ -5,18 +5,14 @@ import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.client.gui.inventory.GuiContainerCreative;
 import net.minecraft.creativetab.CreativeTabs;
 
-public class NEICreativeGuiHandler extends INEIGuiAdapter
-{
+public class NEICreativeGuiHandler extends INEIGuiAdapter {
     @Override
-    public VisiblityData modifyVisiblity(GuiContainer gui, VisiblityData currentVisibility)
-    {
-        if(!(gui instanceof GuiContainerCreative))
-            return currentVisibility;
-        
-        if(((GuiContainerCreative)gui).func_147056_g() != CreativeTabs.tabInventory.getTabIndex())
+    public VisiblityData modifyVisiblity(GuiContainer gui, VisiblityData currentVisibility) {
+        if (!(gui instanceof GuiContainerCreative)) return currentVisibility;
+
+        if (((GuiContainerCreative) gui).func_147056_g() != CreativeTabs.tabInventory.getTabIndex())
             currentVisibility.showItemSection = currentVisibility.enableDeleteMode = false;
 
         return currentVisibility;
     }
-
 }