diff --git a/src/main/java/kamkeel/npcs/network/PacketHandler.java b/src/main/java/kamkeel/npcs/network/PacketHandler.java index f665463bc..91079c6da 100644 --- a/src/main/java/kamkeel/npcs/network/PacketHandler.java +++ b/src/main/java/kamkeel/npcs/network/PacketHandler.java @@ -352,6 +352,8 @@ public class PacketHandler { PLAYER_PACKET.registerPacket(new MailActionPacket.MailSendPacket()); PLAYER_PACKET.registerPacket(new InputDevicePacket()); + + PLAYER_PACKET.registerPacket(new ScreenSizePacket()); } private void registerChannels() { diff --git a/src/main/java/kamkeel/npcs/network/enums/EnumPlayerPacket.java b/src/main/java/kamkeel/npcs/network/enums/EnumPlayerPacket.java index 56d69b163..d1893b557 100644 --- a/src/main/java/kamkeel/npcs/network/enums/EnumPlayerPacket.java +++ b/src/main/java/kamkeel/npcs/network/enums/EnumPlayerPacket.java @@ -9,15 +9,12 @@ public enum EnumPlayerPacket { TrackedQuest, // TODO CheckQuestCompletion, // TODO FactionsGet, // TODO - MailBoxAction, // TODO: Get, Delete, Send, Read, OpenMail + MailBoxAction, MailSend, SaveSign, // TODO SaveBook, // TODO Companion, // TODO: OpenInv, TalentExp RoleGet, // TODO InputDevice, - ScreenSize; // TODO - - - + ScreenSize } diff --git a/src/main/java/kamkeel/npcs/network/packets/player/ScreenSizePacket.java b/src/main/java/kamkeel/npcs/network/packets/player/ScreenSizePacket.java new file mode 100644 index 000000000..83beebcd9 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/player/ScreenSizePacket.java @@ -0,0 +1,49 @@ +package kamkeel.npcs.network.packets.player; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumPlayerPacket; +import net.minecraft.entity.player.EntityPlayer; +import noppes.npcs.controllers.PlayerDataController; + +import java.io.IOException; + +public class ScreenSizePacket extends AbstractPacket { + public static final String packetName = "Player|ScreenSize"; + private int width, height; + + public ScreenSizePacket() { + } + + public ScreenSizePacket(int width, int height){ + this.width = width; + this.height = height; + } + + @Override + public Enum getType() { + return EnumPlayerPacket.ScreenSize; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.PLAYER_PACKET; + } + + @Override + @SideOnly(Side.CLIENT) + public void sendData(ByteBuf out) throws IOException { + out.writeInt(width); + out.writeInt(height); + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + int width = in.readInt(), height = in.readInt(); + PlayerDataController.Instance.getPlayerData(player).screenSize.setSize(width,height); + } +} diff --git a/src/main/java/noppes/npcs/PacketHandlerPlayer.java b/src/main/java/noppes/npcs/PacketHandlerPlayer.java index c47d72239..598074e20 100644 --- a/src/main/java/noppes/npcs/PacketHandlerPlayer.java +++ b/src/main/java/noppes/npcs/PacketHandlerPlayer.java @@ -319,9 +319,9 @@ public class PacketHandlerPlayer{ } } } - else if(type == EnumPlayerPacket.ScreenSize){ - int width = buffer.readInt(), height = buffer.readInt(); - PlayerDataController.Instance.getPlayerData(player).screenSize.setSize(width,height); - } +// else if(type == EnumPlayerPacket.ScreenSize){ +// int width = buffer.readInt(), height = buffer.readInt(); +// PlayerDataController.Instance.getPlayerData(player).screenSize.setSize(width,height); +// } } } diff --git a/src/main/java/noppes/npcs/client/ClientTickHandler.java b/src/main/java/noppes/npcs/client/ClientTickHandler.java index 234fd2dcc..812b3f29f 100644 --- a/src/main/java/noppes/npcs/client/ClientTickHandler.java +++ b/src/main/java/noppes/npcs/client/ClientTickHandler.java @@ -6,7 +6,9 @@ import cpw.mods.fml.common.gameevent.InputEvent; import cpw.mods.fml.common.gameevent.TickEvent; import cpw.mods.fml.common.gameevent.TickEvent.Phase; import kamkeel.npcs.addon.client.DBCClient; +import kamkeel.npcs.network.PacketClient; import kamkeel.npcs.network.packets.player.InputDevicePacket; +import kamkeel.npcs.network.packets.player.ScreenSizePacket; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.inventory.ContainerPlayer; @@ -72,7 +74,7 @@ public class ClientTickHandler{ if(Minecraft.getMinecraft().thePlayer!=null && (prevWidth!=mc.displayWidth || prevHeight!=mc.displayHeight)){ prevWidth = mc.displayWidth; prevHeight = mc.displayHeight; - NoppesUtilPlayer.sendData(EnumPlayerPacket.ScreenSize,mc.displayWidth,mc.displayHeight); + PacketClient.sendClient(new ScreenSizePacket(mc.displayWidth,mc.displayHeight)); } } diff --git a/src/main/java/noppes/npcs/constants/EnumPlayerPacket.java b/src/main/java/noppes/npcs/constants/EnumPlayerPacket.java index f277ddbc4..e8e68e455 100644 --- a/src/main/java/noppes/npcs/constants/EnumPlayerPacket.java +++ b/src/main/java/noppes/npcs/constants/EnumPlayerPacket.java @@ -14,7 +14,7 @@ public enum EnumPlayerPacket { // BankSlotOpen, FactionsGet, // MailGet, - MailDelete, +// MailDelete, // MailSend, // MailRead, // MailboxOpenMail, @@ -25,5 +25,5 @@ public enum EnumPlayerPacket { // KeyPressed, // MouseClicked, CompanionTalentExp, - ScreenSize +// ScreenSize }