Anvilcraft/buildcraft
2
1
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch '6.1.x' of github.com:BuildCraft/BuildCraft into 6.1.x

Browse source
This commit is contained in:
SpaceToad 2014-08-18 23:33:08 +02:00
parent f9b769bdde a2247bf315
commit dd4b1c53f8
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
api/buildcraft/api/core/EnumColor.java
View file

@ -107,7 +107,7 @@ public enum EnumColor {
0xe4e4e4};
@SideOnly(Side.CLIENT)
private static IIcon[] brushIcons = new IIcon[16];
private static IIcon[] brushIcons;
public int getDarkHex() {
return DARK_HEX[ordinal()];
@ -193,6 +193,7 @@ public enum EnumColor {
@SideOnly(Side.CLIENT)
public static void registerIcons(IIconRegister iconRegister) {
brushIcons = new IIcon[16];
for (EnumColor c : values()) {
brushIcons[c.ordinal()] = iconRegister.registerIcon("buildcraft:triggers/color_"
+ c.name().toLowerCase(Locale.ENGLISH));