Skip to content

[MUI2] Pump Machine #4357

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] Pump Machine #4357

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
95e9191
mui for pump machine
zetrock1 Dec 22, 2025
6110389
margin
zetrock1 Dec 22, 2025
a56d88c
Merge branch 'mui2-refactor' into mui2-pump-machine
zetrock1 Dec 23, 2025
ed557f9
fix formatting
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
96 changes: 73 additions & 23 deletions src/main/java/com/gregtechceu/gtceu/common/machine/electric/PumpMachine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,42 @@
import com.gregtechceu.gtceu.api.GTValues;
import com.gregtechceu.gtceu.api.capability.recipe.IO;
import com.gregtechceu.gtceu.api.gui.GuiTextures;
import com.gregtechceu.gtceu.api.gui.UITemplate;
import com.gregtechceu.gtceu.api.gui.widget.TankWidget;
import com.gregtechceu.gtceu.api.gui.widget.ToggleButtonWidget;
import com.gregtechceu.gtceu.api.item.tool.GTToolType;
import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity;
import com.gregtechceu.gtceu.api.machine.TieredEnergyMachine;
import com.gregtechceu.gtceu.api.machine.feature.IAutoOutputFluid;
import com.gregtechceu.gtceu.api.machine.feature.IMachineLife;
import com.gregtechceu.gtceu.api.machine.feature.IUIMachine;
import com.gregtechceu.gtceu.api.machine.feature.IMuiMachine;
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.BoolValue;
import com.gregtechceu.gtceu.api.mui.value.sync.*;
import com.gregtechceu.gtceu.api.mui.widget.ParentWidget;
import com.gregtechceu.gtceu.api.mui.widgets.SlotGroupWidget;
import com.gregtechceu.gtceu.api.mui.widgets.ToggleButton;
import com.gregtechceu.gtceu.api.mui.widgets.layout.Flow;
import com.gregtechceu.gtceu.api.mui.widgets.slot.FluidSlot;
import com.gregtechceu.gtceu.client.mui.screen.ModularPanel;
import com.gregtechceu.gtceu.client.mui.screen.UISettings;
import com.gregtechceu.gtceu.common.data.GTBlocks;
import com.gregtechceu.gtceu.common.data.mui.GTMuiWidgets;
import com.gregtechceu.gtceu.common.mui.GTGuiTextures;
import com.gregtechceu.gtceu.syncsystem.annotations.RerenderOnChanged;
import com.gregtechceu.gtceu.syncsystem.annotations.SaveField;
import com.gregtechceu.gtceu.syncsystem.annotations.SyncToClient;
import com.gregtechceu.gtceu.utils.FormattingUtil;

import com.lowdragmc.lowdraglib.gui.modular.ModularUI;
import com.lowdragmc.lowdraglib.gui.texture.ResourceTexture;
import com.lowdragmc.lowdraglib.gui.widget.ImageWidget;
import com.lowdragmc.lowdraglib.gui.widget.LabelWidget;

import net.minecraft.MethodsReturnNonnullByDefault;
import net.minecraft.Util;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.core.Vec3i;
import net.minecraft.network.chat.Component;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.util.RandomSource;
import net.minecraft.world.entity.player.Player;
Expand Down Expand Up @@ -57,7 +68,7 @@

@ParametersAreNonnullByDefault
@MethodsReturnNonnullByDefault
public class PumpMachine extends TieredEnergyMachine implements IAutoOutputFluid, IUIMachine, IMachineLife {
public class PumpMachine extends TieredEnergyMachine implements IAutoOutputFluid, IMuiMachine, IMachineLife {

public static final int BASE_PUMP_RADIUS = 16;
public static final int EXTRA_PUMP_RADIUS = 4;
Expand Down Expand Up @@ -562,21 +573,60 @@ private int getPumpingCycleLength() {
// ********** Gui ***********//
//////////////////////////////////////
@Override
public ModularUI createUI(Player entityPlayer) {
return new ModularUI(176, 166, this, entityPlayer)
.background(GuiTextures.BACKGROUND)
.widget(new ImageWidget(7, 16, 81, 55, GuiTextures.DISPLAY))
.widget(new LabelWidget(11, 20, "gtceu.gui.fluid_amount"))
.widget(new LabelWidget(11, 30, () -> cache.getFluidInTank(0).getAmount() + "").setTextColor(-1)
.setDropShadow(true))
.widget(new LabelWidget(6, 6, getBlockState().getBlock().getDescriptionId()))
.widget(new TankWidget(cache.getStorages()[0], 90, 35, true, true)
.setBackground(GuiTextures.FLUID_SLOT))
.widget(new ToggleButtonWidget(7, 53, 18, 18,
GuiTextures.BUTTON_FLUID_OUTPUT, this::isAutoOutputFluids, this::setAutoOutputFluids)
.setShouldUseBaseBackground()
.setTooltipText("gtceu.gui.fluid_auto_output.tooltip"))
.widget(UITemplate.bindPlayerInventory(entityPlayer.getInventory(), GuiTextures.SLOT, 7, 84, true));
public ModularPanel buildUI(PosGuiData data, PanelSyncManager syncManager, UISettings settings) {
IntSyncValue bucketSyncer = new IntSyncValue(() -> cache.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)
// Box that has the display texture BG +
// the buttons / text / etc
.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.row()
.margin(4, 0, 41, 0)
.coverChildren()
.child(createAutoOutputFluidButton(syncManager)))
.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 ToggleButton createAutoOutputFluidButton(PanelSyncManager syncManager) {
BooleanSyncValue fluidOutputs = new BooleanSyncValue(this::isAutoOutputFluids,
this::setAutoOutputFluids);
syncManager.syncValue("auto_output_fluids", fluidOutputs);
return new ToggleButton()
.value(new BoolValue.Dynamic(fluidOutputs::getBoolValue, fluidOutputs::setBoolValue))
.overlay(GTGuiTextures.BUTTON_FLUID_OUTPUT)
.tooltipAutoUpdate(true)
.tooltipBuilder((r) -> r.addLine(IKey.lang(Component.translatable("gtceu.gui.fluid_auto_output",
Component.translatable(fluidOutputs.getBoolValue() ? "cover.voiding.label.enabled" :
"cover.voiding.label.disabled")))));
}

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

//////////////////////////////////////
Expand Down