mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 04:52:25 +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,7 +1,7 @@
|
||||
package mekanism.common.network;
|
||||
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import io.netty.channel.ChannelHandlerContext;
|
||||
import mekanism.api.Coord4D;
|
||||
import mekanism.api.gas.Gas;
|
||||
import mekanism.api.gas.GasNetwork;
|
||||
import mekanism.api.gas.GasRegistry;
|
||||
@@ -9,181 +9,193 @@ import mekanism.api.gas.GasStack;
|
||||
import mekanism.api.transmitters.IGridTransmitter;
|
||||
import mekanism.common.EnergyNetwork;
|
||||
import mekanism.common.FluidNetwork;
|
||||
import mekanism.common.PacketHandler;
|
||||
import mekanism.common.network.PacketTransmitterUpdate.TransmitterUpdateMessage;
|
||||
import mekanism.common.network.PacketTransmitterUpdate.TransmitterUpdateMessage.PacketType;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import net.minecraftforge.fluids.FluidRegistry;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
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 PacketTransmitterUpdate extends MekanismPacket
|
||||
public class PacketTransmitterUpdate implements IMessageHandler<TransmitterUpdateMessage, IMessage>
|
||||
{
|
||||
public PacketType packetType;
|
||||
|
||||
public TileEntity tileEntity;
|
||||
|
||||
public double power;
|
||||
|
||||
public GasStack gasStack;
|
||||
public boolean didGasTransfer;
|
||||
|
||||
public FluidStack fluidStack;
|
||||
public boolean didFluidTransfer;
|
||||
|
||||
public PacketTransmitterUpdate() {}
|
||||
|
||||
public PacketTransmitterUpdate(PacketType type, TileEntity tile, Object... data)
|
||||
{
|
||||
packetType = type;
|
||||
tileEntity = tile;
|
||||
|
||||
switch(packetType)
|
||||
{
|
||||
case ENERGY:
|
||||
power = (Double)data[0];
|
||||
break;
|
||||
case GAS:
|
||||
gasStack = (GasStack)data[0];
|
||||
didGasTransfer = (Boolean)data[1];
|
||||
break;
|
||||
case FLUID:
|
||||
fluidStack = (FluidStack)data[0];
|
||||
didFluidTransfer = (Boolean)data[1];
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void write(ChannelHandlerContext ctx, ByteBuf dataStream)
|
||||
public IMessage onMessage(TransmitterUpdateMessage message, MessageContext context)
|
||||
{
|
||||
dataStream.writeInt(packetType.ordinal());
|
||||
|
||||
dataStream.writeInt(tileEntity.xCoord);
|
||||
dataStream.writeInt(tileEntity.yCoord);
|
||||
dataStream.writeInt(tileEntity.zCoord);
|
||||
dataStream.writeInt(tileEntity.getWorldObj().provider.dimensionId);
|
||||
|
||||
switch(packetType)
|
||||
{
|
||||
case ENERGY:
|
||||
dataStream.writeDouble(power);
|
||||
break;
|
||||
case GAS:
|
||||
dataStream.writeInt(gasStack != null ? gasStack.getGas().getID() : -1);
|
||||
dataStream.writeInt(gasStack != null ? gasStack.amount : 0);
|
||||
dataStream.writeBoolean(didGasTransfer);
|
||||
break;
|
||||
case FLUID:
|
||||
dataStream.writeInt(fluidStack != null ? fluidStack.getFluid().getID() : -1);
|
||||
dataStream.writeInt(fluidStack != null ? fluidStack.amount : 0);
|
||||
dataStream.writeBoolean(didFluidTransfer);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void read(ChannelHandlerContext ctx, EntityPlayer player, ByteBuf dataStream)
|
||||
{
|
||||
packetType = PacketType.values()[dataStream.readInt()];
|
||||
|
||||
int x = dataStream.readInt();
|
||||
int y = dataStream.readInt();
|
||||
int z = dataStream.readInt();
|
||||
EntityPlayer player = PacketHandler.getPlayer(context);
|
||||
|
||||
if(packetType == PacketType.UPDATE)
|
||||
if(message.packetType == PacketType.UPDATE)
|
||||
{
|
||||
TileEntity tileEntity = player.worldObj.getTileEntity(x, y, z);
|
||||
TileEntity tileEntity = message.coord4D.getTileEntity(player.worldObj);
|
||||
|
||||
if(tileEntity instanceof IGridTransmitter)
|
||||
{
|
||||
((IGridTransmitter)tileEntity).refreshTransmitterNetwork();
|
||||
}
|
||||
}
|
||||
else if(packetType == PacketType.ENERGY)
|
||||
else if(message.packetType == PacketType.ENERGY)
|
||||
{
|
||||
double powerLevel = dataStream.readDouble();
|
||||
|
||||
TileEntity tileEntity = player.worldObj.getTileEntity(x, y, z);
|
||||
TileEntity tileEntity = message.coord4D.getTileEntity(player.worldObj);
|
||||
|
||||
if(tileEntity != null)
|
||||
{
|
||||
((IGridTransmitter<EnergyNetwork>)tileEntity).getTransmitterNetwork().clientEnergyScale = powerLevel;
|
||||
((IGridTransmitter<EnergyNetwork>)tileEntity).getTransmitterNetwork().clientEnergyScale = message.power;
|
||||
}
|
||||
}
|
||||
else if(packetType == PacketType.GAS)
|
||||
else if(message.packetType == PacketType.GAS)
|
||||
{
|
||||
TileEntity tileEntity = player.worldObj.getTileEntity(x, y, z);
|
||||
|
||||
Gas gasType = GasRegistry.getGas(dataStream.readInt());
|
||||
int amount = dataStream.readInt();
|
||||
GasStack stack = null;
|
||||
didGasTransfer = dataStream.readBoolean();
|
||||
|
||||
if(gasType != null)
|
||||
{
|
||||
stack = new GasStack(gasType, amount);
|
||||
}
|
||||
TileEntity tileEntity = message.coord4D.getTileEntity(player.worldObj);
|
||||
|
||||
if(tileEntity != null)
|
||||
{
|
||||
GasNetwork net = ((IGridTransmitter<GasNetwork>)tileEntity).getTransmitterNetwork();
|
||||
|
||||
if(gasType != null)
|
||||
if(message.gasType != null)
|
||||
{
|
||||
net.refGas = gasType;
|
||||
net.refGas = message.gasType;
|
||||
}
|
||||
|
||||
net.gasStored = stack;
|
||||
net.didTransfer = didGasTransfer;
|
||||
net.gasStored = message.gasStack;
|
||||
net.didTransfer = message.didGasTransfer;
|
||||
}
|
||||
}
|
||||
else if(packetType == PacketType.FLUID)
|
||||
else if(message.packetType == PacketType.FLUID)
|
||||
{
|
||||
TileEntity tileEntity = player.worldObj.getTileEntity(x, y, z);
|
||||
|
||||
int type = dataStream.readInt();
|
||||
Fluid fluidType = type != -1 ? FluidRegistry.getFluid(type) : null;
|
||||
int amount = dataStream.readInt();
|
||||
FluidStack stack = null;
|
||||
didFluidTransfer = dataStream.readBoolean();
|
||||
|
||||
if(fluidType != null)
|
||||
{
|
||||
stack = new FluidStack(fluidType, amount);
|
||||
}
|
||||
TileEntity tileEntity = message.coord4D.getTileEntity(player.worldObj);
|
||||
|
||||
if(tileEntity != null)
|
||||
{
|
||||
FluidNetwork net = ((IGridTransmitter<FluidNetwork>)tileEntity).getTransmitterNetwork();
|
||||
|
||||
if(fluidType != null)
|
||||
if(message.fluidType != null)
|
||||
{
|
||||
net.refFluid = fluidType;
|
||||
net.refFluid = message.fluidType;
|
||||
}
|
||||
|
||||
net.fluidStored = stack;
|
||||
net.didTransfer = didFluidTransfer;
|
||||
net.fluidStored = message.fluidStack;
|
||||
net.didTransfer = message.didFluidTransfer;
|
||||
net.fluidScale = net.getScale();
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void handleClientSide(EntityPlayer player)
|
||||
|
||||
public static class TransmitterUpdateMessage implements IMessage
|
||||
{
|
||||
public PacketType packetType;
|
||||
|
||||
public Coord4D coord4D;
|
||||
|
||||
public double power;
|
||||
|
||||
public GasStack gasStack;
|
||||
public Gas gasType;
|
||||
public boolean didGasTransfer;
|
||||
|
||||
public FluidStack fluidStack;
|
||||
public Fluid fluidType;
|
||||
public boolean didFluidTransfer;
|
||||
|
||||
public int amount;
|
||||
|
||||
public TransmitterUpdateMessage() {}
|
||||
|
||||
public TransmitterUpdateMessage(PacketType type, Coord4D coord, Object... data)
|
||||
{
|
||||
packetType = type;
|
||||
coord4D = coord;
|
||||
|
||||
switch(packetType)
|
||||
{
|
||||
case ENERGY:
|
||||
power = (Double)data[0];
|
||||
break;
|
||||
case GAS:
|
||||
gasStack = (GasStack)data[0];
|
||||
didGasTransfer = (Boolean)data[1];
|
||||
break;
|
||||
case FLUID:
|
||||
fluidStack = (FluidStack)data[0];
|
||||
didFluidTransfer = (Boolean)data[1];
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void toBytes(ByteBuf dataStream)
|
||||
{
|
||||
dataStream.writeInt(packetType.ordinal());
|
||||
|
||||
dataStream.writeInt(coord4D.xCoord);
|
||||
dataStream.writeInt(coord4D.yCoord);
|
||||
dataStream.writeInt(coord4D.zCoord);
|
||||
dataStream.writeInt(coord4D.dimensionId);
|
||||
|
||||
switch(packetType)
|
||||
{
|
||||
case ENERGY:
|
||||
dataStream.writeDouble(power);
|
||||
break;
|
||||
case GAS:
|
||||
dataStream.writeInt(gasStack != null ? gasStack.getGas().getID() : -1);
|
||||
dataStream.writeInt(gasStack != null ? gasStack.amount : 0);
|
||||
dataStream.writeBoolean(didGasTransfer);
|
||||
break;
|
||||
case FLUID:
|
||||
dataStream.writeInt(fluidStack != null ? fluidStack.getFluid().getID() : -1);
|
||||
dataStream.writeInt(fluidStack != null ? fluidStack.amount : 0);
|
||||
dataStream.writeBoolean(didFluidTransfer);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void fromBytes(ByteBuf dataStream)
|
||||
{
|
||||
packetType = PacketType.values()[dataStream.readInt()];
|
||||
|
||||
coord4D = new Coord4D(dataStream.readInt(), dataStream.readInt(), dataStream.readInt(), dataStream.readInt());
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void handleServerSide(EntityPlayer player)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public static enum PacketType
|
||||
{
|
||||
UPDATE,
|
||||
ENERGY,
|
||||
GAS,
|
||||
FLUID
|
||||
if(packetType == PacketType.ENERGY)
|
||||
{
|
||||
power = dataStream.readDouble();
|
||||
}
|
||||
else if(packetType == PacketType.GAS)
|
||||
{
|
||||
gasType = GasRegistry.getGas(dataStream.readInt());
|
||||
amount = dataStream.readInt();
|
||||
didGasTransfer = dataStream.readBoolean();
|
||||
|
||||
if(gasType != null)
|
||||
{
|
||||
gasStack = new GasStack(gasType, amount);
|
||||
}
|
||||
}
|
||||
else if(packetType == PacketType.FLUID)
|
||||
{
|
||||
int type = dataStream.readInt();
|
||||
fluidType = type != -1 ? FluidRegistry.getFluid(type) : null;
|
||||
amount = dataStream.readInt();
|
||||
didFluidTransfer = dataStream.readBoolean();
|
||||
|
||||
if(fluidType != null)
|
||||
{
|
||||
fluidStack = new FluidStack(fluidType, amount);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static enum PacketType
|
||||
{
|
||||
UPDATE,
|
||||
ENERGY,
|
||||
GAS,
|
||||
FLUID
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user