From 6e8dd013bd4ec123cf74daaecf581534d87f2391 Mon Sep 17 00:00:00 2001 From: Ranzu <66495944+Ranzuu@users.noreply.github.com> Date: Fri, 18 Sep 2026 18:35:49 +0200 Subject: [PATCH] Convert the rest of the colors to ColorUtils class (#471) --- .../github/client/gui/GuiFluidAutoFiller.java | 10 +++++++-- .../github/client/gui/GuiFluidInterface.java | 16 +++++++++++--- .../client/gui/GuiFluidPacketDecoder.java | 10 +++++++-- .../client/gui/GuiFluidPatternEncoder.java | 10 +++++++-- .../client/gui/GuiIngredientBuffer.java | 10 +++++++-- .../client/gui/GuiLargeIngredientBuffer.java | 9 ++++++-- .../github/client/gui/GuiLevelMaintainer.java | 10 ++++++--- .../github/client/gui/GuiLevelTerminal.java | 7 +++++- .../github/client/gui/GuiMagnetFilter.java | 22 +++++++++++++++---- .../github/client/gui/GuiOCPatternEditor.java | 10 +++++++-- .../client/gui/GuiSuperStockReplenisher.java | 4 +++- .../glodblock/github/util/FCGuiColors.java | 18 +++++++++------ 12 files changed, 105 insertions(+), 31 deletions(-) diff --git a/src/main/java/com/glodblock/github/client/gui/GuiFluidAutoFiller.java b/src/main/java/com/glodblock/github/client/gui/GuiFluidAutoFiller.java index cf6d3cee..d0c25dac 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiFluidAutoFiller.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiFluidAutoFiller.java @@ -8,6 +8,7 @@ import net.minecraft.util.ResourceLocation; import com.glodblock.github.FluidCraft; import com.glodblock.github.client.gui.container.ContainerFluidAutoFiller; import com.glodblock.github.common.tile.TileFluidAutoFiller; +import com.glodblock.github.util.FCGuiColors; import com.glodblock.github.util.NameConst; import appeng.client.gui.AEBaseGui; @@ -31,7 +32,12 @@ public class GuiFluidAutoFiller extends AEBaseGui { @Override public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY) { - fontRendererObj.drawString(getGuiDisplayName(I18n.format(NameConst.GUI_FLUID_AUTO_FILLER)), 8, 6, 0x404040); - fontRendererObj.drawString(GuiText.inventory.getLocal(), 8, ySize - 94, 0x404040); + fontRendererObj.drawString( + getGuiDisplayName(I18n.format(NameConst.GUI_FLUID_AUTO_FILLER)), + 8, + 6, + FCGuiColors.guiTextColorGray.getColor()); + fontRendererObj + .drawString(GuiText.inventory.getLocal(), 8, ySize - 94, FCGuiColors.guiTextColorGray.getColor()); } } diff --git a/src/main/java/com/glodblock/github/client/gui/GuiFluidInterface.java b/src/main/java/com/glodblock/github/client/gui/GuiFluidInterface.java index 94f42923..cf3b47c6 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiFluidInterface.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiFluidInterface.java @@ -15,6 +15,7 @@ import com.glodblock.github.inventory.IAEFluidTank; import com.glodblock.github.inventory.IDualHost; import com.glodblock.github.inventory.gui.MouseRegionManager; import com.glodblock.github.inventory.gui.TankMouseHandler; +import com.glodblock.github.util.FCGuiColors; import com.glodblock.github.util.NameConst; import com.glodblock.github.util.RenderUtil; @@ -51,15 +52,24 @@ public class GuiFluidInterface extends GuiSub { @Override public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY) { - fontRendererObj.drawString(getGuiDisplayName(I18n.format(NameConst.GUI_FLUID_INTERFACE)), 8, 6, 0x404040); - fontRendererObj.drawString(GuiText.inventory.getLocal(), 8, ySize - 94, 0x404040); + fontRendererObj.drawString( + getGuiDisplayName(I18n.format(NameConst.GUI_FLUID_INTERFACE)), + 8, + 6, + FCGuiColors.guiTextColorGray.getColor()); + fontRendererObj + .drawString(GuiText.inventory.getLocal(), 8, ySize - 94, FCGuiColors.guiTextColorGray.getColor()); GL11.glColor4f(1F, 1F, 1F, 1F); IAEFluidTank fluidInv = cont.getTile().getInternalFluid(); mc.getTextureManager().bindTexture(TextureMap.locationBlocksTexture); for (int i = 0; i < 6; i++) { if (!isPart()) { - fontRendererObj.drawString(dirName(i), TANK_X + i * TANK_X_OFF + 5, 22, 0x404040); + fontRendererObj.drawString( + dirName(i), + TANK_X + i * TANK_X_OFF + 5, + 22, + FCGuiColors.guiTextColorGray.getColor()); } RenderUtil.renderFluidIntoGui( this, diff --git a/src/main/java/com/glodblock/github/client/gui/GuiFluidPacketDecoder.java b/src/main/java/com/glodblock/github/client/gui/GuiFluidPacketDecoder.java index 37672a4a..909f5f92 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiFluidPacketDecoder.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiFluidPacketDecoder.java @@ -7,6 +7,7 @@ import net.minecraft.util.ResourceLocation; import com.glodblock.github.FluidCraft; import com.glodblock.github.client.gui.container.ContainerFluidPacketDecoder; import com.glodblock.github.common.tile.TileFluidPacketDecoder; +import com.glodblock.github.util.FCGuiColors; import com.glodblock.github.util.NameConst; import appeng.client.gui.AEBaseGui; @@ -28,7 +29,12 @@ public class GuiFluidPacketDecoder extends AEBaseGui { @Override public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY) { - fontRendererObj.drawString(getGuiDisplayName(I18n.format(NameConst.GUI_FLUID_PACKET_DECODER)), 8, 6, 0x404040); - fontRendererObj.drawString(GuiText.inventory.getLocal(), 8, ySize - 94, 0x404040); + fontRendererObj.drawString( + getGuiDisplayName(I18n.format(NameConst.GUI_FLUID_PACKET_DECODER)), + 8, + 6, + FCGuiColors.guiTextColorGray.getColor()); + fontRendererObj + .drawString(GuiText.inventory.getLocal(), 8, ySize - 94, FCGuiColors.guiTextColorGray.getColor()); } } diff --git a/src/main/java/com/glodblock/github/client/gui/GuiFluidPatternEncoder.java b/src/main/java/com/glodblock/github/client/gui/GuiFluidPatternEncoder.java index 512093ef..9d73d236 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiFluidPatternEncoder.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiFluidPatternEncoder.java @@ -22,6 +22,7 @@ import com.glodblock.github.common.tile.TileFluidPatternEncoder; import com.glodblock.github.inventory.gui.MouseRegionManager; import com.glodblock.github.inventory.slot.ISlotFluid; import com.glodblock.github.inventory.slot.SlotSingleItem; +import com.glodblock.github.util.FCGuiColors; import com.glodblock.github.util.NameConst; import appeng.api.storage.data.IAEItemStack; @@ -73,8 +74,13 @@ public class GuiFluidPatternEncoder extends AEBaseGui { @Override public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY) { - fontRendererObj.drawString(getGuiDisplayName(I18n.format(NameConst.GUI_FLUID_PATTERN_ENCODER)), 8, 6, 0x404040); - fontRendererObj.drawString(GuiText.inventory.getLocal(), 8, ySize - 94, 0x404040); + fontRendererObj.drawString( + getGuiDisplayName(I18n.format(NameConst.GUI_FLUID_PATTERN_ENCODER)), + 8, + 6, + FCGuiColors.guiTextColorGray.getColor()); + fontRendererObj + .drawString(GuiText.inventory.getLocal(), 8, ySize - 94, FCGuiColors.guiTextColorGray.getColor()); mouseRegions.render(mouseX, mouseY); } diff --git a/src/main/java/com/glodblock/github/client/gui/GuiIngredientBuffer.java b/src/main/java/com/glodblock/github/client/gui/GuiIngredientBuffer.java index 3d4f3517..1ff3036b 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiIngredientBuffer.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiIngredientBuffer.java @@ -15,6 +15,7 @@ import com.glodblock.github.inventory.IAEFluidTank; import com.glodblock.github.inventory.gui.ButtonMouseHandler; import com.glodblock.github.inventory.gui.MouseRegionManager; import com.glodblock.github.inventory.gui.TankMouseHandler; +import com.glodblock.github.util.FCGuiColors; import com.glodblock.github.util.NameConst; import com.glodblock.github.util.RenderUtil; @@ -66,8 +67,13 @@ public class GuiIngredientBuffer extends AEBaseGui { @Override public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY) { - fontRendererObj.drawString(getGuiDisplayName(I18n.format(NameConst.GUI_INGREDIENT_BUFFER)), 8, 6, 0x404040); - fontRendererObj.drawString(GuiText.inventory.getLocal(), 8, ySize - 94, 0x404040); + fontRendererObj.drawString( + getGuiDisplayName(I18n.format(NameConst.GUI_INGREDIENT_BUFFER)), + 8, + 6, + FCGuiColors.guiTextColorGray.getColor()); + fontRendererObj + .drawString(GuiText.inventory.getLocal(), 8, ySize - 94, FCGuiColors.guiTextColorGray.getColor()); GL11.glColor4f(1F, 1F, 1F, 1F); IAEFluidTank fluidInv = cont.getTile().getInternalFluid(); diff --git a/src/main/java/com/glodblock/github/client/gui/GuiLargeIngredientBuffer.java b/src/main/java/com/glodblock/github/client/gui/GuiLargeIngredientBuffer.java index 26a47f30..dd1edb57 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiLargeIngredientBuffer.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiLargeIngredientBuffer.java @@ -15,6 +15,7 @@ import com.glodblock.github.inventory.IAEFluidTank; import com.glodblock.github.inventory.gui.ButtonMouseHandler; import com.glodblock.github.inventory.gui.MouseRegionManager; import com.glodblock.github.inventory.gui.TankMouseHandler; +import com.glodblock.github.util.FCGuiColors; import com.glodblock.github.util.NameConst; import com.glodblock.github.util.RenderUtil; @@ -66,9 +67,13 @@ public class GuiLargeIngredientBuffer extends AEBaseGui { @Override public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY) { + fontRendererObj.drawString( + getGuiDisplayName(I18n.format(NameConst.GUI_LARGE_INGREDIENT_BUFFER)), + 8, + 6, + FCGuiColors.guiTextColorGray.getColor()); fontRendererObj - .drawString(getGuiDisplayName(I18n.format(NameConst.GUI_LARGE_INGREDIENT_BUFFER)), 8, 6, 0x404040); - fontRendererObj.drawString(GuiText.inventory.getLocal(), 8, ySize - 94, 0x404040); + .drawString(GuiText.inventory.getLocal(), 8, ySize - 94, FCGuiColors.guiTextColorGray.getColor()); GL11.glColor4f(1F, 1F, 1F, 1F); IAEFluidTank fluidInv = cont.getTile().getInternalFluid(); diff --git a/src/main/java/com/glodblock/github/client/gui/GuiLevelMaintainer.java b/src/main/java/com/glodblock/github/client/gui/GuiLevelMaintainer.java index 4a44a9eb..5848de6c 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiLevelMaintainer.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiLevelMaintainer.java @@ -136,7 +136,11 @@ public class GuiLevelMaintainer extends GuiSub { @Override public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY) { - fontRendererObj.drawString(getGuiDisplayName(NameConst.i18n(NameConst.GUI_LEVEL_MAINTAINER)), 8, 6, 0x404040); + fontRendererObj.drawString( + getGuiDisplayName(NameConst.i18n(NameConst.GUI_LEVEL_MAINTAINER)), + 8, + 6, + FCGuiColors.guiTextColorGray.getColor()); mouseRegions.render(mouseX, mouseY); } @@ -490,10 +494,10 @@ public class GuiLevelMaintainer extends GuiSub { final double result = Calculator.conversion(this.textField.getText()); if (Double.isNaN(result) || result < 0) { this.amount = null; - this.textField.setTextColor(0xFF0000); + this.textField.setTextColor(FCGuiColors.guiLevelMaintainerError.getColor()); } else { this.amount = (long) ArithHelper.round(result, 0); - this.textField.setTextColor(0xFFFFFF); + this.textField.setTextColor(FCGuiColors.guiTextColorGray.getColor()); } IAEStack stack = component[this.componentIndex].getStack(); diff --git a/src/main/java/com/glodblock/github/client/gui/GuiLevelTerminal.java b/src/main/java/com/glodblock/github/client/gui/GuiLevelTerminal.java index 5eb41e80..1d43555e 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiLevelTerminal.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiLevelTerminal.java @@ -600,7 +600,12 @@ public class GuiLevelTerminal extends FCBaseMEGui implements IDropToFillTextFiel // overlay highlight GL11.glDisable(GL11.GL_LIGHTING); GL11.glTranslatef(0.0f, 0.0f, SLOT_HOVER_Z); - drawRect(colLeft, viewY + 1 + rowYTop, -2 + colRight, viewY - 1 + rowYBot, 0x77FFFFFF); + drawRect( + colLeft, + viewY + 1 + rowYTop, + -2 + colRight, + viewY - 1 + rowYBot, + FCGuiColors.guiLevelTerminalOverlayHighlight.getColor()); GL11.glTranslatef(0.0f, 0.0f, -SLOT_HOVER_Z); } GL11.glDisable(GL11.GL_LIGHTING); diff --git a/src/main/java/com/glodblock/github/client/gui/GuiMagnetFilter.java b/src/main/java/com/glodblock/github/client/gui/GuiMagnetFilter.java index 18797b66..71242b95 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiMagnetFilter.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiMagnetFilter.java @@ -10,6 +10,7 @@ import com.glodblock.github.FluidCraft; import com.glodblock.github.client.gui.container.ContainerMagnetFilter; import com.glodblock.github.inventory.item.WirelessMagnet; import com.glodblock.github.network.CPacketFluidPatternTermBtns; +import com.glodblock.github.util.FCGuiColors; import com.glodblock.github.util.NameConst; import appeng.api.config.ActionItems; @@ -136,10 +137,23 @@ public class GuiMagnetFilter extends GuiSub { @Override public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY) { - this.fontRendererObj.drawString(NameConst.i18n(NameConst.GUI_MAGNET_CARD), 8, 6, 0x404040); - this.fontRendererObj.drawString(NameConst.i18n(NameConst.GUI_MAGNET_CARD_NBT), 61, 22, 0x404040); - this.fontRendererObj.drawString(NameConst.i18n(NameConst.GUI_MAGNET_CARD_META), 61, 34, 0x404040); - this.fontRendererObj.drawString(NameConst.i18n(NameConst.GUI_MAGNET_CARD_ORE), 61, 46, 0x404040); + this.fontRendererObj + .drawString(NameConst.i18n(NameConst.GUI_MAGNET_CARD), 8, 6, FCGuiColors.guiTextColorGray.getColor()); + this.fontRendererObj.drawString( + NameConst.i18n(NameConst.GUI_MAGNET_CARD_NBT), + 61, + 22, + FCGuiColors.guiTextColorGray.getColor()); + this.fontRendererObj.drawString( + NameConst.i18n(NameConst.GUI_MAGNET_CARD_META), + 61, + 34, + FCGuiColors.guiTextColorGray.getColor()); + this.fontRendererObj.drawString( + NameConst.i18n(NameConst.GUI_MAGNET_CARD_ORE), + 61, + 46, + FCGuiColors.guiTextColorGray.getColor()); this.components[0].setVar(this.cont.nbt); this.components[1].setVar(this.cont.meta); this.components[2].setVar(this.cont.ore); diff --git a/src/main/java/com/glodblock/github/client/gui/GuiOCPatternEditor.java b/src/main/java/com/glodblock/github/client/gui/GuiOCPatternEditor.java index 0e2f06f7..69c8944e 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiOCPatternEditor.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiOCPatternEditor.java @@ -7,6 +7,7 @@ import net.minecraft.util.ResourceLocation; import com.glodblock.github.FluidCraft; import com.glodblock.github.client.gui.container.ContainerOCPatternEditor; import com.glodblock.github.common.tile.TileOCPatternEditor; +import com.glodblock.github.util.FCGuiColors; import com.glodblock.github.util.NameConst; import appeng.client.gui.AEBaseGui; @@ -29,7 +30,12 @@ public class GuiOCPatternEditor extends AEBaseGui { @Override public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY) { - fontRendererObj.drawString(getGuiDisplayName(I18n.format(NameConst.GUI_OC_PATTERN_EDITOR)), 8, 6, 0x404040); - fontRendererObj.drawString(GuiText.inventory.getLocal(), 8, ySize - 94, 0x404040); + fontRendererObj.drawString( + getGuiDisplayName(I18n.format(NameConst.GUI_OC_PATTERN_EDITOR)), + 8, + 6, + FCGuiColors.guiTextColorGray.getColor()); + fontRendererObj + .drawString(GuiText.inventory.getLocal(), 8, ySize - 94, FCGuiColors.guiTextColorGray.getColor()); } } diff --git a/src/main/java/com/glodblock/github/client/gui/GuiSuperStockReplenisher.java b/src/main/java/com/glodblock/github/client/gui/GuiSuperStockReplenisher.java index ad8f6747..f14ee370 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiSuperStockReplenisher.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiSuperStockReplenisher.java @@ -13,6 +13,7 @@ import org.lwjgl.opengl.GL11; import com.glodblock.github.FluidCraft; import com.glodblock.github.client.gui.container.ContainerSuperStockReplenisher; import com.glodblock.github.common.tile.TileSuperStockReplenisher; +import com.glodblock.github.util.FCGuiColors; import appeng.api.storage.StorageName; import appeng.api.storage.data.IAEStack; @@ -129,7 +130,8 @@ public class GuiSuperStockReplenisher extends AEBaseGui { @Override public void drawFG(int offsetX, int offsetY, int mouseX, int mouseY) { - fontRendererObj.drawString(GuiText.inventory.getLocal(), 8, ySize - 94, 0x404040); + fontRendererObj + .drawString(GuiText.inventory.getLocal(), 8, ySize - 94, FCGuiColors.guiTextColorGray.getColor()); this.drawVirtualSlots(); } diff --git a/src/main/java/com/glodblock/github/util/FCGuiColors.java b/src/main/java/com/glodblock/github/util/FCGuiColors.java index 45fcf35d..b61a96a6 100644 --- a/src/main/java/com/glodblock/github/util/FCGuiColors.java +++ b/src/main/java/com/glodblock/github/util/FCGuiColors.java @@ -8,13 +8,17 @@ public class FCGuiColors { public static final ColorResource // spotless:off - guiTextColorGray = color.rgb("guiTextColorGray", "0x404040"), + guiTextColorGray = color.rgb("guiTextColorGray", "0x404040"), + guiTextColorWhite = color.rgb("guiTextColorWhite", "0xFFFFFF"), + guiLevelMaintainerError = color.rgb("guiLevelMaintainerError", "0xFF0000"), - stateNone = color.argb("stateNone", "0x00000000"), - stateIdle = color.argb("stateIdle", "0xFF55FF55"), - stateCraft = color.argb("stateCraft", "0xFFFFFF55"), - stateExport = color.argb("stateExport", "0xFFAA00AA"), - stateError = color.argb("stateError", "0xFFFF5555"), - itemSlotOverlayUnpowered = color.argb("itemSlotOverlayUnpowered", "0x66111111"); + + stateNone = color.argb("stateNone", "0x00000000"), + stateIdle = color.argb("stateIdle", "0xFF55FF55"), + stateCraft = color.argb("stateCraft", "0xFFFFFF55"), + stateExport = color.argb("stateExport", "0xFFAA00AA"), + stateError = color.argb("stateError", "0xFFFF5555"), + itemSlotOverlayUnpowered = color.argb("itemSlotOverlayUnpowered", "0x66111111"), + guiLevelTerminalOverlayHighlight = color.argb("guiLevelTerminalOverlayHighlight", "0x77FFFFFF"); // spotless:on }