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,89 +1,40 @@
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.item.ItemScubaTank;
import mekanism.common.network.PacketScubaTankData.ScubaTankDataMessage;
import mekanism.common.network.PacketScubaTankData.ScubaTankDataMessage.ScubaTankPacket;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
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 PacketScubaTankData extends MekanismPacket
public class PacketScubaTankData implements IMessageHandler<ScubaTankDataMessage, IMessage>
{
public ScubaTankPacket packetType;
public String username;
public boolean value;
public PacketScubaTankData() {}
public PacketScubaTankData(ScubaTankPacket type, String name, boolean state)
{
packetType = type;
if(packetType == ScubaTankPacket.UPDATE)
{
username = name;
value = state;
}
}
@Override
public void write(ChannelHandlerContext ctx, ByteBuf dataStream)
public IMessage onMessage(ScubaTankDataMessage message, MessageContext context)
{
dataStream.writeInt(packetType.ordinal());
if(packetType == ScubaTankPacket.UPDATE)
EntityPlayer player = PacketHandler.getPlayer(context);
if(message.packetType == ScubaTankPacket.UPDATE)
{
PacketHandler.writeString(dataStream, username);
dataStream.writeBoolean(value);
}
else if(packetType == ScubaTankPacket.FULL)
{
dataStream.writeInt(Mekanism.gasmaskOn.size());
for(String name : Mekanism.gasmaskOn)
if(message.value)
{
PacketHandler.writeString(dataStream, name);
}
}
}
@Override
public void read(ChannelHandlerContext ctx, EntityPlayer player, ByteBuf dataStream)
{
packetType = ScubaTankPacket.values()[dataStream.readInt()];
if(packetType == ScubaTankPacket.FULL)
{
Mekanism.gasmaskOn.clear();
int amount = dataStream.readInt();
for(int i = 0; i < amount; i++)
{
Mekanism.gasmaskOn.add(PacketHandler.readString(dataStream));
}
}
else if(packetType == ScubaTankPacket.UPDATE)
{
String username = PacketHandler.readString(dataStream);
boolean value = dataStream.readBoolean();
if(value)
{
Mekanism.gasmaskOn.add(username);
Mekanism.gasmaskOn.add(message.username);
}
else {
Mekanism.gasmaskOn.remove(username);
Mekanism.gasmaskOn.remove(message.username);
}
if(!player.worldObj.isRemote)
{
Mekanism.packetPipeline.sendToDimension(new PacketScubaTankData(ScubaTankPacket.UPDATE, username, value), player.worldObj.provider.dimensionId);
Mekanism.packetHandler.sendToDimension(new ScubaTankDataMessage(ScubaTankPacket.UPDATE, message.username, message.value), player.worldObj.provider.dimensionId);
}
}
else if(packetType == ScubaTankPacket.MODE)
else if(message.packetType == ScubaTankPacket.MODE)
{
ItemStack stack = player.getEquipmentInSlot(3);
@@ -92,24 +43,79 @@ public class PacketScubaTankData extends MekanismPacket
((ItemScubaTank)stack.getItem()).toggleFlowing(stack);
}
}
return null;
}
@Override
public void handleClientSide(EntityPlayer player)
public static class ScubaTankDataMessage implements IMessage
{
}
@Override
public void handleServerSide(EntityPlayer player)
{
}
public static enum ScubaTankPacket
{
UPDATE,
FULL,
MODE;
public ScubaTankPacket packetType;
public String username;
public boolean value;
public ScubaTankDataMessage() {}
public ScubaTankDataMessage(ScubaTankPacket type, String name, boolean state)
{
packetType = type;
if(packetType == ScubaTankPacket.UPDATE)
{
username = name;
value = state;
}
}
@Override
public void toBytes(ByteBuf dataStream)
{
dataStream.writeInt(packetType.ordinal());
if(packetType == ScubaTankPacket.UPDATE)
{
PacketHandler.writeString(dataStream, username);
dataStream.writeBoolean(value);
}
else if(packetType == ScubaTankPacket.FULL)
{
dataStream.writeInt(Mekanism.gasmaskOn.size());
for(String name : Mekanism.gasmaskOn)
{
PacketHandler.writeString(dataStream, name);
}
}
}
@Override
public void fromBytes(ByteBuf dataStream)
{
packetType = ScubaTankPacket.values()[dataStream.readInt()];
if(packetType == ScubaTankPacket.FULL)
{
Mekanism.gasmaskOn.clear();
int amount = dataStream.readInt();
for(int i = 0; i < amount; i++)
{
Mekanism.gasmaskOn.add(PacketHandler.readString(dataStream));
}
}
else if(packetType == ScubaTankPacket.UPDATE)
{
username = PacketHandler.readString(dataStream);
value = dataStream.readBoolean();
}
}
public static enum ScubaTankPacket
{
UPDATE,
FULL,
MODE;
}
}
}