Skip to content

[MUI2] Central Monitor fixes #4707

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
gustovafing merged 2 commits into from
Mar 8, 2026
Merged

[MUI2] Central Monitor fixes #4707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
87340ee
fixes (i spent way too long finding the cause of the bug)
TarLaboratories Mar 2, 2026
82cc215
spotless
TarLaboratories Mar 2, 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
5 changes: 2 additions & 3 deletions src/main/java/com/gregtechceu/gtceu/api/item/component/IMonitorModuleItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import com.gregtechceu.gtceu.api.mui.base.IPanelHandler;
import com.gregtechceu.gtceu.api.mui.value.sync.PanelSyncManager;
import com.gregtechceu.gtceu.api.placeholder.PlaceholderContext;
import com.gregtechceu.gtceu.client.mui.screen.ModularPanel;
import com.gregtechceu.gtceu.client.renderer.monitor.IMonitorRenderer;
import com.gregtechceu.gtceu.common.machine.multiblock.electric.CentralMonitorMachine;
import com.gregtechceu.gtceu.common.machine.multiblock.electric.monitor.MonitorGroup;
Expand All @@ -18,8 +17,8 @@ default void tickInPlaceholder(ItemStack stack, PlaceholderContext context) {}

IMonitorRenderer getRenderer(ItemStack stack, CentralMonitorMachine machine, MonitorGroup group);

ModularPanel createModularPanel(ItemStack stack, CentralMonitorMachine machine, MonitorGroup group,
PanelSyncManager syncManager, IPanelHandler panelHandler);
IPanelHandler createModularPanel(ItemStack stack, CentralMonitorMachine machine, MonitorGroup group,
PanelSyncManager syncManager);

default String getType() {
return "unknown";
Expand Down
13 changes: 10 additions & 3 deletions src/main/java/com/gregtechceu/gtceu/api/mui/widgets/textfield/CodeEditorWidget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
package com.gregtechceu.gtceu.api.mui.widgets.textfield;

import com.gregtechceu.gtceu.api.mui.base.value.ISyncOrValue;
import com.gregtechceu.gtceu.api.mui.value.sync.GenericListSyncHandler;
import com.gregtechceu.gtceu.api.mui.value.sync.PanelSyncManager;
import com.gregtechceu.gtceu.api.mui.value.sync.StringSyncValue;
import com.gregtechceu.gtceu.client.mui.screen.viewport.ModularGuiContext;
import com.gregtechceu.gtceu.common.mui.GTGuiTextures;
import com.gregtechceu.gtceu.utils.GTUtil;
Expand Down Expand Up @@ -47,11 +48,17 @@ public class CodeEditorWidget<W extends CodeEditorWidget<W, T>, T> extends TextE

public CodeEditorWidget() {}

public CodeEditorWidget(@Nullable LanguageDefinition<T> language, PanelSyncManager panelSyncManager) {
public CodeEditorWidget(@Nullable LanguageDefinition<T> language) {
this.language = language;
GenericListSyncHandler<Component> formattedTextSync = new GenericListSyncHandler<>(
this::getTextAsComponents, this::formattedText, ByteBufAdapters.COMPONENT);
panelSyncManager.syncValue("formatted_code", formattedTextSync);
setSyncOrValue(formattedTextSync);
}

@Override
public boolean isValidSyncOrValue(@NotNull ISyncOrValue syncOrValue) {
return syncOrValue.isTypeOrEmpty(GenericListSyncHandler.class) ||
syncOrValue.isTypeOrEmpty(StringSyncValue.class);
}

@Override
Expand Down
186 changes: 94 additions & 92 deletions src/main/java/com/gregtechceu/gtceu/api/placeholder/PlaceholderHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,7 @@
import com.gregtechceu.gtceu.api.mui.drawable.BorderDrawable;
import com.gregtechceu.gtceu.api.mui.utils.Alignment;
import com.gregtechceu.gtceu.api.mui.value.StringValue;
import com.gregtechceu.gtceu.api.mui.value.sync.DoubleSyncValue;
import com.gregtechceu.gtceu.api.mui.value.sync.InteractionSyncHandler;
import com.gregtechceu.gtceu.api.mui.value.sync.PanelSyncManager;
import com.gregtechceu.gtceu.api.mui.value.sync.SyncHandlers;
import com.gregtechceu.gtceu.api.mui.value.sync.*;
import com.gregtechceu.gtceu.api.mui.widgets.ButtonWidget;
import com.gregtechceu.gtceu.api.mui.widgets.SortableListWidget;
import com.gregtechceu.gtceu.api.mui.widgets.TextWidget;
Expand Down Expand Up @@ -283,108 +280,113 @@ public static Widget getPlaceholderHandlerUI(String filter) {
return out;
}

public static Flow createPlaceholderEditor(PanelSyncManager syncManager,
PlaceholderContext ctx,
IStringValue<?> code,
@Nullable DoubleSyncValue scaleDouble,
@Nullable IIntValue<?> updateInterval,
@Nullable IBoolValue<?> pause,
@Nullable Runnable updateText) {
public static IPanelHandler createPlaceholderEditor(String name, PanelSyncManager syncManager,
PlaceholderContext ctx,
IStringValue<?> code,
@Nullable DoubleSyncValue scaleDouble,
@Nullable IIntValue<?> updateInterval,
@Nullable IBoolValue<?> pause,
@Nullable Runnable updateText) {
IPanelHandler helpPanel = syncManager.syncedPanel("placeholder_language_help",
true,
(syncManager1, panelHandler1) -> createHelpPanel(syncManager1));
(syncManager1, panelHandler1) -> createHelpPanel());
InteractionSyncHandler runCodeOnce = new InteractionSyncHandler();
if (updateText != null) runCodeOnce.setOnMousePressed(mouseData -> updateText.run());
syncManager.syncValue("run_code_sync_handler", runCodeOnce);
// because the args are nullable, intellij complains about everything, even though childIf is used
// noinspection DataFlowIssue
return Flow.row()
.childIf(ctx.itemStackHandler() != null, () -> Flow.column()
.coverChildren()
.paddingLeft(4)
.children(
ctx.itemStackHandler().getSlots(),
i -> new ItemSlot()
.slot(ctx.itemStackHandler(), i)
.addTooltipLine(
IKey.lang("gtceu.gui.computer_monitor_cover.slot_tooltip", i))))
.child(Flow.column()
.widthRel(.8f)
.padding(5)
.child(Flow.row()
.height(20)
.childIf(scaleDouble != null,
() -> new TextWidget<>(IKey.lang("gtceu.gui.central_monitor.text_scale")))
.childIf(scaleDouble != null, () -> new TextFieldWidget()
.setNumbersDouble(x -> Math.max(x, 0))
.setDefaultNumber(1.0)
.value(scaleDouble)
.marginLeft(4))
.childIf(updateInterval != null,
() -> new TextWidget<>(
IKey.lang("gtceu.gui.computer_monitor_cover.update_interval")))
.childIf(updateInterval != null, () -> new TextFieldWidget()
.setNumbers(1, 1000)
.setDefaultNumber(1)
.value(SyncHandlers.string(
() -> String.valueOf(updateInterval.getIntValue()),
s -> updateInterval.setIntValue(Integer.parseInt(s))))
.marginLeft(4))
.childIf(pause != null, () -> new ToggleButton()
.value(pause)
.background(false, GTGuiTextures.PAUSE)
.background(true, GTGuiTextures.PLAY)
.addTooltip(false, IKey.lang("gtceu.gui.central_monitor.pause"))
.addTooltip(true, IKey.lang("gtceu.gui.central_monitor.resume"))
.margin(4))
.childIf(updateText != null, () -> new ButtonWidget<>()
.background(GTGuiTextures.RIGHTLOAD)
.hoverBackground(GTGuiTextures.RIGHTLOAD, new BorderDrawable())
.addTooltipLine(IKey.lang("gtceu.gui.central_monitor.update_once"))
.syncHandler("run_code_sync_handler"))
.child(new ButtonWidget<>()
.background(GTGuiTextures.HELP)
.hoverBackground(GTGuiTextures.HELP, new BorderDrawable())
.margin(4)
.onMousePressed((mouseX, mouseY, button) -> {
helpPanel.openPanel();
return true;
})))
.child(new CodeEditorWidget<>(PlaceholderHandler.LANG_DEFINITION, syncManager)
.value(code)
.langContext(ctx)
.widthRel(.95f)
.heightRelOffset(() -> 1, -25)))
.child(new SortableListWidget<String>()
.widthRel(.2f)
.paddingBottom(5)
.excludeAreaInRecipeViewer()
.children(PlaceholderHandler.getAllPlaceholderNames()
.stream()
.sorted()
.map(SortableListWidget.Item::new)
.map(w -> w
.child(new TextWidget<>(w.getWidgetValue())
.sizeRel(1)
.alignment(Alignment.CENTER))
.tooltip(new RichTooltip()
.addDrawableLines(LangHandler
.getSingleOrMultiLang(
"gtceu.placeholder_info." + w.getWidgetValue())
.stream()
.map(IKey::lang)
.map(key -> (IDrawable) key)
.toList())))
.toList()));
return syncManager.syncedPanel(name, true, (psm, handler) -> new ModularPanel(name)
.size(400, 250)
.resizeableOnDrag(true)
.excludeAreaInRecipeViewer()
.child(Flow.row()
.childIf(ctx.itemStackHandler() != null, () -> Flow.column()
.coverChildren()
.paddingLeft(4)
.children(
ctx.itemStackHandler().getSlots(),
i -> new ItemSlot()
.slot(ctx.itemStackHandler(), i)
.addTooltipLine(
IKey.lang("gtceu.gui.computer_monitor_cover.slot_tooltip", i))))
.child(Flow.column()
.widthRel(.8f)
.padding(5)
.child(Flow.row()
.height(20)
.childIf(scaleDouble != null,
() -> new TextWidget<>(
IKey.lang("gtceu.gui.central_monitor.text_scale")))
.childIf(scaleDouble != null, () -> new TextFieldWidget()
.setNumbersDouble(x -> Math.max(x, 0))
.setDefaultNumber(1.0)
.value(scaleDouble)
.marginLeft(4))
.childIf(updateInterval != null,
() -> new TextWidget<>(
IKey.lang("gtceu.gui.computer_monitor_cover.update_interval")))
.childIf(updateInterval != null, () -> new TextFieldWidget()
.setNumbers(1, 1000)
.setDefaultNumber(1)
.value(SyncHandlers.string(
() -> String.valueOf(updateInterval.getIntValue()),
s -> updateInterval.setIntValue(Integer.parseInt(s))))
.marginLeft(4))
.childIf(pause != null, () -> new ToggleButton()
.value(pause)
.background(false, GTGuiTextures.PAUSE)
.background(true, GTGuiTextures.PLAY)
.addTooltip(false, IKey.lang("gtceu.gui.central_monitor.pause"))
.addTooltip(true, IKey.lang("gtceu.gui.central_monitor.resume"))
.margin(4))
.childIf(updateText != null, () -> new ButtonWidget<>()
.background(GTGuiTextures.RIGHTLOAD)
.hoverBackground(GTGuiTextures.RIGHTLOAD, new BorderDrawable())
.addTooltipLine(IKey.lang("gtceu.gui.central_monitor.update_once"))
.syncHandler("run_code_sync_handler"))
.child(new ButtonWidget<>()
.background(GTGuiTextures.HELP)
.hoverBackground(GTGuiTextures.HELP, new BorderDrawable())
.margin(4)
.onMousePressed((mouseX, mouseY, button) -> {
helpPanel.openPanel();
return true;
})))
.child(new CodeEditorWidget<>(PlaceholderHandler.LANG_DEFINITION)
.value(code)
.langContext(ctx)
.widthRel(.95f)
.heightRelOffset(1, -25)))
.child(new SortableListWidget<String>()
.widthRel(.2f)
.paddingBottom(5)
.excludeAreaInRecipeViewer()
.children(PlaceholderHandler.getAllPlaceholderNames()
.stream()
.sorted()
.map(SortableListWidget.Item::new)
.map(w -> w
.child(new TextWidget<>(w.getWidgetValue())
.sizeRel(1)
.align(Alignment.CENTER))
.tooltip(new RichTooltip()
.addDrawableLines(LangHandler
.getSingleOrMultiLang(
"gtceu.placeholder_info." + w.getWidgetValue())
.stream()
.map(IKey::lang)
.map(key -> (IDrawable) key)
.toList())))
.toList()))));
}

public static ModularPanel createHelpPanel(PanelSyncManager syncManager) {
public static ModularPanel createHelpPanel() {
return new ModularPanel("placeholder_language_help")
.size(500, 250)
.child(Flow.column()
.padding(5)
.child(new TextWidget<>(IKey.lang("gtceu.gui.central_monitor.text_module_help")))
.child(new CodeEditorWidget<>(LANG_DEFINITION, syncManager)
.child(new CodeEditorWidget<>(LANG_DEFINITION)
.padding(5)
.widthRel(.95f)
.height(100)
Expand Down
6 changes: 2 additions & 4 deletions src/main/java/com/gregtechceu/gtceu/common/data/GTPlaceholders.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,12 +138,10 @@ public boolean isView() {
public MultiLineComponent apply(PlaceholderContext ctx,
List<MultiLineComponent> args) throws PlaceholderException {
String expression = args.stream().map(MultiLineComponent::toString).reduce("", (a, b) -> a + b);
ParseResult result = GTMath.parseExpression(expression, true);
ParseResult result = GTMath.parseExpression(expression, 0, true);
if (result.isFailure())
throw new PlaceholderException(result.getError().toString());
double res = (double) result.getResult().getValue();
if ((int) res == res) return MultiLineComponent.literal((int) res);
return MultiLineComponent.literal(result.getResult().toString());
return MultiLineComponent.literal(result.getResult().getNumberValue().toString());
}

@Override
Expand Down
15 changes: 8 additions & 7 deletions src/main/java/com/gregtechceu/gtceu/common/item/modules/GuiModuleBehaviour.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,13 @@ public IMonitorRenderer getRenderer(ItemStack stack, CentralMonitorMachine machi
}

@Override
public ModularPanel createModularPanel(ItemStack stack, CentralMonitorMachine machine, MonitorGroup group,
PanelSyncManager syncManager, IPanelHandler panelHandler) {
return new ModularPanel("gui_module_info")
.coverChildren()
.child(new TextWidget<>(IKey.lang("gtceu.gui.central_monitor.gui_module_info"))
.height(50)
.width(200));
public IPanelHandler createModularPanel(ItemStack stack, CentralMonitorMachine machine, MonitorGroup group,
PanelSyncManager syncManager) {
return syncManager.syncedPanel("gui_module_" + group.getName(), true,
(psm, handler) -> new ModularPanel("gui_module_info")
.coverChildren()
.child(new TextWidget<>(IKey.lang("gtceu.gui.central_monitor.gui_module_info"))
.height(50)
.width(200)));
}
}
Loading