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

Changed how simple packets work

Browse source 
Instead of ints i've changed it to string IDs too allow for more defined
ids per tile. Should remove any issues with super tiles using the same
packet ID as the tiles that extend them.
This commit is contained in:
DarkGuardsman 2013-09-03 00:17:17 -04:00
parent a7e0c9b6a2
commit a10a39a311
1 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/dark/prefab/TileEntityMachine.java
View file

@ -49,13 +49,20 @@ public abstract class TileEntityMachine extends TileEntityUniversalElectrical im
public static enum TilePacketTypes public static enum TilePacketTypes
{ {
/** Normal packet data of any kind */ /** Normal packet data of any kind */
GENERIC(), GENERIC("generic"),
/** Power updates */ /** Power updates */
POWER(), POWER("isRunning"),
/** GUI display data update */ /** GUI display data update */
GUI(), GUI("guiGeneral"),
/** Full tile read/write data from tile NBT */ /** Full tile read/write data from tile NBT */
NBT(); NBT("nbtAll");
public String name;
private TilePacketTypes(String name)
{
this.name = name;
}
} }
public TileEntityMachine() public TileEntityMachine()
@ -233,7 +240,7 @@ public abstract class TileEntityMachine extends TileEntityUniversalElectrical im
int x = dis.readInt(); int x = dis.readInt();
int y = dis.readInt(); int y = dis.readInt();
int z = dis.readInt(); int z = dis.readInt();
int pId = dis.readInt(); String pId = dis.readUTF();
this.simplePacket(pId, dis, player); this.simplePacket(pId, dis, player);
@ -257,18 +264,18 @@ public abstract class TileEntityMachine extends TileEntityUniversalElectrical im
* @param dis - data * @param dis - data
* @param player - player * @param player - player
* @return true if the packet was used */ * @return true if the packet was used */
public boolean simplePacket(int id, DataInputStream dis, EntityPlayer player) public boolean simplePacket(String id, DataInputStream dis, EntityPlayer player)
{ {
try try
{ {
if (this.worldObj.isRemote) if (this.worldObj.isRemote)
{ {
if (id == TilePacketTypes.POWER.ordinal()) if (id.equalsIgnoreCase(TilePacketTypes.POWER.name))
{ {
this.running = dis.readBoolean(); this.running = dis.readBoolean();
return true; return true;
} }
if (id == TilePacketTypes.NBT.ordinal()) if (id.equalsIgnoreCase(TilePacketTypes.NBT.name))
{ {
this.readFromNBT(Packet.readNBTTagCompound(dis)); this.readFromNBT(Packet.readNBTTagCompound(dis));
} }
@ -301,7 +308,7 @@ public abstract class TileEntityMachine extends TileEntityUniversalElectrical im
{ {
NBTTagCompound tag = new NBTTagCompound(); NBTTagCompound tag = new NBTTagCompound();
this.writeToNBT(tag); this.writeToNBT(tag);
PacketManager.sendPacketToClients(PacketManager.getPacket(this.getChannel(), this, TilePacketTypes.NBT.ordinal(), tag), worldObj, new Vector3(this), 64); PacketManager.sendPacketToClients(PacketManager.getPacket(this.getChannel(), this, TilePacketTypes.NBT.name, tag), worldObj, new Vector3(this), 64);
} }
} }
@ -310,7 +317,7 @@ public abstract class TileEntityMachine extends TileEntityUniversalElectrical im
{ {
NBTTagCompound tag = new NBTTagCompound(); NBTTagCompound tag = new NBTTagCompound();
this.writeToNBT(tag); this.writeToNBT(tag);
return PacketManager.getPacket(this.getChannel(), this, TilePacketTypes.NBT.ordinal(), tag); return PacketManager.getPacket(this.getChannel(), this, TilePacketTypes.NBT.name, tag);
} }
@Override @Override