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 many blocks to MUI2 #2624

Merged
merged 29 commits into from
Jan 29, 2025
Merged

Port many blocks to MUI2 #2624

merged 29 commits into from
Jan 29, 2025

Conversation

Zorbatron
Copy link
Member

@Zorbatron Zorbatron commented Sep 19, 2024 •
edited
Loading

What

Ports a few machines and multiblock parts to use MUI2
Currently has:

  • Muffler Hatch
  • Battery Buffer
  • Processing Array Machine Hatch
  • Block breaker
  • Research station Object Holder (Also fixes them allowing you to insert items while something is being researched)
  • Reservoir Hatch
  • Fisher
  • Primitive Pump Hatch
  • Steam Hatch
  • Buffers
  • Rotor holders

Todo:

  • Change the position of the machine name widgets when it's standardized
  • Retest blocks using GTFluidSlot once Update MUI2 dep to RC2 #2622 is merged (currently is not syncing properly)

Outcome

Progress on moving to MUI2!

@TechLord22 TechLord22 added the type: refactor Suggestion to refactor a section of code label Sep 19, 2024
@Zorbatron Zorbatron marked this pull request as ready for review January 22, 2025 01:32
@Zorbatron Zorbatron requested a review from a team as a code owner January 22, 2025 01:32
ALongStringOfNumbers
ALongStringOfNumbers reviewed Jan 23, 2025
View reviewed changes
...java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityReservoirHatch.java Outdated Show resolved Hide resolved
src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityFisher.java Outdated Show resolved Hide resolved
src/main/java/gregtech/common/metatileentities/multi/MetaTileEntityPumpHatch.java Outdated Show resolved Hide resolved
src/main/java/gregtech/common/metatileentities/multi/MetaTileEntityPumpHatch.java Show resolved Hide resolved
src/main/java/gregtech/common/metatileentities/multi/MetaTileEntityPumpHatch.java Outdated Show resolved Hide resolved
...java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityReservoirHatch.java Outdated Show resolved Hide resolved
...ain/java/gregtech/common/metatileentities/steam/multiblockpart/MetaTileEntitySteamHatch.java Show resolved Hide resolved
...ain/java/gregtech/common/metatileentities/steam/multiblockpart/MetaTileEntitySteamHatch.java Outdated Show resolved Hide resolved
...ain/java/gregtech/common/metatileentities/steam/multiblockpart/MetaTileEntitySteamHatch.java Show resolved Hide resolved
src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityBuffer.java Show resolved Hide resolved
@Zorbatron
Use custom IDrawable overlay.
6694a0d 
Fix being able to insert items into an object holder while research is in progress.
ghzdude
ghzdude reviewed Jan 26, 2025
View reviewed changes
Copy link
Contributor

@ghzdude ghzdude left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

most of the mui2 code lgtm, just a few things

...n/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityMachineHatch.java Outdated Show resolved Hide resolved
src/main/java/gregtech/api/mui/drawable/DrawableColorOverlay.java Outdated Show resolved Hide resolved
src/main/java/gregtech/api/mui/drawable/DrawableColorOverlay.java Outdated Show resolved Hide resolved
src/main/java/gregtech/api/mui/drawable/DrawableColorOverlay.java Outdated Show resolved Hide resolved
ALongStringOfNumbers
ALongStringOfNumbers reviewed Jan 27, 2025
View reviewed changes
Copy link
Contributor

@ALongStringOfNumbers ALongStringOfNumbers left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tooltip fails to update correctly in Machine Access Interface.
image

Placed in a machine, took it out, the slot retained the tooltip of the machine.

...ain/java/gregtech/common/metatileentities/steam/multiblockpart/MetaTileEntitySteamHatch.java
return GTGuis.createPanel(this, 176, 166)
.child(IKey.lang(getMetaFullName()).asWidget().pos(5, 5))
.child(SlotGroupWidget.playerInventory().left(7).bottom(7))
.child((IS_STEEL ? GTGuiTextures.DISPLAY_STEEL : GTGuiTextures.DISPLAY_BRONZE).asWidget()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can this also be handled by the theme? If needed, it can be added to the theme.

@ALongStringOfNumbers ALongStringOfNumbers merged commit abc910b into GregTechCEu:master Jan 29, 2025
3 checks passed
@Zorbatron Zorbatron deleted the zb-lotsa-mui2 branch January 29, 2025 07:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@brachy84 brachy84 brachy84 left review comments

@ghzdude ghzdude ghzdude left review comments

@ALongStringOfNumbers ALongStringOfNumbers ALongStringOfNumbers approved these changes

Assignees
No one assigned
Labels
type: refactor Suggestion to refactor a section of code
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@Zorbatron @ALongStringOfNumbers @ghzdude @brachy84 @TechLord22