-
Notifications
You must be signed in to change notification settings - Fork 354
Computer Monitor Cover Features #3531
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Ghostipedia
merged 136 commits into
GregTechCEu:1.20.1
from
TarLaboratories:dynamic-covers
Jul 31, 2025
Merged
Changes from all commits
Commits
Show all changes
136 commits
Select commit
Hold shift + click to select a range
3d0a63a
implemented dynamic text rendering on covers
TarLaboratories fdf86fc
added a gui to edit displayed text with placeholder support
TarLaboratories 1ed499f
improved gui, added "calc" placeholder
TarLaboratories b67f4c4
improved gui, still can't center a div
TarLaboratories 06af46b
who needs gui titles anyway
TarLaboratories 72c4eb0
made item count placeholder
TarLaboratories 95166ad
added in-game placeholder info
TarLaboratories 8af54d4
added create display link compatibility for computer monitor cover, a…
TarLaboratories 71103ef
forgot to uncomment spark
TarLaboratories 1bd6698
added some more placeholders
TarLaboratories 858f278
made most text translatable
TarLaboratories 4899951
fixed update interval input tooltip
TarLaboratories 393f557
added redstone placeholder
TarLaboratories 02e87ee
added fluidCount placeholder
TarLaboratories 0c2a7de
added displayTarget placeholder
TarLaboratories 6a7e4c4
Merge branch 'GregTechCEu:1.20.1' into dynamic-covers
TarLaboratories 2834937
fixed mod not working without create
TarLaboratories 8c18b11
Merge remote-tracking branch 'origin/dynamic-covers' into dynamic-covers
TarLaboratories 8aca865
the placeholder system is potentially turing-complete now (added prev…
TarLaboratories be49108
fixed formatting
TarLaboratories ddbff4d
fixed gradle stuff
TarLaboratories bbd0efc
small fixes all over the place, mainly the mod now works on server
TarLaboratories 94d8050
formatting
TarLaboratories 87f308c
moved placeholder init
TarLaboratories 5bd332b
made placeholder list scrollable
TarLaboratories a9c8319
fixes here and there, made all text translatable
TarLaboratories 4eb805e
Merge branch '1.20.1' into dynamic-covers
TarLaboratories b9b728a
moved create registrate stuff, made some more text translatable
TarLaboratories a37b510
removed create registrate inner class
TarLaboratories 99cd4f8
added config option for machines having BERs
TarLaboratories 3ef49c7
Merge branch '1.20.1' into dynamic-covers
TarLaboratories 9003d4c
added a bit of placeholders (ae2 compat, data storage)
TarLaboratories d3d19fc
Merge branch '1.20.1' into dynamic-covers
TarLaboratories a039dc1
fix after merge conflict
TarLaboratories 4097e38
fixed backslash not working properly
TarLaboratories fe6b442
just multiblock definition, no functionality yet
TarLaboratories 18a75f0
added central monitor gui, non-functional (yet)
TarLaboratories b870b7e
oops forgot datagen
TarLaboratories 71c4ed8
Update src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/…
TarLaboratories 0704f7b
added suggested changes
TarLaboratories 28e2af9
added a way to copy/paste computer monitor cover settings, also made …
TarLaboratories bd22174
monitor groups should be fully working now (add/remove through gui)
TarLaboratories 40cbdb9
(kinda) refactored the placeholder system, it's not tied into the com…
TarLaboratories c3ba06c
text module works now (with placeholders of course)
TarLaboratories f975600
placeholders in text module can now reference blocks from the compute…
TarLaboratories d67f5c6
datagen
TarLaboratories ef75afc
wireless cover works now
TarLaboratories fe54c2e
added info widget
TarLaboratories 52e1cb7
made non-monitors non-selectable
TarLaboratories 0e6e8da
Merge branch '1.20.1' into dynamic-covers
TarLaboratories 6cc7349
Merge branch '1.20.1' into dynamic-covers
TarLaboratories 622948e
image module works but rendering doesnt
TarLaboratories 9b8ca14
datagen
TarLaboratories da0de41
fixed text module's text not synchronizing to client
TarLaboratories 60b37d6
Merge branch '1.20.1' into dynamic-covers
TarLaboratories 411be93
Merge branch '1.20.1' into dynamic-covers
TarLaboratories 6459b7c
added background to monitor
TarLaboratories 1f874e1
fixed monitor being offset in literally any configuration that is not…
TarLaboratories 3e15af5
fixed crash still no idea how it was caused lol
TarLaboratories ee46369
made things translatable
TarLaboratories 874b226
made component selection scrollable
TarLaboratories 241b05b
added slots for items that placeholders interact with
TarLaboratories b1b5ef7
placeholder reference is now displayed in the central monitor text mo…
TarLaboratories ba297f7
made central monitor drop the modules that were inside it
TarLaboratories e605238
added basic data access hatch (hv) with 4 slots for doing wireless co…
TarLaboratories 5f359c0
Merge branch '1.20.1' into dynamic-covers
TarLaboratories 83f4e91
added tooltips for data items
TarLaboratories d726ccc
changed the central monitor UI a little
TarLaboratories 1630cf1
make PlaceholderHandler static
screret fd72c86
reorganize placeholder handling classes
screret cf9f539
clean up monitor group serialization
screret 1cca083
make ImageCache server safe
screret 5c2bc12
use primitive sets/lists where applicable
screret b75da0c
spotless, other formatting changes
screret 506e270
we can't use any AWT classes because it isn't inlcuded in the usual J…
screret 0702ffb
refactor CentralMonitorLogic to use Recipelogic's fields instead of i…
screret 517e60e
more minor formatting changes
screret 1affd28
fix MonitorImageRenderer
screret 7c83dfd
spotless
screret 7944e72
fix rebase errors
screret 2db5ce9
fixed things, added text scale input
TarLaboratories 8d9997f
fixed image requesting getting stuck if invalid url
TarLaboratories 5cde57d
made image scale depending on the monitors you selected
TarLaboratories ad11901
Merge branch '1.20.1' into dynamic-covers
TarLaboratories 63ef1c1
fixed vertical monitors
TarLaboratories 1bc52a6
removed auto-sync for text scale input
TarLaboratories e005cd1
made central monitors still require energy hatches
TarLaboratories 4ca9f83
up to 4 data hatches now
TarLaboratories 1a0ed97
disabled upwards facing monitors
TarLaboratories 753d51b
Update model (Couldn't run Data)
Ghostipedia b055e0e
Revert "Update model (Couldn't run Data)"
Ghostipedia 30a8514
Revert "Revert "Update model (Couldn't run Data)""
Ghostipedia 573d175
Update Textures
Ghostipedia f7e3945
made the central monitor drop items from removed groups
TarLaboratories e30fddc
fix monitor block model
screret 3c45037
fix datagen crashing
screret 8b88754
make monitor components use a capability instead of instanceof checks
screret e95331b
add a default impl for `IMonitorComponent#isMonitor`
screret 3bfe67a
spotless
screret 2c4d21c
added cc:tweaked integration
TarLaboratories 2417e43
Merge remote-tracking branch 'origin/dynamic-covers' into dynamic-covers
TarLaboratories 5f02923
Merge branch '1.20.1' into dynamic-covers
TarLaboratories 8f9ac0f
adjusted gui
TarLaboratories 0164cb1
fixed upwards facing cental monitor (yay!)
TarLaboratories 956b6f7
Central Monitor Texture Overlays
Ghostipedia 615ba0b
Merge remote-tracking branch 'TarLaboratories/dynamic-covers' into fo…
Ghostipedia 71351d4
added recipes
TarLaboratories da689ba
clean up monitor background rendering
screret 608c1a0
Add CTM to the monitor overlay textures
screret 57ecab2
fix monitor screen render bounds
screret 5af8ad6
remove unnecessary parameters from pattern builder
screret cb0b86f
use custom render type for monitor images for cleaner code
screret 422d845
remove the dynamic background
screret 93c4cb3
add some barebones text to the main window
screret f7553a6
disable monitor block UI
screret 4a23cd6
disallow 2x1 central monitors
screret 427bbf5
fix controller overlays
screret 58b9466
remove animation from the base texture
screret ddc2ab7
fix screen rotation? idk it works
screret 9f2584d
add a max lifetime to cached images
screret 525948d
added subList placeholder
TarLaboratories 98144ef
Merge remote-tracking branch 'origin/dynamic-covers' into dynamic-covers
TarLaboratories 7406d9e
added cmp placeholder
TarLaboratories 1daf050
added brainfuck placeholder
TarLaboratories effef4f
added brainfuck placeholder
TarLaboratories 9724009
added command placeholder
TarLaboratories b9415f4
Merge remote-tracking branch 'origin/dynamic-covers' into dynamic-covers
TarLaboratories 2cd0b15
added tm placeholder
TarLaboratories ed62fc2
moved target data stick slot input so that it doesnt overlap with com…
TarLaboratories 3eed4b1
added formatInt placeholder, fixed command placeholder
TarLaboratories 5836c7f
Merge branch '1.20.1' into dynamic-covers
TarLaboratories 00e9a0b
made commands execute as the player the item is bound to
TarLaboratories 9c6a1ff
Merge branch '1.20.1' into dynamic-covers
TarLaboratories 09e159a
Merge branch '1.20.1' into dynamic-covers
Ghostipedia 269343f
Merge branch '1.20.1' into dynamic-covers
Ghostipedia 2aecdad
Merge branch '1.20.1' into dynamic-covers
Ghostipedia File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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
28 changes: 28 additions & 0 deletions
28
src/generated/resources/assets/gtceu/blockstates/basic_data_access_hatch.json
This file contains hidden or 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,28 @@ | ||
| { | ||
| "variants": { | ||
| "facing=down": { | ||
| "model": "gtceu:block/machine/basic_data_access_hatch", | ||
| "x": 90 | ||
| }, | ||
| "facing=east": { | ||
| "model": "gtceu:block/machine/basic_data_access_hatch", | ||
| "y": 90 | ||
| }, | ||
| "facing=north": { | ||
| "model": "gtceu:block/machine/basic_data_access_hatch" | ||
| }, | ||
| "facing=south": { | ||
| "model": "gtceu:block/machine/basic_data_access_hatch", | ||
| "y": 180 | ||
| }, | ||
| "facing=up": { | ||
| "gtceu:z": 180, | ||
| "model": "gtceu:block/machine/basic_data_access_hatch", | ||
| "x": 270 | ||
| }, | ||
| "facing=west": { | ||
| "model": "gtceu:block/machine/basic_data_access_hatch", | ||
| "y": 270 | ||
| } | ||
| } | ||
| } |
114 changes: 114 additions & 0 deletions
114
src/generated/resources/assets/gtceu/blockstates/central_monitor.json
This file contains hidden or 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,114 @@ | ||
| { | ||
| "variants": { | ||
| "facing=down,upwards_facing=east": { | ||
| "gtceu:z": 90, | ||
| "model": "gtceu:block/machine/central_monitor", | ||
| "x": 90 | ||
| }, | ||
| "facing=down,upwards_facing=north": { | ||
| "model": "gtceu:block/machine/central_monitor", | ||
| "x": 90 | ||
| }, | ||
| "facing=down,upwards_facing=south": { | ||
| "gtceu:z": 180, | ||
| "model": "gtceu:block/machine/central_monitor", | ||
| "x": 90 | ||
| }, | ||
| "facing=down,upwards_facing=west": { | ||
| "gtceu:z": 270, | ||
| "model": "gtceu:block/machine/central_monitor", | ||
| "x": 90 | ||
| }, | ||
| "facing=east,upwards_facing=east": { | ||
| "gtceu:z": 270, | ||
| "model": "gtceu:block/machine/central_monitor", | ||
| "y": 90 | ||
| }, | ||
| "facing=east,upwards_facing=north": { | ||
| "model": "gtceu:block/machine/central_monitor", | ||
| "y": 90 | ||
| }, | ||
| "facing=east,upwards_facing=south": { | ||
| "gtceu:z": 180, | ||
| "model": "gtceu:block/machine/central_monitor", | ||
| "y": 90 | ||
| }, | ||
| "facing=east,upwards_facing=west": { | ||
| "gtceu:z": 90, | ||
| "model": "gtceu:block/machine/central_monitor", | ||
| "y": 90 | ||
| }, | ||
| "facing=north,upwards_facing=east": { | ||
| "gtceu:z": 270, | ||
| "model": "gtceu:block/machine/central_monitor" | ||
| }, | ||
| "facing=north,upwards_facing=north": { | ||
| "model": "gtceu:block/machine/central_monitor" | ||
| }, | ||
| "facing=north,upwards_facing=south": { | ||
| "gtceu:z": 180, | ||
| "model": "gtceu:block/machine/central_monitor" | ||
| }, | ||
| "facing=north,upwards_facing=west": { | ||
| "gtceu:z": 90, | ||
| "model": "gtceu:block/machine/central_monitor" | ||
| }, | ||
| "facing=south,upwards_facing=east": { | ||
| "gtceu:z": 270, | ||
| "model": "gtceu:block/machine/central_monitor", | ||
| "y": 180 | ||
| }, | ||
| "facing=south,upwards_facing=north": { | ||
| "model": "gtceu:block/machine/central_monitor", | ||
| "y": 180 | ||
| }, | ||
| "facing=south,upwards_facing=south": { | ||
| "gtceu:z": 180, | ||
| "model": "gtceu:block/machine/central_monitor", | ||
| "y": 180 | ||
| }, | ||
| "facing=south,upwards_facing=west": { | ||
| "gtceu:z": 90, | ||
| "model": "gtceu:block/machine/central_monitor", | ||
| "y": 180 | ||
| }, | ||
| "facing=up,upwards_facing=east": { | ||
| "gtceu:z": 90, | ||
| "model": "gtceu:block/machine/central_monitor", | ||
| "x": 270 | ||
| }, | ||
| "facing=up,upwards_facing=north": { | ||
| "gtceu:z": 180, | ||
| "model": "gtceu:block/machine/central_monitor", | ||
| "x": 270 | ||
| }, | ||
| "facing=up,upwards_facing=south": { | ||
| "model": "gtceu:block/machine/central_monitor", | ||
| "x": 270 | ||
| }, | ||
| "facing=up,upwards_facing=west": { | ||
| "gtceu:z": 270, | ||
| "model": "gtceu:block/machine/central_monitor", | ||
| "x": 270 | ||
| }, | ||
| "facing=west,upwards_facing=east": { | ||
| "gtceu:z": 270, | ||
| "model": "gtceu:block/machine/central_monitor", | ||
| "y": 270 | ||
| }, | ||
| "facing=west,upwards_facing=north": { | ||
| "model": "gtceu:block/machine/central_monitor", | ||
| "y": 270 | ||
| }, | ||
| "facing=west,upwards_facing=south": { | ||
| "gtceu:z": 180, | ||
| "model": "gtceu:block/machine/central_monitor", | ||
| "y": 270 | ||
| }, | ||
| "facing=west,upwards_facing=west": { | ||
| "gtceu:z": 90, | ||
| "model": "gtceu:block/machine/central_monitor", | ||
| "y": 270 | ||
| } | ||
| } | ||
| } |
28 changes: 28 additions & 0 deletions
28
src/generated/resources/assets/gtceu/blockstates/monitor.json
This file contains hidden or 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,28 @@ | ||
| { | ||
| "variants": { | ||
| "facing=down": { | ||
| "model": "gtceu:block/machine/monitor", | ||
| "x": 90 | ||
| }, | ||
| "facing=east": { | ||
| "model": "gtceu:block/machine/monitor", | ||
| "y": 90 | ||
| }, | ||
| "facing=north": { | ||
| "model": "gtceu:block/machine/monitor" | ||
| }, | ||
| "facing=south": { | ||
| "model": "gtceu:block/machine/monitor", | ||
| "y": 180 | ||
| }, | ||
| "facing=up": { | ||
| "gtceu:z": 180, | ||
| "model": "gtceu:block/machine/monitor", | ||
| "x": 270 | ||
| }, | ||
| "facing=west": { | ||
| "model": "gtceu:block/machine/monitor", | ||
| "y": 270 | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this should be looked into
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
it appears to be an issue between cc tweaked and create, it crashes even without gtceu
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Currently reaching out to someone I know does a bunch of CC:Tweaked and Create compat. They may know why- I believe for the time being we should mark this review comment as something worth investigating in a different PR.
Due to the nature and size of this PR, it'd be a good idea to get this into the 7.1.0-SNAPSHOT cycle now so it has ample time to get testers to find bugs and edge cases that we'll need to handle.