-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: fluid support for logistics system (#208)
* feat: start adding fluid connectors * feat: finish initial fluid connectors * feat: add fluid handling to filters * feat: add filter functionality to fluid connectors * feat: add lang and loottables * fix: references to item connectors * fix: references to item connectors * feat: add guide book entries
- Loading branch information
1 parent
ccab104
commit 7abafbb
Showing
53 changed files
with
2,492 additions
and
77 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| // 1.21 2024-07-25T11:49:24.3868645 Languages: en_us | ||
| 104ec251c98ef8a8927579e731389e2d3ba15dca assets/theurgy/lang/en_us.json | ||
| // 1.21 2024-07-26T10:42:29.0554332 Languages: en_us | ||
| fbd85e7f2dcb8355158e6919472eca24077dc04e assets/theurgy/lang/en_us.json |
240 changes: 240 additions & 0 deletions
240
src/generated/resources/assets/theurgy/blockstates/logistics_fluid_extractor.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,240 @@ | ||
| { | ||
| "multipart": [ | ||
| { | ||
| "apply": { | ||
| "model": "theurgy:block/logistics_connector_filter", | ||
| "x": 90 | ||
| }, | ||
| "when": { | ||
| "facing": "north", | ||
| "has_filter": "true" | ||
| } | ||
| }, | ||
| { | ||
| "apply": { | ||
| "model": "theurgy:block/logistics_fluid_extractor", | ||
| "x": 90 | ||
| }, | ||
| "when": { | ||
| "facing": "north" | ||
| } | ||
| }, | ||
| { | ||
| "apply": { | ||
| "model": "theurgy:block/logistics_connector_filter", | ||
| "x": 90 | ||
| }, | ||
| "when": { | ||
| "facing": "north", | ||
| "has_filter": "true" | ||
| } | ||
| }, | ||
| { | ||
| "apply": { | ||
| "model": "theurgy:block/logistics_fluid_extractor", | ||
| "x": 90 | ||
| }, | ||
| "when": { | ||
| "facing": "north" | ||
| } | ||
| }, | ||
| { | ||
| "apply": { | ||
| "model": "theurgy:block/logistics_connector_filter", | ||
| "x": 90, | ||
| "y": 90 | ||
| }, | ||
| "when": { | ||
| "facing": "east", | ||
| "has_filter": "true" | ||
| } | ||
| }, | ||
| { | ||
| "apply": { | ||
| "model": "theurgy:block/logistics_fluid_extractor", | ||
| "x": 90, | ||
| "y": 90 | ||
| }, | ||
| "when": { | ||
| "facing": "east" | ||
| } | ||
| }, | ||
| { | ||
| "apply": { | ||
| "model": "theurgy:block/logistics_connector_filter", | ||
| "x": 90, | ||
| "y": 90 | ||
| }, | ||
| "when": { | ||
| "facing": "east", | ||
| "has_filter": "true" | ||
| } | ||
| }, | ||
| { | ||
| "apply": { | ||
| "model": "theurgy:block/logistics_fluid_extractor", | ||
| "x": 90, | ||
| "y": 90 | ||
| }, | ||
| "when": { | ||
| "facing": "east" | ||
| } | ||
| }, | ||
| { | ||
| "apply": { | ||
| "model": "theurgy:block/logistics_connector_filter", | ||
| "x": 90, | ||
| "y": 180 | ||
| }, | ||
| "when": { | ||
| "facing": "south", | ||
| "has_filter": "true" | ||
| } | ||
| }, | ||
| { | ||
| "apply": { | ||
| "model": "theurgy:block/logistics_fluid_extractor", | ||
| "x": 90, | ||
| "y": 180 | ||
| }, | ||
| "when": { | ||
| "facing": "south" | ||
| } | ||
| }, | ||
| { | ||
| "apply": { | ||
| "model": "theurgy:block/logistics_connector_filter", | ||
| "x": 90, | ||
| "y": 180 | ||
| }, | ||
| "when": { | ||
| "facing": "south", | ||
| "has_filter": "true" | ||
| } | ||
| }, | ||
| { | ||
| "apply": { | ||
| "model": "theurgy:block/logistics_fluid_extractor", | ||
| "x": 90, | ||
| "y": 180 | ||
| }, | ||
| "when": { | ||
| "facing": "south" | ||
| } | ||
| }, | ||
| { | ||
| "apply": { | ||
| "model": "theurgy:block/logistics_connector_filter", | ||
| "x": 90, | ||
| "y": 270 | ||
| }, | ||
| "when": { | ||
| "facing": "west", | ||
| "has_filter": "true" | ||
| } | ||
| }, | ||
| { | ||
| "apply": { | ||
| "model": "theurgy:block/logistics_fluid_extractor", | ||
| "x": 90, | ||
| "y": 270 | ||
| }, | ||
| "when": { | ||
| "facing": "west" | ||
| } | ||
| }, | ||
| { | ||
| "apply": { | ||
| "model": "theurgy:block/logistics_connector_filter", | ||
| "x": 90, | ||
| "y": 270 | ||
| }, | ||
| "when": { | ||
| "facing": "west", | ||
| "has_filter": "true" | ||
| } | ||
| }, | ||
| { | ||
| "apply": { | ||
| "model": "theurgy:block/logistics_fluid_extractor", | ||
| "x": 90, | ||
| "y": 270 | ||
| }, | ||
| "when": { | ||
| "facing": "west" | ||
| } | ||
| }, | ||
| { | ||
| "apply": { | ||
| "model": "theurgy:block/logistics_connector_filter" | ||
| }, | ||
| "when": { | ||
| "facing": "up", | ||
| "has_filter": "true" | ||
| } | ||
| }, | ||
| { | ||
| "apply": { | ||
| "model": "theurgy:block/logistics_fluid_extractor" | ||
| }, | ||
| "when": { | ||
| "facing": "up" | ||
| } | ||
| }, | ||
| { | ||
| "apply": { | ||
| "model": "theurgy:block/logistics_connector_filter" | ||
| }, | ||
| "when": { | ||
| "facing": "up", | ||
| "has_filter": "true" | ||
| } | ||
| }, | ||
| { | ||
| "apply": { | ||
| "model": "theurgy:block/logistics_fluid_extractor" | ||
| }, | ||
| "when": { | ||
| "facing": "up" | ||
| } | ||
| }, | ||
| { | ||
| "apply": { | ||
| "model": "theurgy:block/logistics_connector_filter", | ||
| "x": 180 | ||
| }, | ||
| "when": { | ||
| "facing": "down", | ||
| "has_filter": "true" | ||
| } | ||
| }, | ||
| { | ||
| "apply": { | ||
| "model": "theurgy:block/logistics_fluid_extractor", | ||
| "x": 180 | ||
| }, | ||
| "when": { | ||
| "facing": "down" | ||
| } | ||
| }, | ||
| { | ||
| "apply": { | ||
| "model": "theurgy:block/logistics_connector_filter", | ||
| "x": 180 | ||
| }, | ||
| "when": { | ||
| "facing": "down", | ||
| "has_filter": "true" | ||
| } | ||
| }, | ||
| { | ||
| "apply": { | ||
| "model": "theurgy:block/logistics_fluid_extractor", | ||
| "x": 180 | ||
| }, | ||
| "when": { | ||
| "facing": "down" | ||
| } | ||
| } | ||
| ] | ||
| } |
Oops, something went wrong.