diff --git a/src/main/java/kamkeel/npcs/network/PacketHandler.java b/src/main/java/kamkeel/npcs/network/PacketHandler.java index c3bf6b871..7cce24566 100644 --- a/src/main/java/kamkeel/npcs/network/PacketHandler.java +++ b/src/main/java/kamkeel/npcs/network/PacketHandler.java @@ -9,10 +9,7 @@ import io.netty.buffer.ByteBuf; import kamkeel.npcs.network.enums.EnumPacketType; import kamkeel.npcs.network.packets.client.*; import kamkeel.npcs.network.packets.client.gui.*; -import kamkeel.npcs.network.packets.client.large.LargeScrollDataPacket; -import kamkeel.npcs.network.packets.client.large.LargeScrollGroupPacket; -import kamkeel.npcs.network.packets.client.large.LargeScrollListPacket; -import kamkeel.npcs.network.packets.client.large.LargeSyncPacket; +import kamkeel.npcs.network.packets.client.large.*; import kamkeel.npcs.network.packets.client.npc.DeleteNpcPacket; import kamkeel.npcs.network.packets.client.npc.EditNpcPacket; import kamkeel.npcs.network.packets.client.script.ScriptedParticlePacket; @@ -68,7 +65,7 @@ public final class PacketHandler { CLIENT_PACKET.registerPacket(new GuiClosePacket()); CLIENT_PACKET.registerPacket(new GuiOpenPacket()); CLIENT_PACKET.registerPacket(new GuiErrorPacket()); - CLIENT_PACKET.registerPacket(new GuiDataPacket()); + CLIENT_PACKET.registerPacket(new LargeGuiDataPacket()); CLIENT_PACKET.registerPacket(new GuiClonerPacket()); // Client | NPC Packets diff --git a/src/main/java/kamkeel/npcs/network/PacketUtil.java b/src/main/java/kamkeel/npcs/network/PacketUtil.java index a2f93d585..c44eae29b 100644 --- a/src/main/java/kamkeel/npcs/network/PacketUtil.java +++ b/src/main/java/kamkeel/npcs/network/PacketUtil.java @@ -3,7 +3,7 @@ package kamkeel.npcs.network; import kamkeel.npcs.network.packets.client.ChatAlertPacket; import kamkeel.npcs.network.packets.client.AchievementPacket; import kamkeel.npcs.network.packets.client.gui.GuiClosePacket; -import kamkeel.npcs.network.packets.client.gui.GuiDataPacket; +import kamkeel.npcs.network.packets.client.large.LargeGuiDataPacket; import kamkeel.npcs.network.packets.client.gui.GuiErrorPacket; import kamkeel.npcs.network.packets.client.gui.GuiOpenPacket; import kamkeel.npcs.network.packets.client.large.LargeScrollGroupPacket; @@ -59,7 +59,7 @@ public class PacketUtil { } public static void sendGuiData(EntityPlayerMP playerMP, NBTTagCompound compound){ - GuiDataPacket packet = new GuiDataPacket(compound); + LargeGuiDataPacket packet = new LargeGuiDataPacket(compound); PacketHandler.Instance.sendToPlayer(packet, playerMP); } } diff --git a/src/main/java/kamkeel/npcs/network/packets/client/gui/GuiDataPacket.java b/src/main/java/kamkeel/npcs/network/packets/client/large/LargeGuiDataPacket.java similarity index 66% rename from src/main/java/kamkeel/npcs/network/packets/client/gui/GuiDataPacket.java rename to src/main/java/kamkeel/npcs/network/packets/client/large/LargeGuiDataPacket.java index 1ee404bd0..8bf57d986 100644 --- a/src/main/java/kamkeel/npcs/network/packets/client/gui/GuiDataPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/client/large/LargeGuiDataPacket.java @@ -1,9 +1,11 @@ -package kamkeel.npcs.network.packets.client.gui; +package kamkeel.npcs.network.packets.client.large; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; +import io.netty.buffer.Unpooled; import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.LargeAbstractPacket; import kamkeel.npcs.network.PacketChannel; import kamkeel.npcs.network.PacketHandler; import kamkeel.npcs.network.enums.EnumClientPacket; @@ -12,22 +14,21 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; -import noppes.npcs.CustomNpcs; -import noppes.npcs.Server; import noppes.npcs.client.gui.util.GuiContainerNPCInterface; import noppes.npcs.client.gui.util.GuiNPCInterface; import noppes.npcs.client.gui.util.IGuiData; import java.io.IOException; +import java.util.Map; -public final class GuiDataPacket extends AbstractPacket { +public final class LargeGuiDataPacket extends LargeAbstractPacket { public static final String packetName = "Client|GuiData"; private NBTTagCompound compound; - public GuiDataPacket(){} + public LargeGuiDataPacket(){} - public GuiDataPacket(NBTTagCompound comp){ + public LargeGuiDataPacket(NBTTagCompound comp){ this.compound = comp; } @@ -38,17 +39,21 @@ public final class GuiDataPacket extends AbstractPacket { @Override public PacketChannel getChannel() { - return PacketHandler.CLIENT_PACKET; + return PacketHandler.LARGE_PACKET; } @Override - public void sendData(ByteBuf out) throws IOException { - ByteBufUtils.writeNBT(out, compound); + protected byte[] getData() throws IOException { + ByteBuf buffer = Unpooled.buffer(); + ByteBufUtils.writeBigNBT(buffer, compound); + byte[] bytes = new byte[buffer.readableBytes()]; + buffer.readBytes(bytes); + return bytes; } @SideOnly(Side.CLIENT) @Override - public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + protected void handleCompleteData(ByteBuf data, EntityPlayer player) throws IOException { GuiScreen gui = Minecraft.getMinecraft().currentScreen; if (gui instanceof GuiNPCInterface && ((GuiNPCInterface) gui).hasSubGui()) { gui = (GuiScreen) ((GuiNPCInterface) gui).getSubGui(); @@ -56,7 +61,7 @@ public final class GuiDataPacket extends AbstractPacket { gui = (GuiScreen) ((GuiContainerNPCInterface) gui).getSubGui(); } if (gui instanceof IGuiData) { - NBTTagCompound nbt = ByteBufUtils.readNBT(in); + NBTTagCompound nbt = ByteBufUtils.readBigNBT(data); ((IGuiData) gui).setGuiData(nbt); } }