Skip to content

[MUI2] Multiblock Tank Machine #4359

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

Open
zetrock1 wants to merge 4 commits into
base: mui2-refactor
Choose a base branch
from
Open

[MUI2] Multiblock Tank Machine #4359

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7247c65
move to mui
zetrock1 Dec 22, 2025
075f155
Merge branch 'mui2-refactor' into mui2-multiblock-tank-machine
zetrock1 Dec 23, 2025
d8ba02f
fix formatting
zetrock1 Dec 23, 2025
f95c6d3
small changes
zetrock1 Dec 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 52 additions & 22 deletions .../java/com/gregtechceu/gtceu/common/machine/multiblock/electric/MultiblockTankMachine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,33 @@

import com.gregtechceu.gtceu.api.capability.recipe.IO;
import com.gregtechceu.gtceu.api.fluids.PropertyFluidFilter;
import com.gregtechceu.gtceu.api.gui.GuiTextures;
import com.gregtechceu.gtceu.api.gui.widget.TankWidget;
import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity;
import com.gregtechceu.gtceu.api.machine.feature.IFancyUIMachine;
import com.gregtechceu.gtceu.api.machine.feature.IMuiMachine;
import com.gregtechceu.gtceu.api.machine.multiblock.MultiblockControllerMachine;
import com.gregtechceu.gtceu.api.machine.trait.NotifiableFluidTank;
import com.gregtechceu.gtceu.api.mui.base.drawable.IKey;
import com.gregtechceu.gtceu.api.mui.base.widget.IWidget;
import com.gregtechceu.gtceu.api.mui.factory.PosGuiData;
import com.gregtechceu.gtceu.api.mui.utils.Alignment;
import com.gregtechceu.gtceu.api.mui.value.sync.IntSyncValue;
import com.gregtechceu.gtceu.api.mui.value.sync.PanelSyncManager;
import com.gregtechceu.gtceu.api.mui.value.sync.SyncHandlers;
import com.gregtechceu.gtceu.api.mui.widget.ParentWidget;
import com.gregtechceu.gtceu.api.mui.widgets.SlotGroupWidget;
import com.gregtechceu.gtceu.api.mui.widgets.layout.Flow;
import com.gregtechceu.gtceu.api.mui.widgets.slot.FluidSlot;
import com.gregtechceu.gtceu.api.transfer.fluid.IFluidHandlerModifiable;
import com.gregtechceu.gtceu.client.mui.screen.ModularPanel;
import com.gregtechceu.gtceu.client.mui.screen.UISettings;
import com.gregtechceu.gtceu.common.data.mui.GTMuiWidgets;
import com.gregtechceu.gtceu.common.mui.GTGuiTextures;
import com.gregtechceu.gtceu.syncsystem.annotations.SaveField;

import com.lowdragmc.lowdraglib.gui.widget.ImageWidget;
import com.lowdragmc.lowdraglib.gui.widget.LabelWidget;
import com.lowdragmc.lowdraglib.gui.widget.Widget;
import com.lowdragmc.lowdraglib.gui.widget.WidgetGroup;
import com.gregtechceu.gtceu.utils.FormattingUtil;

import net.minecraft.MethodsReturnNonnullByDefault;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.network.chat.Component;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResult;
import net.minecraft.world.entity.player.Player;
Expand All @@ -34,7 +44,7 @@

@MethodsReturnNonnullByDefault
@ParametersAreNonnullByDefault
public class MultiblockTankMachine extends MultiblockControllerMachine implements IFancyUIMachine {
public class MultiblockTankMachine extends MultiblockControllerMachine implements IMuiMachine {

@SaveField
@Getter
Expand Down Expand Up @@ -82,20 +92,40 @@ public IFluidHandlerModifiable getFluidHandlerCap(@Nullable Direction side, bool
/////////////////////////////////////

@Override
public Widget createUIWidget() {
var group = new WidgetGroup(0, 0, 90, 63);
group.setBackground(GuiTextures.BACKGROUND_INVERSE);

group.addWidget(new ImageWidget(4, 4, 82, 55, GuiTextures.DISPLAY));
group.addWidget(new LabelWidget(8, 8, "gtceu.gui.fluid_amount"));
group.addWidget(new LabelWidget(8, 18, this::getFluidLabel).setTextColor(-1).setDropShadow(true));
group.addWidget(new TankWidget(tank.getStorages()[0], 68, 23, true, true)
.setBackground(GuiTextures.FLUID_SLOT));

return group;
public ModularPanel buildUI(PosGuiData data, PanelSyncManager syncManager, UISettings settings) {
IntSyncValue bucketSyncer = new IntSyncValue(() -> tank.getFluidInTank(0).getAmount(), (ignored) -> {});
syncManager.syncValue("bucket_amount", bucketSyncer);

return new ModularPanel(this.getDefinition().getName())
.child(
// Top half of the screen
new ParentWidget<>()
.widthRel(1)
.height(20 + 60)
.child(new ParentWidget<>()
.background(GTGuiTextures.DISPLAY)
.size(90, 63)
.align(Alignment.CENTER)
.child(IKey.lang("gtceu.gui.fluid_amount").asWidget()
.color(0xffffff)
.margin(8, 0, 8, 0))
.child(IKey.dynamic(
() -> Component.literal(
FormattingUtil.formatBuckets(bucketSyncer.getIntValue())))
.asWidget()
.color(0xffffff)
.margin(8, 0, 20, 0))
.child(Flow.column()
.margin(68, 0, 23, 0)
.coverChildren()
.child(createFluidSlot(syncManager)))))
.child(GTMuiWidgets.createTitleBar(getDefinition(), 176, GTGuiTextures.BACKGROUND))
.child(SlotGroupWidget.playerInventory(false).left(7).bottom(7));
}

private String getFluidLabel() {
return String.valueOf(tank.getFluidInTank(0).getAmount());
private IWidget createFluidSlot(PanelSyncManager syncManager) {
syncManager.syncValue("fluid_slot",
SyncHandlers.fluidSlot(tank.getStorages()[0]).controlsAmount(false));
return new FluidSlot().syncHandler("fluid_slot", 0).background(GTGuiTextures.FLUID_SLOT);
}
}