Port many blocks to MUI2 #2624
Open
Port many blocks to MUI2 #2624
+522
−228
Conversation
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
(Also doesn't sync properly)
(Also doesn't sync properly)
...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
brachy84
reviewed
Jan 24, 2025
Fix being able to insert items into an object holder while research is in progress.
ghzdude
reviewed
Jan 26, 2025
Comment on lines
+83
to
+90
| .child(new ItemSlot() { | ||
|
|
||
| // Don't draw tooltip if the slot is blocked | ||
| @Override | ||
| public void drawForeground(ModularGuiContext context) { | ||
| if (!isSlotBlocked()) super.drawForeground(context); | ||
| } | ||
| } |
There was a problem hiding this comment.
you can do:
.tooltip(t -> t.setAutoUpdate(false))
.onUpdateListener(itemSlot -> {
RichTooltip tooltip = itemSlot.tooltip();
if (isSlotBlocked()) {
tooltip.buildTooltip();
tooltip.clearText();
} else if (tooltip.isEmpty()) {
tooltip.markDirty();
}
})to mimic and replace the tooltip override
|
|
||
| import java.util.function.Supplier; | ||
|
|
||
| public class DrawableColorOverlay implements IDrawable { |
There was a problem hiding this comment.
imho, usages of this class could just be a DynamicDrawable or lambda, maybe placed in GTGuiTextures.
Comment on lines
+12
to
+13
| private final Supplier<Boolean> drawOverlay; | ||
| private final Supplier<Integer> OVERLAY_COLOR; |
There was a problem hiding this comment.
if this class is kept, these should be primitive suppliers, and OVERLAY_COLOR needs to be camel case format and marked nullable.
Comment on lines
+25
to
+29
| public void draw(GuiContext context, int x, int y, int width, int height, WidgetTheme widgetTheme) { | ||
| if (drawOverlay.get()) { | ||
| GuiDraw.drawRect(x, y, width, height, OVERLAY_COLOR.get()); | ||
| } | ||
| } |
There was a problem hiding this comment.
if OVERLAY_COLOR is null, the color from the widget theme should be used
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What
Ports a few machines and multiblock parts to use MUI2
Currently has:
Todo:
GTFluidSlotonce Update MUI2 dep to RC2 #2622 is merged (currently is not syncing properly)Outcome
Progress on moving to MUI2!