Skip to content

[MUI2] Large Boiler #4612

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

Merged
jurrejelle merged 3 commits into from
Feb 12, 2026
Merged

[MUI2] Large Boiler #4612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b21079c
Remake large boiler UI in MUI + add more options to createIntInputWit…
jurrejelle Feb 12, 2026
ecd69be
Add throttle line
jurrejelle Feb 12, 2026
95f82b7
apply 1,5 suggestion
jurrejelle Feb 12, 2026
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
37 changes: 30 additions & 7 deletions src/main/java/com/gregtechceu/gtceu/common/data/mui/GTMuiWidgets.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,17 +415,25 @@ public static <T, S extends Filter<T, S>> ParentWidget<?> createFilterRow(Filter
}

private static int getIncrementValue(MouseData data) {
int adjust = 1;
return getIncrementValue(data, 1);
}

private static int getIncrementValue(MouseData data, int step) {
int adjust = step;
if (data.shift()) adjust *= 4;
if (data.ctrl()) adjust *= 16;
if (data.alt()) adjust *= 64;
return adjust;
}

private static IKey createAdjustOverlay(boolean increment) {
return createAdjustOverlay(increment, 1);
}

private static IKey createAdjustOverlay(boolean increment, int step) {
final StringBuilder builder = new StringBuilder();
builder.append(increment ? '+' : '-');
builder.append(getIncrementValue(MouseData.create(-1)));
builder.append(getIncrementValue(MouseData.create(-1), step));

float scale = 1f;
if (builder.length() == 3) {
Expand All @@ -442,6 +450,21 @@ private static IKey createAdjustOverlay(boolean increment) {

public static ParentWidget<?> createIntInputWithButtons(IntSyncValue syncValue, IntSupplier minValue,
IntSupplier maxValue) {
return createIntInputWithButtons(syncValue, minValue, maxValue, 1, GTGuiTextures.DISPLAY);
}

public static ParentWidget<?> createIntInputWithButtons(IntSyncValue syncValue, IntSupplier minValue,
IntSupplier maxValue, int step) {
return createIntInputWithButtons(syncValue, minValue, maxValue, step, GTGuiTextures.DISPLAY);
}

public static ParentWidget<?> createIntInputWithButtons(IntSyncValue syncValue, IntSupplier minValue,
IntSupplier maxValue, IDrawable background) {
return createIntInputWithButtons(syncValue, minValue, maxValue, 1, background);
}

public static ParentWidget<?> createIntInputWithButtons(IntSyncValue syncValue, IntSupplier minValue,
IntSupplier maxValue, int step, IDrawable background) {
StringSyncValue formattedValue = new StringSyncValue(syncValue::getStringValue,
syncValue::setStringValue);

Expand All @@ -452,12 +475,12 @@ public static ParentWidget<?> createIntInputWithButtons(IntSyncValue syncValue,
.child(new ButtonWidget<>()
.left(0).width(18)
.onMousePressed((x, y, button) -> {
int val = syncValue.getIntValue() - getIncrementValue(MouseData.create(button));
int val = syncValue.getIntValue() - getIncrementValue(MouseData.create(button), step);
val = Mth.clamp(val, minValue.getAsInt(), maxValue.getAsInt());
syncValue.setIntValue(val, true, true);
return true;
})
.onUpdateListener(w -> w.overlay(createAdjustOverlay(false))))
.onUpdateListener(w -> w.overlay(createAdjustOverlay(false, step))))
.child(new TextFieldWidget()
.left(18).right(18)
.setTextAlignment(Alignment.Center)
Expand All @@ -471,16 +494,16 @@ public static ParentWidget<?> createIntInputWithButtons(IntSyncValue syncValue,
return true;
})
.value(formattedValue)
.background(GTGuiTextures.DISPLAY))
.background(background))
.child(new ButtonWidget<>()
.right(0).width(18)
.onMousePressed((x, y, button) -> {
int val = syncValue.getIntValue() + getIncrementValue(MouseData.create(button));
int val = syncValue.getIntValue() + getIncrementValue(MouseData.create(button), step);
val = Mth.clamp(val, minValue.getAsInt(), maxValue.getAsInt());
syncValue.setIntValue(val, true, true);
return true;
})
.onUpdateListener(w -> w.overlay(createAdjustOverlay(true))));
.onUpdateListener(w -> w.overlay(createAdjustOverlay(true, step))));
}

public static ParentWidget<?> createIntInputWithBucketMode(IntSyncValue intSyncValue,
Expand Down
201 changes: 163 additions & 38 deletions src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/steam/LargeBoilerMachine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,33 +3,48 @@
import com.gregtechceu.gtceu.api.GTValues;
import com.gregtechceu.gtceu.api.blockentity.BlockEntityCreationInfo;
import com.gregtechceu.gtceu.api.capability.recipe.*;
import com.gregtechceu.gtceu.api.gui.GuiTextures;
import com.gregtechceu.gtceu.api.machine.MetaMachine;
import com.gregtechceu.gtceu.api.machine.TickableSubscription;
import com.gregtechceu.gtceu.api.machine.feature.IExplosionMachine;
import com.gregtechceu.gtceu.api.machine.feature.IMuiMachine;
import com.gregtechceu.gtceu.api.machine.feature.IRecipeLogicMachine;
import com.gregtechceu.gtceu.api.machine.feature.multiblock.IDisplayUIMachine;
import com.gregtechceu.gtceu.api.machine.multiblock.WorkableMultiblockMachine;
import com.gregtechceu.gtceu.api.machine.trait.RecipeLogic;
import com.gregtechceu.gtceu.api.mui.base.drawable.IKey;
import com.gregtechceu.gtceu.api.mui.drawable.Icon;
import com.gregtechceu.gtceu.api.mui.factory.PosGuiData;
import com.gregtechceu.gtceu.api.mui.utils.Alignment;
import com.gregtechceu.gtceu.api.mui.utils.Color;
import com.gregtechceu.gtceu.api.mui.utils.MouseData;
import com.gregtechceu.gtceu.api.mui.value.sync.BooleanSyncValue;
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.StringSyncValue;
import com.gregtechceu.gtceu.api.mui.widget.ParentWidget;
import com.gregtechceu.gtceu.api.mui.widget.Widget;
import com.gregtechceu.gtceu.api.mui.widgets.ButtonWidget;
import com.gregtechceu.gtceu.api.mui.widgets.ListWidget;
import com.gregtechceu.gtceu.api.mui.widgets.SlotGroupWidget;
import com.gregtechceu.gtceu.api.mui.widgets.layout.Flow;
import com.gregtechceu.gtceu.api.mui.widgets.textfield.TextFieldWidget;
import com.gregtechceu.gtceu.api.recipe.GTRecipe;
import com.gregtechceu.gtceu.api.recipe.ingredient.FluidIngredient;
import com.gregtechceu.gtceu.api.recipe.modifier.ModifierFunction;
import com.gregtechceu.gtceu.api.recipe.modifier.RecipeModifier;
import com.gregtechceu.gtceu.api.sync_system.annotations.SaveField;
import com.gregtechceu.gtceu.api.sync_system.annotations.SyncToClient;
import com.gregtechceu.gtceu.client.mui.screen.ModularPanel;
import com.gregtechceu.gtceu.client.mui.screen.UISettings;
import com.gregtechceu.gtceu.common.data.GTMaterials;
import com.gregtechceu.gtceu.common.data.mui.GTMuiWidgets;
import com.gregtechceu.gtceu.common.mui.GTGuiTextures;
import com.gregtechceu.gtceu.common.mui.GTGuis;
import com.gregtechceu.gtceu.config.ConfigHolder;

import com.lowdragmc.lowdraglib.gui.texture.IGuiTexture;
import com.lowdragmc.lowdraglib.gui.util.ClickData;
import com.lowdragmc.lowdraglib.gui.widget.ComponentPanelWidget;

import net.minecraft.ChatFormatting;
import net.minecraft.MethodsReturnNonnullByDefault;
import net.minecraft.core.Direction;
import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.HoverEvent;
import net.minecraft.network.chat.Style;
import net.minecraft.server.TickTask;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.util.Mth;
Expand All @@ -45,7 +60,7 @@

@ParametersAreNonnullByDefault
@MethodsReturnNonnullByDefault
public class LargeBoilerMachine extends WorkableMultiblockMachine implements IExplosionMachine, IDisplayUIMachine {
public class LargeBoilerMachine extends WorkableMultiblockMachine implements IExplosionMachine, IMuiMachine {

public static final int TICKS_PER_STEAM_GENERATION = 5;

Expand Down Expand Up @@ -202,40 +217,150 @@ public static ModifierFunction recipeModifier(@NotNull MetaMachine machine, @Not
return ModifierFunction.IDENTITY;
}

public void addDisplayText(List<Component> textList) {
IDisplayUIMachine.super.addDisplayText(textList);
if (isFormed()) {
textList.add(Component.translatable("gtceu.multiblock.large_boiler.temperature",
currentTemperature + 274, maxTemperature + 274));
textList.add(Component.translatable("gtceu.multiblock.large_boiler.steam_output",
steamGenerated / TICKS_PER_STEAM_GENERATION));

var throttleText = Component.translatable("gtceu.multiblock.large_boiler.throttle",
ChatFormatting.AQUA.toString() + getThrottle() + "%")
.withStyle(Style.EMPTY.withHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT,
Component.translatable("gtceu.multiblock.large_boiler.throttle.tooltip"))));
textList.add(throttleText);

var buttonText = Component.translatable("gtceu.multiblock.large_boiler.throttle_modify");
buttonText.append(" ");
buttonText.append(ComponentPanelWidget.withButton(Component.literal("[-]"), "sub"));
buttonText.append(" ");
buttonText.append(ComponentPanelWidget.withButton(Component.literal("[+]"), "add"));
textList.add(buttonText);
}
@Override
public ModularPanel buildUI(PosGuiData data, PanelSyncManager syncManager, UISettings settings) {
var panel = GTGuis.createPanel(this, 176, 176);

panel.child(GTMuiWidgets.createTitleBar(this.getDefinition(), 176))
.child(new ParentWidget<>()
.widthRel(0.95f)
.heightRel(.45f)
.margin(4, 0)
.left(3).top(5)
.child(Flow.row()
.child(getMainTextPanel(syncManager, 170, 84))))
.child(Flow.column()
.coverChildren()
.leftRel(1.0f)
.reverseLayout(true)
.bottom(16)
.padding(0, 4, 4, 4)
.childPadding(2)
.background(GTGuiTextures.BACKGROUND.getSubArea(0.25f, 0f, 1.0f, 1.0f))
.excludeAreaInXei()
.child(GTMuiWidgets.createPowerButton(this, syncManager)))
.child(SlotGroupWidget.playerInventory(false).left(7).bottom(7));
return panel;
}

public Widget<?> getMainTextPanel(PanelSyncManager syncManager, int width, int height) {
var parentWidget = new ParentWidget<>();
var listWidget = new ListWidget<>();
listWidget
.width(width - 6)
.height(height - 6)
.childSeparator(Icon.EMPTY_2PX)
.crossAxisAlignment(Alignment.CrossAxis.START)
.alignX(Alignment.CenterLeft)
.left(3)
.top(3);
parentWidget.size(width, height)
.background(GTGuiTextures.DISPLAY);

// Machine generic sync handlers
BooleanSyncValue isFormed = syncManager.getOrCreateSyncHandler("isFormed", BooleanSyncValue.class,
() -> new BooleanSyncValue(this::isFormed));

// Large Boiler specific sync handlers
// These will not be called anywhere else, so we can create them directly instead of using
// getOrCreateSyncHandler

IntSyncValue currentTemperature = new IntSyncValue(this::getCurrentTemperature);
syncManager.syncValue("currentTemperature", currentTemperature);

IntSyncValue maxTemperature = new IntSyncValue(this::getMaxTemperature);
syncManager.syncValue("maxTemperature", maxTemperature);

IntSyncValue steamGenerated = new IntSyncValue(() -> this.steamGenerated);
syncManager.syncValue("steamGenerated", steamGenerated);

IntSyncValue throttle = new IntSyncValue(() -> this.throttle, newValue -> this.throttle = newValue);
syncManager.syncValue("throttle", throttle);

listWidget
.child(IKey.dynamic(() -> {
if (!isFormed.getBoolValue()) return Component.empty();
return Component.translatable("gtceu.multiblock.large_boiler.temperature",
currentTemperature.getIntValue() + 274, maxTemperature.getIntValue() + 274)
.withStyle(ChatFormatting.WHITE);
})
.asWidget())
.child(IKey.dynamic(() -> {
if (!isFormed.getBoolValue()) return Component.empty();
return Component.translatable("gtceu.multiblock.large_boiler.steam_output",
steamGenerated.getIntValue() / TICKS_PER_STEAM_GENERATION).withStyle(ChatFormatting.WHITE);
})
.asWidget())
.child(IKey.lang(Component.translatable("gtceu.multiblock.large_boiler.throttle_modify")
.withStyle(ChatFormatting.WHITE))
.asWidget())
.child(createIntInputWithButtons(throttle))

.setEnabledIf((widget) -> isFormed.getBoolValue());
parentWidget.child(listWidget);
return parentWidget;
}

public static ParentWidget<?> createIntInputWithButtons(IntSyncValue syncValue) {
StringSyncValue formattedValue = new StringSyncValue(syncValue::getStringValue,
syncValue::setStringValue);

return Flow.row()
.coverChildrenHeight()
.marginBottom(2)
.widthRel(1.0f)
.child(new ButtonWidget<>()
.left(0).width(18)
.onMousePressed((x, y, button) -> {
int val = syncValue.getIntValue() - getIncrementValue(MouseData.create(button));
val = Mth.clamp(val, 25, 100);
syncValue.setIntValue(val, true, true);
return true;
})
.onUpdateListener(w -> w.overlay(createAdjustOverlay(false))))
.child(new TextFieldWidget()
.left(18).right(18)
.setTextAlignment(Alignment.Center)
.setTextColor(Color.WHITE.darker(1))
.setNumbers(25, 100)
.onMouseScrolled((mouseX, mouseY, delta) -> {
int inc = (int) delta;
int val = Mth.clamp(syncValue.getIntValue() + inc, 25, 100);
syncValue.setIntValue(val, true, true);
return true;
})
.value(formattedValue))
.child(new ButtonWidget<>()
.right(0).width(18)
.onMousePressed((x, y, button) -> {
int val = syncValue.getIntValue() + getIncrementValue(MouseData.create(button));
val = Mth.clamp(val, 25, 100);
syncValue.setIntValue(val, true, true);
return true;
})
.onUpdateListener(w -> w.overlay(createAdjustOverlay(true))));
}

public void handleDisplayClick(String componentData, ClickData clickData) {
if (!clickData.isRemote) {
int result = componentData.equals("add") ? 5 : -5;
this.throttle = Mth.clamp(throttle + result, 25, 100);
this.getRecipeLogic().modifyFuelBurnTime(this.throttle);
private static IKey createAdjustOverlay(boolean increment) {
final StringBuilder builder = new StringBuilder();
builder.append(increment ? '+' : '-');
builder.append(getIncrementValue(MouseData.create(-1)));

float scale = 1f;
if (builder.length() == 3) {
scale = 0.8f;
} else if (builder.length() == 4) {
scale = 0.6f;
} else if (builder.length() > 4) {
scale = 0.5f;
}
return IKey.str(builder.toString())
.color(Color.WHITE.main)
.scale(scale);
}

@Override
public IGuiTexture getScreenTexture() {
return GuiTextures.DISPLAY_STEAM.get(maxTemperature > 800);
private static int getIncrementValue(MouseData data) {
return data.shift() ? 5 : 1;
}

public static class LargeBoilerRecipeLogic extends RecipeLogic {
Expand Down