upstream/NotEnoughItems
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/NotEnoughItems.git synced 2026-10-25 20:32:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
307 Commits 7 Branches 538 Tags
116b96f67b4e4975c5394f4646939bbbf652d3a5
Commit Graph
83 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Mitchell 116b96f67b maven publish buildscript update 2022-01-17 20:27:25 -08:00
Jason Mitchell 2d18dcf42b Small bug fixes 2022-01-04 21:46:46 -08:00
Jason Mitchell 0310b4177f * Change default max handlers to page to 1 
* Add bigger crafting table Handler Info
 2021-11-29 21:33:11 -08:00
Jason Mitchell 8ef7978044 Add toString() for PositionedStack 2021-08-08 11:56:59 -07:00
Jason Mitchell 37a571d878 Version bump 2021-05-23 09:55:18 -07:00
Jason Mitchell 5fdb5824df Fix crash with TC NEI & other handlers with null or short/empty getRecipeName() 2021-05-16 10:27:37 -07:00
Jason Mitchell a8919dcd95 Fixes 
* Handle NBTByte Arrays
* Update height for OC handlers
 2021-04-18 16:06:17 -07:00
Jason Mitchell a88a13e7cf Use a config file instead of a hardcoded list so modpacks can customize it. Defaults to BloodMagic "NEIAlchemyRecipeHandler" for non GTNH usage. 2021-04-13 20:54:11 -07:00
Jason Mitchell 8bdcf65250 Add the ability to force recipe/usage handlers to run in serial. Should fix the BM CME. 2021-04-13 20:54:11 -07:00
Jason Mitchell 2e786d1807 2.1.0-GTNH Release 2021-04-12 20:20:36 -07:00
Jason Mitchell 61d6525756 Extend the xor NBT NULL check for any items with a max stack of 1, which should also catch gt6 tools 2021-04-12 20:20:36 -07:00
Jason Mitchell 8790c7f541 Overlap Adjustment 
* (Hopefully) Properly handle ItemPanel overlap with multiple recipes on the page
 2021-04-12 20:20:36 -07:00
Jason Mitchell 461ac036df Backport Add ability to disable and invert inventory scroll transfer. https://github.com/TheCBProject/NotEnoughItems/commit/7943831c2a8898fd6805d39fba57397742ba37f9 2021-04-12 20:20:36 -07:00
Jason Mitchell d575de33fe IMCHandler 
* Add IMCHandler w/ `registerHandlerInfo` & `removeHandlerInfo` (NBT) message handling
 2021-04-12 20:20:36 -07:00
Jason Mitchell c3e35f8643 Make overlay handlers work with GT items 2021-04-12 20:20:36 -07:00
Jason Mitchell f94395f453 New mod support 
* Botania * Project E - Thanks to Glowredman
* TFC+ & Immersive Engineering - Thanks to FaceTorched
 2021-04-12 20:20:36 -07:00
Jason Mitchell 63d6d20c96 Beta13: 
* @Mod->item searching has been added using item subsets, allowing for things like `@Blocks.MobSpawners->zombie`
* DoubleFilteredFilter - Requires both filters to apply (Subset & Pattern)
* Finally updated the README.md
 2021-04-12 20:20:36 -07:00
Jason Mitchell 427793b41d Better subset layout fix 2021-04-12 20:20:36 -07:00
Jason Mitchell f6c59d7a18 Fix NPE during data dump 2021-04-12 20:20:36 -07:00
Jason Mitchell 0e3507de0a Hax to fix fluid tooltip rendering for forestry & ticon 2021-04-12 20:20:36 -07:00
Jason Mitchell 5bfbf250cc The subset dropdown now shows only when the bookmarks aren't visible (there isn't enough room for it otherwise). 2021-04-12 20:20:36 -07:00
Jason Mitchell c0be69f85f handler updates 2021-04-12 20:20:36 -07:00
Jason Mitchell 934eb26249 Overlay buttons visible again 2021-04-12 20:20:36 -07:00
Jason Mitchell 69ab51bd22 Hopefully fix backwards compat 
* Revert an unnecessary field movement
 2021-04-12 20:20:36 -07:00
Jason Mitchell b679b65beb Handler tweaks 
* Add GT6 handler info (Thanks @Miradae)
* Move afuels back to FurnaceHandler and statically reference it from TemplateRecipeHandler  **Should** fix #84
 2021-04-12 20:20:36 -07:00
Jason Mitchell 9a21acd283 Default HandlerInfo if it can't be found. 2021-04-12 20:20:36 -07:00
Jason Mitchell 429f2f36a9 Introduce HandlerInfo 
* Switch handler info loading from code to CSV
 * Add option to load from config or JAR
 * handlers.csv is still a WIP
 2021-04-12 20:20:36 -07:00
Jason Mitchell 509078da35 GUI Scaling 
* Recipe GUI now scales with window size, and displays more than 2 recipes per page, depending on height.
* Hacks to implement recipes per page, based on some assumptions since the height of the handlers are not exposed and are hardcoded
* _Temporarily_ disabled the overlay buttons; they were hardcoded to expect at most 2, need to make them dynamic and actually work again.
 2021-04-12 20:20:36 -07:00
Jason Mitchell 2162b43aa7 Reorg & restyle GuiRecipe to look a bit more like JEI 
Add gregtech hax to avoid overlapping
 2021-04-12 20:20:36 -07:00
Jason Mitchell 7c334d32c2 Shift everything instead of conditionally 2021-04-12 20:20:36 -07:00
Jason Mitchell 2ae5607a60 fixes beta3 2021-04-12 20:20:36 -07:00
Jason Mitchell 0f1333b308 Bugfixes 2021-04-12 20:20:36 -07:00
Jason Mitchell d645732eb3 Fix IOOBE. 2021-04-12 20:20:36 -07:00
Jason Mitchell 371337cf77 Angry Boubs 2021-04-12 20:20:36 -07:00
Jason Mitchell 4fb83ddea6 Add option to switch between JEI tab style and Creative tab style 2021-04-12 20:20:36 -07:00
Jason Mitchell 6279149b21 DrawableResource from JEI. Swap out tab & tab icon drawing. 2021-04-12 20:20:36 -07:00
Jason Mitchell c9bf943fb9 Fix crash on bookmark toggle 
Fixes #53
 2021-04-12 20:20:36 -07:00
Jason Mitchell 14a2dec34e JEI Style Tabs 2021-04-12 20:20:36 -07:00
Jason Mitchell 368a134f92 Prevent bookmarks from overlapping the armor slots on Creative+ mode 2021-04-12 20:20:36 -07:00
Jason Mitchell 68becd6fd6 Add bookmark toggle button. 
Switch config button to JEI style, and add ctrl+click to cycle recipe, utility, and cheat mode.
 2021-04-12 20:20:36 -07:00
Jason Mitchell fe83411c57 Enable bookmark panel hiding 2021-04-12 20:20:36 -07:00
Jason Mitchell 40ff91a908 Update build script and gradle 2021-04-12 20:20:36 -07:00
Jason Mitchell ca9c2a4052 Switch hiddenItems from synchronized to using a ReentrantReadWriteLock with a tryLock. 2021-02-20 21:19:18 -08:00
Jason Mitchell 34b9998ba3 Don't crash with divide by zero error 2021-02-14 15:42:22 -08:00
Jason Mitchell ebbfd349f2 Custom NBT <> JSON Encoder - Fix bookmark saving of items that require escaping 2021-02-14 10:10:53 -08:00
Jason Mitchell 3bb7b6722a Fixes thread starvation issue with parallelStream in findFuels() being called from within another parallelStream on the same ForkJoinPool 
Introduces a `findFuelsOnceParallel` that is called before the parallel recipe/usage handlers are run (which now call the non parallel version of findFuels())
 2021-01-30 12:38:45 -08:00
Jason Mitchell 03ede1773c Backwards Compat 
* Some mods (GC, for example) rely on FuelPair in FurnaceRecipeHandler so add it back as deprecated and switch to TemplateFuelPair
 2021-01-17 14:57:58 -08:00
Jason Mitchell f534b6ed0d Some reorganization and bugfixes 
* Moved findFuels to TemplateRecipeHandler and made it thread safe.
* Several for loops -> streams
* Slight refactor on Item Filtering.execute()
 2021-01-17 14:05:11 -08:00
Jason Mitchell 8c858b5842 Too many ingredients, and apparently an empty fuel? 2020-12-13 12:00:33 -08:00
Jason Mitchell e67e134726 Bump version 2020-05-30 09:57:07 -07:00
Jason Mitchell 5b35ce5575 Mark itemlist dirty after adjusting ItemInfo (hidden, overrides, etc). Should fix craft tweaker item hiding. 2020-05-30 09:57:07 -07:00
Jason Mitchell 5ddfdeafcc Bump version 2020-05-25 13:58:45 -07:00
Jason Mitchell 2062a79a2a Gitignore and should be buildable 2020-05-25 13:54:38 -07:00
Jason Mitchell 23173070c9 lambda 2020-05-25 13:54:38 -07:00
Jason Mitchell 0311599a34 Whoops, it's ArithmeticException not NPE 2020-03-04 20:55:41 -08:00
Jason Mitchell 3bb594ba11 Handle NPE from GC 2020-03-04 16:39:23 -08:00
Jason Mitchell 4b2f944617 promote to non beta 2020-02-22 20:04:28 -08:00
Jason Mitchell 8db8fa1b72 Adjust cheat button alignment with bookmark previous button 2020-02-22 20:04:01 -08:00
Jason Mitchell 10c2326184 Fix the underlying problem -- Bad X! 2020-02-04 20:11:17 -08:00
Jason Mitchell 4375a91220 bump version 2020-02-02 10:45:05 -08:00
Jason Mitchell bb7a9c51f7 Slightly better fix. 2020-02-02 10:44:48 -08:00
Jason Mitchell bb40acc7a3 Fix clicking on items in the bookmark panel. Thanks @monatann for contributing 2020-02-02 09:50:22 -08:00
Jason Mitchell abd1b38870 Avoid divide by zero error 2020-01-21 20:20:45 -08:00
Jason Mitchell 2c0292c3e7 Add back in ItemPanel.items as static 
* Fixes crash in ThermalDyanmics [probably]
 2020-01-20 09:42:39 -08:00
Jason Mitchell 3c5e180f9a Beta-1 2020-01-11 20:20:16 -08:00
Jason Mitchell bc1aa9e97e Stop running the LoadItem task on every inventory open (which also re-ran the search and caused lag on every inventory open). 
Unclear if this breaks anything -- it works with simple testing.
 2020-01-08 21:32:53 -08:00
Jason Mitchell 64ad0f826e Fix TCON workbench compat 2020-01-07 11:15:03 -08:00
Jason Mitchell 935a82d079 Save string ids instead of int ids. 2020-01-05 12:13:50 -08:00
Jason Mitchell 8364eaef6f Add hotkeys to move around recipes 2020-01-02 21:00:34 -08:00
Jason Mitchell 9359df3031 Workaround missing font renderer causing OptionTextField crash 2020-01-02 11:30:24 -08:00
Jason Mitchell 503d26dcdf Less final 2020-01-01 13:24:07 -08:00
Jason Mitchell 4b56f78b46 Pre allocate threadpool, with size of 2/3rds numProcessors 2020-01-01 11:14:02 -08:00
Jason Mitchell dad378e918 Update neimod.info 2019-12-31 15:27:31 -08:00
Jason Mitchell 05b5fa7baf Intellij suggested changes 2019-12-30 21:21:54 -08:00
Jason Mitchell e3462ac9c9 Fix AppleCore crash 2019-12-30 16:32:04 -08:00
Jason Mitchell f272e5942e Add JEI inspiration/backport attribution & license info 2019-12-30 14:41:56 -08:00
Jason Mitchell 6d9ff9ea0a Backport some JEI features 
* Licensed under LGPL
* Remove TMI style
* Remove Load/Save inventory state
* Reworked ItemPanel so it's no longer used statically
* BookmarkPanel inherits from ItemPanel
* Rework LayoutManager
* Bookmarks - including loading & saving
* Utility/Cheat buttons line up and wrap based on GUI size
 2019-12-30 14:32:55 -08:00
Jason Mitchell 5087a95e02 add GTNH to the version instead of just the filename 2019-06-14 21:53:09 -07:00
Jason Mitchell f54b36fc24 bump version and specify gtnh in filename 2019-06-14 21:27:21 -07:00
Jason Mitchell c87ba65f02 update gitignore 2019-06-14 21:24:14 -07:00
Jason Mitchell 8d27675b1a Update gradle wrapper 2019-06-14 21:23:02 -07:00
Jason Mitchell 195885d2b6 (Probably) Stop the ic2 invalid damage application messages. 2019-06-12 14:11:03 -07:00
Jason Mitchell 23888bd46d Prevent random crashes. No idea why this happens, but deal with it gracefully. 2019-06-12 14:10:36 -07:00