upstream/NotEnoughItems
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/NotEnoughItems.git synced 2026-11-13 17:04:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
215 Commits 6 Branches 550 Tags
ca9c2a4052bc024f1624fbfff5985d40ca41fa28
Commit Graph
107 Commits
Author SHA1 Message Date
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
Glease 6fb48eaac4 Prevent NEIClientConfig being loaded too early 
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
 2021-02-02 23:56:42 +08:00
Glease fda24ff453 Add javadoc on what the patch does 
Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
 2021-01-30 13:27:25 -08:00
Glease 42445c61e7 Merge OreDictBandAid fix 
https://github.com/Glease/OreDictBandAid

Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
 2021-01-30 13:27:25 -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
David Lindström abfcdbb3f2 Highly experimental support for backing to BQ when coming from there 
This is a highly exprimental solution to backing out of NEI's recipe view back to whatever opened it, such as BetterQuesting. It seems highly likely that this will break something somewhere, but extremely quick testing did not find any such case.
 2020-09-03 03:39:30 +02:00
TataTawa 2fe5ad7275 Update NEIClientConfig.java 
This reduce server start time for about 1 min. Very helpful to GTNH ssp player.
 2020-07-29 08:03:43 +00: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 23173070c9 lambda 2020-05-25 13:54:38 -07:00
Balthild 4c37971a2b Reuse the ForkJoinPool in ItemList 2020-05-25 13:54:38 -07:00
Balthild 458947628c Add TaskProfiler back 2020-05-25 13:54:38 -07:00
Balthild 6e23c51868 Use a dedicated ForkJoinPool 2020-05-25 13:54:38 -07:00
Balthild c2acfb7d8a Parallelize recipe handlers 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 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 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 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 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 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 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
ganymedes01 9d37aeb07f Fix shift-clicking recipes with items that don't stack 
The old method didn't allow items that don't stack to be shift-clicked.
Since the method is (probably) used in other parts of the mod/by other mods, I thought that it would be better to make a new one to reproduce the wanted behaviour only in this instance.

Edit: I made the method protected just in case another mod wants to override it without much trouble (though I can't think of a reason why)
 2015-11-17 20:49:10 +00:00
Chicken-Bones aaa4cc123c Fix typo 2015-09-01 11:04:49 +10:00
Chicken-Bones e523e6c4e8 Added the ability to add variants to the item panel 2015-09-01 10:57:43 +10:00
mezz 956aabbbdf NBT when looking up by ingredient [1.7 branch] 
Should be the same as the last PR, but for the 1.7 branch.
 2015-08-19 21:17:56 -07:00
Chicken-Bones f1c7b134d9 Add additional brewing ingredient validity check 2015-06-14 15:33:28 +10:00
Chicken-Bones 115ad9e31a Some inventory stuff moved 2015-05-29 18:05:29 +10:00
ganymedes01 58bdc0b1a4 Use EntityPlayer sensitive version of getPickBlock 2015-05-27 11:57:25 -03:00
Chicken-Bones c42edf53cf Add try catch block to handle some implementation breaking subclasses of ShapelessRecipe 2015-05-11 11:57:28 +10:00
Chicken-Bones 46d7a84ecd Localise recipes tooltip 2015-04-26 04:39:53 +10:00
Chicken-Bones d59b28f8fc Localise all the things! 2015-04-25 23:41:18 +10:00
Chicken-Bones e99febf27c Add try/catch around item.getSubItems in creative tab subset loading 2015-04-24 19:05:09 +10:00
Chicken-Bones fbcd6692ed Add fontRenderer parameter 2015-04-24 18:52:02 +10:00