Overriding GUI colors with .mcmeta (#1261)

* Implemented gui textcolor override with .mcmeta files

* cleanup

* Added shared class to reduce code duplication

* Moved #drawLine back to GT_NEI_DefaultHandler

2 files changed, 2 insertions, 8 deletions

diff --git a/src/main/java/gregtech/common/render/GT_FluidDisplayStackRenderer.java b/src/main/java/gregtech/common/render/GT_FluidDisplayStackRenderer.java
index 76a475a1a5..c4e23eab6e 100644
--- a/src/main/java/gregtech/common/render/GT_FluidDisplayStackRenderer.java
+++ b/src/main/java/gregtech/common/render/GT_FluidDisplayStackRenderer.java
@@ -1,7 +1,6 @@
 package gregtech.common.render;
 
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.enums.GuiColors;
 import gregtech.api.enums.ItemList;
 import gregtech.common.items.GT_FluidDisplayItem;
 import net.minecraft.client.Minecraft;
@@ -17,8 +16,6 @@ import org.lwjgl.opengl.GL11;
 @SideOnly(cpw.mods.fml.relauncher.Side.CLIENT)
 public class GT_FluidDisplayStackRenderer implements IItemRenderer {
 
-    private final GuiColors textColor = GuiColors.fluidDisplayStackRenderer;
-
     public GT_FluidDisplayStackRenderer() {
         MinecraftForgeClient.registerItemRenderer(ItemList.Display_Fluid.getItem(), this);
     }
@@ -92,7 +89,7 @@ public class GT_FluidDisplayStackRenderer implements IItemRenderer {
             GL11.glDisable(GL11.GL_BLEND);
             GL11.glScalef(smallTextScale, smallTextScale, 1.0f);
 
-            fontRender.drawString( amountString, 0, (int) (16/smallTextScale) - fontRender.FONT_HEIGHT + 1, textColor.getColor(), true);
+            fontRender.drawString( amountString, 0, (int) (16/smallTextScale) - fontRender.FONT_HEIGHT + 1, 0xFFFFFF, true);
             GL11.glScalef(1f, 1f, 1f);
             GL11.glDisable(GL11.GL_ALPHA_TEST);
         }
diff --git a/src/main/java/gregtech/common/render/GT_PollutionRenderer.java b/src/main/java/gregtech/common/render/GT_PollutionRenderer.java
index e385bd7686..5128af1c36 100644
--- a/src/main/java/gregtech/common/render/GT_PollutionRenderer.java
+++ b/src/main/java/gregtech/common/render/GT_PollutionRenderer.java
@@ -7,7 +7,6 @@ import cpw.mods.fml.common.gameevent.TickEvent;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.GT_Mod;
-import gregtech.api.enums.GuiColors;
 import gregtech.common.entities.GT_EntityFXPollution;
 import gregtech.common.misc.GT_ClientPollutionMap;
 import net.minecraft.block.Block;
@@ -47,8 +46,6 @@ public class GT_PollutionRenderer {
     private static final short[] liquidColor = {160, 200, 10};
     private static final short[] foliageColor = {160, 80, 15};
 
-    private final GuiColors textColor = GuiColors.pollutionRenderer;
-
     //TODO need to soft update some blocks, grass and leaves does more often than liquid it looks like.
 
     public GT_PollutionRenderer() {
@@ -248,7 +245,7 @@ public class GT_PollutionRenderer {
         GL11.glPushMatrix();
         GL11.glEnable(GL11.GL_BLEND);
         OpenGlHelper.glBlendFunc(770, 771, 1, 0);
-        Minecraft.getMinecraft().fontRenderer.drawStringWithShadow(text, 0, off, textColor.getColor());
+        Minecraft.getMinecraft().fontRenderer.drawStringWithShadow(text, 0, off, 0xFFFFFFFF);
         GL11.glDisable(GL11.GL_BLEND);
         GL11.glPopMatrix();
     }