Add controller for many-to-many fusion reactor.

.git-blame-ignore-revs

@@ -1,2 +0,0 @@
-# Ignore spotlessApply reformat
-f106b5e7665df6341ae8539f74dc391a7efc98b1

.gitattributes

@@ -1,44 +0,0 @@
-* text eol=lf
-
-*.[jJ][aA][rR]          binary
-
-*.[pP][nN][gG]          binary
-*.[jJ][pP][gG]          binary
-*.[jJ][pP][eE][gG]      binary
-*.[gG][iI][fF]          binary
-*.[tT][iI][fF]          binary
-*.[tT][iI][fF][fF]      binary
-*.[iI][cC][oO]          binary
-*.[sS][vV][gG]          text
-*.[eE][pP][sS]          binary
-*.[xX][cC][fF]          binary
-
-*.[kK][aA][rR]          binary
-*.[mM]4[aA]             binary
-*.[mM][iI][dD]          binary
-*.[mM][iI][dD][iI]      binary
-*.[mM][pP]3             binary
-*.[oO][gG][gG]          binary
-*.[rR][aA]              binary
-
-*.7[zZ]                 binary
-*.[gG][zZ]              binary
-*.[tT][aA][rR]          binary
-*.[tT][gG][zZ]          binary
-*.[zZ][iI][pP]          binary
-
-*.[tT][cC][nN]          binary
-*.[sS][oO]              binary
-*.[dD][lL][lL]          binary
-*.[dD][yY][lL][iI][bB]  binary
-*.[pP][sS][dD]          binary
-*.[tT][tT][fF]          binary
-*.[oO][tT][fF]          binary
-
-*.[pP][aA][tT][cC][hH]  -text
-
-*.[bB][aA][tT]          text eol=crlf
-*.[cC][mM][dD]          text eol=crlf
-*.[pP][sS]1             text eol=crlf
-
-*[aA][uU][tT][oO][gG][eE][nN][eE][rR][aA][tT][eE][dD]* binary

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

@@ -1,62 +0,0 @@
-name: Report Bug
-description: "Report a bug."
-body:
-  - type: markdown
-    attributes:
-      value: "A bug/crash report with sufficient information and logs to reproduce and track down."
-  - type: input
-    id: discord
-    attributes:
-      label: Your GTNH Discord Username
-      description: Leave empty if you don't have one, but this will make it harder to contact you if we need additional info.
-      placeholder: "Example: Fake#1234"
-  - type: input
-    id: version
-    attributes:
-      label: Mod Version
-      description: "What version of the Mod are you using?"
-      placeholder: "Example: 1.0.0"
-    validations:
-      required: true
-  - type: textarea
-    id: report
-    attributes:
-      label: Bug Report
-      description: "Relevant information, as well as relevant logs attached such as `logs/fml-client-latest.log."
-      placeholder: "Example: https://mclo.gs/ OR submit the file to github by dragging it to this textbox."
-    validations:
-      required: true
-  - type: dropdown
-    id: java
-    attributes:
-      label: Java Version
-      description: What Java version are you using? It's worth mentioning that if you play on Java9+ you should try update to latest minor release (e.g. prefer Java 17.0.6 over 17.0.2) of that version.
-      options:
-        - Java 8
-        - Java 9
-        - Java 11
-        - Java 17
-        - Java 19
-        - Java 20
-        - Java 21
-        - Other (Please Specify)
-    validations:
-      required: true
-  - type: textarea
-    id: modlist
-    attributes:
-      label: Mod List or GTNH Pack Version
-      description: "List of mods, ideally a minimal reproducible set (can be retrieved from latest.log).  If using GTNH please indicate pack version and any changed mods, not the entire modlist."
-      placeholder: "List of mods or GTNH Pack version goes here"
-    validations:
-      required: true
-  - type: checkboxes
-    id: final
-    attributes:
-      label: Final Checklist
-      description: Certify that you read things
-      options:
-        - label: "I have searched the issues and haven't found a similar issue."
-          required: true
-
-

.github/ISSUE_TEMPLATE/001-request-feature.yml

@@ -1,28 +0,0 @@
-name: Feature Request
-description: "Request a feature."
-body:
-  - type: markdown
-    attributes:
-      value: "Please use this form to request features. We ask you check if it was already requested though"
-  - type: input
-    id: discord
-    attributes:
-      label: Your GTNH Discord Username
-      description: Leave empty if you don't have one, but this will make it harder to contact you if we need additional info.
-      placeholder: "Example: Wumpus#1234"
-  - type: textarea
-    id: request
-    attributes:
-      label: Feature Request
-      description: "Relevant information, as well as relevant images"
-      placeholder: "Example: https://mclo.gs/ OR submit the file to github by dragging it to this textbox."
-    validations:
-      required: true
-  - type: checkboxes
-    id: final
-    attributes:
-      label: Final Checklist
-      description: Certify that you read things
-      options:
-        - label: "I have searched the issues and haven't found a similar issue."
-          required: true

.github/scripts/test-no-crash-reports.sh

@@ -0,0 +1,9 @@
+directory="run/crash-reports"
+if [ -d $directory ]; then
+  echo "Crash reports detected:"
+  cat $directory/*
+  exit 1
+else
+  echo "No crash reports detected"
+  exit 0
+fi

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

@@ -1,3 +1,5 @@
+# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
 
 name: Build and test
 
@@ -9,5 +11,35 @@ on:
 
 jobs:
   build-and-test:
-    uses: GTNewHorizons/GTNH-Actions-Workflows/.github/workflows/build-and-test.yml@master
-    secrets: inherit
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+      with: 
+        fetch-depth: 0
+    
+    - name: Set up JDK 8
+      uses: actions/setup-java@v2
+      with:
+        java-version: '8'
+        distribution: 'adopt'
+        cache: gradle
+        
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+
+    - name: Setup the workspace
+      run: ./gradlew setupCIWorkspace
+    
+    - name: Build the mod
+      run: ./gradlew build
+
+    - name: Run server for 1 minute
+      run: |
+        mkdir run
+        echo "eula=true" > run/eula.txt  
+        timeout 10 ./gradlew runServer || true
+
+    - name: Test no crashes happend
+      run: |
+        chmod +x .github/scripts/test-no-crash-reports.sh
+        .github/scripts/test-no-crash-reports.sh

.github/workflows/release-tags.yml

@@ -1,14 +1,51 @@
+# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
 
 name: Release tagged build
 
 on:
   push:
-    tags: [ '*' ]
-
-permissions:
-  contents: write
+    tags:
+      - '*'
 
 jobs:
-  release-tags:
-    uses: GTNewHorizons/GTNH-Actions-Workflows/.github/workflows/release-tags.yml@master
-    secrets: inherit
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Set release version
+        run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
+
+      - name: Set up JDK 8
+        uses: actions/setup-java@v2
+        with:
+          java-version: '8'
+          distribution: 'adopt'
+          cache: gradle
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+
+      - name: Setup the workspace
+        run: ./gradlew setupCIWorkspace
+
+      - name: Build the mod
+        run: ./gradlew build
+
+      - name: Release under current tag
+        uses: "marvinpinto/action-automatic-releases@latest"
+        with:
+          repo_token: "${{ secrets.GITHUB_TOKEN }}"
+          automatic_release_tag: "${{ env.RELEASE_VERSION }}"
+          prerelease: false
+          title: "${{ env.RELEASE_VERSION }}"
+          files: build/libs/*.jar
+
+      - name: Publish to Maven
+        run: ./gradlew publish
+        env:
+          MAVEN_USER: ${{ secrets.MAVEN_USER }}
+          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}

.gitignore

@@ -1,7 +1,6 @@
 .gradle
 .settings
 /.idea/
-/.vscode/
 /run/
 /build/
 /eclipse/
@@ -26,13 +25,5 @@ whitelist.json
 *.iml
 *.ipr
 *.iws
-src/main/resources/mixins.*([!.]).json
+src/main/resources/mixins.*.json
 *.bat
-*.DS_Store
-!gradlew.bat
-.factorypath
-addon.local.gradle
-addon.local.gradle.kts
-addon.late.local.gradle
-addon.late.local.gradle.kts
-layout.json

README.md

@@ -1,6 +1,6 @@
 # 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
+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.
 
@@ -8,18 +8,18 @@ If you have issues with NEI outside of the GTNH modpack you may report them in t
 
 ## New Features:
 
-* Speed
+* 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
+  - Loads the recipe handlers in parallel 
 * A textbox for search with most of the features you'd expect - moving forward, backwards, selection, etc
-* Bookmarks! Are you in the process of crafting? Bookmark it using either 'A' or configure your own key.
+* 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.
+* 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
+* 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:
@@ -29,7 +29,7 @@ If you have issues with NEI outside of the GTNH modpack you may report them in t
 
 ## License
 
-GTNH Modifications Copyright (c) 2019-2024 mitchej123 and the GTNH Team
+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
 

build.gradle

@@ -1,5 +1,748 @@
-//version: 1707058017
+//version: 1652851397
+/*
+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.util.concurrent.TimeUnit
+
+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 'com.gtnewhorizons.gtnhconvention'
+    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
+}
+
+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
+    }
+}
+
+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 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'
+}
+
+// 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 = 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/" + String.valueOf(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 fileName) {
+    String cacheDir = System.getProperty("user.home") + "/.gradle/caches/"
+    String bon2Dir = cacheDir + "forge_gradle/deobf"
+    String bon2File  = bon2Dir + "/BON2-2.5.0.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)
+    }
+
+    download.run {
+        src 'https://github.com/GTNewHorizons/BON2/releases/download/2.5.0/BON2-2.5.0.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', '1.7.10', '--mappingsVer', 'stable_12', '--notch'
+        workingDir bon2Dir
+        standardOutput = new ByteArrayOutputStream()
+    }
+
+    return files(deobfFile)
+}
+
+// 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)
 }

dependencies.gradle

@@ -1,10 +1,7 @@
 // Add your dependencies here
 
 dependencies {
-    api('com.github.GTNewHorizons:CodeChickenCore:1.4.3:dev')
-    implementation('com.github.GTNewHorizons:GTNHLib:0.6.36:dev')
-
-    shadowImplementation('org.apache.commons:commons-csv:1.10.0')
-
-    compileOnly 'maven.modrinth:forge-essentials:7.5.1'
+    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')
 }

gradle.properties

@@ -1,203 +1,60 @@
-# ExampleMod tag to use as Blowdryer (Spotless, etc.) settings version, leave empty to disable.
-# LOCAL to test local config updates.
-gtnh.settings.blowdryerTag = 0.2.0
-
-# Human-readable mod name, available for mcmod.info population.
 modName = NotEnoughItems
 
-# Case-sensitive identifier string, available for mcmod.info population and used for automatic mixin JSON generation.
-# Conventionally lowercase.
+# This is a case-sensitive string to identify your mod. Convention is to use lower case.
 modId = NotEnoughItems
 
-# Root package of the mod, used to find various classes in other properties,
-# mcmod.info substitution, enabling assertions in run tasks, etc.
 modGroup = codechicken.nei
 
-# Whether to use modGroup as the maven publishing group.
-# When false, com.github.GTNewHorizons is used.
-useModGroupForPublishing = false
+# 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/
 
-# Updates your build.gradle and settings.gradle automatically whenever an update is available.
+# Will update your build.gradle automatically whenever an update is available
 autoUpdateBuildScript = false
 
-# Version of Minecraft to target
 minecraftVersion = 1.7.10
-
-# Version of Minecraft Forge to target
 forgeVersion = 10.13.4.1614
 
-# Specify an MCP channel for dependency deobfuscation and the deobfParams task.
-channel = stable
-
-# Specify an MCP mappings version for dependency deobfuscation and the deobfParams task.
-mappingsVersion = 12
-
-# Defines other MCP mappings for dependency deobfuscation.
-remoteMappings = https\://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/
-
-# Select a default username for testing your mod. You can always override this per-run by running
-# `./gradlew runClient --username=AnotherPlayer`, or configuring this command in your IDE.
+# 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
 
-# Enables using modern Java syntax (up to version 17) via Jabel, while still targeting JVM 8.
-# See https://github.com/bsideup/jabel for details on how this works.
-enableModernJavaSyntax = true
-
-# Enables injecting missing generics into the decompiled source code for a better coding experience.
-# Turns most publicly visible List, Map, etc. into proper List<E>, Map<K, V> types.
-enableGenericInjection = true
-
-# Generate a class with a String field for the mod version named as defined below.
-# If generateGradleTokenClass is empty or not missing, no such class will be generated.
-# If gradleTokenVersion is empty or missing, the field will not be present in the class.
-generateGradleTokenClass = codechicken.nei.Tags
-
-# Name of the token containing the project's current version to generate/replace.
-gradleTokenVersion = VERSION
-
-# [DEPRECATED] Mod ID replacement token.
-gradleTokenModId =
-
-# [DEPRECATED] Mod name replacement token.
-gradleTokenModName =
-
-# [DEPRECATED] Mod Group replacement token.
-gradleTokenGroupName =
-
-# [DEPRECATED]
-# Multiple source files can be defined here by providing a comma-separated list: Class1.java,Class2.java,Class3.java
+# 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 =
+# 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
+# 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/
-# There can be multiple files in a space-separated list.
-# Example value: mymodid_at.cfg nei_at.cfg
+# 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
-
-# Set to a non-empty string to configure mixins in a separate source set under src/VALUE, instead of src/main.
-# This can speed up compile times thanks to not running the mixin annotation processor on all input sources.
-# Mixin classes will have access to "main" classes, but not the other way around.
-separateMixinSourceSet =
-
-# Adds some debug arguments like verbose output and class export.
-usesMixinDebug = false
-
-# Specify the location of your implementation of IMixinConfigPlugin. Leave it empty otherwise.
+# 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
+# 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
 
-# Enables Mixins even if this mod doesn't use them, useful if one of the dependencies uses mixins.
-forceEnableMixins = false
-
-# If enabled, you may use 'shadowCompile' for dependencies. They will be integrated into your jar. It is your
-# responsibility to check the license and request permission for distribution if required.
+# 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
-
-# If disabled, won't remove unused classes from shadowed dependencies. Some libraries use reflection to access
-# their own classes, making the minimization unreliable.
-minimizeShadowedDependencies = true
-
-# If disabled, won't rename the shadowed classes.
-relocateShadowedDependencies = true
-
-# Adds CurseMaven, Modrinth, and some more well-known 1.7.10 repositories.
-includeWellKnownRepositories = true
-
-# A list of repositories to exclude from the includeWellKnownRepositories setting. Should be a space separated
-# list of strings, with the acceptable keys being(case does not matter):
-# cursemaven
-# modrinth
-excludeWellKnownRepositories =
-
-# Change these to your Maven coordinates if you want to publish to a custom Maven repository instead of the default GTNH Maven.
-# Authenticate with the MAVEN_USER and MAVEN_PASSWORD environment variables.
-# If you need a more complex setup disable maven publishing here and add a publishing repository to addon.gradle.
-usesMavenPublishing = true
-
-# Maven repository to publish the mod to.
-# mavenPublishUrl = https\://nexus.gtnewhorizons.com/repository/releases/
-
-# Publishing to Modrinth requires you to set the MODRINTH_TOKEN environment variable to your current Modrinth API token.
-#
-# The project's ID on Modrinth. Can be either the slug or the ID.
-# Leave this empty if you don't want to publish to Modrinth.
-modrinthProjectId = notenoughitems-unofficial
-
-# The project's relations on Modrinth. You can use this to refer to other projects on Modrinth.
-# Syntax: scope1-type1:name1;scope2-type2:name2;...
-# Where scope can be one of [required, optional, incompatible, embedded],
-#       type can be one of [project, version],
-#       and the name is the Modrinth project or version slug/id of the other mod.
-# Example: required-project:fplib;optional-project:gasstation;incompatible-project:gregtech
-# Note: GTNH Mixins is automatically set as a required dependency if usesMixins = true
-modrinthRelations = required-project\:codechickencore-unofficial
-
-# Publishing to CurseForge requires you to set the CURSEFORGE_TOKEN environment variable to one of your CurseForge API tokens.
-#
-# The project's numeric ID on CurseForge. You can find this in the About Project box.
-# Leave this empty if you don't want to publish on CurseForge.
-curseForgeProjectId = 358228
-
-# The project's relations on CurseForge. You can use this to refer to other projects on CurseForge.
-# Syntax: type1:name1;type2:name2;...
-# Where type can be one of [requiredDependency, embeddedLibrary, optionalDependency, tool, incompatible],
-#       and the name is the CurseForge project slug of the other mod.
-# Example: requiredDependency:railcraft;embeddedLibrary:cofhlib;incompatible:buildcraft
-# Note: UniMixins is automatically set as a required dependency if usesMixins = true.
-curseForgeRelations = requiredDependency\:codechickencore-unofficial
-
-# Optional parameter to customize the produced artifacts. Use this to preserve artifact naming when migrating older
-# projects. New projects should not use this parameter.
-# customArchiveBaseName =
-
-# Optional parameter to have the build automatically fail if an illegal version is used.
-# This can be useful if you e.g. only want to allow versions in the form of '1.1.xxx'.
-# The check is ONLY performed if the version is a git tag.
-# Note: the specified string must be escaped, so e.g. 1\\.1\\.\\d+ instead of 1\.1\.\d+
-# versionPattern =
-
-# Uncomment to prevent the source code from being published.
-# noPublishedSources = true
-
-# Uncomment this to disable Spotless checks.
-# This should only be uncommented to keep it easier to sync with upstream/other forks.
-# That is, if there is no other active fork/upstream, NEVER change this.
-# disableSpotless = true
-
-# Uncomment this to disable Checkstyle checks (currently wildcard import check).
-# disableCheckstyle = true
-
-# Override the IDEA build type. Valid values are: "" (leave blank, do not override), "idea" (force use native IDEA build), "gradle"
-# (force use delegated build).
-# This is meant to be set in $HOME/.gradle/gradle.properties.
-# e.g. add "systemProp.org.gradle.project.ideaOverrideBuildType=idea" will override the build type to be native build.
-# WARNING: If you do use this option, it will overwrite whatever you have in your existing projects. This might not be what you want!
-# Usually there is no need to uncomment this here as other developers do not necessarily use the same build type as you.
-# ideaOverrideBuildType = idea
-
-# Whether IDEA should run spotless checks when pressing the Build button.
-# This is meant to be set in $HOME/.gradle/gradle.properties.
-# ideaCheckSpotlessOnBuild = true
-

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/usr/bin/env sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# 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.
@@ -15,115 +15,80 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# SPDX-License-Identifier: Apache-2.0
-#
 
 ##############################################################################
-#
-#   Gradle start up script for POSIX generated by Gradle.
-#
-#   Important for running:
-#
-#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
-#       noncompliant, but you have some other compliant shell such as ksh or
-#       bash, then to run this script, type that shell name before the whole
-#       command line, like:
-#
-#           ksh Gradle
-#
-#       Busybox and similar reduced shells will NOT work, because this script
-#       requires all of these POSIX shell features:
-#         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
-#
-#   Important for patching:
-#
-#   (2) This script targets any POSIX shell, so it avoids extensions provided
-#       by Bash, Ksh, etc; in particular arrays are avoided.
-#
-#       The "traditional" practice of packing multiple parameters into a
-#       space-separated string is a well documented source of bugs and security
-#       problems, so this is (mostly) avoided, by progressively accumulating
-#       options in "$@", and eventually passing that to Java.
-#
-#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
-#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
-#       see the in-line comments for details.
-#
-#       There are tweaks for specific operating systems such as AIX, CygWin,
-#       Darwin, MinGW, and NonStop.
-#
-#   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
-#       within the Gradle project.
-#
-#       You can find Gradle at https://github.com/gradle/gradle/.
-#
+##
+##  Gradle start up script for UN*X
+##
 ##############################################################################
 
 # Attempt to set APP_HOME
-
 # Resolve links: $0 may be a link
-app_path=$0
-
-# Need this for daisy-chained symlinks.
-while
-    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
-    [ -h "$app_path" ]
-do
-    ls=$( ls -ld "$app_path" )
-    link=${ls#*' -> '}
-    case $link in             #(
-      /*)   app_path=$link ;; #(
-      *)    app_path=$APP_HOME$link ;;
-    esac
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
 done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
-# This is normally unused
-# shellcheck disable=SC2034
-APP_BASE_NAME=${0##*/}
-# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
+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='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD=maximum
+MAX_FD="maximum"
 
 warn () {
     echo "$*"
-} >&2
+}
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-} >&2
+}
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "$( uname )" in                #(
-  CYGWIN* )         cygwin=true  ;; #(
-  Darwin* )         darwin=true  ;; #(
-  MSYS* | MINGW* )  msys=true    ;; #(
-  NONSTOP* )        nonstop=true ;;
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
-
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD=$JAVA_HOME/jre/sh/java
+        JAVACMD="$JAVA_HOME/jre/sh/java"
     else
-        JAVACMD=$JAVA_HOME/bin/java
+        JAVACMD="$JAVA_HOME/bin/java"
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -132,120 +97,92 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD=java
-    if ! command -v java >/dev/null 2>&1
-    then
-        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
-    fi
 fi
 
 # Increase the maximum file descriptors if we can.
-if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    case $MAX_FD in #(
-      max*)
-        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
-        MAX_FD=$( ulimit -H -n ) ||
-            warn "Could not query maximum file descriptor limit"
-    esac
-    case $MAX_FD in  #(
-      '' | soft) :;; #(
-      *)
-        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
-        ulimit -n "$MAX_FD" ||
-            warn "Could not set maximum file descriptor limit to $MAX_FD"
-    esac
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
 fi
 
-# Collect all arguments for the java command, stacking in reverse order:
-#   * args from the command line
-#   * the main class name
-#   * -classpath
-#   * -D...appname settings
-#   * --module-path (only if needed)
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
 
 # For Cygwin or MSYS, switch paths to Windows format before running java
-if "$cygwin" || "$msys" ; then
-    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
-    JAVACMD=$( cygpath --unix "$JAVACMD" )
-
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    for arg do
-        if
-            case $arg in                                #(
-              -*)   false ;;                            # don't mess with options #(
-              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
-                    [ -e "$t" ] ;;                      #(
-              *)    false ;;
-            esac
-        then
-            arg=$( cygpath --path --ignore --mixed "$arg" )
-        fi
-        # Roll the args list around exactly as many times as the number of
-        # args, so each arg winds up back in the position where it started, but
-        # possibly modified.
-        #
-        # NB: a `for` loop captures its iteration list before it begins, so
-        # changing the positional parameters here affects neither the number of
-        # iterations, nor the values presented in `arg`.
-        shift                   # remove old arg
-        set -- "$@" "$arg"      # push replacement arg
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
     done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
 fi
 
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
-#     and any embedded shellness will be escaped.
-#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
-#     treated as '${Hostname}' itself on the command line.
-
-set -- \
-        "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
-        "$@"
-
-# Stop when "xargs" is not available.
-if ! command -v xargs >/dev/null 2>&1
-then
-    die "xargs is not available"
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
 fi
 
-# Use "xargs" to parse quoted args.
-#
-# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
-#
-# In Bash we could simply go:
-#
-#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
-#   set -- "${ARGS[@]}" "$@"
-#
-# but POSIX shell has neither arrays nor command substitution, so instead we
-# post-process each arg (as a line of input to sed) to backslash-escape any
-# character that might be a shell metacharacter, then use eval to reverse
-# that process (while maintaining the separation between arguments), and wrap
-# the whole thing up as a single "set" statement.
-#
-# This will of course break if any of these variables contains a newline or
-# an unmatched quote.
-#
-
-eval "set -- $(
-        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
-        xargs -n1 |
-        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
-        tr '\n' ' '
-    )" '"$@"'
-
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -13,10 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
-@rem SPDX-License-Identifier: Apache-2.0
-@rem
 
-@if "%DEBUG%"=="" @echo off
+@if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -27,14 +25,10 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%"=="" set DIRNAME=.
-@rem This is normally unused
+if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
 @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"
 
@@ -43,13 +37,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if %ERRORLEVEL% equ 0 goto execute
+if "%ERRORLEVEL%" == "0" goto init
 
-echo. 1>&2
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
+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
 
@@ -57,36 +51,48 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto execute
+if exist "%JAVA_EXE%" goto init
 
-echo. 1>&2
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
+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 %*
+"%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% equ 0 goto mainEnd
+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!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

repositories.gradle

@@ -1,8 +1,18 @@
 // Add any additional repositiroes for your dependencies here
 
 repositories {
+    mavenCentral()
     maven {
-        name = "Modrinth"
-        url = "https://api.modrinth.com/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'
     }
 }

settings.gradle

@@ -1,26 +0,0 @@
-
-pluginManagement {
-    repositories {
-        maven {
-            // RetroFuturaGradle
-            name "GTNH Maven"
-            url "https://nexus.gtnewhorizons.com/repository/public/"
-            mavenContent {
-                includeGroup("com.gtnewhorizons")
-                includeGroupByRegex("com\\.gtnewhorizons\\..+")
-            }
-        }
-        gradlePluginPortal()
-        mavenCentral()
-        mavenLocal()
-    }
-}
-
-plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.38'
-}
-
-
-
-rootProject.name = "NotEnoughItems"
-

src/main/java/codechicken/nei/AutoFocusWidget.java

@@ -1,125 +0,0 @@
-package codechicken.nei;
-
-import static codechicken.lib.gui.GuiDraw.getMousePosition;
-
-import java.awt.Point;
-import java.util.ArrayList;
-import java.util.List;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.client.settings.GameSettings;
-
-import org.lwjgl.input.Keyboard;
-
-import codechicken.nei.guihook.GuiContainerManager;
-import codechicken.nei.guihook.IContainerInputHandler;
-
-public class AutoFocusWidget implements IContainerInputHandler {
-
-    /**
-     * Implement this interface on a GuiContainer to enable the autofocus search in NEI (if the autofocus option is
-     * enabled) without needing to add the classname to the config file .
-     */
-    public interface INEIAutoFocusSearchEnable {
-    }
-
-    public static AutoFocusWidget instance = new AutoFocusWidget();
-
-    public static List<String> enableAutoFocusPrefixes = new ArrayList<>();
-
-    protected boolean autofocus = false;
-    protected Point mouse;
-
-    public AutoFocusWidget() {
-        GuiContainerManager.addInputHandler(this);
-    }
-
-    public void load(GuiContainer gui) {
-        this.autofocus = LayoutManager.searchField.isVisible() && NEIClientConfig.searchWidgetAutofocus() != 0
-                && isAllowedGuiAutoSearchFocus(gui);
-        this.mouse = getMousePosition();
-    }
-
-    @Override
-    public boolean keyTyped(GuiContainer gui, char keyChar, int keyCode) {
-
-        if (this.autofocus) {
-            this.autofocus = false;
-
-            if (!this.mouse.equals(getMousePosition())) {
-                return false;
-            }
-
-            if (NEIClientConfig.searchWidgetAutofocus() == 2
-                    && GameSettings.isKeyDown(Minecraft.getMinecraft().gameSettings.keyBindInventory)) {
-                return false;
-            }
-
-            if (keyCode == Keyboard.KEY_RETURN || keyCode == Keyboard.KEY_NUMPADENTER
-                    || keyCode == Keyboard.KEY_ESCAPE) {
-                return false;
-            }
-
-            LayoutManager.searchField.setFocus(true);
-            LayoutManager.searchField.handleKeyPress(keyCode, keyChar);
-            return true;
-        }
-
-        return false;
-    }
-
-    @Override
-    public boolean lastKeyTyped(GuiContainer gui, char keyChar, int keyID) {
-        return false;
-    }
-
-    @Override
-    public boolean mouseClicked(GuiContainer gui, int mousex, int mousey, int button) {
-        this.autofocus = false;
-        return false;
-    }
-
-    @Override
-    public boolean mouseScrolled(GuiContainer gui, int mousex, int mousey, int scrolled) {
-        this.autofocus = false;
-        return false;
-    }
-
-    @Override
-    public void onKeyTyped(GuiContainer gui, char keyChar, int keyID) {}
-
-    @Override
-    public void onMouseClicked(GuiContainer gui, int mousex, int mousey, int button) {
-        this.autofocus = false;
-    }
-
-    @Override
-    public void onMouseDragged(GuiContainer gui, int mousex, int mousey, int button, long heldTime) {
-        this.autofocus = false;
-    }
-
-    @Override
-    public void onMouseScrolled(GuiContainer gui, int mousex, int mousey, int scrolled) {
-        this.autofocus = false;
-    }
-
-    @Override
-    public void onMouseUp(GuiContainer gui, int mousex, int mousey, int button) {
-        this.autofocus = false;
-    }
-
-    protected boolean isAllowedGuiAutoSearchFocus(GuiContainer gui) {
-        if (gui instanceof INEIAutoFocusSearchEnable) {
-            return true;
-        }
-        String guiClassName = gui.getClass().getName();
-        for (String prefix : enableAutoFocusPrefixes) {
-            if (guiClassName.startsWith(prefix)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-}

src/main/java/codechicken/nei/BookmarkContainerInfo.java

@@ -1,34 +0,0 @@
-package codechicken.nei;
-
-import java.util.HashMap;
-
-import net.minecraft.client.gui.inventory.GuiChest;
-import net.minecraft.client.gui.inventory.GuiContainer;
-
-import codechicken.nei.api.API;
-import codechicken.nei.api.IBookmarkContainerHandler;
-
-public class BookmarkContainerInfo {
-
-    private static final HashMap<Class<? extends GuiContainer>, IBookmarkContainerHandler> handlerMap = new HashMap<>();
-
-    public static void registerBookmarkContainerHandler(Class<? extends GuiContainer> classz,
-            IBookmarkContainerHandler handler) {
-        handlerMap.put(classz, handler);
-    }
-
-    public static boolean hasBookmarkContainerHandler(Class<? extends GuiContainer> classz) {
-        return handlerMap.containsKey(classz);
-    }
-
-    public static IBookmarkContainerHandler getBookmarkContainerHandler(GuiContainer gui) {
-        if (gui != null) {
-            return handlerMap.get(gui.getClass());
-        }
-        return null;
-    }
-
-    public static void load() {
-        API.registerBookmarkContainerHandler(GuiChest.class, new DefaultBookmarkContainerHandler());
-    }
-}

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

@@ -1,11 +1,11 @@
 package codechicken.nei;
 
-import static codechicken.lib.gui.GuiDraw.getStringWidth;
-
 import java.util.List;
 
-public abstract class Button extends Widget {
+import static codechicken.lib.gui.GuiDraw.getStringWidth;
 
+public abstract class Button extends Widget
+{
     public Button(String s) {
         label = s;
     }
@@ -25,7 +25,9 @@ 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;
     }
 
@@ -37,21 +39,23 @@ 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);
-
+        if (tip != null)
+            tooltip.add(tip);
+        
         addTooltips(tooltip);
-
+        
         return tooltip;
     }
 
     public String getButtonTip() {
         return null;
     }
-
-    public void addTooltips(List<String> tooltip) {}
+    
+    public void addTooltips(List<String> tooltip) {} 
 
     public String getRenderLabel() {
         return label;
@@ -61,7 +65,10 @@ public abstract class Button extends Widget {
     public Image icon;
 
     /**
-     * 0x4 = state flag, as opposed to 1 click 0 = normal 1 = on 2 = disabled
+     * 0x4 = state flag, as opposed to 1 click
+     * 0 = normal
+     * 1 = on
+     * 2 = disabled
      */
     public int state;
 }

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

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

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

@@ -1,66 +1,85 @@
 package codechicken.nei;
 
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.function.BiConsumer;
-import java.util.function.Consumer;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
+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 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.launchwrapper.Launch;
 import net.minecraft.world.World;
-import net.minecraftforge.client.event.GuiOpenEvent;
 import net.minecraftforge.client.event.RenderWorldLastEvent;
 import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.event.world.WorldEvent;
-
+import org.apache.commons.csv.CSVFormat;
+import org.apache.commons.csv.CSVParser;
+import org.apache.commons.csv.CSVRecord;
 import org.apache.commons.io.IOUtils;
 
-import com.google.common.collect.Lists;
-
-import codechicken.core.ClassDiscoverer;
-import codechicken.core.ClientUtils;
-import codechicken.core.GuiModListScroll;
-import codechicken.lib.packet.PacketCustom;
-import codechicken.nei.api.API;
-import codechicken.nei.api.IConfigureNEI;
-import codechicken.nei.api.ItemInfo;
-import codechicken.nei.guihook.GuiContainerManager;
-import codechicken.nei.recipe.GuiRecipeTab;
-import codechicken.nei.recipe.StackInfo;
-import cpw.mods.fml.client.CustomModLoadingErrorDisplayException;
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.Loader;
-import cpw.mods.fml.common.ModClassLoader;
-import cpw.mods.fml.common.discovery.ASMDataTable;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import cpw.mods.fml.common.gameevent.TickEvent;
-import cpw.mods.fml.common.gameevent.TickEvent.Phase;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-public class ClientHandler {
+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;
 
+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 final ArrayList<EntityItem> SMPmagneticItems = new ArrayList<>();
+
+    private ArrayList<EntityItem> SMPmagneticItems = new ArrayList<>();
     private World lastworld;
+    private GuiScreen lastGui;
 
     public void addSMPMagneticItem(int i, World world) {
         WorldClient cworld = (WorldClient) world;
@@ -85,11 +104,9 @@ public class ClientHandler {
         if (world.isRemote) {
             items = SMPmagneticItems;
         } else {
-            items = world.getEntitiesWithinAABB(
-                    EntityItem.class,
-                    player.boundingBox.expand(distancexz, distancey, distancexz));
+            items = world.getEntitiesWithinAABB(EntityItem.class, player.boundingBox.expand(distancexz, distancey, distancexz));
         }
-        for (Iterator<EntityItem> iterator = items.iterator(); iterator.hasNext();) {
+        for (Iterator<EntityItem> iterator = items.iterator(); iterator.hasNext(); ) {
             EntityItem item = iterator.next();
 
             if (item.delayBeforeCanPickup > 0) continue;
@@ -143,79 +160,53 @@ public class ClientHandler {
 
     public static void preInit() {
         loadSerialHandlers();
-        loadHiddenItems();
         loadHeightHackHandlers();
-        loadHiddenHandlers();
-        loadEnableAutoFocus();
         ItemInfo.preInit();
         StackInfo.loadGuidFilters();
     }
-
-    public static void loadSettingsFile(String resource, Consumer<Stream<String>> callback) {
-        loadSettingsFile(resource, (file, writer) -> {
-            String folder = resource.substring(resource.lastIndexOf(".") + 1);
-            URL defaultResource = ClientHandler.class.getResource("/assets/nei/" + folder + "/" + resource);
-
-            if (defaultResource != null) {
-                try {
-                    IOUtils.copy(defaultResource.openStream(), writer);
-                } catch (IOException e) {}
+    
+    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);
             }
-        }, callback);
+        }
+        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 loadSettingsFile(String resource, BiConsumer<File, FileWriter> createDefault,
-            Consumer<Stream<String>> callback) {
-        File file = new File(NEIClientConfig.configDir, resource);
-
+    public static void loadHeightHackHandlers() {
+        File file = NEIClientConfig.heightHackHandlersFile;
         if (!file.exists()) {
             try (FileWriter writer = new FileWriter(file)) {
-                NEIClientConfig.logger.info("Creating default '{}' {}", resource, file);
-                createDefault.accept(file, writer);
+                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 '{}' to file {}", resource, file, 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 '{}' file {}", resource, file);
-            callback.accept(
-                    IOUtils.readLines(reader).stream().filter(line -> !line.startsWith("#") && !line.trim().isEmpty()));
+            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 '{}' file {}", resource, file, e);
+            NEIClientConfig.logger.error("Failed to load height hack handlers from file {}", file, e);
         }
     }
 
-    public static void loadSerialHandlers() {
-        loadSettingsFile(
-                "serialhandlers.cfg",
-                lines -> NEIClientConfig.serialHandlers = lines.collect(Collectors.toCollection(HashSet::new)));
-    }
-
-    public static void loadHeightHackHandlers() {
-        loadSettingsFile(
-                "heighthackhandlers.cfg",
-                lines -> NEIClientConfig.heightHackHandlerRegex = lines.map(Pattern::compile)
-                        .collect(Collectors.toCollection(HashSet::new)));
-    }
-
-    public static void loadHiddenHandlers() {
-        loadSettingsFile(
-                "hiddenhandlers.cfg",
-                lines -> NEIClientConfig.hiddenHandlers = lines.collect(Collectors.toCollection(HashSet::new)));
-    }
-
-    public static void loadEnableAutoFocus() {
-        loadSettingsFile(
-                "enableautofocus.cfg",
-                lines -> AutoFocusWidget.enableAutoFocusPrefixes = lines
-                        .collect(Collectors.toCollection(ArrayList::new)));
-    }
-
-    public static void loadHiddenItems() {
-        loadSettingsFile("hiddenitems.cfg", lines -> lines.forEach(API::hideItem));
-    }
-
     public static void load() {
         instance = new ClientHandler();
 
@@ -230,131 +221,121 @@ public class ClientHandler {
     }
 
     public static void postInit() {
-        GuiContainerManager.registerReloadResourceListener();
+        loadHandlerOrdering();
     }
 
     public static void loadHandlerOrdering() {
-        final String COMMA_DELIMITER = ",";
-        final 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.", };
+        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)));
 
-        loadSettingsFile("handlerordering.csv", (file, writer) -> {
-            List<String> toWrite = Lists.newArrayList(defaultHandlerOrdering);
-            GuiRecipeTab.handlerMap.keySet().stream().sorted()
-                    .forEach(handlerId -> toWrite.add(String.format("%s" + COMMA_DELIMITER + "0", handlerId)));
-            try {
                 IOUtils.writeLines(toWrite, "\n", writer);
-            } catch (IOException e) {}
-        }, lines -> lines.map(line -> line.split(COMMA_DELIMITER)).filter(parts -> parts.length == 2).forEach(parts -> {
-            String handlerId = parts[0];
-            int ordering = Integer.parseInt(parts[1]);
-            NEIClientConfig.handlerOrdering.put(handlerId, ordering);
-        }));
-    }
-
-    public static void loadPluginsList() {
-        final boolean jarjar = Launch.blackboard.getOrDefault("jarjar.rfbPluginLoaded", Boolean.FALSE) == Boolean.TRUE;
-        if (!jarjar) {
-            // Do the old style class discovery
-            final ClassDiscoverer classDiscoverer = new ClassDiscoverer(
-                    test -> test.startsWith("NEI") && test.endsWith("Config.class"),
-                    IConfigureNEI.class);
-
-            NEIClientConfig.pluginsList.addAll(classDiscoverer.findClasses());
-            NEIClientConfig.logger
-                    .info("Loading NEI Plugins via ClassDiscoverer: " + NEIClientConfig.pluginsList.size());
-
-        } else {
-            // If JarJar's loaded, the ASMDataTable now includes interfaces in addition to Annotations, so use that
-            // instead Includes a small change in behavior of no longer requiring the class to start with NEI and end
-            // with Config; This could easily be changed if desired, but the previous behavior was likely to speed
-            // things up by limiting the scope when looking at all of the jars and classes in the classpath.
-            final ASMDataTable dataTable = NEIModContainer.getAsmDataTable();
-            final ModClassLoader modClassLoader = (ModClassLoader) Loader.instance().getModClassLoader();
-            for (ASMDataTable.ASMData asmData : dataTable.getAll(IConfigureNEI.class.getName().replace('.', '/'))) {
-                final String className = asmData.getClassName().replace('/', '.');
-                try {
-                    NEIClientConfig.pluginsList.add(Class.forName(className, true, modClassLoader));
-                } catch (ClassNotFoundException e) {
-                    NEIClientConfig.logger.error("Failed to load plugin class {}", className, e);
-                }
+            } catch (IOException e) {
+                NEIClientConfig.logger.error("Failed to save default handler ordering to file {}", file, e);
             }
-            NEIClientConfig.logger.info("Loading NEI Plugins via JarJar: " + NEIClientConfig.pluginsList.size());
+        }
+
+        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;
+        if(event.phase == Phase.END)
+            return;
 
         Minecraft mc = Minecraft.getMinecraft();
-        if (mc.theWorld != null) {
+        if(mc.theWorld != null) {
             loadWorld(mc.theWorld, false);
 
-            if (!NEIClientConfig.isEnabled()) return;
+            if (!NEIClientConfig.isEnabled())
+                return;
 
-            /*
-             * NEI plugins are loaded in a separate thread. Make sure loading them has finished otherwise a CME might
-             * occur in KeyManager if a plugin calls API.addKeyBind() during initialization.
-             */
-            if (NEIClientConfig.isLoaded()) KeyManager.tickKeyStates();
+            KeyManager.tickKeyStates();
 
             NEIController.updateUnlimitedItems(mc.thePlayer.inventory);
-            if (mc.currentScreen == null) NEIController.processCreativeCycling(mc.thePlayer.inventory);
+            if (mc.currentScreen == null)
+                NEIController.processCreativeCycling(mc.thePlayer.inventory);
 
             updateMagnetMode(mc.theWorld, mc.thePlayer);
-        } else {
-            lastworld = null;
         }
-    }
 
-    @SubscribeEvent
-    public void onGuiScreen(GuiOpenEvent event) {
-        if (event.gui instanceof GuiSelectWorld) {
-            NEIClientConfig.reloadSaves();
-        } else if (event.gui == null) {
-            /* prevent WorldClient reference being held in the Gui */
-            NEIController.manager = null;
+        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();
+        if(event.phase == Phase.END && NEIClientConfig.isEnabled())
+            HUDRenderer.renderOverlay();
     }
 
+
     @SubscribeEvent
     public void renderLastEvent(RenderWorldLastEvent event) {
-        if (NEIClientConfig.isEnabled()) WorldOverlayRenderer.render(event.partialTicks);
+        if (NEIClientConfig.isEnabled())
+            WorldOverlayRenderer.render(event.partialTicks);
     }
 
-    @SideOnly(Side.CLIENT)
-    @SubscribeEvent
-    public void onWorldUnload(WorldEvent.Unload event) {
-        Minecraft mc = Minecraft.getMinecraft();
-        if (event.world == mc.theWorld) {
-            NEIClientConfig.unloadWorld();
-            ItemMobSpawner.clearEntityReferences();
-        }
-    }
 
     public void loadWorld(World world, boolean fromServer) {
         if (world != lastworld) {
             SMPmagneticItems.clear();
-            if (!NEIClientConfig.getBooleanSetting("world.overlays.lock")) {
-                WorldOverlayRenderer.reset();
-            }
+            WorldOverlayRenderer.reset();
+
             if (!fromServer) {
                 NEIClientConfig.setHasSMPCounterPart(false);
                 NEIClientConfig.setInternalEnabled(false);
 
-                if (!Minecraft.getMinecraft().isSingleplayer()) // wait for server to initiate in singleplayer
+                if (!Minecraft.getMinecraft().isSingleplayer())//wait for server to initiate in singleplayer
                     NEIClientConfig.loadWorld("remote/" + ClientUtils.getServerIP().replace(':', '~'));
+
+                ItemMobSpawner.clearEntityReferences(world);
             }
+
             lastworld = world;
         }
     }
@@ -364,8 +345,8 @@ public class ClientHandler {
     }
 
     public static RuntimeException throwCME(final String message) {
-        final GuiScreen errorGui = new GuiErrorScreen(null, null) {
-
+        final GuiScreen errorGui = new GuiErrorScreen(null, null)
+        {
             @Override
             public void handleMouseInput() {}
 
@@ -381,18 +362,16 @@ public class ClientHandler {
             }
         };
 
-        CustomModLoadingErrorDisplayException e = new CustomModLoadingErrorDisplayException() {
-
-            private static final long serialVersionUID = -5593387489666663375L;
-
+        @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) {}
+            public void drawScreen(GuiErrorScreen errorScreen, FontRenderer fontRenderer, int mouseRelX, int mouseRelY, float tickTime) {}
         };
         throw e;
     }

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

@@ -1,251 +0,0 @@
-package codechicken.nei;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.stream.Collectors;
-
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTBase.NBTPrimitive;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.StatCollector;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-import com.google.gson.JsonSyntaxException;
-
-import codechicken.nei.ItemList.AnyMultiItemFilter;
-import codechicken.nei.ItemList.EverythingItemFilter;
-import codechicken.nei.ItemList.NothingItemFilter;
-import codechicken.nei.PresetsList.Preset;
-import codechicken.nei.PresetsList.PresetMode;
-import codechicken.nei.api.ItemFilter;
-import codechicken.nei.util.ItemStackFilterParser;
-
-public class CollapsibleItems {
-
-    protected static class GroupItem {
-
-        public String guid;
-        public ItemFilter filter;
-        public boolean expanded = false;
-        public String displayName = "";
-
-        public void setFilter(String filter) {
-            this.filter = ItemStackFilterParser.parse(filter.trim());
-            this.guid = this.filter != null ? UUID.nameUUIDFromBytes(filter.getBytes()).toString() : "";
-        }
-
-        public void setFilter(ItemFilter filter, String guid) {
-            this.filter = filter;
-            this.guid = guid;
-        }
-
-        public boolean matches(ItemStack stack) {
-            return this.filter.matches(stack);
-        }
-    }
-
-    private static final String STATE_KEY = "collapsibleitems";
-
-    protected static File statesFile;
-    protected static final List<GroupItem> groups = new ArrayList<>();
-    protected static final Map<ItemStack, Integer> cache = new ConcurrentHashMap<>();
-
-    private CollapsibleItems() {}
-
-    public static void load() {
-        CollapsibleItems.groups.clear();
-        CollapsibleItems.cache.clear();
-
-        for (int i = PresetsList.presets.size() - 1; i >= 0; i--) {
-            Preset preset = PresetsList.presets.get(i);
-            if (preset.enabled && preset.mode == PresetMode.GROUP) {
-                GroupItem group = new GroupItem();
-                group.setFilter(preset, UUID.nameUUIDFromBytes(preset.items.toString().getBytes()).toString());
-                group.displayName = preset.name;
-                addGroup(group);
-            }
-        }
-
-        if (NEIClientConfig.enableCollapsibleItems()) {
-            ClientHandler.loadSettingsFile(
-                    "collapsibleitems.cfg",
-                    lines -> parseFile(lines.collect(Collectors.toCollection(ArrayList::new))));
-        }
-
-        loadStates();
-    }
-
-    private static void parseFile(List<String> itemStrings) {
-        final JsonParser parser = new JsonParser();
-        GroupItem group = new GroupItem();
-
-        for (String itemStr : itemStrings) {
-            try {
-
-                if (itemStr.startsWith("; ")) {
-                    JsonObject settings = parser.parse(itemStr.substring(2)).getAsJsonObject();
-
-                    if (settings.get("displayName") != null) {
-                        group.displayName = settings.get("displayName").getAsString();
-                    }
-
-                    if (settings.get("unlocalizedName") != null) {
-                        String unlocalizedName = settings.get("unlocalizedName").getAsString();
-                        String displayName = StatCollector.translateToLocal(unlocalizedName);
-
-                        if (!displayName.equals(unlocalizedName)) {
-                            group.displayName = displayName;
-                        }
-                    }
-
-                    if (settings.get("expanded") != null) {
-                        group.expanded = settings.get("expanded").getAsBoolean();
-                    }
-
-                } else {
-                    group.setFilter(itemStr);
-                }
-
-                if (group != null && group.filter != null) {
-                    addGroup(group);
-                    group = new GroupItem();
-                }
-
-            } catch (IllegalArgumentException | JsonSyntaxException | IllegalStateException e) {
-                NEIClientConfig.logger.error("Failed to load collapsible items from json string:\n{}", itemStr);
-            }
-        }
-    }
-
-    private static void addGroup(GroupItem group) {
-        if (group == null || group.filter == null
-                || group.filter instanceof EverythingItemFilter
-                || group.filter instanceof NothingItemFilter)
-            return;
-        CollapsibleItems.groups.add(group);
-    }
-
-    public static boolean isEmpty() {
-        return CollapsibleItems.groups.isEmpty();
-    }
-
-    public static ItemFilter getItemFilter() {
-        AnyMultiItemFilter filter = new AnyMultiItemFilter();
-
-        for (GroupItem group : CollapsibleItems.groups) {
-            filter.filters.add(group.filter);
-        }
-
-        return filter;
-    }
-
-    public static void clearCache() {
-        CollapsibleItems.cache.clear();
-    }
-
-    public static void putItem(ItemStack stack) {
-        int groupIndex = -1;
-
-        for (int i = 0; i < CollapsibleItems.groups.size() && groupIndex == -1; i++) {
-            if (CollapsibleItems.groups.get(i).matches(stack)) {
-                groupIndex = i;
-            }
-        }
-
-        if (groupIndex != -1) {
-            CollapsibleItems.cache.put(stack, groupIndex);
-        }
-    }
-
-    public static int getGroupIndex(ItemStack stack) {
-
-        if (stack == null) {
-            return -1;
-        }
-
-        return CollapsibleItems.cache.getOrDefault(stack, -1);
-    }
-
-    public static String getDisplayName(int groupIndex) {
-
-        if (groupIndex < CollapsibleItems.groups.size()) {
-            return CollapsibleItems.groups.get(groupIndex).displayName;
-        }
-
-        return null;
-    }
-
-    public static boolean isExpanded(int groupIndex) {
-
-        if (groupIndex < CollapsibleItems.groups.size()) {
-            return CollapsibleItems.groups.get(groupIndex).expanded;
-        }
-
-        return true;
-    }
-
-    public static void setExpanded(int groupIndex, boolean expanded) {
-
-        if (groupIndex < CollapsibleItems.groups.size()) {
-            CollapsibleItems.groups.get(groupIndex).expanded = expanded;
-        }
-    }
-
-    public static void toggleGroups(Boolean expanded) {
-
-        if (expanded == null) {
-            expanded = CollapsibleItems.groups.stream().noneMatch(g -> g.expanded);
-        }
-
-        for (GroupItem group : CollapsibleItems.groups) {
-            group.expanded = expanded;
-        }
-
-    }
-
-    public static void saveStates() {
-        NBTTagCompound list = new NBTTagCompound();
-
-        for (GroupItem group : CollapsibleItems.groups) {
-            list.setBoolean(group.guid, group.expanded);
-        }
-
-        if (NEIClientConfig.world != null) {
-            NEIClientConfig.world.nbt.setTag(STATE_KEY, list);
-        }
-    }
-
-    private static void loadStates() {
-
-        try {
-
-            if (NEIClientConfig.world.nbt.hasKey(STATE_KEY)) {
-                NBTTagCompound states = NEIClientConfig.world.nbt.getCompoundTag(STATE_KEY);
-                @SuppressWarnings("unchecked")
-                final Map<String, NBTPrimitive> list = (Map<String, NBTPrimitive>) states.tagMap;
-                final Map<String, GroupItem> mapping = new HashMap<>();
-
-                for (GroupItem group : CollapsibleItems.groups) {
-                    mapping.put(group.guid, group);
-                }
-
-                for (Map.Entry<String, NBTPrimitive> nbtEntry : list.entrySet()) {
-                    if (mapping.containsKey(nbtEntry.getKey())) {
-                        mapping.get(nbtEntry.getKey()).expanded = nbtEntry.getValue().func_150290_f() == 1;
-                    }
-                }
-            }
-
-        } catch (Exception e) {
-            NEIClientConfig.logger.error("Error loading collapsible items states", e);
-        }
-
-    }
-
-}

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

@@ -1,5 +1,7 @@
 package codechicken.nei;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
@@ -9,13 +11,10 @@ import net.minecraft.item.ItemArmor;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-
-public class ContainerCreativeInv extends Container {
-
-    private class SlotArmor extends Slot {
-
+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) {
@@ -40,16 +39,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;
         }
     }
 
@@ -58,22 +56,20 @@ public class ContainerCreativeInv extends Container {
     public ContainerCreativeInv(EntityPlayer player, ExtendedCreativeInv extraInv) {
         this.player = player;
         InventoryPlayer invPlayer = player.inventory;
-        for (int row = 0; row < 6; row++) for (int col = 0; col < 9; col++)
-            addSlotToContainer(new Slot(extraInv, col + row * 9, 8 + col * 18, 5 + row * 18));
+        for (int row = 0; row < 6; row++)
+            for (int col = 0; col < 9; col++)
+                addSlotToContainer(new Slot(extraInv, col + row * 9, 8 + col * 18, 5 + row * 18));
 
-        for (int row = 0; row < 3; ++row) for (int col = 0; col < 9; ++col)
-            addSlotToContainer(new Slot(invPlayer, col + row * 9 + 9, 8 + col * 18, 118 + row * 18));
+        for (int row = 0; row < 3; ++row)
+            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));
+        for (int armorType = 1; armorType < 4; armorType++)
+            addSlotToContainer(new SlotArmor(invPlayer, invPlayer.getSizeInventory() - 1 - armorType, -15, 23 + armorType * 18, armorType));
     }
 
     @Override
@@ -95,13 +91,16 @@ 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,7 +1,6 @@
 package codechicken.nei;
 
-import java.util.ArrayList;
-
+import codechicken.lib.render.CCRenderState;
 import net.minecraft.client.gui.Gui;
 import net.minecraft.enchantment.Enchantment;
 import net.minecraft.entity.player.EntityPlayer;
@@ -13,18 +12,17 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.world.World;
-
 import org.lwjgl.opengl.GL11;
 
-import codechicken.lib.render.CCRenderState;
+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;
@@ -106,11 +104,10 @@ 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;
@@ -129,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;
         }
@@ -138,7 +135,8 @@ 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;
@@ -178,8 +176,10 @@ 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;
                 }
             }
@@ -191,7 +191,8 @@ 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) {
@@ -220,10 +221,9 @@ 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) {
-                    state = 1;
-                }
+            } else if (NEIServerUtils.doesEnchantmentConflict(NEIServerUtils.getEnchantments(toolstack), e) && validate) {
+                state = 1;
+            }
             slotEnchantment.add(new EnchantmentHash(e, state, level));
         }
         if (numoptions != slotEnchantment.size()) {
@@ -257,28 +257,10 @@ 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));
@@ -295,32 +277,18 @@ 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,5 +1,10 @@
 package codechicken.nei;
 
+import codechicken.lib.inventory.ContainerExtended;
+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;
 import net.minecraft.inventory.IInventory;
@@ -11,16 +16,10 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.potion.PotionEffect;
 
-import codechicken.lib.inventory.ContainerExtended;
-import codechicken.lib.inventory.InventoryNBT;
-import codechicken.lib.inventory.InventoryUtils;
-import codechicken.lib.inventory.SlotHandleClicks;
-import codechicken.lib.packet.PacketCustom;
-
-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);
         }
@@ -35,15 +34,16 @@ 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,7 +60,8 @@ 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;
         }
@@ -71,8 +72,8 @@ 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"));
         }
@@ -81,6 +82,7 @@ public class ContainerPotionCreator extends ContainerExtended {
         public void markDirty() {
             super.markDirty();
             NEIClientConfig.global.nbt.setTag("potionStore", tag);
+            NEIClientConfig.global.saveNBT();
         }
     }
 
@@ -94,13 +96,15 @@ 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);
     }
 
@@ -113,27 +117,30 @@ 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);
     }
 
@@ -150,4 +157,4 @@ public class ContainerPotionCreator extends ContainerExtended {
         packet.writeByte(effectID);
         packet.sendToServer();
     }
-}
+}

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

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

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

@@ -1,34 +1,35 @@
 package codechicken.nei;
 
-import java.util.List;
-
+import codechicken.nei.api.IHighlightHandler;
+import codechicken.nei.api.ItemInfo;
+import codechicken.nei.guihook.GuiContainerManager;
 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 codechicken.nei.api.IHighlightHandler;
-import codechicken.nei.api.ItemInfo;
-import codechicken.nei.guihook.GuiContainerManager;
-
-public class DefaultHighlightHandler implements IHighlightHandler {
+import java.util.List;
 
+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);
+            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

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

src/main/java/codechicken/nei/ExtendedCreativeInv.java

@@ -1,13 +1,12 @@
 package codechicken.nei;
 
+import cpw.mods.fml.relauncher.Side;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
 
-import cpw.mods.fml.relauncher.Side;
-
-public class ExtendedCreativeInv implements IInventory {
-
+public class ExtendedCreativeInv implements IInventory
+{
     final PlayerSave playerSave;
     final Side side;
 
@@ -23,7 +22,8 @@ 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];
     }
 
@@ -58,8 +58,10 @@ 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();
     }
@@ -76,7 +78,8 @@ public class ExtendedCreativeInv implements IInventory {
 
     @Override
     public void markDirty() {
-        if (side.isServer()) playerSave.setCreativeDirty();
+        if (side.isServer())
+            playerSave.setCreativeDirty();
     }
 
     @Override
@@ -85,10 +88,12 @@ 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) {
@@ -99,4 +104,5 @@ public class ExtendedCreativeInv implements IInventory {
     public boolean hasCustomInventoryName() {
         return true;
     }
+
 }

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

@@ -1,28 +1,27 @@
 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 net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
 
 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 codechicken.nei.guihook.GuiContainerManager;
-
-public class FastTransferManager {
+import static codechicken.nei.NEIServerUtils.areStacksIdentical;
+import static codechicken.nei.NEIServerUtils.areStacksSameType;
+import static codechicken.nei.NEIServerUtils.copyStack;
 
+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> {
-
+    public static class SlotPositionComparator implements Comparator<Integer>
+    {
         final Container container;
 
         public SlotPositionComparator(Container c) {
@@ -48,7 +47,8 @@ public class FastTransferManager {
         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<>();
             findConnectedSlots(container, slotNo, connectedSlots);
@@ -69,11 +69,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);
             }
         }
@@ -82,7 +82,8 @@ 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 (areStacksSameType(stack, teststack)) return slotNo;
+            if (areStacksSameType(stack, teststack))
+                return slotNo;
         }
         return -1;
     }
@@ -98,16 +99,20 @@ 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();
 
-            if (!areStacksSameType(heldStack, transferStack)) continue;
+            if (!areStacksSameType(heldStack, transferStack))
+                continue;
 
             clickSlot(window, transferFrom);
             if (!fillZoneWithHeldItem(window, toZone)) {
@@ -125,7 +130,8 @@ 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());
@@ -135,19 +141,19 @@ 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
+                    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;
             }
 
@@ -175,48 +181,45 @@ 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
+        if (from.isItemValid(from.getStack()))
+            moveOneItem(window, fromSlot, toSlot);
+        else//slots that you can't put stuff in
             moveOutputSet(window, fromSlot, toSlot);
     }
 
-    public void transferItems(GuiContainer window, int fromSlot, int itemCount) {
-        for (int i = 0; i < itemCount; i++) {
-            transferItem(window, fromSlot);
-        }
-    }
-
     public void moveOutputSet(GuiContainer window, int fromSlot, int toSlot) {
-        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
+        if (NEIClientUtils.getHeldItem() != null)
             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())
+        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
+        if (destZone == null)//slots that don't accept
             return;
 
         int firstZoneSlot = findShiftClickDestinationSlot(window.inventorySlots, toSlot);
@@ -225,14 +228,17 @@ 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);
@@ -241,14 +247,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;
@@ -256,7 +262,8 @@ 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();
@@ -285,24 +292,28 @@ 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);
         }
@@ -312,13 +323,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
+        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)) {

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

@@ -1,251 +0,0 @@
-package codechicken.nei;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraftforge.fluids.FluidRegistry;
-import net.minecraftforge.fluids.FluidStack;
-
-import org.apache.commons.io.IOUtils;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-import com.google.gson.JsonSyntaxException;
-
-import codechicken.core.CommonUtils;
-import codechicken.nei.api.API;
-import codechicken.nei.recipe.Recipe.RecipeId;
-import codechicken.nei.recipe.StackInfo;
-import codechicken.nei.util.NBTJson;
-
-public class FavoriteRecipes {
-
-    private static final Set<NBTTagCompound> tools = new HashSet<>();
-    private static final Map<NBTTagCompound, RecipeId> items = new HashMap<>();
-    private static final Map<String, RecipeId> fluids = new HashMap<>();
-    private static File favoriteFile;
-
-    static {
-        API.addSubset("Favorites", FavoriteRecipes::contains);
-    }
-
-    private FavoriteRecipes() {}
-
-    public static void load() {
-        String worldPath = "global";
-
-        if (NEIClientConfig.getBooleanSetting("inventory.favorites.worldSpecific")) {
-            worldPath = NEIClientConfig.getWorldPath();
-        }
-
-        final File dir = new File(CommonUtils.getMinecraftDir(), "saves/NEI/" + worldPath);
-
-        if (!dir.exists()) {
-            dir.mkdirs();
-        }
-
-        favoriteFile = new File(dir, "favorites.ini");
-
-        if (!favoriteFile.exists()) {
-            final File globalFavorites = new File(CommonUtils.getMinecraftDir(), "saves/NEI/global/favorites.ini");
-            final File configFavorites = new File(NEIClientConfig.configDir, "favorites.ini");
-            final File defaultFavorites = configFavorites.exists() ? configFavorites : globalFavorites;
-
-            if (defaultFavorites.exists()) {
-
-                try {
-                    if (favoriteFile.createNewFile()) {
-                        InputStream src = new FileInputStream(defaultFavorites);
-                        OutputStream dst = new FileOutputStream(favoriteFile);
-
-                        IOUtils.copy(src, dst);
-
-                        src.close();
-                        dst.close();
-                    }
-                } catch (IOException e) {}
-            }
-        }
-
-        loadData();
-    }
-
-    private static void loadData() {
-
-        if (favoriteFile == null || !favoriteFile.exists()) {
-            return;
-        }
-
-        List<String> itemStrings;
-
-        try (FileInputStream reader = new FileInputStream(favoriteFile)) {
-            NEIClientConfig.logger.info("Loading favorites from file {}", favoriteFile);
-            itemStrings = IOUtils.readLines(reader, StandardCharsets.UTF_8);
-        } catch (IOException e) {
-            NEIClientConfig.logger.error("Failed to load favorites from file {}", favoriteFile, e);
-            return;
-        }
-
-        final JsonParser parser = new JsonParser();
-        items.clear();
-
-        for (String itemStr : itemStrings) {
-
-            if (itemStr.isEmpty() || itemStr.startsWith("#")) {
-                continue;
-            }
-
-            try {
-                JsonObject jsonObject = parser.parse(itemStr).getAsJsonObject();
-
-                if (jsonObject.get("item") != null && jsonObject.get("recipeId") != null) {
-                    final NBTTagCompound itemStackNBT = (NBTTagCompound) NBTJson.toNbt(jsonObject.get("item"));
-                    final RecipeId recipeId = RecipeId.of(jsonObject.getAsJsonObject("recipeId"));
-                    final ItemStack stack = StackInfo.loadFromNBT(itemStackNBT);
-
-                    if (stack != null) {
-                        final String fluidKey = getFluidKey(stack);
-
-                        if (fluidKey != null) {
-                            fluids.put(fluidKey, recipeId);
-                        }
-                    }
-
-                    items.put(itemStackNBT, recipeId);
-
-                    if (NEIServerUtils.isItemTool(stack)) {
-                        tools.add(itemStackNBT);
-                    }
-                }
-
-            } catch (IllegalArgumentException | JsonSyntaxException | IllegalStateException e) {
-                NEIClientConfig.logger.error("Failed to load favorite from json string:\n{}", itemStr);
-            }
-
-        }
-
-        SubsetWidget.updateHiddenItems();
-    }
-
-    public static RecipeId getFavorite(ItemStack stack) {
-
-        if (NEIClientConfig.favoritesEnabled() && stack != null) {
-            RecipeId recipeId = items.get(StackInfo.itemStackToNBT(stack, false));
-
-            if (recipeId == null) {
-                recipeId = fluids.get(getFluidKey(stack));
-            }
-
-            if (recipeId != null) {
-                return recipeId;
-            }
-
-            if (NEIServerUtils.isItemTool(stack)
-                    && (stack.stackTagCompound == null || !stack.stackTagCompound.hasKey("GT.ToolStats"))) {
-                for (NBTTagCompound nbt : tools) {
-                    if (NEIServerUtils.areStacksSameTypeCraftingWithNBT(stack, StackInfo.loadFromNBT(nbt))) {
-                        return items.get(nbt);
-                    }
-                }
-            }
-
-        }
-
-        return null;
-    }
-
-    public static ItemStack getFavorite(RecipeId recipeId) {
-        if (NEIClientConfig.favoritesEnabled()) {
-            final Optional<Map.Entry<NBTTagCompound, RecipeId>> result = items.entrySet().stream()
-                    .filter(entry -> entry.getValue().equals(recipeId)).findAny();
-
-            if (result.isPresent()) {
-                return StackInfo.loadFromNBT(result.get().getKey());
-            }
-        }
-
-        return null;
-    }
-
-    public static boolean contains(ItemStack stack) {
-        return getFavorite(stack) != null;
-    }
-
-    public static void setFavorite(ItemStack stack, RecipeId recipeId) {
-        final NBTTagCompound itemStackNBT = StackInfo.itemStackToNBT(stack, false);
-        final String fluidKey = getFluidKey(stack);
-
-        items.entrySet().removeIf(entry -> entry.getKey().equals(itemStackNBT) || entry.getValue().equals(recipeId));
-        fluids.entrySet().removeIf(entry -> entry.getKey().equals(fluidKey) || entry.getValue().equals(recipeId));
-
-        if (recipeId != null) {
-            items.put(itemStackNBT, recipeId);
-
-            if (NEIServerUtils.isItemTool(stack)) {
-                tools.add(itemStackNBT);
-            }
-
-            if (fluidKey != null) {
-                fluids.put(fluidKey, recipeId);
-            }
-        }
-
-        SubsetWidget.updateHiddenItems();
-        ItemList.updateFilter.restart();
-    }
-
-    private static String getFluidKey(ItemStack stack) {
-        final FluidStack fluid = StackInfo.getFluid(stack);
-
-        if (fluid != null) {
-            return FluidRegistry.getFluidName(fluid);
-        }
-
-        return null;
-    }
-
-    public static void save() {
-
-        if (favoriteFile == null) {
-            return;
-        }
-
-        final List<String> strings = new ArrayList<>();
-
-        for (Map.Entry<NBTTagCompound, RecipeId> entry : items.entrySet()) {
-
-            try {
-                final JsonObject line = new JsonObject();
-
-                line.add("item", NBTJson.toJsonObject(entry.getKey()));
-                line.add("recipeId", entry.getValue().toJsonObject());
-
-                strings.add(NBTJson.toJson(line));
-            } catch (JsonSyntaxException e) {
-                NEIClientConfig.logger.error("Failed to stringify favorites ItemStack to json string");
-            }
-
-        }
-
-        try (FileOutputStream output = new FileOutputStream(favoriteFile)) {
-            IOUtils.writeLines(strings, "\n", output, StandardCharsets.UTF_8);
-        } catch (IOException e) {
-            NEIClientConfig.logger.error("Filed to save favorites list to file {}", favoriteFile, e);
-        }
-    }
-
-}

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

@@ -1,308 +0,0 @@
-package codechicken.nei;
-
-import net.minecraft.client.gui.FontRenderer;
-import net.minecraft.client.gui.Gui;
-import net.minecraft.client.gui.GuiTextField;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.util.ChatAllowedCharacters;
-import net.minecraft.util.EnumChatFormatting;
-
-import org.lwjgl.opengl.GL11;
-
-public class FormattedTextField extends GuiTextField {
-
-    public static interface TextFormatter {
-
-        TextFormatter DEFAULT = (text) -> text;
-
-        public String format(String text);
-    }
-
-    protected FontRenderer fontRenderer;
-    protected String rawText = "";
-    protected String formattedText = "";
-    protected String placeholder = "";
-    protected boolean editable = true;
-    protected int editableColor = 14737632;
-    protected int notEditableColor = 7368816;
-    protected TextFormatter formatter = TextFormatter.DEFAULT;
-    protected int lineScrollOffset = 0;
-    protected int frame = 0;
-
-    public FormattedTextField(FontRenderer fontRenderer, int xPosition, int yPosition, int width, int height) {
-        super(fontRenderer, xPosition, yPosition, width, height);
-        this.fontRenderer = fontRenderer;
-    }
-
-    public void setFormatter(TextFormatter formatter) {
-        this.formatter = formatter;
-    }
-
-    public void setPlaceholder(String placeholder) {
-        this.placeholder = placeholder;
-    }
-
-    @Override
-    public void updateCursorCounter() {
-        super.updateCursorCounter();
-        ++this.frame;
-    }
-
-    @Override
-    public void setFocused(boolean focus) {
-        if (focus && !this.isFocused()) {
-            this.frame = 0;
-        }
-
-        super.setFocused(focus);
-    }
-
-    @Override
-    public void setSelectionPos(int p_146199_1_) {
-        String text = this.getText();
-        int j = text.length();
-
-        super.setSelectionPos(p_146199_1_);
-
-        p_146199_1_ = Math.max(0, Math.min(p_146199_1_, j));
-
-        if (this.fontRenderer != null) {
-
-            if (this.lineScrollOffset > j) {
-                this.lineScrollOffset = j;
-            }
-
-            int k = this.getWidth();
-            String s = this.fontRenderer.trimStringToWidth(text.substring(this.lineScrollOffset), k);
-            int l = s.length() + this.lineScrollOffset;
-
-            if (p_146199_1_ == this.lineScrollOffset) {
-                this.lineScrollOffset -= this.fontRenderer.trimStringToWidth(text, k, true).length();
-            }
-
-            if (p_146199_1_ > l) {
-                this.lineScrollOffset += p_146199_1_ - l;
-            } else if (p_146199_1_ <= this.lineScrollOffset) {
-                this.lineScrollOffset -= this.lineScrollOffset - p_146199_1_;
-            }
-
-            this.lineScrollOffset = Math.max(0, Math.min(this.lineScrollOffset, j));
-        }
-    }
-
-    @Override
-    public void setTextColor(int p_146193_1_) {
-        super.setTextColor(p_146193_1_);
-        this.editableColor = p_146193_1_;
-    }
-
-    @Override
-    public void setDisabledTextColour(int p_146204_1_) {
-        super.setDisabledTextColour(p_146204_1_);
-        this.notEditableColor = p_146204_1_;
-    }
-
-    @Override
-    public void setEnabled(boolean p_146184_1_) {
-        super.setEnabled(p_146184_1_);
-        this.editable = p_146184_1_;
-    }
-
-    protected boolean beforeWrite(String text) {
-        return true;
-    }
-
-    @Override
-    public void writeText(String textPart) {
-        String newText = "";
-        String substr = ChatAllowedCharacters.filerAllowedCharacters(textPart);
-        int cursorPosition = getCursorPosition();
-        int maxStringLength = getMaxStringLength();
-        String text = getText();
-
-        if (text.isEmpty()) {
-            newText = substr.substring(0, Math.min(maxStringLength, substr.length()));
-            cursorPosition = newText.length();
-        } else {
-            int selectionEnd = getSelectionEnd();
-            String textStart = text.substring(0, Math.min(cursorPosition, selectionEnd));
-            String textEnd = text.substring(Math.max(cursorPosition, selectionEnd));
-            newText = textStart + substr + textEnd;
-
-            if (newText.length() > maxStringLength) {
-                newText = newText.substring(0, maxStringLength);
-            }
-
-            cursorPosition = Math.min(textStart.length() + substr.length(), newText.length());
-        }
-
-        if (beforeWrite(newText)) {
-            setText(newText);
-            setCursorPosition(cursorPosition);
-        }
-    }
-
-    @Override
-    public int getNthWordFromPos(int p_146183_1_, int p_146183_2_) {
-        return this.func_146197_a(p_146183_1_, p_146183_2_, true);
-    }
-
-    @Override
-    public void drawTextBox() {
-
-        if (!this.getVisible()) {
-            return;
-        }
-
-        if (this.getEnableBackgroundDrawing()) {
-            drawRect(
-                    this.xPosition - 1,
-                    this.yPosition - 1,
-                    this.xPosition + this.width + 1,
-                    this.yPosition + this.height + 1,
-                    -6250336);
-            drawRect(
-                    this.xPosition,
-                    this.yPosition,
-                    this.xPosition + this.width,
-                    this.yPosition + this.height,
-                    -16777216);
-        }
-
-        if (!this.rawText.equals(getText())) {
-            this.rawText = getText();
-            this.formattedText = this.formatter.format(this.rawText);
-            if (!EnumChatFormatting.getTextWithoutFormattingCodes(this.formattedText).toLowerCase()
-                    .equals(this.rawText.toLowerCase())) {
-                this.formattedText = this.rawText;
-            }
-        }
-
-        if (!isFocused() && this.formattedText.isEmpty()) {
-            int x = getEnableBackgroundDrawing() ? this.xPosition + 4 : this.xPosition;
-            int y = getEnableBackgroundDrawing() ? this.yPosition + (this.height - 8) / 2 : this.yPosition;
-            this.fontRenderer.drawStringWithShadow(
-                    this.fontRenderer.trimStringToWidth(this.placeholder, this.getWidth()),
-                    x,
-                    y,
-                    this.notEditableColor);
-            return;
-        }
-
-        int firstCharacterIndex = getFormattedTextShift(this.lineScrollOffset);
-        String rawTextClipped = this.fontRenderer
-                .trimStringToWidth(this.rawText.substring(this.lineScrollOffset), this.getWidth());
-        String textClipped = this.formattedText
-                .substring(firstCharacterIndex, getFormattedTextShift(this.lineScrollOffset + rawTextClipped.length()));
-        int cursorPosition = getFormattedTextShift(getCursorPosition());
-        int selectionEnd = getFormattedTextShift(getSelectionEnd());
-
-        int color = this.editable ? this.editableColor : this.notEditableColor;
-        int cursorA = cursorPosition - firstCharacterIndex;
-        int cursorB = selectionEnd - firstCharacterIndex;
-        boolean flag = cursorA >= 0 && cursorA <= textClipped.length();
-        boolean flag1 = isFocused() && this.frame / 6 % 2 == 0 && flag;
-        boolean flag2 = getCursorPosition() < this.rawText.length() || this.rawText.length() >= getMaxStringLength();
-        int x = getEnableBackgroundDrawing() ? this.xPosition + 4 : this.xPosition;
-        int y = getEnableBackgroundDrawing() ? this.yPosition + (this.height - 8) / 2 : this.yPosition;
-        int x2 = x;
-
-        if (cursorB > textClipped.length()) {
-            cursorB = textClipped.length();
-        }
-
-        if (textClipped.length() > 0) {
-            String s1 = flag ? textClipped.substring(0, cursorA) : textClipped;
-            String colorA = getPreviousColor(firstCharacterIndex);
-            x2 = this.fontRenderer.drawStringWithShadow(colorA + s1, x, y, color);
-        }
-
-        int k1 = x2;
-
-        if (!flag) {
-            k1 = cursorA > 0 ? x + this.width : x;
-        } else if (flag2) {
-            k1 = x2 - 1;
-            --x2;
-        }
-
-        if (textClipped.length() > 0 && flag && cursorA < textClipped.length()) {
-            String colorB = getPreviousColor(firstCharacterIndex + cursorA);
-            this.fontRenderer.drawStringWithShadow(colorB + textClipped.substring(cursorA), x2, y, color);
-        }
-
-        if (flag1) {
-            if (flag2) {
-                Gui.drawRect(k1, y - 1, k1 + 1, y + 1 + this.fontRenderer.FONT_HEIGHT, -3092272);
-            } else {
-                this.fontRenderer.drawStringWithShadow("_", k1, y, color);
-            }
-        }
-
-        if (cursorB != cursorA) {
-            int l1 = x + this.fontRenderer.getStringWidth(textClipped.substring(0, cursorB));
-            drawCursorVertical(k1, y - 1, l1 - 1, y + 1 + this.fontRenderer.FONT_HEIGHT);
-        }
-    }
-
-    private void drawCursorVertical(int x1, int y1, int x2, int y2) {
-        int i1;
-
-        if (x1 < x2) {
-            i1 = x1;
-            x1 = x2;
-            x2 = i1;
-        }
-
-        if (y1 < y2) {
-            i1 = y1;
-            y1 = y2;
-            y2 = i1;
-        }
-
-        if (x2 > this.xPosition + this.width) {
-            x2 = this.xPosition + this.width;
-        }
-
-        if (x1 > this.xPosition + this.width) {
-            x1 = this.xPosition + this.width;
-        }
-
-        Tessellator tessellator = Tessellator.instance;
-        GL11.glColor4f(0.0F, 0.0F, 255.0F, 255.0F);
-        GL11.glDisable(GL11.GL_TEXTURE_2D);
-        GL11.glEnable(GL11.GL_COLOR_LOGIC_OP);
-        GL11.glLogicOp(GL11.GL_OR_REVERSE);
-        tessellator.startDrawingQuads();
-        tessellator.addVertex((double) x1, (double) y2, 0.0D);
-        tessellator.addVertex((double) x2, (double) y2, 0.0D);
-        tessellator.addVertex((double) x2, (double) y1, 0.0D);
-        tessellator.addVertex((double) x1, (double) y1, 0.0D);
-        tessellator.draw();
-        GL11.glDisable(GL11.GL_COLOR_LOGIC_OP);
-        GL11.glEnable(GL11.GL_TEXTURE_2D);
-    }
-
-    private int getFormattedTextShift(int position) {
-        int shift = 0;
-
-        for (int i = 0; i < position; i++) {
-            while (this.formattedText.length() > i + shift && this.formattedText.charAt(i + shift) == '\u00a7') {
-                shift += 2;
-            }
-        }
-
-        return position + shift;
-    }
-
-    private String getPreviousColor(int position) {
-        while (position >= 0) {
-            if (this.formattedText.charAt(position) == '\u00a7') {
-                return this.formattedText.substring(position, position + 2);
-            }
-            position--;
-        }
-        return "";
-    }
-
-}

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

@@ -1,19 +1,17 @@
 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;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.world.World;
-
 import org.lwjgl.opengl.GL11;
 
-import codechicken.lib.render.CCRenderState;
-
-public class GuiEnchantmentModifier extends GuiContainer {
+import static codechicken.nei.NEIClientUtils.translate;
 
+public class GuiEnchantmentModifier extends GuiContainer
+{
     final ContainerEnchantmentModifier container;
 
     public GuiEnchantmentModifier(InventoryPlayer inventoryplayer, World world, int i, int j, int k) {
@@ -62,6 +60,7 @@ public class GuiEnchantmentModifier extends GuiContainer {
 
     public static void toggleEnchantmentValidation() {
         NEIClientConfig.world.nbt.setBoolean("validateenchantments", !validateEnchantments());
+        NEIClientConfig.world.saveNBT();
     }
 
     protected void actionPerformed(GuiButton guibutton) {

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

@@ -1,23 +1,20 @@
 package codechicken.nei;
 
-import java.util.Collections;
-import java.util.List;
-
+import codechicken.lib.render.CCRenderState;
+import codechicken.lib.vec.Rectangle4i;
+import codechicken.nei.api.INEIGuiHandler;
+import codechicken.nei.api.TaggedInventoryArea;
 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 codechicken.lib.render.CCRenderState;
-import codechicken.lib.vec.Rectangle4i;
-import codechicken.nei.AutoFocusWidget.INEIAutoFocusSearchEnable;
-import codechicken.nei.api.INEIGuiHandler;
-import codechicken.nei.api.TaggedInventoryArea;
-
-public class GuiExtendedCreativeInv extends GuiContainer implements INEIGuiHandler, INEIAutoFocusSearchEnable {
+import java.util.Collections;
+import java.util.List;
 
+public class GuiExtendedCreativeInv extends GuiContainer implements INEIGuiHandler
+{
     public GuiExtendedCreativeInv(Container par1Container) {
         super(par1Container);
         ySize = 198;
@@ -55,18 +52,21 @@ public class GuiExtendedCreativeInv extends GuiContainer implements INEIGuiHandl
     }
 
     @Override
-    public boolean hideItemPanelSlot(GuiContainer gui, int x, int y, int w, int h) {
+    public boolean hideItemPanelSlot(GuiContainer gui, int x, int y, int w, int h)
+    {
         return (new Rectangle4i(guiLeft - 15, guiTop + 18, 18, 18 * 4 + 4)).intersects(new Rectangle4i(x, y, w, h));
     }
 
     @Override
-    protected void handleMouseClick(Slot slotIn, int slotId, int clickedButton, int clickType) {
+    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 (slotIn != null && clickType == 4 && slotIn.xDisplayPosition < 0) {
-            clickType = 0;
+        //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(slotIn, slotId, clickedButton, clickType);
+        super.handleMouseClick(p_146984_1_, p_146984_2_, p_146984_3_, p_146984_4_);
     }
+
 }

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

@@ -4,62 +4,38 @@ 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 {
-
+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) {
+    
+    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;
 
-    public void drawButton(Minecraft minecraft, int x, int y) {
-        if (!visible) return;
-
+        FontRenderer fontrenderer = minecraft.fontRenderer;
         minecraft.renderEngine.bindTexture(guiTex);
         GL11.glColor4f(1, 1, 1, 1);
-        boolean mouseOver = x >= xPosition && y >= yPosition && x < xPosition + width && y < yPosition + height;
-        int k = getHoverState(mouseOver);
-        drawTexturedModalRect(xPosition, yPosition, 0, 46 + k * 20, width / 2, height / 2); // top left
-        drawTexturedModalRect(xPosition + width / 2, yPosition, 200 - width / 2, 46 + k * 20, width / 2, height / 2); // top
-                                                                                                                      // right
-        drawTexturedModalRect(
-                xPosition,
-                yPosition + height / 2,
-                0,
-                46 + k * 20 + 20 - height / 2,
-                width / 2,
-                height / 2); // bottom left
-        drawTexturedModalRect(
-                xPosition + width / 2,
-                yPosition + height / 2,
-                200 - width / 2,
-                46 + k * 20 + 20 - height / 2,
-                width / 2,
-                height / 2); // bottom right
-        mouseDragged(minecraft, x, y);
-
-        drawContent(minecraft, x, y, mouseOver);
-    }
-
-    protected int getTextColour(boolean mouseOver) {
-        int color = 0xe0e0e0;
-
-        if (!enabled) {
-            color = 0xffa0a0a0;
-        } else if (mouseOver) {
-            color = 0xffffa0;
-        }
-
-        return color;
-    }
-
-    protected void drawContent(Minecraft minecraft, int y, int x, boolean mouseOver) {
-        FontRenderer fontrenderer = minecraft.fontRenderer;
-        int color = getTextColour(mouseOver);
-
-        drawCenteredString(fontrenderer, displayString, xPosition + width / 2, yPosition + (height - 8) / 2, color);
+        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,37 +1,37 @@
 package codechicken.nei;
 
-import static codechicken.nei.NEIClientUtils.translate;
-
-import java.awt.Dimension;
-import java.util.ArrayList;
-
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagList;
-import net.minecraft.potion.Potion;
-import net.minecraft.potion.PotionEffect;
-import net.minecraft.util.StatCollector;
-
-import org.lwjgl.opengl.GL11;
-
 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 net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.potion.Potion;
+import net.minecraft.potion.PotionEffect;
+import net.minecraft.util.StatCollector;
+import org.lwjgl.opengl.GL11;
 
-public class GuiPotionCreator extends GuiContainerWidget {
+import java.awt.Dimension;
+import java.util.ArrayList;
 
-    public class GuiSlotPotionEffects extends GuiScrollSlot {
+import static codechicken.nei.NEIClientUtils.translate;
 
+public class GuiPotionCreator extends GuiContainerWidget
+{
+    public class GuiSlotPotionEffects extends GuiScrollSlot
+    {
         public int selectedslot = -1;
         public boolean enabled = true;
         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,7 +48,8 @@ public class GuiPotionCreator extends GuiContainerWidget {
         }
 
         @Override
-        public void drawOverlay(float frame) {}
+        public void drawOverlay(float frame) {
+        }
 
         @Override
         public int scrollbarGuideAlignment() {
@@ -68,18 +69,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");
@@ -108,7 +104,8 @@ public class GuiPotionCreator extends GuiContainerWidget {
                 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;
@@ -121,7 +118,8 @@ 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);
@@ -147,16 +145,19 @@ 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();
@@ -174,8 +175,8 @@ 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) {
@@ -189,22 +190,27 @@ 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();
             }
         }
 
@@ -225,8 +231,7 @@ 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();
@@ -311,8 +316,10 @@ 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,31 +1,29 @@
 package codechicken.nei;
 
+import codechicken.lib.config.ConfigTag;
+import codechicken.nei.KeyManager.IKeyStateTracker;
+import codechicken.nei.api.ItemInfo;
+import codechicken.nei.guihook.GuiContainerManager;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.RenderHelper;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.MovingObjectPosition.MovingObjectType;
+import net.minecraft.world.World;
+import org.lwjgl.opengl.GL11;
+import org.lwjgl.opengl.GL12;
+
+import java.awt.Dimension;
+import java.awt.Point;
+import java.util.ArrayList;
+import java.util.List;
+
 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 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;
-import net.minecraft.util.MovingObjectPosition.MovingObjectType;
-import net.minecraft.world.World;
-
-import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.GL12;
-
-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;
-
-public class HUDRenderer implements IKeyStateTracker {
-
+public class HUDRenderer implements IKeyStateTracker
+{
     @Override
     public void tickKeyStates() {
         if (KeyManager.keyStates.get("world.highlight_tips").down) {
@@ -36,28 +34,37 @@ 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;
-            ItemStack[] items = ItemInfo.getIdentifierItems(world, mc.thePlayer, mc.objectMouseOver)
-                    .toArray(new ItemStack[0]);
+            ArrayList<ItemStack> items = ItemInfo.getIdentifierItems(world, mc.thePlayer, mc.objectMouseOver);
+            if (items.isEmpty())
+                return;
 
-            if (items.length == 0) return;
-
-            ItemStack stack = StackInfo.getItemStackWithMinimumDamage(items);
+            int minDamage = Integer.MAX_VALUE;
+            ItemStack stack = null;
+            for(ItemStack astack : items) {
+                if(astack.getItem() != null && astack.getItemDamage() < minDamage) {
+                    stack = astack;
+                    minDamage = stack.getItemDamage();
+                }
+            }
 
             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();
@@ -78,7 +85,8 @@ 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() {
@@ -90,4 +98,4 @@ public class HUDRenderer implements IKeyStateTracker {
     public static void load() {
         KeyManager.trackers.add(new HUDRenderer());
     }
-}
+}

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

@@ -1,112 +0,0 @@
-package codechicken.nei;
-
-import static codechicken.nei.NEIClientUtils.translate;
-
-import java.util.List;
-
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.util.EnumChatFormatting;
-
-import codechicken.nei.guihook.GuiContainerManager;
-import codechicken.nei.guihook.IContainerInputHandler;
-import codechicken.nei.guihook.IContainerTooltipHandler;
-import codechicken.nei.recipe.AutoCraftingManager;
-
-public class HeldItemHandler implements IContainerInputHandler, IContainerTooltipHandler {
-
-    protected HeldItemHandler() {
-
-    }
-
-    public static void load() {
-        HeldItemHandler instance = new HeldItemHandler();
-        GuiContainerManager.addInputHandler(instance);
-        GuiContainerManager.addTooltipHandler(instance);
-    }
-
-    protected boolean contains(int mousex, int mousey) {
-        return NEIClientUtils.getHeldItem() != null && !ItemPanels.bookmarkPanel.inEditingState()
-                && !AutoCraftingManager.processing()
-                && (ItemPanels.bookmarkPanel.contains(mousex, mousey) || ItemPanels.itemPanel.contains(mousex, mousey)
-                        || ItemPanels.itemPanel.historyPanel.contains(mousex, mousey));
-    }
-
-    @Override
-    public boolean mouseClicked(GuiContainer gui, int mousex, int mousey, int button) {
-
-        if (contains(mousex, mousey)) {
-
-            if (NEIClientConfig.canPerformAction("delete") && NEIClientConfig.canPerformAction("item")) {
-                if (button == 1) {
-                    NEIClientUtils.decreaseSlotStack(-999);
-                } else {
-                    NEIClientUtils.deleteHeldItem();
-                }
-            } else {
-                NEIClientUtils.dropHeldItem();
-            }
-
-            return true;
-        }
-
-        return false;
-    }
-
-    @Override
-    public boolean keyTyped(GuiContainer gui, char keyChar, int keyCode) {
-
-        return false;
-    }
-
-    @Override
-    public boolean lastKeyTyped(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 onKeyTyped(GuiContainer gui, char keyChar, int keyID) {
-
-    }
-
-    @Override
-    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) {
-
-    }
-
-    @Override
-    public void onMouseScrolled(GuiContainer gui, int mousex, int mousey, int scrolled) {
-
-    }
-
-    @Override
-    public void onMouseUp(GuiContainer gui, int mousex, int mousey, int button) {
-
-    }
-
-    @Override
-    public List<String> handleTooltip(GuiContainer gui, int mousex, int mousey, List<String> currenttip) {
-
-        if (contains(mousex, mousey)) {
-            currenttip.clear();
-
-            if (NEIClientConfig.canPerformAction("delete") && NEIClientConfig.canPerformAction("item")) {
-                currenttip.add(EnumChatFormatting.RED + translate("itempanel.deleteItem"));
-            }
-        }
-
-        return currenttip;
-    }
-
-}

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

@@ -1,13 +1,14 @@
 package codechicken.nei;
 
-public class Image {
-
+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) {
+    public Image(int x, int y, int w, int h)
+    {
         this.x = x;
         this.y = y;
         width = w;

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

@@ -1,47 +1,55 @@
 package codechicken.nei;
 
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.item.ItemStack;
-
 import codechicken.lib.inventory.InventoryUtils;
 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

@@ -1,12 +1,11 @@
 package codechicken.nei;
 
+import codechicken.nei.api.IInfiniteItemHandler;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
 
-import codechicken.nei.api.IInfiniteItemHandler;
-
-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

@@ -4,13 +4,15 @@ 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() {
-
+public class InventoryCraftingDummy extends InventoryCrafting
+{
+    public InventoryCraftingDummy()
+    {
+        super(new Container()
+        {
             @Override
-            public boolean canInteractWith(EntityPlayer entityplayer) {
+            public boolean canInteractWith(EntityPlayer entityplayer)
+            {
                 return true;
             }
         }, 3, 3);

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

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

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

@@ -1,41 +1,31 @@
 package codechicken.nei;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ForkJoinPool;
-import java.util.concurrent.ForkJoinWorkerThread;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-import java.util.stream.StreamSupport;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.IIcon;
-
-import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.ListMultimap;
-
 import codechicken.nei.ThreadOperationTimer.TimeoutException;
 import codechicken.nei.api.ItemFilter;
 import codechicken.nei.api.ItemFilter.ItemFilterProvider;
 import codechicken.nei.api.ItemInfo;
-import codechicken.nei.search.TooltipFilter;
+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;
 
-public class ItemList {
+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;
 
+public class ItemList
+{
     /**
      * Fields are replaced atomically and contents never modified.
      */
-    public static volatile List<ItemStack> items = new ArrayList<>();
+    public static volatile List<ItemStack>  items = new ArrayList<>();
     /**
      * Fields are replaced atomically and contents never modified.
      */
@@ -48,44 +38,25 @@ public class ItemList {
 
     private static final HashSet<Item> erroredItems = new HashSet<>();
     private static final HashSet<String> stackTraces = new HashSet<>();
-    private static Map<ItemStack, Integer> ordering = new HashMap<>();
-    /**
-     * Unlike {@link LayoutManager#itemsLoaded}, this indicates whether item loading is actually finished or not.
-     */
-    public static boolean loadFinished;
-
-    public static class EverythingItemFilter implements ItemFilter {
 
+    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 NegatedItemFilter implements ItemFilter {
-
-        public ItemFilter filter;
-
-        public NegatedItemFilter(ItemFilter filter) {
-            this.filter = filter;
-        }
-
-        @Override
-        public boolean matches(ItemStack item) {
-            return this.filter == null || !this.filter.matches(item);
-        }
-    }
-
-    public static class PatternItemFilter implements ItemFilter {
-
+    public static class PatternItemFilter implements ItemFilter
+    {
         public Pattern pattern;
 
         public PatternItemFilter(Pattern pattern) {
@@ -94,54 +65,37 @@ public class ItemList {
 
         @Override
         public boolean matches(ItemStack item) {
-            String displayName = EnumChatFormatting.getTextWithoutFormattingCodes(item.getDisplayName());
-
-            if (displayName != null && !displayName.isEmpty() && pattern.matcher(displayName).find()) {
-                return true;
-            }
-
-            if (item.hasDisplayName()) {
-                displayName = EnumChatFormatting
-                        .getTextWithoutFormattingCodes(item.getItem().getItemStackDisplayName(item));
-
-                return displayName != null && !displayName.isEmpty() && pattern.matcher(displayName).find();
-            }
-
-            return false;
+            return pattern.matcher(ItemInfo.getSearchName(item)).find();
         }
     }
 
-    public static class AllMultiItemFilter implements ItemFilter {
-
+    public static class AllMultiItemFilter implements ItemFilter
+    {
         public List<ItemFilter> filters;
 
         public AllMultiItemFilter(List<ItemFilter> filters) {
             this.filters = filters;
         }
 
-        public AllMultiItemFilter(ItemFilter... filters) {
-            this(new LinkedList<>(Arrays.asList(filters)));
-        }
-
         public AllMultiItemFilter() {
             this(new LinkedList<>());
         }
 
         @Override
         public boolean matches(ItemStack item) {
-            for (ItemFilter filter : filters) try {
-                if (filter != null && !filter.matches(item)) return false;
-            } catch (Exception e) {
-                NEIClientConfig.logger
-                        .error("Exception filtering " + item + " with " + filter + " (" + e.getMessage() + ")", e);
-            }
+            for(ItemFilter filter : filters)
+                try {
+                    if (!filter.matches(item)) return false;
+                } catch (Exception e) {
+                    NEIClientConfig.logger.error("Exception filtering "+item+" with "+filter, e);
+                }
 
             return true;
         }
     }
 
-    public static class AnyMultiItemFilter implements ItemFilter {
-
+    public static class AnyMultiItemFilter implements ItemFilter
+    {
         public List<ItemFilter> filters;
 
         public AnyMultiItemFilter(List<ItemFilter> filters) {
@@ -154,29 +108,29 @@ public class ItemList {
 
         @Override
         public boolean matches(ItemStack item) {
-            for (ItemFilter filter : filters) try {
-                if (filter != null && filter.matches(item)) return true;
-            } catch (Exception e) {
-                NEIClientConfig.logger
-                        .error("Exception filtering " + item + " with " + filter + " (" + e.getMessage() + ")", e);
-            }
+            for(ItemFilter filter : filters)
+                try {
+                    if (filter.matches(item)) return true;
+                } catch (Exception 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 != null && !filter.matches(item)) return false;
+                if (!filter.matches(item))
+                    return false;
             } catch (Exception e) {
-                NEIClientConfig.logger
-                        .error("Exception filtering " + item + " with " + filter + " (" + e.getMessage() + ")", e);
+                NEIClientConfig.logger.error("Exception filtering "+item+" with "+filter, e);
             }
         }
 
@@ -184,7 +138,7 @@ public class ItemList {
     }
 
     /**
-     * @deprecated use getItemListFilter().matches(item)
+     * @deprecated  use getItemListFilter().matches(item)
      */
     @Deprecated
     public static boolean itemMatches(ItemStack item) {
@@ -198,218 +152,118 @@ public class ItemList {
     public static List<ItemFilter> getItemFilters() {
         LinkedList<ItemFilter> filters = new LinkedList<>();
         synchronized (itemFilterers) {
-            for (ItemFilterProvider p : itemFilterers) {
+            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<>();
-            for (int damage = 0; damage < 16; damage++) try {
-                ItemStack itemstack = new ItemStack(item, 1, damage);
-                IIcon icon = item.getIconIndex(itemstack);
-                String name = getTooltip(itemstack);
-                String s = name + "@" + (icon == null ? 0 : icon.hashCode());
-                if (damageIconSet.add(s)) {
-                    permutations.add(itemstack);
-                }
-            } catch (TimeoutException t) {
-                throw t;
-            } catch (Throwable t) {
-                NEIServerUtils.logOnce(
-                        t,
-                        stackTraces,
-                        "Ommiting " + item + ":" + damage + " " + item.getClass().getSimpleName(),
-                        item.toString());
-            }
-        }
-
-        private String getTooltip(ItemStack stack) {
-            try {
-                return String.join("\n", stack.getTooltip(Minecraft.getMinecraft().thePlayer, false));
-            } catch (Throwable ignored) {}
-
-            return "";
-        }
-
-        private void updateOrdering(List<ItemStack> items) {
-            final Map<ItemStack, Integer> newOrdering = new HashMap<>();
-            ItemSorter.sort(items);
-
-            if (!CollapsibleItems.isEmpty()) {
-                final HashMap<Integer, Integer> groups = new HashMap<>();
-                int orderIndex = 0;
-
-                for (ItemStack stack : items) {
-                    final int groupIndex = CollapsibleItems.getGroupIndex(stack);
-
-                    if (groupIndex == -1) {
-                        newOrdering.put(stack, orderIndex++);
-                    } else {
-
-                        if (!groups.containsKey(groupIndex)) {
-                            groups.put(groupIndex, orderIndex++);
-                        }
-
-                        newOrdering.put(stack, groups.get(groupIndex));
+            for (int damage = 0; damage < 16; damage++)
+                try {
+                    ItemStack itemstack = new ItemStack(item, 1, damage);
+                    IIcon icon = item.getIconIndex(itemstack);
+                    String name = GuiContainerManager.concatenatedDisplayName(itemstack, false);
+                    String s = name + "@" + (icon == null ? 0 : icon.hashCode());
+                    if (!damageIconSet.contains(s)) {
+                        damageIconSet.add(s);
+                        permutations.add(itemstack);
                     }
                 }
-            } else {
-                int orderIndex = 0;
-
-                for (ItemStack stack : items) {
-                    newOrdering.put(stack, orderIndex++);
+                catch(TimeoutException t) {
+                    throw t;
+                }
+                catch(Throwable t) {
+                    NEIServerUtils.logOnce(t, stackTraces, "Ommiting "+item+":"+damage+" "+item.getClass().getSimpleName(), item.toString());
                 }
-            }
-
-            ItemList.ordering = newOrdering;
         }
 
-        private List<ItemStack> getPermutations(Item item) {
-            final List<ItemStack> permutations = new LinkedList<>(ItemInfo.itemOverrides.get(item));
-
-            if (permutations.isEmpty()) {
-                item.getSubItems(item, null, permutations);
-            }
-
-            if (permutations.isEmpty()) {
-                damageSearch(item, permutations);
-            }
-
-            permutations.addAll(ItemInfo.itemVariants.get(item));
-
-            return permutations.stream()
-                    .filter(
-                            stack -> stack.getItem() != null && stack.getItem().delegate.name() != null
-                                    && !ItemInfo.isHidden(stack))
-                    .collect(Collectors.toList());
-        }
-
-        // For optimization it generate itemslist, permutations, orders & collapsibleitems
         @Override
         @SuppressWarnings("unchecked")
         public void execute() {
-            if (!NEIClientConfig.isEnabled()) return;
-
+            // System.out.println("Executing NEI Item Loading");
             ThreadOperationTimer timer = getTimer(NEIClientConfig.getItemLoadingTimeout());
-            LayoutManager.itemsLoaded = true;
-            loadFinished = false;
 
-            SearchField.searchParser.clearCache();
-            ItemSorter.instance.ordering.clear();
-            CollapsibleItems.clearCache();
-            TooltipFilter.clearCache();
-
-            List<ItemStack> items = new ArrayList<>();
+            LinkedList<ItemStack> items = new LinkedList<>();
+            LinkedList<ItemStack> permutations = new LinkedList<>();
             ListMultimap<Item, ItemStack> itemMap = ArrayListMultimap.create();
-            ItemStackSet unique = new ItemStackSet();
 
-            StreamSupport.stream(((Iterable<Item>) Item.itemRegistry).spliterator(), true).forEach(item -> {
-                if (item == null || item.delegate.name() == null || erroredItems.contains(item)) return;
+            timer.setLimit(NEIClientConfig.getItemLoadingTimeout());
+            for (Item item : (Iterable<Item>) Item.itemRegistry) {
+                if (interrupted()) return;
+
+                if (item == null || erroredItems.contains(item))
+                    continue;
 
                 try {
                     timer.reset(item);
-                    List<ItemStack> permutations = getPermutations(item);
+
+                    permutations.clear();
+                    permutations.addAll(ItemInfo.itemOverrides.get(item));
+
+                    if (permutations.isEmpty())
+                        item.getSubItems(item, null, permutations);
+
+                    if (permutations.isEmpty())
+                        damageSearch(item, permutations);
+
+                    permutations.addAll(ItemInfo.itemVariants.get(item));
+
                     timer.reset();
 
-                    for (ItemStack stack : permutations) {
-                        if (!unique.contains(stack)) {
-
-                            synchronized (unique) {
-                                unique.add(stack);
-                            }
-
-                            synchronized (items) {
-                                items.add(stack);
-                            }
-
-                            CollapsibleItems.putItem(stack);
-                            TooltipFilter.getSearchTooltip(stack);
-                        }
-                    }
-
-                    synchronized (itemMap) {
-                        itemMap.putAll(item, permutations);
-                    }
+                    items.addAll(permutations);
+                    itemMap.putAll(item, permutations);
                 } catch (Throwable t) {
-                    NEIServerConfig.logger.error("Removing item: {} from list.", item, t);
+                    NEIServerConfig.logger.error("Removing item: " + item + " from list.", t);
                     erroredItems.add(item);
                 }
-
-            });
-
-            int index = 0;
-            for (Item item : (Iterable<Item>) Item.itemRegistry) {
-                for (ItemStack stack : itemMap.get(item)) {
-                    ItemSorter.instance.ordering.put(stack, index++);
-                }
             }
 
-            if (interrupted()) return;
+            if(interrupted()) return;
             ItemList.items = items;
             ItemList.itemMap = itemMap;
-            for (ItemsLoadedCallback callback : loadCallbacks) callback.itemsLoaded();
+            for(ItemsLoadedCallback callback : loadCallbacks)
+                callback.itemsLoaded();
 
-            if (interrupted()) return;
-            updateOrdering(ItemList.items);
-
-            loadFinished = true;
-
-            SubsetWidget.updateHiddenItems();
-            ItemPanels.bookmarkPanel.load();
             updateFilter.restart();
         }
     };
 
-    public static ForkJoinPool forkJoinPool;
+    public static ForkJoinPool getPool(int poolSize) {
+        if(poolSize < 1)
+            poolSize = 1;
 
-    static {
-        final ForkJoinPool.ForkJoinWorkerThreadFactory factory = new ForkJoinPool.ForkJoinWorkerThreadFactory() {
-
-            private int workerId;
-
-            @Override
-            public ForkJoinWorkerThread newThread(ForkJoinPool pool) {
-                final ForkJoinWorkerThread worker = ForkJoinPool.defaultForkJoinWorkerThreadFactory.newThread(pool);
-                worker.setName("NEI-worker-thread-" + workerId++);
-                return worker;
-            }
-        };
-        int poolSize = Runtime.getRuntime().availableProcessors() * 2 / 3;
-        if (poolSize < 1) poolSize = 1;
-        forkJoinPool = new ForkJoinPool(poolSize, factory, null, false);
+        return new ForkJoinPool(poolSize);
     }
 
-    public static final RestartableTask updateFilter = new RestartableTask("NEI Item Filtering") {
+    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() {
-
-            if (!loadFinished) return;
-            ItemFilter filter = getItemListFilter();
+            // System.out.println("Executing NEI Item Filtering");
             ArrayList<ItemStack> filtered;
+            ItemFilter filter = getItemListFilter();
 
             try {
-                filtered = ItemList.forkJoinPool.submit(
-                        () -> items.parallelStream().filter(filter::matches)
-                                .collect(Collectors.toCollection(ArrayList::new)))
-                        .get();
+                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;
-
-            filtered.sort(Comparator.comparingInt(ItemList.ordering::get));
-
-            if (interrupted()) return;
-
+            if(interrupted()) return;
+            ItemSorter.sort(filtered);
+            if(interrupted()) return;
             ItemPanel.updateItemList(filtered);
         }
     };

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

@@ -1,9 +1,5 @@
 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,25 +12,29 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntityMobSpawner;
-import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 import net.minecraftforge.client.MinecraftForgeClient;
 
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
-public class ItemMobSpawner extends ItemBlock {
-
-    private static final Map<Integer, EntityLiving> entityHashMap = new HashMap<>();
-    private static final Map<Integer, String> IDtoNameMap = new HashMap<>();
+public class ItemMobSpawner extends ItemBlock
+{
+    private static Map<Integer, EntityLiving> entityHashMap;
+    private static Map<Integer, String> IDtoNameMap;
     public static int idPig;
     private static boolean loaded;
 
     public ItemMobSpawner() {
         super(Blocks.mob_spawner);
+
         hasSubtypes = true;
         MinecraftForgeClient.registerItemRenderer(this, new SpawnerRenderer());
+
+        entityHashMap = new HashMap<>();
+        IDtoNameMap = new HashMap<>();
     }
 
     /**
@@ -49,11 +49,9 @@ 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());
@@ -67,32 +65,30 @@ public class ItemMobSpawner extends ItemBlock {
         return false;
     }
 
-    @SideOnly(Side.CLIENT)
     @Override
-    public void addInformation(ItemStack itemstack, EntityPlayer par2EntityPlayer, List<String> list, boolean par4) {
+    public void addInformation(ItemStack itemstack, EntityPlayer par2EntityPlayer, List list, boolean par4) {
         setDefaultTag(itemstack);
         int meta = itemstack.getItemDamage();
         if (meta == 0) {
             meta = idPig;
         }
         Entity e = getEntity(meta);
-        list.add(
-                (e instanceof IMob ? EnumChatFormatting.DARK_RED : EnumChatFormatting.DARK_AQUA)
-                        + IDtoNameMap.get(meta));
+        list.add("\u00A7" + (e instanceof IMob ? "4" : "3") + IDtoNameMap.get(meta));
     }
 
     public static EntityLiving getEntity(int ID) {
         EntityLiving e = entityHashMap.get(ID);
         if (e == null) {
-            loadSpawners();
-            Class<?> clazz = EntityList.IDtoClassMapping.get(ID);
             World world = NEIClientUtils.mc().theWorld;
+            loadSpawners(world);
+            Class<?> clazz = (Class<?>) EntityList.IDtoClassMapping.get(ID);
             try {
-                e = (EntityLiving) clazz.getConstructor(new Class[] { World.class }).newInstance(world);
+                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);
@@ -100,36 +96,50 @@ public class ItemMobSpawner extends ItemBlock {
         return e;
     }
 
-    public static void clearEntityReferences() {
-        entityHashMap.clear();
+    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() {
+    public static void loadSpawners(World world) {
         if (loaded) return;
         loaded = true;
-        for (Map.Entry<Class<? extends Entity>, String> entry : EntityList.classToStringMapping.entrySet()) {
-            final Class<? extends Entity> clazz = entry.getKey();
-            if (EntityLiving.class.isAssignableFrom(clazz)) {
-                Integer id = (Integer) EntityList.classToIDMapping.get(clazz);
-                if (id == null) continue;
-                String name = entry.getValue();
-                if (name == null) continue;
-                if (name.equals("EnderDragon")) continue;
-                if (name.equals("Pig")) idPig = id;
-                if (clazz != EntityPig.class || name.equals("Pig")) {
-                    IDtoNameMap.put(id, name);
-                }
+        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;
+            try {
+                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;
+
+                IDtoNameMap.put(id, name);
+
+                if (name.equals("Pig"))
+                    idPig = id;
+            } catch (Throwable ignored) {
             }
         }
+
+        IDtoNameMap.entrySet().removeIf(e -> getEntity(e.getKey()).getClass() == EntityPig.class && !e.getValue().equals("Pig"));
     }
 
     @Override
-    public void getSubItems(Item item, CreativeTabs tab, List<ItemStack> list) {
-        if (!NEIClientConfig.hasSMPCounterPart()) list.add(new ItemStack(item));
-        else for (int i : IDtoNameMap.keySet()) list.add(new ItemStack(item, 1, i));
+    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));
     }
 }

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

@@ -1,20 +1,20 @@
 package codechicken.nei;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
+import codechicken.lib.vec.Rectangle4i;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.item.ItemStack;
 
-import codechicken.lib.gui.GuiDraw;
-import codechicken.nei.ItemsPanelGrid.ItemsPanelGridSlot;
-import codechicken.nei.util.NEIMouseUtils;
+import javax.annotation.Nullable;
 
-public class ItemPanel extends PanelWidget<ItemsPanelGrid> {
+import static codechicken.lib.gui.GuiDraw.drawRect;
 
+import java.util.ArrayList;
+
+public class ItemPanel extends PanelWidget
+{
+   
     /**
-     * Backwards compat :-/
+     *  Backwards compat :-/
      */
     @SuppressWarnings("unused")
     @Deprecated
@@ -25,218 +25,205 @@ public class ItemPanel extends PanelWidget<ItemsPanelGrid> {
 
     @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));
+        }
+
     }
 
-    public ItemHistoryPanel historyPanel = new ItemHistoryPanel();
-    public Button toggleGroups;
+    protected static class ItemPanelGrid extends ItemsGrid
+    {
+        public ArrayList<ItemStack> newItems;
 
-    @Deprecated
-    public static class ItemPanelSlot extends ItemsPanelGridSlot {
-
-        @Deprecated
-        public ItemPanelSlot(int idx, ItemStack item) {
-            this(idx, 0, item);
+        public void setItems(ArrayList<ItemStack> items)
+        {
+            newItems = items;
         }
 
-        @Deprecated
-        public ItemPanelSlot(int idx) {
-            this(idx, 0, ItemPanels.itemPanel.getGrid().getItem(idx));
-        }
+        public void refresh(GuiContainer gui)
+        {
 
-        private ItemPanelSlot(int slotIndex, int itemIndex, ItemStack item) {
-            super(slotIndex, itemIndex, item);
-        }
-
-        protected static ItemPanelSlot of(ItemsPanelGridSlot slot) {
-
-            if (slot != null) {
-                ItemPanelSlot customSlot = new ItemPanelSlot(slot.slotIndex, slot.itemIndex, slot.item);
-                customSlot.groupIndex = slot.groupIndex;
-                customSlot.displayName = slot.displayName;
-                customSlot.bgItemStack = slot.bgItemStack;
-                customSlot.groupSize = slot.groupSize;
-                customSlot.extended = slot.extended;
-                customSlot.bgColor = slot.bgColor;
-                return customSlot;
+            if (newItems != null) {
+                realItems = newItems;
+                newItems = null;
+                refreshBuffer = true;
             }
 
-            return null;
+            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() {
-        this.grid = new ItemsPanelGrid();
+    public ItemPanel()
+    {
+        grid = new ItemPanelGrid();
     }
 
-    public static void updateItemList(ArrayList<ItemStack> newItems) {
-        ItemPanels.itemPanel.getGrid().setItems(newItems);
+    public static void updateItemList(ArrayList<ItemStack> newItems)
+    {
+        ((ItemPanelGrid) ItemPanels.itemPanel.getGrid()).setItems(newItems);
         ItemPanels.itemPanel.realItems = newItems;
     }
 
     @Override
-    public void init() {
+    public void init()
+    {
         super.init();
 
-        toggleGroups = new Button("G") {
-
-            @Override
-            public String getButtonTip() {
-                return NEIClientUtils.translate("itempanel.collapsed.button.tip");
-            }
-
+        more = new Button("+")
+        {
             @Override
             public boolean onButtonPress(boolean rightclick) {
-                CollapsibleItems.toggleGroups(rightclick ? false : null);
-                ItemList.updateFilter.restart();
+                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");
+
     }
 
-    @Override
-    public ItemPanelSlot getSlotMouseOver(int mousex, int mousey) {
-        // use ItemPanelSlot for Backwards compat
-        return ItemPanelSlot.of(this.grid.getSlotMouseOver(mousex, mousey));
+    @Deprecated
+    public void scroll(int i)
+    {
+        grid.shiftPage(i);
+    }
+    
+    public String getLabelText()
+    {
+        return String.format("(%d/%d)", getPage(), Math.max(1, getNumPages()));
     }
 
-    public String getLabelText() {
-        return String.format("%d/%d", getPage(), Math.max(1, getNumPages()));
-    }
-
-    protected String getPositioningSettingName() {
+    protected String getPositioningSettingName()
+    {
         return "world.panels.items";
     }
 
-    public int getMarginLeft(GuiContainer gui) {
+    public int getMarginLeft(GuiContainer gui)
+    {
         return (gui.width + gui.xSize) / 2 + PADDING;
     }
 
-    public int getMarginTop(GuiContainer gui) {
+    public int getMarginTop(GuiContainer gui)
+    {
         return PADDING;
     }
 
-    public int getWidth(GuiContainer gui) {
+    public int getWidth(GuiContainer gui)
+    {
         return gui.width - (gui.xSize + gui.width) / 2 - PADDING * 2;
     }
 
-    public int getHeight(GuiContainer gui) {
+    public int getHeight(GuiContainer gui)
+    {
         return gui.height - getMarginTop(gui) - PADDING;
     }
 
-    @Override
-    protected int resizeHeader(GuiContainer gui) {
-        int marginTop = super.resizeHeader(gui);
+    protected int resizeFooter(GuiContainer gui)
+    {
+        final int BUTTON_SIZE = 16;
 
-        toggleGroups.w = pageNext.w;
-        toggleGroups.h = pageNext.h;
-        toggleGroups.y = pageNext.y;
-        toggleGroups.x = pageNext.x - toggleGroups.w - 2;
+        more.w = less.w = BUTTON_SIZE;
+        more.h = less.h = quantity.h = BUTTON_SIZE;
 
-        return marginTop;
-    }
+        less.x = x;
+        more.x = x + w - BUTTON_SIZE;
+        more.y = less.y = quantity.y = y + h - BUTTON_SIZE;
 
-    protected int resizeFooter(GuiContainer gui) {
-        if (!NEIClientConfig.showItemQuantityWidget() && NEIClientConfig.isSearchWidgetCentered()
-                && !NEIClientConfig.showHistoryPanelWidget()) {
-            return 0;
-        }
+        quantity.x = x + BUTTON_SIZE + 2;
+        quantity.w = more.x - quantity.x - 2;
 
-        if (NEIClientConfig.showHistoryPanelWidget()) {
-            historyPanel.x = x;
-            historyPanel.w = w;
-            historyPanel.h = 8 + ItemsGrid.SLOT_SIZE * NEIClientConfig.getIntSetting("inventory.history.useRows");
-
-            if (NEIClientConfig.showItemQuantityWidget() || !NEIClientConfig.isSearchWidgetCentered()) {
-                historyPanel.y = LayoutManager.quantity.y - historyPanel.h - PanelWidget.PADDING;
-                return LayoutManager.quantity.h + historyPanel.h + PanelWidget.PADDING * 2;
-            } else {
-                historyPanel.y = y + h - historyPanel.h;
-                return historyPanel.h + PanelWidget.PADDING;
-            }
-        }
-
-        return LayoutManager.quantity.h + PanelWidget.PADDING;
+        return BUTTON_SIZE + 2;
     }
 
     @Override
-    public void setVisible() {
+    public void setVisible()
+    {
         super.setVisible();
-
+        
         if (grid.getPerPage() > 0) {
-            if (!CollapsibleItems.isEmpty() && !grid.isEmpty()) {
-                LayoutManager.addWidget(toggleGroups);
+            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.getItemQuantity();
+
+            if (amount == 0) {
+                amount = stack.getMaxStackSize();
             }
 
-            if (NEIClientConfig.showHistoryPanelWidget() && (!grid.isEmpty() || !historyPanel.isEmpty())) {
-                LayoutManager.addWidget(historyPanel);
-            }
-        }
-    }
-
-    @Override
-    public void resize(GuiContainer gui) {
-        super.resize(gui);
-        historyPanel.resize(gui);
-    }
-
-    protected ItemStack getDraggedStackWithQuantity(ItemStack itemStack) {
-        return ItemQuantityField.prepareStackWithQuantity(itemStack, 0);
-    }
-
-    @Override
-    public List<String> handleItemTooltip(GuiContainer gui, ItemStack itemstack, int mousex, int mousey,
-            List<String> currenttip) {
-
-        if (!this.grid.forceExpand && !currenttip.isEmpty()) {
-            final ItemsPanelGridSlot hoverSlot = this.grid.getSlotMouseOver(mousex, mousey);
-
-            if (hoverSlot != null && hoverSlot.groupIndex >= 0
-                    && NEIClientConfig.getBooleanSetting("inventory.collapsibleItems.customName")
-                    && !hoverSlot.extended
-                    && !"".equals(hoverSlot.displayName)) {
-                currenttip.clear();
-                currenttip.add(hoverSlot.displayName + GuiDraw.TOOLTIP_LINESPACE);
-            }
+            return NEIServerUtils.copyStack(stack, amount);
         }
 
-        return super.handleItemTooltip(gui, itemstack, mousex, mousey, currenttip);
-    }
-
-    @Override
-    public boolean handleClick(int mousex, int mousey, int button) {
-
-        if (button == 0 && !this.grid.forceExpand && NEIClientUtils.altKey()) {
-            final ItemsPanelGridSlot hoverSlot = this.grid.getSlotMouseOver(mousex, mousey);
-
-            if (hoverSlot != null && hoverSlot.groupIndex >= 0) {
-                CollapsibleItems.setExpanded(hoverSlot.groupIndex, !hoverSlot.extended);
-                this.grid.setItems(this.grid.rawItems);
-                NEIClientUtils.playClickSound();
-                return true;
-            }
-        }
-
-        return super.handleClick(mousex, mousey, button);
-    }
-
-    @Override
-    public Map<String, String> handleHotkeys(GuiContainer gui, int mousex, int mousey, Map<String, String> hotkeys) {
-        final ItemsPanelGridSlot hoverSlot = this.grid.getSlotMouseOver(mousex, mousey);
-
-        if (!this.grid.forceExpand && hoverSlot != null && hoverSlot.groupIndex >= 0 && hoverSlot.groupSize > 1) {
-            final String message = hoverSlot.extended ? "itempanel.collapsed.hint.collapse"
-                    : "itempanel.collapsed.hint.expand";
-            hotkeys.put(
-                    NEIClientUtils.getKeyName(NEIClientUtils.ALT_HASH, NEIMouseUtils.MOUSE_BTN_LMB),
-                    NEIClientUtils.translate(message, hoverSlot.groupSize));
-        }
-
-        return hotkeys;
+        return null;
     }
 
 }

src/main/java/codechicken/nei/ItemPanels.java

@@ -1,7 +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

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

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

@@ -1,25 +1,24 @@
 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.ArrayList;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.StatCollector;
-
-import codechicken.lib.config.ConfigTagParent;
-import codechicken.nei.api.API;
-import codechicken.nei.api.ItemInfo;
-import codechicken.nei.config.GuiItemSorter;
-import codechicken.nei.config.OptionOpenGui;
-
-public class ItemSorter implements Comparator<ItemStack> {
-
-    public static class SortEntry {
 
+public class ItemSorter implements Comparator<ItemStack>, ItemsLoadedCallback
+{
+    public static class SortEntry
+    {
         public final String name;
         public final Comparator<ItemStack> comparator;
 
@@ -33,7 +32,7 @@ public class ItemSorter implements Comparator<ItemStack> {
         }
 
         public String getTooltip() {
-            String tipname = name + ".tip";
+            String tipname = name+".tip";
             String tip = StatCollector.translateToLocal(tipname);
             return !tip.equals(tipname) ? tip : null;
         }
@@ -43,11 +42,12 @@ public class ItemSorter implements Comparator<ItemStack> {
     public static ArrayList<SortEntry> list = new ArrayList<>();
     public static final ItemSorter instance = new ItemSorter();
 
-    // optimisations
-    public Map<ItemStack, Integer> ordering = new HashMap<>();
+    //optimisations
+    public HashMap<ItemStack, Integer> ordering = null;
 
-    public static void sort(List<ItemStack> items) {
+    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);
@@ -56,15 +56,26 @@ public class ItemSorter implements Comparator<ItemStack> {
 
     @Override
     public int compare(ItemStack o1, ItemStack o2) {
-        for (SortEntry e : list) {
+        for(SortEntry e : list) {
             int c = e.comparator.compare(o1, o2);
-            if (c != 0) return c;
+            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;
+        for(SortEntry e : entries)
+            if(e.name.equals(name))
+                return e;
 
         return null;
     }
@@ -78,11 +89,11 @@ public class ItemSorter implements Comparator<ItemStack> {
         entries.add(e);
         ArrayList<SortEntry> nlist = new ArrayList<>(list);
         nlist.add(e);
-        list = nlist; // concurrency
+        list = nlist;//concurrency
     }
 
     public static void initConfig(ConfigTagParent tag) {
-        // minecraft, mod, id, default, meta, name
+        //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()));
@@ -91,8 +102,8 @@ public class ItemSorter implements Comparator<ItemStack> {
         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;
+            if(mod1 == null) return mod2 == null ? 0 : 1;
+            if(mod2 == null) return -1;
             return mod1.compareTo(mod2);
         });
         API.addSortOption("nei.itemsort.id", (o1, o2) -> {
@@ -103,8 +114,8 @@ public class ItemSorter implements Comparator<ItemStack> {
         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;
+            if(order1 == null) return order2 == null ? 0 : 1;
+            if(order2 == null) return -1;
             return compareInt(order1, order2);
         });
         API.addSortOption("nei.itemsort.damage", (o1, o2) -> {
@@ -113,39 +124,44 @@ public class ItemSorter implements Comparator<ItemStack> {
             return compareInt(id1, id2);
         });
         API.addSortOption("nei.itemsort.name", (o1, o2) -> {
-            String name1 = o1.getDisplayName();
-            String name2 = o2.getDisplayName();
+            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(',');
+        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);
+        if(s == null)
+            return new ArrayList<>(entries);
 
         ArrayList<SortEntry> list = new ArrayList<>();
-        for (String s2 : s.split(",")) {
+        for(String s2 : s.split(",")) {
             SortEntry e = find(s2.trim());
-            if (e != null) list.add(e);
+            if(e != null)
+                list.add(e);
         }
-        for (SortEntry e : entries) if (!list.contains(e)) list.add(e);
+        for(SortEntry e : entries)
+            if(!list.contains(e))
+                list.add(e);
 
         return list;
     }

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

@@ -1,133 +0,0 @@
-package codechicken.nei;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.function.Predicate;
-
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-
-import codechicken.nei.recipe.StackInfo;
-
-public class ItemStackAmount {
-
-    private final Map<NBTTagCompound, Long> itemMap = new LinkedHashMap<>();
-
-    public void putAll(ItemStackAmount amounts) {
-        for (Map.Entry<NBTTagCompound, Long> entry : amounts.itemMap.entrySet()) {
-            this.itemMap.put(entry.getKey(), entry.getValue() + this.itemMap.getOrDefault(entry.getKey(), 0L));
-        }
-    }
-
-    public void addAll(Iterable<ItemStack> items) {
-        for (ItemStack stack : items) {
-            add(stack);
-        }
-    }
-
-    public void add(ItemStack item) {
-        add(item, (long) StackInfo.getAmount(item));
-    }
-
-    public void add(ItemStack stack, Long value) {
-        if (stack == null || stack.getItem() == null) return;
-        final NBTTagCompound key = StackInfo.itemStackToNBT(stack, false);
-
-        if (key != null) {
-            this.itemMap.put(key, value + this.itemMap.getOrDefault(key, 0L));
-        }
-    }
-
-    public Long get(ItemStack stack) {
-        if (stack == null || stack.getItem() == null) return null;
-        final NBTTagCompound key = StackInfo.itemStackToNBT(stack, false);
-
-        return this.itemMap.get(key);
-    }
-
-    public void put(ItemStack stack, long value) {
-        if (stack == null || stack.getItem() == null) return;
-        final NBTTagCompound key = StackInfo.itemStackToNBT(stack, false);
-
-        if (key != null) {
-            this.itemMap.put(key, value);
-        }
-    }
-
-    public long getOrDefault(ItemStack stack, long defaultAmount) {
-        final Long e = get(stack);
-
-        return e == null ? defaultAmount : e;
-    }
-
-    public boolean contains(ItemStack stack) {
-        return get(stack) != null;
-    }
-
-    public void clear() {
-        this.itemMap.clear();
-    }
-
-    public Long remove(ItemStack stack) {
-        if (stack == null || stack.getItem() == null) return null;
-        final NBTTagCompound key = StackInfo.itemStackToNBT(stack, false);
-
-        return this.itemMap.remove(key);
-    }
-
-    public boolean removeIf(Predicate<Map.Entry<NBTTagCompound, Long>> predicate) {
-        return this.itemMap.entrySet().removeIf(predicate);
-    }
-
-    public Set<Map.Entry<NBTTagCompound, Long>> entrySet() {
-        return this.itemMap.entrySet();
-    }
-
-    public List<ItemStack> values() {
-        List<ItemStack> list = new ArrayList<>();
-
-        for (Map.Entry<NBTTagCompound, Long> entry : this.itemMap.entrySet()) {
-            list.add(StackInfo.loadFromNBT(entry.getKey(), Math.max(0, entry.getValue())));
-        }
-
-        return list;
-    }
-
-    public int size() {
-        return this.itemMap.size();
-    }
-
-    public boolean isEmpty() {
-        return this.itemMap.isEmpty();
-    }
-
-    public static ItemStackAmount of(ItemStackAmount map) {
-        ItemStackAmount result = new ItemStackAmount();
-        result.itemMap.putAll(map.itemMap);
-        return result;
-    }
-
-    public static ItemStackAmount of(ItemStackMap<Long> map) {
-        ItemStackAmount result = new ItemStackAmount();
-
-        for (ItemStackMap.Entry<Long> entry : map.entries()) {
-            result.put(entry.key, entry.value);
-        }
-
-        return result;
-    }
-
-    public static ItemStackAmount of(Iterable<ItemStack> items) {
-        ItemStackAmount result = new ItemStackAmount();
-
-        for (ItemStack stack : items) {
-            result.add(stack);
-        }
-
-        return result;
-    }
-
-}

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

@@ -1,38 +1,30 @@
 package codechicken.nei;
 
+import com.google.common.base.Objects;
+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 java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Function;
-
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-
-import com.google.common.base.Objects;
-
 /**
  * A maplike class for ItemStack keys with wildcard damage/NBT. Optimised for lookup
  */
-public class ItemStackMap<T> {
-
-    public static class StackMetaKey {
-
+public class ItemStackMap<T>
+{
+    public static class StackMetaKey
+    {
         public final int damage;
         public final NBTTagCompound tag;
-        private final int hashCode;
 
         public StackMetaKey(int damage, NBTTagCompound tag) {
-            if (tag != null && tag.hasNoTags()) {
-                tag = null;
-            }
-            this.hashCode = Objects.hashCode(damage, tag);
             this.damage = damage;
             this.tag = tag;
         }
@@ -42,18 +34,19 @@ public class ItemStackMap<T> {
         }
 
         public int hashCode() {
-            return this.hashCode;
+            return Objects.hashCode(damage, tag);
         }
 
         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 static class Entry<T>
+    {
         public final ItemStack key;
         public final T value;
 
@@ -63,8 +56,8 @@ public class ItemStackMap<T> {
         }
     }
 
-    public class DetailMap {
-
+    public class DetailMap
+    {
         private boolean hasWildcard;
         private T wildcard;
         private HashMap<Integer, T> damageMap;
@@ -73,7 +66,8 @@ 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) {
                 final T ret = damageMap.get(actualDamage(key));
@@ -83,7 +77,8 @@ public class ItemStackMap<T> {
                 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;
         }
@@ -134,50 +129,63 @@ 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<>(newItemStack(item, 1, WILDCARD_VALUE, WILDCARD_TAG), wildcard));
-            if (damageMap != null) for (Map.Entry<Integer, T> entry : damageMap.entrySet())
-                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<>(newItemStack(item, 1, WILDCARD_VALUE, entry.getKey()), entry.getValue()));
-            if (metaMap != null) for (Map.Entry<StackMetaKey, T> entry : metaMap.entrySet()) list.add(
-                    new Entry<>(newItemStack(item, 1, entry.getKey().damage, entry.getKey().tag), entry.getValue()));
+            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<>(newItemStack(item, 1, entry.getKey(), WILDCARD_TAG), entry.getValue()));
+            if (tagMap != null)
+                for (Map.Entry<NBTTagCompound, T> entry : tagMap.entrySet())
+                    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<>(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);
@@ -198,7 +206,7 @@ public class ItemStackMap<T> {
         WILDCARD_TAG.setBoolean("*", true);
     }
 
-    private final Map<Item, DetailMap> itemMap = new LinkedHashMap<>();
+    private final HashMap<Item, DetailMap> itemMap = new HashMap<>();
     private int size;
 
     public T get(ItemStack key) {
@@ -210,39 +218,23 @@ public class ItemStackMap<T> {
         return map == null ? null : map.get(key);
     }
 
-    public T getOrDefault(ItemStack key, T defaultValue) {
-        T e = get(key);
-        return e == null ? defaultValue : e;
-    }
-
     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);
     }
 
-    public T computeIfAbsent(ItemStack key, Function<ItemStack, ? extends T> mappingFunction) {
-        T value;
-        if ((value = get(key)) == null) {
-            T newValue;
-            if ((newValue = mappingFunction.apply(key)) != null) {
-                put(key, newValue);
-                return newValue;
-            }
-        }
-
-        return value;
-    }
-
     public void clear() {
         itemMap.clear();
-        size = 0;
     }
 
     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);
@@ -250,19 +242,22 @@ public class ItemStackMap<T> {
 
     public List<ItemStack> keys() {
         LinkedList<ItemStack> list = new LinkedList<>();
-        for (Map.Entry<Item, DetailMap> entry : itemMap.entrySet()) entry.getValue().addKeys(entry.getKey(), list);
+        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<>();
-        for (DetailMap map : itemMap.values()) map.addValues(list);
+        for (DetailMap map : itemMap.values())
+            map.addValues(list);
         return list;
     }
 
     public List<Entry<T>> entries() {
         LinkedList<Entry<T>> list = new LinkedList<>();
-        for (Map.Entry<Item, DetailMap> entry : itemMap.entrySet()) entry.getValue().addEntries(entry.getKey(), list);
+        for (Map.Entry<Item, DetailMap> entry : itemMap.entrySet())
+            entry.getValue().addEntries(entry.getKey(), list);
         return list;
     }
 

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

@@ -1,25 +1,27 @@
 package codechicken.nei;
 
+import codechicken.nei.api.ItemFilter;
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 
-import codechicken.nei.api.ItemFilter;
-
-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;
     }
 
@@ -27,16 +29,6 @@ public class ItemStackSet extends ItemStackMap<ItemStack> implements ItemFilter
         put(item, item);
     }
 
-    public ItemStackSet addAll(Iterable<ItemStack> items) {
-        for (ItemStack item : items) add(item);
-        return this;
-    }
-
-    public ItemStackSet removeAll(Iterable<ItemStack> items) {
-        for (ItemStack item : items) remove(item);
-        return this;
-    }
-
     public boolean contains(ItemStack item) {
         return get(item) != null;
     }

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

@@ -1,250 +0,0 @@
-package codechicken.nei;
-
-import java.awt.Point;
-import java.util.List;
-
-import net.minecraft.block.Block;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.item.ItemStack;
-
-import org.lwjgl.input.Keyboard;
-import org.lwjgl.opengl.GL11;
-
-import codechicken.lib.gui.GuiDraw;
-import codechicken.nei.guihook.GuiContainerManager;
-import codechicken.nei.guihook.IContainerInputHandler;
-import codechicken.nei.recipe.StackInfo;
-
-public class ItemZoom extends Widget implements IContainerInputHandler {
-
-    public static final int MIN_ZOOM = 0;
-    public static final int MAX_ZOOM = 1000;
-
-    private static final int MIN_SCALE = 2;
-    private static final int SLOT_SIZE = 16;
-
-    private Boolean previousKeyboardRepeatEnabled = null;
-
-    private ItemStack stack = null;
-    private String displayName = "";
-    private int availableAreaWidth = 0;
-    private float xPosition = 0;
-    private float yPosition = 0;
-    private float scale = 1;
-
-    public ItemZoom() {
-        GuiContainerManager.addInputHandler(this);
-    }
-
-    @Override
-    public void draw(int mx, int my) {
-
-        if (this.stack != null && this.availableAreaWidth >= SLOT_SIZE * 2
-                && (NEIClientConfig.getBooleanSetting("inventory.itemzoom.enabled")
-                        || NEIClientConfig.isKeyHashDown("gui.itemzoom_hold"))
-                && GuiContainerManager.shouldShowTooltip(NEIClientUtils.getGuiContainer())) {
-            final float inverseScaleFactor = 1.0f / this.scale;
-            final float screenScale = getScreenScale();
-            final float size = SLOT_SIZE * this.scale;
-            int shiftText = 10;
-
-            GL11.glPushMatrix();
-            GL11.glScaled(screenScale, screenScale, 1);
-            GL11.glScaled(this.scale, this.scale, 2);
-            GL11.glTranslated(this.xPosition * inverseScaleFactor, this.yPosition * inverseScaleFactor, 0);
-
-            GuiContainerManager.drawItem(0, 0, this.stack, false, "");
-
-            GL11.glPopMatrix();
-
-            GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS);
-            GuiContainerManager.enable2DRender();
-
-            if (NEIClientConfig.getBooleanSetting("inventory.itemzoom.showName")) {
-                String dispalyName = NEIClientUtils
-                        .cropText(GuiDraw.fontRenderer, this.displayName, this.availableAreaWidth);
-                GuiDraw.drawStringC(
-                        dispalyName,
-                        (int) ((this.xPosition + size / 2) * screenScale),
-                        (int) ((this.yPosition + size) * screenScale) + shiftText,
-                        NEIClientConfig.getSetting("inventory.itemzoom.nameColor").getHexValue());
-                shiftText += GuiDraw.fontRenderer.FONT_HEIGHT;
-            }
-
-            if (NEIClientConfig.getBooleanSetting("inventory.itemzoom.enabled")
-                    && NEIClientConfig.getBooleanSetting("inventory.itemzoom.helpText")) {
-                String keyName = NEIClientConfig.getKeyName("gui.itemzoom_toggle");
-
-                if (keyName != null) {
-                    String helpText = NEIClientUtils.translate("itemzoom.toggle", keyName);
-                    List<String> lines = GuiDraw.fontRenderer
-                            .listFormattedStringToWidth(helpText, this.availableAreaWidth);
-
-                    for (String line : lines) {
-                        GuiDraw.drawStringC(
-                                line,
-                                (int) ((this.xPosition + size / 2) * screenScale),
-                                (int) ((this.yPosition + size) * screenScale) + 10 + shiftText,
-                                0x66555555);
-                        shiftText += GuiDraw.fontRenderer.FONT_HEIGHT;
-                    }
-                }
-            }
-
-            GL11.glPopAttrib();
-        }
-    }
-
-    public void resize(GuiContainer gui) {
-        final ItemStack stack = getStackMouseOver(gui);
-
-        if (stack != null && (!NEIClientConfig.getBooleanSetting("inventory.itemzoom.onlySolid")
-                || Block.getBlockFromItem(stack.getItem()).getMaterial().isSolid())) {
-            final float screenScale = 1.0f / getScreenScale();
-            final float availableAreaWidth = (gui.width - gui.xSize) / 2 * screenScale;
-            final float availableAreaHeight = gui.height * screenScale;
-            final Point mouse = GuiDraw.getMousePosition();
-
-            this.scale = Math.round(getZoomAmount(gui) * getPointSize(gui) / SLOT_SIZE);
-            this.yPosition = (availableAreaHeight - this.scale * SLOT_SIZE) / 2;
-            this.xPosition = (availableAreaWidth - this.scale * SLOT_SIZE) / 2;
-            this.availableAreaWidth = (int) (availableAreaWidth / screenScale);
-
-            if (availableAreaWidth / screenScale >= mouse.x) {
-                this.xPosition += gui.width * screenScale - availableAreaWidth;
-            }
-
-            try {
-                this.displayName = stack.getDisplayName();
-            } catch (Throwable ignored) {
-                this.displayName = "Unnamed";
-            }
-
-            this.stack = StackInfo.loadFromNBT(StackInfo.itemStackToNBT(stack), 0);
-        } else {
-            this.stack = null;
-            this.displayName = "";
-        }
-    }
-
-    private float getPointSize(GuiContainer gui) {
-        final float screenScale = 1.0f / getScreenScale();
-        final float availableAreaWidth = (gui.width - (gui.xSize + gui.width) / 2) * screenScale;
-        return availableAreaWidth / MAX_ZOOM;
-    }
-
-    private float getScreenScale() {
-        return Minecraft.getMinecraft().currentScreen.width * 1f / Minecraft.getMinecraft().displayWidth;
-    }
-
-    private int getZoomAmount(GuiContainer gui) {
-        return Math.max(
-                Math.round(SLOT_SIZE * MIN_SCALE / getPointSize(gui)),
-                NEIClientConfig.getIntSetting("inventory.itemzoom.zoom"));
-    }
-
-    private void increaseZoom(GuiContainer gui) {
-        final float pointSize = getPointSize(gui);
-        final float scale = Math.round(getZoomAmount(gui) * pointSize / SLOT_SIZE);
-
-        NEIClientConfig.setIntSetting(
-                "inventory.itemzoom.zoom",
-                Math.min(MAX_ZOOM, Math.round((scale + 1) / (pointSize / SLOT_SIZE))));
-    }
-
-    private void decreaseZoom(GuiContainer gui) {
-        final float pointSize = getPointSize(gui);
-        final float scale = Math.round(getZoomAmount(gui) * pointSize / SLOT_SIZE);
-
-        NEIClientConfig.setIntSetting(
-                "inventory.itemzoom.zoom",
-                Math.max(MIN_ZOOM, Math.round(Math.max(MIN_SCALE, scale - 1) / (pointSize / SLOT_SIZE))));
-    }
-
-    private ItemStack getStackMouseOver(GuiContainer gui) {
-
-        if (NEIClientConfig.getBooleanSetting("inventory.itemzoom.neiOnly")) {
-            final Point mouse = GuiDraw.getMousePosition();
-            ItemStack stack = ItemPanels.itemPanel.getStackMouseOver(mouse.x, mouse.y);
-
-            if (stack == null) {
-                stack = ItemPanels.bookmarkPanel.getStackMouseOver(mouse.x, mouse.y);
-            }
-
-            if (stack == null) {
-                stack = ItemPanels.itemPanel.historyPanel.getStackMouseOver(mouse.x, mouse.y);
-            }
-
-            return stack;
-        }
-
-        return GuiContainerManager.getStackMouseOver(gui);
-    }
-
-    @Override
-    public boolean keyTyped(GuiContainer gui, char keyChar, int keyCode) {
-        return false;
-    }
-
-    @Override
-    public boolean mouseClicked(GuiContainer gui, int mousex, int mousey, int button) {
-        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.itemzoom_toggle")) {
-            NEIClientConfig.getSetting("inventory.itemzoom.enabled")
-                    .setBooleanValue(!NEIClientConfig.getBooleanSetting("inventory.itemzoom.enabled"));
-            return true;
-        }
-
-        if (this.stack != null && NEIClientConfig.isKeyHashDown("gui.itemzoom_hold")) {
-            return true;
-        }
-
-        if (this.stack != null && NEIClientConfig.isKeyHashDown("gui.itemzoom_zoom_in")) {
-            increaseZoom(gui);
-            previousKeyboardRepeatEnabled = Keyboard.areRepeatEventsEnabled();
-            Keyboard.enableRepeatEvents(true);
-            return true;
-        }
-
-        if (this.stack != null && NEIClientConfig.isKeyHashDown("gui.itemzoom_zoom_out")) {
-            decreaseZoom(gui);
-            previousKeyboardRepeatEnabled = Keyboard.areRepeatEventsEnabled();
-            Keyboard.enableRepeatEvents(true);
-            return true;
-        }
-
-        if (previousKeyboardRepeatEnabled != null) {
-            Keyboard.enableRepeatEvents(previousKeyboardRepeatEnabled);
-            previousKeyboardRepeatEnabled = null;
-        }
-
-        return false;
-    }
-
-    @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 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/ItemsGrid.java

@@ -1,11 +1,10 @@
 package codechicken.nei;
 
-import java.awt.Color;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-
+import codechicken.lib.vec.Rectangle4i;
+import codechicken.nei.api.GuiInfo;
+import codechicken.nei.guihook.GuiContainerManager;
+import codechicken.nei.recipe.StackInfo;
+import codechicken.nei.ItemPanel.ItemPanelSlot;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.ScaledResolution;
 import net.minecraft.client.gui.inventory.GuiContainer;
@@ -13,250 +12,17 @@ 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;
-import org.lwjgl.opengl.GL30;
 
-import codechicken.lib.vec.Rectangle4i;
-import codechicken.nei.api.GuiInfo;
-import codechicken.nei.guihook.GuiContainerManager;
-import codechicken.nei.recipe.StackInfo;
+import javax.annotation.Nullable;
+import java.util.ArrayList;
+import java.util.Arrays;
 
-public abstract class ItemsGrid<T extends ItemsGrid.ItemsGridSlot, M extends ItemsGrid.MouseContext> {
+import static codechicken.lib.gui.GuiDraw.drawRect;
 
-    protected static class ScreenCapture {
-
-        private long nextCacheRefresh = 0;
-        private Framebuffer framebuffer;
-
-        public ScreenCapture() {
-            this.framebuffer = new Framebuffer(1, 1, true);
-            this.framebuffer.setFramebufferColor(0.0F, 0.0F, 0.0F, 0.0F);
-            Minecraft.getMinecraft().getFramebuffer().bindFramebuffer(false);
-        }
-
-        protected int getGridRenderingCacheFPS(int mode) {
-            return mode == 1 ? NEIClientConfig.getIntSetting("inventory.gridRenderingCacheFPS") : 0;
-        }
-
-        public boolean needRefresh(int mode) {
-            final Minecraft minecraft = Minecraft.getMinecraft();
-            return this.nextCacheRefresh == 0 || this.framebuffer.framebufferWidth != minecraft.displayWidth
-                    || framebuffer.framebufferHeight != minecraft.displayHeight
-                    || getGridRenderingCacheFPS(mode) > 0 && this.nextCacheRefresh < System.currentTimeMillis();
-        }
-
-        public void refreshBuffer() {
-            this.nextCacheRefresh = 0;
-        }
-
-        public void captureScreen(Runnable callback, int mode) {
-            GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS);
-
-            resetFramebuffer();
-            this.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);
-
-            callback.run();
-
-            GL11.glPopAttrib();
-
-            Minecraft.getMinecraft().getFramebuffer().bindFramebuffer(false);
-            this.nextCacheRefresh = System.currentTimeMillis() + (1000 / Math.max(1, getGridRenderingCacheFPS(mode)));
-        }
-
-        private void resetFramebuffer() {
-            final Minecraft minecraft = Minecraft.getMinecraft();
-
-            if (this.framebuffer.framebufferWidth != minecraft.displayWidth
-                    || framebuffer.framebufferHeight != minecraft.displayHeight) {
-                this.framebuffer.createBindFramebuffer(minecraft.displayWidth, minecraft.displayHeight);
-                this.framebuffer.setFramebufferFilter(GL11.GL_NEAREST);
-            } else {
-                this.framebuffer.framebufferClear();
-            }
-
-            // copy depth buffer from MC (fix Angelica)
-            OpenGlHelper.func_153171_g(GL30.GL_READ_FRAMEBUFFER, minecraft.getFramebuffer().framebufferObject);
-            OpenGlHelper.func_153171_g(GL30.GL_DRAW_FRAMEBUFFER, this.framebuffer.framebufferObject);
-            GL30.glBlitFramebuffer(
-                    0,
-                    0,
-                    minecraft.displayWidth,
-                    minecraft.displayHeight,
-                    0,
-                    0,
-                    minecraft.displayWidth,
-                    minecraft.displayHeight,
-                    GL11.GL_DEPTH_BUFFER_BIT | GL11.GL_STENCIL_BUFFER_BIT,
-                    GL11.GL_NEAREST);
-        }
-
-        public void renderCapturedScreen() {
-            this.framebuffer.bindFramebufferTexture();
-
-            final Tessellator tessellator = Tessellator.instance;
-            final Minecraft minecraft = Minecraft.getMinecraft();
-            final ScaledResolution scaledresolution = new ScaledResolution(
-                    minecraft,
-                    minecraft.displayWidth,
-                    minecraft.displayHeight);
-
-            /* Set up some rendering state needed for items to work correctly */
-            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);
-            GL11.glEnable(GL11.GL_TEXTURE_2D);
-
-            tessellator.startDrawingQuads();
-
-            tessellator.addVertexWithUV(0, scaledresolution.getScaledHeight_double(), 0.0, 0, 0);
-            tessellator.addVertexWithUV(
-                    scaledresolution.getScaledWidth_double(),
-                    scaledresolution.getScaledHeight_double(),
-                    0.0,
-                    1,
-                    0);
-            tessellator.addVertexWithUV(scaledresolution.getScaledWidth_double(), 0, 0.0, 1, 1);
-            tessellator.addVertexWithUV(0, 0, 0, 0, 1);
-
-            tessellator.draw();
-
-            this.framebuffer.unbindFramebufferTexture();
-        }
-
-    }
-
-    public static class ItemsGridSlot {
-
-        protected static final float DEFAULT_SLOT_SIZE = 18f;
-        protected static final float LINE_WIDTH = 0.75f;
-
-        public final ItemStack item;
-        public final int slotIndex;
-        public final int itemIndex;
-
-        public Color borderColor = Color.BLACK;
-
-        public boolean borderLeft = false;
-        public boolean borderTop = false;
-        public boolean borderRight = false;
-        public boolean borderBottom = false;
-
-        public ItemsGridSlot(int slotIndex, int itemIndex, ItemStack itemStack) {
-            this.slotIndex = slotIndex;
-            this.itemIndex = itemIndex;
-            this.item = itemStack;
-        }
-
-        public ItemStack getItemStack() {
-            return this.item;
-        }
-
-        public <M extends MouseContext> void beforeDraw(Rectangle4i rect, M mouseContext) {
-            if (mouseContext != null && mouseContext.slotIndex == this.slotIndex) {
-                NEIClientUtils.drawRect(rect.x, rect.y, rect.w, rect.h, HIGHLIGHT_COLOR);
-            }
-        }
-
-        public <M extends MouseContext> void afterDraw(Rectangle4i rect, M mouseContext) {}
-
-        public void drawItem(Rectangle4i rect) {
-            drawItem(getItemStack(), rect);
-        }
-
-        protected void drawItem(ItemStack stack, Rectangle4i rect) {
-
-            if (rect.w != DEFAULT_SLOT_SIZE) {
-                final float panelFactor = (rect.w - 2) / (DEFAULT_SLOT_SIZE - 2);
-                GL11.glTranslatef(rect.x + 1, rect.y + 1, 0);
-                GL11.glScaled(panelFactor, panelFactor, 1);
-
-                GuiContainerManager.drawItem(0, 0, stack, true, "");
-
-                GL11.glScaled(1f / panelFactor, 1f / panelFactor, 1);
-                GL11.glTranslatef(-1 * (rect.x + 1), -1 * (rect.y + 1), 0);
-            } else {
-                GuiContainerManager.drawItem(rect.x + 1, rect.y + 1, stack, true, "");
-            }
-
-        }
-
-        public void drawBorder(Rectangle4i rect) {
-            float halfLineWidth = LINE_WIDTH / 2f;
-
-            if (this.borderLeft) {
-                NEIClientUtils
-                        .drawRect(rect.x - halfLineWidth, rect.y + halfLineWidth, LINE_WIDTH, rect.h, this.borderColor);
-            }
-
-            if (this.borderRight) {
-                NEIClientUtils.drawRect(
-                        rect.x + rect.w - halfLineWidth,
-                        rect.y - halfLineWidth,
-                        LINE_WIDTH,
-                        rect.h,
-                        this.borderColor);
-            }
-
-            if (this.borderTop) {
-                NEIClientUtils
-                        .drawRect(rect.x - halfLineWidth, rect.y - halfLineWidth, rect.w, LINE_WIDTH, this.borderColor);
-            }
-
-            if (this.borderBottom) {
-                NEIClientUtils.drawRect(
-                        rect.x + halfLineWidth,
-                        rect.y + rect.h - halfLineWidth,
-                        rect.w,
-                        LINE_WIDTH,
-                        this.borderColor);
-            }
-        }
-
-    }
-
-    public static class MouseContext {
-
-        public final int slotIndex;
-        public final int columnIndex;
-        public final int rowIndex;
-
-        public MouseContext(int slotIndex, int rowIndex, int columnIndex) {
-            this.slotIndex = slotIndex;
-            this.rowIndex = rowIndex;
-            this.columnIndex = columnIndex;
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(this.rowIndex, this.slotIndex, this.columnIndex);
-        }
-
-        public boolean equals(Object obj) {
-
-            if (obj instanceof MouseContext context) {
-                return this.columnIndex == context.columnIndex && this.rowIndex == context.rowIndex
-                        && this.slotIndex == context.slotIndex;
-            }
-
-            return false;
-        }
-
-    }
-
-    public static int SLOT_SIZE = 18;
-    public static final Color HIGHLIGHT_COLOR = new Color(0xee555555, true);
+public class ItemsGrid
+{
+    public static final int SLOT_SIZE = 18;
 
     protected int width;
     protected int height;
@@ -271,32 +37,36 @@ public abstract class ItemsGrid<T extends ItemsGrid.ItemsGridSlot, M extends Ite
     protected int page;
     protected int perPage;
 
+    protected int firstIndex;
+    protected int numPages;
+
     protected int rows;
     protected int columns;
 
+    protected boolean[] validSlotMap;
     protected boolean[] invalidSlotMap;
 
-    protected Label messageLabel = new Label(getMessageOnEmpty(), true);
+    @Nullable
+    private Framebuffer framebuffer = null;
+    protected boolean refreshBuffer = true;
 
-    protected ScreenCapture screenCapture = null;
-
-    public ArrayList<ItemStack> getItems() {
+    public ArrayList<ItemStack> getItems()
+    {
         return realItems;
     }
 
-    public ItemStack getItem(int itemIndex) {
-        return realItems.get(itemIndex);
+    public ItemStack getItem(int idx)
+    {
+        return realItems.get(idx);
     }
 
-    public int size() {
+    public int size()
+    {
         return realItems.size();
     }
 
-    public boolean isEmpty() {
-        return realItems.isEmpty();
-    }
-
-    public int indexOf(ItemStack stackA, boolean useNBT) {
+    public int indexOf(ItemStack stackA, boolean useNBT)
+    {
 
         for (int idx = 0; idx < realItems.size(); idx++) {
             if (StackInfo.equalItemAndNBT(stackA, realItems.get(idx), useNBT)) {
@@ -307,44 +77,36 @@ public abstract class ItemsGrid<T extends ItemsGrid.ItemsGridSlot, M extends Ite
         return -1;
     }
 
-    public void setPage(int page) {
-        this.page = Math.max(0, Math.min(page, getNumPages() - 1));
-        onGridChanged();
-    }
-
-    public int getPage() {
+    public int getPage()
+    {
         return page + 1;
     }
 
-    public int getPerPage() {
+    public int getPerPage()
+    {
         return perPage;
     }
 
-    public int getNumPages() {
-        if (perPage > 0) {
-            return (int) Math.ceil((float) realItems.size() / (float) perPage);
-        }
-
-        return 0;
+    public int getNumPages()
+    {
+        return numPages;
     }
 
-    public int getRows() {
+    public int getRows()
+    {
         return rows;
     }
-
-    public int getColumns() {
+    
+    public int getColumns()
+    {
         return columns;
     }
 
-    public int getLastRowIndex() {
-        final List<T> mask = getMask();
+    public void setGridSize(int mleft, int mtop, int w, int h)
+    {
+        if(width != w || height != h || mleft != marginLeft || mtop != marginTop)
+            refreshBuffer = true;
 
-        return this.columns > 0 && !mask.isEmpty()
-                ? (int) Math.ceil((float) (mask.get(mask.size() - 1).slotIndex + 1) / this.columns) - 1
-                : 0;
-    }
-
-    public void setGridSize(int mleft, int mtop, int w, int h) {
         marginLeft = mleft;
         marginTop = mtop;
 
@@ -355,19 +117,18 @@ public abstract class ItemsGrid<T extends ItemsGrid.ItemsGridSlot, M extends Ite
         rows = height / SLOT_SIZE;
 
         paddingLeft = (width % SLOT_SIZE) / 2;
-
-        messageLabel.x = marginLeft + width / 2;
-        messageLabel.y = marginTop + height / 2;
     }
 
-    public void shiftPage(int shift) {
+    public void shiftPage(int shift)
+    {
         if (perPage == 0) {
+            numPages = 0;
             page = 0;
             return;
         }
 
-        final int numPages = getNumPages();
-        final int oldPage = page;
+        numPages = (int) Math.ceil((float) realItems.size() / (float) perPage);
+
         page += shift;
 
         if (page >= numPages) {
@@ -379,209 +140,193 @@ public abstract class ItemsGrid<T extends ItemsGrid.ItemsGridSlot, M extends Ite
         }
 
         page = Math.max(0, Math.min(page, numPages - 1));
-
-        if (page != oldPage) {
-            onGridChanged();
-        }
+        if(shift != 0)
+            refreshBuffer = true;
     }
 
-    protected void onGridChanged() {
-        if (this.screenCapture != null) {
-            this.screenCapture.refreshBuffer();
-        }
-    }
-
-    public void onItemsChanged() {
-        onGridChanged();
-    }
-
-    public void refresh(GuiContainer gui) {
+    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;
-
+    private void updateGuiOverlapSlots(GuiContainer gui)
+    {
+        boolean[] oldSlotMap = invalidSlotMap;
         invalidSlotMap = new boolean[rows * columns];
         perPage = columns * rows;
 
-        if (gui != null) {
-            if (NEIClientConfig.optimizeGuiOverlapComputation()) {
-                checkGuiOverlap(gui, 0, columns - 2, 1);
-                checkGuiOverlap(gui, columns - 1, 1, -1);
-            } else {
-                checkGuiOverlap(gui, 0, columns, 1);
-            }
-        }
-
-        if (oldRows != rows || oldColumns != columns || !Arrays.equals(oldSlotMap, invalidSlotMap)) {
-            onGridChanged();
+        checkGuiOverlap(gui, 0, columns - 2, 1);
+        checkGuiOverlap(gui, columns - 1, 1, -1);
+        if(NEIClientConfig.shouldCacheItemRendering() && !Arrays.equals(oldSlotMap, invalidSlotMap)) {
+            refreshBuffer = true;
         }
     }
 
-    private void checkGuiOverlap(GuiContainer gui, int start, int end, int dir) {
+    private void checkGuiOverlap(GuiContainer gui, int start, int end, int dir)
+    {
         boolean validColumn = false;
 
-        for (int c = start; c != end && (!NEIClientConfig.optimizeGuiOverlapComputation() || !validColumn); c += dir) {
+        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 (idx >= 0 && idx < invalidSlotMap.length
-                        && !invalidSlotMap[idx]
-                        && GuiInfo.hideItemPanelSlot(gui, getSlotRect(r, c))) {
+                if (GuiInfo.hideItemPanelSlot(gui, getSlotRect(r, c)) && idx >= 0 && idx < invalidSlotMap.length && !invalidSlotMap[idx]) {
                     invalidSlotMap[idx] = true;
                     validColumn = false;
                     perPage--;
                 }
+
+            }
+
+        }
+
+    }
+
+    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 idx)
+    {
+        return invalidSlotMap[idx];
+    }
+
+    private void drawSlotOutlines(int mousex, int mousey)
+    {
+        ItemPanelSlot focused = getSlotMouseOver(mousex, mousey);
+        int idx = page * perPage;
+        for (int i = 0; i < rows * columns && idx < size(); i++) {
+            if(!invalidSlotMap[i]) {
+                drawSlotOutline(focused, idx, getSlotRect(i));
+                idx++;
             }
         }
     }
 
-    public T getSlotMouseOver(int mousex, int mousey) {
+    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);
+        framebuffer.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);
+    }
+
+    public void draw(int mousex, int mousey)
+    {
+        if (getPerPage() == 0) {
+            return;
+        }
+
+        boolean shouldCache = NEIClientConfig.shouldCacheItemRendering() && !PresetsWidget.inEditMode();
+        if(shouldCache) {
+            Minecraft minecraft = Minecraft.getMinecraft();
+            if (framebuffer == null) {
+                framebuffer = new Framebuffer(minecraft.displayWidth, minecraft.displayHeight, true);
+                framebuffer.framebufferColor[0] = 0.0F;
+                framebuffer.framebufferColor[1] = 0.0F;
+                framebuffer.framebufferColor[2] = 0.0F;
+            }
+            drawSlotOutlines(mousex, mousey);
+            if (refreshBuffer) {
+                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);
+            } else {
+                blitExistingBuffer();
+                return;
+            }
+        } else {
+            drawSlotOutlines(mousex, mousey);
+        }
+
+        GuiContainerManager.enableMatrixStackLogging();
+
+        int idx = page * perPage;
+        for (int i = 0; i < rows * columns && idx < size(); i++) {
+            if (!invalidSlotMap[i]) {
+                drawItem(getSlotRect(i), idx);
+                idx ++;
+            }
+        }
+
+        GuiContainerManager.disableMatrixStackLogging();
+
+        if (refreshBuffer && shouldCache) {
+            refreshBuffer = false;
+            Minecraft.getMinecraft().getFramebuffer().bindFramebuffer(false);
+            blitExistingBuffer();
+        }
+    }
+
+    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 = getRowIndex(mousey);
-        final int overColumn = getColumnIndex(mousex);
+        final int overRow = (int) ((mousey - marginTop) / SLOT_SIZE);
+        final int overColumn = (int) ((mousex - marginLeft - paddingLeft) / SLOT_SIZE);
         final int slt = columns * overRow + overColumn;
+        int idx = page * perPage + slt;
 
         if (overRow >= rows || overColumn >= columns) {
             return null;
         }
 
-        return getSlotBySlotIndex(slt);
-    }
-
-    public T getSlotBySlotIndex(int slotIndex) {
-        return getMask().stream().filter(item -> item.slotIndex == slotIndex).findAny().orElse(null);
-    }
-
-    public T getSlotByItemIndex(int itemIndex) {
-        return getMask().stream().filter(item -> item.itemIndex == itemIndex).findAny().orElse(null);
-    }
-
-    public Rectangle4i getItemRect(int itemIndex) {
-        final T item = getSlotByItemIndex(itemIndex);
-        return item != null ? getSlotRect(item.slotIndex) : null;
-    }
-
-    public Rectangle4i getSlotRect(int slotIndex) {
-        return getSlotRect(slotIndex / columns, slotIndex % columns);
-    }
-
-    public Rectangle4i getSlotRect(int row, int column) {
-        return new Rectangle4i(
-                marginLeft + paddingLeft + column * SLOT_SIZE,
-                marginTop + row * SLOT_SIZE,
-                SLOT_SIZE,
-                SLOT_SIZE);
-    }
-
-    public int getRowIndex(int mousey) {
-        return (mousey - this.marginTop) / SLOT_SIZE;
-    }
-
-    public int getColumnIndex(int mousex) {
-        return (mousex - this.marginLeft - this.paddingLeft) / SLOT_SIZE;
-    }
-
-    public boolean isInvalidSlot(int index) {
-        return invalidSlotMap[index];
-    }
-
-    public abstract List<T> getMask();
-
-    protected abstract M getMouseContext(int mousex, int mousey);
-
-    protected void beforeDrawItems(int mousex, int mousey, M mouseContext) {
-        for (T item : getMask()) {
-            item.beforeDraw(getSlotRect(item.slotIndex), mouseContext);
-        }
-        for (T item : getMask()) {
-            item.drawBorder(getSlotRect(item.slotIndex));
-        }
-    }
-
-    protected void afterDrawItems(int mousex, int mousey, M mouseContext) {
-        for (T item : getMask()) {
-            item.afterDraw(getSlotRect(item.slotIndex), mouseContext);
-        }
-    }
-
-    public void update() {}
-
-    protected void drawItems() {
-
-        for (T item : getMask()) {
-            item.drawItem(getSlotRect(item.slotIndex));
-        }
-
-    }
-
-    protected int getGridRenderingCacheMode() {
-        return NEIClientConfig.getGridRenderingCacheMode();
-    }
-
-    public void draw(int mousex, int mousey) {
-        if (getPerPage() == 0) {
-            return;
-        }
-
-        final int gridRenderingCacheMode = getGridRenderingCacheMode();
-        final M mouseContext = getMouseContext(mousex, mousey);
-
-        beforeDrawItems(mousex, mousey, mouseContext);
-
-        if (gridRenderingCacheMode > 0) {
-
-            if (this.screenCapture == null) {
-                this.screenCapture = new ScreenCapture();
+        for (int i = 0; i < slt; i++) {
+            if (invalidSlotMap[i]) {
+                idx--;
             }
-
-            if (this.screenCapture.needRefresh(gridRenderingCacheMode)) {
-                this.screenCapture.captureScreen(() -> {
-                    GuiContainerManager.enableMatrixStackLogging();
-                    drawItems();
-                    GuiContainerManager.disableMatrixStackLogging();
-                }, gridRenderingCacheMode);
-            }
-
-            this.screenCapture.renderCapturedScreen();
-        } else {
-            GuiContainerManager.enableMatrixStackLogging();
-            drawItems();
-            GuiContainerManager.disableMatrixStackLogging();
         }
 
-        afterDrawItems(mousex, mousey, mouseContext);
+        return idx < size()? new ItemPanelSlot(idx, realItems.get(idx)): null;
     }
 
-    public void setVisible() {
-        if (getItems().isEmpty() && getMessageOnEmpty() != null) {
-            LayoutManager.addWidget(messageLabel);
-        }
-    }
+    public boolean contains(int px, int py)
+    {
 
-    public boolean contains(int px, int py) {
-        final Rectangle4i rect = new Rectangle4i(
-                marginLeft + paddingLeft,
-                marginTop,
-                columns * SLOT_SIZE,
-                rows * SLOT_SIZE);
-
-        if (!rect.contains(px, py)) {
+        if (!(new Rectangle4i(marginLeft + paddingLeft, marginTop, columns * SLOT_SIZE, height)).contains(px, py)) {
             return false;
         }
 
-        return !isInvalidSlot(columns * getRowIndex(py) + getColumnIndex(px));
+        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 || !invalidSlotMap[slt];
     }
 
-    public String getMessageOnEmpty() {
-        return null;
-    }
-}
+}

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

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

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

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

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

@@ -1,5 +1,7 @@
 package codechicken.nei;
 
+import org.lwjgl.input.Keyboard;
+
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.Map.Entry;
@@ -7,39 +9,44 @@ import java.util.Map.Entry;
 /**
  * Good old down/held/up keystate tracker
  */
-public class KeyManager {
-
-    public static interface IKeyStateTracker {
-
+public class KeyManager
+{
+    public static interface IKeyStateTracker
+    {
         public void tickKeyStates();
     }
-
-    public static class KeyState {
-
+    
+    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) {
+    
+    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 {
+            }
+            else
+            {
                 state.up = state.held;
                 state.down = false;
             }
-
             state.held = down;
         }
-
-        for (IKeyStateTracker tracker : trackers) tracker.tickKeyStates();
+        
+        for(IKeyStateTracker tracker : trackers)
+            tracker.tickKeyStates();
     }
 }

src/main/java/codechicken/nei/LRUCache.java

@@ -1,21 +0,0 @@
-package codechicken.nei;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-// Simple LRUCache
-public class LRUCache<K, V> extends LinkedHashMap<K, V> {
-
-    private final int capacity;
-
-    public LRUCache(int capacity) {
-        super(capacity, 0.75f, true);
-        this.capacity = capacity;
-    }
-
-    @Override
-    protected boolean removeEldestEntry(Map.Entry<K, V> eldest) {
-        return size() > capacity;
-    }
-
-}

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

@@ -3,25 +3,30 @@ package codechicken.nei;
 import static codechicken.lib.gui.GuiDraw.drawString;
 import static codechicken.lib.gui.GuiDraw.drawStringC;
 
-public class Label extends Widget {
-
+public class Label extends Widget
+{
     final boolean centered;
     final int colour;
     public String text;
-
-    public Label(String s, boolean center, int color) {
+    
+    public Label(String s, boolean center, int color)
+    {
         text = s;
         centered = center;
         colour = color;
     }
-
-    public Label(String s, boolean center) {
+    
+    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);
+    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/LayoutStyleMinecraft.java

@@ -1,20 +1,32 @@
 package codechicken.nei;
 
-import static codechicken.lib.gui.GuiDraw.drawStringC;
-
-import net.minecraft.client.gui.inventory.GuiContainer;
-
-import org.lwjgl.opengl.GL11;
-
-import codechicken.lib.vec.Rectangle4i;
 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 {
-
-    protected static final int BUTTON_SIZE = 20;
-    protected static final int MARGIN = 2;
+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.presetsPanel;
+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.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;
 
+public class LayoutStyleMinecraft extends LayoutStyle
+{
     public int buttonCount;
     public int leftSize;
     public int numButtons;
@@ -26,21 +38,19 @@ public class LayoutStyleMinecraft extends LayoutStyle {
 
     @Override
     public void init() {
-        LayoutManager.delete.icon = new Image(144, 12, 12, 12);
-        LayoutManager.rain.icon = new Image(120, 12, 12, 12);
-        LayoutManager.gamemode.icons[0] = new Image(132, 12, 12, 12);
-        LayoutManager.gamemode.icons[1] = new Image(156, 12, 12, 12);
-        LayoutManager.gamemode.icons[2] = new Image(168, 12, 12, 12);
-        LayoutManager.magnet.icon = new Image(180, 24, 12, 12);
-        LayoutManager.timeButtons[0].icon = new Image(132, 24, 12, 12);
-        LayoutManager.timeButtons[1].icon = new Image(120, 24, 12, 12);
-        LayoutManager.timeButtons[2].icon = new Image(144, 24, 12, 12);
-        LayoutManager.timeButtons[3].icon = new Image(156, 24, 12, 12);
-        LayoutManager.heal.icon = new Image(168, 24, 12, 12);
-        LayoutManager.itemPresenceOverlays[0] = new DrawableBuilder("nei:textures/nei_tabbed_sprites.png", 0, 40, 8, 8)
-                .build();
-        LayoutManager.itemPresenceOverlays[1] = new DrawableBuilder("nei:textures/nei_tabbed_sprites.png", 8, 40, 8, 8)
-                .build();
+        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
@@ -53,177 +63,97 @@ public class LayoutStyleMinecraft extends LayoutStyle {
         reset();
 
         leftSize = ItemPanels.bookmarkPanel.getWidth(gui);
-        numButtons = Math.max(leftSize / 20, 1);
+        numButtons = Math.max(leftSize / 18, 1);
 
-        LayoutManager.delete.state = 0x4;
-        if (NEIController.getDeleteMode()) {
-            LayoutManager.delete.state |= 1;
-        } else if (!visiblity.enableDeleteMode) {
-            LayoutManager.delete.state |= 2;
-        }
+        delete.state = 0x4;
+        if (NEIController.getDeleteMode())
+            delete.state |= 1;
+        else if (!visiblity.enableDeleteMode)
+            delete.state |= 2;
 
-        LayoutManager.rain.state = 0x4;
-        if (NEIClientConfig.disabledActions.contains("rain")) {
-            LayoutManager.rain.state |= 2;
-        } else if (NEIClientUtils.isRaining()) {
-            LayoutManager.rain.state |= 1;
-        }
+        rain.state = 0x4;
+        if (disabledActions.contains("rain"))
+            rain.state |= 2;
+        else if (NEIClientUtils.isRaining())
+            rain.state |= 1;
 
-        LayoutManager.gamemode.state = 0x4;
+        gamemode.state = 0x4;
         if (NEIClientUtils.getGamemode() != 0) {
-            LayoutManager.gamemode.state |= 0x1;
-            LayoutManager.gamemode.index = NEIClientUtils.getGamemode() - 1;
+            gamemode.state |= 0x1;
+            gamemode.index = NEIClientUtils.getGamemode() - 1;
         } else {
-            if (NEIClientUtils.isValidGamemode("creative")) {
-                LayoutManager.gamemode.index = 0;
-            } else if (NEIClientUtils.isValidGamemode("creative+")) {
-                LayoutManager.gamemode.index = 1;
-            } else if (NEIClientUtils.isValidGamemode("adventure")) {
-                LayoutManager.gamemode.index = 2;
-            }
+            if (NEIClientUtils.isValidGamemode("creative"))
+                gamemode.index = 0;
+            else if (NEIClientUtils.isValidGamemode("creative+"))
+                gamemode.index = 1;
+            else if (NEIClientUtils.isValidGamemode("adventure"))
+                gamemode.index = 2;
         }
-        LayoutManager.bookmarksButton.index = NEIClientConfig.isBookmarkPanelHidden() ? 0 : 1;
-        LayoutManager.options.index = NEIClientConfig.getCheatMode();
+        bookmarksButton.index = NEIClientConfig.isBookmarkPanelHidden() ? 0 : 1;
+        options.index = NEIClientConfig.getCheatMode();
 
-        LayoutManager.magnet.state = 0x4 | (NEIClientConfig.getMagnetMode() ? 1 : 0);
+        magnet.state = 0x4 | (getMagnetMode() ? 1 : 0);
 
-        if (NEIClientConfig.canPerformAction("delete")) {
-            layoutButton(LayoutManager.delete);
-        }
-
-        if (NEIClientConfig.canPerformAction("rain")) {
-            layoutButton(LayoutManager.rain);
-        }
-
-        if (NEIClientUtils.isValidGamemode("creative") || NEIClientUtils.isValidGamemode("creative+")
-                || NEIClientUtils.isValidGamemode("adventure")) {
-            layoutButton(LayoutManager.gamemode);
-        }
-
-        if (NEIClientConfig.canPerformAction("magnet")) {
-            layoutButton(LayoutManager.magnet);
-        }
-
-        if (NEIClientConfig.canPerformAction("time")) {
+        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++) {
-                LayoutManager.timeButtons[i].state = NEIClientConfig.disabledActions.contains(NEIActions.timeZones[i])
-                        ? 2
-                        : 0;
-                layoutButton(LayoutManager.timeButtons[i]);
+                timeButtons[i].state = disabledActions.contains(NEIActions.timeZones[i]) ? 2 : 0;
+                layoutButton(timeButtons[i]);
             }
         }
+        if (canPerformAction("heal"))
+            layoutButton(heal);
 
-        if (NEIClientConfig.canPerformAction("heal")) {
-            layoutButton(LayoutManager.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);
         }
 
-        layoutFooter(gui, visiblity);
-
-        LayoutManager.itemPanel.resize(gui);
-        LayoutManager.bookmarkPanel.resize(gui);
-        LayoutManager.itemZoom.resize(gui);
-    }
-
-    protected void layoutFooter(GuiContainer gui, VisiblityData visiblity) {
-
-        LayoutManager.options.x = MARGIN;
-        LayoutManager.options.y = gui.height - BUTTON_SIZE - MARGIN;
-        LayoutManager.options.w = LayoutManager.options.h = BUTTON_SIZE;
-
-        LayoutManager.bookmarksButton.x = LayoutManager.options.x + LayoutManager.options.w + MARGIN;
-        LayoutManager.bookmarksButton.y = gui.height - BUTTON_SIZE - MARGIN;
-        LayoutManager.bookmarksButton.w = LayoutManager.bookmarksButton.h = BUTTON_SIZE;
-
-        final Rectangle4i searchArea = getSearchFieldArea(gui);
-        final Rectangle4i quantityArea = getQuantityFieldArea(visiblity);
-
-        LayoutManager.searchField.x = searchArea.x;
-        LayoutManager.searchField.y = searchArea.y;
-        LayoutManager.searchField.w = searchArea.w;
-        LayoutManager.searchField.h = searchArea.h;
-
-        if (!NEIClientConfig.subsetWidgetOnTop() && visiblity.showSubsetDropdown) {
-            LayoutManager.dropDown.x = searchArea.x;
-            LayoutManager.dropDown.y = searchArea.y;
-            LayoutManager.dropDown.h = LayoutManager.dropDown.w = BUTTON_SIZE;
-
-            LayoutManager.searchField.x += BUTTON_SIZE;
-            LayoutManager.searchField.w -= BUTTON_SIZE;
-        } else {
-            LayoutManager.dropDown.h = 16;
-            LayoutManager.dropDown.w = 150;
-            LayoutManager.dropDown.y = MARGIN;
-            LayoutManager.dropDown.x = (gui.width - LayoutManager.dropDown.w) / 2;
-        }
-
-        if (quantityArea.w == ItemPanels.itemPanel.w) {
-            LayoutManager.more.w = LayoutManager.less.w = BUTTON_SIZE;
-            LayoutManager.more.h = LayoutManager.less.h = LayoutManager.quantity.h = quantityArea.h;
-            LayoutManager.more.y = LayoutManager.less.y = LayoutManager.quantity.y = quantityArea.y;
-
-            LayoutManager.less.x = quantityArea.x;
-            LayoutManager.more.x = quantityArea.x2() - BUTTON_SIZE;
-
-            LayoutManager.quantity.x = LayoutManager.less.x + LayoutManager.less.w + 1;
-            LayoutManager.quantity.w = LayoutManager.more.x - LayoutManager.quantity.x - 1;
-        } else {
-            LayoutManager.quantity.x = quantityArea.x;
-            LayoutManager.quantity.w = quantityArea.w - 18;
-            LayoutManager.quantity.y = LayoutManager.more.y = quantityArea.y;
-            LayoutManager.quantity.h = quantityArea.h;
-
-            LayoutManager.more.w = LayoutManager.less.w = 18;
-            LayoutManager.more.x = LayoutManager.less.x = LayoutManager.quantity.x + LayoutManager.quantity.w;
-            LayoutManager.more.h = LayoutManager.less.h = LayoutManager.quantity.h / 2;
-            LayoutManager.less.y = LayoutManager.more.y + LayoutManager.more.h;
-        }
-
-    }
-
-    private Rectangle4i getSearchFieldArea(GuiContainer gui) {
-        final Rectangle4i area = new Rectangle4i(0, 0, 0, BUTTON_SIZE);
-
-        if (NEIClientConfig.isSearchWidgetCentered()) {
-            area.w = Math.min(gui.xSize, 176) - MARGIN * 2;
-            area.x = (gui.width - area.w) / 2;
-            area.y = gui.height - BUTTON_SIZE - MARGIN;
-        } else if (NEIClientConfig.showItemQuantityWidget()) {
-            area.w = ItemPanels.itemPanel.w - (int) Math.max(BUTTON_SIZE * 2.5f, ItemPanels.itemPanel.w * 0.3f) - 1;
-            area.x = ItemPanels.itemPanel.x;
-            area.y = ItemPanels.itemPanel.y + ItemPanels.itemPanel.h - BUTTON_SIZE;
-        } else {
-            area.w = ItemPanels.itemPanel.w;
-            area.x = ItemPanels.itemPanel.x;
-            area.y = ItemPanels.itemPanel.y + ItemPanels.itemPanel.h - BUTTON_SIZE;
-        }
-
-        return area;
-    }
-
-    private Rectangle4i getQuantityFieldArea(VisiblityData visiblity) {
-        final Rectangle4i area = new Rectangle4i(0, 0, 0, BUTTON_SIZE);
-
-        if (!visiblity.showSearchSection || NEIClientConfig.isSearchWidgetCentered()) {
-            area.w = ItemPanels.itemPanel.w;
-            area.x = ItemPanels.itemPanel.x;
-        } else {
-            area.w = (int) Math.max(BUTTON_SIZE * 2.5f, ItemPanels.itemPanel.w * 0.3f);
-            area.x = ItemPanels.itemPanel.x + ItemPanels.itemPanel.w - area.w;
-        }
-
-        area.y = ItemPanels.itemPanel.y + ItemPanels.itemPanel.h - BUTTON_SIZE;
-
-        return area;
     }
 
     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;
 
-        button.x = MARGIN + (buttonCount % numButtons) * (button.w + MARGIN);
-        button.y = MARGIN + (buttonCount / numButtons) * (button.h + MARGIN);
-
         buttonCount++;
     }
 
@@ -233,11 +163,13 @@ public class LayoutStyleMinecraft extends LayoutStyle {
         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
+        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;
+        else
+            tex = 1;
         LayoutManager.drawButtonBackground(b.x, b.y, b.w, b.h, true, tex);
 
         Image icon = b.getRenderIcon();
@@ -257,16 +189,12 @@ public class LayoutStyleMinecraft extends LayoutStyle {
 
     @Override
     public void drawSubsetTag(String text, int x, int y, int w, int h, int state, boolean mouseover) {
-        if (state == 1) {
+        if(state == 1)
             GL11.glColor4f(0.65F, 0.65F, 0.65F, 1.0F);
-        } else {
+        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, mouseover ? 0xFFFFFFA0 : (state == 2 ? 0xFFE0E0E0 : 0xFFA0A0A0));
-        }
+        if(text != null)
+            drawStringC(text, x, y, w, h, state == 2 ? 0xFFE0E0E0 : 0xFFA0A0A0);
     }
 }

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

@@ -5,40 +5,47 @@ 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<>();
     public static HashSet<String> canDisable = new HashSet<>();
 
-    public static void addAction(String name, String base, boolean smpreq) {
+    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");
@@ -61,23 +68,27 @@ 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() {
+    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);
+        for(NEIActions a : nameActionMap.values())
+            if(a.base.equals(a.name))
+                list.add(a.name);
         return list;
     }
 }

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

@@ -1,8 +1,10 @@
 package codechicken.nei;
 
-import static codechicken.nei.PacketIDs.C2S;
-import static codechicken.nei.PacketIDs.S2C;
-
+import codechicken.core.ClientUtils;
+import codechicken.lib.inventory.InventoryUtils;
+import codechicken.lib.packet.PacketCustom;
+import codechicken.lib.packet.PacketCustom.IClientPacketHandler;
+import cpw.mods.fml.relauncher.Side;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.inventory.GuiInventory;
 import net.minecraft.item.ItemStack;
@@ -10,50 +12,41 @@ import net.minecraft.network.play.INetHandlerPlayClient;
 import net.minecraft.util.ChatComponentTranslation;
 import net.minecraft.world.World;
 
-import codechicken.core.ClientUtils;
-import codechicken.lib.inventory.InventoryUtils;
-import codechicken.lib.packet.PacketCustom;
-import codechicken.lib.packet.PacketCustom.IClientPacketHandler;
-import cpw.mods.fml.relauncher.Side;
-
-public class NEICPH implements IClientPacketHandler {
-
+public class NEICPH implements IClientPacketHandler
+{
     public static final String channel = "NEI";
 
     @Override
     public void handlePacket(PacketCustom packet, Minecraft mc, INetHandlerPlayClient netHandler) {
         switch (packet.getType()) {
-            case S2C.SEND_SERVER_SIDE_CHECK:
+            case 1:
                 handleSMPCheck(packet.readUByte(), packet.readString(), mc.theWorld);
                 break;
-            case S2C.SEND_LOGIN_STATE:
+            case 10:
                 handleLoginState(packet);
                 break;
-            case S2C.SEND_ACTION_DISABLED:
+            case 11:
                 handleActionDisabled(packet);
                 break;
-            case S2C.SEND_ACTION_ENABLED:
+            case 12:
                 handleActionEnabled(packet);
                 break;
-            case S2C.SEND_MAGNETIC_ITEM:
+            case 13:
                 ClientHandler.instance().addSMPMagneticItem(packet.readInt(), mc.theWorld);
                 break;
-            case S2C.SEND_GAME_MODE:
+            case 14:
                 handleGamemode(mc, packet.readUByte());
                 break;
-            case S2C.OPEN_ENCHANTMENT_GUI:
-                ClientUtils.openSMPGui(
-                        packet.readUByte(),
-                        new GuiEnchantmentModifier(mc.thePlayer.inventory, mc.theWorld, 0, 0, 0));
+            case 21:
+                ClientUtils.openSMPGui(packet.readUByte(), new GuiEnchantmentModifier(mc.thePlayer.inventory, mc.theWorld, 0, 0, 0));
                 break;
-            case S2C.SET_CREATIVE_PLUS_MODE:
-                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));
+            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));
                 break;
-            case S2C.OPEN_POTION_GUI:
+            case 24:
                 ClientUtils.openSMPGui(packet.readUByte(), new GuiPotionCreator(mc.thePlayer.inventory));
                 break;
         }
@@ -65,32 +58,40 @@ 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());
@@ -105,7 +106,7 @@ public class NEICPH implements IClientPacketHandler {
             try {
                 ClientHandler.instance().loadWorld(world, true);
                 NEIClientConfig.setHasSMPCounterPart(true);
-                NEIClientConfig.loadWorld(getSaveName());
+                NEIClientConfig.loadWorld(getSaveName(worldName));
                 sendRequestLoginInfo();
             } catch (Exception e) {
                 NEIClientConfig.logger.error("Error handling SMP Check", e);
@@ -113,14 +114,15 @@ public class NEICPH implements IClientPacketHandler {
         }
     }
 
-    private static String getSaveName() {
-        if (Minecraft.getMinecraft().isSingleplayer()) return "local/" + ClientUtils.getWorldSaveName();
+    private static String getSaveName(String worldName) {
+        if (Minecraft.getMinecraft().isSingleplayer())
+            return "local/" + ClientUtils.getWorldSaveName();
 
-        return "remote/" + ClientUtils.getServerIP().replace(':', '~');
+        return "remote/" + ClientUtils.getServerIP().replace(':', '~') + "/" + worldName;
     }
 
     public static void sendGiveItem(ItemStack spawnstack, boolean infinite, boolean doSpawn) {
-        PacketCustom packet = new PacketCustom(channel, C2S.GIVE_ITEM);
+        PacketCustom packet = new PacketCustom(channel, 1);
         packet.writeItemStack(spawnstack, true);
         packet.writeBoolean(infinite);
         packet.writeBoolean(doSpawn);
@@ -128,7 +130,7 @@ public class NEICPH implements IClientPacketHandler {
     }
 
     public static void sendDeleteAllItems() {
-        PacketCustom packet = new PacketCustom(channel, C2S.DELETE_ALL_ITEMS);
+        PacketCustom packet = new PacketCustom(channel, 4);
         packet.sendToServer();
     }
 
@@ -142,18 +144,12 @@ public class NEICPH implements IClientPacketHandler {
             sendSetSlot(slot, item, false);
         }
 
-        PacketCustom packet = new PacketCustom(channel, C2S.REQUEST_CONTAINER_CONTENTS);
-        packet.sendToServer();
-    }
-
-    public static void sendRequestContainer() {
-        PacketCustom packet = new PacketCustom(channel, C2S.REQUEST_CONTAINER);
-        packet.writeInt(Minecraft.getMinecraft().thePlayer.openContainer.getInventory().size());
+        PacketCustom packet = new PacketCustom(channel, 11);
         packet.sendToServer();
     }
 
     public static void sendSetSlot(int slot, ItemStack stack, boolean container) {
-        PacketCustom packet = new PacketCustom(channel, C2S.SET_SLOT);
+        PacketCustom packet = new PacketCustom(channel, 5);
         packet.writeBoolean(container);
         packet.writeShort(slot);
         packet.writeItemStack(stack);
@@ -161,38 +157,38 @@ public class NEICPH implements IClientPacketHandler {
     }
 
     private static void sendRequestLoginInfo() {
-        PacketCustom packet = new PacketCustom(channel, C2S.REQUEST_LOGIN_INFO);
+        PacketCustom packet = new PacketCustom(channel, 10);
         packet.sendToServer();
     }
 
     public static void sendToggleMagnetMode() {
-        PacketCustom packet = new PacketCustom(channel, C2S.TOGGLE_MAGNET);
+        PacketCustom packet = new PacketCustom(channel, 6);
         packet.sendToServer();
     }
 
     public static void sendSetTime(int hour) {
-        PacketCustom packet = new PacketCustom(channel, C2S.SET_TIME);
+        PacketCustom packet = new PacketCustom(channel, 7);
         packet.writeByte(hour);
         packet.sendToServer();
     }
 
     public static void sendHeal() {
-        PacketCustom packet = new PacketCustom(channel, C2S.HEAL);
+        PacketCustom packet = new PacketCustom(channel, 8);
         packet.sendToServer();
     }
 
     public static void sendToggleRain() {
-        PacketCustom packet = new PacketCustom(channel, C2S.TOGGLE_RAIN);
+        PacketCustom packet = new PacketCustom(channel, 9);
         packet.sendToServer();
     }
 
     public static void sendOpenEnchantmentWindow() {
-        PacketCustom packet = new PacketCustom(channel, C2S.REQUEST_ENCHANTMENT_GUI);
+        PacketCustom packet = new PacketCustom(channel, 21);
         packet.sendToServer();
     }
 
     public static void sendModifyEnchantment(int enchID, int level, boolean add) {
-        PacketCustom packet = new PacketCustom(channel, C2S.MODIFY_ENCHANTMENT);
+        PacketCustom packet = new PacketCustom(channel, 22);
         packet.writeByte(enchID);
         packet.writeByte(level);
         packet.writeBoolean(add);
@@ -200,30 +196,32 @@ public class NEICPH implements IClientPacketHandler {
     }
 
     public static void sendSetPropertyDisabled(String name, boolean enable) {
-        PacketCustom packet = new PacketCustom(channel, C2S.CHANGE_PROPERTY);
+        PacketCustom packet = new PacketCustom(channel, 12);
         packet.writeString(name);
         packet.writeBoolean(enable);
         packet.sendToServer();
     }
 
     public static void sendGamemode(int mode) {
-        new PacketCustom(channel, C2S.SET_GAME_MODE).writeByte(mode).sendToServer();
+        new PacketCustom(channel, 13)
+                .writeByte(mode)
+                .sendToServer();
     }
 
     public static void sendCreativeInv(boolean open) {
-        PacketCustom packet = new PacketCustom(channel, C2S.SET_CREATIVE_PLUS_MODE);
+        PacketCustom packet = new PacketCustom(channel, 23);
         packet.writeBoolean(open);
         packet.sendToServer();
     }
 
     public static void sendCreativeScroll(int steps) {
-        PacketCustom packet = new PacketCustom(channel, C2S.CYCLE_CREATIVE_INV);
+        PacketCustom packet = new PacketCustom(channel, 14);
         packet.writeInt(steps);
         packet.sendToServer();
     }
 
     public static void sendMobSpawnerID(int x, int y, int z, String mobtype) {
-        PacketCustom packet = new PacketCustom(channel, C2S.SEND_MOB_SPAWNER_ID);
+        PacketCustom packet = new PacketCustom(channel, 15);
         packet.writeCoord(x, y, z);
         packet.writeString(mobtype);
         packet.sendToServer();
@@ -231,16 +229,15 @@ 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));
-        PacketCustom packet = new PacketCustom(channel, C2S.REQUEST_POTION_GUI);
-        for (ItemStack stack : potionStore) packet.writeItemStack(stack);
+        InventoryUtils.readItemStacksFromTag(potionStore, NEIClientConfig.global.nbt.getCompoundTag("potionStore").getTagList("items", 10));
+        PacketCustom packet = new PacketCustom(channel, 24);
+        for (ItemStack stack : potionStore)
+            packet.writeItemStack(stack);
         packet.sendToServer();
     }
 
     public static void sendDummySlotSet(int slotNumber, ItemStack stack) {
-        PacketCustom packet = new PacketCustom(channel, C2S.SET_DUMMY_SLOT);
+        PacketCustom packet = new PacketCustom(channel, 25);
         packet.writeShort(slotNumber);
         packet.writeItemStack(stack, true);
         packet.sendToServer();

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

@@ -1,18 +1,17 @@
 package codechicken.nei;
 
-import java.util.Collections;
-import java.util.List;
-
+import codechicken.nei.api.INEIGuiAdapter;
+import codechicken.nei.api.TaggedInventoryArea;
 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 codechicken.nei.api.INEIGuiAdapter;
-import codechicken.nei.api.TaggedInventoryArea;
-
-public class NEIChestGuiHandler extends INEIGuiAdapter {
+import java.util.Collections;
+import java.util.List;
 
+public class NEIChestGuiHandler extends INEIGuiAdapter
+{
     public int chestSize(GuiContainer gui) {
         return ((ContainerChest) gui.inventorySlots).getLowerChestInventory().getSizeInventory();
     }
@@ -24,8 +23,6 @@ public class NEIChestGuiHandler extends INEIGuiAdapter {
 
     @Override
     public List<TaggedInventoryArea> getInventoryAreas(GuiContainer gui) {
-        return gui instanceof GuiChest
-                ? Collections.singletonList(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/NEIClientUtils.java

@@ -1,40 +1,15 @@
 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 java.awt.Color;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.math.BigInteger;
-import java.math.RoundingMode;
-import java.text.DecimalFormat;
-import java.text.DecimalFormatSymbols;
-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.Set;
-import java.util.StringJoiner;
-import java.util.stream.Collectors;
-
+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.ItemInfo;
+import com.google.common.collect.Iterables;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.audio.PositionedSoundRecord;
-import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.client.renderer.OpenGlHelper;
-import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
@@ -42,64 +17,30 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IChatComponent;
 import net.minecraft.util.ResourceLocation;
-
 import org.lwjgl.input.Keyboard;
-import org.lwjgl.opengl.GL11;
 
-import com.google.common.collect.Iterables;
+import java.text.MessageFormat;
+import java.text.NumberFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.stream.Collectors;
 
-import codechicken.lib.gui.GuiDraw;
-import codechicken.lib.inventory.InventoryRange;
-import codechicken.lib.inventory.InventoryUtils;
-import codechicken.lib.util.LangProxy;
-import codechicken.lib.vec.Rectangle4i;
-import codechicken.nei.api.GuiInfo;
-import codechicken.nei.api.IInfiniteItemHandler;
-import codechicken.nei.api.ItemInfo;
-import codechicken.nei.util.NEIKeyboardUtils;
-import codechicken.nei.util.NEIMouseUtils;
-
-public class NEIClientUtils extends NEIServerUtils {
-
-    public static class Alignment {
-
-        public final int x, y;
-
-        public static final Alignment TopLeft = new Alignment(-1, -1);
-        public static final Alignment TopCenter = new Alignment(0, -1);
-        public static final Alignment TopRight = new Alignment(1, -1);
-        public static final Alignment CenterLeft = new Alignment(-1, 0);
-        public static final Alignment Center = new Alignment(0, 0);
-        public static final Alignment CenterRight = new Alignment(1, 0);
-        public static final Alignment BottomLeft = new Alignment(-1, 1);
-        public static final Alignment BottomCenter = new Alignment(0, 1);
-        public static final Alignment BottomRight = new Alignment(1, 1);
-
-        public Alignment(int x, int y) {
-            this.x = x;
-            this.y = y;
-        }
-
-        public float getX(float parentWidth, float childWidth) {
-            final float x = (this.x + 1) / 2f;
-            return parentWidth * x - childWidth * x;
-        }
-
-        public float getY(float parentHeight, float childHeight) {
-            final float y = (this.y + 1) / 2f;
-            return parentHeight * y - childHeight * y;
-        }
-    }
+import static codechicken.nei.NEIClientConfig.canCheatItem;
+import static codechicken.nei.NEIClientConfig.canPerformAction;
+import static codechicken.nei.NEIClientConfig.getItemQuantity;
+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;
 
+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 = NEIKeyboardUtils.ALT_HASH;
-    public static final int SHIFT_HASH = NEIKeyboardUtils.SHIFT_HASH;
-    public static final int CTRL_HASH = NEIKeyboardUtils.CTRL_HASH;
-
     public static Minecraft mc() {
         return Minecraft.getMinecraft();
     }
@@ -109,33 +50,8 @@ public class NEIClientUtils extends NEIServerUtils {
     }
 
     public static void printChatMessage(IChatComponent 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);
+        if (mc().ingameGUI != null)
+            mc().ingameGUI.getChatGUI().printChatMessage(msg);
     }
 
     public static void deleteHeldItem() {
@@ -143,8 +59,7 @@ 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) {
@@ -152,11 +67,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--;
@@ -172,7 +88,8 @@ 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()) {
@@ -189,18 +106,21 @@ 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
+     * @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) {
@@ -232,24 +152,25 @@ 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();
                 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));
+                        .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;
@@ -259,15 +180,17 @@ 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;) {
+            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,
@@ -288,22 +211,24 @@ public class NEIClientUtils extends NEIServerUtils {
     }
 
     public static boolean controlKey() {
-        if (Minecraft.isRunningOnMac) {
-            return Keyboard.isKeyDown(Keyboard.KEY_LMETA) || Keyboard.isKeyDown(Keyboard.KEY_RMETA);
-        }
         return Keyboard.isKeyDown(Keyboard.KEY_LCONTROL) || Keyboard.isKeyDown(Keyboard.KEY_RCONTROL);
     }
 
     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() {
@@ -311,7 +236,8 @@ 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;
     }
@@ -319,13 +245,13 @@ 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);
-        else sendCommand(
-                getStringSetting("command.creative"),
-                getGameType(nmode),
-                mc().thePlayer.getCommandSenderName());
+        if (hasSMPCounterPart())
+            NEICPH.sendGamemode(nmode);
+        else
+            sendCommand(getStringSetting("command.creative"), getGameType(nmode), mc().thePlayer.getCommandSenderName());
     }
 
     public static long getTime() {
@@ -340,18 +266,22 @@ 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.isEmpty()) return;
+        if (command.length() == 0)
+            return;
 
         NumberFormat numberformat = NumberFormat.getIntegerInstance();
         numberformat.setGroupingUsed(false);
         MessageFormat messageformat = new MessageFormat(command);
-        for (int i = 0; i < args.length; i++) if (args[i] instanceof Integer || args[i] instanceof Long)
-            messageformat.setFormatByArgumentIndex(i, numberformat);
+        for (int i = 0; i < args.length; i++)
+            if (args[i] instanceof Integer || args[i] instanceof Long)
+                messageformat.setFormatByArgumentIndex(i, numberformat);
 
         mc().thePlayer.sendChatMessage(messageformat.format(args));
     }
@@ -361,17 +291,22 @@ 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) {
@@ -387,45 +322,24 @@ 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) {
-            int dots = fontRenderer.getStringWidth("...");
-
-            if (containerWidth > dots) {
-                textWidth += dots;
-
-                while (textWidth > containerWidth) {
-                    textWidth -= fontRenderer.getCharWidth(text.charAt(text.length() - 1));
-                    text = text.substring(0, text.length() - 1);
-                }
-
-                return text + "...";
-            }
-
-            return "...";
-        }
-
-        return text;
-    }
-
     public static boolean safeKeyDown(int keyCode) {
         try {
             return Keyboard.isKeyDown(keyCode);
@@ -436,10 +350,12 @@ public class NEIClientUtils extends NEIServerUtils {
 
     public static void setItemQuantity(int i) {
         world.nbt.setInteger("quantity", i);
+        world.saveNBT();
     }
 
     public static GuiContainer getGuiContainer() {
-        if (mc().currentScreen instanceof GuiContainer) return (GuiContainer) mc().currentScreen;
+        if (mc().currentScreen instanceof GuiContainer)
+            return (GuiContainer) mc().currentScreen;
 
         return null;
     }
@@ -448,140 +364,7 @@ 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 (!NEIKeyboardUtils.isHashKey(keycode)) {
-                return getMetaHash() + keycode;
-            }
-        }
-
-        return Keyboard.CHAR_NONE;
-    }
-
-    public static String getKeyName(int keyBind, int mouseBind) {
-        StringJoiner keyText = new StringJoiner(" + ");
-        String keyHash = keyBind == Keyboard.KEY_NONE ? "" : NEIKeyboardUtils.getKeyName(keyBind);
-        String mouseHash = mouseBind == NEIMouseUtils.MOUSE_BTN_NONE ? "" : NEIMouseUtils.getKeyName(mouseBind);
-
-        if (!keyHash.isEmpty()) {
-            keyText.add(keyHash);
-        }
-
-        if (!mouseHash.isEmpty()) {
-            keyText.add(mouseHash);
-        }
-
-        return keyText.toString();
-    }
-
     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));
     }
-
-    public static void reportErrorBuffered(Throwable e, Set<String> buffer, String cause) {
-        StringWriter sw = new StringWriter();
-        e.printStackTrace(new PrintWriter(sw));
-        String stackTrace = cause + sw;
-        if (buffer.contains(stackTrace)) return;
-
-        System.err.println("Error while rendering: " + cause + " (" + e.getMessage() + ")");
-        e.printStackTrace();
-        buffer.add(stackTrace);
-    }
-
-    public static void reportErrorBuffered(Throwable e, Set<String> buffer, ItemStack cause) {
-        if (cause != null) {
-            reportErrorBuffered(e, buffer, cause.toString());
-        } else {
-            reportErrorBuffered(e, buffer, "null");
-        }
-    }
-
-    public static void drawRect(double left, double top, double width, double height, Color color) {
-        Tessellator tessellator = Tessellator.instance;
-
-        GL11.glEnable(GL11.GL_BLEND);
-        GL11.glDisable(GL11.GL_TEXTURE_2D);
-        OpenGlHelper.glBlendFunc(770, 771, 1, 0);
-        GL11.glColor4f(color.getRed() / 255f, color.getGreen() / 255f, color.getBlue() / 255f, color.getAlpha() / 255f);
-        tessellator.startDrawingQuads();
-        tessellator.addVertex(left, top + height, 0.0D);
-        tessellator.addVertex(left + width, top + height, 0.0D);
-        tessellator.addVertex(left + width, top, 0.0D);
-        tessellator.addVertex(left, top, 0.0D);
-        tessellator.draw();
-        GL11.glEnable(GL11.GL_TEXTURE_2D);
-        GL11.glDisable(GL11.GL_BLEND);
-    }
-
-    public static void drawNEIOverlayText(String text, Rectangle4i rect, float scale, int color, boolean shadow,
-            Alignment alignment) {
-        final float screenScale = mc().currentScreen.width * 1f / mc().displayWidth;
-        final double smallTextScale = Math
-                .max(screenScale, (Math.max(scale, 1f) * (GuiDraw.fontRenderer.getUnicodeFlag() ? 3F / 4F : 1F / 2F)));
-
-        NEIClientUtils.gl2DRenderContext(() -> {
-            final int width = GuiDraw.fontRenderer.getStringWidth(text);
-            final float partW = rect.w / 2f;
-            final float partH = rect.h / 2f;
-            final double offsetX = Math
-                    .ceil(rect.x + partW + partW * alignment.x - (width / 2f * (alignment.x + 1)) * smallTextScale);
-            final double offsetY = Math.ceil(
-                    rect.y + partH
-                            + partH * alignment.y
-                            - (GuiDraw.fontRenderer.FONT_HEIGHT / 2f * (alignment.y + 1)) * smallTextScale);
-
-            GL11.glTranslated(offsetX, offsetY, 0);
-            GL11.glScaled(smallTextScale, smallTextScale, 1);
-            GuiDraw.fontRenderer.drawString(text, 0, 0, color, shadow);
-            GL11.glScaled(1 / smallTextScale, 1 / smallTextScale, 1);
-            GL11.glTranslated(-1 * offsetX, -1 * offsetY, 0);
-        });
-    }
-
-    public static void drawNEIOverlayText(String text, int x, int y) {
-        drawNEIOverlayText(text, new Rectangle4i(x, y, 16, 16), 0.5f, 0xFDD835, false, Alignment.TopLeft);
-    }
-
-    public static void gl2DRenderContext(Runnable callback) {
-        boolean isLighting = GL11.glGetBoolean(GL11.GL_LIGHTING);
-        boolean isDepthTest = GL11.glGetBoolean(GL11.GL_DEPTH_TEST);
-        boolean isAlphaTest = GL11.glGetBoolean(GL11.GL_ALPHA_TEST);
-        GL11.glDisable(GL11.GL_LIGHTING);
-        GL11.glEnable(GL11.GL_ALPHA_TEST);
-        GL11.glDisable(GL11.GL_DEPTH_TEST);
-
-        callback.run();
-
-        if (isLighting) GL11.glEnable(GL11.GL_LIGHTING);
-        if (isDepthTest) GL11.glEnable(GL11.GL_DEPTH_TEST);
-        if (!isAlphaTest) GL11.glDisable(GL11.GL_ALPHA_TEST);
-    }
-
 }

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

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

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

@@ -1,17 +1,5 @@
 package codechicken.nei;
 
-import static codechicken.lib.gui.GuiDraw.getMousePosition;
-
-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;
-import net.minecraft.inventory.Slot;
-import net.minecraft.inventory.SlotCrafting;
-import net.minecraft.item.ItemStack;
-
 import codechicken.nei.api.API;
 import codechicken.nei.api.GuiInfo;
 import codechicken.nei.api.IInfiniteItemHandler;
@@ -21,9 +9,20 @@ import codechicken.nei.guihook.GuiContainerManager;
 import codechicken.nei.guihook.IContainerInputHandler;
 import codechicken.nei.guihook.IContainerSlotClickHandler;
 import codechicken.nei.recipe.GuiRecipe;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.client.gui.inventory.GuiContainerCreative;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.Slot;
+import net.minecraft.inventory.SlotCrafting;
+import net.minecraft.item.ItemStack;
 
-public class NEIController implements IContainerSlotClickHandler, IContainerInputHandler {
+import java.awt.Point;
+import java.util.LinkedList;
 
+import static codechicken.lib.gui.GuiDraw.getMousePosition;
+
+public class NEIController implements IContainerSlotClickHandler, IContainerInputHandler
+{
     private static final NEIController instance = new NEIController();
 
     public static GuiContainerManager manager;
@@ -46,10 +45,12 @@ 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) {
@@ -57,7 +58,8 @@ 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<>();
         for (int i = 0; i < inventory.getSizeInventory(); i++)
@@ -65,7 +67,8 @@ public class NEIController implements IContainerSlotClickHandler, IContainerInpu
 
         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))
@@ -76,8 +79,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 ;)
             }
         }
     }
@@ -85,15 +88,14 @@ 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)) {
-                            NEICPH.sendCreativeScroll(-1);
-                            inventory.currentItem = selectedItem;
-                        }
+                } else if (inventory.currentItem == selectedItem - 1 || (inventory.currentItem == 8 && selectedItem == 0)) {
+                    NEICPH.sendCreativeScroll(-1);
+                    inventory.currentItem = selectedItem;
+                }
             }
         }
 
@@ -102,47 +104,51 @@ 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
+            for (int i1 = 0; i1 < 64; i1++)//click this slot 64 times
                 manager.handleSlotClick(slot.slotNumber, button, 0);
             return true;
         }
 
-        if (NEIClientUtils.controlKey() && modifier != 4 // Drop key pressed:
-                                                         // net.minecraft.client.gui.inventory.GuiContainer.keyTyped
-                && slot != null
-                && slot.getStack() != null
+        if (NEIClientUtils.controlKey()
+                && 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,15 +167,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);
@@ -177,7 +184,8 @@ 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) {
@@ -194,10 +202,14 @@ 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;
 
@@ -214,22 +226,24 @@ public class NEIController implements IContainerSlotClickHandler, IContainerInpu
 
     @Override
     public boolean mouseScrolled(GuiContainer gui, int mousex, int mousey, int scrolled) {
-        if (!NEIClientConfig.isEnabled() || GuiInfo.hasCustomSlots(gui)
-                || !NEIClientConfig.isMouseScrollTransferEnabled())
+        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;
+        if (gui instanceof GuiRecipe)
+            return false;
 
         Point mousePos = getMousePosition();
         Slot mouseover = manager.window.getSlotAtPosition(mousePos.x, mousePos.y);
         if (mouseover != null && mouseover.getHasStack()) {
-            if (NEIClientConfig.shouldInvertMouseScrollTransfer()) {
+            if(NEIClientConfig.shouldInvertMouseScrollTransfer()) {
                 scrolled = -scrolled;
             }
-            if (scrolled > 0) fastTransferManager.transferItem(manager.window, mouseover.slotNumber);
-            else fastTransferManager.retrieveItem(manager.window, mouseover.slotNumber);
+            if (scrolled > 0)
+                fastTransferManager.transferItem(manager.window, mouseover.slotNumber);
+            else
+                fastTransferManager.retrieveItem(manager.window, mouseover.slotNumber);
             return true;
         }
         return false;
@@ -246,26 +260,32 @@ 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

@@ -1,20 +1,22 @@
 package codechicken.nei;
 
+import codechicken.nei.api.INEIGuiAdapter;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.client.gui.inventory.GuiContainerCreative;
 import net.minecraft.creativetab.CreativeTabs;
 
-import codechicken.nei.api.INEIGuiAdapter;
-
-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;
     }
+
 }

src/main/java/codechicken/nei/NEIDummySlotHandler.java

@@ -1,21 +1,21 @@
 package codechicken.nei;
 
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-
 import codechicken.lib.inventory.ContainerExtended;
 import codechicken.lib.inventory.SlotDummy;
 import codechicken.nei.api.INEIGuiAdapter;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
 
-public class NEIDummySlotHandler extends INEIGuiAdapter {
-
+public class NEIDummySlotHandler extends INEIGuiAdapter
+{
     @Override
-    public boolean handleDragNDrop(GuiContainer gui, int mousex, int mousey, ItemStack draggedStack, int button) {
+    public boolean handleDragNDrop(GuiContainer gui, int mousex, int mousey, ItemStack draggedStack, int button)
+    {
         Slot slot = gui.getSlotAtPosition(mousex, mousey);
-        if (slot instanceof SlotDummy && slot.isItemValid(draggedStack)
-                && gui.inventorySlots instanceof ContainerExtended) {
-            ((SlotDummy) slot).slotClick(draggedStack, button, NEIClientUtils.shiftKey());
+        if(slot instanceof SlotDummy && slot.isItemValid(draggedStack) && gui.inventorySlots instanceof ContainerExtended)
+        {
+            ((SlotDummy)slot).slotClick(draggedStack, button, NEIClientUtils.shiftKey());
             NEICPH.sendDummySlotSet(slot.slotNumber, slot.getStack());
             return true;
         }

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

@@ -1,48 +1,37 @@
 package codechicken.nei;
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
-
-import net.minecraft.util.EnumChatFormatting;
-
-import com.google.common.eventbus.EventBus;
-import com.google.common.eventbus.Subscribe;
-
 import codechicken.core.CommonUtils;
 import codechicken.core.launch.CodeChickenCorePlugin;
 import codechicken.nei.api.IConfigureNEI;
 import codechicken.nei.asm.NEICorePlugin;
 import codechicken.nei.config.IMCHandler;
 import codechicken.nei.recipe.GuiRecipeTab;
+import codechicken.nei.recipe.RecipeCatalysts;
+import com.google.common.eventbus.EventBus;
+import com.google.common.eventbus.Subscribe;
 import cpw.mods.fml.client.FMLFileResourcePack;
 import cpw.mods.fml.client.FMLFolderResourcePack;
 import cpw.mods.fml.common.DummyModContainer;
 import cpw.mods.fml.common.LoadController;
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.ModMetadata;
-import cpw.mods.fml.common.discovery.ASMDataTable;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLInterModComms;
-import cpw.mods.fml.common.event.FMLLoadCompleteEvent;
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.versioning.ArtifactVersion;
 import cpw.mods.fml.common.versioning.VersionParser;
 import cpw.mods.fml.common.versioning.VersionRange;
+import net.minecraft.util.EnumChatFormatting;
 
-public class NEIModContainer extends DummyModContainer {
+import java.io.File;
+import java.util.*;
 
+public class NEIModContainer extends DummyModContainer
+{
     public static LinkedList<IConfigureNEI> plugins = new LinkedList<>();
 
     private static boolean gregTech5Loaded;
-    private static boolean gtnhLibLoaded;
-
-    private static ASMDataTable asmDataTable;
 
     public NEIModContainer() {
         super(getModMetadata());
@@ -51,10 +40,10 @@ public class NEIModContainer extends DummyModContainer {
 
     private static ModMetadata getModMetadata() {
         final ModMetadata modMetadata = new ModMetadata();
-        modMetadata.name = "NotEnoughItems";
-        modMetadata.modId = "NotEnoughItems";
-        modMetadata.version = Tags.VERSION;
-        modMetadata.authorList = Arrays.asList("ChickenBones", "mitchej123");
+        modMetadata.name = "GRADLETOKEN_MODNAME";
+        modMetadata.modId = "GRADLETOKEN_MODID";
+        modMetadata.version = "GRADLETOKEN_VERSION";
+        modMetadata.authorList = Arrays.asList( "ChickenBones", "mitchej123" );
         modMetadata.url = "https://github.com/GTNewHorizons/NotEnoughItems";
         modMetadata.description = "Recipe Viewer, Inventory Manager, Item Spawner, Cheats and more; GTNH Version includes many enhancements.";
         return modMetadata;
@@ -64,29 +53,21 @@ public class NEIModContainer extends DummyModContainer {
         return gregTech5Loaded;
     }
 
-    public static boolean isGTNHLibLoaded() {
-        return gtnhLibLoaded;
-    }
-
     @Override
     public Set<ArtifactVersion> getRequirements() {
         Set<ArtifactVersion> deps = new HashSet<>();
-        deps.add(VersionParser.parseVersionReference("CodeChickenCore@[" + codechicken.core.asm.Tags.VERSION + ",)"));
+        deps.add(VersionParser.parseVersionReference("CodeChickenCore@["+CodeChickenCorePlugin.version+",)"));
         return deps;
     }
 
     @Override
     public List<ArtifactVersion> getDependencies() {
-        List<ArtifactVersion> deps = new ArrayList<>();
-        deps.add(VersionParser.parseVersionReference("CodeChickenCore@[" + codechicken.core.asm.Tags.VERSION + ",)"));
-        deps.add(VersionParser.parseVersionReference("gtnhlib@[0.6.0,)"));
-        return deps;
+        return new LinkedList<>(getRequirements());
     }
 
     private String description;
-
     private void loadMetadata() {
-        description = super.getMetadata().description.replace("Supporters:", EnumChatFormatting.AQUA + "Supporters:");
+        description = super.getMetadata().description.replace("Supporters:", EnumChatFormatting.AQUA+"Supporters:");
     }
 
     @Override
@@ -97,7 +78,8 @@ public class NEIModContainer extends DummyModContainer {
         } else {
             s_plugins.append(EnumChatFormatting.GREEN).append("Installed plugins: ");
             for (int i = 0; i < plugins.size(); i++) {
-                if (i > 0) s_plugins.append(", ");
+                if (i > 0)
+                    s_plugins.append(", ");
                 IConfigureNEI plugin = plugins.get(i);
                 s_plugins.append(plugin.getName()).append(" ").append(plugin.getVersion());
             }
@@ -118,32 +100,22 @@ public class NEIModContainer extends DummyModContainer {
     @Subscribe
     public void preInit(FMLPreInitializationEvent event) {
         gregTech5Loaded = Loader.isModLoaded("gregtech") && !Loader.isModLoaded("gregapi_post");
-        gtnhLibLoaded = Loader.isModLoaded("gtnhlib");
-        if (CommonUtils.isClient()) ClientHandler.preInit();
-        asmDataTable = event.getAsmData();
+        if (CommonUtils.isClient())
+            ClientHandler.preInit();
     }
 
     @Subscribe
     public void init(FMLInitializationEvent event) {
-        if (CommonUtils.isClient()) ClientHandler.load();
+        if (CommonUtils.isClient())
+            ClientHandler.load();
 
         ServerHandler.load();
     }
-
     @Subscribe
     public void postInit(FMLPostInitializationEvent event) {
-        if (CommonUtils.isClient()) {
-            ClientHandler.postInit();
-        }
-    }
-
-    @Subscribe
-    public void loadComplete(FMLLoadCompleteEvent event) {
         if (CommonUtils.isClient()) {
             GuiRecipeTab.loadHandlerInfo();
-            ClientHandler.loadPluginsList();
-            ClientHandler.loadHandlerOrdering();
-            asmDataTable = null;
+            ClientHandler.postInit();
         }
     }
 
@@ -166,8 +138,4 @@ public class NEIModContainer extends DummyModContainer {
     public Class<?> getCustomResourcePackClass() {
         return getSource().isDirectory() ? FMLFolderResourcePack.class : FMLFileResourcePack.class;
     }
-
-    public static ASMDataTable getAsmDataTable() {
-        return asmDataTable;
-    }
 }

src/main/java/codechicken/nei/NEIPotionGuiHandler.java

@@ -1,28 +1,26 @@
 package codechicken.nei;
 
-import java.util.Collection;
-
+import codechicken.lib.vec.Rectangle4i;
+import codechicken.nei.api.INEIGuiAdapter;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.EntityPlayerSP;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.client.renderer.InventoryEffectRenderer;
 import net.minecraft.potion.PotionEffect;
 
-import codechicken.lib.vec.Rectangle4i;
-import codechicken.nei.api.INEIGuiAdapter;
+import java.util.Collection;
 
 /**
  * Inspired by InventoryEffectRendererGuiHandler.java in JEI
  */
 public class NEIPotionGuiHandler extends INEIGuiAdapter {
-
     @Override
     public boolean hideItemPanelSlot(GuiContainer guiContainer, int slotX, int slotY, int slotW, int slotH) {
         if (NEIClientConfig.ignorePotionOverlap()) {
             return false;
         }
 
-        if (guiContainer instanceof InventoryEffectRenderer) {
+        if(guiContainer instanceof InventoryEffectRenderer) {
             int x = guiContainer.guiLeft - 124;
             int y = guiContainer.guiTop;
             Minecraft minecraft = guiContainer.mc;
@@ -44,7 +42,8 @@ public class NEIPotionGuiHandler extends INEIGuiAdapter {
             Rectangle4i slotRect = new Rectangle4i(slotX, slotY, slotW, slotH);
             for (PotionEffect potioneffect : activePotionEffects) {
                 Rectangle4i box = new Rectangle4i(x, y, 140, 32);
-                if (box.intersects(slotRect)) return true;
+                if(box.intersects(slotRect))
+                    return true;
                 y += height;
             }
         }

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

@@ -1,11 +1,12 @@
 package codechicken.nei;
 
-import static codechicken.nei.PacketIDs.C2S;
-import static codechicken.nei.PacketIDs.S2C;
-
-import java.util.LinkedList;
-import java.util.Set;
-
+import codechicken.core.CommonUtils;
+import codechicken.core.ServerUtils;
+import codechicken.lib.inventory.SlotDummy;
+import codechicken.lib.packet.PacketCustom;
+import codechicken.lib.packet.PacketCustom.IServerPacketHandler;
+import codechicken.lib.vec.BlockCoord;
+import cpw.mods.fml.relauncher.Side;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.inventory.InventoryBasic;
@@ -16,76 +17,69 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.tileentity.TileEntityMobSpawner;
 import net.minecraft.world.World;
 
-import codechicken.core.CommonUtils;
-import codechicken.core.ServerUtils;
-import codechicken.lib.inventory.SlotDummy;
-import codechicken.lib.packet.PacketCustom;
-import codechicken.lib.packet.PacketCustom.IServerPacketHandler;
-import codechicken.lib.vec.BlockCoord;
-import cpw.mods.fml.relauncher.Side;
-
-public class NEISPH implements IServerPacketHandler {
+import java.util.LinkedList;
+import java.util.Set;
 
+public class NEISPH implements IServerPacketHandler
+{
     @Override
     public void handlePacket(PacketCustom packet, EntityPlayerMP sender, INetHandlerPlayServer netHandler) {
-        if (!NEIServerConfig.authenticatePacket(sender, packet)) return;
+        if (!NEIServerConfig.authenticatePacket(sender, packet))
+            return;
 
         switch (packet.getType()) {
-            case C2S.GIVE_ITEM:
+            case 1:
                 handleGiveItem(sender, packet);
                 break;
-            case C2S.DELETE_ALL_ITEMS:
+            case 4:
                 NEIServerUtils.deleteAllItems(sender);
                 break;
-            case C2S.SET_SLOT:
+            case 5:
                 setInventorySlot(sender, packet);
                 break;
-            case C2S.TOGGLE_MAGNET:
+            case 6:
                 NEIServerUtils.toggleMagnetMode(sender);
                 break;
-            case C2S.SET_TIME:
+            case 7:
                 NEIServerUtils.setHourForward(sender.worldObj, packet.readUByte(), true);
                 break;
-            case C2S.HEAL:
+            case 8:
                 NEIServerUtils.healPlayer(sender);
                 break;
-            case C2S.TOGGLE_RAIN:
+            case 9:
                 NEIServerUtils.toggleRaining(sender.worldObj, true);
                 break;
-            case C2S.REQUEST_LOGIN_INFO:
+            case 10:
                 sendLoginState(sender);
                 break;
-            case C2S.REQUEST_CONTAINER_CONTENTS:
+            case 11:
                 sender.sendContainerAndContentsToPlayer(sender.openContainer, sender.openContainer.getInventory());
                 break;
-            case C2S.CHANGE_PROPERTY:
+            case 12:
                 handlePropertyChange(sender, packet);
                 break;
-            case C2S.SET_GAME_MODE:
+            case 13:
                 NEIServerUtils.setGamemode(sender, packet.readUByte());
                 break;
-            case C2S.CYCLE_CREATIVE_INV:
+            case 14:
                 NEIServerUtils.cycleCreativeInv(sender, packet.readInt());
                 break;
-            case C2S.SEND_MOB_SPAWNER_ID:
+            case 15:
                 handleMobSpawnerID(sender.worldObj, packet.readCoord(), packet.readString());
                 break;
-            case C2S.REQUEST_CONTAINER:
-                handleRequestContainer(sender, packet.readInt());
-                break;
-            case C2S.REQUEST_ENCHANTMENT_GUI:
+            case 21:
                 openEnchantmentGui(sender);
                 break;
-            case C2S.MODIFY_ENCHANTMENT:
+            case 22:
                 modifyEnchantment(sender, packet.readUByte(), packet.readUByte(), packet.readBoolean());
                 break;
-            case C2S.SET_CREATIVE_PLUS_MODE:
+            case 23:
                 processCreativeInv(sender, packet.readBoolean());
                 break;
-            case C2S.REQUEST_POTION_GUI:
+            case 24:
                 openPotionGui(sender, packet);
                 break;
-            case C2S.SET_DUMMY_SLOT:
+            case 25:
                 handleDummySlotSet(sender, packet);
                 break;
         }
@@ -96,7 +90,8 @@ public class NEISPH implements IServerPacketHandler {
         ItemStack stack = packet.readItemStack(true);
 
         Slot slot = sender.openContainer.getSlot(slotNumber);
-        if (slot instanceof SlotDummy) slot.putStack(stack);
+        if (slot instanceof SlotDummy)
+            slot.putStack(stack);
     }
 
     private void handleMobSpawnerID(World world, BlockCoord coord, String mobtype) {
@@ -108,11 +103,6 @@ public class NEISPH implements IServerPacketHandler {
         }
     }
 
-    private void handleRequestContainer(EntityPlayerMP sender, int containerSize) {
-        if (sender.openContainer.getInventory().size() != containerSize) return;
-        sender.sendContainerToPlayer(sender.openContainer);
-    }
-
     private void handlePropertyChange(EntityPlayerMP sender, PacketCustom packet) {
         String name = packet.readString();
         if (NEIServerConfig.canPlayerPerformAction(sender.getCommandSenderName(), name))
@@ -121,22 +111,15 @@ public class NEISPH implements IServerPacketHandler {
 
     public static void processCreativeInv(EntityPlayerMP sender, boolean open) {
         if (open) {
-            ServerUtils.openSMPContainer(
-                    sender,
-                    new ContainerCreativeInv(
-                            sender,
-                            new ExtendedCreativeInv(
-                                    NEIServerConfig.forPlayer(sender.getCommandSenderName()),
-                                    Side.SERVER)),
-                    (player, windowId) -> {
-                        PacketCustom packet = new PacketCustom(channel, S2C.SET_CREATIVE_PLUS_MODE);
-                        packet.writeBoolean(true);
-                        packet.writeByte(windowId);
-                        packet.sendToPlayer(player);
-                    });
+            ServerUtils.openSMPContainer(sender, new ContainerCreativeInv(sender, new ExtendedCreativeInv(NEIServerConfig.forPlayer(sender.getCommandSenderName()), Side.SERVER)), (player, windowId) -> {
+                PacketCustom packet = new PacketCustom(channel, 23);
+                packet.writeBoolean(true);
+                packet.writeByte(windowId);
+                packet.sendToPlayer(player);
+            });
         } else {
             sender.closeContainer();
-            PacketCustom packet = new PacketCustom(channel, S2C.SET_CREATIVE_PLUS_MODE);
+            PacketCustom packet = new PacketCustom(channel, 23);
             packet.writeBoolean(false);
             packet.sendToPlayer(sender);
         }
@@ -152,8 +135,7 @@ public class NEISPH implements IServerPacketHandler {
         ItemStack item = packet.readItemStack();
 
         ItemStack old = NEIServerUtils.getSlotContents(player, slot, container);
-        boolean deleting = item == null
-                || old != null && NEIServerUtils.areStacksSameType(item, old) && item.stackSize < old.stackSize;
+        boolean deleting = item == null || old != null && NEIServerUtils.areStacksSameType(item, old) && item.stackSize < old.stackSize;
         if (NEIServerConfig.canPlayerPerformAction(player.getCommandSenderName(), deleting ? "delete" : "item"))
             NEIServerUtils.setSlotContents(player, slot, item, container);
     }
@@ -168,33 +150,36 @@ public class NEISPH implements IServerPacketHandler {
     }
 
     private void openEnchantmentGui(EntityPlayerMP player) {
-        ServerUtils.openSMPContainer(
-                player,
-                new ContainerEnchantmentModifier(player.inventory, player.worldObj, 0, 0, 0),
-                (player1, windowId) -> {
-                    PacketCustom packet = new PacketCustom(channel, S2C.OPEN_ENCHANTMENT_GUI);
-                    packet.writeByte(windowId);
-                    packet.sendToPlayer(player1);
-                });
+        ServerUtils.openSMPContainer(player, new ContainerEnchantmentModifier(player.inventory, player.worldObj, 0, 0, 0), (player1, windowId) -> {
+            PacketCustom packet = new PacketCustom(channel, 21);
+            packet.writeByte(windowId);
+            packet.sendToPlayer(player1);
+        });
     }
 
     private void openPotionGui(EntityPlayerMP player, PacketCustom packet) {
         InventoryBasic b = new InventoryBasic("potionStore", true, 9);
-        for (int i = 0; i < b.getSizeInventory(); i++) b.setInventorySlotContents(i, packet.readItemStack());
+        for (int i = 0; i < b.getSizeInventory(); i++)
+            b.setInventorySlotContents(i, packet.readItemStack());
         ServerUtils.openSMPContainer(player, new ContainerPotionCreator(player.inventory, b), (player1, windowId) -> {
-            PacketCustom packet1 = new PacketCustom(channel, S2C.OPEN_POTION_GUI);
+            PacketCustom packet1 = new PacketCustom(channel, 24);
             packet1.writeByte(windowId);
             packet1.sendToPlayer(player1);
         });
     }
 
     public static void sendActionDisabled(int dim, String name, boolean disable) {
-        new PacketCustom(channel, S2C.SEND_ACTION_DISABLED).writeString(name).writeBoolean(disable)
+        new PacketCustom(channel, 11)
+                .writeString(name)
+                .writeBoolean(disable)
                 .sendToDimension(dim);
     }
 
     public static void sendActionEnabled(EntityPlayerMP player, String name, boolean enable) {
-        new PacketCustom(channel, S2C.SEND_ACTION_ENABLED).writeString(name).writeBoolean(enable).sendToPlayer(player);
+        new PacketCustom(channel, 12)
+                .writeString(name)
+                .writeBoolean(enable)
+                .sendToPlayer(player);
     }
 
     private void sendLoginState(EntityPlayerMP player) {
@@ -205,34 +190,41 @@ public class NEISPH implements IServerPacketHandler {
         PlayerSave playerSave = NEIServerConfig.forPlayer(player.getCommandSenderName());
 
         for (String name : NEIActions.nameActionMap.keySet()) {
-            if (NEIServerConfig.canPlayerPerformAction(player.getCommandSenderName(), name)) actions.add(name);
-            if (NEIServerConfig.isActionDisabled(player.dimension, name)) disabled.add(name);
-            if (playerSave.isActionEnabled(name)) enabled.add(name);
+            if (NEIServerConfig.canPlayerPerformAction(player.getCommandSenderName(), name))
+                actions.add(name);
+            if (NEIServerConfig.isActionDisabled(player.dimension, name))
+                disabled.add(name);
+            if (playerSave.isActionEnabled(name))
+                enabled.add(name);
         }
         for (ItemStackMap.Entry<Set<String>> entry : NEIServerConfig.bannedItems.entries())
             if (!NEIServerConfig.isPlayerInList(player.getCommandSenderName(), entry.value, true))
                 bannedItems.add(entry.key);
 
-        PacketCustom packet = new PacketCustom(channel, S2C.SEND_LOGIN_STATE);
+        PacketCustom packet = new PacketCustom(channel, 10);
 
         packet.writeByte(actions.size());
-        for (String s : actions) packet.writeString(s);
+        for (String s : actions)
+            packet.writeString(s);
 
         packet.writeByte(disabled.size());
-        for (String s : disabled) packet.writeString(s);
+        for (String s : disabled)
+            packet.writeString(s);
 
         packet.writeByte(enabled.size());
-        for (String s : enabled) packet.writeString(s);
+        for (String s : enabled)
+            packet.writeString(s);
 
         packet.writeInt(bannedItems.size());
-        for (ItemStack stack : bannedItems) packet.writeItemStack(stack);
+        for (ItemStack stack : bannedItems)
+            packet.writeItemStack(stack);
 
         packet.sendToPlayer(player);
     }
 
     public static void sendHasServerSideTo(EntityPlayerMP player) {
         NEIServerConfig.logger.debug("Sending serverside check to: " + player.getCommandSenderName());
-        PacketCustom packet = new PacketCustom(channel, S2C.SEND_SERVER_SIDE_CHECK);
+        PacketCustom packet = new PacketCustom(channel, 1);
         packet.writeByte(NEIActions.protocol);
         packet.writeString(CommonUtils.getWorldName(player.worldObj));
 
@@ -240,7 +232,7 @@ public class NEISPH implements IServerPacketHandler {
     }
 
     public static void sendAddMagneticItemTo(EntityPlayerMP player, EntityItem item) {
-        PacketCustom packet = new PacketCustom(channel, S2C.SEND_MAGNETIC_ITEM);
+        PacketCustom packet = new PacketCustom(channel, 13);
         packet.writeInt(item.getEntityId());
 
         packet.sendToPlayer(player);

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

@@ -1,5 +1,23 @@
 package codechicken.nei;
 
+import codechicken.core.CommonUtils;
+import codechicken.core.ServerUtils;
+import codechicken.lib.config.ConfigFile;
+import codechicken.lib.inventory.InventoryUtils;
+import codechicken.lib.packet.PacketCustom;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.JsonToNBT;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.world.World;
+import net.minecraftforge.common.DimensionManager;
+import org.apache.commons.io.IOUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
 import java.io.File;
 import java.io.FileReader;
 import java.io.PrintWriter;
@@ -12,31 +30,8 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.JsonToNBT;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.world.World;
-import net.minecraftforge.common.DimensionManager;
-import net.minecraftforge.permission.PermissionLevel;
-import net.minecraftforge.permission.PermissionManager;
-
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.IOUtils;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-import codechicken.core.CommonUtils;
-import codechicken.core.ServerUtils;
-import codechicken.lib.config.ConfigFile;
-import codechicken.lib.inventory.InventoryUtils;
-import codechicken.lib.packet.PacketCustom;
-
-public class NEIServerConfig {
-
+public class NEIServerConfig
+{
     private static MinecraftServer server;
 
     public static Logger logger = LogManager.getLogger("NotEnoughItems");
@@ -46,8 +41,6 @@ public class NEIServerConfig {
     public static HashMap<String, PlayerSave> playerSaves = new HashMap<>();
     public static ItemStackMap<Set<String>> bannedItems = new ItemStackMap<>();
 
-    private static boolean doesPermAPIExist = false;
-
     public static void load(World world) {
         if (MinecraftServer.getServer() != server) {
             logger.debug("Loading NEI Server");
@@ -57,16 +50,6 @@ public class NEIServerConfig {
             dimTags.clear();
             loadConfig();
             loadBannedItems();
-
-            try {
-                Class.forName("net.minecraftforge.permission.PermissionManager");
-                doesPermAPIExist = true;
-
-                NEIActions.baseActions().forEach(
-                        action -> {
-                            PermissionManager.registerPermission("nei.permissions." + action, PermissionLevel.OP);
-                        });
-            } catch (ClassNotFoundException ignored) {}
         }
         loadWorld(world);
     }
@@ -79,7 +62,7 @@ public class NEIServerConfig {
         try {
             File file = new File(getSaveDir(world), "world.dat");
             NBTTagCompound tag = NEIServerUtils.readNBT(file);
-            if (tag == null) tag = new NBTTagCompound();
+            if(tag == null) tag = new NBTTagCompound();
             dimTags.put(CommonUtils.getDimension(world), tag);
         } catch (Exception e) {
             throw new RuntimeException(e);
@@ -92,8 +75,7 @@ public class NEIServerConfig {
 
         serverConfig.setNewLineMode(1);
         serverConfig.getTag("permissions").useBraces();
-        serverConfig.getTag("permissions")
-                .setComment("List of players who can use these features.\nEg. time=CodeChicken, Friend1");
+        serverConfig.getTag("permissions").setComment("List of players who can use these features.\nEg. time=CodeChicken, Friend1");
 
         setDefaultFeature("time");
         setDefaultFeature("rain");
@@ -111,11 +93,13 @@ public class NEIServerConfig {
     }
 
     private static void setDefaultFeature(String featurename, String... names) {
-        if (names.length == 0) names = new String[] { "OP" };
+        if (names.length == 0)
+            names = new String[]{"OP"};
 
         StringBuilder list = new StringBuilder();
         for (int i = 0; i < names.length; i++) {
-            if (i >= 1) list.append(", ");
+            if (i >= 1)
+                list.append(", ");
             list.append(names[i]);
         }
         serverConfig.getTag("permissions." + featurename).setDefaultValue(list.toString());
@@ -123,11 +107,7 @@ public class NEIServerConfig {
 
     private static void saveWorld(int dim) {
         try {
-            final File saveDir = getSaveDir(DimensionManager.getWorld(dim));
-            if (!saveDir.isDirectory()) {
-                FileUtils.forceMkdir(saveDir);
-            }
-            File file = new File(saveDir, "world.dat");
+            File file = new File(getSaveDir(DimensionManager.getWorld(dim)), "world.dat");
             NEIServerUtils.writeNBT(dimTags.get(dim), file);
         } catch (Exception e) {
             throw new RuntimeException(e);
@@ -135,21 +115,18 @@ public class NEIServerConfig {
     }
 
     public static boolean canPlayerPerformAction(String playername, String name) {
-        String node = "permissions." + NEIActions.base(name);
-        boolean hasPerm = doesPermAPIExist
-                ? PermissionManager.checkPermission(ServerUtils.getPlayer(playername), "nei." + node)
-                : false;
-
-        return hasPerm || isPlayerInList(playername, getPlayerList(node), true);
+        return isPlayerInList(playername, getPlayerList("permissions." + NEIActions.base(name)), true);
     }
 
     public static boolean isPlayerInList(String playername, Set<String> list, boolean allowCards) {
-        if (playername.equals("CONSOLE")) return list.contains(playername);
+        if (playername.equals("CONSOLE"))
+            return list.contains(playername);
 
         playername = playername.toLowerCase();
 
         if (allowCards) {
-            if (list.contains("ALL")) return true;
+            if (list.contains("ALL"))
+                return true;
             if ((ServerUtils.isPlayerOP(playername) || ServerUtils.isPlayerOwner(playername)) && list.contains("OP"))
                 return true;
         }
@@ -196,7 +173,8 @@ public class NEIServerConfig {
         StringBuilder sb = new StringBuilder();
         int i = 0;
         for (Iterator<String> iterator = list.iterator(); iterator.hasNext(); i++) {
-            if (i != 0) sb.append(", ");
+            if (i != 0)
+                sb.append(", ");
 
             sb.append(iterator.next());
         }
@@ -207,7 +185,7 @@ public class NEIServerConfig {
     private static void loadBannedItems() {
         bannedItems.clear();
         File file = new File(saveDir, "banneditems.cfg");
-        if (!file.exists()) {
+        if(!file.exists()) {
             bannedItems.put(new ItemStack(Blocks.command_block), new HashSet<>(Collections.singletonList("NONE")));
             saveBannedItems();
             return;
@@ -215,20 +193,22 @@ public class NEIServerConfig {
         try {
             FileReader r = new FileReader(file);
             int line = 0;
-            for (String s : IOUtils.readLines(r)) {
-                if (s.charAt(0) == '#' || s.trim().isEmpty()) continue;
+            for(String s : IOUtils.readLines(r)) {
+                if(s.charAt(0) == '#' || s.trim().length() == 0)
+                    continue;
                 int delim = s.lastIndexOf('=');
-                if (delim < 0) {
-                    logger.error("line " + line + ": Missing =");
+                if(delim < 0) {
+                    logger.error("line "+line+": Missing =");
                     continue;
                 }
                 try {
                     NBTTagCompound key = (NBTTagCompound) JsonToNBT.func_150315_a(s.substring(0, delim));
                     Set<String> values = new HashSet<>();
-                    for (String s2 : s.substring(delim + 1).split(",")) values.add(s2.trim());
+                    for(String s2 : s.substring(delim+1).split(","))
+                        values.add(s2.trim());
                     bannedItems.put(InventoryUtils.loadPersistant(key), values);
                 } catch (Exception e) {
-                    logger.error("line " + line + ": " + e.getMessage());
+                    logger.error("line "+line+": "+e.getMessage());
                 }
             }
             r.close();
@@ -240,22 +220,22 @@ public class NEIServerConfig {
     public static void saveBannedItems() {
         File file = new File(saveDir, "banneditems.cfg");
         try {
-            if (!file.exists()) file.createNewFile();
+            if(!file.exists())
+                file.createNewFile();
 
             PrintWriter p = new PrintWriter(file);
-            p.println(
-                    "#Saved in this format for external editing. The format isn't that hard to figure out. If you think you're up to it, modify it here!");
+            p.println("#Saved in this format for external editing. The format isn't that hard to figure out. If you think you're up to it, modify it here!");
 
             for (ItemStackMap.Entry<Set<String>> entry : bannedItems.entries()) {
                 NBTTagCompound key = InventoryUtils.savePersistant(entry.key, new NBTTagCompound());
                 key.removeTag("Count");
-                if (key.getByte("Damage") == 0) key.removeTag("Damage");
+                if(key.getByte("Damage") == 0) key.removeTag("Damage");
 
                 p.print(key.toString());
                 p.print("=[");
                 int i = 0;
                 for (String s : entry.value) {
-                    if (i++ != 0) p.print(", ");
+                    if(i++ != 0) p.print(", ");
                     p.print(s);
                 }
                 p.println("]");
@@ -272,15 +252,14 @@ public class NEIServerConfig {
 
     public static void loadPlayer(EntityPlayer player) {
         logger.debug("Loading Player: " + player.getGameProfile().getName());
-        playerSaves.put(
-                player.getCommandSenderName(),
-                new PlayerSave(player.getCommandSenderName(), new File(saveDir, "players")));
+        playerSaves.put(player.getCommandSenderName(), new PlayerSave(player.getCommandSenderName(), new File(saveDir, "players")));
     }
 
     public static void unloadPlayer(EntityPlayer player) {
         logger.debug("Unloading Player: " + player.getCommandSenderName());
         PlayerSave playerSave = playerSaves.remove(player.getCommandSenderName());
-        if (playerSave != null) playerSave.save();
+        if (playerSave != null)
+            playerSave.save();
     }
 
     public static boolean authenticatePacket(EntityPlayerMP sender, PacketCustom packet) {

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

@@ -1,17 +1,13 @@
 package codechicken.nei;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.AbstractList;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-import java.util.zip.ZipException;
-
+import codechicken.core.CommonUtils;
+import codechicken.core.ServerUtils;
+import codechicken.lib.inventory.InventoryRange;
+import codechicken.lib.inventory.InventoryUtils;
+import codechicken.lib.packet.PacketCustom;
+import codechicken.nei.util.NBTHelper;
+import cpw.mods.fml.common.FMLLog;
+import cpw.mods.fml.common.registry.GameRegistry;
 import net.minecraft.command.ICommandSender;
 import net.minecraft.enchantment.Enchantment;
 import net.minecraft.entity.player.EntityPlayer;
@@ -34,43 +30,32 @@ import net.minecraft.world.World;
 import net.minecraft.world.WorldServer;
 import net.minecraft.world.WorldSettings.GameType;
 import net.minecraftforge.oredict.OreDictionary;
-
 import org.apache.logging.log4j.Level;
 
-import codechicken.core.CommonUtils;
-import codechicken.core.ServerUtils;
-import codechicken.lib.inventory.InventoryRange;
-import codechicken.lib.inventory.InventoryUtils;
-import codechicken.lib.packet.PacketCustom;
-import codechicken.nei.PacketIDs.S2C;
-import codechicken.nei.util.NBTHelper;
-import cpw.mods.fml.common.FMLLog;
-import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.relauncher.ReflectionHelper;
-
-public class NEIServerUtils {
-
-    private static Class<?> gtMetaBaseItem;
-
-    static {
-        try {
-            final ClassLoader loader = NEIServerUtils.class.getClassLoader();
-            NEIServerUtils.gtMetaBaseItem = ReflectionHelper
-                    .getClass(loader, "gregtech.api.items.MetaBaseItem", "gregtech.api.items.GT_MetaBase_Item");
-        } catch (Exception ignored) {
-            /* Do nothing */
-        }
-    }
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.AbstractList;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.zip.ZipException;
 
+public class NEIServerUtils
+{
     public static boolean isRaining(World world) {
         return world.getWorldInfo().isRaining();
     }
 
     public static void toggleRaining(World world, boolean notify) {
         boolean raining = !world.isRaining();
-        if (!raining) // turn off
+        if (!raining)//turn off
             ((WorldServer) world).provider.resetRainAndThunder();
-        else world.getWorldInfo().setRaining(!isRaining(world));
+        else
+            world.getWorldInfo().setRaining(!isRaining(world));
 
         if (notify)
             ServerUtils.sendChatToAll(new ChatComponentTranslation("nei.chat.rain." + (raining ? "on" : "off")));
@@ -91,19 +76,27 @@ public class NEIServerUtils {
     }
 
     public static void setSlotContents(EntityPlayer player, int slot, ItemStack item, boolean containerInv) {
-        if (slot == -999) player.inventory.setItemStack(item);
-        else if (containerInv) player.openContainer.putStackInSlot(slot, item);
-        else player.inventory.setInventorySlotContents(slot, item);
+        if (slot == -999)
+            player.inventory.setItemStack(item);
+        else if (containerInv)
+            player.openContainer.putStackInSlot(slot, item);
+        else
+            player.inventory.setInventorySlotContents(slot, item);
     }
 
     public static ItemStack getSlotContents(EntityPlayer player, int slot, boolean containerInv) {
-        if (slot == -999) return player.inventory.getItemStack();
-        else if (containerInv) return player.openContainer.getSlot(slot).getStack();
-        else return player.inventory.getStackInSlot(slot);
+        if (slot == -999)
+            return player.inventory.getItemStack();
+        else if (containerInv)
+            return player.openContainer.getSlot(slot).getStack();
+        else
+            return player.inventory.getStackInSlot(slot);
     }
 
+    @SuppressWarnings("unchecked")
     public static void deleteAllItems(EntityPlayerMP player) {
-        for (Slot slot : player.openContainer.inventorySlots) slot.putStack(null);
+        for (Slot slot : (List<Slot>) player.openContainer.inventorySlots)
+            slot.putStack(null);
 
         player.sendContainerAndContentsToPlayer(player.openContainer, player.openContainer.getInventory());
     }
@@ -123,7 +116,8 @@ public class NEIServerUtils {
         while (NEIServerConfig.isActionDisabled(dim, NEIActions.timeZones[newhour / 6]))
             newhour = ((newhour / 6 + 1) % 4) * 6;
 
-        if (newhour != hour) setHourForward(world, newhour, false);
+        if (newhour != hour)
+            setHourForward(world, newhour, false);
     }
 
     public static boolean canItemFitInInventory(EntityPlayer player, ItemStack itemstack) {
@@ -131,18 +125,17 @@ public class NEIServerUtils {
     }
 
     public static void sendNotice(ICommandSender sender, IChatComponent msg, String permission) {
-        ChatComponentTranslation notice = new ChatComponentTranslation(
-                "chat.type.admin",
-                sender.getCommandSenderName(),
-                msg.createCopy());
+        ChatComponentTranslation notice = new ChatComponentTranslation("chat.type.admin", sender.getCommandSenderName(), msg.createCopy());
         notice.getChatStyle().setColor(EnumChatFormatting.GRAY).setItalic(true);
 
         if (NEIServerConfig.canPlayerPerformAction("CONSOLE", permission))
             MinecraftServer.getServer().addChatMessage(notice);
 
-        for (EntityPlayer p : ServerUtils.getPlayers()) if (p == sender) p.addChatComponentMessage(msg);
-        else if (NEIServerConfig.canPlayerPerformAction(p.getCommandSenderName(), permission))
-            p.addChatComponentMessage(notice);
+        for (EntityPlayer p : ServerUtils.getPlayers())
+            if(p == sender)
+                p.addChatComponentMessage(msg);
+            else if (NEIServerConfig.canPlayerPerformAction(p.getCommandSenderName(), permission))
+                p.addChatComponentMessage(notice);
     }
 
     /**
@@ -151,74 +144,54 @@ public class NEIServerUtils {
      * @return whether the two items are the same in terms of damage and itemID.
      */
     public static boolean areStacksSameType(ItemStack stack1, ItemStack stack2) {
-        return stack1 != null && stack2 != null
-                && (stack1.getItem() == stack2.getItem()
-                        && (!stack2.getHasSubtypes() || stack2.getItemDamage() == stack1.getItemDamage())
-                        && ItemStack.areItemStackTagsEqual(stack2, stack1));
+        return stack1 != null && stack2 != null &&
+                (stack1.getItem() == stack2.getItem() &&
+                (!stack2.getHasSubtypes() || stack2.getItemDamage() == stack1.getItemDamage()) &&
+                ItemStack.areItemStackTagsEqual(stack2, stack1));
     }
 
     /**
      * NBT-friendly version of {@link #areStacksSameType(ItemStack, ItemStack)}
-     *
      * @param stack1 The {@link ItemStack} being compared.
      * @param stack2 The {@link ItemStack} to compare to.
      * @return whether the two items are the same in terms of itemID, damage and NBT.
      */
     public static boolean areStacksSameTypeWithNBT(ItemStack stack1, ItemStack stack2) {
-        return stack1 != null && stack2 != null
-                && stack1.getItem() == stack2.getItem()
-                && (!stack2.getHasSubtypes() || stack2.getItemDamage() == stack1.getItemDamage())
-                && NBTHelper.matchTag(stack1.getTagCompound(), stack2.getTagCompound());
+        return stack1 != null && stack2 != null &&
+                stack1.getItem() == stack2.getItem() &&
+                (!stack2.getHasSubtypes() || stack2.getItemDamage() == stack1.getItemDamage()) &&
+                NBTHelper.matchTag(stack1.getTagCompound(), stack2.getTagCompound());
     }
 
     /**
-     * {@link ItemStack}s with damage -1 are wildcards allowing all damages. Eg all colours of wool are allowed to
-     * create Beds.
+     * {@link ItemStack}s with damage -1 are wildcards allowing all damages. Eg all colours of wool are allowed to create Beds.
      *
      * @param stack1 The {@link ItemStack} being compared.
      * @param stack2 The {@link ItemStack} to compare to.
      * @return whether the two items are the same from the perspective of a crafting inventory.
      */
     public static boolean areStacksSameTypeCrafting(ItemStack stack1, ItemStack stack2) {
-        return stack1 != null && stack2 != null
-                && stack1.getItem() == stack2.getItem()
-                && (stack1.getItemDamage() == stack2.getItemDamage()
-                        || stack1.getItemDamage() == OreDictionary.WILDCARD_VALUE
-                        || stack2.getItemDamage() == OreDictionary.WILDCARD_VALUE
-                        || stack1.getItem().isDamageable());
+        return stack1 != null && stack2 != null &&
+                stack1.getItem() == stack2.getItem() &&
+                (stack1.getItemDamage() == stack2.getItemDamage() || stack1.getItemDamage() == OreDictionary.WILDCARD_VALUE || stack2.getItemDamage() == OreDictionary.WILDCARD_VALUE || stack1.getItem().isDamageable());
     }
 
     /**
      * NBT-friendly version of {@link #areStacksSameTypeCrafting(ItemStack, ItemStack)}
-     *
      * @param stack1 The {@link ItemStack} being compared.
      * @param stack2 The {@link ItemStack} to compare to.
      * @return whether the two items are the same from the perspective of a crafting inventory.
      */
     public static boolean areStacksSameTypeCraftingWithNBT(ItemStack stack1, ItemStack stack2) {
-
-        if (NEIServerUtils.areStacksSameTypeCrafting(stack2, stack1)) {
-            if (NBTHelper.matchTag(stack1.getTagCompound(), stack2.getTagCompound())) return true;
-            if (isItemTool(stack1)
-                    && (stack1.stackTagCompound == null || stack1.stackTagCompound.hasKey("GT.ToolStats"))
-                    && (stack2.stackTagCompound == null || stack2.stackTagCompound.hasKey("GT.ToolStats")))
-                return true;
-            return stack1.getMaxStackSize() == 1 && stack2.getMaxStackSize() == 1
-                    && (stack1.stackTagCompound == null ^ stack2.stackTagCompound == null);
-        }
-
-        return false;
-    }
-
-    /**
-     * GT Items don't have any NBT set for the recipe, so if either of the stacks has a NULL nbt, and the other doesn't,
-     * pretend they stack
-     *
-     * @param ItemStack stack
-     * @return
-     */
-    public static boolean isItemTool(ItemStack stack) {
-        return NEIServerUtils.gtMetaBaseItem != null && NEIServerUtils.gtMetaBaseItem.isInstance(stack.getItem());
+        return stack1 != null && stack2 != null &&
+                stack1.getItem() == stack2.getItem() &&
+                (
+                    stack1.getItemDamage() == stack2.getItemDamage() ||
+                    stack1.getItemDamage() == OreDictionary.WILDCARD_VALUE ||
+                    stack2.getItemDamage() == OreDictionary.WILDCARD_VALUE ||
+                    stack1.getItem().isDamageable()
+                ) &&
+                NBTHelper.matchTag(stack1.getTagCompound(), stack2.getTagCompound());
     }
 
     /**
@@ -229,10 +202,9 @@ public class NEIServerUtils {
      * @return The ordering of stack1 relative to stack2.
      */
     public static int compareStacks(ItemStack stack1, ItemStack stack2) {
-        if (stack1 == stack2) return 0; // catches both null
-        if (stack1 == null || stack2 == null) return stack1 == null ? -1 : 1; // null stack goes first
-        if (stack1.getItem() != stack2.getItem())
-            return Item.getIdFromItem(stack1.getItem()) - Item.getIdFromItem(stack2.getItem());
+        if (stack1 == stack2) return 0;//catches both null
+        if (stack1 == null || stack2 == null) return stack1 == null ? -1 : 1;//null stack goes first
+        if (stack1.getItem() != stack2.getItem()) return Item.getIdFromItem(stack1.getItem()) - Item.getIdFromItem(stack2.getItem());
         if (stack1.stackSize != stack2.stackSize) return stack1.stackSize - stack2.stackSize;
         return stack1.getItemDamage() - stack2.getItemDamage();
     }
@@ -248,37 +220,33 @@ public class NEIServerUtils {
 
     public static void givePlayerItem(EntityPlayerMP player, ItemStack stack, boolean infinite, boolean doGive) {
         if (stack.getItem() == null) {
-            player.addChatComponentMessage(
-                    setColour(new ChatComponentTranslation("nei.chat.give.noitem"), EnumChatFormatting.WHITE));
+            player.addChatComponentMessage(setColour(new ChatComponentTranslation("nei.chat.give.noitem"), EnumChatFormatting.WHITE));
             return;
         }
 
         int given = stack.stackSize;
-        if (doGive) {
-            if (infinite) player.inventory.addItemStackToInventory(stack);
-            else given -= InventoryUtils.insertItem(player.inventory, stack, false);
+        if(doGive) {
+            if (infinite)
+                player.inventory.addItemStackToInventory(stack);
+            else
+                given -= InventoryUtils.insertItem(player.inventory, stack, false);
         }
 
-        sendNotice(
-                player,
-                new ChatComponentTranslation(
-                        "commands.give.success",
-                        stack.func_151000_E(),
-                        infinite ? "\u221E" : Integer.toString(given),
-                        player.getCommandSenderName()),
-                "notify-item");
+        sendNotice(player, new ChatComponentTranslation("commands.give.success", stack.func_151000_E(), infinite ? "\u221E" : Integer.toString(given), player.getCommandSenderName()), "notify-item");
         player.openContainer.detectAndSendChanges();
     }
 
     public static ItemStack copyStack(ItemStack itemstack, int i) {
-        if (itemstack == null) return null;
+        if (itemstack == null)
+            return null;
 
         itemstack.stackSize += i;
         return itemstack.splitStack(i);
     }
 
     public static ItemStack copyStack(ItemStack itemstack) {
-        if (itemstack == null) return null;
+        if (itemstack == null)
+            return null;
 
         return copyStack(itemstack, itemstack.stackSize);
     }
@@ -289,10 +257,14 @@ public class NEIServerUtils {
     }
 
     public static int getCreativeMode(EntityPlayerMP player) {
-        if (NEIServerConfig.forPlayer(player.getCommandSenderName()).isActionEnabled("creative+")) return 2;
-        else if (player.theItemInWorldManager.isCreative()) return 1;
-        else if (player.theItemInWorldManager.getGameType().isAdventure()) return 3;
-        else return 0;
+        if (NEIServerConfig.forPlayer(player.getCommandSenderName()).isActionEnabled("creative+"))
+            return 2;
+        else if (player.theItemInWorldManager.isCreative())
+            return 1;
+        else if (player.theItemInWorldManager.getGameType().isAdventure())
+            return 3;
+        else
+            return 0;
     }
 
     public static GameType getGameType(int mode) {
@@ -309,51 +281,53 @@ public class NEIServerUtils {
     }
 
     public static void setGamemode(EntityPlayerMP player, int mode) {
-        if (mode < 0 || mode >= NEIActions.gameModes.length
-                || NEIActions.nameActionMap.containsKey(NEIActions.gameModes[mode]) && !NEIServerConfig
-                        .canPlayerPerformAction(player.getCommandSenderName(), NEIActions.gameModes[mode]))
+        if (mode < 0 || mode >= NEIActions.gameModes.length ||
+                NEIActions.nameActionMap.containsKey(NEIActions.gameModes[mode]) &&
+                        !NEIServerConfig.canPlayerPerformAction(player.getCommandSenderName(), NEIActions.gameModes[mode]))
             return;
 
-        // creative+
+        //creative+
         NEIServerConfig.forPlayer(player.getCommandSenderName()).enableAction("creative+", mode == 2);
-        if (mode == 2 && !(player.openContainer instanceof ContainerCreativeInv)) // open the container immediately for
-                                                                                  // the client
+        if(mode == 2 && !(player.openContainer instanceof ContainerCreativeInv))//open the container immediately for the client
             NEISPH.processCreativeInv(player, true);
 
-        // change it on the server
+        //change it on the server
         player.theItemInWorldManager.setGameType(getGameType(mode));
 
-        // tell the client to change it
-        new PacketCustom(NEISPH.channel, S2C.SEND_GAME_MODE).writeByte(mode).sendToPlayer(player);
+        //tell the client to change it
+        new PacketCustom(NEISPH.channel, 14).writeByte(mode).sendToPlayer(player);
         player.addChatMessage(new ChatComponentTranslation("nei.chat.gamemode." + mode));
     }
 
     public static void cycleCreativeInv(EntityPlayerMP player, int steps) {
         InventoryPlayer inventory = player.inventory;
 
-        // top down [row][col]
+        //top down [row][col]
         ItemStack[][] slots = new ItemStack[10][9];
         PlayerSave playerSave = NEIServerConfig.forPlayer(player.getCommandSenderName());
 
-        // get
+        //get
         System.arraycopy(inventory.mainInventory, 0, slots[9], 0, 9);
 
         for (int row = 0; row < 3; row++)
             System.arraycopy(inventory.mainInventory, (row + 1) * 9, slots[row + 6], 0, 9);
 
-        for (int row = 0; row < 6; row++) System.arraycopy(playerSave.creativeInv, row * 9, slots[row], 0, 9);
+        for (int row = 0; row < 6; row++)
+            System.arraycopy(playerSave.creativeInv, row * 9, slots[row], 0, 9);
 
         ItemStack[][] newslots = new ItemStack[10][];
 
-        // put back
-        for (int row = 0; row < 10; row++) newslots[(row + steps + 10) % 10] = slots[row];
+        //put back
+        for (int row = 0; row < 10; row++)
+            newslots[(row + steps + 10) % 10] = slots[row];
 
         System.arraycopy(newslots[9], 0, inventory.mainInventory, 0, 9);
 
         for (int row = 0; row < 3; row++)
             System.arraycopy(newslots[row + 6], 0, inventory.mainInventory, (row + 1) * 9, 9);
 
-        for (int row = 0; row < 6; row++) System.arraycopy(newslots[row], 0, playerSave.creativeInv, row * 9, 9);
+        for (int row = 0; row < 6; row++)
+            System.arraycopy(newslots[row], 0, playerSave.creativeInv, row * 9, 9);
 
         playerSave.setDirty();
     }
@@ -362,66 +336,78 @@ public class NEIServerUtils {
         ArrayList<int[]> arraylist = new ArrayList<>();
         if (itemstack != null) {
             NBTTagList nbttaglist = itemstack.getEnchantmentTagList();
-            if (nbttaglist != null) for (int i = 0; i < nbttaglist.tagCount(); i++) {
-                NBTTagCompound tag = nbttaglist.getCompoundTagAt(i);
-                arraylist.add(new int[] { tag.getShort("id"), tag.getShort("lvl") });
-            }
+            if (nbttaglist != null)
+                for (int i = 0; i < nbttaglist.tagCount(); i++) {
+                    NBTTagCompound tag = nbttaglist.getCompoundTagAt(i);
+                    arraylist.add(new int[]{tag.getShort("id"), tag.getShort("lvl")});
+                }
         }
         return arraylist;
     }
 
     public static boolean stackHasEnchantment(ItemStack itemstack, int e) {
         List<int[]> allenchantments = getEnchantments(itemstack);
-        for (int[] ai : allenchantments) if (ai[0] == e) return true;
+        for (int[] ai : allenchantments)
+            if (ai[0] == e)
+                return true;
 
         return false;
     }
 
     public static int getEnchantmentLevel(ItemStack itemstack, int e) {
         List<int[]> allenchantments = getEnchantments(itemstack);
-        for (int[] ai : allenchantments) if (ai[0] == e) return ai[1];
+        for (int[] ai : allenchantments)
+            if (ai[0] == e)
+                return ai[1];
 
         return -1;
     }
 
     public static boolean doesEnchantmentConflict(List<int[]> enchantments, Enchantment e) {
-        for (int[] ai : enchantments) if (!e.canApplyTogether(Enchantment.enchantmentsList[ai[0]])) return true;
+        for (int[] ai : enchantments)
+            if (!e.canApplyTogether(Enchantment.enchantmentsList[ai[0]]))
+                return true;
 
         return false;
     }
 
     public static RuntimeException throwCME(String msg) {
-        if (CommonUtils.isClient()) return ClientHandler.throwCME(msg);
+        if (CommonUtils.isClient())
+            return ClientHandler.throwCME(msg);
 
         throw new RuntimeException(msg);
     }
 
     @SuppressWarnings("unchecked")
     public static ItemStack[] extractRecipeItems(Object obj) {
-        if (obj instanceof ItemStack) return new ItemStack[] { (ItemStack) obj };
-        if (obj instanceof ItemStack[]) return (ItemStack[]) obj;
-        if (obj instanceof List) return ((List<ItemStack>) obj).toArray(new ItemStack[0]);
+        if (obj instanceof ItemStack)
+            return new ItemStack[]{(ItemStack) obj};
+        if (obj instanceof ItemStack[])
+            return (ItemStack[]) obj;
+        if (obj instanceof List)
+            return ((List<ItemStack>) obj).toArray(new ItemStack[0]);
 
-        throw new ClassCastException(obj + " not an ItemStack, ItemStack[] or List<ItemStack?");
+        throw new ClassCastException(obj+" not an ItemStack, ItemStack[] or List<ItemStack?");
     }
 
     public static List<Integer> getRange(final int start, final int end) {
-        return new AbstractList<Integer>() {
-
+        return new AbstractList<Integer>()
+        {
             @Override
             public Integer get(int index) {
-                return start + index;
+                return start+index;
             }
 
             @Override
             public int size() {
-                return end - start;
+                return end-start;
             }
         };
     }
 
     public static StringBuilder fixTrailingCommaList(StringBuilder sb) {
-        if (sb.charAt(sb.length() - 1) == ',') sb.deleteCharAt(sb.length() - 1);
+        if(sb.charAt(sb.length()-1) == ',')
+            sb.deleteCharAt(sb.length()-1);
         return sb;
     }
 
@@ -475,8 +461,7 @@ public class NEIServerUtils {
                     }
                     itemStack.setTagCompound((NBTTagCompound) nbttag);
                 } catch (NBTException e) {
-                    FMLLog.getLogger()
-                            .log(Level.WARN, "Encountered an exception parsing ItemStack NBT string {}", nbtString, e);
+                    FMLLog.getLogger().log(Level.WARN, "Encountered an exception parsing ItemStack NBT string {}", nbtString, e);
                     return null;
                 }
             }
@@ -485,14 +470,16 @@ public class NEIServerUtils {
     }
 
     public static NBTTagCompound readNBT(File file) throws IOException {
-        if (!file.exists()) return null;
+        if(!file.exists()) return null;
         FileInputStream in = new FileInputStream(file);
         NBTTagCompound tag;
         try {
             tag = CompressedStreamTools.readCompressed(in);
-        } catch (ZipException e) {
-            if (e.getMessage().equals("Not in GZIP format")) tag = CompressedStreamTools.read(file);
-            else throw e;
+        } catch(ZipException e) {
+            if(e.getMessage().equals("Not in GZIP format"))
+                tag = CompressedStreamTools.read(file);
+            else
+                throw e;
         }
         in.close();
         return tag;

src/main/java/codechicken/nei/OffsetPositioner.java

@@ -1,25 +1,28 @@
 package codechicken.nei;
 
-import java.util.ArrayList;
-
 import codechicken.nei.api.IStackPositioner;
 
-public class OffsetPositioner implements IStackPositioner {
+import java.util.ArrayList;
 
-    public OffsetPositioner(int x, int y) {
+public class OffsetPositioner implements IStackPositioner
+{
+    public OffsetPositioner(int x, int y)
+    {
         offsetx = x;
         offsety = y;
     }
-
+    
     @Override
-    public ArrayList<PositionedStack> positionStacks(ArrayList<PositionedStack> ai) {
-        for (PositionedStack stack : ai) {
-            stack.relx += offsetx;
-            stack.rely += offsety;
+    public ArrayList<PositionedStack> positionStacks(ArrayList<PositionedStack> ai)
+    {
+        for(PositionedStack stack : ai)
+        {
+            stack.relx+=offsetx;
+            stack.rely+=offsety;
         }
         return ai;
     }
-
+    
     public int offsetx;
     public int offsety;
 }

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

@@ -1,40 +0,0 @@
-package codechicken.nei;
-
-public final class PacketIDs {
-
-    public static final class C2S {
-
-        public static final int GIVE_ITEM = 1;
-        public static final int DELETE_ALL_ITEMS = 4;
-        public static final int SET_SLOT = 5;
-        public static final int TOGGLE_MAGNET = 6;
-        public static final int SET_TIME = 7;
-        public static final int HEAL = 8;
-        public static final int TOGGLE_RAIN = 9;
-        public static final int REQUEST_LOGIN_INFO = 10;
-        public static final int REQUEST_CONTAINER_CONTENTS = 11;
-        public static final int CHANGE_PROPERTY = 12;
-        public static final int SET_GAME_MODE = 13;
-        public static final int CYCLE_CREATIVE_INV = 14;
-        public static final int SEND_MOB_SPAWNER_ID = 15;
-        public static final int REQUEST_CONTAINER = 16;
-        public static final int REQUEST_ENCHANTMENT_GUI = 21;
-        public static final int MODIFY_ENCHANTMENT = 22;
-        public static final int SET_CREATIVE_PLUS_MODE = 23;
-        public static final int REQUEST_POTION_GUI = 24;
-        public static final int SET_DUMMY_SLOT = 25;
-    }
-
-    public static final class S2C {
-
-        public static final int SEND_SERVER_SIDE_CHECK = 1;
-        public static final int SEND_LOGIN_STATE = 10;
-        public static final int SEND_ACTION_DISABLED = 11;
-        public static final int SEND_ACTION_ENABLED = 12;
-        public static final int SEND_MAGNETIC_ITEM = 13;
-        public static final int SEND_GAME_MODE = 14;
-        public static final int OPEN_ENCHANTMENT_GUI = 21;
-        public static final int SET_CREATIVE_PLUS_MODE = 23;
-        public static final int OPEN_POTION_GUI = 24;
-    }
-}

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

@@ -1,25 +1,20 @@
 package codechicken.nei;
 
-import java.awt.Point;
-import java.util.ArrayList;
-
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.item.ItemStack;
-
-import codechicken.lib.gui.GuiDraw;
-import codechicken.lib.vec.Rectangle4i;
-import codechicken.nei.ItemsGrid.ItemsGridSlot;
 import codechicken.nei.api.GuiInfo;
 import codechicken.nei.api.INEIGuiHandler;
 import codechicken.nei.guihook.GuiContainerManager;
-import codechicken.nei.guihook.IContainerTooltipHandler;
 import codechicken.nei.recipe.GuiCraftingRecipe;
 import codechicken.nei.recipe.GuiRecipe;
 import codechicken.nei.recipe.GuiUsageRecipe;
+import codechicken.lib.vec.Rectangle4i;
+import codechicken.nei.ItemPanel.ItemPanelSlot;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.item.ItemStack;
 
-public abstract class PanelWidget<T extends ItemsGrid<? extends ItemsGridSlot, ? extends ItemsGrid.MouseContext>>
-        extends Widget implements IContainerTooltipHandler {
+import java.util.ArrayList;
 
+public abstract class PanelWidget extends Widget
+{
     protected static final int PADDING = 2;
 
     public ItemStack draggedStack;
@@ -29,59 +24,55 @@ public abstract class PanelWidget<T extends ItemsGrid<? extends ItemsGridSlot, ?
     public Button pageNext;
     public Label pageLabel;
 
-    protected T grid;
+    protected ItemsGrid grid;
 
-    public ArrayList<ItemStack> getItems() {
-        return this.grid.getItems();
+    public ArrayList<ItemStack> getItems()
+    {
+        return grid.getItems();
     }
 
-    public T getGrid() {
-        return this.grid;
+    public ItemsGrid getGrid()
+    {
+        return grid;
     }
 
     public void init() {
         pageLabel = new Label("0/0", true);
 
-        pagePrev = new Button("<") {
-
+        pagePrev = new Button("Prev")
+        {
             public boolean onButtonPress(boolean rightclick) {
-
-                if (rightclick) {
-                    grid.setPage(0);
-                } else {
+                if (!rightclick) {
                     grid.shiftPage(-1);
+                    return true;
                 }
-
-                return true;
+                return false;
             }
 
             @Override
-            public void draw(int mousex, int mousey) {
-                this.state = grid.getNumPages() <= 1 ? 2 : 0;
-                super.draw(mousex, mousey);
+            public String getRenderLabel() {
+                return "<";
             }
         };
-        pageNext = new Button(">") {
-
+        pageNext = new Button("Next")
+        {
             public boolean onButtonPress(boolean rightclick) {
-
-                if (rightclick) {
-                    grid.setPage(grid.getNumPages() - 1);
-                } else {
+                if (!rightclick) {
                     grid.shiftPage(1);
+                    return true;
                 }
-
-                return true;
+                return false;
             }
 
             @Override
-            public void draw(int mousex, int mousey) {
-                this.state = grid.getNumPages() <= 1 ? 2 : 0;
-                super.draw(mousex, mousey);
+            public String getRenderLabel() {
+                return ">";
             }
         };
+
     }
 
+
     public abstract String getLabelText();
 
     protected abstract String getPositioningSettingName();
@@ -94,29 +85,26 @@ public abstract class PanelWidget<T extends ItemsGrid<? extends ItemsGridSlot, ?
 
     public abstract int getHeight(GuiContainer gui);
 
-    public void resize(GuiContainer gui) {
-        final Rectangle4i margin = new Rectangle4i(
-                getMarginLeft(gui),
-                getMarginTop(gui),
-                getWidth(gui),
-                getHeight(gui));
+    public void resize(GuiContainer gui)
+    {
+        final Rectangle4i margin = new Rectangle4i(getMarginLeft(gui), getMarginTop(gui), getWidth(gui), getHeight(gui));
 
+
+        final int minWidth = 5 * ItemsGrid.SLOT_SIZE;
+        final int minHeight = 9 * ItemsGrid.SLOT_SIZE;
+        
         final String settingName = getPositioningSettingName();
-        int paddingLeft = (int) Math
-                .ceil(margin.w * NEIClientConfig.getSetting(settingName + ".left").getIntValue() / 100000.0);
-        int paddingTop = (int) Math
-                .ceil(margin.h * NEIClientConfig.getSetting(settingName + ".top").getIntValue() / 100000.0);
-        int paddingRight = (int) Math
-                .ceil(margin.w * NEIClientConfig.getSetting(settingName + ".right").getIntValue() / 100000.0);
-        int paddingBottom = (int) Math
-                .ceil(margin.h * NEIClientConfig.getSetting(settingName + ".bottom").getIntValue() / 100000.0);
+        int paddingLeft = (int)Math.ceil(margin.w * NEIClientConfig.getSetting(settingName + ".left").getIntValue() / 100000.0);
+        int paddingTop = (int)Math.ceil(margin.h * NEIClientConfig.getSetting(settingName + ".top").getIntValue() / 100000.0);
+        int paddingRight = (int)Math.ceil(margin.w * NEIClientConfig.getSetting(settingName + ".right").getIntValue()/ 100000.0);
+        int paddingBottom = (int)Math.ceil(margin.h * NEIClientConfig.getSetting(settingName + ".bottom").getIntValue()  / 100000.0);
 
-        int deltaHeight = Math.min(0, margin.h - paddingTop - paddingBottom - ItemsGrid.SLOT_SIZE) / 2;
+        int deltaHeight = Math.min(0, margin.h - paddingTop - paddingBottom - minHeight) / 2;
 
-        paddingLeft = Math.min(paddingLeft, Math.max(0, margin.w - paddingRight - ItemsGrid.SLOT_SIZE));
-        paddingRight = Math.min(paddingRight, Math.max(0, margin.w - paddingLeft - ItemsGrid.SLOT_SIZE));
-        paddingTop = Math.min(margin.h - ItemsGrid.SLOT_SIZE, Math.max(0, paddingTop + deltaHeight));
-        paddingBottom = Math.min(margin.h - paddingTop - ItemsGrid.SLOT_SIZE, Math.max(0, paddingBottom - deltaHeight));
+        paddingLeft = Math.min(paddingLeft, Math.max(0, margin.w - paddingRight - minWidth));
+        paddingRight = Math.min(paddingRight, Math.max(0, margin.w - paddingLeft - minWidth));
+        paddingTop = Math.min(margin.h - minHeight, Math.max(0, paddingTop + deltaHeight));
+        paddingBottom = Math.min(margin.h - paddingTop - minHeight, Math.max(0, paddingBottom - deltaHeight));
 
         x = margin.x + paddingLeft;
         y = margin.y + paddingTop;
@@ -126,28 +114,21 @@ public abstract class PanelWidget<T extends ItemsGrid<? extends ItemsGridSlot, ?
         final int header = resizeHeader(gui);
         final int footer = resizeFooter(gui);
 
-        this.grid.setGridSize(x, y + header, w, h - header - footer);
-        this.grid.refresh(gui);
+        grid.setGridSize(x, y + header, w, h - header - footer);
+        grid.refresh(gui);
     }
 
-    protected int resizeHeader(GuiContainer gui) {
+    protected int resizeHeader(GuiContainer gui)
+    {
         final int BUTTON_SIZE = 16;
         int paddingLeft = 0;
         int paddingRight = 0;
 
-        while (paddingLeft < w && GuiInfo.hideItemPanelSlot(
-                gui,
-                new Rectangle4i(x + paddingLeft, y, ItemsGrid.SLOT_SIZE, ItemsGrid.SLOT_SIZE))) {
+        while (paddingLeft < w && GuiInfo.hideItemPanelSlot(gui, new Rectangle4i(x + paddingLeft, y, ItemsGrid.SLOT_SIZE, ItemsGrid.SLOT_SIZE))) {
             paddingLeft += ItemsGrid.SLOT_SIZE;
         }
 
-        while (paddingRight < w && GuiInfo.hideItemPanelSlot(
-                gui,
-                new Rectangle4i(
-                        x + w - paddingRight - ItemsGrid.SLOT_SIZE,
-                        y,
-                        ItemsGrid.SLOT_SIZE,
-                        ItemsGrid.SLOT_SIZE))) {
+        while (paddingRight < w && GuiInfo.hideItemPanelSlot(gui, new Rectangle4i(x + w - paddingRight - ItemsGrid.SLOT_SIZE, y, ItemsGrid.SLOT_SIZE, ItemsGrid.SLOT_SIZE))) {
             paddingRight += ItemsGrid.SLOT_SIZE;
         }
 
@@ -171,27 +152,24 @@ public abstract class PanelWidget<T extends ItemsGrid<? extends ItemsGridSlot, ?
 
     protected abstract int resizeFooter(GuiContainer gui);
 
-    public void setVisible() {
-        if (this.grid.getPerPage() > 0 && !this.grid.isEmpty()) {
+    public void setVisible()
+    {
+        if (grid.getPerPage() > 0) {
             LayoutManager.addWidget(pagePrev);
             LayoutManager.addWidget(pageNext);
             LayoutManager.addWidget(pageLabel);
-            this.grid.setVisible();
         }
     }
 
     @Override
-    public void update() {
-        this.grid.update();
+    public void draw(int mousex, int mousey)
+    {
+        grid.draw(mousex, mousey);
     }
 
     @Override
-    public void draw(int mousex, int mousey) {
-        this.grid.draw(mousex, mousey);
-    }
-
-    @Override
-    public void postDraw(int mousex, int mousey) {
+    public void postDraw(int mousex, int mousey)
+    {
         if (draggedStack != null) {
             GuiContainerManager.drawItems.zLevel += 100;
             GuiContainerManager.drawItem(mousex - 8, mousey - 8, draggedStack);
@@ -200,38 +178,59 @@ public abstract class PanelWidget<T extends ItemsGrid<? extends ItemsGridSlot, ?
     }
 
     @Override
-    public void mouseDragged(int mousex, int mousey, int button, long heldTime) {
-        if (this.grid.getSlotBySlotIndex(mouseDownSlot) == null) {
-            mouseDownSlot = -1;
-        }
-
-        if (mouseDownSlot >= 0 && draggedStack == null
-                && NEIClientUtils.getHeldItem() == null
-                && NEIClientConfig.hasSMPCounterPart()) {
-            ItemsGridSlot mouseOverSlot = this.grid.getSlotMouseOver(mousex, mousey);
+    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);
 
             if (mouseOverSlot == null || mouseOverSlot.slotIndex != mouseDownSlot || heldTime > 500) {
-                draggedStack = getDraggedStackWithQuantity(this.grid.getSlotBySlotIndex(mouseDownSlot).getItemStack());
+                draggedStack = getDraggedStackWithQuantity(mouseDownSlot);
                 mouseDownSlot = -1;
             }
+
         }
     }
 
-    protected abstract ItemStack getDraggedStackWithQuantity(ItemStack itemStack);
+    protected abstract ItemStack getDraggedStackWithQuantity(int mouseDownSlot);
 
     @Override
-    public boolean handleClick(int mousex, int mousey, int button) {
-        if (handleClickExt(mousex, mousey, button)) return true;
+    public boolean handleClick(int mousex, int mousey, int button)
+    {
 
-        ItemsGridSlot hoverSlot = this.grid.getSlotMouseOver(mousex, mousey);
+        if (handleClickExt(mousex, mousey, button))
+            return true;
+
+        if (NEIClientUtils.getHeldItem() != null) {
+
+            if (!grid.contains(mousex, mousey)) {
+                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) {
-                draggedStack = getDraggedStackWithQuantity(hoverSlot.getItemStack());
+
+                if (hoverSlot.item != null) {
+                    draggedStack = getDraggedStackWithQuantity(hoverSlot.slotIndex);
+                }
+
             } else {
                 mouseDownSlot = hoverSlot.slotIndex;
             }
-
+            
             return true;
         }
 
@@ -239,14 +238,8 @@ public abstract class PanelWidget<T extends ItemsGrid<? extends ItemsGridSlot, ?
     }
 
     @Override
-    public boolean handleClickExt(int mouseX, int mouseY, int button) {
-
-        if (ItemPanels.itemPanel.draggedStack != null && ItemPanels.bookmarkPanel.contains(mouseX, mouseY)) {
-            ItemPanels.bookmarkPanel.addItem(ItemPanels.itemPanel.draggedStack);
-            ItemPanels.itemPanel.draggedStack = null;
-            return true;
-        }
-
+    public boolean handleClickExt(int mouseX, int mouseY, int button)
+    {
         if (ItemPanels.itemPanel.draggedStack != null) {
             return ItemPanels.itemPanel.handleDraggedClick(mouseX, mouseY, button);
         }
@@ -255,39 +248,29 @@ public abstract class PanelWidget<T extends ItemsGrid<? extends ItemsGridSlot, ?
             return ItemPanels.bookmarkPanel.handleDraggedClick(mouseX, mouseY, button);
         }
 
-        if (NEIClientUtils.getHeldItem() != null) {
-            final ItemStack draggedStack = NEIClientUtils.getHeldItem().copy();
-            return handleGUIContainerClick(draggedStack, mouseX, mouseY, button);
-        }
-
         return false;
     }
 
-    protected boolean handleDraggedClick(int mouseX, int mouseY, int button) {
+    protected boolean handleDraggedClick(int mouseX, int mouseY, int button)
+    {
         if (draggedStack == null) {
             return false;
         }
 
-        if (handleGUIContainerClick(draggedStack, mouseX, mouseY, button)) {
-
-            if (draggedStack.stackSize == 0) {
-                draggedStack = null;
-            }
-
+        if (handleGUIContainerClick(mouseX, mouseY, button)) {
             return true;
         }
 
         final GuiContainer gui = NEIClientUtils.getGuiContainer();
-        if (mouseX < gui.guiLeft || mouseY < gui.guiTop
-                || mouseX >= gui.guiLeft + gui.xSize
-                || mouseY >= gui.guiTop + gui.ySize) {
+        if (mouseX < gui.guiLeft || mouseY < gui.guiTop || mouseX >= gui.guiLeft + gui.xSize || mouseY >= gui.guiTop + gui.ySize) {
             draggedStack = null;
         }
 
         return true;
     }
 
-    protected boolean handleGUIContainerClick(final ItemStack draggedStack, int mouseX, int mouseY, int button) {
+    protected boolean handleGUIContainerClick(int mouseX, int mouseY, int button)
+    {
         final GuiContainer gui = NEIClientUtils.getGuiContainer();
         boolean handled = false;
 
@@ -303,53 +286,60 @@ public abstract class PanelWidget<T extends ItemsGrid<? extends ItemsGridSlot, ?
             GuiInfo.readLock.unlock();
         }
 
+        if (draggedStack.stackSize == 0) {
+            draggedStack = null;
+        }
+
         return handled;
     }
 
     @Override
-    public void mouseUp(int mousex, int mousey, int button) {
-        final ItemsGridSlot hoverSlot = this.grid.getSlotMouseOver(mousex, mousey);
+    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 || NEIClientUtils.shiftKey()
-                    || !NEIClientConfig.canCheatItem(hoverSlot.getItemStack())) {
+            if (NEIController.manager.window instanceof GuiRecipe || !NEIClientConfig.canCheatItem(item)) {
 
                 if (button == 0) {
-                    GuiCraftingRecipe.openRecipeGui("item", hoverSlot.getItemStack().copy());
+                    GuiCraftingRecipe.openRecipeGui("item", item);
                 } else if (button == 1) {
-                    GuiUsageRecipe.openRecipeGui("item", hoverSlot.getItemStack().copy());
+                    GuiUsageRecipe.openRecipeGui("item", item);
                 }
 
-            } else {
-                NEIClientUtils.cheatItem(getDraggedStackWithQuantity(hoverSlot.getItemStack()), button, -1);
+                mouseDownSlot = -1;
+                return;
             }
 
+            NEIClientUtils.cheatItem(getDraggedStackWithQuantity(hoverSlot.slotIndex), button, -1);
         }
 
         mouseDownSlot = -1;
     }
 
     @Override
-    public boolean onMouseWheel(int i, int mousex, int mousey) {
-        if (!contains(mousex, mousey)) return false;
+    public boolean onMouseWheel(int i, int mousex, int mousey)
+    {
+        if (!contains(mousex, mousey))
+            return false;
 
-        this.grid.shiftPage(-i);
+        grid.shiftPage(-i);
         return true;
     }
 
     @Override
-    public boolean handleKeyPress(int keyID, char keyChar) {
-        final Point mouse = GuiDraw.getMousePosition();
-        if (!contains(mouse.x, mouse.y)) return false;
+    public boolean handleKeyPress(int keyID, char keyChar)
+    {
 
-        if (NEIClientConfig.isKeyHashDown("gui.next")) {
-            this.grid.shiftPage(1);
+        if (keyID == NEIClientConfig.getKeyBinding("gui.next")) {
+            grid.shiftPage(1);
             return true;
         }
 
-        if (NEIClientConfig.isKeyHashDown("gui.prev")) {
-            this.grid.shiftPage(-1);
+        if (keyID == NEIClientConfig.getKeyBinding("gui.prev")) {
+            grid.shiftPage(-1);
             return true;
         }
 
@@ -357,29 +347,29 @@ public abstract class PanelWidget<T extends ItemsGrid<? extends ItemsGridSlot, ?
     }
 
     @Override
-    public ItemStack getStackMouseOver(int mousex, int mousey) {
-        final ItemsGridSlot slot = this.grid.getSlotMouseOver(mousex, mousey);
-        return slot == null ? null : slot.getItemStack();
+    public ItemStack getStackMouseOver(int mousex, int mousey)
+    {
+        ItemPanelSlot slot = getSlotMouseOver(mousex, mousey);
+        return slot == null ? null : slot.item;
     }
 
-    public ItemStack getStackMouseOverWithQuantity(int mousex, int mousey) {
-        final ItemStack hoverSlot = getStackMouseOver(mousex, mousey);
-        return hoverSlot != null ? getDraggedStackWithQuantity(hoverSlot) : null;
+    public ItemPanelSlot getSlotMouseOver(int mousex, int mousey)
+    {
+        return grid.getSlotMouseOver(mousex, mousey);
     }
 
-    abstract ItemsGridSlot getSlotMouseOver(int mousex, int mousey);
-
     public int getPage() {
-        return this.grid.getPage();
+        return grid.page + 1;
     }
 
     public int getNumPages() {
-        return this.grid.getNumPages();
+        return grid.numPages;
     }
 
     @Override
-    public boolean contains(int px, int py) {
-        return this.grid.contains(px, py);
+    public boolean contains(int px, int py)
+    {
+        return grid.contains(px, py);
     }
 
 }

src/main/java/codechicken/nei/PlayerSave.java

@@ -1,17 +1,16 @@
 package codechicken.nei;
 
-import java.io.File;
-
+import codechicken.core.ServerUtils;
+import codechicken.lib.inventory.InventoryUtils;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 
-import codechicken.core.ServerUtils;
-import codechicken.lib.inventory.InventoryUtils;
-
-public class PlayerSave {
+import java.io.File;
 
+public class PlayerSave
+{
     public String username;
 
     private File saveFile;
@@ -28,17 +27,20 @@ public class PlayerSave {
         wasOp = ServerUtils.isPlayerOP(playername);
 
         saveFile = new File(saveLocation, username + ".dat");
-        if (!saveFile.getParentFile().exists()) saveFile.getParentFile().mkdirs();
+        if (!saveFile.getParentFile().exists())
+            saveFile.getParentFile().mkdirs();
         load();
     }
 
     private void load() {
         nbt = new NBTTagCompound();
         try {
-            if (!saveFile.exists()) saveFile.createNewFile();
-            if (saveFile.length() > 0) nbt = NEIServerUtils.readNBT(saveFile);
+            if (!saveFile.exists())
+                saveFile.createNewFile();
+            if (saveFile.length() > 0)
+                nbt = NEIServerUtils.readNBT(saveFile);
         } catch (Exception e) {
-            NEIClientConfig.logger.error("Error loading player save: " + username, e);
+            NEIClientConfig.logger.error("Error loading player save: "+username, e);
         }
 
         loadCreativeInv();
@@ -47,19 +49,22 @@ public class PlayerSave {
     private void loadCreativeInv() {
         creativeInv = new ItemStack[54];
         NBTTagList itemList = nbt.getTagList("creativeitems", 10);
-        if (itemList != null) InventoryUtils.readItemStacksFromTag(creativeInv, itemList);
+        if (itemList != null)
+            InventoryUtils.readItemStacksFromTag(creativeInv, itemList);
     }
 
     public void save() {
-        if (!isDirty) return;
+        if (!isDirty)
+            return;
 
-        if (creativeInvDirty) saveCreativeInv();
+        if (creativeInvDirty)
+            saveCreativeInv();
 
         try {
             NEIServerUtils.writeNBT(nbt, saveFile);
             isDirty = false;
         } catch (Exception e) {
-            NEIClientConfig.logger.error("Error saving player: " + username, e);
+            NEIClientConfig.logger.error("Error saving player: "+username, e);
         }
     }
 
@@ -92,7 +97,8 @@ public class PlayerSave {
 
     private NBTTagCompound getEnabledActions() {
         NBTTagCompound tag = nbt.getCompoundTag("enabledActions");
-        if (!nbt.hasKey("enabledActions")) nbt.setTag("enabledActions", tag);
+        if (!nbt.hasKey("enabledActions"))
+            nbt.setTag("enabledActions", tag);
         return tag;
     }
 

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

@@ -1,56 +1,69 @@
 package codechicken.nei;
 
-import static codechicken.nei.NEIClientConfig.canPerformAction;
-
+import codechicken.nei.guihook.IContainerInputHandler;
 import net.minecraft.client.gui.inventory.GuiContainer;
 
-import codechicken.nei.guihook.IContainerInputHandler;
-
-public class PopupInputHandler implements IContainerInputHandler {
+import static codechicken.nei.NEIClientConfig.canPerformAction;
+import static codechicken.nei.NEIClientConfig.getKeyBinding;
 
+public class PopupInputHandler implements IContainerInputHandler
+{
     @Override
-    public boolean keyTyped(GuiContainer gui, char keyChar, int keyCode) {
+    public boolean keyTyped(GuiContainer gui, char keyChar, int keyCode)
+    {
         return false;
     }
 
     @Override
-    public boolean mouseClicked(GuiContainer gui, int mousex, int mousey, int button) {
+    public boolean mouseClicked(GuiContainer gui, int mousex, int mousey, int button)
+    {
         return false;
     }
 
     @Override
-    public void onKeyTyped(GuiContainer gui, char keyChar, int keyID) {}
+    public void onKeyTyped(GuiContainer gui, char keyChar, int keyID)
+    {
+    }
 
     @Override
-    public boolean lastKeyTyped(GuiContainer gui, char keyChar, int keyID) {
-
-        if (NEIClientConfig.isKeyHashDown("gui.enchant") && canPerformAction("enchant")) {
+    public boolean lastKeyTyped(GuiContainer gui, char keyChar, int keyID)
+    {
+        if(keyID == getKeyBinding("gui.enchant") && canPerformAction("enchant"))
+        {
             NEICPH.sendOpenEnchantmentWindow();
             return true;
         }
-
-        if (NEIClientConfig.isKeyHashDown("gui.potion") && canPerformAction("potion")) {
+        if(keyID == getKeyBinding("gui.potion") && canPerformAction("potion"))
+        {
             NEICPH.sendOpenPotionWindow();
             return true;
         }
-
         return false;
     }
 
     @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 onMouseUp(GuiContainer gui, int mousex, int mousey, int button) {}
+    public void onMouseUp(GuiContainer gui, int mousex, int mousey, int button)
+    {
+    }
 
     @Override
-    public boolean mouseScrolled(GuiContainer gui, int mousex, int mousey, int scrolled) {
+    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) {}
-
+    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) {}
+    public void onMouseDragged(GuiContainer gui, int mousex, int mousey, int button, long heldTime)
+    {
+    }
 }

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

@@ -1,144 +1,100 @@
 package codechicken.nei;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.List;
-import java.util.stream.Collectors;
-
 import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;
 
-import codechicken.nei.api.ItemFilter;
-import codechicken.nei.api.ItemInfo;
-import codechicken.nei.recipe.GuiRecipe;
-import codechicken.nei.recipe.StackInfo;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
- * Simply an {@link ItemStack} with position. Mainly used in the recipe handlers.
+ * Simply an {@link ItemStack} with position.
+ * Mainly used in the recipe handlers.
  */
-public class PositionedStack {
-
+public class PositionedStack
+{    
     public int relx;
     public int rely;
     public ItemStack[] items;
-    // compatibility dummy
+    //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) {
+        
+        if(genPerms)
             generatePermutations();
-        } else {
+        else
             setPermutationToRender(0);
-        }
     }
-
-    public PositionedStack(Object object, int x, int y) {
+    
+    public PositionedStack(Object object, int x, int y)
+    {
         this(object, x, y, true);
     }
 
     public void generatePermutations() {
-        if (permutated) return;
-
-        List<ItemStack> stacks = new ArrayList<>();
-        for (ItemStack item : items) {
-            if (item == null || item.getItem() == null) continue;
-
-            if (item.getItemDamage() == Short.MAX_VALUE) {
+        if(permutated)
+            return;
+        
+        ArrayList<ItemStack> stacks = new ArrayList<>();
+        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) {
-                        ItemStack toAdd = stack.copy();
-                        toAdd.stackSize = item.stackSize;
-                        stacks.add(toAdd);
-                    }
-                } else {
+                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) };
-
+        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;
+        for(ItemStack item : items)
+            if(item.stackSize > i)
+                item.stackSize = i;
     }
-
+    
     public PositionedStack copy() {
-        PositionedStack pStack = new PositionedStack(
-                Arrays.stream(this.items).map(ItemStack::copy).toArray(ItemStack[]::new),
-                relx,
-                rely,
-                false);
-        pStack.permutated = this.permutated;
-        return pStack;
+        return new PositionedStack(items, relx, rely);
     }
-
-    public List<ItemStack> getFilteredPermutations() {
-        return getFilteredPermutations(null);
-    }
-
-    public List<ItemStack> getFilteredPermutations(ItemFilter additionalFilter) {
-        List<ItemStack> items = Arrays.asList(this.items);
-
-        items = filteringPermutations(items, item -> !ItemInfo.isHidden(item));
-        items = filteringPermutations(items, PresetsList.getItemFilter());
-        items = filteringPermutations(items, GuiRecipe.getSearchItemFilter());
-        items = filteringPermutations(items, additionalFilter);
-
-        items.sort(Comparator.comparing(FavoriteRecipes::contains).reversed());
-        return items;
-    }
-
-    private List<ItemStack> filteringPermutations(List<ItemStack> items, ItemFilter filter) {
-        if (filter == null) return items;
-        final List<ItemStack> filteredItems = items.stream().filter(filter::matches).collect(Collectors.toList());
-        return filteredItems.isEmpty() ? items : filteredItems;
-    }
-
-    public boolean setPermutationToRender(ItemStack ingredient) {
-
-        for (int index = 0; index < this.items.length; index++) {
-            if (NEIServerUtils.areStacksSameTypeCraftingWithNBT(this.items[index], ingredient)) {
-                setPermutationToRender(index);
-                return true;
-            }
-        }
-
-        return false;
-    }
-
+    
     public void setPermutationToRender(int index) {
-        this.item = this.items[index].copy();
-
-        if (this.item.getItem() == null) {
-            this.item = new ItemStack(Blocks.fire);
-        } else if (this.item.getItemDamage() == OreDictionary.WILDCARD_VALUE && this.item.getItem().isRepairable()) {
-            this.item.setItemDamage(0);
-        }
+        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;
-
+        for(ItemStack item : items)
+            if(NEIServerUtils.areStacksSameTypeCrafting(item, ingredient))
+                return true;
+        
         return false;
     }
 
@@ -146,17 +102,21 @@ public class PositionedStack {
      * NBT-friendly version of {@link #contains(ItemStack)}
      */
     public boolean containsWithNBT(ItemStack ingredient) {
-        for (ItemStack item : items) if (StackInfo.equalItemAndNBT(item, ingredient, true)) return true;
+        for(ItemStack item : items)
+            if(NEIServerUtils.areStacksSameTypeCraftingWithNBT(item, ingredient))
+                return true;
 
         return false;
     }
 
     public boolean contains(Item ingred) {
-        for (ItemStack item : items) if (item.getItem() == ingred) return true;
-
+        for(ItemStack item : items)
+            if(item.getItem() == ingred)
+                return true;
+        
         return false;
     }
-
+    
     @Override
     public String toString() {
         return "PositionedStack(output='" + item.toString() + "')";

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

@@ -1,249 +0,0 @@
-package codechicken.nei;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import net.minecraft.item.ItemStack;
-
-import org.apache.commons.io.IOUtils;
-
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-import com.google.gson.JsonPrimitive;
-import com.google.gson.JsonSyntaxException;
-
-import codechicken.core.CommonUtils;
-import codechicken.nei.api.API;
-import codechicken.nei.api.IRecipeFilter;
-import codechicken.nei.api.IRecipeFilter.IRecipeFilterProvider;
-import codechicken.nei.api.ItemFilter;
-import codechicken.nei.api.ItemFilter.ItemFilterProvider;
-import codechicken.nei.recipe.IRecipeHandler;
-import codechicken.nei.recipe.StackInfo;
-import codechicken.nei.util.NBTJson;
-
-public class PresetsList {
-
-    public enum PresetMode {
-        HIDE,
-        REMOVE,
-        GROUP;
-    }
-
-    public static class Preset implements ItemFilter {
-
-        public String name = "";
-        public boolean enabled = true;
-        public PresetMode mode = PresetMode.HIDE;
-        public Set<String> items = new HashSet<>();
-
-        public static String getIdentifier(ItemStack stack) {
-            return StackInfo.getItemStackGUID(stack);
-        }
-
-        @Override
-        public boolean matches(ItemStack item) {
-            return items.contains(Preset.getIdentifier(item));
-        }
-
-        public Preset copy() {
-            Preset preset = new Preset();
-
-            preset.name = name;
-            preset.enabled = enabled;
-            preset.mode = mode;
-            preset.items = new HashSet<>(items);
-
-            return preset;
-        }
-    }
-
-    protected static class RecipesFilter implements IRecipeFilterProvider, IRecipeFilter {
-
-        public Set<String> cache;
-
-        public IRecipeFilter getFilter() {
-
-            if (cache == null) {
-                cache = PresetsList.presets.stream().filter(p -> p.enabled && p.mode == PresetMode.REMOVE)
-                        .flatMap(p -> p.items.stream()).collect(Collectors.toSet());
-            }
-
-            return cache.isEmpty() ? null : this;
-        }
-
-        @Override
-        public boolean matches(IRecipeHandler handler, List<PositionedStack> ingredients, PositionedStack result,
-                List<PositionedStack> others) {
-
-            if (matchPositionedStack(ingredients, false)) {
-                return false;
-            }
-
-            if (result != null && matchPositionedStack(result)) {
-                return true;
-            }
-
-            if (!others.isEmpty() && matchPositionedStack(others, true)) {
-                return true;
-            }
-
-            return result == null && others.isEmpty();
-        }
-
-        private boolean matchPositionedStack(List<PositionedStack> items, boolean dir) {
-            for (PositionedStack pStack : items) {
-                if (matchPositionedStack(pStack) == dir) {
-                    return true;
-                }
-            }
-
-            return false;
-        }
-
-        private boolean matchPositionedStack(PositionedStack pStack) {
-            for (ItemStack stack : pStack.items) {
-                if (!cache.contains(Preset.getIdentifier(stack))) {
-                    return true;
-                }
-            }
-
-            return false;
-        }
-
-    }
-
-    protected static class ItemPanelFilter implements ItemFilterProvider, ItemFilter {
-
-        public Set<String> cache;
-
-        public ItemFilter getFilter() {
-
-            if (cache == null) {
-                cache = PresetsList.presets.stream()
-                        .filter(p -> p.enabled && (p.mode == PresetMode.HIDE || p.mode == PresetMode.REMOVE))
-                        .flatMap(p -> p.items.stream()).collect(Collectors.toSet());
-            }
-
-            return cache.isEmpty() ? null : this;
-        }
-
-        @Override
-        public boolean matches(ItemStack stack) {
-            return !cache.contains(Preset.getIdentifier(stack));
-        }
-    }
-
-    public static final List<Preset> presets = new ArrayList<>();
-    protected static RecipesFilter recipeFilter = new RecipesFilter();
-    protected static ItemPanelFilter itemFilter = new ItemPanelFilter();
-
-    static {
-        API.addItemFilter(itemFilter);
-        API.addRecipeFilter(recipeFilter);
-    }
-
-    public static ItemFilter getItemFilter() {
-        return itemFilter.getFilter();
-    }
-
-    public static void load() {
-        final File presetsFile = new File(CommonUtils.getMinecraftDir(), "saves/NEI/global/presets.ini");
-
-        if (presetsFile == null || !presetsFile.exists()) {
-            return;
-        }
-
-        List<String> itemStrings;
-        try (FileInputStream reader = new FileInputStream(presetsFile)) {
-            NEIClientConfig.logger.info("Loading presets from file {}", presetsFile);
-            itemStrings = IOUtils.readLines(reader, StandardCharsets.UTF_8);
-        } catch (IOException e) {
-            NEIClientConfig.logger.error("Failed to load presets from file {}", presetsFile, e);
-            return;
-        }
-
-        JsonParser parser = new JsonParser();
-        Preset preset = new Preset();
-        presets.clear();
-
-        for (String itemStr : itemStrings) {
-
-            try {
-
-                if (itemStr.isEmpty()) {
-                    itemStr = "; {}";
-                }
-
-                if (itemStr.startsWith("; ")) {
-                    JsonObject settings = parser.parse(itemStr.substring(2)).getAsJsonObject();
-
-                    if (!preset.items.isEmpty()) {
-                        // do not create empty namespaces
-                        presets.add(preset);
-                        preset = new Preset();
-                    }
-
-                    if (settings.has("name")) {
-                        preset.name = settings.get("name").getAsString();
-                    }
-
-                    if (settings.has("enabled")) {
-                        preset.enabled = settings.get("enabled").getAsBoolean();
-                    }
-
-                    if (settings.has("mode")) {
-                        preset.mode = PresetMode.valueOf(settings.get("mode").getAsString());
-                    }
-
-                } else {
-                    preset.items.add(itemStr);
-                }
-
-            } catch (IllegalArgumentException | JsonSyntaxException | IllegalStateException e) {
-                NEIClientConfig.logger.error("Failed to load presets ItemStack from json string:\n{}", itemStr);
-            }
-        }
-
-        if (!preset.items.isEmpty()) {
-            presets.add(preset);
-        }
-    }
-
-    public static void savePresets() {
-        final File presetsFile = new File(CommonUtils.getMinecraftDir(), "saves/NEI/global/presets.ini");
-        final List<String> strings = new ArrayList<>();
-
-        for (Preset preset : presets) {
-            JsonObject settings = new JsonObject();
-
-            settings.add("name", new JsonPrimitive(preset.name));
-            settings.add("enabled", new JsonPrimitive(preset.enabled));
-            settings.add("mode", new JsonPrimitive(preset.mode.toString()));
-
-            strings.add("; " + NBTJson.toJson(settings));
-            strings.addAll(preset.items);
-        }
-
-        try (FileOutputStream output = new FileOutputStream(presetsFile)) {
-            IOUtils.writeLines(strings, "\n", output, StandardCharsets.UTF_8);
-        } catch (IOException e) {
-            NEIClientConfig.logger.error("Filed to save presets list to file {}", presetsFile, e);
-        }
-
-        recipeFilter.cache = null;
-        itemFilter.cache = null;
-        CollapsibleItems.saveStates();
-        CollapsibleItems.load();
-        LayoutManager.markItemsDirty();
-    }
-
-}

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

@@ -1,86 +0,0 @@
-package codechicken.nei;
-
-import net.minecraft.util.EnumChatFormatting;
-
-import codechicken.nei.SearchField.GuiSearchField;
-import codechicken.nei.api.ItemFilter;
-import codechicken.nei.util.TextHistory;
-
-public abstract class RecipeSearchField extends TextField {
-
-    private static final TextHistory history = new TextHistory();
-
-    public RecipeSearchField(String ident) {
-        super(ident);
-        this.field.setVisible(false);
-    }
-
-    @Override
-    protected void initInternalTextField() {
-        field = new GuiSearchField();
-        field.setMaxStringLength(maxSearchLength);
-        field.setCursorPositionZero();
-    }
-
-    public boolean isVisible() {
-        return this.field.getVisible();
-    }
-
-    public void setVisible(boolean visible) {
-        this.field.setVisible(visible);
-    }
-
-    protected abstract boolean noResults();
-
-    @Override
-    public int getTextColour() {
-        if (!text().isEmpty() && !noResults()) {
-            return focused() ? 0xFFcc3300 : 0xFF993300;
-        } else {
-            return focused() ? 0xFFE0E0E0 : 0xFF909090;
-        }
-    }
-
-    @Override
-    public void lastKeyTyped(int keyID, char keyChar) {
-
-        if (focused() && NEIClientConfig.isKeyHashDown("gui.getprevioussearch")) {
-            handleNavigateHistory(TextHistory.Direction.PREVIOUS);
-        }
-
-        if (focused() && NEIClientConfig.isKeyHashDown("gui.getnextsearch")) {
-            handleNavigateHistory(TextHistory.Direction.NEXT);
-        }
-    }
-
-    @Override
-    public String filterText(String s) {
-        return EnumChatFormatting.getTextWithoutFormattingCodes(s);
-    }
-
-    public ItemFilter getFilter() {
-        return ((GuiSearchField) field).getFilter();
-    }
-
-    @Override
-    public void setFocus(boolean focus) {
-        final boolean previousFocus = field.isFocused();
-
-        if (previousFocus != focus) {
-            history.add(text());
-        }
-
-        super.setFocus(focus);
-    }
-
-    private boolean handleNavigateHistory(TextHistory.Direction direction) {
-        if (focused()) {
-            return history.get(direction, text()).map(newText -> {
-                setText(newText);
-                return true;
-            }).orElse(false);
-        }
-        return false;
-    }
-
-}

src/main/java/codechicken/nei/RestartableTask.java

@@ -1,7 +1,7 @@
 package codechicken.nei;
 
-public abstract class RestartableTask {
-
+public abstract class RestartableTask
+{
     public final String name;
     private Thread thread;
     private volatile boolean restart;
@@ -15,22 +15,21 @@ public abstract class RestartableTask {
 
     private void start() {
         thread = new Thread(name) {
-
             @Override
             public void run() {
                 do {
-                    while (stopped) try {
-                        Thread.sleep(1);
-                    } catch (InterruptedException ignored) {}
-                    if (!restart) execute();
-                } while (!finish());
+                    while(stopped)
+                        try { Thread.sleep(1); } catch (InterruptedException ignored) {}
+                    if(!restart)
+                        execute();
+                } while(!finish());
             }
         };
         thread.start();
     }
 
     private synchronized boolean finish() {
-        if (restart) {
+        if(restart) {
             restart = false;
             return false;
         } else {
@@ -45,18 +44,19 @@ public abstract class RestartableTask {
     }
 
     public synchronized void restart() {
-        if (thread != null) {
+        if(thread != null) {
             stopped = false;
             restart = true;
-        } else start();
+        }
+        else
+            start();
     }
 
     /**
-     * Stops execution until restart is called. If a thread is running, the restart flag will be set, and the thread
-     * will be paused once the execute method exits.
+     * Stops execution until restart is called. If a thread is running, the restart flag will be set, and the thread will be paused once the execute method exits.
      */
     public synchronized void stop() {
-        if (thread != null) {
+        if(thread != null) {
             stopped = true;
             restart = true;
         }

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

@@ -1,34 +1,28 @@
 package codechicken.nei;
 
+import codechicken.lib.gui.GuiDraw;
+import codechicken.nei.ItemList.AnyMultiItemFilter;
+import codechicken.nei.ItemList.EverythingItemFilter;
+import codechicken.nei.ItemList.PatternItemFilter;
+import codechicken.nei.api.API;
+import codechicken.nei.api.ItemFilter;
+import codechicken.nei.api.ItemFilter.ItemFilterProvider;
+import net.minecraft.util.EnumChatFormatting;
+
 import java.util.LinkedList;
 import java.util.List;
-import java.util.function.Function;
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
-import net.minecraft.client.Minecraft;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraftforge.fluids.FluidStack;
-
-import codechicken.lib.gui.GuiDraw;
-import codechicken.nei.ItemList.NothingItemFilter;
-import codechicken.nei.SearchTokenParser.ISearchParserProvider;
-import codechicken.nei.SearchTokenParser.SearchMode;
-import codechicken.nei.api.ItemFilter;
-import codechicken.nei.api.ItemFilter.ItemFilterProvider;
-import codechicken.nei.recipe.StackInfo;
-import codechicken.nei.util.TextHistory;
-
-public class SearchField extends TextField implements ItemFilterProvider {
+import static codechicken.nei.NEIClientConfig.world;
 
+public class SearchField extends TextField implements ItemFilterProvider
+{
     /**
      * Interface for returning a custom filter based on search field text
      */
-    @Deprecated
-    public static interface ISearchProvider {
-
+    public static interface ISearchProvider
+    {
         /**
          * @return false if this filter should only be used if no other non-default filters match the search string
          */
@@ -40,114 +34,38 @@ public class SearchField extends TextField implements ItemFilterProvider {
         public ItemFilter getFilter(String searchText);
     }
 
-    public static class SearchParserProvider implements ISearchParserProvider {
-
-        protected final Function<Pattern, ItemFilter> createFilter;
-        protected final String name;
-        protected final char prefix;
-        protected final EnumChatFormatting highlightedColor;
-
-        public SearchParserProvider(char prefix, String name, EnumChatFormatting highlightedColor,
-                Function<Pattern, ItemFilter> createFilter) {
-            this.prefix = prefix;
-            this.name = name;
-            this.highlightedColor = highlightedColor;
-            this.createFilter = createFilter;
+    private static class DefaultSearchProvider implements ISearchProvider
+    {
+        @Override
+        public boolean isPrimary() {
+            return false;
         }
 
         @Override
         public ItemFilter getFilter(String searchText) {
-            Pattern pattern = SearchField.getPattern(searchText);
-
-            if (pattern != null) {
-                return this.createFilter(pattern);
-            }
-
-            return new NothingItemFilter();
-        }
-
-        protected ItemFilter createFilter(Pattern pattern) {
-            final ItemFilter filter = this.createFilter.apply(pattern);
-
-            return filter == null ? new NothingItemFilter() : filter;
-        }
-
-        @Override
-        public char getPrefix() {
-            return this.prefix;
-        }
-
-        @Override
-        public EnumChatFormatting getHighlightedColor() {
-            return this.highlightedColor;
-        }
-
-        @Override
-        public SearchMode getSearchMode() {
-            return SearchMode.fromInt(NEIClientConfig.getIntSetting("inventory.search." + this.name + "SearchMode"));
+            Pattern pattern = getPattern(searchText);
+            return pattern == null ? null : new PatternItemFilter(pattern);
         }
     }
 
-    public static class GuiSearchField extends FormattedTextField {
-
-        protected final SearchTokenParser searchParser;
-
-        public GuiSearchField() {
-            this(SearchField.searchParser);
-        }
-
-        public GuiSearchField(SearchTokenParser searchParser) {
-            super(Minecraft.getMinecraft().fontRenderer, 0, 0, 0, 0);
-            this.searchParser = searchParser;
-            setFormatter(new SearchTextFormatter(searchParser));
-            setDisabledTextColour(0xFF303030);
-            setPlaceholder(NEIClientUtils.translate("inventory.search.placeholder"));
-        }
-
-        public ItemFilter getFilter() {
-            return getFilter(getText());
-        }
-
-        public ItemFilter getFilter(String filterText) {
-            return this.searchParser.getFilter(filterText);
-        }
-
-    }
-
-    @Deprecated
     public static List<ISearchProvider> searchProviders = new LinkedList<>();
-    public static final SearchTokenParser searchParser = new SearchTokenParser();
-    private static final TextHistory history = new TextHistory();
-    private boolean isVisible = true;
-    private long lastclicktime;
+
+    long lastclicktime;
 
     public SearchField(String ident) {
         super(ident);
-    }
-
-    @Override
-    protected void initInternalTextField() {
-        field = new GuiSearchField();
-        field.setMaxStringLength(maxSearchLength);
-        field.setCursorPositionZero();
+        API.addItemFilter(this);
+        API.addSearchProvider(new DefaultSearchProvider());
     }
 
     public static boolean searchInventories() {
-        return NEIClientConfig.world.nbt.getBoolean("searchinventories");
-    }
-
-    public boolean isVisible() {
-        return isVisible;
-    }
-
-    public void setVisible(boolean visible) {
-        isVisible = visible;
+        return world.nbt.getBoolean("searchinventories");
     }
 
     @Override
-    public int getTextColour() {
-        if (ItemPanels.itemPanel.getItems().isEmpty()
-                && (!this.field.getText().isEmpty() || !NEIClientConfig.hideItemsUntilSearching())) {
+    public int getTextColour()
+    {
+        if (ItemPanels.itemPanel.getItems().isEmpty()) {
             return focused() ? 0xFFcc3300 : 0xFF993300;
         } else {
             return focused() ? 0xFFE0E0E0 : 0xFF909090;
@@ -156,45 +74,24 @@ public class SearchField extends TextField implements ItemFilterProvider {
 
     @Override
     public void draw(int mousex, int mousey) {
+
         super.draw(mousex, mousey);
 
         if (searchInventories()) {
-            GuiDraw.drawGradientRect(
-                    field.xPosition - 1,
-                    field.yPosition - 1,
-                    1,
-                    field.height + 2,
-                    0xFFFFFF00,
-                    0xFFC0B000); // Left
-            GuiDraw.drawGradientRect(
-                    field.xPosition - 1,
-                    field.yPosition - 1,
-                    field.width + 2,
-                    1,
-                    0xFFFFFF00,
-                    0xFFC0B000); // Top
-            GuiDraw.drawGradientRect(
-                    field.xPosition + field.width,
-                    field.yPosition - 1,
-                    1,
-                    field.height + 2,
-                    0xFFFFFF00,
-                    0xFFC0B000); // Left
-            GuiDraw.drawGradientRect(
-                    field.xPosition - 1,
-                    field.yPosition + field.height,
-                    field.width + 2,
-                    1,
-                    0xFFFFFF00,
-                    0xFFC0B000); // Bottom
+            GuiDraw.drawGradientRect(x - 1, y - 1, 1, h + 2, 0xFFFFFF00, 0xFFC0B000); //Left
+            GuiDraw.drawGradientRect(x - 1, y - 1, w + 2, 1, 0xFFFFFF00, 0xFFC0B000); //Top
+            GuiDraw.drawGradientRect(x + w, y - 1, 1, h + 2, 0xFFFFFF00, 0xFFC0B000); //Left
+            GuiDraw.drawGradientRect(x - 1, y + h, w + 2, 1, 0xFFFFFF00, 0xFFC0B000); //Bottom
         }
+
     }
 
     @Override
     public boolean handleClick(int mousex, int mousey, int button) {
         if (button == 0) {
-            if (focused() && (System.currentTimeMillis() - lastclicktime < 400)) { // double click
+            if (focused() && (System.currentTimeMillis() - lastclicktime < 400)) { //double click
                 NEIClientConfig.world.nbt.setBoolean("searchinventories", !searchInventories());
+                NEIClientConfig.world.saveNBT();
             }
             lastclicktime = System.currentTimeMillis();
         }
@@ -204,26 +101,17 @@ public class SearchField extends TextField implements ItemFilterProvider {
     @Override
     public void onTextChange(String oldText) {
         final String newText = text();
-        if (!newText.equals(oldText)) {
-            if (newText.length() > 0) NEIClientConfig.logger.debug("Searching for " + newText);
-            NEIClientConfig.setSearchExpression(newText);
-            ItemList.updateFilter.restart();
-        }
+        if( newText.length() > 0)
+            NEIClientConfig.logger.debug("Searching for " + text());
+
+        NEIClientConfig.setSearchExpression(newText);
+        ItemList.updateFilter.restart();
     }
 
     @Override
     public void lastKeyTyped(int keyID, char keyChar) {
-
-        if (isVisible() && NEIClientConfig.isKeyHashDown("gui.search")) {
+        if (keyID == NEIClientConfig.getKeyBinding("gui.search"))
             setFocus(true);
-        }
-        if (focused() && NEIClientConfig.isKeyHashDown("gui.getprevioussearch")) {
-            handleNavigateHistory(TextHistory.Direction.PREVIOUS);
-        }
-
-        if (focused() && NEIClientConfig.isKeyHashDown("gui.getnextsearch")) {
-            handleNavigateHistory(TextHistory.Direction.NEXT);
-        }
     }
 
     @Override
@@ -232,121 +120,39 @@ public class SearchField extends TextField implements ItemFilterProvider {
     }
 
     public static Pattern getPattern(String search) {
-        return getPattern(search, NEIClientConfig.getIntSetting("inventory.search.patternMode"));
-    }
-
-    public static Pattern getPattern(String search, int patternMode) {
-        switch (patternMode) {
-            case 0: // plain
-                search = Pattern.quote(search);
+        switch (NEIClientConfig.getIntSetting("inventory.searchmode")) {
+            case 0://plain
+                search = "\\Q" + search + "\\E";
                 break;
-            case 1: // extended
-
-                if (search.length() >= 3 && search.startsWith("r/") && search.endsWith("/")) {
-                    search = search.substring(2, search.length() - 1);
-                } else {
-                    final Matcher matcher = Pattern.compile("(\\?|\\*)").matcher(search);
-                    final StringBuilder cleanedString = new StringBuilder();
-                    int lastEndIndex = 0;
-
-                    while (matcher.find()) {
-                        cleanedString.append(Pattern.quote(search.substring(lastEndIndex, matcher.start())));
-
-                        switch (matcher.group(0).charAt(0)) {
-                            case '?':
-                                cleanedString.append(".");
-                                break;
-                            case '*':
-                                cleanedString.append(".+?");
-                                break;
-                            default:
-                                break;
-                        }
-
-                        lastEndIndex = matcher.end();
-                    }
-
-                    search = cleanedString + Pattern.quote(search.substring(lastEndIndex, search.length()));
-                }
-                break;
-            default:
-                break;
-        }
-
-        if (!search.isEmpty()) {
-            try {
-                return Pattern.compile(search, Pattern.MULTILINE | Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
-            } catch (PatternSyntaxException ignored) {}
-        }
-
-        return null;
-    }
-
-    public static String getEscapedSearchText(ItemStack stack) {
-        final FluidStack fluidStack = StackInfo.getFluid(stack);
-        String displayName;
-
-        if (fluidStack != null) {
-            displayName = fluidStack.getLocalizedName();
-        } else {
-            displayName = stack.getDisplayName();
-        }
-
-        return getEscapedSearchText(displayName);
-    }
-
-    public static String getEscapedSearchText(String text) {
-        text = EnumChatFormatting.getTextWithoutFormattingCodes(text);
-
-        switch (NEIClientConfig.getIntSetting("inventory.search.patternMode")) {
             case 1:
-                text = text.replaceAll("[\\?|\\*]", "\\\\$0");
-                break;
-            case 2:
-                text = text.replaceAll("[{}()\\[\\].+*?^$\\\\|]", "\\\\$0");
-                break;
-            default:
+                search = search
+                        .replace(".", "")
+                        .replace("?", ".")
+                        .replace("*", ".+?");
                 break;
         }
 
-        if (text.contains(" ") && NEIClientConfig.getBooleanSetting("inventory.search.quoteDropItemName")) {
-            text = "\"" + text + "\"";
-        }
-
-        return text;
+        Pattern pattern = null;
+        try {
+            pattern = Pattern.compile(search);
+        } catch (PatternSyntaxException ignored) {}
+        return pattern == null || pattern.toString().length() == 0 ? null : pattern;
     }
 
     @Override
     public ItemFilter getFilter() {
+        String s_filter = text().toLowerCase();
 
-        if (field.getText().isEmpty() && NEIClientConfig.hideItemsUntilSearching()) {
-            return new NothingItemFilter();
+        List<ItemFilter> primary = new LinkedList<>();
+        List<ItemFilter> secondary = new LinkedList<>();
+        for (ISearchProvider p : searchProviders) {
+            ItemFilter filter = p.getFilter(s_filter);
+            if (filter != null)
+                (p.isPrimary() ? primary : secondary).add(filter);
         }
 
-        return ((GuiSearchField) field).getFilter();
-    }
-
-    public static ItemFilter getFilter(String filterText) {
-        return SearchField.searchParser.getFilter(filterText);
-    }
-
-    @Override
-    public void setFocus(boolean focus) {
-        final boolean previousFocus = field.isFocused();
-
-        if (previousFocus != focus) {
-            history.add(text());
-        }
-        super.setFocus(focus);
-    }
-
-    private boolean handleNavigateHistory(TextHistory.Direction direction) {
-        if (focused()) {
-            return history.get(direction, text()).map(newText -> {
-                setText(newText);
-                return true;
-            }).orElse(false);
-        }
-        return false;
+        if (!primary.isEmpty()) return new AnyMultiItemFilter(primary);
+        if (!secondary.isEmpty()) return new AnyMultiItemFilter(secondary);
+        return new EverythingItemFilter();
     }
 }

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

@@ -1,66 +0,0 @@
-package codechicken.nei;
-
-import java.util.List;
-import java.util.StringJoiner;
-
-import net.minecraft.util.EnumChatFormatting;
-
-import codechicken.nei.FormattedTextField.TextFormatter;
-import codechicken.nei.SearchTokenParser.SearchToken;
-
-public class SearchTextFormatter implements TextFormatter {
-
-    protected final SearchTokenParser searchParser;
-
-    public SearchTextFormatter(SearchTokenParser searchParser) {
-        this.searchParser = searchParser;
-    }
-
-    public String format(String text) {
-        final String[] parts = (text + "| ").split("\\|");
-        StringJoiner formattedText = new StringJoiner(EnumChatFormatting.GRAY + "|");
-
-        for (int i = 0; i < parts.length - 1; i++) {
-            final String filterText = parts[i];
-            final List<SearchToken> tokens = searchParser.splitSearchText(filterText);
-            StringBuilder formattedPart = new StringBuilder();
-            int startIndex = 0;
-
-            for (SearchToken token : tokens) {
-                formattedPart.append(filterText.substring(startIndex, token.start));
-                EnumChatFormatting tokenColor = EnumChatFormatting.RESET;
-
-                if (token.firstChar != null) {
-                    tokenColor = searchParser.getProvider(token.firstChar).getHighlightedColor();
-                }
-
-                if (token.ignore) {
-                    formattedPart.append(EnumChatFormatting.BLUE + "-");
-                }
-
-                if (token.firstChar != null) {
-                    formattedPart.append(tokenColor + String.valueOf(token.firstChar));
-                }
-
-                if (token.quotes) {
-                    formattedPart.append(EnumChatFormatting.GOLD + "\"");
-                }
-
-                if (!token.rawText.isEmpty()) {
-                    formattedPart.append(tokenColor + token.rawText);
-                }
-
-                if (token.quotes) {
-                    formattedPart.append(EnumChatFormatting.GOLD + "\"");
-                }
-
-                startIndex = token.end;
-            }
-
-            formattedPart.append(filterText.substring(startIndex, filterText.length()));
-            formattedText.add(formattedPart);
-        }
-
-        return formattedText.toString();
-    }
-}

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

@@ -1,314 +0,0 @@
-package codechicken.nei;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.resources.Language;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumChatFormatting;
-
-import codechicken.nei.ItemList.AllMultiItemFilter;
-import codechicken.nei.ItemList.AnyMultiItemFilter;
-import codechicken.nei.ItemList.EverythingItemFilter;
-import codechicken.nei.ItemList.NegatedItemFilter;
-import codechicken.nei.ItemList.NothingItemFilter;
-import codechicken.nei.api.ItemFilter;
-
-public class SearchTokenParser {
-
-    public enum SearchMode {
-
-        ALWAYS,
-        PREFIX,
-        NEVER;
-
-        public static SearchMode fromInt(int value) {
-            return switch (value) {
-                case 0 -> ALWAYS;
-                case 1 -> PREFIX;
-                default -> NEVER;
-            };
-        }
-    }
-
-    public static class SearchToken {
-
-        public boolean ignore = false;
-        public boolean quotes = false;
-        public Character firstChar = null;
-
-        public String[] words;
-
-        public String rawText = "";
-        public int start = 0;
-        public int end = 0;
-
-    }
-
-    public static interface ISearchParserProvider {
-
-        public ItemFilter getFilter(String searchText);
-
-        public static List<Language> getAllLanguages() {
-            return new ArrayList<>(Minecraft.getMinecraft().getLanguageManager().getLanguages());
-        }
-
-        default List<Language> getMatchingLanguages() {
-            return getAllLanguages();
-        }
-
-        public char getPrefix();
-
-        public EnumChatFormatting getHighlightedColor();
-
-        public SearchMode getSearchMode();
-    }
-
-    private static class ProvidersCache {
-
-        public String languageCode = null;
-        public List<ISearchParserProvider> providers = new ArrayList<>();
-
-        public void clear() {
-            this.languageCode = null;
-            this.providers.clear();
-        }
-    }
-
-    private static class IsRegisteredItemFilter implements ItemFilter {
-
-        public ItemFilter filter;
-
-        public IsRegisteredItemFilter(ItemFilter filter) {
-            this.filter = filter;
-        }
-
-        @Override
-        public boolean matches(ItemStack item) {
-            return item != null && item.getItem() != null
-                    && item.getItem().delegate.name() != null
-                    && this.filter.matches(item);
-        }
-    }
-
-    protected final LRUCache<String, ItemFilter> filtersCache = new LRUCache<>(20);
-    protected final List<ISearchParserProvider> searchProviders;
-    protected final ProvidersCache providersCache = new ProvidersCache();
-    protected final Map<Character, Character> prefixRedefinitions = new HashMap<>();
-
-    public SearchTokenParser(List<ISearchParserProvider> searchProviders) {
-        this.searchProviders = searchProviders;
-    }
-
-    public SearchTokenParser() {
-        this(new ArrayList<>());
-    }
-
-    public void addProvider(ISearchParserProvider provider) {
-        this.searchProviders.add(provider);
-        this.providersCache.clear();
-        this.filtersCache.clear();
-    }
-
-    public void clearCache() {
-        this.filtersCache.clear();
-    }
-
-    protected List<ISearchParserProvider> getProviders() {
-        Language currentLanguage = Minecraft.getMinecraft().getLanguageManager().getCurrentLanguage();
-
-        if (!currentLanguage.getLanguageCode().equals(providersCache.languageCode)) {
-            providersCache.providers = new ArrayList<>();
-            providersCache.languageCode = currentLanguage.getLanguageCode();
-
-            Map<Character, ISearchParserProvider> providers = new HashMap<>();
-
-            for (int index = this.searchProviders.size() - 1; index >= 0; index--) {
-                ISearchParserProvider provider = this.searchProviders.get(index);
-
-                if (provider.getMatchingLanguages().contains(currentLanguage)) {
-                    if (provider.getSearchMode() == SearchMode.PREFIX && !providers.containsKey(provider.getPrefix())) {
-                        providers.put(provider.getPrefix(), provider);
-                    } else if (provider.getSearchMode() == SearchMode.ALWAYS) {
-                        providersCache.providers.add(provider);
-                    }
-                }
-            }
-
-            providersCache.providers.addAll(providers.values());
-        }
-
-        return providersCache.providers;
-    }
-
-    public ISearchParserProvider getProvider(char ch) {
-        return getProviders().stream()
-                .filter(
-                        provider -> provider.getSearchMode() == SearchMode.PREFIX
-                                && getRedefinedPrefix(provider.getPrefix()) == ch)
-                .findFirst().orElse(null);
-    }
-
-    public synchronized ItemFilter getFilter(String filterText) {
-        filterText = EnumChatFormatting.getTextWithoutFormattingCodes(filterText).toLowerCase();
-
-        return this.filtersCache.computeIfAbsent(filterText, text -> {
-            final String[] parts = text.split("\\|");
-            final List<ItemFilter> searchTokens = Arrays.stream(parts).map(this::parseSearchText).filter(s -> s != null)
-                    .collect(Collectors.toList());
-
-            if (searchTokens.isEmpty()) {
-                return new EverythingItemFilter();
-            } else if (searchTokens.size() == 1) {
-                return new IsRegisteredItemFilter(searchTokens.get(0));
-            } else {
-                return new IsRegisteredItemFilter(new AnyMultiItemFilter(searchTokens));
-            }
-
-        });
-
-    }
-
-    public List<SearchToken> splitSearchText(String filterText) {
-
-        if (filterText.isEmpty()) {
-            return Collections.emptyList();
-        }
-
-        final List<SearchToken> tokens = new ArrayList<>();
-        final String prefixes = getPrefixes();
-        final int spaceMode = NEIClientConfig.getIntSetting("inventory.search.spaceMode");
-        // The regular expression first tries to match a string that starts with a space or the beginning of the string,
-        // followed by a sequence of characters that do not contain special characters -"@#$%&, and ends with a space
-        // and the characters -"@#$%& or the end of the string.
-        final String patternPart1 = "(?<tokenA>(^|\\s+)(?:[^" + Pattern.quote(" -\"" + prefixes)
-                + "]).+?(?=\\s+["
-                + Pattern.quote("-\"" + prefixes)
-                + "]|$))";
-        // If the first condition is not met, it tries to match a sequence of - characters, followed by @#$%&
-        // characters, then either a quoted string or non-space characters.
-        final String patternPart2 = "((?<ignore>-*)(?<firstChar>[" + Pattern.quote(prefixes)
-                + "]*)(?<tokenB>\\\".*?(?:\\\"|$)|\\S+\\s*))";
-        final Pattern pattern = Pattern.compile(spaceMode == 0 ? patternPart2 : (patternPart1 + "|" + patternPart2));
-        final Matcher filterMatcher = pattern.matcher(filterText);
-
-        while (filterMatcher.find()) {
-            String firstChar = filterMatcher.group("firstChar");
-            SearchToken token = new SearchToken();
-            token.start = filterMatcher.start();
-            token.end = filterMatcher.end();
-            token.ignore = "-".equals(filterMatcher.group("ignore"));
-            token.rawText = spaceMode == 0 ? null : filterMatcher.group("tokenA");
-
-            if (firstChar != null && !firstChar.isEmpty()) {
-                token.firstChar = firstChar.charAt(0);
-            }
-
-            if (token.rawText == null) { // spaceMode == 0
-                token.rawText = filterMatcher.group("tokenB");
-                token.quotes = token.rawText.length() > 1 && token.rawText.startsWith("\"")
-                        && token.rawText.endsWith("\"");
-
-                if (token.quotes) {
-                    token.rawText = token.rawText.substring(1, token.rawText.length() - 1);
-                }
-
-                token.words = new String[] { token.rawText.trim() };
-            } else if (spaceMode == 2) {
-                token.words = token.rawText.trim().split("\\s+");
-            } else {
-                token.words = new String[] { token.rawText.trim() };
-            }
-
-            tokens.add(token);
-        }
-
-        return tokens;
-    }
-
-    private String getPrefixes() {
-        StringBuilder prefixes = new StringBuilder().append('\0');
-
-        for (ISearchParserProvider provider : getProviders()) {
-            if (provider.getSearchMode() == SearchMode.PREFIX) {
-                prefixes.append(getRedefinedPrefix(provider.getPrefix()));
-            }
-        }
-
-        return prefixes.toString();
-    }
-
-    public char getRedefinedPrefix(char prefix) {
-        return this.prefixRedefinitions.getOrDefault(prefix, prefix);
-    }
-
-    private ItemFilter parseSearchText(String filterText) {
-
-        if (filterText.isEmpty()) {
-            return null;
-        }
-
-        final AllMultiItemFilter searchTokens = new AllMultiItemFilter();
-        final List<SearchToken> tokens = splitSearchText(filterText);
-
-        for (SearchToken token : tokens) {
-            if (!token.rawText.isEmpty()) {
-                ItemFilter result = parseToken(token);
-
-                if (token.ignore) {
-                    searchTokens.filters.add(new NegatedItemFilter(result));
-                } else {
-                    searchTokens.filters.add(result);
-                }
-            } else if (!token.ignore) {
-                searchTokens.filters.add(new NothingItemFilter());
-            }
-        }
-
-        return searchTokens;
-    }
-
-    private ItemFilter parseToken(SearchToken token) {
-        final ISearchParserProvider provider = token.firstChar == null ? null : this.getProvider(token.firstChar);
-
-        if (provider == null || provider.getSearchMode() == SearchMode.NEVER) {
-            final List<ItemFilter> filters = new ArrayList<>();
-
-            for (ISearchParserProvider _provider : getProviders()) {
-                if (_provider.getSearchMode() == SearchMode.ALWAYS) {
-                    AllMultiItemFilter filter = generateFilters(_provider, token.words);
-
-                    if (!filter.filters.isEmpty()) {
-                        filters.add(filter);
-                    }
-                }
-            }
-
-            return filters.isEmpty() ? new NothingItemFilter() : new AnyMultiItemFilter(filters);
-        } else {
-            return generateFilters(provider, token.words);
-        }
-    }
-
-    private AllMultiItemFilter generateFilters(ISearchParserProvider provider, String[] words) {
-        final AllMultiItemFilter filters = new AllMultiItemFilter();
-
-        for (String work : words) {
-            final ItemFilter filter = provider.getFilter(work);
-
-            if (filter != null) {
-                filters.filters.add(filter);
-            }
-        }
-
-        return filters;
-    }
-}

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

@@ -1,13 +1,5 @@
 package codechicken.nei;
 
-import java.util.List;
-
-import net.minecraft.entity.item.EntityItem;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.world.World;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.event.world.WorldEvent;
-
 import codechicken.core.CommonUtils;
 import codechicken.lib.packet.PacketCustom;
 import cpw.mods.fml.common.FMLCommonHandler;
@@ -18,9 +10,16 @@ import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerLoggedOutEvent;
 import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerRespawnEvent;
 import cpw.mods.fml.common.gameevent.TickEvent;
 import cpw.mods.fml.common.gameevent.TickEvent.Phase;
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.world.World;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.event.world.WorldEvent;
 
-public class ServerHandler {
+import java.util.List;
 
+public class ServerHandler
+{
     private static ServerHandler instance;
 
     public static void load() {
@@ -35,15 +34,15 @@ public class ServerHandler {
 
     @SubscribeEvent
     public void tickEvent(TickEvent.WorldTickEvent event) {
-        if (event.phase == Phase.START && !event.world.isRemote
-                && NEIServerConfig.dimTags.containsKey(CommonUtils.getDimension(event.world))) // fake worlds that don't
-                                                                                               // call Load
+        if (event.phase == Phase.START && !event.world.isRemote &&
+                NEIServerConfig.dimTags.containsKey(CommonUtils.getDimension(event.world)))//fake worlds that don't call Load
             processDisabledProperties(event.world);
     }
 
     @SubscribeEvent
     public void loadEvent(WorldEvent.Load event) {
-        if (!event.world.isRemote) NEIServerConfig.load(event.world);
+        if(!event.world.isRemote)
+            NEIServerConfig.load(event.world);
     }
 
     @SubscribeEvent
@@ -51,7 +50,8 @@ public class ServerHandler {
         if (event.phase == Phase.START && event.player instanceof EntityPlayerMP) {
             EntityPlayerMP player = (EntityPlayerMP) event.player;
             PlayerSave save = NEIServerConfig.forPlayer(player.getCommandSenderName());
-            if (save == null) return;
+            if (save == null)
+                return;
             updateMagneticPlayer(player, save);
             save.updateOpChange(player);
             save.save();
@@ -60,13 +60,13 @@ public class ServerHandler {
 
     private void processDisabledProperties(World world) {
         NEIServerUtils.advanceDisabledTimes(world);
-        if (NEIServerUtils.isRaining(world)
-                && NEIServerConfig.isActionDisabled(CommonUtils.getDimension(world), "rain"))
+        if (NEIServerUtils.isRaining(world) && NEIServerConfig.isActionDisabled(CommonUtils.getDimension(world), "rain"))
             NEIServerUtils.toggleRaining(world, false);
     }
 
     private void updateMagneticPlayer(EntityPlayerMP player, PlayerSave save) {
-        if (!save.isActionEnabled("magnet") || player.isDead) return;
+        if (!save.isActionEnabled("magnet") || player.isDead)
+            return;
 
         float distancexz = 16;
         float distancey = 8;
@@ -74,8 +74,7 @@ public class ServerHandler {
         double maxspeedy = 0.5;
         double speedxz = 0.05;
         double speedy = 0.07;
-        List<EntityItem> items = player.worldObj
-                .getEntitiesWithinAABB(EntityItem.class, player.boundingBox.expand(distancexz, distancey, distancexz));
+        List<EntityItem> items = player.worldObj.getEntitiesWithinAABB(EntityItem.class, player.boundingBox.expand(distancexz, distancey, distancexz));
         for (EntityItem item : items) {
             if (item.delayBeforeCanPickup > 0) continue;
             if (!NEIServerUtils.canItemFitInInventory(player, item.getEntityItem())) continue;

src/main/java/codechicken/nei/SlotOP.java

@@ -1,10 +1,10 @@
 package codechicken.nei;
 
-public abstract class SlotOP {
-
+public abstract class SlotOP
+{
     public abstract String getDescription();
-
+    
     public abstract int[] getKeyBind();
-
+    
     public abstract void operate();
 }

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

@@ -1,5 +1,7 @@
 package codechicken.nei;
 
+import codechicken.core.ClientUtils;
+import codechicken.lib.render.CCRenderState;
 import net.minecraft.client.renderer.OpenGlHelper;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.client.renderer.Tessellator;
@@ -9,71 +11,84 @@ import net.minecraft.entity.Entity;
 import net.minecraft.entity.boss.BossStatus;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
 import net.minecraftforge.client.IItemRenderer;
-
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
 
-import codechicken.core.ClientUtils;
-import codechicken.lib.render.CCRenderState;
-
-public class SpawnerRenderer implements IItemRenderer {
-
+public class SpawnerRenderer implements IItemRenderer
+{
     @Override
-    public boolean handleRenderType(ItemStack item, ItemRenderType type) {
+    public boolean handleRenderType(ItemStack item, ItemRenderType type)
+    {
         return true;
     }
-
-    public void renderInventoryItem(RenderBlocks render, ItemStack item) {
+    
+    public void renderInventoryItem(RenderBlocks render, ItemStack item)
+    {
         int meta = item.getItemDamage();
-        if (meta == 0) meta = ItemMobSpawner.idPig;
+        
+        if(meta == 0)
+            meta = ItemMobSpawner.idPig;
+
         String bossName = BossStatus.bossName;
         int bossTimeout = BossStatus.statusBarTime;
         boolean bossHasColorModifier = BossStatus.hasColorModifier;
-        Entity entity = ItemMobSpawner.getEntity(meta);
-        try {
+        try
+        {
+            World world = NEIClientUtils.mc().theWorld;
+            ItemMobSpawner.loadSpawners(world);
             CCRenderState.changeTexture(TextureMap.locationBlocksTexture);
             render.renderBlockAsItem(Blocks.mob_spawner, 0, 1F);
-            entity.setWorld(render.minecraftRB.theWorld);
             GL11.glPushMatrix();
+            
+            Entity entity = ItemMobSpawner.getEntity(meta);
+            entity.setWorld(world);
             float f1 = 0.4375F;
-            if (entity.getShadowSize() > 1.5) f1 = 0.1F;
-            GL11.glRotatef((float) (ClientUtils.getRenderTime() * 10), 0.0F, 1.0F, 0.0F);
+            if(entity.getShadowSize() > 1.5)
+                f1 = 0.1F;
+            GL11.glRotatef((float) (ClientUtils.getRenderTime()*10), 0.0F, 1.0F, 0.0F);
             GL11.glRotatef(-20F, 1.0F, 0.0F, 0.0F);
             GL11.glTranslatef(0.0F, -0.4F, 0.0F);
             GL11.glScalef(f1, f1, f1);
             entity.setLocationAndAngles(0, 0, 0, 0.0F, 0.0F);
             RenderManager.instance.renderEntityWithPosYaw(entity, 0.0D, 0.0D, 0.0D, 0.0F, 0);
             GL11.glPopMatrix();
+    
             GL11.glEnable(GL12.GL_RESCALE_NORMAL);
             OpenGlHelper.setActiveTexture(OpenGlHelper.lightmapTexUnit);
             GL11.glDisable(GL11.GL_TEXTURE_2D);
             OpenGlHelper.setActiveTexture(OpenGlHelper.defaultTexUnit);
-        } catch (Exception e) {
-            if (Tessellator.instance.isDrawing) Tessellator.instance.draw();
+        }
+        catch(Exception e)
+        {
+            if(Tessellator.instance.isDrawing)
+                Tessellator.instance.draw();
         }
         BossStatus.bossName = bossName;
         BossStatus.statusBarTime = bossTimeout;
         BossStatus.hasColorModifier = bossHasColorModifier;
     }
-
+    
+    @SuppressWarnings("incomplete-switch")
     @Override
-    public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
-        switch (type) {
+    public void renderItem(ItemRenderType type, ItemStack item, Object... data)
+    {
+        switch(type)
+        {
             case EQUIPPED:
             case EQUIPPED_FIRST_PERSON:
                 GL11.glTranslatef(0.5F, 0.5F, 0.5F);
             case INVENTORY:
             case ENTITY:
-                renderInventoryItem((RenderBlocks) data[0], item);
-                break;
-            default:
-                break;
+                renderInventoryItem((RenderBlocks)data[0], item);
+            break;
         }
     }
-
+    
     @Override
-    public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) {
+    public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper)
+    {
         return true;
-    }
+    }    
 }

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

@@ -2,14 +2,13 @@ package codechicken.nei;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiTextField;
-
 import org.lwjgl.input.Keyboard;
 
-public abstract class TextField extends Widget {
-
+public abstract class TextField extends Widget
+{
     protected GuiTextField field;
 
-    protected static final int maxSearchLength = 256;
+    private static final int maxSearchLength = 256;
 
     public boolean centered;
     public String identifier;
@@ -25,7 +24,7 @@ public abstract class TextField extends Widget {
     public TextField(String ident) {
         identifier = ident;
         initInternalTextField();
-        // Keyboard.enableRepeatEvents(true);
+//        Keyboard.enableRepeatEvents(true);
     }
 
     public int getTextColour() {
@@ -45,7 +44,7 @@ public abstract class TextField extends Widget {
         try {
             setDimensionsAndColor();
             field.drawTextBox();
-        } catch (NullPointerException npe) {
+        } catch(NullPointerException npe) {
             // Hack to deal with a null font renderer... recreate the field and it should work
             GuiTextField oldField = field;
 
@@ -59,43 +58,49 @@ public abstract class TextField extends Widget {
 
     @Override
     public void onGuiClick(int mousex, int mousey) {
-        if (!contains(mousex, mousey)) setFocus(false);
+        if (!contains(mousex, mousey))
+            setFocus(false);
     }
 
     @Override
     public boolean handleClick(int mousex, int mousey, int button) {
         setFocus(true);
 
-        if (button == 1) setText("");
-        else field.mouseClicked(mousex, mousey, button);
+        if (button == 1)
+            setText("");
+        else
+            field.mouseClicked(mousex, mousey, button);
 
         return true;
     }
 
     @Override
     public boolean handleKeyPress(int keyID, char keyChar) {
-        if (!focused()) return false;
+        if (!focused())
+            return false;
 
         String oldText = text();
         boolean handled = field.textboxKeyTyped(keyChar, keyID);
-        if (!handled) {
+        if(!handled) {
             if (keyID == Keyboard.KEY_RETURN || keyID == Keyboard.KEY_NUMPADENTER || keyID == Keyboard.KEY_ESCAPE) {
                 setFocus(false);
                 handled = true;
             }
         }
 
-        if (handled) {
+        if(handled) {
             onTextChange(oldText);
         }
 
         return handled;
+
     }
 
     public abstract void onTextChange(String oldText);
 
     @Override
-    public void update() {}
+    public void update() {
+    }
 
     public void setText(String s) {
         String oldText = text();
@@ -121,6 +126,7 @@ public abstract class TextField extends Widget {
                 Keyboard.enableRepeatEvents(previousKeyboardRepeatEnabled);
                 loseFocus();
             }
+
         }
     }
 
@@ -131,4 +137,5 @@ public abstract class TextField extends Widget {
     public String text() {
         return field.getText();
     }
+
 }

src/main/java/codechicken/nei/ThreadOperationTimer.java

@@ -1,14 +1,13 @@
 package codechicken.nei;
 
 import com.google.common.base.Objects;
-
 import cpw.mods.fml.common.FMLCommonHandler;
 
-public class ThreadOperationTimer extends Thread {
-
-    public static class TimeoutException extends RuntimeException {
-
-        private static final long serialVersionUID = -8621458005263888185L;
+public class ThreadOperationTimer extends Thread
+{
+    @SuppressWarnings("serial")
+    public static class TimeoutException extends RuntimeException
+    {
         public final Object operation;
 
         public TimeoutException(String msg, Object op) {
@@ -23,7 +22,7 @@ public class ThreadOperationTimer extends Thread {
     private long limit;
 
     private ThreadOperationTimer(Thread thread, int limit) {
-        super(thread.getName() + " Operation Timer");
+        super(thread.getName()+" Operation Timer");
         this.thread = thread;
         this.limit = limit;
     }
@@ -42,7 +41,7 @@ public class ThreadOperationTimer extends Thread {
     }
 
     public synchronized void update(Object op) {
-        if (!Objects.equal(operation, op)) {
+        if(!Objects.equal(operation, op)) {
             operation = op;
             opTime = System.currentTimeMillis();
         }
@@ -51,19 +50,14 @@ public class ThreadOperationTimer extends Thread {
     @SuppressWarnings("deprecation")
     @Override
     public void run() {
-        if (FMLCommonHandler.instance().findContainerFor("NotEnoughItems").getVersion().contains("$")) return; // don't
-                                                                                                               // run
-                                                                                                               // this
-                                                                                                               // thread
-                                                                                                               // in a
-                                                                                                               // source
-                                                                                                               // environment
+        if(FMLCommonHandler.instance().findContainerFor("NotEnoughItems").getVersion().contains("$"))
+            return;//don't run this thread in a source environment
 
         while (thread.isAlive()) {
             synchronized (this) {
                 if (operation != null && System.currentTimeMillis() - opTime > limit) {
                     // Thread.stop(Throwable) is hard-deprecated and IntelliJ complains about it.
-                    // thread.stop(new TimeoutException("Operation took too long", operation));
+                    //thread.stop(new TimeoutException("Operation took too long", operation));
                     thread.stop();
                 }
             }
@@ -78,4 +72,4 @@ public class ThreadOperationTimer extends Thread {
         t.start();
         return t;
     }
-}
+}

src/main/java/codechicken/nei/VisiblityData.java

@@ -1,7 +1,7 @@
 package codechicken.nei;
 
-public class VisiblityData {
-
+public class VisiblityData
+{
     public boolean showUtilityButtons = true;
     /**
      * Item panel and associated buttons
@@ -15,6 +15,10 @@ public class VisiblityData {
      * Subset dropdown
      */
     public boolean showSubsetDropdown = true;
+    /**
+     * Presets dropdown
+     */
+    public boolean showPresetsDropdown = true;
     /**
      * Item and search section
      */
@@ -31,15 +35,19 @@ public class VisiblityData {
      * The entire NEI interface, aka hidden
      */
     public boolean showNEI = true;
-
     public boolean enableDeleteMode = true;
 
+    
     // Deprecated -- left in for campatability with other mods that mess with this
     public boolean showStateButtons = false;
 
-    public void translateDependancies() {
-        if (!showNEI) showWidgets = false;
-        if (!showWidgets) showItemSection = showUtilityButtons = false;
-        if (!showItemSection) showBookmarkPanel = showSubsetDropdown = showSearchSection = showItemPanel = false;
+    public void translateDependancies()
+    {
+        if(!showNEI)
+            showWidgets = false;
+        if(!showWidgets)
+            showItemSection = showUtilityButtons = false;
+        if(!showItemSection)
+            showBookmarkPanel = showSubsetDropdown = showPresetsDropdown = showSearchSection = showItemPanel = false;
     }
 }

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

@@ -1,34 +1,37 @@
 package codechicken.nei;
 
+import codechicken.lib.vec.Rectangle4i;
+import net.minecraft.item.ItemStack;
+
 import java.util.List;
 
-import net.minecraft.item.ItemStack;
-
-import codechicken.lib.vec.Rectangle4i;
-
-public abstract class Widget {
-
-    public Widget() {}
+public abstract class Widget
+{
+    public Widget() {
+    }
 
     public abstract void draw(int mx, int my);
 
-    public void postDraw(int mx, int my) {}
-
-    public void postDrawTooltips(int mx, int my, List<String> tooltip) {}
+    public void postDraw(int mx, int my) {
+    }
 
     public boolean handleClick(int mx, int my, int button) {
         return true;
     }
 
-    public void onGuiClick(int mx, int my) {}
+    public void onGuiClick(int mx, int my) {
+    }
 
-    public void mouseUp(int mx, int my, int button) {}
+    public void mouseUp(int mx, int my, int button) {
+
+    }
 
     public boolean handleKeyPress(int keyID, char keyChar) {
         return false;
     }
 
-    public void lastKeyTyped(int keyID, char keyChar) {}
+    public void lastKeyTyped(int keyID, char keyChar) {
+    }
 
     public boolean handleClickExt(int mx, int my, int button) {
         return false;
@@ -38,7 +41,8 @@ public abstract class Widget {
         return false;
     }
 
-    public void update() {}
+    public void update() {
+    }
 
     public Rectangle4i bounds() {
         return new Rectangle4i(x, y, w, h);
@@ -52,15 +56,18 @@ public abstract class Widget {
         return null;
     }
 
-    public void mouseDragged(int mx, int my, int button, long heldTime) {}
+    public void mouseDragged(int mx, int my, int button, long heldTime) {
+    }
 
     public List<String> handleTooltip(int mx, int my, List<String> tooltip) {
         return tooltip;
     }
 
-    public void loseFocus() {}
+    public void loseFocus() {
+    }
 
-    public void gainFocus() {}
+    public void gainFocus() {
+    }
 
     public int x;
     public int y;

src/main/java/codechicken/nei/WidgetZOrder.java

@@ -2,15 +2,17 @@ package codechicken.nei;
 
 import java.util.Comparator;
 
-public class WidgetZOrder implements Comparator<Widget> {
-
+public class WidgetZOrder
+    implements Comparator<Widget>
+{
     final boolean topfirst;
-
-    public WidgetZOrder(boolean topfirst) {
+    public WidgetZOrder(boolean topfirst)
+    {
         this.topfirst = topfirst;
     }
 
-    public int compare(Widget w1, Widget w2) {
-        return w1.z != w2.z ? ((topfirst ? w1.z < w2.z : w1.z > w2.z) ? 1 : -1) : 1;
+    public int compare(Widget w1, Widget w2)
+    {
+        return w1.z != w2.z ? ((topfirst ? w1.z > w2.z : w1.z < w2.z) ? 1 : -1) : 1;
     }
 }