From 079a2735c3db1ead0ccb4254493b40ddba62ad03 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Sat, 28 May 2016 14:52:28 +0200 Subject: [PATCH] Network packet improvements --- .../network/MessageCraftingMonitorCancel.java | 6 ++-- .../network/MessageGridCraftingPush.java | 2 +- .../network/MessageGridCraftingShift.java | 9 ++++-- .../network/MessageGridCraftingStart.java | 28 +++++++++---------- .../network/MessageGridItems.java | 7 +---- .../network/MessageGridStoragePull.java | 28 +++++++++---------- .../network/MessageGridStoragePush.java | 28 +++++++++---------- 7 files changed, 53 insertions(+), 55 deletions(-) diff --git a/src/main/java/refinedstorage/network/MessageCraftingMonitorCancel.java b/src/main/java/refinedstorage/network/MessageCraftingMonitorCancel.java index 7c9d25850..87c1a228b 100755 --- a/src/main/java/refinedstorage/network/MessageCraftingMonitorCancel.java +++ b/src/main/java/refinedstorage/network/MessageCraftingMonitorCancel.java @@ -44,10 +44,10 @@ public class MessageCraftingMonitorCancel extends MessageHandlerPlayerToServer= 0 && message.craftingSlot < grid.getMatrix().getSizeInventory()) { ItemStack stack = grid.getMatrix().getStackInSlot(message.craftingSlot); if (stack != null) { diff --git a/src/main/java/refinedstorage/network/MessageGridCraftingShift.java b/src/main/java/refinedstorage/network/MessageGridCraftingShift.java index 78521cc10..bbae755ff 100755 --- a/src/main/java/refinedstorage/network/MessageGridCraftingShift.java +++ b/src/main/java/refinedstorage/network/MessageGridCraftingShift.java @@ -5,7 +5,6 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import refinedstorage.block.EnumGridType; import refinedstorage.container.ContainerGrid; import refinedstorage.tile.grid.TileGrid; @@ -41,8 +40,12 @@ public class MessageGridCraftingShift extends MessageHandlerPlayerToServer implements IMessage { - private int gridX; - private int gridY; - private int gridZ; + private int x; + private int y; + private int z; private int id; private int quantity; public MessageGridCraftingStart() { } - public MessageGridCraftingStart(int gridX, int gridY, int gridZ, int id, int quantity) { - this.gridX = gridX; - this.gridY = gridY; - this.gridZ = gridZ; + public MessageGridCraftingStart(int x, int y, int z, int id, int quantity) { + this.x = x; + this.y = z; + this.z = z; this.id = id; this.quantity = quantity; } @Override public void fromBytes(ByteBuf buf) { - gridX = buf.readInt(); - gridY = buf.readInt(); - gridZ = buf.readInt(); + x = buf.readInt(); + y = buf.readInt(); + z = buf.readInt(); id = buf.readInt(); quantity = buf.readInt(); } @Override public void toBytes(ByteBuf buf) { - buf.writeInt(gridX); - buf.writeInt(gridY); - buf.writeInt(gridZ); + buf.writeInt(x); + buf.writeInt(y); + buf.writeInt(z); buf.writeInt(id); buf.writeInt(quantity); } @Override public void handle(MessageGridCraftingStart message, EntityPlayerMP player) { - TileEntity tile = player.worldObj.getTileEntity(new BlockPos(message.gridX, message.gridY, message.gridZ)); + TileEntity tile = player.worldObj.getTileEntity(new BlockPos(message.x, message.y, message.z)); if (tile instanceof TileGrid && ((TileGrid) tile).isConnected()) { ((TileGrid) tile).getController().getStorageHandler().handleCraftingRequest(message.id, message.quantity); diff --git a/src/main/java/refinedstorage/network/MessageGridItems.java b/src/main/java/refinedstorage/network/MessageGridItems.java index df68c1271..2242373a6 100755 --- a/src/main/java/refinedstorage/network/MessageGridItems.java +++ b/src/main/java/refinedstorage/network/MessageGridItems.java @@ -31,14 +31,10 @@ public class MessageGridItems implements IMessage, IMessageHandler implements IMessage { - private int gridX; - private int gridY; - private int gridZ; + private int x; + private int y; + private int z; private int id; private int flags; public MessageGridStoragePull() { } - public MessageGridStoragePull(int gridX, int gridY, int gridZ, int id, int flags) { - this.gridX = gridX; - this.gridY = gridY; - this.gridZ = gridZ; + public MessageGridStoragePull(int x, int y, int z, int id, int flags) { + this.x = x; + this.y = y; + this.z = z; this.id = id; this.flags = flags; } @Override public void fromBytes(ByteBuf buf) { - gridX = buf.readInt(); - gridY = buf.readInt(); - gridZ = buf.readInt(); + x = buf.readInt(); + y = buf.readInt(); + z = buf.readInt(); id = buf.readInt(); flags = buf.readInt(); } @Override public void toBytes(ByteBuf buf) { - buf.writeInt(gridX); - buf.writeInt(gridY); - buf.writeInt(gridZ); + buf.writeInt(x); + buf.writeInt(y); + buf.writeInt(z); buf.writeInt(id); buf.writeInt(flags); } @Override public void handle(MessageGridStoragePull message, EntityPlayerMP player) { - TileEntity tile = player.worldObj.getTileEntity(new BlockPos(message.gridX, message.gridY, message.gridZ)); + TileEntity tile = player.worldObj.getTileEntity(new BlockPos(message.x, message.y, message.z)); if (tile instanceof TileGrid && ((TileGrid) tile).isConnected()) { ((TileGrid) tile).getController().getStorageHandler().handlePull(message.id, message.flags, player); diff --git a/src/main/java/refinedstorage/network/MessageGridStoragePush.java b/src/main/java/refinedstorage/network/MessageGridStoragePush.java index 1c0a418f8..8419895eb 100755 --- a/src/main/java/refinedstorage/network/MessageGridStoragePush.java +++ b/src/main/java/refinedstorage/network/MessageGridStoragePush.java @@ -8,44 +8,44 @@ import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import refinedstorage.tile.grid.TileGrid; public class MessageGridStoragePush extends MessageHandlerPlayerToServer implements IMessage { - private int gridX; - private int gridY; - private int gridZ; + private int x; + private int y; + private int z; private int playerSlot; private boolean one; public MessageGridStoragePush() { } - public MessageGridStoragePush(int gridX, int gridY, int gridZ, int playerSlot, boolean one) { - this.gridX = gridX; - this.gridY = gridY; - this.gridZ = gridZ; + public MessageGridStoragePush(int x, int y, int z, int playerSlot, boolean one) { + this.x = x; + this.y = y; + this.z = z; this.playerSlot = playerSlot; this.one = one; } @Override public void fromBytes(ByteBuf buf) { - gridX = buf.readInt(); - gridY = buf.readInt(); - gridZ = buf.readInt(); + x = buf.readInt(); + y = buf.readInt(); + z = buf.readInt(); playerSlot = buf.readInt(); one = buf.readBoolean(); } @Override public void toBytes(ByteBuf buf) { - buf.writeInt(gridX); - buf.writeInt(gridY); - buf.writeInt(gridZ); + buf.writeInt(x); + buf.writeInt(y); + buf.writeInt(z); buf.writeInt(playerSlot); buf.writeBoolean(one); } @Override public void handle(MessageGridStoragePush message, EntityPlayerMP player) { - TileEntity tile = player.worldObj.getTileEntity(new BlockPos(message.gridX, message.gridY, message.gridZ)); + TileEntity tile = player.worldObj.getTileEntity(new BlockPos(message.x, message.y, message.z)); if (tile instanceof TileGrid && ((TileGrid) tile).isConnected()) { ((TileGrid) tile).getController().getStorageHandler().handlePush(message.playerSlot, message.one, player);