Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Port Multiblocks to MUI2 #2672

Draft
wants to merge 90 commits into
base: master
Choose a base branch
from
Draft

Port Multiblocks to MUI2 #2672

wants to merge 90 commits into from

Conversation

ghzdude
Copy link
Contributor

@ghzdude ghzdude commented Nov 29, 2024 •
edited
Loading

What

Ports every multiblock with a UI to use MUI2.

Implementation Details

  • Classes extending MultiMapMultiblockController will need to be updated (GCYM) or override usesMui2() to return false.
  • added KeyUtils to replace TextComponantUtil
  • multiblocks need to override createUIFactory() to create needed sync values and return a configured MultiblockUIFactory
  • createUIFactory() is called during writeInitialSyncData() and receiveInitialSyncData() so that values can be synced correctly before the ui is opened

Currently ported multis are:

  • Large Combustion Engine
  • Large Gas/Plasma/Steam Turbine
  • Electric Blast Furnace
  • Large Boiler
  • Assembly Line
  • Cracking Unit
  • Distillation Tower
  • Fusion Reactor
  • Implosion Compressor
  • Large Chemical Reactor
  • MultiSmelter
  • Processing Array
  • Pyrolyse Oven
  • Research Station
  • Vacuum Freezer

Outcome

multiblock uis are fancier

@ghzdude ghzdude added the type: refactor Suggestion to refactor a section of code label Nov 29, 2024
@Zorbatron Zorbatron mentioned this pull request Dec 3, 2024
Open
TechLord22 and others added 27 commits January 9, 2025 00:14
@TechLord22 @ghzdude
start
e8e19a2
@ghzdude
add KeyUtil for handling IKeys
edd59f9 
port MultiblockDisplayText to mui2
@ghzdude
multiblocks have createUIFactory to override for custom ui
aa9c63e 
almost everything mui2 related is moved into MultiblockUIFactory
fix issues with cyclebutton widget textures
fix syncing (at least for EBF)
probably other things i don't feel like writing about
@ghzdude
coloredTanslation() -> coloredLang()
9836bcf 
fix distinct bus button
more work on MultiblockUIFactory
bars work again
@ghzdude
remove generic for MultiblockUIFactory
2197a15
@ghzdude
initial work on indicator widget
2650bc3
@ghzdude
help i am in syncing hell
a70891a
@ghzdude
remove todo
16134d7
@ghzdude
sync certain values
dab21e8 
add ByteSyncValue
implement blinking logos
@ghzdude
simplify slightly
27294f6
@ghzdude
sike i don't need ByteSyncValue
84ff8ed
@ghzdude
structure formed is already synced
710e598
@ghzdude
try sync progress
52aea74
@ghzdude
progress works
7ee951f 
add dynamic keys
add helper methods
@ghzdude
fix args properly
d982a6c
@ghzdude
update large boiler
6fd3a2a 
use list instead of consumer
move margin to power button instead of flex
@ghzdude
create ui factory at build instead of constructor
5c24871
@ghzdude
update large combustion
1c16ca7 
add note for dynamic texture
@ghzdude
pass in builder instead of list
8956458 
add multiblock name
make steam output dynamic
@ghzdude
improve blinking logo a bit
942053d
@ghzdude
switch to builder instead of list for warning/error
c2dccca 
fix title
@ghzdude
add/improve javadocs
70c7e73 
this is the most i can do for waterFilled for now
@ghzdude
remove reset and make internal methods private
b9f1a93
@ghzdude
sync fuel needed and rotor stats
2b4eff2 
always add fuel line
@ghzdude
rename and reorganize KeyUtil methods
b8c5cbb
@ghzdude
always return cache for client and default for server
f4ec7f9
@ghzdude
make display text dynamically updated
8809600 
no need to use dynamic ikeys
ghzdude added 4 commits January 9, 2025 00:14
@ghzdude
try to utilize new key methods
3956c92
@ghzdude
improve key util methods some more
b9a4517 
fix comp keys losing formatting
actually draw the formatted keys
@ghzdude
simplify status keys
dbdcd51 
remove unneeded method
spotless
@ghzdude
forgor flow
36a9249
ghzdude added 22 commits January 9, 2025 17:34
@ghzdude
fix indicator tooltips
6379bd3 
improve display text
big cleanup
@ghzdude
fix energy container line
015c82b
@ghzdude
port pyrolyse and multismelter
e103f9c 
add hover method to KeyUtil
@ghzdude
fix potential npe when fixing args
5e4f7fd
@ghzdude
add mixin to set cache in constructor
f2fe4fe 
add todo notes to all mui2 mixins
@ghzdude
no longer need to call this
9c6e901
@ghzdude
cleanup
8ef121e
@ghzdude
make adding status keys actually translate
1a6cab4 
add note
@ghzdude
port HPCA, research station, cracking unit
7bf7c3c
@ghzdude
port processing array
b65f4f0 
add varargs to setHover()
@ghzdude
go back to drawable list
7e56ccc
@ghzdude
update note
689cb57
@ghzdude
merge text related mixins under one class
5e561f1
@ghzdude
create better impl for keys with tooltips
7b2bda0
@ghzdude
implement key serialization
babf194 
improve builder to sync and detect changes server-side
@ghzdude
remove note
c05bd78
@ghzdude
remove most dynamic keys
fd64222 
use overridable methods for screen/indicator
remove initial syncing for ui
@ghzdude
fix npe when serializing null arrays
eeb068d 
de/serialize numbers correctly
@ghzdude
no need to sync energy container
b7de2a6
@ghzdude
add helper method for array access
6e486e5
@ghzdude
address todo for dynamic color tooltip
37af081
@ghzdude
this class is no longer necessary
2e8eff4
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
type: refactor Suggestion to refactor a section of code
Projects
MUI2 Port
Status: Hard
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ghzdude @TechLord22