Have a more colorful text display

Zorbatron · Zorbatron · commit 80338e0e7d1c · 2025-11-15T00:59:45.000-05:00
diff --git a/src/main/java/gregtech/api/mui/TextStandards.java b/src/main/java/gregtech/api/mui/TextStandards.java
@@ -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");
+    }
+}
diff --git a/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityMiner.java b/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityMiner.java
@@ -14,6 +14,7 @@
 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;
@@ -155,19 +156,21 @@ public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager panelSyncManage
                             radiusSync.getIntValue(), radiusSync.getIntValue()));
 
                     if (isDone) {
-                        text.addLine(KeyUtil.lang(TextFormatting.GREEN, "gregtech.machine.miner.done"));
+                        text.addLine(KeyUtil.lang(TextStandards.Colors.MACHINE_DONE, "gregtech.machine.miner.done"));
                     } else if (isWorking) {
-                        text.addLine(KeyUtil.lang(TextFormatting.GOLD, "gregtech.machine.miner.working"));
+                        text.addLine(KeyUtil.lang(TextStandards.Colors.MACHINE_WORKING,
+                                "gregtech.machine.miner.working"));
                     } else if (!isWorkingEnabled) {
-                        text.addLine(KeyUtil.lang("gregtech.multiblock.work_paused"));
+                        text.addLine(TextStandards.Keys.MACHINE_PAUSED);
                     }
 
                     if (isInventoryFull) {
-                        text.addLine(KeyUtil.lang(TextFormatting.RED, "gregtech.machine.miner.invfull"));
+                        text.addLine(KeyUtil.lang(TextStandards.Colors.NO_OUTPUT_SPACE,
+                                "gregtech.machine.miner.invfull"));
                     }
 
                     if (!hasEnoughEnergy) {
-                        text.addLine(KeyUtil.lang(TextFormatting.RED, "gregtech.machine.miner.needspower"));
+                        text.addLine(KeyUtil.lang(TextStandards.Colors.NO_POWER, "gregtech.machine.miner.needspower"));
                     }
                 })
                         .left(10)
diff --git a/src/main/java/gregtech/common/metatileentities/steam/SteamMiner.java b/src/main/java/gregtech/common/metatileentities/steam/SteamMiner.java
@@ -14,6 +14,7 @@
 import gregtech.api.mui.GTGuiTextures;
 import gregtech.api.mui.GTGuiTheme;
 import gregtech.api.mui.GTGuis;
+import gregtech.api.mui.TextStandards;
 import gregtech.api.util.GTUtility;
 import gregtech.api.util.KeyUtil;
 import gregtech.client.renderer.texture.Textures;
@@ -186,27 +187,32 @@ public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager panelSyncManage
                                     radius, radius));
 
                             if (isDone) {
-                                text.addLine(KeyUtil.lang(TextFormatting.GREEN, "gregtech.machine.miner.done"));
+                                text.addLine(KeyUtil.lang(TextStandards.Colors.MACHINE_DONE,
+                                        "gregtech.machine.miner.done"));
                             } else if (isWorking) {
-                                text.addLine(KeyUtil.lang(TextFormatting.GOLD, "gregtech.machine.miner.working"));
+                                text.addLine(KeyUtil.lang(TextStandards.Colors.MACHINE_WORKING,
+                                        "gregtech.machine.miner.working"));
                             } else if (!isWorkingEnabled) {
-                                text.addLine(KeyUtil.lang("gregtech.multiblock.work_paused"));
+                                text.addLine(TextStandards.Keys.MACHINE_PAUSED);
                             }
 
                             if (isInventoryFull) {
-                                text.addLine(KeyUtil.lang(TextFormatting.RED, "gregtech.machine.miner.invfull"));
+                                text.addLine(KeyUtil.lang(TextStandards.Colors.NO_OUTPUT_SPACE,
+                                        "gregtech.machine.miner.invfull"));
                             }
 
                             if (isVentBlocked) {
-                                text.addLine(KeyUtil.lang(TextFormatting.RED, "gregtech.machine.steam_miner.vent"));
+                                text.addLine(KeyUtil.lang(TextStandards.Colors.STEAM_VENT_BLOCKED,
+                                        "gregtech.machine.steam_miner.vent"));
                             }
 
                             // Drain energy always returns false when the vent is blocked, so check that it isn't
                             // blocked.
                             // It should be fine since I don't think it can even enter the vent blocked state without
                             // having steam.
                             if (!hasEnoughEnergy && !isVentBlocked) {
-                                text.addLine(KeyUtil.lang(TextFormatting.RED, "gregtech.machine.steam_miner.steam"));
+                                text.addLine(KeyUtil.lang(TextStandards.Colors.NO_POWER,
+                                        "gregtech.machine.steam_miner.steam"));
                             }
                         })
                                 .left(10)
diff --git a/src/main/resources/assets/gregtech/lang/en_us.lang b/src/main/resources/assets/gregtech/lang/en_us.lang
@@ -4883,6 +4883,7 @@ gregtech.machine.miner.hv.name=Advanced Miner II
 gregtech.machine.miner.tooltip=Mines ores below the Miner! Starts as §f%sx%s §7area
 gregtech.machine.miner.per_block=§7takes §f%,ds §7per Block
 
+
 gregtech.machine.large_miner.ev.name=Basic Ore Drilling Plant
 gregtech.machine.large_miner.iv.name=Advanced Ore Drilling Plant
 gregtech.machine.large_miner.luv.name=Advanced Ore Drilling Plant II
@@ -4891,10 +4892,17 @@ gregtech.machine.miner.multi.production=Produces §f3x§7 more crushed ore than
 gregtech.machine.miner.fluid_usage=Uses §f%,d L/t §7of §f%s§7, doubled per overclock.
 gregtech.machine.miner.multi.description=A multiblock mining machine that covers a large area and produces huge quantity of ore.
 gregtech.machine.miner.multi.needsfluid=No Drilling Fluid!
+gregtech.machine.miner.done=Done!
+gregtech.machine.miner.working=Mining...
+gregtech.machine.miner.invfull=Inventory Full!
+gregtech.machine.miner.needspower=Needs Power!
+gregtech.machine.steam_miner.vent=Venting Blocked!
+gregtech.machine.steam_miner.steam=Needs Steam!
+gregtech.machine.miner.errorradius=§cCannot change radius while working!
 gregtech.machine.miner.mining_at=Currently mining at:
-gregtech.machine.miner.mining_pos_x=X: %s
-gregtech.machine.miner.mining_pos_y=Y: %s
-gregtech.machine.miner.mining_pos_z=Z: %s
+gregtech.machine.miner.mining_pos_x=§bX§r: §a%s§r
+gregtech.machine.miner.mining_pos_y=§bY§r: §a%s§r
+gregtech.machine.miner.mining_pos_z=§bZ§r: §a%s§r
 gregtech.machine.miner.radius=Radius: %d
 gregtech.machine.miner.working_area=Working Area: %dx%d blocks
 gregtech.machine.miner.working_area_chunks=Working Area: %dx%d chunks
@@ -5910,14 +5918,6 @@ gregtech.multiblock.large_boiler.explosion_tooltip=Will explode if provided Fuel
 gregtech.multiblock.large_boiler.water_bar_hover=§7Water: §9%,d / %,d L
 gregtech.multiblock.large_boiler.no_water=§eNo Water!
 
-gregtech.machine.miner.done=Done!
-gregtech.machine.miner.working=Working...
-gregtech.machine.miner.invfull=Inventory Full!
-gregtech.machine.miner.needspower=Needs Power!
-gregtech.machine.steam_miner.vent=Venting Blocked!
-gregtech.machine.steam_miner.steam=Needs Steam!
-gregtech.machine.miner.errorradius=§cCannot change radius while working!
-
 gregtech.multiblock.miner.neither_mode=Chunk Mode: §cDisabled§r/nSilk Touch Mode: §cDisabled§r/n§7Switching requires an idle machine.
 gregtech.multiblock.miner.chunk_mode=Chunk Mode: §aEnabled§r/nSilk Touch Mode: §cDisabled§r/n§7Switching requires an idle machine.
 gregtech.multiblock.miner.silk_touch_mode=Chunk Mode: §cDisabled§r/nSilk Touch Mode: §aEnabled§r/n§7Switching requires an idle machine.
