Commit Graph

3646 Commits

Author SHA1 Message Date
Darkere
c0836f20ed fix portablegrid deadlock (#2696)
* fix portablegrid deadlock

* fix using wrong interface

* only delay serverside code

* remove client side calls

* replace with boolean

* changelog

* typos
2020-10-03 23:48:32 +02:00
Darkere
17b153d8b5 Fixes to scrollingpr (#2695)
* fix UUID comparison

* prevent sorting when pressing ctrl as well

* fix missed change

* nullable

* Revert "prevent sorting when pressing ctrl as well"

This reverts commit b1e2932c

* improve if statements

* prevent sorting on ctrl
fix isEmpty

* remove middle mouse click extraction
2020-10-03 22:09:47 +02:00
raoulvdberge
a30205a541 Fix missing logic for portable item grid 2020-10-03 13:02:50 +02:00
raoulvdberge
41a1ce68a8 Fix JEI transitive dep 2020-10-03 13:02:41 +02:00
Darkere
cece473cfb Add scrolling to support to grid (#2409)
* add an onExtract Method for extracting without knowing the ID
onExtract now supports a preferred slot for insertion
onInsert now supports single

* add support for grid item movement via Scrolling

* add MouseTweaks Compatibility
fix item void bug

* Add scrolling to amount specifying screens

* fix reference and comment out mousetweaks integration

* fix missing import

* cleanup

* more cleanup

* changelog

* fix reqeusted changes

* fix method name
fix accidental formatting errors
2020-10-03 12:44:07 +02:00
raoulvdberge
1084450531 Mark as nullable. 2020-09-27 11:34:29 +02:00
raoulvdberge
f23e393494 Changed JEI transfer error mechanics 2020-09-27 11:34:02 +02:00
Darkere
52ee5d5469 fix controller crashing (#2684)
* fix controller crashing
fix consuming color without effect

* changelog
2020-09-26 20:28:13 +02:00
raoulvdberge
bbf10e7564 Bump to 1.9.7 2020-09-25 21:33:42 +02:00
raoulvdberge
288fa960e6 Remove TemporaryPortingUtils. 2020-09-25 21:17:05 +02:00
raoulvdberge
243bc5e7c1 Fix serverside issues. 2020-09-25 21:13:25 +02:00
raoulvdberge
09eab48fff Update changelog, fix bad logic. 2020-09-25 20:57:12 +02:00
Darkere
2c4ce13551 Show missing indicators in JEI (#2582)
* port #2330 to 1.15

* remove unecessary reflection

* rewrite JEI show missing and craftable items so that:
- clicking transfer button still works
- it is also shown for processing recipes
- also for fluids

* add missing method

* send Fluids with the ItemGridUpdateMessage

* port #2330 to 1.15

* remove unecessary reflection

* rewrite JEI show missing and craftable items so that:
- clicking transfer button still works
- it is also shown for processing recipes
- also for fluids

* add missing method

* send Fluids with the ItemGridUpdateMessage

* fix accidental lang duplication

* move lang key to appropriate location

* remove accidental changes to lang file

* port to 1.16 and cleanup

* remove fluids

* update translation to newer method.

* add being able to request autocrafting.

* remove unused variable

* formatting

* fix requested changes

Co-authored-by: Michael <mcpower@users.noreply.github.com>
2020-09-25 20:32:20 +02:00
raoulvdberge
1b4ebd3d20 Port to 1.16.3. 2020-09-25 20:31:56 +02:00
raoulvdberge
3e42134128 Update changelog, remove unused fields. 2020-09-25 00:48:17 +02:00
Darkere
14e63c07ca Colored Network Blocks (#2682)
* add color property to blocks

* add colors to almost all cutouts
add model generation for the blocks
add new models

* fix creative controller model
add item models

* fixed controller drops
fixed diskmanipulator item model

* added colored wireless antenna and detector
fixed sidedness in onBlockActivated

* cleanup

* remove wireless transmitter tooltip as it is no longer accurate

* Move Blocks and Items into DeferredRegistries

* fix issues and registration order

* formatting changes

* change colored blocks from blockstate to block

* fix some formatting

* remove files that can be generated.

* remove more files that can be generated.

* fix most requested changes

* remove string manipulation

* fix tag loop

* register colored variants last.

* fix datagen

* fix controller replacing TE

* add loottables and generation

* add dynamic translation for colored blocks

* readd missing files
delete generated file

* fix name, and recipe unlock triggers

* rename controller trigger

* set light_blue as default color
clean up displaynames

* refactor to avoid string manipulation in BlockModelGenerator

* Move Maps into custom class

* remove unused generic

* fix requested changes

* move recoloring from BlockUtils to ColorMap

* fix translation

* use getTranslatedName()

* fix relay,transmitter,receiver item models
fix controller and crafter loottables
2020-09-25 00:02:16 +02:00
Darkere
f7870b6611 Move Items and Block registration to DeferredRegistries (#2678)
* remove wireless transmitter tooltip as it is no longer accurate

* Move Blocks and Items into DeferredRegistries

* fix issues and registration order

* formatting changes
2020-09-21 13:29:01 +02:00
raoulvdberge
aba679a6b0 Added client config option to remember the Grid search query. Fixes #2642 2020-09-12 00:14:55 +02:00
raoulvdberge
d6c801baf8 Check volatiles. Fixed Portable Grid losing enchantments when placing and breaking. 2020-09-11 23:07:47 +02:00
raoulvdberge
21639a4e8e Bump to 1.9.6 2020-09-11 22:38:28 +02:00
raoulvdberge
06b5d5b0fd Add changelog for 1.9.2b 2020-09-11 22:33:27 +02:00
raoulvdberge
ccc6267662 Added autocrafting cancel commands. 2020-09-05 21:55:56 +02:00
raoulvdberge
6768aa1bbf Implement autocrafting list and get command 2020-09-05 21:38:35 +02:00
raoulvdberge
494ac95737 Package change. 2020-09-05 18:51:44 +02:00
raoulvdberge
71c054aa96 Added network commands. 2020-09-05 18:37:01 +02:00
raoulvdberge
7d697746e2 Fixed text field not being focused in amount specifying screens. 2020-09-05 17:44:38 +02:00
raoulvdberge
6bed059e95 Added a disk list command that can give disks of an owner as well. 2020-09-05 17:39:41 +02:00
raoulvdberge
be91d5ba93 Re-implemented the /refinedstorage createdisk command. 2020-09-05 16:38:15 +02:00
raoulvdberge
c621a16ab3 Added JEI ghost ingredient dragging support. 2020-09-05 15:36:09 +02:00
raoulvdberge
cbf6a22b2f Cleanup SideButton a bit. 2020-09-05 15:14:09 +02:00
raoulvdberge
8c84e703c1 Fix more deprecations. 2020-09-05 14:39:03 +02:00
raoulvdberge
d3818bcb98 Fix some deprecations and some formatting fixes. 2020-09-05 14:36:43 +02:00
raoulvdberge
dcbf838c70 Bump to 1.9.5 2020-08-30 20:11:48 +02:00
Darkere
d9d5616469 Allow addons to extend GridBlock (#2666)
* create GridBlocks with static initializer

* Make constructor take RL instead.
2020-08-30 19:48:49 +02:00
raoulvdberge
9f2fab67a5 typo 2020-08-30 19:47:09 +02:00
raoulvdberge
4f8b0b007f Fixes JEI recipes/usages keys not working in Grids 2020-08-30 19:46:47 +02:00
raoulvdberge
6caed1534a Bump to 1.9.4 2020-08-30 19:40:15 +02:00
raoulvdberge
5ed3e1b670 Let's not wait for Forge... 2020-08-24 22:23:12 +02:00
raoulvdberge
1fb12e81da Fix drawTooltipWithSmallText 2020-08-23 20:27:00 +02:00
raoulvdberge
37953472e3 Initial 1.16.2 port 2020-08-23 20:24:11 +02:00
raoulvdberge
310af6bd27 Update changelog. 2020-07-27 22:01:28 +02:00
ForFunPenguin
14232b0140 Update zh_tw.json to 1.9.1 (#2616)
* Update zh_tw.json to 1.9.1

* Update zh_tw.json
2020-07-27 22:00:01 +02:00
Darkere
67b0fa2d02 fix more ConstructorNetworkNode duping (#2633) 2020-07-27 21:59:26 +02:00
a2y4
1b2348b022 Update ja_jp.json (#2634) 2020-07-27 21:59:09 +02:00
Raoul
df458e64c6 Autocrafting refactor (#2625)
* Extract some methods to other classes to reduce LOC, rename Craft/Crafting/Processing.

* Remove CraftingTaskState as it's unused.

* Move creation of preview elements.

* Move creation of monitor elements.

* Move node management.

* Move recipe node update.

* Move processing node update.

* Clean up List<Pair<NonNullList<ItemStack>, Integer>> mess.

* Introduce CraftingPreviewInfo

* CraftingTask#calculate returns non-null value now

* Split calculate method up some more.

* Rename nodes a bit for readability.

* Make sure that no CraftingTask instance exists that has missing items.

* More cleanup.

* More cleanup.

* Rename some stuff.

* Introduce a NodeListener.

* Improve ProcessingNode a bit.

* Improve some naming.

* Add missing doc

* Merge PossibleInputs.

* Fix breaking out of wrong loop.

* Remove crafting pattern chain stuff and fix forgotten changes to IoUtil calls.
2020-07-22 19:29:58 +02:00
raoulvdberge
b72a19942f Bump to 1.9.3 2020-07-17 20:19:18 +02:00
raoulvdberge
812016f973 Fixed autocrafting being able to load chunks. 2020-07-17 03:54:37 +02:00
raoulvdberge
4edda54276 Fixed Crafting Tweaks buttons being in the wrong position after changing the size configuration of the Grid. Fixes #2348 2020-07-17 03:39:40 +02:00
raoulvdberge
1c47c57b82 Fixed Network Transmitters being able to connect to any network device. Fixes #2440 2020-07-17 03:27:20 +02:00
raoulvdberge
dbf77e1d46 Re-added MouseTweaks & Crafting Tweaks integration. 2020-07-17 03:20:47 +02:00