Rewrite networking code for the 100th time to fix memory leak

This commit is contained in:
Aidan C. Brady committed 2014-06-11 11:57:49 +02:00
1 parent be3883195c
commit e5f76907ce
103 files changed
+2683 -2759

No files matched your search

@@ -1,172 +1,186 @@
package mekanism.common.network;
import io.netty.buffer.ByteBuf;
import io.netty.channel.ChannelHandlerContext;
import mekanism.common.Mekanism;
import mekanism.common.PacketHandler;
import mekanism.common.entity.EntityRobit;
import mekanism.common.network.PacketRobit.RobitMessage;
import mekanism.common.network.PacketRobit.RobitMessage.RobitPacketType;
import net.minecraft.entity.player.EntityPlayer;
import cpw.mods.fml.common.network.simpleimpl.IMessage;
import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
import cpw.mods.fml.common.network.simpleimpl.MessageContext;
public class PacketRobit extends MekanismPacket
public class PacketRobit implements IMessageHandler<RobitMessage, IMessage>
{
public RobitPacketType activeType;
public int guiType;
public int entityId;
public String name;
public PacketRobit() {}
public PacketRobit(RobitPacketType type, int i1, int i2, String s)
{
activeType = type;
switch(activeType)
{
case GUI:
guiType = i1;
entityId = i2;
break;
case FOLLOW:
entityId = i1;
break;
case NAME:
name = s;
entityId = i1;
break;
case GO_HOME:
entityId = i1;
break;
case DROP_PICKUP:
entityId = i1;
break;
}
}
@Override
public void write(ChannelHandlerContext ctx, ByteBuf dataStream)
public IMessage onMessage(RobitMessage message, MessageContext context)
{
dataStream.writeInt(activeType.ordinal());
switch(activeType)
EntityPlayer player = PacketHandler.getPlayer(context);
if(message.activeType == RobitPacketType.GUI)
{
case GUI:
dataStream.writeInt(guiType);
dataStream.writeInt(entityId);
break;
case FOLLOW:
dataStream.writeInt(entityId);
break;
case NAME:
PacketHandler.writeString(dataStream, name);
dataStream.writeInt(entityId);
break;
case GO_HOME:
dataStream.writeInt(entityId);
break;
case DROP_PICKUP:
dataStream.writeInt(entityId);
break;
}
}
@Override
public void read(ChannelHandlerContext ctx, EntityPlayer player, ByteBuf dataStream)
{
int subType = dataStream.readInt();
if(subType == 0)
{
int type = dataStream.readInt();
int id = dataStream.readInt();
if(type == 0)
if(message.guiType == 0)
{
player.openGui(Mekanism.instance, 21, player.worldObj, id, 0, 0);
player.openGui(Mekanism.instance, 21, player.worldObj, message.entityId, 0, 0);
}
else if(type == 1)
else if(message.guiType == 1)
{
player.openGui(Mekanism.instance, 22, player.worldObj, id, 0, 0);
player.openGui(Mekanism.instance, 22, player.worldObj, message.entityId, 0, 0);
}
else if(type == 2)
else if(message.guiType == 2)
{
player.openGui(Mekanism.instance, 23, player.worldObj, id, 0, 0);
player.openGui(Mekanism.instance, 23, player.worldObj, message.entityId, 0, 0);
}
else if(type == 3)
else if(message.guiType == 3)
{
player.openGui(Mekanism.instance, 24, player.worldObj, id, 0, 0);
player.openGui(Mekanism.instance, 24, player.worldObj, message.entityId, 0, 0);
}
else if(type == 4)
else if(message.guiType == 4)
{
player.openGui(Mekanism.instance, 25, player.worldObj, id, 0, 0);
player.openGui(Mekanism.instance, 25, player.worldObj, message.entityId, 0, 0);
}
}
else if(subType == 1)
else if(message.activeType == RobitPacketType.FOLLOW)
{
int id = dataStream.readInt();
EntityRobit robit = (EntityRobit)player.worldObj.getEntityByID(id);
EntityRobit robit = (EntityRobit)player.worldObj.getEntityByID(message.entityId);
if(robit != null)
{
robit.setFollowing(!robit.getFollowing());
}
}
else if(subType == 2)
else if(message.activeType == RobitPacketType.NAME)
{
String name = PacketHandler.readString(dataStream);
int id = dataStream.readInt();
EntityRobit robit = (EntityRobit)player.worldObj.getEntityByID(id);
EntityRobit robit = (EntityRobit)player.worldObj.getEntityByID(message.entityId);
if(robit != null)
{
robit.setName(name);
robit.setName(message.name);
}
}
else if(subType == 3)
else if(message.activeType == RobitPacketType.GO_HOME)
{
int id = dataStream.readInt();
EntityRobit robit = (EntityRobit)player.worldObj.getEntityByID(id);
EntityRobit robit = (EntityRobit)player.worldObj.getEntityByID(message.entityId);
if(robit != null)
{
robit.goHome();
}
}
else if(subType == 4)
else if(message.activeType == RobitPacketType.DROP_PICKUP)
{
int id = dataStream.readInt();
EntityRobit robit = (EntityRobit)player.worldObj.getEntityByID(id);
EntityRobit robit = (EntityRobit)player.worldObj.getEntityByID(message.entityId);
if(robit != null)
{
robit.setDropPickup(!robit.getDropPickup());
}
}
return null;
}
@Override
public void handleClientSide(EntityPlayer player)
public static class RobitMessage implements IMessage
{
}
@Override
public void handleServerSide(EntityPlayer player)
{
}
public static enum RobitPacketType
{
GUI,
FOLLOW,
NAME,
GO_HOME,
DROP_PICKUP;
public RobitPacketType activeType;
public int guiType;
public int entityId;
public String name;
public RobitMessage() {}
public RobitMessage(RobitPacketType type, int i1, int i2, String s)
{
activeType = type;
switch(activeType)
{
case GUI:
guiType = i1;
entityId = i2;
break;
case FOLLOW:
entityId = i1;
break;
case NAME:
name = s;
entityId = i1;
break;
case GO_HOME:
entityId = i1;
break;
case DROP_PICKUP:
entityId = i1;
break;
}
}
@Override
public void toBytes(ByteBuf dataStream)
{
dataStream.writeInt(activeType.ordinal());
switch(activeType)
{
case GUI:
dataStream.writeInt(guiType);
dataStream.writeInt(entityId);
break;
case FOLLOW:
dataStream.writeInt(entityId);
break;
case NAME:
PacketHandler.writeString(dataStream, name);
dataStream.writeInt(entityId);
break;
case GO_HOME:
dataStream.writeInt(entityId);
break;
case DROP_PICKUP:
dataStream.writeInt(entityId);
break;
}
}
@Override
public void fromBytes(ByteBuf dataStream)
{
activeType = RobitPacketType.values()[dataStream.readInt()];
if(activeType == RobitPacketType.GUI)
{
guiType = dataStream.readInt();
entityId = dataStream.readInt();
}
else if(activeType == RobitPacketType.FOLLOW)
{
entityId = dataStream.readInt();
}
else if(activeType == RobitPacketType.NAME)
{
name = PacketHandler.readString(dataStream);
entityId = dataStream.readInt();
}
else if(activeType == RobitPacketType.GO_HOME)
{
entityId = dataStream.readInt();
}
else if(activeType == RobitPacketType.DROP_PICKUP)
{
entityId = dataStream.readInt();
}
}
public static enum RobitPacketType
{
GUI,
FOLLOW,
NAME,
GO_HOME,
DROP_PICKUP;
}
}
}