Compare commits

...
Author SHA1 Message Date
slprime 939845a9ed Add List View to Recipe (#1041) 2026-09-23 00:14:39 +03:00
Martin Robertz c9db437dd1 update+gradle+bs+deps+gitignore
fix curse auto uploader
2026-09-18 00:21:05 +02:00
Jakub b1f20104a6 Publishing (#1039) 2026-09-17 14:09:06 +02:00
AlexandAlex Vermette ab8d5f275f fix(NEIController): Skip MMB on slot click to avoid unecessary conflict with itemstack using it (#1038)
Co-authored-by: Alex Vermette <[email protected]>
2026-09-17 09:16:46 +03:00
slprime 9e87f2b158 Item Craftables Panel Optimization (#1036) 2026-09-14 18:36:58 +03:00
Dream Master ab512d3fd8 update deps 2026-09-14 10:28:02 +02:00
slprime 4a9f17590b Fix Slot Highlighting (#1035) 2026-09-14 08:44:35 +03:00
slprime a845e6c3e5 Registry NEI Fluids in Server (#1033) 2026-09-12 23:41:17 +03:00
Chitak 985 4f3a0826fe ItemFluidDisplay/getSubItems skips the last fluid (#1032) 2026-09-12 22:43:05 +03:00
slprime 6cd7697ca0 Repair Handler Optimization (#1031) 2026-09-12 20:02:52 +03:00
slprime 38dc14eca1 Fix concurrent modification crash in API.hideItem (#1030) 2026-09-11 08:30:49 +03:00
slprime 1fc824410b Change Fluid Amount Limit (#1029) 2026-09-11 08:10:28 +03:00
slprime af6dba1269 Correctly filtering neifluids (#1027) 2026-09-10 22:52:37 +03:00
slprime 2bf5a1cf9f Fix Bookmark Fluid Factor Limit (#1025) 2026-09-09 19:07:19 +03:00
Ranzuandgithub-actions[bot] 2126ec78bc Destroy one pixel and add color localization (#1022)
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2026-09-09 13:34:25 +03:00
slprime 5f6209366a Fix Detect Fluid Display (#1021) 2026-09-09 07:06:14 +03:00
JarnexisandMykhailo Balaker f5fc4e704d Add Ukrainian (uk_UA) localization and translate README (#996)
Co-authored-by: Mykhailo Balaker <[email protected]>
2026-09-08 18:52:48 +02:00
slprimeandgithub-actions[bot] 3d6c1c6e19 Implement Bookmark Tree Screen (#1018)
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2026-09-08 13:56:58 +03:00
slprime fda7688807 Added fluid support in recipes (#1020) 2026-09-08 13:41:16 +03:00
boubou19andMartin Robertz 3f38e6f39b Various CPU and RAM improvements (#1015)
Co-authored-by: Martin Robertz <[email protected]>
2026-09-03 00:07:25 +03:00
vcwdfca 866b796411 add centerOverlay (#1016) 2026-08-31 19:21:39 +03:00
slprime 7817640d96 Check unknown bookmark group (#1014) 2026-08-26 16:57:07 +03:00
vcwdfcaandslprime bd595f739c Add feature to save history like bookmarks (#1011)
Co-authored-by: slprime <[email protected]>
2026-08-26 13:40:18 +03:00
slprime 4c74a01930 Fix crash when recipe search results change mid-rebuild (#1012) 2026-08-25 09:09:53 +03:00
slprime 6ced1e0604 Fix Fluid Untranslator (#1009) 2026-08-20 22:25:35 +03:00
slprime f8d00a5445 Add Accepts Label (#1007) 2026-08-14 22:41:15 +03:00
Taran Robertsandslprime 75d53b12ca New worlds ignoring global cheatmode (#1003)
Co-authored-by: slprime <[email protected]>
2026-08-14 16:20:31 +03:00
slprime f93d5977ed Fix Autocrafting With GTTools (#1006) 2026-08-14 15:22:35 +03:00
slprimeandgithub-actions[bot] c4f9c54200 Fix Autocrafting Infinity Loop (#1004)
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2026-08-14 13:27:42 +03:00
slprime 7d4c8b82ba Add custom render for PositionedStack (#1002) 2026-08-13 21:49:05 +03:00
slprime c6170f9795 Bookmarks: Fix Permutations with different amount (#1000) 2026-08-12 22:45:39 +03:00
Dream Master 5a533c8994 update+gradle+bs+deps 2026-08-11 00:26:14 +07:00
Nikolay S.andslprime d70a47a3a4 Modernize Java code (#997)
Co-authored-by: slprime <[email protected]>
2026-08-10 14:55:40 +03:00
boubou19andgithub-actions[bot] 6c3db443d7 Cache enum .values() (#998)
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2026-08-10 07:40:36 +02:00
boubou19 a51836fe9b Optimize updateUnlimitedItems (#995) 2026-08-07 19:05:01 +03:00
slprime 139ca22e51 Fix Untranslator With Broken Item (#993) 2026-08-04 19:43:34 +03:00
slprime 10fc78bdcf Add Recipe Filter syntax tooltip (#992) 2026-08-04 19:18:27 +03:00
slprime 5fb5ab6698 Added Bookmark Chain Visitor (#991) 2026-08-01 20:35:19 +03:00
slprime f47a8766a9 Create EmptyContainer (#990) 2026-08-01 20:19:54 +03:00
slprime 4cc72444d9 Fix Tooltip with Component in first line (#989) 2026-08-01 20:00:17 +03:00
123 changed files with 7808 additions and 740 deletions

No files matched your search

+3 -1
View File
@@ -28,6 +28,7 @@ whitelist.json
*.iws
src/main/resources/mixins.*([!.]).json
*.bat
*.sh
*.DS_Store
!gradlew.bat
.factorypath
@@ -35,4 +36,5 @@ addon.local.gradle
addon.local.gradle.kts
addon.late.local.gradle
addon.late.local.gradle.kts
layout.json
layout.json
+2
View File
@@ -1,5 +1,7 @@
# 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.
+93
View File
@@ -0,0 +1,93 @@
# 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.
+11 -5
View File
@@ -5,12 +5,13 @@ configurations.create('gtnhlibEmbed') {
}
dependencies {
api('com.github.GTNewHorizons:CodeChickenCore:1.4.16:dev')
devOnlyNonPublishable('com.github.GTNewHorizons:GTNHLib:0.11.23:dev')
api('com.github.GTNewHorizons:CodeChickenCore:1.4.21:dev')
devOnlyNonPublishable('com.github.GTNewHorizons:GTNHLib:0.11.49: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')
@@ -22,13 +23,18 @@ dependencies {
testRuntimeOnly('org.junit.platform:junit-platform-launcher')
testRuntimeOnly("org.lwjgl.lwjgl:lwjgl:2.9.3");
compileOnly("com.github.GTNewHorizons:GTNHLib:0.11.23") { transitive = false }
gtnhlibEmbed("com.github.GTNewHorizons:GTNHLib:0.11.23") { transitive = false }
compileOnly("com.github.GTNewHorizons:GTNHLib:0.11.49") { transitive = false }
gtnhlibEmbed("com.github.GTNewHorizons:GTNHLib:0.11.49") { 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({ project.configurations.getByName('gtnhlibEmbed').collect { zipTree(it) } }) {
from(gtnhlibEmbedContents) {
include 'com/gtnewhorizon/gtnhlib/color/ColorResource.class'
include 'com/gtnewhorizon/gtnhlib/color/ColorResource$*.class'
}
+5
View File
@@ -186,6 +186,11 @@ modrinthRelations = required-project\:codechickencore-unofficial
# Leave this empty if you don't want to publish on CurseForge.
curseForgeProjectId = 358228
# 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],
+10 -10
View File
@@ -1,12 +1,12 @@
#This file is generated by updateDaemonJvm
toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cf726b4a1c84b50457225f9bba6d7650/redirect
toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect
toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cf726b4a1c84b50457225f9bba6d7650/redirect
toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect
toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c2dd35c9d0aaf0ba6ad0791320f99dfc/redirect
toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/e5810bd7fd1f8a586644409d395a7e55/redirect
toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cf726b4a1c84b50457225f9bba6d7650/redirect
toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect
toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/7b3c4877c0749019e6805bb61e421497/redirect
toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/d76df094a9cbbabd3b08251f9e61444a/redirect
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
Binary file not shown.
+3 -1
View File
@@ -1,7 +1,9 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Vendored
+3 -3
View File
@@ -20,7 +20,7 @@
##############################################################################
#
# Gradle start up script for POSIX generated by Gradle.
# gradlew start up script for POSIX generated by Gradle.
#
# Important for running:
#
@@ -29,7 +29,7 @@
# bash, then to run this script, type that shell name before the whole
# command line, like:
#
# ksh Gradle
# ksh gradlew
#
# Busybox and similar reduced shells will NOT work, because this script
# requires all of these POSIX shell features:
@@ -57,7 +57,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/b631911858264c0b6e4d6603d677ff5218766cee/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
Vendored
+12 -23
View File
@@ -19,12 +19,12 @@
@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@rem gradlew startup script for Windows
@rem
@rem ##########################################################################
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal
@rem Set local scope for the variables, and ensure extensions are enabled
setlocal EnableExtensions
set DIRNAME=%~dp0
if "%DIRNAME%"=="" set DIRNAME=.
@@ -51,7 +51,7 @@ 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
goto fail
"%COMSPEC%" /c exit 1
:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
@@ -65,29 +65,18 @@ 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
goto fail
"%COMSPEC%" /c exit 1
:execute
@rem Setup the command line
@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%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
: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
:exitWithErrorLevel
@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts
"%COMSPEC%" /c exit %ERRORLEVEL%
+1 -1
View File
@@ -17,7 +17,7 @@ pluginManagement {
}
plugins {
id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.26'
id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.31'
}
@@ -903,19 +903,21 @@ public class BookmarkPanel extends PanelWidget<BookmarkGrid> {
}
private List<String> recipeChainTooltip(int groupId, List<String> currenttip) {
boolean crafting = this.grid.getGroup(groupId).crafting != null;
boolean crafting = this.grid.isCraftingMode(groupId);
if (this.recipeChainTooltipLineHandler == null || this.recipeChainTooltipLineHandler.groupId != groupId
|| this.recipeChainTooltipLineHandler.crafting != crafting) {
this.recipeChainTooltipLineHandler = new RecipeChainTooltipLineHandler(
groupId,
crafting,
this.grid.createRecipeChainMath(groupId));
final RecipeChainMath recipeChainMath = this.grid.createRecipeChainMath(groupId);
if (recipeChainMath != null) {
this.recipeChainTooltipLineHandler = new RecipeChainTooltipLineHandler(
groupId,
crafting,
recipeChainMath);
}
}
if (this.recipeChainTooltipLineHandler != null) {
currenttip.add(GuiDraw.TOOLTIP_HANDLER + GuiDraw.getTipLineId(this.recipeChainTooltipLineHandler));
}
currenttip.add(GuiDraw.TOOLTIP_HANDLER + GuiDraw.getTipLineId(this.recipeChainTooltipLineHandler));
return currenttip;
}
@@ -1046,15 +1048,9 @@ public class BookmarkPanel extends PanelWidget<BookmarkGrid> {
final BookmarksGridSlot slot = this.grid.getSlotMouseOver(mousex, mousey);
if (slot != null) {
int multiplier = 1;
if (NEIClientUtils.altKey()) {
multiplier = NEIClientConfig.showItemQuantityWidget() ? NEIClientConfig.getItemQuantity() : 0;
if (multiplier == 0) {
multiplier = StackInfo.itemStackToNBT(slot.getItemStack()).hasKey("gtFluidName") ? 144
: slot.getItemStack().getMaxStackSize();
}
}
final long multiplier = NEIClientUtils.altKey()
? NEIClientUtils.getScrollMultiplier(slot.getItemStack())
: 1;
this.grid.shiftItemAmount(slot.itemIndex, multiplier * shift);
return true;
@@ -1096,10 +1092,13 @@ public class BookmarkPanel extends PanelWidget<BookmarkGrid> {
}
activeStack = items.get((items.size() - shift + stackIndex) % items.size());
this.acceptsFollowingTooltipLineHandler.setActiveStack(activeStack);
this.grid.getBookmarkItem(Math.abs(itemIndex)).itemStack = activeStack;
this.grid.onItemsChanged();
final int targetItemIndex = Math.abs(itemIndex);
final BookmarkItem oldItem = this.grid.getBookmarkItem(targetItemIndex);
final BookmarkItem newItem = oldItem.copyWithPerm(activeStack);
this.grid.replaceBookmarkItem(targetItemIndex, newItem);
}
return true;
@@ -48,6 +48,7 @@ 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.GuiRecipeTab;
import codechicken.nei.recipe.StackInfo;
@@ -279,6 +280,7 @@ public class ClientHandler {
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();
@@ -10,6 +10,7 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
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;
@@ -112,7 +113,7 @@ public class CollapsibleItems {
group.setFilter(itemStr);
}
if (group != null && group.filter != null) {
if (group.filter != null) {
addGroup(group);
group = new GroupItem();
}
@@ -227,17 +228,17 @@ public class CollapsibleItems {
if (NEIClientConfig.world.nbt.hasKey(STATE_KEY)) {
NBTTagCompound states = NEIClientConfig.world.nbt.getCompoundTag(STATE_KEY);
@SuppressWarnings("unchecked")
final Map<String, NBTPrimitive> list = (Map<String, NBTPrimitive>) states.tagMap;
final Map<String, 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, NBTPrimitive> nbtEntry : list.entrySet()) {
for (Map.Entry<String, NBTBase> nbtEntry : list.entrySet()) {
if (mapping.containsKey(nbtEntry.getKey())) {
mapping.get(nbtEntry.getKey()).expanded = nbtEntry.getValue().func_150290_f() == 1;
mapping.get(nbtEntry.getKey()).expanded = ((NBTPrimitive) nbtEntry.getValue()).func_150290_f()
== 1;
}
}
}
@@ -17,6 +17,8 @@ public class ColorUtils {
buttonLabelNormal = color.rgb("buttonLabelNormal", "0xE0E0E0"),
buttonLabelHover = color.rgb("buttonLabelHover", "0xFFFFA0"),
buttonLabelDisabled = color.rgb("buttonLabelDisabled", "0x601010"),
buttonLabelInactive = color.rgb("buttonLabelInactive", "0xA0A0A0");
buttonLabelInactive = color.rgb("buttonLabelInactive", "0xA0A0A0"),
craftingTreeLine = color.argb("craftingTreeLine", "0xFF888888");
// spotless:on
}
@@ -79,14 +79,13 @@ public class ContainerCreativeInv extends Container {
@Override
public ItemStack transferStackInSlot(EntityPlayer par1EntityPlayer, int slotIndex) {
ItemStack transferredStack = null;
Slot slot = (Slot) inventorySlots.get(slotIndex);
Slot slot = inventorySlots.get(slotIndex);
if (slot != null && slot.getHasStack()) {
ItemStack stack = slot.getStack();
transferredStack = stack.copy();
if (stack.getItem() instanceof ItemArmor) {
ItemArmor armor = (ItemArmor) stack.getItem();
if (stack.getItem() instanceof ItemArmor armor) {
if (!getSlot(90 + armor.armorType).getHasStack()) {
getSlot(90 + armor.armorType).putStack(transferredStack);
slot.putStack(null);
@@ -8,7 +8,6 @@ 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;
@@ -164,14 +163,14 @@ public class ContainerEnchantmentModifier extends ContainerEnchantment {
public boolean addEnchantment(int e, int level) {
if (e < Enchantment.enchantmentsList.length && Enchantment.enchantmentsList[e] != null) {
((Slot) inventorySlots.get(0)).getStack().addEnchantment(Enchantment.enchantmentsList[e], level);
inventorySlots.get(0).getStack().addEnchantment(Enchantment.enchantmentsList[e], level);
return true;
}
return false;
}
public void removeEnchantment(int e) {
ItemStack stack = ((Slot) inventorySlots.get(0)).getStack();
ItemStack stack = inventorySlots.get(0).getStack();
NBTTagList nbttaglist = stack.getEnchantmentTagList();
if (nbttaglist != null) {
for (int i = 0; i < nbttaglist.tagCount(); i++) {
@@ -20,7 +20,7 @@ public class DefaultHighlightHandler implements IHighlightHandler {
String name = null;
try {
String s = GuiContainerManager.itemDisplayNameShort(stack);
if (s != null && !s.endsWith("Unnamed")) name = s;
if (!s.endsWith("Unnamed")) name = s;
if (name != null) currenttip.add(name);
} catch (Exception ignored) {}
@@ -91,7 +91,7 @@ public class FastTransferManager {
public static void clearSlots(Container container) {
for (int slotNo = 0; slotNo < container.inventorySlots.size(); slotNo++)
((Slot) container.inventorySlots.get(slotNo)).putStack(null);
container.inventorySlots.get(slotNo).putStack(null);
}
public void performMassTransfer(GuiContainer window, int fromSlot, int toSlot, ItemStack heldStack) {
@@ -289,7 +289,7 @@ public class FastTransferManager {
if (held == null) return -1;
for (int i = 0; held != null && i < window.inventorySlots.inventorySlots.size(); i++) {
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)) {
@@ -82,8 +82,8 @@ public class GuiEnchantmentModifier extends GuiContainer {
private void changeLevel(int i) {
container.level += i;
((GuiButton) buttonList.get(0)).enabled = container.level != 1;
((GuiButton) buttonList.get(1)).enabled = container.level != 10;
buttonList.get(0).enabled = container.level != 1;
buttonList.get(1).enabled = container.level != 10;
}
protected void mouseClicked(int i, int j, int k) {
@@ -30,14 +30,7 @@ public class InfiniteStackSizeHandler implements IInfiniteItemHandler {
@Override
public void replenishInfiniteStack(InventoryPlayer inv, int slotNo) {
ItemStack stack = inv.getStackInSlot(slotNo);
stack.stackSize = 111;
for (int i = 0; i < inv.getSizeInventory(); i++) {
if (i == slotNo) continue;
if (NEIServerUtils.areStacksSameType(stack, inv.getStackInSlot(i))) inv.setInventorySlotContents(i, null);
}
inv.getStackInSlot(slotNo).stackSize = 111;
}
@Override
@@ -6,11 +6,14 @@ 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 net.minecraftforge.fluids.FluidContainerRegistry;
import codechicken.lib.vec.Rectangle4i;
import codechicken.nei.ItemsGrid.ItemsGridSlot;
@@ -21,7 +24,6 @@ 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;
@@ -39,7 +41,7 @@ public class ItemCraftablesPanel
public CraftablesGridSlot(int slotIndex, int itemIndex, ItemStack itemStack, RecipeId recipeId) {
super(slotIndex, itemIndex, itemStack);
this.realAmount = StackInfo.getAmount(itemStack);
this.isFluidDisplay = StackInfo.itemStackToNBT(itemStack).hasKey("gtFluidName");
this.isFluidDisplay = StackInfo.isFluidDisplayItem(itemStack);
this.recipeId = recipeId;
}
@@ -82,6 +84,42 @@ public class ItemCraftablesPanel
}
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;
@@ -93,6 +131,16 @@ public class ItemCraftablesPanel
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() {
pendingResult.set(generateCraftables(ItemCraftablesPanel.this.pendingSnapshot));
}
};
public ItemCraftablesPanel() {
this.grid = new ItemsGrid<>() {
@@ -114,12 +162,7 @@ public class ItemCraftablesPanel
if (!ItemCraftablesPanel.this.availableRecipes.isEmpty()) {
final List<Map.Entry<ItemStack, RecipeId>> entries = ItemCraftablesPanel.this.availableRecipes
.entrySet().stream()
.sorted(
Map.Entry.comparingByKey(
Comparator.comparing(FavoriteRecipes::containsManual)
.thenComparing(FavoriteRecipes::contains).reversed()
.thenComparing(ItemSorter.instance)))
.entrySet().stream().sorted(Map.Entry.comparingByKey(ITEM_SORT_COMPARATOR))
.limit(maxSlotIndex).collect(Collectors.toList());
int slotIndex = 0;
int itemIndex = 0;
@@ -195,10 +238,20 @@ public class ItemCraftablesPanel
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()) {
@@ -219,8 +272,14 @@ public class ItemCraftablesPanel
this.lastPlayerInventory = inv;
this.lastGuiContainer = firstGui;
this.lastFavoritesCount = FavoriteRecipes.size();
this.availableRecipes = generateCraftables(firstGui);
this.grid.onGridChanged();
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 {
@@ -241,20 +300,31 @@ public class ItemCraftablesPanel
private GuiContainer getGuiContainer() {
final GuiContainer firstGui = NEIClientUtils.getGuiContainer();
return (firstGui instanceof GuiRecipe gui) ? gui.firstGui : firstGui;
return (firstGui instanceof GuiRecipe<?>gui) ? gui.firstGui : firstGui;
}
private Map<ItemStack, RecipeId> generateCraftables(GuiContainer firstGui) {
final List<IRecipeHandler> availableHandlers = getAvailableHandlers(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 List<ItemStack> invStacks = ItemCraftablesPanel.this.lastPlayerInventory.values();
final Map<Item, List<ItemStack>> invByItem = indexInventoryByItem(snapshot.inventory.values());
for (IRecipeHandler handler : availableHandlers) {
availableRecipes.putAll(filterHandlerRecipes(handler, firstGui, invStacks));
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;
@@ -270,19 +340,126 @@ public class ItemCraftablesPanel
return availableHandlers;
}
private Map<ItemStack, RecipeId> filterHandlerRecipes(IRecipeHandler handler, GuiContainer firstGui,
List<ItemStack> invStacks) {
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 resultStack = handler.getResultStack(recipeIndex);
if (resultStack != null) {
return resultStack.item;
}
final List<PositionedStack> otherStacks = handler.getOtherStacks(recipeIndex);
for (PositionedStack otherStack : otherStacks) {
if (!FluidContainerRegistry.isContainer(otherStack.items[0])
|| StackInfo.getFluid(otherStack.items[0]) != null) {
return otherStack.item;
}
}
return otherStacks.isEmpty() ? null : otherStacks.get(0).item;
}
private static ItemStack getCheapResult(IRecipeHandler handler, int recipeIndex) {
final PositionedStack resultStack = handler.getResultStack(recipeIndex);
final List<PositionedStack> results = resultStack != null ? Collections.singletonList(resultStack)
: handler.getOtherStacks(recipeIndex);
if (results.isEmpty()) {
return null;
}
ItemStack stack = null;
if (results.size() > 1) {
for (PositionedStack result : results) {
if (!FluidContainerRegistry.isContainer(result.item) || StackInfo.getFluid(result.item) != null) {
stack = result.item;
break;
}
}
}
if (stack == null) {
stack = results.get(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<>();
final boolean showOnlyFavorites = NEIClientConfig.getBooleanSetting("inventory.craftables.favoritesOnly");
IntStream.range(0, handler.numRecipes()).parallel().forEach(recipeIndex -> {
if (existsIngredients(firstGui, handler.getIngredientStacks(recipeIndex), invStacks)) {
final Recipe recipe = Recipe.of(handler, recipeIndex);
final List<PositionedStack> ingredientStacks = handler.getIngredientStacks(recipeIndex);
if (!recipe.getResults().isEmpty()
&& (!showOnlyFavorites || FavoriteRecipes.getFavorite(recipe.getRecipeId()) != null)) {
synchronized (availableRecipes) {
availableRecipes.put(recipe.getResult(), recipe.getRecipeId());
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);
}
}
}
}
@@ -291,14 +468,27 @@ public class ItemCraftablesPanel
return availableRecipes;
}
private boolean existsIngredients(GuiContainer firstGui, List<PositionedStack> ingredients,
List<ItemStack> invStacks) {
private boolean existsIngredients(List<PositionedStack> ingredients, Map<Item, List<ItemStack>> invByItem) {
final Map<ItemStack, Integer> usedItems = new HashMap<>();
for (PositionedStack pStack : ingredients) {
final ItemStack used = invStacks.stream().filter(
is -> usedItems.getOrDefault(is, is.stackSize) >= pStack.item.stackSize && pStack.contains(is))
.findAny().orElse(null);
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);
@@ -1,17 +1,34 @@
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) {
@@ -115,4 +132,107 @@ public class ItemHistoryPanel extends AbstractSubpanel<ItemsGrid<ItemHistoryPane
}
}
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);
}
}
}
@@ -150,8 +150,7 @@ public class ItemListLoader {
if (item == null) {
return;
}
if (item instanceof IFluidContainerItem) {
IFluidContainerItem fluidItem = (IFluidContainerItem) item;
if (item instanceof IFluidContainerItem fluidItem) {
runChecked(stack, () -> fluidItem.getFluid(stack), "getFluid");
}
runChecked(stack, () -> item.isDamaged(stack), "isDamaged");
@@ -294,6 +293,7 @@ public class ItemListLoader {
updateFilter.restart();
warmTooltips.restart();
loadBookmarks.restart();
loadHistory.restart();
}
};
@@ -320,6 +320,14 @@ public class ItemListLoader {
}
};
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
@@ -341,6 +349,7 @@ public class ItemListLoader {
SubsetWidget.updateHiddenItems();
updateFilter.restart();
loadBookmarks.restart();
loadHistory.restart();
}
};
@@ -100,7 +100,7 @@ public class ItemMobSpawner extends ItemBlock {
return true;
}
return placed;
return false;
}
private String getMobTypeFromItemStack(ItemStack stack) {
@@ -238,7 +238,6 @@ public class ItemMobSpawner extends ItemBlock {
NEIClientConfig.logger.debug("Cleared all entity references from cache");
}
@SuppressWarnings("unchecked")
public static void loadSpawners() {
if (loaded) {
return;
@@ -246,8 +245,7 @@ public class ItemMobSpawner extends ItemBlock {
synchronized (ItemMobSpawner.class) {
try {
for (Map.Entry<Class<? extends Entity>, String> entry : ((Map<Class<? extends Entity>, String>) EntityList.classToStringMapping)
.entrySet()) {
for (Map.Entry<Class<? extends Entity>, String> entry : EntityList.classToStringMapping.entrySet()) {
Class<? extends Entity> clazz = entry.getKey();
String name = entry.getValue();
@@ -323,7 +321,7 @@ public class ItemMobSpawner extends ItemBlock {
String name = ENTITY_CLASS_TO_NAME_CACHE.get(entityClass);
if (name == null) {
name = (String) EntityList.classToStringMapping.get(entityClass);
name = EntityList.classToStringMapping.get(entityClass);
}
return name != null && shouldRegisterEntity(entityClass, name);
@@ -83,11 +83,7 @@ public class ItemQuantityField extends TextField {
}
if (amount == 0) {
amount = NEIClientConfig.showItemQuantityWidget() ? NEIClientConfig.getItemQuantity() : 0;
if (amount == 0) {
amount = StackInfo.itemStackToNBT(stack).hasKey("gtFluidName") ? 144 : stack.getMaxStackSize();
}
amount = NEIClientUtils.getScrollMultiplier(stack);
}
return StackInfo.withAmount(stack, amount);
@@ -46,8 +46,7 @@ public class ItemStackMap<T> {
}
public boolean equals(Object o) {
if (!(o instanceof StackMetaKey)) return false;
StackMetaKey t = (StackMetaKey) o;
if (!(o instanceof StackMetaKey t)) return false;
return damage == t.damage && Objects.equal(tag, t.tag);
}
}
@@ -218,8 +217,7 @@ public class ItemStackMap<T> {
public void put(ItemStack key, T value) {
if (key == null || key.getItem() == null) return;
DetailMap map = itemMap.get(key.getItem());
if (map == null) itemMap.put(key.getItem(), map = new DetailMap());
DetailMap map = itemMap.computeIfAbsent(key.getItem(), k -> new DetailMap());
map.put(key, value);
}
+21 -8
View File
@@ -19,6 +19,7 @@ import org.lwjgl.opengl.GL30;
import codechicken.lib.vec.Rectangle4i;
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;
@@ -348,16 +349,24 @@ public abstract class ItemsGrid<T extends ItemsGrid.ItemsGridSlot, M extends Ite
}
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 = Math.max(0, w);
height = Math.max(0, h);
width = newWidth;
height = newHeight;
columns = width / SLOT_SIZE;
rows = height / SLOT_SIZE;
paddingLeft = (width % SLOT_SIZE) / 2;
if (changed) {
onGridChanged();
}
}
public void shiftPage(int shift) {
@@ -396,7 +405,10 @@ public abstract class ItemsGrid<T extends ItemsGrid.ItemsGridSlot, M extends Ite
}
public void refresh(GuiContainer gui) {
updateGuiOverlapSlots(gui);
final int gridRenderingCacheMode = getGridRenderingCacheMode();
if (gridRenderingCacheMode <= 0 || screenCapture == null || screenCapture.needRefresh(gridRenderingCacheMode)) {
updateGuiOverlapSlots(gui);
}
shiftPage(0);
}
@@ -409,11 +421,12 @@ public abstract class ItemsGrid<T extends ItemsGrid.ItemsGridSlot, M extends Ite
perPage = columns * rows;
if (gui != null) {
final INEIGuiHandler[] handlers = GuiInfo.getGuiHandlersSnapshot();
if (NEIClientConfig.optimizeGuiOverlapComputation()) {
checkGuiOverlap(gui, 0, columns - 2, 1);
checkGuiOverlap(gui, columns - 1, 1, -1);
checkGuiOverlap(gui, handlers, 0, columns - 2, 1);
checkGuiOverlap(gui, handlers, columns - 1, 1, -1);
} else {
checkGuiOverlap(gui, 0, columns, 1);
checkGuiOverlap(gui, handlers, 0, columns, 1);
}
}
@@ -422,7 +435,7 @@ public abstract class ItemsGrid<T extends ItemsGrid.ItemsGridSlot, M extends Ite
}
}
private void checkGuiOverlap(GuiContainer gui, int start, int end, int dir) {
private void checkGuiOverlap(GuiContainer gui, INEIGuiHandler[] handlers, int start, int end, int dir) {
boolean validColumn = false;
for (int c = start; c != end && (!NEIClientConfig.optimizeGuiOverlapComputation() || !validColumn); c += dir) {
@@ -432,7 +445,7 @@ public abstract class ItemsGrid<T extends ItemsGrid.ItemsGridSlot, M extends Ite
final int idx = columns * r + c;
if (idx >= 0 && idx < invalidSlotMap.length
&& !invalidSlotMap[idx]
&& GuiInfo.hideItemPanelSlot(gui, getSlotRect(r, c))) {
&& GuiInfo.hideItemPanelSlot(gui, getSlotRect(r, c), handlers)) {
invalidSlotMap[idx] = true;
validColumn = false;
perPage--;
@@ -0,0 +1,125 @@
package codechicken.nei;
import static codechicken.lib.gui.GuiDraw.fontRenderer;
import java.util.ArrayList;
import java.util.List;
import net.minecraft.client.renderer.RenderHelper;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
import codechicken.lib.gui.GuiDraw;
import codechicken.nei.guihook.GuiContainerManager;
public class ItemsListTooltipLineHandler extends ItemsTooltipLineHandler {
protected static final int NAME_MARGIN = 2;
protected final List<String> names = new ArrayList<>();
protected int tailCount = 0;
public ItemsListTooltipLineHandler(String label, List<ItemStack> items, int maxRows) {
super(label, items, true, maxRows);
this.rows = Math.min(maxRows, this.length);
this.count = this.length > this.rows ? this.rows - 1 : this.length;
int width = fontRenderer.getStringWidth(this.label) + 15;
for (int index = 0; index < this.count; index++) {
final String name = this.items.get(index).getDisplayName();
this.names.add(name);
width = Math.max(width, SLOT_SIZE + NAME_MARGIN + fontRenderer.getStringWidth(name));
}
if (this.count < this.length) {
final int tail = this.length - this.count;
width = Math.max(width, Math.min(tail, MAX_COLUMNS) * SLOT_SIZE);
final int fit = width / SLOT_SIZE;
if (tail <= fit) {
this.tailCount = tail;
} else {
final String text = "+" + (tail - fit);
this.tailCount = Math
.max(0, fit - (int) Math.ceil((float) (fontRenderer.getStringWidth(text) - 2) / SLOT_SIZE));
}
}
this.size.width = this.length > 0 ? width : 0;
this.size.height = this.length > 0 ? this.rows * SLOT_SIZE + fontRenderer.FONT_HEIGHT + 2 + MARGIN_TOP : 0;
}
@Override
public void setLabel(String label) {
this.label = label;
this.size.width = Math.max(this.size.width, fontRenderer.getStringWidth(this.label) + 15);
}
@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);
for (int index = 0; index < this.count; index++) {
drawSlot(0, index * SLOT_SIZE, index);
}
for (int index = 0; index < this.tailCount; index++) {
drawSlot(index * SLOT_SIZE, this.count * SLOT_SIZE, this.count + index);
}
NEIClientUtils.gl2DRenderContext(() -> {
final int textShift = ICON_OFFSET + Math.round((ICON_SIZE - fontRenderer.FONT_HEIGHT) / 2f);
for (int index = 0; index < this.count; index++) {
fontRenderer.drawStringWithShadow(
EnumChatFormatting.GRAY + this.names.get(index),
SLOT_SIZE + NAME_MARGIN,
index * SLOT_SIZE + textShift,
0xFFFFFF);
}
final int hidden = this.length - this.count - this.tailCount;
if (hidden > 0) {
final String text = "+" + hidden;
fontRenderer.drawStringWithShadow(
EnumChatFormatting.GRAY + text,
this.size.width - fontRenderer.getStringWidth(text) - 2,
this.count * SLOT_SIZE + textShift,
0xFFFFFF);
}
});
GL11.glTranslatef(-xTranslation, -yTranslation, -zTranslation);
GL11.glPopAttrib();
}
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);
}
}
@@ -4,6 +4,7 @@ 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;
@@ -17,22 +18,151 @@ 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 FLUID_STACK_SIZE = 144;
protected final List<ItemStack> items;
protected final List<Long> amounts = new ArrayList<>();
protected AmountRenderer amountRenderer;
protected String label;
protected EnumChatFormatting labelColor = EnumChatFormatting.GRAY;
protected List<ItemStack> items;
protected int activeStackIndex = -1;
protected Dimension size = new Dimension();
protected boolean saveStackSize = false;
protected int columns = 0;
protected int count = 0;
protected int rows = 0;
@@ -45,7 +175,7 @@ public class ItemsTooltipLineHandler implements ITooltipLineHandler {
public ItemsTooltipLineHandler(String label, List<ItemStack> items, boolean saveStackSize, int maxRows) {
this.label = label;
this.items = groupingItemStacks(items);
this.saveStackSize = saveStackSize;
this.amountRenderer = saveStackSize ? new TotalAmountRenderer() : new NoAmountRenderer();
this.length = this.items.size();
if (this.length > 0) {
@@ -69,6 +199,11 @@ public class ItemsTooltipLineHandler implements ITooltipLineHandler {
}
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);
@@ -79,6 +214,10 @@ public class ItemsTooltipLineHandler implements ITooltipLineHandler {
return this.activeStackIndex == -1 ? null : this.items.get(this.activeStackIndex);
}
public List<ItemStack> getItems() {
return this.items;
}
public boolean isEmpty() {
return this.items.isEmpty();
}
@@ -92,6 +231,11 @@ public class ItemsTooltipLineHandler implements ITooltipLineHandler {
this.labelColor = color;
}
public void setLabel(String label) {
this.label = label;
this.size.width = Math.max(this.columns * SLOT_SIZE, fontRenderer.getStringWidth(this.label) + 15);
}
@Override
public void draw(int x, int y) {
if (this.length == 0) return;
@@ -117,19 +261,15 @@ public class ItemsTooltipLineHandler implements ITooltipLineHandler {
}
for (int index = 0; index < this.count && index + indexShift < this.items.size(); index++) {
ItemStack drawStack = this.items.get(index + indexShift);
int col = index % this.columns;
int row = index / this.columns;
String stackSize = !this.saveStackSize || drawStack.stackSize == 0 ? ""
: ReadableNumberConverter.INSTANCE.toWideReadableForm(drawStack.stackSize);
if (this.activeStackIndex == index + indexShift) {
NEIClientUtils.gl2DRenderContext(
() -> GuiDraw.drawRect(col * SLOT_SIZE - 1, row * SLOT_SIZE - 1, 18, 18, 0x66555555));
() -> GuiDraw.drawRect(col * SLOT_SIZE, row * SLOT_SIZE, SLOT_SIZE, SLOT_SIZE, 0x66555555));
}
drawItem(col * SLOT_SIZE, row * SLOT_SIZE, drawStack, stackSize);
drawStackWithAmount(col * SLOT_SIZE, row * SLOT_SIZE, index + indexShift);
}
if (this.count < this.items.size()) {
@@ -148,24 +288,23 @@ public class ItemsTooltipLineHandler implements ITooltipLineHandler {
GL11.glPopAttrib();
}
protected void drawItem(int x, int y, ItemStack drawStack, String stackSize) {
GuiContainerManager.drawItem(x, y, drawStack, true, stackSize);
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()) {
final ItemStack stack = StackInfo.loadFromNBT(entry.getKey(), Math.max(0, entry.getValue()));
if (entry.getKey().hasKey("gtFluidName")) {
stack.stackSize = 0;
}
result.add(stack);
result.add(StackInfo.loadFromNBT(entry.getKey(), 0));
this.amounts.add(Math.max(0, entry.getValue()));
}
if (result.isEmpty()) {
result.addAll(items);
for (ItemStack stack : items) {
result.add(stack);
this.amounts.add(0L);
}
}
return result;
@@ -43,6 +43,7 @@ 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;
@@ -118,11 +119,6 @@ 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());
@@ -907,30 +903,35 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH
GL11.glEnable(GL11.GL_TEXTURE_2D);
changeTexture("textures/gui/widgets.png");
drawTexturedModalRect(x, y, tx1, ty1, w1, h1); // top left
drawTexturedModalRect(x, y2, tx1, ty2, w1, h2); // bottom left
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
for (int tile = 0; tile < wTiles; tile++) {
final int tileX = x + w1 + 50 * tile;
drawTexturedModalRect(tileX, y, tx3, ty1, 50, h1); // top
drawTexturedModalRect(tileX, y2, tx3, ty2, 50, h2); // bottom
addTexturedModalRect(tessellator, tileX, y, tx3, ty1, 50, h1); // top
addTexturedModalRect(tessellator, tileX, y2, tx3, ty2, 50, h2); // bottom
}
drawTexturedModalRect(x2, y, tx2, ty1, w2, h1); // top right
drawTexturedModalRect(x2, y2, tx2, ty2, w2, h2); // bottom right
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);
}
public static void drawItemPresenceOverlay(int slotX, int slotY, boolean isPresent, boolean slotHighlight) {
if (slotHighlight) {
NEIClientUtils.gl2DRenderContext(() -> drawRect(slotX, slotY, 16, 16, isPresent ? 0x8000AA00 : 0x80AA0000));
} else {
Image icon = itemPresenceOverlays[isPresent ? 1 : 0];
drawIcon(slotX + 16 - icon.width, slotY + 16 - icon.height, icon);
}
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 LayoutManager instance() {
@@ -8,7 +8,6 @@ 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 {
@@ -38,10 +37,6 @@ public class LayoutStyleMinecraft extends LayoutStyle {
LayoutManager.timeButtons[2].icon = new Image(144, 24, 12, 12);
LayoutManager.timeButtons[3].icon = new Image(156, 24, 12, 12);
LayoutManager.heal.icon = new Image(168, 24, 12, 12);
LayoutManager.itemPresenceOverlays[0] = new DrawableBuilder("nei:textures/nei_tabbed_sprites.png", 0, 40, 8, 8)
.build();
LayoutManager.itemPresenceOverlays[1] = new DrawableBuilder("nei:textures/nei_tabbed_sprites.png", 8, 40, 8, 8)
.build();
}
@Override
@@ -288,6 +288,32 @@ public class NEIClientConfig {
tag.getTag("inventory.history.useRows").setComment("Rows used in historical areas").getIntValue(2);
API.addOption(new OptionIntegerField("inventory.history.useRows", 1, 5));
tag.getTag("inventory.history.worldSpecific").setComment("Global or world specific history")
.getBooleanValue(false);
API.addOption(new OptionToggleButton("inventory.history.worldSpecific", true) {
@Override
public boolean onClick(int button) {
super.onClick(button);
ItemPanels.itemPanel.historyPanel.save();
ItemPanels.itemPanel.historyPanel.load();
return true;
}
});
tag.getTag("inventory.history.save").setComment("Enable/disable History save").getBooleanValue(false);
API.addOption(new OptionToggleButton("inventory.history.save", true) {
@Override
public boolean onClick(int button) {
super.onClick(button);
ItemPanels.itemPanel.historyPanel.save();
ItemPanels.itemPanel.historyPanel.load();
return true;
}
});
tag.getTag("inventory.craftables.enabled").setComment("Enable/disable Craftables Panel").getBooleanValue(false);
API.addOption(new OptionToggleButton("inventory.craftables.enabled", true));
@@ -361,6 +387,13 @@ public class NEIClientConfig {
setFavoriteDefaults(tag);
tag.getTag("inventory.tooltip.showFluidTemperature").setComment("Enabled show Fluid Temperature")
.getBooleanValue(true);
API.addOption(new OptionToggleButton("inventory.tooltip.showFluidTemperature", true));
tag.getTag("inventory.tooltip.showFluidState").setComment("Enabled show Fluid State").getBooleanValue(true);
API.addOption(new OptionToggleButton("inventory.tooltip.showFluidState", true));
tag.getTag("inventory.itemIDs").getIntValue(1);
API.addOption(new OptionCycled("inventory.itemIDs", 3, true));
@@ -840,6 +873,7 @@ public class NEIClientConfig {
API.addKeyBind("bookmark.remove_recipe", Keyboard.KEY_A);
API.addKeyBind("bookmark.pull_items", Keyboard.KEY_V);
API.addKeyBind("bookmark.chat_link", Keyboard.KEY_L);
API.addKeyBind("bookmark.open_crafting_tree", Keyboard.KEY_T);
API.addKeyBind("bookmark.hide", Keyboard.KEY_B);
API.addKeyBind("itemzoom.toggle", Keyboard.KEY_Z);
@@ -882,9 +916,14 @@ public class NEIClientConfig {
world = new ConfigSet(new File(specificDir, "NEI.dat"), new ConfigFile(new File(specificDir, "NEI.cfg")));
if (newWorld && Minecraft.getMinecraft().isSingleplayer()) {
world.config.getTag("inventory.cheatmode")
.setIntValue(NEIClientUtils.mc().playerController.isInCreativeMode() ? 2 : 0);
if (newWorld && Minecraft.getMinecraft().isSingleplayer() && getLockedMode() == -1) {
final int globalMode = global.config.getTag("inventory.cheatmode").getIntValue();
final int worldMode = Math
.min(globalMode, NEIClientUtils.mc().playerController.isInCreativeMode() ? 2 : 0);
if (worldMode != globalMode) {
world.config.getTag("inventory.cheatmode").setIntValue(worldMode);
}
}
bootNEI();
@@ -921,9 +960,8 @@ public class NEIClientConfig {
return;
}
if (ItemPanels.bookmarkPanel != null) {
ItemPanels.bookmarkPanel.save();
}
ItemPanels.bookmarkPanel.save();
ItemPanels.itemPanel.historyPanel.save();
SubsetWidget.saveHidden();
FavoriteRecipes.save();
@@ -20,6 +20,7 @@ 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;
@@ -41,6 +42,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
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;
@@ -56,6 +58,8 @@ 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 {
@@ -293,6 +297,83 @@ 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);
}
@@ -483,6 +564,16 @@ public class NEIClientUtils extends NEIServerUtils {
}
}
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);
@@ -525,6 +616,7 @@ public class NEIClientUtils extends NEIServerUtils {
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);
});
}
@@ -4,13 +4,13 @@ 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;
@@ -27,7 +27,7 @@ import codechicken.nei.commands.CommandUntranslator;
import codechicken.nei.guihook.GuiContainerManager;
import codechicken.nei.guihook.IContainerInputHandler;
import codechicken.nei.guihook.IContainerSlotClickHandler;
import codechicken.nei.recipe.GuiRecipe;
import codechicken.nei.util.EmptyContainer;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -77,29 +77,38 @@ public class NEIController implements IContainerSlotClickHandler, IContainerInpu
public static void updateUnlimitedItems(InventoryPlayer inventory) {
if (!NEIClientConfig.canPerformAction("item") || !NEIClientConfig.hasSMPCounterPart()) return;
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++) {
int size = inventory.getSizeInventory();
for (int i = 0; i < size; i++) {
ItemStack stack = inventory.getStackInSlot(i);
if (stack == null) continue;
for (IInfiniteItemHandler handler : ItemInfo.infiniteHandlers)
if (handler.canHandleItem(stack) && handler.isItemInfinite(stack))
handler.replenishInfiniteStack(inventory, i);
}
for (IInfiniteItemHandler handler : ItemInfo.infiniteHandlers) {
if (!handler.canHandleItem(stack) || !handler.isItemInfinite(stack)) continue;
for (int i = 0; i < inventory.getSizeInventory(); i++) {
ItemStack newstack = inventory.getStackInSlot(i);
long beforeSize = packStackSize(stack.stackSize, stack.getItemDamage());
handler.replenishInfiniteStack(inventory, i);
if (!NEIServerUtils.areStacksIdentical(beforeStacks.get(i), newstack)) {
inventory.setInventorySlotContents(i, beforeStacks.get(i)); // restore in case of SMP fail
NEIClientUtils.setSlotContents(i, newstack, false); // sends via SMP handler ;)
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
}
}
}
}
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) {
@@ -160,7 +169,7 @@ public class NEIController implements IContainerSlotClickHandler, IContainerInpu
if (GuiInfo.hasCustomSlots(gui)) return false;
if (NEIClientUtils.shiftKey()) {
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();
@@ -252,7 +261,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 instanceof GuiRecipe) return false;
if (gui.inventorySlots instanceof EmptyContainer) return false;
Point mousePos = getMousePosition();
Slot mouseover = manager.window.getSlotAtPosition(mousePos.x, mousePos.y);
@@ -102,6 +102,7 @@ public class NEIModContainer extends DummyModContainer {
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();
}
@@ -1,14 +1,10 @@
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;
/**
@@ -18,35 +14,37 @@ public class NEIPotionGuiHandler extends INEIGuiAdapter {
@Override
public boolean hideItemPanelSlot(GuiContainer guiContainer, int slotX, int slotY, int slotW, int slotH) {
if (NEIClientConfig.ignorePotionOverlap()) {
if (!(guiContainer instanceof InventoryEffectRenderer)) {
return false;
}
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;
}
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;
}
return false;
}
@@ -34,8 +34,8 @@ 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;
@@ -46,6 +46,7 @@ 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;
@@ -76,7 +77,7 @@ public class NEIServerUtils {
public static void toggleRaining(World world, boolean notify) {
boolean raining = !world.isRaining();
if (!raining) // turn off
((WorldServer) world).provider.resetRainAndThunder();
world.provider.resetRainAndThunder();
else world.getWorldInfo().setRaining(!isRaining(world));
if (notify)
@@ -262,9 +263,6 @@ public class NEIServerUtils {
/**
* GT Items don't have any NBT set for the recipe, so if either of the stacks has a NULL nbt, and the other doesn't,
* pretend they stack
*
* @param ItemStack stack
* @return
*/
public static boolean isItemTool(ItemStack stack) {
return GTMetaBaseItemHolder.gtMetaBaseItem != null
@@ -446,17 +444,53 @@ 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]);
throw new ClassCastException(obj + " not an ItemStack, ItemStack[] or List<ItemStack?");
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");
}
public static List<Integer> getRange(final int start, final int end) {
return new AbstractList<Integer>() {
return new AbstractList<>() {
@Override
public Integer get(int index) {
@@ -6,13 +6,22 @@ import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.IIcon;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.oredict.OreDictionary;
import org.lwjgl.opengl.GL11;
import codechicken.nei.api.ItemFilter;
import codechicken.nei.api.ItemInfo;
import codechicken.nei.guihook.GuiContainerManager;
import codechicken.nei.recipe.Badge;
import codechicken.nei.recipe.GuiRecipe;
import codechicken.nei.recipe.StackInfo;
@@ -20,19 +29,25 @@ import codechicken.nei.recipe.StackInfo;
/**
* Simply an {@link ItemStack} with position. Mainly used in the recipe handlers.
*/
public class PositionedStack {
public class PositionedStack implements Cloneable {
/** Maximum chance value representing 100% probability (1 unit = 0.01%). */
public static final int CHANCE_FULL = 10_000;
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;
private boolean permutated = false;
protected boolean permutated = false;
protected String acceptsLabel;
protected List<String> tooltip;
protected List<Badge> badges;
public PositionedStack(Object object, int x, int y, boolean genPerms) {
items = NEIServerUtils.extractRecipeItems(object);
@@ -87,8 +102,28 @@ public class PositionedStack {
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 null;
return this.badges;
}
public void setTooltip(List<String> tooltip) {
this.tooltip = tooltip;
}
public List<String> getTooltip() {
return this.tooltip;
}
public int getChance() {
@@ -100,14 +135,22 @@ public class PositionedStack {
}
public PositionedStack copy() {
PositionedStack pStack = new PositionedStack(
Arrays.stream(this.items).map(ItemStack::copy).toArray(ItemStack[]::new),
relx,
rely,
false);
pStack.permutated = this.permutated;
pStack.chance = this.chance;
return pStack;
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.tooltip = this.tooltip == null ? null : new ArrayList<>(this.tooltip);
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() {
@@ -164,7 +207,9 @@ public class PositionedStack {
}
public boolean contains(int mx, int my) {
return mx >= this.relx - 1 && mx < this.relx + 17 && my >= this.rely - 1 && my < this.rely + 17;
return mx >= this.relx - 1 && mx < this.relx + this.width + 1
&& my >= this.rely - 1
&& my < this.rely + this.height + 1;
}
public boolean contains(ItemStack ingredient) {
@@ -192,4 +237,138 @@ public class PositionedStack {
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 Fluid extends PositionedStack {
/** The tank size the fill level is measured against, in mB. 0 means "always render full". */
public int capacity = 0;
private ItemStack cachedFluidItem;
private FluidStack cachedFluidStack;
public Fluid(Object object, int x, int y, boolean genPerms) {
super(object, x, y, genPerms);
}
public Fluid(Object object, int x, int y) {
this(object, x, y, true);
}
public Fluid(Object object, int x, int y, int width, int height, int capacity) {
super(object, x, y, false);
this.width = width;
this.height = height;
this.capacity = capacity;
}
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) {
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;
}
final int tankCapacity = this.capacity > 0 ? this.capacity : fluidStack.amount;
int fillHeight = tankCapacity > 0
? (int) ((long) this.height * Math.min(fluidStack.amount, tankCapacity) / tankCapacity)
: 0;
if (fluidStack.amount > 0 && fillHeight <= 0) {
fillHeight = 1;
}
if (fillHeight > 0) {
drawFluid(this.relx, this.rely, this.width, this.height, fillHeight, fluidStack);
}
}
private static void drawFluid(int x, int y, int width, int height, int fillHeight, FluidStack fluidStack) {
final IIcon icon = fluidStack.getFluid().getIcon(fluidStack);
if (icon == null) {
return;
}
final int color = fluidStack.getFluid().getColor(fluidStack);
final float red = (color >> 16 & 0xFF) / 255F;
final float green = (color >> 8 & 0xFF) / 255F;
final float blue = (color & 0xFF) / 255F;
Minecraft.getMinecraft().getTextureManager().bindTexture(TextureMap.locationBlocksTexture);
GL11.glColor4f(red, green, blue, 1F);
GL11.glEnable(GL11.GL_BLEND);
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
GL11.glDisable(GL11.GL_LIGHTING);
final Tessellator tessellator = Tessellator.instance;
tessellator.startDrawingQuads();
for (int tx = 0; tx < width; tx += 16) {
final int tileWidth = Math.min(16, width - tx);
final double u2 = icon.getMinU() + (icon.getMaxU() - icon.getMinU()) * tileWidth / 16D;
for (int ty = 0; ty < fillHeight; ty += 16) {
final int tileHeight = Math.min(16, fillHeight - ty);
final double v2 = icon.getMinV() + (icon.getMaxV() - icon.getMinV()) * tileHeight / 16D;
final int bottomY = y + height - ty;
final int topY = bottomY - tileHeight;
tessellator.addVertexWithUV(x + tx, bottomY, 0, icon.getMinU(), v2);
tessellator.addVertexWithUV(x + tx + tileWidth, bottomY, 0, u2, v2);
tessellator.addVertexWithUV(x + tx + tileWidth, topY, 0, u2, icon.getMinV());
tessellator.addVertexWithUV(x + tx, topY, 0, icon.getMinU(), icon.getMinV());
}
}
tessellator.draw();
GL11.glDisable(GL11.GL_BLEND);
GL11.glEnable(GL11.GL_LIGHTING);
GL11.glColor4f(1F, 1F, 1F, 1F);
}
}
}
@@ -163,9 +163,7 @@ public class PresetsList {
public static void load() {
final File presetsFile = new File(CommonUtils.getMinecraftDir(), "saves/NEI/global/presets.ini");
if (presetsFile == null || !presetsFile.exists()) {
return;
}
if (!presetsFile.exists()) return;
List<String> itemStrings;
try (FileInputStream reader = new FileInputStream(presetsFile)) {
@@ -15,7 +15,6 @@ import net.minecraftforge.fluids.FluidStack;
import codechicken.lib.gui.GuiDraw;
import codechicken.nei.ItemList.NothingItemFilter;
import codechicken.nei.SearchTokenParser.ISearchParserProvider;
import codechicken.nei.SearchTokenParser.SearchMode;
import codechicken.nei.api.IRecipeFilter;
import codechicken.nei.api.IRecipeFilter.IRecipeFilterProvider;
import codechicken.nei.api.ItemFilter;
@@ -85,8 +84,8 @@ public class SearchField extends TextField implements ItemFilterProvider {
}
@Override
public SearchMode getSearchMode() {
return SearchMode.fromInt(NEIClientConfig.getIntSetting("inventory.search." + this.name + "SearchMode"));
public String getName() {
return this.name;
}
}
@@ -59,7 +59,13 @@ public class SearchTokenParser {
public EnumChatFormatting getHighlightedColor();
public SearchMode getSearchMode();
default SearchMode getSearchMode() {
return SearchMode.fromInt(NEIClientConfig.getIntSetting("inventory.search." + getName() + "SearchMode"));
}
default String getName() {
return String.valueOf(getPrefix());
}
}
private static class ProvidersCache {
@@ -179,7 +185,7 @@ public class SearchTokenParser {
public synchronized ItemFilter getFilter(String rawText, boolean skipRecipeTokens) {
final String filterText = EnumChatFormatting.getTextWithoutFormattingCodes(rawText).toLowerCase();
if (filterText == null || filterText.isEmpty()) {
if (filterText.isEmpty()) {
return new EverythingItemFilter();
}
@@ -253,7 +259,7 @@ public class SearchTokenParser {
public synchronized IRecipeFilter getRecipeFilter(String filterText) {
filterText = EnumChatFormatting.getTextWithoutFormattingCodes(filterText).toLowerCase();
if (filterText == null || filterText.isEmpty()) {
if (filterText.isEmpty()) {
return new RecipeFilter(FilterContext.ANY, true, new EverythingItemFilter());
}
@@ -10,6 +10,7 @@ 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;
@@ -18,6 +19,7 @@ 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 {
@@ -31,6 +33,14 @@ 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
@@ -46,8 +56,7 @@ public class ServerHandler {
@SubscribeEvent
public void tickEvent(TickEvent.PlayerTickEvent event) {
if (event.phase == Phase.START && event.player instanceof EntityPlayerMP) {
EntityPlayerMP player = (EntityPlayerMP) event.player;
if (event.phase == Phase.START && event.player instanceof EntityPlayerMP player) {
PlayerSave save = NEIServerConfig.forPlayer(player.getCommandSenderName());
if (save == null) return;
updateMagneticPlayer(player, save);
@@ -399,8 +399,8 @@ public class SubsetWidget extends Button implements ItemFilterProvider {
}
@Override
public SearchMode getSearchMode() {
return SearchMode.fromInt(NEIClientConfig.getIntSetting("inventory.search.subsetsSearchMode"));
public String getName() {
return "subsets";
}
private boolean matches(String name, String searchText, Pattern pattern) {
@@ -1,7 +1,5 @@
package codechicken.nei;
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.concurrent.Callable;
@@ -23,6 +21,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;
@@ -322,6 +322,12 @@ public class WorldOverlayRenderer implements IKeyStateTracker {
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);
for (double y = (int) y1; y <= y2; y++) {
@@ -416,38 +422,18 @@ public class WorldOverlayRenderer implements IKeyStateTracker {
GL11.glDisable(GL11.GL_BLEND);
}
/** Holder defers class loading until Cubic Chunks is confirmed present. */
private static final class CCWorldBounds {
static final MethodHandle GET_MIN_HEIGHT;
static final MethodHandle GET_MAX_HEIGHT;
static {
try {
MethodHandles.Lookup lookup = MethodHandles.lookup();
// Mixined into World by CC, use reflection + MethodHandles to call these
GET_MIN_HEIGHT = lookup.unreflect(World.class.getMethod("getMinHeight"));
GET_MAX_HEIGHT = lookup.unreflect(World.class.getMethod("getMaxHeight"));
} catch (ReflectiveOperationException e) {
throw new ExceptionInInitializerError(e);
}
}
}
private static int worldMinHeight(World world) {
if (!NEIModContainer.isCCLoaded()) return 0;
try {
return (int) CCWorldBounds.GET_MIN_HEIGHT.invoke(world);
} catch (Throwable ignored) {
if (NEIModContainer.isCCLoaded() && world instanceof IMinMaxHeight worldHeights) {
return worldHeights.getMinHeight();
} else {
return 0;
}
}
private static int worldMaxHeight(World world) {
if (!NEIModContainer.isCCLoaded()) return world.getHeight();
try {
return (int) CCWorldBounds.GET_MAX_HEIGHT.invoke(world);
} catch (Throwable ignored) {
if (NEIModContainer.isCCLoaded() && world instanceof IMinMaxHeight worldHeights) {
return worldHeights.getMaxHeight();
} else {
return world.getHeight();
}
}
+2 -2
View File
@@ -146,14 +146,14 @@ 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 void hideItem(ItemStack item) {
public static synchronized void hideItem(ItemStack item) {
if (!ItemInfo.hiddenItems.contains(item)) {
ItemInfo.hiddenItems.add(item);
LayoutManager.markItemsDirty();
}
}
public static void hideItem(String rule) {
public static synchronized void hideItem(String rule) {
ItemFilter filter = ItemStackFilterParser.parse(rule);
if (filter != null) {
ItemInfo.hiddenItemsRules.filters.add(filter);
+14 -5
View File
@@ -51,20 +51,29 @@ public class GuiInfo {
}
public static boolean hideItemPanelSlot(GuiContainer gui, Rectangle4i rect) {
return hideItemPanelSlot(gui, rect, getGuiHandlersSnapshot());
}
public static INEIGuiHandler[] getGuiHandlersSnapshot() {
try {
readLock.lock();
if (guiHandlers.stream()
.anyMatch(handler -> handler.hideItemPanelSlot(gui, rect.x, rect.y, rect.w, rect.h))) {
return true;
}
return guiHandlers.toArray(new INEIGuiHandler[0]);
} finally {
readLock.unlock();
}
}
public static boolean hideItemPanelSlot(GuiContainer gui, Rectangle4i rect, INEIGuiHandler[] handlers) {
for (INEIGuiHandler handler : handlers) {
if (handler.hideItemPanelSlot(gui, rect.x, rect.y, rect.w, rect.h)) return true;
}
for (Object item : gui.buttonList) {
GuiButton button = (GuiButton) item;
if ((new Rectangle4i(button.xPosition, button.yPosition, button.width, button.height)).intersects(rect)) {
if (button.xPosition + button.width > rect.x && button.xPosition < rect.x + rect.w
&& button.yPosition + button.height > rect.y
&& button.yPosition < rect.y + rect.h) {
return true;
}
}
@@ -1,15 +1,9 @@
package codechicken.nei.api;
import java.util.Collections;
import java.util.List;
import java.util.regex.Pattern;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
import codechicken.nei.VisiblityData;
/**
* Lets you just override those things you want to
*/
@@ -17,31 +11,6 @@ public class INEIGuiAdapter implements INEIGuiHandler {
static final Pattern SPECIAL_REGEX_CHARS = Pattern.compile("[{}()\\[\\].+*?^$\\\\|]");
@Override
public VisiblityData modifyVisiblity(GuiContainer gui, VisiblityData currentVisibility) {
return currentVisibility;
}
@Override
public Iterable<Integer> getItemSpawnSlots(GuiContainer gui, ItemStack item) {
return Collections.emptyList();
}
@Override
public List<TaggedInventoryArea> getInventoryAreas(GuiContainer gui) {
return null;
}
@Override
public boolean handleDragNDrop(GuiContainer gui, int mousex, int mousey, ItemStack draggedStack, int button) {
return false;
}
@Override
public boolean hideItemPanelSlot(GuiContainer gui, int x, int y, int w, int h) {
return false;
}
protected String formattingText(String displayName) {
return SPECIAL_REGEX_CHARS.matcher(EnumChatFormatting.getTextWithoutFormattingCodes(displayName))
.replaceAll("\\\\$0");
@@ -1,5 +1,6 @@
package codechicken.nei.api;
import java.util.Collections;
import java.util.List;
import net.minecraft.client.gui.inventory.GuiContainer;
@@ -12,23 +13,29 @@ import codechicken.nei.VisiblityData;
*/
public interface INEIGuiHandler {
public VisiblityData modifyVisiblity(GuiContainer gui, VisiblityData currentVisibility);
default VisiblityData modifyVisiblity(GuiContainer gui, VisiblityData currentVisibility) {
return currentVisibility;
}
/**
* NEI will give the specified item to the InventoryRange returned if the player's inventory is full. Should not
* return null, just an empty list
*/
public Iterable<Integer> getItemSpawnSlots(GuiContainer gui, ItemStack item);
default Iterable<Integer> getItemSpawnSlots(GuiContainer gui, ItemStack item) {
return Collections.emptyList();
}
/**
* @return A list of TaggedInventoryAreas that will be used with the savestates.
*/
public List<TaggedInventoryArea> getInventoryAreas(GuiContainer gui);
default List<TaggedInventoryArea> getInventoryAreas(GuiContainer gui) {
return null;
}
/**
* Handles clicks while an itemstack has been dragged from the item panel. Use this to set configurable slots and
* the like. Changes made to the stackSize of the dragged stack will be kept
*
*
* @param gui The current gui instance
* @param mousex The x position of the mouse
* @param mousey The y position of the mouse
@@ -37,18 +44,22 @@ public interface INEIGuiHandler {
* @return True if the drag n drop was handled. False to resume processing through other routes. The held stack will
* be deleted if draggedStack.stackSize == 0
*/
public boolean handleDragNDrop(GuiContainer gui, int mousex, int mousey, ItemStack draggedStack, int button);
default boolean handleDragNDrop(GuiContainer gui, int mousex, int mousey, ItemStack draggedStack, int button) {
return false;
}
/**
* Used to prevent the item panel from drawing on top of other gui elements. This function will also be called with
* a 1x1 size rectangle on the mouse position for determining if the given coordinate should override item panel
* functions such as scrolling
*
*
* @param x The x coordinate of the rectangle bounding the slot
* @param y The y coordinate of the rectangle bounding the slot
* @param w The w coordinate of the rectangle bounding the slot
* @param h The h coordinate of the rectangle bounding the slot
* @return true if the item panel slot within the specified rectangle should not be rendered.
*/
public boolean hideItemPanelSlot(GuiContainer gui, int x, int y, int w, int h);
default boolean hideItemPanelSlot(GuiContainer gui, int x, int y, int w, int h) {
return false;
}
}
@@ -1,15 +1,12 @@
package codechicken.nei.api;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.item.ItemStack;
import codechicken.nei.NEIClientConfig;
import codechicken.nei.PositionedStack;
import codechicken.nei.NEIClientUtils;
import codechicken.nei.recipe.GuiOverlayButton.ItemOverlayState;
import codechicken.nei.recipe.IRecipeHandler;
@@ -38,28 +35,14 @@ public interface IOverlayHandler {
}
default List<ItemOverlayState> presenceOverlay(GuiContainer firstGui, IRecipeHandler recipe, int recipeIndex) {
final List<ItemOverlayState> itemPresenceSlots = new ArrayList<>();
final List<PositionedStack> ingredients = recipe.getIngredientStacks(recipeIndex);
final List<ItemStack> invStacks = firstGui.inventorySlots.inventorySlots.stream()
.filter(
s -> s != null && s.getStack() != null
&& s.getStack().stackSize > 0
&& s.isItemValid(s.getStack())
&& s.canTakeStack(firstGui.mc.thePlayer))
.map(s -> s.getStack().copy()).collect(Collectors.toList());
for (PositionedStack stack : ingredients) {
Optional<ItemStack> used = invStacks.stream().filter(is -> is.stackSize > 0 && stack.contains(is))
.findAny();
itemPresenceSlots.add(new ItemOverlayState(stack, used.isPresent()));
if (used.isPresent()) {
ItemStack is = used.get();
is.stackSize -= 1;
}
}
return itemPresenceSlots;
return NEIClientUtils.presenceOverlay(
recipe.getIngredientStacks(recipeIndex),
firstGui.inventorySlots.inventorySlots.stream()
.filter(
s -> s != null && s.getStack() != null
&& s.getStack().stackSize > 0
&& s.isItemValid(s.getStack())
&& s.canTakeStack(firstGui.mc.thePlayer))
.map(s -> s.getStack().copy()).collect(Collectors.toList()));
}
}
@@ -24,4 +24,8 @@ public interface IStackStringifyHandler {
default void pauseItemDamageSound(boolean pause) {}
default boolean isFluidDisplayItem(ItemStack stack) {
return false;
}
}
@@ -36,6 +36,7 @@ import net.minecraft.util.MovingObjectPosition;
import net.minecraft.util.RegistryNamespaced;
import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraftforge.client.MinecraftForgeClient;
import net.minecraftforge.common.BiomeDictionary;
import net.minecraftforge.common.IShearable;
import net.minecraftforge.oredict.OreDictionary;
@@ -60,6 +61,8 @@ import codechicken.nei.config.HandlerDumper;
import codechicken.nei.config.ItemPanelDumper;
import codechicken.nei.config.RegistryDumper;
import codechicken.nei.guihook.GuiContainerManager;
import codechicken.nei.item.FluidDisplayRenderer;
import codechicken.nei.item.ItemFluidDisplay;
import codechicken.nei.recipe.BrewingRecipeHandler;
import codechicken.nei.recipe.RecipeItemInputHandler;
import codechicken.nei.search.IdentifierFilter;
@@ -77,10 +80,13 @@ import cpw.mods.fml.common.registry.GameRegistry.UniqueIdentifier;
*/
public class ItemInfo {
public static enum Layout {
public enum Layout {
HEADER,
BODY,
FOOTER
FOOTER;
public static final Layout[] VALUES = values();
}
public static final ArrayListMultimap<Layout, IHighlightHandler> highlightHandlers = ArrayListMultimap.create();
@@ -130,6 +136,7 @@ public class ItemInfo {
public static void preInit() {
addMobSpawnerItem();
setupFluidDisplayItemClient();
}
public static void load() {
@@ -315,6 +322,11 @@ public class ItemInfo {
GameDataManipulator.replaceItem(Block.getIdFromBlock(Blocks.mob_spawner), new ItemMobSpawner());
}
private static void setupFluidDisplayItemClient() {
ItemFluidDisplay.INSTANCE.setCreativeTab(ItemFluidDisplay.tabFluids);
MinecraftForgeClient.registerItemRenderer(ItemFluidDisplay.INSTANCE, new FluidDisplayRenderer());
}
private static void addInfiniteHandlers() {
API.addInfiniteItemHandler(new InfiniteStackSizeHandler());
API.addInfiniteItemHandler(new InfiniteToolHandler());
@@ -399,6 +411,7 @@ public class ItemInfo {
item -> item.getItem() instanceof ItemArmor armor && armor.armorType == 2);
API.addSubset("Items.Armor.Boots", item -> item.getItem() instanceof ItemArmor armor && armor.armorType == 3);
API.addSubset("Items.Food", item -> item.getItem() instanceof ItemFood);
API.addSubset("Items.Fluids", item -> item.getItem() instanceof ItemFluidDisplay);
API.addSubset("Items.Potions.Ingredients", BrewingRecipeHandler.ingredients);
for (CreativeTabs tab : CreativeTabs.creativeTabArray) {
@@ -472,7 +485,7 @@ public class ItemInfo {
MovingObjectPosition mop) {
List<String> retString = new ArrayList<>();
for (ItemInfo.Layout layout : ItemInfo.Layout.values())
for (ItemInfo.Layout layout : Layout.VALUES)
for (IHighlightHandler handler : ItemInfo.highlightHandlers.get(layout))
retString = handler.handleTextData(itemStack, world, player, mop, retString, layout);
@@ -14,8 +14,9 @@ public class NEIInfo {
public static void load(World world) {
OptionCycled modeOption = (OptionCycled) NEIClientConfig.getOptionList().getOption("inventory.cheatmode");
final boolean worldConfig = NEIClientConfig.isWorldSpecific("inventory.cheatmode");
// kept alive so the WeakReference in Option.slotRef isn't GC'd before copyGlobals/cycle use it
GuiOptionList env = modeOption.parent.synthesizeEnvironment(false);
GuiOptionList env = modeOption.parent.synthesizeEnvironment(worldConfig);
if (!modeOption.optionValid(modeOption.value())) {
modeOption.copyGlobals();
modeOption.cycle();
@@ -32,6 +32,7 @@ import codechicken.nei.bookmark.BookmarkItem;
import codechicken.nei.bookmark.BookmarkItem.BookmarkItemType;
import codechicken.nei.bookmark.BookmarkPayload;
import codechicken.nei.bookmark.BookmarksGridSlot;
import codechicken.nei.bookmark.tree.GuiCraftingTree;
import codechicken.nei.recipe.AutoCraftingManager;
import codechicken.nei.recipe.GuiCraftingRecipe;
import codechicken.nei.recipe.GuiFavoriteButton;
@@ -101,6 +102,12 @@ public abstract class ShortcutInputHandler {
return true;
}
if (ItemPanels.bookmarkPanel.getGrid().isCraftingMode(groupId)
&& KeyManager.isKeyDown("bookmark.open_crafting_tree")) {
GuiCraftingTree.openCraftingTreeGui(ItemPanels.bookmarkPanel.getGrid(), groupId);
return true;
}
if (NEIClientConfig.autocraftingEnabled() && KeyManager.isKeyDown("gui.craft_items")
&& NEIClientUtils.shiftKey()
&& ItemPanels.bookmarkPanel.getGrid().isCraftingMode(groupId)) {
@@ -274,7 +281,7 @@ public abstract class ShortcutInputHandler {
if (slot.getGroup().crafting == null) {
final Recipe recipe = Recipe.of(slot.getRecipeId());
if (recipe != null) {
math = RecipeChainMath.of(recipe, Math.max(1, slot != null ? slot.getMultiplier() : 1));
math = RecipeChainMath.of(recipe, Math.max(1, slot.getMultiplier()));
}
} else {
math = ItemPanels.bookmarkPanel.getGrid()
@@ -441,7 +448,7 @@ public abstract class ShortcutInputHandler {
}
}
if (gui instanceof GuiRecipe guiRecipe) {
if (gui instanceof GuiRecipe<?>guiRecipe) {
recipe = guiRecipe.getFocusedRecipe();
}
@@ -477,6 +484,7 @@ public abstract class ShortcutInputHandler {
final Map<String, String> hotkeys = new HashMap<>();
if (groupId != -1) {
final boolean isCraftingMode = ItemPanels.bookmarkPanel.getGrid().isCraftingMode(groupId);
hotkeys.put(
KeyManager.getKeyName("bookmark.remove_recipe", NEIClientUtils.SHIFT_HASH),
@@ -486,6 +494,12 @@ public abstract class ShortcutInputHandler {
KeyManager.getKeyName("bookmark.chat_link", NEIClientUtils.CTRL_HASH),
NEIClientUtils.translate("bookmark.group.chat_link"));
if (isCraftingMode) {
hotkeys.put(
KeyManager.getKeyName("bookmark.open_crafting_tree"),
NEIClientUtils.translate("bookmark.group.open_crafting_tree"));
}
if (BookmarkContainerInfo.getBookmarkContainerHandler(gui) != null) {
hotkeys.put(
KeyManager.getKeyName("bookmark.pull_items"),
@@ -495,7 +509,7 @@ public abstract class ShortcutInputHandler {
NEIClientUtils.translate("bookmark.group.pull_items_shift"));
}
if (NEIClientConfig.autocraftingEnabled() && ItemPanels.bookmarkPanel.getGrid().isCraftingMode(groupId)) {
if (NEIClientConfig.autocraftingEnabled() && isCraftingMode) {
hotkeys.put(
NEIClientConfig
.getKeyName("gui.craft_items", NEIClientUtils.SHIFT_HASH + NEIClientUtils.CTRL_HASH),
@@ -736,7 +750,7 @@ public abstract class ShortcutInputHandler {
return itemSlot.getRecipeId();
}
if (gui instanceof GuiRecipe guiRecipe) {
if (gui instanceof GuiRecipe<?>guiRecipe) {
final Recipe focusedRecipe = guiRecipe.getFocusedRecipe();
if (focusedRecipe != null) {
@@ -24,7 +24,7 @@ import codechicken.lib.gui.GuiDraw;
import codechicken.lib.vec.Rectangle4i;
import codechicken.nei.BookmarkPanel.BookmarkViewMode;
import codechicken.nei.ItemPanels;
import codechicken.nei.ItemStackSet;
import codechicken.nei.ItemStackAmount;
import codechicken.nei.ItemsGrid;
import codechicken.nei.ItemsGrid.MouseContext;
import codechicken.nei.LayoutManager;
@@ -179,11 +179,15 @@ public class BookmarkGrid extends ItemsGrid<BookmarksGridSlot, BookmarkGrid.Book
}
public int addGroup(BookmarkGroup group) {
int groupId = this.bookmarkItems.stream().mapToInt(item -> item.groupId).max().orElse(DEFAULT_GROUP_ID) + 1;
final int groupId = getNextGroupId();
this.groups.put(groupId, group);
return groupId;
}
public int getNextGroupId() {
return this.bookmarkItems.stream().mapToInt(item -> item.groupId).max().orElse(DEFAULT_GROUP_ID) + 1;
}
@Override
public int getNumPages() {
@@ -600,6 +604,11 @@ public class BookmarkGrid extends ItemsGrid<BookmarksGridSlot, BookmarkGrid.Book
public RecipeChainMath createRecipeChainMath(int groupId, RecipeId recipeId) {
final BookmarkGroup group = getGroup(groupId);
if (group == null) {
return null;
}
final List<BookmarkItem> chainItems = new ArrayList<>();
final Set<RecipeId> collapsedRecipes = group.crafting != null && recipeId == null ? group.collapsedRecipes
: Collections.emptySet();
@@ -879,6 +888,16 @@ public class BookmarkGrid extends ItemsGrid<BookmarksGridSlot, BookmarkGrid.Book
return this.bookmarkItems.get(itemIndex);
}
public void replaceBookmarkItem(int itemIndex, BookmarkItem newItem) {
if (itemIndex < 0 || itemIndex >= this.bookmarkItems.size()) {
return;
}
this.bookmarkItems.set(itemIndex, newItem);
onItemsChanged();
}
public int getAbsoluteSlotIndex(int itemIndex) {
return this.gridGenerator.itemToSlot.getOrDefault(itemIndex, -1);
}
@@ -898,8 +917,8 @@ public class BookmarkGrid extends ItemsGrid<BookmarksGridSlot, BookmarkGrid.Book
}
public void addRecipe(Recipe recipe, int multiplier, int groupId) {
final ItemStackSet seenResults = new ItemStackSet();
final ItemStackSet seenIngredients = new ItemStackSet();
final ItemStackAmount seenResults = new ItemStackAmount();
final ItemStackAmount seenIngredients = new ItemStackAmount();
final List<ItemStack> results = new ArrayList<>();
final List<ItemStack> ingredients = new ArrayList<>();
@@ -935,7 +954,7 @@ public class BookmarkGrid extends ItemsGrid<BookmarksGridSlot, BookmarkGrid.Book
}
public void removeRecipe(int itemIndex, boolean removeFullRecipe) {
final BookmarkItem item = getCalculatedItem(itemIndex);
final BookmarkItem item = getBookmarkItem(itemIndex);
if (item == null) {
return;
@@ -1199,28 +1218,10 @@ public class BookmarkGrid extends ItemsGrid<BookmarksGridSlot, BookmarkGrid.Book
if (group.collapsed) {
shiftGroupAmount(targetItem.groupId, shift);
} else if (targetItem.recipeId != null && targetItem.type != BookmarkItemType.ITEM) {
final RecipeId recipeId = this.gridGenerator.itemToRecipe
.getOrDefault(targetItemIndex, targetItem.recipeId);
final boolean recipeInMiddle = group.crafting != null && group.crafting.recipeInMiddle.contains(recipeId);
long multiplier = Integer.MAX_VALUE;
for (BookmarkItem item : this.bookmarkItems) {
if (item.equalsRecipe(recipeId, targetItem.groupId) && !item.emptyFactor()) {
multiplier = Math.min(
shiftMultiplier(
Math.max(recipeInMiddle ? 1 : 0, item.multiplier),
shift,
recipeInMiddle ? 1 : 0),
multiplier);
}
}
for (BookmarkItem item : this.bookmarkItems) {
if (item.equalsRecipe(recipeId, targetItem.groupId) && !item.emptyFactor()) {
item.multiplier = multiplier;
}
}
shiftRecipeAmount(
targetItem.groupId,
this.gridGenerator.itemToRecipe.getOrDefault(targetItemIndex, targetItem.recipeId),
shift);
} else {
for (BookmarkItem item : this.bookmarkItems) {
@@ -1230,6 +1231,32 @@ public class BookmarkGrid extends ItemsGrid<BookmarksGridSlot, BookmarkGrid.Book
}
}
this.onItemsChanged();
}
}
public void shiftRecipeAmount(int targetGroupId, RecipeId recipeId, long shift) {
final BookmarkGroup group = getGroup(targetGroupId);
final boolean recipeInMiddle = group != null && group.crafting != null
&& group.crafting.recipeInMiddle.contains(recipeId);
long multiplier = Integer.MAX_VALUE;
for (BookmarkItem item : this.bookmarkItems) {
if (item.equalsRecipe(recipeId, targetGroupId) && !item.emptyFactor()) {
multiplier = Math.min(
shiftMultiplier(
Math.max(recipeInMiddle ? 1 : 0, item.multiplier),
shift,
recipeInMiddle ? 1 : 0),
multiplier);
}
}
for (BookmarkItem item : this.bookmarkItems) {
if (item.equalsRecipe(recipeId, targetGroupId) && !item.emptyFactor()) {
item.multiplier = multiplier;
}
}
this.onItemsChanged();
@@ -42,7 +42,7 @@ public class BookmarkItem {
this.groupId = groupId;
this.stack = stack;
this.factor = nbTag.hasKey("gtFluidName") ? Math.min(144, nbTag.getInteger("Count")) : 1;
this.factor = StackInfo.isFluidDisplayItem(stack) ? Math.max(nbTag.getInteger("Count"), 1) : 1;
}
public Builder factor(long factor) {
@@ -228,11 +228,15 @@ public class BookmarkItem {
final List<RecipeIngredient> items = type == BookmarkItemType.RESULT ? recipe.getResults()
: recipe.getIngredients();
final Builder builder = builder(groupId, stack).type(type).recipe(recipe);
final ItemStack emptyStack = StackInfo.withAmount(stack, 0);
long amount = 0;
for (RecipeIngredient res : items) {
if (res.contains(stack)) {
amount += 1L * res.getAmount() * res.getChance();
for (ItemStack perm : res.getPermutations()) {
if (NEIClientUtils.areStacksSameTypeWithNBT(emptyStack, StackInfo.withAmount(perm, 0))) {
amount += 1L * StackInfo.getAmount(perm) * res.getChance();
break;
}
}
}
@@ -308,6 +312,47 @@ public class BookmarkItem {
return copyWithMultiplier(this.multiplier);
}
public BookmarkItem copyWithPerm(ItemStack stack) {
if (this.recipeId != null
&& !NEIClientUtils.areStacksSameTypeWithNBT(StackInfo.withAmount(stack, 0), this.getItemStack(0))) {
final ItemStack oldPerm = findPermutation(this.itemStack);
final ItemStack newPerm = findPermutation(stack);
if (oldPerm != null && newPerm != null) {
final long oldAmount = StackInfo.getAmount(oldPerm);
final long amount = oldAmount > 0 ? this.factor * this.chance * StackInfo.getAmount(newPerm) / oldAmount
: 0;
final long factor = (amount % PositionedStack.CHANCE_FULL) == 0 ? amount / PositionedStack.CHANCE_FULL
: 1;
final long chance = factor == 1 ? amount : PositionedStack.CHANCE_FULL;
return new BookmarkItem(
this.groupId,
this.multiplier,
factor,
chance,
newPerm,
this.permutations,
this.recipeId,
this.type);
}
}
return copy();
}
private ItemStack findPermutation(ItemStack stack) {
for (ItemStack itemStack : this.permutations.values()) {
if (StackInfo.equalItemAndNBT(stack, itemStack, true)) {
return itemStack;
}
}
return null;
}
public boolean containsItems(BookmarkItem item) {
return this.permutations.keySet().stream().anyMatch(item.permutations::containsKey);
}
@@ -316,21 +361,47 @@ public class BookmarkItem {
return getAmount(this.multiplier);
}
public long getAmount(long multiplier, ItemStack perm) {
if (this.recipeId != null && perm != null
&& !NEIClientUtils.areStacksSameTypeWithNBT(StackInfo.withAmount(perm, 0), this.getItemStack(0))) {
final ItemStack oldPerm = findPermutation(this.itemStack);
final ItemStack newPerm = findPermutation(perm);
if (oldPerm != null && newPerm != null) {
final long oldAmount = StackInfo.getAmount(oldPerm);
final long amount = oldAmount > 0 ? this.factor * this.chance * StackInfo.getAmount(newPerm) / oldAmount
: 0;
final long factor = (amount % PositionedStack.CHANCE_FULL) == 0 ? amount / PositionedStack.CHANCE_FULL
: 1;
final long chance = factor == 1 ? amount : PositionedStack.CHANCE_FULL;
return getAmount(multiplier, factor, chance);
}
}
return getAmount(multiplier);
}
public long getAmount(long multiplier) {
long amount = this.factor * multiplier;
return getAmount(multiplier, this.factor, this.chance);
}
protected long getAmount(long multiplier, long factor, long chance) {
long amount = factor * multiplier;
if (this.fluidCellAmount > 1) {
amount = amount * this.fluidCellAmount;
}
if (this.chance != PositionedStack.CHANCE_FULL) {
if (chance != PositionedStack.CHANCE_FULL) {
if (this.type == BookmarkItemType.INGREDIENT) {
// For ingredients, round up the expected amount to be conservative.
amount = (amount * this.chance + PositionedStack.CHANCE_FULL - 1) / PositionedStack.CHANCE_FULL;
return (amount * chance + PositionedStack.CHANCE_FULL - 1) / PositionedStack.CHANCE_FULL;
} else {
// For results, round down the expected amount to be conservative.
amount = (amount * this.chance) / PositionedStack.CHANCE_FULL;
return (amount * chance) / PositionedStack.CHANCE_FULL;
}
}
@@ -82,7 +82,7 @@ public class BookmarksGridSlot extends ItemsGridSlot {
this.bookmarkItem = bookmarkItem;
this.isOutputRecipe = group.crafting != null && group.crafting.outputRecipes.contains(bookmarkItem.recipeId);
this.isFluidDisplay = StackInfo.itemStackToNBT(bookmarkItem.itemStack).hasKey("gtFluidName");
this.isFluidDisplay = StackInfo.isFluidDisplayItem(bookmarkItem.itemStack);
this.realMultiplier = realMultiplier;
this.calculatedMultiplier = calculatedMultiplier;
@@ -1,5 +1,7 @@
package codechicken.nei.bookmark;
import static codechicken.nei.bookmark.BookmarkGrid.DEFAULT_GROUP_ID;
import java.awt.Point;
import java.util.ArrayList;
import java.util.Collections;
@@ -139,13 +141,11 @@ public class SortableItem {
return;
}
if (overGroupId != BookmarkGrid.DEFAULT_GROUP_ID
&& beforeGroupId != BookmarkGrid.DEFAULT_GROUP_ID) {
beforeGroupId = BookmarkGrid.DEFAULT_GROUP_ID;
if (overGroupId != DEFAULT_GROUP_ID && beforeGroupId != DEFAULT_GROUP_ID) {
beforeGroupId = DEFAULT_GROUP_ID;
}
if (overGroupId == BookmarkGrid.DEFAULT_GROUP_ID && beforeGroupId != BookmarkGrid.DEFAULT_GROUP_ID
&& afterGroupId != BookmarkGrid.DEFAULT_GROUP_ID) {
if (overGroupId == DEFAULT_GROUP_ID && afterGroupId != DEFAULT_GROUP_ID) {
return;
}
@@ -160,12 +160,11 @@ public class SortableItem {
return;
}
if (overGroupId != BookmarkGrid.DEFAULT_GROUP_ID && afterGroupId != BookmarkGrid.DEFAULT_GROUP_ID) {
afterGroupId = BookmarkGrid.DEFAULT_GROUP_ID;
if (overGroupId != DEFAULT_GROUP_ID && afterGroupId != DEFAULT_GROUP_ID) {
afterGroupId = DEFAULT_GROUP_ID;
}
if (overGroupId == BookmarkGrid.DEFAULT_GROUP_ID && beforeGroupId != BookmarkGrid.DEFAULT_GROUP_ID
&& afterGroupId != BookmarkGrid.DEFAULT_GROUP_ID) {
if (overGroupId == DEFAULT_GROUP_ID && beforeGroupId != DEFAULT_GROUP_ID) {
return;
}
@@ -0,0 +1,119 @@
package codechicken.nei.bookmark.tree;
import java.awt.geom.Point2D;
class Camera {
private static final float ZOOM_MIN = 0.1f;
private static final float ZOOM_MAX = 8.0f;
private static final double ZOOM_STEP_BASE = 1.4;
private static final float SCROLL_STEP_DIVISOR = 5f;
private static final int CULL_MARGIN = 32;
private static final int CULL_ROW_MARGIN = 16;
private static final float INITIAL_SCROLL = -8f;
public int widgetX;
public int widgetY;
public int widgetW;
public int widgetH;
public float scrollX = INITIAL_SCROLL;
public float scrollY = INITIAL_SCROLL;
public float zoomLevel = 1.0f;
private float lastDragX;
private float lastDragY;
private boolean dragging;
public void setViewport(int x, int y, int w, int h) {
this.widgetX = x;
this.widgetY = y;
this.widgetW = w;
this.widgetH = h;
}
public boolean isInWidget(int x, int y) {
return x >= this.widgetX && y >= this.widgetY
&& x < this.widgetX + this.widgetW
&& y < this.widgetY + this.widgetH;
}
public void startDrag(int mouseX, int mouseY) {
this.dragging = true;
this.lastDragX = mouseX;
this.lastDragY = mouseY;
}
public void drag(int mouseX, int mouseY) {
if (!this.dragging) {
return;
}
this.scrollX -= (mouseX - this.lastDragX) / this.zoomLevel;
this.scrollY -= (mouseY - this.lastDragY) / this.zoomLevel;
this.lastDragX = mouseX;
this.lastDragY = mouseY;
}
public void endDrag() {
this.dragging = false;
}
public boolean isDragging() {
return this.dragging;
}
public void scroll(int mouseX, int mouseY, int direction, boolean shiftKey, boolean ctrlKey) {
if (shiftKey) {
this.scrollX -= direction * this.widgetW / (SCROLL_STEP_DIVISOR * this.zoomLevel);
} else if (ctrlKey) {
final int localX = mouseX - this.widgetX;
final int localY = mouseY - this.widgetY;
final float oldZoom = this.zoomLevel;
this.zoomLevel = clamp((float) (this.zoomLevel * Math.pow(ZOOM_STEP_BASE, direction)), ZOOM_MIN, ZOOM_MAX);
this.scrollX += localX / oldZoom - localX / this.zoomLevel;
this.scrollY += localY / oldZoom - localY / this.zoomLevel;
} else {
this.scrollY -= direction * this.widgetH / (SCROLL_STEP_DIVISOR * this.zoomLevel);
}
}
public void centerOn(float worldX, float worldY) {
this.scrollX = worldX - (this.widgetW / this.zoomLevel) / 2f;
this.scrollY = worldY - (this.widgetH / this.zoomLevel) / 2f;
}
public void clampToBounds(int treeWidth, int treeHeight) {
this.scrollX = clamp(this.scrollX, -this.widgetW / this.zoomLevel + 4, treeWidth - 4);
this.scrollY = clamp(this.scrollY, -this.widgetH / this.zoomLevel + 4, treeHeight - 4);
}
public int visibleRowMin() {
final float zScrollY = this.scrollY * this.zoomLevel;
return (int) ((zScrollY - CULL_MARGIN) / this.zoomLevel) - CULL_ROW_MARGIN;
}
public int visibleRowMax() {
final float zScrollY = this.scrollY * this.zoomLevel;
return (int) ((zScrollY + CULL_MARGIN) / this.zoomLevel) + (int) (this.widgetH / this.zoomLevel)
+ CULL_ROW_MARGIN;
}
public Point2D.Double toWorldPoint(Point2D mouse) {
final float zScrollX = this.scrollX * this.zoomLevel;
final float zScrollY = this.scrollY * this.zoomLevel;
return new Point2D.Double(
(mouse.getX() - this.widgetX + zScrollX) / this.zoomLevel,
(mouse.getY() - this.widgetY + zScrollY) / this.zoomLevel);
}
static float clamp(float value, float min, float max) {
return value < min ? min : Math.min(value, max);
}
}
@@ -0,0 +1,720 @@
package codechicken.nei.bookmark.tree;
import java.awt.Color;
import java.awt.Point;
import java.awt.geom.Point2D;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.TreeMap;
import java.util.function.BiPredicate;
import net.minecraft.client.renderer.RenderHelper;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
import codechicken.lib.gui.GuiDraw;
import codechicken.lib.vec.Rectangle4i;
import codechicken.nei.ColorUtils;
import codechicken.nei.NEIClientUtils;
import codechicken.nei.NEIClientUtils.Alignment;
import codechicken.nei.PositionedStack;
import codechicken.nei.bookmark.BookmarkItem;
import codechicken.nei.drawable.DrawableBuilder;
import codechicken.nei.drawable.DrawableResource;
import codechicken.nei.guihook.GuiContainerManager;
import codechicken.nei.recipe.Recipe.RecipeId;
import codechicken.nei.scroll.GuiHelper;
import codechicken.nei.util.ReadableNumberConverter;
class CraftingTreeCanvas {
private static final DrawableResource SCROLLBAR_H = new DrawableBuilder(
"nei:textures/gui/craftingtree.png",
0,
88,
2,
24).build();
private static final DrawableResource SCROLLBAR_W = new DrawableBuilder(
"nei:textures/gui/craftingtree.png",
0,
84,
24,
2).build();
private static final DrawableResource ICON_COLLAPSED = new DrawableBuilder(
"nei:textures/gui/craftingtree.png",
4,
88,
5,
5).build();
private static final DrawableResource ICON_COLLAPSED_HOVER = new DrawableBuilder(
"nei:textures/gui/craftingtree.png",
11,
88,
5,
5).build();
private static final DrawableResource ICON_EXPANDED = new DrawableBuilder(
"nei:textures/gui/craftingtree.png",
4,
95,
5,
5).build();
private static final DrawableResource ICON_EXPANDED_HOVER = new DrawableBuilder(
"nei:textures/gui/craftingtree.png",
11,
95,
5,
5).build();
private static final DrawableResource ICON_REMOVE = new DrawableBuilder(
"nei:textures/gui/craftingtree.png",
85,
48,
16,
16).build();
private static final DrawableResource ICON_CRAFTING = new DrawableBuilder(
"nei:textures/gui/craftingtree.png",
67,
48,
16,
16).build();
private static final DrawableResource SLOT_DEFAULT = new DrawableBuilder(
"nei:textures/gui/craftingtree.png",
68,
2,
18,
18).build();
private static final DrawableResource SLOT_MISSING = new DrawableBuilder(
"nei:textures/gui/craftingtree.png",
92,
2,
18,
18).build();
private static final DrawableResource SLOT_CRAFTING = new DrawableBuilder(
"nei:textures/gui/craftingtree.png",
116,
2,
18,
18).build();
private static final DrawableResource SLOT_DISABLED = new DrawableBuilder(
"nei:textures/gui/craftingtree.png",
140,
2,
18,
18).build();
private static final DrawableResource SLOT_HIGHLIGHTED = new DrawableBuilder(
"nei:textures/gui/craftingtree.png",
164,
2,
18,
18).build();
private static final Color LINE_COLOR = new Color(ColorUtils.craftingTreeLine.getColor(), true);
private static final int HOVER_COLOR = 0x66888888;
private static final float BADGE_SCALE = 0.6f;
public static final int SLOT_SIZE = 18;
public static final int X_SPACING = 24;
public static final int Y_SPACING = 14;
public static final int ROOT_SPACING = 36;
private static final float FIT_MARGIN = 8f;
public final CraftingTreeGraph graph = new CraftingTreeGraph();
public final Map<ItemTreeSlot, Point> pointByNode = new HashMap<>();
public final TreeMap<Integer, List<ItemTreeSlot>> rows = new TreeMap<>();
public final Set<RecipeId> collapsedRecipes = Collections.newSetFromMap(new HashMap<>());
public int treeWidth = 0;
public int treeHeight = 0;
private final Camera camera = new Camera();
public void setViewport(int x, int y, int w, int h) {
this.camera.setViewport(x, y, w, h);
}
public boolean isInWidget(int x, int y) {
return this.camera.isInWidget(x, y);
}
public void fitToView() {
final float firstResultCenterX = this.graph.roots.isEmpty() ? this.treeWidth / 2f
: this.pointByNode.get(this.graph.roots.get(0)).x + SLOT_SIZE / 2f;
this.camera.zoomLevel = 1.0f;
this.camera.scrollX = this.treeWidth <= (this.camera.widgetW - FIT_MARGIN)
? (this.treeWidth - this.camera.widgetW) / 2f
: firstResultCenterX - this.camera.widgetW / 2f;
this.camera.scrollY = this.treeHeight <= (this.camera.widgetH - FIT_MARGIN)
? (this.treeHeight - this.camera.widgetH) / 2f
: -FIT_MARGIN;
}
public void startDrag(int mouseX, int mouseY) {
this.camera.startDrag(mouseX, mouseY);
}
public void drag(int mouseX, int mouseY) {
this.camera.drag(mouseX, mouseY);
}
public void endDrag() {
this.camera.endDrag();
}
public boolean isDragging() {
return this.camera.isDragging();
}
public void scroll(int mouseX, int mouseY, int direction, boolean shiftKey, boolean ctrlKey) {
this.camera.scroll(mouseX, mouseY, direction, shiftKey, ctrlKey);
}
public void scrollTo(ItemTreeSlot node) {
if (node == null || !this.pointByNode.containsKey(node)) {
return;
}
final Point point = this.pointByNode.get(node);
final float nodeCenterX = point.x + SLOT_SIZE / 2f;
final float nodeCenterY = point.y + SLOT_SIZE / 2f;
this.camera.centerOn(nodeCenterX, nodeCenterY);
}
public ItemTreeSlot getNodeMouseOver(Point2D mouse) {
return findVisibleNode(mouse, (node, local) -> {
final Point point = this.pointByNode.get(node);
return local.x >= point.x && local.x < point.x + SLOT_SIZE
&& local.y >= point.y
&& local.y < point.y + SLOT_SIZE;
});
}
public ItemTreeSlot getHandlerBadgeMouseOver(Point2D mouse) {
return findVisibleNode(mouse, (node, local) -> {
if (node.prefItem == null || !this.graph.childrenOf.containsKey(node)) {
return false;
}
final Point point = this.pointByNode.get(node);
final float[] badge = badgeRect(point.x, point.y);
return local.x >= badge[0] && local.x < badge[0] + badge[2]
&& local.y >= badge[1]
&& local.y < badge[1] + badge[3];
});
}
public ItemTreeSlot getCollapseArrowMouseOver(Point2D mouse) {
return findVisibleNode(mouse, (node, local) -> {
if (!this.graph.childrenOf.containsKey(node) || node.prefItem == null
|| this.collapsedRecipes.contains(node.prefItem.recipeId) && !this.graph.roots.contains(node)) {
return false;
}
final Point point = this.pointByNode.get(node);
final float iconX = point.x + SLOT_SIZE / 2 - ICON_COLLAPSED.width - 1;
final float iconY = point.y + SLOT_SIZE + 1;
final float iconW = ICON_COLLAPSED.width;
final float iconH = ICON_COLLAPSED.height;
return local.x >= iconX && local.x < iconX + iconW && local.y >= iconY && local.y < iconY + iconH;
});
}
private ItemTreeSlot findVisibleNode(Point2D mouse, BiPredicate<ItemTreeSlot, Point2D.Double> hitTest) {
final Point2D.Double local = this.camera.toWorldPoint(mouse);
for (List<ItemTreeSlot> row : this.rows.subMap(camera.visibleRowMin(), camera.visibleRowMax()).values()) {
for (ItemTreeSlot node : row) {
if (hitTest.test(node, local)) {
return node;
}
}
}
return null;
}
public void draw(Point2D mouse, Set<BookmarkItem> collapsedItems, SearchResult searchResult,
boolean useInventorySnapshot, ItemTreeSlot hoveredNode, ItemTreeSlot deleteHoverNode) {
this.camera.clampToBounds(this.treeWidth, this.treeHeight);
final float zScrollX = this.camera.scrollX * this.camera.zoomLevel;
final float zScrollY = this.camera.scrollY * this.camera.zoomLevel;
final int cropXMin = (int) ((zScrollX - 32) / this.camera.zoomLevel);
final int cropXMax = (int) ((zScrollX + 32) / this.camera.zoomLevel)
+ (int) (this.camera.widgetW / this.camera.zoomLevel);
final ItemTreeSlot collapseHoverNode = this.camera.isDragging() ? null : getCollapseArrowMouseOver(mouse);
GuiHelper.useScissor(this.camera.widgetX, this.camera.widgetY, this.camera.widgetW, this.camera.widgetH, () -> {
GL11.glPushMatrix();
GL11.glPushAttrib(GL11.GL_ENABLE_BIT | GL11.GL_COLOR_BUFFER_BIT | GL11.GL_LIGHTING_BIT);
GL11.glColor4f(1, 1, 1, 1);
GL11.glEnable(GL11.GL_BLEND);
GL11.glEnable(GL12.GL_RESCALE_NORMAL);
RenderHelper.enableGUIStandardItemLighting();
GL11.glDisable(GL11.GL_LIGHTING);
GL11.glTranslatef(this.camera.widgetX - zScrollX, this.camera.widgetY - zScrollY, 0.0f);
GL11.glScalef(this.camera.zoomLevel, this.camera.zoomLevel, 1.0f);
for (List<ItemTreeSlot> row : this.rows.subMap(this.camera.visibleRowMin(), this.camera.visibleRowMax())
.values()) {
for (ItemTreeSlot node : row) {
final Point point = this.pointByNode.get(node);
drawParentLine(node);
if (point.x >= cropXMin && point.x <= cropXMax) {
drawSlot(node, useInventorySnapshot, searchResult, collapsedItems, node == hoveredNode);
drawCollapseIcon(node, collapsedItems, node == collapseHoverNode);
if (node == hoveredNode) {
NEIClientUtils.gl2DRenderContext(
() -> {
GuiDraw.drawRect(
point.x + 1,
point.y + 1,
SLOT_SIZE - 2,
SLOT_SIZE - 2,
HOVER_COLOR);
});
}
if (node.prefItem != null && this.graph.childrenOf.containsKey(node)) {
drawSlotBadge(node, point.x, point.y);
if (node == deleteHoverNode) {
drawDeleteButton(point);
}
}
}
}
}
GL11.glPopAttrib();
GL11.glPopMatrix();
});
drawScrollbars();
}
public void drawFull(Set<BookmarkItem> collapsedItems, SearchResult searchResult, boolean useInventorySnapshot) {
GL11.glPushMatrix();
GL11.glPushAttrib(GL11.GL_ENABLE_BIT | GL11.GL_COLOR_BUFFER_BIT | GL11.GL_LIGHTING_BIT);
GL11.glColor4f(1, 1, 1, 1);
GL11.glEnable(GL11.GL_BLEND);
GL11.glEnable(GL12.GL_RESCALE_NORMAL);
RenderHelper.enableGUIStandardItemLighting();
GL11.glDisable(GL11.GL_LIGHTING);
for (List<ItemTreeSlot> row : this.rows.values()) {
for (ItemTreeSlot node : row) {
final Point point = this.pointByNode.get(node);
drawParentLine(node);
drawSlot(node, useInventorySnapshot, searchResult, collapsedItems, false);
if (node.prefItem != null && this.graph.childrenOf.containsKey(node)) {
drawSlotBadge(node, point.x, point.y);
}
}
}
GL11.glPopAttrib();
GL11.glPopMatrix();
}
private void drawSlot(ItemTreeSlot node, boolean useInventorySnapshot, SearchResult searchResult,
Set<BookmarkItem> collapsedItems, boolean hovered) {
final Point point = this.pointByNode.get(node);
if (searchResult != null) {
if (node == searchResult.highlightNode) {
SLOT_HIGHLIGHTED.draw(point.x, point.y);
} else if (searchResult.searchMatches.contains(node)) {
SLOT_DEFAULT.draw(point.x, point.y);
} else {
SLOT_DISABLED.draw(point.x, point.y);
}
} else if (useInventorySnapshot) {
if (node.leftAmount == 0) {
if (this.graph.parentOf.get(node) != null && this.graph.parentOf.get(node).leftAmount == 0
|| node.requestedAmount == 0) {
SLOT_DISABLED.draw(point.x, point.y);
} else {
SLOT_DEFAULT.draw(point.x, point.y);
}
} else if (!this.graph.childrenOf.containsKey(node)) {
SLOT_MISSING.draw(point.x, point.y);
} else if (collapsedItems.contains(node.ingrItem)) {
if (this.graph.subtreeMissingCache.contains(node)) {
SLOT_MISSING.draw(point.x, point.y);
} else {
SLOT_CRAFTING.draw(point.x, point.y);
}
} else if (!this.graph.childrenNeedCraftingCache.contains(node)) {
SLOT_CRAFTING.draw(point.x, point.y);
} else {
SLOT_DEFAULT.draw(point.x, point.y);
}
} else {
SLOT_DEFAULT.draw(point.x, point.y);
}
GuiContainerManager
.drawItem(point.x + (SLOT_SIZE - 16) / 2, point.y + (SLOT_SIZE - 16) / 2, node.emptyStack, true);
if (node.requestedAmount > 0 && node.leftAmount == 0) {
drawStackSize(node, node.ingrItem.getStackSize(node.requestedAmount), point.x, point.y, true);
} else if (node.requestedAmount > 0 && node.leftAmount > 0) {
final long amount = hovered && node.prefItem != null
&& this.graph.roots.contains(node)
&& this.collapsedRecipes.contains(node.prefItem.recipeId)
&& NEIClientUtils.controlKey() ? node.currentRequestedAmount : node.requestedAmount;
drawStackSize(node, node.ingrItem.getStackSize(amount), point.x, point.y, false);
}
}
protected void drawStackSize(ItemTreeSlot node, long stackSize, int x, int y, boolean resolved) {
String amountString = stackSize < 10_000 ? String.valueOf(stackSize)
: ReadableNumberConverter.INSTANCE.toWideReadableForm(stackSize);
if (node.isFluidDisplay) {
amountString += "L";
}
final boolean hasOutputChance = node.prefItem != null && node.prefItem.chance != PositionedStack.CHANCE_FULL;
int color = 0xFFFFFF;
if (node.ingrItem.chance != PositionedStack.CHANCE_FULL || hasOutputChance || node.isContainerItem) {
amountString = "~" + amountString;
color = 0xFFAA00;
}
if (resolved) {
color = 0x55FF55;
}
NEIClientUtils.drawNEIOverlayText(
amountString,
new Rectangle4i(
x + (SLOT_SIZE - 16) / 2,
y + (SLOT_SIZE - 16) / 2,
SLOT_SIZE - (SLOT_SIZE - 16),
SLOT_SIZE - (SLOT_SIZE - 16)),
1,
color,
true,
node.isFluidDisplay ? Alignment.BottomLeft : Alignment.BottomRight);
}
protected void drawSlotBadge(ItemTreeSlot node, int x, int y) {
final float[] badge = badgeRect(x, y);
GL11.glPushMatrix();
GL11.glColor4f(1, 1, 1, 1);
GL11.glTranslatef(badge[0], badge[1], 4.0f);
GL11.glScalef(BADGE_SCALE, BADGE_SCALE, 1.0f);
if (node.info.hasImageOrItem()) {
final DrawableResource image = node.info.getImage();
if (image != null) {
image.draw(0, 0);
} else {
GuiContainerManager.drawItem(0, 0, node.info.getItemStack(), true);
}
} else {
ICON_CRAFTING.draw(0, 0);
}
GL11.glPopMatrix();
}
private void drawCollapseIcon(ItemTreeSlot node, Set<BookmarkItem> collapsedItems, boolean hover) {
if (!this.graph.childrenOf.containsKey(node) || node.prefItem == null
|| this.collapsedRecipes.contains(node.prefItem.recipeId) && !this.graph.roots.contains(node)) {
return;
}
final DrawableResource icon;
if (collapsedItems.contains(node.ingrItem)) {
icon = hover ? ICON_COLLAPSED_HOVER : ICON_COLLAPSED;
} else {
icon = hover ? ICON_EXPANDED_HOVER : ICON_EXPANDED;
}
final Point point = this.pointByNode.get(node);
GL11.glColor4f(1, 1, 1, 1);
icon.draw(point.x + SLOT_SIZE / 2 - icon.width - 1, point.y + SLOT_SIZE + 1);
}
private void drawDeleteButton(Point point) {
final float[] badge = badgeRect(point.x, point.y);
GL11.glPushMatrix();
GL11.glColor4f(1, 1, 1, 1);
GL11.glTranslatef(badge[0], badge[1], 350.0f);
GL11.glScalef(BADGE_SCALE, BADGE_SCALE, 1.0f);
ICON_REMOVE.draw(0, 0);
GL11.glPopMatrix();
}
private static float[] badgeRect(float x, float y) {
final float w = ICON_REMOVE.width * BADGE_SCALE;
final float h = ICON_REMOVE.height * BADGE_SCALE;
return new float[] { x - w / 2 + 1, y - h / 2 + 1, w, h };
}
private void drawParentLine(ItemTreeSlot node) {
if (!this.graph.parentOf.containsKey(node)) {
return;
}
final Point point = this.pointByNode.get(node);
final float x0 = point.x + SLOT_SIZE / 2f;
final float y0 = point.y - 1;
final ItemTreeSlot parentNode = this.graph.parentOf.get(node);
final Point parentPoint = this.pointByNode.get(parentNode);
final float x1 = parentPoint.x + SLOT_SIZE / 2f;
final float y1 = parentPoint.y + SLOT_SIZE;
if (x0 != x1) {
final float midY = (y0 + y1) / 2f;
NEIClientUtils.drawRect(x0, Math.min(y0, midY), 1, Math.abs(midY - y0) + 1, LINE_COLOR);
NEIClientUtils.drawRect(Math.min(x0, x1), midY, Math.abs(x1 - x0) + 1, 1, LINE_COLOR);
NEIClientUtils.drawRect(x1, Math.min(midY, y1), 1, Math.abs(y1 - midY) + 1, LINE_COLOR);
} else {
NEIClientUtils.drawRect(x0, Math.min(y0, y1), 1, Math.abs(y1 - y0) + 1, LINE_COLOR);
}
}
private void drawScrollbars() {
if (this.treeWidth <= 0 || this.treeHeight <= 0) {
return;
}
final float scrollXPct = Camera.clamp(this.camera.scrollX / this.treeWidth, 0.0f, 1.0f);
final float scrollYPct = Camera.clamp(this.camera.scrollY / this.treeHeight, 0.0f, 1.0f);
GL11.glTranslatef(0, 0, 500.0f);
SCROLLBAR_H.draw(
this.camera.widgetX + this.camera.widgetW - 3,
(int) (this.camera.widgetY + scrollYPct * (this.camera.widgetH - SCROLLBAR_H.height)));
SCROLLBAR_W.draw(
(int) (this.camera.widgetX + scrollXPct * (this.camera.widgetW - SCROLLBAR_W.width)),
this.camera.widgetY + this.camera.widgetH - 3);
GL11.glTranslatef(0, 0, -500.0f);
}
public void recalculateCoordinates(Set<RecipeId> collapsedRecipes, Set<BookmarkItem> collapsedItems,
ItemTreeSlot anchor) {
final Map<ItemTreeSlot, Integer> offsetFromParent = new HashMap<>();
final Point anchorOldPoint = anchor != null ? resolveAnchorPoint(anchor) : null;
this.collapsedRecipes.clear();
this.pointByNode.clear();
this.rows.clear();
this.treeWidth = 0;
this.treeHeight = 0;
this.collapsedRecipes.addAll(collapsedRecipes);
for (ItemTreeSlot node : this.graph.items) {
this.pointByNode.put(node, new Point(0, 0));
}
final List<int[]> contour = new ArrayList<>();
for (ItemTreeSlot root : this.graph.roots) {
final List<int[]> layout = computeLayout(root, collapsedItems, offsetFromParent);
final int shift = contour.isEmpty() ? 0 : requiredRootShift(contour, layout);
mergeContour(contour, layout, shift);
assignPositions(root, shift, 0, collapsedItems, offsetFromParent);
}
int minX = 0;
for (Point point : this.pointByNode.values()) {
minX = Math.min(minX, point.x);
}
if (minX < 0) {
for (Point point : this.pointByNode.values()) {
point.x -= minX;
}
}
for (List<ItemTreeSlot> row : this.rows.values()) {
for (ItemTreeSlot node : row) {
this.treeWidth = Math.max(this.treeWidth, this.pointByNode.get(node).x + CraftingTreeCanvas.SLOT_SIZE);
this.treeHeight = Math
.max(this.treeHeight, this.pointByNode.get(node).y + CraftingTreeCanvas.SLOT_SIZE);
}
}
if (anchorOldPoint != null) {
final Point anchorNewPoint = resolveAnchorPoint(anchor);
if (anchorNewPoint != null) {
this.camera.scrollX += anchorNewPoint.x - anchorOldPoint.x;
this.camera.scrollY += anchorNewPoint.y - anchorOldPoint.y;
}
}
}
private Point resolveAnchorPoint(ItemTreeSlot anchor) {
Point result = this.pointByNode.get(anchor);
if (result == null) {
for (Map.Entry<ItemTreeSlot, Point> entry : this.pointByNode.entrySet()) {
if (entry.getKey().ingrItem.equals(anchor.ingrItem)) {
return entry.getValue();
}
}
}
return result;
}
private List<int[]> computeLayout(ItemTreeSlot node, Set<BookmarkItem> collapsedItems,
Map<ItemTreeSlot, Integer> offsetFromParent) {
List<ItemTreeSlot> children = Collections.emptyList();
if (!collapsedItems.contains(node.ingrItem)) {
children = this.graph.childrenOf.getOrDefault(node, Collections.emptyList());
}
if (children.isEmpty()) {
final List<int[]> rows = new ArrayList<>();
rows.add(new int[] { 0, 0 });
return rows;
}
final int[] offsets = new int[children.size()];
final List<int[]> combined = new ArrayList<>();
for (int i = 0; i < children.size(); i++) {
final List<int[]> childRows = computeLayout(children.get(i), collapsedItems, offsetFromParent);
final int shift = i == 0 ? 0 : requiredShift(combined, childRows, X_SPACING);
offsets[i] = shift;
mergeContour(combined, childRows, shift);
}
final int selfX = (offsets[0] + offsets[children.size() - 1]) / 2;
for (int i = 0; i < children.size(); i++) {
offsetFromParent.put(children.get(i), offsets[i] - selfX);
}
for (int[] row : combined) {
row[0] -= selfX;
row[1] -= selfX;
}
final List<int[]> rows = new ArrayList<>(combined.size() + 1);
rows.add(new int[] { 0, 0 });
rows.addAll(combined);
return rows;
}
private static int requiredShift(List<int[]> existing, List<int[]> incoming, int spacing) {
int shift = 0;
final int rows = Math.min(existing.size(), incoming.size());
for (int r = 0; r < rows; r++) {
shift = Math.max(shift, existing.get(r)[1] + spacing - incoming.get(r)[0]);
}
return shift;
}
private static int requiredRootShift(List<int[]> existing, List<int[]> incoming) {
int existingRight = Integer.MIN_VALUE;
for (int[] row : existing) {
existingRight = Math.max(existingRight, row[1]);
}
int incomingLeft = Integer.MAX_VALUE;
for (int[] row : incoming) {
incomingLeft = Math.min(incomingLeft, row[0]);
}
return Math.max(0, existingRight + ROOT_SPACING - incomingLeft);
}
private static void mergeContour(List<int[]> target, List<int[]> source, int shift) {
for (int r = 0; r < source.size(); r++) {
final int left = source.get(r)[0] + shift;
final int right = source.get(r)[1] + shift;
if (r < target.size()) {
target.get(r)[0] = Math.min(target.get(r)[0], left);
target.get(r)[1] = Math.max(target.get(r)[1], right);
} else {
target.add(new int[] { left, right });
}
}
}
private void assignPositions(ItemTreeSlot node, int x, int y, Set<BookmarkItem> collapsedItems,
Map<ItemTreeSlot, Integer> offsetFromParent) {
this.rows.computeIfAbsent(y, ignored -> new ArrayList<>()).add(node);
this.pointByNode.put(node, new Point(x, y));
final int childY = y + CraftingTreeCanvas.SLOT_SIZE + Y_SPACING;
if (!collapsedItems.contains(node.ingrItem)) {
for (ItemTreeSlot child : this.graph.childrenOf.getOrDefault(node, Collections.emptyList())) {
assignPositions(child, x + offsetFromParent.get(child), childY, collapsedItems, offsetFromParent);
}
}
}
}
@@ -0,0 +1,99 @@
package codechicken.nei.bookmark.tree;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import codechicken.nei.recipe.Recipe.RecipeId;
public class CraftingTreeGraph {
public final List<ItemTreeSlot> roots = new ArrayList<>();
public final List<ItemTreeSlot> items = new ArrayList<>();
public final Map<ItemTreeSlot, ItemTreeSlot> parentOf = new HashMap<>();
public final Map<ItemTreeSlot, List<ItemTreeSlot>> childrenOf = new HashMap<>();
public final Set<ItemTreeSlot> subtreeMissingCache = new HashSet<>();
public final Set<ItemTreeSlot> childrenNeedCraftingCache = new HashSet<>();
public void rebuild(CraftingTreeMath math) {
this.subtreeMissingCache.clear();
this.childrenNeedCraftingCache.clear();
math.refresh();
this.roots.clear();
this.roots.addAll(math.rootSlots);
this.items.clear();
this.items.addAll(math.items);
this.parentOf.clear();
this.parentOf.putAll(math.parentOf);
this.childrenOf.clear();
this.childrenOf.putAll(math.childrenOf);
for (ItemTreeSlot root : this.roots) {
computeSubtreeMissing(root);
}
for (Map.Entry<ItemTreeSlot, List<ItemTreeSlot>> entry : this.childrenOf.entrySet()) {
if (entry.getValue().stream().anyMatch(child -> child.leftAmount != 0)) {
this.childrenNeedCraftingCache.add(entry.getKey());
}
}
}
public Set<RecipeId> collectUnusedRecipes(ItemTreeSlot node) {
final Map<RecipeId, Set<RecipeId>> children = new HashMap<>();
final Map<RecipeId, Set<RecipeId>> consumers = new HashMap<>();
int rootCount = 0;
for (ItemTreeSlot item : this.items) {
if (item.prefItem != null) {
children.computeIfAbsent(item.ingrItem.recipeId, k -> new HashSet<>()).add(item.prefItem.recipeId);
consumers.computeIfAbsent(item.prefItem.recipeId, k -> new HashSet<>()).add(item.ingrItem.recipeId);
if (item.ingrItem.recipeId.equals(node.prefItem.recipeId)) {
rootCount++;
}
}
}
final Set<RecipeId> unusedRecipes = new HashSet<>();
final RecipeId rootRecipeId = node.prefItem.recipeId;
if (rootCount <= 1) {
unusedRecipes.add(rootRecipeId);
collectSubtree(rootRecipeId, children, consumers, unusedRecipes);
}
return unusedRecipes;
}
private void collectSubtree(RecipeId recipeId, Map<RecipeId, Set<RecipeId>> children,
Map<RecipeId, Set<RecipeId>> consumers, Set<RecipeId> unusedRecipes) {
for (RecipeId child : children.getOrDefault(recipeId, Collections.emptySet())) {
if (consumers.get(child).size() == 1 && unusedRecipes.add(child)) {
collectSubtree(child, children, consumers, unusedRecipes);
}
}
}
private boolean computeSubtreeMissing(ItemTreeSlot node) {
boolean hasMissing = !this.childrenOf.containsKey(node);
for (ItemTreeSlot child : this.childrenOf.getOrDefault(node, Collections.emptyList())) {
hasMissing |= child.leftAmount != 0 && computeSubtreeMissing(child);
}
if (hasMissing) {
this.subtreeMissingCache.add(node);
}
return hasMissing;
}
}
@@ -0,0 +1,149 @@
package codechicken.nei.bookmark.tree;
import java.util.ArrayDeque;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Deque;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import codechicken.nei.bookmark.BookmarkItem;
import codechicken.nei.bookmark.BookmarkItem.BookmarkItemType;
import codechicken.nei.recipe.Recipe.RecipeId;
import codechicken.nei.recipe.chain.RecipeChainMath;
public class CraftingTreeMath extends RecipeChainMath {
public final List<ItemTreeSlot> rootSlots = new ArrayList<>();
public final List<ItemTreeSlot> items = new ArrayList<>();
public final Map<ItemTreeSlot, ItemTreeSlot> parentOf = new HashMap<>();
public final Map<ItemTreeSlot, List<ItemTreeSlot>> childrenOf = new HashMap<>();
private final Deque<ItemTreeSlot> parentStack = new ArrayDeque<>();
private ItemTreeSlot lastItem = null;
public CraftingTreeMath(List<BookmarkItem> chainItems, Set<RecipeId> collapsedRecipes) {
super(chainItems, collapsedRecipes);
}
@Override
public RecipeChainMath refresh() {
this.rootSlots.clear();
this.items.clear();
this.parentOf.clear();
this.childrenOf.clear();
this.parentStack.clear();
this.lastItem = null;
return super.refresh();
}
@Override
protected void calculationStepTrigger(BookmarkItem ingrItem, BookmarkItem prefItem, long requestedAmount,
long containerAmount, long inventoryAmount, long ingrAmount, long produced) {
if (ingrItem.type == BookmarkItemType.RESULT) {
final ItemTreeSlot slot = new ItemTreeSlot(
ingrItem,
Math.max(0, this.requiredAmount.get(prefItem) - requestedAmount),
requestedAmount,
this.requiredAmount.get(prefItem),
0,
prefItem);
this.rootSlots.add(slot);
this.items.add(slot);
this.lastItem = slot;
} else {
if (prefItem != null && hasContainerItem(prefItem.itemStack)) {
if (requestedAmount > 1) {
final long requestedSteps = getToolsContainerItems(
prefItem.itemStack.copy(),
requestedAmount).leftSteps;
requestedAmount = (long) Math
.ceil((double) requestedAmount / Math.max(1, requestedAmount - requestedSteps));
}
if (containerAmount > 1) {
final long containerSteps = getToolsContainerItems(
prefItem.itemStack.copy(),
containerAmount).leftSteps;
containerAmount = (long) Math
.ceil((double) containerAmount / Math.max(1, containerAmount - containerSteps));
}
}
final ItemTreeSlot slot = new ItemTreeSlot(
ingrItem,
0,
requestedAmount,
produced,
containerAmount,
prefItem);
this.items.add(slot);
this.parentOf.put(slot, this.parentStack.peek());
this.childrenOf.computeIfAbsent(this.parentStack.peek(), k -> new ArrayList<>()).add(slot);
this.lastItem = slot;
}
}
@Override
protected void prepareIngredients(RecipeId recipeId, long multiplier, List<RecipeId> visited) {
this.parentStack.push(this.lastItem);
super.prepareIngredients(recipeId, multiplier, visited);
this.lastItem = this.parentStack.pop();
}
@Override
protected void calculateSuitableRecipe(BookmarkItem ingrItem, long ingrMultiplier, List<RecipeId> visited) {
final BookmarkItem prefItem = this.preferredItems.get(ingrItem);
super.calculateSuitableRecipe(ingrItem, ingrMultiplier, visited);
if (prefItem != null && !isForeignBoxBoundary(ingrItem)
&& !visited.contains(prefItem.recipeId)
&& !this.childrenOf.containsKey(this.lastItem)) {
visited.add(prefItem.recipeId);
prepareIngredients(prefItem.recipeId, visited);
visited.remove(prefItem.recipeId);
}
}
protected void prepareIngredients(RecipeId recipeId, List<RecipeId> visited) {
this.parentStack.push(this.lastItem);
for (BookmarkItem item : this.ingredientsByRecipe.getOrDefault(recipeId, Collections.emptyList())) {
if (!item.emptyFactor()) {
calculateSuitableRecipe(item, visited);
}
}
this.lastItem = this.parentStack.pop();
}
protected void calculateSuitableRecipe(BookmarkItem ingrItem, List<RecipeId> visited) {
final BookmarkItem prefItem = this.preferredItems.get(ingrItem);
final ItemTreeSlot slot = new ItemTreeSlot(ingrItem, 0, 0, 0, 0, prefItem);
this.items.add(slot);
this.parentOf.put(slot, this.parentStack.peek());
this.childrenOf.computeIfAbsent(this.parentStack.peek(), k -> new ArrayList<>()).add(slot);
this.lastItem = slot;
if (prefItem != null && !isForeignBoxBoundary(ingrItem) && !visited.contains(prefItem.recipeId)) {
visited.add(prefItem.recipeId);
prepareIngredients(prefItem.recipeId, visited);
visited.remove(prefItem.recipeId);
}
}
}
@@ -0,0 +1,105 @@
package codechicken.nei.bookmark.tree;
import java.util.EnumSet;
import java.util.HashSet;
import java.util.Set;
import codechicken.nei.NEIClientConfig;
import codechicken.nei.bookmark.BookmarkItem;
class CraftingTreeState {
enum CollapseMode {
EXPANDED,
SMART,
ALL
}
enum StatsSection {
INGREDIENTS_NEEDED,
INGREDIENTS_AVAILABLE,
CRAFTING_NEEDED,
CRAFTING_AVAILABLE,
RESULTS,
REMAINDERS,
HANDLERS
}
private static final String KEY_STATS_VISIBLE = "craftingTree.statsVisible";
private static final String KEY_STATS_SECTIONS = "craftingTree.statsSections";
private static final String KEY_USE_INVENTORY_SNAPSHOT = "craftingTree.useInventorySnapshot";
private static final String KEY_COLLAPSE_MODE = "craftingTree.collapseMode";
public boolean statsPanelVisible = true;
public final Set<StatsSection> visibleStatsSections = EnumSet.allOf(StatsSection.class);
public boolean useInventorySnapshot = false;
public CollapseMode collapseMode = CollapseMode.EXPANDED;
public final Set<BookmarkItem> collapsedItems = new HashSet<>();
public ItemTreeSlot replaceRecipeNode;
public SearchResult searchItemResult;
public SearchResult searchStatsResult;
public void load() {
this.statsPanelVisible = !NEIClientConfig.world.nbt.hasKey(KEY_STATS_VISIBLE)
|| NEIClientConfig.world.nbt.getBoolean(KEY_STATS_VISIBLE);
final int savedSectionsMask = NEIClientConfig.world.nbt.hasKey(KEY_STATS_SECTIONS)
? NEIClientConfig.world.nbt.getInteger(KEY_STATS_SECTIONS)
: -1;
this.visibleStatsSections.clear();
for (StatsSection section : StatsSection.values()) {
if ((savedSectionsMask & (1 << section.ordinal())) != 0) {
this.visibleStatsSections.add(section);
}
}
this.useInventorySnapshot = NEIClientConfig.world.nbt.getBoolean(KEY_USE_INVENTORY_SNAPSHOT);
final CollapseMode[] collapseModes = CollapseMode.values();
final int savedCollapseMode = NEIClientConfig.world.nbt.getInteger(KEY_COLLAPSE_MODE);
this.collapseMode = savedCollapseMode >= 0 && savedCollapseMode < collapseModes.length
? collapseModes[savedCollapseMode]
: CollapseMode.EXPANDED;
this.replaceRecipeNode = null;
}
public void toggleStatsPanelVisible() {
this.statsPanelVisible = !this.statsPanelVisible;
NEIClientConfig.world.nbt.setBoolean(KEY_STATS_VISIBLE, this.statsPanelVisible);
}
public void toggleStatsSection(StatsSection section) {
if (!this.visibleStatsSections.remove(section)) {
this.visibleStatsSections.add(section);
}
int mask = 0;
for (StatsSection visibleSection : this.visibleStatsSections) {
mask |= 1 << visibleSection.ordinal();
}
NEIClientConfig.world.nbt.setInteger(KEY_STATS_SECTIONS, mask);
}
public void toggleUseInventorySnapshot() {
this.useInventorySnapshot = !this.useInventorySnapshot;
NEIClientConfig.world.nbt.setBoolean(KEY_USE_INVENTORY_SNAPSHOT, this.useInventorySnapshot);
}
public void cycleCollapseMode() {
final CollapseMode[] collapseModes = CollapseMode.values();
this.collapseMode = collapseModes[(this.collapseMode.ordinal() + 1) % collapseModes.length];
NEIClientConfig.world.nbt.setInteger(KEY_COLLAPSE_MODE, this.collapseMode.ordinal());
}
public SearchResult activeSearchResult() {
return this.searchItemResult != null ? this.searchItemResult : this.searchStatsResult;
}
}
@@ -0,0 +1,241 @@
package codechicken.nei.bookmark.tree;
import java.util.Arrays;
import java.util.List;
import java.util.function.BooleanSupplier;
import java.util.function.Supplier;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiButton;
import org.lwjgl.opengl.GL11;
import codechicken.nei.GuiNEIButton;
import codechicken.nei.NEIClientUtils;
import codechicken.nei.drawable.DrawableBuilder;
import codechicken.nei.drawable.DrawableResource;
class CraftingTreeToolbar {
private static class GuiStatsButton extends GuiNEIButton {
private final Supplier<DrawableResource> icon;
private final BooleanSupplier isEnabled;
private final Supplier<String> tooltip;
public GuiStatsButton(int buttonId, Supplier<DrawableResource> icon, Supplier<String> tooltip,
BooleanSupplier isEnabled) {
super(buttonId, 0, 0, 16, 16, "");
this.tooltip = tooltip;
this.icon = icon;
this.isEnabled = isEnabled;
}
public String getTooltip() {
return this.tooltip.get();
}
@Override
public int getHoverState(boolean mouseOver) {
return this.isEnabled.getAsBoolean() ? 0 : super.getHoverState(mouseOver);
}
@Override
protected void drawContent(Minecraft minecraft, int y, int x, boolean mouseOver) {
final DrawableResource icon = this.icon.get();
final int iconX = this.xPosition + (this.width - icon.width / 2) / 2;
final int iconY = this.yPosition + (this.height - icon.height / 2) / 2;
GL11.glPushMatrix();
GL11.glColor4f(1, 1, 1, 1);
GL11.glEnable(GL11.GL_BLEND);
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
GL11.glTranslated(iconX, iconY, 0);
GL11.glScalef(0.5f, 0.5f, 1);
icon.bindTexture();
GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, GL11.GL_LINEAR);
GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MAG_FILTER, GL11.GL_LINEAR);
icon.draw(0, 0);
GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, GL11.GL_NEAREST);
GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MAG_FILTER, GL11.GL_NEAREST);
GL11.glDisable(GL11.GL_BLEND);
GL11.glPopMatrix();
}
}
private static final DrawableResource STATS_TEXTURE = new DrawableBuilder(
"nei:textures/gui/craftingtree.png",
2,
66,
16,
16).build();
private static final DrawableResource COMPACT_STATS_TEXTURE = new DrawableBuilder(
"nei:textures/gui/craftingtree.png",
20,
66,
16,
16).build();
private static final DrawableResource FIT_TEXTURE = new DrawableBuilder(
"nei:textures/gui/craftingtree.png",
38,
66,
16,
16).build();
private static final DrawableResource INV_TEXTURE = new DrawableBuilder(
"nei:textures/gui/craftingtree.png",
56,
66,
16,
16).build();
private static final DrawableResource LINK_TEXTURE = new DrawableBuilder(
"nei:textures/gui/craftingtree.png",
74,
66,
16,
16).build();
private static final DrawableResource ICON_COLLAPSED = new DrawableBuilder(
"nei:textures/gui/craftingtree.png",
92,
66,
16,
16).build();
private static final DrawableResource ICON_INDETERMINATE = new DrawableBuilder(
"nei:textures/gui/craftingtree.png",
110,
66,
16,
16).build();
private static final DrawableResource ICON_EXPANDED = new DrawableBuilder(
"nei:textures/gui/craftingtree.png",
128,
66,
16,
16).build();
private static final DrawableResource ICON_SCREENSHOT = new DrawableBuilder(
"nei:textures/gui/craftingtree.png",
146,
66,
16,
16).build();
private static final DrawableResource ICON_SETTINGS = new DrawableBuilder(
"nei:textures/gui/craftingtree.png",
164,
66,
16,
16).build();
private static final int BUTTON_SPACING = 20;
public static final int INV_BUTTON_ID = 0;
public static final int FIT_BUTTON_ID = 1;
public static final int COLLAPSE_ALL_BUTTON_ID = 2;
public static final int TOGGLE_STATS_BUTTON_ID = 3;
public static final int STATS_SECTIONS_BUTTON_ID = 4;
public static final int LINK_BUTTON_ID = 5;
public static final int SCREENSHOT_BUTTON_ID = 6;
private final CraftingTreeState uiState;
private final GuiStatsButton[] buttons;
public CraftingTreeToolbar(CraftingTreeState uiState) {
this.uiState = uiState;
this.buttons = new GuiStatsButton[] {
new GuiStatsButton(
INV_BUTTON_ID,
() -> INV_TEXTURE,
() -> NEIClientUtils.translate(
this.uiState.useInventorySnapshot ? "bookmark.tree.toolbar.inventory_on"
: "bookmark.tree.toolbar.inventory_off"),
() -> this.uiState.useInventorySnapshot),
new GuiStatsButton(
FIT_BUTTON_ID,
() -> FIT_TEXTURE,
() -> NEIClientUtils.translate("bookmark.tree.toolbar.fit_to_view"),
() -> false),
new GuiStatsButton(COLLAPSE_ALL_BUTTON_ID, () -> switch (this.uiState.collapseMode) {
case EXPANDED -> ICON_EXPANDED;
case SMART -> ICON_INDETERMINATE;
case ALL -> ICON_COLLAPSED;
}, () -> NEIClientUtils.translate(switch (this.uiState.collapseMode) {
case EXPANDED -> "bookmark.tree.toolbar.collapse_resolved";
case SMART -> "bookmark.tree.toolbar.collapse_all";
case ALL -> "bookmark.tree.toolbar.expand_all";
}), () -> this.uiState.collapseMode != CraftingTreeState.CollapseMode.EXPANDED),
new GuiStatsButton(
TOGGLE_STATS_BUTTON_ID,
() -> this.uiState.visibleStatsSections.size() == CraftingTreeState.StatsSection.values().length
? STATS_TEXTURE
: COMPACT_STATS_TEXTURE,
() -> NEIClientUtils.translate(
this.uiState.statsPanelVisible ? "bookmark.tree.toolbar.stats_on"
: "bookmark.tree.toolbar.stats_off"),
() -> this.uiState.statsPanelVisible),
new GuiStatsButton(
STATS_SECTIONS_BUTTON_ID,
() -> ICON_SETTINGS,
() -> NEIClientUtils.translate("bookmark.tree.toolbar.stats_sections"),
() -> false),
new GuiStatsButton(
LINK_BUTTON_ID,
() -> LINK_TEXTURE,
() -> NEIClientUtils.translate("bookmark.tree.toolbar.link"),
() -> false),
new GuiStatsButton(
SCREENSHOT_BUTTON_ID,
() -> ICON_SCREENSHOT,
() -> NEIClientUtils.translate("bookmark.tree.toolbar.screenshot"),
() -> false)
};
}
public void layout(int x, int y) {
for (int i = 0; i < this.buttons.length; i++) {
this.buttons[i].xPosition = x + BUTTON_SPACING * i;
this.buttons[i].yPosition = y;
}
}
public void addTo(List<GuiButton> buttonList) {
buttonList.addAll(Arrays.asList(this.buttons));
}
public GuiButton getButton(int buttonId) {
for (int i = 0; i < this.buttons.length; i++) {
if (this.buttons[i].id == buttonId) {
return this.buttons[i];
}
}
return null;
}
public String getTooltip(Minecraft mc, int mousex, int mousey) {
for (GuiStatsButton button : this.buttons) {
if (button.mousePressed(mc, mousex, mousey)) {
return button.getTooltip();
}
}
return null;
}
}
File diff suppressed because it is too large. Load diff
@@ -0,0 +1,90 @@
package codechicken.nei.bookmark.tree;
import net.minecraft.item.ItemStack;
import codechicken.nei.bookmark.BookmarkItem;
import codechicken.nei.recipe.GuiRecipeTab;
import codechicken.nei.recipe.HandlerInfo;
import codechicken.nei.recipe.StackInfo;
class ItemTreeSlot {
public final BookmarkItem ingrItem;
public final BookmarkItem prefItem;
public final long ingeritRequestedAmount;
public final long currentRequestedAmount;
public final long requestedAmount;
public final long containerAmount;
public final long producedAmount;
public final long leftAmount;
public final ItemStack emptyStack;
public final ItemStack itemStack;
public final boolean isFluidDisplay;
public final boolean isContainerItem;
public final HandlerInfo info;
public final long multiplier;
public ItemTreeSlot(BookmarkItem ingrItem, long ingeritRequestedAmount, long currentRequestedAmount,
long producedAmount, long containerAmount, BookmarkItem prefItem) {
this.ingrItem = ingrItem;
this.ingeritRequestedAmount = ingeritRequestedAmount;
this.currentRequestedAmount = currentRequestedAmount;
this.requestedAmount = ingeritRequestedAmount + currentRequestedAmount;
this.containerAmount = containerAmount;
this.producedAmount = producedAmount;
this.leftAmount = producedAmount + containerAmount;
this.prefItem = prefItem;
if (prefItem != null) {
this.info = handlerInfo(prefItem.recipeId.getHandlerName());
this.multiplier = prefItem.getMultiplierFromAmount(this.requestedAmount);
this.itemStack = prefItem.getItemStack(this.requestedAmount);
this.emptyStack = prefItem.getItemStack(0);
} else {
this.info = null;
this.multiplier = ingrItem.getMultiplierFromAmount(this.requestedAmount);
this.itemStack = ingrItem.getItemStack(this.requestedAmount);
this.emptyStack = ingrItem.getItemStack(0);
}
this.isFluidDisplay = StackInfo.isFluidDisplayItem(this.emptyStack);
this.isContainerItem = isContainerItem(this.emptyStack);
}
private static HandlerInfo handlerInfo(String handlerName) {
final HandlerInfo info = GuiRecipeTab.getHandlerInfo(handlerName, null);
return info != null ? info : GuiRecipeTab.DEFAULT_HANDLER_INFO;
}
private static boolean isContainerItem(ItemStack stack) {
boolean isContainerItem = false;
if (stack.getItem().hasContainerItem(stack)) {
final boolean isPausedItemDamageSound = StackInfo.isPausedItemDamageSound();
try {
StackInfo.pauseItemDamageSound(true);
final ItemStack containerItem = stack.getItem().getContainerItem(stack);
if (containerItem != null) {
isContainerItem = stack.getItem() == containerItem.getItem();
}
} finally {
StackInfo.pauseItemDamageSound(isPausedItemDamageSound);
}
}
return isContainerItem;
}
}
@@ -0,0 +1,28 @@
package codechicken.nei.bookmark.tree;
import java.util.LinkedHashSet;
import java.util.Set;
import net.minecraft.item.ItemStack;
import codechicken.nei.NEIClientUtils;
class SearchResult {
public final Object searchGUID;
public ItemTreeSlot highlightNode;
public final Set<ItemTreeSlot> searchMatches = new LinkedHashSet<>();
public SearchResult(Object searchGUID) {
this.searchGUID = searchGUID;
}
public boolean matchesGUID(Object guid) {
if (guid instanceof ItemStack stack && this.searchGUID instanceof ItemStack searchStack) {
return NEIClientUtils.areStacksSameTypeCraftingWithNBT(stack, searchStack);
}
return this.searchGUID.equals(guid);
}
}
@@ -0,0 +1,748 @@
package codechicken.nei.bookmark.tree;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import net.minecraft.client.renderer.RenderHelper;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
import codechicken.lib.gui.GuiDraw;
import codechicken.lib.vec.Rectangle4i;
import codechicken.nei.ItemSorter;
import codechicken.nei.ItemStackAmount;
import codechicken.nei.NEIClientUtils;
import codechicken.nei.NEIClientUtils.Alignment;
import codechicken.nei.Widget;
import codechicken.nei.bookmark.BookmarkItem;
import codechicken.nei.drawable.DrawableBuilder;
import codechicken.nei.drawable.DrawableResource;
import codechicken.nei.guihook.GuiContainerManager;
import codechicken.nei.recipe.GuiRecipeTab;
import codechicken.nei.recipe.HandlerInfo;
import codechicken.nei.recipe.Recipe.RecipeId;
import codechicken.nei.recipe.StackInfo;
import codechicken.nei.recipe.chain.RecipeChainMath;
import codechicken.nei.scroll.ScrollBar;
import codechicken.nei.scroll.ScrollContainer;
import codechicken.nei.util.ReadableNumberConverter;
class StatsPanel extends ScrollContainer {
public static class HandlerStats {
public long iterations;
public long recipeCount;
}
private static class SectionLabel extends Widget {
public final String text;
public SectionLabel(String text) {
this.text = text;
this.w = GuiDraw.fontRenderer.getStringWidth(text);
this.h = GuiDraw.fontRenderer.FONT_HEIGHT + 4;
}
@Override
public void draw(int mx, int my) {
NEIClientUtils.gl2DRenderContext(
() -> GuiDraw.fontRenderer.drawStringWithShadow(this.text, this.x, this.y, 0xFFFFFFFF));
}
}
public static class ItemStatsSlot extends Widget {
public final ItemStack stack;
public final long stackSize;
public final RecipeId recipeId;
public final long multiplier;
public final HandlerInfo info;
public final DrawableResource icon;
private final boolean isFluidDisplay;
public boolean highlight = false;
public ItemStatsSlot(ItemStack stack, long stackSize, DrawableResource icon, RecipeId recipeId,
long multiplier) {
this.stack = StackInfo.withAmount(stack, 0);
this.stackSize = stackSize;
this.icon = icon;
this.recipeId = recipeId;
this.multiplier = multiplier;
this.isFluidDisplay = StackInfo.isFluidDisplayItem(stack);
this.info = this.recipeId != null ? handlerInfo(this.recipeId.getHandlerName()) : null;
this.w = SLOT_SIZE;
this.h = SLOT_SIZE;
}
public ItemStatsSlot(ItemStack stack, long stackSize, DrawableResource icon) {
this(stack, stackSize, icon, null, 1);
}
public ItemStack getStack() {
return StackInfo.withAmount(this.stack, stackSize);
}
@Override
public void draw(int mx, int my) {
if (this.highlight) {
SLOT_HIGHLIGHTED.draw(this.x, this.y);
} else {
this.icon.draw(this.x, this.y);
}
GuiContainerManager
.drawItem(this.x + (SLOT_SIZE - 16) / 2, this.y + (SLOT_SIZE - 16) / 2, this.stack, true, "");
drawStackSize();
if (mx >= this.x && mx < this.x + SLOT_SIZE && my >= this.y && my < this.y + SLOT_SIZE) {
NEIClientUtils.gl2DRenderContext(
() -> GuiDraw.drawRect(this.x + 1, this.y + 1, SLOT_SIZE - 2, SLOT_SIZE - 2, HOVER_COLOR));
}
if (this.recipeId != null) {
drawHandlerBadge();
}
}
private void drawHandlerBadge() {
final float scale = 0.6f;
final float badgeX = x - 6 * scale;
GL11.glPushMatrix();
GL11.glColor4f(1, 1, 1, 1);
GL11.glTranslatef(badgeX, y - 6 * scale, 3.0f);
GL11.glScalef(scale, scale, 1.0f);
if (this.info.hasImageOrItem()) {
final DrawableResource image = this.info.getImage();
if (image != null) {
image.draw(0, 0);
} else {
GuiContainerManager.drawItem(0, 0, this.info.getItemStack(), true);
}
} else {
ICON_CRAFTING.draw(0, 0);
}
GL11.glPopMatrix();
}
private void drawStackSize() {
String amountString = stackSize < 10_000 ? String.valueOf(stackSize)
: ReadableNumberConverter.INSTANCE.toWideReadableForm(stackSize);
if (this.isFluidDisplay) {
amountString += "L";
}
NEIClientUtils.drawNEIOverlayText(
amountString,
new Rectangle4i(
x + (SLOT_SIZE - 16) / 2,
y + (SLOT_SIZE - 16) / 2,
SLOT_SIZE - (SLOT_SIZE - 16),
SLOT_SIZE - (SLOT_SIZE - 16)),
1,
0xFFFFFF,
true,
this.isFluidDisplay ? Alignment.BottomLeft : Alignment.BottomRight);
}
}
public static class HandlerStatsSlot extends Widget {
public final String handlerName;
public final HandlerInfo info;
public final HandlerStats stats;
public boolean highlight = false;
public HandlerStatsSlot(String handlerName, HandlerStats stats) {
this.handlerName = handlerName;
this.info = handlerInfo(handlerName);
this.stats = stats;
this.w = SLOT_SIZE;
this.h = SLOT_SIZE;
}
@Override
public void draw(int mx, int my) {
if (this.highlight) {
SLOT_HIGHLIGHTED.draw(this.x, this.y);
} else {
SLOT_DEFAULT.draw(this.x, this.y);
}
if (this.info.hasImageOrItem()) {
final DrawableResource image = this.info.getImage();
if (image != null) {
image.draw(this.x + (SLOT_SIZE - 16) / 2, this.y + (SLOT_SIZE - 16) / 2);
} else {
GuiContainerManager.drawItem(
this.x + (SLOT_SIZE - 16) / 2,
this.y + (SLOT_SIZE - 16) / 2,
this.info.getItemStack(),
true);
}
} else {
ICON_CRAFTING.draw(this.x + (SLOT_SIZE - 16) / 2, this.y + (SLOT_SIZE - 16) / 2);
}
NEIClientUtils.drawNEIOverlayText(
"x" + ReadableNumberConverter.INSTANCE.toWideReadableForm(this.stats.iterations),
new Rectangle4i(this.x + 1, this.y + 1, SLOT_SIZE - 2, SLOT_SIZE - 2),
1,
0xFFFFFF,
true,
Alignment.TopLeft);
NEIClientUtils.drawNEIOverlayText(
ReadableNumberConverter.INSTANCE.toWideReadableForm(this.stats.recipeCount),
new Rectangle4i(this.x + 1, this.y + 1, SLOT_SIZE - 2, SLOT_SIZE - 2),
1,
0xFFFFFF,
true,
Alignment.BottomRight);
if (mx >= this.x && mx < this.x + SLOT_SIZE && my >= this.y && my < this.y + SLOT_SIZE) {
NEIClientUtils.gl2DRenderContext(
() -> GuiDraw.drawRect(this.x + 1, this.y + 1, SLOT_SIZE - 2, SLOT_SIZE - 2, HOVER_COLOR));
}
}
}
private static final int SLOT_SIZE = 18;
private static final int SLOT_INLINE_GAP = 2;
private static final int SLOT_BLOCK_GAP = 2;
private static final int COLUMN_GAP = 10;
private static final int HOVER_COLOR = 0x66999999;
private static final DrawableResource BG_TEXTURE = new DrawableBuilder(
"nei:textures/gui/craftingtree.png",
26,
84,
46,
16).build();
private static final DrawableResource SLOT_DEFAULT = new DrawableBuilder(
"nei:textures/gui/craftingtree.png",
68,
26,
18,
18).build();
private static final DrawableResource SLOT_MISSING = new DrawableBuilder(
"nei:textures/gui/craftingtree.png",
92,
26,
18,
18).build();
private static final DrawableResource SLOT_CRAFTING = new DrawableBuilder(
"nei:textures/gui/craftingtree.png",
116,
26,
18,
18).build();
private static final DrawableResource SLOT_DISABLED = new DrawableBuilder(
"nei:textures/gui/craftingtree.png",
140,
26,
18,
18).build();
private static final DrawableResource SLOT_HIGHLIGHTED = new DrawableBuilder(
"nei:textures/gui/craftingtree.png",
164,
26,
18,
18).build();
private static final DrawableResource ICON_CRAFTING = new DrawableBuilder(
"nei:textures/gui/craftingtree.png",
67,
48,
16,
16).build();
private static final int Z_OFFSET = 100;
public StatsPanel() {
final ScrollBar scrollbar = new ScrollBar().setTrackWidth(4)
.setThumbTexture(new DrawableBuilder("nei:textures/gui/craftingtree.png", 26, 100, 24, 4).build(), 0, 0)
.setTrackTexture(new DrawableBuilder("nei:textures/gui/craftingtree.png", 26, 104, 24, 4).build(), 0, 0)
.setTrackPadding(1, -5, 1, 0).setOverflowType(ScrollBar.OverflowType.AUTO);
setHorizontalScroll(scrollbar);
setPaddingBlock(4, 4);
setPaddingInline(1, 1);
}
public void rebuild(RecipeChainMath math, CraftingTreeGraph graph, boolean useInventorySnapshot,
Set<CraftingTreeState.StatsSection> sections, int widgetX, int widgetY, int widgetW, int widgetH) {
clear();
final List<String> labels = new ArrayList<>();
final List<List<Widget>> sectionGroups = new ArrayList<>();
final List<Widget> inputsAndAvailable = new ArrayList<>();
if (sections.contains(CraftingTreeState.StatsSection.INGREDIENTS_NEEDED)) {
inputsAndAvailable.addAll(collectInputs(math, useInventorySnapshot));
}
if (sections.contains(CraftingTreeState.StatsSection.INGREDIENTS_AVAILABLE)) {
inputsAndAvailable.addAll(collectAvailable(math));
}
if (!inputsAndAvailable.isEmpty()) {
labels.add(NEIClientUtils.translate("bookmark.tree.stats.ingredients"));
sectionGroups.add(inputsAndAvailable);
}
final boolean showCraftingNeeded = sections.contains(CraftingTreeState.StatsSection.CRAFTING_NEEDED);
final boolean showCraftingAvailable = sections.contains(CraftingTreeState.StatsSection.CRAFTING_AVAILABLE);
if (showCraftingNeeded || showCraftingAvailable) {
final List<Widget> craftingNeededSlot = new ArrayList<>();
final List<Widget> craftingAvailableSlot = new ArrayList<>();
final Map<BookmarkItem, Boolean> recipeMissing = new LinkedHashMap<>();
final Map<BookmarkItem, Integer> recipeLevel = new HashMap<>();
for (Map.Entry<ItemTreeSlot, List<ItemTreeSlot>> entry : graph.childrenOf.entrySet()) {
final ItemTreeSlot node = entry.getKey();
final boolean needsCrafting = graph.childrenNeedCraftingCache.contains(node);
recipeMissing.merge(node.prefItem, needsCrafting, (a, b) -> a || b);
recipeLevel.merge(node.prefItem, treeLevel(node, graph.parentOf), Math::max);
}
final List<Map.Entry<BookmarkItem, Boolean>> sortedRecipeMissing = new ArrayList<>(
recipeMissing.entrySet());
sortedRecipeMissing.sort(
Comparator.<Map.Entry<BookmarkItem, Boolean>>comparingInt(entry -> recipeLevel.get(entry.getKey()))
.thenComparing(entry -> entry.getKey().itemStack, ItemSorter.instance));
for (Map.Entry<BookmarkItem, Boolean> entry : sortedRecipeMissing) {
final BookmarkItem resultItem = entry.getKey();
final long amount = resultItem.getAmount();
if (amount > 0) {
final boolean missingIngredients = entry.getValue();
if (missingIngredients ? !showCraftingNeeded : !showCraftingAvailable) {
continue;
}
final List<Widget> slot = missingIngredients ? craftingNeededSlot : craftingAvailableSlot;
slot.add(
new ItemStatsSlot(
resultItem.itemStack,
resultItem.getStackSize(amount),
missingIngredients ? SLOT_DEFAULT : SLOT_CRAFTING,
resultItem.recipeId,
resultItem.getMultiplier()));
}
}
final List<Widget> craftingSlots = new ArrayList<>(craftingNeededSlot);
craftingSlots.addAll(craftingAvailableSlot);
if (!craftingSlots.isEmpty()) {
labels.add(NEIClientUtils.translate("bookmark.tree.stats.crafting"));
sectionGroups.add(craftingSlots);
}
}
final List<Widget> outputsAndRemainders = new ArrayList<>();
if (sections.contains(CraftingTreeState.StatsSection.RESULTS)) {
outputsAndRemainders.addAll(collectOutputs(math));
}
if (sections.contains(CraftingTreeState.StatsSection.REMAINDERS)) {
outputsAndRemainders.addAll(collectRemainder(math));
}
if (!outputsAndRemainders.isEmpty()) {
labels.add(NEIClientUtils.translate("bookmark.tree.stats.results"));
sectionGroups.add(outputsAndRemainders);
}
if (sections.contains(CraftingTreeState.StatsSection.HANDLERS)) {
final List<Widget> handlers = collectHandlers(math);
if (!handlers.isEmpty()) {
labels.add(NEIClientUtils.translate("bookmark.tree.stats.handlers"));
sectionGroups.add(handlers);
}
}
layoutSections(labels, sectionGroups, widgetX, widgetY, widgetW, widgetH);
}
private void layoutSections(List<String> labels, List<List<Widget>> sections, int widgetX, int widgetY, int widgetW,
int widgetH) {
final int maxRowWidth = Math.max(SLOT_SIZE, widgetW);
final int sectionCount = sections.size();
final int[] sizes = new int[sectionCount];
final int[] labelWidths = new int[sectionCount];
final int[] columns = new int[sectionCount];
final int maxRows = widgetH / ((GuiDraw.fontRenderer.FONT_HEIGHT + 4) + SLOT_SIZE * 2 + SLOT_BLOCK_GAP) > 3 ? 2
: 1;
for (int i = 0; i < sectionCount; i++) {
sizes[i] = sections.get(i).size();
labelWidths[i] = GuiDraw.fontRenderer.getStringWidth(labels.get(i) + ":");
columns[i] = sizes[i] == 0 ? 0 : (sizes[i] + maxRows - 1) / maxRows;
}
int compactWidth = COLUMN_GAP * Math.max(0, sectionCount - 1);
for (int i = 0; i < sectionCount; i++) {
compactWidth += sectionWidth(columns[i], labelWidths[i]);
}
if (compactWidth <= maxRowWidth) {
int budget = (maxRowWidth - compactWidth) / (SLOT_SIZE + SLOT_INLINE_GAP);
while (budget > 0) {
boolean grew = false;
for (int i = 0; i < sectionCount && budget > 0; i++) {
if (columns[i] < sizes[i]) {
columns[i]++;
--budget;
grew = true;
}
}
if (!grew) {
break;
}
}
}
final List<Widget> widgets = new ArrayList<>();
int cursorX = 0;
int maxHeight = 0;
for (int i = 0; i < sectionCount; i++) {
final int height = placeSection(widgets, labels.get(i), sections.get(i), columns[i], cursorX, 0);
maxHeight = Math.max(maxHeight, height);
cursorX += sectionWidth(columns[i], labelWidths[i]) + COLUMN_GAP;
}
final int contentW = Math.max(0, cursorX - COLUMN_GAP);
final int contentH = maxHeight;
final int maxVisibleH = maxRows * SLOT_SIZE + Math.max(0, maxRows - 1) * SLOT_BLOCK_GAP
+ GuiDraw.fontRenderer.FONT_HEIGHT
+ 4;
final int visibleHeight = Math.min(contentH, maxVisibleH);
this.w = widgetW;
this.x = widgetX;
this.h = visibleHeight + this.paddingBlockStart + this.paddingBlockEnd;
this.y = widgetY + widgetH - this.h;
final int xShift = contentW < this.w ? (this.w - contentW) / 2 : 0;
for (Widget widget : widgets) {
widget.x += xShift;
}
setWidgets(widgets);
update();
}
private static int sectionWidth(int columns, int labelWidth) {
return Math.max(columns * SLOT_SIZE + Math.max(0, columns - 1) * SLOT_INLINE_GAP, labelWidth);
}
private static int placeSection(List<Widget> widgets, String label, List<Widget> group, int columns, int x, int y) {
final SectionLabel sectionLabel = new SectionLabel(label + ":");
sectionLabel.x = x;
sectionLabel.y = y;
widgets.add(sectionLabel);
final int gridY = y + GuiDraw.fontRenderer.FONT_HEIGHT + 4;
final int rowWidth = columns * SLOT_SIZE + Math.max(0, columns - 1) * SLOT_INLINE_GAP;
int cursorX = 0;
int row = 0;
boolean any = false;
for (Widget entry : group) {
if (cursorX > 0) {
if (cursorX + SLOT_INLINE_GAP + SLOT_SIZE > rowWidth) {
cursorX = 0;
row++;
} else {
cursorX += SLOT_INLINE_GAP;
}
} else if (cursorX + SLOT_SIZE > rowWidth) {
cursorX = 0;
row++;
}
entry.x = x + cursorX;
entry.y = gridY + row * (SLOT_SIZE + SLOT_BLOCK_GAP);
widgets.add(entry);
cursorX += SLOT_SIZE;
any = true;
}
final int rows = any ? row + 1 : 0;
return (gridY - y) + rows * SLOT_SIZE + Math.max(0, rows - 1) * SLOT_BLOCK_GAP;
}
public ItemStack getStackMouseOver(int mouseX, int mouseY) {
final Widget widget = getWidgetUnderMouse(mouseX, mouseY);
return widget instanceof ItemStatsSlot slot && slot.recipeId == null ? slot.getStack() : null;
}
public void setHighlight(SearchResult searchResult) {
for (Widget widget : getWidgets()) {
if (widget instanceof HandlerStatsSlot slot) {
slot.highlight = searchResult != null && searchResult.matchesGUID(slot.handlerName);
} else if (widget instanceof ItemStatsSlot slot) {
slot.highlight = searchResult != null && searchResult.matchesGUID(slot.stack);
}
}
}
public Object getWidgetGUIDUnderMouse(int mouseX, int mouseY) {
final Widget widget = getWidgetUnderMouse(mouseX, mouseY);
if (widget instanceof HandlerStatsSlot slot) {
return slot.handlerName;
} else if (widget instanceof ItemStatsSlot slot) {
return slot.stack;
}
return null;
}
public String getHandlerMouseOver(int mouseX, int mouseY) {
final Widget widget = getWidgetUnderMouse(mouseX, mouseY);
if (widget instanceof HandlerStatsSlot slot) {
return slot.handlerName;
} else if (widget instanceof ItemStatsSlot slot && slot.recipeId != null) {
return slot.recipeId.getHandlerName();
}
return null;
}
public RecipeId getRecipeIdMouseOver(int mouseX, int mouseY) {
final Widget widget = getWidgetUnderMouse(mouseX, mouseY);
return widget instanceof ItemStatsSlot slot ? slot.recipeId : null;
}
public boolean isDraggingScrollbar() {
return canScrollHorizontal() && getHorizontalScroll().isMouseDragged();
}
@Override
public boolean onMouseWheel(int direction, int mouseX, int mouseY) {
if (canScrollHorizontal() && boundsOutside().contains(mouseX, mouseY)) {
getHorizontalScroll().setScrollOffset(this, getHorizontalScrollOffset() - direction * MOUSE_SCROLL_SPEED);
return true;
}
return super.onMouseWheel(direction, mouseX, mouseY);
}
public void draw(int mouseX, int mouseY) {
GL11.glTranslatef(0, 0, Z_OFFSET);
GL11.glPushAttrib(GL11.GL_ENABLE_BIT | GL11.GL_COLOR_BUFFER_BIT | GL11.GL_LIGHTING_BIT);
GL11.glEnable(GL12.GL_RESCALE_NORMAL);
GL11.glColor4f(1, 1, 1, 1);
RenderHelper.enableGUIStandardItemLighting();
GL11.glDisable(GL11.GL_LIGHTING);
BG_TEXTURE.draw(this.x, this.y, this.w, this.h, 0, 0, 2, 0);
super.draw(mouseX, mouseY);
GL11.glPopAttrib();
GL11.glTranslatef(0, 0, -Z_OFFSET);
}
public void drawFull() {
GL11.glPushAttrib(GL11.GL_ENABLE_BIT | GL11.GL_COLOR_BUFFER_BIT | GL11.GL_LIGHTING_BIT);
GL11.glEnable(GL12.GL_RESCALE_NORMAL);
GL11.glColor4f(1, 1, 1, 1);
RenderHelper.enableGUIStandardItemLighting();
GL11.glDisable(GL11.GL_LIGHTING);
drawContent(-1, -1);
GL11.glPopAttrib();
}
private List<Widget> collectAvailable(RecipeChainMath math) {
final ItemStackAmount items = new ItemStackAmount();
final List<Widget> widgets = new ArrayList<>();
for (BookmarkItem item : math.initialItems) {
final long amount = math.requiredAmount.getOrDefault(item, 0L);
if (amount > 0) {
items.add(item.itemStack, item.getStackSize(amount));
}
}
for (Map.Entry<NBTTagCompound, Long> entry : items.entrySet()) {
if (entry.getValue() > 0) {
widgets.add(
new ItemStatsSlot(StackInfo.loadFromNBT(entry.getKey(), 0), entry.getValue(), SLOT_DEFAULT));
}
}
return widgets;
}
private List<Widget> collectInputs(RecipeChainMath math, boolean useInventorySnapshot) {
final ItemStackAmount items = new ItemStackAmount();
final List<Widget> widgets = new ArrayList<>();
for (BookmarkItem item : math.recipeIngredients) {
final long amount = math.requiredAmount.containsKey(math.preferredItems.get(item)) ? 0
: math.requiredAmount.getOrDefault(item, item.getAmount());
if (amount > 0) {
items.add(item.itemStack, item.getStackSize(amount));
}
}
for (Map.Entry<NBTTagCompound, Long> entry : items.entrySet()) {
if (entry.getValue() > 0) {
widgets.add(
new ItemStatsSlot(
StackInfo.loadFromNBT(entry.getKey(), 0),
entry.getValue(),
useInventorySnapshot ? SLOT_MISSING : SLOT_DEFAULT));
}
}
return widgets;
}
private List<Widget> collectOutputs(RecipeChainMath math) {
final ItemStackAmount items = new ItemStackAmount();
final List<Widget> widgets = new ArrayList<>();
for (BookmarkItem item : math.recipeResults) {
final long amount = item.getAmount() - math.requiredAmount.getOrDefault(item, 0L);
if (amount > 0 && math.outputRecipes.containsKey(item.recipeId)) {
items.add(item.itemStack, item.getStackSize(amount));
}
}
for (Map.Entry<NBTTagCompound, Long> entry : items.entrySet()) {
if (entry.getValue() > 0) {
widgets.add(
new ItemStatsSlot(StackInfo.loadFromNBT(entry.getKey(), 0), entry.getValue(), SLOT_DEFAULT));
}
}
return widgets;
}
private List<Widget> collectRemainder(RecipeChainMath math) {
final ItemStackAmount items = new ItemStackAmount();
final List<Widget> widgets = new ArrayList<>();
for (BookmarkItem item : math.recipeResults) {
final long amount = item.getAmount() - math.requiredAmount.getOrDefault(item, 0L);
if (amount > 0 && !math.outputRecipes.containsKey(item.recipeId)) {
items.add(item.itemStack, item.getStackSize(amount));
}
}
for (ItemStack stack : math.containerItemsInventory) {
if (stack != null) {
items.add(stack);
}
}
for (ItemStack stack : math.containerItemsCrafting) {
if (stack != null) {
items.add(stack);
}
}
for (Map.Entry<NBTTagCompound, Long> entry : items.entrySet()) {
if (entry.getValue() > 0) {
widgets.add(
new ItemStatsSlot(StackInfo.loadFromNBT(entry.getKey(), 0), entry.getValue(), SLOT_DISABLED));
}
}
return widgets;
}
private List<Widget> collectHandlers(RecipeChainMath math) {
final Map<String, HandlerStats> handlerStats = new HashMap<>();
final List<Widget> widgets = new ArrayList<>();
for (BookmarkItem item : math.recipeResults) {
final HandlerStats stats = handlerStats
.computeIfAbsent(item.recipeId.getHandlerName(), k -> new HandlerStats());
stats.iterations += item.getMultiplier();
stats.recipeCount++;
}
for (Map.Entry<String, HandlerStats> entry : handlerStats.entrySet()) {
widgets.add(new HandlerStatsSlot(entry.getKey(), entry.getValue()));
}
return widgets;
}
private static int treeLevel(ItemTreeSlot node, Map<ItemTreeSlot, ItemTreeSlot> parentOf) {
int level = 0;
for (ItemTreeSlot current = parentOf.get(node); current != null; current = parentOf.get(current)) {
level++;
}
return level;
}
private static HandlerInfo handlerInfo(String handlerName) {
final HandlerInfo info = GuiRecipeTab.getHandlerInfo(handlerName, null);
return info != null ? info : GuiRecipeTab.DEFAULT_HANDLER_INFO;
}
}
@@ -0,0 +1,121 @@
package codechicken.nei.bookmark.tree;
import static codechicken.lib.gui.GuiDraw.drawStringC;
import org.lwjgl.opengl.GL11;
import codechicken.lib.gui.GuiDraw;
import codechicken.nei.LayoutManager;
import codechicken.nei.NEIClientUtils;
import codechicken.nei.bookmark.tree.CraftingTreeState.StatsSection;
class StatsSectionsMenu {
private static final StatsSection[] SECTIONS = StatsSection.values();
private static final int ROW_HEIGHT = 16;
private static final int LABEL_PADDING = 10;
private static final int MIN_WIDTH = 70;
private static final int TOP_PADDING = 4;
private static final int Z_OFFSET = 500;
private static final int COLOR_HOVER = 0xFFFFFFA0;
private static final int COLOR_ENABLED = 0xFFE0E0E0;
private static final int COLOR_DISABLED = 0xFFA0A0A0;
public boolean visible = false;
private int x;
private int y;
private int w;
private int h;
public void open(int anchorX, int anchorY) {
this.visible = true;
int maxLabelWidth = 0;
for (StatsSection section : SECTIONS) {
maxLabelWidth = Math.max(maxLabelWidth, GuiDraw.fontRenderer.getStringWidth(label(section)));
}
this.w = Math.max(MIN_WIDTH, maxLabelWidth + LABEL_PADDING * 2);
this.h = TOP_PADDING + SECTIONS.length * ROW_HEIGHT;
this.x = anchorX;
this.y = anchorY;
}
public void close() {
this.visible = false;
}
public boolean isInWidget(int mouseX, int mouseY) {
return this.visible && mouseX >= this.x
&& mouseX < this.x + this.w
&& mouseY >= this.y
&& mouseY < this.y + this.h;
}
public boolean handleClick(int mouseX, int mouseY, CraftingTreeState uiState) {
if (!isInWidget(mouseX, mouseY)) {
return false;
}
final int relativeY = mouseY - this.y - TOP_PADDING;
if (relativeY >= 0) {
final int index = relativeY / ROW_HEIGHT;
if (index < SECTIONS.length) {
uiState.toggleStatsSection(SECTIONS[index]);
}
}
return true;
}
public void draw(int mouseX, int mouseY, CraftingTreeState uiState) {
if (!this.visible) {
return;
}
GL11.glTranslatef(0, 0, Z_OFFSET);
for (int i = 0; i < SECTIONS.length; i++) {
final StatsSection section = SECTIONS[i];
final int rowY = this.y + TOP_PADDING + i * ROW_HEIGHT;
final boolean hover = mouseX >= this.x && mouseX < this.x + this.w
&& mouseY >= rowY
&& mouseY < rowY + ROW_HEIGHT;
final boolean checked = uiState.visibleStatsSections.contains(section);
final int color = hover ? COLOR_HOVER : checked ? COLOR_ENABLED : COLOR_DISABLED;
if (checked) {
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
LayoutManager.drawButtonBackground(this.x, rowY, this.w, ROW_HEIGHT, false, 1);
} else {
GL11.glColor4f(0.65F, 0.65F, 0.65F, 1.0F);
LayoutManager.drawButtonBackground(this.x, rowY, this.w, ROW_HEIGHT, false, 0);
}
drawStringC(label(section), this.x, rowY, this.w, ROW_HEIGHT, color);
}
GL11.glColor4f(1, 1, 1, 1);
GL11.glTranslatef(0, 0, -Z_OFFSET);
}
private static String label(StatsSection section) {
return NEIClientUtils.translate(switch (section) {
case INGREDIENTS_NEEDED -> "bookmark.tree.stats.ingredients_needed";
case INGREDIENTS_AVAILABLE -> "bookmark.tree.stats.ingredients_available";
case CRAFTING_NEEDED -> "bookmark.tree.stats.crafting_needed";
case CRAFTING_AVAILABLE -> "bookmark.tree.stats.crafting_available";
case RESULTS -> "bookmark.tree.stats.results";
case REMAINDERS -> "bookmark.tree.stats.remainders";
case HANDLERS -> "bookmark.tree.stats.handlers";
});
}
}
@@ -0,0 +1,75 @@
package codechicken.nei.bookmark.tree;
import java.util.List;
import java.util.Map;
import net.minecraft.client.Minecraft;
import org.lwjgl.opengl.GL11;
import codechicken.nei.NEIClientUtils;
import codechicken.nei.drawable.DrawableBuilder;
import codechicken.nei.drawable.DrawableResource;
import codechicken.nei.recipe.GuiRecipeButton;
import codechicken.nei.recipe.Recipe;
import codechicken.nei.recipe.RecipeHandlerRef;
public class TreeOverlayButton extends GuiRecipeButton {
protected static final DrawableResource ICON_FILL = new DrawableBuilder(
"nei:textures/nei_sprites.png",
28,
76,
9,
10).build();
protected static final int BUTTON_ID_SHIFT = 4;
public final GuiCraftingTree treeGui;
public TreeOverlayButton(GuiCraftingTree treeGui, RecipeHandlerRef handlerRef, int x, int y) {
super(handlerRef, x, y, handlerRef.recipeIndex + BUTTON_ID_SHIFT, "+");
this.treeGui = treeGui;
}
@Override
public List<String> handleTooltip(List<String> currenttip) {
currenttip.add(NEIClientUtils.translate("bookmark.tree.overlay"));
return currenttip;
}
@Override
public Map<String, String> handleHotkeys(int mousex, int mousey, Map<String, String> hotkeys) {
return hotkeys;
}
@Override
public void mouseReleased(int mouseX, int mouseY) {
if (this.treeGui != null) {
this.treeGui.addRecipe(Recipe.of(this.handlerRef));
}
}
@Override
protected void drawContent(Minecraft minecraft, int y, int x, boolean mouseOver) {
final int iconX = this.xPosition + (this.width - ICON_FILL.width - 1) / 2;
final int iconY = this.yPosition + (this.height - ICON_FILL.height) / 2;
GL11.glColor4f(1, 1, 1, this.enabled ? 1 : 0.5f);
GL11.glEnable(GL11.GL_BLEND);
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
ICON_FILL.draw(iconX, iconY);
GL11.glDisable(GL11.GL_BLEND);
GL11.glColor4f(1, 1, 1, 1);
}
@Override
public void drawItemOverlay() {}
public Recipe getRecipe() {
return Recipe.of(this.handlerRef);
}
@Override
public void lastKeyTyped(char keyChar, int keyID) {}
}
@@ -17,7 +17,6 @@ import codechicken.nei.recipe.GuiRecipeTab;
import codechicken.nei.recipe.GuiUsageRecipe;
import codechicken.nei.recipe.HandlerInfo;
import codechicken.nei.recipe.IRecipeHandler;
import codechicken.nei.recipe.TemplateRecipeHandler;
import codechicken.nei.util.NBTJson;
public class HandlerDumper extends DataDumper {
@@ -37,10 +36,7 @@ public class HandlerDumper extends DataDumper {
LinkedList<String[]> list = new LinkedList<>();
for (IRecipeHandler handler : GuiUsageRecipe.usagehandlers) {
final String handlerName = handler.getHandlerId();
final String handlerId = Objects.firstNonNull(
handler instanceof TemplateRecipeHandler ? ((TemplateRecipeHandler) handler).getOverlayIdentifier()
: null,
"null");
final String handlerId = Objects.firstNonNull(handler.getOverlayIdentifier(), "null");
HandlerInfo info = GuiRecipeTab.getHandlerInfo(handlerName, handlerId);
list.add(
@@ -40,6 +40,10 @@ public class DrawableResource extends Image {
return height + paddingTop + paddingBottom;
}
public void bindTexture() {
Minecraft.getMinecraft().getTextureManager().bindTexture(this.resourceLocation);
}
public void draw(int xOffset, int yOffset) {
draw(xOffset, yOffset, 0, 0, 0, 0);
}
@@ -50,7 +54,7 @@ public class DrawableResource extends Image {
final int height = this.height - maskBottom - maskTop;
GL11.glEnable(GL11.GL_TEXTURE_2D);
Minecraft.getMinecraft().getTextureManager().bindTexture(this.resourceLocation);
bindTexture();
drawModalRectWithCustomSizedTexture(xOffset + maskLeft, yOffset + maskTop, maskLeft, maskTop, width, height);
if (!is2DTexture) GL11.glDisable(GL11.GL_TEXTURE_2D);
}
@@ -72,7 +76,7 @@ public class DrawableResource extends Image {
final int remainderHeight = tileHeight - (tileHeightCount * middleHeight);
GL11.glEnable(GL11.GL_TEXTURE_2D);
Minecraft.getMinecraft().getTextureManager().bindTexture(this.resourceLocation);
bindTexture();
// middle parts
for (int tileW = 0; tileW <= tileWidthCount; tileW++) {
@@ -7,6 +7,7 @@ import net.minecraft.item.ItemStack;
import codechicken.nei.PositionedStack;
import codechicken.nei.api.IRecipeFilter;
import codechicken.nei.api.ItemFilter;
import codechicken.nei.api.ItemInfo;
import codechicken.nei.recipe.IRecipeHandler;
public class RecipeFilter implements IRecipeFilter {
@@ -78,7 +79,7 @@ public class RecipeFilter implements IRecipeFilter {
if (pStack == null) return false;
for (ItemStack stack : pStack.items) {
if (this.filter.matches(stack)) {
if (!ItemInfo.isHidden(stack) && this.filter.matches(stack)) {
return true;
}
}
@@ -314,7 +314,7 @@ public class GuiContainerManager {
}
private static int modelviewDepth = -1;
private static boolean contextEnabled = false;
private static int contextDepth = 0;
private static final ItemStackSet renderingErrorItems = new ItemStackSet();
public static void drawItem(int offsetX, int offsetY, ItemStack itemstack, FontRenderer fontRenderer,
@@ -411,16 +411,15 @@ public class GuiContainerManager {
}
public static void enableMatrixStackLogging() {
if (!contextEnabled) {
if (contextDepth == 0) {
GL11.glPushAttrib(GL11.GL_ENABLE_BIT | GL11.GL_COLOR_BUFFER_BIT | GL11.GL_LIGHTING_BIT);
modelviewDepth = GL11.glGetInteger(GL11.GL_MODELVIEW_STACK_DEPTH);
contextEnabled = true;
}
contextDepth++;
}
public static void disableMatrixStackLogging() {
if (contextEnabled) {
contextEnabled = false;
if (contextDepth > 0 && --contextDepth == 0) {
modelviewDepth = -1;
GL11.glPopAttrib();
}
@@ -621,11 +620,11 @@ public class GuiContainerManager {
if (!secondDisplayName.isEmpty()) {
tooltip.add(1, EnumChatFormatting.DARK_GRAY + secondDisplayName + GuiDraw.TOOLTIP_LINESPACE);
} else {
} else if (!tooltip.get(0).startsWith(GuiDraw.TOOLTIP_HANDLER)) {
tooltip.set(0, tooltip.get(0) + GuiDraw.TOOLTIP_LINESPACE);
}
} else if (!tooltip.isEmpty()) {
} else if (!tooltip.isEmpty() && !tooltip.get(0).startsWith(GuiDraw.TOOLTIP_HANDLER)) {
tooltip.set(0, tooltip.get(0) + GuiDraw.TOOLTIP_LINESPACE);
}
@@ -0,0 +1,96 @@
package codechicken.nei.item;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.client.renderer.OpenGlHelper;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraftforge.client.IItemRenderer;
import org.lwjgl.opengl.GL11;
import codechicken.nei.util.ReadableNumberConverter;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class FluidDisplayRenderer implements IItemRenderer {
@Override
public boolean handleRenderType(ItemStack item, ItemRenderType type) {
return type == ItemRenderType.INVENTORY;
}
@Override
public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) {
return false;
}
@Override
public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
if (type != ItemRenderType.INVENTORY || !(item.getItem() instanceof ItemFluidDisplay fluidDisplay)) {
return;
}
renderIcon(item, fluidDisplay);
renderAmountOverlay(item, fluidDisplay);
}
private void renderIcon(ItemStack item, ItemFluidDisplay fluidDisplay) {
final IIcon icon = fluidDisplay.getIconIndex(item);
if (icon == null) {
return;
}
final int color = fluidDisplay.getColorFromItemStack(item, 0);
final float red = (color >> 16 & 0xFF) / 255F;
final float green = (color >> 8 & 0xFF) / 255F;
final float blue = (color & 0xFF) / 255F;
Minecraft.getMinecraft().getTextureManager().bindTexture(TextureMap.locationBlocksTexture);
GL11.glColor4f(red, green, blue, 1F);
GL11.glEnable(GL11.GL_BLEND);
OpenGlHelper
.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ONE_MINUS_SRC_ALPHA);
final Tessellator tessellator = Tessellator.instance;
tessellator.startDrawingQuads();
tessellator.addVertexWithUV(0, 16, 0, icon.getMinU(), icon.getMaxV());
tessellator.addVertexWithUV(16, 16, 0, icon.getMaxU(), icon.getMaxV());
tessellator.addVertexWithUV(16, 0, 0, icon.getMaxU(), icon.getMinV());
tessellator.addVertexWithUV(0, 0, 0, icon.getMinU(), icon.getMinV());
tessellator.draw();
GL11.glColor4f(1F, 1F, 1F, 1F);
GL11.glDisable(GL11.GL_BLEND);
}
private void renderAmountOverlay(ItemStack item, ItemFluidDisplay fluidDisplay) {
final long amount = fluidDisplay.getAmountLong(item);
if (amount <= 0) {
return;
}
String amountString = "";
if (amount < 10_000) {
amountString = String.valueOf(amount) + "L";
} else {
amountString = ReadableNumberConverter.INSTANCE.toWideReadableForm(amount) + "L";
}
final FontRenderer fontRender = Minecraft.getMinecraft().fontRenderer;
float smallTextScale = fontRender.getUnicodeFlag() ? 3F / 4F : 1F / 2F;
GL11.glPushAttrib(GL11.GL_ENABLE_BIT);
GL11.glDisable(GL11.GL_BLEND);
GL11.glPushMatrix();
GL11.glScalef(smallTextScale, smallTextScale, 1.0f);
fontRender
.drawString(amountString, 0, (int) (16 / smallTextScale) - fontRender.FONT_HEIGHT + 1, 0xFFFFFF, true);
GL11.glPopMatrix();
GL11.glPopAttrib();
}
}
@@ -0,0 +1,193 @@
package codechicken.nei.item;
import java.util.List;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.IIcon;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidContainerItem;
import codechicken.nei.NEIClientConfig;
import codechicken.nei.NEIClientUtils;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class ItemFluidDisplay extends Item implements IFluidContainerItem {
public static ItemFluidDisplay INSTANCE;
public final static CreativeTabs tabFluids = new CreativeTabs("neiFluids") {
@Override
public Item getTabIconItem() {
return INSTANCE;
}
@Override
@SideOnly(Side.CLIENT)
public ItemStack getIconItemStack() {
return createStack(new FluidStack(FluidRegistry.WATER, 0));
}
};
public ItemFluidDisplay() {
setUnlocalizedName("nei.fluidDisplay");
setMaxStackSize(1);
INSTANCE = this;
}
public static ItemStack createStack(FluidStack fluidStack) {
return fluidStack == null ? null : createStack(fluidStack.getFluid(), fluidStack.amount);
}
public static ItemStack createStack(Fluid fluid, long amount) {
if (fluid == null) {
return null;
}
int fluidId;
try {
fluidId = FluidRegistry.getFluidID(fluid);
} catch (Exception e) {
NEIClientConfig.logger.error("Failed to get fluid id for: " + fluid.getName(), e);
return null;
}
final ItemStack stack = new ItemStack(INSTANCE, 1, fluidId);
final NBTTagCompound nbtTag = new NBTTagCompound();
nbtTag.setLong("neiFluidDisplayAmount", amount);
stack.setTagCompound(nbtTag);
return stack;
}
@Override
public FluidStack getFluid(ItemStack stack) {
if (stack == null || !(stack.getItem() instanceof ItemFluidDisplay) || !stack.hasTagCompound()) {
return null;
}
final Fluid fluid = FluidRegistry.getFluid(stack.getItemDamage());
if (fluid == null) {
return null;
}
final NBTTagCompound nbTag = stack.getTagCompound();
final FluidStack fluidStack = new FluidStack(
fluid,
(int) Math.min(nbTag.getLong("neiFluidDisplayAmount"), Integer.MAX_VALUE));
return fluidStack;
}
public long getAmountLong(ItemStack stack) {
if (stack == null || !(stack.getItem() instanceof ItemFluidDisplay) || !stack.hasTagCompound()) {
return 0;
}
return stack.getTagCompound().getLong("neiFluidDisplayAmount");
}
@Override
public int getCapacity(ItemStack stack) {
return (int) Math.min(getAmountLong(stack), Integer.MAX_VALUE);
}
@Override
public int fill(ItemStack container, FluidStack resource, boolean doFill) {
return 0;
}
@Override
public FluidStack drain(ItemStack container, int maxDrain, boolean doDrain) {
return null;
}
@Override
public IIcon getIconFromDamage(int metadata) {
final Fluid fluid = FluidRegistry.getFluid(metadata);
final IIcon icon = fluid != null ? fluid.getStillIcon() : null;
return icon != null ? icon : FluidRegistry.WATER.getStillIcon();
}
@Override
public int getSpriteNumber() {
return 0;
}
@Override
public int getColorFromItemStack(ItemStack stack, int renderPass) {
final Fluid fluid = stack != null ? FluidRegistry.getFluid(stack.getItemDamage()) : null;
return fluid != null ? fluid.getColor() : 0xFFFFFF;
}
@Override
public String getItemStackDisplayName(ItemStack stack) {
final Fluid fluid = stack != null ? FluidRegistry.getFluid(stack.getItemDamage()) : null;
return fluid != null ? fluid.getLocalizedName() : super.getItemStackDisplayName(stack);
}
@Override
public String getUnlocalizedName(ItemStack stack) {
final Fluid fluid = stack != null ? FluidRegistry.getFluid(stack.getItemDamage()) : null;
return fluid != null ? fluid.getUnlocalizedName() : super.getUnlocalizedName(stack);
}
@Override
@SideOnly(Side.CLIENT)
public void addInformation(ItemStack stack, EntityPlayer player, List<String> tooltip, boolean advanced) {
final Fluid fluid = FluidRegistry.getFluid(stack.getItemDamage());
if (fluid == null) {
return;
}
if (NEIClientConfig.getBooleanSetting("inventory.tooltip.showFluidTemperature")) {
tooltip.add(
EnumChatFormatting.RED + NEIClientUtils.translate(
"inventory.tooltip.temperature.fluid",
NEIClientUtils.formatNumber(fluid.getTemperature())));
}
if (NEIClientConfig.getBooleanSetting("inventory.tooltip.showFluidState")) {
tooltip.add(
EnumChatFormatting.GREEN + NEIClientUtils.translate(
"inventory.tooltip.state.fluid",
NEIClientUtils.translate(
fluid.isGaseous() ? "inventory.tooltip.state.fluid.gas"
: "inventory.tooltip.state.fluid.liquid")));
}
}
@Override
public void registerIcons(IIconRegister register) {}
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(Item aItem, CreativeTabs aTab, List<ItemStack> aList) {
for (int i = 0, j = FluidRegistry.getMaxID(); i <= j; i++) {
final Fluid fluid = FluidRegistry.getFluid(i);
if (fluid == null) {
continue;
}
final ItemStack stack = ItemFluidDisplay.createStack(new FluidStack(fluid, 0));
if (stack != null) {
aList.add(stack);
}
}
}
}
@@ -15,11 +15,12 @@ public class AcceptsFollowingTooltipLineHandler extends ItemsTooltipLineHandler
public Object tooltipGUID;
public AcceptsFollowingTooltipLineHandler(Object tooltipGUID, List<ItemStack> items, ItemStack activeStack,
protected AcceptsFollowingTooltipLineHandler(Object tooltipGUID, List<ItemStack> items, ItemStack activeStack,
int maxRows) {
super(NEIClientUtils.translate("recipe.accepts"), items, false, maxRows);
this.tooltipGUID = tooltipGUID;
setActiveStack(activeStack);
setAmountRenderer(new FavoriteAmountRenderer());
}
public static AcceptsFollowingTooltipLineHandler of(Object tooltipGUID, List<ItemStack> items,
@@ -38,12 +39,15 @@ public class AcceptsFollowingTooltipLineHandler extends ItemsTooltipLineHandler
return null;
}
@Override
protected void drawItem(int x, int y, ItemStack drawStack, String stackSize) {
super.drawItem(x, y, drawStack, stackSize);
protected static class FavoriteAmountRenderer extends NoAmountRenderer {
if (FavoriteRecipes.containsManual(drawStack)) {
NEIClientUtils.drawNEIOverlayText("F", x, y);
@Override
public void draw(int x, int y, ItemStack stack, long amount) {
super.draw(x, y, stack, amount);
if (FavoriteRecipes.containsManual(stack)) {
NEIClientUtils.drawNEIOverlayText("F", x, y);
}
}
}
@@ -32,43 +32,46 @@ public class AutoCraftingManager {
StackInfo.pauseItemDamageSound(true);
do {
changed = false;
try {
do {
changed = false;
RecipeChainIterator iterator = new RecipeChainIterator(math, initialItems);
iterator.updateInventory(getInventoryItems(guiContainer));
RecipeChainIterator iterator = new RecipeChainIterator(math, initialItems);
iterator.updateInventory(getInventoryItems(guiContainer));
while (iterator.hasNext() && !interrupted(guiContainer)) {
final Map<RecipeId, Long> recipes = iterator.next();
boolean craft = false;
while (iterator.hasNext() && !interrupted(guiContainer)) {
final Map<RecipeId, Long> recipes = iterator.next();
boolean craft = false;
for (Map.Entry<RecipeId, Long> entry : recipes.entrySet()) {
final RecipeHandlerRef handler = RecipeHandlerRef.of(entry.getKey());
for (Map.Entry<RecipeId, Long> entry : recipes.entrySet()) {
final RecipeHandlerRef handler = RecipeHandlerRef.of(entry.getKey());
if (handler != null && handler.canCraft(guiContainer)) {
long multiplier = entry.getValue();
if (handler != null && handler.canCraft(guiContainer)) {
long multiplier = entry.getValue();
while (multiplier > 0 && !interrupted(guiContainer)
&& handler.craft(guiContainer, (int) Math.min(64, multiplier))) {
multiplier -= 64;
while (multiplier > 0 && !interrupted(guiContainer)
&& handler.craft(guiContainer, (int) Math.min(64, multiplier))) {
multiplier -= 64;
}
craft = craft || multiplier != entry.getValue();
}
craft = multiplier != entry.getValue();
if (interrupted(guiContainer)) break;
}
if (interrupted(guiContainer)) break;
if (craft) {
changed = true;
processed = true;
iterator.updateInventory(getInventoryItems(guiContainer));
}
}
if (craft) {
changed = true;
processed = true;
iterator.updateInventory(getInventoryItems(guiContainer));
}
}
} while (changed && !interrupted(guiContainer));
} while (changed && !interrupted(guiContainer));
StackInfo.pauseItemDamageSound(false);
} finally {
StackInfo.pauseItemDamageSound(false);
}
if (processed && !changed && !interrupted(guiContainer)) {
NEIClientUtils.playClickSound();
@@ -64,7 +64,7 @@ public class BookmarkRecipeId {
return false;
}
Short idx = 0;
short idx = 0;
for (PositionedStack pStack : stacks) {
final NBTTagCompound tagCompoundA = StackInfo
@@ -123,8 +123,7 @@ public class BookmarkRecipeId {
return true;
}
if (anObject instanceof BookmarkRecipeId) {
final BookmarkRecipeId anRecipeId = (BookmarkRecipeId) anObject;
if (anObject instanceof BookmarkRecipeId anRecipeId) {
if (!handlerName.equals(anRecipeId.handlerName)) {
return false;
@@ -13,7 +13,7 @@ public class BrewingOverlayHandler extends DefaultOverlayHandler {
public Slot[][] mapIngredSlots(GuiContainer gui, List<PositionedStack> ingredients) {
Slot[][] map = super.mapIngredSlots(gui, ingredients);
Slot[] potSlots = new Slot[3];
for (int i = 0; i < 3; i++) potSlots[i] = (Slot) gui.inventorySlots.inventorySlots.get(i);
for (int i = 0; i < 3; i++) potSlots[i] = gui.inventorySlots.inventorySlots.get(i);
map[1] = potSlots;
return map;
}
@@ -36,6 +36,7 @@ public class DefaultOverlayHandler implements IOverlayHandler {
public int numSlots;
public int recipeAmount;
public boolean isContainerItem = false;
public long damagePerContainerCraft;
}
public static class IngredientDistribution {
@@ -123,6 +124,11 @@ public class DefaultOverlayHandler implements IOverlayHandler {
if (craftingSlot.getHasStack() && craftingSlot.canTakeStack(firstGui.mc.thePlayer)) {
FastTransferManager.clickSlot(firstGui, craftingSlot.slotNumber, 0, 1);
if (craftingSlot.getHasStack()) {
break;
}
craft = true;
}
@@ -259,6 +265,11 @@ public class DefaultOverlayHandler implements IOverlayHandler {
final int maxStackSize = istack.stack.getMaxStackSize();
if (maxStackSize == 1 && istack.isContainerItem) {
if (istack.damagePerContainerCraft > 0) {
quantity = (int) Math.min(quantity, istack.damagePerContainerCraft);
}
// If non-stackable, fill up as much as possible of the other ingredients
continue;
}
@@ -372,7 +383,14 @@ public class DefaultOverlayHandler implements IOverlayHandler {
final NBTTagCompound tagCompound = pstack.getTagCompound();
if (tagCompound != null && tagCompound.hasKey("GT.ToolStats")) {
final NBTTagCompound toolStats = tagCompound.getCompoundTag("GT.ToolStats");
final long damagePerContainerCraft = getGTToolDamagePerContainerCraft(pstack);
final long maxDamage = toolStats.getLong("MaxDamage");
final long damage = toolStats.getLong("Damage");
istack.isContainerItem = true;
istack.damagePerContainerCraft = (maxDamage - damage + damagePerContainerCraft - 1)
/ damagePerContainerCraft;
} else {
final boolean isPausedItemDamageSound = StackInfo.isPausedItemDamageSound();
StackInfo.pauseItemDamageSound(true);
@@ -390,6 +408,19 @@ public class DefaultOverlayHandler implements IOverlayHandler {
}
}
private int getGTToolDamagePerContainerCraft(ItemStack aStack) {
try {
final Object toolStats = aStack.getItem().getClass().getMethod("getToolStats", ItemStack.class)
.invoke(aStack.getItem(), aStack);
return (int) toolStats.getClass().getMethod("getToolDamagePerContainerCraft").invoke(toolStats);
} catch (Throwable th) {
th.printStackTrace();
}
return 0;
}
protected List<DistributedIngred> getPermutationIngredients(List<PositionedStack> ingredients) {
ArrayList<DistributedIngred> ingredStacks = new ArrayList<>();
for (PositionedStack posstack : ingredients) /* work out what we need */ {
@@ -53,8 +53,7 @@ public class FuelRecipeHandler extends FurnaceRecipeHandler {
private void loadAllSmelting() {
// Note: Not safe as written for parallelStream
final Map<ItemStack, ItemStack> smeltingRecipes = (Map<ItemStack, ItemStack>) FurnaceRecipes.smelting()
.getSmeltingList();
final Map<ItemStack, ItemStack> smeltingRecipes = FurnaceRecipes.smelting().getSmeltingList();
smeltingRecipes.entrySet().stream().map(recipe -> new SmeltingPair(recipe.getKey(), recipe.getValue()))
.collect(Collectors.toCollection(() -> mfurnace));
}
@@ -84,7 +84,7 @@ public class FurnaceRecipeHandler extends TemplateRecipeHandler {
public void loadCraftingRecipes(String outputId, Object... results) {
if (outputId.equals("smelting") && getClass() == FurnaceRecipeHandler.class) { // don't want subclasses getting
// a hold of this
Map<ItemStack, ItemStack> recipes = (Map<ItemStack, ItemStack>) FurnaceRecipes.smelting().getSmeltingList();
Map<ItemStack, ItemStack> recipes = FurnaceRecipes.smelting().getSmeltingList();
for (Entry<ItemStack, ItemStack> recipe : recipes.entrySet())
arecipes.add(new SmeltingPair(recipe.getKey(), recipe.getValue()));
} else super.loadCraftingRecipes(outputId, results);
@@ -92,7 +92,7 @@ public class FurnaceRecipeHandler extends TemplateRecipeHandler {
@Override
public void loadCraftingRecipes(ItemStack result) {
Map<ItemStack, ItemStack> recipes = (Map<ItemStack, ItemStack>) FurnaceRecipes.smelting().getSmeltingList();
Map<ItemStack, ItemStack> recipes = FurnaceRecipes.smelting().getSmeltingList();
for (Entry<ItemStack, ItemStack> recipe : recipes.entrySet())
if (NEIServerUtils.areStacksSameType(recipe.getValue(), result))
arecipes.add(new SmeltingPair(recipe.getKey(), recipe.getValue()));
@@ -108,7 +108,7 @@ public class FurnaceRecipeHandler extends TemplateRecipeHandler {
@Override
public void loadUsageRecipes(ItemStack ingredient) {
Map<ItemStack, ItemStack> recipes = (Map<ItemStack, ItemStack>) FurnaceRecipes.smelting().getSmeltingList();
Map<ItemStack, ItemStack> recipes = FurnaceRecipes.smelting().getSmeltingList();
for (Entry<ItemStack, ItemStack> recipe : recipes.entrySet())
if (NEIServerUtils.areStacksSameTypeCrafting(recipe.getKey(), ingredient)) {
SmeltingPair arecipe = new SmeltingPair(recipe.getKey(), recipe.getValue());
@@ -119,7 +119,7 @@ public class GuiCraftingRecipe extends GuiRecipe<ICraftingHandler> {
public static RecipeId getRecipeId(GuiScreen gui, ItemStack stackover) {
if (gui instanceof GuiRecipe guiRecipe) {
if (gui instanceof GuiRecipe<?>guiRecipe) {
final Recipe focusedRecipe = guiRecipe.getFocusedRecipe();
if (focusedRecipe != null) {
@@ -23,6 +23,7 @@ import codechicken.nei.KeyManager;
import codechicken.nei.LayoutManager;
import codechicken.nei.NEIClientConfig;
import codechicken.nei.NEIClientUtils;
import codechicken.nei.bookmark.tree.GuiCraftingTree;
import codechicken.nei.drawable.DrawableBuilder;
import codechicken.nei.drawable.DrawableResource;
import codechicken.nei.recipe.Recipe.RecipeId;
@@ -127,6 +128,12 @@ public class GuiFavoriteButton extends GuiRecipeButton {
saveRecipeInBookmark();
}
if (KeyManager.isKeyDown("bookmark.open_crafting_tree") && NEIClientUtils.shiftKey()
&& saveRecipeInBookmark()) {
final int groupId = ItemPanels.bookmarkPanel.getGrid().getNextGroupId() - 1;
GuiCraftingTree.openCraftingTreeGui(ItemPanels.bookmarkPanel.getGrid(), groupId);
}
}
@Override
@@ -135,6 +142,10 @@ public class GuiFavoriteButton extends GuiRecipeButton {
KeyManager.getKeyName("bookmark.add", NEIClientUtils.SHIFT_HASH),
translate("recipe.favorite.bookmark_recipe"));
hotkeys.put(
KeyManager.getKeyName("bookmark.open_crafting_tree", NEIClientUtils.SHIFT_HASH),
NEIClientUtils.translate("bookmark.group.open_crafting_tree"));
if (this.recipe.getResults().size() > 1) {
hotkeys.put(
NEIMouseUtils.getKeyName(NEIMouseUtils.MOUSE_BTN_NONE + NEIMouseUtils.MOUSE_SCROLL),
@@ -155,11 +166,16 @@ public class GuiFavoriteButton extends GuiRecipeButton {
if (this.selectedResult == null) return;
NEIClientUtils.gl2DRenderContext(
() -> GuiDraw.drawRect(this.selectedResult.relx, this.selectedResult.rely, 16, 16, 0x66333333));
() -> GuiDraw.drawRect(
this.selectedResult.relx,
this.selectedResult.rely,
this.selectedResult.width,
this.selectedResult.height,
0x66333333));
final Image icon = isFavorite() ? ICON_STATE_ON : ICON_STATE_OFF;
final int iconX = this.selectedResult.relx + (16 - icon.width) / 2;
final int iconY = this.selectedResult.rely + (18 - icon.height) / 2;
final int iconX = this.selectedResult.relx + (this.selectedResult.width - icon.width) / 2;
final int iconY = this.selectedResult.rely + (this.selectedResult.height + 2 - icon.height) / 2;
LayoutManager.drawIcon(iconX, iconY, icon);
}
@@ -184,8 +200,8 @@ public class GuiFavoriteButton extends GuiRecipeButton {
return true;
}
public void saveRecipeInBookmark() {
ItemPanels.bookmarkPanel.addGroup(getRecipesTree(getRecipe()), BookmarkViewMode.TODO_LIST, true);
public boolean saveRecipeInBookmark() {
return ItemPanels.bookmarkPanel.addGroup(getRecipesTree(getRecipe()), BookmarkViewMode.TODO_LIST, true);
}
private List<Recipe> getRecipesTree(Recipe mainRecipe) {
@@ -29,6 +29,15 @@ import codechicken.nei.util.NEIMouseUtils;
public class GuiOverlayButton extends GuiRecipeButton {
protected static DrawableResource notPresent = new DrawableBuilder(
"nei:textures/nei_tabbed_sprites.png",
0,
40,
8,
8).build();
protected static DrawableResource present = new DrawableBuilder("nei:textures/nei_tabbed_sprites.png", 8, 40, 8, 8)
.build();
public enum ItemOverlayFormat {
BACKGROUND,
@@ -58,11 +67,23 @@ public class GuiOverlayButton extends GuiRecipeButton {
}
public void draw(ItemOverlayFormat format) {
LayoutManager.drawItemPresenceOverlay(
this.slot.relx,
this.slot.rely,
this.isPresent,
format == ItemOverlayFormat.BACKGROUND);
if (format == ItemOverlayFormat.BACKGROUND) {
NEIClientUtils.gl2DRenderContext(
() -> GuiDraw.drawRect(
this.slot.relx,
this.slot.rely,
this.slot.width,
this.slot.height,
isPresent ? 0x8000AA00 : 0x80AA0000));
} else {
final DrawableResource icon = isPresent ? present : notPresent;
LayoutManager.drawIcon(
this.slot.relx + this.slot.width - icon.width,
this.slot.rely + this.slot.height - icon.height,
icon);
}
}
}
@@ -256,6 +277,11 @@ public class GuiOverlayButton extends GuiRecipeButton {
return this.itemPresenceCache;
}
@Override
public void onPermutationsChanged() {
this.itemPresenceCache.clear();
}
public void setRequireShiftForOverlayRecipe(boolean require) {
this.requireShiftForOverlayRecipe = require;
updateEnabled();
@@ -291,30 +317,15 @@ public class GuiOverlayButton extends GuiRecipeButton {
}
protected List<ItemOverlayState> presenceOverlay(List<PositionedStack> ingredients) {
final List<ItemOverlayState> states = new ArrayList<>();
final List<ItemStack> invStacks = this.firstGui.inventorySlots.inventorySlots.stream()
.filter(
s -> s != null && s.getStack() != null
&& s.getStack().stackSize > 0
&& s.isItemValid(s.getStack())
&& s.canTakeStack(this.firstGui.mc.thePlayer))
.map(s -> s.getStack().copy()).collect(Collectors.toCollection(ArrayList::new));
for (PositionedStack stack : ingredients) {
boolean 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;
return NEIClientUtils.presenceOverlay(
ingredients,
this.firstGui.inventorySlots.inventorySlots.stream()
.filter(
s -> s != null && s.getStack() != null
&& s.getStack().stackSize > 0
&& s.isItemValid(s.getStack())
&& s.canTakeStack(this.firstGui.mc.thePlayer))
.map(s -> s.getStack().copy()).collect(Collectors.toList()));
}
public void overlayRecipe(boolean shift) {
@@ -34,6 +34,8 @@ import codechicken.nei.PositionedStack;
import codechicken.nei.RecipeSearchField;
import codechicken.nei.RestartableTask;
import codechicken.nei.SearchField;
import codechicken.nei.SearchTokenParser.ISearchParserProvider;
import codechicken.nei.SearchTokenParser.SearchMode;
import codechicken.nei.VisiblityData;
import codechicken.nei.Widget;
import codechicken.nei.api.IGuiContainerOverlay;
@@ -54,6 +56,8 @@ import codechicken.nei.scroll.ScrollBar;
import codechicken.nei.scroll.ScrollBar.OverflowType;
import codechicken.nei.scroll.ScrollBar.ScrollPlace;
import codechicken.nei.scroll.ScrollContainer;
import codechicken.nei.search.SearchExpressionUtils;
import codechicken.nei.util.EmptyContainer;
import codechicken.nei.util.SlotInaccessible;
public abstract class GuiRecipe<H extends IRecipeHandler> extends GuiContainer implements IGuiContainerOverlay,
@@ -172,6 +176,59 @@ public abstract class GuiRecipe<H extends IRecipeHandler> extends GuiContainer i
return true;
}
@Override
public void addTooltips(List<String> tooltip) {
tooltip.add(NEIClientUtils.translate("recipe.search.tooltip.name") + GuiDraw.TOOLTIP_LINESPACE);
if (NEIClientUtils.shiftKey()) {
tooltip.add(
NEIClientUtils.translate(
"recipe.search.tooltip.input",
SearchExpressionUtils.HIGHLIGHTS.RECIPE + "<"));
tooltip.add(
NEIClientUtils.translate(
"recipe.search.tooltip.output",
SearchExpressionUtils.HIGHLIGHTS.RECIPE + ">"));
for (ISearchParserProvider provider : SearchField.searchParser.getProviders()) {
if (provider.getSearchMode() == SearchMode.PREFIX) {
addPrefixTooltip(tooltip, provider);
}
}
tooltip.add(
NEIClientUtils.translate(
"recipe.search.tooltip.exclude",
SearchExpressionUtils.HIGHLIGHTS.NEGATE + "-"));
tooltip.add(
NEIClientUtils.translate(
"recipe.search.tooltip.exclude_recipe",
SearchExpressionUtils.HIGHLIGHTS.NEGATE + "!"));
tooltip.add(
NEIClientUtils
.translate("recipe.search.tooltip.or", SearchExpressionUtils.HIGHLIGHTS.OR.f + "|"));
tooltip.add(
NEIClientUtils.translate(
"recipe.search.tooltip.exact",
SearchExpressionUtils.HIGHLIGHTS.QUOTED + "\"",
SearchExpressionUtils.HIGHLIGHTS.QUOTED + "\""));
} else {
tooltip.add(NEIClientUtils.translate("recipe.search.tooltip.shift"));
}
}
private void addPrefixTooltip(List<String> tooltip, ISearchParserProvider provider) {
final char prefix = SearchField.searchParser.getRedefinedPrefix(provider.getPrefix());
final String modeName = NEIClientUtils.translate("recipe.search.tooltip.prefix." + provider.getName());
tooltip.add(
NEIClientUtils.translate(
"recipe.search.tooltip.prefix",
provider.getHighlightedColor() + String.valueOf(prefix),
modeName));
}
};
/**
@@ -181,7 +238,7 @@ public abstract class GuiRecipe<H extends IRecipeHandler> extends GuiContainer i
private boolean isHeightHackApplied = false;
protected GuiRecipe(GuiScreen prevgui) {
super(new ContainerRecipe());
super(new EmptyContainer());
this.recipeTabs = new GuiRecipeTabs() {
@Override
@@ -191,7 +248,7 @@ public abstract class GuiRecipe<H extends IRecipeHandler> extends GuiContainer i
};
this.recipeCatalyst = new GuiRecipeCatalyst();
this.slotcontainer = (ContainerRecipe) this.inventorySlots;
this.slotcontainer = (EmptyContainer) this.inventorySlots;
this.prevGui = prevgui;
this.firstGuiGeneral = prevgui;
@@ -526,7 +583,7 @@ public abstract class GuiRecipe<H extends IRecipeHandler> extends GuiContainer i
@Override
public Slot getSlotAtPosition(int mousex, int mousey) {
final Widget activeWidget = this.container.getWidgetUnderMouse(mousex, mousey);
final ContainerRecipe slotcontainer = (ContainerRecipe) inventorySlots;
final EmptyContainer slotcontainer = (EmptyContainer) inventorySlots;
slotcontainer.setActiveStack(null);
if (activeWidget instanceof NEIRecipeWidget recipeWidget) {
@@ -759,6 +816,10 @@ public abstract class GuiRecipe<H extends IRecipeHandler> extends GuiContainer i
this.recipeTabs.handleTooltip(mousex, mousey, currenttip);
if (this.handler != null && this.handler.searchingAvailable()) {
currenttip = GuiRecipe.toggleSearch.handleTooltip(mousex, mousey, currenttip);
}
if (currenttip.isEmpty() && isHandlerTitleHovered(mousex, mousey)) {
currenttip.add(NEIClientUtils.translate("recipe.tab.view_all.tooltip"));
}
@@ -1022,7 +1083,7 @@ public abstract class GuiRecipe<H extends IRecipeHandler> extends GuiContainer i
final int curRecipe = indices.isEmpty() ? 0 : indices.get(0);
final Recipe recipe = Recipe.of(gRecipe.handler.original, curRecipe);
return recipe != null ? recipe.getRecipeId() : null;
return recipe.getRecipeId();
}
return null;
@@ -1033,7 +1094,7 @@ public abstract class GuiRecipe<H extends IRecipeHandler> extends GuiContainer i
private GuiOverlayButton[] overlayButtons = new GuiOverlayButton[0];
@Deprecated
public ContainerRecipe slotcontainer;
public EmptyContainer slotcontainer;
@Deprecated
public List<GuiButton> getOverlayButtons() {
@@ -65,6 +65,10 @@ public abstract class GuiRecipeButton extends GuiNEIButton {
}
public void onPermutationsChanged() {
}
public boolean mouseScrolled(int scroll) {
return false;
}
@@ -175,6 +175,10 @@ public class NEIRecipeWidget extends Widget {
if (!NEIClientUtils.shiftKey() && ((this.cycleticks++) / 20) != this.lastcycle || this.lastcycle == -1) {
this.lastcycle = this.cycleticks / 20;
updatePermutations();
for (GuiRecipeButton button : getRecipeButtonsIfInit()) {
button.onPermutationsChanged();
}
}
for (GuiRecipeButton button : getRecipeButtons()) {
@@ -223,7 +227,7 @@ public class NEIRecipeWidget extends Widget {
button -> (this.showAsWidget ? button instanceof GuiOverlayButton : button.contains(mouseX, mouseY))
? button
: null,
(GuiRecipeButton) null);
null);
if (overlayButton != null) {
NEIClientUtils.gl2DRenderContext(() -> overlayButton.drawItemOverlay());
@@ -247,14 +251,15 @@ public class NEIRecipeWidget extends Widget {
}
protected void drawItem(PositionedStack pStack, int mouseX, int mouseY, int yShift, boolean input) {
GuiContainerManager.drawItem(pStack.relx, pStack.rely, pStack.item);
pStack.draw(mouseX - this.x, mouseY - this.y - yShift);
if (this.handlerInfo.getShowBadge()) {
drawBadge(pStack, input);
}
if (pStack.contains(mouseX - this.x, mouseY - this.y - yShift)) {
NEIClientUtils.gl2DRenderContext(() -> GuiDraw.drawRect(pStack.relx, pStack.rely, 16, 16, 0x80FFFFFF));
NEIClientUtils.gl2DRenderContext(
() -> GuiDraw.drawRect(pStack.relx, pStack.rely, pStack.width, pStack.height, 0x80FFFFFF));
}
}
@@ -291,7 +296,7 @@ public class NEIRecipeWidget extends Widget {
final List<Badge> badges = getBadges(pStack, input);
for (Badge badge : badges) {
badge.draw(new Rectangle4i(pStack.relx, pStack.rely, 16, 16));
badge.draw(new Rectangle4i(pStack.relx, pStack.rely, pStack.width, pStack.height));
}
}
@@ -409,14 +414,22 @@ public class NEIRecipeWidget extends Widget {
if (itemstack != null) {
final PositionedStack hovered = getPositionedStackMouseOver(mousex, mousey);
if (hovered != null && this.handlerInfo.getShowBadge()) {
final List<Badge> badges = getBadges(hovered, getOutputs().indexOf(hovered) == -1);
if (hovered != null) {
if (this.handlerInfo.getShowBadge()) {
final List<Badge> badges = getBadges(hovered, getOutputs().indexOf(hovered) == -1);
for (Badge badge : badges) {
if (badge.getTooltip() != null && !badge.getTooltip().isEmpty()) {
tooltip.addAll(badge.getTooltip());
for (Badge badge : badges) {
if (badge.getTooltip() != null && !badge.getTooltip().isEmpty()) {
tooltip.addAll(badge.getTooltip());
}
}
}
final List<String> customTooltip = hovered.getTooltip();
if (customTooltip != null && !customTooltip.isEmpty()) {
tooltip.addAll(customTooltip);
}
}
if (hovered == null || !NEIClientConfig.showCycledIngredientsTooltip()
@@ -427,6 +440,10 @@ public class NEIRecipeWidget extends Widget {
|| this.acceptsFollowingTooltipLineHandler.tooltipGUID != hovered) {
this.acceptsFollowingTooltipLineHandler = AcceptsFollowingTooltipLineHandler
.of(hovered, this.permutations.get(hovered), hovered.item);
if (this.acceptsFollowingTooltipLineHandler != null && hovered.getAcceptsLabel() != null) {
this.acceptsFollowingTooltipLineHandler.setLabel(hovered.getAcceptsLabel());
}
}
} else if (this.acceptsFollowingTooltipLineHandler != null) {
this.acceptsFollowingTooltipLineHandler = null;
@@ -168,7 +168,7 @@ public class ProfilerRecipeHandler implements ICraftingHandler, IUsageHandler {
private boolean isHandlerTitleHovered(int recipe, Point mouse) {
final GuiContainer guiContainer = NEIClientUtils.getGuiContainer();
if (guiContainer instanceof GuiRecipe guiRecipe) {
if (guiContainer instanceof GuiRecipe<?>guiRecipe) {
final Point recipePosition = guiRecipe.getRecipePosition(recipe);
return new Rectangle(recipePosition.x, recipePosition.y, WIDTH, 16)
.contains(mouse.x - guiContainer.guiLeft, mouse.y - guiContainer.guiTop);
@@ -250,7 +250,7 @@ public class ProfilerRecipeHandler implements ICraftingHandler, IUsageHandler {
if (r.handler != null) {
final GuiContainer guiContainer = NEIClientUtils.getGuiContainer();
if (guiContainer instanceof GuiRecipe guiRecipe) {
if (guiContainer instanceof GuiRecipe<?>guiRecipe) {
int index = guiRecipe.currenthandlers.indexOf(r.handler);
if (index != -1) {
@@ -4,7 +4,9 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.IdentityHashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import net.minecraft.item.Item;
@@ -43,7 +45,13 @@ public class Recipe {
if (!isShapedRecipe()) {
// sort to ignore ingredients position in shapeless recipes
this.ingredients.sort(Comparator.comparing(StackInfo::getItemStackGUID));
final Map<ItemStack, String> guids = new IdentityHashMap<>();
for (ItemStack ingredient : this.ingredients) {
guids.put(ingredient, StackInfo.getItemStackGUID(ingredient));
}
this.ingredients.sort(Comparator.comparing(guids::get));
}
}
@@ -52,7 +60,10 @@ public class Recipe {
}
public static RecipeId of(IRecipeHandler handler, int recipeIndex) {
final List<PositionedStack> ingredients = handler.getIngredientStacks(recipeIndex);
return of(handler, recipeIndex, handler.getIngredientStacks(recipeIndex));
}
public static RecipeId of(IRecipeHandler handler, int recipeIndex, List<PositionedStack> ingredients) {
final String handlerName = GuiRecipeTab.getHandlerInfo(handler).getHandlerName();
PositionedStack pStackResult = handler.getResultStack(recipeIndex);
@@ -288,13 +299,18 @@ public class Recipe {
protected int relx;
protected int rely;
protected int width;
protected int height;
public RecipeIngredient(int relx, int rely, List<ItemStack> items, int chance, int activeIndex) {
public RecipeIngredient(int relx, int rely, int width, int height, List<ItemStack> items, int chance,
int activeIndex) {
this.items = items.stream().map(ItemStack::copy).toArray(size -> new ItemStack[size]);
this.amount = StackInfo.getAmount(this.items[activeIndex]);
this.activeIndex = activeIndex;
this.relx = relx;
this.rely = rely;
this.width = width;
this.height = height;
this.chance = chance;
}
@@ -314,11 +330,19 @@ public class Recipe {
}
}
return of(positionedStack.relx, positionedStack.rely, stacks, positionedStack.getChance(), activeIndex);
return of(
positionedStack.relx,
positionedStack.rely,
positionedStack.width,
positionedStack.height,
stacks,
positionedStack.getChance(),
activeIndex);
}
public static RecipeIngredient of(int relx, int rely, List<ItemStack> stacks, int chance, int activeIndex) {
return new RecipeIngredient(relx, rely, stacks, chance, activeIndex);
public static RecipeIngredient of(int relx, int rely, int width, int height, List<ItemStack> stacks, int chance,
int activeIndex) {
return new RecipeIngredient(relx, rely, width, height, stacks, chance, activeIndex);
}
public int getAmount() {
@@ -335,34 +359,25 @@ public class Recipe {
public void setActiveIndex(int activeIndex) {
this.activeIndex = Math.max(0, Math.min(activeIndex, this.items.length - 1));
this.amount = StackInfo.getAmount(this.items[this.activeIndex]);
}
public boolean contains(ItemStack stackA) {
return getPermutations().stream()
.anyMatch(stackB -> NEIClientUtils.areStacksSameTypeWithNBT(stackB, stackA));
final ItemStack stack = StackInfo.withAmount(stackA, 0);
return getPermutations().stream().anyMatch(
stackB -> NEIClientUtils.areStacksSameTypeWithNBT(StackInfo.withAmount(stackB, 0), stack));
}
public List<ItemStack> getPermutations() {
return Arrays.asList(this.items);
}
public RecipeIngredient setAmount(int amount) {
for (int index = 0; index < this.items.length; index++) {
this.items[index] = StackInfo.withAmount(this.items[index], amount);
}
return this;
}
public void setChance(int chance) {
this.chance = chance;
}
public RecipeIngredient copy() {
return new RecipeIngredient(
this.relx,
this.rely,
this.width,
this.height,
getPermutations().stream().map(ItemStack::copy).collect(Collectors.toList()),
this.chance,
this.activeIndex);
@@ -447,7 +462,7 @@ public class Recipe {
}
if (item instanceof ItemStack stack) {
return RecipeIngredient.of(0, 0, Arrays.asList(stack), PositionedStack.CHANCE_FULL, 0);
return RecipeIngredient.of(0, 0, 16, 16, Arrays.asList(stack), PositionedStack.CHANCE_FULL, 0);
}
if (item instanceof RecipeIngredient ingr) {
@@ -59,7 +59,7 @@ public class RecipeHandlerRef {
private GuiContainer prepareGui(GuiContainer firstGui) {
if (firstGui instanceof GuiRecipe gui) {
if (firstGui instanceof GuiRecipe<?>gui) {
firstGui = gui.firstGui;
}
@@ -50,8 +50,7 @@ public class RecipeInfo {
public static void registerGuiOverlay(Class<? extends GuiContainer> classz, String ident,
IStackPositioner positioner) {
positionerMap.put(new OverlayKey(classz, ident), positioner);
if (positioner instanceof OffsetPositioner && !offsets.containsKey(classz)) {
OffsetPositioner p = (OffsetPositioner) positioner;
if (positioner instanceof OffsetPositioner p && !offsets.containsKey(classz)) {
setGuiOffset(classz, p.offsetx, p.offsety);
}
}
@@ -0,0 +1,332 @@
package codechicken.nei.recipe;
import java.awt.Dimension;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashSet;
import java.util.IdentityHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumChatFormatting;
import codechicken.lib.gui.GuiDraw.ITooltipLineHandler;
import codechicken.lib.vec.Rectangle4i;
import codechicken.nei.ItemStackAmount;
import codechicken.nei.ItemsListTooltipLineHandler;
import codechicken.nei.ItemsTooltipLineHandler;
import codechicken.nei.ItemsTooltipLineHandler.StacksAmountRenderer;
import codechicken.nei.ItemsTooltipLineHandler.TotalAmountRenderer;
import codechicken.nei.NEIClientUtils;
import codechicken.nei.PositionedStack;
import codechicken.nei.api.IGuiContainerOverlay;
import codechicken.nei.recipe.Recipe.RecipeId;
import codechicken.nei.recipe.Recipe.RecipeIngredient;
import codechicken.nei.util.ReadableNumberConverter;
public class RecipeItemsTooltipLineHandler implements ITooltipLineHandler {
protected static class ChanceTotalAmountRenderer extends TotalAmountRenderer {
protected final Set<ItemStack> approximate;
public ChanceTotalAmountRenderer(Set<ItemStack> approximate) {
this.approximate = approximate;
}
@Override
protected String formatAmount(ItemStack stack, long amount) {
final String text = super.formatAmount(stack, amount);
if (!this.approximate.contains(stack)) {
return text;
} else if (!text.isEmpty()) {
return EnumChatFormatting.GOLD + "~" + text;
} else if (amount == 0) {
return EnumChatFormatting.GOLD + "~0";
}
return text;
}
}
protected static class ChanceStacksAmountRenderer extends StacksAmountRenderer {
protected static final int APPROXIMATE_COLOR = 0xFFAA00;
protected final Set<ItemStack> approximate;
public ChanceStacksAmountRenderer(Set<ItemStack> approximate) {
this.approximate = approximate;
}
@Override
protected void drawAmount(Rectangle4i rect, ItemStack stack, long amount) {
if (amount == 0) {
Badge.notConsumed().draw(rect);
} else {
super.drawAmount(rect, stack, amount);
}
}
@Override
protected String getPrefix(ItemStack stack) {
return this.approximate.contains(stack) ? "~" : "";
}
@Override
protected int getColor(ItemStack stack) {
return this.approximate.contains(stack) ? APPROXIMATE_COLOR : super.getColor(stack);
}
}
protected static final int MAX_ROWS = 15;
protected final RecipeId recipeId;
protected final long multiplier;
protected boolean useInventory = false;
protected final List<ItemsTooltipLineHandler> lines = new ArrayList<>();
protected final Dimension size = new Dimension();
protected String title = "";
protected boolean created = false;
public RecipeItemsTooltipLineHandler(RecipeId recipeId, long multiplier) {
this.recipeId = recipeId;
this.multiplier = multiplier;
}
public RecipeItemsTooltipLineHandler setUseInventory(boolean useInventory) {
this.useInventory = useInventory;
this.created = false;
return this;
}
public RecipeId getRecipeId() {
return this.recipeId;
}
public long getMultiplier() {
return this.multiplier;
}
public boolean isUseInventory() {
return this.useInventory;
}
public String getTitle() {
ensureCreated();
return this.title;
}
@Override
public Dimension getSize() {
ensureCreated();
return this.size;
}
protected void ensureCreated() {
if (!this.created) {
this.created = true;
createLines();
}
}
@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 static int getIngredientOrder(ItemStack stack) {
return StackInfo.isFluidDisplayItem(stack) ? 2 : stack.stackSize == 0 ? 0 : 1;
}
protected void createLines() {
this.lines.clear();
this.size.setSize(0, 0);
final RecipeHandlerRef handlerRef = RecipeHandlerRef.of(this.recipeId);
if (handlerRef == null) {
return;
}
final Recipe recipe = Recipe.of(handlerRef);
final Set<NBTTagCompound> approximateResults = new HashSet<>();
final Set<NBTTagCompound> approximateIngredients = new HashSet<>();
final List<ItemStack> results = multiplyItems(recipe.getResults(), false, approximateResults);
final List<ItemStack> ingredients = multiplyItems(recipe.getIngredients(), true, approximateIngredients);
final ItemStackAmount ingredientsAmount = ItemStackAmount.of(ingredients);
ingredients.sort(Comparator.comparingInt(RecipeItemsTooltipLineHandler::getIngredientOrder));
this.title = handlerRef.handler.getRecipeName().trim() + " (x"
+ ReadableNumberConverter.INSTANCE.toWideReadableForm(this.multiplier)
+ ")";
addResultLine(results, approximateResults);
addRequiredLine(ingredients, approximateIngredients);
if (this.useInventory) {
final List<ItemStack> needed = subtractItems(ingredientsAmount, getInventoryItems());
final ItemStackAmount neededAmount = ItemStackAmount.of(needed);
final ItemStackAmount consumedAmount = ItemStackAmount.of(ingredientsAmount);
consumedAmount.removeIf(entry -> entry.getValue() <= 0);
if (!neededAmount.equals(consumedAmount)) {
addNeededLine(
needed,
approximateIngredients,
needed.size() == 1 || ingredientsAmount.size() + neededAmount.size() <= MAX_ROWS);
}
}
int width = 0;
int height = 0;
for (ItemsTooltipLineHandler line : this.lines) {
width = Math.max(width, line.getSize().width);
height += line.getSize().height;
}
this.size.setSize(width, height);
}
protected void addResultLine(List<ItemStack> items, Set<NBTTagCompound> approximate) {
final String label = NEIClientUtils.translate("recipe.items.results");
final ItemsTooltipLineHandler line = items.size() == 1 ? new ItemsListTooltipLineHandler(label, items, MAX_ROWS)
: new ItemsTooltipLineHandler(label, items);
if (line.isEmpty()) {
return;
}
line.setLabelColor(EnumChatFormatting.GREEN);
final Set<ItemStack> approximateItems = Collections.newSetFromMap(new IdentityHashMap<>());
for (ItemStack stack : line.getItems()) {
if (approximate.contains(StackInfo.itemStackToNBT(stack, false))) {
approximateItems.add(stack);
}
}
line.setAmountRenderer(new ChanceTotalAmountRenderer(approximateItems));
this.lines.add(line);
}
protected void addRequiredLine(List<ItemStack> items, Set<NBTTagCompound> approximate) {
final String label = NEIClientUtils.translate("recipe.items.ingredients");
final ItemsTooltipLineHandler line = new ItemsListTooltipLineHandler(label, items, MAX_ROWS);
if (line.isEmpty()) {
return;
}
line.setLabelColor(EnumChatFormatting.YELLOW);
final Set<ItemStack> approximateItems = Collections.newSetFromMap(new IdentityHashMap<>());
for (ItemStack stack : line.getItems()) {
if (approximate.contains(StackInfo.itemStackToNBT(stack, false))) {
approximateItems.add(stack);
}
}
line.setAmountRenderer(new ChanceStacksAmountRenderer(approximateItems));
this.lines.add(line);
}
protected void addNeededLine(List<ItemStack> items, Set<NBTTagCompound> approximate, boolean vertical) {
final String label = NEIClientUtils.translate("recipe.items.ingredients_needed");
final ItemsTooltipLineHandler line = vertical ? new ItemsListTooltipLineHandler(label, items, MAX_ROWS)
: new ItemsTooltipLineHandler(label, items);
if (line.isEmpty()) {
return;
}
line.setLabelColor(EnumChatFormatting.RED);
final Set<ItemStack> approximateItems = Collections.newSetFromMap(new IdentityHashMap<>());
for (ItemStack stack : line.getItems()) {
if (approximate.contains(StackInfo.itemStackToNBT(stack, false))) {
approximateItems.add(stack);
}
}
line.setAmountRenderer(new ChanceStacksAmountRenderer(approximateItems));
this.lines.add(line);
}
protected List<ItemStack> multiplyItems(List<RecipeIngredient> items, boolean ingredients,
Set<NBTTagCompound> approximate) {
final ItemStackAmount chanceAmounts = new ItemStackAmount();
final List<ItemStack> result = new ArrayList<>();
for (RecipeIngredient item : items) {
chanceAmounts.add(item.getItemStack(), (long) item.getAmount() * item.getChance());
}
for (Map.Entry<NBTTagCompound, Long> entry : chanceAmounts.entrySet()) {
final long amount = entry.getValue() * this.multiplier;
final long entryAmount = ingredients
? (amount + PositionedStack.CHANCE_FULL - 1) / PositionedStack.CHANCE_FULL
: amount / PositionedStack.CHANCE_FULL;
final ItemStack stack = StackInfo.loadFromNBT(entry.getKey(), entryAmount);
if (amount % PositionedStack.CHANCE_FULL != 0) {
approximate.add(entry.getKey());
}
result.add(stack);
}
return result;
}
protected static ItemStackAmount getInventoryItems() {
GuiScreen screen = NEIClientUtils.mc().currentScreen;
if (screen instanceof IGuiContainerOverlay overlay) {
screen = overlay.getFirstScreen();
}
if (screen instanceof GuiContainer container) {
return AutoCraftingManager.getInventoryItems(container);
}
return new ItemStackAmount();
}
protected static List<ItemStack> subtractItems(ItemStackAmount items, ItemStackAmount subtrahend) {
final List<ItemStack> result = new ArrayList<>();
for (Map.Entry<NBTTagCompound, Long> entry : items.entrySet()) {
final ItemStack stack = StackInfo.loadFromNBT(entry.getKey(), 0);
final long amount = entry.getValue() - subtrahend.getOrDefault(stack, 0L);
if (amount > 0) {
result.add(StackInfo.withAmount(stack, amount));
}
}
return result;
}
}
@@ -50,12 +50,13 @@ public class RecipePageManager {
final int heightAvailable = this.container.getVisibleHeight();
final int width = Math.max(166, this.handlerInfo.getWidth());
final int numRecipes = getNumRecipes();
final List<Integer> searchRecipes = this.handler.getFilteredRecipes();
final int numRecipes = searchRecipes.size();
List<Widget> widgets = new ArrayList<>();
int shiftY = 0;
for (int i = 0; i < numRecipes; i++) {
final int recipeIndex = this.handler.ref(i);
final int recipeIndex = searchRecipes.get(i);
final NEIRecipeWidget widget = RecipeHandlerRef.of(this.handler.original, recipeIndex).getRecipeWidget();
widget.w = width;
@@ -13,6 +13,7 @@ import codechicken.nei.drawable.DrawableResource;
import codechicken.nei.guihook.GuiContainerManager;
import codechicken.nei.recipe.Recipe.RecipeId;
import codechicken.nei.scroll.GuiHelper;
import codechicken.nei.util.ReadableNumberConverter;
public class RecipeTooltipLineHandler implements ITooltipLineHandler {
@@ -32,9 +33,15 @@ public class RecipeTooltipLineHandler implements ITooltipLineHandler {
protected NEIRecipeWidget widget = null;
protected RecipeId recipeId = null;
protected boolean createdGui = false;
protected long multiplier = 0;
public RecipeTooltipLineHandler(RecipeId recipeId, long multiplier) {
this.recipeId = recipeId;
this.multiplier = multiplier;
}
public RecipeTooltipLineHandler(RecipeId recipeId) {
this.recipeId = recipeId;
this(recipeId, 0);
}
public ItemStack getItemStack() {
@@ -45,6 +52,10 @@ public class RecipeTooltipLineHandler implements ITooltipLineHandler {
return this.recipeId;
}
public long getMultiplier() {
return this.multiplier;
}
@Override
public Dimension getSize() {
@@ -104,6 +115,14 @@ public class RecipeTooltipLineHandler implements ITooltipLineHandler {
GuiDraw.drawRect(BG_PADDING, BG_PADDING, size.width - BG_PADDING * 2, 12, 0x30000000);
GuiDraw.drawStringC(this.recipeName, this.widget.w / 2, BG_PADDING + 2, 0xffffff);
if (this.multiplier > 0) {
GuiDraw.drawString(
"x" + ReadableNumberConverter.INSTANCE.toWideReadableForm(this.multiplier),
BG_PADDING + 2,
BG_PADDING + 2,
0xffffff);
}
GuiHelper.useScissor(
this.widget.x,
this.widget.y,
@@ -2,13 +2,17 @@ package codechicken.nei.recipe;
import java.awt.Rectangle;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutionException;
import java.util.stream.Collectors;
import net.minecraft.client.gui.GuiRepair;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import codechicken.nei.ItemList;
@@ -35,14 +39,17 @@ public class RepairRecipeHandler extends TemplateRecipeHandler {
private static class ItemStackKey {
private final ItemStack stack;
private final int hashCode;
public ItemStackKey(ItemStack stack) {
this.stack = stack;
this.hashCode = stack.isItemStackDamageable() ? stack.getItem().hashCode()
: 31 * stack.getItem().hashCode() + stack.getItemDamage();
}
@Override
public int hashCode() {
return stack.getItem().hashCode();
return this.hashCode;
}
@Override
@@ -104,22 +111,48 @@ public class RepairRecipeHandler extends TemplateRecipeHandler {
reloadRepairRecipesTask.restart();
}
private void buildCache() {
final Map<ItemStackKey, RepairPair> recipes = new HashMap<>();
private static final Set<Integer> knownBrokenItemTypes = ConcurrentHashMap.newKeySet();
private static volatile List<ItemStack> uniqueMaterials;
for (ItemStack itemstack1 : ItemList.items) {
recipes.computeIfAbsent(new ItemStackKey(itemstack1), key -> this.getRepairRecipe(key.stack));
private void buildCache() {
if (cachedRecipes != null) return;
uniqueMaterials = collectUniqueMaterials();
final Map<ItemStackKey, RepairPair> recipes = new ConcurrentHashMap<>();
try {
ItemList.forkJoinPool.submit(
() -> ItemList.items.parallelStream().forEach(
itemstack1 -> recipes
.computeIfAbsent(new ItemStackKey(itemstack1), key -> getRepairRecipe(key.stack))))
.get();
} catch (InterruptedException | ExecutionException e) {
NEIClientConfig.logger.error("Failed to build repair recipe cache", e);
}
cachedRecipes = recipes.values().stream().filter(recipe -> recipe != null).collect(Collectors.toList());
}
private static List<ItemStack> collectUniqueMaterials() {
final Map<Long, ItemStack> unique = new LinkedHashMap<>();
for (ItemStack stack : ItemList.items) {
final long key = ((long) Item.getIdFromItem(stack.getItem()) << 32) | (stack.getItemDamage() & 0xFFFFFFFFL);
unique.putIfAbsent(key, stack);
}
return new ArrayList<>(unique.values());
}
private RepairPair getRepairRecipe(ItemStack itemstack1) {
if (!itemstack1.isItemStackDamageable()) return null;
final List<ItemStack> permutations = new ArrayList<>();
final int itemId = Item.getIdFromItem(itemstack1.getItem());
if (knownBrokenItemTypes.contains(itemId)) return null;
for (ItemStack itemstack2 : ItemList.items) {
final List<ItemStack> permutations = new ArrayList<>();
final List<ItemStack> candidates = uniqueMaterials != null ? uniqueMaterials : collectUniqueMaterials();
for (ItemStack itemstack2 : candidates) {
try {
if (itemstack1.getItem().getIsRepairable(itemstack1, itemstack2)) {
final ItemStack right = itemstack2.copy();
@@ -127,7 +160,8 @@ public class RepairRecipeHandler extends TemplateRecipeHandler {
permutations.add(right);
}
} catch (Exception e) {
// Catch exceptions from mods that don't properly implement getIsRepairable
knownBrokenItemTypes.add(itemId);
break;
}
}
@@ -74,20 +74,18 @@ class SearchRecipeHandler<H extends IRecipeHandler> {
}
List<Integer> filtered = null;
final List<Integer> recipes = IntStream.range(0, filteredRecipes.size()).boxed()
.collect(Collectors.toCollection(ArrayList::new));
final List<Integer> recipes = IntStream.range(0, filteredRecipes.size()).boxed().collect(Collectors.toList());
try {
filtered = ItemList.forkJoinPool.submit(
() -> recipes.parallelStream()
.filter(recipe -> mathRecipe(this.original, filteredRecipes.get(recipe), filter))
.collect(Collectors.toCollection(ArrayList::new)))
.collect(Collectors.toList()))
.get();
filtered.sort((a, b) -> a - b);
} catch (InterruptedException | ExecutionException e) {
e.printStackTrace();
}
return filtered;
@@ -97,6 +95,22 @@ class SearchRecipeHandler<H extends IRecipeHandler> {
this.searchRecipes = searchRecipes;
}
public List<Integer> getFilteredRecipes() {
if (this.searchRecipes == null) {
return this.filteredRecipes;
}
final List<Integer> search = this.searchRecipes;
final List<Integer> resolved = new ArrayList<>(search.size());
for (int idx : search) {
resolved.add(this.filteredRecipes.get(idx));
}
return resolved;
}
public int ref(int index) {
if (searchRecipes != null) {
@@ -1,6 +1,8 @@
package codechicken.nei.recipe;
import java.awt.Rectangle;
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
import java.util.List;
@@ -13,8 +15,6 @@ import net.minecraft.item.crafting.IRecipe;
import net.minecraft.item.crafting.ShapedRecipes;
import net.minecraftforge.oredict.ShapedOreRecipe;
import codechicken.core.ReflectionManager;
import codechicken.nei.NEIClientConfig;
import codechicken.nei.NEIClientUtils;
import codechicken.nei.NEIServerUtils;
import codechicken.nei.PositionedStack;
@@ -25,6 +25,24 @@ import codechicken.nei.api.IStackPositioner;
public class ShapedRecipeHandler extends TemplateRecipeHandler {
private static final MethodHandle SHAPED_ORE_RECIPE_WIDTH, SHAPED_ORE_RECIPE_HEIGHT;
static {
try {
final var lookup = MethodHandles.lookup();
final var widthField = ShapedOreRecipe.class.getDeclaredField("width");
final var heightField = ShapedOreRecipe.class.getDeclaredField("height");
widthField.setAccessible(true);
heightField.setAccessible(true);
SHAPED_ORE_RECIPE_WIDTH = lookup.unreflectGetter(widthField);
SHAPED_ORE_RECIPE_HEIGHT = lookup.unreflectGetter(heightField);
} catch (IllegalAccessException | NoSuchFieldException e) {
throw new RuntimeException(e);
}
}
public class CachedShapedRecipe extends CachedRecipe {
public ArrayList<PositionedStack> ingredients;
@@ -84,7 +102,7 @@ public class ShapedRecipeHandler extends TemplateRecipeHandler {
@Override
public void loadCraftingRecipes(String outputId, Object... results) {
if (outputId.equals("crafting") && getClass() == ShapedRecipeHandler.class) {
for (IRecipe irecipe : (List<IRecipe>) CraftingManager.getInstance().getRecipeList()) {
for (IRecipe irecipe : CraftingManager.getInstance().getRecipeList()) {
CachedShapedRecipe recipe = null;
if (irecipe instanceof ShapedRecipes shaped) {
@@ -99,7 +117,7 @@ public class ShapedRecipeHandler extends TemplateRecipeHandler {
}
}
} else if (outputId.equals("crafting2x2") && getClass() == ShapedRecipeHandler.class) {
for (IRecipe irecipe : (List<IRecipe>) CraftingManager.getInstance().getRecipeList()) {
for (IRecipe irecipe : CraftingManager.getInstance().getRecipeList()) {
if (irecipe instanceof ShapedRecipes shaped && shaped.recipeWidth <= 2 && shaped.recipeHeight <= 2) {
CachedShapedRecipe recipe = new CachedShapedRecipe(shaped);
@@ -115,7 +133,7 @@ public class ShapedRecipeHandler extends TemplateRecipeHandler {
@Override
public void loadCraftingRecipes(ItemStack result) {
for (IRecipe irecipe : (List<IRecipe>) CraftingManager.getInstance().getRecipeList()) {
for (IRecipe irecipe : CraftingManager.getInstance().getRecipeList()) {
if (NEIServerUtils.areStacksSameTypeCrafting(irecipe.getRecipeOutput(), result)) {
CachedShapedRecipe recipe = null;
if (irecipe instanceof ShapedRecipes) recipe = new CachedShapedRecipe((ShapedRecipes) irecipe);
@@ -131,7 +149,7 @@ public class ShapedRecipeHandler extends TemplateRecipeHandler {
@Override
public void loadUsageRecipes(ItemStack ingredient) {
for (IRecipe irecipe : (List<IRecipe>) CraftingManager.getInstance().getRecipeList()) {
for (IRecipe irecipe : CraftingManager.getInstance().getRecipeList()) {
CachedShapedRecipe recipe = null;
if (irecipe instanceof ShapedRecipes) recipe = new CachedShapedRecipe((ShapedRecipes) irecipe);
else if (irecipe instanceof ShapedOreRecipe) recipe = forgeShapedRecipe((ShapedOreRecipe) irecipe);
@@ -147,19 +165,21 @@ public class ShapedRecipeHandler extends TemplateRecipeHandler {
}
public CachedShapedRecipe forgeShapedRecipe(ShapedOreRecipe recipe) {
int width, height;
try {
int width = ReflectionManager.getField(ShapedOreRecipe.class, Integer.class, recipe, 4);
int height = ReflectionManager.getField(ShapedOreRecipe.class, Integer.class, recipe, 5);
Object[] items = recipe.getInput();
for (Object item : items) if (item instanceof List && ((List<?>) item).isEmpty()) // ore handler, no ores
return null;
return new CachedShapedRecipe(width, height, items, recipe.getRecipeOutput());
} catch (Exception e) {
NEIClientConfig.logger.error("Error loading recipe: ", e);
return null;
width = (int) SHAPED_ORE_RECIPE_WIDTH.invokeExact(recipe);
height = (int) SHAPED_ORE_RECIPE_HEIGHT.invokeExact(recipe);
} catch (Throwable e) {
throw new IllegalStateException("Unreachable");
}
Object[] items = recipe.getInput();
for (Object item : items) {
if (item instanceof List<?>ores && ores.isEmpty()) // ore handler, no ores
return null;
}
return new CachedShapedRecipe(width, height, items, recipe.getRecipeOutput());
}
@Override
@@ -21,6 +21,7 @@ import codechicken.nei.LRUCache;
import codechicken.nei.api.IStackStringifyHandler;
import codechicken.nei.api.ItemInfo;
import codechicken.nei.recipe.stackinfo.DefaultStackStringifyHandler;
import codechicken.nei.recipe.stackinfo.FluidDisplayStackStringifyHandler;
import codechicken.nei.recipe.stackinfo.GTFluidStackStringifyHandler;
import codechicken.nei.util.ItemStackKey;
import codechicken.nei.util.NBTHelper;
@@ -36,6 +37,7 @@ public class StackInfo {
static {
stackStringifyHandlers.add(new DefaultStackStringifyHandler());
stackStringifyHandlers.add(new FluidDisplayStackStringifyHandler());
stackStringifyHandlers.add(new GTFluidStackStringifyHandler());
}
@@ -57,7 +59,7 @@ public class StackInfo {
if (nbtTag != null) {
nbtTag = (NBTTagCompound) nbtTag.copy();
nbtTag.setInteger("Count", (int) Math.max(Math.min(customCount, Integer.MAX_VALUE), 0));
nbtTag.setLong("Count", Math.max(customCount, 0));
return loadFromNBT(nbtTag);
}
@@ -86,6 +88,19 @@ public class StackInfo {
return result == null ? stack : result;
}
public static boolean isFluidDisplayItem(ItemStack stack) {
if (stack == null) {
return false;
}
for (int i = stackStringifyHandlers.size() - 1; i >= 0; i--) {
if (stackStringifyHandlers.get(i).isFluidDisplayItem(stack)) {
return true;
}
}
return false;
}
public static void pauseItemDamageSound(boolean pause) {
if (isPausedItemDamageSound != (isPausedItemDamageSound = pause)) {
for (IStackStringifyHandler handler : stackStringifyHandlers) {
@@ -111,7 +126,15 @@ public class StackInfo {
}
public static boolean equalItemAndNBT(ItemStack stackA, ItemStack stackB, boolean useNBT) {
if (stackA == null || stackB == null || stackA.getItem() != stackB.getItem()) {
if (stackA == null || stackB == null) {
return false;
}
if (isFluidDisplayItem(stackA)) {
return isFluidDisplayItem(stackB) && getFluid(stackA).isFluidEqual(getFluid(stackB));
}
if (stackA.getItem() != stackB.getItem()) {
return false;
}
@@ -127,6 +150,10 @@ public class StackInfo {
}
public static synchronized FluidStack getFluid(ItemStack stack) {
if (stack == null) {
return null;
}
ItemStackKey key = new ItemStackKey(stack);
FluidStack fluid = fluidcache.get(key);
@@ -143,7 +170,8 @@ public class StackInfo {
}
public static boolean isFluidContainer(ItemStack stack) {
return stack.getItem() instanceof IFluidContainerItem || FluidContainerRegistry.isContainer(stack);
return stack.getItem() instanceof IFluidContainerItem && !isFluidDisplayItem(stack)
|| FluidContainerRegistry.isContainer(stack);
}
public static String getItemStackGUID(ItemStack stack) {
Loaded 100 of 123 files, more files were not shown because too many files have changed in this diff. Show more