update bs

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

@@ -1,60 +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 17
-        - Java 21
-        - java 25
-        - java 26
-        - 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/workflows/build-and-test.yml

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

.github/workflows/optimize-images.yml

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

.gitignore

@@ -28,7 +28,6 @@ whitelist.json
 *.iws
 src/main/resources/mixins.*([!.]).json
 *.bat
-*.sh
 *.DS_Store
 !gradlew.bat
 .factorypath
@@ -36,5 +35,4 @@ addon.local.gradle
 addon.local.gradle.kts
 addon.late.local.gradle
 addon.late.local.gradle.kts
-layout.json
-
+layout.json

README.md

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

README_uk.md

@@ -1,93 +0,0 @@
-# NotEnoughItems Unofficial — від команди GTNH
-
-🌐 **Мови:** [English](README.md) | [Українська](README_uk.md)
-
-Продовження модифікації NotEnoughItems для 1.7.10 від розробників збірки GregTech: New Horizons із функціями, натхненними та/або бекпортованими з JustEnoughItems.
-
-Ми протестували цю версію з усіма модами, що входять до GTNH, а також із обмеженим набором інших модів (як-от моди від Reika). Було докладено всіх зусиль для збереження зворотної сумісності, однак основну увагу приділено модам зі збірки GTNH.
-
-Якщо у вас виникли проблеми з NEI за межами збірки GTNH, ви можете повідомити про них у [GitHub-репозиторії GTNH NEI](https://github.com/GTNewHorizons/NotEnoughItems).
-
-## Нові можливості:
-
-* Швидкодія
-  - Використовує паралельний потік для пошуку у списку предметів на кількох ядрах процесора, що в середньому пришвидшує пошук у 2–6 разів.
-  - Завантажує обробники рецептів паралельно.
-* Текстове поле пошуку з більшістю очікуваних функцій — переміщення курсора вперед/назад, виділення тексту тощо.
-* Закладки! Перебуваєте у процесі крафту? Додайте потрібний рецепт до закладок за допомогою клавіші «A» або налаштуйте власну клавішу.
-* Перемикання видимості панелі закладок. Гаряча клавіша за замовчуванням — `B`. Меню «Підгрупи предметів» доступне лише тоді, коли панель закладок прихована.
-* Кнопки утиліт та читів вирівнюються в ряд та переносяться на новий рядок залежно від розміру графічного інтерфейсу.
-* Список предметів (`ItemList`) більше не генерується повторно з `ItemRegistry` під час кожного відкриття інвентарю.
-* Вкладки у стилі JEI (або творчого режиму) [За бажанням]. Примітка: вимагає явної підтримки для рендерингу `ItemStack`, інакше використовуються перші дві літери назви обробника.
-* Вкладки/обробники завантажуються з конфігураційного CSV-файлу в JAR-архіві (або за бажанням з папки `config`). Для авторів модів доступні IMC-повідомлення з NBT-даними `registerHandlerInfo` та `removeHandlerInfo` для додавання інформації про обробники з використанням тих самих полів, що й у CSV-файлі.
-* Пошук за допомогою синтаксису `@[Мод]->[предмет]`. Наприклад: `@Mod.gregtech->iron ingot`.
-* Перемикання між режимами рецептів, утиліт та читів за допомогою CTRL + ЛКМ по іконці гайкового ключа.
-* Інструменти/предмети з GT5u та інструменти з GT6 тепер мають коректно працювати з функцією накладення та перенесення рецепта.
-
-### Обробник інформаційних сторінок
-Хочете додати інформацію про блок чи предмет, не створюючи для нього величезну підказку? Ви можете додати інформацію про будь-який блок чи предмет, зареєструвавши його в обробнику інформації.
-
-Інформаційні сторінки відображаються під час пошуку рецептів або способів використання відповідного предмета. Усі відповідні предмети будуть циклічно змінюватися у верхній частині інформаційної сторінки.
-
-Ваш мод може викликати:
-```java
-FMLInterModComms.sendMessage("NotEnoughItems", "addItemInfo", nbt);
-```
-Де `nbt` — це `NBTTagCompound`, відформатований, як описано нижче.
-
-| Тег              | Тип                            | Опис                                                                                                                                                                                                                                                                 |
-|------------------|--------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `filter`         | `String`                       | Текстовий фільтр для визначення предметів, для яких має відображатися ця інформаційна сторінка.<br/>Можна використовувати `modname:itemname`, метадані, теги OreDictionary та регулярні вирази. Повний формат можна переглянути у `config/NEI/collapsibleitems.cfg`. |
-| `page` / `pages` | `String` / `String NBTTagList` | Безпосередньо текст для відображення. Різницю між одно- та багатосторінковими повідомленнями див. нижче.<br/>Обидва формати підтримують автоматичний переклад наданих рядків.                                                                                        |
-
-#### Односторінковий формат
-
-Використовуйте текстовий тег `"page"`, якщо хочете додати лише одну сторінку інформації:
-```java
-NBTTagCompound tag = new NBTTagCompound();
-tag.setString("filter", "minecraft:log 3");
-tag.setString("page", "Exotic wood found in tropical climates.");
-
-FMLInterModComms.sendMessage("NotEnoughItems", "addItemInfo", tag);
-```
-
-#### Багатосторінковий формат
-
-Використовуйте тег `"pages"` як `NBTTagList` із рядків, якщо потрібно додати понад одну сторінку:
-```java
-NBTTagCompound tag = new NBTTagCompound();
-tag.setString("filter", "minecraft:diamond_sword");
-
-NBTTagList pages = new NBTTagList();
-pages.appendTag(new NBTTagString("A powerful melee weapon."));
-pages.appendTag(new NBTTagString("Can be enchanted for extra effects."));
-
-tag.setTag("pages", pages);
-
-FMLInterModComms.sendMessage("NotEnoughItems", "addItemInfo", tag);
-```
-* Кожен елемент списку — це одна сторінка.
-* Сторінки з’являтимуться в NEI з кнопками для їх гортання.
-
-#### Відповідність предметів
-
-Усі предмети, що відповідають фільтру `filter`, відображатимуть вашу інформаційну сторінку. Повний формат фільтра див. у `config/NEI/collapsibleitems.cfg`.
-
-#### Файл конфігурації інформації про предмети
-
-Якщо ви творець збірки модів і хочете створити власні інформаційні сторінки для предметів, їх можна легко додати у файлі `config/NEI/informationpages.cfg`, де також наведено ще кілька прикладів.
-
-## Інші примітки:
-
-* Вилучено стиль TMI
-* Вилучено збереження/завантаження стану інвентарю
-
-## Ліцензія
-
-Авторські права на модифікації від команди GTNH (c) 2019-2024 належать mitchej123 та команді GTNH.
-
-Поширюється за ліцензією LGPL-3.0 або новішої версії — використовуйте цей код на власний розсуд, але, будь ласка, діліться з розробниками будь-якими внесеними вами змінами.
-
-Окремі частини коду натхненні, запозичені або бекпортовані з [JEI](https://github.com/mezz/JustEnoughItems/tree/1.12) за ліцензією MIT.
-
-Авторські права на оригінальний код (c) 2014-2015 належать mezz; код поширювався за ліцензією MIT.

addon.gradle

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

dependencies.gradle

@@ -1,42 +1,7 @@
 // Add your dependencies here
-configurations.create('gtnhlibEmbed') {
-    canBeConsumed = false
-    canBeResolved = true
-}
 
 dependencies {
-    api('com.github.GTNewHorizons:CodeChickenCore:1.4.22:dev')
-    devOnlyNonPublishable('com.github.GTNewHorizons:GTNHLib:0.11.54:dev')
-
+    api('com.github.GTNewHorizons:CodeChickenLib:1.2.1:dev')
+    api('com.github.GTNewHorizons:CodeChickenCore:1.2.1:dev')
     shadowImplementation('org.apache.commons:commons-csv:1.10.0')
-
-    compileOnly('maven.modrinth:forge-essentials:7.5.1')
-    compileOnly('com.cardinalstar.cubicchunks:CubicChunks1710:v0.1.14-alpha:dev')
-
-    antlr('org.antlr:antlr4:4.13.2')
-    shadowImplementation('org.antlr:antlr4-runtime:4.13.2')
-
-    testImplementation(platform('org.junit:junit-bom:5.13.4'))
-    testImplementation('org.junit.jupiter:junit-jupiter')
-    testImplementation("org.mockito:mockito-core:5.+")
-
-    testRuntimeOnly('org.junit.platform:junit-platform-launcher')
-    testRuntimeOnly("org.lwjgl.lwjgl:lwjgl:2.9.3");
-
-    compileOnly("com.github.GTNewHorizons:GTNHLib:0.11.54") { transitive = false }
-    gtnhlibEmbed("com.github.GTNewHorizons:GTNHLib:0.11.54") { transitive = false }
-}
-
-def embedArchiveOperations = gtnhGradle.archiveOperations
-def gtnhlibEmbedContents = configurations.gtnhlibEmbed.elements.map { files ->
-    files.collect { embedArchiveOperations.zipTree(it.asFile) }
-}
-
-[tasks.jar, tasks.shadowJar].each {
-    it.configure {
-        from(gtnhlibEmbedContents) {
-            include 'com/gtnewhorizon/gtnhlib/color/ColorResource.class'
-            include 'com/gtnewhorizon/gtnhlib/color/ColorResource$*.class'
-        }
-    }
 }

gradle.properties

@@ -1,174 +1,90 @@
-# 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 modern Java syntax support. Valid values:
-# - false: No modern syntax, Java 8 only
-# - jabel: Jabel syntax-only support, compiles to J8 bytecode
-# - jvmDowngrader: Full modern Java via JVM Downgrader (syntax + stdlib APIs)
-# - modern: Native modern Java bytecode, no downgrading
-enableModernJavaSyntax = jabel
-
-# If set, ignores the above setting and compiles with the given toolchain. This may cause unexpected issues,
-# and should *not* be used in most situations. -1 disables this.
-# forceToolchainVersion = -1
-
-# Target JVM version for JVM Downgrader bytecode downgrading.
-# Only used when enableModernJavaSyntax = jvmDowngrader
-# downgradeTargetVersion = 8
-
-# Comma-separated list of Java versions for multi-release jar support (JVM Downgrader only).
-# Classes will be available in META-INF/versions/N/ for each version N in this list.
-# Default: "21,25" (J25+ gets native classes, J21-24 gets partial downgrade, J8-20 gets full downgrade).
-# jvmDowngraderMultiReleaseVersions = 21,25
-
-# Specifies how JVM Downgrader API stubs are provided. Options:
-# - shade: Shade minimized stubs into the jar
-# - gtnhlib: GTNHLib provides stubs at runtime (adds version constraint)
-# - external: Another dependency provides stubs (no constraint, no warning)
-# - (empty): Warning reminding you to configure stubs
-# Note: 'shade' option requires you to verify license compliance, see: https://github.com/unimined/JvmDowngrader/blob/main/LICENSE.md
-# jvmDowngraderStubsProvider =
-
-# Enables injecting missing generics into the decompiled source code for a better coding experience.
-# Turns most publicly visible List, Map, etc. into proper List<E>, Map<K, V> types.
-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.
+# version in @Mod([...], version = VERSION, [...])
+# Leave these properties empty to skip individual token replacements
+# Generate a class with String fields for the mod id, name, version and group name named with the fields below
+generateGradleTokenClass = codechicken.nei.Tags
+gradleTokenModId = 
+gradleTokenModName = 
+gradleTokenVersion = VERSION
+gradleTokenGroupName = 
+# [DEPRECATED]
+# Multiple source files can be defined here by providing a comma-seperated list: Class1.java,Class2.java,Class3.java
+# 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 =
 
 # 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. The package must exist or
-# the build will fail. If you have a package property defined in your mixins.<modid>.json,
-# it must match with this or the build will fail.
+# 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
+# Publishing to CurseForge requires you to set the CURSEFORGE_TOKEN environment variable to one of your CurseForge API tokens.
 
-# If disabled, won't rename the shadowed classes.
-relocateShadowedDependencies = true
+# 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
 
-# Adds CurseMaven, Modrinth, and some more well-known 1.7.10 repositories.
-includeWellKnownRepositories = true
+# 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 id of the other mod.
+curseForgeRelations = requiredDependency:codechickencore-unofficial;requiredDependency:codechickenlib-unofficial
 
-# 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
+# Publishing to modrinth requires you to set the MODRINTH_TOKEN environment variable to your current modrinth API token.
 
-# 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.
+# Leave this empty if you don't want to publish on Modrinth.
+
 modrinthProjectId = notenoughitems-unofficial
 
 # The project's relations on Modrinth. You can use this to refer to other projects on Modrinth.
@@ -176,68 +92,7 @@ modrinthProjectId = notenoughitems-unofficial
 # 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: UniMixins is automatically set as a required dependency if usesMixins = true.
-modrinthRelations = required-project\:codechickencore-unofficial
 
-# Publishing to CurseForge requires you to set the CURSEFORGE_TOKEN environment variable to one of your CurseForge API tokens.
-#
-# 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
+modrinthRelations = required-project:codechickenlib-unofficial;required-project:codechickencore-unofficial
 
-# Comma-separated supported CurseForge environments: client, server (case-insensitive).
-# Use client or server for mods that only support one environment. Defaults to client,server.
-# These tags describe where the mod can run, not whether installation is required on both sides.
-curseForgeEnvironments = client,server
 
-# 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 customize the default working directory used by the runClient* tasks. Relative to the project directory.
-# runClientWorkingDirectory = run/client
-
-# Optional parameter to customize the default working directory used by the runServer* tasks. Relative to the project directory.
-# runServerWorkingDirectory = run/server
-
-# Optional parameter to have the build automatically fail if an illegal version is used.
-# This can be useful if you e.g. only want to allow versions in the form of '1.1.xxx'.
-# The check is ONLY performed if the version is a git tag.
-# 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
-
-# Non-GTNH properties
-org.gradle.configuration-cache = true
-org.gradle.parallel = true

gradle/gradle-daemon-jvm.properties

@@ -1,12 +0,0 @@
-#This file is generated by updateDaemonJvm
-toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/539ea72837c6244075f8ee037babc29e/redirect
-toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/876dbbf00bf4ef6190f7da074cee903a/redirect
-toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/539ea72837c6244075f8ee037babc29e/redirect
-toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/876dbbf00bf4ef6190f7da074cee903a/redirect
-toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/9064f22734b42ac03e85df04b632e167/redirect
-toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/4d0277c49991306ac78048580fe34bcf/redirect
-toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/539ea72837c6244075f8ee037babc29e/redirect
-toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/876dbbf00bf4ef6190f7da074cee903a/redirect
-toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/a9fa3b809e484a1e1ac4308a5dda661a/redirect
-toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/aa99913fa6d767d899ffc96082da01ca/redirect
-toolchainVersion=25

gradle/wrapper/gradle-wrapper.properties

@@ -1,9 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
-retries=0
-retryBackOffMs=500
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015 the original authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,12 +15,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# SPDX-License-Identifier: Apache-2.0
-#
 
 ##############################################################################
 #
-#   gradlew start up script for POSIX generated by Gradle.
+#   Gradle start up script for POSIX generated by Gradle.
 #
 #   Important for running:
 #
@@ -29,7 +27,7 @@
 #       bash, then to run this script, type that shell name before the whole
 #       command line, like:
 #
-#           ksh gradlew
+#           ksh Gradle
 #
 #       Busybox and similar reduced shells will NOT work, because this script
 #       requires all of these POSIX shell features:
@@ -57,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -86,7 +84,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -114,6 +112,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 
 # Determine the Java command to use to start the JVM.
@@ -171,6 +170,7 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -203,14 +203,15 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_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" \
-        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew.bat

@@ -13,18 +13,16 @@
 @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
 @rem ##########################################################################
 @rem
-@rem  gradlew startup script for Windows
+@rem  Gradle startup script for Windows
 @rem
 @rem ##########################################################################
 
-@rem Set local scope for the variables, and ensure extensions are enabled
-setlocal EnableExtensions
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
@@ -45,13 +43,13 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-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.
 
-"%COMSPEC%" /c exit 1
+goto fail
 
 :findJavaFromJavaHome
 set JAVA_HOME=%JAVA_HOME:"=%
@@ -59,24 +57,36 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-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.
 
-"%COMSPEC%" /c exit 1
+goto fail
 
 :execute
 @rem Setup the command line
 
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
-@rem Execute gradlew
-@rem endlocal doesn't take effect until after the line is parsed and variables are expanded
-@rem which allows us to clear the local environment before executing the java command
-endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
-:exitWithErrorLevel
-@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts
-"%COMSPEC%" /c exit %ERRORLEVEL%
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 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%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

repositories.gradle

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

settings.gradle

@@ -6,7 +6,6 @@ pluginManagement {
             name "GTNH Maven"
             url "https://nexus.gtnewhorizons.com/repository/public/"
             mavenContent {
-                includeGroup("com.gtnewhorizons")
                 includeGroupByRegex("com\\.gtnewhorizons\\..+")
             }
         }
@@ -17,10 +16,15 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.34'
+    id 'com.diffplug.blowdryerSetup' version '1.7.1'
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0' // Provides java toolchains
 }
 
-
+blowdryerSetup {
+    repoSubfolder 'gtnhShared'
+    github('GTNewHorizons/ExampleMod1.7.10', 'tag', '0.2.0')
+    //devLocal '.' // Use this when testing config updates locally
+}
 
 rootProject.name = "NotEnoughItems"
 

src/main/antlr/SearchExpressionLexer.g4

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

src/main/antlr/SearchExpressionParser.g4

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

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

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

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

@@ -1,180 +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.GuiTextField;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.client.settings.GameSettings;
-import net.minecraft.util.ChatAllowedCharacters;
-
-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;
-    protected Point pendingMouse;
-    protected GuiTextField textInputHolder;
-
-    public AutoFocusWidget() {
-        GuiContainerManager.addInputHandler(this);
-    }
-
-    public void load(GuiContainer gui) {
-        this.autofocus = LayoutManager.searchField.isVisible() && NEIClientConfig.searchWidgetAutofocus() != 0
-                && isAllowedGuiAutoSearchFocus(gui);
-        this.mouse = null;
-        this.pendingMouse = null;
-
-        if (this.autofocus) {
-            beginTextInput();
-        }
-    }
-
-    protected void beginTextInput() {
-        if (this.textInputHolder == null) {
-            this.textInputHolder = new GuiTextField(Minecraft.getMinecraft().fontRenderer, 0, 0, 0, 0);
-        }
-
-        this.textInputHolder.setFocused(true);
-    }
-
-    protected void endTextInput() {
-        if (this.textInputHolder != null) {
-            this.textInputHolder.setFocused(false);
-        }
-    }
-
-    public void guiTick() {
-        if (!this.autofocus) {
-            return;
-        }
-
-        final Point current = getMousePosition();
-
-        if (this.mouse == null) {
-            if (current.equals(this.pendingMouse)) {
-                this.mouse = current;
-            }
-
-            this.pendingMouse = current;
-        } else if (!this.mouse.equals(current)) {
-            cancel();
-        }
-    }
-
-    protected void cancel() {
-        if (this.autofocus) {
-            this.autofocus = false;
-            endTextInput();
-        }
-    }
-
-    @Override
-    public boolean keyTyped(GuiContainer gui, char keyChar, int keyCode) {
-
-        if (this.autofocus) {
-
-            if (NEIClientConfig.searchWidgetAutofocus() == 2
-                    && GameSettings.isKeyDown(Minecraft.getMinecraft().gameSettings.keyBindInventory)) {
-                cancel();
-                return false;
-            }
-
-            if (keyCode == Keyboard.KEY_RETURN || keyCode == Keyboard.KEY_NUMPADENTER
-                    || keyCode == Keyboard.KEY_ESCAPE) {
-                cancel();
-                return false;
-            }
-
-            if (!ChatAllowedCharacters.isAllowedCharacter(keyChar)) {
-                return false;
-            }
-
-            this.autofocus = false;
-
-            LayoutManager.searchField.setFocus(true);
-            endTextInput();
-
-            final String oldText = LayoutManager.searchField.text();
-            LayoutManager.searchField.handleKeyPress(keyCode, keyChar);
-
-            return !LayoutManager.searchField.text().equals(oldText);
-        }
-
-        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) {
-        cancel();
-        return false;
-    }
-
-    @Override
-    public boolean mouseScrolled(GuiContainer gui, int mousex, int mousey, int scrolled) {
-        cancel();
-        return false;
-    }
-
-    @Override
-    public void onKeyTyped(GuiContainer gui, char keyChar, int keyID) {}
-
-    @Override
-    public void onMouseClicked(GuiContainer gui, int mousex, int mousey, int button) {
-        cancel();
-    }
-
-    @Override
-    public void onMouseDragged(GuiContainer gui, int mousex, int mousey, int button, long heldTime) {
-        cancel();
-    }
-
-    @Override
-    public void onMouseScrolled(GuiContainer gui, int mousex, int mousey, int scrolled) {
-        cancel();
-    }
-
-    @Override
-    public void onMouseUp(GuiContainer gui, int mousex, int mousey, int button) {
-        cancel();
-    }
-
-    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/BookmarkCraftingChain.java

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

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

@@ -15,7 +15,7 @@ public abstract class Button extends Widget {
     }
 
     public int contentWidth() {
-        return getRenderIcon() == null ? getStringWidth(getRenderLabel()) : getRenderIcon().width;
+        return getRenderIcon() == null ? getStringWidth(label) : getRenderIcon().width;
     }
 
     @Override
@@ -57,10 +57,6 @@ public abstract class Button extends Widget {
         return label;
     }
 
-    public int getRenderLabelColor() {
-        return 0;
-    }
-
     public final String label;
     public Image icon;
 

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

@@ -2,67 +2,50 @@ package codechicken.nei;
 
 import java.io.BufferedReader;
 import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.net.MalformedURLException;
 import java.net.URL;
-import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.function.Consumer;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.EntityPlayerSP;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.GuiErrorScreen;
+import net.minecraft.client.gui.GuiMainMenu;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.gui.GuiSelectWorld;
-import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.client.multiplayer.WorldClient;
-import net.minecraft.client.resources.IResource;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.item.EntityItem;
-import net.minecraft.launchwrapper.Launch;
-import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
-import net.minecraftforge.client.event.GuiOpenEvent;
 import net.minecraftforge.client.event.RenderWorldLastEvent;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.world.WorldEvent;
 
-import org.apache.commons.io.FileUtils;
+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.ImmutableList;
 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.GuiInfo;
-import codechicken.nei.api.IConfigureNEI;
 import codechicken.nei.api.ItemInfo;
-import codechicken.nei.bookmark.tree.GuiCraftingTree;
-import codechicken.nei.guihook.GuiContainerManager;
-import codechicken.nei.recipe.GuiCraftingRecipe;
-import codechicken.nei.recipe.GuiUsageRecipe;
-import codechicken.nei.recipe.IRecipeHandler;
-import codechicken.nei.recipe.RecipeHandlerRef;
-import codechicken.nei.recipe.RecipeItemInputHandler;
+import codechicken.nei.recipe.GuiRecipeTab;
 import codechicken.nei.recipe.StackInfo;
-import codechicken.nei.recipe.debug.DebugHandlerWidget;
 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;
@@ -71,25 +54,17 @@ import cpw.mods.fml.relauncher.SideOnly;
 
 public class ClientHandler {
 
+    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 static final String HANDLER_ORDERING = "handlerordering.csv";
-    public static final List<String> DEFAULT_CONFIGS = ImmutableList.of(
-            "serialhandlers.cfg",
-            "heighthackhandlers.cfg",
-            "hiddenhandlers.cfg",
-            "enableautofocus.cfg",
-            "guicraftablesblacklist.cfg",
-            "defaultbookmarkcontainers.cfg",
-            "hiddenitems.cfg",
-            "guidfilters.cfg",
-            "informationpages.cfg",
-            "collapsibleitems.cfg",
-            "recipeidblacklist.cfg",
-            "handlers.csv",
-            "catalysts.csv",
-            HANDLER_ORDERING);
+
+    private ArrayList<EntityItem> SMPmagneticItems = new ArrayList<>();
     private World lastworld;
+    private GuiScreen lastGui;
 
     public void addSMPMagneticItem(int i, World world) {
         WorldClient cworld = (WorldClient) world;
@@ -172,144 +147,91 @@ public class ClientHandler {
 
     public static void preInit() {
         loadSerialHandlers();
-        loadHiddenItems();
         loadHeightHackHandlers();
         loadHiddenHandlers();
-        loadEnableAutoFocus();
-        loadGuiCraftablesBlacklist();
-        loadDefaultBookmarkContainers();
         ItemInfo.preInit();
         StackInfo.loadGuidFilters();
     }
 
-    private static URL getDefaultResource(String resource) {
-        final String folder = resource.substring(resource.lastIndexOf(".") + 1);
-        return ClientHandler.class.getResource("/assets/nei/" + folder + "/" + resource);
-    }
-
-    public static boolean exportDefaultConfig(String resource) {
-        final File file = new File(NEIClientConfig.configDir, resource);
-        if (file.exists() && !NEIClientUtils.backupFile(file)) return false;
-
-        if (HANDLER_ORDERING.equals(resource)) {
-            return writeDefaultHandlerOrdering();
-        }
-
-        final URL url = getDefaultResource(resource);
-        if (url == null) return false;
-
-        try {
-            FileUtils.copyURLToFile(url, file);
-            NEIClientConfig.logger.info("Exported default '{}' to {}", resource, file);
-            return true;
-        } catch (IOException e) {
-            NEIClientConfig.logger.error("Failed to export default '{}' to file {}", resource, file, e);
-            return false;
-        }
-    }
-
-    public static boolean loadSettingsResource(String resource, Consumer<Stream<String>> callback) {
-        final ResourceLocation location = new ResourceLocation("nei", resource);
-
-        try {
-            final IResource res = Minecraft.getMinecraft().getResourceManager().getResource(location);
-
-            try (BufferedReader reader = new BufferedReader(
-                    new InputStreamReader(res.getInputStream(), StandardCharsets.UTF_8))) {
-                NEIClientConfig.logger.info("Loading '{}' from jar {}", resource, location);
-                callback.accept(
-                        IOUtils.readLines(reader).stream()
-                                .map(line -> line.contains("#") ? line.substring(0, line.indexOf('#')) : line)
-                                .map(String::trim).filter(line -> !line.isEmpty()));
-                return true;
-            }
-
-        } catch (Exception io) {
-            NEIClientConfig.logger.error("Failed to load '{}' file {}", resource, location);
-        }
-
-        return false;
-    }
-
-    public static boolean loadSettingsFile(String resource, Consumer<Stream<String>> callback) {
-        final File file = new File(NEIClientConfig.configDir, resource);
-        final boolean fromJar = !file.exists();
-
-        try {
-            final URL url = fromJar ? getDefaultResource(resource) : file.toURI().toURL();
-            if (url == null) return false;
-
-            try (InputStreamReader reader = new InputStreamReader(url.openStream(), StandardCharsets.UTF_8)) {
-                NEIClientConfig.logger.info("Loading '{}' from {}", resource, fromJar ? "JAR" : file);
-                callback.accept(
-                        IOUtils.readLines(reader).stream()
-                                .map(line -> line.contains("#") ? line.substring(0, line.indexOf('#')) : line)
-                                .map(String::trim).filter(line -> !line.isEmpty()));
-                return true;
-            }
-        } catch (IOException e) {
-            NEIClientConfig.logger.error("Failed to load '{}' file {}", resource, file, e);
-        }
-
-        return false;
-    }
-
     public static void loadSerialHandlers() {
-        loadSettingsFile(
-                "serialhandlers.cfg",
-                lines -> NEIClientConfig.serialHandlers = lines.collect(Collectors.toCollection(HashSet::new)));
+        File file = NEIClientConfig.serialHandlersFile;
+        if (!file.exists()) {
+            try (FileWriter writer = new FileWriter(file)) {
+                NEIClientConfig.logger.info("Creating default serial handlers list {}", file);
+                URL defaultSerialHandlersResource = ClientHandler.class
+                        .getResource("/assets/nei/cfg/serialhandlers.cfg");
+                if (defaultSerialHandlersResource != null) {
+                    IOUtils.copy(defaultSerialHandlersResource.openStream(), writer);
+                }
+            } catch (IOException e) {
+                NEIClientConfig.logger.error("Failed to save default serial handlers list to file {}", file, e);
+            }
+        }
+        try (FileReader reader = new FileReader(file)) {
+            NEIClientConfig.logger.info("Loading serial handlers from file {}", file);
+            NEIClientConfig.serialHandlers = IOUtils.readLines(reader).stream().filter((line) -> !line.startsWith("#"))
+                    .collect(Collectors.toCollection(HashSet::new));
+        } catch (IOException e) {
+            NEIClientConfig.logger.error("Failed to load serial handlers from file {}", file, e);
+        }
     }
 
     public static void loadHeightHackHandlers() {
-        loadSettingsFile(
-                "heighthackhandlers.cfg",
-                lines -> NEIClientConfig.heightHackHandlerRegex = lines.map(Pattern::compile)
-                        .collect(Collectors.toCollection(HashSet::new)));
+        File file = NEIClientConfig.heightHackHandlersFile;
+        if (!file.exists()) {
+            try (FileWriter writer = new FileWriter(file)) {
+                NEIClientConfig.logger.info("Creating default height hack handlers list {}", file);
+                URL defaultHeightHackHandlersResource = ClientHandler.class
+                        .getResource("/assets/nei/cfg/heighthackhandlers.cfg");
+                if (defaultHeightHackHandlersResource != null) {
+                    IOUtils.copy(defaultHeightHackHandlersResource.openStream(), writer);
+                }
+            } catch (IOException e) {
+                NEIClientConfig.logger.error("Failed to save default height hack handlers list to file {}", file, e);
+            }
+        }
+
+        try (FileReader reader = new FileReader(file)) {
+            NEIClientConfig.logger.info("Loading height hack handlers from file {}", file);
+            NEIClientConfig.heightHackHandlerRegex = IOUtils.readLines(reader).stream()
+                    .filter((line) -> !line.startsWith("#")).map(Pattern::compile)
+                    .collect(Collectors.toCollection(HashSet::new));
+        } catch (IOException e) {
+            NEIClientConfig.logger.error("Failed to load height hack handlers from file {}", file, e);
+        }
     }
 
     public static void 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.toList()));
-    }
-
-    public static void loadGuiCraftablesBlacklist() {
-        loadSettingsFile(
-                "guicraftablesblacklist.cfg",
-                lines -> ItemCraftablesPanel.guiBlacklist = lines.collect(Collectors.toList()));
-    }
-
-    public static void loadDefaultBookmarkContainers() {
-        loadSettingsFile("defaultbookmarkcontainers.cfg", lines -> {
-            for (String clazz : lines.collect(Collectors.toList())) {
-                try {
-                    API.registerBookmarkContainerHandler(
-                            (Class<? extends GuiContainer>) Class.forName(clazz),
-                            new DefaultBookmarkContainerHandler());
-                } catch (Exception e) {
-                    NEIClientConfig.logger.error("Failed to load class '{}' for defaultbookmarkcontainers.cfg", clazz);
+        File file = NEIClientConfig.hiddenHandlersFile;
+        if (!file.exists()) {
+            try (FileWriter writer = new FileWriter(file)) {
+                NEIClientConfig.logger.info("Creating default hidden handlers list {}", file);
+                URL defaultHeightHackHandlersResource = ClientHandler.class
+                        .getResource("/assets/nei/cfg/hiddenhandlers.cfg");
+                if (defaultHeightHackHandlersResource != null) {
+                    IOUtils.copy(defaultHeightHackHandlersResource.openStream(), writer);
                 }
+            } catch (IOException e) {
+                NEIClientConfig.logger.error("Failed to save default hidden handlers list to file {}", file, e);
             }
-        });
-    }
+        }
 
-    public static void loadHiddenItems() {
-        loadSettingsFile("hiddenitems.cfg", lines -> lines.forEach(API::hideItem));
+        try (FileReader reader = new FileReader(file)) {
+            NEIClientConfig.logger.info("Loading hidden handlers from file {}", file);
+            NEIClientConfig.hiddenHandlers = IOUtils.readLines(reader).stream().filter((line) -> !line.startsWith("#"))
+                    .collect(Collectors.toCollection(HashSet::new));
+        } catch (IOException e) {
+            NEIClientConfig.logger.error("Failed to load hidden handlers from file {}", file, e);
+        }
     }
 
     public static void load() {
         instance = new ClientHandler();
 
+        GuiModListScroll.register("NotEnoughItems");
         PacketCustom.assignHandler(NEICPH.channel, new NEICPH());
         FMLCommonHandler.instance().bus().register(instance);
         MinecraftForge.EVENT_BUS.register(instance);
-        MinecraftForge.EVENT_BUS.register(new GuiCraftingTree.EventHandler());
 
         API.registerHighlightHandler(new DefaultHighlightHandler(), ItemInfo.Layout.HEADER);
         HUDRenderer.load();
@@ -317,80 +239,53 @@ public class ClientHandler {
     }
 
     public static void postInit() {
-        GuiContainerManager.registerReloadResourceListener();
+        loadHandlerOrdering();
     }
 
     public static void loadHandlerOrdering() {
-        loadSettingsFile(
-                HANDLER_ORDERING,
-                lines -> lines.map(line -> line.split(",")).filter(parts -> parts.length == 2).forEach(parts -> {
-                    String handlerId = parts[0];
-                    int ordering = Integer.parseInt(parts[1]);
-                    NEIClientConfig.handlerOrdering.put(handlerId, ordering);
-                }));
-    }
+        File file = NEIClientConfig.handlerOrderingFile;
+        if (!file.exists()) {
+            try (FileWriter writer = new FileWriter(file)) {
+                NEIClientConfig.logger.info("Creating default handler ordering CSV {}", file);
 
-    private static boolean writeDefaultHandlerOrdering() {
-        final File file = new File(NEIClientConfig.configDir, HANDLER_ORDERING);
-        final List<String> lines = Lists.newArrayList(
-                "# 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 keep their own order, 0 for most of them.",
-                "# Negative numbers are fine.");
-        final Map<String, Integer> orders = new TreeMap<>();
-        final List<IRecipeHandler> handlers = new ArrayList<>();
-        handlers.addAll(GuiCraftingRecipe.craftinghandlers);
-        handlers.addAll(GuiCraftingRecipe.serialCraftingHandlers);
-        handlers.addAll(GuiUsageRecipe.usagehandlers);
-        handlers.addAll(GuiUsageRecipe.serialUsageHandlers);
+                List<String> toWrite = Lists.newArrayList(defaultHandlerOrdering);
+                GuiRecipeTab.handlerMap.keySet().stream().sorted()
+                        .forEach(handlerId -> toWrite.add(String.format("%s,0", handlerId)));
 
-        for (IRecipeHandler handler : handlers) {
-            orders.putIfAbsent(
-                    NEIClientConfig.HANDLER_ID_FUNCTION.apply(handler),
-                    NEIClientConfig.getHandlerOrder(handler));
-        }
-
-        orders.forEach((handlerId, order) -> lines.add(handlerId + "," + order));
-
-        try {
-            NEIClientConfig.logger.info("Creating default '{}' {}", HANDLER_ORDERING, file);
-            FileUtils.writeLines(file, StandardCharsets.UTF_8.name(), lines, "\n");
-            return true;
-        } catch (IOException e) {
-            NEIClientConfig.logger.error("Failed to save default '{}' to file {}", HANDLER_ORDERING, file, e);
-            return false;
-        }
-    }
-
-    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);
-                }
+                IOUtils.writeLines(toWrite, "\n", writer);
+            } 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();
         }
     }
 
@@ -414,20 +309,18 @@ public class ClientHandler {
             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;
-            GuiInfo.clearGuiHandlers();
+        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
@@ -446,28 +339,24 @@ public class ClientHandler {
         Minecraft mc = Minecraft.getMinecraft();
         if (event.world == mc.theWorld) {
             NEIClientConfig.unloadWorld();
-            ItemMobSpawner.clearEntityReferences();
-            RecipeItemInputHandler.instance.clearTooltipCache();
-            RecipeHandlerRef.clearCache();
-            ItemPanels.itemPanel.craftablesPanel.clearGuiReferences();
-            DebugHandlerWidget.instance.clearGuiReferences();
-            NEIController.manager = null;
         }
     }
 
     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
                     NEIClientConfig.loadWorld("remote/" + ClientUtils.getServerIP().replace(':', '~'));
+
+                ItemMobSpawner.clearEntityReferences(world);
             }
+
             lastworld = world;
         }
     }
@@ -494,10 +383,9 @@ public class ClientHandler {
             }
         };
 
+        @SuppressWarnings("serial")
         CustomModLoadingErrorDisplayException e = new CustomModLoadingErrorDisplayException() {
 
-            private static final long serialVersionUID = -5593387489666663375L;
-
             @Override
             public void initGui(GuiErrorScreen errorScreen, FontRenderer fontRenderer) {
                 Minecraft.getMinecraft().displayGuiScreen(errorGui);

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

@@ -1,316 +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.concurrent.CopyOnWriteArrayList;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTBase;
-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 String unlocalizedName;
-
-        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 String getDisplayName() {
-            if (this.unlocalizedName != null && !this.unlocalizedName.isEmpty()) {
-                final String translated = StatCollector.translateToLocal(this.unlocalizedName);
-
-                if (!translated.equals(this.unlocalizedName)) {
-                    return translated;
-                }
-            }
-
-            return this.displayName;
-        }
-
-        public boolean matches(ItemStack stack) {
-            return this.filter.matches(stack);
-        }
-    }
-
-    public static class ApiGroup {
-
-        private String unlocalizedName;
-
-        public ApiGroup setName(String unlocalizedName) {
-            this.unlocalizedName = unlocalizedName;
-            return this;
-        }
-    }
-
-    private static final String STATE_KEY = "collapsibleitems";
-
-    protected static File statesFile;
-    protected static final List<GroupItem> groups = new ArrayList<>();
-    protected static final List<Supplier<GroupItem>> apiGroups = new CopyOnWriteArrayList<>();
-    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))));
-
-            for (Supplier<GroupItem> apiGroup : CollapsibleItems.apiGroups) {
-                try {
-                    addGroup(apiGroup.get());
-                } catch (Exception e) {
-                    NEIClientConfig.logger.error("Failed to add API group", e);
-                }
-            }
-        }
-
-        loadStates();
-    }
-
-    public static ApiGroup registerGroup(String filter) {
-        final ApiGroup apiGroup = new ApiGroup();
-
-        CollapsibleItems.apiGroups.add(() -> {
-            GroupItem group = new GroupItem();
-            group.setFilter(filter);
-            group.unlocalizedName = apiGroup.unlocalizedName;
-            return group;
-        });
-
-        return apiGroup;
-    }
-
-    public static ApiGroup registerGroup(Iterable<ItemStack> items) {
-        final ApiGroup apiGroup = new ApiGroup();
-        final ItemStackSet filter = new ItemStackSet();
-
-        for (ItemStack stack : items) {
-            if (stack != null) filter.add(stack.copy());
-        }
-
-        if (filter.isEmpty()) return apiGroup;
-
-        final String key = filter.keys().stream()
-                .map(stack -> Item.itemRegistry.getNameForObject(stack.getItem()) + ":" + stack.getItemDamage())
-                .sorted().collect(Collectors.joining(","));
-        final String guid = UUID.nameUUIDFromBytes(key.getBytes()).toString();
-
-        CollapsibleItems.apiGroups.add(() -> {
-            GroupItem group = new GroupItem();
-            group.setFilter(filter, guid);
-            group.unlocalizedName = apiGroup.unlocalizedName;
-            return group;
-        });
-
-        return apiGroup;
-    }
-
-    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("unlocalizedName") != null) {
-                        group.unlocalizedName = settings.get("unlocalizedName").getAsString();
-                    }
-
-                    if (settings.get("expanded") != null) {
-                        group.expanded = settings.get("expanded").getAsBoolean();
-                    }
-
-                } else {
-                    group.setFilter(itemStr);
-                }
-
-                if (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).getDisplayName();
-        }
-
-        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);
-                final Map<String, NBTBase> list = states.tagMap;
-                final Map<String, GroupItem> mapping = new HashMap<>();
-
-                for (GroupItem group : CollapsibleItems.groups) {
-                    mapping.put(group.guid, group);
-                }
-
-                for (Map.Entry<String, NBTBase> nbtEntry : list.entrySet()) {
-                    if (mapping.containsKey(nbtEntry.getKey())) {
-                        mapping.get(nbtEntry.getKey()).expanded = ((NBTPrimitive) nbtEntry.getValue()).func_150290_f()
-                                == 1;
-                    }
-                }
-            }
-
-        } catch (Exception e) {
-            NEIClientConfig.logger.error("Error loading collapsible items states", e);
-        }
-
-    }
-
-}

src/main/java/codechicken/nei/ColorUtils.java

@@ -1,24 +0,0 @@
-package codechicken.nei;
-
-import com.gtnewhorizon.gtnhlib.color.ColorResource;
-
-public class ColorUtils {
-
-    private static final ColorResource.Factory color = new ColorResource.Factory("nei");
-
-    public static final ColorResource
-    // spotless:off
-        textGray            = color.rgb("textGray",             "0x404040"),
-        textLightGray       = color.rgb("textLightGray",        "0x606060"),
-        recipeTitle         = color.rgb("recipeTitle",          "0xFFFFFF"),
-        recipeTitleHover    = color.rgb("recipeTitleHover",     "0xFFFF55"),
-        subsetWidget        = color.rgb("subsetWidget",         "0xAA00AA"),
-        recipeBadge         = color.rgb("recipeBadge",          "0xFDD835"),
-        buttonLabelNormal   = color.rgb("buttonLabelNormal",    "0xE0E0E0"),
-        buttonLabelHover    = color.rgb("buttonLabelHover",     "0xFFFFA0"),
-        buttonLabelDisabled = color.rgb("buttonLabelDisabled",  "0x601010"),
-        buttonLabelInactive = color.rgb("buttonLabelInactive",  "0xA0A0A0"),
-
-        craftingTreeLine    = color.argb("craftingTreeLine",    "0xFF888888");
-    // spotless:on
-}

src/main/java/codechicken/nei/CompositeTooltipLineHandler.java

@@ -1,101 +0,0 @@
-package codechicken.nei;
-
-import java.awt.Dimension;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-
-import codechicken.lib.gui.GuiDraw;
-import codechicken.lib.gui.GuiDraw.ITooltipLineHandler;
-
-public abstract class CompositeTooltipLineHandler implements ITooltipLineHandler {
-
-    protected static final int SCREEN_MARGIN = 8 * 2 + 10;
-    protected static final int RESERVED_HEIGHT = 40;
-
-    protected final List<ItemsTooltipLineHandler> lines = new ArrayList<>();
-    protected final Dimension size = new Dimension();
-
-    protected boolean created = false;
-    protected int screenHeight = 0;
-
-    protected abstract void createLines();
-
-    protected boolean needsUpdate() {
-        return false;
-    }
-
-    @Override
-    public Dimension getSize() {
-        ensureCreated();
-        return this.size;
-    }
-
-    @Override
-    public void draw(int x, int y) {
-        if (this.size.height == 0) return;
-
-        for (ItemsTooltipLineHandler line : this.lines) {
-            line.draw(x, y);
-            y += line.getSize().height;
-        }
-    }
-
-    protected void ensureCreated() {
-        boolean update = needsUpdate();
-        update = this.screenHeight != (this.screenHeight = GuiDraw.displaySize().height) || update;
-
-        if (this.created && !update) {
-            return;
-        }
-
-        this.created = true;
-        this.lines.clear();
-        this.size.setSize(0, 0);
-
-        createLines();
-        fitToScreen();
-
-        for (ItemsTooltipLineHandler line : this.lines) {
-            this.size.width = Math.max(this.size.width, line.getSize().width);
-            this.size.height += line.getSize().height;
-        }
-    }
-
-    protected void fitToScreen() {
-        if (this.lines.isEmpty()) {
-            return;
-        }
-
-        final List<ItemsTooltipLineHandler> ordered = new ArrayList<>(this.lines);
-        ordered.sort(Comparator.comparingInt(ItemsTooltipLineHandler::getRows));
-
-        int budget = availableHeight() / ItemsTooltipLineHandler.SLOT_SIZE;
-        int rest = ordered.size();
-
-        for (ItemsTooltipLineHandler line : ordered) {
-            final int fair = Math.max(1, budget / rest);
-
-            if (line.getRows() > fair) {
-                line.setMaxRows(fair);
-            }
-
-            budget -= line.getRows();
-            rest--;
-        }
-    }
-
-    protected int availableHeight() {
-        return GuiDraw.displaySize().height - SCREEN_MARGIN
-                - RESERVED_HEIGHT
-                - this.lines.size() * ItemsTooltipLineHandler.headerHeight();
-    }
-
-    protected static int maxLineRows() {
-        final int height = GuiDraw.displaySize().height - SCREEN_MARGIN
-                - RESERVED_HEIGHT
-                - ItemsTooltipLineHandler.headerHeight();
-        return Math.max(1, height / ItemsTooltipLineHandler.SLOT_SIZE);
-    }
-
-}

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

@@ -79,13 +79,14 @@ public class ContainerCreativeInv extends Container {
     @Override
     public ItemStack transferStackInSlot(EntityPlayer par1EntityPlayer, int slotIndex) {
         ItemStack transferredStack = null;
-        Slot slot = inventorySlots.get(slotIndex);
+        Slot slot = (Slot) inventorySlots.get(slotIndex);
 
         if (slot != null && slot.getHasStack()) {
             ItemStack stack = slot.getStack();
             transferredStack = stack.copy();
 
-            if (stack.getItem() instanceof ItemArmor armor) {
+            if (stack.getItem() instanceof ItemArmor) {
+                ItemArmor armor = (ItemArmor) stack.getItem();
                 if (!getSlot(90 + armor.armorType).getHasStack()) {
                     getSlot(90 + armor.armorType).putStack(transferredStack);
                     slot.putStack(null);

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

@@ -8,6 +8,7 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.ContainerEnchantment;
 import net.minecraft.inventory.IInventory;
+import net.minecraft.inventory.Slot;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagList;
@@ -163,14 +164,14 @@ public class ContainerEnchantmentModifier extends ContainerEnchantment {
 
     public boolean addEnchantment(int e, int level) {
         if (e < Enchantment.enchantmentsList.length && Enchantment.enchantmentsList[e] != null) {
-            inventorySlots.get(0).getStack().addEnchantment(Enchantment.enchantmentsList[e], level);
+            ((Slot) inventorySlots.get(0)).getStack().addEnchantment(Enchantment.enchantmentsList[e], level);
             return true;
         }
         return false;
     }
 
     public void removeEnchantment(int e) {
-        ItemStack stack = inventorySlots.get(0).getStack();
+        ItemStack stack = ((Slot) inventorySlots.get(0)).getStack();
         NBTTagList nbttaglist = stack.getEnchantmentTagList();
         if (nbttaglist != null) {
             for (int i = 0; i < nbttaglist.tagCount(); i++) {

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

@@ -116,6 +116,7 @@ public class ContainerPotionCreator extends ContainerExtended {
         if (!player.worldObj.isRemote) InventoryUtils.dropOnClose(player, potionInv);
     }
 
+    @SuppressWarnings("unchecked")
     @Override
     public void handleServerPacket(PacketCustom packet) {
         ItemStack potion = potionInv.getStackInSlot(0);

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

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

@@ -20,7 +20,7 @@ public class DefaultHighlightHandler implements IHighlightHandler {
         String name = null;
         try {
             String s = GuiContainerManager.itemDisplayNameShort(stack);
-            if (!s.endsWith("Unnamed")) name = s;
+            if (s != null && !s.endsWith("Unnamed")) name = s;
 
             if (name != null) currenttip.add(name);
         } catch (Exception ignored) {}

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

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

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

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

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

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

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

@@ -1,328 +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 TextFormatter getFormatter() {
-        return this.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 setText(String rawText) {
-        super.setText(EnumChatFormatting.getTextWithoutFormattingCodes(rawText));
-    }
-
-    @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, 1.0F, 1.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 + 1 && this.formattedText.charAt(i + shift) == '\u00a7'
-                    && isFormattingCode(this.formattedText.charAt(i + shift + 1))) {
-                shift += 2;
-            }
-        }
-
-        return Math.min(position + shift, this.formattedText.length());
-    }
-
-    private static boolean isFormattingCode(char c) {
-        return (c >= '0' && c <= '9') || (c >= 'a' && c <= 'f')
-                || (c >= 'k' && c <= 'o')
-                || c == 'r'
-                || (c >= 'A' && c <= 'F')
-                || (c >= 'K' && c <= 'O')
-                || c == 'R';
-    }
-
-    private String getPreviousColor(int position) {
-        position = Math.min(position, this.formattedText.length() - 1);
-        while (position >= 0) {
-            if (this.formattedText.charAt(position) == '\u00a7') {
-                return this.formattedText.substring(position, position + 2);
-            }
-            position--;
-        }
-        return "";
-    }
-
-}

src/main/java/codechicken/nei/GridOverlapScanner.java

@@ -1,188 +0,0 @@
-package codechicken.nei;
-
-import java.lang.ref.WeakReference;
-import java.util.Arrays;
-import java.util.function.Predicate;
-
-import net.minecraft.client.gui.inventory.GuiContainer;
-
-import codechicken.lib.vec.Rectangle4i;
-
-final class GridOverlapScanner {
-
-    private static boolean scanRequested = true;
-    private static boolean scanFrame = true;
-    private static boolean wasShowTooltip = true;
-    private static WeakReference<GuiContainer> lastGui = new WeakReference<>(null);
-
-    private boolean invalidated = true;
-
-    private final Rectangle4i rect = new Rectangle4i();
-    private boolean[] checked = new boolean[0];
-    private int[] queue = new int[0];
-    private int tail;
-
-    private Predicate<Rectangle4i> isHidden;
-    private boolean[] hidden;
-    private int hiddenCount;
-    private int left;
-    private int top;
-    private int slotSize;
-    private int columns;
-
-    public static void requestScan() {
-        scanRequested = true;
-    }
-
-    public static void beginFrame(GuiContainer gui, boolean shouldShowTooltip) {
-
-        if (wasShowTooltip != shouldShowTooltip) {
-            scanRequested = true;
-        }
-
-        wasShowTooltip = shouldShowTooltip;
-
-        if (lastGui.get() != gui) {
-            lastGui = new WeakReference<>(gui);
-            scanRequested = true;
-        }
-
-        scanFrame = scanRequested;
-        scanRequested = false;
-    }
-
-    public static boolean isScanFrame() {
-        return scanFrame;
-    }
-
-    public void invalidate() {
-        this.invalidated = true;
-    }
-
-    public boolean shouldRefresh() {
-        final boolean refresh = this.invalidated || scanFrame;
-        this.invalidated = false;
-        return refresh;
-    }
-
-    public int scan(Predicate<Rectangle4i> isHidden, int left, int top, int slotSize, int rows, int columns,
-            boolean seedLeft, boolean seedRight, boolean[] hidden) {
-        final int size = rows * columns;
-
-        if (this.checked.length < size) {
-            this.checked = new boolean[size];
-            this.queue = new int[size];
-        } else {
-            Arrays.fill(this.checked, 0, size, false);
-        }
-
-        this.isHidden = isHidden;
-        this.hidden = hidden;
-        this.hiddenCount = 0;
-        this.tail = 0;
-        this.left = left;
-        this.top = top;
-        this.slotSize = slotSize;
-        this.columns = columns;
-
-        for (int r = 0; r < rows; r++) {
-            if (seedLeft) {
-                probe(r, 0);
-            }
-            if (seedRight) {
-                probe(r, columns - 1);
-            }
-        }
-
-        for (int head = 0; head < this.tail; head++) {
-            final int row = this.queue[head] / columns;
-            final int column = this.queue[head] % columns;
-
-            for (int r = Math.max(0, row - 1); r <= Math.min(rows - 1, row + 1); r++) {
-                for (int c = Math.max(0, column - 1); c <= Math.min(columns - 1, column + 1); c++) {
-                    probe(r, c);
-                }
-            }
-        }
-
-        for (int r = 0; r < rows; r++) {
-            for (int c = 0; c < columns; c++) {
-                if (this.checked[r * columns + c]) {
-                    continue;
-                }
-
-                int c1 = c;
-                while (c1 + 1 < columns && !this.checked[r * columns + c1 + 1]) {
-                    c1++;
-                }
-
-                int r1 = r;
-                while (r1 + 1 < rows && isUnchecked(r1 + 1, c, c1)) {
-                    r1++;
-                }
-
-                scanArea(r, r1, c, c1);
-                c = c1;
-            }
-        }
-
-        this.isHidden = null;
-        this.hidden = null;
-
-        return this.hiddenCount;
-    }
-
-    private void probe(int row, int column) {
-        final int idx = row * this.columns + column;
-
-        if (!this.checked[idx]) {
-            this.checked[idx] = true;
-
-            if (test(row, row, column, column)) {
-                this.hidden[idx] = true;
-                this.queue[this.tail++] = idx;
-                this.hiddenCount++;
-            }
-        }
-    }
-
-    private void scanArea(int r0, int r1, int c0, int c1) {
-
-        if (!test(r0, r1, c0, c1)) {
-            for (int r = r0; r <= r1; r++) {
-                Arrays.fill(this.checked, r * this.columns + c0, r * this.columns + c1 + 1, true);
-            }
-        } else if (r0 == r1 && c0 == c1) {
-            this.checked[r0 * this.columns + c0] = true;
-            this.hidden[r0 * this.columns + c0] = true;
-            this.hiddenCount++;
-        } else if (r1 - r0 >= c1 - c0) {
-            final int mid = (r0 + r1) / 2;
-            scanArea(r0, mid, c0, c1);
-            scanArea(mid + 1, r1, c0, c1);
-        } else {
-            final int mid = (c0 + c1) / 2;
-            scanArea(r0, r1, c0, mid);
-            scanArea(r0, r1, mid + 1, c1);
-        }
-    }
-
-    private boolean isUnchecked(int row, int c0, int c1) {
-        for (int c = c0; c <= c1; c++) {
-            if (this.checked[row * this.columns + c]) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    private boolean test(int r0, int r1, int c0, int c1) {
-        this.rect.set(
-                this.left + c0 * this.slotSize,
-                this.top + r0 * this.slotSize,
-                (c1 - c0 + 1) * this.slotSize,
-                (r1 - r0 + 1) * this.slotSize);
-        return this.isHidden.test(this.rect);
-    }
-
-}

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

@@ -24,8 +24,8 @@ public class GuiEnchantmentModifier extends GuiContainer {
 
     @Override
     protected void drawGuiContainerForegroundLayer(int par1, int par2) {
-        fontRendererObj.drawString(translate("enchant"), 12, 6, ColorUtils.textGray.getColor());
-        fontRendererObj.drawString(translate("enchant.level"), 19, 20, ColorUtils.textGray.getColor());
+        fontRendererObj.drawString(translate("enchant"), 12, 6, 0x404040);
+        fontRendererObj.drawString(translate("enchant.level"), 19, 20, 0x404040);
     }
 
     protected void drawGuiContainerBackgroundLayer(float f, int i, int j) {
@@ -39,11 +39,7 @@ public class GuiEnchantmentModifier extends GuiContainer {
         container.drawScrollBar(this);
 
         String levelstring = "" + container.level;
-        fontRendererObj.drawString(
-                levelstring,
-                33 - fontRendererObj.getStringWidth(levelstring) / 2,
-                34,
-                ColorUtils.textLightGray.getColor());
+        fontRendererObj.drawString(levelstring, 33 - fontRendererObj.getStringWidth(levelstring) / 2, 34, 0xFF606060);
 
         GL11.glTranslatef(-guiLeft, -guiTop, 0);
     }
@@ -82,8 +78,8 @@ public class GuiEnchantmentModifier extends GuiContainer {
 
     private void changeLevel(int i) {
         container.level += i;
-        buttonList.get(0).enabled = container.level != 1;
-        buttonList.get(1).enabled = container.level != 10;
+        ((GuiButton) buttonList.get(0)).enabled = container.level != 1;
+        ((GuiButton) buttonList.get(1)).enabled = container.level != 10;
     }
 
     protected void mouseClicked(int i, int j, int k) {

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

@@ -12,11 +12,10 @@ 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 {
+public class GuiExtendedCreativeInv extends GuiContainer implements INEIGuiHandler {
 
     public GuiExtendedCreativeInv(Container par1Container) {
         super(par1Container);
@@ -60,13 +59,13 @@ public class GuiExtendedCreativeInv extends GuiContainer implements INEIGuiHandl
     }
 
     @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;
+        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

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

@@ -289,10 +289,10 @@ public class GuiPotionCreator extends GuiContainerWidget {
         CCRenderState.changeTexture("nei:textures/gui/potion.png");
         drawTexturedModalRect(0, 0, 0, 0, xSize, ySize);
 
-        FontUtils.drawCenteredString(translate("potion.favourite"), xSize / 2, 4, ColorUtils.textGray.getColor());
-        fontRendererObj.drawString(translate("potion.duration"), 12, 40, ColorUtils.textGray.getColor());
-        fontRendererObj.drawString(translate("potion.level"), 19, 73, ColorUtils.textGray.getColor());
-        FontUtils.drawCenteredString(translateAmplifier(amplifier), 33, 86, ColorUtils.textGray.getColor());
+        FontUtils.drawCenteredString(translate("potion.favourite"), xSize / 2, 4, 0x404040);
+        fontRendererObj.drawString(translate("potion.duration"), 12, 40, 0x404040);
+        fontRendererObj.drawString(translate("potion.level"), 19, 73, 0x404040);
+        FontUtils.drawCenteredString(translateAmplifier(amplifier), 33, 86, 0xFF606060);
     }
 
     @Override

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

@@ -28,7 +28,7 @@ public class HUDRenderer implements IKeyStateTracker {
 
     @Override
     public void tickKeyStates() {
-        if (KeyManager.isPressed("world.highlight_tips")) {
+        if (KeyManager.keyStates.get("world.highlight_tips").down) {
             ConfigTag tag = NEIClientConfig.getSetting("world.highlight_tips");
             tag.setBooleanValue(!tag.getBooleanValue());
         }
@@ -42,11 +42,13 @@ public class HUDRenderer implements IKeyStateTracker {
                 && mc.objectMouseOver != null
                 && mc.objectMouseOver.typeOfHit == MovingObjectType.BLOCK) {
             World world = mc.theWorld;
-            final List<ItemStack> items = ItemInfo.getIdentifierItems(world, mc.thePlayer, mc.objectMouseOver);
+            ItemStack[] items = ItemInfo.getIdentifierItems(world, mc.thePlayer, mc.objectMouseOver)
+                    .toArray(new ItemStack[0]);
 
-            if (items.isEmpty()) return;
+            if (items.length == 0) return;
+
+            ItemStack stack = StackInfo.getItemStackWithMinimumDamage(items);
 
-            final ItemStack stack = StackInfo.getItemStackWithMinimumDamage(items.toArray(new ItemStack[0]));
             renderOverlay(stack, ItemInfo.getText(stack, world, mc.thePlayer, mc.objectMouseOver), getPositioning());
         }
     }

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

@@ -1,114 +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.containsWithSubpanels(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")
-                    || NEIClientUtils.mc().playerController.isInCreativeMode()) {
-                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")
-                    || NEIClientUtils.mc().playerController.isInCreativeMode()) {
-                currenttip.add(EnumChatFormatting.RED + translate("itempanel.deleteItem"));
-            }
-        }
-
-        return currenttip;
-    }
-
-}

src/main/java/codechicken/nei/IMCForNEI.java

@@ -1,161 +0,0 @@
-package codechicken.nei;
-
-import net.minecraft.client.gui.GuiRepair;
-import net.minecraft.client.gui.inventory.GuiBrewingStand;
-import net.minecraft.client.gui.inventory.GuiCrafting;
-import net.minecraft.client.gui.inventory.GuiFurnace;
-import net.minecraft.client.gui.inventory.GuiInventory;
-import net.minecraft.nbt.NBTTagCompound;
-
-import codechicken.nei.api.API;
-import codechicken.nei.recipe.BrewingOverlayHandler;
-import codechicken.nei.recipe.BrewingRecipeHandler;
-import codechicken.nei.recipe.DefaultOverlayHandler;
-import codechicken.nei.recipe.FireworkRecipeHandler;
-import codechicken.nei.recipe.FuelRecipeHandler;
-import codechicken.nei.recipe.FurnaceRecipeHandler;
-import codechicken.nei.recipe.InformationHandler;
-import codechicken.nei.recipe.ProfilerRecipeHandler;
-import codechicken.nei.recipe.RepairOverlayHandler;
-import codechicken.nei.recipe.RepairRecipeHandler;
-import codechicken.nei.recipe.ShapedRecipeHandler;
-import codechicken.nei.recipe.ShapelessRecipeHandler;
-import cpw.mods.fml.common.event.FMLInterModComms;
-
-public class IMCForNEI {
-
-    public static void IMCSender() {
-
-        API.registerRecipeHandler(new ShapedRecipeHandler());
-        API.registerUsageHandler(new ShapedRecipeHandler());
-        sendHandler("codechicken.nei.recipe.ShapedRecipeHandler", "minecraft:crafting_table");
-
-        API.registerRecipeHandler(new ShapelessRecipeHandler());
-        API.registerUsageHandler(new ShapelessRecipeHandler());
-        sendHandler("codechicken.nei.recipe.ShapelessRecipeHandler", "minecraft:crafting_table");
-
-        API.registerRecipeHandler(new FireworkRecipeHandler());
-        API.registerUsageHandler(new FireworkRecipeHandler());
-        sendHandler("codechicken.nei.recipe.FireworkRecipeHandler", "minecraft:fireworks");
-
-        API.registerRecipeHandler(new FurnaceRecipeHandler());
-        API.registerUsageHandler(new FurnaceRecipeHandler());
-        sendHandler("codechicken.nei.recipe.FurnaceRecipeHandler", "minecraft:furnace");
-
-        API.registerRecipeHandler(new BrewingRecipeHandler());
-        API.registerUsageHandler(new BrewingRecipeHandler());
-        sendHandler("codechicken.nei.recipe.BrewingRecipeHandler", "minecraft:brewing_stand");
-
-        API.registerRecipeHandler(new FuelRecipeHandler());
-        API.registerUsageHandler(new FuelRecipeHandler());
-        sendFuelRecipeHandler();
-
-        API.registerRecipeHandler(new InformationHandler());
-        API.registerUsageHandler(new InformationHandler());
-        sendInformationHandler();
-
-        API.registerRecipeHandler(new RepairRecipeHandler());
-        API.registerUsageHandler(new RepairRecipeHandler());
-        sendRepairHandler();
-        sendCatalyst("repair", "minecraft:anvil");
-
-        API.registerGuiOverlay(GuiCrafting.class, "crafting");
-        API.registerGuiOverlay(GuiInventory.class, "crafting2x2", 63, 20);
-        API.registerGuiOverlay(GuiFurnace.class, "smelting");
-        API.registerGuiOverlay(GuiFurnace.class, "fuel");
-        API.registerGuiOverlay(GuiBrewingStand.class, "brewing");
-        API.registerGuiOverlay(GuiRepair.class, "repair", 2, 37);
-
-        API.registerGuiOverlayHandler(GuiCrafting.class, new DefaultOverlayHandler(), "crafting");
-        API.registerGuiOverlayHandler(GuiInventory.class, new DefaultOverlayHandler(63, 20), "crafting2x2");
-        API.registerGuiOverlayHandler(GuiBrewingStand.class, new BrewingOverlayHandler(), "brewing");
-        API.registerGuiOverlayHandler(GuiRepair.class, new RepairOverlayHandler(), "repair");
-
-        API.registerRecipeHandler(new ProfilerRecipeHandler(true));
-        API.registerUsageHandler(new ProfilerRecipeHandler(false));
-        sendProfilerRecipeHandler();
-    }
-
-    private static void sendHandler(String aName, String aBlock) {
-        NBTTagCompound aNBT = new NBTTagCompound();
-        aNBT.setString("handler", aName);
-        aNBT.setString("modName", "Minecraft");
-        aNBT.setString("modId", "minecraft");
-        aNBT.setString("itemName", aBlock);
-        aNBT.setInteger("handlerWidth", 166);
-        aNBT.setInteger("handlerHeight", 65);
-        aNBT.setBoolean("multipleWidgetsAllowed", true);
-        aNBT.setInteger("yShift", 0);
-        FMLInterModComms.sendMessage("NotEnoughItems", "registerHandlerInfo", aNBT);
-    }
-
-    private static void sendRepairHandler() {
-        NBTTagCompound aNBT = new NBTTagCompound();
-        aNBT.setString("handler", "codechicken.nei.recipe.RepairRecipeHandler");
-        aNBT.setString("modName", "Minecraft");
-        aNBT.setString("modId", "minecraft");
-        aNBT.setString("itemName", "minecraft:anvil");
-        aNBT.setInteger("handlerHeight", 39);
-        aNBT.setInteger("handlerWidth", 166);
-        aNBT.setBoolean("multipleWidgetsAllowed", true);
-        aNBT.setBoolean("showFavoritesButton", false);
-        aNBT.setInteger("yShift", 0);
-        FMLInterModComms.sendMessage("NotEnoughItems", "registerHandlerInfo", aNBT);
-    }
-
-    private static void sendFuelRecipeHandler() {
-        NBTTagCompound aNBT = new NBTTagCompound();
-        aNBT.setString("handler", "codechicken.nei.recipe.FuelRecipeHandler");
-        aNBT.setString("modName", "Minecraft");
-        aNBT.setString("modId", "minecraft");
-        aNBT.setString("imageResource", "nei:textures/nei_tabbed_sprites.png");
-        aNBT.setInteger("imageX", 80);
-        aNBT.setInteger("imageY", 0);
-        aNBT.setInteger("imageWidth", 14);
-        aNBT.setInteger("imageHeight", 14);
-        aNBT.setInteger("handlerHeight", 65);
-        aNBT.setInteger("handlerWidth", 166);
-        aNBT.setBoolean("multipleWidgetsAllowed", true);
-        aNBT.setInteger("yShift", 0);
-        FMLInterModComms.sendMessage("NotEnoughItems", "registerHandlerInfo", aNBT);
-    }
-
-    private static void sendInformationHandler() {
-        NBTTagCompound aNBT = new NBTTagCompound();
-        aNBT.setString("handler", "codechicken.nei.recipe.InformationHandler");
-        aNBT.setString("modName", "Not Enough Items");
-        aNBT.setString("modId", "nei");
-        aNBT.setString("imageResource", "nei:textures/nei_tabbed_sprites.png");
-        aNBT.setInteger("imageX", 96);
-        aNBT.setInteger("imageY", 0);
-        aNBT.setInteger("imageWidth", 16);
-        aNBT.setInteger("imageHeight", 16);
-        aNBT.setInteger("handlerHeight", 65);
-        aNBT.setInteger("handlerWidth", 166);
-        aNBT.setBoolean("multipleWidgetsAllowed", true);
-        aNBT.setInteger("yShift", 0);
-        FMLInterModComms.sendMessage("NotEnoughItems", "registerHandlerInfo", aNBT);
-    }
-
-    private static void sendProfilerRecipeHandler() {
-        NBTTagCompound aNBT = new NBTTagCompound();
-        aNBT.setString("handler", "codechicken.nei.recipe.ProfilerRecipeHandler");
-        aNBT.setString("modName", "Not Enough Items");
-        aNBT.setString("modId", "nei");
-        aNBT.setString("itemName", "minecraft:clock");
-        aNBT.setInteger("handlerHeight", 16);
-        aNBT.setInteger("handlerWidth", 166);
-        aNBT.setBoolean("multipleWidgetsAllowed", true);
-        aNBT.setInteger("yShift", 0);
-        FMLInterModComms.sendMessage("NotEnoughItems", "registerHandlerInfo", aNBT);
-    }
-
-    private static void sendCatalyst(String aName, String aStack) {
-        NBTTagCompound aNBT = new NBTTagCompound();
-        aNBT.setString("handlerID", aName);
-        aNBT.setString("itemName", aStack);
-        aNBT.setInteger("priority", 0);
-        FMLInterModComms.sendMessage("NotEnoughItems", "registerCatalystInfo", aNBT);
-    }
-
-}

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

@@ -30,7 +30,14 @@ public class InfiniteStackSizeHandler implements IInfiniteItemHandler {
 
     @Override
     public void replenishInfiniteStack(InventoryPlayer inv, int slotNo) {
-        inv.getStackInSlot(slotNo).stackSize = 111;
+        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);
+        }
     }
 
     @Override

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

@@ -1,483 +0,0 @@
-package codechicken.nei;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-
-import codechicken.lib.vec.Rectangle4i;
-import codechicken.nei.ItemsGrid.ItemsGridSlot;
-import codechicken.nei.ItemsGrid.MouseContext;
-import codechicken.nei.NEIClientUtils.Alignment;
-import codechicken.nei.recipe.AutoCraftingManager;
-import codechicken.nei.recipe.GuiCraftingRecipe;
-import codechicken.nei.recipe.GuiRecipe;
-import codechicken.nei.recipe.ICraftingHandler;
-import codechicken.nei.recipe.IRecipeHandler;
-import codechicken.nei.recipe.Recipe;
-import codechicken.nei.recipe.Recipe.RecipeId;
-import codechicken.nei.recipe.RecipeInfo;
-import codechicken.nei.recipe.StackInfo;
-import codechicken.nei.util.ReadableNumberConverter;
-
-public class ItemCraftablesPanel
-        extends AbstractSubpanel<ItemsGrid<ItemCraftablesPanel.CraftablesGridSlot, MouseContext>> {
-
-    public static class CraftablesGridSlot extends ItemsGridSlot {
-
-        protected final long realAmount;
-        protected final boolean isFluidDisplay;
-        protected final RecipeId recipeId;
-
-        public CraftablesGridSlot(int slotIndex, int itemIndex, ItemStack itemStack, RecipeId recipeId) {
-            super(slotIndex, itemIndex, itemStack);
-            this.realAmount = StackInfo.getAmount(itemStack);
-            this.isFluidDisplay = StackInfo.isFluidDisplayItem(itemStack);
-            this.recipeId = recipeId;
-        }
-
-        @Override
-        public RecipeId getRecipeId() {
-            return this.recipeId;
-        }
-
-        @Override
-        public <M extends MouseContext> void afterDraw(Rectangle4i rect, M mouseContext) {
-            drawStackSize(rect);
-        }
-
-        protected void drawStackSize(Rectangle4i rect) {
-            long stackSize = this.realAmount;
-
-            if (stackSize > 1) {
-                final float panelFactor = (rect.w - 2) / (DEFAULT_SLOT_SIZE - 2);
-                String amountString = "";
-
-                if (stackSize < 10_000) {
-                    amountString = String.valueOf(stackSize);
-                } else {
-                    amountString = ReadableNumberConverter.INSTANCE.toWideReadableForm(stackSize);
-                }
-
-                if (this.isFluidDisplay) {
-                    amountString += "L";
-                }
-
-                NEIClientUtils.drawNEIOverlayText(
-                        amountString,
-                        new Rectangle4i(rect.x + 1, rect.y + 1, rect.w - 2, rect.h - 2),
-                        panelFactor,
-                        0xFFFFFF,
-                        true,
-                        this.isFluidDisplay ? Alignment.BottomLeft : Alignment.BottomRight);
-            }
-        }
-
-    }
-
-    private static class CraftablesSnapshot {
-
-        final GuiContainer guiContainer;
-        final ItemStackAmount inventory;
-        final boolean showOnlyFavorites;
-        final int maxCandidates;
-
-        CraftablesSnapshot(GuiContainer guiContainer, ItemStackAmount inventory, boolean showOnlyFavorites,
-                int maxCandidates) {
-            this.guiContainer = guiContainer;
-            this.inventory = inventory;
-            this.showOnlyFavorites = showOnlyFavorites;
-            this.maxCandidates = maxCandidates;
-        }
-    }
-
-    private static class RecipeCandidate {
-
-        final IRecipeHandler handler;
-        final int recipeIndex;
-        final List<PositionedStack> ingredientStacks;
-        final ItemStack sortKeyItem;
-
-        RecipeCandidate(IRecipeHandler handler, int recipeIndex, List<PositionedStack> ingredientStacks,
-                ItemStack sortKeyItem) {
-            this.handler = handler;
-            this.recipeIndex = recipeIndex;
-            this.ingredientStacks = ingredientStacks;
-            this.sortKeyItem = sortKeyItem;
-        }
-    }
-
-    private static final Comparator<ItemStack> ITEM_SORT_COMPARATOR = Comparator
-            .comparing(FavoriteRecipes::containsManual).thenComparing(FavoriteRecipes::contains).reversed()
-            .thenComparing(ItemSorter.instance);
-
-    public static List<String> guiBlacklist = new ArrayList<>();
-    private final int MIN_DELAY = 600;
-
-    private Map<String, ArrayList<ICraftingHandler>> identHandlers = new HashMap<>();
-    private Map<ItemStack, RecipeId> availableRecipes = new HashMap<>();
-
-    private GuiContainer lastGuiContainer = null;
-    private ItemStackAmount lastPlayerInventory = null;
-    private long lastPlayerInventorySync = 0;
-    private int lastFavoritesCount = 0;
-
-    private volatile CraftablesSnapshot pendingSnapshot;
-    private final AtomicReference<Map<ItemStack, RecipeId>> pendingResult = new AtomicReference<>();
-    private final RestartableTask task = new RestartableTask("NEI Craftables Panel") {
-
-        @Override
-        public void execute() {
-            final CraftablesSnapshot snapshot = ItemCraftablesPanel.this.pendingSnapshot;
-
-            if (snapshot != null) {
-                pendingResult.set(generateCraftables(snapshot));
-            }
-        }
-    };
-
-    public ItemCraftablesPanel() {
-        this.grid = new ItemsGrid<>() {
-
-            protected List<CraftablesGridSlot> gridMask;
-
-            @Override
-            protected void onGridChanged() {
-                this.gridMask = null;
-                super.onGridChanged();
-            }
-
-            @Override
-            public List<CraftablesGridSlot> getMask() {
-
-                if (this.gridMask == null) {
-                    final int maxSlotIndex = this.rows * this.columns;
-                    final List<CraftablesGridSlot> gridMask = new ArrayList<>();
-                    this.realItems.clear();
-
-                    if (!ItemCraftablesPanel.this.availableRecipes.isEmpty()) {
-                        final List<Map.Entry<ItemStack, RecipeId>> entries = ItemCraftablesPanel.this.availableRecipes
-                                .entrySet().stream().sorted(Map.Entry.comparingByKey(ITEM_SORT_COMPARATOR))
-                                .limit(maxSlotIndex).collect(Collectors.toList());
-                        int slotIndex = 0;
-                        int itemIndex = 0;
-
-                        for (Map.Entry<ItemStack, RecipeId> entry : entries) {
-                            if (!isInvalidSlot(slotIndex)) {
-                                this.realItems.add(entry.getKey());
-                                gridMask.add(
-                                        new CraftablesGridSlot(
-                                                slotIndex,
-                                                itemIndex++,
-                                                entry.getKey(),
-                                                entry.getValue()));
-                            }
-                            if (slotIndex++ >= maxSlotIndex) {
-                                break;
-                            }
-                        }
-
-                        this.gridMask = gridMask;
-                    } else {
-                        this.gridMask = Collections.emptyList();
-                    }
-
-                    ItemCraftablesPanel.this.updateLinePadding();
-                }
-
-                return this.gridMask;
-            }
-
-            @Override
-            protected MouseContext getMouseContext(int mousex, int mousey) {
-                final ItemsGridSlot hovered = getSlotMouseOver(mousex, mousey);
-
-                if (hovered != null) {
-                    return new MouseContext(
-                            hovered.slotIndex,
-                            hovered.slotIndex / this.columns,
-                            hovered.slotIndex % this.columns);
-                }
-
-                return null;
-            }
-
-        };
-    }
-
-    @Override
-    protected ItemStack getDraggedStackWithQuantity(ItemStack itemStack) {
-        return ItemQuantityField.prepareStackWithQuantity(itemStack, StackInfo.getAmount(itemStack));
-    }
-
-    @Override
-    public void draw(int mousex, int mousey) {
-        if (!this.availableRecipes.isEmpty()) {
-            super.draw(mousex, mousey);
-        }
-    }
-
-    @Override
-    public int setPanelWidth(int width) {
-        if (getGuiContainer() != this.lastGuiContainer) updateCraftables();
-
-        final int columns = width / ItemsGrid.SLOT_SIZE;
-        final int useRows = NEIClientConfig.getIntSetting("inventory.craftables.useRows");
-        final int rows = (int) Math.min(Math.ceil(this.availableRecipes.size() * 1f / columns), useRows);
-
-        this.w = width;
-        this.h = 8 + ItemsGrid.SLOT_SIZE * Math.max(rows, 1);
-
-        return rows;
-    }
-
-    public void update() {
-        this.splittingLineColor = NEIClientConfig.getSetting("inventory.craftables.color").getHexValue();
-        applyPendingResult();
-        updateCraftables();
-        super.update();
-    }
-
-    private void applyPendingResult() {
-        final Map<ItemStack, RecipeId> result = this.pendingResult.getAndSet(null);
-
-        if (result != null && NEIClientConfig.showCraftablesPanelWidget()) {
-            this.availableRecipes = result;
-            this.grid.onGridChanged();
-        }
-    }
-
-    private void updateCraftables() {
-
-        if (!NEIClientConfig.showCraftablesPanelWidget()) {
-            clearCraftables();
-        } else if (this.lastPlayerInventory == null
-                || Math.abs(System.currentTimeMillis() - this.lastPlayerInventorySync) >= MIN_DELAY) {
-                    final GuiContainer firstGui = getGuiContainer();
-                    this.lastPlayerInventorySync = System.currentTimeMillis();
-
-                    if (firstGui != null && !ItemCraftablesPanel.guiBlacklist.contains(firstGui.getClass().getName())) {
-                        final boolean showOnlyFavorites = NEIClientConfig
-                                .getBooleanSetting("inventory.craftables.favoritesOnly");
-                        final ItemStackAmount inv = AutoCraftingManager.getInventoryItems(firstGui);
-
-                        if (this.lastGuiContainer != firstGui
-                                || showOnlyFavorites && this.lastFavoritesCount != FavoriteRecipes.size()
-                                || !inv.equals(this.lastPlayerInventory)) {
-                            this.lastPlayerInventory = inv;
-                            this.lastGuiContainer = firstGui;
-                            this.lastFavoritesCount = FavoriteRecipes.size();
-                            final int maxRows = NEIClientConfig.getIntSetting("inventory.craftables.useRows") + 2;
-                            final int maxCandidates = Math.max(this.grid.columns, 1) * maxRows;
-                            this.pendingSnapshot = new CraftablesSnapshot(
-                                    firstGui,
-                                    inv,
-                                    showOnlyFavorites,
-                                    maxCandidates);
-                            this.task.restart();
-                        }
-
-                    } else {
-                        clearCraftables();
-                    }
-
-                }
-
-    }
-
-    private void clearCraftables() {
-        if (!this.availableRecipes.isEmpty()) {
-            this.availableRecipes = Collections.emptyMap();
-            this.lastPlayerInventory = null;
-            this.grid.onGridChanged();
-        }
-    }
-
-    public void clearGuiReferences() {
-        this.lastGuiContainer = null;
-        this.pendingSnapshot = null;
-    }
-
-    private GuiContainer getGuiContainer() {
-        final GuiContainer firstGui = NEIClientUtils.getGuiContainer();
-        return (firstGui instanceof GuiRecipe<?>gui) ? gui.firstGui : firstGui;
-    }
-
-    private Map<ItemStack, RecipeId> generateCraftables(CraftablesSnapshot snapshot) {
-        final List<IRecipeHandler> availableHandlers = getAvailableHandlers(snapshot.guiContainer);
-        final Map<ItemStack, RecipeId> availableRecipes = new HashMap<>();
-
-        if (!availableHandlers.isEmpty()) {
-            final Map<Item, List<ItemStack>> invByItem = indexInventoryByItem(snapshot.inventory.values());
-
-            if (snapshot.showOnlyFavorites) {
-                for (IRecipeHandler handler : availableHandlers) {
-                    availableRecipes.putAll(filterHandlerRecipes(handler, invByItem, true));
-                }
-            } else {
-                final List<RecipeCandidate> candidates = Collections.synchronizedList(new ArrayList<>());
-
-                for (IRecipeHandler handler : availableHandlers) {
-                    collectHandlerCandidates(handler, invByItem, candidates);
-                }
-
-                candidates.sort(Comparator.comparing(c -> c.sortKeyItem, ITEM_SORT_COMPARATOR));
-                candidates.subList(0, Math.min(candidates.size(), snapshot.maxCandidates)).parallelStream()
-                        .forEach(candidate -> buildCandidate(candidate, availableRecipes));
-            }
-        }
-
-        return availableRecipes;
-    }
-
-    private List<IRecipeHandler> getAvailableHandlers(GuiContainer firstGui) {
-        final List<IRecipeHandler> availableHandlers = new ArrayList<>();
-
-        for (String ident : RecipeInfo.getOverlayHandlerIdents(firstGui)) {
-            availableHandlers.addAll(identHandlers.computeIfAbsent(ident, GuiCraftingRecipe::getCraftingHandlers));
-        }
-
-        return availableHandlers;
-    }
-
-    private static Map<Item, List<ItemStack>> indexInventoryByItem(List<ItemStack> invStacks) {
-        final Map<Item, List<ItemStack>> index = new HashMap<>();
-
-        for (ItemStack stack : invStacks) {
-            index.computeIfAbsent(stack.getItem(), i -> new ArrayList<>()).add(stack);
-        }
-
-        return index;
-    }
-
-    private void collectHandlerCandidates(IRecipeHandler handler, Map<Item, List<ItemStack>> invByItem,
-            List<RecipeCandidate> candidates) {
-        IntStream.range(0, handler.numRecipes()).parallel().forEach(recipeIndex -> {
-            final List<PositionedStack> ingredientStacks = handler.getIngredientStacks(recipeIndex);
-
-            if (existsIngredients(ingredientStacks, invByItem)) {
-                final ItemStack sortKeyItem = getCheapResultItem(handler, recipeIndex);
-
-                if (sortKeyItem != null) {
-                    candidates.add(new RecipeCandidate(handler, recipeIndex, ingredientStacks, sortKeyItem));
-                }
-            }
-        });
-    }
-
-    private void buildCandidate(RecipeCandidate candidate, Map<ItemStack, RecipeId> availableRecipes) {
-        final ItemStack result = getCheapResult(candidate.handler, candidate.recipeIndex);
-
-        if (result != null) {
-            final RecipeId recipeId = RecipeId.of(candidate.handler, candidate.recipeIndex, candidate.ingredientStacks);
-
-            synchronized (availableRecipes) {
-                availableRecipes.put(result, recipeId);
-            }
-        }
-    }
-
-    private static ItemStack getCheapResultItem(IRecipeHandler handler, int recipeIndex) {
-        final PositionedStack result = Recipe
-                .getMainResult(handler.getResultStacks(recipeIndex), pStack -> pStack.items[0]);
-        return result != null ? result.item : null;
-    }
-
-    private static ItemStack getCheapResult(IRecipeHandler handler, int recipeIndex) {
-        final List<PositionedStack> results = handler.getResultStacks(recipeIndex);
-
-        if (results.isEmpty()) {
-            return null;
-        }
-
-        final ItemStack stack = Recipe.getMainResult(results, pStack -> pStack.items[0]).item;
-        int stackSize = 0;
-
-        for (PositionedStack result : results) {
-            if (containsSameType(result, stack)) {
-                stackSize += StackInfo.getAmount(result.item);
-            }
-        }
-
-        return StackInfo.withAmount(stack, stackSize);
-    }
-
-    private static boolean containsSameType(PositionedStack pStack, ItemStack stack) {
-        final ItemStack normalized = StackInfo.withAmount(stack, 0);
-
-        for (ItemStack permutation : pStack.items) {
-            if (NEIServerUtils.areStacksSameTypeWithNBT(StackInfo.withAmount(permutation, 0), normalized)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    private Map<ItemStack, RecipeId> filterHandlerRecipes(IRecipeHandler handler, Map<Item, List<ItemStack>> invByItem,
-            boolean showOnlyFavorites) {
-        final Map<ItemStack, RecipeId> availableRecipes = new HashMap<>();
-
-        IntStream.range(0, handler.numRecipes()).parallel().forEach(recipeIndex -> {
-            final List<PositionedStack> ingredientStacks = handler.getIngredientStacks(recipeIndex);
-
-            if (existsIngredients(ingredientStacks, invByItem)) {
-                final ItemStack result = getCheapResult(handler, recipeIndex);
-
-                if (result != null) {
-                    final RecipeId recipeId = RecipeId.of(handler, recipeIndex, ingredientStacks);
-
-                    if (!showOnlyFavorites || FavoriteRecipes.getFavorite(recipeId) != null) {
-                        synchronized (availableRecipes) {
-                            availableRecipes.put(result, recipeId);
-                        }
-                    }
-                }
-            }
-        });
-
-        return availableRecipes;
-    }
-
-    private boolean existsIngredients(List<PositionedStack> ingredients, Map<Item, List<ItemStack>> invByItem) {
-        final Map<ItemStack, Integer> usedItems = new HashMap<>();
-
-        for (PositionedStack pStack : ingredients) {
-            ItemStack used = null;
-
-            for (ItemStack permutation : pStack.items) {
-                final List<ItemStack> candidates = invByItem.get(permutation.getItem());
-
-                if (candidates == null) continue;
-
-                for (ItemStack is : candidates) {
-                    if (usedItems.getOrDefault(is, is.stackSize) >= pStack.item.stackSize
-                            && NEIServerUtils.areStacksSameTypeCrafting(permutation, is)) {
-                        used = is;
-                        break;
-                    }
-                }
-
-                if (used != null) break;
-            }
-
-            if (used != null) {
-                usedItems.put(used, usedItems.getOrDefault(used, used.stackSize) - pStack.item.stackSize);
-            } else {
-                return false;
-            }
-        }
-
-        return !usedItems.isEmpty();
-    }
-
-}

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

@@ -1,238 +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.Collections;
-import java.util.List;
-
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-
-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.ItemsGrid.ItemsGridSlot;
-import codechicken.nei.ItemsGrid.MouseContext;
-import codechicken.nei.recipe.Recipe.RecipeId;
-import codechicken.nei.recipe.StackInfo;
-import codechicken.nei.util.NBTJson;
-
-public class ItemHistoryPanel extends AbstractSubpanel<ItemsGrid<ItemHistoryPanel.HistoryGridSlot, MouseContext>> {
-
-    protected File historyFile = null;
-
-    public static class HistoryGridSlot extends ItemsGridSlot {
-
-        public HistoryGridSlot(int slotIndex, int itemIndex, ItemStack item) {
-            super(slotIndex, itemIndex, item);
-        }
-
-        @Override
-        public RecipeId getRecipeId() {
-            return FavoriteRecipes.getFavorite(this.item);
-        }
-    }
-
-    public ItemHistoryPanel() {
-        this.grid = new ItemsGrid<>() {
-
-            protected List<HistoryGridSlot> gridMask;
-
-            @Override
-            protected void onGridChanged() {
-                this.gridMask = null;
-                super.onGridChanged();
-            }
-
-            @Override
-            public List<HistoryGridSlot> getMask() {
-
-                if (this.gridMask == null) {
-                    this.gridMask = new ArrayList<>();
-                    int itemIndex = 0;
-                    for (int slotIndex = 0; slotIndex < this.rows * this.columns && itemIndex < size(); slotIndex++) {
-                        if (!isInvalidSlot(slotIndex)) {
-                            this.gridMask.add(new HistoryGridSlot(slotIndex, itemIndex, getItem(itemIndex)));
-                            itemIndex++;
-                        }
-                    }
-
-                    ItemHistoryPanel.this.updateLinePadding();
-                }
-
-                return this.gridMask;
-            }
-
-            @Override
-            protected MouseContext getMouseContext(int mousex, int mousey) {
-                final HistoryGridSlot hovered = getSlotMouseOver(mousex, mousey);
-
-                if (hovered != null) {
-                    return new MouseContext(
-                            hovered.slotIndex,
-                            hovered.slotIndex / this.columns,
-                            hovered.slotIndex % this.columns);
-                }
-
-                return null;
-            }
-
-        };
-    }
-
-    @Override
-    protected ItemStack getDraggedStackWithQuantity(ItemStack itemStack) {
-        return ItemQuantityField.prepareStackWithQuantity(itemStack, 0);
-    }
-
-    @Override
-    public void draw(int mousex, int mousey) {
-        if (this.grid.size() > 0) {
-            super.draw(mousex, mousey);
-        }
-    }
-
-    @Override
-    public int setPanelWidth(int width) {
-        final int columns = width / ItemsGrid.SLOT_SIZE;
-        final int useRows = NEIClientConfig.getIntSetting("inventory.history.useRows");
-        final int rows = (int) Math.min(Math.ceil(this.grid.size() * 1f / columns), useRows);
-
-        this.w = width;
-        this.h = 8 + ItemsGrid.SLOT_SIZE * Math.max(rows, 1);
-
-        return rows;
-    }
-
-    public void update() {
-        this.splittingLineColor = NEIClientConfig.getSetting("inventory.history.color").getHexValue();
-        super.update();
-    }
-
-    public void addItem(ItemStack stack) {
-        if (stack != null) {
-            ItemStack is = StackInfo.withAmount(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 load() {
-
-        if (!NEIClientConfig.getBooleanSetting("inventory.history.save")) {
-            return;
-        }
-
-        String worldPath = "global";
-
-        if (NEIClientConfig.getBooleanSetting("inventory.history.worldSpecific")) {
-            worldPath = NEIClientConfig.getWorldPath();
-        }
-
-        final File dir = new File(CommonUtils.getMinecraftDir(), "saves/NEI/" + worldPath);
-
-        if (!dir.exists()) {
-            dir.mkdirs();
-        }
-
-        final File historyFile = new File(dir, "history.ini");
-
-        if (historyFile.equals(this.historyFile)) {
-            return;
-        }
-
-        List<String> itemStrings = Collections.emptyList();
-
-        if (historyFile.exists()) {
-            try (FileInputStream reader = new FileInputStream(historyFile)) {
-                NEIClientConfig.logger.info("Loading history from file {}", historyFile);
-                itemStrings = IOUtils.readLines(reader, StandardCharsets.UTF_8);
-            } catch (IOException e) {
-                NEIClientConfig.logger.error("Failed to load history from file {}", historyFile, e);
-                return;
-            }
-        }
-
-        final JsonParser parser = new JsonParser();
-        final int maxSize = Math.max(50, this.grid.rows * this.grid.columns);
-
-        this.grid.realItems.clear();
-
-        for (String itemStr : itemStrings) {
-
-            if (itemStr.isEmpty()) {
-                continue;
-            }
-
-            if (this.grid.realItems.size() >= maxSize) {
-                break;
-            }
-
-            try {
-                JsonObject row = parser.parse(itemStr).getAsJsonObject();
-                NBTTagCompound itemStackNBT = (NBTTagCompound) NBTJson.toNbt(row.get("item"));
-                ItemStack itemStack = StackInfo.loadFromNBT(itemStackNBT);
-
-                if (itemStack != null) {
-                    this.grid.realItems.add(itemStack);
-                } else {
-                    NEIClientConfig.logger.warn(
-                            "Failed to load history ItemStack from json string, the item no longer exists:\n{}",
-                            itemStr);
-                }
-            } catch (Exception e) {
-                NEIClientConfig.logger.error("Failed to load history ItemStack from json string:\n{}", itemStr);
-            }
-        }
-
-        this.grid.onItemsChanged();
-
-        this.historyFile = historyFile;
-    }
-
-    public void save() {
-
-        if (!NEIClientConfig.getBooleanSetting("inventory.history.save")) {
-            return;
-        }
-
-        if (this.historyFile == null) {
-            return;
-        }
-
-        final List<String> strings = new ArrayList<>();
-
-        for (ItemStack stack : this.grid.realItems) {
-
-            try {
-                final JsonObject row = new JsonObject();
-                row.add("item", NBTJson.toJsonObject(StackInfo.itemStackToNBT(stack)));
-                strings.add(NBTJson.toJson(row));
-            } catch (JsonSyntaxException e) {
-                NEIClientConfig.logger.error("Failed to stringify history ItemStack to json string");
-            }
-        }
-
-        try (FileOutputStream output = new FileOutputStream(this.historyFile)) {
-            IOUtils.writeLines(strings, "\n", output, StandardCharsets.UTF_8);
-        } catch (IOException e) {
-            NEIClientConfig.logger.error("Failed to save history list to file {}", this.historyFile, e);
-        }
-    }
-
-}

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

@@ -2,24 +2,26 @@ package codechicken.nei;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+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.concurrent.ForkJoinWorkerThread;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.StatCollector;
+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.util.ItemUntranslator;
+import codechicken.nei.guihook.GuiContainerManager;
 
 public class ItemList {
 
@@ -35,8 +37,11 @@ public class ItemList {
      * Updates to this should be synchronised on this
      */
     public static final List<ItemFilterProvider> itemFilterers = new LinkedList<>();
+
     public static final List<ItemsLoadedCallback> loadCallbacks = new LinkedList<>();
 
+    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.
      */
@@ -58,20 +63,6 @@ public class ItemList {
         }
     }
 
-    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 Pattern pattern;
@@ -82,34 +73,7 @@ public class ItemList {
 
         @Override
         public boolean matches(ItemStack item) {
-            String displayName = EnumChatFormatting.getTextWithoutFormattingCodes(item.getDisplayName());
-
-            if (displayName != null && !displayName.isEmpty() && this.pattern.matcher(displayName).find()) {
-                return true;
-            }
-
-            displayName = ItemUntranslator.getInstance().getItemStackDisplayName(item);
-
-            if (!displayName.isEmpty() && this.pattern.matcher(displayName).find()) {
-                return true;
-            }
-
-            if (item.hasDisplayName()) {
-                displayName = EnumChatFormatting
-                        .getTextWithoutFormattingCodes(item.getItem().getItemStackDisplayName(item));
-
-                if (displayName != null && !displayName.isEmpty() && this.pattern.matcher(displayName).find()) {
-                    return true;
-                }
-            }
-
-            for (String alias : ItemInfo.getAliases(item)) {
-                if (this.pattern.matcher(StatCollector.translateToLocal(alias)).find()) {
-                    return true;
-                }
-            }
-
-            return false;
+            return pattern.matcher(ItemInfo.getSearchName(item)).find();
         }
     }
 
@@ -122,7 +86,7 @@ public class ItemList {
         }
 
         public AllMultiItemFilter(ItemFilter... filters) {
-            this(new LinkedList<>(Arrays.asList(filters)));
+            this(Arrays.asList(filters));
         }
 
         public AllMultiItemFilter() {
@@ -134,8 +98,7 @@ public class ItemList {
             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);
+                NEIClientConfig.logger.error("Exception filtering " + item + " with " + filter, e);
             }
 
             return true;
@@ -157,10 +120,9 @@ public class ItemList {
         @Override
         public boolean matches(ItemStack item) {
             for (ItemFilter filter : filters) try {
-                if (filter != null && filter.matches(item)) return true;
+                if (filter.matches(item)) return true;
             } catch (Exception e) {
-                NEIClientConfig.logger
-                        .error("Exception filtering " + item + " with " + filter + " (" + e.getMessage() + ")", e);
+                NEIClientConfig.logger.error("Exception filtering " + item + " with " + filter, e);
             }
 
             return false;
@@ -175,10 +137,9 @@ public class ItemList {
     public static boolean itemMatchesAll(ItemStack item, List<ItemFilter> 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);
             }
         }
 
@@ -200,65 +161,119 @@ public class ItemList {
     public static List<ItemFilter> getItemFilters() {
         LinkedList<ItemFilter> filters = new LinkedList<>();
         synchronized (itemFilterers) {
-            for (ItemFilterProvider p : itemFilterers) {
-                filters.add(p.getFilter());
-            }
+            for (ItemFilterProvider p : itemFilterers) filters.add(p.getFilter());
         }
         return filters;
     }
 
-    public static ItemStack[] expandPermutations(ItemStack[] items) {
-        List<ItemStack> stacks = new ArrayList<>();
-        for (ItemStack item : items) {
-            if (item == null || item.getItem() == null) continue;
+    public static final RestartableTask loadItems = new RestartableTask("NEI Item Loading") {
 
-            if (item.getItemDamage() == Short.MAX_VALUE) {
-                List<ItemStack> permutations = itemMap.get(item.getItem());
-                if (!permutations.isEmpty()) {
-                    for (ItemStack stack : permutations) {
-                        ItemStack toAdd = stack.copy();
-                        toAdd.stackSize = item.stackSize;
-                        stacks.add(toAdd);
-                    }
-                } else {
-                    ItemStack base = new ItemStack(item.getItem(), item.stackSize);
-                    base.stackTagCompound = item.stackTagCompound;
-                    stacks.add(base);
+        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 = GuiContainerManager.concatenatedDisplayName(itemstack, false);
+                String s = name + "@" + (icon == null ? 0 : icon.hashCode());
+                if (!damageIconSet.contains(s)) {
+                    damageIconSet.add(s);
+                    permutations.add(itemstack);
                 }
-                continue;
+            } catch (TimeoutException t) {
+                throw t;
+            } catch (Throwable t) {
+                NEIServerUtils.logOnce(
+                        t,
+                        stackTraces,
+                        "Ommiting " + item + ":" + damage + " " + item.getClass().getSimpleName(),
+                        item.toString());
             }
-
-            stacks.add(item.copy());
         }
 
-        return stacks.toArray(new ItemStack[0]);
-    }
+        @Override
+        @SuppressWarnings("unchecked")
+        public void execute() {
+            // System.out.println("Executing NEI Item Loading");
+            ThreadOperationTimer timer = getTimer(NEIClientConfig.getItemLoadingTimeout());
+            loadFinished = false;
 
-    public static ForkJoinPool forkJoinPool;
+            LinkedList<ItemStack> items = new LinkedList<>();
+            LinkedList<ItemStack> permutations = new LinkedList<>();
+            ListMultimap<Item, ItemStack> itemMap = ArrayListMultimap.create();
 
-    static {
-        final ForkJoinPool.ForkJoinWorkerThreadFactory factory = new ForkJoinPool.ForkJoinWorkerThreadFactory() {
+            timer.setLimit(NEIClientConfig.getItemLoadingTimeout());
+            for (Item item : (Iterable<Item>) Item.itemRegistry) {
+                if (interrupted()) return;
 
-            private int workerId;
+                if (item == null || erroredItems.contains(item)) continue;
 
-            @Override
-            public ForkJoinWorkerThread newThread(ForkJoinPool pool) {
-                final ForkJoinWorkerThread worker = ForkJoinPool.defaultForkJoinWorkerThreadFactory.newThread(pool);
-                worker.setName("NEI-worker-thread-" + workerId++);
-                return worker;
+                try {
+                    timer.reset(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();
+
+                    items.addAll(permutations);
+                    itemMap.putAll(item, permutations);
+                } catch (Throwable t) {
+                    NEIServerConfig.logger.error("Removing item: " + item + " from list.", t);
+                    erroredItems.add(item);
+                }
             }
-        };
-        int poolSize = Runtime.getRuntime().availableProcessors() * 2 / 3;
+
+            if (interrupted()) return;
+            ItemList.items = items;
+            ItemList.itemMap = itemMap;
+            for (ItemsLoadedCallback callback : loadCallbacks) callback.itemsLoaded();
+
+            updateFilter.restart();
+
+            loadFinished = true;
+        }
+    };
+
+    public static ForkJoinPool getPool(int poolSize) {
         if (poolSize < 1) poolSize = 1;
-        forkJoinPool = new ForkJoinPool(poolSize, factory, null, false);
+
+        return new ForkJoinPool(poolSize);
     }
 
-    // The item list pipeline lives in ItemListLoader; these references are kept for backward compatibility.
-    public static final RestartableTask loadItems = ItemListLoader.loadItems;
+    public static final int numProcessors = Runtime.getRuntime().availableProcessors();
+    public static ForkJoinPool forkJoinPool = getPool(numProcessors * 2 / 3);
 
-    public static final RestartableTask refreshItems = ItemListLoader.refreshItems;
+    public static final RestartableTask updateFilter = new RestartableTask("NEI Item Filtering") {
 
-    public static final RestartableTask updateFilter = ItemListLoader.updateFilter;
+        @Override
+        public void execute() {
+            // 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();
+            } catch (InterruptedException | ExecutionException e) {
+                filtered = new ArrayList<>();
+                e.printStackTrace();
+                stop();
+            }
+
+            if (interrupted()) return;
+            ItemSorter.sort(filtered);
+            if (interrupted()) return;
+            ItemPanel.updateItemList(filtered);
+        }
+    };
 
     /**
      * @deprecated Use updateFilter.restart()

src/main/java/codechicken/nei/ItemListLoader.java

@@ -1,383 +0,0 @@
-package codechicken.nei;
-
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ExecutionException;
-import java.util.stream.Collectors;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.IIcon;
-import net.minecraftforge.fluids.IFluidContainerItem;
-
-import com.google.common.base.Throwables;
-import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.ListMultimap;
-
-import codechicken.nei.ItemList.ItemsLoadedCallback;
-import codechicken.nei.ThreadOperationTimer.TimeoutException;
-import codechicken.nei.api.ItemFilter;
-import codechicken.nei.api.ItemInfo;
-import codechicken.nei.recipe.InformationHandler;
-import codechicken.nei.recipe.RecipeHandlerRef;
-import codechicken.nei.recipe.RepairRecipeHandler;
-import codechicken.nei.search.TooltipFilter;
-import cpw.mods.fml.common.FMLLog;
-
-public class ItemListLoader {
-
-    private static final HashSet<Item> erroredItems = new HashSet<>();
-    private static Map<ItemStack, Integer> ordering = new HashMap<>();
-
-    private ItemListLoader() {}
-
-    private static void damageSearch(Item item, List<ItemStack> permutations) {
-        final Set<String> damageIconSet = new HashSet<>();
-        final EntityPlayer player = Minecraft.getMinecraft().thePlayer;
-
-        for (int damage = 0; damage < 16; damage++) {
-            try {
-                final ItemStack itemstack = new ItemStack(item, 1, damage);
-                final IIcon icon = item.getIconIndex(itemstack);
-                final String key = itemstack.getDisplayName() + "@"
-                        + (icon == null ? 0 : icon.hashCode())
-                        + "@"
-                        + getInformation(itemstack, player);
-
-                if (damageIconSet.add(key)) {
-                    permutations.add(itemstack);
-                }
-            } catch (TimeoutException t) {
-                throw t;
-            } catch (Throwable t) {
-                NEIClientUtils.errorOnce(
-                        "ItemListLoader: " + item.toString(),
-                        "Ommiting " + item + ":" + damage + " " + item.getClass().getSimpleName(),
-                        t);
-            }
-        }
-    }
-
-    private static String getInformation(ItemStack stack, EntityPlayer player) {
-        try {
-            final List<String> tooltip = new ArrayList<>();
-            stack.getItem().addInformation(stack, player, tooltip, false);
-            return String.join("\n", tooltip);
-        } catch (Throwable ignored) {}
-
-        return "";
-    }
-
-    private static void updateOrdering(List<ItemStack> items) {
-        final Map<ItemStack, Integer> newOrdering = new HashMap<>();
-
-        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));
-                }
-            }
-        } else {
-            int orderIndex = 0;
-
-            for (ItemStack stack : items) {
-                newOrdering.put(stack, orderIndex++);
-            }
-        }
-
-        ordering = newOrdering;
-    }
-
-    private static 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());
-    }
-
-    private static void runChecked(ItemStack stack, Runnable action, String reason) {
-        int hashOld = 0;
-        if (stack.hasTagCompound()) {
-            hashOld = stack.stackTagCompound.hashCode();
-        }
-
-        action.run();
-
-        if (stack.hasTagCompound() && hashOld != stack.stackTagCompound.hashCode()) {
-            FMLLog.warning(
-                    "NEI: Forced tag update with reason (" + reason + ") for " + stack + "(" + stack.getItem() + ")");
-        }
-    }
-
-    private static void forceTagCompoundInitialization(ItemStack stack) {
-        Item item = stack.getItem();
-        if (item == null) {
-            return;
-        }
-        if (item instanceof IFluidContainerItem fluidItem) {
-            runChecked(stack, () -> fluidItem.getFluid(stack), "getFluid");
-        }
-        runChecked(stack, () -> item.isDamaged(stack), "isDamaged");
-        runChecked(stack, () -> item.getDamage(stack), "getDamage");
-        runChecked(stack, () -> item.showDurabilityBar(stack), "showDurabilityBar");
-        runChecked(stack, () -> item.getAttributeModifiers(stack), "getAttributeModifiers");
-        runChecked(stack, () -> item.getDurabilityForDisplay(stack), "getDurabilityForDisplay");
-        runChecked(stack, () -> item.getItemStackLimit(stack), "getItemStackLimit");
-        runChecked(stack, () -> item.getToolClasses(stack), "getToolClasses");
-        runChecked(stack, () -> item.getUnlocalizedNameInefficiently(stack), "getUnlocalizedNameInefficiently");
-        runChecked(stack, () -> item.hasEffect(stack), "hasEffect");
-        runChecked(stack, () -> item.getDigSpeed(stack, Blocks.stone, 0), "getDigSpeed");
-
-        /*
-         * unused... for now runChecked(stack, () -> GameRegistry.getFuelValue(stack), "getFuelValue");
-         * runChecked(stack, () -> item.getUnlocalizedName(stack), "getUnlocalizedName"); runChecked(stack, () ->
-         * item.doesContainerItemLeaveCraftingGrid(stack), "doesContainerItemLeaveCraftingGrid"); runChecked(stack, ()
-         * -> item.getItemUseAction(stack), "getItemUseAction"); runChecked(stack, () ->
-         * item.getMaxItemUseDuration(stack), "getMaxItemUseDuration"); runChecked(stack, () ->
-         * item.getPotionEffect(stack), "getPotionEffect"); runChecked(stack, () -> item.isPotionIngredient(stack),
-         * "isPotionIngredient"); runChecked(stack, () -> item.getRarity(stack), "getRarity"); runChecked(stack, () ->
-         * item.hasCustomEntity(stack), "hasCustomEntity"); runChecked(stack, () -> item.getSmeltingExperience(stack),
-         * "getSmeltingExperience"); runChecked(stack, () -> item.getMaxDamage(stack), "getMaxDamage");
-         * runChecked(stack, () -> item.getDamage(stack), "getDamage"); runChecked(stack, stack::isItemDamaged,
-         * "isItemDamaged"); runChecked(stack, () -> item.hasEffect(stack, 0), "hasEffect"); runChecked(stack, () ->
-         * item.getItemEnchantability(stack), "getItemEnchantability"); runChecked(stack, () ->
-         * item.isBeaconPayment(stack), "isBeaconPayment"); runChecked(stack, () -> item.getDamage(stack), "getDamage");
-         * runChecked(stack, () -> item.getDamage(stack), "getDamage"); runChecked(stack, () -> item.getDamage(stack),
-         * "getDamage");
-         */
-    }
-
-    @SuppressWarnings("unchecked")
-    private static List<ItemStack> gatherItems(ThreadOperationTimer timer) {
-        ItemSorter.instance.ordering.clear();
-
-        List<ItemStack> items = new ArrayList<>();
-        ListMultimap<Item, ItemStack> itemMap = ArrayListMultimap.create();
-        ItemStackSet unique = new ItemStackSet();
-
-        final List<Item> registryItems = new ArrayList<>();
-        for (Item item : (Iterable<Item>) Item.itemRegistry) registryItems.add(item);
-
-        registryItems.parallelStream().forEach(item -> {
-            if (item == null || item.delegate.name() == null || erroredItems.contains(item)) return;
-
-            try {
-                timer.reset(item);
-                List<ItemStack> permutations = getPermutations(item);
-                timer.reset();
-
-                synchronized (itemMap) {
-                    itemMap.putAll(item, permutations);
-                }
-            } catch (Throwable t) {
-                NEIServerConfig.logger.error(
-                        "Removing item: {} from list.\n{}: {}",
-                        item,
-                        t.getMessage(),
-                        Throwables.getStackTraceAsString(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 (!unique.contains(stack)) {
-                    unique.add(stack);
-                    items.add(stack);
-                }
-            }
-        }
-
-        ItemList.itemMap = itemMap;
-
-        return items;
-    }
-
-    private static void buildItemCaches(List<ItemStack> items) {
-        SearchField.searchParser.clearCache();
-        TooltipFilter.clearCache();
-        InformationHandler.clearCache();
-
-        items.parallelStream().forEach(stack -> {
-            try {
-                forceTagCompoundInitialization(stack);
-                InformationHandler.populateStacks(stack);
-            } catch (Throwable t) {
-                NEIServerConfig.logger.error(
-                        "Failed to build caches for: {}\n{}: {}",
-                        stack,
-                        t.getMessage(),
-                        Throwables.getStackTraceAsString(t));
-            }
-        });
-    }
-
-    private static void indexCollapsibleItems(List<ItemStack> items) {
-        CollapsibleItems.clearCache();
-        items.parallelStream().forEach(CollapsibleItems::putItem);
-    }
-
-    public static final RestartableTask loadItems = new RestartableTask("NEI Item Loading") {
-
-        @Override
-        public void execute() {
-            if (!NEIClientConfig.isEnabled() || NEIClientUtils.mc().thePlayer == null) return;
-
-            final ThreadOperationTimer timer = getTimer(NEIClientConfig.getItemLoadingTimeout());
-            LayoutManager.itemsLoaded = true;
-            ItemList.loadFinished = false;
-            warmTooltips.stop();
-
-            List<ItemStack> items = gatherItems(timer);
-
-            if (interrupted()) return;
-            buildItemCaches(items);
-            indexCollapsibleItems(items);
-
-            if (interrupted()) return;
-            ItemSorter.sort(items);
-
-            if (interrupted()) return;
-            ItemList.items = items;
-            for (ItemsLoadedCallback callback : ItemList.loadCallbacks) callback.itemsLoaded();
-
-            if (interrupted()) return;
-            updateOrdering(ItemList.items);
-
-            ItemList.loadFinished = true;
-
-            RepairRecipeHandler.findRepairRecipesOnceParallel();
-            RecipeHandlerRef.clearCache();
-            FavoriteRecipes.reload();
-            SubsetWidget.updateHiddenItems();
-            updateFilter.restart();
-            warmTooltips.restart();
-            loadBookmarks.restart();
-            loadHistory.restart();
-        }
-    };
-
-    public static final RestartableTask warmTooltips = new RestartableTask("NEI Tooltip Caching") {
-
-        @Override
-        public void execute() {
-            if (!ItemList.loadFinished) return;
-            // Use the common pool, not ItemList.forkJoinPool, so it does not queue behind updateFilter.
-            ItemList.items.parallelStream().forEach(stack -> {
-                if (interrupted()) return;
-                try {
-                    TooltipFilter.getSearchTooltip(stack);
-                } catch (Throwable ignored) {}
-            });
-        }
-    };
-
-    public static final RestartableTask loadBookmarks = new RestartableTask("NEI Bookmark Loading") {
-
-        @Override
-        public void execute() {
-            ItemPanels.bookmarkPanel.load();
-        }
-    };
-
-    public static final RestartableTask loadHistory = new RestartableTask("NEI History Loading") {
-
-        @Override
-        public void execute() {
-            ItemPanels.itemPanel.historyPanel.load();
-        }
-    };
-
-    public static final RestartableTask refreshItems = new RestartableTask("NEI Item Reordering") {
-
-        @Override
-        public void execute() {
-            if (!ItemList.loadFinished) return;
-
-            final List<ItemStack> items = new ArrayList<>(ItemList.items);
-
-            indexCollapsibleItems(items);
-
-            if (interrupted()) return;
-            ItemSorter.sort(items);
-
-            if (interrupted()) return;
-            ItemList.items = items;
-            updateOrdering(ItemList.items);
-
-            FavoriteRecipes.reload();
-            SubsetWidget.updateHiddenItems();
-            updateFilter.restart();
-            loadBookmarks.restart();
-            loadHistory.restart();
-        }
-    };
-
-    public static final RestartableTask updateFilter = new RestartableTask("NEI Item Filtering") {
-
-        @Override
-        public void execute() {
-
-            if (!ItemList.loadFinished) return;
-            ItemFilter filter = ItemList.getItemListFilter();
-            ArrayList<ItemStack> filtered;
-
-            try {
-                filtered = ItemList.forkJoinPool.submit(
-                        () -> ItemList.items.parallelStream().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(ordering::get));
-
-            if (interrupted()) return;
-
-            ItemPanel.updateItemList(filtered);
-        }
-    };
-}

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

@@ -1,10 +1,8 @@
 package codechicken.nei;
 
-import java.lang.reflect.Modifier;
-import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.Entity;
@@ -17,313 +15,124 @@ import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
 import net.minecraft.tileentity.TileEntityMobSpawner;
-import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 import net.minecraftforge.client.MinecraftForgeClient;
-import net.minecraftforge.common.util.ForgeDirection;
-
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 
 public class ItemMobSpawner extends ItemBlock {
 
-    private static final Map<Integer, EntityLiving> entityHashMap = new ConcurrentHashMap<>();
-    private static final Map<Integer, String> IDtoNameMap = new ConcurrentHashMap<>();
-    private static final Map<Class<? extends Entity>, String> ENTITY_CLASS_TO_NAME_CACHE = new ConcurrentHashMap<>();
-
-    public static int idPig = 90;
-    private static volatile boolean loaded = false;
-
-    // For asm
-    public static int placedX;
-    public static int placedY;
-    public static int placedZ;
-
-    public static void setLastPlacedPosition(int x, int y, int z) {
-        placedX = x;
-        placedY = y;
-        placedZ = z;
-    }
-
-    public static int[] getLastPlacedPosition() {
-        return new int[] { placedX, placedY, placedZ };
-    }
+    private static final Map<Integer, EntityLiving> entityHashMap = new HashMap<>();
+    private static final Map<Integer, String> IDtoNameMap = new HashMap<>();
+    public static int idPig;
+    private static boolean loaded;
 
     public ItemMobSpawner() {
         super(Blocks.mob_spawner);
+
         hasSubtypes = true;
         MinecraftForgeClient.registerItemRenderer(this, new SpawnerRenderer());
     }
 
+    /**
+     * These are ASM translated from BlockMobSpawner
+     */
+    public static int placedX;
+
+    public static int placedY;
+    public static int placedZ;
+
     @Override
-    public IIcon getIconFromDamage(int meta) {
+    public IIcon getIconFromDamage(int par1) {
         return Blocks.mob_spawner.getBlockTextureFromSide(0);
     }
 
-    @Override
-    public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int x, int y, int z, int side,
-            float hitX, float hitY, float hitZ) {
-        int targetX = x;
-        int targetY = y;
-        int targetZ = z;
-
-        if (!world.getBlock(x, y, z).isReplaceable(world, x, y, z)) {
-            ForgeDirection direction = ForgeDirection.getOrientation(side);
-            targetX += direction.offsetX;
-            targetY += direction.offsetY;
-            targetZ += direction.offsetZ;
-        }
-
-        placedX = targetX;
-        placedY = targetY;
-        placedZ = targetZ;
-
-        String mobType = getMobTypeFromItemStack(itemstack);
-
-        boolean placed = super.onItemUse(itemstack, entityplayer, world, x, y, z, side, hitX, hitY, hitZ);
-
-        if (placed) {
-            TileEntity tileEntity = world.getTileEntity(targetX, targetY, targetZ);
-
-            if (tileEntity instanceof TileEntityMobSpawner spawner && mobType != null) {
-                spawner.func_145881_a().setEntityName(mobType);
-
-                if (!world.isRemote) {
-                    world.markBlockForUpdate(targetX, targetY, targetZ);
-                    NEICPH.sendMobSpawnerID(targetX, targetY, targetZ, mobType);
+    public boolean onItemUse(ItemStack itemstack, EntityPlayer entityplayer, World world, int x, int y, int z, int par7,
+            float par8, float par9, float par10) {
+        if (super.onItemUse(itemstack, entityplayer, world, x, y, z, par7, par8, par9, par10) && world.isRemote) {
+            TileEntityMobSpawner tileentitymobspawner = (TileEntityMobSpawner) world
+                    .getTileEntity(placedX, placedY, placedZ);
+            if (tileentitymobspawner != null) {
+                setDefaultTag(itemstack);
+                String mobtype = IDtoNameMap.get(itemstack.getItemDamage());
+                if (mobtype != null) {
+                    NEICPH.sendMobSpawnerID(placedX, placedY, placedZ, mobtype);
+                    tileentitymobspawner.func_145881_a().setEntityName(mobtype);
                 }
             }
-
             return true;
         }
-
         return false;
     }
 
-    private String getMobTypeFromItemStack(ItemStack stack) {
-        int meta = getValidMetaData(stack);
-        return IDtoNameMap.get(meta);
-    }
-
-    private int getValidMetaData(ItemStack stack) {
-        int meta = stack.getItemDamage();
-        if (meta == 0 || !IDtoNameMap.containsKey(meta)) {
-            return idPig;
-        }
-        return meta;
-    }
-
-    @SideOnly(Side.CLIENT)
     @Override
-    public void addInformation(ItemStack itemstack, EntityPlayer player, List<String> tooltip, boolean advanced) {
-        int meta = getValidMetaData(itemstack);
-        EntityLiving entity = getEntity(meta);
-        String mobName = IDtoNameMap.get(meta);
-
-        if (entity != null && mobName != null) {
-            EnumChatFormatting color = (entity instanceof IMob) ? EnumChatFormatting.DARK_RED
-                    : EnumChatFormatting.DARK_AQUA;
-            tooltip.add(color + mobName);
+    public 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("\u00A7" + (e instanceof IMob ? "4" : "3") + IDtoNameMap.get(meta));
     }
 
-    public static EntityLiving getEntity(int id) {
-        EntityLiving cached = entityHashMap.get(id);
-        if (cached != null) {
-            return cached;
-        }
-
-        loadSpawners();
-
-        Class<?> entityClass = EntityList.IDtoClassMapping.get(id);
-        World world = NEIClientUtils.mc() != null ? NEIClientUtils.mc().theWorld : null;
-
-        if (isInvalidEntityClass(entityClass)) {
-            return cacheFallback(id);
-        }
-
-        EntityLiving entity = createEntityInstance(entityClass, world, id);
-        if (entity != null) {
-            entityHashMap.put(id, entity);
-        }
-
-        return entity;
-    }
-
-    private static boolean isInvalidEntityClass(Class<?> entityClass) {
-        if (entityClass == null) {
-            return true;
-        }
-
-        int modifiers = entityClass.getModifiers();
-        if (Modifier.isAbstract(modifiers) || Modifier.isInterface(modifiers)) {
-            NEIClientConfig.logger.warn("Skipping abstract/interface entity class: {}", entityClass.getName());
-            return true;
-        }
-
-        if (!EntityLiving.class.isAssignableFrom(entityClass)) {
-            NEIClientConfig.logger.warn("Skipping non-EntityLiving class: {}", entityClass.getName());
-            return true;
-        }
-
-        return false;
-    }
-
-    @SuppressWarnings("unchecked")
-    private static EntityLiving createEntityInstance(Class<?> entityClass, World world, int id) {
-        if (entityClass == null || world == null) {
-            NEIClientConfig.logger.debug("World or entity class is null, using fallback for ID: {}", id);
-            return getFallbackEntity(id);
-        }
-
-        try {
-            Class<? extends EntityLiving> livingClass = (Class<? extends EntityLiving>) entityClass;
-            return livingClass.getConstructor(World.class).newInstance(world);
-        } catch (Throwable t) {
-            logEntityCreationError(entityClass, id, t);
-            return getFallbackEntity(id);
-        }
-    }
-
-    private static void logEntityCreationError(Class<?> entityClass, int id, Throwable t) {
-        String entityName = IDtoNameMap.getOrDefault(id, "unknown");
-        if (entityClass == null) {
-            NEIClientConfig.logger
-                    .error("Failed to create entity instance: Class is null for ID {}, Name {}", id, entityName, t);
-        } else {
-            NEIClientConfig.logger.error(
-                    "Failed to create instance of entity: Class {}, ID {}, Name {}",
-                    entityClass.getName(),
-                    id,
-                    entityName,
-                    t);
-        }
-    }
-
-    private static EntityLiving cacheFallback(int id) {
-        EntityLiving fallback = getFallbackEntity(id);
-        if (fallback != null) {
-            entityHashMap.put(id, fallback);
-        }
-        return fallback;
-    }
-
-    private static EntityLiving getFallbackEntity(int originalId) {
-        EntityLiving pig = entityHashMap.get(idPig);
-        if (pig == null) {
-            World world = NEIClientUtils.mc() != null ? NEIClientUtils.mc().theWorld : null;
-
-            if (world != null) {
-                try {
-                    pig = new EntityPig(world);
-                    entityHashMap.put(idPig, pig);
-                    NEIClientConfig.logger.debug("Created fallback pig entity for ID: {}", originalId);
-                } catch (Exception e) {
-                    NEIClientConfig.logger
-                            .error("Failed to create fallback pig entity for original ID: {}", originalId, e);
-                }
-            } else {
-                NEIClientConfig.logger.warn("World is null, cannot create fallback entity for ID: {}", originalId);
-            }
-        }
-
-        return pig;
-    }
-
-    public static void clearEntityReferences() {
-        entityHashMap.clear();
-        NEIClientConfig.logger.debug("Cleared all entity references from cache");
-    }
-
-    public static void loadSpawners() {
-        if (loaded) {
-            return;
-        }
-
-        synchronized (ItemMobSpawner.class) {
+    public static EntityLiving getEntity(int ID) {
+        EntityLiving e = entityHashMap.get(ID);
+        if (e == null) {
+            World world = NEIClientUtils.mc().theWorld;
+            loadSpawners(world);
+            Class<?> clazz = (Class<?>) EntityList.IDtoClassMapping.get(ID);
             try {
-                for (Map.Entry<Class<? extends Entity>, String> entry : EntityList.classToStringMapping.entrySet()) {
-
-                    Class<? extends Entity> clazz = entry.getKey();
-                    String name = entry.getValue();
-
-                    if (shouldRegisterEntity(clazz, name)) {
-                        Integer id = (Integer) EntityList.classToIDMapping.get(clazz);
-                        if (id != null) {
-                            IDtoNameMap.put(id, name);
-                            ENTITY_CLASS_TO_NAME_CACHE.put(clazz, name);
-
-                            if ("Pig".equals(name)) {
-                                idPig = id;
-                                NEIClientConfig.logger.debug("Set pig entity ID to: {}", id);
-                            }
-                        }
-                    }
-                }
-                loaded = true;
-                NEIClientConfig.logger.info("Loaded {} spawner entity mappings", IDtoNameMap.size());
-
-            } catch (Exception e) {
-                NEIClientConfig.logger.error("Error loading spawners from entity list", e);
+                e = (EntityLiving) clazz.getConstructor(new Class[] { World.class }).newInstance(world);
+            } catch (Throwable t) {
+                if (clazz == null)
+                    NEIClientConfig.logger.error("Null class for entity (" + ID + ", " + IDtoNameMap.get(ID));
+                else NEIClientConfig.logger.error("Error creating instance of entity: " + clazz.getName(), t);
+                e = getEntity(idPig);
             }
+            entityHashMap.put(ID, e);
         }
+        return e;
     }
 
-    private static boolean shouldRegisterEntity(Class<? extends Entity> clazz, String name) {
-        if (clazz == null || name == null || name.trim().isEmpty()) {
-            return false;
+    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);
+    }
+
+    public static void loadSpawners(World world) {
+        if (loaded) return;
+        loaded = true;
+        HashMap<Class<Entity>, String> classToStringMapping = (HashMap<Class<Entity>, String>) EntityList.classToStringMapping;
+        HashMap<Class<Entity>, Integer> classToIDMapping = (HashMap<Class<Entity>, Integer>) EntityList.classToIDMapping;
+        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) {}
         }
 
-        if (!EntityLiving.class.isAssignableFrom(clazz)) {
-            return false;
-        }
-
-        if ("EnderDragon".equals(name) || "Giant".equals(name)) {
-            return false;
-        }
-
-        return true;
+        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 {
-            loadSpawners();
-            for (int id : IDtoNameMap.keySet()) {
-                ItemStack stack = new ItemStack(item, 1, id);
-                list.add(stack);
-            }
-        }
-    }
-
-    public static String getEntityNameForMeta(int meta) {
-        loadSpawners();
-        return IDtoNameMap.getOrDefault(meta, IDtoNameMap.getOrDefault(idPig, "Pig"));
-    }
-
-    public static boolean isValidEntityMeta(int meta) {
-        loadSpawners();
-        return IDtoNameMap.containsKey(meta) || meta == 0;
-    }
-
-    public static Map<Integer, String> getRegisteredSpawnerEntities() {
-        loadSpawners();
-        return Collections.unmodifiableMap(IDtoNameMap);
-    }
-
-    public static boolean isEntityValidForSpawner(Class<? extends Entity> entityClass) {
-        if (entityClass == null) return false;
-
-        String name = ENTITY_CLASS_TO_NAME_CACHE.get(entityClass);
-        if (name == null) {
-            name = EntityList.classToStringMapping.get(entityClass);
-        }
-
-        return name != null && shouldRegisterEntity(entityClass, name);
+    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,18 +1,17 @@
 package codechicken.nei;
 
+import static codechicken.lib.gui.GuiDraw.drawRect;
+
 import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+
+import javax.annotation.Nullable;
 
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.item.ItemStack;
 
-import codechicken.lib.gui.GuiDraw;
 import codechicken.lib.vec.Rectangle4i;
-import codechicken.nei.ItemsPanelGrid.ItemsPanelGridSlot;
-import codechicken.nei.util.NEIMouseUtils;
 
-public class ItemPanel extends PanelWidget<ItemsPanelGrid> {
+public class ItemPanel extends PanelWidget {
 
     /**
      * Backwards compat :-/
@@ -32,50 +31,66 @@ public class ItemPanel extends PanelWidget<ItemsPanelGrid> {
         return super.getStackMouseOver(mousex, mousey);
     }
 
-    public ItemHistoryPanel historyPanel = new ItemHistoryPanel();
-    public ItemCraftablesPanel craftablesPanel = new ItemCraftablesPanel();
-    protected Button toggleGroups;
+    public Button more;
+    public Button less;
+    public ItemQuantityField quantity;
 
-    @Deprecated
-    public static class ItemPanelSlot extends ItemsPanelGridSlot {
+    public static class ItemPanelSlot {
 
-        @Deprecated
-        public ItemPanelSlot(int idx, ItemStack item) {
-            this(idx, 0, item);
+        public ItemStack item;
+        public int slotIndex;
+
+        public ItemPanelSlot(int idx, ItemStack stack) {
+            slotIndex = idx;
+            item = stack;
         }
 
         @Deprecated
         public ItemPanelSlot(int idx) {
-            this(idx, 0, ItemPanels.itemPanel.getGrid().getItem(idx));
+            this(idx, ItemPanels.itemPanel.getGrid().getItem(idx));
+        }
+    }
+
+    protected static class ItemPanelGrid extends ItemsGrid {
+
+        public ArrayList<ItemStack> newItems;
+
+        public void setItems(ArrayList<ItemStack> items) {
+            newItems = items;
         }
 
-        private ItemPanelSlot(int slotIndex, int itemIndex, ItemStack item) {
-            super(slotIndex, itemIndex, item);
-        }
+        public void refresh(GuiContainer gui) {
 
-        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;
+                onItemsChanged();
             }
 
-            return null;
+            super.refresh(gui);
+        }
+
+        @Override
+        protected void beforeDrawSlot(@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.beforeDrawSlot(focused, slotIdx, rect);
+            }
+        }
+
+        @Override
+        public String getMessageOnEmpty() {
+            return ItemList.loadFinished ? null : NEIClientUtils.translate("itempanel.loading");
         }
     }
 
     public ItemPanel() {
-        this.grid = new ItemsPanelGrid();
+        grid = new ItemPanelGrid();
     }
 
     public static void updateItemList(ArrayList<ItemStack> newItems) {
-        ItemPanels.itemPanel.getGrid().setItems(newItems);
+        ((ItemPanelGrid) ItemPanels.itemPanel.getGrid()).setItems(newItems);
         ItemPanels.itemPanel.realItems = newItems;
     }
 
@@ -83,195 +98,126 @@ public class ItemPanel extends PanelWidget<ItemsPanelGrid> {
     public void init() {
         super.init();
 
-        toggleGroups = new Button("G") {
-
-            @Override
-            public String getRenderLabel() {
-                return NEIClientUtils.translate("itempanel.collapsed.button");
-            }
-
-            @Override
-            public String getButtonTip() {
-                return NEIClientUtils.translate("itempanel.collapsed.button.tip");
-            }
+        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()));
     }
 
-    @Override
-    public Rectangle4i calculateBounds(GuiContainer gui) {
-        final int maxWidth = (gui.width - 176) / 2 - PADDING * 2;
-        final int maxHeight = gui.height - PADDING * 2;
-        final int freeSpace = (gui.width - gui.xSize) / 2 - PADDING * 2;
-
-        final int paddingLeft = (int) Math
-                .ceil(maxWidth * NEIClientConfig.getSetting("world.panels.items.left").getIntValue() / 100000.0);
-        final int paddingTop = (int) Math
-                .ceil(maxHeight * NEIClientConfig.getSetting("world.panels.items.top").getIntValue() / 100000.0);
-        final int paddingRight = (int) Math
-                .ceil(maxWidth * NEIClientConfig.getSetting("world.panels.items.right").getIntValue() / 100000.0);
-        final int paddingBottom = (int) Math
-                .ceil(maxHeight * NEIClientConfig.getSetting("world.panels.items.bottom").getIntValue() / 100000.0);
-
-        final int width = Math.max(
-                ItemsGrid.SLOT_SIZE,
-                snapDownToMultiple(
-                        Math.min(freeSpace - paddingRight, maxWidth - paddingLeft - paddingRight),
-                        ItemsGrid.SLOT_SIZE));
-        final int height = Math.max(ItemsGrid.SLOT_SIZE, maxHeight - paddingTop - paddingBottom);
-
-        return new Rectangle4i(gui.width - width - PADDING - paddingRight, paddingTop + PADDING, width, height);
+    protected String getPositioningSettingName() {
+        return "world.panels.items";
     }
 
-    @Override
-    protected int resizeHeader(GuiContainer gui) {
-        int marginTop = super.resizeHeader(gui);
+    public int getMarginLeft(GuiContainer gui) {
+        return (gui.width + gui.xSize) / 2 + PADDING;
+    }
 
-        toggleGroups.w = pageNext.w;
-        toggleGroups.h = pageNext.h;
-        toggleGroups.y = pageNext.y;
-        toggleGroups.x = pageNext.x - toggleGroups.w - 2;
+    public int getMarginTop(GuiContainer gui) {
+        return PADDING;
+    }
 
-        return marginTop;
+    public int getWidth(GuiContainer gui) {
+        return gui.width - (gui.xSize + gui.width) / 2 - PADDING * 2;
+    }
+
+    public int getHeight(GuiContainer gui) {
+        return gui.height - getMarginTop(gui) - PADDING;
     }
 
     protected int resizeFooter(GuiContainer gui) {
-        int footerY = y + h;
-        int footerHeight = 0;
+        if (!NEIClientConfig.showItemQuantityWidget() && NEIClientConfig.isSearchWidgetCentered()) return 0;
 
-        if (grid.getPerPage() == 0) {
-            return 0;
+        final int BUTTON_SIZE = 20;
+        more.w = less.w = BUTTON_SIZE;
+        quantity.h = BUTTON_SIZE;
+
+        if (NEIClientConfig.isSearchWidgetCentered()) {
+            more.h = less.h = BUTTON_SIZE;
+            more.x = x + w - BUTTON_SIZE;
+            more.y = less.y = quantity.y = y + h - BUTTON_SIZE;
+            less.x = x;
+            quantity.x = x + BUTTON_SIZE + 2;
+            quantity.w = more.x - quantity.x - 2;
+        } else {
+            quantity.x = (int) (x + (w * 0.7)) + 3;
+            quantity.y = y + h - BUTTON_SIZE;
+            quantity.w = (int) ((w * 0.3) - BUTTON_SIZE - 1);
+
+            more.h = less.h = BUTTON_SIZE / 2;
+            more.y = y + h - (more.h * 2);
+
+            less.x = more.x = quantity.x + quantity.w;
+            less.y = more.y + more.h;
         }
 
-        if (NEIClientConfig.showItemQuantityWidget() || !NEIClientConfig.isSearchWidgetCentered()) {
-            footerY = LayoutManager.quantity.y;
-            footerHeight = LayoutManager.quantity.h + PanelWidget.PADDING;
-        }
-
-        if (NEIClientConfig.showHistoryPanelWidget()) {
-            historyPanel.x = x;
-
-            if (historyPanel.setPanelWidth(w) != 0) {
-                footerY = historyPanel.y = footerY - historyPanel.h;
-                footerHeight += historyPanel.h;
-            }
-
-        }
-
-        if (NEIClientConfig.showCraftablesPanelWidget()) {
-            craftablesPanel.x = x;
-
-            if (craftablesPanel.setPanelWidth(w) != 0) {
-                footerY = craftablesPanel.y = footerY - craftablesPanel.h;
-                footerHeight += craftablesPanel.h;
-            }
-        }
-
-        return footerHeight;
+        return BUTTON_SIZE + 2;
     }
 
     @Override
     public void setVisible() {
         super.setVisible();
 
-        if (grid.getPerPage() > 0) {
-
-            if (!CollapsibleItems.isEmpty() && !grid.isEmpty()) {
-                LayoutManager.addWidget(toggleGroups);
-            }
-
-            if (NEIClientConfig.showCraftablesPanelWidget()) {
-                LayoutManager.addWidget(craftablesPanel);
-            }
-
-            if (NEIClientConfig.showHistoryPanelWidget()) {
-                LayoutManager.addWidget(historyPanel);
-            }
-
+        if (grid.getPerPage() > 0 && NEIClientConfig.showItemQuantityWidget()) {
+            LayoutManager.addWidget(more);
+            LayoutManager.addWidget(less);
+            LayoutManager.addWidget(quantity);
         }
     }
 
-    @Override
-    public void resize(GuiContainer gui) {
-        super.resize(gui);
-        this.historyPanel.resize(gui);
-        this.craftablesPanel.resize(gui);
-    }
+    protected ItemStack getDraggedStackWithQuantity(int mouseDownSlot) {
+        ItemStack stack = grid.getItem(mouseDownSlot);
 
-    protected ItemStack getDraggedStackWithQuantity(ItemStack itemStack) {
-        return ItemQuantityField.prepareStackWithQuantity(itemStack, 0);
-    }
+        if (stack != null) {
+            int amount = NEIClientConfig.showItemQuantityWidget() ? NEIClientConfig.getItemQuantity() : 0;
 
-    @Override
-    public List<String> handleItemTooltip(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);
+            if (amount == 0) {
+                amount = stack.getMaxStackSize();
             }
+
+            return NEIServerUtils.copyStack(stack, amount);
         }
 
-        return super.handleItemTooltip(itemstack, mousex, mousey, currenttip);
+        return null;
     }
-
-    @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(int mousex, int mousey, Map<String, String> hotkeys) {
-        final ItemsPanelGridSlot hoverSlot = this.grid.getSlotMouseOver(mousex, mousey);
-
-        if (!this.grid.forceExpand && hoverSlot != null && hoverSlot.groupIndex >= 0 && hoverSlot.groupSize > 1) {
-            final String message = hoverSlot.extended ? "itempanel.collapsed.hint.collapse"
-                    : "itempanel.collapsed.hint.expand";
-            hotkeys.put(
-                    NEIClientUtils.getKeyName(NEIClientUtils.ALT_HASH, NEIMouseUtils.MOUSE_BTN_LMB),
-                    NEIClientUtils.translate(message, hoverSlot.groupSize));
-        }
-
-        return super.handleHotkeys(mousex, mousey, hotkeys);
-    }
-
-    public boolean containsWithSubpanels(int px, int py) {
-        return contains(px, py) || NEIClientConfig.showHistoryPanelWidget() && this.historyPanel.contains(px, py)
-                || NEIClientConfig.showCraftablesPanelWidget() && this.craftablesPanel.contains(px, py);
-    }
-
 }

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

@@ -1,11 +1,6 @@
 package codechicken.nei;
 
-import net.minecraft.client.Minecraft;
-import net.minecraft.item.ItemStack;
-
-import org.lwjgl.input.Keyboard;
-
-import codechicken.nei.recipe.StackInfo;
+import static codechicken.nei.NEIClientUtils.translate;
 
 public class ItemQuantityField extends TextField {
 
@@ -15,80 +10,18 @@ public class ItemQuantityField extends TextField {
         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 = NEIClientUtils.getScrollMultiplier(stack);
-        }
-
-        return StackInfo.withAmount(stack, amount);
-    }
-
     @Override
     public void gainFocus() {
         if (text().equals("0")) {
@@ -103,21 +36,35 @@ public class ItemQuantityField extends TextField {
 
     @Override
     public void onTextChange(String oldText) {
-        NEIClientUtils.setItemQuantity(getInteger());
+        NEIClientUtils.setItemQuantity(intValue());
+    }
+
+    @Override
+    public void draw(int mousex, int mousey) {
+
+        if (!focused() && intValue() == 0) {
+            field.setText(translate("itempanel.quantity.default"));
+            field.setEnabled(false);
+            super.draw(mousex, mousey);
+            field.setEnabled(true);
+            field.setText("0");
+        } else {
+            super.draw(mousex, mousey);
+        }
     }
 
     @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)));
+        int quantity = intValue() + i * multiplier;
+        setText(Integer.toString(quantity));
         return true;
     }
 

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

@@ -4,19 +4,19 @@ 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.ItemList.ItemsLoadedCallback;
 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 class ItemSorter implements Comparator<ItemStack>, ItemsLoadedCallback {
 
     public static class SortEntry {
 
@@ -44,10 +44,12 @@ public class ItemSorter implements Comparator<ItemStack> {
     public static final ItemSorter instance = new ItemSorter();
 
     // optimisations
-    public Map<ItemStack, Integer> ordering = new HashMap<>();
+    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);
@@ -63,6 +65,14 @@ public class ItemSorter implements Comparator<ItemStack> {
         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;
 
@@ -113,12 +123,20 @@ 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));
+        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) {

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

@@ -1,143 +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();
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-
-        if (obj instanceof ItemStackAmount items) {
-            return this.itemMap.equals(items.itemMap);
-        }
-
-        return false;
-    }
-
-    public static ItemStackAmount of(ItemStackAmount map) {
-        ItemStackAmount result = new ItemStackAmount();
-        result.itemMap.putAll(map.itemMap);
-        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

@@ -5,11 +5,9 @@ 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;
@@ -26,13 +24,8 @@ public class ItemStackMap<T> {
 
         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,11 +35,12 @@ public class ItemStackMap<T> {
         }
 
         public int hashCode() {
-            return this.hashCode;
+            return Objects.hashCode(damage, tag);
         }
 
         public boolean equals(Object o) {
-            if (!(o instanceof StackMetaKey t)) return false;
+            if (!(o instanceof StackMetaKey)) return false;
+            StackMetaKey t = (StackMetaKey) o;
             return damage == t.damage && Objects.equal(tag, t.tag);
         }
     }
@@ -197,7 +191,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) {
@@ -217,26 +211,13 @@ public class ItemStackMap<T> {
     public void put(ItemStack key, T value) {
         if (key == null || key.getItem() == null) return;
 
-        DetailMap map = itemMap.computeIfAbsent(key.getItem(), k -> new DetailMap());
+        DetailMap map = itemMap.get(key.getItem());
+        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) {

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

@@ -1,5 +1,7 @@
 package codechicken.nei;
 
+import java.util.List;
+
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -27,16 +29,11 @@ public class ItemStackSet extends ItemStackMap<ItemStack> implements ItemFilter
         put(item, item);
     }
 
-    public ItemStackSet addAll(Iterable<ItemStack> items) {
+    public ItemStackSet addAll(List<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,282 +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")
-                        || KeyManager.isKeyDown("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_ENABLE_BIT | GL11.GL_COLOR_BUFFER_BIT | GL11.GL_LIGHTING_BIT);
-            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 = KeyManager.getKeyName("itemzoom.toggle", NEIClientUtils.SHIFT_HASH);
-
-                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);
-
-            final float rightSideShift = gui.width * screenScale - availableAreaWidth;
-            final boolean leftSideFree = availableAreaWidth / screenScale < mouse.x;
-            final boolean rightSideFree = mouse.x < gui.width - availableAreaWidth / screenScale;
-
-            final boolean showOnRight = leftSideFree && rightSideFree ? !preferLeftSide() : !leftSideFree;
-
-            if (showOnRight) {
-                this.xPosition += rightSideShift;
-            }
-
-            try {
-                this.displayName = stack.getDisplayName();
-            } catch (Throwable ignored) {
-                this.displayName = "Unnamed";
-            }
-
-            // Copying the stack copies its whole NBT, so it is only done when the hovered stack changes
-            final boolean sameStack = this.stack != null && this.stack.isItemEqual(stack)
-                    && ItemStack.areItemStackTagsEqual(this.stack, stack);
-            if (!sameStack) {
-                this.stack = StackInfo.withAmount(stack, 0);
-            }
-        } else {
-            this.stack = null;
-            this.displayName = "";
-        }
-    }
-
-    private boolean preferLeftSide() {
-        switch (NEIClientConfig.getIntSetting("inventory.itemzoom.preferredSide")) {
-            case 1:
-                return true;
-            case 2:
-                return false;
-        }
-
-        final int leftCount = NEIClientConfig.isBookmarkPanelHidden()
-                || ItemPanels.bookmarkPanel.getGrid().getPerPage() == 0 ? 0 : ItemPanels.bookmarkPanel.getGrid().size();
-        final int rightCount = ItemPanels.itemPanel.getGrid().getPerPage() == 0 ? 0
-                : ItemPanels.itemPanel.getGrid().size();
-
-        return leftCount <= rightCount;
-    }
-
-    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) {
-        return false;
-    }
-
-    @Override
-    public boolean onHotkeyPressed(GuiContainer gui) {
-
-        if (KeyManager.isHashDown("itemzoom.toggle", NEIClientUtils.SHIFT_HASH)) {
-            NEIClientConfig.getSetting("inventory.itemzoom.enabled")
-                    .setBooleanValue(!NEIClientConfig.getBooleanSetting("inventory.itemzoom.enabled"));
-            return true;
-        }
-
-        if (this.stack != null && KeyManager.isKeyDown("itemzoom.hold")) {
-            return true;
-        }
-
-        if (this.stack != null && KeyManager.isKeyDown("itemzoom.zoom_in")) {
-            increaseZoom(gui);
-            previousKeyboardRepeatEnabled = Keyboard.areRepeatEventsEnabled();
-            Keyboard.enableRepeatEvents(true);
-            return true;
-        }
-
-        if (this.stack != null && KeyManager.isKeyDown("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,10 +1,12 @@
 package codechicken.nei;
 
-import java.awt.Color;
+import static codechicken.lib.gui.GuiDraw.drawRect;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Objects;
+
+import javax.annotation.Nullable;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.ScaledResolution;
@@ -15,254 +17,16 @@ import net.minecraft.client.shader.Framebuffer;
 import net.minecraft.item.ItemStack;
 
 import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.GL30;
 
 import codechicken.lib.vec.Rectangle4i;
+import codechicken.nei.ItemPanel.ItemPanelSlot;
 import codechicken.nei.api.GuiInfo;
-import codechicken.nei.api.INEIGuiHandler;
 import codechicken.nei.guihook.GuiContainerManager;
-import codechicken.nei.recipe.Recipe.RecipeId;
 import codechicken.nei.recipe.StackInfo;
 
-public abstract class ItemsGrid<T extends ItemsGrid.ItemsGridSlot, M extends ItemsGrid.MouseContext> {
+public class ItemsGrid {
 
-    protected static class ScreenCapture {
-
-        private long nextCacheRefresh = 0;
-        private final 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_ENABLE_BIT);
-
-            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 stencil values (required by mui2)
-            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 RecipeId getRecipeId() {
-            return null;
-        }
-
-        public void drawItem(Rectangle4i rect) {
-            drawItem(getItemStack(), rect);
-        }
-
-        protected void drawItem(ItemStack stack, Rectangle4i rect) {
-
-            if (rect.w != DEFAULT_SLOT_SIZE) {
-                final float panelFactor = (rect.w - 2) / (DEFAULT_SLOT_SIZE - 2);
-                GL11.glTranslatef(rect.x + 1, rect.y + 1, 0);
-                GL11.glScaled(panelFactor, panelFactor, 1);
-
-                GuiContainerManager.drawItem(0, 0, stack, true, "");
-
-                GL11.glScaled(1f / panelFactor, 1f / panelFactor, 1);
-                GL11.glTranslatef(-1 * (rect.x + 1), -1 * (rect.y + 1), 0);
-            } else {
-                GuiContainerManager.drawItem(rect.x + 1, rect.y + 1, stack, true, "");
-            }
-
-        }
-
-        public void drawBorder(Rectangle4i rect) {
-            float halfLineWidth = LINE_WIDTH / 2f;
-
-            if (this.borderLeft) {
-                NEIClientUtils
-                        .drawRect(rect.x - halfLineWidth, rect.y + halfLineWidth, LINE_WIDTH, rect.h, this.borderColor);
-            }
-
-            if (this.borderRight) {
-                NEIClientUtils.drawRect(
-                        rect.x + rect.w - halfLineWidth,
-                        rect.y - halfLineWidth,
-                        LINE_WIDTH,
-                        rect.h,
-                        this.borderColor);
-            }
-
-            if (this.borderTop) {
-                NEIClientUtils
-                        .drawRect(rect.x - halfLineWidth, rect.y - halfLineWidth, rect.w, LINE_WIDTH, this.borderColor);
-            }
-
-            if (this.borderBottom) {
-                NEIClientUtils.drawRect(
-                        rect.x + halfLineWidth,
-                        rect.y + rect.h - halfLineWidth,
-                        rect.w,
-                        LINE_WIDTH,
-                        this.borderColor);
-            }
-        }
-
-    }
-
-    public static class MouseContext {
-
-        public final int slotIndex;
-        public final int columnIndex;
-        public final int rowIndex;
-
-        public MouseContext(int slotIndex, int rowIndex, int columnIndex) {
-            this.slotIndex = slotIndex;
-            this.rowIndex = rowIndex;
-            this.columnIndex = columnIndex;
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(this.rowIndex, this.slotIndex, this.columnIndex);
-        }
-
-        public boolean equals(Object obj) {
-
-            if (obj instanceof MouseContext context) {
-                return this.columnIndex == context.columnIndex && this.rowIndex == context.rowIndex
-                        && this.slotIndex == context.slotIndex;
-            }
-
-            return false;
-        }
-
-    }
-
-    public static int SLOT_SIZE = 18;
-    public static final Color HIGHLIGHT_COLOR = new Color(0xee555555, true);
+    public static final int SLOT_SIZE = 18;
 
     protected int width;
     protected int height;
@@ -279,29 +43,29 @@ public abstract class ItemsGrid<T extends ItemsGrid.ItemsGridSlot, M extends Ite
 
     protected int rows;
     protected int columns;
+    protected List<Integer> gridMask = null;
 
     protected boolean[] invalidSlotMap;
 
-    private final GridOverlapScanner overlapScanner = new GridOverlapScanner();
+    protected Label messageLabel = new Label(getMessageOnEmpty(), true);
 
-    protected ScreenCapture screenCapture = null;
+    @Nullable
+    private Framebuffer framebuffer = null;
+
+    protected boolean refreshBuffer = true;
 
     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() {
         return realItems.size();
     }
 
-    public boolean isEmpty() {
-        return realItems.isEmpty();
-    }
-
     public int indexOf(ItemStack stackA, boolean useNBT) {
 
         for (int idx = 0; idx < realItems.size(); idx++) {
@@ -343,33 +107,23 @@ public abstract class ItemsGrid<T extends ItemsGrid.ItemsGridSlot, M extends Ite
     }
 
     public int getLastRowIndex() {
-        final List<T> mask = getMask();
-
-        return this.columns > 0 && !mask.isEmpty()
-                ? (int) Math.ceil((float) (mask.get(mask.size() - 1).slotIndex + 1) / this.columns) - 1
-                : 0;
+        return this.columns > 0 ? (int) Math.ceil((float) this.getMask().size() / this.columns) - 1 : 0;
     }
 
     public void setGridSize(int mleft, int mtop, int w, int h) {
-        final int newWidth = Math.max(0, w);
-        final int newHeight = Math.max(0, h);
-        final boolean changed = marginLeft != mleft || marginTop != mtop || width != newWidth || height != newHeight;
-
         marginLeft = mleft;
         marginTop = mtop;
 
-        width = newWidth;
-        height = newHeight;
+        width = Math.max(0, w);
+        height = Math.max(0, h);
 
-        this.columns = newWidth / SLOT_SIZE;
-        this.rows = newHeight / SLOT_SIZE;
+        columns = width / SLOT_SIZE;
+        rows = height / SLOT_SIZE;
 
         paddingLeft = (width % SLOT_SIZE) / 2;
 
-        if (changed) {
-            this.overlapScanner.invalidate();
-            onGridChanged();
-        }
+        messageLabel.x = marginLeft + width / 2;
+        messageLabel.y = marginTop + height / 2;
     }
 
     public void shiftPage(int shift) {
@@ -398,83 +152,72 @@ public abstract class ItemsGrid<T extends ItemsGrid.ItemsGridSlot, M extends Ite
     }
 
     protected void onGridChanged() {
-        if (this.screenCapture != null) {
-            this.screenCapture.refreshBuffer();
-        }
+        refreshBuffer = true;
+        this.gridMask = null;
     }
 
-    public void onItemsChanged() {
+    protected void onItemsChanged() {
         onGridChanged();
     }
 
     public void refresh(GuiContainer gui) {
-        if (this.overlapScanner.shouldRefresh()) {
-            updateGuiOverlapSlots(gui);
-        }
+        updateGuiOverlapSlots(gui);
         shiftPage(0);
     }
 
     protected void updateGuiOverlapSlots(GuiContainer gui) {
-        final boolean[] oldSlotMap = this.invalidSlotMap;
-        final int size = this.rows * this.columns;
-        final boolean[] slotMap = new boolean[size];
+        final boolean[] oldSlotMap = invalidSlotMap;
+        final int oldRows = rows;
+        final int oldColumns = columns;
 
-        this.perPage = size;
+        invalidSlotMap = new boolean[rows * columns];
+        perPage = columns * rows;
 
-        if (gui != null && size > 0) {
-            final INEIGuiHandler[] handlers = GuiInfo.getGuiHandlersSnapshot();
-            final Rectangle4i origin = getSlotRect(0, 0);
-
-            this.perPage -= this.overlapScanner.scan(
-                    rect -> GuiInfo.hideItemPanelSlot(gui, rect, handlers),
-                    origin.x,
-                    origin.y,
-                    SLOT_SIZE,
-                    this.rows,
-                    this.columns,
-                    origin.x + this.columns * SLOT_SIZE > gui.guiLeft,
-                    origin.x < gui.guiLeft + gui.xSize,
-                    slotMap);
+        if (NEIClientConfig.optimizeGuiOverlapComputation()) {
+            checkGuiOverlap(gui, 0, columns - 2, 1);
+            checkGuiOverlap(gui, columns - 1, 1, -1);
+        } else {
+            checkGuiOverlap(gui, 0, columns, 1);
         }
 
-        this.invalidSlotMap = slotMap;
-
-        if (!Arrays.equals(oldSlotMap, slotMap)) {
+        if (oldRows != rows || oldColumns != columns || !Arrays.equals(oldSlotMap, invalidSlotMap)) {
             onGridChanged();
         }
     }
 
-    public T getSlotMouseOver(int mousex, int mousey) {
-        if (!contains(mousex, mousey)) {
-            return null;
+    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) {
+            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))) {
+                    invalidSlotMap[idx] = true;
+                    validColumn = false;
+                    perPage--;
+                }
+            }
+        }
+    }
+
+    public Rectangle4i getItemRect(int idx) {
+        final List<Integer> mask = getMask();
+
+        for (int i = 0; i < mask.size(); i++) {
+            if (mask.get(i) != null && idx == mask.get(i)) {
+                return getSlotRect(i);
+            }
         }
 
-        final int overRow = getRowIndex(mousey);
-        final int overColumn = getColumnIndex(mousex);
-        final int slt = columns * overRow + overColumn;
-
-        if (overRow >= rows || overColumn >= columns) {
-            return null;
-        }
-
-        return getSlotBySlotIndex(slt);
+        return null;
     }
 
-    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 i) {
+        return getSlotRect(i / columns, i % columns);
     }
 
     public Rectangle4i getSlotRect(int row, int column) {
@@ -485,49 +228,99 @@ public abstract class ItemsGrid<T extends ItemsGrid.ItemsGridSlot, M extends Ite
                 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 List<Integer> getMask() {
 
-    protected abstract M getMouseContext(int mousex, int mousey);
+        if (this.gridMask == null) {
+            this.gridMask = new ArrayList<>();
+            int idx = page * perPage;
+
+            for (int i = 0; i < rows * columns && idx < size(); i++) {
+                this.gridMask.add(isInvalidSlot(i) ? null : idx++);
+            }
 
-    protected 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));
+
+        return this.gridMask;
+    }
+
+    private void beforeDrawItems(int mousex, int mousey, @Nullable ItemPanelSlot focused) {
+
+        final List<Integer> mask = getMask();
+
+        for (int i = 0; i < mask.size(); i++) {
+            if (mask.get(i) != null) {
+                beforeDrawSlot(focused, mask.get(i), getSlotRect(i));
+            }
         }
     }
 
-    protected void afterDrawItems(int mousex, int mousey, M mouseContext) {
-        for (T item : getMask()) {
-            item.afterDraw(getSlotRect(item.slotIndex), mouseContext);
+    private void afterDrawItems(int mousex, int mousey, @Nullable ItemPanelSlot focused) {
+        final List<Integer> mask = getMask();
+
+        for (int i = 0; i < mask.size(); i++) {
+            if (mask.get(i) != null) {
+                afterDrawSlot(focused, mask.get(i), getSlotRect(i));
+            }
         }
     }
 
     public void update() {}
 
-    protected void drawItems() {
-
-        for (T item : getMask()) {
-            item.drawItem(getSlotRect(item.slotIndex));
+    protected void beforeDrawSlot(@Nullable ItemPanelSlot focused, int slotIdx, Rectangle4i rect) {
+        if (focused != null && focused.slotIndex == slotIdx) {
+            drawRect(rect.x, rect.y, rect.w, rect.h, 0xee555555); // highlight
         }
-
     }
 
-    protected int getGridRenderingCacheMode() {
-        return NEIClientConfig.getGridRenderingCacheMode();
+    protected void afterDrawSlot(@Nullable ItemPanelSlot focused, int slotIdx, Rectangle4i rect) {}
+
+    private void blitExistingBuffer() {
+        Minecraft minecraft = Minecraft.getMinecraft();
+        GL11.glEnable(GL11.GL_BLEND);
+        OpenGlHelper.glBlendFunc(GL11.GL_ONE, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ONE_MINUS_SRC_ALPHA);
+        GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+        getFrameBuffer().bindFramebufferTexture();
+        GL11.glEnable(GL11.GL_TEXTURE_2D);
+        ScaledResolution res = new ScaledResolution(minecraft, minecraft.displayWidth, minecraft.displayHeight);
+        Tessellator tessellator = Tessellator.instance;
+        tessellator.startDrawingQuads();
+        tessellator.addVertexWithUV(0, res.getScaledHeight_double(), 0.0, 0, 0);
+        tessellator.addVertexWithUV(res.getScaledWidth_double(), res.getScaledHeight_double(), 0.0, 1, 0);
+        tessellator.addVertexWithUV(res.getScaledWidth_double(), 0, 0.0, 1, 1);
+        tessellator.addVertexWithUV(0, 0, 0, 0, 1);
+        tessellator.draw();
+        OpenGlHelper.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO);
+    }
+
+    private Framebuffer getFrameBuffer() {
+
+        if (framebuffer == null) {
+            framebuffer = new Framebuffer(1, 1, true);
+            framebuffer.setFramebufferColor(0.0F, 0.0F, 0.0F, 0.0F);
+        }
+
+        return framebuffer;
+    }
+
+    private void drawItems() {
+        GuiContainerManager.enableMatrixStackLogging();
+
+        final List<Integer> mask = getMask();
+        for (int i = 0; i < mask.size(); i++) {
+            if (mask.get(i) != null) {
+                drawItem(getSlotRect(i), mask.get(i));
+            }
+        }
+
+        GuiContainerManager.disableMatrixStackLogging();
+    }
+
+    protected boolean shouldCacheItemRendering() {
+        return NEIClientConfig.shouldCacheItemRendering();
     }
 
     public void draw(int mousex, int mousey) {
@@ -535,33 +328,77 @@ public abstract class ItemsGrid<T extends ItemsGrid.ItemsGridSlot, M extends Ite
             return;
         }
 
-        final int gridRenderingCacheMode = getGridRenderingCacheMode();
-        final M mouseContext = getMouseContext(mousex, mousey);
+        final ItemPanelSlot focused = getSlotMouseOver(mousex, mousey);
 
-        beforeDrawItems(mousex, mousey, mouseContext);
+        if (shouldCacheItemRendering()) {
 
-        if (gridRenderingCacheMode > 0) {
+            if (refreshBuffer) {
+                Minecraft minecraft = Minecraft.getMinecraft();
+                Framebuffer framebuffer = getFrameBuffer();
+                framebuffer.createBindFramebuffer(minecraft.displayWidth, minecraft.displayHeight);
+                framebuffer.framebufferClear();
+                framebuffer.bindFramebuffer(false);
 
-            if (this.screenCapture == null) {
-                this.screenCapture = new ScreenCapture();
+                /* Set up some rendering state needed for items to work correctly */
+                GL11.glDisable(GL11.GL_BLEND);
+                GL11.glDepthMask(true);
+                OpenGlHelper.glBlendFunc(
+                        GL11.GL_SRC_ALPHA,
+                        GL11.GL_ONE_MINUS_SRC_ALPHA,
+                        GL11.GL_SRC_ALPHA,
+                        GL11.GL_ONE_MINUS_SRC_ALPHA);
+                GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+
+                drawItems();
+
+                Minecraft.getMinecraft().getFramebuffer().bindFramebuffer(false);
+                refreshBuffer = false;
             }
 
-            if (this.screenCapture.needRefresh(gridRenderingCacheMode)) {
-                this.screenCapture.captureScreen(() -> {
-                    GuiContainerManager.enableMatrixStackLogging();
-                    drawItems();
-                    GuiContainerManager.disableMatrixStackLogging();
-                }, gridRenderingCacheMode);
-            }
-
-            this.screenCapture.renderCapturedScreen();
+            beforeDrawItems(mousex, mousey, focused);
+            blitExistingBuffer();
         } else {
-            GuiContainerManager.enableMatrixStackLogging();
+            beforeDrawItems(mousex, mousey, focused);
             drawItems();
-            GuiContainerManager.disableMatrixStackLogging();
         }
 
-        afterDrawItems(mousex, mousey, mouseContext);
+        afterDrawItems(mousex, mousey, focused);
+    }
+
+    public void postDrawTooltips(int mousex, int mousey, List<String> tooltip) {}
+
+    public void setVisible() {
+        if (getItems().isEmpty() && getMessageOnEmpty() != null) {
+            LayoutManager.addWidget(messageLabel);
+        }
+    }
+
+    protected void drawItem(Rectangle4i rect, int idx) {
+        GuiContainerManager.drawItem(rect.x + 1, rect.y + 1, getItem(idx));
+    }
+
+    public ItemPanelSlot getSlotMouseOver(int mousex, int mousey) {
+        if (!contains(mousex, mousey)) {
+            return null;
+        }
+
+        final int overRow = (int) ((mousey - marginTop) / SLOT_SIZE);
+        final int overColumn = (int) ((mousex - marginLeft - paddingLeft) / SLOT_SIZE);
+        final int slt = columns * overRow + overColumn;
+
+        if (overRow >= rows || overColumn >= columns) {
+            return null;
+        }
+
+        final List<Integer> mask = getMask();
+
+        if (mask.size() > slt && mask.get(slt) != null) {
+            final int idx = mask.get(slt);
+
+            return new ItemPanelSlot(idx, getItem(idx));
+        }
+
+        return null;
     }
 
     public boolean contains(int px, int py) {
@@ -575,7 +412,13 @@ public abstract class ItemsGrid<T extends ItemsGrid.ItemsGridSlot, M extends Ite
             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);
+
+        return !isInvalidSlot(columns * r + c);
     }
 
+    public String getMessageOnEmpty() {
+        return null;
+    }
 }

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

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

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

@@ -1,410 +0,0 @@
-package codechicken.nei;
-
-import static codechicken.lib.gui.GuiDraw.fontRenderer;
-
-import java.awt.Dimension;
-import java.util.ArrayList;
-import java.util.IdentityHashMap;
-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.lib.vec.Rectangle4i;
-import codechicken.nei.NEIClientUtils.Alignment;
-import codechicken.nei.guihook.GuiContainerManager;
-import codechicken.nei.recipe.StackInfo;
-import codechicken.nei.util.ReadableNumberConverter;
-
-public class ItemsTooltipLineHandler implements ITooltipLineHandler {
-
-    @FunctionalInterface
-    public interface AmountRenderer {
-
-        void draw(int x, int y, ItemStack stack, long amount);
-    }
-
-    public static class NoAmountRenderer implements AmountRenderer {
-
-        @Override
-        public void draw(int x, int y, ItemStack stack, long amount) {
-            GuiContainerManager.drawItem(x, y, stack, true, "");
-        }
-
-        protected static void drawAmountText(String text, Rectangle4i rect, int color, Alignment alignment) {
-            NEIClientUtils.drawNEIOverlayText(text, rect, 1, color, true, alignment);
-        }
-    }
-
-    public static class TotalAmountRenderer extends NoAmountRenderer {
-
-        private static class AmountText {
-
-            public final String text;
-            public final Alignment alignment;
-
-            public AmountText(String text, Alignment alignment) {
-                this.text = text;
-                this.alignment = alignment;
-            }
-        }
-
-        private final Map<ItemStack, AmountText> cache = new IdentityHashMap<>();
-
-        @Override
-        public void draw(int x, int y, ItemStack stack, long amount) {
-            super.draw(x, y, stack, amount);
-            drawAmount(new Rectangle4i(x, y, SLOT_SIZE - 2, SLOT_SIZE - 2), stack, amount);
-        }
-
-        protected void drawAmount(Rectangle4i rect, ItemStack stack, long amount) {
-            final AmountText amountText = this.cache.computeIfAbsent(stack, key -> {
-                final boolean isFluidDisplay = StackInfo.isFluidDisplayItem(key);
-                final String text = formatAmount(key, amount);
-
-                return new AmountText(
-                        isFluidDisplay && !text.isEmpty() ? text + "L" : text,
-                        isFluidDisplay ? Alignment.BottomLeft : Alignment.BottomRight);
-            });
-
-            if (!amountText.text.isEmpty()) {
-                drawAmountText(amountText.text, rect, 0xFFFFFF, amountText.alignment);
-            }
-        }
-
-        protected String formatAmount(ItemStack stack, long amount) {
-            return amount == 0 ? "" : ReadableNumberConverter.INSTANCE.toWideReadableForm(amount);
-        }
-    }
-
-    public static class StacksAmountRenderer extends NoAmountRenderer {
-
-        private static class StacksText {
-
-            public final String stacks;
-            public final String remainder;
-            public final int color;
-
-            public StacksText(String stacks, String remainder, int color) {
-                this.stacks = stacks;
-                this.remainder = remainder;
-                this.color = color;
-            }
-        }
-
-        private final Map<ItemStack, StacksText> cache = new IdentityHashMap<>();
-
-        @Override
-        public void draw(int x, int y, ItemStack stack, long amount) {
-            super.draw(x, y, stack, amount);
-            drawAmount(new Rectangle4i(x, y, SLOT_SIZE - 2, SLOT_SIZE - 2), stack, amount);
-        }
-
-        protected void drawAmount(Rectangle4i rect, ItemStack stack, long amount) {
-            final StacksText stacksText = this.cache.computeIfAbsent(stack, key -> formatAmount(key, amount));
-
-            if (!stacksText.stacks.isEmpty()) {
-                drawAmountText(stacksText.stacks, rect, stacksText.color, Alignment.TopLeft);
-            }
-
-            if (!stacksText.remainder.isEmpty()) {
-                drawAmountText(stacksText.remainder, rect, stacksText.color, Alignment.BottomRight);
-            }
-        }
-
-        private StacksText formatAmount(ItemStack stack, long amount) {
-            final long stackSize = StackInfo.isFluidDisplayItem(stack) ? FLUID_STACK_SIZE
-                    : Math.max(1, stack.getMaxStackSize());
-            final long stacks = amount / stackSize;
-            final long remainder = amount % stackSize;
-            final String prefix = getPrefix(stack);
-
-            return new StacksText(
-                    stacks > 0 ? prefix + "x" + ReadableNumberConverter.INSTANCE.toWideReadableForm(stacks) : "",
-                    remainder > 0
-                            ? (stacks > 0 ? "+" : prefix)
-                                    + ReadableNumberConverter.INSTANCE.toWideReadableForm(remainder)
-                            : "",
-                    getColor(stack));
-        }
-
-        protected String getPrefix(ItemStack stack) {
-            return "";
-        }
-
-        protected int getColor(ItemStack stack) {
-            return 0xFFFFFF;
-        }
-    }
-
-    protected static final int SLOT_SIZE = 18;
-    protected static final int ICON_SIZE = 16;
-    protected static final int ICON_OFFSET = 1;
-    protected static final int MAX_COLUMNS = 11;
-    protected static final int MARGIN_TOP = 2;
-    protected static final int LABEL_MARGIN = 15;
-    protected static final int NAME_MARGIN = 2;
-    protected static final int DEFAULT_MAX_ROWS = 5;
-    protected static final int FLUID_STACK_SIZE = 144;
-
-    protected final List<ItemStack> items;
-    protected final List<Long> amounts = new ArrayList<>();
-    protected final List<String> names = new ArrayList<>();
-
-    protected AmountRenderer amountRenderer;
-
-    protected String label;
-    protected EnumChatFormatting labelColor = EnumChatFormatting.GRAY;
-
-    protected int activeStackIndex = -1;
-    protected Dimension size = new Dimension();
-
-    protected int maxNamedRows = Integer.MAX_VALUE;
-
-    protected int length = 0;
-    protected int rows = 0;
-    protected int nameRows = 0;
-    protected int gridColumns = 0;
-    protected int gridCount = 0;
-
-    public static ItemsTooltipLineHandler of(String label, List<ItemStack> items, int maxRows, int maxNamedRows) {
-        return new ItemsTooltipLineHandler(label, items, true, maxRows, maxNamedRows);
-    }
-
-    public ItemsTooltipLineHandler(String label, List<ItemStack> items) {
-        this(label, items, true, DEFAULT_MAX_ROWS, 0);
-    }
-
-    public ItemsTooltipLineHandler(String label, List<ItemStack> items, boolean saveStackSize, int maxRows) {
-        this(label, items, saveStackSize, maxRows, 0);
-    }
-
-    protected ItemsTooltipLineHandler(String label, List<ItemStack> items, boolean saveStackSize, int maxRows,
-            int maxNamedRows) {
-        this.label = label;
-        this.items = groupingItemStacks(items);
-        this.amountRenderer = saveStackSize ? new TotalAmountRenderer() : new NoAmountRenderer();
-        this.length = this.items.size();
-        this.maxNamedRows = maxNamedRows;
-
-        setMaxRows(maxRows);
-    }
-
-    protected static int headerHeight() {
-        return fontRenderer.FONT_HEIGHT + 2 + MARGIN_TOP;
-    }
-
-    public ItemsTooltipLineHandler setMaxRows(int maxRows) {
-        if (this.length == 0) {
-            return this;
-        }
-
-        this.names.clear();
-        this.nameRows = 0;
-
-        if (!layoutWithNames(maxRows)) {
-            layoutAsGrid(maxRows);
-        }
-
-        this.size.height = this.rows * SLOT_SIZE + headerHeight();
-
-        return this;
-    }
-
-    public int getRows() {
-        return this.rows;
-    }
-
-    protected boolean layoutWithNames(int maxRows) {
-        final int maxNames = Math.min(this.maxNamedRows, this.length <= maxRows ? this.length : maxRows - 1);
-        final int[] lineWidth = new int[maxNames + 1];
-        lineWidth[0] = labelWidth();
-
-        for (int index = 0; index < maxNames; index++) {
-            final String name = this.items.get(index).getDisplayName();
-            this.names.add(name);
-            lineWidth[index + 1] = Math
-                    .max(lineWidth[index], SLOT_SIZE + NAME_MARGIN + fontRenderer.getStringWidth(name));
-        }
-
-        for (int named = maxNames; named >= 0; named--) {
-            final int rest = this.length - named;
-            final int width = Math.max(lineWidth[named], Math.min(rest, MAX_COLUMNS) * SLOT_SIZE);
-            final int columns = Math.max(1, width / SLOT_SIZE);
-            final int restRows = (int) Math.ceil((float) rest / columns);
-
-            if (named + restRows <= maxRows) {
-                this.nameRows = named;
-                this.gridColumns = columns;
-                this.gridCount = rest;
-                this.rows = named + restRows;
-                this.size.width = width;
-                return true;
-            }
-        }
-
-        this.names.clear();
-        return false;
-    }
-
-    protected void layoutAsGrid(int maxRows) {
-        this.gridColumns = Math.min(MAX_COLUMNS, this.length);
-        this.rows = Math.min(maxRows, (int) Math.ceil((float) this.length / this.gridColumns));
-        this.gridCount = Math.min(this.length, this.gridColumns * this.rows);
-        this.size.width = Math.max(this.gridColumns * SLOT_SIZE, labelWidth());
-
-        if (this.gridCount < this.length) {
-            this.gridCount -= reservedColumns(this.length - this.gridCount);
-        }
-    }
-
-    protected int labelWidth() {
-        return fontRenderer.getStringWidth(this.label) + LABEL_MARGIN;
-    }
-
-    protected int reservedColumns(int hidden) {
-        return (int) Math.ceil((float) (fontRenderer.getStringWidth("+" + hidden) - 2) / SLOT_SIZE);
-    }
-
-    public ItemsTooltipLineHandler setAmountRenderer(AmountRenderer amountRenderer) {
-        this.amountRenderer = amountRenderer;
-        return this;
-    }
-
-    public void setActiveStack(ItemStack activeStack) {
-        final ItemStack realStack = items.stream().filter(stack -> NEIClientUtils.areStacksSameType(stack, activeStack))
-                .findFirst().orElse(null);
-        this.activeStackIndex = items.indexOf(realStack);
-    }
-
-    public ItemStack getActiveStack() {
-        return this.activeStackIndex == -1 ? null : this.items.get(this.activeStackIndex);
-    }
-
-    public List<ItemStack> getItems() {
-        return this.items;
-    }
-
-    public boolean isEmpty() {
-        return this.items.isEmpty();
-    }
-
-    @Override
-    public Dimension getSize() {
-        return this.size;
-    }
-
-    public void setLabelColor(EnumChatFormatting color) {
-        this.labelColor = color;
-    }
-
-    public void setLabel(String label) {
-        this.label = label;
-        this.size.width = Math.max(this.size.width, labelWidth());
-    }
-
-    @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.glEnable(GL12.GL_RESCALE_NORMAL);
-
-        GL11.glPushAttrib(GL11.GL_ENABLE_BIT | GL11.GL_COLOR_BUFFER_BIT | GL11.GL_LIGHTING_BIT);
-        RenderHelper.enableGUIStandardItemLighting();
-
-        final int xTranslation = x;
-        final int yTranslation = y + fontRenderer.FONT_HEIGHT + 2;
-        final int zTranslation = GuiContainerManager.TOOLTIP_Z_OFFSET;
-        GL11.glTranslatef(xTranslation, yTranslation, zTranslation);
-
-        final int gridShift = gridIndexShift();
-
-        for (int index = 0; index < this.nameRows; index++) {
-            drawSlot(0, index * SLOT_SIZE, index);
-        }
-
-        for (int index = 0; index < this.gridCount; index++) {
-            drawSlot(
-                    (index % this.gridColumns) * SLOT_SIZE,
-                    (this.nameRows + index / this.gridColumns) * SLOT_SIZE,
-                    this.nameRows + gridShift + index);
-        }
-
-        NEIClientUtils.gl2DRenderContext(() -> {
-            final int textShift = ICON_OFFSET + Math.round((ICON_SIZE - fontRenderer.FONT_HEIGHT) / 2f);
-
-            for (int index = 0; index < this.nameRows; index++) {
-                fontRenderer.drawStringWithShadow(
-                        EnumChatFormatting.GRAY + this.names.get(index),
-                        SLOT_SIZE + NAME_MARGIN,
-                        index * SLOT_SIZE + textShift,
-                        0xFFFFFF);
-            }
-
-            final int hidden = this.length - this.nameRows - this.gridCount;
-
-            if (hidden > 0) {
-                final String text = "+" + hidden;
-                fontRenderer.drawStringWithShadow(
-                        EnumChatFormatting.GRAY + text,
-                        this.size.width - fontRenderer.getStringWidth(text) - 2,
-                        (this.rows - 1) * SLOT_SIZE + textShift,
-                        0xFFFFFF);
-            }
-        });
-
-        GL11.glTranslatef(-xTranslation, -yTranslation, -zTranslation);
-        GL11.glPopAttrib();
-    }
-
-    protected int gridIndexShift() {
-        if (this.nameRows > 0 || this.activeStackIndex == -1) {
-            return 0;
-        }
-
-        return Math.max(0, Math.min(this.length - this.gridCount, this.activeStackIndex - this.gridCount + 2));
-    }
-
-    protected void drawSlot(int x, int y, int index) {
-        if (this.activeStackIndex == index) {
-            NEIClientUtils.gl2DRenderContext(() -> GuiDraw.drawRect(x, y, SLOT_SIZE, SLOT_SIZE, 0x66555555));
-        }
-
-        drawStackWithAmount(x, y, index);
-    }
-
-    protected void drawStackWithAmount(int x, int y, int index) {
-        this.amountRenderer.draw(x + ICON_OFFSET, y + ICON_OFFSET, this.items.get(index), this.amounts.get(index));
-    }
-
-    private List<ItemStack> groupingItemStacks(List<ItemStack> items) {
-        final List<ItemStack> result = new ArrayList<>();
-
-        for (Map.Entry<NBTTagCompound, Long> entry : ItemStackAmount.of(items).entrySet()) {
-            result.add(StackInfo.loadFromNBT(entry.getKey(), 0));
-            this.amounts.add(Math.max(0, entry.getValue()));
-        }
-
-        if (result.isEmpty()) {
-            for (ItemStack stack : items) {
-                result.add(stack);
-                this.amounts.add(0L);
-            }
-        }
-
-        return result;
-    }
-
-}

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

@@ -2,22 +2,10 @@ package codechicken.nei;
 
 import java.util.HashMap;
 import java.util.LinkedList;
-import java.util.Map;
-import java.util.StringJoiner;
-import java.util.function.BooleanSupplier;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.settings.KeyBinding;
-
-import org.lwjgl.input.Keyboard;
-import org.lwjgl.input.Mouse;
-
-import codechicken.nei.util.NEIKeyboardUtils;
-import codechicken.nei.util.NEIMouseUtils;
-import cpw.mods.fml.client.registry.ClientRegistry;
+import java.util.Map.Entry;
 
 /**
- * Registers NEI key bindings as vanilla {@link KeyBinding}s and exposes their state to the rest of NEI.
+ * Good old down/held/up keystate tracker
  */
 public class KeyManager {
 
@@ -26,173 +14,30 @@ public class KeyManager {
         public void tickKeyStates();
     }
 
+    public static class KeyState {
+
+        public boolean down;
+        public boolean held;
+        public boolean up;
+    }
+
+    public static HashMap<String, KeyState> keyStates = new HashMap<>();
     public static LinkedList<IKeyStateTracker> trackers = new LinkedList<>();
-    private static final Map<String, KeyBinding> keyBindings = new HashMap<>();
-    private static final Map<String, String> keyAliases = new HashMap<>();
-    private static volatile boolean pendingOptionsReload = false;
-    private static int clickedButton = -1;
-
-    static {
-        // Aliases for legacy keybinds
-        keyAliases.put("gui.recipe", "recipe.recipe");
-        keyAliases.put("gui.usage", "recipe.usage");
-        keyAliases.put("gui.hide_bookmarks", "bookmark.hide");
-    }
-
-    public static KeyBinding registerKeyBinding(String ident, int defaultKey) {
-        return keyBindings.computeIfAbsent(ident, id -> {
-            final KeyBinding binding = new KeyBinding(
-                    "nei.options.keys." + id,
-                    NEIKeyboardUtils.unhash(defaultKey),
-                    categoryFor(id));
-            ClientRegistry.registerKeyBinding(binding);
-            return binding;
-        });
-    }
-
-    public static KeyBinding getKeyBinding(String ident) {
-        return keyBindings.get(keyAliases.getOrDefault(ident, ident));
-    }
-
-    public static boolean isRegistered(String description) {
-        for (KeyBinding binding : keyBindings.values()) {
-            if (binding.getKeyDescription().equals(description)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public static int getKeyCode(String ident) {
-        final KeyBinding binding = getKeyBinding(ident);
-        return binding == null ? Keyboard.KEY_NONE : binding.getKeyCode();
-    }
-
-    public static boolean isKeyDown(String ident) {
-        final KeyBinding binding = getKeyBinding(ident);
-
-        if (binding != null) {
-            final int keyCode = binding.getKeyCode();
-
-            if (keyCode < 0) {
-                final int button = keyCode + 100;
-                return Mouse.isButtonDown(button) || button == clickedButton;
-            } else if (keyCode > Keyboard.KEY_NONE && keyCode < Keyboard.KEYBOARD_SIZE) {
-                return Keyboard.isKeyDown(keyCode);
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Whether any NEI key binding is assigned to the given mouse button.
-     */
-    public static boolean isMouseBound(int button) {
-        for (KeyBinding binding : keyBindings.values()) {
-            if (binding.getKeyCode() == button - 100) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Runs a hotkey handler for a click of the given mouse button if the button is bound to any NEI key binding. The
-     * button is reported as down by {@link #isKeyDown} for the duration of the call, because the LWJGL button state can
-     * already be released when a quick click is processed.
-     *
-     * @return true if the click was consumed by the handler
-     */
-    public static boolean handleMouseHotkey(int button, BooleanSupplier handler) {
-        if (!isMouseBound(button)) {
-            return false;
-        }
-
-        final int previous = clickedButton;
-        clickedButton = button;
-
-        try {
-            return handler.getAsBoolean();
-        } finally {
-            clickedButton = previous;
-        }
-    }
-
-    public static boolean isHashDown(String ident) {
-        return isHashDown(ident, 0);
-    }
-
-    public static boolean isHashDown(String ident, int modifierMask) {
-
-        if (!isKeyDown(ident)) {
-            return false;
-        }
-
-        if (NEIKeyboardUtils.isHashKey(getKeyCode(ident))) {
-            return true;
-        }
-
-        return ((modifierMask & NEIKeyboardUtils.CTRL_HASH) != 0) == NEIClientUtils.controlKey()
-                && ((modifierMask & NEIKeyboardUtils.SHIFT_HASH) != 0) == NEIClientUtils.shiftKey()
-                && ((modifierMask & NEIKeyboardUtils.ALT_HASH) != 0) == NEIClientUtils.altKey();
-    }
-
-    public static String getKeyName(String ident) {
-        return getKeyName(ident, 0);
-    }
-
-    public static String getKeyName(String ident, int meta) {
-        final int keyCode = getKeyCode(ident);
-        return keyCode == Keyboard.KEY_NONE ? null : NEIKeyboardUtils.getKeyName(keyCode, meta);
-    }
-
-    public static String getKeyName(String ident, int meta, int mouseBind) {
-        final int keyCode = getKeyCode(ident);
-        return keyCode == Keyboard.KEY_NONE && mouseBind == NEIMouseUtils.MOUSE_BTN_NONE ? null
-                : getKeyName(keyCode, meta, mouseBind);
-    }
-
-    public static String getKeyName(int keyBind, int mouseBind) {
-        final int keyCode = NEIKeyboardUtils.unhash(keyBind);
-        return getKeyName(keyCode, keyBind - keyCode, mouseBind);
-    }
-
-    private static String getKeyName(int keyCode, int hash, int mouseBind) {
-        StringJoiner keyText = new StringJoiner(" + ");
-        String keyHash = keyCode == Keyboard.KEY_NONE && hash == 0 ? "" : NEIKeyboardUtils.getKeyName(keyCode, hash);
-        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 boolean isPressed(String ident) {
-        final KeyBinding binding = getKeyBinding(ident);
-        return binding != null && binding.isPressed();
-    }
-
-    private static String categoryFor(String ident) {
-        final int dot = ident.indexOf('.');
-        return dot < 0 ? "nei.options.keys" : "nei.options.keys." + ident.substring(0, dot);
-    }
-
-    public static void requestOptionsReload() {
-        pendingOptionsReload = true;
-    }
 
     public static void tickKeyStates() {
+        for (Entry<String, KeyState> entry : keyStates.entrySet()) {
+            final boolean down = NEIClientConfig.isKeyHashDown(entry.getKey());
+            final KeyState state = entry.getValue();
 
-        if (pendingOptionsReload) {
-            pendingOptionsReload = false;
-            Minecraft.getMinecraft().gameSettings.loadOptions();
+            if (down) {
+                state.down = !state.held;
+                state.up = false;
+            } else {
+                state.up = state.held;
+                state.down = false;
+            }
+
+            state.held = down;
         }
 
         for (IKeyStateTracker tracker : trackers) tracker.tickKeyStates();

src/main/java/codechicken/nei/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/LayoutManager.java

@@ -31,11 +31,8 @@ import static codechicken.nei.NEIClientUtils.toggleMagnetMode;
 import static codechicken.nei.NEIClientUtils.toggleRaining;
 import static codechicken.nei.NEIClientUtils.translate;
 
-import java.awt.Point;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-import java.util.Set;
 import java.util.TreeSet;
 
 import net.minecraft.client.Minecraft;
@@ -43,7 +40,6 @@ import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.client.gui.inventory.GuiContainerCreative;
 import net.minecraft.client.renderer.InventoryEffectRenderer;
-import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -66,10 +62,8 @@ import codechicken.nei.guihook.IContainerDrawHandler;
 import codechicken.nei.guihook.IContainerInputHandler;
 import codechicken.nei.guihook.IContainerObjectHandler;
 import codechicken.nei.guihook.IContainerTooltipHandler;
-import codechicken.nei.recipe.AutoCraftingManager;
 import codechicken.nei.recipe.GuiRecipeTab;
 import codechicken.nei.recipe.RecipeCatalysts;
-import codechicken.nei.recipe.debug.DebugHandlerWidget;
 
 public class LayoutManager implements IContainerInputHandler, IContainerTooltipHandler, IContainerDrawHandler,
         IContainerObjectHandler, IKeyStateTracker {
@@ -82,29 +76,34 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH
     /**
      * Sorted bottom first
      */
-    private static Set<Widget> drawWidgets = new TreeSet<>(new WidgetZOrder(false));
+    private static TreeSet<Widget> drawWidgets = new TreeSet<>(new WidgetZOrder(false));
     /**
      * Sorted top first
      */
-    private static Set<Widget> controlWidgets = new TreeSet<>(new WidgetZOrder(true));
+    private static TreeSet<Widget> controlWidgets = new TreeSet<>(new WidgetZOrder(true));
 
     public static ItemPanel itemPanel;
     public static BookmarkPanel bookmarkPanel;
     public static SubsetWidget dropDown;
+    public static PresetsWidget presetsPanel;
     public static SearchField searchField;
-    public static ItemZoom itemZoom;
 
     public static ButtonCycled options;
     public static ButtonCycled bookmarksButton;
 
+    @Deprecated
     public static Button more;
+
+    @Deprecated
     public static Button less;
+
+    @Deprecated
     public static ItemQuantityField quantity;
 
     public static Button delete;
     public static ButtonCycled gamemode;
     public static Button rain;
-    public static ButtonCycled magnet;
+    public static Button magnet;
     public static Button[] timeButtons = new Button[4];
     public static Button heal;
 
@@ -119,6 +118,11 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH
      */
     public static boolean itemsLoaded = false;
 
+    /**
+     * Not present, Present
+     */
+    public static Image[] itemPresenceOverlays = new Image[2];
+
     public static void load() {
         API.addLayoutStyle(0, new LayoutStyleMinecraft());
 
@@ -133,14 +137,16 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH
 
     @Override
     public void onPreDraw(GuiContainer gui) {
-        // Reset the gui to the center of the screen, for potion effect offsets etc
-        if (isEnabled() && gui instanceof InventoryEffectRenderer) {
+        if (!isHidden() && isEnabled() && gui instanceof InventoryEffectRenderer) // Reset the gui to the center of the
+                                                                                  // screen, for potion effect offsets
+        // etc
+        {
             gui.guiLeft = (gui.width - gui.xSize) / 2;
             gui.guiTop = (gui.height - gui.ySize) / 2;
 
             if (gui instanceof GuiContainerCreative && gui.buttonList.size() >= 2) {
-                GuiButton button1 = gui.buttonList.get(0);
-                GuiButton button2 = gui.buttonList.get(1);
+                GuiButton button1 = (GuiButton) gui.buttonList.get(0);
+                GuiButton button2 = (GuiButton) gui.buttonList.get(1);
                 button1.xPosition = gui.guiLeft;
                 button2.xPosition = gui.guiLeft + gui.xSize - 20;
             }
@@ -161,18 +167,14 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH
     public void onMouseClicked(GuiContainer gui, int mousex, int mousey, int button) {
         if (isHidden()) return;
 
-        for (Widget widget : controlWidgets) {
-            widget.onGuiClick(mousex, mousey);
-        }
+        for (Widget widget : controlWidgets) widget.onGuiClick(mousex, mousey);
     }
 
     @Override
     public boolean mouseClicked(GuiContainer gui, int mousex, int mousey, int button) {
         if (isHidden()) return false;
 
-        if (!isEnabled()) {
-            return options.contains(mousex, mousey) && options.handleClick(mousex, mousey, button);
-        }
+        if (!isEnabled()) return options.contains(mousex, mousey) && options.handleClick(mousex, mousey, button);
 
         for (Widget widget : controlWidgets) {
             widget.onGuiClick(mousex, mousey);
@@ -186,22 +188,10 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH
 
     @Override
     public boolean objectUnderMouse(GuiContainer gui, int mousex, int mousey) {
-        return getWidgetUnderMouse(mousex, mousey) != null;
-    }
+        if (!isHidden() && isEnabled())
+            for (Widget widget : drawWidgets) if (widget.contains(mousex, mousey)) return true;
 
-    public Widget getWidgetUnderMouse(int mousex, int mousey) {
-
-        if (isHidden() || !isEnabled()) {
-            return null;
-        }
-
-        for (Widget widget : controlWidgets) {
-            if (widget.contains(mousex, mousey)) {
-                return widget;
-            }
-        }
-
-        return null;
+        return false;
     }
 
     public boolean keyTyped(GuiContainer gui, char keyChar, int keyID) {
@@ -220,40 +210,23 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH
     @Override
     public boolean lastKeyTyped(GuiContainer gui, char keyChar, int keyID) {
 
-        if (isEnabled() && !isHidden()) {
-            for (Widget widget : controlWidgets) {
-                if (inputFocused == null) {
-                    widget.lastKeyTyped(keyID, keyChar);
-                }
-            }
-        }
-
-        return false;
-    }
-
-    @Override
-    public boolean onHotkeyPressed(GuiContainer gui) {
-
-        if (KeyManager.isKeyDown("gui.hide")) {
+        if (NEIClientConfig.isKeyHashDown("gui.hide")) {
             toggleBooleanSetting("inventory.hidden");
             return true;
         }
 
-        if (KeyManager.isKeyDown("bookmark.hide")) {
-            toggleBooleanSetting("inventory.bookmarks.enabled");
+        if (NEIClientConfig.isKeyHashDown("gui.hide_bookmarks")) {
+            toggleBooleanSetting("inventory.bookmarksEnabled");
             return true;
         }
 
-        if (KeyManager.isKeyDown("gui.next_tooltip") && GuiContainerManager.incrementTooltipPage()) {
+        if (NEIClientConfig.isKeyHashDown("gui.next_tooltip")) {
+            GuiContainerManager.incrementTooltipPage();
             return true;
         }
 
-        if (isEnabled() && !isHidden() && inputFocused == null) {
-            for (Widget widget : controlWidgets) {
-                if (widget.onHotkeyPressed()) {
-                    return true;
-                }
-            }
+        if (isEnabled() && !isHidden()) {
+            for (Widget widget : controlWidgets) if (inputFocused == null) widget.lastKeyTyped(keyID, keyChar);
         }
 
         return false;
@@ -274,12 +247,12 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH
 
     @Override
     public ItemStack getStackUnderMouse(GuiContainer gui, int mousex, int mousey) {
-        final Widget focused = getWidgetUnderMouse(mousex, mousey);
-
-        if (focused != null) {
-            return focused.getStackMouseOver(mousex, mousey);
+        if (!isHidden() && isEnabled()) {
+            for (Widget widget : drawWidgets) {
+                ItemStack stack = widget.getStackMouseOver(mousex, mousey);
+                if (stack != null) return stack;
+            }
         }
-
         return null;
     }
 
@@ -307,20 +280,17 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH
     }
 
     @Override
-    public List<String> handleTooltip(GuiContainer gui, int mousex, int mousey, List<String> currenttip) {
-
+    public void postRenderTooltips(GuiContainer gui, int mousex, int mousey, List<String> tooltip) {
         if (!isHidden() && isEnabled() && GuiContainerManager.shouldShowTooltip(gui)) {
-            final Widget focused = getWidgetUnderMouse(mousex, mousey);
-
-            if (focused != null) {
-                currenttip = focused.handleTooltip(mousex, mousey, currenttip);
-
-                if (focused instanceof IContainerTooltipHandler tip) {
-                    currenttip = tip.handleTooltip(gui, mousex, mousey, currenttip);
-                }
-            }
+            for (Widget widget : drawWidgets) widget.postDrawTooltips(mousex, mousey, tooltip);
         }
+    }
 
+    @Override
+    public List<String> handleTooltip(GuiContainer gui, int mousex, int mousey, List<String> currenttip) {
+        if (!isHidden() && isEnabled() && GuiContainerManager.shouldShowTooltip(gui)) {
+            for (Widget widget : drawWidgets) currenttip = widget.handleTooltip(mousex, mousey, currenttip);
+        }
         return currenttip;
     }
 
@@ -337,66 +307,32 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH
             currenttip.set(0, mainname);
         }
 
-        if (!isHidden() && isEnabled() && GuiContainerManager.shouldShowTooltip(gui)) {
-            final Point mouse = GuiDraw.getMousePosition();
-            final Widget focused = getWidgetUnderMouse(mouse.x, mouse.y);
-
-            if (focused instanceof IContainerTooltipHandler tip) {
-                currenttip = tip.handleItemDisplayName(gui, stack, currenttip);
-            }
-        }
-
         return currenttip;
     }
 
     @Override
     public List<String> handleItemTooltip(GuiContainer gui, ItemStack itemstack, int mousex, int mousey,
             List<String> currenttip) {
-
-        if (!isHidden() && isEnabled() && GuiContainerManager.shouldShowTooltip(gui)) {
-            final Widget focused = getWidgetUnderMouse(mousex, mousey);
-
-            if (focused != null) {
-                currenttip = focused.handleItemTooltip(itemstack, mousex, mousey, currenttip);
-            }
-
-            if (focused instanceof IContainerTooltipHandler tip) {
-                currenttip = tip.handleItemTooltip(gui, itemstack, mousex, mousey, currenttip);
-            }
-        }
-
         return currenttip;
     }
 
-    @Override
-    public Map<String, String> handleHotkeys(GuiContainer gui, int mousex, int mousey, Map<String, String> hotkeys) {
-
-        if (!isHidden() && isEnabled() && GuiContainerManager.shouldShowTooltip(gui)) {
-            final Widget focused = getWidgetUnderMouse(mousex, mousey);
-
-            if (focused != null) {
-                hotkeys = focused.handleHotkeys(mousex, mousey, hotkeys);
-
-                if (focused instanceof IContainerTooltipHandler tip) {
-                    hotkeys = tip.handleHotkeys(gui, mousex, mousey, hotkeys);
-                }
-            }
-
-        }
-
-        return hotkeys;
-    }
-
     public static void layout(GuiContainer gui) {
-        GridOverlapScanner.beginFrame(gui, GuiContainerManager.shouldShowTooltip(gui));
-
         VisiblityData visiblity = new VisiblityData();
-        visiblity.showNEI = !isHidden();
-        visiblity.showBookmarkPanel = !isBookmarkPanelHidden();
-        visiblity.showSearchSection = !(gui.height - gui.ySize <= 40 && NEIClientConfig.isSearchWidgetCentered());
-        visiblity.showSubsetDropdown = NEIClientConfig.showSubsetWidget()
-                && (gui.guiTop > 20 || visiblity.showSearchSection && !NEIClientConfig.subsetWidgetOnTop());
-        visiblity.showWidgets = gui.guiLeft - 4 > 76;
+
+        if (isHidden()) visiblity.showNEI = false;
+
+        if (isBookmarkPanelHidden()) visiblity.showBookmarkPanel = false;
+
+        if (gui.height - gui.ySize <= 40 && NEIClientConfig.isSearchWidgetCentered())
+            visiblity.showSearchSection = false;
+
+        if (visiblity.showBookmarkPanel || gui.guiTop <= 20) visiblity.showSubsetDropdown = false;
+
+        if (!visiblity.showBookmarkPanel || gui.guiTop <= 20) visiblity.showPresetsDropdown = false;
+
+        if (gui.guiLeft - 4 < 76) visiblity.showWidgets = false;
+
+        if (!itemsLoaded) visiblity.showPresetsDropdown = false;
 
         try {
             GuiInfo.readLock.lock();
@@ -419,11 +355,9 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH
         bookmarkPanel = ItemPanels.bookmarkPanel;
         bookmarkPanel.init();
 
-        itemZoom = new ItemZoom();
-
         dropDown = new SubsetWidget();
+        presetsPanel = new PresetsWidget();
         searchField = new SearchField("search");
-        API.addItemFilter(searchField);
 
         options = new ButtonCycled(3) {
 
@@ -445,16 +379,15 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH
             @Override
             public boolean onButtonPress(boolean rightclick) {
                 if (!rightclick) {
-                    if (Keyboard.getEventKeyState() && getIsAccessibleControlEventKey()
-                            && NEIClientConfig.canChangeCheatMode()) {
-                        NEIClientConfig.setCheatMode((NEIClientConfig.getCheatMode() + 1) % 3);
+                    if (Keyboard.getEventKeyState() && getIsAccessibleControlEventKey()) {
+                        NEIClientConfig.cycleSetting("inventory.cheatmode", 3);
                     } else {
                         if (Keyboard.getEventKeyState() && (Keyboard.getEventKey() == Keyboard.KEY_LSHIFT
                                 || Keyboard.getEventKey() == Keyboard.KEY_RSHIFT)) {
                             GuiRecipeTab.loadHandlerInfo();
                             RecipeCatalysts.loadCatalystInfo();
                         }
-                        getOptionList().openGui(getGuiContainer());
+                        getOptionList().openGui(getGuiContainer(), false);
                     }
                     return true;
                 }
@@ -470,10 +403,7 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH
                 else if (cheatMode == 2) modeColor = EnumChatFormatting.RED.toString();
                 String controlKeyLocalization = translate(Minecraft.isRunningOnMac ? "key.ctrl.mac" : "key.ctrl");
                 tooltip.add(modeColor + translate("inventory.options.tip.cheatmode." + cheatMode));
-                if (NEIClientConfig.canChangeCheatMode()) {
-                    tooltip.add(
-                            modeColor + translate("inventory.options.tip.cheatmode.disable", controlKeyLocalization));
-                }
+                tooltip.add(modeColor + translate("inventory.options.tip.cheatmode.disable", controlKeyLocalization));
             }
 
             @Override
@@ -492,7 +422,7 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH
 
             @Override
             public boolean onButtonPress(boolean rightclick) {
-                NEIClientConfig.toggleBooleanSetting("inventory.bookmarks.enabled");
+                NEIClientConfig.toggleBooleanSetting("inventory.bookmarksEnabled");
                 return true;
             }
 
@@ -506,43 +436,9 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH
             }
         };
 
-        more = new Button("+") {
-
-            @Override
-            public boolean onButtonPress(boolean rightclick) {
-                if (rightclick) return false;
-
-                int modifier = NEIClientUtils.controlKey() ? 64 : NEIClientUtils.shiftKey() ? 10 : 1;
-                int quantity = NEIClientConfig.getItemQuantity() + modifier;
-
-                if (quantity < 0) {
-                    quantity = 0;
-                }
-
-                LayoutManager.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;
-                }
-
-                LayoutManager.quantity.setText(Integer.toString(quantity));
-                return true;
-            }
-        };
-
-        quantity = new ItemQuantityField("quantity");
-
+        more = ItemPanels.itemPanel.more;
+        less = ItemPanels.itemPanel.less;
+        quantity = ItemPanels.itemPanel.quantity;
         delete = new Button() {
 
             @Override
@@ -613,7 +509,7 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH
                 return getStateTip("rain", state);
             }
         };
-        magnet = new ButtonCycled(2) {
+        magnet = new Button() {
 
             @Override
             public boolean onButtonPress(boolean rightclick) {
@@ -718,12 +614,12 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH
 
             if (!itemsLoaded) {
                 ItemList.loadItems.restart();
+                itemsLoaded = true;
             }
-
             overlayRenderer = null;
+
             getLayoutStyle().init();
             layout(gui);
-            AutoFocusWidget.instance.load(gui);
         }
 
         NEIController.load(gui);
@@ -755,15 +651,14 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH
 
         addWidget(options);
         addWidget(bookmarksButton);
-
-        if (visiblity.showItemPanel && NEIClientConfig.showItemQuantityWidget()) {
-            addWidget(quantity);
-            addWidget(more);
-            addWidget(less);
-        }
-
         if (visiblity.showItemPanel) {
-            addWidget(itemPanel);
+
+            if (PresetsWidget.inEditMode()) {
+                drawWidgets.add(itemPanel);
+            } else {
+                addWidget(itemPanel);
+            }
+
             itemPanel.setVisible();
         }
 
@@ -772,13 +667,13 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH
             bookmarkPanel.setVisible();
         }
 
-        if (visiblity.showSearchSection && NEIClientConfig.isSearchWidgetCentered()
-                || visiblity.showItemPanel && !NEIClientConfig.isSearchWidgetCentered()) {
-            searchField.setVisible(true);
+        if (visiblity.showPresetsDropdown) {
+            addWidget(presetsPanel);
+        }
+
+        searchField.setVisible(visiblity.showSearchSection);
+        if (visiblity.showSearchSection) {
             addWidget(searchField);
-        } else {
-            searchField.setVisible(false);
-            searchField.setFocus(false);
         }
 
         if (visiblity.showUtilityButtons) {
@@ -793,13 +688,10 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH
             if (canPerformAction("delete")) addWidget(delete);
         }
 
-        addWidget(itemZoom);
-
         if (visiblity.showSubsetDropdown) {
+            // Bookmarks or Subset/dropdown
             addWidget(dropDown);
         }
-
-        addWidget(DebugHandlerWidget.instance);
     }
 
     public static LayoutStyle getLayoutStyle(int id) {
@@ -823,9 +715,6 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH
 
         if (!isEnabled()) return;
 
-        GridOverlapScanner.requestScan();
-        AutoFocusWidget.instance.guiTick();
-
         for (Widget widget : drawWidgets) widget.update();
     }
 
@@ -833,9 +722,7 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH
     public boolean mouseScrolled(GuiContainer gui, int mousex, int mousey, int scrolled) {
         if (isHidden() || !isEnabled()) return false;
 
-        for (Widget widget : controlWidgets) {
-            if (widget.onMouseWheel(scrolled, mousex, mousey)) return true;
-        }
+        for (Widget widget : drawWidgets) if (widget.onMouseWheel(scrolled, mousex, mousey)) return true;
 
         return false;
     }
@@ -845,7 +732,7 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH
 
     @Override
     public boolean shouldShowTooltip(GuiContainer gui) {
-        return itemPanel.draggedStack == null && !bookmarkPanel.inEditingState() && !AutoCraftingManager.processing();
+        return itemPanel.draggedStack == null && !bookmarkPanel.inEditingState();
     }
 
     /** Note: this method isn't actually used by this mod, but NEI add-ons might need it. */
@@ -873,11 +760,13 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH
             ItemStack item = slot.getStack();
 
             if (item == null ? !getSearchExpression().equals("") : !searchField.getFilter().matches(item)) {
-                NEIClientUtils.gl2DRenderContext(() -> {
-                    GL11.glTranslatef(0, 0, 150);
-                    drawRect(slot.xDisplayPosition, slot.yDisplayPosition, 16, 16, 0x80000000);
-                    GL11.glTranslatef(0, 0, -150);
-                });
+                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);
             }
         }
 
@@ -922,39 +811,23 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH
         final int ty2 = ty + 20 - h2 - te;
         final int tx2 = 200 - w2 - te;
 
-        final boolean is2DTexture = GL11.glGetBoolean(GL11.GL_TEXTURE_2D);
-
-        GL11.glEnable(GL11.GL_TEXTURE_2D);
         changeTexture("textures/gui/widgets.png");
-        final Tessellator tessellator = Tessellator.instance;
-        tessellator.startDrawingQuads();
-        addTexturedModalRect(tessellator, x, y, tx1, ty1, w1, h1); // top left
-        addTexturedModalRect(tessellator, x, y2, tx1, ty2, w1, h2); // bottom left
+        drawTexturedModalRect(x, y, tx1, ty1, w1, h1); // top left
+        drawTexturedModalRect(x, y2, tx1, ty2, w1, h2); // bottom left
 
         for (int tile = 0; tile < wTiles; tile++) {
             final int tileX = x + w1 + 50 * tile;
-            addTexturedModalRect(tessellator, tileX, y, tx3, ty1, 50, h1); // top
-            addTexturedModalRect(tessellator, tileX, y2, tx3, ty2, 50, h2); // bottom
+            drawTexturedModalRect(tileX, y, tx3, ty1, 50, h1); // top
+            drawTexturedModalRect(tileX, y2, tx3, ty2, 50, h2); // bottom
         }
 
-        addTexturedModalRect(tessellator, x2, y, tx2, ty1, w2, h1); // top right
-        addTexturedModalRect(tessellator, x2, y2, tx2, ty2, w2, h2); // bottom right
-        tessellator.draw();
-
-        if (!is2DTexture) GL11.glDisable(GL11.GL_TEXTURE_2D);
+        drawTexturedModalRect(x2, y, tx2, ty1, w2, h1); // top right
+        drawTexturedModalRect(x2, y2, tx2, ty2, w2, h2); // bottom right
     }
 
-    private static void addTexturedModalRect(Tessellator tessellator, int x, int y, int textureX, int textureY,
-            int width, int height) {
-        final double z = GuiDraw.gui.getZLevel();
-        final double u = textureX / 256D;
-        final double v = textureY / 256D;
-        final double maxU = (textureX + width) / 256D;
-        final double maxV = (textureY + height) / 256D;
-        tessellator.addVertexWithUV(x, y + height, z, u, maxV);
-        tessellator.addVertexWithUV(x + width, y + height, z, maxU, maxV);
-        tessellator.addVertexWithUV(x + width, y, z, maxU, v);
-        tessellator.addVertexWithUV(x, y, z, u, v);
+    public static void drawItemPresenceOverlay(int slotX, int slotY, boolean isPresent) {
+        Image icon = itemPresenceOverlays[isPresent ? 1 : 0];
+        drawIcon(slotX + 16 - icon.width, slotY + 16 - icon.height, icon);
     }
 
     public static LayoutManager instance() {
@@ -965,12 +838,12 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH
     public void tickKeyStates() {
         if (Minecraft.getMinecraft().currentScreen != null) return;
 
-        if (KeyManager.isPressed("world.dawn")) timeButtons[0].onButtonPress(false);
-        if (KeyManager.isPressed("world.noon")) timeButtons[1].onButtonPress(false);
-        if (KeyManager.isPressed("world.dusk")) timeButtons[2].onButtonPress(false);
-        if (KeyManager.isPressed("world.midnight")) timeButtons[3].onButtonPress(false);
-        if (KeyManager.isPressed("world.rain")) rain.onButtonPress(false);
-        if (KeyManager.isPressed("world.heal")) heal.onButtonPress(false);
-        if (KeyManager.isPressed("world.creative")) gamemode.onButtonPress(false);
+        if (KeyManager.keyStates.get("world.dawn").down) timeButtons[0].onButtonPress(false);
+        if (KeyManager.keyStates.get("world.noon").down) timeButtons[1].onButtonPress(false);
+        if (KeyManager.keyStates.get("world.dusk").down) timeButtons[2].onButtonPress(false);
+        if (KeyManager.keyStates.get("world.midnight").down) timeButtons[3].onButtonPress(false);
+        if (KeyManager.keyStates.get("world.rain").down) rain.onButtonPress(false);
+        if (KeyManager.keyStates.get("world.heal").down) heal.onButtonPress(false);
+        if (KeyManager.keyStates.get("world.creative").down) gamemode.onButtonPress(false);
     }
 }

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

@@ -1,19 +1,34 @@
 package codechicken.nei;
 
 import static codechicken.lib.gui.GuiDraw.drawStringC;
+import static codechicken.nei.LayoutManager.bookmarkPanel;
+import static codechicken.nei.LayoutManager.bookmarksButton;
+import static codechicken.nei.LayoutManager.delete;
+import static codechicken.nei.LayoutManager.dropDown;
+import static codechicken.nei.LayoutManager.gamemode;
+import static codechicken.nei.LayoutManager.heal;
+import static codechicken.nei.LayoutManager.itemPanel;
+import static codechicken.nei.LayoutManager.itemPresenceOverlays;
+import static codechicken.nei.LayoutManager.magnet;
+import static codechicken.nei.LayoutManager.options;
+import static codechicken.nei.LayoutManager.presetsPanel;
+import static codechicken.nei.LayoutManager.rain;
+import static codechicken.nei.LayoutManager.searchField;
+import static codechicken.nei.LayoutManager.timeButtons;
+import static codechicken.nei.NEIClientConfig.canPerformAction;
+import static codechicken.nei.NEIClientConfig.disabledActions;
+import static codechicken.nei.NEIClientConfig.getMagnetMode;
+import static codechicken.nei.NEIClientConfig.isEnabled;
 
 import 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;
 
 public class LayoutStyleMinecraft extends LayoutStyle {
 
-    protected static final int BUTTON_SIZE = 20;
-    protected static final int MARGIN = 2;
-
     public int buttonCount;
     public int leftSize;
     public int numButtons;
@@ -25,18 +40,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.icons[0] = new Image(180, 24, 12, 12);
-        LayoutManager.magnet.icons[1] = new Image(180, 36, 12, 12);
-        LayoutManager.timeButtons[0].icon = new Image(132, 24, 12, 12);
-        LayoutManager.timeButtons[1].icon = new Image(120, 24, 12, 12);
-        LayoutManager.timeButtons[2].icon = new Image(144, 24, 12, 12);
-        LayoutManager.timeButtons[3].icon = new Image(156, 24, 12, 12);
-        LayoutManager.heal.icon = new Image(168, 24, 12, 12);
+        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
@@ -48,179 +64,90 @@ public class LayoutStyleMinecraft extends LayoutStyle {
     public void layout(GuiContainer gui, VisiblityData visiblity) {
         reset();
 
-        leftSize = (gui.width - gui.xSize) / 2 - 4;
-        numButtons = Math.max(leftSize / 20, 1);
+        leftSize = ItemPanels.bookmarkPanel.getWidth(gui);
+        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);
-        LayoutManager.magnet.index = (LayoutManager.magnet.state & 0x1) != 0 ? 1 : 0;
-
-        if (NEIClientConfig.canPerformAction("delete")) {
-            layoutButton(LayoutManager.delete);
-        }
-
-        if (NEIClientConfig.canPerformAction("rain")) {
-            layoutButton(LayoutManager.rain);
-        }
+        magnet.state = 0x4 | (getMagnetMode() ? 1 : 0);
 
+        if (canPerformAction("delete")) layoutButton(delete);
+        if (canPerformAction("rain")) layoutButton(rain);
         if (NEIClientUtils.isValidGamemode("creative") || NEIClientUtils.isValidGamemode("creative+")
-                || NEIClientUtils.isValidGamemode("adventure")) {
-            layoutButton(LayoutManager.gamemode);
-        }
-
-        if (NEIClientConfig.canPerformAction("magnet")) {
-            layoutButton(LayoutManager.magnet);
-        }
-
-        if (NEIClientConfig.canPerformAction("time")) {
+                || 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);
 
-        layoutFooter(gui, visiblity);
+        options.x = isEnabled() ? 0 : 6;
+        options.y = isEnabled() ? gui.height - 22 : gui.height - 28;
+        options.w = 22;
+        options.h = 22;
 
-        LayoutManager.itemPanel.resize(gui);
-        LayoutManager.bookmarkPanel.resize(gui);
-        LayoutManager.itemZoom.resize(gui);
-    }
+        bookmarksButton.x = 24 + (isEnabled() ? 0 : 6);
+        bookmarksButton.y = isEnabled() ? gui.height - 22 : gui.height - 28;
+        bookmarksButton.w = 22;
+        bookmarksButton.h = 22;
 
-    protected void layoutFooter(GuiContainer gui, VisiblityData visiblity) {
+        dropDown.h = 18;
+        dropDown.w = 150;
+        dropDown.y = 0;
+        dropDown.x = (gui.width - gui.xSize) / 2 + gui.xSize - dropDown.w;
 
-        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);
+        presetsPanel.h = 16;
+        presetsPanel.w = 150;
+        presetsPanel.y = 2;
+        presetsPanel.x = (gui.width - gui.xSize) / 2 + gui.xSize - presetsPanel.w;
 
+        searchField.h = 20;
         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;
+            searchField.w = 150;
+            searchField.x = (gui.width - searchField.w) / 2;
         } else {
-            area.w = ItemPanels.itemPanel.w;
-            area.x = ItemPanels.itemPanel.x;
-            area.y = ItemPanels.itemPanel.y + ItemPanels.itemPanel.h - BUTTON_SIZE;
+            searchField.w = (int) (itemPanel.w * (NEIClientConfig.showItemQuantityWidget() ? 0.7 : 1));
+            searchField.x = itemPanel.x;
         }
+        searchField.y = gui.height - searchField.h - 2;
 
-        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;
+        if (!visiblity.showItemSection) {
+            searchField.setFocus(false);
         }
-
-        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++;
     }
 
@@ -239,11 +166,7 @@ public class LayoutStyleMinecraft extends LayoutStyle {
 
         Image icon = b.getRenderIcon();
         if (icon == null) {
-            int labelColor = b.getRenderLabelColor();
-            int colour = labelColor != 0 ? labelColor
-                    : tex == 2 ? ColorUtils.buttonLabelHover.getColor()
-                            : tex == 0 ? ColorUtils.buttonLabelDisabled.getColor()
-                                    : ColorUtils.buttonLabelNormal.getColor();
+            int colour = tex == 2 ? 0xffffa0 : tex == 0 ? 0x601010 : 0xe0e0e0;
 
             drawStringC(b.getRenderLabel(), b.x + b.w / 2, b.y + (b.h - 8) / 2, colour);
         } else {
@@ -258,16 +181,9 @@ 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) {
-            GL11.glColor4f(0.65F, 0.65F, 0.65F, 1.0F);
-        } else {
-            GL11.glColor4f(1, 1, 1, 1);
-        }
-
+        if (state == 1) GL11.glColor4f(0.65F, 0.65F, 0.65F, 1.0F);
+        else GL11.glColor4f(1, 1, 1, 1);
         LayoutManager.drawButtonBackground(x, y, w, h, false, state == 0 ? 0 : 1);
-
-        if (text != null) {
-            drawStringC(text, x, y, w, h, 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

@@ -54,7 +54,6 @@ public class NEIActions {
         addAction("magnet", true);
         addAction("enchant", true);
         addAction("potion", true);
-        addAction("autocraft");
 
         canDisable.add("dawn");
         canDisable.add("noon");

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

@@ -6,7 +6,6 @@ import static codechicken.nei.PacketIDs.S2C;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.inventory.GuiInventory;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.network.play.INetHandlerPlayClient;
 import net.minecraft.util.ChatComponentTranslation;
 import net.minecraft.world.World;
@@ -15,7 +14,6 @@ import codechicken.core.ClientUtils;
 import codechicken.lib.inventory.InventoryUtils;
 import codechicken.lib.packet.PacketCustom;
 import codechicken.lib.packet.PacketCustom.IClientPacketHandler;
-import codechicken.nei.commands.CommandBookmarkAdd;
 import cpw.mods.fml.relauncher.Side;
 
 public class NEICPH implements IClientPacketHandler {
@@ -58,21 +56,6 @@ public class NEICPH implements IClientPacketHandler {
             case S2C.OPEN_POTION_GUI:
                 ClientUtils.openSMPGui(packet.readUByte(), new GuiPotionCreator(mc.thePlayer.inventory));
                 break;
-            case S2C.CACHE_BOOKMARK_DATA:
-                handleCacheBookmarkData(packet);
-                break;
-            case S2C.SYNC:
-                ServerSync.onReply(packet.readInt());
-                break;
-        }
-    }
-
-    private void handleCacheBookmarkData(PacketCustom packet) {
-        final String payloadId = packet.readString();
-        final NBTTagCompound payloadTag = packet.readNBTTagCompound();
-
-        if (payloadTag != null) {
-            CommandBookmarkAdd.cachePayload(payloadId, payloadTag);
         }
     }
 
@@ -203,12 +186,6 @@ public class NEICPH implements IClientPacketHandler {
         packet.sendToServer();
     }
 
-    public static void sendChatLink(NBTTagCompound payloadTag) {
-        PacketCustom packet = new PacketCustom(channel, C2S.SEND_CHAT_ITEM_LINK);
-        packet.writeNBTTagCompound(payloadTag);
-        packet.sendToServer();
-    }
-
     public static void sendOpenEnchantmentWindow() {
         PacketCustom packet = new PacketCustom(channel, C2S.REQUEST_ENCHANTMENT_GUI);
         packet.sendToServer();

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

@@ -8,13 +8,10 @@ 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.File;
-import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
+import java.math.BigInteger;
 import java.math.RoundingMode;
-import java.nio.file.Files;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
 import java.text.MessageFormat;
@@ -23,92 +20,48 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.IdentityHashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.audio.PositionedSoundRecord;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.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;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.ChatComponentTranslation;
+import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.IChatComponent;
 import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.fluids.FluidStack;
 
 import org.lwjgl.input.Keyboard;
-import org.lwjgl.opengl.GL11;
 
 import com.google.common.collect.Iterables;
-import com.gtnewhorizon.gtnhlib.util.numberformatting.NumberFormatUtil;
 
-import codechicken.lib.gui.GuiDraw;
 import codechicken.lib.inventory.InventoryRange;
 import codechicken.lib.inventory.InventoryUtils;
 import codechicken.lib.util.LangProxy;
-import codechicken.lib.vec.Rectangle4i;
 import codechicken.nei.api.GuiInfo;
 import codechicken.nei.api.IInfiniteItemHandler;
 import codechicken.nei.api.ItemInfo;
-import codechicken.nei.recipe.GuiOverlayButton.ItemOverlayState;
-import codechicken.nei.recipe.StackInfo;
-import codechicken.nei.util.NEIKeyboardUtils;
 
 public class NEIClientUtils extends NEIServerUtils {
 
-    private static final Set<String> REPORTED = ConcurrentHashMap.newKeySet();
-
-    public static class Alignment {
-
-        public final int x, y;
-
-        public static final Alignment TopLeft = new Alignment(-1, -1);
-        public static final Alignment TopCenter = new Alignment(0, -1);
-        public static final Alignment TopRight = new Alignment(1, -1);
-        public static final Alignment CenterLeft = new Alignment(-1, 0);
-        public static final Alignment Center = new Alignment(0, 0);
-        public static final Alignment CenterRight = new Alignment(1, 0);
-        public static final Alignment BottomLeft = new Alignment(-1, 1);
-        public static final Alignment BottomCenter = new Alignment(0, 1);
-        public static final Alignment BottomRight = new Alignment(1, 1);
-
-        public Alignment(int x, int y) {
-            this.x = x;
-            this.y = y;
-        }
-
-        public float getX(float parentWidth, float childWidth) {
-            final float x = (this.x + 1) / 2f;
-            return parentWidth * x - childWidth * x;
-        }
-
-        public float getY(float parentHeight, float childHeight) {
-            final float y = (this.y + 1) / 2f;
-            return parentHeight * y - childHeight * y;
-        }
-    }
-
     public static LangProxy lang = new LangProxy("nei");
 
     /** Formats a number with group separator and at most 2 fraction digits. */
     private static final Map<Locale, DecimalFormat> decimalFormatters = new HashMap<>();
-    private static final DecimalFormat CHANCE_FORMAT = new DecimalFormat("##0.##%");
 
-    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 final int ALT_HASH = 1 << 27;
+    public static final int SHIFT_HASH = 1 << 26;
+    public static final int CTRL_HASH = 1 << 25;
 
     public static Minecraft mc() {
         return Minecraft.getMinecraft();
@@ -136,26 +89,16 @@ public class NEIClientUtils extends NEIServerUtils {
         });
     }
 
-    public static String formatNumber(Number aNumber) {
-
-        if (NEIModContainer.isGTNHLibLoaded()) {
-            return NumberFormatUtil.formatNumber(aNumber);
-        }
-
+    public static String formatNumbers(BigInteger aNumber) {
         return getDecimalFormat().format(aNumber);
     }
 
-    public static String formatFluid(Number aNumber) {
-
-        if (NEIModContainer.isGTNHLibLoaded()) {
-            return NumberFormatUtil.formatFluid(aNumber);
-        }
-
-        return getDecimalFormat().format(aNumber) + " L";
+    public static String formatNumbers(long aNumber) {
+        return getDecimalFormat().format(aNumber);
     }
 
-    public static String formatChance(float chance) {
-        return CHANCE_FORMAT.format(chance);
+    public static String formatNumbers(double aNumber) {
+        return getDecimalFormat().format(aNumber);
     }
 
     public static void deleteHeldItem() {
@@ -218,7 +161,7 @@ public class NEIClientUtils extends NEIServerUtils {
     public static void cheatItem(ItemStack stack, int button, int mode) {
         if (!canCheatItem(stack)) return;
 
-        if (mode == -1 && button == 0 && controlKey() && NEIClientConfig.hasSMPCounterPart()) {
+        if (mode == -1 && button == 0 && shiftKey() && NEIClientConfig.hasSMPCounterPart()) {
             for (IInfiniteItemHandler handler : ItemInfo.infiniteHandlers) {
                 if (!handler.canHandleItem(stack)) continue;
 
@@ -303,83 +246,6 @@ public class NEIClientUtils extends NEIServerUtils {
         return InventoryUtils.getInsertibleQuantity(new InventoryRange(player.inventory, 0, 36), itemstack) > 0;
     }
 
-    public static List<ItemOverlayState> presenceOverlay(List<PositionedStack> ingredients, List<ItemStack> invStacks) {
-        final List<ItemOverlayState> states = new ArrayList<>();
-        final Map<ItemStack, Long> remainingFluid = new IdentityHashMap<>();
-
-        for (PositionedStack stack : ingredients) {
-            boolean found;
-
-            if (StackInfo.isFluidDisplayItem(stack.item)) {
-                final FluidStack requiredFluid = StackInfo.getFluid(stack.item);
-                found = requiredFluid != null && consumeFluid(invStacks, remainingFluid, requiredFluid);
-            } else {
-                found = false;
-
-                for (ItemStack is : invStacks) {
-                    if (is.stackSize > 0 && stack.contains(is)) {
-                        is.stackSize--;
-                        found = true;
-                        break;
-                    }
-                }
-            }
-
-            states.add(new ItemOverlayState(stack, found));
-        }
-
-        return states;
-    }
-
-    private static boolean consumeFluid(List<ItemStack> invStacks, Map<ItemStack, Long> remainingFluid,
-            FluidStack requiredFluid) {
-        long need = requiredFluid.amount;
-        final List<ItemStack> matched = new ArrayList<>();
-
-        for (ItemStack is : invStacks) {
-            if (need <= 0) {
-                break;
-            }
-
-            if (is.stackSize <= 0) {
-                continue;
-            }
-
-            final FluidStack invFluid = StackInfo.getFluid(is);
-
-            if (invFluid == null || !invFluid.isFluidEqual(requiredFluid)) {
-                continue;
-            }
-
-            final long available = remainingFluid.computeIfAbsent(is, k -> (long) invFluid.amount * is.stackSize);
-            if (available <= 0) {
-                continue;
-            }
-
-            matched.add(is);
-            need -= available;
-        }
-
-        if (need > 0) {
-            return false;
-        }
-
-        long remainingNeed = requiredFluid.amount;
-        for (ItemStack is : matched) {
-            final long available = remainingFluid.get(is);
-            final long consumed = Math.min(available, remainingNeed);
-
-            remainingFluid.put(is, available - consumed);
-            remainingNeed -= consumed;
-
-            if (remainingNeed <= 0) {
-                break;
-            }
-        }
-
-        return true;
-    }
-
     public static boolean shiftKey() {
         return Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT);
     }
@@ -442,7 +308,7 @@ public class NEIClientUtils extends NEIServerUtils {
     }
 
     public static void sendCommand(String command, Object... args) {
-        if (command.isEmpty()) return;
+        if (command.length() == 0) return;
 
         NumberFormat numberformat = NumberFormat.getIntegerInstance();
         numberformat.setGroupingUsed(false);
@@ -467,10 +333,6 @@ public class NEIClientUtils extends NEIServerUtils {
         else sendCommand(getStringSetting("command.heal"), mc().thePlayer.getCommandSenderName());
     }
 
-    public static void sendChatItemLink(NBTTagCompound payload) {
-        if (hasSMPCounterPart()) NEICPH.sendChatLink(payload);
-    }
-
     public static void toggleMagnetMode() {
         if (hasSMPCounterPart()) NEICPH.sendToggleMagnetMode();
     }
@@ -505,16 +367,18 @@ public class NEIClientUtils extends NEIServerUtils {
     }
 
     public static String cropText(FontRenderer fontRenderer, String text, int containerWidth) {
+
         int textWidth = fontRenderer.getStringWidth(text);
 
         if (textWidth > containerWidth) {
-            int dots = fontRenderer.getStringWidth("...");
+            textWidth += fontRenderer.getStringWidth("...");
 
-            if (containerWidth <= dots) {
-                return "...";
+            while (textWidth > containerWidth) {
+                textWidth -= fontRenderer.getCharWidth(text.charAt(text.length() - 1));
+                text = text.substring(0, text.length() - 1);
             }
 
-            return fontRenderer.trimStringToWidth(text, containerWidth - dots) + "...";
+            return text + "...";
         }
 
         return text;
@@ -542,8 +406,43 @@ public class NEIClientUtils extends NEIServerUtils {
         return Keyboard.isKeyDown(Keyboard.KEY_LMENU) || Keyboard.isKeyDown(Keyboard.KEY_RMENU);
     }
 
-    public static String getKeyName(int keyBind, int mouseBind) {
-        return KeyManager.getKeyName(keyBind, mouseBind);
+    public static int getMetaHash() {
+        if (Keyboard.getEventKeyState()) {
+            int hash = 0;
+
+            if (altKey()) {
+                hash = hash | ALT_HASH;
+            }
+
+            if (shiftKey()) {
+                hash = hash | SHIFT_HASH;
+            }
+
+            if (controlKey()) {
+                hash = hash | CTRL_HASH;
+            }
+
+            return hash;
+        }
+
+        return 0;
+    }
+
+    public static int getKeyHash() {
+
+        if (Keyboard.getEventKeyState()) {
+            final int keycode = Keyboard.getEventKey();
+
+            if (keycode != Keyboard.KEY_LSHIFT && keycode != Keyboard.KEY_RSHIFT
+                    && keycode != Keyboard.KEY_LCONTROL
+                    && keycode != Keyboard.KEY_RCONTROL
+                    && keycode != Keyboard.KEY_LMENU
+                    && keycode != Keyboard.KEY_RMENU) {
+                return getMetaHash() + keycode;
+            }
+        }
+
+        return Keyboard.CHAR_NONE;
     }
 
     public static void playClickSound() {
@@ -557,9 +456,16 @@ public class NEIClientUtils extends NEIServerUtils {
         String stackTrace = cause + sw;
         if (buffer.contains(stackTrace)) return;
 
-        System.err.println("Error while rendering: " + cause + " (" + e.getMessage() + ")");
+        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) {
@@ -569,105 +475,4 @@ public class NEIClientUtils extends NEIServerUtils {
             reportErrorBuffered(e, buffer, "null");
         }
     }
-
-    public static long getScrollMultiplier(ItemStack stack) {
-        final long multiplier = NEIClientConfig.showItemQuantityWidget() ? NEIClientConfig.getItemQuantity() : 0;
-
-        if (multiplier != 0) {
-            return multiplier;
-        }
-
-        return StackInfo.isFluidDisplayItem(stack) ? 144 : stack.getMaxStackSize();
-    }
-
-    public static void drawRect(double left, double top, double width, double height, Color color) {
-        final boolean is2DTexture = GL11.glGetBoolean(GL11.GL_TEXTURE_2D);
-        final boolean isBlend = GL11.glGetBoolean(GL11.GL_BLEND);
-        final Tessellator tessellator = Tessellator.instance;
-
-        GL11.glEnable(GL11.GL_BLEND);
-        GL11.glDisable(GL11.GL_TEXTURE_2D);
-        OpenGlHelper.glBlendFunc(770, 771, 1, 0);
-        GL11.glColor4f(color.getRed() / 255f, color.getGreen() / 255f, color.getBlue() / 255f, color.getAlpha() / 255f);
-        tessellator.startDrawingQuads();
-        tessellator.addVertex(left, top + height, 0.0D);
-        tessellator.addVertex(left + width, top + height, 0.0D);
-        tessellator.addVertex(left + width, top, 0.0D);
-        tessellator.addVertex(left, top, 0.0D);
-        tessellator.draw();
-        GL11.glColor4f(1, 1, 1, 1);
-        if (is2DTexture) GL11.glEnable(GL11.GL_TEXTURE_2D);
-        if (!isBlend) GL11.glDisable(GL11.GL_BLEND);
-    }
-
-    public static void drawNEIOverlayText(String text, Rectangle4i rect, float scale, int color, boolean shadow,
-            Alignment alignment) {
-        final float screenScale = mc().currentScreen.width * 1f / mc().displayWidth;
-        final double smallTextScale = Math
-                .max(screenScale, (Math.max(scale, 1f) * (GuiDraw.fontRenderer.getUnicodeFlag() ? 3F / 4F : 1F / 2F)));
-
-        NEIClientUtils.gl2DRenderContext(() -> {
-            final int width = GuiDraw.fontRenderer.getStringWidth(text);
-            final float partW = rect.w / 2f;
-            final float partH = rect.h / 2f;
-            final double offsetX = Math
-                    .ceil(rect.x + partW + partW * alignment.x - (width / 2f * (alignment.x + 1)) * smallTextScale);
-            final double offsetY = Math.ceil(
-                    rect.y + partH
-                            + partH * alignment.y
-                            - (GuiDraw.fontRenderer.FONT_HEIGHT / 2f * (alignment.y + 1)) * smallTextScale);
-
-            GL11.glTranslated(offsetX, offsetY, 0);
-            GL11.glScaled(smallTextScale, smallTextScale, 1);
-            GuiDraw.fontRenderer.drawString(text, 0, 0, color, shadow);
-            GL11.glScaled(1 / smallTextScale, 1 / smallTextScale, 1);
-            GL11.glTranslated(-1 * offsetX, -1 * offsetY, 0);
-            GL11.glColor4f(1, 1, 1, 1);
-        });
-    }
-
-    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);
-    }
-
-    public static void errorOnce(String key, String message, Throwable error) {
-        if (REPORTED.add(key)) {
-            NEIClientConfig.logger.error(message, error);
-        }
-    }
-
-    public static void warnOnce(String key, String message) {
-        if (REPORTED.add(key)) {
-            NEIClientConfig.logger.warn(message);
-        }
-    }
-
-    public static boolean backupFile(File file) {
-        final File backup = new File(file.getAbsolutePath() + ".backup-" + System.currentTimeMillis());
-
-        try {
-            Files.copy(file.toPath(), backup.toPath());
-            NEIClientConfig.logger.info("Backed up file {} to {}", file, backup);
-            return true;
-        } catch (IOException e) {
-            NEIClientConfig.logger.error("Failed to backup file {} to {}", file, backup, e);
-            return false;
-        }
-    }
-
 }

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

@@ -1,35 +1,26 @@
 package codechicken.nei;
 
 import static codechicken.lib.gui.GuiDraw.getMousePosition;
-import static codechicken.nei.NEIClientConfig.canCheatItem;
 
 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.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.client.ClientCommandHandler;
 
-import codechicken.core.CommonUtils;
-import codechicken.lib.gui.GuiDraw;
 import codechicken.nei.api.API;
 import codechicken.nei.api.GuiInfo;
 import codechicken.nei.api.IInfiniteItemHandler;
 import codechicken.nei.api.INEIGuiHandler;
 import codechicken.nei.api.ItemInfo;
-import codechicken.nei.commands.CommandBookmarkAdd;
-import codechicken.nei.commands.CommandRecipeId;
-import codechicken.nei.commands.CommandUntranslator;
 import codechicken.nei.guihook.GuiContainerManager;
 import codechicken.nei.guihook.IContainerInputHandler;
 import codechicken.nei.guihook.IContainerSlotClickHandler;
-import codechicken.nei.util.EmptyContainer;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
+import codechicken.nei.recipe.GuiRecipe;
 
 public class NEIController implements IContainerSlotClickHandler, IContainerInputHandler {
 
@@ -48,8 +39,6 @@ public class NEIController implements IContainerSlotClickHandler, IContainerInpu
     public static void load() {
         GuiContainerManager.addSlotClickHandler(instance);
         GuiContainerManager.addInputHandler(instance);
-
-        if (CommonUtils.isClient()) registerClientCommands();
     }
 
     public static void load(GuiContainer gui) {
@@ -67,48 +56,32 @@ public class NEIController implements IContainerSlotClickHandler, IContainerInpu
         return gui.field_147007_t && gui.field_147008_s.size() > 1;
     }
 
-    @SideOnly(Side.CLIENT)
-    public static void registerClientCommands() {
-        ClientCommandHandler.instance.registerCommand(new CommandBookmarkAdd());
-        ClientCommandHandler.instance.registerCommand(new CommandRecipeId());
-        ClientCommandHandler.instance.registerCommand(new CommandUntranslator());
-    }
-
     public static void updateUnlimitedItems(InventoryPlayer inventory) {
         if (!NEIClientConfig.canPerformAction("item") || !NEIClientConfig.hasSMPCounterPart()) return;
 
-        int size = inventory.getSizeInventory();
-        for (int i = 0; i < size; i++) {
+        LinkedList<ItemStack> beforeStacks = new LinkedList<>();
+        for (int i = 0; i < inventory.getSizeInventory(); i++)
+            beforeStacks.add(NEIServerUtils.copyStack(inventory.getStackInSlot(i)));
+
+        for (int i = 0; i < inventory.getSizeInventory(); i++) {
             ItemStack stack = inventory.getStackInSlot(i);
             if (stack == null) continue;
 
-            for (IInfiniteItemHandler handler : ItemInfo.infiniteHandlers) {
-                if (!handler.canHandleItem(stack) || !handler.isItemInfinite(stack)) continue;
+            for (IInfiniteItemHandler handler : ItemInfo.infiniteHandlers)
+                if (handler.canHandleItem(stack) && handler.isItemInfinite(stack))
+                    handler.replenishInfiniteStack(inventory, i);
+        }
 
-                long beforeSize = packStackSize(stack.stackSize, stack.getItemDamage());
-                handler.replenishInfiniteStack(inventory, i);
+        for (int i = 0; i < inventory.getSizeInventory(); i++) {
+            ItemStack newstack = inventory.getStackInSlot(i);
 
-                ItemStack newstack = inventory.getStackInSlot(i);
-                if (!sameStack(stack, beforeSize, newstack)) {
-                    NEIClientUtils.setSlotContents(i, newstack, false); // sends via SMP handler ;)
-                    stack.stackSize = (int) (beforeSize >> 32);
-                    stack.setItemDamage((int) beforeSize);
-                    inventory.setInventorySlotContents(i, stack); // restore in case of SMP fail
-                }
+            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 ;)
             }
         }
     }
 
-    private static long packStackSize(int stackSize, int itemDamage) {
-        return ((long) stackSize << 32) | (itemDamage & 0xFFFFFFFFL);
-    }
-
-    private static boolean sameStack(ItemStack before, long beforeSize, ItemStack stack) {
-        if (stack == null) return before == null;
-        return before != null && Item.getIdFromItem(before.getItem()) == Item.getIdFromItem(stack.getItem())
-                && beforeSize == packStackSize(stack.stackSize, stack.getItemDamage());
-    }
-
     public static void processCreativeCycling(InventoryPlayer inventory) {
         if (NEIClientConfig.invCreativeMode() && NEIClientUtils.controlKey()) {
             if (selectedItem != inventory.currentItem) {
@@ -149,7 +122,7 @@ public class NEIController implements IContainerSlotClickHandler, IContainerInpu
             return true;
         }
 
-        if (button == 1 && modifier != 2 && slot instanceof SlotCrafting) // right click
+        if (button == 1 && slot instanceof SlotCrafting) // right click
         {
             for (int i1 = 0; i1 < 64; i1++) // click this slot 64 times
                 manager.handleSlotClick(slot.slotNumber, button, 0);
@@ -161,40 +134,26 @@ public class NEIController implements IContainerSlotClickHandler, IContainerInpu
                 && slot != null
                 && slot.getStack() != null
                 && slot.isItemValid(slot.getStack())) {
-            if (!canCheatItem(slot.getStack())) return false;
-
             NEIClientUtils.cheatItem(slot.getStack(), button, 1);
             return true;
         }
 
         if (GuiInfo.hasCustomSlots(gui)) return false;
 
-        if (NEIClientUtils.shiftKey() && button != 2) { // MMB is used by other mods when an itemstack is picked.
-            // fix small mouse movement while clicking causing slotIndex to be -999
-            if (slotIndex == -999) {
-                final Point mouse = GuiDraw.getMousePosition();
-                slot = gui.getSlotAtPosition(mouse.x, mouse.y);
+        if (slotIndex >= 0 && NEIClientUtils.shiftKey()
+                && NEIClientUtils.getHeldItem() != null
+                && !slot.getHasStack()) {
+            ItemStack held = NEIClientUtils.getHeldItem();
+            manager.handleSlotClick(slot.slotNumber, button, 0);
+            if (slot.isItemValid(held) && !ItemInfo.fastTransferExemptions.contains(slot.getClass()))
+                fastTransferManager.performMassTransfer(gui, pickedUpFromSlot, slotIndex, held);
 
-                if (slot != null) {
-                    slotIndex = slot.slotNumber;
-                }
-            }
+            return true;
+        }
 
-            if (slotIndex >= 0 && NEIClientUtils.getHeldItem() != null && !slot.getHasStack()) {
-                final ItemStack held = NEIClientUtils.getHeldItem();
-                manager.handleSlotClick(slot.slotNumber, button, 0);
-
-                if (slot.isItemValid(held) && !ItemInfo.fastTransferExemptions.contains(slot.getClass())) {
-                    fastTransferManager.performMassTransfer(gui, pickedUpFromSlot, slotIndex, held);
-                }
-
-                return true;
-            }
-
-            if (slotIndex == -999 && button == 0) {
-                fastTransferManager.throwAll(gui, pickedUpFromSlot);
-                return true;
-            }
+        if (slotIndex == -999 && NEIClientUtils.shiftKey() && button == 0) {
+            fastTransferManager.throwAll(gui, pickedUpFromSlot);
+            return true;
         }
 
         return false;
@@ -261,7 +220,7 @@ public class NEIController implements IContainerSlotClickHandler, IContainerInpu
 
         // slot in GuiRecipe does not contain actual stack
         // and scroll should be handled by GuiRecipe, not here
-        if (gui.inventorySlots instanceof EmptyContainer) return false;
+        if (gui instanceof GuiRecipe) return false;
 
         Point mousePos = getMousePosition();
         Slot mouseover = manager.window.getSlotAtPosition(mousePos.x, mousePos.y);

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

@@ -1,13 +1,13 @@
 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 java.util.concurrent.CopyOnWriteArrayList;
+
+import net.minecraft.util.EnumChatFormatting;
 
 import com.google.common.eventbus.EventBus;
 import com.google.common.eventbus.Subscribe;
@@ -17,7 +17,6 @@ import codechicken.core.launch.CodeChickenCorePlugin;
 import codechicken.nei.api.IConfigureNEI;
 import codechicken.nei.asm.NEICorePlugin;
 import codechicken.nei.config.IMCHandler;
-import codechicken.nei.guihook.HideousLinkedList;
 import codechicken.nei.recipe.GuiRecipeTab;
 import cpw.mods.fml.client.FMLFileResourcePack;
 import cpw.mods.fml.client.FMLFolderResourcePack;
@@ -25,30 +24,24 @@ import cpw.mods.fml.common.DummyModContainer;
 import cpw.mods.fml.common.LoadController;
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.ModMetadata;
-import cpw.mods.fml.common.discovery.ASMDataTable;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLInterModComms;
 import cpw.mods.fml.common.event.FMLLoadCompleteEvent;
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import cpw.mods.fml.common.event.FMLServerAboutToStartEvent;
 import cpw.mods.fml.common.versioning.ArtifactVersion;
 import cpw.mods.fml.common.versioning.VersionParser;
 import cpw.mods.fml.common.versioning.VersionRange;
 
-@SuppressWarnings("UnstableApiUsage")
 public class NEIModContainer extends DummyModContainer {
 
-    public static final LinkedList<IConfigureNEI> plugins = new HideousLinkedList<>(new CopyOnWriteArrayList<>());
+    public static LinkedList<IConfigureNEI> plugins = new LinkedList<>();
 
     private static boolean gregTech5Loaded;
-    private static boolean gtnhLibLoaded;
-    private static boolean cubicChunksLoaded;
-
-    private static ASMDataTable asmDataTable;
 
     public NEIModContainer() {
         super(getModMetadata());
+        loadMetadata();
     }
 
     private static ModMetadata getModMetadata() {
@@ -56,7 +49,7 @@ public class NEIModContainer extends DummyModContainer {
         modMetadata.name = "NotEnoughItems";
         modMetadata.modId = "NotEnoughItems";
         modMetadata.version = Tags.VERSION;
-        modMetadata.authorList = Arrays.asList("ChickenBones", "mitchej123", "SLPrime");
+        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;
@@ -66,31 +59,44 @@ public class NEIModContainer extends DummyModContainer {
         return gregTech5Loaded;
     }
 
-    public static boolean isGTNHLibLoaded() {
-        return gtnhLibLoaded;
-    }
-
-    public static boolean isCCLoaded() {
-        return cubicChunksLoaded;
-    }
-
     @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.9.6,)"));
-        return deps;
+        return new LinkedList<>(getRequirements());
     }
 
     private String description;
 
+    private void loadMetadata() {
+        description = super.getMetadata().description.replace("Supporters:", EnumChatFormatting.AQUA + "Supporters:");
+    }
+
+    @Override
+    public ModMetadata getMetadata() {
+        StringBuilder s_plugins = new StringBuilder();
+        if (plugins.size() == 0) {
+            s_plugins.append(EnumChatFormatting.RED).append("No installed plugins.");
+        } else {
+            s_plugins.append(EnumChatFormatting.GREEN).append("Installed plugins: ");
+            for (int i = 0; i < plugins.size(); i++) {
+                if (i > 0) s_plugins.append(", ");
+                IConfigureNEI plugin = plugins.get(i);
+                s_plugins.append(plugin.getName()).append(" ").append(plugin.getVersion());
+            }
+            s_plugins.append(".");
+        }
+
+        ModMetadata meta = super.getMetadata();
+        meta.description = description.replace("<plugins>", s_plugins.toString());
+        return meta;
+    }
+
     @Override
     public boolean registerBus(EventBus bus, LoadController controller) {
         bus.register(this);
@@ -100,19 +106,13 @@ public class NEIModContainer extends DummyModContainer {
     @Subscribe
     public void preInit(FMLPreInitializationEvent event) {
         gregTech5Loaded = Loader.isModLoaded("gregtech") && !Loader.isModLoaded("gregapi_post");
-        gtnhLibLoaded = Loader.isModLoaded("gtnhlib");
-        cubicChunksLoaded = Loader.isModLoaded("cubicchunks");
-        ServerHandler.preInit();
         if (CommonUtils.isClient()) ClientHandler.preInit();
-        asmDataTable = event.getAsmData();
     }
 
     @Subscribe
     public void init(FMLInitializationEvent event) {
-        if (CommonUtils.isClient()) {
-            ClientHandler.load();
-            IMCForNEI.IMCSender();
-        }
+        if (CommonUtils.isClient()) ClientHandler.load();
+
         ServerHandler.load();
     }
 
@@ -127,17 +127,9 @@ public class NEIModContainer extends DummyModContainer {
     public void loadComplete(FMLLoadCompleteEvent event) {
         if (CommonUtils.isClient()) {
             GuiRecipeTab.loadHandlerInfo();
-            ClientHandler.loadPluginsList();
-            ClientHandler.loadHandlerOrdering();
-            asmDataTable = null;
         }
     }
 
-    @Subscribe
-    public void onServerAboutToStart(FMLServerAboutToStartEvent event) {
-        NEIServerConfig.resetFirstLoad();
-    }
-
     @Subscribe
     public void handleIMCMessages(FMLInterModComms.IMCEvent event) {
         IMCHandler.processIMC(event.getMessages());
@@ -157,8 +149,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,10 +1,14 @@
 package codechicken.nei;
 
+import java.util.Collection;
+
 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;
 
 /**
@@ -14,37 +18,35 @@ public class NEIPotionGuiHandler extends INEIGuiAdapter {
 
     @Override
     public boolean hideItemPanelSlot(GuiContainer guiContainer, int slotX, int slotY, int slotW, int slotH) {
-        if (!(guiContainer instanceof InventoryEffectRenderer)) {
+        if (NEIClientConfig.ignorePotionOverlap()) {
             return false;
         }
 
-        int x = guiContainer.guiLeft - 124;
-        if (slotX + slotW <= x || slotX >= x + 140) {
-            return false;
-        }
-
-        Minecraft minecraft = guiContainer.mc;
-        if (minecraft == null) {
-            return false;
-        }
-        EntityPlayerSP player = minecraft.thePlayer;
-        if (player == null) {
-            return false;
-        }
-        int potionCount = player.getActivePotionEffects().size();
-        if (potionCount == 0 || NEIClientConfig.ignorePotionOverlap()) {
-            return false;
-        }
-        int height = 33;
-        if (potionCount > 5) {
-            height = 132 / (potionCount - 1);
-        }
-        return intersectsPotionEffects(slotY, slotH, guiContainer.guiTop, potionCount, height);
-    }
-
-    static boolean intersectsPotionEffects(int slotY, int slotH, int effectY, int potionCount, int height) {
-        for (int i = 0; i < potionCount; i++, effectY += height) {
-            if (slotY + slotH > effectY && slotY < effectY + 32) return true;
+        if (guiContainer instanceof InventoryEffectRenderer) {
+            int x = guiContainer.guiLeft - 124;
+            int y = guiContainer.guiTop;
+            Minecraft minecraft = guiContainer.mc;
+            if (minecraft == null) {
+                return false;
+            }
+            EntityPlayerSP player = minecraft.thePlayer;
+            if (player == null) {
+                return false;
+            }
+            Collection<PotionEffect> activePotionEffects = player.getActivePotionEffects();
+            if (activePotionEffects.isEmpty()) {
+                return false;
+            }
+            int height = 33;
+            if (activePotionEffects.size() > 5) {
+                height = 132 / (activePotionEffects.size() - 1);
+            }
+            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;
+                y += height;
+            }
         }
         return false;
     }

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

@@ -11,7 +11,6 @@ import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.inventory.InventoryBasic;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.network.play.INetHandlerPlayServer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.tileentity.TileEntityMobSpawner;
@@ -89,25 +88,9 @@ public class NEISPH implements IServerPacketHandler {
             case C2S.SET_DUMMY_SLOT:
                 handleDummySlotSet(sender, packet);
                 break;
-            case C2S.SEND_CHAT_ITEM_LINK:
-                handleSendChatItemLink(sender, packet);
-                break;
-            case C2S.SYNC:
-                handleSync(sender, packet.readInt());
-                break;
         }
     }
 
-    private void handleSync(EntityPlayerMP sender, int id) {
-        sender.sendContainerAndContentsToPlayer(sender.openContainer, sender.openContainer.getInventory());
-        new PacketCustom(channel, S2C.SYNC).writeInt(id).sendToPlayer(sender);
-    }
-
-    private void handleSendChatItemLink(EntityPlayerMP sender, PacketCustom packet) {
-        final NBTTagCompound payloadTag = packet.readNBTTagCompound();
-        NEIServerUtils.sendChatItemLink(sender, payloadTag);
-    }
-
     private void handleDummySlotSet(EntityPlayerMP sender, PacketCustom packet) {
         int slotNumber = packet.readShort();
         ItemStack stack = packet.readItemStack(true);

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

@@ -18,10 +18,9 @@ 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;
@@ -36,38 +35,24 @@ import codechicken.lib.packet.PacketCustom;
 
 public class NEIServerConfig {
 
-    private static boolean firstLoad;
+    private static MinecraftServer server;
+
     public static Logger logger = LogManager.getLogger("NotEnoughItems");
     public static File saveDir;
     public static ConfigFile serverConfig;
     public static Map<Integer, NBTTagCompound> dimTags = new HashMap<>();
     public static HashMap<String, PlayerSave> playerSaves = new HashMap<>();
     public static ItemStackMap<Set<String>> bannedItems = new ItemStackMap<>();
-    private static boolean doesPermAPIExist = false;
-
-    public static void resetFirstLoad() {
-        firstLoad = true;
-    }
 
     public static void load(World world) {
-        if (firstLoad) {
-            firstLoad = false;
+        if (MinecraftServer.getServer() != server) {
             logger.debug("Loading NEI Server");
+            server = MinecraftServer.getServer();
             saveDir = new File(DimensionManager.getCurrentSaveRootDirectory(), "NEI");
 
             dimTags.clear();
             loadConfig();
             loadBannedItems();
-
-            try {
-                Class.forName("net.minecraftforge.permission.PermissionManager");
-                doesPermAPIExist = true;
-
-                NEIActions.baseActions().forEach(
-                        action -> {
-                            PermissionManager.registerPermission("nei.permissions." + action, PermissionLevel.OP);
-                        });
-            } catch (ClassNotFoundException ignored) {}
         }
         loadWorld(world);
     }
@@ -108,7 +93,6 @@ public class NEIServerConfig {
         setDefaultFeature("save-state");
         setDefaultFeature("item");
         setDefaultFeature("delete");
-        setDefaultFeature("autocraft", "ALL");
         setDefaultFeature("notify-item", "CONSOLE, OP");
     }
 
@@ -137,12 +121,7 @@ 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) {
@@ -218,7 +197,7 @@ public class NEIServerConfig {
             FileReader r = new FileReader(file);
             int line = 0;
             for (String s : IOUtils.readLines(r)) {
-                if (s.charAt(0) == '#' || s.trim().isEmpty()) continue;
+                if (s.charAt(0) == '#' || s.trim().length() == 0) continue;
                 int delim = s.lastIndexOf('=');
                 if (delim < 0) {
                     logger.error("line " + line + ": Missing =");

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

@@ -4,10 +4,12 @@ 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.UUID;
+import java.util.Set;
 import java.util.zip.ZipException;
 
 import net.minecraft.command.ICommandSender;
@@ -15,7 +17,6 @@ import net.minecraft.enchantment.Enchantment;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.event.ClickEvent;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -26,13 +27,12 @@ import net.minecraft.nbt.NBTException;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.nbt.NBTTagList;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.util.ChatComponentText;
 import net.minecraft.util.ChatComponentTranslation;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.IChatComponent;
 import net.minecraft.world.World;
+import net.minecraft.world.WorldServer;
 import net.minecraft.world.WorldSettings.GameType;
-import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.oredict.OreDictionary;
 
 import org.apache.logging.log4j.Level;
@@ -43,30 +43,12 @@ import codechicken.lib.inventory.InventoryRange;
 import codechicken.lib.inventory.InventoryUtils;
 import codechicken.lib.packet.PacketCustom;
 import codechicken.nei.PacketIDs.S2C;
-import codechicken.nei.item.ItemFluidDisplay;
-import codechicken.nei.recipe.StackInfo;
 import codechicken.nei.util.NBTHelper;
 import cpw.mods.fml.common.FMLLog;
 import cpw.mods.fml.common.registry.GameRegistry;
-import cpw.mods.fml.relauncher.ReflectionHelper;
 
 public class NEIServerUtils {
 
-    private static class GTMetaBaseItemHolder {
-
-        private static final Class<?> gtMetaBaseItem = loadMetaBaseItem();
-
-        private static Class<?> loadMetaBaseItem() {
-            try {
-                final ClassLoader loader = NEIServerUtils.class.getClassLoader();
-                return ReflectionHelper
-                        .getClass(loader, "gregtech.api.items.MetaBaseItem", "gregtech.api.items.GT_MetaBase_Item");
-            } catch (Exception ignored) {
-                return null;
-            }
-        }
-    }
-
     public static boolean isRaining(World world) {
         return world.getWorldInfo().isRaining();
     }
@@ -74,7 +56,7 @@ public class NEIServerUtils {
     public static void toggleRaining(World world, boolean notify) {
         boolean raining = !world.isRaining();
         if (!raining) // turn off
-            world.provider.resetRainAndThunder();
+            ((WorldServer) world).provider.resetRainAndThunder();
         else world.getWorldInfo().setRaining(!isRaining(world));
 
         if (notify)
@@ -87,48 +69,6 @@ public class NEIServerUtils {
         player.extinguish();
     }
 
-    public static void sendChatItemLink(EntityPlayerMP sender, NBTTagCompound payload) {
-        if (payload == null) {
-            sender.addChatMessage(new ChatComponentText("Invalid bookmark payload"));
-            return;
-        }
-
-        final String linkType = payload.getString("linkType");
-        final String payloadId = UUID.randomUUID().toString().substring(0, 8);
-        final PacketCustom packet = new PacketCustom(NEISPH.channel, S2C.CACHE_BOOKMARK_DATA).writeString(payloadId)
-                .writeNBTTagCompound((NBTTagCompound) payload.copy());
-
-        for (EntityPlayer player : ServerUtils.getPlayers()) {
-            if (player instanceof EntityPlayerMP playerMP) {
-                packet.sendToPlayer(playerMP);
-            }
-        }
-
-        try {
-            final IChatComponent clickable;
-
-            if (payload.hasKey("item")) {
-                clickable = StackInfo.loadFromNBT(payload.getCompoundTag("item")).func_151000_E();
-            } else {
-                clickable = new ChatComponentText("[")
-                        .appendSibling(new ChatComponentTranslation("nei.chat.item_link." + linkType + ".text"))
-                        .appendText("]");
-            }
-
-            if (clickable == null) {
-                throw new Exception("Invalid ItemStack NBT");
-            }
-
-            clickable.getChatStyle()
-                    .setChatClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/nei_bookmark " + payloadId));
-            ServerUtils.sendChatToAll(
-                    new ChatComponentTranslation("nei.chat.item_link.text", sender.getDisplayName(), clickable));
-        } catch (Exception e) {
-            sender.addChatMessage(new ChatComponentText(e.toString()));
-        }
-
-    }
-
     public static long getTime(World world) {
         return world.getWorldInfo().getWorldTime();
     }
@@ -149,8 +89,9 @@ public class NEIServerUtils {
         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());
     }
@@ -206,7 +147,7 @@ public class NEIServerUtils {
 
     /**
      * NBT-friendly version of {@link #areStacksSameType(ItemStack, ItemStack)}
-     *
+     * 
      * @param stack1 The {@link ItemStack} being compared.
      * @param stack2 The {@link ItemStack} to compare to.
      * @return whether the two items are the same in terms of itemID, damage and NBT.
@@ -214,7 +155,7 @@ public class NEIServerUtils {
     public static boolean areStacksSameTypeWithNBT(ItemStack stack1, ItemStack stack2) {
         return stack1 != null && stack2 != null
                 && stack1.getItem() == stack2.getItem()
-                && (stack2.isItemStackDamageable() || stack2.getItemDamage() == stack1.getItemDamage())
+                && (!stack2.getHasSubtypes() || stack2.getItemDamage() == stack1.getItemDamage())
                 && NBTHelper.matchTag(stack1.getTagCompound(), stack2.getTagCompound());
     }
 
@@ -237,33 +178,19 @@ public class NEIServerUtils {
 
     /**
      * NBT-friendly version of {@link #areStacksSameTypeCrafting(ItemStack, ItemStack)}
-     *
+     * 
      * @param stack1 The {@link ItemStack} being compared.
      * @param stack2 The {@link ItemStack} to compare to.
      * @return whether the two items are the same from the perspective of a crafting inventory.
      */
     public static boolean areStacksSameTypeCraftingWithNBT(ItemStack stack1, ItemStack stack2) {
-
-        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
-     */
-    public static boolean isItemTool(ItemStack stack) {
-        return GTMetaBaseItemHolder.gtMetaBaseItem != null
-                && GTMetaBaseItemHolder.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());
     }
 
     /**
@@ -441,53 +368,17 @@ public class NEIServerUtils {
         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 item) {
-            return new ItemStack[] { item };
-        }
-
-        if (obj instanceof ItemStack[]arr) {
-            return arr;
-        }
-
-        if (obj instanceof FluidStack fluid) {
-            return new ItemStack[] { ItemFluidDisplay.createStack(fluid) };
-        }
-
-        if (obj instanceof FluidStack[]arr) {
-            final ItemStack[] items = new ItemStack[arr.length];
-
-            for (int i = 0; i < items.length; i++) {
-                items[i] = ItemFluidDisplay.createStack(arr[i]);
-            }
-
-            return items;
-        }
-
-        if (obj instanceof List list) {
-            final ItemStack[] items = new ItemStack[list.size()];
-
-            for (int i = 0; i < items.length; i++) {
-                items[i] = extractRecipeItem(list.get(i));
-            }
-
-            return items;
-        }
-
-        throw new ClassCastException(
-                obj + " not an ItemStack, ItemStack[], FluidStack, FluidStack[] or a List of them");
-    }
-
-    private static ItemStack extractRecipeItem(Object obj) {
-        if (obj == null) return null;
-        if (obj instanceof ItemStack item) return item;
-        if (obj instanceof FluidStack fluid) return ItemFluidDisplay.createStack(fluid);
-        throw new ClassCastException(obj + " not an ItemStack or FluidStack");
+        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<>() {
+        return new AbstractList<Integer>() {
 
             @Override
             public Integer get(int index) {
@@ -506,6 +397,20 @@ public class NEIServerUtils {
         return sb;
     }
 
+    public static void logOnce(Throwable t, Set<String> stackTraces, String message) {
+        logOnce(t, stackTraces, message, "");
+    }
+
+    public static void logOnce(Throwable t, Set<String> stackTraces, String message, String identifier) {
+        StringWriter sw = new StringWriter();
+        t.printStackTrace(new PrintWriter(sw));
+        String stackTrace = identifier + sw.toString();
+        if (!stackTraces.contains(stackTrace)) {
+            NEIServerConfig.logger.error(message, t);
+            stackTraces.add(stackTrace);
+        }
+    }
+
     public static ItemStack getModdedItem(String itemId, String nbtString) {
         int meta = -1;
         ItemStack itemStack;

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

@@ -23,8 +23,6 @@ public final class PacketIDs {
         public static final int SET_CREATIVE_PLUS_MODE = 23;
         public static final int REQUEST_POTION_GUI = 24;
         public static final int SET_DUMMY_SLOT = 25;
-        public static final int SEND_CHAT_ITEM_LINK = 26;
-        public static final int SYNC = 27;
     }
 
     public static final class S2C {
@@ -38,7 +36,5 @@ public final class PacketIDs {
         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;
-        public static final int CACHE_BOOKMARK_DATA = 25;
-        public static final int SYNC = 26;
     }
 }

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

@@ -1,22 +1,21 @@
 package codechicken.nei;
 
-import java.awt.Point;
 import java.util.ArrayList;
+import java.util.List;
 
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.item.ItemStack;
 
-import codechicken.lib.gui.GuiDraw;
 import codechicken.lib.vec.Rectangle4i;
-import codechicken.nei.ItemsGrid.ItemsGridSlot;
+import codechicken.nei.ItemPanel.ItemPanelSlot;
 import codechicken.nei.api.GuiInfo;
 import codechicken.nei.api.INEIGuiHandler;
-import codechicken.nei.api.ShortcutInputHandler;
 import codechicken.nei.guihook.GuiContainerManager;
+import codechicken.nei.recipe.GuiCraftingRecipe;
 import codechicken.nei.recipe.GuiRecipe;
+import codechicken.nei.recipe.GuiUsageRecipe;
 
-public abstract class PanelWidget<T extends ItemsGrid<? extends ItemsGridSlot, ? extends ItemsGrid.MouseContext>>
-        extends Widget {
+public abstract class PanelWidget extends Widget {
 
     protected static final int PADDING = 2;
 
@@ -27,96 +26,124 @@ public abstract class PanelWidget<T extends ItemsGrid<? extends ItemsGridSlot, ?
     public Button pageNext;
     public Label pageLabel;
 
-    protected T grid;
-
-    private int headerPaddingLeft;
-    private int headerPaddingRight;
+    protected ItemsGrid grid;
 
     public ArrayList<ItemStack> getItems() {
-        return this.grid.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();
 
-    public abstract Rectangle4i calculateBounds(GuiContainer gui);
+    protected abstract String getPositioningSettingName();
 
-    protected static int snapDownToMultiple(int value, int multiple) {
-        return (value / multiple) * multiple;
-    }
+    public abstract int getMarginLeft(GuiContainer gui);
+
+    public abstract int getMarginTop(GuiContainer gui);
+
+    public abstract int getWidth(GuiContainer gui);
+
+    public abstract int getHeight(GuiContainer gui);
 
     public void resize(GuiContainer gui) {
-        final Rectangle4i bounds = calculateBounds(gui);
+        final Rectangle4i margin = new Rectangle4i(
+                getMarginLeft(gui),
+                getMarginTop(gui),
+                getWidth(gui),
+                getHeight(gui));
 
-        x = bounds.x;
-        y = bounds.y;
-        w = bounds.w;
-        h = bounds.h;
+        final int minWidth = 5 * ItemsGrid.SLOT_SIZE;
+        final int minHeight = 9 * ItemsGrid.SLOT_SIZE;
+
+        final String settingName = getPositioningSettingName();
+        int paddingLeft = (int) Math
+                .ceil(margin.w * NEIClientConfig.getSetting(settingName + ".left").getIntValue() / 100000.0);
+        int paddingTop = (int) Math
+                .ceil(margin.h * NEIClientConfig.getSetting(settingName + ".top").getIntValue() / 100000.0);
+        int paddingRight = (int) Math
+                .ceil(margin.w * NEIClientConfig.getSetting(settingName + ".right").getIntValue() / 100000.0);
+        int paddingBottom = (int) Math
+                .ceil(margin.h * NEIClientConfig.getSetting(settingName + ".bottom").getIntValue() / 100000.0);
+
+        int deltaHeight = Math.min(0, margin.h - paddingTop - paddingBottom - minHeight) / 2;
+
+        paddingLeft = Math.min(paddingLeft, Math.max(0, margin.w - paddingRight - minWidth));
+        paddingRight = Math.min(paddingRight, Math.max(0, margin.w - paddingLeft - minWidth));
+        paddingTop = Math.min(margin.h - minHeight, Math.max(0, paddingTop + deltaHeight));
+        paddingBottom = Math.min(margin.h - paddingTop - minHeight, Math.max(0, paddingBottom - deltaHeight));
+
+        x = margin.x + paddingLeft;
+        y = margin.y + paddingTop;
+        w = margin.w - paddingLeft - paddingRight;
+        h = margin.h - paddingTop - paddingBottom;
 
         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) {
         final int BUTTON_SIZE = 16;
+        int paddingLeft = 0;
+        int paddingRight = 0;
 
-        if (GridOverlapScanner.isScanFrame()) {
-            updateHeaderPadding(gui);
+        while (paddingLeft < w && GuiInfo.hideItemPanelSlot(
+                gui,
+                new Rectangle4i(x + paddingLeft, y, ItemsGrid.SLOT_SIZE, ItemsGrid.SLOT_SIZE))) {
+            paddingLeft += ItemsGrid.SLOT_SIZE;
         }
 
-        final int paddingLeft = this.headerPaddingLeft;
-        final int paddingRight = this.headerPaddingRight;
+        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;
+        }
 
-        if (paddingLeft + paddingRight >= this.w) {
+        if (paddingLeft + paddingRight >= w) {
             return 0;
         }
 
@@ -124,53 +151,35 @@ public abstract class PanelWidget<T extends ItemsGrid<? extends ItemsGridSlot, ?
         pagePrev.h = pageNext.h = BUTTON_SIZE;
         pagePrev.y = pageNext.y = y;
 
-        pagePrev.x = this.x + paddingLeft;
-        pageNext.x = this.x + this.w - pageNext.w - paddingRight;
+        pagePrev.x = x + paddingLeft;
+        pageNext.x = x + w - pageNext.w - paddingRight;
 
-        pageLabel.x = this.x + paddingLeft + (this.w - paddingLeft - paddingRight) / 2;
-        pageLabel.y = this.y + 5;
+        pageLabel.x = x + paddingLeft + (w - paddingLeft - paddingRight) / 2;
+        pageLabel.y = y + 5;
         pageLabel.text = getLabelText();
 
         return BUTTON_SIZE + 2;
     }
 
-    private void updateHeaderPadding(GuiContainer gui) {
-        final INEIGuiHandler[] handlers = GuiInfo.getGuiHandlersSnapshot();
-        final Rectangle4i slot = new Rectangle4i(this.x, this.y, ItemsGrid.SLOT_SIZE, ItemsGrid.SLOT_SIZE);
-        this.headerPaddingLeft = 0;
-        this.headerPaddingRight = 0;
-
-        while (this.headerPaddingLeft < this.w && GuiInfo.hideItemPanelSlot(gui, slot, handlers)) {
-            this.headerPaddingLeft += ItemsGrid.SLOT_SIZE;
-            slot.x += ItemsGrid.SLOT_SIZE;
-        }
-
-        slot.x = this.x + this.w - ItemsGrid.SLOT_SIZE;
-
-        while (this.headerPaddingRight < this.w && GuiInfo.hideItemPanelSlot(gui, slot, handlers)) {
-            this.headerPaddingRight += ItemsGrid.SLOT_SIZE;
-            slot.x -= ItemsGrid.SLOT_SIZE;
-        }
-    }
-
     protected abstract int resizeFooter(GuiContainer gui);
 
     public void setVisible() {
-        if (this.grid.getPerPage() > 0 && !this.grid.isEmpty()) {
+        if (grid.getPerPage() > 0) {
             LayoutManager.addWidget(pagePrev);
             LayoutManager.addWidget(pageNext);
             LayoutManager.addWidget(pageLabel);
+            grid.setVisible();
         }
     }
 
     @Override
     public void update() {
-        this.grid.update();
+        grid.update();
     }
 
     @Override
     public void draw(int mousex, int mousey) {
-        this.grid.draw(mousex, mousey);
+        grid.draw(mousex, mousey);
     }
 
     @Override
@@ -183,34 +192,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;
-        }
+    public void postDrawTooltips(int mx, int my, List<String> tooltip) {
+        grid.postDrawTooltips(mx, my, tooltip);
+    }
 
+    @Override
+    public void mouseDragged(int mousex, int mousey, int button, long heldTime) {
         if (mouseDownSlot >= 0 && draggedStack == null
                 && NEIClientUtils.getHeldItem() == null
                 && NEIClientConfig.hasSMPCounterPart()) {
-            ItemsGridSlot mouseOverSlot = this.grid.getSlotMouseOver(mousex, mousey);
+            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;
 
-        ItemsGridSlot hoverSlot = this.grid.getSlotMouseOver(mousex, mousey);
+        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;
             }
@@ -225,7 +259,7 @@ public abstract class PanelWidget<T extends ItemsGrid<? extends ItemsGridSlot, ?
     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.bookmarkPanel.addOrRemoveItem(ItemPanels.itemPanel.draggedStack, null, null, false, true);
             ItemPanels.itemPanel.draggedStack = null;
             return true;
         }
@@ -291,17 +325,24 @@ public abstract class PanelWidget<T extends ItemsGrid<? extends ItemsGridSlot, ?
 
     @Override
     public void mouseUp(int mousex, int mousey, int button) {
-        final ItemsGridSlot hoverSlot = this.grid.getSlotMouseOver(mousex, mousey);
+        ItemPanelSlot hoverSlot = getSlotMouseOver(mousex, mousey);
 
         if (hoverSlot != null && hoverSlot.slotIndex == mouseDownSlot && draggedStack == null) {
+            ItemStack item = hoverSlot.item.copy();
 
-            if (NEIController.manager.window instanceof GuiRecipe || NEIClientUtils.shiftKey()
-                    || !NEIClientConfig.canCheatItem(hoverSlot.getItemStack())) {
-                ShortcutInputHandler.handleMouseClick(hoverSlot.getItemStack());
-            } else {
-                NEIClientUtils.cheatItem(getDraggedStackWithQuantity(hoverSlot.getItemStack()), button, -1);
+            if (NEIController.manager.window instanceof GuiRecipe || !NEIClientConfig.canCheatItem(item)) {
+
+                if (button == 0) {
+                    GuiCraftingRecipe.openRecipeGui("item", item);
+                } else if (button == 1) {
+                    GuiUsageRecipe.openRecipeGui("item", item);
+                }
+
+                mouseDownSlot = -1;
+                return;
             }
 
+            NEIClientUtils.cheatItem(getDraggedStackWithQuantity(hoverSlot.slotIndex), button, -1);
         }
 
         mouseDownSlot = -1;
@@ -311,22 +352,20 @@ public abstract class PanelWidget<T extends ItemsGrid<? extends ItemsGridSlot, ?
     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 onHotkeyPressed() {
-        final Point mouse = GuiDraw.getMousePosition();
-        if (!contains(mouse.x, mouse.y)) return false;
+    public boolean handleKeyPress(int keyID, char keyChar) {
 
-        if (KeyManager.isKeyDown("gui.next")) {
-            this.grid.shiftPage(1);
+        if (NEIClientConfig.isKeyHashDown("gui.next")) {
+            grid.shiftPage(1);
             return true;
         }
 
-        if (KeyManager.isKeyDown("gui.prev")) {
-            this.grid.shiftPage(-1);
+        if (NEIClientConfig.isKeyHashDown("gui.prev")) {
+            grid.shiftPage(-1);
             return true;
         }
 
@@ -335,28 +374,24 @@ 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();
+        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.getPage();
     }
 
     public int getNumPages() {
-        return this.grid.getNumPages();
+        return grid.getNumPages();
     }
 
     @Override
     public boolean contains(int px, int py) {
-        return this.grid.contains(px, py);
+        return grid.contains(px, py);
     }
-
 }

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

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

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

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

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

@@ -1,51 +1,25 @@
 package codechicken.nei;
 
 import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
 import java.util.List;
-import java.util.function.Function;
-import java.util.stream.Collectors;
 
 import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.oredict.OreDictionary;
 
-import codechicken.nei.api.ItemFilter;
-import codechicken.nei.api.ItemInfo;
-import codechicken.nei.guihook.GuiContainerManager;
-import codechicken.nei.item.FluidDrawer;
-import codechicken.nei.item.FluidDrawer.FillDirection;
-import codechicken.nei.recipe.Badge;
-import codechicken.nei.recipe.GuiRecipe;
-import codechicken.nei.recipe.StackInfo;
-
 /**
  * Simply an {@link ItemStack} with position. Mainly used in the recipe handlers.
  */
-public class PositionedStack implements Cloneable {
-
-    /** Maximum chance value representing 100% probability (1 unit = 0.01%). */
-    public static final int CHANCE_FULL = 10_000;
+public class PositionedStack {
 
     public int relx;
     public int rely;
-    public int width = 16;
-    public int height = 16;
     public ItemStack[] items;
     // compatibility dummy
     public ItemStack item;
 
-    protected int chance = CHANCE_FULL;
-    protected boolean permutated = false;
-
-    protected String acceptsLabel;
-
-    protected Function<ItemStack, List<String>> tooltip;
-    protected List<Badge> badges;
+    private boolean permutated = false;
 
     public PositionedStack(Object object, int x, int y, boolean genPerms) {
         items = NEIServerUtils.extractRecipeItems(object);
@@ -66,11 +40,31 @@ public class PositionedStack implements Cloneable {
     public void generatePermutations() {
         if (permutated) return;
 
-        items = ItemList.expandPermutations(items);
+        ArrayList<ItemStack> stacks = new ArrayList<>();
+        for (ItemStack item : items) {
+            if (item == null || item.getItem() == null) continue;
 
-        if (items.length == 0) {
-            items = new ItemStack[] { new ItemStack(Blocks.fire) };
+            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 {
+                    ItemStack base = new ItemStack(item.getItem(), item.stackSize);
+                    base.stackTagCompound = item.stackTagCompound;
+                    stacks.add(base);
+                }
+                continue;
+            }
+
+            stacks.add(item.copy());
         }
+        items = stacks.toArray(new ItemStack[0]);
+
+        if (items.length == 0) items = new ItemStack[] { new ItemStack(Blocks.fire) };
 
         permutated = true;
         setPermutationToRender(0);
@@ -80,117 +74,19 @@ public class PositionedStack implements Cloneable {
         for (ItemStack item : items) if (item.stackSize > i) item.stackSize = i;
     }
 
-    public void setAcceptsLabel(String acceptsLabel) {
-        this.acceptsLabel = acceptsLabel;
-    }
-
-    public String getAcceptsLabel() {
-        return this.acceptsLabel;
-    }
-
-    public void setBadges(List<Badge> badges) {
-        this.badges = badges;
-    }
-
-    public List<Badge> getBadges() {
-        return this.badges;
-    }
-
-    public void setTooltip(List<String> tooltip) {
-        this.tooltip = tooltip == null ? null : item -> tooltip;
-    }
-
-    public void setTooltipProvider(Function<ItemStack, List<String>> provider) {
-        this.tooltip = provider;
-    }
-
-    public List<String> getTooltip() {
-        return this.tooltip == null ? null : this.tooltip.apply(this.item);
-    }
-
-    public int getChance() {
-        return this.chance;
-    }
-
-    public void setChance(int chance) {
-        this.chance = chance;
-    }
-
     public PositionedStack copy() {
-        try {
-            PositionedStack pStack = (PositionedStack) super.clone();
-            pStack.items = Arrays.stream(this.items).map(ItemStack::copy).toArray(ItemStack[]::new);
-            pStack.item = this.item == null ? null : this.item.copy();
-            pStack.badges = this.badges == null ? null : new ArrayList<>(this.badges);
-            return pStack;
-        } catch (CloneNotSupportedException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    public void draw(int mousex, int mousey) {
-        final int x = this.relx + (this.width - 16) / 2;
-        final int y = this.rely + (this.height - 16) / 2;
-        GuiContainerManager.drawItem(x, y, this.item);
-    }
-
-    public List<ItemStack> getFilteredPermutations() {
-        return getFilteredPermutations(null);
-    }
-
-    public List<ItemStack> getFilteredPermutations(ItemFilter additionalFilter) {
-        List<ItemStack> items = new ArrayList<>(Arrays.asList(this.items));
-
-        items = filteringPermutations(items, item -> !ItemInfo.isHidden(item));
-        items = filteringPermutations(items, PresetsList.getItemFilter());
-        items = filteringPermutations(items, GuiRecipe.getSearchItemFilter());
-        items = filteringPermutations(items, additionalFilter);
-
-        items.sort(Comparator.comparing(FavoriteRecipes::containsManual).reversed());
-        return items;
-    }
-
-    private 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 int getPermutationIndex(ItemStack stack) {
-
-        for (int index = 0; index < this.items.length; index++) {
-            if (NEIServerUtils.areStacksSameType(items[index], stack)) {
-                return index;
-            }
-        }
-
-        return -1;
-    }
-
-    public boolean setPermutationToRender(ItemStack ingredient) {
-        final int stackIndex = getPermutationIndex(ingredient);
-
-        if (stackIndex >= 0) {
-            setPermutationToRender(stackIndex);
-        }
-
-        return stackIndex >= 0;
+        return new PositionedStack(items, relx, rely);
     }
 
     public void setPermutationToRender(int index) {
-        this.item = this.items[index].copy();
+        item = 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);
-        }
-    }
-
-    public boolean contains(int mx, int my) {
-        return mx >= this.relx - 1 && mx < this.relx + this.width + 1
-                && my >= this.rely - 1
-                && my < this.rely + this.height + 1;
+        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) {
@@ -203,7 +99,7 @@ public class PositionedStack implements Cloneable {
      * 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;
     }
@@ -218,120 +114,4 @@ public class PositionedStack implements Cloneable {
     public String toString() {
         return "PositionedStack(output='" + item.toString() + "')";
     }
-
-    public static class Placeholder extends PositionedStack {
-
-        public Placeholder(Object object, int x, int y, boolean genPerms) {
-            super(object, x, y, genPerms);
-        }
-
-        public Placeholder(Object object, int x, int y) {
-            this(object, x, y, true);
-        }
-
-        @Override
-        public void draw(int mousex, int mousey) {}
-    }
-
-    public static class Tank extends PositionedStack {
-
-        /** The tank size the fill level is measured against, in mB. 0 means "always render full". */
-        protected int capacity = 0;
-        protected boolean flowingTexture = false;
-        protected FillDirection fillDirection = FillDirection.AUTO;
-
-        private ItemStack cachedFluidItem;
-        private FluidStack cachedFluidStack;
-
-        public Tank(Object object, int x, int y, boolean genPerms) {
-            super(object, x, y, genPerms);
-        }
-
-        public Tank(Object object, int x, int y) {
-            this(object, x, y, true);
-        }
-
-        public Tank(Object object, int x, int y, int width, int height, int capacity) {
-            super(object, x, y, false);
-            this.width = width;
-            this.height = height;
-            setCapacity(capacity);
-        }
-
-        public int getCapacity() {
-            return this.capacity;
-        }
-
-        public Tank setCapacity(int capacity) {
-            this.capacity = Math.max(capacity, 0);
-            return this;
-        }
-
-        public boolean hasFlowingTexture() {
-            return this.flowingTexture;
-        }
-
-        public Tank setFlowingTexture(boolean flowingTexture) {
-            this.flowingTexture = flowingTexture;
-            return this;
-        }
-
-        public FillDirection getFillDirection() {
-            return this.fillDirection;
-        }
-
-        public Tank setFillDirection(FillDirection fillDirection) {
-            this.fillDirection = fillDirection == null ? FillDirection.AUTO : fillDirection;
-            return this;
-        }
-
-        protected FluidStack getFluidStack() {
-
-            if (this.item != this.cachedFluidItem) {
-                this.cachedFluidItem = this.item;
-                this.cachedFluidStack = StackInfo.isFluidDisplayItem(this.item) ? StackInfo.getFluid(this.item) : null;
-            }
-
-            return this.cachedFluidStack;
-        }
-
-        @Override
-        public List<String> getTooltip() {
-            final List<String> tooltip = new ArrayList<>();
-            final List<String> customTooltip = super.getTooltip();
-            final FluidStack fluidStack = getFluidStack();
-
-            if (fluidStack != null && this.capacity > 0) {
-                tooltip.add(
-                        EnumChatFormatting.GRAY + NEIClientUtils
-                                .translate("recipe.fluid.tank.amount", NEIClientUtils.formatFluid(fluidStack.amount)));
-            }
-
-            if (customTooltip != null) {
-                tooltip.addAll(customTooltip);
-            }
-
-            return tooltip;
-        }
-
-        @Override
-        public void draw(int mousex, int mousey) {
-            final FluidStack fluidStack = getFluidStack();
-
-            if (fluidStack == null) {
-                super.draw(mousex, mousey);
-                return;
-            }
-
-            FluidDrawer.drawTank(
-                    this.relx,
-                    this.rely,
-                    this.width,
-                    this.height,
-                    this.capacity,
-                    fluidStack,
-                    this.flowingTexture,
-                    this.fillDirection);
-        }
-    }
 }

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

@@ -1,269 +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.SubsetWidget.SubsetTag;
-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 {
-        SUBSET,
-        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 PresetRecipeFilter implements IRecipeFilterProvider, IRecipeFilter {
-
-        public Set<String> cache;
-
-        public IRecipeFilter getRecipeFilter() {
-
-            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, int recipeIndex) {
-
-            if (matchPositionedStack(handler.getIngredientStacks(recipeIndex), false)) {
-                return false;
-            }
-
-            final List<PositionedStack> outputs = handler.getResultStacks(recipeIndex);
-
-            if (matchPositionedStack(outputs, true)) {
-                return true;
-            }
-
-            final List<PositionedStack> auxiliaries = handler.getAuxiliaryStacks(recipeIndex);
-
-            if (matchPositionedStack(auxiliaries, true)) {
-                return true;
-            }
-
-            return outputs.isEmpty() && auxiliaries.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 PresetRecipeFilter recipeFilter = new PresetRecipeFilter();
-    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.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);
-        }
-
-        updateSubsets();
-    }
-
-    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("Failed to save presets list to file {}", presetsFile, e);
-        }
-
-        recipeFilter.cache = null;
-        itemFilter.cache = null;
-        updateSubsets();
-        CollapsibleItems.saveStates();
-        CollapsibleItems.load();
-        ItemList.refreshItems.restart();
-    }
-
-    private static void updateSubsets() {
-        SubsetWidget.removeTag("Presets");
-
-        for (Preset preset : PresetsList.presets) {
-            if (preset.enabled && preset.mode == PresetMode.SUBSET) {
-                SubsetWidget.addTag(
-                        new SubsetTag(
-                                "Presets." + preset.name,
-                                stack -> preset.items.contains(Preset.getIdentifier(stack))));
-            }
-        }
-
-    }
-
-}

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

@@ -2,14 +2,10 @@ package codechicken.nei;
 
 import net.minecraft.util.EnumChatFormatting;
 
-import codechicken.nei.SearchField.GuiSearchField;
-import codechicken.nei.api.IRecipeFilter;
-import codechicken.nei.api.IRecipeFilter.IRecipeFilterProvider;
 import codechicken.nei.api.ItemFilter;
-import codechicken.nei.api.ItemFilter.ItemFilterProvider;
 import codechicken.nei.util.TextHistory;
 
-public abstract class RecipeSearchField extends TextField implements ItemFilterProvider, IRecipeFilterProvider {
+public abstract class RecipeSearchField extends TextField {
 
     private static final TextHistory history = new TextHistory();
 
@@ -18,22 +14,6 @@ public abstract class RecipeSearchField extends TextField implements ItemFilterP
         this.field.setVisible(false);
     }
 
-    @Override
-    protected void initInternalTextField() {
-        final GuiSearchField field = new GuiSearchField();
-        field.setMaxStringLength(maxSearchLength);
-        field.setCursorPositionZero();
-        field.setSkipRecipeTokens(true);
-        field.setFormatter(new SearchTextFormatter(SearchField.searchParser) {
-
-            @Override
-            protected String getContextToken() {
-                return this.searchParser.getRecipeContextTokens();
-            }
-        });
-        this.field = field;
-    }
-
     public boolean isVisible() {
         return this.field.getVisible();
     }
@@ -54,19 +34,15 @@ public abstract class RecipeSearchField extends TextField implements ItemFilterP
     }
 
     @Override
-    public boolean onHotkeyPressed() {
+    public void lastKeyTyped(int keyID, char keyChar) {
 
-        if (focused() && KeyManager.isKeyDown("gui.getprevioussearch")) {
+        if (focused() && NEIClientConfig.isKeyHashDown("gui.getprevioussearch")) {
             handleNavigateHistory(TextHistory.Direction.PREVIOUS);
-            return true;
         }
 
-        if (focused() && KeyManager.isKeyDown("gui.getnextsearch")) {
+        if (focused() && NEIClientConfig.isKeyHashDown("gui.getnextsearch")) {
             handleNavigateHistory(TextHistory.Direction.NEXT);
-            return true;
         }
-
-        return false;
     }
 
     @Override
@@ -74,14 +50,8 @@ public abstract class RecipeSearchField extends TextField implements ItemFilterP
         return EnumChatFormatting.getTextWithoutFormattingCodes(s);
     }
 
-    @Override
     public ItemFilter getFilter() {
-        return ((GuiSearchField) field).getFilter();
-    }
-
-    @Override
-    public IRecipeFilter getRecipeFilter() {
-        return ((GuiSearchField) field).getRecipeFilter();
+        return SearchField.getFilter(text());
     }
 
     @Override

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

@@ -1,25 +1,21 @@
 package codechicken.nei;
 
+import static codechicken.nei.NEIClientConfig.world;
+
 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.api.IRecipeFilter;
-import codechicken.nei.api.IRecipeFilter.IRecipeFilterProvider;
+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 codechicken.nei.recipe.StackInfo;
 import codechicken.nei.util.TextHistory;
 
 public class SearchField extends TextField implements ItemFilterProvider {
@@ -27,7 +23,6 @@ public class SearchField extends TextField implements ItemFilterProvider {
     /**
      * Interface for returning a custom filter based on search field text
      */
-    @Deprecated
     public static interface ISearchProvider {
 
         /**
@@ -41,115 +36,34 @@ public class SearchField extends TextField implements ItemFilterProvider {
         public ItemFilter getFilter(String searchText);
     }
 
-    public static class SearchParserProvider implements ISearchParserProvider {
+    private static class DefaultSearchProvider implements ISearchProvider {
 
-        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;
+        @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 String getName() {
-            return this.name;
+            Pattern pattern = getPattern(searchText);
+            return pattern == null ? null : new PatternItemFilter(pattern);
         }
     }
 
-    public static class GuiSearchField extends FormattedTextField implements ItemFilterProvider, IRecipeFilterProvider {
-
-        protected final SearchTokenParser searchParser;
-        protected boolean skipRecipeTokens = false;
-
-        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 void setSkipRecipeTokens(boolean skipRecipeTokens) {
-            this.skipRecipeTokens = skipRecipeTokens;
-        }
-
-        @Override
-        public ItemFilter getFilter() {
-            return getFilter(getText());
-        }
-
-        @Override
-        public IRecipeFilter getRecipeFilter() {
-            return getRecipeFilter(getText());
-        }
-
-        public ItemFilter getFilter(String filterText) {
-            return this.searchParser.getFilter(filterText, this.skipRecipeTokens);
-        }
-
-        public IRecipeFilter getRecipeFilter(String filterText) {
-            return this.searchParser.getRecipeFilter(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");
+        return world.nbt.getBoolean("searchinventories");
     }
 
     public boolean isVisible() {
@@ -162,8 +76,7 @@ public class SearchField extends TextField implements ItemFilterProvider {
 
     @Override
     public int getTextColour() {
-        if (ItemPanels.itemPanel.getItems().isEmpty()
-                && (!this.field.getText().isEmpty() || !NEIClientConfig.hideItemsUntilSearching())) {
+        if (ItemPanels.itemPanel.getItems().isEmpty()) {
             return focused() ? 0xFFcc3300 : 0xFF993300;
         } else {
             return focused() ? 0xFFE0E0E0 : 0xFF909090;
@@ -172,37 +85,14 @@ 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
         }
     }
 
@@ -220,31 +110,25 @@ public class SearchField extends TextField implements ItemFilterProvider {
     @Override
     public void onTextChange(String oldText) {
         final String newText = text();
-        if (!newText.equals(oldText)) {
-            NEIClientConfig.setSearchExpression(newText);
-            ItemList.updateFilter.restart();
-        }
+        if (newText.length() > 0) NEIClientConfig.logger.debug("Searching for " + text());
+
+        NEIClientConfig.setSearchExpression(newText);
+        ItemList.updateFilter.restart();
     }
 
     @Override
-    public boolean onHotkeyPressed() {
+    public void lastKeyTyped(int keyID, char keyChar) {
 
-        if (isVisible() && KeyManager.isHashDown("gui.search")) {
+        if (isVisible() && NEIClientConfig.isKeyHashDown("gui.search")) {
             setFocus(true);
-            return true;
         }
-
-        if (focused() && KeyManager.isKeyDown("gui.getprevioussearch")) {
+        if (focused() && NEIClientConfig.isKeyHashDown("gui.getprevioussearch")) {
             handleNavigateHistory(TextHistory.Direction.PREVIOUS);
-            return true;
         }
 
-        if (focused() && KeyManager.isKeyDown("gui.getnextsearch")) {
+        if (focused() && NEIClientConfig.isKeyHashDown("gui.getnextsearch")) {
             handleNavigateHistory(TextHistory.Direction.NEXT);
-            return true;
         }
-
-        return false;
     }
 
     @Override
@@ -253,114 +137,47 @@ 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) {
+        switch (NEIClientConfig.getIntSetting("inventory.searchmode")) {
             case 0: // plain
-                search = Pattern.quote(search);
+                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;
-        }
-        // regex and extended+
-        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);
-
-        boolean addQuotes = text.contains(" ")
-                && NEIClientConfig.getBooleanSetting("inventory.search.quoteDropItemName");
-
-        switch (NEIClientConfig.getIntSetting("inventory.search.patternMode")) {
             case 1:
-                text = text.replaceAll("[\\?|\\*]", "\\\\$0");
-                break;
-            case 2:
-                text = text.replaceAll("[{}()\\[\\].+*?^$\\\\|]", "\\\\$0");
-                break;
-            case 3:
-                // In extended+ quotes require only quotes to be escaped
-                if (addQuotes) {
-                    text = text.replaceAll("\"", "\\\\$0");
-                } else {
-                    String prefixes = searchParser.getPrefixes();
-                    text = text.replaceAll("[-<>^{}|/\\\\\"" + Pattern.quote(prefixes) + "]", "\\\\$0");
-                }
-                break;
-            default:
+                search = search.replace(".", "").replace("?", ".").replace("*", ".+?");
                 break;
         }
 
-        if (addQuotes) {
-            text = "\"" + text + "\"";
-        }
+        Pattern pattern = null;
+        try {
+            pattern = Pattern.compile(search);
+        } catch (PatternSyntaxException ignored) {}
 
-        return text;
+        return pattern == null || pattern.toString().length() == 0 ? null : pattern;
     }
 
     @Override
     public ItemFilter getFilter() {
-
-        if (field.getText().isEmpty() && NEIClientConfig.hideItemsUntilSearching()) {
-            return new NothingItemFilter();
-        }
-
-        return ((GuiSearchField) field).getFilter();
+        return getFilter(text());
     }
 
-    public static ItemFilter getFilter(String filterText) {
-        return SearchField.searchParser.getFilter(filterText);
+    public static ItemFilter getFilter(String s_filter) {
+        List<ItemFilter> primary = new LinkedList<>();
+        List<ItemFilter> secondary = new LinkedList<>();
+        s_filter = s_filter.toLowerCase();
+
+        for (ISearchProvider p : searchProviders) {
+            ItemFilter filter = p.getFilter(s_filter);
+            if (filter != null) (p.isPrimary() ? primary : secondary).add(filter);
+        }
+
+        if (!primary.isEmpty()) {
+            return new AnyMultiItemFilter(primary);
+        }
+
+        if (!secondary.isEmpty()) {
+            return new AnyMultiItemFilter(secondary);
+        }
+
+        return new EverythingItemFilter();
     }
 
     @Override

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

@@ -1,109 +0,0 @@
-package codechicken.nei;
-
-import net.minecraft.util.EnumChatFormatting;
-
-import codechicken.nei.FormattedTextField.TextFormatter;
-import codechicken.nei.search.SearchExpressionFormatVisitor;
-import codechicken.nei.search.SearchExpressionUtils;
-import codechicken.nei.search.SearchToken;
-
-public class SearchTextFormatter implements TextFormatter {
-
-    protected final SearchTokenParser searchParser;
-    protected String contextToken = "";
-
-    public SearchTextFormatter(SearchTokenParser searchParser) {
-        this.searchParser = searchParser;
-    }
-
-    public void setContextToken(String contextToken) {
-        this.contextToken = contextToken;
-    }
-
-    protected String getContextToken() {
-        return this.contextToken;
-    }
-
-    @Override
-    public String format(String text) {
-        final int patternMode = NEIClientConfig.getIntSetting("inventory.search.patternMode");
-        if (patternMode == 3) {
-            final int spaceModeEnabled = NEIClientConfig.getIntSetting("inventory.search.spaceMode");
-            if (spaceModeEnabled == 1) {
-                text = SearchTokenParser.SPACE_PATTERN.matcher(text).replaceAll("\\\\ ");
-            }
-            final SearchExpressionFormatVisitor visitor = new SearchExpressionFormatVisitor(searchParser);
-            return SearchExpressionUtils.visitRecipeSearchExpression(text, visitor);
-        } else {
-            final StringBuilder formattedText = new StringBuilder();
-            final String contextToken = getContextToken();
-
-            for (String[] orQuery : searchParser.splitByDelimiters(text, "|", false)) {
-                final String filterText = orQuery[1];
-
-                formattedText.append(SearchExpressionUtils.HIGHLIGHTS.OR + orQuery[0]);
-
-                for (String[] contextPart : searchParser.splitByDelimiters(filterText, contextToken, false)) {
-
-                    if (!contextPart[0].isEmpty()) {
-                        formattedText.append(
-                                SearchExpressionUtils.HIGHLIGHTS.RECIPE + contextPart[0].substring(0, 1)
-                                        + EnumChatFormatting.RESET);
-                        contextPart[1] = contextPart[0].substring(1) + contextPart[1];
-                    }
-
-                    if (contextPart[1].isEmpty()) {
-                        continue;
-                    }
-
-                    int startIndex = 0;
-
-                    for (SearchToken token : searchParser.splitSearchText(contextPart[1])) {
-                        formattedText.append(contextPart[1].substring(startIndex, token.start));
-                        EnumChatFormatting tokenColor = EnumChatFormatting.RESET;
-
-                        if (token.firstChar != null) {
-                            tokenColor = searchParser.getProvider(token.firstChar).getHighlightedColor();
-                        }
-
-                        if (token.ignore != null) {
-                            formattedText
-                                    .append(SearchExpressionUtils.HIGHLIGHTS.NEGATE + String.valueOf(token.ignore));
-                        }
-
-                        if (token.firstChar != null) {
-                            formattedText.append(tokenColor + String.valueOf(token.firstChar));
-                        }
-
-                        if (token.quotes) {
-                            formattedText.append(SearchExpressionUtils.HIGHLIGHTS.QUOTED + "\"");
-                        }
-
-                        if (patternMode == 1 && !token.quotes && isRegexToken(token.rawText)) {
-                            formattedText.append(SearchExpressionUtils.HIGHLIGHTS.REGEX + token.rawText.substring(0, 2))
-                                    .append(tokenColor + token.rawText.substring(2, token.rawText.length() - 1))
-                                    .append(SearchExpressionUtils.HIGHLIGHTS.REGEX + "/");
-                        } else if (!token.rawText.isEmpty()) {
-                            formattedText.append(tokenColor + token.rawText);
-                        }
-
-                        if (token.quotes) {
-                            formattedText.append(SearchExpressionUtils.HIGHLIGHTS.QUOTED + "\"");
-                        }
-
-                        startIndex = token.end;
-                    }
-
-                    formattedText.append(contextPart[1].substring(startIndex, contextPart[1].length()));
-                }
-
-            }
-
-            return formattedText.toString();
-        }
-    }
-
-    private static boolean isRegexToken(String search) {
-        return search.length() >= 3 && search.regionMatches(true, 0, "r/", 0, 2) && search.endsWith("/");
-    }
-}

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

@@ -1,524 +0,0 @@
-package codechicken.nei;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Pattern;
-
-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.api.IRecipeFilter;
-import codechicken.nei.api.ItemFilter;
-import codechicken.nei.filter.AllMultiRecipeFilter;
-import codechicken.nei.filter.AnyMultiRecipeFilter;
-import codechicken.nei.filter.RecipeFilter;
-import codechicken.nei.filter.RecipeFilter.FilterContext;
-import codechicken.nei.search.ItemFilterVisitor;
-import codechicken.nei.search.RecipeFilterVisitor;
-import codechicken.nei.search.SearchExpressionUtils;
-import codechicken.nei.search.SearchToken;
-
-public class SearchTokenParser {
-
-    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 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();
-
-        default SearchMode getSearchMode() {
-            return SearchMode.fromInt(NEIClientConfig.getIntSetting("inventory.search." + getName() + "SearchMode"));
-        }
-
-        default String getName() {
-            return String.valueOf(getPrefix());
-        }
-    }
-
-    private static class ProvidersCache {
-
-        public String languageCode = null;
-        public List<ISearchParserProvider> providers = new ArrayList<>();
-
-        public void clear() {
-            this.languageCode = null;
-            this.providers.clear();
-        }
-    }
-
-    public 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);
-        }
-    }
-
-    public static final Pattern SPACE_PATTERN = Pattern.compile(" ");
-
-    protected final LRUCache<String, ItemFilter> filtersCache = new LRUCache<>(20);
-    protected final LRUCache<String, IRecipeFilter> recipesCache = new LRUCache<>(20);
-    protected final List<ISearchParserProvider> searchProviders;
-    protected final ProvidersCache providersCache = new ProvidersCache();
-    protected final Map<Character, Character> prefixRedefinitions = new HashMap<>();
-    protected String prefixes = null;
-
-    public SearchTokenParser(List<ISearchParserProvider> searchProviders) {
-        this.searchProviders = searchProviders;
-    }
-
-    public SearchTokenParser() {
-        this(new ArrayList<>());
-    }
-
-    public void addProvider(ISearchParserProvider provider) {
-        this.searchProviders.add(provider);
-        clearCache();
-    }
-
-    public synchronized void clearCache() {
-        this.providersCache.clear();
-        this.filtersCache.clear();
-        this.recipesCache.clear();
-        this.prefixes = null;
-    }
-
-    public List<ISearchParserProvider> getProviders() {
-        Language currentLanguage = Minecraft.getMinecraft().getLanguageManager().getCurrentLanguage();
-
-        if (!currentLanguage.getLanguageCode().equals(providersCache.languageCode)) {
-            final List<ISearchParserProvider> providersList = new ArrayList<>();
-            final Map<Character, ISearchParserProvider> providers = new HashMap<>();
-
-            for (int index = this.searchProviders.size() - 1; index >= 0; index--) {
-                ISearchParserProvider provider = this.searchProviders.get(index);
-
-                if (provider.getMatchingLanguages().contains(currentLanguage)) {
-                    if (provider.getSearchMode() == SearchMode.PREFIX && !providers.containsKey(provider.getPrefix())) {
-                        providers.put(provider.getPrefix(), provider);
-                    } else if (provider.getSearchMode() == SearchMode.ALWAYS) {
-                        providersList.add(provider);
-                    }
-                }
-            }
-
-            providersList.addAll(providers.values());
-            providersCache.languageCode = currentLanguage.getLanguageCode();
-            providersCache.providers = providersList;
-        }
-
-        return providersCache.providers;
-    }
-
-    public boolean hasRedefinedPrefix(char ch) {
-        return getPrefixes().indexOf(ch) >= 0;
-    }
-
-    public ISearchParserProvider getProvider(char ch) {
-        if (!hasRedefinedPrefix(ch)) {
-            return null;
-        }
-        for (ISearchParserProvider provider : getProviders()) {
-            if (provider.getSearchMode() == SearchMode.PREFIX && getRedefinedPrefix(provider.getPrefix()) == ch) {
-                return provider;
-            }
-        }
-        return null;
-    }
-
-    public List<ItemFilter> getAlwaysProvidersFilters(String searchText) {
-        final List<ItemFilter> filters = new ArrayList<>();
-        for (ISearchParserProvider provider : getProviders()) {
-            if (provider.getSearchMode() == SearchMode.ALWAYS) {
-                filters.add(provider.getFilter(searchText));
-            }
-        }
-
-        return filters;
-    }
-
-    public synchronized ItemFilter getFilter(String filterText) {
-        return getFilter(filterText, false);
-    }
-
-    public synchronized ItemFilter getFilter(String rawText, boolean skipRecipeTokens) {
-        final String filterText = EnumChatFormatting.getTextWithoutFormattingCodes(rawText).toLowerCase();
-
-        if (filterText.isEmpty()) {
-            return new EverythingItemFilter();
-        }
-
-        final int patternMode = NEIClientConfig.getIntSetting("inventory.search.patternMode");
-
-        if (patternMode != 3) {
-            return this.filtersCache.computeIfAbsent(skipRecipeTokens + ":" + filterText, _t -> {
-                final List<ItemFilter> searchTokens = new ArrayList<>();
-                final String contextTokens = skipRecipeTokens ? getRecipeContextTokens() : "";
-
-                for (String[] subQuery : splitByDelimiters(filterText, "|", false)) {
-
-                    if (subQuery[1].isEmpty()) {
-                        continue;
-                    }
-
-                    final List<ItemFilter> tokens = new ArrayList<>();
-
-                    for (String[] contextQuery : splitByDelimiters(subQuery[1], contextTokens, false)) {
-
-                        if (contextQuery[1].isEmpty() || contextQuery[0].startsWith(">")
-                                || contextQuery[0].startsWith("^")) {
-                            continue;
-                        }
-
-                        if (!contextQuery[0].isEmpty()) {
-                            contextQuery[0] = contextQuery[0].substring(1);
-                        }
-
-                        for (SearchToken token : splitSearchText(contextQuery[0] + contextQuery[1])) {
-                            final ItemFilter result = token.getFilter(this);
-
-                            if (result != null) {
-                                tokens.add(result);
-                            }
-                        }
-                    }
-
-                    if (tokens.size() == 1) {
-                        searchTokens.add(tokens.get(0));
-                    } else if (!tokens.isEmpty()) {
-                        searchTokens.add(new AllMultiItemFilter(tokens));
-                    }
-                }
-
-                if (searchTokens.isEmpty()) {
-                    return new EverythingItemFilter();
-                } else if (searchTokens.size() == 1) {
-                    return new IsRegisteredItemFilter(searchTokens.get(0));
-                } else {
-                    return new IsRegisteredItemFilter(new AnyMultiItemFilter(searchTokens));
-                }
-            });
-        } else {
-            return this.filtersCache.computeIfAbsent(filterText, text -> {
-                final int spaceMode = NEIClientConfig.getIntSetting("inventory.search.spaceMode");
-
-                if (spaceMode == 1) {
-                    text = SearchTokenParser.SPACE_PATTERN.matcher(text).replaceAll("\\\\ ");
-                }
-                if (skipRecipeTokens) {
-                    return new IsRegisteredItemFilter(
-                            SearchExpressionUtils.visitRecipeSearchExpression(text, new ItemFilterVisitor(this)));
-                } else {
-                    return new IsRegisteredItemFilter(
-                            SearchExpressionUtils.visitSearchExpression(text, new ItemFilterVisitor(this)));
-                }
-            });
-        }
-
-    }
-
-    public synchronized IRecipeFilter getRecipeFilter(String filterText) {
-        filterText = EnumChatFormatting.getTextWithoutFormattingCodes(filterText).toLowerCase();
-
-        if (filterText.isEmpty()) {
-            return new RecipeFilter(FilterContext.ANY, true, new EverythingItemFilter());
-        }
-
-        final int patternMode = NEIClientConfig.getIntSetting("inventory.search.patternMode");
-
-        if (patternMode != 3) {
-            return this.recipesCache.computeIfAbsent(filterText, input -> {
-                final List<IRecipeFilter> searchTokens = new ArrayList<>();
-
-                for (String[] orQueryPart : splitByDelimiters(input, "|", false)) {
-
-                    if (orQueryPart[1].isEmpty()) {
-                        continue;
-                    }
-
-                    final List<IRecipeFilter> contextList = new ArrayList<>();
-
-                    for (String[] contextQuery : splitByDelimiters(orQueryPart[1], getRecipeContextTokens(), false)) {
-
-                        if (contextQuery[1].isEmpty()) {
-                            continue;
-                        }
-
-                        final List<IRecipeFilter> tokens = new ArrayList<>();
-                        FilterContext context = FilterContext.ANY;
-
-                        if (!contextQuery[0].isEmpty()) {
-                            context = FilterContext.fromChar(contextQuery[0].charAt(0));
-                            contextQuery[0] = contextQuery[0].substring(1);
-                        }
-
-                        for (SearchToken token : splitSearchText(contextQuery[0] + contextQuery[1])) {
-                            final ItemFilter result = token.getFilter(this);
-                            if (result != null) {
-                                tokens.add(
-                                        new RecipeFilter(context, token.ignore == null || token.ignore != '!', result));
-                            }
-                        }
-
-                        if (tokens.size() == 1) {
-                            contextList.add(tokens.get(0));
-                        } else if (!tokens.isEmpty()) {
-                            contextList.add(new AllMultiRecipeFilter(tokens));
-                        }
-                    }
-
-                    if (contextList.size() == 1) {
-                        searchTokens.add(contextList.get(0));
-                    } else if (!contextList.isEmpty()) {
-                        searchTokens.add(new AllMultiRecipeFilter(contextList));
-                    }
-                }
-
-                if (searchTokens.isEmpty()) {
-                    return new RecipeFilter(FilterContext.ANY, true, new EverythingItemFilter());
-                } else if (searchTokens.size() == 1) {
-                    return searchTokens.get(0);
-                } else {
-                    return new AnyMultiRecipeFilter(searchTokens);
-                }
-            });
-
-        } else {
-            return this.recipesCache.computeIfAbsent(filterText, text -> {
-                final int spaceMode = NEIClientConfig.getIntSetting("inventory.search.spaceMode");
-
-                if (spaceMode == 1) {
-                    text = SearchTokenParser.SPACE_PATTERN.matcher(text).replaceAll("\\\\ ");
-                }
-
-                return SearchExpressionUtils.visitRecipeSearchExpression(text, new RecipeFilterVisitor(this));
-            });
-        }
-
-    }
-
-    public List<SearchToken> splitSearchText(String filterText) {
-        if (filterText.isEmpty()) {
-            return Collections.emptyList();
-        }
-
-        final List<SearchToken> tokens = new ArrayList<>();
-        final int spaceMode = NEIClientConfig.getIntSetting("inventory.search.spaceMode");
-        final String prefixes = getPrefixes();
-        SearchToken lastToken = null;
-        int lastEnd = 0;
-
-        for (String[] part : splitByDelimiters(filterText, "-!" + prefixes, true)) {
-            final SearchToken token = createToken(lastEnd, part, prefixes);
-            final int length = part[0].length() + part[1].length();
-
-            if (token.isSimpleFilter() && token.rawText.isEmpty()) {
-                lastEnd += length;
-                continue;
-            }
-
-            if (spaceMode == 0) { // and
-                tokens.add(lastToken = token);
-            } else if (spaceMode == 1) { // space
-
-                if (lastToken != null && lastToken.isSimpleFilter() && token.isSimpleFilter()) {
-                    lastToken.rawText = filterText.substring(lastToken.start, token.end).trim();
-                    lastToken.words[0] = lastToken.rawText;
-                    lastToken.end = token.end;
-                } else {
-                    tokens.add(lastToken = token);
-                }
-
-            } else if (spaceMode == 2) { // and-x
-
-                if (lastToken != null && lastToken.isSimpleFilter() && token.isSimpleFilter()) {
-                    final String[] newWords = new String[lastToken.words.length + token.words.length];
-
-                    System.arraycopy(lastToken.words, 0, newWords, 0, lastToken.words.length);
-                    System.arraycopy(token.words, 0, newWords, lastToken.words.length, token.words.length);
-
-                    lastToken.words = newWords;
-                    lastToken.rawText = filterText.substring(lastToken.start, token.end).trim();
-                    lastToken.end = token.end;
-                } else {
-                    tokens.add(lastToken = token);
-                }
-
-            }
-
-            lastEnd += length;
-        }
-
-        return tokens;
-    }
-
-    private SearchToken createToken(int lastEnd, String[] part, String prefixes) {
-        final SearchToken token = new SearchToken();
-        String pref = part[0];
-        String query = part[1].trim();
-
-        token.start = lastEnd;
-        token.end = lastEnd + pref.length() + query.length();
-
-        if (pref.startsWith("-")) {
-            token.ignore = '-';
-            pref = pref.substring(1);
-        } else if (pref.startsWith("!")) {
-            token.ignore = '!';
-            pref = pref.substring(1);
-        }
-
-        if (!pref.isEmpty()) {
-            char firstChar = pref.charAt(0);
-
-            if (prefixes.indexOf(firstChar) >= 0) {
-                token.firstChar = firstChar;
-                pref = pref.substring(1);
-            }
-        }
-
-        String text = pref + query;
-        token.quotes = text.length() > 1 && text.startsWith("\"") && text.endsWith("\"");
-
-        if (token.quotes) {
-            text = text.substring(1, text.length() - 1);
-        }
-
-        token.rawText = text;
-        token.words = new String[] { token.quotes ? text.replaceAll("\\\\\"", "\"") : text };
-        return token;
-    }
-
-    public List<String[]> splitByDelimiters(String input, String delimiters, boolean space) {
-
-        if (delimiters == null || delimiters.isEmpty()) {
-            return Collections.singletonList(new String[] { "", input });
-        }
-
-        final List<String[]> tokens = new ArrayList<>();
-        final int length = input.length();
-        final boolean regexTokens = NEIClientConfig.getIntSetting("inventory.search.patternMode") == 1;
-        boolean insideQuotes = false;
-        boolean insideRegex = false;
-        String token = "";
-        int lastEnd = 0;
-        int index = 0;
-
-        while (index < length) {
-            final char ch = input.charAt(index);
-
-            if (insideRegex) {
-                if (ch == '/' && input.charAt(index - 1) != '\\') {
-                    insideRegex = false;
-                }
-
-                index++;
-                continue;
-            }
-
-            if (!insideQuotes && delimiters.indexOf(ch) >= 0
-                    && (!space || index == 0 || input.charAt(index - 1) == ' ' || lastEnd == index)) {
-
-                if (lastEnd == index) {
-                    token += String.valueOf(ch);
-                } else {
-                    tokens.add(new String[] { token, input.substring(lastEnd, index) });
-                    token = String.valueOf(ch);
-                }
-
-                lastEnd = index + 1;
-            } else if (!insideQuotes && space && ch != ' ' && (index > 0 && input.charAt(index - 1) == ' ')) {
-                tokens.add(new String[] { token, input.substring(lastEnd, index) });
-                token = "";
-
-                lastEnd = index;
-            }
-
-            if (ch == '"' && (index == 0 || input.charAt(index - 1) != '\\')) {
-                insideQuotes = !insideQuotes;
-            } else if (regexTokens && !insideQuotes && isRegexStart(input, index)) {
-                insideRegex = true;
-                index++;
-            }
-
-            index++;
-        }
-
-        tokens.add(new String[] { token, input.substring(lastEnd) });
-
-        return tokens;
-    }
-
-    private static boolean isRegexStart(String input, int index) {
-        return Character.toLowerCase(input.charAt(index)) == 'r' && index + 1 < input.length()
-                && input.charAt(index + 1) == '/'
-                && (index == 0 || !Character.isLetterOrDigit(input.charAt(index - 1)));
-    }
-
-    public String getPrefixes() {
-        if (this.prefixes == null) {
-            final StringBuilder builder = new StringBuilder();
-
-            for (ISearchParserProvider provider : getProviders()) {
-                if (provider.getSearchMode() == SearchTokenParser.SearchMode.PREFIX) {
-                    builder.append(getRedefinedPrefix(provider.getPrefix()));
-                }
-            }
-
-            this.prefixes = builder.toString();
-        }
-
-        return this.prefixes;
-    }
-
-    public String getRecipeContextTokens() {
-        // '^' is the start anchor and the negated class in regex mode
-        return NEIClientConfig.getIntSetting("inventory.search.patternMode") == 2 ? "<>" : "<>^";
-    }
-
-    public char getRedefinedPrefix(char prefix) {
-        return this.prefixRedefinitions.getOrDefault(prefix, prefix);
-    }
-
-}

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

@@ -10,7 +10,6 @@ import net.minecraftforge.event.world.WorldEvent;
 
 import codechicken.core.CommonUtils;
 import codechicken.lib.packet.PacketCustom;
-import codechicken.nei.item.ItemFluidDisplay;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerChangedDimensionEvent;
@@ -19,12 +18,13 @@ 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 cpw.mods.fml.common.registry.GameRegistry;
 
 public class ServerHandler {
 
+    private static ServerHandler instance;
+
     public static void load() {
-        ServerHandler instance = new ServerHandler();
+        instance = new ServerHandler();
 
         PacketCustom.assignHandler(NEICPH.channel, new NEISPH());
         FMLCommonHandler.instance().bus().register(instance);
@@ -33,14 +33,6 @@ public class ServerHandler {
         NEIActions.init();
     }
 
-    public static void preInit() {
-        registerFluidDisplayItem();
-    }
-
-    private static void registerFluidDisplayItem() {
-        GameRegistry.registerItem(new ItemFluidDisplay(), "neiFluidDisplay");
-    }
-
     @SubscribeEvent
     public void tickEvent(TickEvent.WorldTickEvent event) {
         if (event.phase == Phase.START && !event.world.isRemote
@@ -56,7 +48,8 @@ public class ServerHandler {
 
     @SubscribeEvent
     public void tickEvent(TickEvent.PlayerTickEvent event) {
-        if (event.phase == Phase.START && event.player instanceof EntityPlayerMP player) {
+        if (event.phase == Phase.START && event.player instanceof EntityPlayerMP) {
+            EntityPlayerMP player = (EntityPlayerMP) event.player;
             PlayerSave save = NEIServerConfig.forPlayer(player.getCommandSenderName());
             if (save == null) return;
             updateMagneticPlayer(player, save);

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

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

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

@@ -9,6 +9,7 @@ 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;
@@ -26,16 +27,21 @@ public class SpawnerRenderer implements IItemRenderer {
 
     public void renderInventoryItem(RenderBlocks render, ItemStack item) {
         int meta = item.getItemDamage();
+
         if (meta == 0) meta = ItemMobSpawner.idPig;
+
         String bossName = BossStatus.bossName;
         int bossTimeout = BossStatus.statusBarTime;
         boolean bossHasColorModifier = BossStatus.hasColorModifier;
-        Entity entity = ItemMobSpawner.getEntity(meta);
         try {
+            World world = NEIClientUtils.mc().theWorld;
+            ItemMobSpawner.loadSpawners(world);
             CCRenderState.changeTexture(TextureMap.locationBlocksTexture);
             render.renderBlockAsItem(Blocks.mob_spawner, 0, 1F);
-            entity.setWorld(render.minecraftRB.theWorld);
             GL11.glPushMatrix();
+
+            Entity entity = ItemMobSpawner.getEntity(meta);
+            entity.setWorld(world);
             float f1 = 0.4375F;
             if (entity.getShadowSize() > 1.5) f1 = 0.1F;
             GL11.glRotatef((float) (ClientUtils.getRenderTime() * 10), 0.0F, 1.0F, 0.0F);
@@ -45,6 +51,7 @@ public class SpawnerRenderer implements IItemRenderer {
             entity.setLocationAndAngles(0, 0, 0, 0.0F, 0.0F);
             RenderManager.instance.renderEntityWithPosYaw(entity, 0.0D, 0.0D, 0.0D, 0.0F, 0);
             GL11.glPopMatrix();
+
             GL11.glEnable(GL12.GL_RESCALE_NORMAL);
             OpenGlHelper.setActiveTexture(OpenGlHelper.lightmapTexUnit);
             GL11.glDisable(GL11.GL_TEXTURE_2D);
@@ -57,6 +64,7 @@ public class SpawnerRenderer implements IItemRenderer {
         BossStatus.hasColorModifier = bossHasColorModifier;
     }
 
+    @SuppressWarnings("incomplete-switch")
     @Override
     public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
         switch (type) {
@@ -67,8 +75,6 @@ public class SpawnerRenderer implements IItemRenderer {
             case ENTITY:
                 renderInventoryItem((RenderBlocks) data[0], item);
                 break;
-            default:
-                break;
         }
     }
 

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

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

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

@@ -6,9 +6,9 @@ import cpw.mods.fml.common.FMLCommonHandler;
 
 public class ThreadOperationTimer extends Thread {
 
+    @SuppressWarnings("serial")
     public static class TimeoutException extends RuntimeException {
 
-        private static final long serialVersionUID = -8621458005263888185L;
         public final Object operation;
 
         public TimeoutException(String msg, Object op) {

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

@@ -15,6 +15,10 @@ public class VisiblityData {
      * Subset dropdown
      */
     public boolean showSubsetDropdown = true;
+    /**
+     * Presets dropdown
+     */
+    public boolean showPresetsDropdown = true;
     /**
      * Item and search section
      */
@@ -40,6 +44,7 @@ public class VisiblityData {
     public void translateDependancies() {
         if (!showNEI) showWidgets = false;
         if (!showWidgets) showItemSection = showUtilityButtons = false;
-        if (!showItemSection) showBookmarkPanel = showSubsetDropdown = showSearchSection = showItemPanel = false;
+        if (!showItemSection)
+            showBookmarkPanel = showSubsetDropdown = showPresetsDropdown = showSearchSection = showItemPanel = false;
     }
 }

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

@@ -1,7 +1,6 @@
 package codechicken.nei;
 
 import java.util.List;
-import java.util.Map;
 
 import net.minecraft.item.ItemStack;
 
@@ -15,6 +14,8 @@ public abstract class Widget {
 
     public void postDraw(int mx, int my) {}
 
+    public void postDrawTooltips(int mx, int my, List<String> tooltip) {}
+
     public boolean handleClick(int mx, int my, int button) {
         return true;
     }
@@ -29,10 +30,6 @@ public abstract class Widget {
 
     public void lastKeyTyped(int keyID, char keyChar) {}
 
-    public boolean onHotkeyPressed() {
-        return false;
-    }
-
     public boolean handleClickExt(int mx, int my, int button) {
         return false;
     }
@@ -41,10 +38,6 @@ public abstract class Widget {
         return false;
     }
 
-    public Map<String, String> handleHotkeys(int mousex, int mousey, Map<String, String> hotkeys) {
-        return hotkeys;
-    }
-
     public void update() {}
 
     public Rectangle4i bounds() {
@@ -55,10 +48,6 @@ public abstract class Widget {
         return bounds().contains(px, py);
     }
 
-    public boolean isVisible() {
-        return true;
-    }
-
     public ItemStack getStackMouseOver(int mx, int my) {
         return null;
     }
@@ -69,14 +58,6 @@ public abstract class Widget {
         return tooltip;
     }
 
-    public List<String> handleItemTooltip(ItemStack itemstack, int mousex, int mousey, List<String> tooltip) {
-        return tooltip;
-    }
-
-    public boolean isFocused() {
-        return false;
-    }
-
     public void loseFocus() {}
 
     public void gainFocus() {}
@@ -86,5 +67,4 @@ public abstract class Widget {
     public int z;
     public int w;
     public int h;
-
 }

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

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

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

@@ -11,6 +11,6 @@ public class WidgetZOrder implements Comparator<Widget> {
     }
 
     public int compare(Widget w1, Widget w2) {
-        return w1.z != w2.z ? ((topfirst ? w1.z < w2.z : w1.z > w2.z) ? 1 : -1) : 1;
+        return w1.z != w2.z ? ((topfirst ? w1.z > w2.z : w1.z < w2.z) ? 1 : -1) : 1;
     }
 }

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

@@ -1,11 +1,5 @@
 package codechicken.nei;
 
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.concurrent.Callable;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockSnow;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.entity.Entity;
@@ -21,11 +15,8 @@ import net.minecraft.world.chunk.Chunk;
 
 import org.lwjgl.opengl.GL11;
 
-import com.cardinalstar.cubicchunks.world.api.IMinMaxHeight;
-
 import codechicken.lib.math.MathHelper;
 import codechicken.nei.KeyManager.IKeyStateTracker;
-import cpw.mods.fml.relauncher.ReflectionHelper;
 
 public class WorldOverlayRenderer implements IKeyStateTracker {
 
@@ -34,23 +25,21 @@ public class WorldOverlayRenderer implements IKeyStateTracker {
     public static int mobOverlay = 0;
     private static byte[] mobSpawnCache;
     private static long mobOverlayUpdateTime;
+    private static String oregenPatternName;
+    private static boolean hasOregenPatternBeenSet = false;
 
     public static void reset() {
         mobOverlay = 0;
         chunkOverlay = 0;
+        hasOregenPatternBeenSet = false;
     }
 
     @Override
     public void tickKeyStates() {
         if (Minecraft.getMinecraft().currentScreen != null) return;
 
-        if (KeyManager.isPressed("world.moboverlay")) {
-            mobOverlay = (mobOverlay + 1) % 2;
-            NEIClientUtils
-                    .printChatMessage(new ChatComponentText(NEIClientUtils.translate("chat.moboverlay." + mobOverlay)));
-        }
-
-        if (KeyManager.isPressed("world.chunkoverlay")) {
+        if (KeyManager.keyStates.get("world.moboverlay").down) mobOverlay = (mobOverlay + 1) % 2;
+        if (KeyManager.keyStates.get("world.chunkoverlay").down) {
             chunkOverlay = (chunkOverlay + 1) % (NEIModContainer.isGT5Loaded() ? 4 : 3);
             // 0-2 (or 3 with gt)
             NEIClientUtils.printChatMessage(
@@ -60,7 +49,6 @@ public class WorldOverlayRenderer implements IKeyStateTracker {
     }
 
     public static void render(float frame) {
-        GL11.glPushAttrib(GL11.GL_ENABLE_BIT | GL11.GL_COLOR_BUFFER_BIT | GL11.GL_DEPTH_BUFFER_BIT | GL11.GL_LINE_BIT);
         GL11.glPushMatrix();
         Entity entity = Minecraft.getMinecraft().renderViewEntity;
 
@@ -74,12 +62,9 @@ public class WorldOverlayRenderer implements IKeyStateTracker {
 
         GL11.glTranslated(-interpPosX + intOffsetX, -interpPosY + intOffsetY, -interpPosZ + intOffsetZ);
 
-        GL11.glEnable(GL11.GL_DEPTH_TEST);
-        GL11.glDepthFunc(GL11.GL_LEQUAL);
         renderChunkBounds(entity, intOffsetX, intOffsetY, intOffsetZ);
         renderMobSpawnOverlay(entity, intOffsetX, intOffsetY, intOffsetZ);
         GL11.glPopMatrix();
-        GL11.glPopAttrib();
     }
 
     private static void buildMobSpawnOverlay(Entity entity) {
@@ -88,11 +73,9 @@ public class WorldOverlayRenderer implements IKeyStateTracker {
         }
 
         World world = entity.worldObj;
-        int worldHeight = world.getHeight();
-
         int x1 = (int) entity.posX;
         int z1 = (int) entity.posZ;
-        int y1 = (int) MathHelper.clip(entity.posY, 16, worldHeight - 16);
+        int y1 = (int) MathHelper.clip(entity.posY, 16, world.getHeight() - 16);
 
         for (int i = 0; i <= 32; i++) {
             int x = x1 - 16 + i;
@@ -111,12 +94,6 @@ public class WorldOverlayRenderer implements IKeyStateTracker {
 
                 for (int k = 0; k <= 32; k++) {
                     int y = y1 - 16 + k;
-
-                    if (y >= worldHeight) {
-                        mobSpawnCache[bufIndex + k] = -1;
-                        continue;
-                    }
-
                     if (y > maxHeight) {
                         mobSpawnCache[bufIndex + k] = -1;
                         break;
@@ -127,15 +104,6 @@ public class WorldOverlayRenderer implements IKeyStateTracker {
         }
     }
 
-    private static double getOverlayYOffset(World world, int x, int y, int z) {
-        Block block = world.getBlock(x, y, z);
-        if (block instanceof BlockSnow) {
-            int meta = world.getBlockMetadata(x, y, z) & 7;
-            return (1 + meta) / 8.0 + 0.02;
-        }
-        return 0.02;
-    }
-
     private static void renderMobSpawnOverlay(Entity entity, int intOffsetX, int intOffsetY, int intOffsetZ) {
         if (mobOverlay == 0) {
             if (mobSpawnCache != null) {
@@ -191,12 +159,10 @@ public class WorldOverlayRenderer implements IKeyStateTracker {
                         curSpawnMode = spawnMode;
                     }
 
-                    double yOff = getOverlayYOffset(world, x + intOffsetX, y + intOffsetY, z + intOffsetZ);
-
-                    tess.addVertex(x, y + yOff, z);
-                    tess.addVertex(x + 1, y + yOff, z + 1);
-                    tess.addVertex(x + 1, y + yOff, z);
-                    tess.addVertex(x, y + yOff, z + 1);
+                    tess.addVertex(x, y + 0.02, z);
+                    tess.addVertex(x + 1, y + 0.02, z + 1);
+                    tess.addVertex(x + 1, y + 0.02, z);
+                    tess.addVertex(x, y + 0.02, z + 1);
                 }
             }
         }
@@ -211,10 +177,6 @@ public class WorldOverlayRenderer implements IKeyStateTracker {
     private static final AxisAlignedBB aabb = AxisAlignedBB.getBoundingBox(0, 0, 0, 0, 0, 0);
 
     private static byte getSpawnMode(Chunk chunk, int x, int y, int z) {
-        if (y >= chunk.worldObj.getHeight()) {
-            return 0;
-        }
-
         if (chunk.getSavedLightValue(EnumSkyBlock.Block, x & 15, y, z & 15) >= 8
                 || !SpawnerAnimals.canCreatureTypeSpawnAtLocation(EnumCreatureType.monster, chunk.worldObj, x, y, z)) {
             return 0;
@@ -237,17 +199,12 @@ public class WorldOverlayRenderer implements IKeyStateTracker {
     private static void renderChunkBounds(Entity entity, int intOffsetX, int intOffsetY, int intOffsetZ) {
         if (chunkOverlay == 0) return;
 
-        int worldMinY = worldMinHeight(entity.worldObj);
-        int worldMaxY = worldMaxHeight(entity.worldObj);
-
         GL11.glDisable(GL11.GL_TEXTURE_2D);
         GL11.glEnable(GL11.GL_BLEND);
         GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
         GL11.glDisable(GL11.GL_LIGHTING);
         GL11.glLineWidth(1.5F);
-
-        final Tessellator tess = Tessellator.instance;
-        tess.startDrawing(GL11.GL_LINES);
+        GL11.glBegin(GL11.GL_LINES);
 
         for (int cx = -4; cx <= 4; cx++) for (int cz = -4; cz <= 4; cz++) {
             double x1 = ((entity.chunkCoordX + cx) << 4) - intOffsetX;
@@ -258,13 +215,14 @@ public class WorldOverlayRenderer implements IKeyStateTracker {
             double dy = 128;
             double y1 = Math.floor(entity.posY - dy / 2);
             double y2 = y1 + dy;
-            if (y1 < worldMinY) {
-                y1 = worldMinY;
-                y2 = worldMinY + dy;
+            if (y1 < 0) {
+                y1 = 0;
+                y2 = dy;
             }
-            if (y2 > worldMaxY) {
-                y2 = worldMaxY;
-                y1 = Math.max(worldMaxY - dy, worldMinY);
+
+            if (y1 > entity.worldObj.getHeight()) {
+                y2 = entity.worldObj.getHeight();
+                y1 = y2 - dy;
             }
 
             y1 -= intOffsetY;
@@ -272,38 +230,22 @@ public class WorldOverlayRenderer implements IKeyStateTracker {
 
             double dist = Math.pow(1.5, -(cx * cx + cz * cz));
 
-            tess.setColorRGBA_F(0.9F, 0, 0, (float) dist);
+            GL11.glColor4d(0.9, 0, 0, dist);
             if (cx >= 0 && cz >= 0) {
-                tess.addVertex(x2, y1, z2);
-                tess.addVertex(x2, y2, z2);
+                GL11.glVertex3d(x2, y1, z2);
+                GL11.glVertex3d(x2, y2, z2);
             }
             if (cx >= 0 && cz <= 0) {
-                tess.addVertex(x2, y1, z1);
-                tess.addVertex(x2, y2, z1);
+                GL11.glVertex3d(x2, y1, z1);
+                GL11.glVertex3d(x2, y2, z1);
             }
             if (cx <= 0 && cz >= 0) {
-                tess.addVertex(x1, y1, z2);
-                tess.addVertex(x1, y2, z2);
+                GL11.glVertex3d(x1, y1, z2);
+                GL11.glVertex3d(x1, y2, z2);
             }
             if (cx <= 0 && cz <= 0) {
-                tess.addVertex(x1, y1, z1);
-                tess.addVertex(x1, y2, z1);
-            }
-
-            if (NEIModContainer.isCCLoaded()) {
-                tess.setColorRGBA_F(0, 0.5F, 0.9F, (float) dist * 0.5F);
-                int cubeBase = (int) Math.floor((y1 + intOffsetY) / 16.0) * 16;
-                for (int cubeY = cubeBase; cubeY <= y2 + intOffsetY; cubeY += 16) {
-                    double ry = cubeY - intOffsetY;
-                    tess.addVertex(x1, ry, z1);
-                    tess.addVertex(x2, ry, z1);
-                    tess.addVertex(x1, ry, z2);
-                    tess.addVertex(x2, ry, z2);
-                    tess.addVertex(x1, ry, z1);
-                    tess.addVertex(x1, ry, z2);
-                    tess.addVertex(x2, ry, z1);
-                    tess.addVertex(x2, ry, z2);
-                }
+                GL11.glVertex3d(x1, y1, z1);
+                GL11.glVertex3d(x1, y2, z1);
             }
 
             if (cx == 0 && cz == 0) {
@@ -311,49 +253,53 @@ public class WorldOverlayRenderer implements IKeyStateTracker {
                     dy = 32;
                     y1 = Math.floor(entity.posY - dy / 2);
                     y2 = y1 + dy;
-                    if (y1 < worldMinY) {
-                        y1 = worldMinY;
-                        y2 = worldMinY + dy;
+                    if (y1 < 0) {
+                        y1 = 0;
+                        y2 = dy;
                     }
-                    if (y2 > worldMaxY) {
-                        y2 = worldMaxY;
-                        y1 = Math.max(worldMaxY - dy, worldMinY);
+
+                    if (y1 > entity.worldObj.getHeight()) {
+                        y2 = entity.worldObj.getHeight();
+                        y1 = y2 - dy;
                     }
 
                     y1 -= intOffsetY;
                     y2 -= intOffsetY;
-                    double centerX = (x1 + x2) / 2;
-                    double centerZ = (z1 + z2) / 2;
 
-                    tess.setColorRGBA_F(0.9F, 0.9F, 0, (float) dist);
-                    tess.addVertex(centerX, y1, centerZ);
-                    tess.addVertex(centerX, y2, centerZ);
-
-                    tess.setColorRGBA_F(0, 0.9F, 0, 0.4F);
+                    GL11.glColor4d(0, 0.9, 0, 0.4);
                     for (double y = (int) y1; y <= y2; y++) {
-                        tess.addVertex(x2, y, z1);
-                        tess.addVertex(x2, y, z2);
-                        tess.addVertex(x1, y, z1);
-                        tess.addVertex(x1, y, z2);
-                        tess.addVertex(x1, y, z2);
-                        tess.addVertex(x2, y, z2);
-                        tess.addVertex(x1, y, z1);
-                        tess.addVertex(x2, y, z1);
+                        GL11.glVertex3d(x2, y, z1);
+                        GL11.glVertex3d(x2, y, z2);
+                        GL11.glVertex3d(x1, y, z1);
+                        GL11.glVertex3d(x1, y, z2);
+                        GL11.glVertex3d(x1, y, z2);
+                        GL11.glVertex3d(x2, y, z2);
+                        GL11.glVertex3d(x1, y, z1);
+                        GL11.glVertex3d(x2, y, z1);
                     }
                     for (double h = 1; h <= 15; h++) {
-                        tess.addVertex(x1 + h, y1, z1);
-                        tess.addVertex(x1 + h, y2, z1);
-                        tess.addVertex(x1 + h, y1, z2);
-                        tess.addVertex(x1 + h, y2, z2);
-                        tess.addVertex(x1, y1, z1 + h);
-                        tess.addVertex(x1, y2, z1 + h);
-                        tess.addVertex(x2, y1, z1 + h);
-                        tess.addVertex(x2, y2, z1 + h);
+                        GL11.glVertex3d(x1 + h, y1, z1);
+                        GL11.glVertex3d(x1 + h, y2, z1);
+                        GL11.glVertex3d(x1 + h, y1, z2);
+                        GL11.glVertex3d(x1 + h, y2, z2);
+                        GL11.glVertex3d(x1, y1, z1 + h);
+                        GL11.glVertex3d(x1, y2, z1 + h);
+                        GL11.glVertex3d(x2, y1, z1 + h);
+                        GL11.glVertex3d(x2, y2, z1 + h);
                     }
                 } else if (chunkOverlay == 3) {
+                    if (!hasOregenPatternBeenSet) {
+                        try {
+                            oregenPatternName = ((Enum<?>) Class.forName("gregtech.common.GT_Worldgenerator")
+                                    .getDeclaredField("oregenPattern").get(null)).name();
+                        } catch (Exception ignored) {
+                            oregenPatternName = "AXISSYMMETRICAL";
+                        }
+                        hasOregenPatternBeenSet = true;
+                    }
                     int gx1;
                     int gz1;
-                    if (getOregenPatternName().equals("EQUAL_SPACING")) {
+                    if (oregenPatternName.equals("EQUAL_SPACING")) {
                         // gt oregen uses new regular pattern
                         gx1 = ((Math.floorDiv(entity.chunkCoordX, 3) * 3) << 4) - intOffsetX;
                         gz1 = ((Math.floorDiv(entity.chunkCoordZ, 3) * 3) << 4) - intOffsetZ;
@@ -373,106 +319,55 @@ public class WorldOverlayRenderer implements IKeyStateTracker {
                     int gx2 = gx1 + 48;
                     int gz2 = gz1 + 48;
 
-                    tess.setColorRGBA_F(0, 0.9F, 0, 0.4F);
+                    GL11.glColor4d(0, 0.9, 0, 0.4);
                     for (double y = (int) y1; y <= y2; y++) {
-                        tess.addVertex(gx2, y, gz1);
-                        tess.addVertex(gx2, y, gz2);
-                        tess.addVertex(gx1, y, gz1);
-                        tess.addVertex(gx1, y, gz2);
-                        tess.addVertex(gx1, y, gz2);
-                        tess.addVertex(gx2, y, gz2);
-                        tess.addVertex(gx1, y, gz1);
-                        tess.addVertex(gx2, y, gz1);
+                        GL11.glVertex3d(gx2, y, gz1);
+                        GL11.glVertex3d(gx2, y, gz2);
+                        GL11.glVertex3d(gx1, y, gz1);
+                        GL11.glVertex3d(gx1, y, gz2);
+                        GL11.glVertex3d(gx1, y, gz2);
+                        GL11.glVertex3d(gx2, y, gz2);
+                        GL11.glVertex3d(gx1, y, gz1);
+                        GL11.glVertex3d(gx2, y, gz1);
                     }
                     for (double h = 4; h <= 44; h += 4) {
                         if (h % 16 == 0) {
                             continue;
                         }
-                        tess.addVertex(gx1 + h, y1, gz1);
-                        tess.addVertex(gx1 + h, y2, gz1);
-                        tess.addVertex(gx1 + h, y1, gz2);
-                        tess.addVertex(gx1 + h, y2, gz2);
-                        tess.addVertex(gx1, y1, gz1 + h);
-                        tess.addVertex(gx1, y2, gz1 + h);
-                        tess.addVertex(gx2, y1, gz1 + h);
-                        tess.addVertex(gx2, y2, gz1 + h);
+                        GL11.glVertex3d(gx1 + h, y1, gz1);
+                        GL11.glVertex3d(gx1 + h, y2, gz1);
+                        GL11.glVertex3d(gx1 + h, y1, gz2);
+                        GL11.glVertex3d(gx1 + h, y2, gz2);
+                        GL11.glVertex3d(gx1, y1, gz1 + h);
+                        GL11.glVertex3d(gx1, y2, gz1 + h);
+                        GL11.glVertex3d(gx2, y1, gz1 + h);
+                        GL11.glVertex3d(gx2, y2, gz1 + h);
                     }
 
-                    tess.setColorRGBA_F(0, 0, 0.9F, 0.4F);
+                    GL11.glColor4d(0, 0, 0.9, 0.4);
                     gx1 += 23;
                     gz1 += 23;
                     gx2 = gx1 + 1;
                     gz2 = gz1 + 1;
 
-                    tess.addVertex(gx1, y1, gz1);
-                    tess.addVertex(gx1, y2, gz1);
-                    tess.addVertex(gx2, y1, gz1);
-                    tess.addVertex(gx2, y2, gz1);
-                    tess.addVertex(gx1, y1, gz2);
-                    tess.addVertex(gx1, y2, gz2);
-                    tess.addVertex(gx2, y1, gz2);
-                    tess.addVertex(gx2, y2, gz2);
+                    GL11.glVertex3d(gx1, y1, gz1);
+                    GL11.glVertex3d(gx1, y2, gz1);
+                    GL11.glVertex3d(gx2, y1, gz1);
+                    GL11.glVertex3d(gx2, y2, gz1);
+                    GL11.glVertex3d(gx1, y1, gz2);
+                    GL11.glVertex3d(gx1, y2, gz2);
+                    GL11.glVertex3d(gx2, y1, gz2);
+                    GL11.glVertex3d(gx2, y2, gz2);
                 }
             }
         }
 
-        tess.draw();
+        GL11.glEnd();
         GL11.glEnable(GL11.GL_LIGHTING);
         GL11.glEnable(GL11.GL_TEXTURE_2D);
         GL11.glDisable(GL11.GL_BLEND);
     }
 
-    private static int worldMinHeight(World world) {
-        if (NEIModContainer.isCCLoaded() && world instanceof IMinMaxHeight worldHeights) {
-            return worldHeights.getMinHeight();
-        } else {
-            return 0;
-        }
-    }
-
-    private static int worldMaxHeight(World world) {
-        if (NEIModContainer.isCCLoaded() && world instanceof IMinMaxHeight worldHeights) {
-            return worldHeights.getMaxHeight();
-        } else {
-            return world.getHeight();
-        }
-    }
-
-    private static Callable<String> oregenPatternReader;
-
-    private static String getOregenPatternName() {
-        if (oregenPatternReader == null) {
-            oregenPatternReader = resolveOregenPatternReader();
-        }
-        try {
-            return oregenPatternReader.call();
-        } catch (Exception ignored) {
-            return "AXISSYMMETRICAL";
-        }
-    }
-
-    private static Callable<String> resolveOregenPatternReader() {
-        try {
-            final Class<?> gtWorldGenerator = ReflectionHelper.getClass(
-                    WorldOverlayRenderer.class.getClassLoader(),
-                    "gregtech.common.GTWorldgenerator",
-                    "gregtech.common.GT_Worldgenerator");
-
-            try {
-                // GT5-Unofficial >= 5.09.54.29 support
-                final Method accessor = gtWorldGenerator.getMethod("getOregenPattern");
-                return () -> ((Enum<?>) accessor.invoke(null)).name();
-            } catch (NoSuchMethodException legacy) {
-                // Older GT
-                final Field oregenPattern = gtWorldGenerator.getDeclaredField("oregenPattern");
-                oregenPattern.setAccessible(true);
-                return () -> ((Enum<?>) oregenPattern.get(null)).name();
-            }
-        } catch (Exception ignored) {
-            return () -> "AXISSYMMETRICAL";
-        }
-    }
-
     public static void load() {
         KeyManager.trackers.add(new WorldOverlayRenderer());
     }

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

@@ -1,41 +1,36 @@
 package codechicken.nei.api;
 
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
 
 import net.minecraft.block.Block;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.Fluid;
 
 import org.lwjgl.input.Keyboard;
 
 import com.google.common.collect.Sets;
 
 import codechicken.nei.BookmarkContainerInfo;
-import codechicken.nei.CollapsibleItems;
 import codechicken.nei.ItemList;
 import codechicken.nei.ItemSorter;
 import codechicken.nei.ItemStackSet;
 import codechicken.nei.KeyManager;
+import codechicken.nei.KeyManager.KeyState;
 import codechicken.nei.LayoutManager;
 import codechicken.nei.NEIClientConfig;
 import codechicken.nei.OffsetPositioner;
 import codechicken.nei.SearchField;
 import codechicken.nei.SearchField.ISearchProvider;
-import codechicken.nei.SearchTokenParser.ISearchParserProvider;
 import codechicken.nei.SubsetWidget;
 import codechicken.nei.SubsetWidget.SubsetTag;
 import codechicken.nei.api.IRecipeFilter.IRecipeFilterProvider;
 import codechicken.nei.api.ItemFilter.ItemFilterProvider;
 import codechicken.nei.config.Option;
-import codechicken.nei.item.FluidDrawer;
+import codechicken.nei.config.OptionKeyBind;
 import codechicken.nei.recipe.CatalystInfo;
 import codechicken.nei.recipe.GuiCraftingRecipe;
 import codechicken.nei.recipe.GuiRecipe;
@@ -46,7 +41,6 @@ import codechicken.nei.recipe.IUsageHandler;
 import codechicken.nei.recipe.RecipeCatalysts;
 import codechicken.nei.recipe.RecipeInfo;
 import codechicken.nei.recipe.StackInfo;
-import codechicken.nei.util.ItemStackFilterParser;
 
 /**
  * This is the main class that handles item property configuration. WARNING: DO NOT access this class until the world
@@ -149,53 +143,23 @@ public class API {
      * Hide an item from the item panel Damage values of OreDictionary.WILDCARD_VALUE and ItemStackMap.WILDCARD_TAG tags
      * function as wildcards for their respective variables
      */
-    public static synchronized void hideItem(ItemStack item) {
+    public static void hideItem(ItemStack item) {
         if (!ItemInfo.hiddenItems.contains(item)) {
             ItemInfo.hiddenItems.add(item);
             LayoutManager.markItemsDirty();
         }
     }
 
-    public static synchronized void hideItem(String rule) {
-        ItemFilter filter = ItemStackFilterParser.parse(rule);
-        if (filter != null) {
-            ItemInfo.hiddenItemsRules.filters.add(filter);
-            LayoutManager.markItemsDirty();
-        }
-    }
-
     /**
      * Add or replace the name normally shown on the item tooltip
      */
     public static void setOverrideName(ItemStack item, String name) {
-        String existing = ItemInfo.nameOverrides.get(item);
-        if (!Objects.equals(name, existing)) {
-            if (name == null) {
-                ItemInfo.nameOverrides.remove(item);
-            } else {
-                ItemInfo.nameOverrides.put(item, name);
-            }
+        if (!name.equals(ItemInfo.nameOverrides.get(item))) {
+            ItemInfo.nameOverrides.put(item, name);
             LayoutManager.markItemsDirty();
         }
     }
 
-    /**
-     * Add an alias name that this item can be found by in the search field, in addition to its display name.
-     *
-     * @param aliases translation keys, localized at search time
-     */
-    public static void setAliases(ItemStack item, String... aliases) {
-        final List<String> list = Arrays.asList(aliases).stream().filter(Objects::nonNull).map(String::trim)
-                .filter(s -> !s.isEmpty()).collect(Collectors.toList());
-
-        if (list.isEmpty()) {
-            ItemInfo.itemAliases.remove(item);
-        } else {
-            ItemInfo.itemAliases.put(item, list);
-        }
-
-    }
-
     /**
      * Adds an item to the item panel. Any items added using this function will override the default search pattern.
      *
@@ -226,12 +190,20 @@ public class API {
      * @param defaultKey The default value, commonly obtained from {@link Keyboard}
      */
     public static void addKeyBind(String ident, int defaultKey) {
-        KeyManager.registerKeyBinding(ident, defaultKey);
+        NEIClientConfig.setDefaultKeyBinding(ident, defaultKey);
+        KeyManager.keyStates.put(ident, new KeyState());
+        addOption(new OptionKeyBind(ident));
     }
 
-    @Deprecated
+    /**
+     * Add a custom KeyBinding to be configured in the Controls menu.
+     *
+     * @param ident      An identifier for your key, eg "shoot"
+     * @param defaultKey The default value, commonly obtained from {@link Keyboard}
+     */
     public static void addHashBind(String ident, int defaultKey) {
-        KeyManager.registerKeyBinding(ident, defaultKey);
+        NEIClientConfig.setDefaultKeyBinding(ident, defaultKey);
+        addOption(new OptionKeyBind(ident, true));
     }
 
     public static void addOption(Option option) {
@@ -342,38 +314,11 @@ public class API {
         SubsetWidget.addTag(tag);
     }
 
-    /**
-     * Registers a group of items that is collapsed into a single entry in the item panel. Groups registered here have
-     * the lowest priority: an item that matches a preset or a collapsibleitems.cfg group stays there. They are active
-     * only while the Collapsible Items option is enabled. Must be called while plugins are loading.
-     *
-     * @param filter A search string for matching items that belong to this group. Also identifies the group when its
-     *               expanded state is saved, so changing it resets the saved state.
-     * @return A handle to optionally set the name shown for the group
-     */
-    public static CollapsibleItems.ApiGroup addCollapsibleGroup(String filter) {
-        return CollapsibleItems.registerGroup(filter);
-    }
-
-    /**
-     * Same as {@link #addCollapsibleGroup(String)}, but the group is given as a list of item stacks. The stacks
-     * identify the group when its expanded state is saved, so changing them resets the saved state.
-     *
-     * @param items Item stacks that belong to this group
-     * @return A handle to optionally set the name shown for the group
-     */
-    public static CollapsibleItems.ApiGroup addCollapsibleGroup(Iterable<ItemStack> items) {
-        return CollapsibleItems.registerGroup(items);
-    }
-
-    @Deprecated
-    public static void addSearchProvider(ISearchProvider provider) {}
-
     /**
      * Adds a new search provider to the search field
      */
-    public static void addSearchProvider(ISearchParserProvider provider) {
-        SearchField.searchParser.addProvider(provider);
+    public static void addSearchProvider(ISearchProvider provider) {
+        SearchField.searchProviders.add(provider);
     }
 
     /**
@@ -404,16 +349,6 @@ public class API {
         StackInfo.stackStringifyHandlers.add(handler);
     }
 
-    /**
-     * Replaces the default rendering of a fluid in NEI fluid display slots and fluid tanks.
-     *
-     * @param fluid    the fluid to render
-     * @param renderer the renderer, or null to restore the default rendering
-     */
-    public static void registerFluidRenderer(Fluid fluid, IFluidRenderer renderer) {
-        FluidDrawer.registerFluidRenderer(fluid, renderer);
-    }
-
     /**
      * Adds an association between an ingredient and what it can craft. (i.e. Furnace ItemStack -> Smelting and Fuel
      * Recipes) Allows players to see what ingredient they need to craft in order to make recipes from a recipe

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

@@ -1,7 +1,5 @@
 package codechicken.nei.api;
 
-import static codechicken.lib.gui.GuiDraw.drawRect;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -9,14 +7,13 @@ import net.minecraft.inventory.Slot;
 
 import org.lwjgl.opengl.GL11;
 
-import codechicken.nei.NEIClientUtils;
 import codechicken.nei.PositionedStack;
 import codechicken.nei.guihook.GuiContainerManager;
 
 public class DefaultOverlayRenderer implements IRecipeOverlayRenderer {
 
     public DefaultOverlayRenderer(List<PositionedStack> ai, IStackPositioner positioner) {
-        this.positioner = positioner;
+        positioner = this.positioner = positioner;
         ingreds = new ArrayList<>();
         for (PositionedStack stack : ai) ingreds.add(stack.copy());
         ingreds = positioner.positionStacks(ingreds);
@@ -24,22 +21,20 @@ public class DefaultOverlayRenderer implements IRecipeOverlayRenderer {
 
     @Override
     public void renderOverlay(GuiContainerManager gui, Slot slot) {
-        GL11.glPushAttrib(GL11.GL_ENABLE_BIT | GL11.GL_COLOR_BUFFER_BIT | GL11.GL_LIGHTING_BIT);
         GL11.glEnable(GL11.GL_BLEND);
         GL11.glBlendFunc(770, 1);
+        GL11.glColor4d(0.6, 0.6, 0.6, 0.7);
 
+        GuiContainerManager.setColouredItemRender(true);
         for (PositionedStack stack : ingreds) {
-            if (stack.relx == slot.xDisplayPosition && stack.rely == slot.yDisplayPosition && !slot.getHasStack()) {
+            if (stack.relx == slot.xDisplayPosition && stack.rely == slot.yDisplayPosition)
                 GuiContainerManager.drawItem(stack.relx, stack.rely, stack.item);
-                drawHover(stack.relx, stack.rely);
-            }
         }
+        GuiContainerManager.setColouredItemRender(false);
 
-        GL11.glPopAttrib();
-    }
-
-    private static void drawHover(int x, int y) {
-        NEIClientUtils.gl2DRenderContext(() -> drawRect(x, y, 16, 16, 0x66555555));
+        GL11.glColor4f(1, 1, 1, 1);
+        GL11.glDisable(GL11.GL_BLEND);
+        GL11.glEnable(GL11.GL_LIGHTING);
     }
 
     final IStackPositioner positioner;