Skip to content

Port singleblock miners to MUI2 and fix lang error #2878

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
ALongStringOfNumbers merged 9 commits into from
Nov 17, 2025
Merged

Port singleblock miners to MUI2 and fix lang error #2878

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ef2b812
Separate out each coordinate axis into its own line.
Zorbatron Oct 29, 2025
454517d
Port LV-HV miners to MUI2
Zorbatron Oct 29, 2025
ac8b10a
Steam miner
Zorbatron Oct 29, 2025
60dfb04
Don't say "no steam" when vent is blocked
Zorbatron Oct 29, 2025
42e9a89
Merge branch 'master' into zb/miner-mui2-and-lang-fix
Zorbatron Nov 13, 2025
38af9e4
Fix master merge-in
Zorbatron Nov 13, 2025
4884f94
Re-enable slot textures for alternate themes
Zorbatron Nov 15, 2025
92835d8
Only show the mining position when the miner is actually working
Zorbatron Nov 15, 2025
80338e0
Have a more colorful text display
Zorbatron Nov 15, 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
43 changes: 43 additions & 0 deletions src/main/java/gregtech/api/capability/IMiner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,22 @@
package gregtech.api.capability;

import gregtech.common.mui.widget.ScrollableTextWidget;

import net.minecraftforge.items.IItemHandlerModifiable;

import codechicken.lib.vec.Cuboid6;
import com.cleanroommc.modularui.drawable.UITexture;
import com.cleanroommc.modularui.drawable.text.RichText;
import com.cleanroommc.modularui.utils.Alignment;
import com.cleanroommc.modularui.value.sync.PanelSyncManager;
import com.cleanroommc.modularui.value.sync.SyncHandlers;
import com.cleanroommc.modularui.widget.Widget;
import com.cleanroommc.modularui.widgets.layout.Flow;
import com.cleanroommc.modularui.widgets.layout.Grid;
import com.cleanroommc.modularui.widgets.slot.ItemSlot;
import org.jetbrains.annotations.NotNull;

import java.util.function.Consumer;

public interface IMiner {

Expand All @@ -19,4 +35,31 @@ default boolean drainFluid(boolean simulate) {
default int getWorkingArea(int maximumRadius) {
return maximumRadius * 2 + 1;
}

default Widget<?> createMinerWidgets(@NotNull PanelSyncManager panelSyncManager,
@NotNull IItemHandlerModifiable inventory, int inventorySize,
@NotNull UITexture textDisplayBackground,
@NotNull Consumer<RichText> textBuilder) {
int rowSize = (int) Math.sqrt(inventorySize);
panelSyncManager.registerSlotGroup("export_items", rowSize);

return Flow.row()
.coverChildren()
.child(new ScrollableTextWidget()
.size(105 - 3 * 2, 75 - 3 * 2)
.autoUpdate(true)
.alignment(Alignment.TopLeft)
.textBuilder(textBuilder)
.background(textDisplayBackground.asIcon()
.margin(-3)))
.child(new Grid()
.marginLeft(6)
.minElementMargin(0)
.minColWidth(18)
.minRowHeight(18)
.mapTo(rowSize, inventorySize, index -> new ItemSlot()
.slot(SyncHandlers.itemSlot(inventory, index)
.slotGroup("export_items")
.accessibility(false, true))));
}
}
9 changes: 3 additions & 6 deletions src/main/java/gregtech/api/mui/GTGuiTheme.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,7 @@ private static String gregtech(String s) {
public static final GTGuiTheme BRONZE = templateBuilder(Names.BRONZE)
.parent(Names.STANDARD)
.panel(IDs.BRONZE_BACKGROUND)
// .itemSlot(GTGuiTextures.IDs.BRONZE_SLOT)
// .fluidSlot(GTGuiTextures.IDs.BRONZE_SLOT)
.itemSlot(GTGuiTextures.IDs.BRONZE_SLOT)
.displayBackground(IDs.DISPLAY_BRONZE)
.button(IDs.BRONZE_BUTTON)
.color(Colors.BRONZE)
Expand All @@ -84,8 +83,7 @@ private static String gregtech(String s) {
.parent(Names.STANDARD)
.panel(IDs.STEEL_BACKGROUND)
.textColor(Color.WHITE.darker(1))
// .itemSlot(GTGuiTextures.IDs.STEEL_SLOT)
// .fluidSlot(GTGuiTextures.IDs.STEEL_SLOT)
.itemSlot(GTGuiTextures.IDs.STEEL_SLOT)
.displayBackground(IDs.DISPLAY_STEEL)
.button(IDs.STEEL_BUTTON)
.simpleToggleButton(IDs.STEEL_BUTTON, IDs.STEEL_BUTTON_SELECTED,
Expand All @@ -98,8 +96,7 @@ private static String gregtech(String s) {
.panel(IDs.PRIMITIVE_BACKGROUND)
.textColor(Color.WHITE.darker(1))
.color(Colors.PRIMITIVE)
// .itemSlot(GTGuiTextures.IDs.PRIMITIVE_SLOT)
// .fluidSlot(GTGuiTextures.IDs.PRIMITIVE_SLOT)
.itemSlot(GTGuiTextures.IDs.PRIMITIVE_SLOT)
.build();

protected final String themeId;
Expand Down
26 changes: 26 additions & 0 deletions src/main/java/gregtech/api/mui/TextStandards.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package gregtech.api.mui;

import gregtech.api.util.KeyUtil;

import net.minecraft.util.text.TextFormatting;

import com.cleanroommc.modularui.api.drawable.IKey;

public final class TextStandards {

public static class Colors {

public static final TextFormatting MACHINE_WORKING = TextFormatting.GREEN;
public static final TextFormatting MACHINE_DONE = TextFormatting.GREEN;
public static final TextFormatting MACHINE_PAUSED = TextFormatting.GOLD;
public static final TextFormatting NO_OUTPUT_SPACE = TextFormatting.RED;
public static final TextFormatting STEAM_VENT_BLOCKED = TextFormatting.RED;
public static final TextFormatting NO_POWER = TextFormatting.RED;
}

public static class Keys {

public static final IKey MACHINE_PAUSED = KeyUtil.lang(Colors.MACHINE_PAUSED,
"gregtech.multiblock.work_paused");
}
}
156 changes: 90 additions & 66 deletions src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityMiner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
import gregtech.api.capability.impl.EnergyContainerHandler;
import gregtech.api.capability.impl.NotifiableItemStackHandler;
import gregtech.api.capability.impl.miner.MinerLogic;
import gregtech.api.gui.GuiTextures;
import gregtech.api.gui.ModularUI;
import gregtech.api.gui.widgets.AdvancedTextWidget;
import gregtech.api.gui.widgets.SlotWidget;
import gregtech.api.items.itemhandlers.GTItemStackHandler;
import gregtech.api.metatileentity.IDataInfoProvider;
import gregtech.api.metatileentity.MetaTileEntity;
import gregtech.api.metatileentity.TieredMetaTileEntity;
import gregtech.api.metatileentity.interfaces.IGregTechTileEntity;
import gregtech.api.mui.GTGuiTextures;
import gregtech.api.mui.GTGuis;
import gregtech.api.mui.TextStandards;
import gregtech.api.util.KeyUtil;
import gregtech.client.renderer.texture.Textures;
import gregtech.core.sound.GTSoundEvents;

Expand All @@ -26,7 +26,6 @@
import net.minecraft.network.PacketBuffer;
import net.minecraft.util.*;
import net.minecraft.util.text.ITextComponent;
import net.minecraft.util.text.Style;
import net.minecraft.util.text.TextComponentTranslation;
import net.minecraft.util.text.TextFormatting;
import net.minecraft.world.World;
Expand All @@ -40,6 +39,15 @@
import codechicken.lib.render.CCRenderState;
import codechicken.lib.render.pipeline.IVertexOperation;
import codechicken.lib.vec.Matrix4;
import com.cleanroommc.modularui.api.drawable.IKey;
import com.cleanroommc.modularui.factory.PosGuiData;
import com.cleanroommc.modularui.screen.ModularPanel;
import com.cleanroommc.modularui.screen.UISettings;
import com.cleanroommc.modularui.value.sync.BooleanSyncValue;
import com.cleanroommc.modularui.value.sync.IntSyncValue;
import com.cleanroommc.modularui.value.sync.PanelSyncManager;
import com.cleanroommc.modularui.widgets.SlotGroupWidget;
import com.cleanroommc.modularui.widgets.slot.ItemSlot;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

Expand Down Expand Up @@ -96,69 +104,85 @@ public void renderMetaTileEntity(CCRenderState renderState, Matrix4 translation,
}

@Override
protected ModularUI createUI(@NotNull EntityPlayer entityPlayer) {
int rowSize = (int) Math.sqrt(inventorySize);
ModularUI.Builder builder = new ModularUI.Builder(GuiTextures.BACKGROUND, 195, 176);
builder.bindPlayerInventory(entityPlayer.inventory, 94);

if (getTier() == GTValues.HV) {
for (int y = 0; y < rowSize; y++) {
for (int x = 0; x < rowSize; x++) {
int index = y * rowSize + x;
builder.widget(
new SlotWidget(exportItems, index, 151 - rowSize * 9 + x * 18, 18 + y * 18, true, false)
.setBackgroundTexture(GuiTextures.SLOT));
}
}
} else {
for (int y = 0; y < rowSize; y++) {
for (int x = 0; x < rowSize; x++) {
int index = y * rowSize + x;
builder.widget(
new SlotWidget(exportItems, index, 142 - rowSize * 9 + x * 18, 18 + y * 18, true, false)
.setBackgroundTexture(GuiTextures.SLOT));
}
}
}

builder.image(7, 16, 105, 75, GuiTextures.DISPLAY)
.label(6, 6, getMetaFullName());
builder.widget(new AdvancedTextWidget(10, 19, this::addDisplayText, 0xFFFFFF)
.setMaxWidthLimit(84));
builder.widget(new AdvancedTextWidget(70, 19, this::addDisplayText2, 0xFFFFFF)
.setMaxWidthLimit(84));
builder.widget(new SlotWidget(chargerInventory, 0, 171, 152)
.setBackgroundTexture(GuiTextures.SLOT, GuiTextures.CHARGER_OVERLAY));

return builder.build(getHolder(), entityPlayer);
}

private void addDisplayText(@NotNull List<ITextComponent> textList) {
int workingArea = getWorkingArea(minerLogic.getCurrentRadius());
textList.add(new TextComponentTranslation("gregtech.machine.miner.startx", this.minerLogic.getX().get()));
textList.add(new TextComponentTranslation("gregtech.machine.miner.starty", this.minerLogic.getY().get()));
textList.add(new TextComponentTranslation("gregtech.machine.miner.startz", this.minerLogic.getZ().get()));
textList.add(new TextComponentTranslation("gregtech.machine.miner.working_area", workingArea, workingArea));
if (this.minerLogic.isDone())
textList.add(new TextComponentTranslation("gregtech.machine.miner.done")
.setStyle(new Style().setColor(TextFormatting.GREEN)));
else if (this.minerLogic.isWorking())
textList.add(new TextComponentTranslation("gregtech.machine.miner.working")
.setStyle(new Style().setColor(TextFormatting.GOLD)));
else if (!this.isWorkingEnabled())
textList.add(new TextComponentTranslation("gregtech.multiblock.work_paused"));
if (isInventoryFull)
textList.add(new TextComponentTranslation("gregtech.machine.miner.invfull")
.setStyle(new Style().setColor(TextFormatting.RED)));
if (!drainEnergy(true))
textList.add(new TextComponentTranslation("gregtech.machine.miner.needspower")
.setStyle(new Style().setColor(TextFormatting.RED)));
public boolean usesMui2() {
return true;
}

private void addDisplayText2(@NotNull List<ITextComponent> textList) {
textList.add(new TextComponentTranslation("gregtech.machine.miner.minex", this.minerLogic.getMineX().get()));
textList.add(new TextComponentTranslation("gregtech.machine.miner.miney", this.minerLogic.getMineY().get()));
textList.add(new TextComponentTranslation("gregtech.machine.miner.minez", this.minerLogic.getMineZ().get()));
@SuppressWarnings("DuplicatedCode")
@Override
public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager panelSyncManager, UISettings settings) {
IntSyncValue radiusSync = new IntSyncValue(() -> getWorkingArea(minerLogic.getCurrentRadius()));
BooleanSyncValue isDoneSync = new BooleanSyncValue(minerLogic::isDone);
BooleanSyncValue isWorkingSync = new BooleanSyncValue(minerLogic::isWorking);
BooleanSyncValue isWorkingEnabledSync = new BooleanSyncValue(minerLogic::isWorkingEnabled);
BooleanSyncValue isInventoryFullSync = new BooleanSyncValue(() -> isInventoryFull);
BooleanSyncValue hasEnoughEnergySync = new BooleanSyncValue(() -> drainEnergy(true));
panelSyncManager.syncValue("radius", 0, radiusSync);
panelSyncManager.syncValue("done", 0, isDoneSync);
panelSyncManager.syncValue("working", 0, isWorkingSync);
panelSyncManager.syncValue("workingEnabled", 0, isWorkingEnabledSync);
panelSyncManager.syncValue("inventoryFull", 0, isInventoryFullSync);
panelSyncManager.syncValue("enoughEnergy", 0, hasEnoughEnergySync);

IntSyncValue xPosSync = new IntSyncValue(() -> minerLogic.getMineX().get());
IntSyncValue yPosSync = new IntSyncValue(() -> minerLogic.getMineY().get());
IntSyncValue zPosSync = new IntSyncValue(() -> minerLogic.getMineZ().get());
panelSyncManager.syncValue("xPos", 0, xPosSync);
panelSyncManager.syncValue("yPos", 0, yPosSync);
panelSyncManager.syncValue("zPos", 0, zPosSync);

return GTGuis.createPanel(this, 197, 176)
.child(IKey.lang(getMetaFullName())
.asWidget()
.pos(5, 5))
.child(createMinerWidgets(panelSyncManager, exportItems, inventorySize, GTGuiTextures.DISPLAY, text -> {
boolean isDone = isDoneSync.getBoolValue();
boolean isWorking = isWorkingSync.getBoolValue();
boolean isWorkingEnabled = isWorkingEnabledSync.getBoolValue();
boolean isInventoryFull = isInventoryFullSync.getBoolValue();
boolean hasEnoughEnergy = hasEnoughEnergySync.getBoolValue();

if (isWorking) {
text.addLine(KeyUtil.lang(TextFormatting.WHITE, "gregtech.machine.miner.mining_at"));
text.addLine(KeyUtil.lang(TextFormatting.WHITE, "gregtech.machine.miner.mining_pos_x",
xPosSync.getIntValue()));
text.addLine(KeyUtil.lang(TextFormatting.WHITE, "gregtech.machine.miner.mining_pos_y",
yPosSync.getIntValue()));
text.addLine(KeyUtil.lang(TextFormatting.WHITE, "gregtech.machine.miner.mining_pos_z",
zPosSync.getIntValue()));
}

text.addLine(KeyUtil.lang(TextFormatting.WHITE, "gregtech.machine.miner.working_area",
radiusSync.getIntValue(), radiusSync.getIntValue()));

if (isDone) {
text.addLine(KeyUtil.lang(TextStandards.Colors.MACHINE_DONE, "gregtech.machine.miner.done"));
} else if (isWorking) {
text.addLine(KeyUtil.lang(TextStandards.Colors.MACHINE_WORKING,
"gregtech.machine.miner.working"));
} else if (!isWorkingEnabled) {
text.addLine(TextStandards.Keys.MACHINE_PAUSED);
}

if (isInventoryFull) {
text.addLine(KeyUtil.lang(TextStandards.Colors.NO_OUTPUT_SPACE,
"gregtech.machine.miner.invfull"));
}

if (!hasEnoughEnergy) {
text.addLine(KeyUtil.lang(TextStandards.Colors.NO_POWER, "gregtech.machine.miner.needspower"));
}
})
.left(10)
.top(18))
.child(SlotGroupWidget.playerInventory(false)
.left(7)
.bottom(7))
.child(new ItemSlot()
.right(7)
.bottom(7)
.slot(chargerInventory, 0)
.background(GTGuiTextures.SLOT, GTGuiTextures.CHARGER_OVERLAY));
}

@Override
Expand Down
8 changes: 5 additions & 3 deletions src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityLargeMiner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,9 +270,11 @@ protected void configureDisplayText(MultiblockUIBuilder builder) {
int workingArea = syncer.syncInt(getWorkingArea(minerLogic.getCurrentRadius()));

list.add(KeyUtil.lang(TextFormatting.GRAY, "gregtech.machine.miner.mining_at"));
list.add(KeyUtil.lang(TextFormatting.GRAY, "gregtech.machine.miner.mining_pos",
syncer.syncInt(minerLogic.getMineX().get()),
syncer.syncInt(minerLogic.getMineY().get()),
list.add(KeyUtil.lang(TextFormatting.GRAY, "gregtech.machine.miner.mining_pos_x",
syncer.syncInt(minerLogic.getMineX().get())));
list.add(KeyUtil.lang(TextFormatting.GRAY, "gregtech.machine.miner.mining_pos_y",
syncer.syncInt(minerLogic.getMineY().get())));
list.add(KeyUtil.lang(TextFormatting.GRAY, "gregtech.machine.miner.mining_pos_z",
syncer.syncInt(minerLogic.getMineZ().get())));

if (syncer.syncBoolean(minerLogic.isChunkMode())) {
Expand Down
Loading
Loading