mirror of
https://github.com/GTNewHorizons/NotEnoughItems.git
synced 2026-11-16 18:54:45 +00:00
Compare commits
24
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3c472a02cb | ||
|
|
382278bebb | ||
|
|
55c9811a2b | ||
|
|
0ec87a8b9e | ||
|
|
939845a9ed | ||
|
|
c9db437dd1 | ||
|
|
b1f20104a6 | ||
|
|
ab8d5f275f | ||
|
|
9e87f2b158 | ||
|
|
ab512d3fd8 | ||
|
|
4a9f17590b | ||
|
|
a845e6c3e5 | ||
|
|
4f3a0826fe | ||
|
|
6cd7697ca0 | ||
|
|
38dc14eca1 | ||
|
|
1fc824410b | ||
|
|
af6dba1269 | ||
|
|
2bf5a1cf9f | ||
|
|
2126ec78bc | ||
|
|
5f6209366a | ||
|
|
f5fc4e704d | ||
|
|
3d6c1c6e19 | ||
|
|
fda7688807 | ||
|
|
3f38e6f39b |
No files matched your search
+3
-1
@@ -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
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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.
|
||||
+10
-5
@@ -5,8 +5,8 @@ configurations.create('gtnhlibEmbed') {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
api('com.github.GTNewHorizons:CodeChickenCore:1.4.17:dev')
|
||||
devOnlyNonPublishable('com.github.GTNewHorizons:GTNHLib:0.11.37: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')
|
||||
|
||||
@@ -23,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.37") { transitive = false }
|
||||
gtnhlibEmbed("com.github.GTNewHorizons:GTNHLib:0.11.37") { 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'
|
||||
}
|
||||
|
||||
@@ -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],
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
#This file is generated by updateDaemonJvm
|
||||
toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/97d46b5ff4df0bf61e95652a190a5567/redirect
|
||||
toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/9ef54a08e06b0754cee9fc95ed3a3134/redirect
|
||||
toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/97d46b5ff4df0bf61e95652a190a5567/redirect
|
||||
toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/9ef54a08e06b0754cee9fc95ed3a3134/redirect
|
||||
toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/1df82b76031285ef2e6a4f59ffe9299d/redirect
|
||||
toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/c7d5be6a02945ac2e045048ee54a7d32/redirect
|
||||
toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/97d46b5ff4df0bf61e95652a190a5567/redirect
|
||||
toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/9ef54a08e06b0754cee9fc95ed3a3134/redirect
|
||||
toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/643f404f769811f5f265fd66f7af5d89/redirect
|
||||
toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/38256085a73e137cb4937ea9c4807fec/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
|
||||
Vendored
BIN
Binary file not shown.
+3
-1
@@ -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
|
||||
@@ -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
@@ -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
@@ -17,7 +17,7 @@ pluginManagement {
|
||||
}
|
||||
|
||||
plugins {
|
||||
id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.29'
|
||||
id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.31'
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -7,8 +7,10 @@ import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.GuiTextField;
|
||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||
import net.minecraft.client.settings.GameSettings;
|
||||
import net.minecraft.util.ChatAllowedCharacters;
|
||||
|
||||
import org.lwjgl.input.Keyboard;
|
||||
|
||||
@@ -30,6 +32,8 @@ public class AutoFocusWidget implements IContainerInputHandler {
|
||||
|
||||
protected boolean autofocus = false;
|
||||
protected Point mouse;
|
||||
protected Point pendingMouse;
|
||||
protected GuiTextField textInputHolder;
|
||||
|
||||
public AutoFocusWidget() {
|
||||
GuiContainerManager.addInputHandler(this);
|
||||
@@ -38,32 +42,83 @@ public class AutoFocusWidget implements IContainerInputHandler {
|
||||
public void load(GuiContainer gui) {
|
||||
this.autofocus = LayoutManager.searchField.isVisible() && NEIClientConfig.searchWidgetAutofocus() != 0
|
||||
&& isAllowedGuiAutoSearchFocus(gui);
|
||||
this.mouse = getMousePosition();
|
||||
this.mouse = null;
|
||||
this.pendingMouse = null;
|
||||
|
||||
if (this.autofocus) {
|
||||
beginTextInput();
|
||||
}
|
||||
}
|
||||
|
||||
protected void beginTextInput() {
|
||||
if (this.textInputHolder == null) {
|
||||
this.textInputHolder = new GuiTextField(Minecraft.getMinecraft().fontRenderer, 0, 0, 0, 0);
|
||||
}
|
||||
|
||||
this.textInputHolder.setFocused(true);
|
||||
}
|
||||
|
||||
protected void endTextInput() {
|
||||
if (this.textInputHolder != null) {
|
||||
this.textInputHolder.setFocused(false);
|
||||
}
|
||||
}
|
||||
|
||||
public void guiTick() {
|
||||
if (!this.autofocus) {
|
||||
return;
|
||||
}
|
||||
|
||||
final Point current = getMousePosition();
|
||||
|
||||
if (this.mouse == null) {
|
||||
if (current.equals(this.pendingMouse)) {
|
||||
this.mouse = current;
|
||||
}
|
||||
|
||||
this.pendingMouse = current;
|
||||
} else if (!this.mouse.equals(current)) {
|
||||
cancel();
|
||||
}
|
||||
}
|
||||
|
||||
protected void cancel() {
|
||||
if (this.autofocus) {
|
||||
this.autofocus = false;
|
||||
endTextInput();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean keyTyped(GuiContainer gui, char keyChar, int keyCode) {
|
||||
|
||||
if (this.autofocus) {
|
||||
this.autofocus = false;
|
||||
|
||||
if (!this.mouse.equals(getMousePosition())) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (NEIClientConfig.searchWidgetAutofocus() == 2
|
||||
&& GameSettings.isKeyDown(Minecraft.getMinecraft().gameSettings.keyBindInventory)) {
|
||||
cancel();
|
||||
return false;
|
||||
}
|
||||
|
||||
if (keyCode == Keyboard.KEY_RETURN || keyCode == Keyboard.KEY_NUMPADENTER
|
||||
|| keyCode == Keyboard.KEY_ESCAPE) {
|
||||
cancel();
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!ChatAllowedCharacters.isAllowedCharacter(keyChar)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
this.autofocus = false;
|
||||
|
||||
LayoutManager.searchField.setFocus(true);
|
||||
endTextInput();
|
||||
|
||||
final String oldText = LayoutManager.searchField.text();
|
||||
LayoutManager.searchField.handleKeyPress(keyCode, keyChar);
|
||||
return true;
|
||||
|
||||
return !LayoutManager.searchField.text().equals(oldText);
|
||||
}
|
||||
|
||||
return false;
|
||||
@@ -76,13 +131,13 @@ public class AutoFocusWidget implements IContainerInputHandler {
|
||||
|
||||
@Override
|
||||
public boolean mouseClicked(GuiContainer gui, int mousex, int mousey, int button) {
|
||||
this.autofocus = false;
|
||||
cancel();
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean mouseScrolled(GuiContainer gui, int mousex, int mousey, int scrolled) {
|
||||
this.autofocus = false;
|
||||
cancel();
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -91,22 +146,22 @@ public class AutoFocusWidget implements IContainerInputHandler {
|
||||
|
||||
@Override
|
||||
public void onMouseClicked(GuiContainer gui, int mousex, int mousey, int button) {
|
||||
this.autofocus = false;
|
||||
cancel();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onMouseDragged(GuiContainer gui, int mousex, int mousey, int button, long heldTime) {
|
||||
this.autofocus = false;
|
||||
cancel();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onMouseScrolled(GuiContainer gui, int mousex, int mousey, int scrolled) {
|
||||
this.autofocus = false;
|
||||
cancel();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onMouseUp(GuiContainer gui, int mousex, int mousey, int button) {
|
||||
this.autofocus = false;
|
||||
cancel();
|
||||
}
|
||||
|
||||
protected boolean isAllowedGuiAutoSearchFocus(GuiContainer gui) {
|
||||
|
||||
@@ -1048,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;
|
||||
|
||||
@@ -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;
|
||||
@@ -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
|
||||
}
|
||||
@@ -0,0 +1,101 @@
|
||||
package codechicken.nei;
|
||||
|
||||
import java.awt.Dimension;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Comparator;
|
||||
import java.util.List;
|
||||
|
||||
import codechicken.lib.gui.GuiDraw;
|
||||
import codechicken.lib.gui.GuiDraw.ITooltipLineHandler;
|
||||
|
||||
public abstract class CompositeTooltipLineHandler implements ITooltipLineHandler {
|
||||
|
||||
protected static final int SCREEN_MARGIN = 8 * 2 + 10;
|
||||
protected static final int RESERVED_HEIGHT = 40;
|
||||
|
||||
protected final List<ItemsTooltipLineHandler> lines = new ArrayList<>();
|
||||
protected final Dimension size = new Dimension();
|
||||
|
||||
protected boolean created = false;
|
||||
protected int screenHeight = 0;
|
||||
|
||||
protected abstract void createLines();
|
||||
|
||||
protected boolean needsUpdate() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Dimension getSize() {
|
||||
ensureCreated();
|
||||
return this.size;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void draw(int x, int y) {
|
||||
if (this.size.height == 0) return;
|
||||
|
||||
for (ItemsTooltipLineHandler line : this.lines) {
|
||||
line.draw(x, y);
|
||||
y += line.getSize().height;
|
||||
}
|
||||
}
|
||||
|
||||
protected void ensureCreated() {
|
||||
boolean update = needsUpdate();
|
||||
update = this.screenHeight != (this.screenHeight = GuiDraw.displaySize().height) || update;
|
||||
|
||||
if (this.created && !update) {
|
||||
return;
|
||||
}
|
||||
|
||||
this.created = true;
|
||||
this.lines.clear();
|
||||
this.size.setSize(0, 0);
|
||||
|
||||
createLines();
|
||||
fitToScreen();
|
||||
|
||||
for (ItemsTooltipLineHandler line : this.lines) {
|
||||
this.size.width = Math.max(this.size.width, line.getSize().width);
|
||||
this.size.height += line.getSize().height;
|
||||
}
|
||||
}
|
||||
|
||||
protected void fitToScreen() {
|
||||
if (this.lines.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
|
||||
final List<ItemsTooltipLineHandler> ordered = new ArrayList<>(this.lines);
|
||||
ordered.sort(Comparator.comparingInt(ItemsTooltipLineHandler::getRows));
|
||||
|
||||
int budget = availableHeight() / ItemsTooltipLineHandler.SLOT_SIZE;
|
||||
int rest = ordered.size();
|
||||
|
||||
for (ItemsTooltipLineHandler line : ordered) {
|
||||
final int fair = Math.max(1, budget / rest);
|
||||
|
||||
if (line.getRows() > fair) {
|
||||
line.setMaxRows(fair);
|
||||
}
|
||||
|
||||
budget -= line.getRows();
|
||||
rest--;
|
||||
}
|
||||
}
|
||||
|
||||
protected int availableHeight() {
|
||||
return GuiDraw.displaySize().height - SCREEN_MARGIN
|
||||
- RESERVED_HEIGHT
|
||||
- this.lines.size() * ItemsTooltipLineHandler.headerHeight();
|
||||
}
|
||||
|
||||
protected static int maxLineRows() {
|
||||
final int height = GuiDraw.displaySize().height - SCREEN_MARGIN
|
||||
- RESERVED_HEIGHT
|
||||
- ItemsTooltipLineHandler.headerHeight();
|
||||
return Math.max(1, height / ItemsTooltipLineHandler.SLOT_SIZE);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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 {
|
||||
@@ -244,17 +303,28 @@ public class ItemCraftablesPanel
|
||||
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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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--;
|
||||
|
||||
@@ -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,56 +18,269 @@ 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 {
|
||||
|
||||
protected static final int SLOT_SIZE = 18;
|
||||
protected static final int MAX_COLUMNS = 11;
|
||||
protected static final int MARGIN_TOP = 2;
|
||||
@FunctionalInterface
|
||||
public interface 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;
|
||||
protected int length = 0;
|
||||
|
||||
public ItemsTooltipLineHandler(String label, List<ItemStack> items) {
|
||||
this(label, items, true, 5);
|
||||
void draw(int x, int y, ItemStack stack, long amount);
|
||||
}
|
||||
|
||||
public ItemsTooltipLineHandler(String label, List<ItemStack> items, boolean saveStackSize, int maxRows) {
|
||||
this.label = label;
|
||||
this.items = groupingItemStacks(items);
|
||||
this.saveStackSize = saveStackSize;
|
||||
this.length = this.items.size();
|
||||
public static class NoAmountRenderer implements AmountRenderer {
|
||||
|
||||
if (this.length > 0) {
|
||||
this.columns = Math.min(MAX_COLUMNS, this.length);
|
||||
this.rows = Math.min(maxRows, (int) Math.ceil((float) this.length / this.columns));
|
||||
@Override
|
||||
public void draw(int x, int y, ItemStack stack, long amount) {
|
||||
GuiContainerManager.drawItem(x, y, stack, true, "");
|
||||
}
|
||||
|
||||
this.size.width = Math.max(this.columns * SLOT_SIZE, fontRenderer.getStringWidth(this.label) + 15);
|
||||
this.size.height = this.rows * SLOT_SIZE + fontRenderer.FONT_HEIGHT + 2 + MARGIN_TOP;
|
||||
protected static void drawAmountText(String text, Rectangle4i rect, int color, Alignment alignment) {
|
||||
NEIClientUtils.drawNEIOverlayText(text, rect, 1, color, true, alignment);
|
||||
}
|
||||
}
|
||||
|
||||
this.count = Math.min(
|
||||
this.length,
|
||||
Math.min(
|
||||
this.columns * this.rows,
|
||||
this.length > MAX_COLUMNS * maxRows ? (MAX_COLUMNS * maxRows) : Integer.MAX_VALUE));
|
||||
public static class TotalAmountRenderer extends NoAmountRenderer {
|
||||
|
||||
if (this.items.size() > this.count) {
|
||||
String text = "+" + (this.items.size() - this.count);
|
||||
this.count -= (int) Math.ceil((float) (fontRenderer.getStringWidth(text) - 2) / SLOT_SIZE);
|
||||
private static class AmountText {
|
||||
|
||||
public final String text;
|
||||
public final Alignment alignment;
|
||||
|
||||
public AmountText(String text, Alignment alignment) {
|
||||
this.text = text;
|
||||
this.alignment = alignment;
|
||||
}
|
||||
}
|
||||
|
||||
private final Map<ItemStack, AmountText> cache = new IdentityHashMap<>();
|
||||
|
||||
@Override
|
||||
public void draw(int x, int y, ItemStack stack, long amount) {
|
||||
super.draw(x, y, stack, amount);
|
||||
drawAmount(new Rectangle4i(x, y, SLOT_SIZE - 2, SLOT_SIZE - 2), stack, amount);
|
||||
}
|
||||
|
||||
protected void drawAmount(Rectangle4i rect, ItemStack stack, long amount) {
|
||||
final AmountText amountText = this.cache.computeIfAbsent(stack, key -> {
|
||||
final boolean isFluidDisplay = StackInfo.isFluidDisplayItem(key);
|
||||
final String text = formatAmount(key, amount);
|
||||
|
||||
return new AmountText(
|
||||
isFluidDisplay && !text.isEmpty() ? text + "L" : text,
|
||||
isFluidDisplay ? Alignment.BottomLeft : Alignment.BottomRight);
|
||||
});
|
||||
|
||||
if (!amountText.text.isEmpty()) {
|
||||
drawAmountText(amountText.text, rect, 0xFFFFFF, amountText.alignment);
|
||||
}
|
||||
}
|
||||
|
||||
protected String formatAmount(ItemStack stack, long amount) {
|
||||
return amount == 0 ? "" : ReadableNumberConverter.INSTANCE.toWideReadableForm(amount);
|
||||
}
|
||||
}
|
||||
|
||||
public static class StacksAmountRenderer extends NoAmountRenderer {
|
||||
|
||||
private static class StacksText {
|
||||
|
||||
public final String stacks;
|
||||
public final String remainder;
|
||||
public final int color;
|
||||
|
||||
public StacksText(String stacks, String remainder, int color) {
|
||||
this.stacks = stacks;
|
||||
this.remainder = remainder;
|
||||
this.color = color;
|
||||
}
|
||||
}
|
||||
|
||||
private final Map<ItemStack, StacksText> cache = new IdentityHashMap<>();
|
||||
|
||||
@Override
|
||||
public void draw(int x, int y, ItemStack stack, long amount) {
|
||||
super.draw(x, y, stack, amount);
|
||||
drawAmount(new Rectangle4i(x, y, SLOT_SIZE - 2, SLOT_SIZE - 2), stack, amount);
|
||||
}
|
||||
|
||||
protected void drawAmount(Rectangle4i rect, ItemStack stack, long amount) {
|
||||
final StacksText stacksText = this.cache.computeIfAbsent(stack, key -> formatAmount(key, amount));
|
||||
|
||||
if (!stacksText.stacks.isEmpty()) {
|
||||
drawAmountText(stacksText.stacks, rect, stacksText.color, Alignment.TopLeft);
|
||||
}
|
||||
|
||||
if (!stacksText.remainder.isEmpty()) {
|
||||
drawAmountText(stacksText.remainder, rect, stacksText.color, Alignment.BottomRight);
|
||||
}
|
||||
}
|
||||
|
||||
private StacksText formatAmount(ItemStack stack, long amount) {
|
||||
final long stackSize = StackInfo.isFluidDisplayItem(stack) ? FLUID_STACK_SIZE
|
||||
: Math.max(1, stack.getMaxStackSize());
|
||||
final long stacks = amount / stackSize;
|
||||
final long remainder = amount % stackSize;
|
||||
final String prefix = getPrefix(stack);
|
||||
|
||||
return new StacksText(
|
||||
stacks > 0 ? prefix + "x" + ReadableNumberConverter.INSTANCE.toWideReadableForm(stacks) : "",
|
||||
remainder > 0
|
||||
? (stacks > 0 ? "+" : prefix)
|
||||
+ ReadableNumberConverter.INSTANCE.toWideReadableForm(remainder)
|
||||
: "",
|
||||
getColor(stack));
|
||||
}
|
||||
|
||||
protected String getPrefix(ItemStack stack) {
|
||||
return "";
|
||||
}
|
||||
|
||||
protected int getColor(ItemStack stack) {
|
||||
return 0xFFFFFF;
|
||||
}
|
||||
}
|
||||
|
||||
protected static final int SLOT_SIZE = 18;
|
||||
protected static final int ICON_SIZE = 16;
|
||||
protected static final int ICON_OFFSET = 1;
|
||||
protected static final int MAX_COLUMNS = 11;
|
||||
protected static final int MARGIN_TOP = 2;
|
||||
protected static final int LABEL_MARGIN = 15;
|
||||
protected static final int NAME_MARGIN = 2;
|
||||
protected static final int DEFAULT_MAX_ROWS = 5;
|
||||
protected static final int FLUID_STACK_SIZE = 144;
|
||||
|
||||
protected final List<ItemStack> items;
|
||||
protected final List<Long> amounts = new ArrayList<>();
|
||||
protected final List<String> names = new ArrayList<>();
|
||||
|
||||
protected AmountRenderer amountRenderer;
|
||||
|
||||
protected String label;
|
||||
protected EnumChatFormatting labelColor = EnumChatFormatting.GRAY;
|
||||
|
||||
protected int activeStackIndex = -1;
|
||||
protected Dimension size = new Dimension();
|
||||
|
||||
protected final boolean showNames;
|
||||
|
||||
protected int length = 0;
|
||||
protected int rows = 0;
|
||||
protected int nameRows = 0;
|
||||
protected int gridColumns = 0;
|
||||
protected int gridCount = 0;
|
||||
|
||||
public static ItemsTooltipLineHandler grid(String label, List<ItemStack> items, int maxRows) {
|
||||
return new ItemsTooltipLineHandler(label, items, true, maxRows, false);
|
||||
}
|
||||
|
||||
public static ItemsTooltipLineHandler list(String label, List<ItemStack> items, int maxRows) {
|
||||
return new ItemsTooltipLineHandler(label, items, true, maxRows, true);
|
||||
}
|
||||
|
||||
public ItemsTooltipLineHandler(String label, List<ItemStack> items) {
|
||||
this(label, items, true, DEFAULT_MAX_ROWS, false);
|
||||
}
|
||||
|
||||
public ItemsTooltipLineHandler(String label, List<ItemStack> items, boolean saveStackSize, int maxRows) {
|
||||
this(label, items, saveStackSize, maxRows, false);
|
||||
}
|
||||
|
||||
protected ItemsTooltipLineHandler(String label, List<ItemStack> items, boolean saveStackSize, int maxRows,
|
||||
boolean showNames) {
|
||||
this.label = label;
|
||||
this.items = groupingItemStacks(items);
|
||||
this.amountRenderer = saveStackSize ? new TotalAmountRenderer() : new NoAmountRenderer();
|
||||
this.length = this.items.size();
|
||||
this.showNames = showNames;
|
||||
|
||||
setMaxRows(maxRows);
|
||||
}
|
||||
|
||||
protected static int headerHeight() {
|
||||
return fontRenderer.FONT_HEIGHT + 2 + MARGIN_TOP;
|
||||
}
|
||||
|
||||
public ItemsTooltipLineHandler setMaxRows(int maxRows) {
|
||||
if (this.length == 0) {
|
||||
return this;
|
||||
}
|
||||
|
||||
this.names.clear();
|
||||
this.nameRows = 0;
|
||||
|
||||
if (!this.showNames || !layoutWithNames(maxRows)) {
|
||||
layoutAsGrid(maxRows);
|
||||
}
|
||||
|
||||
this.size.height = this.rows * SLOT_SIZE + headerHeight();
|
||||
|
||||
return this;
|
||||
}
|
||||
|
||||
public int getRows() {
|
||||
return this.rows;
|
||||
}
|
||||
|
||||
protected boolean layoutWithNames(int maxRows) {
|
||||
final int maxNames = this.length <= maxRows ? this.length : maxRows - 1;
|
||||
final int[] lineWidth = new int[maxNames + 1];
|
||||
lineWidth[0] = labelWidth();
|
||||
|
||||
for (int index = 0; index < maxNames; index++) {
|
||||
final String name = this.items.get(index).getDisplayName();
|
||||
this.names.add(name);
|
||||
lineWidth[index + 1] = Math
|
||||
.max(lineWidth[index], SLOT_SIZE + NAME_MARGIN + fontRenderer.getStringWidth(name));
|
||||
}
|
||||
|
||||
for (int named = maxNames; named >= 0; named--) {
|
||||
final int rest = this.length - named;
|
||||
final int width = Math.max(lineWidth[named], Math.min(rest, MAX_COLUMNS) * SLOT_SIZE);
|
||||
final int columns = Math.max(1, width / SLOT_SIZE);
|
||||
final int restRows = (int) Math.ceil((float) rest / columns);
|
||||
|
||||
if (named + restRows <= maxRows) {
|
||||
this.nameRows = named;
|
||||
this.gridColumns = columns;
|
||||
this.gridCount = rest;
|
||||
this.rows = named + restRows;
|
||||
this.size.width = width;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
this.names.clear();
|
||||
return false;
|
||||
}
|
||||
|
||||
protected void layoutAsGrid(int maxRows) {
|
||||
this.gridColumns = Math.min(MAX_COLUMNS, this.length);
|
||||
this.rows = Math.min(maxRows, (int) Math.ceil((float) this.length / this.gridColumns));
|
||||
this.gridCount = Math.min(this.length, this.gridColumns * this.rows);
|
||||
this.size.width = Math.max(this.gridColumns * SLOT_SIZE, labelWidth());
|
||||
|
||||
if (this.gridCount < this.length) {
|
||||
this.gridCount -= reservedColumns(this.length - this.gridCount);
|
||||
}
|
||||
}
|
||||
|
||||
protected int labelWidth() {
|
||||
return fontRenderer.getStringWidth(this.label) + LABEL_MARGIN;
|
||||
}
|
||||
|
||||
protected int reservedColumns(int hidden) {
|
||||
return (int) Math.ceil((float) (fontRenderer.getStringWidth("+" + hidden) - 2) / SLOT_SIZE);
|
||||
}
|
||||
|
||||
public ItemsTooltipLineHandler setAmountRenderer(AmountRenderer amountRenderer) {
|
||||
this.amountRenderer = amountRenderer;
|
||||
return this;
|
||||
}
|
||||
|
||||
public void setActiveStack(ItemStack activeStack) {
|
||||
@@ -79,6 +293,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();
|
||||
}
|
||||
@@ -94,7 +312,7 @@ public class ItemsTooltipLineHandler implements ITooltipLineHandler {
|
||||
|
||||
public void setLabel(String label) {
|
||||
this.label = label;
|
||||
this.size.width = Math.max(this.columns * SLOT_SIZE, fontRenderer.getStringWidth(this.label) + 15);
|
||||
this.size.width = Math.max(this.size.width, labelWidth());
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -115,62 +333,79 @@ public class ItemsTooltipLineHandler implements ITooltipLineHandler {
|
||||
final int zTranslation = GuiContainerManager.TOOLTIP_Z_OFFSET;
|
||||
GL11.glTranslatef(xTranslation, yTranslation, zTranslation);
|
||||
|
||||
int indexShift = 0;
|
||||
final int gridShift = gridIndexShift();
|
||||
|
||||
if (this.activeStackIndex != -1) {
|
||||
indexShift = Math.max(0, Math.min(this.items.size() - this.count, this.activeStackIndex - this.count + 2));
|
||||
for (int index = 0; index < this.nameRows; index++) {
|
||||
drawSlot(0, index * SLOT_SIZE, index);
|
||||
}
|
||||
|
||||
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;
|
||||
for (int index = 0; index < this.gridCount; index++) {
|
||||
drawSlot(
|
||||
(index % this.gridColumns) * SLOT_SIZE,
|
||||
(this.nameRows + index / this.gridColumns) * SLOT_SIZE,
|
||||
this.nameRows + gridShift + index);
|
||||
}
|
||||
|
||||
String stackSize = !this.saveStackSize || drawStack.stackSize == 0 ? ""
|
||||
: ReadableNumberConverter.INSTANCE.toWideReadableForm(drawStack.stackSize);
|
||||
NEIClientUtils.gl2DRenderContext(() -> {
|
||||
final int textShift = ICON_OFFSET + Math.round((ICON_SIZE - fontRenderer.FONT_HEIGHT) / 2f);
|
||||
|
||||
if (this.activeStackIndex == index + indexShift) {
|
||||
NEIClientUtils.gl2DRenderContext(
|
||||
() -> GuiDraw.drawRect(col * SLOT_SIZE - 1, row * SLOT_SIZE - 1, 18, 18, 0x66555555));
|
||||
for (int index = 0; index < this.nameRows; index++) {
|
||||
fontRenderer.drawStringWithShadow(
|
||||
EnumChatFormatting.GRAY + this.names.get(index),
|
||||
SLOT_SIZE + NAME_MARGIN,
|
||||
index * SLOT_SIZE + textShift,
|
||||
0xFFFFFF);
|
||||
}
|
||||
|
||||
drawItem(col * SLOT_SIZE, row * SLOT_SIZE, drawStack, stackSize);
|
||||
}
|
||||
final int hidden = this.length - this.nameRows - this.gridCount;
|
||||
|
||||
if (this.count < this.items.size()) {
|
||||
final String text = "+" + (this.items.size() - this.count);
|
||||
|
||||
NEIClientUtils.gl2DRenderContext(() -> {
|
||||
if (hidden > 0) {
|
||||
final String text = "+" + hidden;
|
||||
fontRenderer.drawStringWithShadow(
|
||||
text,
|
||||
MAX_COLUMNS * SLOT_SIZE - fontRenderer.getStringWidth(text) - 2,
|
||||
(this.rows - 1) * SLOT_SIZE + (SLOT_SIZE - fontRenderer.FONT_HEIGHT) / 2,
|
||||
0xee555555);
|
||||
});
|
||||
}
|
||||
EnumChatFormatting.GRAY + text,
|
||||
this.size.width - fontRenderer.getStringWidth(text) - 2,
|
||||
(this.rows - 1) * SLOT_SIZE + textShift,
|
||||
0xFFFFFF);
|
||||
}
|
||||
});
|
||||
|
||||
GL11.glTranslatef(-xTranslation, -yTranslation, -zTranslation);
|
||||
GL11.glPopAttrib();
|
||||
}
|
||||
|
||||
protected void drawItem(int x, int y, ItemStack drawStack, String stackSize) {
|
||||
GuiContainerManager.drawItem(x, y, drawStack, true, stackSize);
|
||||
protected int gridIndexShift() {
|
||||
if (this.nameRows > 0 || this.activeStackIndex == -1) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
return Math.max(0, Math.min(this.length - this.gridCount, this.activeStackIndex - this.gridCount + 2));
|
||||
}
|
||||
|
||||
protected void drawSlot(int x, int y, int index) {
|
||||
if (this.activeStackIndex == index) {
|
||||
NEIClientUtils.gl2DRenderContext(() -> GuiDraw.drawRect(x, y, SLOT_SIZE, SLOT_SIZE, 0x66555555));
|
||||
}
|
||||
|
||||
drawStackWithAmount(x, y, index);
|
||||
}
|
||||
|
||||
protected void drawStackWithAmount(int x, int y, int index) {
|
||||
this.amountRenderer.draw(x + ICON_OFFSET, y + ICON_OFFSET, this.items.get(index), this.amounts.get(index));
|
||||
}
|
||||
|
||||
private List<ItemStack> groupingItemStacks(List<ItemStack> items) {
|
||||
final List<ItemStack> result = new ArrayList<>();
|
||||
|
||||
for (Map.Entry<NBTTagCompound, Long> entry : ItemStackAmount.of(items).entrySet()) {
|
||||
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());
|
||||
|
||||
@@ -807,6 +803,8 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH
|
||||
|
||||
if (!isEnabled()) return;
|
||||
|
||||
AutoFocusWidget.instance.guiTick();
|
||||
|
||||
for (Widget widget : drawWidgets) widget.update();
|
||||
}
|
||||
|
||||
@@ -907,30 +905,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
|
||||
|
||||
@@ -212,9 +212,6 @@ public class NEIClientConfig {
|
||||
.getBooleanValue(false);
|
||||
API.addOption(new OptionToggleButton("inventory.bookmarks.showRecipeHandlerIcon", true));
|
||||
|
||||
tag.getTag("inventory.bookmarks.recipeChainDir").getIntValue(1);
|
||||
API.addOption(new OptionCycled("inventory.bookmarks.recipeChainDir", 2, true));
|
||||
|
||||
tag.getTag("inventory.bookmarks.ignorePotionOverlap").setComment("Ignore overlap with potion effect HUD")
|
||||
.getBooleanValue(false);
|
||||
API.addOption(new OptionToggleButton("inventory.bookmarks.ignorePotionOverlap", true));
|
||||
@@ -387,6 +384,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));
|
||||
|
||||
@@ -866,6 +870,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);
|
||||
@@ -1145,10 +1150,6 @@ public class NEIClientConfig {
|
||||
return getBooleanSetting("inventory.bookmarks.ignorePotionOverlap");
|
||||
}
|
||||
|
||||
public static int recipeChainDir() {
|
||||
return getIntSetting("inventory.bookmarks.recipeChainDir");
|
||||
}
|
||||
|
||||
public static boolean optimizeGuiOverlapComputation() {
|
||||
return getBooleanSetting("inventory.optimize_gui_overlap_computation");
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -169,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();
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -35,6 +35,7 @@ import net.minecraft.util.EnumChatFormatting;
|
||||
import net.minecraft.util.IChatComponent;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.WorldSettings.GameType;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
|
||||
import org.apache.logging.log4j.Level;
|
||||
@@ -45,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;
|
||||
@@ -442,13 +444,49 @@ 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) {
|
||||
|
||||
@@ -9,11 +9,15 @@ import java.util.stream.Collectors;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.EnumChatFormatting;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
|
||||
import codechicken.nei.api.ItemFilter;
|
||||
import codechicken.nei.api.ItemInfo;
|
||||
import codechicken.nei.guihook.GuiContainerManager;
|
||||
import codechicken.nei.item.FluidDrawer;
|
||||
import codechicken.nei.item.FluidDrawer.FillDirection;
|
||||
import codechicken.nei.recipe.Badge;
|
||||
import codechicken.nei.recipe.GuiRecipe;
|
||||
import codechicken.nei.recipe.StackInfo;
|
||||
@@ -230,9 +234,6 @@ public class PositionedStack implements Cloneable {
|
||||
return "PositionedStack(output='" + item.toString() + "')";
|
||||
}
|
||||
|
||||
/**
|
||||
* A {@link PositionedStack} that keeps its items but never draws them.
|
||||
*/
|
||||
public static class Placeholder extends PositionedStack {
|
||||
|
||||
public Placeholder(Object object, int x, int y, boolean genPerms) {
|
||||
@@ -246,4 +247,106 @@ public class PositionedStack implements Cloneable {
|
||||
@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". */
|
||||
protected int capacity = 0;
|
||||
protected boolean flowingTexture = false;
|
||||
protected FillDirection fillDirection = FillDirection.AUTO;
|
||||
|
||||
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;
|
||||
setCapacity(capacity);
|
||||
}
|
||||
|
||||
public int getCapacity() {
|
||||
return this.capacity;
|
||||
}
|
||||
|
||||
public Fluid setCapacity(int capacity) {
|
||||
this.capacity = Math.max(capacity, 0);
|
||||
return this;
|
||||
}
|
||||
|
||||
public boolean hasFlowingTexture() {
|
||||
return this.flowingTexture;
|
||||
}
|
||||
|
||||
public Fluid setFlowingTexture(boolean flowingTexture) {
|
||||
this.flowingTexture = flowingTexture;
|
||||
return this;
|
||||
}
|
||||
|
||||
public FillDirection getFillDirection() {
|
||||
return this.fillDirection;
|
||||
}
|
||||
|
||||
public Fluid setFillDirection(FillDirection fillDirection) {
|
||||
this.fillDirection = fillDirection == null ? FillDirection.AUTO : fillDirection;
|
||||
return this;
|
||||
}
|
||||
|
||||
protected FluidStack getFluidStack() {
|
||||
|
||||
if (this.item != this.cachedFluidItem) {
|
||||
this.cachedFluidItem = this.item;
|
||||
this.cachedFluidStack = StackInfo.isFluidDisplayItem(this.item) ? StackInfo.getFluid(this.item) : null;
|
||||
}
|
||||
|
||||
return this.cachedFluidStack;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<String> getTooltip() {
|
||||
final List<String> tooltip = new ArrayList<>();
|
||||
final List<String> customTooltip = super.getTooltip();
|
||||
final FluidStack fluidStack = getFluidStack();
|
||||
|
||||
if (fluidStack != null) {
|
||||
tooltip.add(
|
||||
EnumChatFormatting.GRAY + NEIClientUtils
|
||||
.translate("recipe.fluid.tank.amount", NEIClientUtils.formatFluid(fluidStack.amount)));
|
||||
}
|
||||
|
||||
if (customTooltip != null) {
|
||||
tooltip.addAll(customTooltip);
|
||||
}
|
||||
|
||||
return tooltip;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void draw(int mousex, int mousey) {
|
||||
final FluidStack fluidStack = getFluidStack();
|
||||
|
||||
if (fluidStack == null) {
|
||||
super.draw(mousex, mousey);
|
||||
return;
|
||||
}
|
||||
|
||||
FluidDrawer.drawFluid(
|
||||
this.relx,
|
||||
this.rely,
|
||||
this.width,
|
||||
this.height,
|
||||
this.capacity,
|
||||
fluidStack,
|
||||
this.flowingTexture,
|
||||
this.fillDirection);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -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
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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;
|
||||
@@ -133,6 +136,7 @@ public class ItemInfo {
|
||||
|
||||
public static void preInit() {
|
||||
addMobSpawnerItem();
|
||||
setupFluidDisplayItemClient();
|
||||
}
|
||||
|
||||
public static void load() {
|
||||
@@ -318,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());
|
||||
@@ -402,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) {
|
||||
|
||||
@@ -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)) {
|
||||
@@ -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),
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -913,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<>();
|
||||
|
||||
@@ -950,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;
|
||||
@@ -1214,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) {
|
||||
@@ -1245,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) {
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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,755 @@
|
||||
package codechicken.nei.bookmark.tree;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Comparator;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
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, 10.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<>();
|
||||
final Set<RecipeId> countedRecipes = new HashSet<>();
|
||||
|
||||
for (BookmarkItem item : math.recipeResults) {
|
||||
// a recipe adds one result item per output, count it only once
|
||||
if (!countedRecipes.add(item.recipeId)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
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) {}
|
||||
|
||||
}
|
||||
@@ -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,7 +620,7 @@ 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);
|
||||
}
|
||||
|
||||
|
||||
@@ -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,108 @@
|
||||
package codechicken.nei.item;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.client.renderer.texture.TextureMap;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class FluidDrawer {
|
||||
|
||||
public enum FillDirection {
|
||||
|
||||
AUTO,
|
||||
UP,
|
||||
DOWN,
|
||||
LEFT,
|
||||
RIGHT;
|
||||
|
||||
public boolean isHorizontal() {
|
||||
return this == LEFT || this == RIGHT;
|
||||
}
|
||||
|
||||
public FillDirection resolve(FluidStack fluidStack) {
|
||||
if (this != AUTO) return this;
|
||||
return fluidStack.getFluid().isGaseous(fluidStack) ? DOWN : UP;
|
||||
}
|
||||
}
|
||||
|
||||
private FluidDrawer() {}
|
||||
|
||||
public static void drawFluid(int x, int y, int width, int height, int capacity, FluidStack fluidStack,
|
||||
boolean flowing, FillDirection direction) {
|
||||
final Fluid fluid = fluidStack.getFluid();
|
||||
IIcon icon = flowing ? fluid.getFlowingIcon() : null;
|
||||
|
||||
if (icon == null) {
|
||||
icon = fluid.getIcon(fluidStack);
|
||||
}
|
||||
|
||||
if (icon == null || fluidStack.amount <= 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
direction = direction.resolve(fluidStack);
|
||||
|
||||
final int tankSize = direction.isHorizontal() ? width : height;
|
||||
final int tankCapacity = capacity > 0 ? capacity : fluidStack.amount;
|
||||
final int fillSize = Math
|
||||
.max(1, (int) ((long) tankSize * Math.min(fluidStack.amount, tankCapacity) / tankCapacity));
|
||||
|
||||
final int fillWidth = direction.isHorizontal() ? Math.min(fillSize, width) : width;
|
||||
final int fillHeight = direction.isHorizontal() ? height : Math.min(fillSize, height);
|
||||
final int fillX = direction == FillDirection.LEFT ? x + width - fillWidth : x;
|
||||
final int fillY = direction == FillDirection.DOWN ? y : y + height - fillHeight;
|
||||
final boolean anchorRight = direction == FillDirection.LEFT;
|
||||
final boolean anchorBottom = direction != FillDirection.DOWN;
|
||||
|
||||
final int color = fluid.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.glColor3f(red, green, blue);
|
||||
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 < fillWidth; tx += 16) {
|
||||
final int tileWidth = Math.min(16, fillWidth - tx);
|
||||
// a cropped tile keeps the texture edge that stays seamless against the neighbouring tile
|
||||
final double uSize = (icon.getMaxU() - icon.getMinU()) * tileWidth / 16D;
|
||||
final double uMin = anchorRight ? icon.getMaxU() - uSize : icon.getMinU();
|
||||
final double uMax = anchorRight ? icon.getMaxU() : icon.getMinU() + uSize;
|
||||
final int leftX = anchorRight ? fillX + fillWidth - tx - tileWidth : fillX + tx;
|
||||
final int rightX = leftX + tileWidth;
|
||||
|
||||
for (int ty = 0; ty < fillHeight; ty += 16) {
|
||||
final int tileHeight = Math.min(16, fillHeight - ty);
|
||||
final double vSize = (icon.getMaxV() - icon.getMinV()) * tileHeight / 16D;
|
||||
final double vMin = anchorBottom ? icon.getMaxV() - vSize : icon.getMinV();
|
||||
final double vMax = anchorBottom ? icon.getMaxV() : icon.getMinV() + vSize;
|
||||
final int bottomY = anchorBottom ? fillY + fillHeight - ty : fillY + ty + tileHeight;
|
||||
final int topY = bottomY - tileHeight;
|
||||
|
||||
tessellator.addVertexWithUV(leftX, bottomY, 0, uMin, vMax);
|
||||
tessellator.addVertexWithUV(rightX, bottomY, 0, uMax, vMax);
|
||||
tessellator.addVertexWithUV(rightX, topY, 0, uMax, vMin);
|
||||
tessellator.addVertexWithUV(leftX, topY, 0, uMin, vMin);
|
||||
}
|
||||
}
|
||||
tessellator.draw();
|
||||
|
||||
GL11.glDisable(GL11.GL_BLEND);
|
||||
GL11.glEnable(GL11.GL_LIGHTING);
|
||||
GL11.glColor4f(1F, 1F, 1F, 1F);
|
||||
}
|
||||
}
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -20,6 +20,7 @@ public class AcceptsFollowingTooltipLineHandler extends ItemsTooltipLineHandler
|
||||
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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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),
|
||||
@@ -189,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);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -241,11 +262,8 @@ public class GuiOverlayButton extends GuiRecipeButton {
|
||||
.map(state -> state.getSlot().item).collect(Collectors.toList());
|
||||
|
||||
if (!items.isEmpty()) {
|
||||
this.missedMaterialsTooltipLineHandler = new ItemsTooltipLineHandler(
|
||||
NEIClientUtils.translate("recipe.overlay.missing"),
|
||||
items,
|
||||
true,
|
||||
Integer.MAX_VALUE);
|
||||
this.missedMaterialsTooltipLineHandler = ItemsTooltipLineHandler
|
||||
.grid(NEIClientUtils.translate("recipe.overlay.missing"), items, Integer.MAX_VALUE);
|
||||
} else {
|
||||
this.missedMaterialsTooltipLineHandler = null;
|
||||
}
|
||||
@@ -256,6 +274,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 +314,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) {
|
||||
|
||||
@@ -65,6 +65,10 @@ public abstract class GuiRecipeButton extends GuiNEIButton {
|
||||
|
||||
}
|
||||
|
||||
public void onPermutationsChanged() {
|
||||
|
||||
}
|
||||
|
||||
public boolean mouseScrolled(int scroll) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -181,6 +181,24 @@ public abstract class GuiRecipeTab extends Widget {
|
||||
return res;
|
||||
}
|
||||
|
||||
public static String getHandlerTitle(String handlerName) {
|
||||
String title = findRecipeName(GuiCraftingRecipe.craftinghandlers, handlerName);
|
||||
if (title == null) title = findRecipeName(GuiCraftingRecipe.serialCraftingHandlers, handlerName);
|
||||
if (title == null) title = findRecipeName(GuiUsageRecipe.usagehandlers, handlerName);
|
||||
if (title == null) title = findRecipeName(GuiUsageRecipe.serialUsageHandlers, handlerName);
|
||||
|
||||
return title != null ? title : handlerName;
|
||||
}
|
||||
|
||||
private static String findRecipeName(List<? extends IRecipeHandler> handlers, String handlerName) {
|
||||
for (int index = 0; index < handlers.size(); index++) {
|
||||
final IRecipeHandler handler = handlers.get(index);
|
||||
if (handlerName.equals(getHandlerInfo(handler).getHandlerName())) return handler.getRecipeName().trim();
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
public static String getHandlerMod(String name, String name2) {
|
||||
HandlerInfo info = getHandlerInfo(name, name2);
|
||||
if (info == null) return "Unknown";
|
||||
|
||||
@@ -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()) {
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -0,0 +1,291 @@
|
||||
package codechicken.nei.recipe;
|
||||
|
||||
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.vec.Rectangle4i;
|
||||
import codechicken.nei.CompositeTooltipLineHandler;
|
||||
import codechicken.nei.ItemStackAmount;
|
||||
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 extends CompositeTooltipLineHandler {
|
||||
|
||||
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 final RecipeId recipeId;
|
||||
protected final long multiplier;
|
||||
protected boolean useInventory = false;
|
||||
protected String title = "";
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
protected static int getIngredientOrder(ItemStack stack) {
|
||||
return StackInfo.isFluidDisplayItem(stack) ? 2 : stack.stackSize == 0 ? 0 : 1;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void createLines() {
|
||||
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() <= maxLineRows());
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
protected void addResultLine(List<ItemStack> items, Set<NBTTagCompound> approximate) {
|
||||
final String label = NEIClientUtils.translate("recipe.items.results");
|
||||
final ItemsTooltipLineHandler line = items.size() == 1
|
||||
? ItemsTooltipLineHandler.list(label, items, maxLineRows())
|
||||
: ItemsTooltipLineHandler.grid(label, items, maxLineRows());
|
||||
|
||||
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 = ItemsTooltipLineHandler.list(label, items, maxLineRows());
|
||||
|
||||
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 ? ItemsTooltipLineHandler.list(label, items, maxLineRows())
|
||||
: ItemsTooltipLineHandler.grid(label, items, maxLineRows());
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -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;
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package codechicken.nei.recipe.chain;
|
||||
|
||||
import java.util.ArrayDeque;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
@@ -25,7 +26,7 @@ import codechicken.nei.recipe.StackInfo;
|
||||
|
||||
public class RecipeChainMath {
|
||||
|
||||
private static class ContainerItemResult {
|
||||
protected static class ContainerItemResult {
|
||||
|
||||
public ItemStack stack;
|
||||
public ItemStack containerItem;
|
||||
@@ -48,13 +49,19 @@ public class RecipeChainMath {
|
||||
public final List<BookmarkItem> recipeIngredients = new ArrayList<>();
|
||||
public final List<BookmarkItem> recipeResults = new ArrayList<>();
|
||||
|
||||
protected final Map<RecipeId, List<BookmarkItem>> ingredientsByRecipe = new HashMap<>();
|
||||
protected final Map<RecipeId, List<BookmarkItem>> resultsByRecipe = new HashMap<>();
|
||||
|
||||
public final Map<BookmarkItem, BookmarkItem> preferredItems = new HashMap<>();
|
||||
|
||||
public final Map<BookmarkItem, Long> requiredAmount = new HashMap<>();
|
||||
public final List<ItemStack> containerItems = new ArrayList<>();
|
||||
|
||||
public final List<ItemStack> containerItemsCrafting = new ArrayList<>();
|
||||
public final List<ItemStack> containerItemsInventory = new ArrayList<>();
|
||||
|
||||
private final List<ItemStack> containerItemsBlacklist = new ArrayList<>();
|
||||
|
||||
private RecipeChainMath(List<BookmarkItem> recipeItems, Set<RecipeId> collapsedRecipes) {
|
||||
protected RecipeChainMath(List<BookmarkItem> recipeItems, Set<RecipeId> collapsedRecipes) {
|
||||
final Map<RecipeId, Long> multipliers = new HashMap<>();
|
||||
|
||||
for (BookmarkItem item : recipeItems) {
|
||||
@@ -70,6 +77,8 @@ public class RecipeChainMath {
|
||||
}
|
||||
}
|
||||
|
||||
rebuildRecipeIndex();
|
||||
|
||||
for (Map.Entry<RecipeId, Long> entry : multipliers.entrySet()) {
|
||||
if (entry.getValue() > 1 || collapsedRecipes.contains(entry.getKey())) {
|
||||
collectPreferredItems(entry.getKey(), this.preferredItems, new HashSet<>());
|
||||
@@ -125,14 +134,26 @@ public class RecipeChainMath {
|
||||
|
||||
}
|
||||
|
||||
private void rebuildRecipeIndex() {
|
||||
this.ingredientsByRecipe.clear();
|
||||
this.resultsByRecipe.clear();
|
||||
|
||||
for (BookmarkItem item : this.recipeIngredients) {
|
||||
this.ingredientsByRecipe.computeIfAbsent(item.recipeId, k -> new ArrayList<>()).add(item);
|
||||
}
|
||||
|
||||
for (BookmarkItem item : this.recipeResults) {
|
||||
this.resultsByRecipe.computeIfAbsent(item.recipeId, k -> new ArrayList<>()).add(item);
|
||||
}
|
||||
}
|
||||
|
||||
private void collectPreferredItems(RecipeId recipeId, Map<BookmarkItem, BookmarkItem> preferredItems,
|
||||
Set<RecipeId> visited) {
|
||||
|
||||
visited.add(recipeId);
|
||||
|
||||
for (BookmarkItem ingrItem : this.recipeIngredients) {
|
||||
if (!ingrItem.emptyFactor() && recipeId.equals(ingrItem.recipeId)
|
||||
&& !preferredItems.containsKey(ingrItem)) {
|
||||
for (BookmarkItem ingrItem : this.ingredientsByRecipe.getOrDefault(recipeId, Collections.emptyList())) {
|
||||
if (!ingrItem.emptyFactor() && !preferredItems.containsKey(ingrItem)) {
|
||||
BookmarkItem activeItem = null;
|
||||
BookmarkItem prefItem = null;
|
||||
|
||||
@@ -178,8 +199,8 @@ public class RecipeChainMath {
|
||||
private void removeLoop(RecipeId recipeId, Map<BookmarkItem, BookmarkItem> preferredItems, Set<RecipeId> visited) {
|
||||
visited.add(recipeId);
|
||||
|
||||
for (BookmarkItem ingrItem : this.recipeIngredients) {
|
||||
if (!ingrItem.emptyFactor() && recipeId.equals(ingrItem.recipeId) && preferredItems.containsKey(ingrItem)) {
|
||||
for (BookmarkItem ingrItem : this.ingredientsByRecipe.getOrDefault(recipeId, Collections.emptyList())) {
|
||||
if (!ingrItem.emptyFactor() && preferredItems.containsKey(ingrItem)) {
|
||||
BookmarkItem prefItem = preferredItems.get(ingrItem);
|
||||
|
||||
if (visited.contains(prefItem.recipeId)) {
|
||||
@@ -194,6 +215,87 @@ public class RecipeChainMath {
|
||||
visited.remove(recipeId);
|
||||
}
|
||||
|
||||
private List<RecipeId> getOutputRecipeProcessingOrder() {
|
||||
|
||||
if (this.outputRecipes.size() <= 1) {
|
||||
return new ArrayList<>(this.outputRecipes.keySet());
|
||||
}
|
||||
|
||||
final Map<RecipeId, Set<RecipeId>> dependents = new HashMap<>();
|
||||
final Map<RecipeId, Integer> inDegree = new HashMap<>();
|
||||
|
||||
for (RecipeId recipeId : this.outputRecipes.keySet()) {
|
||||
inDegree.put(recipeId, 0);
|
||||
}
|
||||
|
||||
for (RecipeId recipeId : this.outputRecipes.keySet()) {
|
||||
final Set<RecipeId> dependencies = new HashSet<>();
|
||||
collectBoxDependencies(recipeId, recipeId, dependencies, new HashSet<>());
|
||||
dependents.put(recipeId, dependencies);
|
||||
|
||||
for (RecipeId dependency : dependencies) {
|
||||
inDegree.merge(dependency, 1, Integer::sum);
|
||||
}
|
||||
}
|
||||
|
||||
final List<RecipeId> order = new ArrayList<>();
|
||||
final ArrayDeque<RecipeId> queue = new ArrayDeque<>();
|
||||
|
||||
for (RecipeId recipeId : this.outputRecipes.keySet()) {
|
||||
if (inDegree.get(recipeId) == 0) {
|
||||
queue.add(recipeId);
|
||||
}
|
||||
}
|
||||
|
||||
while (!queue.isEmpty()) {
|
||||
final RecipeId recipeId = queue.poll();
|
||||
order.add(recipeId);
|
||||
|
||||
for (RecipeId dependency : dependents.getOrDefault(recipeId, Collections.emptySet())) {
|
||||
if (inDegree.merge(dependency, -1, Integer::sum) == 0) {
|
||||
queue.add(dependency);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (order.size() != this.outputRecipes.size()) {
|
||||
for (RecipeId recipeId : this.outputRecipes.keySet()) {
|
||||
if (!order.contains(recipeId)) {
|
||||
order.add(recipeId);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return order;
|
||||
}
|
||||
|
||||
private void collectBoxDependencies(RecipeId boxId, RecipeId currentRecipeId, Set<RecipeId> dependencies,
|
||||
Set<RecipeId> visited) {
|
||||
|
||||
if (!visited.add(currentRecipeId)) {
|
||||
return;
|
||||
}
|
||||
|
||||
for (BookmarkItem ingrItem : this.ingredientsByRecipe.getOrDefault(currentRecipeId, Collections.emptyList())) {
|
||||
if (ingrItem.emptyFactor()) {
|
||||
continue;
|
||||
}
|
||||
|
||||
final BookmarkItem prefItem = this.preferredItems.get(ingrItem);
|
||||
if (prefItem == null) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (this.outputRecipes.containsKey(prefItem.recipeId) && !prefItem.recipeId.equals(boxId)) {
|
||||
dependencies.add(prefItem.recipeId);
|
||||
} else {
|
||||
collectBoxDependencies(boxId, prefItem.recipeId, dependencies, visited);
|
||||
}
|
||||
}
|
||||
|
||||
visited.remove(currentRecipeId);
|
||||
}
|
||||
|
||||
public RecipeId createMasterRoot() {
|
||||
final List<BookmarkItem> rootIngredients = new ArrayList<>();
|
||||
|
||||
@@ -216,6 +318,7 @@ public class RecipeChainMath {
|
||||
BookmarkItem.builder(-1, ROOT_ITEM).factor(1).recipeId(ROOT_RECIPE_ID).type(BookmarkItemType.RESULT)
|
||||
.build());
|
||||
this.recipeIngredients.addAll(rootIngredients);
|
||||
rebuildRecipeIndex();
|
||||
|
||||
return ROOT_RECIPE_ID;
|
||||
}
|
||||
@@ -276,6 +379,12 @@ public class RecipeChainMath {
|
||||
return missedItems;
|
||||
}
|
||||
|
||||
protected boolean isForeignBoxBoundary(BookmarkItem ingrItem) {
|
||||
final BookmarkItem prefItem = this.preferredItems.get(ingrItem);
|
||||
return prefItem != null && ingrItem.type != BookmarkItemType.RESULT
|
||||
&& this.outputRecipes.containsKey(prefItem.recipeId);
|
||||
}
|
||||
|
||||
private void resetCalculation() {
|
||||
|
||||
for (BookmarkItem item : this.recipeIngredients) {
|
||||
@@ -288,7 +397,8 @@ public class RecipeChainMath {
|
||||
|
||||
this.preferredItems.clear();
|
||||
this.requiredAmount.clear();
|
||||
this.containerItems.clear();
|
||||
this.containerItemsCrafting.clear();
|
||||
this.containerItemsInventory.clear();
|
||||
this.containerItemsBlacklist.clear();
|
||||
|
||||
for (RecipeId recipeId : this.outputRecipes.keySet()) {
|
||||
@@ -313,9 +423,13 @@ public class RecipeChainMath {
|
||||
}
|
||||
}
|
||||
|
||||
for (BookmarkItem prefItem : this.recipeResults) {
|
||||
if (!prefItem.emptyFactor() && this.outputRecipes.containsKey(prefItem.recipeId)) {
|
||||
final long prefMultiplier = this.outputRecipes.get(prefItem.recipeId);
|
||||
for (RecipeId recipeId : getOutputRecipeProcessingOrder()) {
|
||||
final long prefMultiplier = this.outputRecipes.get(recipeId);
|
||||
|
||||
for (BookmarkItem prefItem : this.resultsByRecipe.getOrDefault(recipeId, Collections.emptyList())) {
|
||||
if (prefItem.emptyFactor()) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (prefItem.itemStack.getItem().hasContainerItem(prefItem.itemStack)) {
|
||||
this.containerItemsBlacklist.add(prefItem.itemStack);
|
||||
@@ -341,20 +455,40 @@ public class RecipeChainMath {
|
||||
return this;
|
||||
}
|
||||
|
||||
private void calculateSuitableRecipe(BookmarkItem ingrItem, long ingrMultiplier, List<RecipeId> visited) {
|
||||
protected void calculateSuitableRecipe(BookmarkItem ingrItem, long ingrMultiplier, List<RecipeId> visited) {
|
||||
final BookmarkItem prefItem = this.preferredItems.get(ingrItem);
|
||||
long ingrAmount = ingrItem
|
||||
.getAmount(ingrMultiplier, prefItem != null ? prefItem.itemStack : ingrItem.itemStack);
|
||||
final long requested = ingrAmount;
|
||||
long containerAmount = 0;
|
||||
long inventoryAmount = 0;
|
||||
|
||||
// calculate existing containers
|
||||
if (ingrAmount > 0) {
|
||||
for (ItemStack stack : ingrItem.permutations.values()) {
|
||||
if (hasContainerItem(stack)) {
|
||||
final long stackSize = ingrItem.getStackSize(ingrAmount);
|
||||
final long shiftSize = shiftContainerItems(stack, stackSize);
|
||||
if (stackSize != shiftSize && (ingrAmount = shiftSize * ingrItem.fluidCellAmount) == 0) {
|
||||
break;
|
||||
long stackSize = ingrItem.getStackSize(ingrAmount);
|
||||
long shiftSize = shiftContainerItems(stack, stackSize, this.containerItemsCrafting);
|
||||
|
||||
if (stackSize != shiftSize) {
|
||||
final long newIngrAmount = shiftSize * ingrItem.fluidCellAmount;
|
||||
containerAmount += ingrAmount - newIngrAmount;
|
||||
if ((ingrAmount = newIngrAmount) == 0) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
stackSize = shiftSize;
|
||||
shiftSize = shiftContainerItems(stack, stackSize, this.containerItemsInventory);
|
||||
|
||||
if (stackSize != shiftSize) {
|
||||
final long newIngrAmount = shiftSize * ingrItem.fluidCellAmount;
|
||||
inventoryAmount += ingrAmount - newIngrAmount;
|
||||
if ((ingrAmount = newIngrAmount) == 0) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -362,20 +496,36 @@ public class RecipeChainMath {
|
||||
// calculate existing initial items
|
||||
if (ingrAmount > 0) {
|
||||
for (BookmarkItem item : this.initialItems) {
|
||||
if (item.containsItems(ingrItem)
|
||||
&& (ingrAmount = addRequiredAmount(item, ingrAmount, item.getAmount())) == 0) {
|
||||
break;
|
||||
if (item.containsItems(ingrItem)) {
|
||||
final long newIngrAmount = addRequiredAmount(
|
||||
item,
|
||||
ingrAmount,
|
||||
item.getAmount(),
|
||||
this.containerItemsInventory);
|
||||
inventoryAmount += ingrAmount - newIngrAmount;
|
||||
if ((ingrAmount = newIngrAmount) == 0) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// shift amount
|
||||
if (prefItem == null) {
|
||||
addRequiredAmount(ingrItem, ingrAmount, Long.MAX_VALUE);
|
||||
} else if (visited.contains(prefItem.recipeId)) {
|
||||
addRequiredAmount(prefItem, ingrAmount, Long.MAX_VALUE);
|
||||
} else {
|
||||
addRequiredAmount(prefItem, ingrAmount, Long.MAX_VALUE);
|
||||
final BookmarkItem producer = prefItem != null ? prefItem : ingrItem;
|
||||
final long beforeShift = this.requiredAmount.getOrDefault(producer, 0L);
|
||||
|
||||
addRequiredAmount(producer, ingrAmount, Long.MAX_VALUE, this.containerItemsCrafting);
|
||||
|
||||
calculationStepTrigger(
|
||||
ingrItem,
|
||||
prefItem,
|
||||
requested,
|
||||
containerAmount,
|
||||
inventoryAmount,
|
||||
ingrAmount,
|
||||
this.requiredAmount.getOrDefault(producer, 0L) - beforeShift);
|
||||
|
||||
if (prefItem != null && !isForeignBoxBoundary(ingrItem) && !visited.contains(prefItem.recipeId)) {
|
||||
final long multiplier = Math
|
||||
.max(0, prefItem.getMultiplierFromAmount(this.requiredAmount.get(prefItem)) - prefItem.multiplier);
|
||||
|
||||
@@ -389,17 +539,21 @@ public class RecipeChainMath {
|
||||
|
||||
}
|
||||
|
||||
private void prepareIngredients(RecipeId recipeId, long multiplier, List<RecipeId> visited) {
|
||||
protected void calculationStepTrigger(BookmarkItem ingrItem, BookmarkItem prefItem, long requested,
|
||||
long containerAmount, long inventoryAmount, long ingrAmount, long produced) {}
|
||||
|
||||
for (BookmarkItem item : this.recipeIngredients) {
|
||||
if (!item.emptyFactor() && recipeId.equals(item.recipeId)) {
|
||||
protected void prepareIngredients(RecipeId recipeId, long multiplier, List<RecipeId> visited) {
|
||||
|
||||
for (BookmarkItem item : this.ingredientsByRecipe.getOrDefault(recipeId, Collections.emptyList())) {
|
||||
if (!item.emptyFactor()) {
|
||||
calculateSuitableRecipe(item, multiplier, visited);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private long addRequiredAmount(BookmarkItem prefItem, long ingrAmount, long maxAmount) {
|
||||
protected long addRequiredAmount(BookmarkItem prefItem, long ingrAmount, long maxAmount,
|
||||
List<ItemStack> containerItems) {
|
||||
long shiftAmount = this.requiredAmount.getOrDefault(prefItem, 0L);
|
||||
|
||||
if (hasContainerItem(prefItem.itemStack)) {
|
||||
@@ -410,7 +564,7 @@ public class RecipeChainMath {
|
||||
itemStack = itemStack.copy();
|
||||
itemStack.stackSize = 1;
|
||||
|
||||
ingrAmount = shiftContainerItems(itemStack, prefItem.getStackSize(ingrAmount))
|
||||
ingrAmount = shiftContainerItems(itemStack, prefItem.getStackSize(ingrAmount), containerItems)
|
||||
* prefItem.fluidCellAmount;
|
||||
|
||||
if (ingrAmount > 0) {
|
||||
@@ -419,7 +573,8 @@ public class RecipeChainMath {
|
||||
|
||||
if (result.stack == null) {
|
||||
final long stepsPerReplacement = steps - result.leftSteps;
|
||||
multiplier = Math.min(steps / stepsPerReplacement, maxAmount - shiftAmount);
|
||||
multiplier = Math
|
||||
.min(steps / stepsPerReplacement, (maxAmount - shiftAmount) / prefItem.fluidCellAmount);
|
||||
steps -= multiplier * stepsPerReplacement;
|
||||
} else {
|
||||
steps = result.leftSteps;
|
||||
@@ -431,16 +586,16 @@ public class RecipeChainMath {
|
||||
while (stackSize > Integer.MAX_VALUE) {
|
||||
final ItemStack copy = result.containerItem.copy();
|
||||
copy.stackSize = Integer.MAX_VALUE;
|
||||
this.containerItems.add(copy);
|
||||
containerItems.add(copy);
|
||||
stackSize -= copy.stackSize;
|
||||
}
|
||||
|
||||
result.containerItem.stackSize = (int) stackSize;
|
||||
this.containerItems.add(result.containerItem);
|
||||
containerItems.add(result.containerItem);
|
||||
}
|
||||
|
||||
if (result.stack != null) {
|
||||
this.containerItems.add(result.stack);
|
||||
containerItems.add(result.stack);
|
||||
}
|
||||
|
||||
ingrAmount = steps * prefItem.fluidCellAmount;
|
||||
@@ -461,11 +616,11 @@ public class RecipeChainMath {
|
||||
return ingrAmount;
|
||||
}
|
||||
|
||||
private long shiftContainerItems(ItemStack aStack, long steps) {
|
||||
final int initialSize = this.containerItems.size();
|
||||
private long shiftContainerItems(ItemStack aStack, long steps, List<ItemStack> containerItems) {
|
||||
final int initialSize = containerItems.size();
|
||||
|
||||
for (int i = 0; i < initialSize && steps > 0; i++) {
|
||||
ItemStack bStack = this.containerItems.get(i);
|
||||
ItemStack bStack = containerItems.get(i);
|
||||
|
||||
if (bStack != null && NEIClientUtils.areStacksSameTypeCraftingWithNBT(aStack, bStack)) {
|
||||
final ContainerItemResult result = getToolsContainerItems(bStack, steps);
|
||||
@@ -474,20 +629,20 @@ public class RecipeChainMath {
|
||||
steps = result.leftSteps;
|
||||
|
||||
if (result.containerItem != null) {
|
||||
this.containerItems.add(result.containerItem);
|
||||
containerItems.add(result.containerItem);
|
||||
}
|
||||
|
||||
this.containerItems.set(i, bStack);
|
||||
containerItems.set(i, bStack);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
this.containerItems.removeIf(stack -> stack == null);
|
||||
containerItems.removeIf(stack -> stack == null);
|
||||
|
||||
return steps;
|
||||
}
|
||||
|
||||
private ContainerItemResult getToolsContainerItems(ItemStack aStack, long steps) {
|
||||
protected ContainerItemResult getToolsContainerItems(ItemStack aStack, long steps) {
|
||||
final NBTTagCompound tagCompound = aStack.getTagCompound();
|
||||
|
||||
if (tagCompound != null && tagCompound.hasKey("GT.ToolStats")) {
|
||||
@@ -541,7 +696,7 @@ public class RecipeChainMath {
|
||||
return 0;
|
||||
}
|
||||
|
||||
private boolean hasContainerItem(ItemStack aStack) {
|
||||
protected boolean hasContainerItem(ItemStack aStack) {
|
||||
|
||||
if (aStack.getItem().hasContainerItem(aStack)) {
|
||||
|
||||
@@ -558,16 +713,12 @@ public class RecipeChainMath {
|
||||
}
|
||||
|
||||
private void addShift(RecipeId recipeId, long shift) {
|
||||
for (BookmarkItem item : this.recipeIngredients) {
|
||||
if (recipeId.equals(item.recipeId)) {
|
||||
item.multiplier += shift;
|
||||
}
|
||||
for (BookmarkItem item : this.ingredientsByRecipe.getOrDefault(recipeId, Collections.emptyList())) {
|
||||
item.multiplier += shift;
|
||||
}
|
||||
|
||||
for (BookmarkItem item : this.recipeResults) {
|
||||
if (recipeId.equals(item.recipeId)) {
|
||||
item.multiplier += shift;
|
||||
}
|
||||
for (BookmarkItem item : this.resultsByRecipe.getOrDefault(recipeId, Collections.emptyList())) {
|
||||
item.multiplier += shift;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,30 +1,123 @@
|
||||
package codechicken.nei.recipe.chain;
|
||||
|
||||
import java.awt.Dimension;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Comparator;
|
||||
import java.util.HashMap;
|
||||
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.inventory.GuiContainer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.util.EnumChatFormatting;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import codechicken.lib.gui.GuiDraw;
|
||||
import codechicken.lib.gui.GuiDraw.ITooltipLineHandler;
|
||||
import codechicken.nei.ColorUtils;
|
||||
import codechicken.nei.CompositeTooltipLineHandler;
|
||||
import codechicken.nei.ItemSorter;
|
||||
import codechicken.nei.ItemStackAmount;
|
||||
import codechicken.nei.ItemsTooltipLineHandler;
|
||||
import codechicken.nei.NEIClientConfig;
|
||||
import codechicken.nei.ItemsTooltipLineHandler.AmountRenderer;
|
||||
import codechicken.nei.ItemsTooltipLineHandler.StacksAmountRenderer;
|
||||
import codechicken.nei.ItemsTooltipLineHandler.TotalAmountRenderer;
|
||||
import codechicken.nei.NEIClientUtils;
|
||||
import codechicken.nei.bookmark.BookmarkItem;
|
||||
import codechicken.nei.drawable.DrawableResource;
|
||||
import codechicken.nei.guihook.GuiContainerManager;
|
||||
import codechicken.nei.recipe.AutoCraftingManager;
|
||||
import codechicken.nei.recipe.GuiRecipe;
|
||||
import codechicken.nei.recipe.GuiRecipeTab;
|
||||
import codechicken.nei.recipe.HandlerInfo;
|
||||
import codechicken.nei.recipe.Recipe.RecipeId;
|
||||
import codechicken.nei.recipe.StackInfo;
|
||||
|
||||
public class RecipeChainTooltipLineHandler implements ITooltipLineHandler {
|
||||
public class RecipeChainTooltipLineHandler extends CompositeTooltipLineHandler {
|
||||
|
||||
protected static class MissingStacksAmountRenderer extends StacksAmountRenderer {
|
||||
|
||||
protected static final int MISSING_COLOR = 0xFF5555;
|
||||
|
||||
protected final Set<NBTTagCompound> missing;
|
||||
private final Map<ItemStack, Boolean> cache = new IdentityHashMap<>();
|
||||
|
||||
public MissingStacksAmountRenderer(Set<NBTTagCompound> missing) {
|
||||
this.missing = missing;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected int getColor(ItemStack stack) {
|
||||
return this.cache.computeIfAbsent(stack, key -> this.missing.contains(StackInfo.itemStackToNBT(key, false)))
|
||||
? MISSING_COLOR
|
||||
: super.getColor(stack);
|
||||
}
|
||||
}
|
||||
|
||||
protected static class HandlerIconRenderer extends TotalAmountRenderer {
|
||||
|
||||
protected static final int ICON_SIZE = 16;
|
||||
protected static final float BADGE_SCALE = 0.6f;
|
||||
protected static final float BADGE_OFFSET = 3f;
|
||||
// slots are drawn edge to edge, so the badge has to clear the 3d model of the neighbour slot
|
||||
protected static final float BADGE_Z = 10f;
|
||||
|
||||
protected final Map<NBTTagCompound, HandlerInfo> handlers;
|
||||
private final Map<ItemStack, HandlerInfo> cache = new IdentityHashMap<>();
|
||||
private final Map<String, String> titleCache = new HashMap<>();
|
||||
|
||||
public HandlerIconRenderer(Map<NBTTagCompound, HandlerInfo> handlers) {
|
||||
this.handlers = handlers;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void draw(int x, int y, ItemStack stack, long amount) {
|
||||
super.draw(x, y, stack, amount);
|
||||
drawHandlerBadge(
|
||||
x,
|
||||
y,
|
||||
this.cache.computeIfAbsent(stack, key -> this.handlers.get(StackInfo.itemStackToNBT(key, false))));
|
||||
}
|
||||
|
||||
protected void drawHandlerBadge(int x, int y, HandlerInfo handlerInfo) {
|
||||
if (handlerInfo == null) return;
|
||||
|
||||
GL11.glPushMatrix();
|
||||
GL11.glColor4f(1, 1, 1, 1);
|
||||
GL11.glTranslatef(x - BADGE_OFFSET * BADGE_SCALE, y - BADGE_OFFSET * BADGE_SCALE, BADGE_Z);
|
||||
GL11.glScalef(BADGE_SCALE, BADGE_SCALE, 1.0f);
|
||||
|
||||
if (handlerInfo.hasImageOrItem()) {
|
||||
final DrawableResource image = handlerInfo.getImage();
|
||||
|
||||
if (image != null) {
|
||||
NEIClientUtils.gl2DRenderContext(() -> image.draw(0, 0));
|
||||
} else {
|
||||
GuiContainerManager.drawItem(0, 0, handlerInfo.getItemStack(), true, "");
|
||||
}
|
||||
|
||||
} else {
|
||||
drawBadgeText(handlerInfo.getHandlerName());
|
||||
}
|
||||
|
||||
GL11.glPopMatrix();
|
||||
}
|
||||
|
||||
protected void drawBadgeText(String handlerName) {
|
||||
final String title = this.titleCache.computeIfAbsent(handlerName, GuiRecipeTab::getHandlerTitle);
|
||||
final String text = title.isEmpty() ? "??" : title.substring(0, Math.min(2, title.length()));
|
||||
|
||||
NEIClientUtils.gl2DRenderContext(
|
||||
() -> GuiDraw.fontRenderer.drawStringWithShadow(
|
||||
text,
|
||||
(ICON_SIZE - GuiDraw.fontRenderer.getStringWidth(text)) / 2,
|
||||
(ICON_SIZE - GuiDraw.fontRenderer.FONT_HEIGHT) / 2,
|
||||
ColorUtils.buttonLabelNormal.getColor()));
|
||||
}
|
||||
}
|
||||
|
||||
public final int groupId;
|
||||
public final boolean crafting;
|
||||
@@ -32,16 +125,9 @@ public class RecipeChainTooltipLineHandler implements ITooltipLineHandler {
|
||||
protected final List<BookmarkItem> initialItems;
|
||||
protected final Map<RecipeId, Long> outputRecipes;
|
||||
|
||||
protected ItemsTooltipLineHandler available;
|
||||
protected ItemsTooltipLineHandler inputs;
|
||||
protected ItemsTooltipLineHandler outputs;
|
||||
protected ItemsTooltipLineHandler remainder;
|
||||
protected ItemsTooltipLineHandler craftingNeeded;
|
||||
protected boolean lastShiftKey = false;
|
||||
protected boolean lastControlKey = false;
|
||||
|
||||
protected Dimension size = new Dimension();
|
||||
|
||||
public RecipeChainTooltipLineHandler(int groupId, boolean crafting, RecipeChainMath math) {
|
||||
this.groupId = groupId;
|
||||
this.crafting = crafting;
|
||||
@@ -50,20 +136,32 @@ public class RecipeChainTooltipLineHandler implements ITooltipLineHandler {
|
||||
this.outputRecipes = new HashMap<>(this.math.outputRecipes);
|
||||
}
|
||||
|
||||
private void onUpdate() {
|
||||
@Override
|
||||
protected boolean needsUpdate() {
|
||||
final boolean shiftChanged = this.lastShiftKey != (this.lastShiftKey = NEIClientUtils.shiftKey());
|
||||
return this.lastControlKey != (this.lastControlKey = NEIClientUtils.controlKey()) || shiftChanged;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void createLines() {
|
||||
if (this.outputRecipes.isEmpty() && !this.lastShiftKey) {
|
||||
return;
|
||||
}
|
||||
|
||||
final List<ItemStack> available = new ArrayList<>();
|
||||
final List<ItemStack> inputs = new ArrayList<>();
|
||||
final List<ItemStack> outputs = new ArrayList<>();
|
||||
final List<ItemStack> remainder = new ArrayList<>();
|
||||
final List<ItemStack> craftingNeeded = new ArrayList<>();
|
||||
final Map<NBTTagCompound, HandlerInfo> craftingHandlers = new HashMap<>();
|
||||
final ItemStackAmount inventory = new ItemStackAmount();
|
||||
final GuiContainer currentGui = NEIClientUtils.getGuiContainer();
|
||||
|
||||
if (this.lastShiftKey && !(currentGui instanceof GuiRecipe<?>)) {
|
||||
if (this.lastShiftKey && currentGui != null && !(currentGui instanceof GuiRecipe<?>)) {
|
||||
inventory.putAll(AutoCraftingManager.getInventoryItems(currentGui));
|
||||
}
|
||||
|
||||
if (!this.math.outputRecipes.isEmpty()) {
|
||||
if (!this.outputRecipes.isEmpty()) {
|
||||
this.math.initialItems.clear();
|
||||
this.math.outputRecipes.clear();
|
||||
this.math.outputRecipes.putAll(this.outputRecipes);
|
||||
@@ -105,7 +203,7 @@ public class RecipeChainTooltipLineHandler implements ITooltipLineHandler {
|
||||
}
|
||||
|
||||
} else {
|
||||
this.math.initialItems.addAll(initialItems);
|
||||
this.math.initialItems.addAll(this.initialItems);
|
||||
}
|
||||
|
||||
this.math.refresh();
|
||||
@@ -138,21 +236,24 @@ public class RecipeChainTooltipLineHandler implements ITooltipLineHandler {
|
||||
if (amount > 0) {
|
||||
if (math.outputRecipes.containsKey(item.recipeId)) {
|
||||
outputs.add(item.getItemStack(amount));
|
||||
} else if (this.lastShiftKey) {
|
||||
} else {
|
||||
remainder.add(item.getItemStack(amount));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (this.lastShiftKey) {
|
||||
for (ItemStack stack : math.containerItems) {
|
||||
if (stack != null) {
|
||||
remainder.add(stack.copy());
|
||||
}
|
||||
for (ItemStack stack : math.containerItemsInventory) {
|
||||
if (stack != null) {
|
||||
remainder.add(stack.copy());
|
||||
}
|
||||
}
|
||||
for (ItemStack stack : math.containerItemsCrafting) {
|
||||
if (stack != null) {
|
||||
remainder.add(stack.copy());
|
||||
}
|
||||
}
|
||||
|
||||
} else if (this.lastShiftKey) {
|
||||
} else {
|
||||
|
||||
for (BookmarkItem item : this.math.initialItems) {
|
||||
if (inventory.contains(item.itemStack)) {
|
||||
@@ -170,161 +271,100 @@ public class RecipeChainTooltipLineHandler implements ITooltipLineHandler {
|
||||
inputs.add(item.getItemStack());
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if (this.lastShiftKey) {
|
||||
for (Map.Entry<BookmarkItem, Long> item : this.math.requiredAmount.entrySet()) {
|
||||
if (item.getKey().type == BookmarkItem.BookmarkItemType.RESULT && item.getValue() != 0)
|
||||
craftingNeeded.add(item.getKey().getItemStack(item.getValue()));
|
||||
if (item.getKey().type == BookmarkItem.BookmarkItemType.RESULT && item.getValue() != 0) {
|
||||
final ItemStack stack = item.getKey().getItemStack(item.getValue());
|
||||
|
||||
craftingNeeded.add(stack);
|
||||
putHandlerInfo(craftingHandlers, stack, item.getKey().recipeId);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
inputs.sort(
|
||||
Comparator.comparing((ItemStack stack) -> StackInfo.getFluid(stack) != null)
|
||||
.thenComparingInt(stack -> -1 * stack.stackSize).thenComparing(ItemSorter.instance));
|
||||
outputs.sort(
|
||||
Comparator.comparing((ItemStack stack) -> StackInfo.getFluid(stack) != null)
|
||||
.thenComparingInt(stack -> -1 * stack.stackSize).thenComparing(ItemSorter.instance));
|
||||
remainder.sort(
|
||||
Comparator.comparing((ItemStack stack) -> StackInfo.getFluid(stack) != null)
|
||||
.thenComparingInt(stack -> -1 * stack.stackSize).thenComparing(ItemSorter.instance));
|
||||
|
||||
this.inputs = new ItemsTooltipLineHandler(
|
||||
this.lastShiftKey ? NEIClientUtils.translate("bookmark.crafting_chain.missing")
|
||||
: NEIClientUtils.translate("bookmark.crafting_chain.input"),
|
||||
inputs,
|
||||
true,
|
||||
Integer.MAX_VALUE);
|
||||
|
||||
this.available = new ItemsTooltipLineHandler(
|
||||
NEIClientUtils.translate("bookmark.crafting_chain.available"),
|
||||
available,
|
||||
true,
|
||||
Integer.MAX_VALUE);
|
||||
|
||||
this.outputs = new ItemsTooltipLineHandler(
|
||||
NEIClientUtils.translate("bookmark.crafting_chain.output"),
|
||||
outputs,
|
||||
true,
|
||||
Integer.MAX_VALUE);
|
||||
|
||||
this.remainder = new ItemsTooltipLineHandler(
|
||||
NEIClientUtils.translate("bookmark.crafting_chain.remainder"),
|
||||
remainder,
|
||||
true,
|
||||
Integer.MAX_VALUE);
|
||||
|
||||
this.craftingNeeded = new ItemsTooltipLineHandler(
|
||||
NEIClientUtils.translate("bookmark.crafting_chain.needed"),
|
||||
craftingNeeded,
|
||||
true,
|
||||
Integer.MAX_VALUE);
|
||||
final Set<NBTTagCompound> missing = new HashSet<>();
|
||||
|
||||
if (this.lastShiftKey) {
|
||||
this.inputs.setLabelColor(EnumChatFormatting.RED);
|
||||
this.available.setLabelColor(EnumChatFormatting.GREEN);
|
||||
this.craftingNeeded.setLabelColor(EnumChatFormatting.BLUE);
|
||||
}
|
||||
|
||||
this.size.height = this.size.width = 0;
|
||||
|
||||
if (!this.inputs.isEmpty() || !this.outputs.isEmpty()
|
||||
|| !this.remainder.isEmpty()
|
||||
|| !this.available.isEmpty()) {
|
||||
|
||||
if (!this.math.outputRecipes.isEmpty()) {
|
||||
this.size.height = 2 + GuiDraw.fontRenderer.FONT_HEIGHT;
|
||||
for (ItemStack stack : inputs) {
|
||||
missing.add(StackInfo.itemStackToNBT(stack, false));
|
||||
}
|
||||
this.size.width = Math.max(
|
||||
this.inputs.getSize().width,
|
||||
Math.max(
|
||||
this.outputs.getSize().width,
|
||||
Math.max(
|
||||
this.remainder.getSize().width,
|
||||
Math.max(this.available.getSize().width, this.craftingNeeded.getSize().width))));
|
||||
|
||||
this.size.height += this.inputs.getSize().height + this.outputs.getSize().height
|
||||
+ this.remainder.getSize().height
|
||||
+ this.available.getSize().height
|
||||
+ this.craftingNeeded.getSize().height;
|
||||
}
|
||||
|
||||
// items with a shortage are already in the inputs list, holding the missing amount instead of the required one
|
||||
final List<ItemStack> covered = new ArrayList<>();
|
||||
|
||||
for (ItemStack stack : available) {
|
||||
if (!missing.contains(StackInfo.itemStackToNBT(stack, false))) {
|
||||
covered.add(stack);
|
||||
}
|
||||
}
|
||||
|
||||
final Comparator<ItemStack> comparator = Comparator
|
||||
.comparing((ItemStack stack) -> StackInfo.getFluid(stack) != null)
|
||||
.thenComparingInt(stack -> -1 * stack.stackSize).thenComparing(ItemSorter.instance);
|
||||
|
||||
inputs.sort(comparator);
|
||||
covered.sort(comparator);
|
||||
outputs.sort(comparator);
|
||||
remainder.sort(comparator);
|
||||
|
||||
// missing items stay on top of the list
|
||||
inputs.addAll(covered);
|
||||
|
||||
if (this.lastShiftKey) {
|
||||
outputs.addAll(remainder);
|
||||
}
|
||||
|
||||
addLine(
|
||||
NEIClientUtils.translate("bookmark.crafting_chain"),
|
||||
outputs,
|
||||
outputs.size() == 1,
|
||||
EnumChatFormatting.AQUA,
|
||||
new TotalAmountRenderer());
|
||||
|
||||
addLine(
|
||||
NEIClientUtils.translate("bookmark.crafting_chain.needed"),
|
||||
craftingNeeded,
|
||||
false,
|
||||
EnumChatFormatting.BLUE,
|
||||
new HandlerIconRenderer(craftingHandlers));
|
||||
|
||||
addLine(
|
||||
NEIClientUtils.translate("bookmark.crafting_chain.input"),
|
||||
inputs,
|
||||
this.lastShiftKey,
|
||||
EnumChatFormatting.YELLOW,
|
||||
this.lastShiftKey ? new MissingStacksAmountRenderer(missing) : new TotalAmountRenderer());
|
||||
}
|
||||
|
||||
@Override
|
||||
public Dimension getSize() {
|
||||
boolean update = this.outputs == null;
|
||||
update = this.lastShiftKey != (this.lastShiftKey = NEIClientUtils.shiftKey()) || update;
|
||||
update = this.lastControlKey != (this.lastControlKey = NEIClientUtils.controlKey()) || update;
|
||||
|
||||
if (update) {
|
||||
onUpdate();
|
||||
protected static void putHandlerInfo(Map<NBTTagCompound, HandlerInfo> handlers, ItemStack stack,
|
||||
RecipeId recipeId) {
|
||||
if (recipeId == null) {
|
||||
return;
|
||||
}
|
||||
return this.size;
|
||||
|
||||
final HandlerInfo handlerInfo = GuiRecipeTab.getHandlerInfo(recipeId.getHandlerName(), null);
|
||||
|
||||
handlers.put(
|
||||
StackInfo.itemStackToNBT(stack, false),
|
||||
handlerInfo != null ? handlerInfo : GuiRecipeTab.DEFAULT_HANDLER_INFO);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void draw(int x, int y) {
|
||||
if (this.size.height == 0) return;
|
||||
protected void addLine(String label, List<ItemStack> items, boolean vertical, EnumChatFormatting labelColor,
|
||||
AmountRenderer amountRenderer) {
|
||||
final ItemsTooltipLineHandler line = vertical ? ItemsTooltipLineHandler.list(label, items, maxLineRows())
|
||||
: ItemsTooltipLineHandler.grid(label, items, maxLineRows());
|
||||
|
||||
if (!this.math.outputRecipes.isEmpty()) {
|
||||
GuiDraw.fontRenderer.drawStringWithShadow(
|
||||
EnumChatFormatting.AQUA + NEIClientUtils.translate("bookmark.crafting_chain"),
|
||||
x,
|
||||
y + 2,
|
||||
0xee555555);
|
||||
|
||||
y += 2 + GuiDraw.fontRenderer.FONT_HEIGHT;
|
||||
if (line.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (NEIClientConfig.recipeChainDir() == 0) {
|
||||
if (!this.inputs.isEmpty()) {
|
||||
this.inputs.draw(x, y);
|
||||
y += this.inputs.getSize().height;
|
||||
}
|
||||
|
||||
if (!this.available.isEmpty()) {
|
||||
this.available.draw(x, y);
|
||||
y += this.available.getSize().height;
|
||||
}
|
||||
|
||||
if (!this.craftingNeeded.isEmpty()) {
|
||||
this.craftingNeeded.draw(x, y);
|
||||
y += this.craftingNeeded.getSize().height;
|
||||
}
|
||||
|
||||
if (!this.outputs.isEmpty()) {
|
||||
this.outputs.draw(x, y);
|
||||
y += this.outputs.getSize().height;
|
||||
}
|
||||
|
||||
} else {
|
||||
|
||||
if (!this.outputs.isEmpty()) {
|
||||
this.outputs.draw(x, y);
|
||||
y += this.outputs.getSize().height;
|
||||
}
|
||||
|
||||
if (!this.inputs.isEmpty()) {
|
||||
this.inputs.draw(x, y);
|
||||
y += this.inputs.getSize().height;
|
||||
}
|
||||
|
||||
if (!this.craftingNeeded.isEmpty()) {
|
||||
this.craftingNeeded.draw(x, y);
|
||||
y += this.craftingNeeded.getSize().height;
|
||||
}
|
||||
|
||||
if (!this.available.isEmpty()) {
|
||||
this.available.draw(x, y);
|
||||
y += this.available.getSize().height;
|
||||
}
|
||||
}
|
||||
|
||||
if (!this.remainder.isEmpty()) {
|
||||
this.remainder.draw(x, y);
|
||||
}
|
||||
line.setLabelColor(labelColor);
|
||||
line.setAmountRenderer(amountRenderer);
|
||||
|
||||
this.lines.add(line);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -40,7 +40,7 @@ public class LabelWidget extends Widget implements IUpdatableWidget {
|
||||
@Override
|
||||
public List<String> handleTooltip(int mx, int my, List<String> tooltip) {
|
||||
|
||||
if (contains(mx, my)) {
|
||||
if (contains(mx, my) && this.value != null) {
|
||||
tooltip.add(this.value);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,9 +1,14 @@
|
||||
package codechicken.nei.recipe.stackinfo;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockLiquid;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import net.minecraftforge.fluids.FluidContainerRegistry;
|
||||
import net.minecraftforge.fluids.FluidRegistry;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import net.minecraftforge.fluids.IFluidContainerItem;
|
||||
|
||||
@@ -40,7 +45,7 @@ public class DefaultStackStringifyHandler implements IStackStringifyHandler {
|
||||
final ItemStack stack = ItemStack.loadItemStackFromNBT(nbtTag);
|
||||
|
||||
if (stack != null) {
|
||||
stack.stackSize = nbtTag.getInteger("Count");
|
||||
stack.stackSize = (int) Math.min(nbtTag.getLong("Count"), Integer.MAX_VALUE);
|
||||
}
|
||||
|
||||
return stack;
|
||||
@@ -49,8 +54,24 @@ public class DefaultStackStringifyHandler implements IStackStringifyHandler {
|
||||
public FluidStack getFluid(ItemStack stack) {
|
||||
FluidStack fluidStack = FluidContainerRegistry.getFluidForFilledItem(stack);
|
||||
|
||||
if (fluidStack == null && stack.getItem() instanceof IFluidContainerItem) {
|
||||
fluidStack = ((IFluidContainerItem) stack.getItem()).getFluid(stack);
|
||||
if (fluidStack == null && stack.getItem() instanceof IFluidContainerItem container) {
|
||||
fluidStack = container.getFluid(stack);
|
||||
}
|
||||
|
||||
if (fluidStack == null && Block.getBlockFromItem(stack.getItem()) instanceof BlockLiquid liquidBlock) {
|
||||
Fluid fluid = FluidRegistry.lookupFluidForBlock(liquidBlock);
|
||||
|
||||
if (fluid == null) {
|
||||
if (liquidBlock.getMaterial() == Material.water) {
|
||||
fluid = FluidRegistry.WATER;
|
||||
} else if (liquidBlock.getMaterial() == Material.lava) {
|
||||
fluid = FluidRegistry.LAVA;
|
||||
}
|
||||
}
|
||||
|
||||
if (fluid != null) {
|
||||
fluidStack = new FluidStack(fluid, FluidContainerRegistry.BUCKET_VOLUME);
|
||||
}
|
||||
}
|
||||
|
||||
return fluidStack;
|
||||
|
||||
@@ -0,0 +1,68 @@
|
||||
package codechicken.nei.recipe.stackinfo;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import net.minecraftforge.fluids.FluidRegistry;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
|
||||
import codechicken.nei.api.IStackStringifyHandler;
|
||||
import codechicken.nei.item.ItemFluidDisplay;
|
||||
|
||||
public class FluidDisplayStackStringifyHandler implements IStackStringifyHandler {
|
||||
|
||||
public static final String NBT_FLUID_NAME = "neiFluidName";
|
||||
|
||||
@Override
|
||||
public boolean isFluidDisplayItem(ItemStack stack) {
|
||||
return stack.getItem() instanceof ItemFluidDisplay;
|
||||
}
|
||||
|
||||
@Override
|
||||
public NBTTagCompound convertItemStackToNBT(ItemStack stack, boolean saveStackSize) {
|
||||
|
||||
if (!(stack.getItem() instanceof ItemFluidDisplay)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
final FluidStack fluidStack = ((ItemFluidDisplay) stack.getItem()).getFluid(stack);
|
||||
|
||||
if (fluidStack == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
final long amount = ((ItemFluidDisplay) stack.getItem()).getAmountLong(stack);
|
||||
final NBTTagCompound nbTag = new NBTTagCompound();
|
||||
nbTag.setString(NBT_FLUID_NAME, fluidStack.getFluid().getName());
|
||||
nbTag.setLong("Count", saveStackSize ? amount : 1);
|
||||
|
||||
return nbTag;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack convertNBTToItemStack(NBTTagCompound nbtTag) {
|
||||
|
||||
if (!nbtTag.hasKey(NBT_FLUID_NAME)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
final Fluid fluid = FluidRegistry.getFluid(nbtTag.getString(NBT_FLUID_NAME));
|
||||
|
||||
if (fluid == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return ItemFluidDisplay.createStack(fluid, nbtTag.getLong("Count"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public FluidStack getFluid(ItemStack stack) {
|
||||
|
||||
if (stack.getItem() instanceof ItemFluidDisplay fluidDisplay) {
|
||||
return fluidDisplay.getFluid(stack);
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -11,13 +11,13 @@ import net.minecraftforge.fluids.FluidRegistry;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
|
||||
import codechicken.nei.api.IStackStringifyHandler;
|
||||
import codechicken.nei.item.ItemFluidDisplay;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import cpw.mods.fml.relauncher.ReflectionHelper;
|
||||
|
||||
public class GTFluidStackStringifyHandler implements IStackStringifyHandler {
|
||||
|
||||
protected static Class<?> itemFluidDisplay = null;
|
||||
protected static Method getFluidDisplayStack = null;
|
||||
protected static Method getFluidFromDisplayStack = null;
|
||||
protected static Class<?> gtMetaGeneratedTool = null;
|
||||
protected static Field playSound = null;
|
||||
@@ -33,7 +33,6 @@ public class GTFluidStackStringifyHandler implements IStackStringifyHandler {
|
||||
"gregtech.common.items.ItemFluidDisplay",
|
||||
"gregtech.common.items.GT_FluidDisplayItem");
|
||||
getFluidFromDisplayStack = gtUtility.getMethod("getFluidFromDisplayStack", ItemStack.class);
|
||||
getFluidDisplayStack = gtUtility.getMethod("getFluidDisplayStack", FluidStack.class, boolean.class);
|
||||
|
||||
gtMetaGeneratedTool = ReflectionHelper.getClass(
|
||||
loader,
|
||||
@@ -45,14 +44,15 @@ public class GTFluidStackStringifyHandler implements IStackStringifyHandler {
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public NBTTagCompound convertItemStackToNBT(ItemStack stack, boolean saveStackSize) {
|
||||
|
||||
if (stack.getItem() != GameRegistry.findItem("ae2fc", "fluid_drop")) {
|
||||
if (stack != null && isFluidDisplayItem(stack)) {
|
||||
final FluidStack fluidStack = getFluid(stack);
|
||||
|
||||
if (fluidStack != null) {
|
||||
final NBTTagCompound nbTag = new NBTTagCompound();
|
||||
nbTag.setString("gtFluidName", fluidStack.getFluid().getName());
|
||||
nbTag.setString(FluidDisplayStackStringifyHandler.NBT_FLUID_NAME, fluidStack.getFluid().getName());
|
||||
nbTag.setInteger("Count", saveStackSize ? fluidStack.amount : 144);
|
||||
return nbTag;
|
||||
}
|
||||
@@ -61,23 +61,22 @@ public class GTFluidStackStringifyHandler implements IStackStringifyHandler {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack convertNBTToItemStack(NBTTagCompound nbtTag) {
|
||||
|
||||
if (getFluidDisplayStack != null && nbtTag.hasKey("gtFluidName")) {
|
||||
if (nbtTag.hasKey("gtFluidName")) {
|
||||
final String fluidName = nbtTag.getString("gtFluidName");
|
||||
final Fluid fluid = FluidRegistry.getFluid(fluidName);
|
||||
final int amount = nbtTag.getInteger("Count");
|
||||
|
||||
if (fluid != null) {
|
||||
try {
|
||||
return (ItemStack) getFluidDisplayStack.invoke(null, new FluidStack(fluid, amount), true);
|
||||
} catch (Exception e) {}
|
||||
return ItemFluidDisplay.createStack(fluid, nbtTag.getLong("Count"));
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public FluidStack getFluid(ItemStack stack) {
|
||||
final Item item = stack.getItem();
|
||||
|
||||
@@ -98,11 +97,7 @@ public class GTFluidStackStringifyHandler implements IStackStringifyHandler {
|
||||
Fluid fluid = FluidRegistry.getFluid(nbtTag.getString("Fluid").toLowerCase());
|
||||
|
||||
if (fluid != null) {
|
||||
FluidStack fluidStack = new FluidStack(fluid, stack.stackSize);
|
||||
if (nbtTag.hasKey("FluidTag")) {
|
||||
fluidStack.tag = nbtTag.getCompoundTag("FluidTag");
|
||||
}
|
||||
return fluidStack;
|
||||
return new FluidStack(fluid, stack.stackSize);
|
||||
}
|
||||
}
|
||||
} catch (Exception e) {}
|
||||
@@ -110,6 +105,7 @@ public class GTFluidStackStringifyHandler implements IStackStringifyHandler {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack normalizeRecipeQueryStack(ItemStack stack) {
|
||||
|
||||
if (stack.getItem() == GameRegistry.findItem("ae2fc", "fluid_drop")
|
||||
@@ -117,9 +113,7 @@ public class GTFluidStackStringifyHandler implements IStackStringifyHandler {
|
||||
final FluidStack fluidStack = getFluid(stack);
|
||||
|
||||
if (fluidStack != null) {
|
||||
try {
|
||||
return (ItemStack) getFluidDisplayStack.invoke(null, fluidStack, true);
|
||||
} catch (Exception e) {}
|
||||
return ItemFluidDisplay.createStack(fluidStack);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -136,4 +130,11 @@ public class GTFluidStackStringifyHandler implements IStackStringifyHandler {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isFluidDisplayItem(ItemStack stack) {
|
||||
final Item item = stack.getItem();
|
||||
return (itemFluidDisplay != null && itemFluidDisplay.isInstance(item))
|
||||
|| item == GameRegistry.findItem("ae2fc", "fluid_packet");
|
||||
}
|
||||
|
||||
}
|
||||
@@ -4,8 +4,11 @@ import java.util.regex.Pattern;
|
||||
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.fluids.FluidRegistry;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
|
||||
import codechicken.nei.api.ItemFilter;
|
||||
import codechicken.nei.recipe.StackInfo;
|
||||
import cpw.mods.fml.common.registry.GameData;
|
||||
|
||||
public class IdentifierFilter implements ItemFilter {
|
||||
@@ -18,15 +21,33 @@ public class IdentifierFilter implements ItemFilter {
|
||||
|
||||
@Override
|
||||
public boolean matches(ItemStack stack) {
|
||||
final FluidStack fluidStack = StackInfo.isFluidDisplayItem(stack) ? StackInfo.getFluid(stack) : null;
|
||||
|
||||
if (fluidStack != null) {
|
||||
return this.pattern.matcher(getFluidStringIdentifier(fluidStack) + "\n" + getFluidIdentifier(fluidStack))
|
||||
.find();
|
||||
}
|
||||
|
||||
return this.pattern.matcher(getStringIdentifier(stack) + "\n" + getIdentifier(stack)).find();
|
||||
}
|
||||
|
||||
protected String getFluidIdentifier(FluidStack fluidStack) {
|
||||
return String.valueOf(FluidRegistry.getFluidID(fluidStack.getFluid()));
|
||||
}
|
||||
|
||||
protected String getFluidStringIdentifier(FluidStack fluidStack) {
|
||||
final String name = FluidRegistry.getDefaultFluidName(fluidStack.getFluid());
|
||||
|
||||
return name == null || name.isEmpty() ? "Unknown:Unknown" : name;
|
||||
}
|
||||
|
||||
protected String getIdentifier(ItemStack stack) {
|
||||
return Item.getIdFromItem(stack.getItem()) + ":" + stack.getItemDamage();
|
||||
}
|
||||
|
||||
protected String getStringIdentifier(ItemStack stack) {
|
||||
String name = GameData.getItemRegistry().getNameForObject(stack.getItem());
|
||||
final String name = GameData.getItemRegistry().getNameForObject(stack.getItem());
|
||||
|
||||
return name == null || name.isEmpty() ? "Unknown:Unknown" : name;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,13 +1,18 @@
|
||||
package codechicken.nei.search;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import net.minecraftforge.fluids.FluidRegistry;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
|
||||
import codechicken.nei.NEIClientConfig;
|
||||
import codechicken.nei.api.ItemFilter;
|
||||
import codechicken.nei.api.ItemInfo;
|
||||
import codechicken.nei.recipe.StackInfo;
|
||||
import cpw.mods.fml.common.Loader;
|
||||
import cpw.mods.fml.common.ModContainer;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
@@ -15,6 +20,7 @@ import cpw.mods.fml.common.registry.GameRegistry.UniqueIdentifier;
|
||||
|
||||
public class ModNameFilter implements ItemFilter {
|
||||
|
||||
private static final Map<String, String> fluidOwners = new HashMap<>();
|
||||
private final Pattern pattern;
|
||||
|
||||
public ModNameFilter(Pattern pattern) {
|
||||
@@ -23,31 +29,52 @@ public class ModNameFilter implements ItemFilter {
|
||||
|
||||
@Override
|
||||
public boolean matches(ItemStack itemStack) {
|
||||
return this.pattern.matcher(nameFromStack(itemStack.getItem())).find();
|
||||
return this.pattern.matcher(nameFromStack(itemStack)).find();
|
||||
}
|
||||
|
||||
protected static String nameFromStack(Item item) {
|
||||
protected static String nameFromStack(ItemStack itemStack) {
|
||||
try {
|
||||
ModContainer mod = Loader.instance().getIndexedModList().get(getModId(item));
|
||||
ModContainer mod = Loader.instance().getIndexedModList().get(getModId(itemStack));
|
||||
return mod == null ? "Minecraft" : mod.getName();
|
||||
} catch (NullPointerException e) {
|
||||
} catch (Throwable e) {
|
||||
return "";
|
||||
}
|
||||
}
|
||||
|
||||
protected static String getModId(Item item) {
|
||||
protected static String getModId(ItemStack itemStack) {
|
||||
final FluidStack fluidStack = StackInfo.isFluidDisplayItem(itemStack) ? StackInfo.getFluid(itemStack) : null;
|
||||
|
||||
if (!ItemInfo.itemOwners.containsKey(item)) {
|
||||
if (fluidStack != null) {
|
||||
return getFluidModId(fluidStack.getFluid());
|
||||
}
|
||||
|
||||
if (!ItemInfo.itemOwners.containsKey(itemStack.getItem())) {
|
||||
try {
|
||||
UniqueIdentifier ident = GameRegistry.findUniqueIdentifierFor(item);
|
||||
ItemInfo.itemOwners.put(item, ident.modId);
|
||||
final UniqueIdentifier identifier = GameRegistry.findUniqueIdentifierFor(itemStack.getItem());
|
||||
ItemInfo.itemOwners.put(itemStack.getItem(), identifier.modId);
|
||||
} catch (Exception ignored) {
|
||||
NEIClientConfig.logger.error("Failed to find identifier for: " + item);
|
||||
ItemInfo.itemOwners.put(item, "Unknown");
|
||||
NEIClientConfig.logger.error("Failed to find identifier for: " + itemStack.getItem());
|
||||
ItemInfo.itemOwners.put(itemStack.getItem(), "Unknown");
|
||||
}
|
||||
}
|
||||
|
||||
return ItemInfo.itemOwners.get(item);
|
||||
return ItemInfo.itemOwners.get(itemStack.getItem());
|
||||
}
|
||||
|
||||
private static String getFluidModId(Fluid fluid) {
|
||||
final String fluidName = FluidRegistry.getDefaultFluidName(fluid);
|
||||
|
||||
if (!fluidOwners.containsKey(fluidName)) {
|
||||
try {
|
||||
final UniqueIdentifier identifier = new UniqueIdentifier(fluidName);
|
||||
fluidOwners.put(fluidName, identifier.modId);
|
||||
} catch (Exception ignored) {
|
||||
NEIClientConfig.logger.error("Failed to find identifier for fluid: " + fluidName);
|
||||
fluidOwners.put(fluidName, "Unknown");
|
||||
}
|
||||
}
|
||||
|
||||
return fluidOwners.get(fluidName);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -25,4 +25,6 @@ minecraft:record_
|
||||
#splash potion
|
||||
minecraft:potion 16000-17000
|
||||
#lingering potion
|
||||
minecraft:potion 8000-9000
|
||||
minecraft:potion 8000-9000
|
||||
#fluid display
|
||||
neifluiddisplay
|
||||
@@ -44,14 +44,14 @@ com.rwtema.extrautils.nei.InfoHandler,Extra Utilities,ExtraUtilities:chandelier,
|
||||
com.rwtema.extrautils.nei.MicroBlocksHandler,Extra Utilities,ExtraUtilities:microblocks:1,,ExtraUtilities,TRUE,,,,,,,,,,,,
|
||||
com.rwtema.extrautils.nei.SoulHandler,Extra Utilities,ExtraUtilities:mini-soul,,ExtraUtilities,TRUE,,,,,,,,,,,,
|
||||
hellfirepvp.beebetteratbees.client.gui.BBABGuiRecipeTreeHandler,Bees,Forestry:beeQueenGE,,Forestry,TRUE,,,140,,2,,,,,,,
|
||||
forestry.factory.recipes.nei.NEIHandlerBottler,Forestry for Minecraft,Forestry:factory,,Forestry,TRUE,,,84,,5,,,,,,,
|
||||
forestry.factory.recipes.nei.NEIHandlerCarpenter,Forestry for Minecraft,Forestry:factory:1,,Forestry,TRUE,,,81,,5,,,,,,,
|
||||
forestry.factory.recipes.nei.NEIHandlerBottler,Forestry for Minecraft,Forestry:factory,,Forestry,TRUE,,,71,,5,,,,,,,
|
||||
forestry.factory.recipes.nei.NEIHandlerCarpenter,Forestry for Minecraft,Forestry:factory:1,,Forestry,TRUE,,,95,,5,,,,,,,
|
||||
forestry.factory.recipes.nei.NEIHandlerCentrifuge,Forestry for Minecraft,Forestry:factory:2,,Forestry,TRUE,,,81,,5,,,,,,,
|
||||
forestry.factory.recipes.nei.NEIHandlerFabricator,Forestry for Minecraft,Forestry:factory2,,Forestry,TRUE,,,,,,,,,,,,
|
||||
forestry.factory.recipes.nei.NEIHandlerFermenter,Forestry for Minecraft,Forestry:factory:3,,Forestry,TRUE,,,81,,5,,,,,,,
|
||||
forestry.factory.recipes.nei.NEIHandlerMoistener,Forestry for Minecraft,Forestry:factory:4,,Forestry,TRUE,,,84,,5,,,,,,,
|
||||
forestry.factory.recipes.nei.NEIHandlerSqueezer,Forestry for Minecraft,Forestry:factory:5,,Forestry,TRUE,,,84,,5,,,,,,,
|
||||
forestry.factory.recipes.nei.NEIHandlerStill,Forestry for Minecraft,Forestry:factory:6,,Forestry,TRUE,,,81,,5,,,,,,,
|
||||
forestry.factory.recipes.nei.NEIHandlerFermenter,Forestry for Minecraft,Forestry:factory:3,,Forestry,TRUE,,2,69,,5,,,,,,,
|
||||
forestry.factory.recipes.nei.NEIHandlerMoistener,Forestry for Minecraft,Forestry:factory:4,,Forestry,TRUE,,1,70,,5,,,,,,,
|
||||
forestry.factory.recipes.nei.NEIHandlerSqueezer,Forestry for Minecraft,Forestry:factory:5,,Forestry,TRUE,,,98,,5,,,,,,,
|
||||
forestry.factory.recipes.nei.NEIHandlerStill,Forestry for Minecraft,Forestry:factory:6,,Forestry,TRUE,,2,69,,5,,,,,,,
|
||||
net.bdew.neiaddons.forestry.bees.BeeBreedingHandler,Forestry for Minecraft,Forestry:beeQueenGE,,Forestry,TRUE,,,65,,5,,,,,,,
|
||||
net.bdew.neiaddons.forestry.bees.BeeProduceHandler,Forestry for Minecraft,Forestry:beeQueenGE,,Forestry,TRUE,,,65,,5,,,,,,,
|
||||
net.bdew.neiaddons.forestry.butterflies.ButterflyBreedingHandler,Forestry for Minecraft,Forestry:butterflyGE,,Forestry,TRUE,,,,,,,,,,,,
|
||||
@@ -228,11 +228,11 @@ com.djgiannuzz.thaumcraftneiplugin.nei.recipehandler.InfusionRecipeHandler,Thaum
|
||||
ru.timeconqueror.tcneiadditions.nei.arcaneworkbench.ArcaneCraftingShapedHandler,Thaumcraft,Thaumcraft:blockTable:15,,Thaumcraft,TRUE,,4,138,,2,,,,,,,
|
||||
ru.timeconqueror.tcneiadditions.nei.AspectCombinationHandler,Thaumcraft,Thaumcraft:ItemResearchNotes,,Thaumcraft,TRUE,,,130,,2,,,,,,In sets of 5. Each one is ~30 height,
|
||||
ru.timeconqueror.tcneiadditions.nei.AspectFromItemStackHandler,Thaumcraft,Thaumcraft:ItemResearchNotes,,Thaumcraft,TRUE,,,140,,2,,,,,,,
|
||||
tconstruct.plugins.nei.RecipeHandlerAlloying,Tinker's Construct,TConstruct:Smeltery,,TConstruct,TRUE,,,65,,5,,,,,,,
|
||||
tconstruct.plugins.nei.RecipeHandlerCastingBasin,Tinker's Construct,TConstruct:SearedBlock:2,,TConstruct,TRUE,,,65,,5,,,,,,,
|
||||
tconstruct.plugins.nei.RecipeHandlerCastingTable,Tinker's Construct,TConstruct:SearedBlock,,TConstruct,TRUE,,,65,,5,,,,,,,
|
||||
tconstruct.plugins.nei.RecipeHandlerAlloying,Tinker's Construct,TConstruct:Smeltery,,TConstruct,TRUE,,3,63,,5,,,,,,,
|
||||
tconstruct.plugins.nei.RecipeHandlerCastingBasin,Tinker's Construct,TConstruct:SearedBlock:2,,TConstruct,TRUE,,2,57,,5,,,,,,,
|
||||
tconstruct.plugins.nei.RecipeHandlerCastingTable,Tinker's Construct,TConstruct:SearedBlock,,TConstruct,TRUE,,2,57,,5,,,,,,,
|
||||
tconstruct.plugins.nei.RecipeHandlerDryingRack,Tinker's Construct,TConstruct:Armor.DryingRack,,TConstruct,TRUE,,,55,,5,,,,,,,
|
||||
tconstruct.plugins.nei.RecipeHandlerMelting,Tinker's Construct,TConstruct:LavaTank:2,,TConstruct,TRUE,,,65,,5,,,,,,,
|
||||
tconstruct.plugins.nei.RecipeHandlerMelting,Tinker's Construct,TConstruct:LavaTank:2,,TConstruct,TRUE,,-1,60,,5,,,,,,,
|
||||
tconstruct.plugins.nei.RecipeHandlerToolMaterials,Tinker's Construct,TConstruct:ToolStationBlock,,TConstruct,TRUE,,,110,,3,,,,,,"Longer if more modifiers, I went through the whole list",
|
||||
net.p455w0rd.wirelesscraftingterminal.integration.modules.NEIHelpers.NEIAEShapedRecipeHandler,Wireless Crafting Terminal,ae2wct:wirelessCraftingTerminal,,ae2wct,TRUE,,,,,,,,,,,,
|
||||
alkalus.main.nei.NEI_Handler_Cauldron,Witchery,witchery:cauldron,,WitcheryExtras,TRUE,,,65,,5,,,,,,,
|
||||
|
||||
|
@@ -59,7 +59,7 @@ nei.options.wbutton.tip.0=Používám globální nastavení
|
||||
nei.options.wbutton.tip.1=Přepisuji globální nastavení
|
||||
|
||||
nei.options.keys=Nastavení kláves
|
||||
nei.options.keys.gui=Inventář
|
||||
nei.options.keys.gui=NEI Inventář
|
||||
nei.options.keys.recipe.recipe=Recept
|
||||
nei.options.keys.recipe.usage=Použití
|
||||
nei.options.keys.gui.enchant=Očarování
|
||||
@@ -69,7 +69,7 @@ nei.options.keys.gui.prev=Předchozí stránka
|
||||
nei.options.keys.gui.next=Další stránka
|
||||
nei.options.keys.gui.hide=Přepnout viditelnost NEI
|
||||
nei.options.keys.gui.search=Zaměřit vyhledávací pole
|
||||
nei.options.keys.world=Svět
|
||||
nei.options.keys.world=NEI Svět
|
||||
nei.options.keys.world.chunkoverlay=Ohraničení chunku
|
||||
nei.options.keys.world.moboverlay=Označení míst spawnu monster
|
||||
nei.options.keys.world.highlight_tips=Informace o bloku
|
||||
|
||||
@@ -63,7 +63,7 @@ nei.options.wbutton.tip.0=Nutzt globale Einstellungen
|
||||
nei.options.wbutton.tip.1=Übergeht globale Einstellungen
|
||||
|
||||
nei.options.keys=Tastenbelegung
|
||||
nei.options.keys.gui=Inventar
|
||||
nei.options.keys.gui=NEI Inventar
|
||||
nei.options.keys.recipe.recipe=Rezept
|
||||
nei.options.keys.recipe.usage=Nutzung
|
||||
nei.options.keys.gui.enchant=Verzauberungen
|
||||
@@ -73,7 +73,7 @@ nei.options.keys.gui.prev=Vorherige Seite
|
||||
nei.options.keys.gui.next=Nächste Seite
|
||||
nei.options.keys.gui.hide=Verstelle NEI-Sichtbarkeit
|
||||
nei.options.keys.gui.search=Fokussiere Such-Leiste
|
||||
nei.options.keys.world=Welt
|
||||
nei.options.keys.world=NEI Welt
|
||||
nei.options.keys.world.chunkoverlay=Chunk-Grenzen-Overlay
|
||||
nei.options.keys.world.moboverlay=Mob-Spawn-Overlay
|
||||
nei.options.keys.world.highlight_tips=Highlight-Tooltips
|
||||
|
||||
@@ -30,6 +30,7 @@ nei.bookmark.group.sorting=Move Position
|
||||
nei.bookmark.group.remove_recipe=Remove Group
|
||||
nei.bookmark.group.pull_items=Pull all Items
|
||||
nei.bookmark.group.pull_items_shift=Pull missing Items
|
||||
nei.bookmark.group.open_crafting_tree=Open Crafting Tree
|
||||
nei.bookmark.group.craft_missing=Craft Missing Items
|
||||
nei.bookmark.group.craft_all=Craft Items
|
||||
nei.bookmark.group.chat_link=Send Bookmark Group to Chat
|
||||
@@ -47,11 +48,46 @@ nei.bookmark.recipe.toggle_collapse=Toggle Collapse/Expand
|
||||
nei.bookmark.recipe.chat_link=Send Recipe to Chat
|
||||
nei.bookmark.crafting_chain=Crafting Chain
|
||||
nei.bookmark.crafting_chain.input=Ingredients
|
||||
nei.bookmark.crafting_chain.missing=Missing Items
|
||||
nei.bookmark.crafting_chain.output=Results
|
||||
nei.bookmark.crafting_chain.remainder=Remainders
|
||||
nei.bookmark.crafting_chain.needed=Required Crafts
|
||||
nei.bookmark.crafting_chain.available=Available Items
|
||||
nei.bookmark.tree.title=Crafting Tree
|
||||
nei.bookmark.tree.empty=No crafting chain to display
|
||||
nei.bookmark.tree.overlay=Use for recipe tree
|
||||
nei.bookmark.tree.item.state.resolved=In inventory: %s
|
||||
nei.bookmark.tree.item.state.partial=Still needed: %s
|
||||
nei.bookmark.tree.item.state.craftable=Can be crafted
|
||||
nei.bookmark.tree.item.state.surplus=Extra produced: %s
|
||||
nei.bookmark.tree.item.toggle_recipe=Collapse/Expand Recipe
|
||||
|
||||
nei.bookmark.tree.stats.handlers=Handlers
|
||||
nei.bookmark.tree.stats.ingredients=Ingredients
|
||||
nei.bookmark.tree.stats.ingredients_needed=Ingredients Needed
|
||||
nei.bookmark.tree.stats.ingredients_available=Ingredients Available
|
||||
nei.bookmark.tree.stats.results=Results
|
||||
nei.bookmark.tree.stats.remainders=Remainders
|
||||
nei.bookmark.tree.stats.crafting=Crafting
|
||||
nei.bookmark.tree.stats.crafting_needed=Crafting Needed
|
||||
nei.bookmark.tree.stats.crafting_available=Crafting Available
|
||||
nei.bookmark.tree.stats.handler_iterations=Iterations: %s
|
||||
nei.bookmark.tree.stats.handler_recipes=Unique Recipes: %s
|
||||
|
||||
nei.bookmark.tree.stats.highlight_handler=Highlight Recipe Handler
|
||||
nei.bookmark.tree.stats.next_highlight=Go to Next Highlighted Handler
|
||||
nei.bookmark.tree.stats.prev_highlight=Go to Previous Highlighted Handler
|
||||
nei.bookmark.tree.stats.clear_highlight=Clear Handler Highlight
|
||||
|
||||
nei.bookmark.tree.toolbar.inventory_off=Recompute tree using player inventory (snapshot)
|
||||
nei.bookmark.tree.toolbar.inventory_on=Using inventory snapshot - click to clear
|
||||
nei.bookmark.tree.toolbar.fit_to_view=Fit tree to view
|
||||
nei.bookmark.tree.toolbar.stats_off=Show stats panel
|
||||
nei.bookmark.tree.toolbar.stats_on=Hide stats panel
|
||||
nei.bookmark.tree.toolbar.stats_sections=Choose visible stats sections
|
||||
nei.bookmark.tree.toolbar.link=Send Bookmark Group to Chat
|
||||
nei.bookmark.tree.toolbar.collapse_resolved=Collapse items with nothing left to craft
|
||||
nei.bookmark.tree.toolbar.collapse_all=Collapse all nested items
|
||||
nei.bookmark.tree.toolbar.expand_all=Expand all nested items
|
||||
nei.bookmark.tree.toolbar.screenshot=Save tree as image
|
||||
nei.bookmark.tree.screenshot.fbo_unsupported=Could not save crafting tree screenshot: framebuffers are not supported
|
||||
|
||||
nei.inventory.search.placeholder=Search...
|
||||
nei.itempanel.quantity.default=One stack
|
||||
nei.itempanel.loading=Loading Item List...
|
||||
@@ -123,7 +159,14 @@ nei.inventory.current.gamemode.2=Current gamemode: creative+
|
||||
nei.inventory.current.gamemode.3=Current gamemode: adventure
|
||||
nei.inventory.tooltip.page=Page: %s / %s [Press %s to see next page]
|
||||
nei.inventory.tooltip.count.item=Count: %s
|
||||
|
||||
itemGroup.neiFluids=Fluids
|
||||
|
||||
nei.inventory.tooltip.count.fluid=Amount: %s
|
||||
nei.inventory.tooltip.temperature.fluid=Temperature: %sK
|
||||
nei.inventory.tooltip.state.fluid=State: %s
|
||||
nei.inventory.tooltip.state.fluid.gas=Gas
|
||||
nei.inventory.tooltip.state.fluid.liquid=Liquid
|
||||
|
||||
nei.inventory.gamemode.0=Click: Set gamemode to survival
|
||||
nei.inventory.gamemode.1=Click: Set gamemode to creative
|
||||
@@ -200,6 +243,7 @@ nei.options.keys.gui.search=Focus Search Bar
|
||||
nei.options.keys.bookmark.add=Add Bookmark
|
||||
nei.options.keys.bookmark.remove_recipe=Remove Group from Bookmarks (Shift +)
|
||||
nei.options.keys.bookmark.pull_items=Pull all Bookmarked Items
|
||||
nei.options.keys.bookmark.open_crafting_tree=Open Crafting Tree Window
|
||||
nei.options.keys.bookmark.hide=Toggle Bookmark Panel Visibility
|
||||
nei.options.keys.bookmark.chat_link=Send link to chat (Ctrl +)
|
||||
nei.options.keys.gui.overlay=Fill/Overlay Crafting Grid
|
||||
@@ -236,9 +280,6 @@ nei.options.inventory.bookmarks.enabled.false=Hidden
|
||||
nei.options.inventory.bookmarks.animation=REI Style Animation in Bookmarks
|
||||
nei.options.inventory.bookmarks.animation.true=Yes
|
||||
nei.options.inventory.bookmarks.animation.false=No
|
||||
nei.options.inventory.bookmarks.recipeChainDir=Crafting Chain Info Direction
|
||||
nei.options.inventory.bookmarks.recipeChainDir.0=Input First
|
||||
nei.options.inventory.bookmarks.recipeChainDir.1=Output First
|
||||
nei.options.inventory.bookmarks.recipeTooltipsMode=Show Recipe Tooltips in Bookmarks
|
||||
nei.options.inventory.bookmarks.recipeTooltipsMode.0=None
|
||||
nei.options.inventory.bookmarks.recipeTooltipsMode.1=In Horizontal View
|
||||
@@ -486,6 +527,14 @@ nei.options.inventory.itemUntranslator=Item Untranslator
|
||||
nei.options.inventory.itemUntranslator.true=Enabled
|
||||
nei.options.inventory.itemUntranslator.false=Disabled
|
||||
|
||||
nei.options.inventory.tooltip=Tooltips
|
||||
nei.options.inventory.tooltip.showFluidTemperature=Show Fluid Temperature
|
||||
nei.options.inventory.tooltip.showFluidTemperature.true=Yes
|
||||
nei.options.inventory.tooltip.showFluidTemperature.false=No
|
||||
nei.options.inventory.tooltip.showFluidState=Show Fluid State
|
||||
nei.options.inventory.tooltip.showFluidState.true=Yes
|
||||
nei.options.inventory.tooltip.showFluidState.false=No
|
||||
|
||||
nei.options.command=Commands
|
||||
nei.options.command.creative=Gamemode
|
||||
nei.options.command.creative.tip={0} = 1 for creative, 0 for survival, {1} = player
|
||||
@@ -576,6 +625,7 @@ nei.debug.RecipeHandler.reset=Reset
|
||||
|
||||
nei.recipe.page=Page %s/%s
|
||||
nei.recipe.tooltip=Recipes
|
||||
nei.recipe.fluid.tank.amount=Amount: %s
|
||||
nei.recipe.tab.view_all.tooltip=View all categories
|
||||
nei.recipe.search.tooltip.name=Filter Syntax
|
||||
nei.recipe.search.tooltip.shift=§7Hold §6Shift§7 for more info
|
||||
@@ -610,6 +660,10 @@ nei.recipe.badge.ncp.tooltip=Considered in parallel calculation, but not get con
|
||||
nei.recipe.badge.chance.consume=Consume Chance: %s
|
||||
nei.recipe.badge.chance.output=Output Chance: %s
|
||||
|
||||
nei.recipe.items.results=Results
|
||||
nei.recipe.items.ingredients=Ingredients
|
||||
nei.recipe.items.ingredients_needed=Ingredients Needed
|
||||
|
||||
# Deprecated
|
||||
nei.recipe.fuel.required=%s required
|
||||
# Deprecated
|
||||
@@ -674,6 +728,7 @@ nei.subsets.Items.Armor.Boots=Boots
|
||||
nei.subsets.Items.Armor.Chestplates=Chestplates
|
||||
nei.subsets.Items.Armor.Helmets=Helmets
|
||||
nei.subsets.Items.Armor.Leggings=Leggings
|
||||
nei.subsets.Items.Fluids=Fluids
|
||||
nei.subsets.Items.Food=Food
|
||||
nei.subsets.Items.Potions=Potions
|
||||
nei.subsets.Items.Potions.Ingredients=Ingredients
|
||||
@@ -691,6 +746,9 @@ nei.subsets.Items.Weapons=Weapons
|
||||
nei.subsets.Items.Weapons.Ranged=Ranged
|
||||
nei.subsets.Items.Weapons.Swords=Swords
|
||||
nei.subsets.Untranslated=Untranslated
|
||||
nei.subsets.Favorites=Favorites
|
||||
nei.subsets.Favorites.Manual=Manual
|
||||
nei.subsets.Favorites.Generated=Generated
|
||||
nei.subsets.Mod=Mod
|
||||
|
||||
nei.presets.new=New Preset
|
||||
|
||||
@@ -62,7 +62,7 @@ nei.options.wbutton.tip.0=Kasutab globaalseid seadeid
|
||||
nei.options.wbutton.tip.1=Globaalsete seadmete ületegemine
|
||||
|
||||
nei.options.keys=Klahviseosed
|
||||
nei.options.keys.gui=Seljakott
|
||||
nei.options.keys.gui=NEI Seljakott
|
||||
nei.options.keys.recipe.recipe=Retsept
|
||||
nei.options.keys.recipe.usage=Kasutus
|
||||
nei.options.keys.gui.enchant=Loitsud
|
||||
@@ -72,7 +72,7 @@ nei.options.keys.gui.prev=Eel. Leht
|
||||
nei.options.keys.gui.next=Järg. Leht
|
||||
nei.options.keys.gui.hide=Lülita NEI nähtavust
|
||||
nei.options.keys.gui.search=Fokuseeri otsingu riba
|
||||
nei.options.keys.world=Maailm
|
||||
nei.options.keys.world=NEI Maailm
|
||||
nei.options.keys.world.chunkoverlay=Chunk'i ääre ülekate
|
||||
nei.options.keys.world.moboverlay=Koletiste sündimis ülekate
|
||||
nei.options.keys.world.highlight_tips=Highlight Tooltips
|
||||
|
||||
@@ -60,7 +60,7 @@ nei.options.wbutton.tip.0=Utilisation des paramètres globaux
|
||||
nei.options.wbutton.tip.1=Annuler l'utilisation des paramètres globaux
|
||||
|
||||
nei.options.keys=Raccourcis clavier
|
||||
nei.options.keys.gui=Inventaire
|
||||
nei.options.keys.gui=NEI Inventaire
|
||||
nei.options.keys.recipe.recipe=Recette
|
||||
nei.options.keys.recipe.usage=Usage
|
||||
nei.options.keys.gui.enchant=Enchantements
|
||||
@@ -70,7 +70,7 @@ nei.options.keys.gui.prev=Recette suivante
|
||||
nei.options.keys.gui.next=Page suivante
|
||||
nei.options.keys.gui.hide=Afficher ou cacher NEI
|
||||
nei.options.keys.gui.search=Sélectionner la barre de recherche
|
||||
nei.options.keys.world=Monde
|
||||
nei.options.keys.world=NEI Monde
|
||||
nei.options.keys.world.chunkoverlay=Overlay limitation des chunks
|
||||
nei.options.keys.world.moboverlay=Overlay spawn des monstres
|
||||
nei.options.keys.world.highlight_tips=Mettez en surbrillance les info-bulles
|
||||
|
||||
@@ -63,7 +63,7 @@ nei.options.wbutton.tip.0=Usando le opzioni globali
|
||||
nei.options.wbutton.tip.1=Sovrascrivendo le opzioni globali
|
||||
|
||||
nei.options.keys=Controlli
|
||||
nei.options.keys.gui=Inventario
|
||||
nei.options.keys.gui=NEI Inventario
|
||||
nei.options.keys.recipe.recipe=Ricetta
|
||||
nei.options.keys.recipe.usage=Usi
|
||||
nei.options.keys.gui.enchant=Incantare
|
||||
@@ -73,7 +73,7 @@ nei.options.keys.gui.prev=Pagina precedente
|
||||
nei.options.keys.gui.next=Pagina successiva
|
||||
nei.options.keys.gui.hide=Modifica visibilità NEI
|
||||
nei.options.keys.gui.search=Attiva barra di ricerca
|
||||
nei.options.keys.world=Mondo
|
||||
nei.options.keys.world=NEI Mondo
|
||||
nei.options.keys.world.chunkoverlay=Mostra confini dei chunk
|
||||
nei.options.keys.world.moboverlay=Mostra spawn dei mob
|
||||
nei.options.keys.world.highlight_tips=Esalta tooltips
|
||||
|
||||
@@ -58,7 +58,7 @@ nei.options.wbutton.tip.0=글로벌로 세팅
|
||||
nei.options.wbutton.tip.1=전역 설정
|
||||
|
||||
nei.options.keys=키 바인딩
|
||||
nei.options.keys.gui=인벤토리
|
||||
nei.options.keys.gui=NEI 인벤토리
|
||||
nei.options.keys.recipe.recipe=레시피
|
||||
nei.options.keys.recipe.usage=사용법
|
||||
nei.options.keys.gui.enchant=인첸트
|
||||
@@ -68,7 +68,7 @@ nei.options.keys.gui.prev=이전 페이지
|
||||
nei.options.keys.gui.next=다음 페이지
|
||||
nei.options.keys.gui.hide=NEI 활성/비활성화
|
||||
nei.options.keys.gui.search=빠른 검색
|
||||
nei.options.keys.world=월드
|
||||
nei.options.keys.world=NEI 월드
|
||||
nei.options.keys.world.chunkoverlay=청크경계 확인
|
||||
nei.options.keys.world.moboverlay=몹스폰 확인
|
||||
nei.options.keys.world.highlight_tips=하이라이트 툴팁
|
||||
|
||||
@@ -59,7 +59,7 @@ nei.options.wbutton.tip.0=Używanie ustawień globalnych
|
||||
nei.options.wbutton.tip.1=Nadpisywanie ustawienia globalnego
|
||||
|
||||
nei.options.keys=Ustawienia klawiszy
|
||||
nei.options.keys.gui=Ekwipunek
|
||||
nei.options.keys.gui=NEI Ekwipunek
|
||||
nei.options.keys.recipe.recipe=Recepta
|
||||
nei.options.keys.recipe.usage=Użytek
|
||||
nei.options.keys.gui.enchant=Zaklęcia
|
||||
@@ -69,7 +69,7 @@ nei.options.keys.gui.prev=Poprzednia strona
|
||||
nei.options.keys.gui.next=Następna strona
|
||||
nei.options.keys.gui.hide=Przełącz widzialność NEI
|
||||
nei.options.keys.gui.search=Ustaw ostrość na pasek wyszukiwania
|
||||
nei.options.keys.world=Świat
|
||||
nei.options.keys.world=NEI Świat
|
||||
nei.options.keys.world.chunkoverlay=Nakładka granic chunków
|
||||
nei.options.keys.world.moboverlay=Nakładka pojawiania się mobów
|
||||
nei.options.keys.world.highlight_tips=Podpowiedzi podświetleń
|
||||
|
||||
@@ -59,7 +59,7 @@ nei.options.wbutton.tip.0=Usando configurações globais
|
||||
nei.options.wbutton.tip.1=Substituindo configurações globais
|
||||
|
||||
nei.options.keys=Atalhos de Teclado
|
||||
nei.options.keys.gui=Inventário
|
||||
nei.options.keys.gui=NEI Inventário
|
||||
nei.options.keys.recipe.recipe=Receita
|
||||
nei.options.keys.recipe.usage=Uso
|
||||
nei.options.keys.gui.enchant=Encantamentos
|
||||
@@ -69,7 +69,7 @@ nei.options.keys.gui.prev=Pág. Anterior
|
||||
nei.options.keys.gui.next=Próxima Pág.
|
||||
nei.options.keys.gui.hide=Trocar Visibilidade do NEI
|
||||
nei.options.keys.gui.search=Focar na Barra de Buscas
|
||||
nei.options.keys.world=Mundo
|
||||
nei.options.keys.world=NEI Mundo
|
||||
nei.options.keys.world.chunkoverlay=Sobreposição de Fronteira de Chunks
|
||||
nei.options.keys.world.moboverlay=Sobreposição de Spawn de Mobs
|
||||
nei.options.keys.world.highlight_tips=Destacar Dicas
|
||||
|
||||
@@ -23,8 +23,6 @@ nei.bookmark.group.pull_items_shift=Переместить недостающи
|
||||
nei.bookmark.group.chat_link=Отправить группу в чат
|
||||
nei.bookmark.crafting_chain=Цепочка крафта
|
||||
nei.bookmark.crafting_chain.input=Ингредиенты
|
||||
nei.bookmark.crafting_chain.output=Результаты
|
||||
nei.bookmark.crafting_chain.remainder=Остатки
|
||||
|
||||
nei.itempanel.quantity.default=Одна стопка
|
||||
nei.itempanel.loading=Загрузка списка предметов...
|
||||
@@ -84,6 +82,13 @@ nei.inventory.current.gamemode.2=Текущий режим игры: творч
|
||||
nei.inventory.current.gamemode.3=Текущий режим игры: приключение
|
||||
nei.inventory.tooltip.page=Страница: %s / %s [Нажмите %s для перехода на следующую страницу]
|
||||
|
||||
itemGroup.neiFluids=Жидкости
|
||||
|
||||
nei.inventory.tooltip.temperature.fluid=Температура: %sK
|
||||
nei.inventory.tooltip.state.fluid=Состояние: %s
|
||||
nei.inventory.tooltip.state.fluid.gas=Газ
|
||||
nei.inventory.tooltip.state.fluid.liquid=Жидкость
|
||||
|
||||
nei.inventory.gamemode.0=Клик: Установить режим игры на выживание
|
||||
nei.inventory.gamemode.1=Клик: Установить режим игры на творческий
|
||||
nei.inventory.gamemode.2=Клик: Установить режим игры на творческий+
|
||||
@@ -177,9 +182,6 @@ nei.options.inventory.bookmarks.enabled.false=Скрытая
|
||||
nei.options.inventory.bookmarks.animation=Анимация в стиле REI в закладках
|
||||
nei.options.inventory.bookmarks.animation.true=Да
|
||||
nei.options.inventory.bookmarks.animation.false=Нет
|
||||
nei.options.inventory.bookmarks.recipeChainDir=Направление информации о цепочке крафта
|
||||
nei.options.inventory.bookmarks.recipeChainDir.0=Сначала ингредиенты
|
||||
nei.options.inventory.bookmarks.recipeChainDir.1=Сначала результат
|
||||
nei.options.inventory.bookmarks.recipeTooltipsMode=Показывать подсказки рецептов в закладках
|
||||
nei.options.inventory.bookmarks.recipeTooltipsMode.0=Нет
|
||||
nei.options.inventory.bookmarks.recipeTooltipsMode.1=В горизонтальном виде
|
||||
@@ -444,6 +446,7 @@ nei.subsets.Items.Armor.Boots=Ботинки
|
||||
nei.subsets.Items.Armor.Chestplates=Нагрудники
|
||||
nei.subsets.Items.Armor.Helmets=Шлемы
|
||||
nei.subsets.Items.Armor.Leggings=Поножи
|
||||
nei.subsets.Items.Fluids=Жидкости
|
||||
nei.subsets.Items.Food=Еда
|
||||
nei.subsets.Items.Potions=Зелья
|
||||
nei.subsets.Items.Potions.Ingredients=Ингредиенты
|
||||
|
||||
@@ -59,7 +59,7 @@ nei.options.wbutton.tip.0=Používajú sa globálne nastavenia
|
||||
nei.options.wbutton.tip.1=Globálne nastavenia sú nahradené
|
||||
|
||||
nei.options.keys=Klávesové skratky
|
||||
nei.options.keys.gui=Inventár
|
||||
nei.options.keys.gui=NEI Inventár
|
||||
nei.options.keys.recipe.recipe=Recept
|
||||
nei.options.keys.recipe.usage=Použitie
|
||||
nei.options.keys.gui.enchant=Očarovania
|
||||
@@ -69,7 +69,7 @@ nei.options.keys.gui.prev=Predchádzajúca strana
|
||||
nei.options.keys.gui.next=Nasledujúca strana
|
||||
nei.options.keys.gui.hide=Prepni viditeľnosť NEI
|
||||
nei.options.keys.gui.search=Zamerania na vyhľadávací riadok
|
||||
nei.options.keys.world=Svet
|
||||
nei.options.keys.world=NEI Svet
|
||||
nei.options.keys.world.chunkoverlay=Vrstva hraníc chunkov
|
||||
nei.options.keys.world.moboverlay=Vrstva zrodenia sa monštier
|
||||
nei.options.keys.world.highlight_tips=Zvýraznenie opisov
|
||||
|
||||
@@ -59,7 +59,7 @@ nei.options.wbutton.tip.0=Genel ayarları kullanıyorsunuz
|
||||
nei.options.wbutton.tip.1=Genel ayarların üstüne yazılıyor
|
||||
|
||||
nei.options.keys=Tuşlar
|
||||
nei.options.keys.gui=Envanter
|
||||
nei.options.keys.gui=NEI Envanter
|
||||
nei.options.keys.recipe.recipe=Tarifler
|
||||
nei.options.keys.recipe.usage=Kullanım yeri
|
||||
nei.options.keys.gui.enchant=Büylüler
|
||||
@@ -69,7 +69,7 @@ nei.options.keys.gui.prev=Önceki sayfa
|
||||
nei.options.keys.gui.next=Sonraki sayfa
|
||||
nei.options.keys.gui.hide=Nei görünürlük ayarı
|
||||
nei.options.keys.gui.search=Arama çubuğu odağı
|
||||
nei.options.keys.world=Dünya
|
||||
nei.options.keys.world=NEI Dünya
|
||||
nei.options.keys.world.chunkoverlay=Chunk sınır yerleşimi
|
||||
nei.options.keys.world.moboverlay=Mob Spawn yerleşimi
|
||||
nei.options.keys.world.highlight_tips=Nesne ipucu
|
||||
|
||||
@@ -0,0 +1,714 @@
|
||||
nei.load=Завантажити
|
||||
nei.save=Зберегти
|
||||
|
||||
# Клавіша керування PC/Linux
|
||||
nei.key.ctrl=CTRL
|
||||
nei.key.shift=SHIFT
|
||||
nei.key.alt=ALT
|
||||
nei.mouse.left=ЛКМ
|
||||
nei.mouse.right=ПКМ
|
||||
nei.mouse.middle=СКМ
|
||||
nei.mouse.other=Кнопка %d
|
||||
nei.mouse.scroll=Прокручування
|
||||
nei.mouse.drag=Перетягування
|
||||
# Клавіша Command на Mac
|
||||
nei.key.ctrl.mac=CMD
|
||||
nei.showHotkeys=Утримуйте %s для відображення гарячих клавіш
|
||||
|
||||
nei.bookmark.toggle=Закладки
|
||||
nei.bookmark.toggle.tip=Перемикнути видимість панелі закладок
|
||||
nei.bookmark.pullBookmarkedItems.tip=Перемістити всі предмети із закладок зі сховища до інвентарю
|
||||
|
||||
nei.bookmark.group=Група закладок
|
||||
nei.bookmark.group.include_group=Створити групу/Додати до групи
|
||||
nei.bookmark.group.exclude_group=Видалити групу/Виключити з групи
|
||||
nei.bookmark.group.toggle_mode=Перемикнути режим груп
|
||||
nei.bookmark.group.toggle_collapse=Згорнути/Розгорнути
|
||||
nei.bookmark.group.toggle_crafting_chain=Перемикнути ланцюжок крафту
|
||||
nei.bookmark.group.overlay_use=Заповнити сітку крафту
|
||||
nei.bookmark.group.sorting=Змінити позицію
|
||||
nei.bookmark.group.remove_recipe=Видалити групу
|
||||
nei.bookmark.group.pull_items=Перемістити всі предмети
|
||||
nei.bookmark.group.pull_items_shift=Перемістити відсутні предмети
|
||||
nei.bookmark.group.craft_missing=Скрафтити відсутні предмети
|
||||
nei.bookmark.group.craft_all=Скрафтити предмети
|
||||
nei.bookmark.group.chat_link=Надіслати групу закладок у чат
|
||||
nei.bookmark.item.sorting=Змінити позицію
|
||||
nei.bookmark.item.chat_link=Надіслати предмет у чат
|
||||
nei.bookmark.remove_recipe=Видалити рецепт
|
||||
nei.bookmark.remove_item=Видалити предмет
|
||||
nei.bookmark.add_item=Додати закладку
|
||||
nei.bookmark.add_item_with_recipe=Додати закладку з рецептом
|
||||
nei.bookmark.add_item_with_recipe_and_count=Додати закладку з рецептом і кількістю
|
||||
nei.bookmark.add_item_with_count=Додати закладку з кількістю
|
||||
nei.bookmark.change_quantity=Змінити кількість
|
||||
nei.bookmark.change_quantity_step=Змінити кількість із множником
|
||||
nei.bookmark.recipe.toggle_collapse=Згорнути/Розгорнути
|
||||
nei.bookmark.recipe.chat_link=Надіслати рецепт у чат
|
||||
nei.bookmark.crafting_chain=Ланцюжок крафту
|
||||
nei.bookmark.crafting_chain.input=Інгредієнти
|
||||
nei.bookmark.crafting_chain.needed=Необхідні крафти
|
||||
nei.inventory.search.placeholder=Пошук...
|
||||
nei.itempanel.quantity.default=Один стек
|
||||
nei.itempanel.loading=Завантаження списку предметів...
|
||||
nei.itempanel.deleteItem=Знищити предмет
|
||||
nei.itempanel.collapsed.button=G
|
||||
nei.itempanel.collapsed.button.tip=Згорнути/Розгорнути всі згруповані предмети
|
||||
nei.itempanel.collapsed.hint.expand=Розгорнути групу (%d предметів)
|
||||
nei.itempanel.collapsed.hint.collapse=Згорнути групу (%d предметів)
|
||||
nei.itempanel.overlay_recipe=Накласти рецепт
|
||||
nei.itempanel.craft_missing=Скрафтити відсутні предмети
|
||||
nei.itempanel.craft_all=Скрафтити предмети
|
||||
nei.itempanel.fill_crafting_grid=Заповнити сітку крафту
|
||||
nei.itempanel.fill_crafting_grid_quantity=Заповнити сітку крафту з кількістю
|
||||
nei.itempanel.open_crafting=Рецепт створення цього предмета
|
||||
nei.itempanel.open_usage=Рецепти з використанням цього предмета
|
||||
nei.itempanel.infinite_item=Видати нескінченний предмет
|
||||
nei.itempanel.copy_name=Скопіювати назву предмета
|
||||
nei.itempanel.copy_oredict=Скопіювати OreDictionary предмета
|
||||
nei.itempanel.copy_id=Скопіювати ID предмета
|
||||
|
||||
nei.itempanel.chat_link_item=Надіслати посилання на предмет у чат
|
||||
|
||||
nei.enchant=Зачарування
|
||||
nei.enchant.level=Рівень
|
||||
nei.enchant.locked=Заблоковано
|
||||
nei.enchant.unlocked=Розблоковано
|
||||
|
||||
nei.potion.favourite=Обрані зілля
|
||||
nei.potion.duration=Тривалість
|
||||
nei.potion.level=Рівень
|
||||
|
||||
nei.inventory.options=Налаштування
|
||||
nei.inventory.options.tip=Налаштування NEI
|
||||
nei.inventory.options.tip.cheatmode.0=Режим рецептів
|
||||
nei.inventory.options.tip.cheatmode.1=Режим утиліт
|
||||
nei.inventory.options.tip.cheatmode.2=Режим читів
|
||||
nei.inventory.options.tip.cheatmode.disable=%s - натисніть тут для перемикання між режимами Рецептів, Утиліт та Читів.
|
||||
nei.inventory.prev=Назад
|
||||
nei.inventory.next=Далі
|
||||
nei.inventory.item_subsets=Підгрупи предметів
|
||||
nei.inventory.delete.inv=ЗНИЩИТИ ВСІ ПРЕДМЕТИ з поточного інвентарю
|
||||
nei.inventory.delete.one=Знищити %s
|
||||
nei.inventory.delete.all=Знищити ВСІ %s
|
||||
nei.inventory.delete.enable=Режим знищення
|
||||
nei.inventory.delete.1=Увімкнути режим знищення
|
||||
nei.inventory.delete.0=Вимкнути режим знищення
|
||||
nei.inventory.rain.enable=Дощ
|
||||
nei.inventory.rain.1=Увімкнути дощ
|
||||
nei.inventory.rain.0=Вимкнути дощ
|
||||
nei.inventory.magnet.enable=Режим магніту
|
||||
nei.inventory.magnet.1=Увімкнути режим магніту
|
||||
nei.inventory.magnet.0=Вимкнути режим магніту
|
||||
nei.inventory.dawn.enable=Світанок-полудень
|
||||
nei.inventory.dawn.disable=ПКМ: Вимкнути фазу світанок-полудень
|
||||
nei.inventory.dawn.set=Встановити час: Світанок
|
||||
nei.inventory.noon.enable=Полудень-сутінки
|
||||
nei.inventory.noon.disable=ПКМ: Вимкнути фазу полудень-сутінки
|
||||
nei.inventory.noon.set=Встановити час: Полудень
|
||||
nei.inventory.dusk.enable=Сутінки-опівніч
|
||||
nei.inventory.dusk.disable=ПКМ: Вимкнути фазу сутінки-опівніч
|
||||
nei.inventory.dusk.set=Встановити час: Сутінки
|
||||
nei.inventory.midnight.enable=Опівніч-світанок
|
||||
nei.inventory.midnight.disable=ПКМ: Вимкнути фазу опівніч-світанок
|
||||
nei.inventory.midnight.set=Встановити час: Опівніч
|
||||
nei.inventory.heal=Зцілити гравця
|
||||
nei.inventory.current.gamemode.0=Поточний режим гри: Виживання
|
||||
nei.inventory.current.gamemode.1=Поточний режим гри: Творчий
|
||||
nei.inventory.current.gamemode.2=Поточний режим гри: Творчий+
|
||||
nei.inventory.current.gamemode.3=Поточний режим гри: Пригодницький
|
||||
nei.inventory.tooltip.page=Сторінка: %s / %s [Натисніть %s для наступної сторінки]
|
||||
nei.inventory.tooltip.count.item=Кількість: %s
|
||||
nei.inventory.tooltip.count.fluid=Об’єм: %s
|
||||
|
||||
nei.inventory.gamemode.0=Встановити режим Виживання
|
||||
nei.inventory.gamemode.1=Встановити Творчий режим
|
||||
nei.inventory.gamemode.2=Встановити Творчий+ режим
|
||||
nei.inventory.gamemode.3=Встановити Пригодницький режим
|
||||
|
||||
nei.chat.gamemode.0=Тепер ви граєте в режимі Виживання
|
||||
nei.chat.gamemode.1=Тепер ви граєте у Творчому режимі
|
||||
nei.chat.gamemode.2=Тепер ви граєте в режимі Творчий+
|
||||
nei.chat.gamemode.3=Тепер ви граєте в Пригодницькому режимі
|
||||
nei.chat.rain.on=Дощ увімкнено
|
||||
nei.chat.rain.off=Дощ вимкнено
|
||||
nei.chat.time=День %d. %d:00
|
||||
nei.chat.give.noitem=Такого предмета не існує.
|
||||
nei.chat.recipe.error=Сталася помилка під час завантаження рецепта. Перегляньте лог для отримання деталей.
|
||||
nei.chat.render.error=Сталася помилка під час відображення предмета. Перегляньте лог для отримання деталей.
|
||||
nei.chat.chunkoverlay.0=Відображення чанків: Вимкнено
|
||||
nei.chat.chunkoverlay.1=Відображення чанків: Кути чанків
|
||||
nei.chat.chunkoverlay.2=Відображення чанків: Чанки
|
||||
nei.chat.chunkoverlay.3=Відображення чанків: Рудні жили GT
|
||||
nei.chat.moboverlay.0=Відображення спавну мобів: §cВимкнено
|
||||
nei.chat.moboverlay.1=Відображення спавну мобів: §2Увімкнено
|
||||
nei.chat.item_link.text=<%s> §6Натисніть, щоб додати закладку: %s
|
||||
nei.chat.item_link.item.text=Додати предмет у закладки
|
||||
nei.chat.item_link.recipe.text=Додати рецепт у закладки
|
||||
nei.chat.item_link.group.text=Додати групу в закладки
|
||||
nei.chat.bookmark_added.text=Закладку додано!
|
||||
|
||||
nei.chat.recipeid.many_params=Забагато параметрів! Використання: %s
|
||||
nei.chat.recipeid.not_found=Файл %s не знайдено!
|
||||
nei.chat.recipeid.diff.start=Розпочато порівняння рецептів!
|
||||
nei.chat.recipeid.diff.finish=Завершено порівняння рецептів!
|
||||
nei.chat.recipeid.dump.start=Розпочато опрацювання обробників рецептів!
|
||||
nei.chat.recipeid.dump.finish=Завершено опрацювання обробників рецептів!
|
||||
|
||||
nei.chat.untranslator.dump.start=Розпочато створення дампу untranslator!
|
||||
nei.chat.untranslator.dump.finish=Завершено створення дампу untranslator!
|
||||
nei.chat.untranslator.dump.error=Дочекайтеся завантаження предметів!
|
||||
nei.chat.untranslator.clear=Файл успішно видалено!
|
||||
nei.chat.untranslator.clear.error=Не вдалося видалити файл!
|
||||
|
||||
nei.options=Налаштування NEI
|
||||
nei.options.back=Повернутися
|
||||
nei.options.save=Зберегти
|
||||
nei.options.world=Світ
|
||||
nei.options.global=Глобально
|
||||
nei.options.global.tip.0=Налаштування застосовуються до всіх світів
|
||||
nei.options.global.tip.1=Натисніть W біля налаштування, щоб увімкнути перевизначення для цього світу
|
||||
nei.options.wbutton.tip.0=Використовуються глобальні налаштування
|
||||
nei.options.wbutton.tip.1=Перевизначення глобального налаштування
|
||||
|
||||
nei.options.keys=Прив’язка клавіш
|
||||
nei.options.keys.tip=Налаштувати гарячі клавіші NEI у вікні керування Minecraft
|
||||
nei.options.keys.gui=Інвентар NEI
|
||||
nei.options.keys.world=Світ NEI
|
||||
nei.options.keys.recipe=Рецепти NEI
|
||||
nei.options.keys.bookmark=Закладки NEI
|
||||
nei.options.keys.copy=Копіювання NEI
|
||||
nei.options.keys.itemzoom=Наближення предметів NEI
|
||||
nei.options.keys.showenchant=Показати зачарування
|
||||
nei.options.keys.recipe.recipe=Рецепт
|
||||
nei.options.keys.recipe.usage=Використання
|
||||
nei.options.keys.gui.enchant=Зачарування
|
||||
nei.options.keys.gui.potion=Зілля
|
||||
nei.options.keys.recipe.back=Повернутися до попереднього рецепту
|
||||
nei.options.keys.gui.prev=Попередня сторінка панелі предметів
|
||||
nei.options.keys.gui.next=Наступна сторінка панелі предметів
|
||||
nei.options.keys.gui.hide=Перемикнути видимість
|
||||
nei.options.keys.recipe.next_recipe=Наступний рецепт
|
||||
nei.options.keys.recipe.prev_recipe=Попередній рецепт
|
||||
nei.options.keys.recipe.next_machine=Наступна категорія
|
||||
nei.options.keys.recipe.prev_machine=Попередня категорія
|
||||
nei.options.keys.gui.search=Фокус на рядок пошуку
|
||||
nei.options.keys.bookmark.add=Додати закладку
|
||||
nei.options.keys.bookmark.remove_recipe=Видалити групу із закладок (Shift +)
|
||||
nei.options.keys.bookmark.pull_items=Перемістити всі предмети із закладок
|
||||
nei.options.keys.bookmark.hide=Перемикнути видимість панелі закладок
|
||||
nei.options.keys.bookmark.chat_link=Надіслати посилання в чат (Ctrl +)
|
||||
nei.options.keys.gui.overlay=Заповнити/Накласти сітку крафту
|
||||
nei.options.keys.gui.getprevioussearch=Попередній пошуковий запит
|
||||
nei.options.keys.gui.getnextsearch=Наступний пошуковий запит
|
||||
nei.options.keys.gui.next_tooltip=Наступна підказка
|
||||
nei.options.keys.copy.name=Скопіювати назву предмета (Ctrl +)
|
||||
nei.options.keys.gui.craft_items=Скрафтити предмети (Shift +)
|
||||
nei.options.keys.copy.oredict=Скопіювати OreDictionary предмета (Ctrl +)
|
||||
nei.options.keys.copy.identifier=Скопіювати ID предмета (Ctrl +)
|
||||
nei.options.keys.itemzoom.toggle=Перемикнути наближення предмета (Shift +)
|
||||
nei.options.keys.itemzoom.hold=Утримувати для відображення наближення предмета
|
||||
nei.options.keys.itemzoom.zoom_in=Збільшити масштаб предмета
|
||||
nei.options.keys.itemzoom.zoom_out=Зменшити масштаб предмета
|
||||
nei.options.keys.bookmark.favorite=Додати в обране (Shift +)
|
||||
nei.options.keys.bookmark.favorite_item=Перемикнути обране (Shift +)
|
||||
nei.options.keys.world.chunkoverlay=Відображення меж чанків
|
||||
nei.options.keys.world.moboverlay=Відображення спавну мобів
|
||||
nei.options.keys.world.highlight_tips=Контекстні підказки
|
||||
nei.options.keys.world.dawn=Світанок
|
||||
nei.options.keys.world.noon=Полудень
|
||||
nei.options.keys.world.dusk=Сутінки
|
||||
nei.options.keys.world.midnight=Опівніч
|
||||
nei.options.keys.world.rain=Дощ
|
||||
nei.options.keys.world.heal=Зцілення
|
||||
nei.options.keys.world.creative=Режим гри
|
||||
nei.options.keys.world.creative.tip=Перемикати режим гри
|
||||
|
||||
nei.options.inventory=Інвентар
|
||||
nei.options.inventory.bookmarks=Панель закладок
|
||||
nei.options.inventory.bookmarks.enabled=Видимість панелі закладок
|
||||
nei.options.inventory.bookmarks.enabled.true=Видима
|
||||
nei.options.inventory.bookmarks.enabled.false=Прихована
|
||||
nei.options.inventory.bookmarks.animation=Анімація закладок у стилі REI
|
||||
nei.options.inventory.bookmarks.animation.true=Так
|
||||
nei.options.inventory.bookmarks.animation.false=Ні
|
||||
nei.options.inventory.bookmarks.recipeTooltipsMode=Показувати підказки рецептів у закладках
|
||||
nei.options.inventory.bookmarks.recipeTooltipsMode.0=Ніколи
|
||||
nei.options.inventory.bookmarks.recipeTooltipsMode.1=У горизонтальному вигляді
|
||||
nei.options.inventory.bookmarks.recipeTooltipsMode.2=У вертикальному вигляді
|
||||
nei.options.inventory.bookmarks.recipeTooltipsMode.3=Завжди
|
||||
nei.options.inventory.bookmarks.showRecipeMarkerMode=Показувати маркер рецепта
|
||||
nei.options.inventory.bookmarks.showRecipeMarkerMode.0=Не показувати
|
||||
nei.options.inventory.bookmarks.showRecipeMarkerMode.1=Текст
|
||||
nei.options.inventory.bookmarks.showRecipeMarkerMode.2=Тло
|
||||
nei.options.inventory.bookmarks.showRecipeHandlerIcon=Показувати іконку обробника
|
||||
nei.options.inventory.bookmarks.showRecipeHandlerIcon.true=Так
|
||||
nei.options.inventory.bookmarks.showRecipeHandlerIcon.false=Ні
|
||||
|
||||
nei.options.inventory.bookmarks.recipeMarkerColor=Колір маркера рецепта
|
||||
nei.options.inventory.bookmarks.ignorePotionOverlap=Ігнорувати перекриття з HUD ефектів зілля
|
||||
nei.options.inventory.bookmarks.ignorePotionOverlap.true=Так
|
||||
nei.options.inventory.bookmarks.ignorePotionOverlap.false=Ні
|
||||
nei.options.inventory.bookmarks.worldSpecific=Прив’язка до світу
|
||||
nei.options.inventory.bookmarks.worldSpecific.true=Так
|
||||
nei.options.inventory.bookmarks.worldSpecific.false=Ні
|
||||
nei.options.inventory.bookmarks.bookmarkItemsWithRecipe=Додавати в закладки предмети з рецептом
|
||||
nei.options.inventory.bookmarks.bookmarkItemsWithRecipe.true=Так
|
||||
nei.options.inventory.bookmarks.bookmarkItemsWithRecipe.false=Ні
|
||||
nei.options.inventory.bookmarks.bookmarkRecipeWithCount=Додавати в закладки рецепт з кількістю
|
||||
nei.options.inventory.bookmarks.bookmarkRecipeWithCount.true=Так
|
||||
nei.options.inventory.bookmarks.bookmarkRecipeWithCount.false=Ні
|
||||
nei.options.inventory.favorites=Обране
|
||||
nei.options.inventory.favorites.enabled=Видимість
|
||||
nei.options.inventory.favorites.enabled.true=Видимо
|
||||
nei.options.inventory.favorites.enabled.false=Приховано
|
||||
nei.options.inventory.favorites.worldSpecific=Прив’язка до світу
|
||||
nei.options.inventory.favorites.worldSpecific.true=Так
|
||||
nei.options.inventory.favorites.worldSpecific.false=Ні
|
||||
nei.options.inventory.favorites.showRecipeTooltipInPanel=Підказки рецептів у правій панелі
|
||||
nei.options.inventory.favorites.showRecipeTooltipInPanel.true=Так
|
||||
nei.options.inventory.favorites.showRecipeTooltipInPanel.false=Ні
|
||||
nei.options.inventory.favorites.showRecipeTooltipInGui=Підказки рецептів у меню рецептів
|
||||
nei.options.inventory.favorites.showRecipeTooltipInGui.true=Так
|
||||
nei.options.inventory.favorites.showRecipeTooltipInGui.false=Ні
|
||||
nei.options.inventory.favorites.depth=Глибина
|
||||
nei.options.inventory.favorites.generateSingleRecipeFavorites=Додавати в обране окремі рецепти
|
||||
nei.options.inventory.favorites.generateSingleRecipeFavorites.true=Так
|
||||
nei.options.inventory.favorites.generateSingleRecipeFavorites.false=Ні
|
||||
nei.options.inventory.hotkeysHelpText=Показувати підказки щодо гарячих клавіш
|
||||
nei.options.inventory.hotkeysHelpText.true=Так
|
||||
nei.options.inventory.hotkeysHelpText.false=Ні
|
||||
nei.options.inventory.showHotkeys=Показувати гарячі клавіші
|
||||
nei.options.inventory.showHotkeys.true=Так
|
||||
nei.options.inventory.showHotkeys.false=Ні
|
||||
nei.options.inventory.guirecipe=Інтерфейс рецептів
|
||||
nei.options.inventory.guirecipe.jeiStyleTabs=Вкладки у стилі JEI
|
||||
nei.options.inventory.guirecipe.jeiStyleTabs.true=Так
|
||||
nei.options.inventory.guirecipe.jeiStyleTabs.false=Ні [Дивак]
|
||||
nei.options.inventory.guirecipe.itemPresenceOverlay=Індикатор наявності предметів під час наведення на «?»
|
||||
nei.options.inventory.guirecipe.itemPresenceOverlay.0=Немає
|
||||
nei.options.inventory.guirecipe.itemPresenceOverlay.1=Іконка
|
||||
nei.options.inventory.guirecipe.itemPresenceOverlay.2=Тло
|
||||
nei.options.inventory.guirecipe.slotHighlightPresent=Підсвічувати наявні предмети
|
||||
nei.options.inventory.guirecipe.slotHighlightPresent.true=Так
|
||||
nei.options.inventory.guirecipe.slotHighlightPresent.false=Ні
|
||||
nei.options.inventory.guirecipe.infiniteScroll=Нескінченне прокручування
|
||||
nei.options.inventory.guirecipe.infiniteScroll.true=Так
|
||||
nei.options.inventory.guirecipe.infiniteScroll.false=Ні
|
||||
nei.options.inventory.guirecipe.jeiStyleRecipeCatalyst=Каталізатори рецептів у стилі JEI
|
||||
nei.options.inventory.guirecipe.jeiStyleRecipeCatalyst.0=Немає
|
||||
nei.options.inventory.guirecipe.jeiStyleRecipeCatalyst.1=Сітка
|
||||
nei.options.inventory.guirecipe.jeiStyleRecipeCatalyst.2=Прокручування
|
||||
nei.options.inventory.guirecipe.cycledIngredientsTooltip=Підказка щодо циклічних інгредієнтів
|
||||
nei.options.inventory.guirecipe.cycledIngredientsTooltip.true=Показувати
|
||||
nei.options.inventory.guirecipe.cycledIngredientsTooltip.false=Приховувати
|
||||
nei.options.inventory.guirecipe.handlerInfo=Віджет інформації про обробник
|
||||
nei.options.inventory.guirecipe.handlerInfo.tip=Використовуйте Shift+D в інтерфейсі рецептів
|
||||
nei.options.inventory.guirecipe.handlerInfo.true=Увімкнено
|
||||
nei.options.inventory.guirecipe.handlerInfo.false=Вимкнено
|
||||
|
||||
nei.options.inventory.guirecipe.scrollPages=Прокручування сторінок
|
||||
nei.options.inventory.guirecipe.scrollPages.true=Увімкнено
|
||||
nei.options.inventory.guirecipe.scrollPages.false=Вимкнено
|
||||
|
||||
nei.options.inventory.guirecipe.maxHeight=Максимальна висота
|
||||
nei.options.inventory.showItemQuantityWidget=Показувати віджет кількості предметів
|
||||
nei.options.inventory.showItemQuantityWidget.true=Так
|
||||
nei.options.inventory.showItemQuantityWidget.false=Ні
|
||||
nei.options.inventory.search=Віджет пошуку
|
||||
nei.options.inventory.search.widgetPosition=Позиція віджета
|
||||
nei.options.inventory.search.widgetPosition.true=По центру
|
||||
nei.options.inventory.search.widgetPosition.false=Праворуч
|
||||
nei.options.inventory.search.hideUntilSearching=Приховувати до початку пошуку
|
||||
nei.options.inventory.search.hideUntilSearching.true=Так
|
||||
nei.options.inventory.search.hideUntilSearching.false=Ні
|
||||
nei.options.inventory.search.widgetAutofocus=Автофокус
|
||||
nei.options.inventory.search.widgetAutofocus.0=Ні
|
||||
nei.options.inventory.search.widgetAutofocus.1=Так
|
||||
nei.options.inventory.search.widgetAutofocus.2=Розширений
|
||||
nei.options.inventory.search.patternMode=Режим пошуку
|
||||
nei.options.inventory.search.patternMode.0=Звичайний
|
||||
nei.options.inventory.search.patternMode.1=Розширений
|
||||
nei.options.inventory.search.patternMode.2=Регулярні вирази
|
||||
nei.options.inventory.search.patternMode.3=Розширений+
|
||||
nei.options.inventory.search.spaceMode=Пробіл працює як
|
||||
nei.options.inventory.search.spaceMode.0=Логічне «AND»
|
||||
nei.options.inventory.search.spaceMode.0.tip=Пробіл між токенами без префіксів працює як логічний оператор «AND»
|
||||
nei.options.inventory.search.spaceMode.1=Пробіл
|
||||
nei.options.inventory.search.spaceMode.1.tip=Пробіл між токенами без префіксів працює як звичайний пробіл
|
||||
nei.options.inventory.search.spaceMode.2=Логічне «AND» (в категорії)
|
||||
nei.options.inventory.search.spaceMode.2.tip=Пробіл працює як оператор «AND», але всі токени повинні бути в межах однієї категорії
|
||||
nei.options.inventory.search.quoteDropItemName=Брати в лапки назву перетягнутого предмета
|
||||
nei.options.inventory.search.quoteDropItemName.true=Так
|
||||
nei.options.inventory.search.quoteDropItemName.false=Ні
|
||||
nei.options.inventory.search.format=Формат пошуку
|
||||
nei.options.inventory.search.format.true=Старий формат
|
||||
nei.options.inventory.search.format.false=Розширений
|
||||
nei.options.inventory.search.modNameSearchMode=Пошук за назвою моду
|
||||
nei.options.inventory.search.modNameSearchMode.0=Завжди
|
||||
nei.options.inventory.search.modNameSearchMode.1=Префікс: %s
|
||||
nei.options.inventory.search.modNameSearchMode.2=Ніколи
|
||||
nei.options.inventory.search.tooltipSearchMode=Пошук у підказках
|
||||
nei.options.inventory.search.tooltipSearchMode.0=Завжди
|
||||
nei.options.inventory.search.tooltipSearchMode.1=Префікс: %s
|
||||
nei.options.inventory.search.tooltipSearchMode.2=Ніколи
|
||||
nei.options.inventory.search.identifierSearchMode=Пошук за ID ресурсу
|
||||
nei.options.inventory.search.identifierSearchMode.0=Завжди
|
||||
nei.options.inventory.search.identifierSearchMode.1=Префікс: %s
|
||||
nei.options.inventory.search.identifierSearchMode.2=Ніколи
|
||||
nei.options.inventory.search.oreDictSearchMode=Пошук у OreDictionary
|
||||
nei.options.inventory.search.oreDictSearchMode.0=Завжди
|
||||
nei.options.inventory.search.oreDictSearchMode.1=Префікс: %s
|
||||
nei.options.inventory.search.oreDictSearchMode.2=Ніколи
|
||||
nei.options.inventory.search.subsetsSearchMode=Пошук у підгрупах предметів
|
||||
nei.options.inventory.search.subsetsSearchMode.0=Завжди
|
||||
nei.options.inventory.search.subsetsSearchMode.1=Префікс: %s
|
||||
nei.options.inventory.search.subsetsSearchMode.2=Ніколи
|
||||
nei.options.inventory.guirecipe.creativeTabStyle=Стиль вкладок Creative чи JEI
|
||||
nei.options.inventory.guirecipe.creativeTabStyle.true=Creative
|
||||
nei.options.inventory.guirecipe.creativeTabStyle.false=JEI
|
||||
nei.options.inventory.optimize_gui_overlap_computation=Оптимізувати обчислення перекриття інтерфейсів
|
||||
nei.options.inventory.optimize_gui_overlap_computation.true=Так
|
||||
nei.options.inventory.optimize_gui_overlap_computation.false=Ні
|
||||
nei.options.inventory.autocrafting=Автокрафт
|
||||
nei.options.inventory.autocrafting.true=Увімкнено
|
||||
nei.options.inventory.autocrafting.false=Вимкнено
|
||||
nei.options.inventory.guirecipe.shiftOverlayRecipe=Утримувати Shift для переміщення предметів під час накладання рецепта
|
||||
nei.options.inventory.guirecipe.shiftOverlayRecipe.true=Так
|
||||
nei.options.inventory.guirecipe.shiftOverlayRecipe.false=Ні
|
||||
nei.options.inventory.widgetsenabled.true=NEI увімкнено
|
||||
nei.options.inventory.widgetsenabled.false=NEI вимкнено
|
||||
nei.options.inventory.cheatmode.0=Режим рецептів
|
||||
nei.options.inventory.cheatmode.1=Режим утиліт
|
||||
nei.options.inventory.cheatmode.2=Режим читів
|
||||
nei.options.inventory.guirecipe.profile=Профілювання рецептів
|
||||
nei.options.inventory.guirecipe.profile.true=Так
|
||||
nei.options.inventory.guirecipe.profile.false=Ні
|
||||
nei.options.inventory.itemsort=Сортування панелі предметів
|
||||
nei.options.inventory.itemIDs=ID предметів
|
||||
nei.options.inventory.itemIDs.0=Приховано
|
||||
nei.options.inventory.itemIDs.1=Авто
|
||||
nei.options.inventory.itemIDs.2=Відображаються
|
||||
nei.options.inventory.utilities=Утиліти
|
||||
nei.options.inventory.utilities.tip=Оберіть функції для режиму утиліт
|
||||
nei.options.inventory.utilities.time=Час
|
||||
nei.options.inventory.utilities.rain=Дощ
|
||||
nei.options.inventory.utilities.heal=Зцілення
|
||||
nei.options.inventory.utilities.delete=Знищення
|
||||
nei.options.inventory.utilities.magnet=Магніт
|
||||
nei.options.inventory.utilities.gamemode=Режим гри
|
||||
nei.options.inventory.utilities.enchant=Зачарування
|
||||
nei.options.inventory.utilities.potion=Зілля
|
||||
nei.options.inventory.utilities.item=Предмети
|
||||
nei.options.inventory.gamemodes=Режими гри
|
||||
nei.options.inventory.gamemodes.tip=Оберіть режими гри для перемикання
|
||||
nei.options.inventory.gamemodes.creative=Творчий
|
||||
nei.options.inventory.gamemodes.creative+=Творчий+
|
||||
nei.options.inventory.gamemodes.adventure=Пригодницький
|
||||
nei.options.inventory.itempanelScale=Масштаб панелі предметів (у відсотках)
|
||||
nei.options.inventory.disableMouseScrollTransfer=Вимкнути переміщення колесом миші
|
||||
nei.options.inventory.disableMouseScrollTransfer.true=Так
|
||||
nei.options.inventory.disableMouseScrollTransfer.false=Ні
|
||||
nei.options.inventory.invertMouseScrollTransfer=Інвертувати напрямок переміщення колесом миші
|
||||
nei.options.inventory.invertMouseScrollTransfer.true=Так
|
||||
nei.options.inventory.invertMouseScrollTransfer.false=Ні
|
||||
nei.options.inventory.gridRenderingCacheMode=Режим кешування візуалізації сітки
|
||||
nei.options.inventory.gridRenderingCacheMode.0=Вимкнено
|
||||
nei.options.inventory.gridRenderingCacheMode.1=Низький FPS
|
||||
nei.options.inventory.gridRenderingCacheMode.2=Заморожування
|
||||
nei.options.inventory.gridRenderingCacheFPS=FPS кешування візуалізації сітки
|
||||
nei.options.inventory.collapsibleItems=Групування предметів
|
||||
nei.options.inventory.collapsibleItems.enabled=Групування предметів
|
||||
nei.options.inventory.collapsibleItems.enabled.true=Увімкнено
|
||||
nei.options.inventory.collapsibleItems.enabled.false=Вимкнено
|
||||
nei.options.inventory.collapsibleItems.customName=Показувати власну назву групи
|
||||
nei.options.inventory.collapsibleItems.customName.true=Так
|
||||
nei.options.inventory.collapsibleItems.customName.false=Ні
|
||||
nei.options.inventory.collapsibleItems.expandedColor=Колір розгорнутої групи
|
||||
nei.options.inventory.collapsibleItems.collapsedColor=Колір згорнутої групи
|
||||
nei.options.inventory.history=Панель історії
|
||||
nei.options.inventory.history.enabled=Видимість панелі історії
|
||||
nei.options.inventory.history.enabled.true=Увімкнено
|
||||
nei.options.inventory.history.enabled.false=Вимкнено
|
||||
nei.options.inventory.history.color=Колір
|
||||
nei.options.inventory.history.useRows=Рядки
|
||||
nei.options.inventory.history.worldSpecific=Прив’язка до світу
|
||||
nei.options.inventory.history.worldSpecific.true=Так
|
||||
nei.options.inventory.history.worldSpecific.false=Ні
|
||||
nei.options.inventory.history.save=Збереження історії
|
||||
nei.options.inventory.history.save.true=Увімкнено
|
||||
nei.options.inventory.history.save.false=Вимкнено
|
||||
nei.options.inventory.craftables=Панель доступних крафтів
|
||||
nei.options.inventory.craftables.enabled=Видимість панелі доступних крафтів
|
||||
nei.options.inventory.craftables.enabled.true=Увімкнено
|
||||
nei.options.inventory.craftables.enabled.false=Вимкнено
|
||||
nei.options.inventory.craftables.color=Колір
|
||||
nei.options.inventory.craftables.useRows=Рядки
|
||||
nei.options.inventory.craftables.favoritesOnly=Показувати лише обрані
|
||||
nei.options.inventory.craftables.favoritesOnly.true=Так
|
||||
nei.options.inventory.craftables.favoritesOnly.false=Ні
|
||||
nei.options.inventory.subsets=Віджет підгруп
|
||||
nei.options.inventory.subsets.enabled=Видимість підгруп
|
||||
nei.options.inventory.subsets.enabled.true=Увімкнено
|
||||
nei.options.inventory.subsets.enabled.false=Вимкнено
|
||||
nei.options.inventory.subsets.widgetPosition=Позиція віджета
|
||||
nei.options.inventory.subsets.widgetPosition.true=Зверху
|
||||
nei.options.inventory.subsets.widgetPosition.false=Знизу
|
||||
nei.options.inventory.itemzoom=Панель наближення предметів
|
||||
nei.options.inventory.itemzoom.enabled=Видимість панелі наближення предметів
|
||||
nei.options.inventory.itemzoom.enabled.true=Увімкнено
|
||||
nei.options.inventory.itemzoom.enabled.false=Вимкнено
|
||||
nei.options.inventory.itemzoom.neiOnly=Лише для оверлеїв NEI
|
||||
nei.options.inventory.itemzoom.neiOnly.true=Увімкнено
|
||||
nei.options.inventory.itemzoom.neiOnly.false=Вимкнено
|
||||
nei.options.inventory.itemzoom.neiOnly.tip=Наближати предмети лише зі списків інгредієнтів та закладок JEI.
|
||||
nei.options.inventory.itemzoom.onlySolid=Показувати лише суцільні предмети
|
||||
nei.options.inventory.itemzoom.onlySolid.true=Увімкнено
|
||||
nei.options.inventory.itemzoom.onlySolid.false=Вимкнено
|
||||
nei.options.inventory.itemzoom.helpText=Показувати текст підказки
|
||||
nei.options.inventory.itemzoom.helpText.true=Увімкнено
|
||||
nei.options.inventory.itemzoom.helpText.false=Вимкнено
|
||||
nei.options.inventory.itemzoom.helpText.tip=Показувати назву «Наближення предмета» та гарячу клавішу перемикання під збільшеним предметом.
|
||||
nei.options.inventory.itemzoom.zoom=Рівень наближення
|
||||
nei.options.inventory.itemzoom.zoom.tip=Установіть менше значення, щоб зменшити ступінь наближення предмета.
|
||||
nei.options.inventory.itemzoom.showName=Показувати назву
|
||||
nei.options.inventory.itemzoom.showName.true=Показувати
|
||||
nei.options.inventory.itemzoom.showName.false=Приховувати
|
||||
nei.options.inventory.itemzoom.nameColor=Колір назви
|
||||
nei.options.inventory.itemUntranslator=Оригінальні назви предметів
|
||||
nei.options.inventory.itemUntranslator.true=Увімкнено
|
||||
nei.options.inventory.itemUntranslator.false=Вимкнено
|
||||
|
||||
nei.options.command=Команди
|
||||
nei.options.command.creative=Режим гри
|
||||
nei.options.command.creative.tip={0} = 1 для творчого, 0 для виживання, {1} = гравець
|
||||
nei.options.command.item=Предмет
|
||||
nei.options.command.item.tip={0} = гравець, {1} = ID, {2} = кількість, {3} = міцність/метадані, {4} = NBT, {5} = назва
|
||||
nei.options.command.time=Час
|
||||
nei.options.command.time.tip={0} = ігровий час
|
||||
nei.options.command.rain=Дощ
|
||||
nei.options.command.rain.tip={0} = 1 увімкнено, 0 вимкнено
|
||||
nei.options.command.heal=Зцілення
|
||||
nei.options.command.heal.tip={0} = гравець
|
||||
|
||||
nei.options.world.highlight_tips=Контекстні підказки
|
||||
nei.options.world.highlight_tips.hide=Приховані
|
||||
nei.options.world.highlight_tips.show=Відображаються
|
||||
nei.options.world.highlight_tips.sample=Зразок
|
||||
|
||||
nei.options.world.panels=Налаштування панелей
|
||||
nei.options.world.presets=Список пресетів
|
||||
|
||||
nei.options.world.overlays=Налаштування оверлеїв
|
||||
nei.options.world.overlays.lock=Фіксувати оверлеї між вимірами
|
||||
nei.options.world.overlays.lock.true=Увімкнено
|
||||
nei.options.world.overlays.lock.false=Вимкнено
|
||||
|
||||
nei.options.tools=Інструменти
|
||||
nei.options.tools.handler_load_from_config=Завантажувати обробники з конфігураційного файлу
|
||||
nei.options.tools.handler_load_from_config.true=Конфігурація
|
||||
nei.options.tools.handler_load_from_config.false=JAR
|
||||
nei.options.tools.catalyst_load_from_config=Завантажувати каталізатори з конфігураційного файлу
|
||||
nei.options.tools.catalyst_load_from_config.true=Конфігурація
|
||||
nei.options.tools.catalyst_load_from_config.false=JAR
|
||||
nei.options.tools.dump=Дампи даних
|
||||
nei.options.tools.dump.dump=Створити дамп
|
||||
nei.options.tools.dump.dumped=ID %s збережено в %s
|
||||
nei.options.tools.dump.mode.0=Використані
|
||||
nei.options.tools.dump.mode.1=Вільні
|
||||
nei.options.tools.dump.mode.2=Усі
|
||||
nei.options.tools.dump.item=Предметів
|
||||
nei.options.tools.dump.items=Предмети
|
||||
nei.options.tools.dump.block=Блоків
|
||||
nei.options.tools.dump.blocks=Блоки
|
||||
nei.options.tools.dump.potion=Зіллів
|
||||
nei.options.tools.dump.potions=Зілля
|
||||
nei.options.tools.dump.enchantment=Зачарувань
|
||||
nei.options.tools.dump.enchantments=Зачарування
|
||||
nei.options.tools.dump.biome=Біомів
|
||||
nei.options.tools.dump.biomes=Біоми
|
||||
nei.options.tools.dump.itempanel=Панель предметів
|
||||
nei.options.tools.dump.itempanel.dumped=Вміст панелі предметів збережено в %s
|
||||
nei.options.tools.dump.itempanel.mode.0=CSV
|
||||
nei.options.tools.dump.itempanel.mode.1=NBT
|
||||
nei.options.tools.dump.itempanel.mode.2=Json
|
||||
nei.options.tools.dump.itempanel.mode.3=PNG
|
||||
nei.options.tools.dump.itempanel.icon.dumped=Іконки панелі предметів збережено в %s
|
||||
nei.options.tools.dump.itempanel.icon.cancelled=Дамп скасовано
|
||||
nei.options.tools.dump.itempanel.icon.warning.1=§cУВАГА§r: Ви збираєтеся зберегти дамп %s предметів у роздільній здатності %sx%s
|
||||
nei.options.tools.dump.itempanel.icon.warning.2=Утримуйте %s під час натискання цієї кнопки, щоб продовжити
|
||||
nei.options.tools.dump.handlers=Обробники NEI
|
||||
nei.options.tools.dump.handlers.dumped=Обробники збережено в %s
|
||||
nei.options.tools.dump.handlers.mode.0=CSV
|
||||
nei.options.tools.dump.handlers.mode.1=Json
|
||||
|
||||
nei.debug.RecipeHandler.title=Налагодження обробника рецептів
|
||||
nei.debug.RecipeHandler.copy=Скопіювати
|
||||
nei.debug.RecipeHandler.Name=Назва
|
||||
nei.debug.RecipeHandler.Id=ID
|
||||
nei.debug.RecipeHandler.Key=Ключ
|
||||
nei.debug.RecipeHandler.HHack=H.Hack
|
||||
nei.debug.RecipeHandler.ModName=Назва моду
|
||||
nei.debug.RecipeHandler.ModId=ID моду
|
||||
nei.debug.RecipeHandler.Order=Порядок
|
||||
nei.debug.RecipeHandler.yShift=yShift
|
||||
nei.debug.RecipeHandler.MultiWidgets=Мультивіджети
|
||||
nei.debug.RecipeHandler.Height=Висота
|
||||
nei.debug.RecipeHandler.Width=Ширина
|
||||
nei.debug.RecipeHandler.ShowFavorites=Показувати обрані
|
||||
nei.debug.RecipeHandler.ShowOverlay=Показувати оверлеї
|
||||
nei.debug.RecipeHandler.ShowBadge=Показувати плашку
|
||||
nei.debug.RecipeHandler.AllowOverflowY=Дозволити вихід за межі Y
|
||||
nei.debug.RecipeHandler.AllowOverflowX=Дозволити вихід за межі X
|
||||
nei.debug.RecipeHandler.Override=Перевизначити
|
||||
nei.debug.RecipeHandler.checkbox.on=Увімк.
|
||||
nei.debug.RecipeHandler.checkbox.off=Вимк.
|
||||
nei.debug.RecipeHandler.yes=Так
|
||||
nei.debug.RecipeHandler.no=Ні
|
||||
nei.debug.RecipeHandler.reset=Скинути
|
||||
|
||||
nei.recipe.page=Сторінка %s/%s
|
||||
nei.recipe.tooltip=Рецепти
|
||||
nei.recipe.tab.view_all.tooltip=Переглянути всі категорії
|
||||
nei.recipe.search.tooltip.name=Синтаксис фільтрів
|
||||
nei.recipe.search.tooltip.shift=§7Утримуйте §6Shift§7 для детальнішої інформації
|
||||
nei.recipe.search.tooltip.input=%s§fтекст§8 - §7пошук в інгредієнтах
|
||||
nei.recipe.search.tooltip.output=%s§fтекст§8 - §7пошук у результатах
|
||||
nei.recipe.search.tooltip.prefix=%sтекст§8 - §7%s
|
||||
|
||||
nei.recipe.search.tooltip.prefix.modName=пошук за модом
|
||||
nei.recipe.search.tooltip.prefix.tooltip=пошук за підказкою
|
||||
nei.recipe.search.tooltip.prefix.oreDict=пошук за OreDict
|
||||
nei.recipe.search.tooltip.prefix.identifier=пошук за ID ресурсу
|
||||
nei.recipe.search.tooltip.prefix.subsets=пошук за підгрупами
|
||||
nei.recipe.search.tooltip.prefix.chemicalFormula=пошук за хімічною формулою
|
||||
|
||||
nei.recipe.search.tooltip.exclude=%s§fтекст§8 - §7виключити предмети, що містять текст
|
||||
nei.recipe.search.tooltip.exclude_recipe=%s§fтекст§8 - §7виключити рецепти, що містять текст
|
||||
nei.recipe.search.tooltip.or=§fa%s§fb§8 - §7пошук «a» або «b»
|
||||
nei.recipe.search.tooltip.exact=%s§fтекст%s§8 - §7збіг із точною фразою
|
||||
|
||||
nei.recipe.shaped=Формований крафт
|
||||
nei.recipe.shapeless=Безформний крафт
|
||||
nei.recipe.furnace=Витоплення
|
||||
nei.recipe.fuel=Паливо
|
||||
nei.recipe.fuel.smeltCount=Витоплює: %s
|
||||
|
||||
nei.recipe.badge.nc=NC
|
||||
nei.recipe.badge.nc.tooltip=Не витрачається у процесі
|
||||
|
||||
nei.recipe.badge.ncp=NC(P)
|
||||
nei.recipe.badge.ncp.tooltip=Враховується у паралельних обчисленнях, але не витрачається
|
||||
|
||||
nei.recipe.badge.chance.consume=Шанс витрачання: %s
|
||||
nei.recipe.badge.chance.output=Шанс отримання: %s
|
||||
|
||||
# Застаріле
|
||||
nei.recipe.fuel.required=Потрібно %s
|
||||
# Застаріле
|
||||
nei.recipe.fuel.processed=Оброблено %s
|
||||
# Застаріле
|
||||
nei.recipe.fuel.produced=Вироблено %s
|
||||
nei.recipe.firework=Феєрверки
|
||||
nei.recipe.firework.tooltip0=Барвники надають зарядам кольору
|
||||
nei.recipe.firework.tooltip1=Повторне фарбування додає заряду ефект згасання кольорів
|
||||
nei.recipe.firework.tooltip2=З одного феєрверку можна випустити кілька зарядів
|
||||
nei.recipe.repair=Ремонт
|
||||
nei.recipe.brewing=Зіллєваріння
|
||||
nei.recipe.profiler.crafting=Профілювання крафту
|
||||
nei.recipe.profiler.usage=Профілювання використання
|
||||
nei.recipe.concurrent.usage=Паралельне використання — Всього
|
||||
nei.recipe.concurrent.crafting=Паралельний крафт — Всього
|
||||
nei.recipe.accepts=Приймає наступне
|
||||
nei.recipe.accepts.scroll=Змінити предмет
|
||||
|
||||
nei.recipe.overlay=Накладання рецепта
|
||||
nei.recipe.overlay.missing=Відсутнє наступне
|
||||
nei.recipe.overlay.mismatch=Невідповідність сітці крафту
|
||||
nei.recipe.overlay.overlayRecipe=Накласти рецепт
|
||||
nei.recipe.overlay.fillCraftingGrid=Заповнити сітку крафту
|
||||
nei.recipe.overlay.bookmarkRecipe=Зберегти з рецептом
|
||||
nei.recipe.overlay.bookmarkRecipeAndCount=Зберегти з рецептом і кількістю
|
||||
nei.recipe.overlay.sendRecipeToChat=Надіслати рецепт у чат
|
||||
|
||||
nei.recipe.favorite=Обране
|
||||
nei.recipe.favorite.bookmark_recipe=Зберегти дерево рецептів
|
||||
nei.recipe.favorite.change_result_index=Змінити результат
|
||||
nei.recipe.favorite.toggle=Перемикнути обране
|
||||
|
||||
nei.recipe.information=Інформація
|
||||
|
||||
nei.itemsort.minecraft=Minecraft
|
||||
nei.itemsort.minecraft.tip=Спочатку сортує предмети з ванільного Minecraft
|
||||
nei.itemsort.mod=Мод
|
||||
nei.itemsort.mod.tip=Групує предмети з одного моду, сортуючи за назвою моду
|
||||
nei.itemsort.id=ID предмета
|
||||
nei.itemsort.default=За замовчуванням
|
||||
nei.itemsort.default.tip=Залишає початковий порядок кожного предмета без змін
|
||||
nei.itemsort.damage=Пошкодження предмета
|
||||
nei.itemsort.name=Відображувана назва
|
||||
|
||||
nei.subsets.item.cheat=Видати предмет
|
||||
nei.subsets.item.search=Пошук за предметом
|
||||
nei.subsets.item.show=Показати предмет
|
||||
nei.subsets.item.hide=Приховати предмет
|
||||
nei.subsets.tag.search=Пошук за підгрупою
|
||||
nei.subsets.tag.onlythis=Показати лише цю підгрупу
|
||||
nei.subsets.tag.onlythis.key=Подвійне натискання ЛКМ
|
||||
nei.subsets.tag.show=Показати підгрупу
|
||||
nei.subsets.tag.hide=Приховати підгрупу
|
||||
|
||||
nei.subsets.Blocks=Блоки
|
||||
nei.subsets.Blocks.MobSpawners=Спавнери мобів
|
||||
nei.subsets.CreativeTabs=Вкладки творчості
|
||||
nei.subsets.Items=Предмети
|
||||
nei.subsets.Items.Armor=Обладунки
|
||||
nei.subsets.Items.Armor.Boots=Чоботи
|
||||
nei.subsets.Items.Armor.Chestplates=Нагрудники
|
||||
nei.subsets.Items.Armor.Helmets=Шоломи
|
||||
nei.subsets.Items.Armor.Leggings=Наголінники
|
||||
nei.subsets.Items.Food=Їжа
|
||||
nei.subsets.Items.Potions=Зілля
|
||||
nei.subsets.Items.Potions.Ingredients=Інгредієнти
|
||||
nei.subsets.Items.Potions.Negative=Негативні
|
||||
nei.subsets.Items.Potions.Neutral=Нейтральні
|
||||
nei.subsets.Items.Potions.Positive=Позитивні
|
||||
nei.subsets.Items.Potions.Splash=Вибухові
|
||||
nei.subsets.Items.Tools=Інструменти
|
||||
nei.subsets.Items.Tools.Axes=Сокири
|
||||
nei.subsets.Items.Tools.Hoes=Мотики
|
||||
nei.subsets.Items.Tools.Other=Інші
|
||||
nei.subsets.Items.Tools.Pickaxes=Кайла
|
||||
nei.subsets.Items.Tools.Shovels=Лопати
|
||||
nei.subsets.Items.Weapons=Зброя
|
||||
nei.subsets.Items.Weapons.Ranged=Дальнього бою
|
||||
nei.subsets.Items.Weapons.Swords=Мечі
|
||||
nei.subsets.Untranslated=Оригінальні
|
||||
nei.subsets.Favorites=Обрані
|
||||
nei.subsets.Favorites.Manual=Додані вручну
|
||||
nei.subsets.Favorites.Generated=Автоматично
|
||||
nei.subsets.Mod=Мод
|
||||
|
||||
nei.presets.new=Новий пресет
|
||||
nei.presets.toggle=Перемикнути пресети
|
||||
nei.presets.create=Створити пресет
|
||||
nei.presets.update=Оновити пресет
|
||||
nei.presets.enabled=Увімкнено
|
||||
nei.presets.filter=F
|
||||
nei.presets.filter.tip=Приховати предмети з інших активних пресетів
|
||||
nei.presets.name=Назва пресета
|
||||
nei.presets.mode=Режим
|
||||
nei.presets.mode.hide=Приховати
|
||||
nei.presets.mode.hide.char=H
|
||||
nei.presets.mode.hide.tip=Приховати предмети на панелі
|
||||
nei.presets.mode.subset=Підгрупа
|
||||
nei.presets.mode.subset.char=S
|
||||
nei.presets.mode.subset.tip=Створити власні підгрупи
|
||||
nei.presets.mode.remove=Видалити
|
||||
nei.presets.mode.remove.tip=Приховати предмети на панелі та їхні рецепти
|
||||
nei.presets.mode.remove.char=R
|
||||
nei.presets.mode.group=Група
|
||||
nei.presets.mode.group.tip=Створити власну групу предметів, що згортаються
|
||||
nei.presets.mode.group.char=G
|
||||
|
||||
nei.itemzoom.toggle=Використовуйте %s для перемикання наближення предметів
|
||||
@@ -88,7 +88,7 @@ nei.options.wbutton.tip.1=覆写全局设置
|
||||
|
||||
nei.options.keys=按键绑定
|
||||
nei.options.keys.showenchant=显示附魔值
|
||||
nei.options.keys.gui=物品栏
|
||||
nei.options.keys.gui=NEI 物品栏
|
||||
nei.options.keys.recipe.recipe=查看合成
|
||||
nei.options.keys.recipe.usage=查看用途
|
||||
nei.options.keys.gui.enchant=附魔
|
||||
@@ -110,7 +110,7 @@ nei.options.keys.gui.getnextsearch=下一个搜索
|
||||
nei.options.keys.copy.name=复制物品名称 (Ctrl +)
|
||||
nei.options.keys.copy.oredict=复制物品矿词词典 (Ctrl +)
|
||||
nei.options.keys.copy.identifier=复制物品ID (Ctrl +)
|
||||
nei.options.keys.world=世界
|
||||
nei.options.keys.world=NEI 世界
|
||||
nei.options.keys.world.chunkoverlay=区块(chunks)边界显示
|
||||
nei.options.keys.world.moboverlay=刷怪区域显示
|
||||
nei.options.keys.world.highlight_tips=显示选中方块名称
|
||||
|
||||
@@ -58,7 +58,7 @@ nei.options.wbutton.tip.0=使用全局設定
|
||||
nei.options.wbutton.tip.1=覆蓋全局設定
|
||||
|
||||
nei.options.keys=按鍵設定
|
||||
nei.options.keys.gui=物品欄
|
||||
nei.options.keys.gui=NEI 物品欄
|
||||
nei.options.keys.recipe.recipe=合成表
|
||||
nei.options.keys.recipe.usage=用途
|
||||
nei.options.keys.gui.enchant=附魔
|
||||
@@ -68,7 +68,7 @@ nei.options.keys.gui.prev=上一頁
|
||||
nei.options.keys.gui.next=下一頁
|
||||
nei.options.keys.gui.hide=隱藏/顯示NEI界面
|
||||
nei.options.keys.gui.search=焦點搜索欄
|
||||
nei.options.keys.world=世界
|
||||
nei.options.keys.world=NEI 世界
|
||||
nei.options.keys.world.chunkoverlay=區塊邊界顯示
|
||||
nei.options.keys.world.moboverlay=怪物生成區域顯示
|
||||
nei.options.keys.world.highlight_tips=高亮工具提示
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 1.3 KiB |
@@ -0,0 +1,58 @@
|
||||
package codechicken.nei;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.times;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.gui.inventory.GuiContainer;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
public class ItemsGridTest {
|
||||
|
||||
@Test
|
||||
void synchronizesOverlapAndCaptureRefresh() {
|
||||
TestGrid grid = new TestGrid();
|
||||
ItemsGrid.ScreenCapture capture = mock(ItemsGrid.ScreenCapture.class);
|
||||
grid.screenCapture = capture;
|
||||
|
||||
grid.setGridSize(1, 2, 18, 18);
|
||||
grid.setGridSize(1, 2, 18, 18);
|
||||
verify(capture, times(1)).refreshBuffer();
|
||||
|
||||
when(capture.needRefresh(1)).thenReturn(false, true);
|
||||
grid.refresh(null);
|
||||
grid.refresh(null);
|
||||
assertEquals(1, grid.overlapRefreshes);
|
||||
}
|
||||
|
||||
private static final class TestGrid extends ItemsGrid<ItemsGrid.ItemsGridSlot, ItemsGrid.MouseContext> {
|
||||
|
||||
private int overlapRefreshes;
|
||||
|
||||
@Override
|
||||
protected int getGridRenderingCacheMode() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void updateGuiOverlapSlots(GuiContainer gui) {
|
||||
overlapRefreshes++;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<ItemsGrid.ItemsGridSlot> getMask() {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected ItemsGrid.MouseContext getMouseContext(int mousex, int mousey) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
package codechicken.nei;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
import static org.mockito.Mockito.mock;
|
||||
|
||||
import net.minecraft.client.renderer.InventoryEffectRenderer;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
public class NEIPotionGuiHandlerTest {
|
||||
|
||||
@Test
|
||||
void preservesGapsBetweenPotionBoxes() {
|
||||
assertTrue(NEIPotionGuiHandler.intersectsPotionEffects(131, 1, 100, 2, 33));
|
||||
assertFalse(NEIPotionGuiHandler.intersectsPotionEffects(132, 1, 100, 2, 33));
|
||||
}
|
||||
|
||||
@Test
|
||||
void skipsConfigLookupOutsidePotionColumn() {
|
||||
InventoryEffectRenderer gui = mock(InventoryEffectRenderer.class);
|
||||
gui.guiLeft = 200;
|
||||
|
||||
assertFalse(new NEIPotionGuiHandler().hideItemPanelSlot(gui, 216, 100, 1, 1));
|
||||
}
|
||||
}
|
||||
Loaded 100 of 102 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user