aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/nei
AgeCommit message (Collapse)Author
2022-08-14do not cache result of GuiColors if the object is not short-lived (#1254)Glease
2022-08-13Fix mTierIndexes using an incorrect data structure causing ↵YannickMG
ArrayOutOfBoundException (#1244)
2022-08-12Added means of customizing GUI colors for resource packs (#1203)Albi
* Added means of customizing GUI colors through lang file * Color values are now stored in json file instead of the lang file * Made json only load upon resource reload and ensured server compatibility Co-authored-by: Martin Robertz <dream-master@gmx.net>
2022-08-09fix(warnings): remove broad wanings suppression (#1223)Léa Gris
* fix(warnings): remove broad wanings suppression This shell script was applied to remove all instances of `@SuppressWarnings("ALL")`: ```sh grep -lr '@SuppressWarnings([[:space:]]*"ALL"[[:space:]]*)' src/ | xargs -l1 \ sed -n -i.bak '/@SuppressWarnings([[:space:]]*"ALL"[[:space:]]*)/!p' ``` * nuke @SuppressWarnings("all") in GT_NEI_DefaultHandler Case insensitive: ```sh grep -lr '@SuppressWarnings([[:space:]]*"[Aa][Ll][Ll]"[[:space:]]*)' src/ | xargs -l1 \ sed -n -i.bak '/@SuppressWarnings([[:space:]]*"[Aa][Ll][Ll]"[[:space:]]*)/!p' find src -type f -name '*.bak' -delete ``` * fix(warnings): GT_NEI_DefaultHandler * fix(warnings): GT_Mod * fix(warnings): GT_Values * fix(warnings): Materials * fix(warnings): GT_BeeDefinition * fix(warnings): GT_PostLoad * fix(warnings): GT_Worldgenloader * fix(warnings): GT_PreLoad
2022-08-09Fix original voltage shows up when voltage is "unspecified" (#1228)miozune
* Fix original voltage shows up when voltage is "unspecified" * better check * move calculation
2022-08-05Show original voltage (configurable) and amperage when overclocked (#1204)miozune
2022-08-04Fix crash upon activating recipe stacktrace config (#1198)miozune
2022-07-30Expose some of the NEI methods and fields to addons (#1159)miozune
* Expose NEI description y offset so that large GUI from addons can fit in * more protected * more protected
2022-07-25Update NEI (#1158)miozune
2022-07-18Allow showing multiple recipe owners (#1136)miozune
2022-07-15Add recipe owner display (#1135)miozune
2022-07-10Add RecipeCatalyst for LAGT (#1119)miozune
2022-07-02Add IMC for NEI RecipeCatalyst (#1109)miozune
2022-06-26Re-added null check for null amperage from SteamPower (#1099)YannickMG
* Re-added null check for null amperage from SteamPower * Avoid re-building strings needlessly in drawDescription
2022-06-26fix nei (#1097)Yang Xizhi
2022-06-25NEI GUI Fix (#1095)Connor-Colenso
* Attempt 3 * Fix NEI Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
2022-06-23Plasma forge fixes (#1086)Connor-Colenso
* Basis of changes. * Fix item stack and fluid vanishing. * Add new plasma forge UI, change tooltip and fix recipe map. * Fix corrupted fluid registry. * Fix fluids in recipes. Items still need adjusting. * Working. * Liquid spacetime and rename multi to D.T.P.S. so it can fit in GUI properly. * Make animation of spacetime fluid slower. * Fix recipe map (again). * Remove screwdriver junk. Clean up code slightly. * More cleaning. * Comments * Add hatch limitations and add some additional information. Also update NEI GUI. * Add proper recipes and change SpaceTime to a fluid not a gas. * Remove depreciated coil check (since I stole the IDs). * Remove depreciated coil check (since I stole the IDs). Add more comments. * Change temp of SpaceTime. * Add catalyst recipes + support for 16:16 fusion recipes. * Add comments. * Scala fix maybe? * Change plasma forge GUI. * Uncap temperature of materials. (Short -> Int) * Add chunkloading support (when multi is active). * Fix NEI merge issues. * fix used ids in kevlar * Add fluid support for laser engraver. * fix sh***t (cherry picked from commit 01851c100c52fd8292028cf6dda2cb136c617afc) * Add new intermediate materials to facilitate crafting. Also fix fusion typo. * Fix heat/fluid quantity display to be formatted correctly. * Change recipes to be more balanced. * Change residue fluid texture. * Restore better naming for multiblock. * Fix recipe typo. * Fix text not wrapping in multi controller. * Give laser engraver internal fluid storage. * Add IMC NEI support. * Update material properties. * Remove old dev comments. * Fix NEI texture. * Update/fix plasma forge recipes. * Increase max hatch count. * Increase max hatch count and fix mixing energy hatches. Plus quick check for processing time. * Fix spacetime recipe. * Update spacetime textures and add new item textures. * Remove manual spacetime fluid addition. * Add custom fluid texture override ability. * Update infinity and spacetime to use new custom fluid override texture. * Depreciate old recipe adding methods. * Refactor GT NEI handler. * Remove unnecessary import. * Remove debug comment. * Clean up auto generated fluid code. * Fix NPE and add a few comments. * Refactor GT NEI handler. * Update NEI GUIs. * More NEI fixes. * Update LCR NEI GUI. * Update error message. Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Co-authored-by: Martin Robertz <dream-master@gmx.net>
2022-06-19Add Plasma Forge (Endgame multi) (#1076)Connor-Colenso
* Basis of changes. * Fix item stack and fluid vanishing. * Add new plasma forge UI, change tooltip and fix recipe map. * Fix corrupted fluid registry. * Fix fluids in recipes. Items still need adjusting. * Working. * Liquid spacetime and rename multi to D.T.P.S. so it can fit in GUI properly. * Make animation of spacetime fluid slower. * Fix recipe map (again). * Remove screwdriver junk. Clean up code slightly. * More cleaning. * Comments * Add hatch limitations and add some additional information. Also update NEI GUI. * Add proper recipes and change SpaceTime to a fluid not a gas. * Remove depreciated coil check (since I stole the IDs). * Remove depreciated coil check (since I stole the IDs). Add more comments. * Change temp of SpaceTime. * Add catalyst recipes + support for 16:16 fusion recipes. * Add comments. * Scala fix maybe? * Change plasma forge GUI. * Uncap temperature of materials. (Short -> Int) * Add chunkloading support (when multi is active). * Fix NEI merge issues. * fix used ids in kevlar * Add fluid support for laser engraver. * fix sh***t (cherry picked from commit 01851c100c52fd8292028cf6dda2cb136c617afc) * Add new intermediate materials to facilitate crafting. Also fix fusion typo. * Fix heat/fluid quantity display to be formatted correctly. * Change recipes to be more balanced. * Change residue fluid texture. * Restore better naming for multiblock. * Fix recipe typo. * Fix text not wrapping in multi controller. * Give laser engraver internal fluid storage. * Add IMC NEI support. * Update material properties. * Remove old dev comments. * Fix NEI texture. Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Co-authored-by: Martin Robertz <dream-master@gmx.net>
2022-06-10Adjust NEI recipe pages (#1077)Connor-Colenso
* Add config support for changes. * Change ticks config to default OFF. * Usage -> Voltage for some cases. Also fix language translations. * Remove comment. * Remove redundant null check. * Bring back null checks (crashes). Move config to client. Adjust priorities so that if OC is detected it will display usage instead of voltage. * Remove null checks again (but for realsies this time). * Add language localisation. * Update language localisation. Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
2022-06-04display fusion tier in nei (#1070)Yang Xizhi
* display fusion tier in nei * assign
2022-05-26Fix crash with multi amperage recipe & improve Mass Fabricator NEI (#1053)miozune
2022-04-07Disable generation of oredict equivalents for circuits in NEI if Custom ↵miozune
Diagram is loaded (#1003)
2022-03-18fix set locked fluid not working via drag n drop (#979)Glease
2022-02-28Fix cached recipes not updating permutations in NEI (#957)miozune
* Fix cached recipes not updating permutations in NEI * another cycle
2022-02-20Add default behavior for looking up NEI catalysts (#940)miozune
2022-02-04GT_RectHandler now relies on an interface (#916)YannickMG
and not specific class names
2022-02-03Basic Machine NEI Power Tiers (#914)YannickMG
* Add IntelliJ .shelf folder to .gitignore * Fixing GT_GuiTooltip bug I introduced * Deprecated superfluous String trans methods. * Add Power class to compute and describe power usage * trans -> GT_Utility.trans Removed absent param from Javadoc * Add Power to BasicMachine and use it for power calculations * Steam BasicMachine rework Have Bronze and Steel tier override Power with appropriate SteamPower Make Bronze machines explicitly tier 1 Make Steel machines explicitly tier 2 Defined recipe list and bricked status for each machine Unified checkRecipe uses machine's recipe list and Power * Raised NEI dependency to 2.2.5 * Defining NEI transfer rect in individual UIs Using a new interface called from GT_RectHandler * Code cleanup & minor refactor * Add power field to NEI Default Handler Add method to create Power object from the recipe map * Display power tier in NEI handler name * User Power to draw NEI Handler description * Enable filtering handler recipes using Power * Repurposing aBricked parameter into aHighPressure To fix my previous faulty method of setting mTier * Must call getCache to get recipes properly. * Better communicate NEI Overclock info
2022-01-31Fix incorrect sorted recipe list cachingGlease
2022-01-03Allow drag and drop from NEI to set output hatch locking (#845)Glease
* Allow drag and drop from NEI to set output hatch locking also cleaned up the output hatch networking code * Add not locked indicator
2021-10-21Restore sorting of recipes in NEID-Cysteine
Revert "Restore sorting of recipes in NEI" This reverts commit c7104eaeb2c6c2e94161436e3c7ecb5378cdc74a. Restore sorting of recipes in NEI
2021-10-18Further optimization to NEI lookupGlease
2021-10-18Cache sorted recipe list in NEI handlersGlease
2021-09-29Merge pull request #671 from D-Cysteine/experimentalMartin Robertz
Move assembly line NEI tab before all other GT NEI tabs
2021-09-28Support arbitrary ordering of NEI handlersD-Cysteine
2021-09-27Move assembly line NEI tab before all other GT NEI tabsD-Cysteine
2021-09-26use map instead of loop to get containersGlodBlock
2021-09-23allow NEI to search fluid for cellGlodBlock
2021-09-20Add voltage tier to assembly line NEI displayD-Cysteine
2021-08-15Fix accidentally deleted spaceD-Cysteine
2021-08-15Add number formatting for recipe special valueD-Cysteine
2021-08-07Also format recipe timeD-Cysteine
2021-08-07Add number formatting for tooltips & recipesD-Cysteine
2021-07-15Removed useless array creation in most #copy methods by changing them to ↵TimeConqueror
#copyOrNull variant with single parameter.
2021-06-29Sorts assline recipes by voltagePrometheus0000
2021-05-24feat(glow): iconset machines glow supportLéa Gris
- Add glow support for all sides and states of iconset machines (same as with basicmachines). Automated code cleanup with IDEA of: - Optiimise all imports (remove unused, sort) - Reorder all modifiers to the canonical preferred order (as stated in the Java Language Specification) - Add all missing @Override annotations
2021-01-18Merge branch 'experimental' into mitchej123_cleanupMartin Robertz
2021-01-17More removal of commented out code, small formatting adjustmentsJason Mitchell
2021-01-17Optionally hide assline recipes (defaults to false). Should have no impact ↵Jason Mitchell
on the ability to craft them.
2020-10-25Organize importGlease
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
2020-10-25Move the hide to proper place & use proper apiGlease
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>