tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Fixed TileMaterial loading colors before texture loads

Browse source
This commit is contained in:
Calclavia 2014-02-01 13:33:32 +08:00
parent 4c940c1949
commit 9ccee1addc
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/resonantinduction/core/resource/TileMaterial.java
View file

@ -18,11 +18,12 @@ import com.google.common.io.ByteArrayDataInput;
public class TileMaterial extends TileAdvanced implements IPacketReceiver
{
public String name;
private int clientColor = 0xFFFFFF;
public int getColor()
{
return clientColor;
if (name != null)
return ResourceGenerator.materialColors.get(name);
return 0xFFFFFF;
}
@Override
@ -35,7 +36,6 @@ public class TileMaterial extends TileAdvanced implements IPacketReceiver
public void onReceivePacket(ByteArrayDataInput data, EntityPlayer player, Object... extra)
{
name = data.readUTF();
clientColor = ResourceGenerator.materialColors.get(name);
worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord);
}
@ -61,6 +61,7 @@ public class TileMaterial extends TileAdvanced implements IPacketReceiver
public void writeToNBT(NBTTagCompound nbt)
{
super.writeToNBT(nbt);
nbt.setString("name", name);
if (name != null)
nbt.setString("name", name);
}
}