Commit Graph
451 Commits
Author SHA1 Message Date
Martin Robertz 9ff65a4fce Merge remote-tracking branch 'origin/quartz_tank_cell_fix' into dev 1.1.12-gtnh-pre 2023-04-30 17:13:34 +02:00
Firenoo 39e245b488 Fix FluidContainerRegistry interactions w/ Certus Quart Tank
The Certus Quartz Tank previously did not consider the
FluidContainerRegistry API for fluid containers, so fluid containers
that implemented that (like ic2 cells) were voided when filling the
tank.

Signed-off-by: Firenoo <[email protected]>
2023-04-30 08:02:06 -07:00
Martin Robertz 273c91b816 Merge remote-tracking branch 'origin/cell_workbench' into dev 1.1.11-gtnh-pre 2023-04-30 11:47:33 +02:00
Martin Robertz acfdd9087c Merge remote-tracking branch 'origin/export_fix_a' into dev 2023-04-30 11:47:14 +02:00
Firenoo 54bdeabd99 Allow all 63 partition items to be used for fluid cells
Previously, only one partition item was allowed. This fix will have
the cell consider all 63 slots. If you configure more than 1 or 5
cell slots, it works as expected - up to 1 or 5 of the whitelisted
fluids can be stored at a time.

This will degrade performance slightly.

Signed-off-by: Firenoo <[email protected]>
2023-04-29 20:46:52 -07:00
Firenoo df045ec1a8 Fix fluid export bus voiding fluids on crafting only mode
The Fluid Export Bus was voiding fluids on craft only mode because it
tried to craft it, and decided to continue with the normal export logic:
Extract fluid from ME system and fill the tank.

Unfortunately, there was a condition that prevented the extracted fluid
from going anywhere depending on craft only mode, so it got voided.

Commit fixes this by skipping the normal extract logic if set to craft
only. It also removes fluid simulation (we will see if they were actually
needed. Initial tests indicate no), which should improve performance by
a little bit.

Signed-off-by: Firenoo <[email protected]>
2023-04-29 19:59:03 -07:00
Martin Robertz 4e1983b87f Merge remote-tracking branch 'origin/byebyeEC2' into dev 1.1.10-gtnh-pre 2023-04-29 20:14:07 +02:00
firenoo 77ec41812d Add null check for tanks (#118)
* Add null check for tanks

Some IFluidHandlers return null for getTankInfo(), so a null check is needed.

* spotless apply
1.1.9-gtnh
2023-04-28 19:19:53 +02:00
Firenoo 50c4015d54 apply spotless
too lazy to rebase
2023-04-28 10:01:34 -07:00
Firenoo b7b68515f1 Add more tooltip help and cell handler for void cell 2023-04-28 10:01:34 -07:00
Firenoo 3245de6ba1 Add handlers for deprecated item cells
Now the placeholder should work automatically in a drive.

The void cell is still a WIP.
2023-04-28 10:01:33 -07:00
Firenoo 3e2a0482e9 Fixed some storage cell conversion issues
The placeholders did not transfer NBT data properly
2023-04-28 10:01:33 -07:00
Firenoo 6b9e500655 Finish basic item replacement code
- parts work
- items are remapped properly, and converted when they enter the player inventory
2023-04-28 10:01:32 -07:00
Firenoo 709805b4c6 API changes to make room for Extra Cells fluid placeholder 2023-04-28 10:01:32 -07:00
Firenoo bfaec12011 set config "replaceEC2" to default true 2023-04-28 10:01:32 -07:00
Firenoo 7ad5b9d297 EC2 Deprecation: Part 3 - Parts
Parts are deprecated.
2023-04-28 10:01:31 -07:00
Firenoo 68c0abba95 EC2 deprecation: Part 2 - Blocks 2023-04-28 10:01:31 -07:00
Firenoo 682489de18 EC2 deprecation: Part 1 - Items
Laying the groundwork for absorbing EC2 mappings.
2023-04-28 10:01:28 -07:00
Martin Robertz 258465a654 fix (#117) 1.1.8-gtnh 2023-04-26 22:38:09 +02:00
Martin Robertz adbc077736 Update dependencies.gradle 2023-04-26 22:13:49 +02:00
Martin Robertz adf317d6a1 update dep file 2023-04-26 21:36:16 +02:00
firenoo 508f6e5d64 Add null check when determining potential tanks to import (#116)
It seems that implementers of IFluidHandler sometimes return null
in `getTankInfo()`, so this adds a check for that before doing the
bus work.
2023-04-26 21:14:40 +02:00
firenoo c174db3f15 Fix fluid terminal interactions (#111)
Now the math is properly calculated.
1.1.7-gtnh
2023-04-01 14:54:48 +02:00
firenooandMartin Robertz e1b3f20078 Network throttle: Force ME update packets to be sent once every N ms. (#110)
* Network throttle: Force ME update packets to be sent once every 50ms.

1. Item and fluid packets are separated to their own classes, as they are
not even allowed to be mixed together in the first place. This will enforce a strict
separation of the two.

2. New network worker thread for handling ME inventory updates. Instead of
creating packets directly, classes should schedule packet(s) to be sent at the
next 50ms boundary. The packet has a limit of 256 items to prevent killing the
client, but this can be changed in the config. In fact, the packet send rate is
also configurable.

3. Upon opening a terminal GUI, ME update packets are split. Only the last received
packet will trigger a terminal sorting, so if the ME system is large, it may take
several seconds (!) to load all the items.

* Update SPacketMEFluidInvUpdate.java

---------

Co-authored-by: Martin Robertz <[email protected]>
2023-04-01 14:04:39 +02:00
chochem 54781c290e quantum fluid fix (#114) 2023-03-30 22:21:00 +02:00
firenoo 9c2ef02383 Split packets when sending items over network (#107)
Packets are now split into smaller chunks when sent. The packet
size is adjustable in the config.
1.1.2-gtnh 1.1.4-gtnh-pre
2023-03-23 17:14:14 +01:00
Raven Szewczyk 6a244c12c4 Add unlocalized names to fluid drops&packets (#105)
Previously they were null.

Fixes <https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/12874>
1.1.0-gtnh
2023-03-14 21:04:56 +01:00
asdflj 399c5f53dd craft confirm screen add cpu select support (#99)
* craft confirm screen add cpu select support

* fix bug
1.0.95-gtnh
2023-03-13 12:58:20 +08:00
asdfljandRaven Szewczyk b9724d9369 fc terminal add type filter (#98)
* fc terminal add type filter

* Update dependencies.gradle

---------

Co-authored-by: Raven Szewczyk <[email protected]>
1.0.94-gtnh
2023-03-12 20:25:42 +01:00
Yang Xizhi c92f8bdd7c Merge pull request #103 from asdflj/recipe
fix fc pattern terminal shift click will use not support item to fill slot
1.0.92-gtnh
2023-03-07 12:41:05 +08:00
asdflj ab7769a45d add default method 2023-03-06 18:35:54 +08:00
asdflj d2c03bc903 fix fc pattern terminal shift click will use not support item to fill slot 2023-03-06 15:54:33 +08:00
Yang Xizhi e8664328ed Merge pull request #102 from asdflj/terminal
fix cant Take/Put items in Universal Terminal
1.0.91-gtnh
2023-03-04 13:10:41 +08:00
asdflj 84e395e470 fix cant Take/Put items in Universal Terminal 2023-03-04 08:36:21 +08:00
GlodBlock 0a01bb008b fix gl crash 1.0.90-gtnh 2023-03-03 20:27:02 +08:00
Yang Xizhi f73f79da7b Merge pull request #100 from asdflj/terminal
terminal does not update view
1.0.89-gtnh
2023-03-03 13:03:22 +08:00
asdflj 16f207ce80 terminal does not update view 2023-03-03 13:00:01 +08:00
GlodBlock 18f31ac3ef fix export bus exporting too much fluid 2023-03-02 16:46:35 +08:00
Yang Xizhi b205d3f53f Merge pull request #97 from asdflj/master
fluid packet decode add support to use conduit to export fluid
1.0.88-gtnh
2023-02-28 12:24:33 +08:00
asdflj 6505967826 add fluid packet check 2023-02-28 09:06:06 +08:00
asdflj 78e9291fc6 Certus Quartz Tank add waila support
fluid packet decode add support to use conduit to export fluid
2023-02-27 16:50:29 +08:00
Yang Xizhi 6c4e12e968 Merge pull request #96 from asdflj/master
fluid export bus add schedule mode
1.0.86-gtnh
2023-02-26 16:45:31 +08:00
asdflj ebf5a23ab9 fluid export bus add schedule mode 2023-02-26 10:46:55 +08:00
GlodBlock 161e38cbda fix fluid dupe from simulate drain 1.0.85-gtnh 2023-02-25 22:06:29 +08:00
Yang Xizhi 948dcdcbce Merge pull request #95 from asdflj/master
fix can't be display in network details
2023-02-25 20:42:39 +08:00
asdflj 0b99ba974f fixed renamer bug 2023-02-25 19:21:52 +08:00
asdflj 2407653e96 fix universal terminal infinity connect bug 2023-02-25 11:43:21 +08:00
asdflj acfb5b1d48 add universal terminal more tips 2023-02-24 16:30:39 +08:00
asdflj 232b64e819 fix Universal terminal patten mode recipe transfer to slot item stack size error 2023-02-24 11:16:54 +08:00
asdflj 7438c7075c fix can't be display in network details 2023-02-24 09:40:21 +08:00