diff options
Diffstat (limited to 'src/main/java')
43 files changed, 465 insertions, 167 deletions
diff --git a/src/main/java/gregtech/GT_Mod.java b/src/main/java/gregtech/GT_Mod.java index e68285472c..72deff5953 100644 --- a/src/main/java/gregtech/GT_Mod.java +++ b/src/main/java/gregtech/GT_Mod.java @@ -16,6 +16,7 @@ import cpw.mods.fml.common.event.FMLServerStartingEvent; import cpw.mods.fml.common.event.FMLServerStoppingEvent; import cpw.mods.fml.common.registry.EntityRegistry; import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.GregTech_API; import gregtech.api.enchants.Enchantment_EnderDamage; import gregtech.api.enchants.Enchantment_Radioactivity; @@ -63,26 +64,9 @@ import gregtech.loaders.load.GT_SonictronLoader; import gregtech.loaders.misc.GT_Achievements; import gregtech.loaders.misc.GT_Bees; import gregtech.loaders.misc.GT_CoverLoader; -import gregtech.loaders.postload.GT_BlockResistanceLoader; -import gregtech.loaders.postload.GT_BookAndLootLoader; -import gregtech.loaders.postload.GT_CraftingRecipeLoader; -import gregtech.loaders.postload.GT_CropLoader; -import gregtech.loaders.postload.GT_ExtremeDieselFuelLoader; -import gregtech.loaders.postload.GT_ItemMaxStacksizeLoader; -import gregtech.loaders.postload.GT_MachineRecipeLoader; -import gregtech.loaders.postload.GT_MinableRegistrator; -import gregtech.loaders.postload.GT_PostLoad; -import gregtech.loaders.postload.GT_RecyclerBlacklistLoader; -import gregtech.loaders.postload.GT_ScrapboxDropLoader; -import gregtech.loaders.postload.GT_Worldgenloader; -import gregtech.loaders.preload.GT_Loader_CircuitBehaviors; -import gregtech.loaders.preload.GT_Loader_ItemData; -import gregtech.loaders.preload.GT_Loader_Item_Block_And_Fluid; -import gregtech.loaders.preload.GT_Loader_MetaTileEntities; -import gregtech.loaders.preload.GT_Loader_MultiTileEntities; -import gregtech.loaders.preload.GT_Loader_OreDictionary; -import gregtech.loaders.preload.GT_Loader_OreProcessing; -import gregtech.loaders.preload.GT_PreLoad; +import gregtech.loaders.misc.GT_JsonLoader; +import gregtech.loaders.postload.*; +import gregtech.loaders.preload.*; import gregtech.nei.IMCForNEI; import ic2.api.recipe.IRecipeInput; import ic2.api.recipe.RecipeOutput; @@ -172,6 +156,8 @@ public class GT_Mod implements IGT_Mod { public static final String aTextIC2 = "ic2_"; public static final Logger GT_FML_LOGGER = LogManager.getLogger("GregTech GTNH"); + @SideOnly(Side.CLIENT) + public static GT_JsonLoader jsonGuiColors; static { if ((509 != GregTech_API.VERSION) || (509 != GT_ModHandler.VERSION) || (509 != GT_OreDictUnificator.VERSION) || (509 != GT_Recipe.VERSION) || (509 != GT_Utility.VERSION) || (509 != GT_RecipeRegistrator.VERSION) || (509 != Element.VERSION) || (509 != Materials.VERSION) || (509 != OrePrefixes.VERSION)) { @@ -219,6 +205,7 @@ public class GT_Mod implements IGT_Mod { if (FMLCommonHandler.instance().getSide() == Side.CLIENT) { MinecraftForge.EVENT_BUS.register(new ExtraIcons()); + jsonGuiColors = new GT_JsonLoader("textures/guiColors.json"); } Configuration tMainConfig = GT_PreLoad.getConfiguration(aEvent.getModConfigurationDirectory()); @@ -478,7 +465,7 @@ public class GT_Mod implements IGT_Mod { GT_PostLoad.identifyAnySteam(); achievements = new GT_Achievements(); - + ReverseShapedRecipe.runReverseRecipes(); ReverseShapelessRecipe.runReverseRecipes(); diff --git a/src/main/java/gregtech/api/enums/GuiColors.java b/src/main/java/gregtech/api/enums/GuiColors.java new file mode 100644 index 0000000000..3e7582bb7b --- /dev/null +++ b/src/main/java/gregtech/api/enums/GuiColors.java @@ -0,0 +1,110 @@ +package gregtech.api.enums; + +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +import gregtech.api.util.GT_Log; +import gregtech.GT_Mod; + +public enum GuiColors { + //RGB Colors: Name and default value + oneByOne (0x404040), + twoByTwo (0x404040), + twoByTwoFluid (0x404040), + twoByTwoFluidInventory (0x404040), + threeByThree (0x404040), + fourByFour (0x404040), + basicMachine (0x404040), + basicTankTitle (0x404040), + basicTankInventory (0x404040), + basicTankLiquidAmount (0xFAFAFF), + basicTankLiquidValue (0xFAFAFF), + maintenanceHatch (0x404040), + maintenanceHatchRepair (0x404040), + + multiMachineTitle (0xFAFAFF), + multiMachineDrillBaseText (0xFAFAFF), + multiMachineIncompleteStructure (0xFAFAFF), + multiMachineLargeTurbineText (0xFAFAFF), + multiMachineMaintenanceText (0xFAFAFF), + multiMachineMalletRestart (0xFAFAFF), + multiMachineRunningPerfectly (0xFAFAFF), + + outputHatchTitle (0x404040), + outputHatchInventory (0x404040), + outputHatchAmount (0xFAFAFF), + outputHatchValue (0xFAFAFF), + outputHatchFluidName (0xFAFAFF), + outputHatchLockedFluid (0xFAFAFF), + + boiler (0x404040), + bronzeBlastFurnace (0x404040), + fusionReactor (0xFF0000), + industrialApiary (0x404040), + microwaveEnergyTransmitter (0xFAFAFF), + primitiveBlastFurnace (0x404040), + quantumChestTitle (0x404040), + quantumChestAmount (0xFAFAFF), + regulator (0xFAFAFF), + teleporter (0xFAFAFF), + + fluidDisplayStackRenderer (0xFFFFFF), + + //ARGB Colors: Name and default value + dialogSelectItem (0xFF555555), + pollutionRenderer (0xFFFFFFFF), + screenText (0xFF222222), + + coverArm (0xFF555555), + coverControlsWork (0xFF555555), + coverConveyor (0xFF555555), + coverDoesWork (0xFF555555), + coverEUMeter (0xFF555555), + coverFluidFilterName (0xFF222222), + coverFluidFilter (0xFF555555), + coverFluidRegulatorWarn (0xFFFF0000), + coverFluidRegulator (0xFF555555), + coverItemFilter (0xFF555555), + coverItemMeter (0xFF555555), + coverLiquidMeter (0xFF555555), + coverMaintenance (0xFF555555), + coverPlayerDetector (0xFF555555), + coverPump (0xFF555555), + coverRedstoneWirelessBase (0xFF555555), + coverShutter (0xFF555555), + + NEIText (0xFF000000) + ; + + private final String root; + private final int color; + + GuiColors() { + this.root = "GT5U.gui.color"; + this.color = 0x000000; + } + + GuiColors(final int hex) { + this.root = "GT5U.gui.color"; + this.color = hex; + } + + public int getColor() { + int color = this.color; + String hex = ""; + + if (FMLCommonHandler.instance().getSide() == Side.CLIENT && GT_Mod.jsonGuiColors != null) { + hex = GT_Mod.jsonGuiColors.getString(this.root + "." + this.toString()); + + try { + if (!hex.isEmpty()) {color = Integer.parseUnsignedInt(hex, 16);} + } + catch (final NumberFormatException e) { + GT_Log.err.println("Couldn't format color correctly for: " + this.root + " -> " + hex); + } + } + + return color; + } +}
\ No newline at end of file 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; } |