Commit Graph
244 Commits
Author SHA1 Message Date
Jason Mitchell 38995885dd Better subset layout fix 2021-04-10 10:45:07 -07:00
Jason Mitchell d6c4bec3e0 Fix NPE during data dump 2.1.0-GTNH-beta12 2021-04-10 10:06:26 -07:00
Jason Mitchell a28acf5ac2 Hax to fix fluid tooltip rendering for forestry & ticon 2.1.0-GTNH-beta11 2021-04-04 11:23:24 -07:00
Jason Mitchell c479b3c591 The subset dropdown now shows only when the bookmarks aren't visible (there isn't enough room for it otherwise). 2021-04-03 22:56:15 -07:00
Jason Mitchell 0a6fac8300 handler updates 2021-04-03 13:36:37 -07:00
Jason Mitchell ecf45c56f8 Overlay buttons visible again 2.1.0-GTNH-beta9 2021-03-30 00:29:50 -07:00
Jason Mitchell f67ddeecc4 Hopefully fix backwards compat
* Revert an unnecessary field movement
2021-03-28 12:01:40 -07:00
Jason Mitchell 237c96e7e5 Handler tweaks
* Add GT6 handler info (Thanks @Miradae)
* Move afuels back to FurnaceHandler and statically reference it from TemplateRecipeHandler  **Should** fix #84
2021-03-28 11:04:50 -07:00
Jason Mitchell c12775bb06 Default HandlerInfo if it can't be found. 2021-03-28 10:12:21 -07:00
Jason Mitchell 4dfc4f86bf Introduce HandlerInfo
* Switch handler info loading from code to CSV
 * Add option to load from config or JAR
 * handlers.csv is still a WIP
2.1.0-GTNH-beta6
2021-03-28 00:12:17 -07:00
Jason Mitchell f0e09e2b0d 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.
2.1.0-GTNH-beta5
2021-03-27 13:26:11 -07:00
Prometheus0000 5d82f0af54 Fixes some handler bugs (#73)
* Fixes some handler images
* Fixed some handlers not having the right image or being in the right section

Basically just GT/BW/GT++. I also added some spaces to look nicer, and reorganized the GT/BW/GT++ a little.
2021-03-26 17:03:06 -07:00
Jason Mitchell 4c36d0625e Reorg & restyle GuiRecipe to look a bit more like JEI
Add gregtech hax to avoid overlapping
2.1.0-GTNH-beta4
2021-03-24 21:12:18 -07:00
Jason Mitchell 5bfcc73459 Shift everything instead of conditionally 2021-03-24 18:23:30 -07:00
Lex bc1dd44c41 shift of the bookmark border 2021-03-24 18:20:20 -07:00
Jason Mitchell d2de8af64c fixes beta3 2.1.0-GTNH-beta3 2021-03-24 17:49:24 -07:00
Jason Mitchell af50881c6e Bugfixes 2.1.0-GTNH-beta2 2021-03-23 23:34:05 -07:00
Jason Mitchell c971199bd1 Fix IOOBE. 2021-03-23 21:59:40 -07:00
Jason Mitchell 146e882229 Angry Boubs 2021-03-22 21:20:48 -07:00
Jason Mitchell baa0a8962b Add option to switch between JEI tab style and Creative tab style 2021-03-22 20:22:00 -07:00
Léa Gris 400f38d919 impr(tab): user creative inventory tab asset and layout
This allow proprely textured GUI without the need to update a resourcepack.
2021-03-22 19:02:42 -07:00
Jason Mitchell 07ec5f67c5 DrawableResource from JEI. Swap out tab & tab icon drawing. 2021-03-21 21:43:37 -07:00
Léa Gris 79b5da1d1a refactor: override draw with correct signature 2021-03-21 19:39:12 -07:00
Jason Mitchell aa13ba7781 Fix crash on bookmark toggle
Fixes #53
2021-03-21 09:32:03 -07:00
Jason Mitchell 966e404218 JEI Style Tabs 2.1.0-GTNH-beta 2021-03-20 22:38:46 -07:00
Jason Mitchell b64d3a8be4 Prevent bookmarks from overlapping the armor slots on Creative+ mode 2021-03-20 16:43:24 -07:00
Jason Mitchell 34b8af475d Add bookmark toggle button.
Switch config button to JEI style, and add ctrl+click to cycle recipe, utility, and cheat mode.
2021-03-15 23:01:07 -07:00
Jason Mitchell b298f3961a Enable bookmark panel hiding 2021-03-14 12:22:27 -07:00
Jason Mitchell 2804698e71 Update build script and gradle 2021-03-14 10:24:58 -07:00
Jason Mitchell ca9c2a4052 Switch hiddenItems from synchronized to using a ReentrantReadWriteLock with a tryLock. 2.0.11-GTNH 2021-02-20 21:19:18 -08:00
Jason Mitchell 34b9998ba3 Don't crash with divide by zero error 2.0.10-GTNH 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
Martin Robertz 127f422e39 Update build.properties 2.0.9-GTNH 2021-02-02 18:07:13 +01:00
Martin Robertz 3f3ce46301 Merge pull request #38 from GTNewHorizons/classloading-order-fix
Prevent NEIClientConfig being loaded too early
2021-02-02 18:06:53 +01:00
Glease 6fb48eaac4 Prevent NEIClientConfig being loaded too early
Signed-off-by: Glease <[email protected]>
2021-02-02 23:56:42 +08:00
Glease fda24ff453 Add javadoc on what the patch does
Signed-off-by: Glease <[email protected]>
2.0.8-GTNH
2021-01-30 13:27:25 -08:00
Glease 42445c61e7 Merge OreDictBandAid fix
https://github.com/Glease/OreDictBandAid

Signed-off-by: Glease <[email protected]>
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
Martin Robertz 7cfa4ae4ca Merge pull request #31 from GTNewHorizons/small_bug_fixes
Too many ingredients, and apparently an empty fuel?
2.0.6-GTNH
2020-12-13 22:47:08 +01:00
Jason Mitchell 8c858b5842 Too many ingredients, and apparently an empty fuel? 2020-12-13 12:00:33 -08:00
DreamMasterXXL 6734326ec9 update(NEI)bump version 2.0.5-GTNH 2020-09-20 20:13:11 +02:00
Martin Robertz 4dc5832d34 Merge pull request #28 from dvdmandt/master
[NEEDS CAREFUL REVIEW] Highly experimental support for backing to BetterQuesting from recipe view
2020-09-03 11:25:07 +02: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
Martin Robertz 2fae9f0968 Merge pull request #27 from TataTawa/patch-1
Update NEIClientConfig.java
2020-08-01 09:56:14 +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 e67e134726 Bump version 2.0.4-GTNH 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
DreamMasterXXL a2d469b411 update gitignore 2.0.3-GTNH 2020-05-27 14:49:35 +02:00