Commit Graph

2869 Commits

Author SHA1 Message Date
raoulvdberge
510595a6bc Added OR search operator to the Grid with "|", fixes #1759 2018-04-27 01:23:01 +02:00
raoulvdberge
24ff8d5bd3 Empty patterns can no longer be inserted in the pattern result slot in the Pattern Grid with hoppers, fixes #1761 2018-04-27 01:07:11 +02:00
tomKPZ
e85cda1b0a Allow crafters to be daisy-chained (#1740)
* Allow crafters to be daisy-chained

In crafting situations that require more than the 9 blocking patterns
that one crafter allows, the only solution is to duplicate the setup
to allow a second crafter.  This CL allows crafters to be
daisy-chained to provide a solution to this issue.

Also, since unlimited crafters can now be placed on a single
inventory, this eliminates the need to have multiple intermediate
inventories which then pipe into the desired inventory.  This also
improves the crafting manager UI as now those patterns can all be
listed under one "Furnace" instead of (potentially multiple) "Chest"s.

* Update crafting manager on crafter rotate

* Revert .gitignore change and fix crash

* Refactor

* Remove Set import

* Address comments
2018-04-24 07:34:56 +02:00
raoulvdberge
2aea6a761e Bump to 1.5.34 2018-04-23 17:40:41 +02:00
raoulvdberge
09714cc111 Crafter Manager misc fixes 2018-04-06 12:14:46 +02:00
raoulvdberge
7fca77193f Fixed Grid not always using all combinations when using JEI autocompletion 2018-04-06 11:31:46 +02:00
raoulvdberge
e3654fed56 Fix mouse tweaks interfering with Crafter Manager 2018-04-06 11:30:52 +02:00
raoulvdberge
f04bbb4669 Fixed crash when autocompleting Ender IO recipes from JEI, fixes #1735 2018-04-04 19:29:39 +02:00
raoulvdberge
cf6c66d42b Fixed model warning about Portable Grid, fixes #1723 2018-04-04 19:26:31 +02:00
raoulvdberge
5d78b87609 Fixes #1736 2018-04-04 19:16:53 +02:00
raoulvdberge
959134dd9e Fixes #1737 2018-04-04 19:13:08 +02:00
raoulvdberge
848d59bed8 Minor fix 2018-03-24 10:06:25 +01:00
raoulvdberge
84a7b3bd77 Further optimize Grid. Should fix #1719 2018-03-24 09:52:25 +01:00
raoulvdberge
9d09bd7d96 Patterns in the Crafter slots now automatically render the output without pressing shift 2018-03-19 20:22:06 +01:00
raoulvdberge
f287172ce9 Add nullable to pattern inventory getter for Reborn Storage 2018-03-19 16:33:03 +01:00
raoulvdberge
20c96b467f Allow grid filter searching in crafter manager and fix misc bugs 2018-03-19 15:33:55 +01:00
raoulvdberge
69227cad31 Change search of crafter manager to search for items instead of category 2018-03-19 13:58:35 +01:00
raoulvdberge
57c3f29e06 Change model of crafter manager and handle redstone mode 2018-03-19 13:34:12 +01:00
raoulvdberge
650d4d95e4 Fixed filter slots not caring about max stack size, fixes #1707 2018-03-18 13:10:24 +01:00
raoulvdberge
207d0e851e Prevent items moving while scrolling through slots with Inventory Sorter in the Crafter Manager 2018-03-18 11:45:55 +01:00
raoulvdberge
42ae53b61a Bring grid sorting performance back up to par with previous version and update changelog 2018-03-18 11:18:42 +01:00
raoulvdberge
5436af4c17 Assign slot limit to dummy crafter manager inventory 2018-03-17 23:13:25 +01:00
raoulvdberge
0d80759496 Fix some position bugs in crafter manager container and add model and recipe 2018-03-17 23:12:18 +01:00
raoulvdberge
992d868bf7 Move search field logic to another class so we can reuse it in the crafter manager 2018-03-17 20:41:59 +01:00
raoulvdberge
f90b4fcafe Move some things to a new package 2018-03-17 20:09:40 +01:00
raoulvdberge
210312f63f Support for invs that have more or less than 9 slots in Crafter Manager 2018-03-17 17:07:24 +01:00
raoulvdberge
b3afbab1ba Merge remote-tracking branch 'origin/mc1.12' into mc1.12 2018-03-17 15:48:17 +01:00
raoulvdberge
964a5c66ef Crafter manager 2018-03-17 15:48:01 +01:00
ineternet
727be6c6ec "Finished" check now considers the set IO mode (#1709)
* "Finished" check now considers the set IO mode

* Fixed behaviour, removed useless code

* oops, my branch wasnt up to date apparently

* forgot moving drive to output when full

* apparently wrong indentation

* Update NetworkNodeDiskManipulator.java

* changed format

* f o r m a t
2018-03-14 19:43:25 +01:00
raoulvdberge
e7b7c3052b Move reader writer logic to another class, crafting monitor update to crafting manager and use GuiBase.executeLater more 2018-03-14 10:22:17 +01:00
raoulvdberge
d6b5f15cb0 Make grid search history static and remove network from grid interface 2018-03-11 22:36:03 +01:00
raoulvdberge
e0d937e647 Rewrite grid synchronization and sorting code 2018-03-11 22:05:13 +01:00
raoulvdberge
183e5b9cbd Bump to 1.5.33 2018-03-11 21:46:14 +01:00
raoulvdberge
333935bd85 Fixed an autocrafting crash, fixes #1567 2018-03-08 21:38:47 +01:00
raoulvdberge
0b9c62c6c0 Remove konami code easter egg 2018-03-08 20:05:32 +01:00
raoulvdberge
f04645758a Fixed a crash when the Constructor tries to place a block when a multipart is attached to it, fixes #1648 2018-03-08 19:05:41 +01:00
raoulvdberge
1510e27dad Attempted to fix FPS drop on Grid sorting, fixes #1674 2018-03-08 18:46:26 +01:00
raoulvdberge
1bd2a44820 Fixed crafting event in Crafting Grid being fired twice, fixes #1685 2018-03-08 17:59:01 +01:00
raoulvdberge
98e7d485c0 Update changelog 2018-02-18 07:18:23 +01:00
TeamSpen210
cd8d71b0eb Fix orientations for Portable Grid, v2 (#1675)
* Remove BakedModelPortableGrid, and add proper camera transforms

* Add the correct on-ground transform, and tweak item frame scale

* Switch to hold Portable Grid more like a laptop
2018-02-18 07:15:46 +01:00
raoulvdberge
35b32fb636 Disk Manipulator in fluid mode will now extract a bucket at a time instead of 1 mB (or 64 buckets at a time with a Stack Upgrade instead of 64 mB), fixes #1650 2018-02-17 23:04:36 +01:00
ineternet
bc65285d41 Fix for #1147 (#1651)
* fixes #1147

Previously, the manipulator would stop and stuck on a disk when it isn't empty, but also cannot be emptied any more (network is full). This fixes this: If the network cannot accept any items anymore, the disk will be moved to output.

* Update CHANGELOG.md

* removed testing leftovers

* changed behaviour
2018-02-17 22:48:23 +01:00
ineternet
01266716da Interface NBT/Metadata check fix (updated) (#1646)
* fixes #1643

* Update CHANGELOG.md
2018-01-28 12:15:50 +01:00
ineternet
07628a5872 Stop fluid stacks from displaying "0" (#1630)
* Changed display logic of fluid stacks

Fluid stacks that contain less than one bucket (999mB or less) of fluid will now display "<1" instead of "0", for aesthetic purposes.

* Update CHANGELOG.md

* typo fix

* Changed to float display
2018-01-28 10:28:59 +01:00
raoulvdberge
7365964216 Fixed 2 same stacks using capabilities without NBT tag not treated equal, fixes #1606 2018-01-18 21:51:15 +01:00
raoulvdberge
688231cfc8 Fixed not being able to extract half a stack of items with max stack size 1 in Grid when using right click, fixes #1626 2018-01-18 21:18:12 +01:00
raoulvdberge
b24e054721 Move quantity formatter to API, fixes #1608 2018-01-09 20:25:02 +01:00
raoulvdberge
530f3c58bf Fixed fluid stack lists not using amount provided when inserting newly in list 2018-01-09 20:04:28 +01:00
ineternet
12cc9428ee Changed item quantity of a craftable item to 0 (#1613)
* Changed item quantity of a craftable item to 0

Whenever a system has none of a specific item but the ability to craft it, the grid saves the quantity as 1. Quantity sorting would make use of this and sort it alphabetically together with other quantity 1 items. This change should make quantity sorting think craftable items have a quantity of 0, making all of them appear behind itemstacks with the quantity 1 (or higher).

* Moving code logic to GridStackItem

* Update GridSortingQuantity.java

* Changed stack quantity logic

Craftable itemstacks remain stored as "1 item" internally. Other classes will be given the information that the stack is empty, though.

* Update CHANGELOG.md
2018-01-09 19:12:23 +01:00
ineternet
3d6ff79ada Fixed issue with pattern overwriting (#1610)
* Fixed issue with pattern overwriting

Pattern overwriting if the blank pattern (top slot in the pattern slots) slot was empty. Fixed this by only considering a recipe invalid if there are *absolutely no* patterns available, meaning none in top and none in bottom.

* Fixed a line

typo, sorry

* fixed patternAvailable, returned opposite

* Updated name to isPatternAvailable

* Added newest change to the changelog

Second line in the 1.5.32 version added.
2018-01-09 18:02:36 +01:00