Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed packet functions not static

Browse source
This commit is contained in:
Calclavia 2013-08-03 00:06:53 -04:00
parent 717ef201fd
commit 5bc0b50219
1 changed files with 82 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
src/resonantinduction/PacketHandler.java
View file

@ -5,7 +5,6 @@ package resonantinduction;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream; import java.io.DataOutputStream;
import java.util.ArrayList;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.network.INetworkManager; import net.minecraft.network.INetworkManager;
@ -20,7 +19,6 @@ import com.google.common.io.ByteStreams;
import cpw.mods.fml.common.network.IPacketHandler; import cpw.mods.fml.common.network.IPacketHandler;
import cpw.mods.fml.common.network.PacketDispatcher; import cpw.mods.fml.common.network.PacketDispatcher;
import cpw.mods.fml.common.network.Player; import cpw.mods.fml.common.network.Player;
import cpw.mods.fml.relauncher.Side;
/** /**
* @author AidanBrady * @author AidanBrady
@ -31,16 +29,17 @@ public class PacketHandler implements IPacketHandler
@Override @Override
public void onPacketData(INetworkManager manager, Packet250CustomPayload packet, Player player) public void onPacketData(INetworkManager manager, Packet250CustomPayload packet, Player player)
{ {
if(packet.channel == ResonantInduction.CHANNEL) if (packet.channel == ResonantInduction.CHANNEL)
{ {
ByteArrayDataInput dataStream = ByteStreams.newDataInput(packet.data); ByteArrayDataInput dataStream = ByteStreams.newDataInput(packet.data);
EntityPlayer entityplayer = (EntityPlayer)player; EntityPlayer entityplayer = (EntityPlayer) player;
World world = entityplayer.worldObj; World world = entityplayer.worldObj;
try { try
{
int packetType = dataStream.readInt(); int packetType = dataStream.readInt();
if(packetType == PacketType.TILE.ordinal()) if (packetType == PacketType.TILE.ordinal())
{ {
int x = dataStream.readInt(); int x = dataStream.readInt();
int y = dataStream.readInt(); int y = dataStream.readInt();
@ -48,70 +47,81 @@ public class PacketHandler implements IPacketHandler
TileEntity tileEntity = world.getBlockTileEntity(x, y, z); TileEntity tileEntity = world.getBlockTileEntity(x, y, z);
if(tileEntity instanceof IPacketReceiver) if (tileEntity instanceof IPacketReceiver)
{ {
((IPacketReceiver)tileEntity).handle(dataStream); ((IPacketReceiver) tileEntity).handle(dataStream);
} }
} }
} catch(Exception e) {} }
catch (Exception e)
{
}
} }
} }
public static void encode(Object[] dataValues, DataOutputStream output) public static void encode(Object[] dataValues, DataOutputStream output)
{ {
try { try
for(Object data : dataValues)
{ {
if(data instanceof Integer) for (Object data : dataValues)
{ {
output.writeInt((Integer)data); if (data instanceof Integer)
{
output.writeInt((Integer) data);
} }
else if(data instanceof Boolean) else if (data instanceof Boolean)
{ {
output.writeBoolean((Boolean)data); output.writeBoolean((Boolean) data);
} }
else if(data instanceof Double) else if (data instanceof Double)
{ {
output.writeDouble((Double)data); output.writeDouble((Double) data);
} }
else if(data instanceof Float) else if (data instanceof Float)
{ {
output.writeFloat((Float)data); output.writeFloat((Float) data);
} }
else if(data instanceof String) else if (data instanceof String)
{ {
output.writeUTF((String)data); output.writeUTF((String) data);
} }
else if(data instanceof Byte) else if (data instanceof Byte)
{ {
output.writeByte((Byte)data); output.writeByte((Byte) data);
} }
} }
} catch(Exception e) {} }
catch (Exception e)
{
}
} }
public void sendTileEntityPacketToServer(TileEntity tileEntity, Object... dataValues) public static void sendTileEntityPacketToServer(TileEntity tileEntity, Object... dataValues)
{ {
PacketDispatcher.sendPacketToServer(getTileEntityPacket(tileEntity, dataValues)); PacketDispatcher.sendPacketToServer(getTileEntityPacket(tileEntity, dataValues));
} }
public void sendTileEntityPacketToClients(TileEntity tileEntity, Object... dataValues) public static void sendTileEntityPacketToClients(TileEntity tileEntity, Object... dataValues)
{ {
PacketDispatcher.sendPacketToAllPlayers(getTileEntityPacket(tileEntity, dataValues)); PacketDispatcher.sendPacketToAllPlayers(getTileEntityPacket(tileEntity, dataValues));
} }
public Packet250CustomPayload getTileEntityPacket(TileEntity tileEntity, Object... dataValues) public static Packet250CustomPayload getTileEntityPacket(TileEntity tileEntity, Object... dataValues)
{ {
ByteArrayOutputStream bytes = new ByteArrayOutputStream(); ByteArrayOutputStream bytes = new ByteArrayOutputStream();
DataOutputStream data = new DataOutputStream(bytes); DataOutputStream data = new DataOutputStream(bytes);
try { try
{
data.writeInt(tileEntity.xCoord); data.writeInt(tileEntity.xCoord);
data.writeInt(tileEntity.yCoord); data.writeInt(tileEntity.yCoord);
data.writeInt(tileEntity.zCoord); data.writeInt(tileEntity.zCoord);
encode(dataValues, data); encode(dataValues, data);
} catch(Exception e) {} }
catch (Exception e)
{
}
Packet250CustomPayload packet = new Packet250CustomPayload(); Packet250CustomPayload packet = new Packet250CustomPayload();
packet.channel = ResonantInduction.CHANNEL; packet.channel = ResonantInduction.CHANNEL;