-
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: Add filters for logistics system (#191)
* feat: add some basic gui classes from Create * feat: more gui classes * feat: start on filter menu * feat: add filter screen * feat: add filter item * feat: make (largely empty) openable filter screen * fix: basic screen functions * feat: add full list filter screen functionality * fix: use of right button tooltips * chore: update parchment * feat: add filter class with filter functionality * chore: preparations for filter functionality in logistics * feat: add initial behaviour functionality for filter * feat: add filter visuals * feat: add filter behaviour to logistics connectors * feat: add adding/removing of filters * fix: filter screen auto-closing * feat: add recipe for filter * fix: logistics system does not apply the filter * feat: add ingame guide for filters * chore: re-establish reuse compliance
- Loading branch information
1 parent
a10eacf
commit d35283e
Showing
89 changed files
with
2,495 additions
and
205 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-06-16T17:19:50.8834725 Languages: en_us | ||
| ba6c366fce8e50bb8aa76351c07aec09e75fc71c assets/theurgy/lang/en_us.json | ||
| // 1.21 2024-06-27T13:16:55.3767089 Languages: en_us | ||
| 07c0314bf133fdba8083089c3e5e6552ad8f57d7 assets/theurgy/lang/en_us.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
264 changes: 237 additions & 27 deletions
264
src/generated/resources/assets/theurgy/blockstates/logistics_item_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 |
|---|---|---|
| @@ -1,30 +1,240 @@ | ||
| { | ||
| "variants": { | ||
| "facing=down": { | ||
| "model": "theurgy:block/logistics_item_extractor", | ||
| "x": 180 | ||
| }, | ||
| "facing=east": { | ||
| "model": "theurgy:block/logistics_item_extractor", | ||
| "x": 90, | ||
| "y": 90 | ||
| }, | ||
| "facing=north": { | ||
| "model": "theurgy:block/logistics_item_extractor", | ||
| "x": 90 | ||
| }, | ||
| "facing=south": { | ||
| "model": "theurgy:block/logistics_item_extractor", | ||
| "x": 90, | ||
| "y": 180 | ||
| }, | ||
| "facing=up": { | ||
| "model": "theurgy:block/logistics_item_extractor" | ||
| }, | ||
| "facing=west": { | ||
| "model": "theurgy:block/logistics_item_extractor", | ||
| "x": 90, | ||
| "y": 270 | ||
| "multipart": [ | ||
| { | ||
| "apply": { | ||
| "model": "theurgy:block/logistics_connector_filter", | ||
| "x": 90 | ||
| }, | ||
| "when": { | ||
| "facing": "north", | ||
| "has_filter": "true" | ||
| } | ||
| }, | ||
| { | ||
| "apply": { | ||
| "model": "theurgy:block/logistics_item_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_item_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_item_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_item_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_item_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_item_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_item_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_item_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_item_extractor" | ||
| }, | ||
| "when": { | ||
| "facing": "up" | ||
| } | ||
| }, | ||
| { | ||
| "apply": { | ||
| "model": "theurgy:block/logistics_connector_filter" | ||
| }, | ||
| "when": { | ||
| "facing": "up", | ||
| "has_filter": "true" | ||
| } | ||
| }, | ||
| { | ||
| "apply": { | ||
| "model": "theurgy:block/logistics_item_extractor" | ||
| }, | ||
| "when": { | ||
| "facing": "up" | ||
| } | ||
| }, | ||
| { | ||
| "apply": { | ||
| "model": "theurgy:block/logistics_connector_filter", | ||
| "x": 180 | ||
| }, | ||
| "when": { | ||
| "facing": "down", | ||
| "has_filter": "true" | ||
| } | ||
| }, | ||
| { | ||
| "apply": { | ||
| "model": "theurgy:block/logistics_item_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_item_extractor", | ||
| "x": 180 | ||
| }, | ||
| "when": { | ||
| "facing": "down" | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| } |
Oops, something went wrong.