Commit Graph
69 Commits
Author SHA1 Message Date
firenooandGitHub GTNH Actions c94876b02e Add the dual P2P interface (#139)
* Add the dual P2P interface

- Can be disabled in the config
- Updated dependencies
- We now require a hard inheritance dependency on beta-238+.
- CANNOT BE ATTUNED.

* Dependency cleanup (don't use pre)

* Fix dual interface background

* Fix null icon for p2p dual interface

BetterP2P needs this to properly display the icon.

* spotlessApply

---------

Co-authored-by: GitHub GTNH Actions <unknown>
2023-07-22 17:00:43 +02:00
chill d5b8ef6ea9 Code cleanup (#133)
* gradle updateBuildScript

* fix comments and commented-out code

Code deletion, converting comments into javadocs, and refactoring code to not
need comments.

* remove redundant suppressions

* replace C-style array declaration with Java-style

* make private field final

* remove unnecessary semicolon

* extract a common part from an if

* simplify boolean expression

* simplify ternary if

* remove unused imports

* convert escaped characters for clarity

* replace while with for

* replace explicit types with diamond operators

* replace anonymous type with lambda

* enable modern Java syntax

* migrate to enhanced switch

* migrate to pattern variables for instanceof

* remove empty javadoc

* add Nonnull annotation to overrides of Nonnull methods

* replace wailaStack with null

When wailaStack is not null, the flow breaks out of the loop,
so there's no need to confuse the reader with putting wailaStack
both as the result and the parameter of the call - there's no
recursion.

* int cannot be bigger than its max value

* suppress dataflow warning

* remove redundant initializer

The default value of int is 0.

* null check is covered by instanceof

* simplify some calls of addVertexWithUV

* fix typos and add TODOs

* make flipState more understandable
2023-06-18 23:29:57 +02:00
firenooGitHub GTNH Actionsgithub-actions[bot]
3da14b3bbe More ec2 mappings (#124)
* Replace ore dictionary bus

Extra Cells ore dict bus -> export bus w/ ore dict card
(retains ore filter setting, not verified they are 1:1)

* Add OpenComputer migration

Moves migration to postInit, and migrates OC upgrades.

* Remap wireless w/ correct encryption key + power

Basically now works without needing to relink in security term

* Update buildscript

* spotless apply

* spotlessApply (#125)

Co-authored-by: GitHub GTNH Actions <>

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2023-05-06 19:04:59 +02:00
firenoo d2df9beb31 Fix fluid export bus voiding fluids on crafting only mode (#120)
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.

The amount must be simulated before extracting from the ME system. This
helps prevent a scenario where we cannot insert the fluid back (such as
when we have a fluid storage bus on Extract Only).

Signed-off-by: Firenoo <49818773+firenoo@users.noreply.github.com>
2023-05-01 19:43:07 +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
asdfljandRaven Szewczyk b9724d9369 fc terminal add type filter (#98)
* fc terminal add type filter

* Update dependencies.gradle

---------

Co-authored-by: Raven Szewczyk <git@eigenraven.me>
2023-03-12 20:25:42 +01:00
GlodBlock 0a01bb008b fix gl crash 2023-03-03 20:27:02 +08:00
GlodBlock 18f31ac3ef fix export bus exporting too much fluid 2023-03-02 16:46:35 +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 2023-02-25 22:06:29 +08:00
asdflj bc053b2690 fix fluid storage bus crash 2023-02-20 18:19:47 +08:00
asdflj 09c1c49529 pattern terminal add auto fill blank pattern 2023-02-17 12:04:11 +08:00
GlodBlock f22bebbf21 wireless crafting terminal 2023-02-04 18:27:16 +08:00
GlodBlock 513af871aa wireless universal terminal 2023-02-03 22:38:33 +08:00
asdflj 5ea7f44058 Merge remote-tracking branch 'origin/bookmark' into bookmark 2023-01-31 15:51:29 +08:00
asdflj 7f53e01184 add wireless fluid pattern terminal 2023-01-31 15:50:45 +08:00
GlodBlock 2eb1854eda network update flag 2023-01-31 10:49:19 +08:00
asdflj 99f8e98017 spotless apply 2023-01-29 16:30:27 +08:00
Jason Mitchell 69a5c0e6ee [ci skip] spotlessApply with the new settings 2023-01-28 17:43:10 -08:00
GlodBlock 80340dbd75 add portable fluid cell 2023-01-28 23:15:33 +08:00
Martin Robertz 4d236cb898 Merge pull request #69 from asdflj/bookmark
add fluid storage monitor
2023-01-25 10:36:13 +01:00
GlodBlock e424230f96 add missing super event handler 2023-01-25 14:56:36 +08:00
asdflj 3531f9f23e add fluid storage monitor 2023-01-24 21:38:10 +08:00
GlodBlock ea4014fc1e fix fluid storage bus trigger 2023-01-24 15:48:10 +08:00
GlodBlock 8d072f0c89 refactor 6 2023-01-23 16:45:14 +08:00
GlodBlock 5b62c4fdc8 refactor 5 2023-01-22 19:37:44 +08:00
GlodBlock b9b8ac3b43 Merge branch 'master' of https://github.com/GTNewHorizons/AE2FluidCraft-Rework.git into refactor 2023-01-21 17:25:12 +08:00
GlodBlock 018d488bee refactor 2 2023-01-21 14:45:07 +08:00
Yang Xizhi c5e9b34a5e Merge branch 'master' into fix/fluidterminal 2023-01-20 15:29:25 +08:00
asdflj 5ca8909dbf add fluid level emitter 2023-01-19 00:07:16 +08:00
GitHub GTNH Actions f0aef4e73c spotlessApply 2023-01-17 14:44:20 +00:00
GlodBlock fe1ec6276d add fluid storage bus 2023-01-17 22:41:49 +08:00
asdflj 42c47a3a3e add super speed card support 2023-01-03 16:25:33 +08:00
asdflj 77ccfb5606 add Fluid Buffer 2022-12-14 15:05:00 +08:00
asdflj 5e31096c7e spotless apply 2022-12-05 14:41:36 +08:00
Martin Robertz b81a18ff65 Merge pull request #24 from dipo33/fluid-interface-sideless
Add option to make Fluid Interface sideless
2022-12-04 18:18:51 +01:00
asdflj b3fa0c09d1 add waila support 2022-11-30 10:29:37 +08:00
Matej Dipčár d28ffa6adc Fix Fluid Import Bus to be able to import multiple fluids just like EIO conduits 2022-11-28 01:44:36 +01:00
asdflj dc7c33bfa0 uh substitutions mode is not complete yet 2022-11-15 09:15:30 +08:00
GlodBlock d29f035139 fluid terminal clean up 2022-11-07 19:17:20 +08:00
asdflj fd6eb37369 fluid terminal add "use substitutions" button 2022-10-31 09:16:19 +08:00
asdflj 238fd317e4 add fluid terminal 2022-10-20 12:28:01 +08:00
GlodBlock b2f07d2a02 fix wrong invert trigger 2022-10-08 20:20:11 +08:00
GlodBlock d820b68a7d uh 2022-10-03 20:04:19 +08:00
GlodBlock bce6e35675 crafting card support for fluid export bus 2022-10-03 19:46:57 +08:00
zy f6c10901d9 update
add recipe encode pattern crafting blank pattern
add control shift click to encode whole stack
fix import export nane display error
2022-09-17 20:05:30 +08:00
zy c313f51750 update
add recipe encode pattern crafting blank pattern
add control shift click to encode whole stack
fix import export nane display error
2022-09-17 19:05:31 +08:00
Martin Robertz df5ee936ce Merge pull request #9 from vfyjxf/master
Allows the use of the middle mouse button to modify the number of items in the pattern.
2022-08-14 12:09:57 +02:00
vfyjxf dbbaea9235 Allows the use of the middle mouse button to modify the number of items in the pattern. 2022-08-14 00:44:55 +08:00
Runakai1 13a23165c2 removed unnecessary var 2022-08-13 16:22:19 +02:00