aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common
diff options
context:
space:
mode:
authorAlbi <12825442+Flanisch@users.noreply.github.com>2022-08-12 20:34:37 +0200
committerGitHub <noreply@github.com>2022-08-12 20:34:37 +0200
commitbbd40c34e104dcead78290af1394e6f5867df565 (patch)
tree43c8d507722b7ba189cf4acfb924ca584b287c6f /src/main/java/gregtech/common
parentd815f1f0e7b267c1c7ef97fdf2c790b6c9f6a378 (diff)
downloadGT5-Unofficial-bbd40c34e104dcead78290af1394e6f5867df565.tar.gz
GT5-Unofficial-bbd40c34e104dcead78290af1394e6f5867df565.tar.bz2
GT5-Unofficial-bbd40c34e104dcead78290af1394e6f5867df565.zip
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>
Diffstat (limited to 'src/main/java/gregtech/common')
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_Arm.java11
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java12
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java9
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_DoesWork.java8
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_EUMeter.java9
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java14
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java13
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_ItemFilter.java6
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java9
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_LiquidMeter.java7
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_NeedMaintainance.java19
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java9
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_Pump.java8
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java7
-rw-r--r--src/main/java/gregtech/common/covers/GT_Cover_Shutter.java12
-rw-r--r--src/main/java/gregtech/common/gui/GT_GUIContainer_Boiler.java6
-rw-r--r--src/main/java/gregtech/common/gui/GT_GUIContainer_BronzeBlastFurnace.java6
-rw-r--r--src/main/java/gregtech/common/gui/GT_GUIContainer_FusionReactor.java12
-rw-r--r--src/main/java/gregtech/common/gui/GT_GUIContainer_IndustrialApiary.java8
-rw-r--r--src/main/java/gregtech/common/gui/GT_GUIContainer_MicrowaveEnergyTransmitter.java14
-rw-r--r--src/main/java/gregtech/common/gui/GT_GUIContainer_OutputHatch.java20
-rw-r--r--src/main/java/gregtech/common/gui/GT_GUIContainer_PrimitiveBlastFurnace.java4
-rw-r--r--src/main/java/gregtech/common/gui/GT_GUIContainer_QuantumChest.java13
-rw-r--r--src/main/java/gregtech/common/gui/GT_GUIContainer_Regulator.java22
-rw-r--r--src/main/java/gregtech/common/gui/GT_GUIContainer_Teleporter.java14
-rw-r--r--src/main/java/gregtech/common/render/GT_FluidDisplayStackRenderer.java5
-rw-r--r--src/main/java/gregtech/common/render/GT_PollutionRenderer.java5
27 files changed, 188 insertions, 94 deletions
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Arm.java b/src/main/java/gregtech/common/covers/GT_Cover_Arm.java
index 727ab12f20..4fd00840ae 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_Arm.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_Arm.java
@@ -1,6 +1,7 @@
package gregtech.common.covers;
import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GuiColors;
import gregtech.api.gui.GT_GUICover;
import gregtech.api.gui.widgets.GT_GuiFakeItemButton;
import gregtech.api.gui.widgets.GT_GuiIcon;
@@ -27,6 +28,8 @@ public class GT_Cover_Arm extends GT_CoverBehavior {
protected static final int SLOT_ID_MIN = 0;
protected static final int CONVERTED_BIT = 0x80000000;
+ private final int textColor = GuiColors.coverArm.getColor();
+
public GT_Cover_Arm(int aTickRate) {
this.mTickRate = aTickRate;
}
@@ -288,12 +291,12 @@ public class GT_Cover_Arm extends GT_CoverBehavior {
public void drawExtras(int mouseX, int mouseY, float parTicks) {
super.drawExtras(mouseX, mouseY, parTicks);
if (export)
- this.getFontRenderer().drawString(GT_Utility.trans("006", "Export"), startX + spaceX*3, 4+startY+spaceY*0, 0xFF555555);
+ this.getFontRenderer().drawString(GT_Utility.trans("006", "Export"), startX + spaceX*3, 4+startY+spaceY*0, textColor);
else
- this.getFontRenderer().drawString(GT_Utility.trans("007", "Import"), startX + spaceX*3, 4+startY+spaceY*0, 0xFF555555);
+ this.getFontRenderer().drawString(GT_Utility.trans("007", "Import"), startX + spaceX*3, 4+startY+spaceY*0, textColor);
- this.getFontRenderer().drawString(GT_Utility.trans("254", "Internal slot#"), startX + spaceX*3, 4+startY+spaceY*1, 0xFF555555);
- this.getFontRenderer().drawString(GT_Utility.trans("255", "Adjacent slot#"), startX + spaceX*3, 4+startY+spaceY*2, 0xFF555555);
+ this.getFontRenderer().drawString(GT_Utility.trans("254", "Internal slot#"), startX + spaceX*3, 4+startY+spaceY*1, textColor);
+ this.getFontRenderer().drawString(GT_Utility.trans("255", "Adjacent slot#"), startX + spaceX*3, 4+startY+spaceY*2, textColor);
}
@Override
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java b/src/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java
index 7d9a109895..3a4fb3a50a 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java
@@ -1,6 +1,7 @@
package gregtech.common.covers;
import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GuiColors;
import gregtech.api.gui.GT_GUICover;
import gregtech.api.gui.widgets.GT_GuiIcon;
import gregtech.api.gui.widgets.GT_GuiIconButton;
@@ -17,6 +18,9 @@ import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.Fluid;
public class GT_Cover_ControlsWork extends GT_CoverBehavior {
+
+ private final int textColor = GuiColors.coverControlsWork.getColor();
+
@Override
public int doCoverThings(byte aSide, byte aInputRedstone, int aCoverID, int aCoverVariable, ICoverable aTileEntity, long aTimer) {
if (!makeSureOnlyOne(aSide, aTileEntity)) return 0;
@@ -177,10 +181,10 @@ public class GT_Cover_ControlsWork extends GT_CoverBehavior {
@Override
public void drawExtras(int mouseX, int mouseY, float parTicks) {
super.drawExtras(mouseX, mouseY, parTicks);
- this.fontRendererObj.drawString(GT_Utility.trans("243", "Enable with Redstone"), 3+startX + spaceX*1, 4+startY+spaceY*0, 0xFF555555);
- this.fontRendererObj.drawString(GT_Utility.trans("244", "Disable with Redstone"),3+startX + spaceX*1, 4+startY+spaceY*1, 0xFF555555);
- this.fontRendererObj.drawString(GT_Utility.trans("245", "Disable machine"), 3+startX + spaceX*1, 4+startY+spaceY*2, 0xFF555555);
- this.fontRendererObj.drawString(GT_Utility.trans("507", "Safe Mode"), 3+startX + spaceX*1, 4+startY+spaceY*3, 0xFF555555);
+ this.fontRendererObj.drawString(GT_Utility.trans("243", "Enable with Redstone"), 3+startX + spaceX*1, 4+startY+spaceY*0, textColor);
+ this.fontRendererObj.drawString(GT_Utility.trans("244", "Disable with Redstone"),3+startX + spaceX*1, 4+startY+spaceY*1, textColor);
+ this.fontRendererObj.drawString(GT_Utility.trans("245", "Disable machine"), 3+startX + spaceX*1, 4+startY+spaceY*2, textColor);
+ this.fontRendererObj.drawString(GT_Utility.trans("507", "Safe Mode"), 3+startX + spaceX*1, 4+startY+spaceY*3, textColor);
}
@Override
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java b/src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java
index 7e8f85b820..4c41909b14 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java
@@ -1,6 +1,7 @@
package gregtech.common.covers;
import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GuiColors;
import gregtech.api.gui.GT_GUICover;
import gregtech.api.gui.widgets.GT_GuiIcon;
import gregtech.api.gui.widgets.GT_GuiIconButton;
@@ -20,6 +21,8 @@ public class GT_Cover_Conveyor extends GT_CoverBehavior {
public final int mTickRate;
private final int mMaxStacks;
+ private final int textColor = GuiColors.coverPlayerDetector.getColor();
+
public GT_Cover_Conveyor(int aTickRate) {
this.mTickRate = aTickRate;
this.mMaxStacks = 1;
@@ -179,9 +182,9 @@ public class GT_Cover_Conveyor extends GT_CoverBehavior {
@Override
public void drawExtras(int mouseX, int mouseY, float parTicks) {
super.drawExtras(mouseX, mouseY, parTicks);
- this.fontRendererObj.drawString(GT_Utility.trans("229", "Import/Export"), startX + spaceX*3, 3+startY+spaceY*0, 0xFF555555);
- this.fontRendererObj.drawString(GT_Utility.trans("230", "Conditional"), startX + spaceX*3, 3+startY+spaceY*1, 0xFF555555);
- this.fontRendererObj.drawString(GT_Utility.trans("231", "Enable Input"), startX + spaceX*3, 3+startY+spaceY*2, 0xFF555555);
+ this.fontRendererObj.drawString(GT_Utility.trans("229", "Import/Export"), startX + spaceX*3, 3+startY+spaceY*0, textColor);
+ this.fontRendererObj.drawString(GT_Utility.trans("230", "Conditional"), startX + spaceX*3, 3+startY+spaceY*1, textColor);
+ this.fontRendererObj.drawString(GT_Utility.trans("231", "Enable Input"), startX + spaceX*3, 3+startY+spaceY*2, textColor);
}
@Override
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_DoesWork.java b/src/main/java/gregtech/common/covers/GT_Cover_DoesWork.java
index b2e83258a8..6043ccb472 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_DoesWork.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_DoesWork.java
@@ -1,6 +1,7 @@
package gregtech.common.covers;
import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GuiColors;
import gregtech.api.gui.GT_GUICover;
import gregtech.api.gui.widgets.GT_GuiIcon;
import gregtech.api.gui.widgets.GT_GuiIconButton;
@@ -15,6 +16,9 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraftforge.fluids.Fluid;
public class GT_Cover_DoesWork extends GT_CoverBehavior {
+
+ private final int textColor = GuiColors.coverDoesWork.getColor();
+
@Override
public boolean isRedstoneSensitive(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, long aTimer) {
return false;
@@ -144,8 +148,8 @@ public class GT_Cover_DoesWork extends GT_CoverBehavior {
s2 = GT_Utility.trans("INVERTED", "Inverted");
else
s2 = GT_Utility.trans("NORMAL", "Normal");
- this.fontRendererObj.drawString(s1, startX + spaceX*3, 4+startY+spaceY*0, 0xFF555555);
- this.fontRendererObj.drawString(s2, startX + spaceX*3, 4+startY+spaceY*1, 0xFF555555);
+ this.fontRendererObj.drawString(s1, startX + spaceX*3, 4+startY+spaceY*0, textColor);
+ this.fontRendererObj.drawString(s2, startX + spaceX*3, 4+startY+spaceY*1, textColor);
}
@Override
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_EUMeter.java b/src/main/java/gregtech/common/covers/GT_Cover_EUMeter.java
index 17eedb2c95..292697be38 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_EUMeter.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_EUMeter.java
@@ -2,6 +2,7 @@ package gregtech.common.covers;
import com.google.common.io.ByteArrayDataInput;
import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GuiColors;
import gregtech.api.gui.GT_GUICover;
import gregtech.api.gui.widgets.GT_GuiIcon;
import gregtech.api.gui.widgets.GT_GuiIconButton;
@@ -30,6 +31,8 @@ import java.util.function.Function;
public class GT_Cover_EUMeter extends GT_CoverBehaviorBase<GT_Cover_EUMeter.EUMeterData> {
+ private final int textColor = GuiColors.coverEUMeter.getColor();
+
public GT_Cover_EUMeter() {
super(EUMeterData.class);
}
@@ -387,9 +390,9 @@ public class GT_Cover_EUMeter extends GT_CoverBehaviorBase<GT_Cover_EUMeter.EUMe
@Override
public void drawExtras(int mouseX, int mouseY, float parTicks) {
super.drawExtras(mouseX, mouseY, parTicks);
- this.getFontRenderer().drawString(coverVariable.type.getTitle(), startX + spaceX, 4 + startY, 0xFF555555);
- this.getFontRenderer().drawString(coverVariable.inverted ? INVERTED : NORMAL, startX + spaceX, 4 + startY + spaceY, 0xFF555555);
- this.getFontRenderer().drawString(GT_Utility.trans("222.1", "Energy threshold"), startX, startY + spaceY * 3 + 4, 0xFF555555);
+ this.getFontRenderer().drawString(coverVariable.type.getTitle(), startX + spaceX, 4 + startY, textColor);
+ this.getFontRenderer().drawString(coverVariable.inverted ? INVERTED : NORMAL, startX + spaceX, 4 + startY + spaceY, textColor);
+ this.getFontRenderer().drawString(GT_Utility.trans("222.1", "Energy threshold"), startX, startY + spaceY * 3 + 4, textColor);
}
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java b/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java
index f792fcee08..1051539314 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_FluidRegulator.java
@@ -2,6 +2,7 @@ package gregtech.common.covers;
import com.google.common.io.ByteArrayDataInput;
import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GuiColors;
import gregtech.api.gui.GT_GUICover;
import gregtech.api.gui.widgets.GT_GuiIcon;
import gregtech.api.gui.widgets.GT_GuiIconButton;
@@ -49,6 +50,9 @@ public class GT_Cover_FluidRegulator extends GT_CoverBehaviorBase<GT_Cover_Fluid
private static final int TICK_RATE_BITMASK = (TICK_RATE_MAX - TICK_RATE_MIN) << SPEED_LENGTH;
public final int mTransferRate;
+ private final int
+ textColor = GuiColors.coverFluidRegulator.getColor(),
+ textColorWarn = GuiColors.coverFluidRegulatorWarn.getColor();
private boolean allowFluid = false;
public GT_Cover_FluidRegulator(int aTransferRate) {
@@ -390,11 +394,11 @@ public class GT_Cover_FluidRegulator extends GT_CoverBehaviorBase<GT_Cover_Fluid
@Override
public void drawExtras(int mouseX, int mouseY, float parTicks) {
super.drawExtras(mouseX, mouseY, parTicks);
- this.getFontRenderer().drawString(GT_Utility.trans("229", "Import/Export"), startX + spaceX * 4, 4 + startY + spaceY * 0, 0xFF555555);
- this.getFontRenderer().drawString(GT_Utility.trans("229", "Conditional"), startX + spaceX * 4, 4 + startY + spaceY * 1, 0xFF555555);
- this.getFontRenderer().drawString(GT_Utility.trans("208", " L"), startX + spaceX * 4, 4 + startY + spaceY * 2, 0xFF555555);
- this.getFontRenderer().drawString(GT_Utility.trans("209", " ticks"), startX + spaceX * 7, 4 + startY + spaceY * 2, 0xFF555555);
- this.getFontRenderer().drawString(String.format(GT_Utility.trans("210", "Average: %.2f L/sec"), coverVariable.tickRate == 0 ? 0 : coverVariable.speed * 20d / coverVariable.tickRate), startX + spaceX * 0, 4 + startY + spaceY * 3, warn ? 0xffff0000 : 0xff555555);
+ this.getFontRenderer().drawString(GT_Utility.trans("229", "Import/Export"), startX + spaceX * 4, 4 + startY + spaceY * 0, textColor);
+ this.getFontRenderer().drawString(GT_Utility.trans("229", "Conditional"), startX + spaceX * 4, 4 + startY + spaceY * 1, textColor);
+ this.getFontRenderer().drawString(GT_Utility.trans("208", " L"), startX + spaceX * 4, 4 + startY + spaceY * 2, textColor);
+ this.getFontRenderer().drawString(GT_Utility.trans("209", " ticks"), startX + spaceX * 7, 4 + startY + spaceY * 2, textColor);
+ this.getFontRenderer().drawString(String.format(GT_Utility.trans("210", "Average: %.2f L/sec"), coverVariable.tickRate == 0 ? 0 : coverVariable.speed * 20d / coverVariable.tickRate), startX + spaceX * 0, 4 + startY + spaceY * 3, warn ? textColorWarn : textColor);
}
@Override
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java b/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java
index 457f27ae20..a809ebd206 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_Fluidfilter.java
@@ -2,6 +2,7 @@ package gregtech.common.covers;
import com.google.common.io.ByteArrayDataInput;
import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GuiColors;
import gregtech.api.gui.GT_GUICover;
import gregtech.api.gui.widgets.GT_GuiFakeItemButton;
import gregtech.api.gui.widgets.GT_GuiIcon;
@@ -40,6 +41,10 @@ public class GT_Cover_Fluidfilter extends GT_CoverBehaviorBase<GT_Cover_Fluidfil
private final int ANY_INPUT_FILTER_OUTPUT = 6; // 110
private final int ANY_INPUT_INVERT_OUTPUT = 7; // 111
+ private final int
+ textColor = GuiColors.coverFluidFilter.getColor(),
+ textColorFluidFilterName = GuiColors.coverFluidFilterName.getColor();
+
public GT_Cover_Fluidfilter() {
super(FluidFilterData.class);
}
@@ -259,10 +264,10 @@ public class GT_Cover_Fluidfilter extends GT_CoverBehaviorBase<GT_Cover_Fluidfil
@Override
public void drawExtras(int mouseX, int mouseY, float parTicks) {
super.drawExtras(mouseX, mouseY, parTicks);
- this.fontRendererObj.drawString(GT_Utility.trans("238", "Filter Direction"), startX + spaceX*2, 3+startY+spaceY*0, 0xFF555555);
- this.fontRendererObj.drawString(GT_Utility.trans("239", "Filter Type"), startX + spaceX*2, 3+startY+spaceY*1, 0xFF555555);
- this.fontRendererObj.drawString(GT_Utility.trans("240", "Block Flow"), startX + spaceX*2, 3+startY+spaceY*2, 0xFF555555);
- this.fontRendererObj.drawSplitString(fluidFilterName, startX + spaceX+3, 4+startY+spaceY*3, gui_width-40 , 0xFF222222);
+ this.fontRendererObj.drawString(GT_Utility.trans("238", "Filter Direction"), startX + spaceX*2, 3+startY+spaceY*0, textColor);
+ this.fontRendererObj.drawString(GT_Utility.trans("239", "Filter Type"), startX + spaceX*2, 3+startY+spaceY*1, textColor);
+ this.fontRendererObj.drawString(GT_Utility.trans("240", "Block Flow"), startX + spaceX*2, 3+startY+spaceY*2, textColor);
+ this.fontRendererObj.drawSplitString(fluidFilterName, startX + spaceX+3, 4+startY+spaceY*3, gui_width-40 , textColorFluidFilterName);
}
@Override
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_ItemFilter.java b/src/main/java/gregtech/common/covers/GT_Cover_ItemFilter.java
index 0e45844568..d1130c35ed 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_ItemFilter.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_ItemFilter.java
@@ -3,6 +3,7 @@ package gregtech.common.covers;
import com.google.common.io.ByteArrayDataInput;
import cpw.mods.fml.common.network.ByteBufUtils;
import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GuiColors;
import gregtech.api.gui.GT_GUICover;
import gregtech.api.gui.widgets.GT_GuiFakeItemButton;
import gregtech.api.gui.widgets.GT_GuiIcon;
@@ -34,6 +35,7 @@ import static gregtech.api.util.GT_Utility.moveMultipleItemStacks;
public class GT_Cover_ItemFilter extends GT_CoverBehaviorBase<GT_Cover_ItemFilter.ItemFilterData> {
private final boolean mExport;
+ private final int textColor = GuiColors.coverItemFilter.getColor();
public GT_Cover_ItemFilter(boolean isExport) {
super(ItemFilterData.class);
@@ -234,8 +236,8 @@ public class GT_Cover_ItemFilter extends GT_CoverBehaviorBase<GT_Cover_ItemFilte
@Override
public void drawExtras(int mouseX, int mouseY, float parTicks) {
super.drawExtras(mouseX, mouseY, parTicks);
- this.fontRendererObj.drawString(GT_Utility.trans("317", "Filter: "), startX + spaceX*0, 3+startY+spaceY*1, 0xFF555555);
- this.fontRendererObj.drawString(GT_Utility.trans("318", "Check Mode"), startX + spaceX*2, 3+startY+spaceY*0, 0xFF555555);
+ this.fontRendererObj.drawString(GT_Utility.trans("317", "Filter: "), startX + spaceX*0, 3+startY+spaceY*1, textColor);
+ this.fontRendererObj.drawString(GT_Utility.trans("318", "Check Mode"), startX + spaceX*2, 3+startY+spaceY*0, textColor);
}
@Override
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java b/src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java
index addacade3d..b51ffff486 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_ItemMeter.java
@@ -4,6 +4,7 @@ import com.google.common.io.ByteArrayDataInput;
import gregtech.api.GregTech_API;
import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GuiColors;
import gregtech.api.gui.GT_GUICover;
import gregtech.api.gui.widgets.GT_GuiFakeItemButton;
import gregtech.api.gui.widgets.GT_GuiIcon;
@@ -38,6 +39,8 @@ public class GT_Cover_ItemMeter extends GT_CoverBehaviorBase<GT_Cover_ItemMeter.
private static final int CONVERTED_BIT = 0x80000000;
private static final int INVERT_BIT = 0x40000000;
+ private final int textColor = GuiColors.coverItemMeter.getColor();
+
public GT_Cover_ItemMeter() {
super(ItemMeterData.class);
}
@@ -317,9 +320,9 @@ public class GT_Cover_ItemMeter extends GT_CoverBehaviorBase<GT_Cover_ItemMeter.
@Override
public void drawExtras(int mouseX, int mouseY, float parTicks) {
super.drawExtras(mouseX, mouseY, parTicks);
- this.getFontRenderer().drawString(coverVariable.inverted ? INVERTED : NORMAL, startX + spaceX * 3, 4 + startY, 0xFF555555);
- this.getFontRenderer().drawString(GT_Utility.trans("254", "Detect slot#"), startX + spaceX * 3, 4 + startY + spaceY, 0xFF555555);
- this.getFontRenderer().drawString(GT_Utility.trans("221", "Item threshold"), startX + spaceX * 3, startY + spaceY * 2 + 4, 0xFF555555);
+ this.getFontRenderer().drawString(coverVariable.inverted ? INVERTED : NORMAL, startX + spaceX * 3, 4 + startY, textColor);
+ this.getFontRenderer().drawString(GT_Utility.trans("254", "Detect slot#"), startX + spaceX * 3, 4 + startY + spaceY, textColor);
+ this.getFontRenderer().drawString(GT_Utility.trans("221", "Item threshold"), startX + spaceX * 3, startY + spaceY * 2 + 4, textColor);
}
@Override
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_LiquidMeter.java b/src/main/java/gregtech/common/covers/GT_Cover_LiquidMeter.java
index 05f758f593..a9590d8c5c 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_LiquidMeter.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_LiquidMeter.java
@@ -2,6 +2,7 @@ package gregtech.common.covers;
import com.google.common.io.ByteArrayDataInput;
import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GuiColors;
import gregtech.api.gui.GT_GUICover;
import gregtech.api.gui.widgets.GT_GuiIcon;
import gregtech.api.gui.widgets.GT_GuiIconCheckButton;
@@ -29,6 +30,8 @@ import java.util.Arrays;
public class GT_Cover_LiquidMeter extends GT_CoverBehaviorBase<GT_Cover_LiquidMeter.LiquidMeterData> {
+ private final int textColor = GuiColors.coverLiquidMeter.getColor();
+
public GT_Cover_LiquidMeter() {
super(LiquidMeterData.class);
}
@@ -254,8 +257,8 @@ public class GT_Cover_LiquidMeter extends GT_CoverBehaviorBase<GT_Cover_LiquidMe
@Override
public void drawExtras(int mouseX, int mouseY, float parTicks) {
super.drawExtras(mouseX, mouseY, parTicks);
- this.fontRendererObj.drawString(coverVariable.inverted ? INVERTED : NORMAL, startX + spaceX * 1, 4 + startY + spaceY * 0, 0xFF555555);
- this.getFontRenderer().drawString(GT_Utility.trans("222", "Fluid threshold"), startX + spaceX * 5 - 10, startY + spaceY * 1 + 4, 0xFF555555);
+ this.fontRendererObj.drawString(coverVariable.inverted ? INVERTED : NORMAL, startX + spaceX * 1, 4 + startY + spaceY * 0, textColor);
+ this.getFontRenderer().drawString(GT_Utility.trans("222", "Fluid threshold"), startX + spaceX * 5 - 10, startY + spaceY * 1 + 4, textColor);
}
@Override
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_NeedMaintainance.java b/src/main/java/gregtech/common/covers/GT_Cover_NeedMaintainance.java
index 037af5d42c..ef2fb2e23b 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_NeedMaintainance.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_NeedMaintainance.java
@@ -1,6 +1,7 @@
package gregtech.common.covers;
import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GuiColors;
import gregtech.api.gui.GT_GUICover;
import gregtech.api.gui.widgets.GT_GuiIcon;
import gregtech.api.gui.widgets.GT_GuiIconCheckButton;
@@ -19,6 +20,8 @@ import net.minecraftforge.fluids.Fluid;
public class GT_Cover_NeedMaintainance extends GT_CoverBehavior {
+ private final int textColor = GuiColors.coverMaintenance.getColor();
+
private boolean isRotor(ItemStack aRotor) {
return !(aRotor == null || !(aRotor.getItem() instanceof GT_MetaGenerated_Tool) || aRotor.getItemDamage() < 170 || aRotor.getItemDamage() > 176);
}
@@ -229,16 +232,16 @@ public class GT_Cover_NeedMaintainance extends GT_CoverBehavior {
public void drawExtras(int mouseX, int mouseY, float parTicks) {
super.drawExtras(mouseX, mouseY, parTicks);
- this.fontRendererObj.drawString(buttontext[0],startX + spaceX*1, 4+startY+spaceY*0, 0xFF555555);
- this.fontRendererObj.drawString(buttontext[1],startX + spaceX*1, 4+startY+spaceY*1, 0xFF555555);
- this.fontRendererObj.drawString(buttontext[2],startX + spaceX*1, 4+startY+spaceY*2, 0xFF555555);
- this.fontRendererObj.drawString(buttontext[3],startX + spaceX*1, 4+startY+spaceY*3, 0xFF555555);
- this.fontRendererObj.drawString(buttontext[4],startX + spaceX*5 + 4, 4+startY+spaceY*0, 0xFF555555);
- this.fontRendererObj.drawString(buttontext[5],startX + spaceX*5 + 4, 4+startY+spaceY*1, 0xFF555555);
- this.fontRendererObj.drawString(buttontext[6],startX + spaceX*5 + 4, 4+startY+spaceY*2, 0xFF555555);
+ this.fontRendererObj.drawString(buttontext[0],startX + spaceX*1, 4+startY+spaceY*0, textColor);
+ this.fontRendererObj.drawString(buttontext[1],startX + spaceX*1, 4+startY+spaceY*1, textColor);
+ this.fontRendererObj.drawString(buttontext[2],startX + spaceX*1, 4+startY+spaceY*2, textColor);
+ this.fontRendererObj.drawString(buttontext[3],startX + spaceX*1, 4+startY+spaceY*3, textColor);
+ this.fontRendererObj.drawString(buttontext[4],startX + spaceX*5 + 4, 4+startY+spaceY*0, textColor);
+ this.fontRendererObj.drawString(buttontext[5],startX + spaceX*5 + 4, 4+startY+spaceY*1, textColor);
+ this.fontRendererObj.drawString(buttontext[6],startX + spaceX*5 + 4, 4+startY+spaceY*2, textColor);
// inverted normal
String s2 = ((coverVariable & 0x1) > 0) ? buttontext[7] : buttontext[8];
- this.fontRendererObj.drawString(s2, startX + spaceX*5 + 4, 4+startY+spaceY*3, 0xFF555555);
+ this.fontRendererObj.drawString(s2, startX + spaceX*5 + 4, 4+startY+spaceY*3, textColor);
}
@Override
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java b/src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java
index 072d7141b0..dca0e826bf 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java
@@ -1,6 +1,7 @@
package gregtech.common.covers;
import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GuiColors;
import gregtech.api.gui.GT_GUICover;
import gregtech.api.gui.widgets.GT_GuiIcon;
import gregtech.api.gui.widgets.GT_GuiIconCheckButton;
@@ -18,6 +19,8 @@ public class GT_Cover_PlayerDetector extends GT_CoverBehavior {
private String placer = "";
private int range = 8;
+ private final int textColor = GuiColors.coverPlayerDetector.getColor();
+
@Override
public boolean isRedstoneSensitive(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, long aTimer) {
@@ -160,11 +163,11 @@ public class GT_Cover_PlayerDetector extends GT_CoverBehavior {
public void drawExtras(int mouseX, int mouseY, float parTicks) {
super.drawExtras(mouseX, mouseY, parTicks);
this.fontRendererObj.drawString(GT_Utility.trans("319", "Any player"),
- startX + spaceX*1, 4+startY+spaceY*0, 0xFF555555);
+ startX + spaceX*1, 4+startY+spaceY*0, textColor);
this.fontRendererObj.drawString(GT_Utility.trans("320", "Other players"),
- startX + spaceX*1, 4+startY+spaceY*1, 0xFF555555);
+ startX + spaceX*1, 4+startY+spaceY*1, textColor);
this.fontRendererObj.drawString(GT_Utility.trans("321", "Only owner"),
- startX + spaceX*1, 4+startY+spaceY*2, 0xFF555555);
+ startX + spaceX*1, 4+startY+spaceY*2, textColor);
}
@Override
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Pump.java b/src/main/java/gregtech/common/covers/GT_Cover_Pump.java
index 11a4743b3f..96ea7b205e 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_Pump.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_Pump.java
@@ -1,6 +1,7 @@
package gregtech.common.covers;
import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GuiColors;
import gregtech.api.gui.GT_GUICover;
import gregtech.api.gui.widgets.GT_GuiIcon;
import gregtech.api.gui.widgets.GT_GuiIconButton;
@@ -18,6 +19,7 @@ import net.minecraftforge.fluids.IFluidHandler;
public class GT_Cover_Pump extends GT_CoverBehavior{
public final int mTransferRate;
+ private final int textColor = GuiColors.coverPump.getColor();
public GT_Cover_Pump(int aTransferRate) {
this.mTransferRate = aTransferRate;
@@ -204,9 +206,9 @@ public class GT_Cover_Pump extends GT_CoverBehavior{
@Override
public void drawExtras(int mouseX, int mouseY, float parTicks) {
super.drawExtras(mouseX, mouseY, parTicks);
- this.fontRendererObj.drawString(GT_Utility.trans("229", "Import/Export"), startX + spaceX*3, 3+startY+spaceY*0, 0xFF555555);
- this.fontRendererObj.drawString(GT_Utility.trans("230", "Conditional"), startX + spaceX*3, 3+startY+spaceY*1, 0xFF555555);
- this.fontRendererObj.drawString(GT_Utility.trans("231", "Enable Input"), startX + spaceX*3, 3+startY+spaceY*2, 0xFF555555);
+ this.fontRendererObj.drawString(GT_Utility.trans("229", "Import/Export"), startX + spaceX*3, 3+startY+spaceY*0, textColor);
+ this.fontRendererObj.drawString(GT_Utility.trans("230", "Conditional"), startX + spaceX*3, 3+startY+spaceY*1, textColor);
+ this.fontRendererObj.drawString(GT_Utility.trans("231", "Enable Input"), startX + spaceX*3, 3+startY+spaceY*2, textColor);
}
@Override
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java
index 2ec1ee9938..edfd8c51fb 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java
@@ -2,6 +2,7 @@ package gregtech.common.covers;
import gregtech.api.GregTech_API;
import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GuiColors;
import gregtech.api.gui.GT_GUICover;
import gregtech.api.gui.widgets.GT_GuiIcon;
import gregtech.api.gui.widgets.GT_GuiIconCheckButton;
@@ -23,6 +24,8 @@ public abstract class GT_Cover_RedstoneWirelessBase extends GT_CoverBehavior {
private static final int PUBLIC_MASK = 0x0000FFFF;
private static final int CHECKBOX_MASK = 0x00010000;
+ private final int textColor = GuiColors.coverRedstoneWirelessBase.getColor();
+
@Override
public boolean onCoverRemoval(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, boolean aForced) {
GregTech_API.sWirelessRedstone.put(aCoverVariable, (byte) 0);
@@ -177,8 +180,8 @@ public abstract class GT_Cover_RedstoneWirelessBase extends GT_CoverBehavior {
@Override
public void drawExtras(int mouseX, int mouseY, float parTicks) {
super.drawExtras(mouseX, mouseY, parTicks);
- this.getFontRenderer().drawString(GT_Utility.trans("246", "Frequency"), startX + spaceX*4, 4+startY+spaceY*0, 0xFF555555);
- this.getFontRenderer().drawString(GT_Utility.trans("601", "Use Private Frequency"), startX + spaceX * 1, startY + spaceY * 2 + 4, 0xFF555555);
+ this.getFontRenderer().drawString(GT_Utility.trans("246", "Frequency"), startX + spaceX*4, 4+startY+spaceY*0, textColor);
+ this.getFontRenderer().drawString(GT_Utility.trans("601", "Use Private Frequency"), startX + spaceX * 1, startY + spaceY * 2 + 4, textColor);
}
@Override
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_Shutter.java b/src/main/java/gregtech/common/covers/GT_Cover_Shutter.java
index b8ce4260cd..48c8846cd6 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_Shutter.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_Shutter.java
@@ -1,6 +1,7 @@
package gregtech.common.covers;
import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GuiColors;
import gregtech.api.gui.GT_GUICover;
import gregtech.api.gui.widgets.GT_GuiIcon;
import gregtech.api.gui.widgets.GT_GuiIconCheckButton;
@@ -15,6 +16,9 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraftforge.fluids.Fluid;
public class GT_Cover_Shutter extends GT_CoverBehavior {
+
+ private final int textColor = GuiColors.coverShutter.getColor();
+
@Override
public boolean isRedstoneSensitive(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, long aTimer) {
return false;
@@ -141,13 +145,13 @@ public class GT_Cover_Shutter extends GT_CoverBehavior {
public void drawExtras(int mouseX, int mouseY, float parTicks) {
super.drawExtras(mouseX, mouseY, parTicks);
this.fontRendererObj.drawString(GT_Utility.trans("082", "Open if work enabled"),
- 3+startX + spaceX*1, 4+startY+spaceY*0, 0xFF555555);
+ 3+startX + spaceX*1, 4+startY+spaceY*0, textColor);
this.fontRendererObj.drawString(GT_Utility.trans("083", "Open if work disabled"),
- 3+startX + spaceX*1, 4+startY+spaceY*1, 0xFF555555);
+ 3+startX + spaceX*1, 4+startY+spaceY*1, textColor);
this.fontRendererObj.drawString(GT_Utility.trans("084", "Only Output allowed"),
- 3+startX + spaceX*1, 4+startY+spaceY*2, 0xFF555555);
+ 3+startX + spaceX*1, 4+startY+spaceY*2, textColor);
this.fontRendererObj.drawString(GT_Utility.trans("085", "Only Input allowed"),
- 3+startX + spaceX*1, 4+startY+spaceY*3, 0xFF555555);
+ 3+startX + spaceX*1, 4+startY+spaceY*3, textColor);
}
@Override
diff --git a/src/main/java/gregtech/common/gui/GT_GUIContainer_Boiler.java b/src/main/java/gregtech/common/gui/GT_GUIContainer_Boiler.java
index 879c803702..9d4b23975a 100644
--- a/src/main/java/gregtech/common/gui/GT_GUIContainer_Boiler.java
+++ b/src/main/java/gregtech/common/gui/GT_GUIContainer_Boiler.java
@@ -1,17 +1,21 @@
package gregtech.common.gui;
+import gregtech.api.enums.GuiColors;
import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import net.minecraft.entity.player.InventoryPlayer;
public class GT_GUIContainer_Boiler extends GT_GUIContainerMetaTile_Machine {
+
+ private final int textColor = GuiColors.boiler.getColor();
+
public GT_GUIContainer_Boiler(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aTextureName) {
super(new GT_Container_Boiler(aInventoryPlayer, aTileEntity), "gregtech:textures/gui/" + aTextureName);
}
@Override
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
- this.fontRendererObj.drawString("Boiler", 8, 4, 4210752);
+ this.fontRendererObj.drawString("Boiler", 8, 4, textColor);
}
@Override
diff --git a/src/main/java/gregtech/common/gui/GT_GUIContainer_BronzeBlastFurnace.java b/src/main/java/gregtech/common/gui/GT_GUIContainer_BronzeBlastFurnace.java
index d60977104e..d18b61410f 100644
--- a/src/main/java/gregtech/common/gui/GT_GUIContainer_BronzeBlastFurnace.java
+++ b/src/main/java/gregtech/common/gui/GT_GUIContainer_BronzeBlastFurnace.java
@@ -1,17 +1,21 @@
package gregtech.common.gui;
+import gregtech.api.enums.GuiColors;
import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import net.minecraft.entity.player.InventoryPlayer;
public class GT_GUIContainer_BronzeBlastFurnace extends GT_GUIContainerMetaTile_Machine {
+
+ private final int textColor = GuiColors.bronzeBlastFurnace.getColor();
+
public GT_GUIContainer_BronzeBlastFurnace(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) {
super(new GT_Container_BronzeBlastFurnace(aInventoryPlayer, aTileEntity), "gregtech:textures/gui/BronzeBlastFurnace.png");
}
@Override
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
- this.fontRendererObj.drawString("Bronze Blast Furnace", 8, 4, 4210752);
+ this.fontRendererObj.drawString("Bronze Blast Furnace", 8, 4, textColor);
}
@Override
diff --git a/src/main/java/gregtech/common/gui/GT_GUIContainer_FusionReactor.java b/src/main/java/gregtech/common/gui/GT_GUIContainer_FusionReactor.java
index 55c144356a..bb806b177f 100644
--- a/src/main/java/gregtech/common/gui/GT_GUIContainer_FusionReactor.java
+++ b/src/main/java/gregtech/common/gui/GT_GUIContainer_FusionReactor.java
@@ -1,5 +1,6 @@
package gregtech.common.gui;
+import gregtech.api.enums.GuiColors;
import gregtech.api.gui.GT_Container_MultiMachine;
import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -15,6 +16,7 @@ public class GT_GUIContainer_FusionReactor extends GT_GUIContainerMetaTile_Machi
public String mNEI;
String mName = "";
+ private final int textColor = GuiColors.fusionReactor.getColor();
public GT_GUIContainer_FusionReactor(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName, String aTextureFile, String aNEI) {
super(new GT_Container_MultiMachine(aInventoryPlayer, aTileEntity, false), RES_PATH_GUI + "multimachines/" + (aTextureFile == null ? "MultiblockDisplay" : aTextureFile));
@@ -38,15 +40,15 @@ public class GT_GUIContainer_FusionReactor extends GT_GUIContainerMetaTile_Machi
}
}
if(this.mContainer.mEnergy > 160000000 && this.mContainer.mEnergy < 160010000)
- fontRendererObj.drawString("160,000,000 EU", 50, 155, 0x00ff0000);
+ fontRendererObj.drawString("160,000,000 EU", 50, 155, textColor);
else if(this.mContainer.mEnergy > 320000000 && this.mContainer.mEnergy < 320010000)
- fontRendererObj.drawString("320,000,000 EU", 50, 155, 0x00ff0000);
+ fontRendererObj.drawString("320,000,000 EU", 50, 155, textColor);
else if(this.mContainer.mEnergy > 640000000 && this.mContainer.mEnergy < 640010000)
- fontRendererObj.drawString("640,000,000 EU", 50, 155, 0x00ff0000);
+ fontRendererObj.drawString("640,000,000 EU", 50, 155, textColor);
else if(this.mContainer.mEnergyLong > 5120000000L && this.mContainer.mEnergyLong < 5120080000L)
- fontRendererObj.drawString("5,120,000,000 EU", 50, 155, 0x00ff0000);
+ fontRendererObj.drawString("5,120,000,000 EU", 50, 155, textColor);
else
- fontRendererObj.drawString(GT_Utility.formatNumbers(this.mContainer.mEnergyLong) + " EU", 50, 155, 0x00ff0000);
+ fontRendererObj.drawString(GT_Utility.formatNumbers(this.mContainer.mEnergyLong) + " EU", 50, 155, textColor);
}
}
diff --git a/src/main/java/gregtech/common/gui/GT_GUIContainer_IndustrialApiary.java b/src/main/java/gregtech/common/gui/GT_GUIContainer_IndustrialApiary.java
index 3737632dd4..18909b7013 100644
--- a/src/main/java/gregtech/common/gui/GT_GUIContainer_IndustrialApiary.java
+++ b/src/main/java/gregtech/common/gui/GT_GUIContainer_IndustrialApiary.java
@@ -2,6 +2,7 @@ package gregtech.common.gui;
import forestry.api.apiculture.*;
import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GuiColors;
import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
import gregtech.api.gui.widgets.GT_GuiSlotTooltip;
import gregtech.api.gui.widgets.GT_GuiTooltip;
@@ -33,6 +34,7 @@ public class GT_GUIContainer_IndustrialApiary extends GT_GUIContainerMetaTile_Ma
UPGRADE_TOOLTIP = "GT5U.machines.industrialapiary.upgradeslot.tooltip"
;
+ private final int textColor = GuiColors.industrialApiary.getColor();
GT_GuiTooltip mErrorStatesTooltip;
GT_GuiTooltip mSpeedToggleTooltip;
@@ -115,9 +117,9 @@ public class GT_GUIContainer_IndustrialApiary extends GT_GUIContainerMetaTile_Ma
@Override
protected void drawGuiContainerForegroundLayer(int par1, int par2) {
- this.fontRendererObj.drawString("Ind. Apiary", 8, 4, 4210752);
- this.fontRendererObj.drawString("x", 30, 63, 4210752);
- this.fontRendererObj.drawString((1 << getContainer().mSpeed) + "", 26, 72, 4210752);
+ this.fontRendererObj.drawString("Ind. Apiary", 8, 4, textColor);
+ this.fontRendererObj.drawString("x", 30, 63, textColor);
+ this.fontRendererObj.drawString((1 << getContainer().mSpeed) + "", 26, 72, textColor);
}
@Override
diff --git a/src/main/java/gregtech/common/gui/GT_GUIContainer_MicrowaveEnergyTransmitter.java b/src/main/java/gregtech/common/gui/GT_GUIContainer_MicrowaveEnergyTransmitter.java
index 6d580bad11..d75ea5c9ec 100644
--- a/src/main/java/gregtech/common/gui/GT_GUIContainer_MicrowaveEnergyTransmitter.java
+++ b/src/main/java/gregtech/common/gui/GT_GUIContainer_MicrowaveEnergyTransmitter.java
@@ -1,5 +1,6 @@
package gregtech.common.gui;
+import gregtech.api.enums.GuiColors;
import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.util.GT_Utility;
@@ -8,6 +9,9 @@ import net.minecraft.entity.player.InventoryPlayer;
import static gregtech.api.enums.GT_Values.RES_PATH_GUI;
public class GT_GUIContainer_MicrowaveEnergyTransmitter extends GT_GUIContainerMetaTile_Machine {
+
+ private final int textColor = GuiColors.microwaveEnergyTransmitter.getColor();
+
public GT_GUIContainer_MicrowaveEnergyTransmitter(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) {
super(new GT_Container_MicrowaveEnergyTransmitter(aInventoryPlayer, aTileEntity), RES_PATH_GUI + "Teleporter.png");
}
@@ -16,12 +20,12 @@ public class GT_GUIContainer_MicrowaveEnergyTransmitter extends GT_GUIContainerM
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
this.fontRendererObj.drawString("Teleporter", 46, 8, 16448255);
if (this.mContainer != null) {
- this.fontRendererObj.drawString("X: " + GT_Utility.parseNumberToString(((GT_Container_MicrowaveEnergyTransmitter) this.mContainer).mTargetX), 46, 16, 16448255);
- this.fontRendererObj.drawString("Y: " + GT_Utility.parseNumberToString(((GT_Container_MicrowaveEnergyTransmitter) this.mContainer).mTargetY), 46, 24, 16448255);
- this.fontRendererObj.drawString("Z: " + GT_Utility.parseNumberToString(((GT_Container_MicrowaveEnergyTransmitter) this.mContainer).mTargetZ), 46, 32, 16448255);
+ this.fontRendererObj.drawString("X: " + GT_Utility.parseNumberToString(((GT_Container_MicrowaveEnergyTransmitter) this.mContainer).mTargetX), 46, 16, textColor);
+ this.fontRendererObj.drawString("Y: " + GT_Utility.parseNumberToString(((GT_Container_MicrowaveEnergyTransmitter) this.mContainer).mTargetY), 46, 24, textColor);
+ this.fontRendererObj.drawString("Z: " + GT_Utility.parseNumberToString(((GT_Container_MicrowaveEnergyTransmitter) this.mContainer).mTargetZ), 46, 32, textColor);
if (((GT_Container_MicrowaveEnergyTransmitter) this.mContainer).mEgg > 0) {
- this.fontRendererObj.drawString("Dim: " + GT_Utility.parseNumberToString(((GT_Container_MicrowaveEnergyTransmitter) this.mContainer).mTargetD), 46, 40, 16448255);
- this.fontRendererObj.drawString("Dim Valid: " + (GT_Utility.isRealDimension(((GT_Container_MicrowaveEnergyTransmitter) this.mContainer).mTargetD) ? "Yes":"No"), 46, 48, 16448255);
+ this.fontRendererObj.drawString("Dim: " + GT_Utility.parseNumberToString(((GT_Container_MicrowaveEnergyTransmitter) this.mContainer).mTargetD), 46, 40, textColor);
+ this.fontRendererObj.drawString("Dim Valid: " + (GT_Utility.isRealDimension(((GT_Container_MicrowaveEnergyTransmitter) this.mContainer).mTargetD) ? "Yes":"No"), 46, 48, textColor);
}
}
}
diff --git a/src/main/java/gregtech/common/gui/GT_GUIContainer_OutputHatch.java b/src/main/java/gregtech/common/gui/GT_GUIContainer_OutputHatch.java
index 5e009ef428..33bac13be6 100644
--- a/src/main/java/gregtech/common/gui/GT_GUIContainer_OutputHatch.java
+++ b/src/main/java/gregtech/common/gui/GT_GUIContainer_OutputHatch.java
@@ -5,6 +5,7 @@ import codechicken.nei.api.INEIGuiHandler;
import codechicken.nei.api.TaggedInventoryArea;
import cpw.mods.fml.common.Optional;
import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GuiColors;
import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.net.GT_Packet_SetLockedFluid;
@@ -24,6 +25,13 @@ import static gregtech.api.enums.GT_Values.RES_PATH_GUI;
public class GT_GUIContainer_OutputHatch extends GT_GUIContainerMetaTile_Machine implements INEIGuiHandler {
private final String mName;
+ private final int
+ textColorTitle = GuiColors.outputHatchTitle.getColor(),
+ textColorInventory = GuiColors.outputHatchInventory.getColor(),
+ textColorAmount = GuiColors.outputHatchAmount.getColor(),
+ textColorAmountValue = GuiColors.outputHatchValue.getColor(),
+ textColorFluidName = GuiColors.outputHatchFluidName.getColor(),
+ textColorLockedFluid = GuiColors.outputHatchLockedFluid.getColor();
public GT_GUIContainer_OutputHatch(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName) {
super(new GT_Container_OutputHatch(aInventoryPlayer, aTileEntity), RES_PATH_GUI + "OutputHatch.png");
@@ -32,15 +40,15 @@ public class GT_GUIContainer_OutputHatch 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_OutputHatch) mContainer).mContent), 10, 30, 16448255);
- fontRendererObj.drawString("Locked Fluid", 101, 20, 16448255);
+ fontRendererObj.drawString("Liquid Amount", 10, 20, textColorAmount);
+ fontRendererObj.drawString(GT_Utility.parseNumberToString(((GT_Container_OutputHatch) mContainer).mContent), 10, 30, textColorAmountValue);
+ fontRendererObj.drawString("Locked Fluid", 101, 20, textColorAmount);
ItemStack tLockedDisplayStack = (ItemStack) mContainer.getInventory().get(3);
String fluidName = tLockedDisplayStack == null ? "None" : tLockedDisplayStack.getDisplayName();
- fontRendererObj.drawString(fluidName, 101, 30, 16448255);
+ fontRendererObj.drawString(fluidName, 101, 30, textColorFluidName);
}
}
diff --git a/src/main/java/gregtech/common/gui/GT_GUIContainer_PrimitiveBlastFurnace.java b/src/main/java/gregtech/common/gui/GT_GUIContainer_PrimitiveBlastFurnace.java
index 1a709c8129..dfd1e61aa9 100644
--- a/src/main/java/gregtech/common/gui/GT_GUIContainer_PrimitiveBlastFurnace.java
+++ b/src/main/java/gregtech/common/gui/GT_GUIContainer_PrimitiveBlastFurnace.java
@@ -1,5 +1,6 @@
package gregtech.common.gui;
+import gregtech.api.enums.GuiColors;
import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
import gregtech.api.gui.widgets.GT_GuiIcon;
import gregtech.api.gui.widgets.GT_GuiTabLine.GT_GuiTabIconSet;
@@ -17,6 +18,7 @@ public class GT_GUIContainer_PrimitiveBlastFurnace extends GT_GUIContainerMetaTi
GT_GuiIcon.TAB_NORMAL_BRICK,
GT_GuiIcon.TAB_HIGHLIGHT_BRICK,
GT_GuiIcon.TAB_DISABLED_BRICK);
+ private final int textColor = GuiColors.primitiveBlastFurnace.getColor();
public GT_GUIContainer_PrimitiveBlastFurnace(InventoryPlayer inventoryPlayer, IGregTechTileEntity tileEntity,
String name, String aNEI) {
@@ -28,7 +30,7 @@ public class GT_GUIContainer_PrimitiveBlastFurnace extends GT_GUIContainerMetaTi
@Override
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
- this.fontRendererObj.drawString(name, 8, 4, 4210752);
+ this.fontRendererObj.drawString(name, 8, 4, textColor);
}
@Override
diff --git a/src/main/java/gregtech/common/gui/GT_GUIContainer_QuantumChest.java b/src/main/java/gregtech/common/gui/GT_GUIContainer_QuantumChest.java
index e4a98ac14b..370c71fed9 100644
--- a/src/main/java/gregtech/common/gui/GT_GUIContainer_QuantumChest.java
+++ b/src/main/java/gregtech/common/gui/GT_GUIContainer_QuantumChest.java
@@ -1,5 +1,6 @@
package gregtech.common.gui;
+import gregtech.api.enums.GuiColors;
import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.util.GT_Utility;
@@ -11,6 +12,10 @@ import static gregtech.api.enums.GT_Values.RES_PATH_GUI;
public class GT_GUIContainer_QuantumChest extends GT_GUIContainerMetaTile_Machine {
private final String mName;
+ private final int
+ textColorTitle = GuiColors.quantumChestTitle.getColor(),
+ textColorAmount = GuiColors.quantumChestAmount.getColor();
+
public GT_GUIContainer_QuantumChest(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName) {
super(new GT_Container_QuantumChest(aInventoryPlayer, aTileEntity), RES_PATH_GUI + "BasicTank.png");
@@ -19,11 +24,11 @@ public class GT_GUIContainer_QuantumChest extends GT_GUIContainerMetaTile_Machin
@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, textColorTitle);
+ fontRendererObj.drawString(mName, 8, 6, textColorTitle);
if (mContainer != null) {
- fontRendererObj.drawString("Item Amount", 10, 20, 16448255);
- fontRendererObj.drawString(GT_Utility.parseNumberToString(((GT_Container_QuantumChest) mContainer).mContent), 10, 30, 16448255);
+ fontRendererObj.drawString("Item Amount", 10, 20, textColorAmount);
+ fontRendererObj.drawString(GT_Utility.parseNumberToString(((GT_Container_QuantumChest) mContainer).mContent), 10, 30, textColorAmount);
}
}
diff --git a/src/main/java/gregtech/common/gui/GT_GUIContainer_Regulator.java b/src/main/java/gregtech/common/gui/GT_GUIContainer_Regulator.java
index 06b1ddb00e..09fb48121e 100644
--- a/src/main/java/gregtech/common/gui/GT_GUIContainer_Regulator.java
+++ b/src/main/java/gregtech/common/gui/GT_GUIContainer_Regulator.java
@@ -1,25 +1,29 @@
package gregtech.common.gui;
+import gregtech.api.enums.GuiColors;
import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import net.minecraft.entity.player.InventoryPlayer;
public class GT_GUIContainer_Regulator extends GT_GUIContainerMetaTile_Machine {
+
+ private final int textColor = GuiColors.regulator.getColor();
+
public GT_GUIContainer_Regulator(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) {
super(new GT_Container_Regulator(aInventoryPlayer, aTileEntity), "gregtech:textures/gui/Regulator.png");
}
@Override
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
- this.fontRendererObj.drawString(String.valueOf(((GT_Container_Regulator) this.mContainer).mTargetSlots[0]), 120, 9, 16448255);
- this.fontRendererObj.drawString(String.valueOf(((GT_Container_Regulator) this.mContainer).mTargetSlots[1]), 137, 9, 16448255);
- this.fontRendererObj.drawString(String.valueOf(((GT_Container_Regulator) this.mContainer).mTargetSlots[2]), 155, 9, 16448255);
- this.fontRendererObj.drawString(String.valueOf(((GT_Container_Regulator) this.mContainer).mTargetSlots[3]), 120, 26, 16448255);
- this.fontRendererObj.drawString(String.valueOf(((GT_Container_Regulator) this.mContainer).mTargetSlots[4]), 137, 26, 16448255);
- this.fontRendererObj.drawString(String.valueOf(((GT_Container_Regulator) this.mContainer).mTargetSlots[5]), 155, 26, 16448255);
- this.fontRendererObj.drawString(String.valueOf(((GT_Container_Regulator) this.mContainer).mTargetSlots[6]), 120, 43, 16448255);
- this.fontRendererObj.drawString(String.valueOf(((GT_Container_Regulator) this.mContainer).mTargetSlots[7]), 137, 43, 16448255);
- this.fontRendererObj.drawString(String.valueOf(((GT_Container_Regulator) this.mContainer).mTargetSlots[8]), 155, 43, 16448255);
+ this.fontRendererObj.drawString(String.valueOf(((GT_Container_Regulator) this.mContainer).mTargetSlots[0]), 120, 9, textColor);
+ this.fontRendererObj.drawString(String.valueOf(((GT_Container_Regulator) this.mContainer).mTargetSlots[1]), 137, 9, textColor);
+ this.fontRendererObj.drawString(String.valueOf(((GT_Container_Regulator) this.mContainer).mTargetSlots[2]), 155, 9, textColor);
+ this.fontRendererObj.drawString(String.valueOf(((GT_Container_Regulator) this.mContainer).mTargetSlots[3]), 120, 26, textColor);
+ this.fontRendererObj.drawString(String.valueOf(((GT_Container_Regulator) this.mContainer).mTargetSlots[4]), 137, 26, textColor);
+ this.fontRendererObj.drawString(String.valueOf(((GT_Container_Regulator) this.mContainer).mTargetSlots[5]), 155, 26, textColor);
+ this.fontRendererObj.drawString(String.valueOf(((GT_Container_Regulator) this.mContainer).mTargetSlots[6]), 120, 43, textColor);
+ this.fontRendererObj.drawString(String.valueOf(((GT_Container_Regulator) this.mContainer).mTargetSlots[7]), 137, 43, textColor);
+ this.fontRendererObj.drawString(String.valueOf(((GT_Container_Regulator) this.mContainer).mTargetSlots[8]), 155, 43, textColor);
}
@Override
diff --git a/src/main/java/gregtech/common/gui/GT_GUIContainer_Teleporter.java b/src/main/java/gregtech/common/gui/GT_GUIContainer_Teleporter.java
index 786cb6b5b3..efc4771b22 100644
--- a/src/main/java/gregtech/common/gui/GT_GUIContainer_Teleporter.java
+++ b/src/main/java/gregtech/common/gui/GT_GUIContainer_Teleporter.java
@@ -1,5 +1,6 @@
package gregtech.common.gui;
+import gregtech.api.enums.GuiColors;
import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.util.GT_Utility;
@@ -8,6 +9,9 @@ import net.minecraft.entity.player.InventoryPlayer;
import static gregtech.api.enums.GT_Values.RES_PATH_GUI;
public class GT_GUIContainer_Teleporter extends GT_GUIContainerMetaTile_Machine {
+
+ private final int textColor = GuiColors.teleporter.getColor();
+
public GT_GUIContainer_Teleporter(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) {
super(new GT_Container_Teleporter(aInventoryPlayer, aTileEntity), RES_PATH_GUI + "Teleporter.png");
}
@@ -16,12 +20,12 @@ public class GT_GUIContainer_Teleporter extends GT_GUIContainerMetaTile_Machine
protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
this.fontRendererObj.drawString("Teleporter", 46, 8, 16448255);
if (this.mContainer != null) {
- this.fontRendererObj.drawString("X: " + GT_Utility.parseNumberToString(((GT_Container_Teleporter) this.mContainer).mTargetX), 46, 16, 16448255);
- this.fontRendererObj.drawString("Y: " + GT_Utility.parseNumberToString(((GT_Container_Teleporter) this.mContainer).mTargetY), 46, 24, 16448255);
- this.fontRendererObj.drawString("Z: " + GT_Utility.parseNumberToString(((GT_Container_Teleporter) this.mContainer).mTargetZ), 46, 32, 16448255);
+ this.fontRendererObj.drawString("X: " + GT_Utility.parseNumberToString(((GT_Container_Teleporter) this.mContainer).mTargetX), 46, 16, textColor);
+ this.fontRendererObj.drawString("Y: " + GT_Utility.parseNumberToString(((GT_Container_Teleporter) this.mContainer).mTargetY), 46, 24, textColor);
+ this.fontRendererObj.drawString("Z: " + GT_Utility.parseNumberToString(((GT_Container_Teleporter) this.mContainer).mTargetZ), 46, 32, textColor);
if (((GT_Container_Teleporter) this.mContainer).mEgg > 0) {
- this.fontRendererObj.drawString("Dim: " + GT_Utility.parseNumberToString(((GT_Container_Teleporter) this.mContainer).mTargetD), 46, 40, 16448255);
- this.fontRendererObj.drawString("Dim Valid: " + (GT_Utility.isRealDimension(((GT_Container_Teleporter) this.mContainer).mTargetD) ? "Yes":"No"), 46, 48, 16448255);
+ this.fontRendererObj.drawString("Dim: " + GT_Utility.parseNumberToString(((GT_Container_Teleporter) this.mContainer).mTargetD), 46, 40, textColor);
+ this.fontRendererObj.drawString("Dim Valid: " + (GT_Utility.isRealDimension(((GT_Container_Teleporter) this.mContainer).mTargetD) ? "Yes":"No"), 46, 48, textColor);
}
}
}
diff --git a/src/main/java/gregtech/common/render/GT_FluidDisplayStackRenderer.java b/src/main/java/gregtech/common/render/GT_FluidDisplayStackRenderer.java
index c4e23eab6e..92921ecbe9 100644
--- a/src/main/java/gregtech/common/render/GT_FluidDisplayStackRenderer.java
+++ b/src/main/java/gregtech/common/render/GT_FluidDisplayStackRenderer.java
@@ -1,6 +1,7 @@
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;
@@ -16,6 +17,8 @@ import org.lwjgl.opengl.GL11;
@SideOnly(cpw.mods.fml.relauncher.Side.CLIENT)
public class GT_FluidDisplayStackRenderer implements IItemRenderer {
+ private final int textColor = GuiColors.fluidDisplayStackRenderer.getColor();
+
public GT_FluidDisplayStackRenderer() {
MinecraftForgeClient.registerItemRenderer(ItemList.Display_Fluid.getItem(), this);
}
@@ -89,7 +92,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, 0xFFFFFF, true);
+ fontRender.drawString( amountString, 0, (int) (16/smallTextScale) - fontRender.FONT_HEIGHT + 1, textColor, 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 5128af1c36..e8478913a1 100644
--- a/src/main/java/gregtech/common/render/GT_PollutionRenderer.java
+++ b/src/main/java/gregtech/common/render/GT_PollutionRenderer.java
@@ -7,6 +7,7 @@ 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;
@@ -46,6 +47,8 @@ public class GT_PollutionRenderer {
private static final short[] liquidColor = {160, 200, 10};
private static final short[] foliageColor = {160, 80, 15};
+ private final int textColor = GuiColors.pollutionRenderer.getColor();
+
//TODO need to soft update some blocks, grass and leaves does more often than liquid it looks like.
public GT_PollutionRenderer() {
@@ -245,7 +248,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, 0xFFFFFFFF);
+ Minecraft.getMinecraft().fontRenderer.drawStringWithShadow(text, 0, off, textColor);
GL11.glDisable(GL11.GL_BLEND);
GL11.glPopMatrix();
}