From 31533e96dfda84c735361e2afeb9a863df5f51fb Mon Sep 17 00:00:00 2001 From: Ranzu <66495944+Ranzuu@users.noreply.github.com> Date: Mon, 15 Jun 2026 18:50:35 +0200 Subject: [PATCH] Convert to ColorUtils (#440) Co-authored-by: Kogepan229 --- dependencies.gradle | 2 +- .../github/client/gui/GuiLevelMaintainer.java | 14 ++--- .../github/client/gui/GuiLevelTerminal.java | 21 ++++---- .../glodblock/github/util/FCGuiColors.java | 52 +++++-------------- .../resources/assets/ae2fc/lang/de_DE.lang | 6 --- .../resources/assets/ae2fc/lang/en_US.lang | 6 --- .../resources/assets/ae2fc/lang/ru_RU.lang | 6 --- .../resources/assets/ae2fc/lang/zh_CN.lang | 6 --- 8 files changed, 31 insertions(+), 82 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 1be45d4e..f05ae17c 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -35,7 +35,7 @@ */ dependencies { api('com.github.GTNewHorizons:NotEnoughItems:2.8.102-GTNH:dev') - api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-982-GTNH:dev') + api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-983-GTNH:dev') api('com.github.GTNewHorizons:waila:1.19.30:dev') api("com.github.GTNewHorizons:GTNHLib:0.11.15:dev") 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 95d4d126..0986c217 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiLevelMaintainer.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiLevelMaintainer.java @@ -307,43 +307,43 @@ public class GuiLevelMaintainer extends GuiSub { message.add(NameConst.i18n(NameConst.TT_LEVEL_MAINTAINER_TITLE) + "\n"); switch (this.state) { case Idle -> { - this.line.setColor(FCGuiColors.StateIdle.getColor()); + this.line.setColor(FCGuiColors.stateIdle.getColor()); message.add( NameConst.i18n(NameConst.TT_LEVEL_MAINTAINER_CURRENT) + " " + NameConst.i18n(NameConst.TT_LEVEL_MAINTAINER_IDLE)); } case Craft -> { - this.line.setColor(FCGuiColors.StateCraft.getColor()); + this.line.setColor(FCGuiColors.stateCraft.getColor()); message.add( NameConst.i18n(NameConst.TT_LEVEL_MAINTAINER_CURRENT) + " " + NameConst.i18n(NameConst.TT_LEVEL_MAINTAINER_LINK)); } case Export -> { - this.line.setColor(FCGuiColors.StateExport.getColor()); + this.line.setColor(FCGuiColors.stateExport.getColor()); message.add( NameConst.i18n(NameConst.TT_LEVEL_MAINTAINER_CURRENT) + " " + NameConst.i18n(NameConst.TT_LEVEL_MAINTAINER_EXPORT)); } case Error -> { - this.line.setColor(FCGuiColors.StateError.getColor()); + this.line.setColor(FCGuiColors.stateError.getColor()); message.add( NameConst.i18n(NameConst.TT_LEVEL_MAINTAINER_CURRENT) + " " + NameConst.i18n(NameConst.TT_LEVEL_MAINTAINER_ERROR)); } case NotFound -> { - this.line.setColor(FCGuiColors.StateError.getColor()); + this.line.setColor(FCGuiColors.stateError.getColor()); message.add( NameConst.i18n(NameConst.TT_LEVEL_MAINTAINER_CURRENT) + " " + NameConst.i18n(NameConst.TT_LEVEL_MAINTAINER_NOT_FOUND)); } case CantCraft -> { - this.line.setColor(FCGuiColors.StateError.getColor()); + this.line.setColor(FCGuiColors.stateError.getColor()); message.add( NameConst.i18n(NameConst.TT_LEVEL_MAINTAINER_CURRENT) + " " + NameConst.i18n(NameConst.TT_LEVEL_MAINTAINER_CANT_CRAFT)); } default -> { - this.line.setColor(FCGuiColors.StateNone.getColor()); + this.line.setColor(FCGuiColors.stateNone.getColor()); message.add( NameConst.i18n(NameConst.TT_LEVEL_MAINTAINER_CURRENT) + " " + NameConst.i18n(NameConst.TT_LEVEL_MAINTAINER_NONE)); 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 77a31080..5d413705 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiLevelTerminal.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiLevelTerminal.java @@ -62,7 +62,6 @@ import appeng.container.AEBaseContainer; import appeng.container.slot.AppEngSlot; import appeng.core.AEConfig; import appeng.core.localization.ButtonToolTips; -import appeng.core.localization.GuiColors; import appeng.core.localization.GuiText; import appeng.core.localization.PlayerMessages; import appeng.core.sync.GuiBridge; @@ -241,12 +240,12 @@ public class GuiLevelTerminal extends FCBaseMEGui implements IDropToFillTextFiel StatCollector.translateToLocal(NameConst.GUI_LEVEL_TERMINAL), 8, 6, - GuiColors.GuiTextColorGray.getColor()); + FCGuiColors.guiTextColorGray.getColor()); fontRendererObj.drawString( GuiText.inventory.getLocal(), GuiLevelTerminal.offsetX + 2, ySize - 96 + 3, - GuiColors.GuiTextColorGray.getColor()); + FCGuiColors.guiTextColorGray.getColor()); if (!ModAndClassUtil.NEI && tooltipStack != null) { renderToolTip(tooltipStack, mouseX, mouseY); @@ -395,7 +394,7 @@ public class GuiLevelTerminal extends FCBaseMEGui implements IDropToFillTextFiel int title; int renderY = 0; final int sectionBottom = viewY + section.getHeight() - 1; - final int fontColor = GuiColors.GuiTextColorGray.getColor(); + final int fontColor = FCGuiColors.guiTextColorGray.getColor(); /* * Render title */ @@ -563,11 +562,11 @@ public class GuiLevelTerminal extends FCBaseMEGui implements IDropToFillTextFiel aes.drawOverlayInGui(mc, 0, 0, false, false, false, false); GL11.glTranslatef(0.0f, 0.0f, ITEM_STACK_OVERLAY_Z - ITEM_STACK_Z); int color = switch (state) { - case Idle -> FCGuiColors.StateIdle.getColor(); - case Craft -> FCGuiColors.StateCraft.getColor(); - case Export -> FCGuiColors.StateExport.getColor(); - case Error, NotFound, CantCraft -> FCGuiColors.StateError.getColor(); - case None -> FCGuiColors.StateNone.getColor(); + case Idle -> FCGuiColors.stateIdle.getColor(); + case Craft -> FCGuiColors.stateCraft.getColor(); + case Export -> FCGuiColors.stateExport.getColor(); + case Error, NotFound, CantCraft -> FCGuiColors.stateError.getColor(); + case None -> FCGuiColors.stateNone.getColor(); }; int offset = 0; int size = 4; @@ -585,7 +584,7 @@ public class GuiLevelTerminal extends FCBaseMEGui implements IDropToFillTextFiel if (!tooltip) { if (entry.filteredRecipes[slotIdx]) { GL11.glTranslatef(0.0f, 0.0f, ITEM_STACK_OVERLAY_Z); - drawRect(0, 0, 16, 16, GuiColors.ItemSlotOverlayUnpowered.getColor()); + drawRect(0, 0, 16, 16, FCGuiColors.itemSlotOverlayUnpowered.getColor()); } } else { tooltipStack = Platform.stackConvert(aes).getItemStack(); @@ -594,7 +593,7 @@ public class GuiLevelTerminal extends FCBaseMEGui implements IDropToFillTextFiel } else if (entry.filteredRecipes[slotIdx]) { GL11.glPushMatrix(); GL11.glTranslatef(colLeft, viewY + rowYTop + 1, ITEM_STACK_OVERLAY_Z); - drawRect(0, 0, 16, 16, GuiColors.ItemSlotOverlayUnpowered.getColor()); + drawRect(0, 0, 16, 16, FCGuiColors.itemSlotOverlayUnpowered.getColor()); GL11.glPopMatrix(); } if (tooltip) { diff --git a/src/main/java/com/glodblock/github/util/FCGuiColors.java b/src/main/java/com/glodblock/github/util/FCGuiColors.java index c9c2e954..45fcf35d 100644 --- a/src/main/java/com/glodblock/github/util/FCGuiColors.java +++ b/src/main/java/com/glodblock/github/util/FCGuiColors.java @@ -1,46 +1,20 @@ package com.glodblock.github.util; -import net.minecraft.util.StatCollector; +import com.gtnewhorizon.gtnhlib.color.ColorResource; -import appeng.core.AELog; +public class FCGuiColors { -public enum FCGuiColors { + private static final ColorResource.Factory color = new ColorResource.Factory("ae2fc"); - // ARGB Colors: Name and default value - StateNone(0x00000000), - StateIdle(0xFF55FF55), - StateCraft(0xFFFFFF55), - StateExport(0xFFAA00AA), - StateError(0xFFFF5555); + public static final ColorResource + // spotless:off + guiTextColorGray = color.rgb("guiTextColorGray", "0x404040"), - private final String root; - private final int color; - - FCGuiColors() { - this.root = "ae2fc.gui.color"; - this.color = 0x000000; - } - - FCGuiColors(final int hex) { - this.root = "ae2fc.gui.color"; - this.color = hex; - } - - public int getColor() { - String hex = StatCollector.translateToLocal(this.getUnlocalized()); - int color = this.color; - - if (hex.length() <= 8) { - try { - color = Integer.parseUnsignedInt(hex, 16); - } catch (final NumberFormatException e) { - AELog.warn("Couldn't format color correctly for: " + this.root + " -> " + hex); - } - } - return color; - } - - public String getUnlocalized() { - return this.root + '.' + this.toString(); - } + 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"); + // spotless:on } diff --git a/src/main/resources/assets/ae2fc/lang/de_DE.lang b/src/main/resources/assets/ae2fc/lang/de_DE.lang index 9e59eb16..19bba7ed 100644 --- a/src/main/resources/assets/ae2fc/lang/de_DE.lang +++ b/src/main/resources/assets/ae2fc/lang/de_DE.lang @@ -190,12 +190,6 @@ ae2fc.gui.magnet.ore=Ore Dictionary benutzen ae2fc.gui.magnet.whitelist=Whitelist ae2fc.gui.magnet.blacklist=Blacklist -ae2fc.gui.color.StateNone=00000000 -ae2fc.gui.color.StateIdle=FF55FF55 -ae2fc.gui.color.StateCraft=FFFFFF55 -ae2fc.gui.color.StateExport=FFAA00AA -ae2fc.gui.color.StateError=FFFF5555 - error.unknown=Unbekannt ae2fc.key.OpenTerminal=Handkonsole öffnen diff --git a/src/main/resources/assets/ae2fc/lang/en_US.lang b/src/main/resources/assets/ae2fc/lang/en_US.lang index e8ec635b..68db35eb 100644 --- a/src/main/resources/assets/ae2fc/lang/en_US.lang +++ b/src/main/resources/assets/ae2fc/lang/en_US.lang @@ -199,12 +199,6 @@ ae2fc.gui.magnet.ore=Use Ore Dictionary ae2fc.gui.magnet.whitelist=Whitelisting ae2fc.gui.magnet.blacklist=Blacklisting -ae2fc.gui.color.StateNone=00000000 -ae2fc.gui.color.StateIdle=FF55FF55 -ae2fc.gui.color.StateCraft=FFFFFF55 -ae2fc.gui.color.StateExport=FFAA00AA -ae2fc.gui.color.StateError=FFFF5555 - error.unknown=Unknown ae2fc.key.OpenTerminal=Open Wireless Universal Terminal diff --git a/src/main/resources/assets/ae2fc/lang/ru_RU.lang b/src/main/resources/assets/ae2fc/lang/ru_RU.lang index 04e00c65..bc4bef8a 100644 --- a/src/main/resources/assets/ae2fc/lang/ru_RU.lang +++ b/src/main/resources/assets/ae2fc/lang/ru_RU.lang @@ -190,12 +190,6 @@ ae2fc.gui.magnet.ore=Использовать словарь руд ae2fc.gui.magnet.whitelist=Белый список ae2fc.gui.magnet.blacklist=Чёрный список -ae2fc.gui.color.StateNone=00000000 -ae2fc.gui.color.StateIdle=FF55FF55 -ae2fc.gui.color.StateCraft=FFFFFF55 -ae2fc.gui.color.StateExport=FFAA00AA -ae2fc.gui.color.StateError=FFFF5555 - error.unknown=Неизвестно ae2fc.key.OpenTerminal=Открыть беспроводной универсальный терминал diff --git a/src/main/resources/assets/ae2fc/lang/zh_CN.lang b/src/main/resources/assets/ae2fc/lang/zh_CN.lang index 10e5f678..247c5777 100644 --- a/src/main/resources/assets/ae2fc/lang/zh_CN.lang +++ b/src/main/resources/assets/ae2fc/lang/zh_CN.lang @@ -184,12 +184,6 @@ ae2fc.gui.magnet.ore=Use Ore Dictionary ae2fc.gui.magnet.whitelist=Whitelisting ae2fc.gui.magnet.blacklist=Blacklisting -ae2fc.gui.color.StateNone=00000000 -ae2fc.gui.color.StateIdle=FF55FF55 -ae2fc.gui.color.StateCraft=FFFFFF55 -ae2fc.gui.color.StateExport=FFAA00AA -ae2fc.gui.color.StateError=FFFF5555 - error.unknown=未知流体 ae2fc.key.OpenTerminal=Open Wireless Universal Terminal