Code

Port Multiblocks to MUI2#2672

Code

Draft

ghzdude wants to merge 134 commits intomasterGregTechCEu/GregTech:masterfrom tc/mui2-multisGregTechCEu/GregTech:tc/mui2-multisCopy head branch name to clipboard

+3,469-1,266

Commits

Commits on Feb 3, 2025

• start

  

  TechLord22

  authored and

  ghzdude

  committed
  bcd5e06

  Copy full SHA for bcd5e06

• add KeyUtil for handling IKeys

  Show description for e61a164
  ghzdude

  committed
  e61a164

  Copy full SHA for e61a164

• multiblocks have createUIFactory to override for custom ui

  Show description for 42ceb22
  ghzdude

  committed
  42ceb22

  Copy full SHA for 42ceb22

• coloredTanslation() -> coloredLang()

  Show description for 686332a
  ghzdude

  committed
  686332a

  Copy full SHA for 686332a

• remove generic for MultiblockUIFactory

  ghzdude

  committed
  5fecb10

  Copy full SHA for 5fecb10

• initial work on indicator widget

  ghzdude

  committed
  d36be66

  Copy full SHA for d36be66

• help i am in syncing hell

  ghzdude

  committed
  acb64fa

  Copy full SHA for acb64fa

• remove todo

  ghzdude

  committed
  ef5f2f4

  Copy full SHA for ef5f2f4

• sync certain values

  Show description for c461318
  ghzdude

  committed
  c461318

  Copy full SHA for c461318

• simplify slightly

  ghzdude

  committed
  03558a2

  Copy full SHA for 03558a2

• sike i don't need ByteSyncValue

  ghzdude

  committed
  b82a577

  Copy full SHA for b82a577

• structure formed is already synced

  ghzdude

  committed
  31a1db5

  Copy full SHA for 31a1db5

• try sync progress

  ghzdude

  committed
  12ed53c

  Copy full SHA for 12ed53c

• progress works

  Show description for 60b9464
  ghzdude

  committed
  60b9464

  Copy full SHA for 60b9464

• fix args properly

  ghzdude

  committed
  ae5350c

  Copy full SHA for ae5350c

• update large boiler

  Show description for eaf415f
  ghzdude

  committed
  eaf415f

  Copy full SHA for eaf415f

• create ui factory at build instead of constructor

  ghzdude

  committed
  db85897

  Copy full SHA for db85897

• update large combustion

  Show description for f7cba29
  ghzdude

  committed
  f7cba29

  Copy full SHA for f7cba29

• pass in builder instead of list

  Show description for 5c63926
  ghzdude

  committed
  5c63926

  Copy full SHA for 5c63926

• improve blinking logo a bit

  ghzdude

  committed
  a790d05

  Copy full SHA for a790d05

• switch to builder instead of list for warning/error

  Show description for a13a9ac
  ghzdude

  committed
  a13a9ac

  Copy full SHA for a13a9ac

• add/improve javadocs

  Show description for 76a87d1
  ghzdude

  committed
  76a87d1

  Copy full SHA for 76a87d1

• remove reset and make internal methods private

  ghzdude

  committed
  3bb71ee

  Copy full SHA for 3bb71ee

• sync fuel needed and rotor stats

  Show description for 6dd01b2
  ghzdude

  committed
  6dd01b2

  Copy full SHA for 6dd01b2

• rename and reorganize KeyUtil methods

  ghzdude

  committed
  9846938

  Copy full SHA for 9846938

• always return cache for client and default for server

  ghzdude

  committed
  8514a48

  Copy full SHA for 8514a48

• make display text dynamically updated

  Show description for 277756e
  ghzdude

  committed
  277756e

  Copy full SHA for 277756e

• comments, use margin instead of padding, align

  ghzdude

  committed
  7b6394c

  Copy full SHA for 7b6394c

• make and use builder methods instead of anonynous classes

  ghzdude

  committed
  fcea28d

  Copy full SHA for fcea28d

• move builder from MultiblockDisplayTextPort into MultiblockUIFactory

  Show description for 743d3d0
  ghzdude

  committed
  743d3d0

  Copy full SHA for 743d3d0

• make builder static again

  ghzdude

  committed
  c6ce966

  Copy full SHA for c6ce966

• simplify compound consumer

  Show description for c4677f0
  ghzdude

  committed
  c4677f0

  Copy full SHA for c4677f0

• fix water for boiler

  ghzdude

  committed
  a3d5277

  Copy full SHA for a3d5277

• fix lubricant for LCE

  ghzdude

  committed
  e6ade7b

  Copy full SHA for e6ade7b

• fix large turbine

  ghzdude

  committed
  f81a5d1

  Copy full SHA for f81a5d1

• fix maint and obstruction

  ghzdude

  committed
  b764c3d

  Copy full SHA for b764c3d

• improve int array sync value

  ghzdude

  committed
  d29bc5b

  Copy full SHA for d29bc5b

• improve compound consumers

  Show description for 6610d25
  ghzdude

  committed
  6610d25

  Copy full SHA for 6610d25

• start work on fixing display

  ghzdude

  committed
  141594b

  Copy full SHA for 141594b

• fix display tooltips

  ghzdude

  committed
  55eefaf

  Copy full SHA for 55eefaf

• use dynamic keys again

  ghzdude

  committed
  955d8d1

  Copy full SHA for 955d8d1

• simplify display checking

  Show description for effb2c2
  ghzdude

  committed
  effb2c2

  Copy full SHA for effb2c2

• add tooltip for no flex

  ghzdude

  committed
  c73d1c7

  Copy full SHA for c73d1c7

• improve value syncing greatly

  ghzdude

  committed
  60819b4

  Copy full SHA for 60819b4

• fix LCE fuel name + spotless

  ghzdude

  committed
  c5ccc4f

  Copy full SHA for c5ccc4f

• remove unused datacode

  ghzdude

  committed
  e22831f

  Copy full SHA for e22831f

• no need to sync temp

  ghzdude

  committed
  6a62028

  Copy full SHA for 6a62028

• rework builder to use IDrawables

  Show description for 182bbc9
  ghzdude

  committed
  182bbc9

  Copy full SHA for 182bbc9

• simplify ifs

  ghzdude

  committed
  b09ea47

  Copy full SHA for b09ea47

• move tooltip setting to right method

  ghzdude

  committed
  501c34e

  Copy full SHA for 501c34e

• fix packages

  ghzdude

  committed
  e5f6a0c

  Copy full SHA for e5f6a0c

• make fluid drill lang colored

  ghzdude

  committed
  bab1176

  Copy full SHA for bab1176

• port Fusion Reactor + textures

  Show description for 94e8f26
  ghzdude

  committed
  94e8f26

  Copy full SHA for 94e8f26

• sync harder

  Show description for 87a7810
  ghzdude

  committed
  87a7810

  Copy full SHA for 87a7810

• improve EBF formStructure() a bit

  ghzdude

  committed
  5fb9ea1

  Copy full SHA for 5fb9ea1

• remove unused datacode

  ghzdude

  committed
  a2ee026

  Copy full SHA for a2ee026

• create new class for display that behaves similar to AdvancedTextWidget

  ghzdude

  committed
  a49364e

  Copy full SHA for a49364e

• add new case for status

  ghzdude

  committed
  2fafcba

  Copy full SHA for 2fafcba

• improve drawing a bit

  ghzdude

  committed
  165a0b0

  Copy full SHA for 165a0b0

• add change listener

  ghzdude

  committed
  87a3db0

  Copy full SHA for 87a3db0

• fix rebase

  ghzdude

  committed
  4e91ecc

  Copy full SHA for 4e91ecc

• only construct key array if lengths are different

  ghzdude

  committed
  d9d52b8

  Copy full SHA for d9d52b8

• try to utilize new key methods

  ghzdude

  committed
  b48a427

  Copy full SHA for b48a427

• improve key util methods some more

  Show description for d935f99
  ghzdude

  committed
  d935f99

  Copy full SHA for d935f99

• simplify status keys

  Show description for fb97aec
  ghzdude

  committed
  fb97aec

  Copy full SHA for fb97aec

• forgor flow

  ghzdude

  committed
  bae8bbf

  Copy full SHA for bae8bbf

• port to rich text

  ghzdude

  committed
  1119e0f

  Copy full SHA for 1119e0f

• fix npe

  ghzdude

  committed
  f4803ee

  Copy full SHA for f4803ee

• fix indicator tooltips

  Show description for fa7115c
  ghzdude

  committed
  fa7115c

  Copy full SHA for fa7115c

• fix energy container line

  ghzdude

  committed
  766550b

  Copy full SHA for 766550b

• port pyrolyse and multismelter

  Show description for 7870303
  ghzdude

  committed
  7870303

  Copy full SHA for 7870303

• fix potential npe when fixing args

  ghzdude

  committed
  a9d7f53

  Copy full SHA for a9d7f53

• add mixin to set cache in constructor

  Show description for 07626d4
  ghzdude

  committed
  07626d4

  Copy full SHA for 07626d4

• no longer need to call this

  ghzdude

  committed
  0b67143

  Copy full SHA for 0b67143

• cleanup

  ghzdude

  committed
  3d64cb0

  Copy full SHA for 3d64cb0

• make adding status keys actually translate

  Show description for 9dde138
  ghzdude

  committed
  9dde138

  Copy full SHA for 9dde138

• port HPCA, research station, cracking unit

  ghzdude

  committed
  49de9bd

  Copy full SHA for 49de9bd

• port processing array

  Show description for 50959c8
  ghzdude

  committed
  50959c8

  Copy full SHA for 50959c8

• go back to drawable list

  ghzdude

  committed
  43725ba

  Copy full SHA for 43725ba

• update note

  ghzdude

  committed
  6b503d5

  Copy full SHA for 6b503d5

• merge text related mixins under one class

  ghzdude

  committed
  affe3b5

  Copy full SHA for affe3b5

• create better impl for keys with tooltips

  ghzdude

  committed
  896b741

  Copy full SHA for 896b741

• implement key serialization

  Show description for 2098f11
  ghzdude

  committed
  2098f11

  Copy full SHA for 2098f11

• remove note

  ghzdude

  committed
  8a2eee6

  Copy full SHA for 8a2eee6

• remove most dynamic keys

  Show description for f3ac009
  ghzdude

  committed
  f3ac009

  Copy full SHA for f3ac009

• fix npe when serializing null arrays

  Show description for 2bb2cb6
  ghzdude

  committed
  2bb2cb6

  Copy full SHA for 2bb2cb6

• no need to sync energy container

  ghzdude

  committed
  c118276

  Copy full SHA for c118276

• add helper method for array access

  ghzdude

  committed
  6e48da9

  Copy full SHA for 6e48da9

• address todo for dynamic color tooltip

  ghzdude

  committed
  84b93e1

  Copy full SHA for 84b93e1

• this class is no longer necessary

  ghzdude

  committed
  c68532c

  Copy full SHA for c68532c

• add method overload

  ghzdude

  committed
  c921795

  Copy full SHA for c921795

• simplify DrawableSerializer

  Show description for 36c74db
  ghzdude

  committed
  36c74db

  Copy full SHA for 36c74db

• add method for additional children to the screen

  ghzdude

  committed
  533ac5f

  Copy full SHA for 533ac5f

• remove custom screen

  Show description for 65e8851
  ghzdude

  committed
  65e8851

  Copy full SHA for 65e8851

• remove unused method

  ghzdude

  committed
  d4caac7

  Copy full SHA for d4caac7

• Move the PSS to the new MUI2 display text methods

  

  Zorbatron

  authored and

  ghzdude

  committed
  707f70c

  Copy full SHA for 707f70c

• simplify progress bars a bit

  Show description for 278c688
  ghzdude

  committed
  278c688

  Copy full SHA for 278c688

• add extra space to lines

  ghzdude

  committed
  d464f0d

  Copy full SHA for d464f0d

• Pass guiData to MultiblockUIFactory#createFlexButton

  

  Zorbatron

  authored and

  ghzdude

  committed
  df962e6

  Copy full SHA for df962e6

• move trifunction back to bifunction and remove panel parameter

  Show description for 3f595e2
  ghzdude

  committed
  3f595e2

  Copy full SHA for 3f595e2

• fix rebase

  ghzdude

  committed
  4c9d39d

  Copy full SHA for 4c9d39d

• fix formatting

  ghzdude

  committed
  b50a5b2

  Copy full SHA for b50a5b2

• add note

  ghzdude

  committed
  299f52e

  Copy full SHA for 299f52e

• fix prev duration being zero

  ghzdude

  committed
  ef917c9

  Copy full SHA for ef917c9

• add string with formatting and number method to KeyUtil

  Show description for a7d81fc
  ghzdude

  committed
  a7d81fc

  Copy full SHA for a7d81fc

• spotless

  ghzdude

  committed
  c4b42fa

  Copy full SHA for c4b42fa

• cleanup and new voltage key methods

  ghzdude

  committed
  01310aa

  Copy full SHA for 01310aa

• add status tooltip for fusion reactor

  ghzdude

  committed
  c4139f0

  Copy full SHA for c4139f0

• fix format number with precision

  Show description for be94f31
  ghzdude

  committed
  be94f31

  Copy full SHA for be94f31

• add runnable to update structure formed for error/warning builders

  Show description for b263f75
  ghzdude

  committed
  b263f75

  Copy full SHA for b263f75

• more cleanup 2.0

  ghzdude

  committed
  4a39fe8

  Copy full SHA for 4a39fe8

• simplify item bus grid construction

  ghzdude

  committed
  3864b05

  Copy full SHA for 3864b05

• actually mark dirty on change

  Show description for 11edc7a
  ghzdude

  committed
  11edc7a

  Copy full SHA for 11edc7a

• add hpca grid to screen

  ghzdude

  committed
  0dfce00

  Copy full SHA for 0dfce00

• Merge branch 'master' into tc/mui2-multis

  Zorbatron

  committed
  9ee8b2c

  Copy full SHA for 9ee8b2c

• Mostly working multi miner port

  Zorbatron

  committed
  51e68c1

  Copy full SHA for 51e68c1

Commits on Feb 4, 2025

• fix mine pos for large miner

  ghzdude

  committed
  84431a1

  Copy full SHA for 84431a1

• Finish off the large miner.

  Show description for 041ea73
  Zorbatron

  committed
  041ea73

  Copy full SHA for 041ea73

• Remove MUI0 methods from FuelMultiblockController, MetaTileEntityCrackingUnit, MetaTileEntityElectricBlastFurnace, MetaTileEntityLargeBoiler, MetaTileEntityLargeCombustionEngine, MetaTileEntityLarg…

  Show description for 9140eee
  Zorbatron

  committed
  9140eee

  Copy full SHA for 9140eee

• spotless

  Zorbatron

  committed
  363df3c

  Copy full SHA for 363df3c

• Move RecipeMapSteamMultiblockController to the MUI2 methods.

  Zorbatron

  committed
  a27e8b8

  Copy full SHA for a27e8b8

• AT to MUI2

  Zorbatron

  committed
  9943c39

  Copy full SHA for 9943c39

• Cleanroom mui2-ified + move the order of some text around to make more sense (to me )

  Zorbatron

  committed
  a089a9e

  Copy full SHA for a089a9e

• data bank

  Zorbatron

  committed
  c39de92

  Copy full SHA for c39de92

• network switch

  Zorbatron

  committed
  d7d02dc

  Copy full SHA for d7d02dc

• remove old mui0 methods from HPCA

  Zorbatron

  committed
  e8b8bcc

  Copy full SHA for e8b8bcc

• Fluid Drill multiblock

  Zorbatron

  committed
  26ff967

  Copy full SHA for 26ff967

• Mark handleDisplayClick as deprecated

  Zorbatron

  committed
  319b2c6

  Copy full SHA for 319b2c6

• Central Monitor kinda ish not really

  Zorbatron

  committed
  10cb1e4

  Copy full SHA for 10cb1e4

• spotless

  Zorbatron

  committed
  ee3d42d

  Copy full SHA for ee3d42d

• move getFluidIKey to KeyUtil and rename

  Show description for d326fd4
  ghzdude

  committed
  d326fd4

  Copy full SHA for d326fd4

• use number method and add note

  ghzdude

  committed
  10d25b0

  Copy full SHA for 10d25b0

Commits on Feb 5, 2025

• Move the status line to be more consistent with other multiblocks and use KeyUtil.number for the other two lines.

  Zorbatron

  committed
  6ba7ff8

  Copy full SHA for 6ba7ff8

• handle translation on server

  ghzdude

  committed
  85f59d4

  Copy full SHA for 85f59d4