diff options
Diffstat (limited to 'src/main/java/gregtech/api/enums')
-rw-r--r-- | src/main/java/gregtech/api/enums/GT_Values.java | 5 | ||||
-rw-r--r-- | src/main/java/gregtech/api/enums/Textures.java | 11 |
2 files changed, 11 insertions, 5 deletions
diff --git a/src/main/java/gregtech/api/enums/GT_Values.java b/src/main/java/gregtech/api/enums/GT_Values.java index f7dfa461dd..cda42cbcbf 100644 --- a/src/main/java/gregtech/api/enums/GT_Values.java +++ b/src/main/java/gregtech/api/enums/GT_Values.java @@ -1,6 +1,7 @@ package gregtech.api.enums; import gregtech.api.fluid.FluidTankGT; +import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.internal.IGT_Mod; import gregtech.api.interfaces.internal.IGT_RecipeAdder; import gregtech.api.net.IGT_NetworkHandler; @@ -281,6 +282,9 @@ public class GT_Values { } + /** The Color White as RGB Short Array. */ + public static final short[] UNCOLORED_RBGA = {255, 255, 255, 255}; + /** The Color White as simple Integer (0x00ffffff). */ public static final int UNCOLORED = 0x00ffffff; /** @@ -456,6 +460,7 @@ public class GT_Values { public static final FluidTankInfo[] emptyFluidTankInfo = new FluidTankInfo[0]; public static final FluidStack[] emptyFluidStack = new FluidStack[0]; public static final ItemStack[] emptyItemStackArray = new ItemStack[0]; + public static final IIconContainer[] emptyIconContainerArray = new IIconContainer[3]; /** * Pretty formatting for author names. diff --git a/src/main/java/gregtech/api/enums/Textures.java b/src/main/java/gregtech/api/enums/Textures.java index 115d9ece26..666098b079 100644 --- a/src/main/java/gregtech/api/enums/Textures.java +++ b/src/main/java/gregtech/api/enums/Textures.java @@ -2048,11 +2048,16 @@ public class Textures { protected String mIconName; public CustomIcon(String aIconName) { - mIconName = aIconName; + mIconName = !aIconName.contains(":") ? RES_PATH_BLOCK + aIconName : aIconName; GregTech_API.sGTBlockIconload.add(this); } @Override + public void run() { + mIcon = GregTech_API.sBlockIcons.registerIcon(mIconName); + } + + @Override public IIcon getIcon() { return mIcon; } @@ -2067,10 +2072,6 @@ public class Textures { return TextureMap.locationBlocksTexture; } - @Override - public void run() { - mIcon = GregTech_API.sBlockIcons.registerIcon(RES_PATH_BLOCK + mIconName); - } } } |