Fix incorrect color applied to GuiRecipeCatalyst (#300)

* add placeholder bookmark drop

* add item panel to bookmark panel injection support

* fix outofboundsexception

* fix drag'n drop voids bookmark

* add itemstack moving animation

* implement pop animation

* fix crashes

* disable ItemPanel Animation

* disable pop animation on bookmark load

* spotlessapply

* disable move animation on gui scale

* add config option

README.md

@@ -27,6 +27,13 @@ If you have issues with NEI outside of the GTNH modpack you may report them in t
 * Remove TMI style
 * Removed inventory Load/Save state
 
+## Development
+Before launching, you need to add 
+```
+-Dfml.coreMods.load=codechicken.nei.asm.NEICorePlugin
+``` 
+as a command line argument to the VM.
+
 ## License
 
 GTNH Modifications Copyright (c) 2019-2022 mitchej123 and the GTNH Team

addon.gradle

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

build.gradle

@@ -1,10 +1,9 @@
-//version: 1656003794
+//version: 1660899027
 /*
-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.
-*/
+ 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
@@ -21,6 +20,8 @@ import java.util.zip.ZipOutputStream
 
 buildscript {
     repositories {
+        mavenCentral()
+
         maven {
             name 'forge'
             url 'https://maven.minecraftforge.net'
@@ -42,7 +43,6 @@ buildscript {
         classpath 'com.github.GTNewHorizons:ForgeGradle:1.2.7'
     }
 }
-
 plugins {
     id 'java-library'
     id 'idea'
@@ -57,8 +57,15 @@ plugins {
     id 'com.palantir.git-version'        version '0.13.0'       apply false
     id 'de.undercouch.download'          version '5.0.1'
     id 'com.github.gmazzo.buildconfig'   version '3.0.3'        apply false
-    id "com.diffplug.spotless"           version "6.7.2"
+    id 'com.diffplug.spotless'           version '6.7.2'        apply false
 }
+verifySettingsGradle()
+
+dependencies {
+    implementation 'com.diffplug:blowdryer:1.6.0'
+}
+
+apply plugin: 'com.diffplug.blowdryer'
 
 if (project.file('.git/HEAD').isFile()) {
     apply plugin: 'com.palantir.git-version'
@@ -84,35 +91,11 @@ idea {
     }
 }
 
-// Spotless autoformatter
-// See https://github.com/diffplug/spotless/tree/main/plugin-gradle
-// Can be locally toggled via spotless:off/spotless:on comments
-spotless {
-    encoding 'UTF-8'
+boolean disableSpotless = project.hasProperty("disableSpotless") ? project.disableSpotless.toBoolean() : false
 
-    format 'misc', {
-        target '*.md', '.gitignore'
-
-        trimTrailingWhitespace()
-        indentWithSpaces(4)
-        endWithNewline()
-    }
-    java {
-        toggleOffOn()
-        importOrder()
-        removeUnusedImports()
-        palantirJavaFormat('1.1.0') // last version supporting jvm 8
-    }
-    kotlin {
-        toggleOffOn()
-        ktfmt('0.39')
-    }
-    groovyGradle {
-        toggleOffOn()
-        importOrder()
-        target '*.gradle'
-        greclipse('4.19.0') // last version supporting jvm 8
-    }
+if (!disableSpotless) {
+    apply plugin: 'com.diffplug.spotless'
+    apply from: Blowdryer.file('spotless.gradle')
 }
 
 if(JavaVersion.current() != JavaVersion.VERSION_1_8) {
@@ -140,12 +123,11 @@ checkPropertyExists("containsMixinsAndOrCoreModOnly")
 checkPropertyExists("usesShadowedDependencies")
 checkPropertyExists("developmentEnvironmentUserName")
 
-boolean noPublishedSources = project.findProperty("noPublishedSources") ? project.noPublishedSources.toBoolean() : false
-boolean usesMixinDebug = project.findProperty('usesMixinDebug') ?: project.usesMixins.toBoolean()
-String channel = project.findProperty('channel') ? project.channel : 'stable'
-String mappingsVersion = project.findProperty('mappingsVersion') ? project.mappingsVersion : '12'
-String remoteMappings = project.findProperty('remoteMappings') ? project.remoteMappings : 'https://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/'
-
+boolean noPublishedSources = project.hasProperty("noPublishedSources") ? project.noPublishedSources.toBoolean() : false
+boolean usesMixinDebug = project.hasProperty('usesMixinDebug') ?: project.usesMixins.toBoolean()
+boolean forceEnableMixins = project.hasProperty('forceEnableMixins') ? project.forceEnableMixins.toBoolean() : false
+String channel = project.hasProperty('channel') ? project.channel : 'stable'
+String mappingsVersion = project.hasProperty('mappingsVersion') ? project.mappingsVersion : '12'
 String javaSourceDir = "src/main/java/"
 String scalaSourceDir = "src/main/scala/"
 String kotlinSourceDir = "src/main/kotlin/"
@@ -228,10 +210,10 @@ try {
 }
 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.)'
-    )
+            '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
 }
@@ -255,7 +237,7 @@ else {
 def arguments = []
 def jvmArguments = []
 
-if (usesMixins.toBoolean()) {
+if (usesMixins.toBoolean() || forceEnableMixins) {
     arguments += [
         "--tweakClass org.spongepowered.asm.launch.MixinTweaker"
     ]
@@ -320,7 +302,7 @@ repositories {
         name 'Overmind forge repo mirror'
         url 'https://gregtech.overminddl1.com/'
     }
-    if(usesMixins.toBoolean()) {
+    if(usesMixins.toBoolean() || forceEnableMixins) {
         maven {
             name 'sponge'
             url 'https://repo.spongepowered.org/repository/maven-public'
@@ -337,6 +319,8 @@ dependencies {
         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')
+    }
+    if(usesMixins.toBoolean() || forceEnableMixins) {
         // 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
@@ -394,7 +378,10 @@ shadowJar {
     }
 
     minimize()  // This will only allow shading for actually used classes
-    configurations = [project.configurations.shadowImplementation, project.configurations.shadowCompile]
+    configurations = [
+        project.configurations.shadowImplementation,
+        project.configurations.shadowCompile
+    ]
     dependsOn(relocateShadowJar)
 }
 
@@ -416,7 +403,7 @@ jar {
 }
 
 reobf {
-    if(usesMixins.toBoolean()) {
+    if(usesMixins.toBoolean() && file(mixinSrg).exists()) {
         addExtraSrgFile mixinSrg
     }
 }
@@ -425,12 +412,12 @@ 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"
+                "-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"
             ]
         }
     }
@@ -439,8 +426,8 @@ afterEvaluate {
 runClient {
     if(developmentEnvironmentUserName) {
         arguments += [
-                "--username",
-                developmentEnvironmentUserName
+            "--username",
+            developmentEnvironmentUserName
         ]
     }
 
@@ -458,13 +445,14 @@ tasks.withType(JavaExec).configureEach {
             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
+    exclude("spotless.gradle")
 
     // replace stuff in mcmod.info, nothing else
     from(sourceSets.main.resources.srcDirs) {
@@ -472,9 +460,9 @@ processResources {
 
         // replace modVersion and minecraftVersion
         expand "minecraftVersion": project.minecraft.version,
-            "modVersion": modVersion,
-            "modId": modId,
-            "modName": modName
+        "modVersion": modVersion,
+        "modId": modId,
+        "modName": modName
     }
 
     if(usesMixins.toBoolean()) {
@@ -484,6 +472,7 @@ processResources {
     // copy everything else that's not the mcmod.info
     from(sourceSets.main.resources.srcDirs) {
         exclude 'mcmod.info'
+        exclude 'spotless.gradle'
     }
 }
 
@@ -503,9 +492,9 @@ def getManifestAttributes() {
 
     if(usesMixins.toBoolean()) {
         manifestAttributes += [
-                "TweakClass" : "org.spongepowered.asm.launch.MixinTweaker",
-                "MixinConfigs" : "mixins." + modId + ".json",
-                "ForceLoadAsMod" : !containsMixinsAndOrCoreModOnly.toBoolean()
+            "TweakClass" : "org.spongepowered.asm.launch.MixinTweaker",
+            "MixinConfigs" : "mixins." + modId + ".json",
+            "ForceLoadAsMod" : !containsMixinsAndOrCoreModOnly.toBoolean()
         ]
     }
     return manifestAttributes
@@ -532,7 +521,10 @@ task shadowDevJar(type: ShadowJar) {
     }
 
     minimize()  // This will only allow shading for actually used classes
-    configurations = [project.configurations.shadowImplementation, project.configurations.shadowCompile]
+    configurations = [
+        project.configurations.shadowImplementation,
+        project.configurations.shadowCompile
+    ]
 }
 
 task relocateShadowDevJar(type: ConfigureShadowRelocation) {
@@ -624,7 +616,10 @@ publishing {
             // remove extra garbage from minecraft and minecraftDeps configuration
             pom.withXml {
                 def badArtifacts = [:].withDefault {[] as Set<String>}
-                for (configuration in [projectConfigs.minecraft, projectConfigs.minecraftDeps]) {
+                for (configuration in [
+                            projectConfigs.minecraft,
+                            projectConfigs.minecraftDeps
+                        ]) {
                     for (dependency in configuration.allDependencies) {
                         badArtifacts[dependency.group == null ? "" : dependency.group] += dependency.name
                     }
@@ -658,11 +653,11 @@ task updateBuildScript {
     doLast {
         if (performBuildScriptUpdate(projectDir.toString())) return
 
-        print("Build script already up-to-date!")
+            print("Build script already up-to-date!")
     }
 }
 
-if (isNewBuildScriptVersionAvailable(projectDir.toString())) {
+if (!project.getGradle().startParameter.isOffline() && isNewBuildScriptVersionAvailable(projectDir.toString())) {
     if (autoUpdateBuildScript.toBoolean()) {
         performBuildScriptUpdate(projectDir.toString())
     } else {
@@ -673,12 +668,26 @@ if (isNewBuildScriptVersionAvailable(projectDir.toString())) {
 static URL availableBuildScriptUrl() {
     new URL("https://raw.githubusercontent.com/GTNewHorizons/ExampleMod1.7.10/main/build.gradle")
 }
+static URL exampleSettingsGradleUrl() {
+    new URL("https://raw.githubusercontent.com/GTNewHorizons/ExampleMod1.7.10/main/settings.gradle.example")
+}
+
+
+def verifySettingsGradle() {
+    def settingsFile = getFile("settings.gradle")
+    if (!settingsFile.exists()) {
+        println("Downloading default settings.gradle")
+        exampleSettingsGradleUrl().withInputStream { i -> settingsFile.withOutputStream { it << i } }
+        throw new GradleException("Settings.gradle has been updated, please re-run task.")
+    }
+}
 
 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!")
+        verifySettingsGradle()
         return true
     }
     return false
@@ -739,194 +748,195 @@ task deobfParams {
         }
 
         out.style(Style.Success).println("Modified ${replaceParams(file("$projectDir/src/main/java"), params)} files!")
-        out.style(Style.Failure).println("Don't forget to verify that the code still works as before!\n It could be broken due to duplicate variables existing now\n or parameters taking priority over other variables.")
-    }
+    out.style(Style.Failure).println("Don't forget to verify that the code still works as before!\n It could be broken due to duplicate variables existing now\n or parameters taking priority over other variables.")
+}
 }
 
 static int replaceParams(File file, Map<String, String> params) {
-    int fileCount = 0
+int fileCount = 0
 
-    if(file.isDirectory()) {
-        for(File f : file.listFiles()) {
-            fileCount += replaceParams(f, params)
-        }
-        return fileCount
+if(file.isDirectory()) {
+    for(File f : file.listFiles()) {
+        fileCount += replaceParams(f, params)
     }
-    println("Visiting ${file.getName()} ...")
-    try {
-        String content = new String(Files.readAllBytes(file.toPath()))
-        int hash = content.hashCode()
-        params.forEach{key, value ->
-            content = content.replaceAll(key, value)
-        }
-        if(hash != content.hashCode()) {
-            Files.write(file.toPath(), content.getBytes("UTF-8"))
-            return 1
-        }
-    } catch(Exception e) {
-        e.printStackTrace()
+    return fileCount
+}
+println("Visiting ${file.getName()} ...")
+try {
+    String content = new String(Files.readAllBytes(file.toPath()))
+    int hash = content.hashCode()
+    params.forEach{key, value ->
+        content = content.replaceAll(key, value)
     }
-    return 0
+    if(hash != content.hashCode()) {
+        Files.write(file.toPath(), content.getBytes("UTF-8"))
+        return 1
+    }
+} catch(Exception e) {
+    e.printStackTrace()
+}
+return 0
 }
 
 // Credit: bitsnaps (https://gist.github.com/bitsnaps/00947f2dce66f4bbdabc67d7e7b33681)
 static unzip(String zipFileName, String outputDir) {
-    byte[] buffer = new byte[16384]
-    ZipInputStream zis = new ZipInputStream(new FileInputStream(zipFileName))
-    ZipEntry zipEntry = zis.getNextEntry()
-    while (zipEntry != null) {
-         File newFile = new File(outputDir + File.separator, zipEntry.name)
-         if (zipEntry.isDirectory()) {
-             if (!newFile.isDirectory() && !newFile.mkdirs()) {
-                 throw new IOException("Failed to create directory $newFile")
-             }
-         } else {
-             // fix for Windows-created archives
-             File parent = newFile.parentFile
-             if (!parent.isDirectory() && !parent.mkdirs()) {
-                 throw new IOException("Failed to create directory $parent")
-             }
-             // write file content
-             FileOutputStream fos = new FileOutputStream(newFile)
-             int len = 0
-             while ((len = zis.read(buffer)) > 0) {
-                 fos.write(buffer, 0, len)
-             }
-             fos.close()
-         }
-     zipEntry = zis.getNextEntry()
-     }
-    zis.closeEntry()
-    zis.close()
+byte[] buffer = new byte[16384]
+ZipInputStream zis = new ZipInputStream(new FileInputStream(zipFileName))
+ZipEntry zipEntry = zis.getNextEntry()
+while (zipEntry != null) {
+    File newFile = new File(outputDir + File.separator, zipEntry.name)
+    if (zipEntry.isDirectory()) {
+        if (!newFile.isDirectory() && !newFile.mkdirs()) {
+            throw new IOException("Failed to create directory $newFile")
+        }
+    } else {
+        // fix for Windows-created archives
+        File parent = newFile.parentFile
+        if (!parent.isDirectory() && !parent.mkdirs()) {
+            throw new IOException("Failed to create directory $parent")
+        }
+        // write file content
+        FileOutputStream fos = new FileOutputStream(newFile)
+        int len = 0
+        while ((len = zis.read(buffer)) > 0) {
+            fos.write(buffer, 0, len)
+        }
+        fos.close()
+    }
+    zipEntry = zis.getNextEntry()
+}
+zis.closeEntry()
+zis.close()
 }
 
 configure(deobfParams) {
-    group = 'forgegradle'
-    description = 'Rename all obfuscated parameter names inherited from Minecraft classes'
+group = 'forgegradle'
+description = 'Rename all obfuscated parameter names inherited from Minecraft classes'
 }
 
 // Dependency Deobfuscation
 
 def deobf(String sourceURL) {
-    try {
-        URL url = new URL(sourceURL)
-        String fileName = url.getFile()
+try {
+    URL url = new URL(sourceURL)
+    String fileName = url.getFile()
 
-        //get rid of directories:
-        int lastSlash = fileName.lastIndexOf("/")
-        if(lastSlash > 0) {
-            fileName = fileName.substring(lastSlash + 1)
-        }
-        //get rid of extension:
-        if(fileName.endsWith(".jar") || fileName.endsWith(".litemod")) {
-            fileName = fileName.substring(0, fileName.lastIndexOf("."))
-        }
-
-        String hostName = url.getHost()
-        if(hostName.startsWith("www.")) {
-            hostName = hostName.substring(4)
-        }
-        List parts = Arrays.asList(hostName.split("\\."))
-        Collections.reverse(parts)
-        hostName = String.join(".", parts)
-
-        return deobf(sourceURL, "$hostName/$fileName")
-    } catch(Exception e) {
-        return deobf(sourceURL, "deobf/${sourceURL.hashCode()}")
+    //get rid of directories:
+    int lastSlash = fileName.lastIndexOf("/")
+    if(lastSlash > 0) {
+        fileName = fileName.substring(lastSlash + 1)
     }
+    //get rid of extension:
+    if(fileName.endsWith(".jar") || fileName.endsWith(".litemod")) {
+        fileName = fileName.substring(0, fileName.lastIndexOf("."))
+    }
+
+    String hostName = url.getHost()
+    if(hostName.startsWith("www.")) {
+        hostName = hostName.substring(4)
+    }
+    List parts = Arrays.asList(hostName.split("\\."))
+    Collections.reverse(parts)
+    hostName = String.join(".", parts)
+
+    return deobf(sourceURL, "$hostName/$fileName")
+} catch(Exception e) {
+    return deobf(sourceURL, "deobf/${sourceURL.hashCode()}")
+}
 }
 
 // The method above is to be preferred. Use this method if the filename is not at the end of the URL.
 def deobf(String sourceURL, String rawFileName) {
-    String bon2Version = "2.5.1"
-    String fileName = URLDecoder.decode(rawFileName, "UTF-8")
-    String cacheDir = "$project.gradle.gradleUserHomeDir/caches"
-    String bon2Dir = "$cacheDir/forge_gradle/deobf"
-    String bon2File = "$bon2Dir/BON2-${bon2Version}.jar"
-    String obfFile = "$cacheDir/modules-2/files-2.1/${fileName}.jar"
-    String deobfFile = "$cacheDir/modules-2/files-2.1/${fileName}-deobf.jar"
-
-    if(file(deobfFile).exists()) {
-        return files(deobfFile)
-    }
-
-    String mappingsVer
-    if(remoteMappings) {
-        String id = "${forgeVersion.split("\\.")[3]}-$minecraftVersion"
-        String mappingsZIP = "$cacheDir/forge_gradle/maven_downloader/de/oceanlabs/mcp/mcp_snapshot_nodoc/$id/mcp_snapshot_nodoc-${id}.zip"
-
-        zipMappings(mappingsZIP, remoteMappings, bon2Dir)
-
-        mappingsVer = "snapshot_$id"
-    } else {
-        mappingsVer = "${channel}_$mappingsVersion"
-    }
-
-    download.run {
-        src "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases/com/github/parker8283/BON2/$bon2Version-CUSTOM/BON2-$bon2Version-CUSTOM-all.jar"
-        dest bon2File
-        quiet true
-        overwrite false
-    }
-
-    download.run {
-        src sourceURL
-        dest obfFile
-        quiet true
-        overwrite false
-    }
-
-    exec {
-        commandLine 'java', '-jar', bon2File, '--inputJar', obfFile, '--outputJar', deobfFile, '--mcVer', minecraftVersion, '--mappingsVer', mappingsVer, '--notch'
-        workingDir bon2Dir
-        standardOutput = new FileOutputStream("${deobfFile}.log")
-    }
+String bon2Version = "2.5.1"
+String fileName = URLDecoder.decode(rawFileName, "UTF-8")
+String cacheDir = "$project.gradle.gradleUserHomeDir/caches"
+String bon2Dir = "$cacheDir/forge_gradle/deobf"
+String bon2File = "$bon2Dir/BON2-${bon2Version}.jar"
+String obfFile = "$cacheDir/modules-2/files-2.1/${fileName}.jar"
+String deobfFile = "$cacheDir/modules-2/files-2.1/${fileName}-deobf.jar"
 
+if(file(deobfFile).exists()) {
     return files(deobfFile)
 }
 
+String mappingsVer
+String remoteMappings = project.hasProperty('remoteMappings') ? project.remoteMappings : 'https://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/'
+if(remoteMappings) {
+    String id = "${forgeVersion.split("\\.")[3]}-$minecraftVersion"
+    String mappingsZIP = "$cacheDir/forge_gradle/maven_downloader/de/oceanlabs/mcp/mcp_snapshot_nodoc/$id/mcp_snapshot_nodoc-${id}.zip"
+
+    zipMappings(mappingsZIP, remoteMappings, bon2Dir)
+
+    mappingsVer = "snapshot_$id"
+} else {
+    mappingsVer = "${channel}_$mappingsVersion"
+}
+
+download.run {
+    src "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases/com/github/parker8283/BON2/$bon2Version-CUSTOM/BON2-$bon2Version-CUSTOM-all.jar"
+    dest bon2File
+    quiet true
+    overwrite false
+}
+
+download.run {
+    src sourceURL
+    dest obfFile
+    quiet true
+    overwrite false
+}
+
+exec {
+    commandLine 'java', '-jar', bon2File, '--inputJar', obfFile, '--outputJar', deobfFile, '--mcVer', minecraftVersion, '--mappingsVer', mappingsVer, '--notch'
+    workingDir bon2Dir
+    standardOutput = new FileOutputStream("${deobfFile}.log")
+}
+
+return files(deobfFile)
+}
+
 def zipMappings(String zipPath, String url, String bon2Dir) {
-    File zipFile = new File(zipPath)
-    if(zipFile.exists()) {
-        return
-    }
+File zipFile = new File(zipPath)
+if(zipFile.exists()) {
+    return
+}
 
-    String fieldsCache = "$bon2Dir/data/fields.csv"
-    String methodsCache = "$bon2Dir/data/methods.csv"
+String fieldsCache = "$bon2Dir/data/fields.csv"
+String methodsCache = "$bon2Dir/data/methods.csv"
 
-    download.run {
-        src "${url}fields.csv"
-        dest fieldsCache
-        quiet true
-    }
-    download.run {
-        src "${url}methods.csv"
-        dest methodsCache
-        quiet true
-    }
+download.run {
+    src "${url}fields.csv"
+    dest fieldsCache
+    quiet true
+}
+download.run {
+    src "${url}methods.csv"
+    dest methodsCache
+    quiet true
+}
 
-    zipFile.getParentFile().mkdirs()
-    ZipOutputStream zos = new ZipOutputStream(new FileOutputStream(zipFile))
+zipFile.getParentFile().mkdirs()
+ZipOutputStream zos = new ZipOutputStream(new FileOutputStream(zipFile))
 
-    zos.putNextEntry(new ZipEntry("fields.csv"))
-    Files.copy(Paths.get(fieldsCache), zos)
-    zos.closeEntry()
+zos.putNextEntry(new ZipEntry("fields.csv"))
+Files.copy(Paths.get(fieldsCache), zos)
+zos.closeEntry()
 
-    zos.putNextEntry(new ZipEntry("methods.csv"))
-    Files.copy(Paths.get(methodsCache), zos)
-    zos.closeEntry()
+zos.putNextEntry(new ZipEntry("methods.csv"))
+Files.copy(Paths.get(methodsCache), zos)
+zos.closeEntry()
 
-    zos.close()
+zos.close()
 }
 
 // Helper methods
 
 def checkPropertyExists(String propertyName) {
-    if (!project.hasProperty(propertyName)) {
-        throw new GradleException("This project requires a property \"" + propertyName + "\"! Please add it your \"gradle.properties\". You can find all properties and their description here: https://github.com/GTNewHorizons/ExampleMod1.7.10/blob/main/gradle.properties")
-    }
+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)
+return new File(projectDir, relativePath)
 }

dependencies.gradle

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

repositories.gradle

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

settings.gradle

@@ -0,0 +1,10 @@
+plugins {
+    id 'com.diffplug.blowdryerSetup' version '1.6.0'
+}
+
+apply plugin: 'com.diffplug.blowdryerSetup'
+
+blowdryerSetup {
+    github('GTNewHorizons/ExampleMod1.7.10', 'tag', '0.1.4')
+    //devLocal '.' // Use this when testing config updates locally
+}

src/main/java/codechicken/nei/AnimatedItemStack.java

@@ -0,0 +1,76 @@
+package codechicken.nei;
+
+import static codechicken.nei.ItemsGrid.SLOT_SIZE;
+
+import codechicken.nei.guihook.GuiContainerManager;
+import net.minecraft.item.ItemStack;
+import org.lwjgl.opengl.GL11;
+
+public class AnimatedItemStack {
+
+    private static final int steep = 10;
+    private static final float scaleSpeed = 0.1f;
+
+    private int lastPosX = -1;
+    private int lastPosY = -1;
+    private float currentScale = 0;
+    private final boolean doMoveAnim;
+    private final boolean doPopAnim;
+
+    public ItemStack itemStack;
+
+    public AnimatedItemStack(ItemStack itemStack, boolean doMoveAnim, boolean doPopAnim) {
+        this.itemStack = itemStack;
+        this.doMoveAnim = doMoveAnim;
+        this.doPopAnim = doPopAnim;
+    }
+
+    public void drawItem(int x, int y) {
+        drawItem(x, y, false, null, false);
+    }
+
+    public void drawItem(int x, int y, boolean smallAmount, String stackSize, boolean blockMoveAnimOnce) {
+        if (NEIClientConfig.areBookmarksAnimated()) {
+            if (doPopAnim && currentScale < 1) {
+                drawPoppingItem(x, y, smallAmount, stackSize);
+                return;
+            }
+            if (doMoveAnim && (lastPosX != x || lastPosY != y) && !blockMoveAnimOnce) {
+                drawMovingItem(x, y, smallAmount, stackSize);
+                return;
+            }
+        }
+        currentScale = 1;
+        lastPosX = x;
+        lastPosY = y;
+        GuiContainerManager.drawItem(x, y, itemStack, smallAmount, stackSize);
+    }
+
+    private void drawPoppingItem(int x, int y, boolean smallAmount, String stackSize) {
+        currentScale += scaleSpeed;
+        GL11.glScalef(currentScale, currentScale, currentScale); // push & pop matrix crashes the game
+        GuiContainerManager.drawItem(
+                (int) ((x + (SLOT_SIZE / 2 - currentScale * SLOT_SIZE / 2)) / currentScale),
+                (int) ((y + (SLOT_SIZE / 2 - currentScale * SLOT_SIZE / 2)) / currentScale),
+                itemStack,
+                smallAmount,
+                stackSize);
+        GL11.glScalef(1 / currentScale, 1 / currentScale, 1 / currentScale);
+    }
+
+    private void drawMovingItem(int x, int y, boolean smallAmount, String stackSize) {
+        if (lastPosX != -1 && lastPosY != -1) {
+            int xDiff = x - lastPosX;
+            int yDiff = y - lastPosY;
+            int moveX = xDiff / steep + ((xDiff % steep == 0) ? 0 : (xDiff > 0 ? 1 : -1));
+            int moveY = yDiff / steep + ((yDiff % steep == 0) ? 0 : (yDiff > 0 ? 1 : -1));
+            GuiContainerManager.drawItem(lastPosX + moveX, lastPosY + moveY, itemStack, smallAmount, stackSize);
+            lastPosX = lastPosX + moveX;
+            lastPosY = lastPosY + moveY;
+        } else {
+            lastPosX = x;
+            lastPosY = y;
+            GuiContainerManager.drawItem(x, y, itemStack, smallAmount, stackSize);
+        }
+    }
+}

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

@@ -1,8 +1,7 @@
 package codechicken.nei;
 
-import static codechicken.lib.gui.GuiDraw.drawRect;
-import static codechicken.lib.gui.GuiDraw.getMousePosition;
-import static codechicken.nei.NEIClientUtils.translate;
+import static codechicken.lib.gui.GuiDraw.*;
+import static codechicken.nei.NEIClientUtils.*;
 
 import codechicken.core.CommonUtils;
 import codechicken.lib.vec.Rectangle4i;
@@ -30,6 +29,7 @@ import java.util.Map;
 import javax.annotation.Nullable;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import org.apache.commons.io.IOUtils;
@@ -49,6 +49,9 @@ public class BookmarkPanel extends PanelWidget {
     protected List<BookmarkGrid> namespaces = new ArrayList<>();
     protected int activeNamespaceIndex = 0;
 
+    private BookmarkStackMeta draggedStackMeta;
+    private int draggedStackOriginIndex = -1;
+
     protected static class BookmarkStackMeta {
         public int factor;
         public BookmarkRecipeId recipeId;
@@ -207,7 +210,7 @@ public class BookmarkPanel extends PanelWidget {
                 final BookmarkStackMeta meta = getMetadata(idx);
                 if ((recipeId == null && meta.recipeId == null
                                 || recipeId != null && meta.recipeId != null && recipeId.equals(meta.recipeId))
-                        && StackInfo.equalItemAndNBT(stackA, realItems.get(idx), useNBT)) {
+                        && StackInfo.equalItemAndNBT(stackA, getItem(idx), useNBT)) {
                     return idx;
                 }
             }
@@ -219,14 +222,24 @@ public class BookmarkPanel extends PanelWidget {
             return metadata.get(idx);
         }
 
-        public void addItem(ItemStack stackA, BookmarkStackMeta meta) {
-            realItems.add(stackA);
+        public void addItem(ItemStack stackA, BookmarkStackMeta meta, boolean doPopAnim) {
+            addRealItem(stackA, true, doPopAnim);
             metadata.add(meta);
             onGridChanged();
         }
 
+        public void addItem(ItemStack stackA, BookmarkStackMeta meta, int index) {
+            if (index == -1) {
+                addItem(stackA, meta, true);
+                return;
+            }
+            addRealItem(index, stackA, true, true);
+            metadata.add(index, meta);
+            onGridChanged();
+        }
+
         public void replaceItem(int idx, ItemStack stack) {
-            realItems.set(idx, stack);
+            setRealItem(idx, stack, true, true);
             onGridChanged();
         }
 
@@ -318,12 +331,14 @@ public class BookmarkPanel extends PanelWidget {
                 final ItemStack stack = getItem(idx);
                 final BookmarkStackMeta meta = getMetadata(idx);
 
-                GuiContainerManager.drawItem(
-                        rect.x + 1,
-                        rect.y + 1,
-                        stack,
-                        true,
-                        meta.factor < 0 || meta.fluidDisplay ? "" : String.valueOf(stack.stackSize));
+                realItems
+                        .get(idx)
+                        .drawItem(
+                                rect.x + 1,
+                                rect.y + 1,
+                                true,
+                                meta.factor < 0 || meta.fluidDisplay ? "" : String.valueOf(stack.stackSize),
+                                draggedStack == null);
 
                 if (meta.recipeId != null && !meta.ingredient && NEIClientConfig.showRecipeMarker()) {
                     drawRecipeMarker(rect.x, rect.y, GuiContainerManager.getFontRenderer(stack));
@@ -407,12 +422,26 @@ public class BookmarkPanel extends PanelWidget {
         addOrRemoveItem(stackA, null, null, false, false);
     }
 
+    public void addOrRemoveItem(ItemStack stackA, int index) {
+        addOrRemoveItem(stackA, null, null, false, false, index);
+    }
+
     public void addOrRemoveItem(
             ItemStack stackover,
             final String handlerName,
             final List<PositionedStack> ingredients,
             boolean saveIngredients,
             boolean saveStackSize) {
+        addOrRemoveItem(stackover, handlerName, ingredients, saveIngredients, saveStackSize, -1);
+    }
+
+    public void addOrRemoveItem(
+            ItemStack stackover,
+            final String handlerName,
+            final List<PositionedStack> ingredients,
+            boolean saveIngredients,
+            boolean saveStackSize,
+            int addIndex) {
         loadBookmarksIfNeeded();
 
         final Point mousePos = getMousePosition();
@@ -462,7 +491,8 @@ public class BookmarkPanel extends PanelWidget {
                                         recipeId != null ? recipeId.copy() : null,
                                         (saveStackSize ? 1 : -1) * count,
                                         true,
-                                        nbTag.hasKey("gtFluidName")));
+                                        nbTag.hasKey("gtFluidName")),
+                                addIndex);
                     }
                 }
 
@@ -472,7 +502,8 @@ public class BookmarkPanel extends PanelWidget {
                                 recipeId,
                                 (saveStackSize ? 1 : -1) * nbTagA.getInteger("Count"),
                                 false,
-                                nbTagA.hasKey("gtFluidName")));
+                                nbTagA.hasKey("gtFluidName")),
+                        addIndex);
             }
         }
 
@@ -739,7 +770,8 @@ public class BookmarkPanel extends PanelWidget {
                                                             .get("ingredient")
                                                             .getAsBoolean()
                                                     : false,
-                                            itemStackNBT.hasKey("gtFluidName")));
+                                            itemStackNBT.hasKey("gtFluidName")),
+                                    false);
                 } else {
                     NEIClientConfig.logger.warn(
                             "Failed to load bookmarked ItemStack from json string, the item no longer exists:\n{}",
@@ -863,8 +895,8 @@ public class BookmarkPanel extends PanelWidget {
 
     @Override
     public void mouseDragged(int mousex, int mousey, int button, long heldTime) {
-
-        if (button == 0 && NEIClientUtils.shiftKey() && mouseDownSlot >= 0) {
+        // legacy sort
+        if (button == 0 && NEIClientUtils.shiftKey() && mouseDownSlot >= 0 && draggedStack == null) {
             ItemPanelSlot mouseOverSlot = getSlotMouseOver(mousex, mousey);
 
             if (sortedStackIndex == -1) {
@@ -893,7 +925,7 @@ public class BookmarkPanel extends PanelWidget {
                         final BookmarkStackMeta meta = sortedGrid.getMetadata(sortedStackIndex);
 
                         sortedGrid.removeItem(sortedStackIndex);
-                        hoverGrid.addItem(stack, meta);
+                        hoverGrid.addItem(stack, meta, true);
 
                         sortedNamespaceIndex = activeNamespaceIndex;
                         sortedStackIndex = hoverGrid.indexOf(stack, meta.recipeId);
@@ -935,7 +967,80 @@ public class BookmarkPanel extends PanelWidget {
             return;
         }
 
-        super.mouseDragged(mousex, mousey, button, heldTime);
+        if (mouseDownSlot >= 0
+                && draggedStack == null
+                && NEIClientUtils.getHeldItem() == null
+                && NEIClientConfig.hasSMPCounterPart()) {
+            ItemPanelSlot mouseOverSlot = getSlotMouseOver(mousex, mousey);
+
+            if (mouseOverSlot == null || mouseOverSlot.slotIndex != mouseDownSlot || heldTime > 500) {
+                draggedStack = getDraggedStackWithQuantity(mouseDownSlot);
+                draggedStackMeta = ((BookmarkGrid) grid).getMetadata(mouseDownSlot);
+                draggedStackOriginIndex = mouseDownSlot;
+                ((BookmarkGrid) grid).removeItem(mouseDownSlot);
+                saveBookmarks();
+                fixCountOfNamespaces();
+                mouseDownSlot = -1;
+            }
+        }
+    }
+
+    @Override
+    public void update() {
+        int mouseX = getMousePosition().x;
+        int mouseY = getMousePosition().y;
+        if (draggedStack != null) {
+
+            if (!contains(mouseX, mouseY)) {
+                if (sortedStackIndex != -1 && sortedStackIndex < grid.realItems.size()) {
+                    ((BookmarkGrid) grid).removeItem(sortedStackIndex);
+                    sortedStackIndex = -1;
+                }
+            } else {
+                ItemPanelSlot mouseOverSlot = getSlotMouseOver(mouseX, mouseY);
+                if (sortedStackIndex == -1) {
+                    sortedNamespaceIndex = activeNamespaceIndex;
+                    if (mouseOverSlot != null) {
+                        sortedStackIndex = mouseOverSlot.slotIndex;
+                    } else {
+                        sortedStackIndex = grid.size();
+                    }
+                    // dummy item
+                    addOrRemoveItem(
+                            new ItemStack(Items.paper).setStackDisplayName("this is a dummy item"), sortedStackIndex);
+                } else if (mouseOverSlot != null && mouseOverSlot.slotIndex != sortedStackIndex) {
+                    final BookmarkGrid sortedGrid = namespaces.get(sortedNamespaceIndex);
+                    if (sortedStackIndex >= grid.size()) sortedStackIndex = grid.size() - 1;
+                    if (sortedGrid.getViewMode() == BookmarkViewMode.DEFAULT) {
+                        sortedGrid.moveItem(sortedStackIndex, mouseOverSlot.slotIndex);
+                        sortedStackIndex = mouseOverSlot.slotIndex;
+                    } else if (sortedGrid.getViewMode() == BookmarkViewMode.TODO_LIST) {
+                        final ItemStack stack = sortedGrid.getItem(sortedStackIndex);
+                        final BookmarkStackMeta meta = sortedGrid.getMetadata(sortedStackIndex);
+                        final boolean isIngredient = sortedStackIndex > 0
+                                && meta.recipeId != null
+                                && meta.ingredient
+                                && meta.recipeId.equals(sortedGrid.getRecipeId(sortedStackIndex - 1));
+
+                        if (!isIngredient) {
+                            mouseOverSlot = getSlotMouseOver(grid.marginLeft + grid.paddingLeft, mouseY);
+
+                            if (mouseOverSlot != null && sortedStackIndex != mouseOverSlot.slotIndex) {
+                                sortedGrid.moveItem(sortedStackIndex, mouseOverSlot.slotIndex);
+                                sortedStackIndex = sortedGrid.indexOf(stack, meta.recipeId);
+                            }
+
+                        } else if (meta.recipeId != null
+                                && sortedGrid.getMetadata(mouseOverSlot.slotIndex).ingredient
+                                && meta.recipeId.equals(sortedGrid.getRecipeId(mouseOverSlot.slotIndex))) {
+                            sortedGrid.moveItem(sortedStackIndex, mouseOverSlot.slotIndex);
+                            sortedStackIndex = sortedGrid.indexOf(stack, meta.recipeId);
+                        }
+                    }
+                }
+            }
+        }
+        super.update();
     }
 
     private ItemPanelSlot getNextSlot(int mousex, int mousey, boolean line) {
@@ -960,7 +1065,8 @@ public class BookmarkPanel extends PanelWidget {
     @Override
     public void postDraw(int mousex, int mousey) {
 
-        if (sortedStackIndex != -1) {
+        // legacy sort
+        if (sortedStackIndex != -1 && shiftKey() && draggedStack == null) {
             GuiContainerManager.drawItems.zLevel += 100;
             GuiContainerManager.drawItem(
                     mousex - 8,
@@ -996,6 +1102,39 @@ public class BookmarkPanel extends PanelWidget {
         }
     }
 
+    @Override
+    protected boolean handleDraggedClick(int mouseX, int mouseY, int button) {
+        if (contains(mouseX, mouseY)) {
+            ((BookmarkGrid) grid).removeItem(sortedStackIndex);
+            if (draggedStackMeta != null) {
+                ((BookmarkGrid) grid).addItem(draggedStack, draggedStackMeta, sortedStackIndex);
+                fixCountOfNamespaces();
+                saveBookmarks();
+            } else addOrRemoveItem(draggedStack, sortedStackIndex);
+            sortedStackIndex = -1;
+            draggedStack = null;
+            draggedStackMeta = null;
+            draggedStackOriginIndex = -1;
+            return true;
+        }
+        return false;
+    }
+
+    public void restoreBookmark() {
+        if (draggedStack != null && draggedStackOriginIndex != -1) {
+            if (sortedStackIndex != -1) ((BookmarkGrid) grid).removeItem(sortedStackIndex);
+            if (draggedStackMeta != null) {
+                ((BookmarkGrid) grid).addItem(draggedStack, draggedStackMeta, draggedStackOriginIndex);
+                fixCountOfNamespaces();
+                saveBookmarks();
+            } else addOrRemoveItem(draggedStack, draggedStackOriginIndex);
+            sortedStackIndex = -1;
+            draggedStack = null;
+            draggedStackMeta = null;
+            draggedStackOriginIndex = -1;
+        }
+    }
+
     @Override
     public List<String> handleTooltip(int mx, int my, List<String> tooltip) {
 
@@ -1009,8 +1148,7 @@ public class BookmarkPanel extends PanelWidget {
 
     @Override
     public void mouseUp(int mousex, int mousey, int button) {
-        if (sortedStackIndex != -1) {
-            draggedStack = null;
+        if (sortedStackIndex != -1 && draggedStack == null) {
             sortedNamespaceIndex = -1;
             sortedStackIndex = -1;
             mouseDownSlot = -1;
@@ -1089,4 +1227,9 @@ public class BookmarkPanel extends PanelWidget {
             BGrid.replaceItem(slotIndex, StackInfo.loadFromNBT(nbTag));
         }
     }
+
+    public void deleteDraggedMeta() {
+        draggedStackMeta = null;
+        draggedStackOriginIndex = -1;
+    }
 }

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

@@ -37,6 +37,11 @@ public class ItemList {
 
     private static final HashSet<Item> erroredItems = new HashSet<>();
     private static final HashSet<String> stackTraces = new HashSet<>();
+    /**
+     * Unlike {@link LayoutManager#itemsLoaded}, this indicates whether item loading is
+     * actually finished or not.
+     */
+    public static boolean loadFinished;
 
     public static class EverythingItemFilter implements ItemFilter {
         @Override
@@ -179,6 +184,7 @@ public class ItemList {
         public void execute() {
             // System.out.println("Executing NEI Item Loading");
             ThreadOperationTimer timer = getTimer(NEIClientConfig.getItemLoadingTimeout());
+            loadFinished = false;
 
             LinkedList<ItemStack> items = new LinkedList<>();
             LinkedList<ItemStack> permutations = new LinkedList<>();
@@ -218,6 +224,8 @@ public class ItemList {
             for (ItemsLoadedCallback callback : loadCallbacks) callback.itemsLoaded();
 
             updateFilter.restart();
+
+            loadFinished = true;
         }
     };
 

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

@@ -57,7 +57,8 @@ public class ItemPanel extends PanelWidget {
         public void refresh(GuiContainer gui) {
 
             if (newItems != null) {
-                realItems = newItems;
+                realItems.clear();
+                addRealItems(newItems, false, false);
                 newItems = null;
                 onGridChanged();
             }
@@ -73,6 +74,11 @@ public class ItemPanel extends PanelWidget {
                 super.drawSlotOutline(focused, slotIdx, rect);
             }
         }
+
+        @Override
+        public String getMessageOnEmpty() {
+            return ItemList.loadFinished ? null : NEIClientUtils.translate("itempanel.loading");
+        }
     }
 
     public ItemPanel() {

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

@@ -9,7 +9,9 @@ import codechicken.nei.guihook.GuiContainerManager;
 import codechicken.nei.recipe.StackInfo;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
+import java.util.stream.Collectors;
 import javax.annotation.Nullable;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.ScaledResolution;
@@ -31,7 +33,7 @@ public class ItemsGrid {
 
     protected int paddingLeft;
 
-    protected ArrayList<ItemStack> realItems = new ArrayList<>();
+    protected ArrayList<AnimatedItemStack> realItems = new ArrayList<>();
 
     protected int page;
     protected int perPage;
@@ -41,17 +43,35 @@ public class ItemsGrid {
 
     protected boolean[] invalidSlotMap;
 
+    protected Label messageLabel = new Label(getMessageOnEmpty(), true);
+
     @Nullable
     private Framebuffer framebuffer = null;
 
     protected boolean refreshBuffer = true;
 
     public ArrayList<ItemStack> getItems() {
-        return realItems;
+        return realItems.stream().map(e -> e.itemStack).collect(Collectors.toCollection(ArrayList::new));
     }
 
     public ItemStack getItem(int idx) {
-        return realItems.get(idx);
+        return realItems.get(idx).itemStack;
+    }
+
+    protected void addRealItems(Collection<ItemStack> itemStack, boolean doMoveAnim, boolean doPopAnim) {
+        itemStack.forEach(e -> addRealItem(e, doMoveAnim, doPopAnim));
+    }
+
+    protected void addRealItem(ItemStack itemStack, boolean doMoveAnim, boolean doPopAnim) {
+        realItems.add(new AnimatedItemStack(itemStack, doMoveAnim, doPopAnim));
+    }
+
+    protected void addRealItem(int index, ItemStack itemStack, boolean doMoveAnim, boolean doPopAnim) {
+        realItems.add(index, new AnimatedItemStack(itemStack, doMoveAnim, doPopAnim));
+    }
+
+    protected void setRealItem(int index, ItemStack itemStack, boolean doMoveAnim, boolean doPopAnim) {
+        realItems.set(index, new AnimatedItemStack(itemStack, doMoveAnim, doPopAnim));
     }
 
     public int size() {
@@ -61,7 +81,7 @@ public class ItemsGrid {
     public int indexOf(ItemStack stackA, boolean useNBT) {
 
         for (int idx = 0; idx < realItems.size(); idx++) {
-            if (StackInfo.equalItemAndNBT(stackA, realItems.get(idx), useNBT)) {
+            if (StackInfo.equalItemAndNBT(stackA, getItem(idx), useNBT)) {
                 return idx;
             }
         }
@@ -104,6 +124,9 @@ public class ItemsGrid {
         rows = height / SLOT_SIZE;
 
         paddingLeft = (width % SLOT_SIZE) / 2;
+
+        messageLabel.x = marginLeft + width / 2;
+        messageLabel.y = marginTop + height / 2;
     }
 
     public void shiftPage(int shift) {
@@ -305,8 +328,14 @@ public class ItemsGrid {
         }
     }
 
+    public void setVisible() {
+        if (getItems().isEmpty() && getMessageOnEmpty() != null) {
+            LayoutManager.addWidget(messageLabel);
+        }
+    }
+
     protected void drawItem(Rectangle4i rect, int idx) {
-        GuiContainerManager.drawItem(rect.x + 1, rect.y + 1, getItem(idx));
+        realItems.get(idx).drawItem(rect.x + 1, rect.y + 1);
     }
 
     public ItemPanelSlot getSlotMouseOver(int mousex, int mousey) {
@@ -345,4 +374,8 @@ public class ItemsGrid {
 
         return r >= rows || c >= columns || !isInvalidSlot(slt);
     }
+
+    public String getMessageOnEmpty() {
+        return null;
+    }
 }

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

@@ -112,6 +112,12 @@ public class LayoutManager
 
     public static HashMap<Integer, LayoutStyle> layoutStyles = new HashMap<>();
 
+    /**
+     * This is set to true immediately after item loading thread is started,
+     * to prevent duplicated loading thread from being executed.
+     * If you want to know if item list is actually finished loading,
+     * Use {@link ItemList#loadFinished} instead.
+     */
     public static boolean itemsLoaded = false;
 
     /**
@@ -729,10 +735,12 @@ public class LayoutManager
                         ? !getSearchExpression().equals("")
                         : !((SearchField) searchField).getFilter().matches(item))) {
             GL11.glDisable(GL11.GL_LIGHTING);
+            GL11.glDisable(GL11.GL_DEPTH_TEST);
             GL11.glTranslatef(0, 0, 150);
             drawRect(slot.xDisplayPosition, slot.yDisplayPosition, 16, 16, 0x80000000);
             GL11.glTranslatef(0, 0, -150);
             GL11.glEnable(GL11.GL_LIGHTING);
+            GL11.glEnable(GL11.GL_DEPTH_TEST);
         }
     }
 

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

@@ -87,9 +87,19 @@ public class NEIClientConfig {
     public static final Function<IRecipeHandler, String> HANDLER_ID_FUNCTION =
             handler -> Objects.firstNonNull(handler.getOverlayIdentifier(), handler.getHandlerId());
 
+    public static int getHandlerOrder(IRecipeHandler handler) {
+        if (handlerOrdering.get(handler.getOverlayIdentifier()) != null) {
+            return handlerOrdering.get(handler.getOverlayIdentifier());
+        }
+        if (handlerOrdering.get(handler.getHandlerId()) != null) {
+            return handlerOrdering.get(handler.getHandlerId());
+        }
+        return 0;
+    }
+
     // Comparator that compares handlers using the handlerOrdering map.
     public static final Comparator<IRecipeHandler> HANDLER_COMPARATOR =
-            Comparator.comparingInt(handler -> handlerOrdering.getOrDefault(HANDLER_ID_FUNCTION.apply(handler), 0));
+            Comparator.comparingInt(NEIClientConfig::getHandlerOrder);
 
     public static ItemStack[] creativeInv;
 
@@ -227,6 +237,10 @@ public class NEIClientConfig {
                 .setComment("Use NBT in Bookmarks")
                 .getBooleanValue(true);
         API.addOption(new OptionToggleButton("inventory.useNBTInBookmarks", true));
+        tag.getTag("inventory.bookmarksAnimationEnabled")
+                .setComment("REI Style Animation in Bookmarks")
+                .getBooleanValue(true);
+        API.addOption(new OptionToggleButton("inventory.bookmarksAnimationEnabled", true));
         tag.getTag("inventory.showRecipeMarker")
                 .setComment("Show Recipe Marker")
                 .getBooleanValue(false);
@@ -334,6 +348,8 @@ public class NEIClientConfig {
         API.addHashBind("gui.overlay_use", Keyboard.KEY_S + NEIClientUtils.SHIFT_HASH);
         API.addHashBind("gui.overlay_hide", Keyboard.KEY_S + NEIClientUtils.CTRL_HASH);
         API.addHashBind("gui.hide_bookmarks", Keyboard.KEY_B);
+        API.addKeyBind("gui.getprevioussearch", Keyboard.KEY_UP);
+        API.addKeyBind("gui.getnextsearch", Keyboard.KEY_DOWN);
 
         API.addKeyBind("world.chunkoverlay", Keyboard.KEY_F9);
         API.addKeyBind("world.moboverlay", Keyboard.KEY_F7);
@@ -492,6 +508,10 @@ public class NEIClientConfig {
         return getBooleanSetting("inventory.useNBTInBookmarks");
     }
 
+    public static boolean areBookmarksAnimated() {
+        return getBooleanSetting("inventory.bookmarksAnimationEnabled");
+    }
+
     public static boolean showRecipeMarker() {
         return getBooleanSetting("inventory.showRecipeMarker");
     }

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

@@ -15,6 +15,8 @@ import codechicken.nei.api.GuiInfo;
 import codechicken.nei.api.IInfiniteItemHandler;
 import codechicken.nei.api.ItemInfo;
 import com.google.common.collect.Iterables;
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.math.BigInteger;
 import java.math.RoundingMode;
 import java.text.DecimalFormat;
@@ -29,6 +31,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Set;
 import java.util.stream.Collectors;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.audio.PositionedSoundRecord;
@@ -39,6 +42,8 @@ import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.ChatComponentTranslation;
+import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.IChatComponent;
 import net.minecraft.util.ResourceLocation;
 import org.lwjgl.input.Keyboard;
@@ -445,4 +450,30 @@ public class NEIClientUtils extends NEIServerUtils {
         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.printStackTrace();
+        buffer.add(stackTrace);
+
+        EntityPlayer player = Minecraft.getMinecraft().thePlayer;
+        if (player != null) {
+            IChatComponent chat = new ChatComponentTranslation("nei.chat.render.error");
+            chat.getChatStyle().setColor(EnumChatFormatting.RED);
+            player.addChatComponentMessage(chat);
+        }
+    }
+
+    public static void reportErrorBuffered(Throwable e, Set<String> buffer, ItemStack cause) {
+        if (cause != null) {
+            reportErrorBuffered(e, buffer, cause.toString());
+        } else {
+            reportErrorBuffered(e, buffer, "null");
+        }
+    }
 }

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

@@ -15,7 +15,7 @@ import net.minecraft.item.ItemStack;
 public abstract class PanelWidget extends Widget {
     protected static final int PADDING = 2;
 
-    public ItemStack draggedStack;
+    public static ItemStack draggedStack;
     public int mouseDownSlot = -1;
 
     public Button pagePrev;
@@ -160,6 +160,7 @@ public abstract class PanelWidget extends Widget {
             LayoutManager.addWidget(pagePrev);
             LayoutManager.addWidget(pageNext);
             LayoutManager.addWidget(pageLabel);
+            grid.setVisible();
         }
     }
 
@@ -182,8 +183,7 @@ public abstract class PanelWidget extends Widget {
         if (mouseDownSlot >= 0
                 && draggedStack == null
                 && NEIClientUtils.getHeldItem() == null
-                && NEIClientConfig.hasSMPCounterPart()
-                && !GuiInfo.hasCustomSlots(NEIClientUtils.getGuiContainer())) {
+                && NEIClientConfig.hasSMPCounterPart()) {
             ItemPanelSlot mouseOverSlot = getSlotMouseOver(mousex, mousey);
 
             if (mouseOverSlot == null || mouseOverSlot.slotIndex != mouseDownSlot || heldTime > 500) {
@@ -240,14 +240,30 @@ public abstract class PanelWidget extends Widget {
 
     @Override
     public boolean handleClickExt(int mouseX, int mouseY, int button) {
-        if (ItemPanels.itemPanel.draggedStack != null) {
-            return ItemPanels.itemPanel.handleDraggedClick(mouseX, mouseY, button);
-        }
+        if (draggedStack != null) {
+            boolean succeed = ItemPanels.bookmarkPanel.handleDraggedClick(mouseX, mouseY, button)
+                    || ItemPanels.itemPanel.handleDraggedClick(mouseX, mouseY, button);
+            if (succeed) return true;
 
-        if (ItemPanels.bookmarkPanel.draggedStack != null) {
-            return ItemPanels.bookmarkPanel.handleDraggedClick(mouseX, mouseY, button);
-        }
+            if (handleGUIContainerClick(draggedStack, mouseX, mouseY, button)) {
+                if (draggedStack.stackSize == 0) {
+                    ItemPanels.bookmarkPanel.restoreBookmark();
+                    draggedStack = null;
+                }
 
+                return true;
+            }
+
+            final GuiContainer gui = NEIClientUtils.getGuiContainer();
+            if (mouseX < gui.guiLeft
+                    || mouseY < gui.guiTop
+                    || mouseX >= gui.guiLeft + gui.xSize
+                    || mouseY >= gui.guiTop + gui.ySize) {
+                ItemPanels.bookmarkPanel.deleteDraggedMeta();
+                draggedStack = null;
+                return true;
+            }
+        }
         if (NEIClientUtils.getHeldItem() != null) {
             final ItemStack draggedStack = NEIClientUtils.getHeldItem().copy();
             return handleGUIContainerClick(draggedStack, mouseX, mouseY, button);
@@ -257,28 +273,7 @@ public abstract class PanelWidget extends Widget {
     }
 
     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;
-            }
-
-            return true;
-        }
-
-        final GuiContainer gui = NEIClientUtils.getGuiContainer();
-        if (mouseX < gui.guiLeft
-                || mouseY < gui.guiTop
-                || mouseX >= gui.guiLeft + gui.xSize
-                || mouseY >= gui.guiTop + gui.ySize) {
-            draggedStack = null;
-        }
-
-        return true;
+        return false;
     }
 
     protected boolean handleGUIContainerClick(final ItemStack draggedStack, int mouseX, int mouseY, int button) {
@@ -289,9 +284,6 @@ public abstract class PanelWidget extends Widget {
             GuiInfo.readLock.lock();
             for (INEIGuiHandler handler : GuiInfo.guiHandlers) {
                 if (handler.handleDragNDrop(gui, mouseX, mouseY, draggedStack, button)) {
-
-                    NEIClientConfig.logger.info(handler);
-
                     handled = true;
                     break;
                 }

src/main/java/codechicken/nei/PresetsWidget.java

@@ -312,7 +312,8 @@ public class PresetsWidget extends Widget {
             final int directionState = direction.contains(x + mx, y + my) ? 1 : 2;
             final int deleteState = delete.contains(x + mx, y + my) ? 1 : 2;
 
-            final String displayName = NEIClientUtils.cropText(fontRenderer, tag.displayName, option.w - 6);
+            final String displayName =
+                    NEIClientUtils.cropText(PresetsWidget.fontRenderer, tag.displayName, option.w - 6);
             final String dirName =
                     tag.whitelist ? translate("presets.whitelist.label") : translate("presets.blacklist.label");
 

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

@@ -9,6 +9,7 @@ import codechicken.nei.ItemList.PatternItemFilter;
 import codechicken.nei.api.API;
 import codechicken.nei.api.ItemFilter;
 import codechicken.nei.api.ItemFilter.ItemFilterProvider;
+import codechicken.nei.util.TextHistory;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.regex.Pattern;
@@ -45,6 +46,7 @@ public class SearchField extends TextField implements ItemFilterProvider {
     }
 
     public static List<ISearchProvider> searchProviders = new LinkedList<>();
+    private static final TextHistory history = new TextHistory();
     private boolean isVisible = true;
 
     long lastclicktime;
@@ -116,6 +118,13 @@ public class SearchField extends TextField implements ItemFilterProvider {
         if (isVisible() && NEIClientConfig.isKeyHashDown("gui.search")) {
             setFocus(true);
         }
+        if (NEIClientConfig.isKeyHashDown("gui.getprevioussearch") && focused()) {
+            handleNavigateHistory(TextHistory.Direction.PREVIOUS);
+        }
+
+        if (NEIClientConfig.isKeyHashDown("gui.getnextsearch") && focused()) {
+            handleNavigateHistory(TextHistory.Direction.NEXT);
+        }
     }
 
     @Override
@@ -156,4 +165,26 @@ public class SearchField extends TextField implements ItemFilterProvider {
         if (!secondary.isEmpty()) return new AnyMultiItemFilter(secondary);
         return new EverythingItemFilter();
     }
+
+    @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/api/ShortcutInputHandler.java

@@ -0,0 +1,119 @@
+package codechicken.nei.api;
+
+import codechicken.nei.ItemPanels;
+import codechicken.nei.LayoutManager;
+import codechicken.nei.NEIClientConfig;
+import codechicken.nei.NEIClientUtils;
+import codechicken.nei.PositionedStack;
+import codechicken.nei.recipe.GuiCraftingRecipe;
+import codechicken.nei.recipe.GuiRecipe;
+import codechicken.nei.recipe.GuiUsageRecipe;
+import java.util.List;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.item.ItemStack;
+import org.lwjgl.input.Mouse;
+
+public abstract class ShortcutInputHandler {
+
+    public static boolean handleKeyEvent(ItemStack stackover) {
+
+        if (NEIClientConfig.isKeyHashDown("gui.overlay_hide")) {
+            return hideOverlayRecipe();
+        }
+
+        if (stackover == null) {
+            return false;
+        }
+
+        stackover = stackover.copy();
+
+        if (NEIClientConfig.isKeyHashDown("gui.overlay")) {
+            return openOverlayRecipe(stackover, false);
+        }
+
+        if (NEIClientConfig.isKeyHashDown("gui.overlay_use")) {
+            return openOverlayRecipe(stackover, true);
+        }
+
+        if (NEIClientConfig.isKeyHashDown("gui.recipe")) {
+            return GuiCraftingRecipe.openRecipeGui("item", stackover);
+        }
+
+        if (NEIClientConfig.isKeyHashDown("gui.usage")) {
+            return GuiUsageRecipe.openRecipeGui("item", stackover);
+        }
+
+        if (NEIClientConfig.isKeyHashDown("gui.bookmark")) {
+            return saveRecipeInBookmark(stackover, false, false);
+        }
+
+        if (NEIClientConfig.isKeyHashDown("gui.bookmark_recipe")) {
+            return saveRecipeInBookmark(stackover, true, false);
+        }
+
+        if (NEIClientConfig.isKeyHashDown("gui.bookmark_count")) {
+            return saveRecipeInBookmark(stackover, false, true);
+        }
+
+        if (NEIClientConfig.isKeyHashDown("gui.bookmark_recipe_count")) {
+            return saveRecipeInBookmark(stackover, true, true);
+        }
+
+        return false;
+    }
+
+    public static boolean handleMouseClick(ItemStack stackover) {
+
+        if (stackover != null) {
+            final int button = Mouse.getEventButton();
+            stackover = stackover.copy();
+
+            if (button == 0) {
+                return GuiCraftingRecipe.openRecipeGui("item", stackover);
+            } else if (button == 1) {
+                return GuiUsageRecipe.openRecipeGui("item", stackover);
+            }
+        }
+
+        return false;
+    }
+
+    private static boolean hideOverlayRecipe() {
+
+        if (LayoutManager.overlayRenderer != null) {
+            LayoutManager.overlayRenderer = null;
+            return true;
+        }
+
+        return false;
+    }
+
+    private static boolean openOverlayRecipe(ItemStack stack, boolean shift) {
+        final GuiContainer gui = NEIClientUtils.getGuiContainer();
+
+        if (gui == null || gui instanceof GuiRecipe) {
+            return false;
+        }
+
+        return GuiCraftingRecipe.openRecipeGui("item", true, shift, stack);
+    }
+
+    private static boolean saveRecipeInBookmark(ItemStack stack, boolean saveIngredients, boolean saveStackSize) {
+
+        if (stack != null) {
+            final GuiContainer gui = NEIClientUtils.getGuiContainer();
+            List<PositionedStack> ingredients = null;
+            String handlerName = "";
+
+            if (gui instanceof GuiRecipe) {
+                ingredients = ((GuiRecipe<?>) gui).getFocusedRecipeIngredients();
+                handlerName = ((GuiRecipe<?>) gui).getHandlerName();
+            }
+
+            ItemPanels.bookmarkPanel.addOrRemoveItem(stack, handlerName, ingredients, saveIngredients, saveStackSize);
+            return true;
+        }
+
+        return false;
+    }
+}

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

@@ -238,9 +238,9 @@ public class NEITransformer implements IClassTransformer {
             @Override
             public void transform(MethodNode mv) {
                 ASMHelper.logger.debug("NEI: Injecting mouseUp call");
-                ASMBlock gotoBlock = asmblocks.get("n_mouseUpGoto");
-                ASMBlock needleBlock = asmblocks.get("n_mouseUp");
-                ASMBlock injectionBlock = asmblocks.get("mouseUp");
+                ASMBlock gotoBlock = asmblocks.get("n_mouseUpGoto").copy();
+                ASMBlock needleBlock = asmblocks.get("n_mouseUp").copy();
+                ASMBlock injectionBlock = asmblocks.get("mouseUp").copy();
 
                 gotoBlock.mergeLabels(injectionBlock);
                 findOnce(mv.instructions, gotoBlock.list).replace(gotoBlock.list.list);

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

@@ -163,6 +163,7 @@ public class GuiPanelSettings extends GuiScreenWidget {
             final int rows = (h - (PANEL_SIZE + 2) * 2) / ItemsGrid.SLOT_SIZE;
             final int paddingLeft = (w % ItemsGrid.SLOT_SIZE) / 2;
             final ArrayList<ItemStack> items = ItemPanels.itemPanel.getItems();
+            if (items.isEmpty()) return;
 
             for (int r = 0; r < rows; r++) {
                 for (int c = 0; c < columns; c++) {

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

@@ -3,6 +3,7 @@ package codechicken.nei.drawable;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.client.gui.GuiScreen;
+import org.lwjgl.opengl.GL11;
 
 /*
 * Taken from Mantle 1.12-1.3.3.49 under the MIT License
@@ -70,6 +71,7 @@ public class GuiElementDuex {
      */
     public int draw(int xPos, int yPos) {
         // drawModalRectWithCustomSizedTexture
+        GL11.glColor4f(1, 1, 1, 1);
         GuiScreen.func_146110_a(xPos, yPos, x, y, w, h, texW, texH);
         return w;
     }

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

@@ -9,8 +9,6 @@ import codechicken.lib.gui.GuiDraw;
 import codechicken.nei.NEIClientUtils;
 import codechicken.nei.recipe.StackInfo;
 import java.awt.Point;
-import java.io.PrintWriter;
-import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
@@ -270,14 +268,7 @@ public class GuiContainerManager {
             if (!checkMatrixStack()) throw new IllegalStateException("Modelview matrix stack too deep");
             if (Tessellator.instance.isDrawing) throw new IllegalStateException("Still drawing");
         } catch (Exception e) {
-            StringWriter sw = new StringWriter();
-            e.printStackTrace(new PrintWriter(sw));
-            String stackTrace = itemstack + sw.toString();
-            if (!stackTraces.contains(stackTrace)) {
-                System.err.println("Error while rendering: " + itemstack);
-                e.printStackTrace();
-                stackTraces.add(stackTrace);
-            }
+            NEIClientUtils.reportErrorBuffered(e, stackTraces, itemstack);
 
             restoreMatrixStack();
             if (Tessellator.instance.isDrawing) Tessellator.instance.draw();
@@ -579,17 +570,28 @@ public class GuiContainerManager {
     public void drawSlotItem(Slot slot, ItemStack stack, int x, int y, String quantity) {
         // for lighting correction
         boolean glRescale = GL11.glGetBoolean(GL12.GL_RESCALE_NORMAL);
+        float zLevel = drawItems.zLevel += 100F;
 
-        if (window instanceof IGuiSlotDraw) {
-            ((IGuiSlotDraw) window).drawSlotItem(slot, stack, x, y, quantity);
-        } else {
+        try {
+            if (window instanceof IGuiSlotDraw) {
+                ((IGuiSlotDraw) window).drawSlotItem(slot, stack, x, y, quantity);
+            } else {
 
-            if (quantity == null) {
-                quantity = stack != null && stack.stackSize > 1 ? String.valueOf(stack.stackSize) : "";
+                if (quantity == null) {
+                    quantity = stack != null && stack.stackSize > 1 ? String.valueOf(stack.stackSize) : "";
+                }
+
+                drawItems.renderItemAndEffectIntoGUI(fontRenderer, renderEngine, stack, x, y);
+                drawItems.renderItemOverlayIntoGUI(fontRenderer, renderEngine, stack, x, y, quantity);
             }
+        } catch (Exception e) {
+            NEIClientUtils.reportErrorBuffered(e, stackTraces, stack);
 
-            drawItems.renderItemAndEffectIntoGUI(fontRenderer, renderEngine, stack, x, y);
-            drawItems.renderItemOverlayIntoGUI(fontRenderer, renderEngine, stack, x, y, quantity);
+            restoreMatrixStack();
+            if (Tessellator.instance.isDrawing) Tessellator.instance.draw();
+
+            drawItems.zLevel = zLevel;
+            drawItems.renderItemIntoGUI(fontRenderer, renderEngine, new ItemStack(Blocks.fire), x, y);
         }
 
         if (glRescale) {
@@ -597,6 +599,7 @@ public class GuiContainerManager {
         } else {
             GL11.glDisable(GL12.GL_RESCALE_NORMAL);
         }
+        drawItems.zLevel = zLevel - 100;
     }
 
     /**

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

@@ -140,6 +140,7 @@ public abstract class GuiRecipeTab extends Widget {
             tooltip.add("");
             tooltip.add("HandlerName: " + handlerName);
             tooltip.add("HandlerID: " + handlerID);
+            tooltip.add("HandlerOrder: " + NEIClientConfig.getHandlerOrder(handler));
         }
     }
 

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

@@ -1,12 +1,9 @@
 package codechicken.nei.recipe;
 
 import codechicken.nei.ItemPanels;
-import codechicken.nei.LayoutManager;
-import codechicken.nei.NEIClientConfig;
-import codechicken.nei.PositionedStack;
+import codechicken.nei.api.ShortcutInputHandler;
 import codechicken.nei.guihook.GuiContainerManager;
 import codechicken.nei.guihook.IContainerInputHandler;
-import java.util.List;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.item.ItemStack;
 
@@ -14,52 +11,7 @@ public class RecipeItemInputHandler implements IContainerInputHandler {
 
     @Override
     public boolean lastKeyTyped(GuiContainer gui, char keyChar, int keyCode) {
-
-        if (NEIClientConfig.isKeyHashDown("gui.overlay_hide")) {
-            return hideOverlayRecipe();
-        }
-
-        ItemStack stackover = GuiContainerManager.getStackMouseOver(gui);
-
-        if (stackover == null) {
-            return false;
-        }
-
-        stackover = stackover.copy();
-
-        if (NEIClientConfig.isKeyHashDown("gui.overlay")) {
-            return openOverlayRecipe(gui, stackover, false);
-        }
-
-        if (NEIClientConfig.isKeyHashDown("gui.overlay_use")) {
-            return openOverlayRecipe(gui, stackover, true);
-        }
-
-        if (NEIClientConfig.isKeyHashDown("gui.recipe")) {
-            return GuiCraftingRecipe.openRecipeGui("item", stackover);
-        }
-
-        if (NEIClientConfig.isKeyHashDown("gui.usage")) {
-            return GuiUsageRecipe.openRecipeGui("item", stackover);
-        }
-
-        if (NEIClientConfig.isKeyHashDown("gui.bookmark")) {
-            return saveRecipeInBookmark(gui, stackover, false, false);
-        }
-
-        if (NEIClientConfig.isKeyHashDown("gui.bookmark_recipe")) {
-            return saveRecipeInBookmark(gui, stackover, true, false);
-        }
-
-        if (NEIClientConfig.isKeyHashDown("gui.bookmark_count")) {
-            return saveRecipeInBookmark(gui, stackover, false, true);
-        }
-
-        if (NEIClientConfig.isKeyHashDown("gui.bookmark_recipe_count")) {
-            return saveRecipeInBookmark(gui, stackover, true, true);
-        }
-
-        return false;
+        return ShortcutInputHandler.handleKeyEvent(GuiContainerManager.getStackMouseOver(gui));
     }
 
     @Override
@@ -70,53 +22,7 @@ public class RecipeItemInputHandler implements IContainerInputHandler {
 
         ItemStack stackover = GuiContainerManager.getStackMouseOver(gui);
 
-        if (stackover != null) {
-            if (button == 0) {
-                return GuiCraftingRecipe.openRecipeGui("item", stackover.copy());
-            } else if (button == 1) {
-                return GuiUsageRecipe.openRecipeGui("item", stackover.copy());
-            }
-        }
-
-        return false;
-    }
-
-    private boolean hideOverlayRecipe() {
-
-        if (LayoutManager.overlayRenderer != null) {
-            LayoutManager.overlayRenderer = null;
-            return true;
-        }
-
-        return false;
-    }
-
-    private boolean openOverlayRecipe(GuiContainer gui, ItemStack stack, boolean shift) {
-
-        if (gui instanceof GuiRecipe) {
-            return false;
-        }
-
-        return GuiCraftingRecipe.openRecipeGui("item", true, shift, stack);
-    }
-
-    private boolean saveRecipeInBookmark(
-            GuiContainer gui, ItemStack stack, boolean saveIngredients, boolean saveStackSize) {
-
-        if (stack != null) {
-            List<PositionedStack> ingredients = null;
-            String handlerName = "";
-
-            if (gui instanceof GuiRecipe) {
-                ingredients = ((GuiRecipe<?>) gui).getFocusedRecipeIngredients();
-                handlerName = ((GuiRecipe<?>) gui).getHandlerName();
-            }
-
-            ItemPanels.bookmarkPanel.addOrRemoveItem(stack, handlerName, ingredients, saveIngredients, saveStackSize);
-            return true;
-        }
-
-        return false;
+        return ShortcutInputHandler.handleMouseClick(stackover);
     }
 
     @Override

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

@@ -0,0 +1,69 @@
+package codechicken.nei.util;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * Backported from JustEnoughItems/Core/src/main/java/mezz/jei/core/util/TextHistory.java
+ */
+public class TextHistory {
+    private static final int MAX_HISTORY = 100;
+
+    public enum Direction {
+        NEXT,
+        PREVIOUS
+    }
+
+    private final List<String> history = new ArrayList<>();
+
+    public boolean add(String currentText) {
+        if (currentText.length() > 0) {
+            history.remove(currentText);
+            history.add(currentText);
+            if (history.size() > MAX_HISTORY) {
+                history.remove(0);
+            }
+            return true;
+        }
+        return false;
+    }
+
+    public Optional<String> get(Direction direction, String currentText) {
+        if (direction == direction.NEXT) {
+            return getNext(currentText);
+        } else {
+            return getPrevious(currentText);
+        }
+    }
+
+    public Optional<String> getPrevious(String currentText) {
+        int historyIndex = history.indexOf(currentText);
+        if (historyIndex < 0) {
+            if (add(currentText)) {
+                historyIndex = history.size() - 1;
+            } else {
+                historyIndex = history.size();
+            }
+        }
+        if (historyIndex <= 0) {
+            return Optional.empty();
+        }
+        String value = history.get(historyIndex - 1);
+        return Optional.of(value);
+    }
+
+    public Optional<String> getNext(String currentText) {
+        int historyIndex = history.indexOf(currentText);
+        if (historyIndex < 0) {
+            return Optional.empty();
+        }
+        final String historyString;
+        if (historyIndex + 1 < history.size()) {
+            historyString = history.get(historyIndex + 1);
+        } else {
+            historyString = "";
+        }
+        return Optional.of(historyString);
+    }
+}

src/main/resources/assets/nei/csv/catalysts.csv

@@ -467,7 +467,15 @@ exnihilo.compatibility.nei.RecipeHandlerSieve,exnihilo:sifting_table:2,,exnihilo
 exnihilo.compatibility.nei.RecipeHandlerSieve,exnihilo:sifting_table:3,,exnihilo,TRUE,,,,,,
 exnihilo.compatibility.nei.RecipeHandlerSieve,exnihilo:sifting_table:4,,exnihilo,TRUE,,,,,,
 exnihilo.compatibility.nei.RecipeHandlerSieve,exnihilo:sifting_table:5,,exnihilo,TRUE,,,,,,
+crafting,gregtech_addon:machine:16,,gregtech_addon,TRUE,,,,,,
+crafting,gregtech_addon:machine:112,,gregtech_addon,TRUE,,,,,,
+crafting,gregtech_addon:machine:128,,gregtech_addon,TRUE,,,,,,
+smelting,gregtech_addon:machine:131,,gregtech_addon,TRUE,,,,,,
+smelting,gregtech_addon:machine:138,,gregtech_addon,TRUE,,,,,,
+smelting,gregtech_addon:machine:54,,gregtech_addon,TRUE,,,,,,
+smelting,gregtech_addon:machine:63,,gregtech_addon,TRUE,,,,,,
 gregtech.Alloy,gregtech_addon:machine:56,,gregtech_addon,TRUE,,,,,,
+gregtechmod.integration.nei.handlers.AlloySmelterRecipeHandler,gregtech_addon:machine:132,,gregtech_addon,TRUE,,,,,,
 gregtech.Assembler,gregtech_addon:machine:60,,gregtech_addon,TRUE,,,,,,
 gregtech.Bender,gregtech_addon:machine:59,,gregtech_addon,TRUE,,,,,,
 gregtech.Blast,gregtech_addon:machine:29,,gregtech_addon,TRUE,,,,,,
@@ -494,6 +502,13 @@ gregtech.Lathe,gregtech_addon:machine:111,,gregtech_addon,TRUE,,,,,,
 gregtech.Sawmill,gregtech_addon:machine:32,,gregtech_addon,TRUE,,,,,,
 gregtech.VacuumFreezer,gregtech_addon:machine:38,,gregtech_addon,TRUE,,,,,,
 gregtech.Wiremill,gregtech_addon:machine:55,,gregtech_addon,TRUE,,,,,,
+ic2.neiIntegration.core.recipehandler.MaceratorRecipeHandler,gregtech_addon:machine:130,,gregtech_addon,TRUE,,,,,,
+ic2.neiIntegration.core.recipehandler.MaceratorRecipeHandler,gregtech_addon:machine:50,,gregtech_addon,TRUE,,,,,,
+ic2.neiIntegration.core.recipehandler.MaceratorRecipeHandler,gregtech_addon:machine:64,,gregtech_addon,TRUE,,,,,,
+ic2.neiIntegration.core.recipehandler.ExtractorRecipeHandler,gregtech_addon:machine:51,,gregtech_addon,TRUE,,,,,,
+ic2.neiIntegration.core.recipehandler.ExtractorRecipeHandler,gregtech_addon:machine:135,,gregtech_addon,TRUE,,,,,,
+ic2.neiIntegration.core.recipehandler.CompressorRecipeHandler,gregtech_addon:machine:52,,gregtech_addon,TRUE,,,,,,
+ic2.neiIntegration.core.recipehandler.CompressorRecipeHandler,gregtech_addon:machine:134,,gregtech_addon,TRUE,,,,,,
 wanion.biggercraftingtables.nei.BigShapedRecipeHandler,biggercraftingtables:BiggerCraftingTables,,biggercraftingtables,TRUE,,,,,,this and below are not tested
 wanion.biggercraftingtables.nei.BigShapedRecipeHandler,biggercraftingtables:AutoBiggerCraftingTables,,biggercraftingtables,TRUE,,,,,,
 wanion.biggercraftingtables.nei.BigShapelessRecipeHandler,biggercraftingtables:BiggerCraftingTables,,biggercraftingtables,TRUE,,,,,,
@@ -527,6 +542,10 @@ nc.crafting.nei.CoolerRecipeHandler,NuclearCraft:coolerIdle,,NuclearCraft,TRUE,,
 nc.crafting.nei.HeliumExtractorRecipeHandler,NuclearCraft:heliumExtractorIdle,,NuclearCraft,TRUE,,,,,,
 nc.crafting.nei.RecyclerRecipeHandler,NuclearCraft:recyclerIdle,,NuclearCraft,TRUE,,,,,,
 nc.crafting.nei.NuclearWorkspaceRecipeHandler,NuclearCraft:nuclearWorkspace,,NuclearCraft,TRUE,,,,,,
+nc.crafting.nei.FissionRecipeHandler,NuclearCraft:fissionReactorGraphiteIdle,,NuclearCraft,TRUE,,,,,,
+nc.crafting.nei.FissionSteamRecipeHandler,NuclearCraft:fissionReactorSteamIdle,,NuclearCraft,TRUE,,,,,,
+nc.crafting.nei.FusionRecipeHandler,NuclearCraft:fusionReactor,,NuclearCraft,TRUE,,,,,,
+nc.crafting.nei.FusionSteamRecipeHandler,NuclearCraft:fusionReactorSteam,,NuclearCraft,TRUE,,,,,,
 ganymedes01.etfuturum.NEI_EtFuturum_Config$NEI_Recipes_Smoker,etfuturum:smoker,,etfuturum,TRUE,,,,,,not working well
 ganymedes01.etfuturum.NEI_EtFuturum_Config$NEI_Recipes_BlastFurnace,etfuturum:blast_furnace,,etfuturum,TRUE,,,,,,not working well
 connor135246.campfirebackport.client.compat.nei.NEICampfireRecipeHandler,campfirebackport:campfire,,campfirebackport,TRUE,,,,,,
@@ -1316,4 +1335,9 @@ crafting,BiblioCraft:BiblioWorkbench:4,,BiblioCraft,TRUE,,,,,,
 crafting,BiblioCraft:BiblioWorkbench:5,,BiblioCraft,TRUE,,,,,,
 crafting,BiblioCraft:BiblioWorkbench:6,,BiblioCraft,TRUE,,,,,,
 crafting,ComputerCraft:CC-TurtleExpanded,{leftUpgrade:2},ComputerCraft,TRUE,,,,,,
-crafting,ComputerCraft:CC-TurtleAdvanced,{leftUpgrade:2},ComputerCraft,TRUE,,,,,,
+crafting,ComputerCraft:CC-TurtleAdvanced,{leftUpgrade:2},ComputerCraft,TRUE,,,,,,
+tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerHarvester,MineFactoryReloaded:machine.0:2,,MineFactoryReloaded,TRUE,,,,,,
+tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerSewer,MineFactoryReloaded:machine.0:10,,MineFactoryReloaded,TRUE,,,,,,
+tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerGrinder,MineFactoryReloaded:machine.0:13,,MineFactoryReloaded,TRUE,,,,,,
+tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerBioReactor,MineFactoryReloaded:machine.1:10,,MineFactoryReloaded,TRUE,,,,,,
+tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerSlaughterhouse,MineFactoryReloaded:machine.1:13,,MineFactoryReloaded,TRUE,,,,,,

src/main/resources/assets/nei/csv/handlers.csv

@@ -491,6 +491,11 @@ nc.crafting.nei.CoolerRecipeHandler,NuclearCraft,NuclearCraft:coolerIdle,,Nuclea
 nc.crafting.nei.HeliumExtractorRecipeHandler,NuclearCraft,NuclearCraft:heliumExtractorIdle,,NuclearCraft,TRUE,,,65,166,5,,,,,,
 nc.crafting.nei.RecyclerRecipeHandler,NuclearCraft,NuclearCraft:recyclerIdle,,NuclearCraft,TRUE,,,65,166,5,,,,,,
 nc.crafting.nei.NuclearWorkspaceRecipeHandler,NuclearCraft,NuclearCraft:nuclearWorkspace,,NuclearCraft,TRUE,,,130,,2,,,,,,
+nc.crafting.nei.InfoUsageHandler,NuclearCraft,NuclearCraft:fuel,,NuclearCraft,TRUE,,,,,,,,,,,
+nc.crafting.nei.FissionRecipeHandler,NuclearCraft,NuclearCraft:fissionReactorGraphiteIdle,,NuclearCraft,TRUE,,,,,,,,,,,
+nc.crafting.nei.FissionSteamRecipeHandler,NuclearCraft,NuclearCraft:fissionReactorSteamIdle,,NuclearCraft,TRUE,,,,,,,,,,,
+nc.crafting.nei.FusionRecipeHandler,NuclearCraft,NuclearCraft:fusionReactor,,NuclearCraft,TRUE,,,,,,,,,,,
+nc.crafting.nei.FusionSteamRecipeHandler,NuclearCraft,NuclearCraft:fusionReactorSteam,,NuclearCraft,TRUE,,,,,,,,,,,
 ganymedes01.etfuturum.NEI_EtFuturum_Config$NEI_Recipes_Smoker,EtFuturum Requiem,etfuturum:lit_smoker,,etfuturum,TRUE,,,65,166,5,,,,,,
 ganymedes01.etfuturum.NEI_EtFuturum_Config$NEI_Recipes_BlastFurnace,EtFuturum Requiem,etfuturum:lit_blast_furnace,,etfuturum,TRUE,,,65,166,5,,,,,,
 connor135246.campfirebackport.client.compat.nei.NEICampfireRecipeHandler,Campfire Backport,campfirebackport:campfire,,campfirebackport,TRUE,,,65,166,5,,,,,,
@@ -500,4 +505,9 @@ net.blay09.mods.excompressum.compat.nei.RecipeHandlerBarrelProcess,Ex Compressum
 net.blay09.mods.excompressum.compat.nei.RecipeHandlerComposting,Ex Compressum,exnihilo:barrel,,excompressum,TRUE,,,130,166,5,,,,,,
 net.blay09.mods.excompressum.compat.nei.RecipeHandlerCompressedHammer,Ex Compressum,excompressum:compressedHammerIron,,excompressum,TRUE,,,58,166,10,,,,,,
 com.InfinityRaider.AgriCraft.compatibility.NEI.NEICropMutationHandler,AgriCraft,AgriCraft:cropsItem,,AgriCraft,TRUE,,,85,166,5,,,,,,
-com.InfinityRaider.AgriCraft.compatibility.NEI.NEICropProductHandler,AgriCraft,minecraft:farmland,,AgriCraft,TRUE,,,85,166,5,,,,,,
+com.InfinityRaider.AgriCraft.compatibility.NEI.NEICropProductHandler,AgriCraft,minecraft:farmland,,AgriCraft,TRUE,,,85,166,5,,,,,,
+tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerHarvester,MineFactory Reloaded,MineFactoryReloaded:machine.0:2,,MineFactoryReloaded,TRUE,,,,,,,,,,,
+tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerSewer,MineFactory Reloaded,MineFactoryReloaded:machine.0:10,,MineFactoryReloaded,TRUE,,,,,,,,,,,
+tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerGrinder,MineFactory Reloaded,MineFactoryReloaded:machine.0:13,,MineFactoryReloaded,TRUE,,,,,,,,,,,
+tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerBioReactor,MineFactory Reloaded,MineFactoryReloaded:machine.1:10,,MineFactoryReloaded,TRUE,,,,,,,,,,,
+tonius.neiintegration.mods.minefactoryreloaded.RecipeHandlerSlaughterhouse,MineFactory Reloaded,MineFactoryReloaded:machine.1:13,,MineFactoryReloaded,TRUE,,,,,,,,,,,

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

@@ -11,6 +11,7 @@ nei.bookmark.toggle.tip=Toggle visibility of the Bookmark Panel
 nei.bookmark.viewmode.toggle.tip=Toggle Bookmark View Mode
 
 nei.itempanel.quantity.default=One stack
+nei.itempanel.loading=Loading Item List...
 
 nei.enchant=Enchant
 nei.enchant.level=Level
@@ -70,6 +71,7 @@ nei.chat.rain.off=Rain turned off
 nei.chat.time=Day %d. %d:00
 nei.chat.give.noitem=No such item.
 nei.chat.recipe.error=There was error during loading recipe. Please check log for details.
+nei.chat.render.error=There was error during rendering item. Please check log for details.
 
 nei.options=NEI Options
 nei.options.back=Back
@@ -104,6 +106,8 @@ nei.options.keys.gui.hide_bookmarks=Toggle Bookmark Panel Visibility
 nei.options.keys.gui.overlay=Overlay Recipe
 nei.options.keys.gui.overlay_hide=Hide Overlay Recipe
 nei.options.keys.gui.overlay_use=Use Overlay Recipe
+nei.options.keys.gui.getprevioussearch=Previous Search
+nei.options.keys.gui.getnextsearch=Next Search
 nei.options.keys.world=World
 nei.options.keys.world.chunkoverlay=Chunk Boundary Overlay
 nei.options.keys.world.moboverlay=Mob Spawn Overlay
@@ -142,6 +146,9 @@ nei.options.inventory.saveCurrentRecipeInBookmarksEnabled.false=Disabled
 nei.options.inventory.useNBTInBookmarks=Use NBT in Bookmarks
 nei.options.inventory.useNBTInBookmarks.true=Yes
 nei.options.inventory.useNBTInBookmarks.false=No
+nei.options.inventory.bookmarksAnimationEnabled=REI Style Animation in Bookmarks
+nei.options.inventory.bookmarksAnimationEnabled.true=Yes
+nei.options.inventory.bookmarksAnimationEnabled.false=No
 nei.options.inventory.showRecipeMarker=Show Recipe Marker
 nei.options.inventory.showRecipeMarker.true=Yes
 nei.options.inventory.showRecipeMarker.false=No

src/main/resources/dependencies.info

@@ -1,7 +1,7 @@
 {
-        "repo": "https://github.com/GTNewHorizons/CodeChickenLib/releases/download/1.1.5.3/",
-        "file": "CodeChickenLib-1.7.10-1.1.5.3.jar",
-        "dev": "CodeChickenLib-1.7.10-1.1.5.3-dev.jar",
+        "repo": "https://github.com/GTNewHorizons/CodeChickenLib/releases/download/1.1.5.5/",
+        "file": "CodeChickenLib-1.7.10-1.1.5.5.jar",
+        "dev": "CodeChickenLib-1.7.10-1.1.5.5-dev.jar",
         "class": "codechicken.lib.asm.ASMHelper",
         "coreLib": true
 }