mirror of
https://github.com/Thorfusion/Mekanism-Community-Edition.git
synced 2026-11-22 12:59:41 +00:00
Major packet work, I think it's done. 34 errors to go!
This commit is contained in:
1 parent
659b963af6
commit
1933723b52
41 files changed
+638
-886
No files matched your search
@@ -1,16 +1,15 @@
|
||||
package mekanism.common.network;
|
||||
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import io.netty.channel.ChannelHandlerContext;
|
||||
|
||||
import java.io.DataOutputStream;
|
||||
|
||||
import mekanism.common.Mekanism;
|
||||
import mekanism.common.PacketHandler;
|
||||
import mekanism.common.item.ItemScubaTank;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import com.google.common.io.ByteArrayDataInput;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import io.netty.channel.ChannelHandlerContext;
|
||||
|
||||
public class PacketScubaTankData extends MekanismPacket
|
||||
{
|
||||
@@ -30,7 +29,29 @@ public class PacketScubaTankData extends MekanismPacket
|
||||
}
|
||||
}
|
||||
|
||||
public void read(ByteArrayDataInput dataStream, EntityPlayer player, World world) throws Exception
|
||||
@Override
|
||||
public void write(ChannelHandlerContext ctx, 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 read(ChannelHandlerContext ctx, EntityPlayer player, ByteBuf dataStream)
|
||||
{
|
||||
packetType = ScubaTankPacket.values()[dataStream.readInt()];
|
||||
|
||||
@@ -42,12 +63,12 @@ public class PacketScubaTankData extends MekanismPacket
|
||||
|
||||
for(int i = 0; i < amount; i++)
|
||||
{
|
||||
Mekanism.gasmaskOn.add(dataStream.readUTF());
|
||||
Mekanism.gasmaskOn.add(PacketHandler.readString(dataStream));
|
||||
}
|
||||
}
|
||||
else if(packetType == ScubaTankPacket.UPDATE)
|
||||
{
|
||||
String username = dataStream.readUTF();
|
||||
String username = PacketHandler.readString(dataStream);
|
||||
boolean value = dataStream.readBoolean();
|
||||
|
||||
if(value)
|
||||
@@ -58,9 +79,9 @@ public class PacketScubaTankData extends MekanismPacket
|
||||
Mekanism.gasmaskOn.remove(username);
|
||||
}
|
||||
|
||||
if(!world.isRemote)
|
||||
if(!player.worldObj.isRemote)
|
||||
{
|
||||
Mekanism.packetPipeline.sendToDimension(new PacketScubaTankData(ScubaTankPacket.UPDATE, username, value), world.provider.dimensionId);
|
||||
Mekanism.packetPipeline.sendToDimension(new PacketScubaTankData(ScubaTankPacket.UPDATE, username, value), player.worldObj.provider.dimensionId);
|
||||
}
|
||||
}
|
||||
else if(packetType == ScubaTankPacket.MODE)
|
||||
@@ -74,38 +95,6 @@ public class PacketScubaTankData extends MekanismPacket
|
||||
}
|
||||
}
|
||||
|
||||
public void write(DataOutputStream dataStream) throws Exception
|
||||
{
|
||||
dataStream.writeInt(packetType.ordinal());
|
||||
|
||||
if(packetType == ScubaTankPacket.UPDATE)
|
||||
{
|
||||
dataStream.writeUTF(username);
|
||||
dataStream.writeBoolean(value);
|
||||
}
|
||||
else if(packetType == ScubaTankPacket.FULL)
|
||||
{
|
||||
dataStream.writeInt(Mekanism.gasmaskOn.size());
|
||||
|
||||
for(String username : Mekanism.gasmaskOn)
|
||||
{
|
||||
dataStream.writeUTF(username);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void write(ChannelHandlerContext ctx, ByteBuf buffer)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void read(ChannelHandlerContext ctx, ByteBuf buffer)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void handleClientSide(EntityPlayer player)
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user