mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-20 03:59:37 +00:00
Rewrite networking code for the 100th time to fix memory leak
This commit is contained in:
1 parent
be3883195c
commit
e5f76907ce
103 files changed
+2683
-2759
No files matched your search
@@ -1,55 +1,32 @@
|
||||
package mekanism.common.network;
|
||||
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import io.netty.channel.ChannelHandlerContext;
|
||||
import mekanism.api.Coord4D;
|
||||
import mekanism.common.IUpgradeManagement;
|
||||
import mekanism.common.Mekanism;
|
||||
import mekanism.common.PacketHandler;
|
||||
import mekanism.common.network.PacketRemoveUpgrade.RemoveUpgradeMessage;
|
||||
import mekanism.common.tile.TileEntityBasicBlock;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
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 PacketRemoveUpgrade extends MekanismPacket
|
||||
public class PacketRemoveUpgrade implements IMessageHandler<RemoveUpgradeMessage, IMessage>
|
||||
{
|
||||
public Coord4D coord4D;
|
||||
|
||||
public byte upgradeType;
|
||||
|
||||
public PacketRemoveUpgrade() {}
|
||||
|
||||
public PacketRemoveUpgrade(Coord4D coord, byte type)
|
||||
{
|
||||
coord4D = coord;
|
||||
upgradeType = type;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void write(ChannelHandlerContext ctx, ByteBuf dataStream)
|
||||
public IMessage onMessage(RemoveUpgradeMessage message, MessageContext context)
|
||||
{
|
||||
dataStream.writeInt(coord4D.xCoord);
|
||||
dataStream.writeInt(coord4D.yCoord);
|
||||
dataStream.writeInt(coord4D.zCoord);
|
||||
|
||||
dataStream.writeByte(upgradeType);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void read(ChannelHandlerContext ctx, EntityPlayer player, ByteBuf dataStream)
|
||||
{
|
||||
int x = dataStream.readInt();
|
||||
int y = dataStream.readInt();
|
||||
int z = dataStream.readInt();
|
||||
|
||||
byte type = dataStream.readByte();
|
||||
|
||||
TileEntity tileEntity = player.worldObj.getTileEntity(x, y, z);
|
||||
|
||||
EntityPlayer player = PacketHandler.getPlayer(context);
|
||||
TileEntity tileEntity = message.coord4D.getTileEntity(player.worldObj);
|
||||
|
||||
if(tileEntity instanceof IUpgradeManagement && tileEntity instanceof TileEntityBasicBlock)
|
||||
{
|
||||
IUpgradeManagement upgradeTile = (IUpgradeManagement)tileEntity;
|
||||
|
||||
if(type == 0)
|
||||
if(message.upgradeType == 0)
|
||||
{
|
||||
if(upgradeTile.getSpeedMultiplier() > 0)
|
||||
{
|
||||
@@ -59,7 +36,7 @@ public class PacketRemoveUpgrade extends MekanismPacket
|
||||
}
|
||||
}
|
||||
}
|
||||
else if(type == 1)
|
||||
else if(message.upgradeType == 1)
|
||||
{
|
||||
if(upgradeTile.getEnergyMultiplier() > 0)
|
||||
{
|
||||
@@ -70,17 +47,41 @@ public class PacketRemoveUpgrade extends MekanismPacket
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void handleClientSide(EntityPlayer player)
|
||||
|
||||
public static class RemoveUpgradeMessage implements IMessage
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void handleServerSide(EntityPlayer player)
|
||||
{
|
||||
|
||||
public Coord4D coord4D;
|
||||
|
||||
public byte upgradeType;
|
||||
|
||||
public RemoveUpgradeMessage() {}
|
||||
|
||||
public RemoveUpgradeMessage(Coord4D coord, byte type)
|
||||
{
|
||||
coord4D = coord;
|
||||
upgradeType = type;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void toBytes(ByteBuf dataStream)
|
||||
{
|
||||
dataStream.writeInt(coord4D.xCoord);
|
||||
dataStream.writeInt(coord4D.yCoord);
|
||||
dataStream.writeInt(coord4D.zCoord);
|
||||
dataStream.writeInt(coord4D.dimensionId);
|
||||
|
||||
dataStream.writeByte(upgradeType);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void fromBytes(ByteBuf dataStream)
|
||||
{
|
||||
coord4D = new Coord4D(dataStream.readInt(), dataStream.readInt(), dataStream.readInt(), dataStream.readInt());
|
||||
|
||||
upgradeType = dataStream.readByte();
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user