Added means of customizing GUI colors for resource packs (#1203)

* Added means of customizing GUI colors through lang file

* Color values are now stored in json file instead of the lang file

* Made json only load upon resource reload and ensured server compatibility

Co-authored-by: Martin Robertz <dream-master@gmx.net>

11 files changed, 72 insertions, 33 deletions

diff --git a/src/main/java/gregtech/api/gui/GT_GUIContainer_1by1.java b/src/main/java/gregtech/api/gui/GT_GUIContainer_1by1.java
index 0a25c6fb9a..8682a77bae 100644
--- a/src/main/java/gregtech/api/gui/GT_GUIContainer_1by1.java
+++ b/src/main/java/gregtech/api/gui/GT_GUIContainer_1by1.java
@@ -1,13 +1,15 @@
 package gregtech.api.gui;
 
+import gregtech.api.enums.GuiColors;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import net.minecraft.entity.player.InventoryPlayer;
 
 import static gregtech.api.enums.GT_Values.RES_PATH_GUI;
 
 public class GT_GUIContainer_1by1 extends GT_GUIContainerMetaTile_Machine {
-
+    
     private final String mName;
+    private final int textColor = GuiColors.oneByOne.getColor();
 
     public GT_GUIContainer_1by1(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName) {
         super(new GT_Container_1by1(aInventoryPlayer, aTileEntity), RES_PATH_GUI + "1by1.png");
@@ -21,7 +23,7 @@ public class GT_GUIContainer_1by1 extends GT_GUIContainerMetaTile_Machine {
 
     @Override
     protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
-        fontRendererObj.drawString(mName, 8, 4, 4210752);
+        fontRendererObj.drawString(mName, 8, 4, textColor);
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/gui/GT_GUIContainer_2by2.java b/src/main/java/gregtech/api/gui/GT_GUIContainer_2by2.java
index faa8e4a14f..72afda851b 100644
--- a/src/main/java/gregtech/api/gui/GT_GUIContainer_2by2.java
+++ b/src/main/java/gregtech/api/gui/GT_GUIContainer_2by2.java
@@ -1,5 +1,6 @@
 package gregtech.api.gui;
 
+import gregtech.api.enums.GuiColors;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import net.minecraft.entity.player.InventoryPlayer;
 
@@ -8,6 +9,7 @@ import static gregtech.api.enums.GT_Values.RES_PATH_GUI;
 public class GT_GUIContainer_2by2 extends GT_GUIContainerMetaTile_Machine {
 
     private final String mName;
+    private final int textColor = GuiColors.twoByTwo.getColor();
 
     public GT_GUIContainer_2by2(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName) {
         super(new GT_Container_2by2(aInventoryPlayer, aTileEntity), RES_PATH_GUI + "2by2.png");
@@ -21,7 +23,7 @@ public class GT_GUIContainer_2by2 extends GT_GUIContainerMetaTile_Machine {
 
     @Override
     protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
-        fontRendererObj.drawString(mName, 8, 4, 4210752);
+        fontRendererObj.drawString(mName, 8, 4, textColor);
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/gui/GT_GUIContainer_2by2_Fluid.java b/src/main/java/gregtech/api/gui/GT_GUIContainer_2by2_Fluid.java
index 355914cc00..860f33c2bb 100644
--- a/src/main/java/gregtech/api/gui/GT_GUIContainer_2by2_Fluid.java
+++ b/src/main/java/gregtech/api/gui/GT_GUIContainer_2by2_Fluid.java
@@ -1,5 +1,6 @@
 package gregtech.api.gui;
 
+import gregtech.api.enums.GuiColors;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.util.StatCollector;
@@ -9,6 +10,9 @@ import static gregtech.api.enums.GT_Values.RES_PATH_GUI;
 public class GT_GUIContainer_2by2_Fluid extends GT_GUIContainerMetaTile_Machine {
 
     private final String mName;
+    private final int
+        textColorTitle = GuiColors.twoByTwoFluid.getColor(),
+        textColorInventory = GuiColors.twoByTwoFluidInventory.getColor();
 
     public GT_GUIContainer_2by2_Fluid(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName) {
         super(new GT_Container_2by2_Fluid(aInventoryPlayer, aTileEntity), RES_PATH_GUI + "2by2fluid.png");
@@ -17,8 +21,8 @@ public class GT_GUIContainer_2by2_Fluid extends GT_GUIContainerMetaTile_Machine
 
     @Override
     protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
-        fontRendererObj.drawString(StatCollector.translateToLocal("container.inventory"), 8, ySize - 96 + 2, 4210752);
-        fontRendererObj.drawString(mName, 8, 6, 4210752);
+        fontRendererObj.drawString(StatCollector.translateToLocal("container.inventory"), 8, ySize - 96 + 2, textColorInventory);
+        fontRendererObj.drawString(mName, 8, 6, textColorTitle);
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/gui/GT_GUIContainer_3by3.java b/src/main/java/gregtech/api/gui/GT_GUIContainer_3by3.java
index f53ee8a975..12b3f81754 100644
--- a/src/main/java/gregtech/api/gui/GT_GUIContainer_3by3.java
+++ b/src/main/java/gregtech/api/gui/GT_GUIContainer_3by3.java
@@ -1,5 +1,6 @@
 package gregtech.api.gui;
 
+import gregtech.api.enums.GuiColors;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import net.minecraft.entity.player.InventoryPlayer;
 
@@ -8,6 +9,7 @@ import static gregtech.api.enums.GT_Values.RES_PATH_GUI;
 public class GT_GUIContainer_3by3 extends GT_GUIContainerMetaTile_Machine {
 
     private final String mName;
+    private final int textColor = GuiColors.threeByThree.getColor();
 
     public GT_GUIContainer_3by3(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName) {
         super(new GT_Container_3by3(aInventoryPlayer, aTileEntity), RES_PATH_GUI + "3by3.png");
@@ -21,7 +23,7 @@ public class GT_GUIContainer_3by3 extends GT_GUIContainerMetaTile_Machine {
 
     @Override
     protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
-        fontRendererObj.drawString(mName, 8, 4, 4210752);
+        fontRendererObj.drawString(mName, 8, 4, textColor);
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/gui/GT_GUIContainer_4by4.java b/src/main/java/gregtech/api/gui/GT_GUIContainer_4by4.java
index 6c28653c0f..fa2695b633 100644
--- a/src/main/java/gregtech/api/gui/GT_GUIContainer_4by4.java
+++ b/src/main/java/gregtech/api/gui/GT_GUIContainer_4by4.java
@@ -1,5 +1,6 @@
 package gregtech.api.gui;
 
+import gregtech.api.enums.GuiColors;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import net.minecraft.entity.player.InventoryPlayer;
 
@@ -8,6 +9,7 @@ import static gregtech.api.enums.GT_Values.RES_PATH_GUI;
 public class GT_GUIContainer_4by4 extends GT_GUIContainerMetaTile_Machine {
 
     private final String mName;
+    private final int textColor = GuiColors.fourByFour.getColor();
 
     public GT_GUIContainer_4by4(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName) {
         super(new GT_Container_4by4(aInventoryPlayer, aTileEntity), RES_PATH_GUI + "4by4.png");
@@ -21,7 +23,7 @@ public class GT_GUIContainer_4by4 extends GT_GUIContainerMetaTile_Machine {
 
     @Override
     protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
-        fontRendererObj.drawString(mName, 8, 4, 4210752);
+        fontRendererObj.drawString(mName, 8, 4, textColor);
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/gui/GT_GUIContainer_BasicMachine.java b/src/main/java/gregtech/api/gui/GT_GUIContainer_BasicMachine.java
index 92121df0ea..29168a53bb 100644
--- a/src/main/java/gregtech/api/gui/GT_GUIContainer_BasicMachine.java
+++ b/src/main/java/gregtech/api/gui/GT_GUIContainer_BasicMachine.java
@@ -1,6 +1,7 @@
 package gregtech.api.gui;
 
 import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GuiColors;
 import gregtech.api.gui.widgets.GT_GuiIcon;
 import gregtech.api.gui.widgets.GT_GuiTabLine.GT_GuiTabIconSet;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -40,13 +41,14 @@ public class GT_GUIContainer_BasicMachine extends GT_GUIContainerMetaTile_Machin
         GT_GuiIcon.TAB_NORMAL_STEEL,
         GT_GuiIcon.TAB_HIGHLIGHT_STEEL,
         GT_GuiIcon.TAB_DISABLED_STEEL);
+    private final int textColor = GuiColors.basicMachine.getColor();
     public final String
             mName,
             mNEI;
     public final byte
             mProgressBarDirection,
             mProgressBarAmount;
-
+    
     // Tooltip localization keys
     private static final String
         GHOST_CIRCUIT_TOOLTIP = "GT5U.machines.select_circuit.tooltip",
@@ -168,7 +170,7 @@ public class GT_GUIContainer_BasicMachine extends GT_GUIContainerMetaTile_Machin
     @Override
     protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
         super.drawGuiContainerForegroundLayer(mouseX, mouseY);
-        fontRendererObj.drawString(mName, 8, 4, 4210752);
+        fontRendererObj.drawString(mName, 8, 4, textColor);
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/gui/GT_GUIContainer_BasicTank.java b/src/main/java/gregtech/api/gui/GT_GUIContainer_BasicTank.java
index b44b6280ae..4a9e6751a6 100644
--- a/src/main/java/gregtech/api/gui/GT_GUIContainer_BasicTank.java
+++ b/src/main/java/gregtech/api/gui/GT_GUIContainer_BasicTank.java
@@ -1,5 +1,6 @@
 package gregtech.api.gui;
 
+import gregtech.api.enums.GuiColors;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.util.GT_Utility;
 import net.minecraft.entity.player.InventoryPlayer;
@@ -10,6 +11,11 @@ import static gregtech.api.enums.GT_Values.RES_PATH_GUI;
 public class GT_GUIContainer_BasicTank extends GT_GUIContainerMetaTile_Machine {
 
     private final String mName;
+    private final int 
+        textColorTitle = GuiColors.basicTankTitle.getColor(),
+        textColorInventory = GuiColors.basicTankInventory.getColor(),
+        textColorLiquidAmount = GuiColors.basicTankLiquidAmount.getColor(),
+        textColorLiquidValue = GuiColors.basicTankLiquidValue.getColor();
 
     public GT_GUIContainer_BasicTank(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName) {
         super(new GT_Container_BasicTank(aInventoryPlayer, aTileEntity), RES_PATH_GUI + "BasicTank.png");
@@ -18,11 +24,11 @@ public class GT_GUIContainer_BasicTank extends GT_GUIContainerMetaTile_Machine {
 
     @Override
     protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
-        fontRendererObj.drawString(StatCollector.translateToLocal("container.inventory"), 8, ySize - 96 + 2, 4210752);
-        fontRendererObj.drawString(mName, 8, 6, 4210752);
+        fontRendererObj.drawString(StatCollector.translateToLocal("container.inventory"), 8, ySize - 96 + 2, textColorInventory);
+        fontRendererObj.drawString(mName, 8, 6, textColorTitle);
         if (mContainer != null) {
-            fontRendererObj.drawString("Liquid Amount", 10, 20, 16448255);
-            fontRendererObj.drawString(GT_Utility.parseNumberToString(((GT_Container_BasicTank) mContainer).mContent), 10, 30, 16448255);
+            fontRendererObj.drawString("Liquid Amount", 10, 20, textColorLiquidAmount);
+            fontRendererObj.drawString(GT_Utility.parseNumberToString(((GT_Container_BasicTank) mContainer).mContent), 10, 30, textColorLiquidValue);
         }
     }
 
diff --git a/src/main/java/gregtech/api/gui/GT_GUIContainer_MaintenanceHatch.java b/src/main/java/gregtech/api/gui/GT_GUIContainer_MaintenanceHatch.java
index 7f98e8b86a..e1b57e2028 100644
--- a/src/main/java/gregtech/api/gui/GT_GUIContainer_MaintenanceHatch.java
+++ b/src/main/java/gregtech/api/gui/GT_GUIContainer_MaintenanceHatch.java
@@ -1,11 +1,16 @@
 package gregtech.api.gui;
 
+import gregtech.api.enums.GuiColors;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import net.minecraft.entity.player.InventoryPlayer;
 
 import static gregtech.api.enums.GT_Values.RES_PATH_GUI;
 
 public class GT_GUIContainer_MaintenanceHatch extends GT_GUIContainerMetaTile_Machine {
+    private final int 
+        textColorTitle = GuiColors.maintenanceHatch.getColor(),
+        textColorRepair = GuiColors.maintenanceHatchRepair.getColor();
+
 
     public GT_GUIContainer_MaintenanceHatch(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) {
         super(new GT_Container_MaintenanceHatch(aInventoryPlayer, aTileEntity), RES_PATH_GUI + "Maintenance.png");
@@ -13,8 +18,8 @@ public class GT_GUIContainer_MaintenanceHatch extends GT_GUIContainerMetaTile_Ma
 
     @Override
     protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
-        fontRendererObj.drawString("Maintenance Hatch", 8, 4, 4210752);
-        fontRendererObj.drawString("Click with Tool to repair.", 8, 12, 4210752);
+        fontRendererObj.drawString("Maintenance Hatch", 8, 4, textColorTitle);
+        fontRendererObj.drawString("Click with Tool to repair.", 8, 12, textColorRepair);
     }
 
     @Override
diff --git a/src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java b/src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java
index 8a1987df83..6943b33a21 100644
--- a/src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java
+++ b/src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java
@@ -1,5 +1,6 @@
 package gregtech.api.gui;
 
+import gregtech.api.enums.GuiColors;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_Utility;
@@ -22,6 +23,15 @@ import static gregtech.api.enums.GT_Values.RES_PATH_GUI;
 public class GT_GUIContainer_MultiMachine extends GT_GUIContainerMetaTile_Machine {
 
     String mName = "";
+    private final int 
+        textColorTitle = GuiColors.multiMachineTitle.getColor(),
+        textColorMaintenance = GuiColors.multiMachineMaintenanceText.getColor(),
+        textColorIncompleteStructure = GuiColors.multiMachineIncompleteStructure.getColor(),
+        textColorMalletRestart = GuiColors.multiMachineMalletRestart.getColor(),
+        textColorRunningPerfectly = GuiColors.multiMachineRunningPerfectly.getColor(),
+        textColorDrillBase = GuiColors.multiMachineDrillBaseText.getColor(),
+        textColorLargeTurbine = GuiColors.multiMachineLargeTurbineText.getColor();
+
 
     public GT_GUIContainer_MultiMachine(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName, String aTextureFile) {
         super(new GT_Container_MultiMachine(aInventoryPlayer, aTileEntity), RES_PATH_GUI + "multimachines/" + (aTextureFile == null ? "MultiblockDisplay" : aTextureFile));
@@ -50,7 +60,7 @@ public class GT_GUIContainer_MultiMachine extends GT_GUIContainerMetaTile_Machin
                 total_line_length += str.length();
 
                 if (total_line_length > max_chars_per_line) {
-                    fontRendererObj.drawString(current_line, 10, line_counter, 16448255);
+                    fontRendererObj.drawString(current_line, 10, line_counter, textColorTitle);
                     line_counter += 8;
                     current_line = "";
                     index = 0;
@@ -64,71 +74,71 @@ public class GT_GUIContainer_MultiMachine extends GT_GUIContainerMetaTile_Machin
                 }
                 index++;
             }
-            fontRendererObj.drawString(current_line, 10, line_counter, 16448255);
+            fontRendererObj.drawString(current_line, 10, line_counter, textColorTitle);
             line_counter += 8;
         } else {
-            fontRendererObj.drawString(mName, 10, line_counter, 16448255);
+            fontRendererObj.drawString(mName, 10, line_counter, textColorTitle);
             line_counter += 8;
         }
 
 
         if (mContainer != null) {//(mWrench ? 0 : 1) | (mScrewdriver ? 0 : 2) | (mSoftHammer ? 0 : 4) | (mHardHammer ? 0 : 8) | (mSolderingTool ? 0 : 16) | (mCrowbar ? 0 : 32) | (mMachine ? 0 : 64));
             if ((mContainer.mDisplayErrorCode & 1) != 0) {
-                fontRendererObj.drawString(GT_Utility.trans("132", "Pipe is loose."), 10, line_counter, 16448255);
+                fontRendererObj.drawString(GT_Utility.trans("132", "Pipe is loose."), 10, line_counter, textColorMaintenance);
                 line_counter += 8;
             }
 
             if ((mContainer.mDisplayErrorCode & 2) != 0) {
-                fontRendererObj.drawString(GT_Utility.trans("133", "Screws are loose."), 10, line_counter, 16448255);
+                fontRendererObj.drawString(GT_Utility.trans("133", "Screws are loose."), 10, line_counter, textColorMaintenance);
                 line_counter += 8;
             }
 
             if ((mContainer.mDisplayErrorCode & 4) != 0) {
-                fontRendererObj.drawString(GT_Utility.trans("134", "Something is stuck."), 10, line_counter, 16448255);
+                fontRendererObj.drawString(GT_Utility.trans("134", "Something is stuck."), 10, line_counter, textColorMaintenance);
                 line_counter += 8;
             }
 
             if ((mContainer.mDisplayErrorCode & 8) != 0) {
-                fontRendererObj.drawString(GT_Utility.trans("135", "Platings are dented."), 10, line_counter, 16448255);
+                fontRendererObj.drawString(GT_Utility.trans("135", "Platings are dented."), 10, line_counter, textColorMaintenance);
                 line_counter += 8;
             }
 
             if ((mContainer.mDisplayErrorCode & 16) != 0) {
-                fontRendererObj.drawString(GT_Utility.trans("136", "Circuitry burned out."), 10, line_counter, 16448255);
+                fontRendererObj.drawString(GT_Utility.trans("136", "Circuitry burned out."), 10, line_counter, textColorMaintenance);
                 line_counter += 8;
             }
 
             if ((mContainer.mDisplayErrorCode & 32) != 0) {
-                fontRendererObj.drawString(GT_Utility.trans("137", "That doesn't belong there."), 10, line_counter, 16448255);
+                fontRendererObj.drawString(GT_Utility.trans("137", "That doesn't belong there."), 10, line_counter, textColorMaintenance);
                 line_counter += 8;
             }
 
             if ((mContainer.mDisplayErrorCode & 64) != 0) {
-                fontRendererObj.drawString(GT_Utility.trans("138", "Incomplete Structure."), 10, line_counter, 16448255);
+                fontRendererObj.drawString(GT_Utility.trans("138", "Incomplete Structure."), 10, line_counter, textColorIncompleteStructure);
                 line_counter += 8;
             }
 
             if (mContainer.mDisplayErrorCode == 0) {
                 if (mContainer.mActive == 0) {
-                    fontRendererObj.drawString(GT_Utility.trans("139", "Hit with Soft Mallet"), 10, line_counter, 16448255);
+                    fontRendererObj.drawString(GT_Utility.trans("139", "Hit with Soft Mallet"), 10, line_counter, textColorMalletRestart);
                     line_counter += 8;
-                    fontRendererObj.drawString(GT_Utility.trans("140", "to (re-)start the Machine"), 10, line_counter, 16448255);
+                    fontRendererObj.drawString(GT_Utility.trans("140", "to (re-)start the Machine"), 10, line_counter, textColorMalletRestart);
                     line_counter += 8;
-                    fontRendererObj.drawString(GT_Utility.trans("141", "if it doesn't start."), 10, line_counter, 16448255);
+                    fontRendererObj.drawString(GT_Utility.trans("141", "if it doesn't start."), 10, line_counter, textColorMalletRestart);
                     line_counter += 8;
                 } else {
-                    fontRendererObj.drawString(GT_Utility.trans("142", "Running perfectly."), 10, line_counter, 16448255);
+                    fontRendererObj.drawString(GT_Utility.trans("142", "Running perfectly."), 10, line_counter, textColorRunningPerfectly);
                     line_counter += 8;
                 }
                 if (mContainer.mTileEntity.getMetaTileEntity() instanceof GT_MetaTileEntity_DrillerBase) {
                     ItemStack tItem = mContainer.mTileEntity.getMetaTileEntity().getStackInSlot(1);
                     if (tItem == null || !GT_Utility.areStacksEqual(tItem, GT_ModHandler.getIC2Item("miningPipe", 1L))) {
-                        fontRendererObj.drawString(GT_Utility.trans("143", "Missing Mining Pipe"), 10, line_counter, 16448255);
+                        fontRendererObj.drawString(GT_Utility.trans("143", "Missing Mining Pipe"), 10, line_counter, textColorDrillBase);
                     }
                 } else if (mContainer.mTileEntity.getMetaTileEntity() instanceof GT_MetaTileEntity_LargeTurbine) {
                     ItemStack tItem = mContainer.mTileEntity.getMetaTileEntity().getStackInSlot(1);
                     if (tItem == null || !(tItem.getItem() == GT_MetaGenerated_Tool_01.INSTANCE && tItem.getItemDamage() >= 170 && tItem.getItemDamage() <= 177)) {
-                        fontRendererObj.drawString(GT_Utility.trans("144", "Missing Turbine Rotor"), 10, line_counter, 16448255);
+                        fontRendererObj.drawString(GT_Utility.trans("144", "Missing Turbine Rotor"), 10, line_counter, textColorLargeTurbine);
                     }
                 }
             }
diff --git a/src/main/java/gregtech/api/gui/GT_GUIDialogSelectItem.java b/src/main/java/gregtech/api/gui/GT_GUIDialogSelectItem.java
index 2c3f77cf06..245803ebc7 100644
--- a/src/main/java/gregtech/api/gui/GT_GUIDialogSelectItem.java
+++ b/src/main/java/gregtech/api/gui/GT_GUIDialogSelectItem.java
@@ -1,5 +1,6 @@
 package gregtech.api.gui;
 
+import gregtech.api.enums.GuiColors;
 import gregtech.api.gui.widgets.GT_GuiFakeItemButton;
 import gregtech.api.gui.widgets.GT_GuiIcon;
 import gregtech.api.gui.widgets.GT_GuiIconButton;
@@ -17,6 +18,7 @@ public class GT_GUIDialogSelectItem extends GT_GUIScreen {
 	public static final int UNSELECTED = -1;
 	private static final int cols = 9;
 	private static final int rows = 3;
+	private final int textColor = GuiColors.dialogSelectItem.getColor();
 	private final GuiScreen parent;
 	private final Consumer<ItemStack> selectedCallback;
 	// passed in stack
@@ -103,7 +105,7 @@ public class GT_GUIDialogSelectItem extends GT_GUIScreen {
 	@Override
 	public void drawExtras(int mouseX, int mouseY, float parTicks) {
 		int y = 25 + (18 - getFontRenderer().FONT_HEIGHT) / 2;
-		getFontRenderer().drawString(StatCollector.translateToLocal("GT5U.gui.select.current"), 8, y, 0xff555555);
+		getFontRenderer().drawString(StatCollector.translateToLocal("GT5U.gui.select.current"), 8, y, textColor);
 		super.drawExtras(mouseX, mouseY, parTicks);
 	}
 
diff --git a/src/main/java/gregtech/api/gui/GT_GUIScreen.java b/src/main/java/gregtech/api/gui/GT_GUIScreen.java
index 0c2dbb0481..1b01f17ec8 100644
--- a/src/main/java/gregtech/api/gui/GT_GUIScreen.java
+++ b/src/main/java/gregtech/api/gui/GT_GUIScreen.java
@@ -1,6 +1,7 @@
 package gregtech.api.gui;
 
 import gregtech.api.enums.Dyes;
+import gregtech.api.enums.GuiColors;
 import gregtech.api.gui.widgets.GT_GuiFakeItemButton;
 import gregtech.api.gui.widgets.GT_GuiIntegerTextBox;
 import gregtech.api.gui.widgets.GT_GuiTooltip;
@@ -29,6 +30,7 @@ public abstract class GT_GUIScreen extends GuiScreen implements GT_IToolTipRende
 	protected int gui_height = 107;
 	protected int guiTop, guiLeft;
 	protected boolean drawButtons = true;
+	private final int textColor = GuiColors.multiMachineTitle.getColor();
 	private GuiButton selectedButton;
 	public String header;
 	public GT_GuiFakeItemButton headerIcon;
@@ -125,7 +127,7 @@ public abstract class GT_GUIScreen extends GuiScreen implements GT_IToolTipRende
 	}
 
 	public void drawExtras(int mouseX, int mouseY, float parTicks) {
-		this.fontRendererObj.drawString(header, 25, 9, 0xFF222222);
+		this.fontRendererObj.drawString(header, 25, 9, textColor);
 	}
 
 	@Override