From 4f7ad220df0438b6f3382110577b53f29da46453 Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Thu, 24 May 2018 15:50:07 -0400 Subject: Update of all changes --- .../jewelrycraft/network/PacketHandler.java | 35 +++--- .../jewelrycraft/network/PacketKeyPressEvent.java | 103 +++++++++--------- .../network/PacketRequestPlayerInfo.java | 69 ++++++------ .../jewelrycraft/network/PacketRequestSetSlot.java | 80 +++++++------- .../network/PacketSendClientPlayerInfo.java | 91 ++++++++-------- .../network/PacketSendServerPlayerInfo.java | 119 +++++++++++---------- .../network/PacketSendServerPlayersInfo.java | 87 ++++++++------- 7 files changed, 299 insertions(+), 285 deletions(-) mode change 100644 => 100755 src/main/java/darkknight/jewelrycraft/network/PacketHandler.java mode change 100644 => 100755 src/main/java/darkknight/jewelrycraft/network/PacketKeyPressEvent.java mode change 100644 => 100755 src/main/java/darkknight/jewelrycraft/network/PacketRequestPlayerInfo.java mode change 100644 => 100755 src/main/java/darkknight/jewelrycraft/network/PacketRequestSetSlot.java mode change 100644 => 100755 src/main/java/darkknight/jewelrycraft/network/PacketSendClientPlayerInfo.java mode change 100644 => 100755 src/main/java/darkknight/jewelrycraft/network/PacketSendServerPlayerInfo.java mode change 100644 => 100755 src/main/java/darkknight/jewelrycraft/network/PacketSendServerPlayersInfo.java (limited to 'src/main/java/darkknight/jewelrycraft/network') diff --git a/src/main/java/darkknight/jewelrycraft/network/PacketHandler.java b/src/main/java/darkknight/jewelrycraft/network/PacketHandler.java old mode 100644 new mode 100755 index db24ead..f98c14a --- a/src/main/java/darkknight/jewelrycraft/network/PacketHandler.java +++ b/src/main/java/darkknight/jewelrycraft/network/PacketHandler.java @@ -6,17 +6,28 @@ import cpw.mods.fml.relauncher.Side; import darkknight.jewelrycraft.JewelrycraftMod; import darkknight.jewelrycraft.util.Variables; -public class PacketHandler -{ +public class PacketHandler { - public static void preInit(FMLPreInitializationEvent e) - { - JewelrycraftMod.netWrapper = NetworkRegistry.INSTANCE.newSimpleChannel(Variables.MODID); - JewelrycraftMod.netWrapper.registerMessage(PacketKeyPressEvent.class, PacketKeyPressEvent.class, 3, Side.SERVER); - JewelrycraftMod.netWrapper.registerMessage(PacketRequestPlayerInfo.class, PacketRequestPlayerInfo.class, 4, Side.SERVER); - JewelrycraftMod.netWrapper.registerMessage(PacketSendClientPlayerInfo.class, PacketSendClientPlayerInfo.class, 5, Side.CLIENT); - JewelrycraftMod.netWrapper.registerMessage(PacketSendServerPlayersInfo.class, PacketSendServerPlayersInfo.class, 6, Side.CLIENT); - JewelrycraftMod.netWrapper.registerMessage(PacketRequestSetSlot.class, PacketRequestSetSlot.class, 7, Side.SERVER); - JewelrycraftMod.netWrapper.registerMessage(PacketSendServerPlayerInfo.class, PacketSendServerPlayerInfo.class, 8, Side.SERVER); - } + public static void preInit(FMLPreInitializationEvent e) { + JewelrycraftMod.netWrapper = + NetworkRegistry.INSTANCE.newSimpleChannel(Variables.MODID); + JewelrycraftMod.netWrapper.registerMessage( + PacketKeyPressEvent.class, PacketKeyPressEvent.class, 3, + Side.SERVER); + JewelrycraftMod.netWrapper.registerMessage( + PacketRequestPlayerInfo.class, + PacketRequestPlayerInfo.class, 4, Side.SERVER); + JewelrycraftMod.netWrapper.registerMessage( + PacketSendClientPlayerInfo.class, + PacketSendClientPlayerInfo.class, 5, Side.CLIENT); + JewelrycraftMod.netWrapper.registerMessage( + PacketSendServerPlayersInfo.class, + PacketSendServerPlayersInfo.class, 6, Side.CLIENT); + JewelrycraftMod.netWrapper.registerMessage( + PacketRequestSetSlot.class, PacketRequestSetSlot.class, 7, + Side.SERVER); + JewelrycraftMod.netWrapper.registerMessage( + PacketSendServerPlayerInfo.class, + PacketSendServerPlayerInfo.class, 8, Side.SERVER); + } } diff --git a/src/main/java/darkknight/jewelrycraft/network/PacketKeyPressEvent.java b/src/main/java/darkknight/jewelrycraft/network/PacketKeyPressEvent.java old mode 100644 new mode 100755 index b7ab07d..107ffd8 --- a/src/main/java/darkknight/jewelrycraft/network/PacketKeyPressEvent.java +++ b/src/main/java/darkknight/jewelrycraft/network/PacketKeyPressEvent.java @@ -7,54 +7,57 @@ import darkknight.jewelrycraft.JewelrycraftMod; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayer; -public class PacketKeyPressEvent implements IMessage, IMessageHandler -{ - public int actionID; - - /** - * @param id - */ - public PacketKeyPressEvent(int id) - { - actionID = id; - } - - /** - * - */ - public PacketKeyPressEvent() - {} - - /** - * @param message - * @param ctx - * @return - */ - @Override - public IMessage onMessage(PacketKeyPressEvent message, MessageContext ctx) - { - EntityPlayer sender = ctx.getServerHandler().playerEntity; - // Jewelry inventory - if (message.actionID == 0) sender.openGui(JewelrycraftMod.instance, 2, sender.worldObj, (int)sender.posX, (int)sender.posY, (int)sender.posZ); - if (message.actionID == 1) sender.openGui(JewelrycraftMod.instance, 4, sender.worldObj, (int)sender.posX, (int)sender.posY, (int)sender.posZ); - return null; - } - - /** - * @param buf - */ - @Override - public void fromBytes(ByteBuf buf) - { - actionID = buf.readInt(); - } - - /** - * @param buf - */ - @Override - public void toBytes(ByteBuf buf) - { - buf.writeInt(actionID); - } +public class PacketKeyPressEvent implements IMessage, + IMessageHandler { + public int actionID; + + /** + * @param id + */ + public PacketKeyPressEvent(int id) { + actionID = id; + } + + /** + * + */ + public PacketKeyPressEvent() { + } + + /** + * @param message + * @param ctx + * @return + */ + @Override + public IMessage onMessage(PacketKeyPressEvent message, + MessageContext ctx) { + EntityPlayer sender = ctx.getServerHandler().playerEntity; + // Jewelry inventory + if (message.actionID == 0) + sender.openGui(JewelrycraftMod.instance, 2, sender.worldObj, + (int) sender.posX, (int) sender.posY, + (int) sender.posZ); + if (message.actionID == 1) + sender.openGui(JewelrycraftMod.instance, 4, sender.worldObj, + (int) sender.posX, (int) sender.posY, + (int) sender.posZ); + return null; + } + + /** + * @param buf + */ + @Override + public void fromBytes(ByteBuf buf) { + actionID = buf.readInt(); + } + + /** + * @param buf + */ + @Override + public void toBytes(ByteBuf buf) { + buf.writeInt(actionID); + } } diff --git a/src/main/java/darkknight/jewelrycraft/network/PacketRequestPlayerInfo.java b/src/main/java/darkknight/jewelrycraft/network/PacketRequestPlayerInfo.java old mode 100644 new mode 100755 index f8df419..e3c3564 --- a/src/main/java/darkknight/jewelrycraft/network/PacketRequestPlayerInfo.java +++ b/src/main/java/darkknight/jewelrycraft/network/PacketRequestPlayerInfo.java @@ -7,37 +7,40 @@ import darkknight.jewelrycraft.util.PlayerUtils; import darkknight.jewelrycraft.util.Variables; import io.netty.buffer.ByteBuf; -public class PacketRequestPlayerInfo implements IMessage, IMessageHandler -{ - - /** - * - */ - public PacketRequestPlayerInfo() - {} - - /** - * @param message - * @param ctx - * @return - */ - @Override - public IMessage onMessage(PacketRequestPlayerInfo message, MessageContext ctx) - { - return new PacketSendClientPlayerInfo(PlayerUtils.getModPlayerPersistTag(ctx.getServerHandler().playerEntity, Variables.MODID)); - } - - /** - * @param buf - */ - @Override - public void fromBytes(ByteBuf buf) - {} - - /** - * @param buf - */ - @Override - public void toBytes(ByteBuf buf) - {} +public class PacketRequestPlayerInfo implements IMessage, + IMessageHandler { + + /** + * + */ + public PacketRequestPlayerInfo() { + } + + /** + * @param message + * @param ctx + * @return + */ + @Override + public IMessage onMessage(PacketRequestPlayerInfo message, + MessageContext ctx) { + return new PacketSendClientPlayerInfo( + PlayerUtils.getModPlayerPersistTag( + ctx.getServerHandler().playerEntity, + Variables.MODID)); + } + + /** + * @param buf + */ + @Override + public void fromBytes(ByteBuf buf) { + } + + /** + * @param buf + */ + @Override + public void toBytes(ByteBuf buf) { + } } diff --git a/src/main/java/darkknight/jewelrycraft/network/PacketRequestSetSlot.java b/src/main/java/darkknight/jewelrycraft/network/PacketRequestSetSlot.java old mode 100644 new mode 100755 index d06bfc0..bf6c1aa --- a/src/main/java/darkknight/jewelrycraft/network/PacketRequestSetSlot.java +++ b/src/main/java/darkknight/jewelrycraft/network/PacketRequestSetSlot.java @@ -15,48 +15,46 @@ import net.minecraft.item.ItemStack; * @author Sorin * */ -public class PacketRequestSetSlot implements IMessage, IMessageHandler -{ - ItemStack stack; - - public PacketRequestSetSlot() - {} - - public PacketRequestSetSlot(ItemStack stack) - { - this.stack = stack; - } +public class PacketRequestSetSlot implements IMessage, + IMessageHandler { + ItemStack stack; - /** - * @param message - * @param ctx - * @return - */ - @Override - public IMessage onMessage(PacketRequestSetSlot message, MessageContext ctx) - { - if (ctx.getServerHandler().playerEntity.openContainer instanceof ContainerJewelryModifier) - { - ((ContainerJewelryModifier)ctx.getServerHandler().playerEntity.openContainer).modInv.setInventorySlotContents(36, message.stack); - } - return null; - } + public PacketRequestSetSlot() { + } - /** - * @param buf - */ - @Override - public void fromBytes(ByteBuf buf) - { - stack = ByteBufUtils.readItemStack(buf); - } + public PacketRequestSetSlot(ItemStack stack) { + this.stack = stack; + } - /** - * @param buf - */ - @Override - public void toBytes(ByteBuf buf) - { - ByteBufUtils.writeItemStack(buf, stack); - } + /** + * @param message + * @param ctx + * @return + */ + @Override + public IMessage onMessage(PacketRequestSetSlot message, + MessageContext ctx) { + if (ctx.getServerHandler().playerEntity.openContainer instanceof ContainerJewelryModifier) { + ((ContainerJewelryModifier) ctx + .getServerHandler().playerEntity.openContainer).modInv + .setInventorySlotContents(36, message.stack); + } + return null; + } + + /** + * @param buf + */ + @Override + public void fromBytes(ByteBuf buf) { + stack = ByteBufUtils.readItemStack(buf); + } + + /** + * @param buf + */ + @Override + public void toBytes(ByteBuf buf) { + ByteBufUtils.writeItemStack(buf, stack); + } } diff --git a/src/main/java/darkknight/jewelrycraft/network/PacketSendClientPlayerInfo.java b/src/main/java/darkknight/jewelrycraft/network/PacketSendClientPlayerInfo.java old mode 100644 new mode 100755 index c8bf0aa..21000de --- a/src/main/java/darkknight/jewelrycraft/network/PacketSendClientPlayerInfo.java +++ b/src/main/java/darkknight/jewelrycraft/network/PacketSendClientPlayerInfo.java @@ -8,51 +8,48 @@ import darkknight.jewelrycraft.events.ScreenHandler; import io.netty.buffer.ByteBuf; import net.minecraft.nbt.NBTTagCompound; -public class PacketSendClientPlayerInfo implements IMessage, IMessageHandler -{ - public NBTTagCompound tagCompound; - - /** - * @param tagCompound - */ - public PacketSendClientPlayerInfo(NBTTagCompound tagCompound) - { - this.tagCompound = tagCompound; - } - - /** - * - */ - public PacketSendClientPlayerInfo() - {} - - /** - * @param message - * @param ctx - * @return - */ - @Override - public IMessage onMessage(PacketSendClientPlayerInfo message, MessageContext ctx) - { - ScreenHandler.tagCache = message.tagCompound; - return null; - } - - /** - * @param buf - */ - @Override - public void fromBytes(ByteBuf buf) - { - tagCompound = ByteBufUtils.readTag(buf); - } - - /** - * @param buf - */ - @Override - public void toBytes(ByteBuf buf) - { - ByteBufUtils.writeTag(buf, tagCompound); - } +public class PacketSendClientPlayerInfo implements IMessage, + IMessageHandler { + public NBTTagCompound tagCompound; + + /** + * @param tagCompound + */ + public PacketSendClientPlayerInfo(NBTTagCompound tagCompound) { + this.tagCompound = tagCompound; + } + + /** + * + */ + public PacketSendClientPlayerInfo() { + } + + /** + * @param message + * @param ctx + * @return + */ + @Override + public IMessage onMessage(PacketSendClientPlayerInfo message, + MessageContext ctx) { + ScreenHandler.tagCache = message.tagCompound; + return null; + } + + /** + * @param buf + */ + @Override + public void fromBytes(ByteBuf buf) { + tagCompound = ByteBufUtils.readTag(buf); + } + + /** + * @param buf + */ + @Override + public void toBytes(ByteBuf buf) { + ByteBufUtils.writeTag(buf, tagCompound); + } } diff --git a/src/main/java/darkknight/jewelrycraft/network/PacketSendServerPlayerInfo.java b/src/main/java/darkknight/jewelrycraft/network/PacketSendServerPlayerInfo.java old mode 100644 new mode 100755 index afefb65..da18c17 --- a/src/main/java/darkknight/jewelrycraft/network/PacketSendServerPlayerInfo.java +++ b/src/main/java/darkknight/jewelrycraft/network/PacketSendServerPlayerInfo.java @@ -10,62 +10,65 @@ import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; -public class PacketSendServerPlayerInfo implements IMessage, IMessageHandler -{ - public NBTTagCompound tagCompound; - public String curse, action; - - /** - * @param tagCompound - */ - public PacketSendServerPlayerInfo(String action, String curse, NBTTagCompound tagCompound) - { - this.tagCompound = tagCompound; - this.curse = curse; - this.action = action; - } - - /** - * - */ - public PacketSendServerPlayerInfo() - {} - - /** - * @param message - * @param ctx - * @return - */ - @Override - public IMessage onMessage(PacketSendServerPlayerInfo message, MessageContext ctx) - { - EntityPlayerMP serverPlayer = ctx.getServerHandler().playerEntity; - NBTTagCompound playerInfo = PlayerUtils.getModPlayerPersistTag(serverPlayer, Variables.MODID); - playerInfo.setInteger(message.curse, message.action.equals("remove") ? 0 : 1); - playerInfo.setInteger("activeCurses", message.tagCompound.getInteger("activeCurses")); - System.out.println(message.action + " " + message.curse + " " + message.tagCompound.getInteger(curse) + " " + message.tagCompound.getInteger("activeCurses")); - return null; - } - - /** - * @param buf - */ - @Override - public void fromBytes(ByteBuf buf) - { - tagCompound = ByteBufUtils.readTag(buf); - curse = ByteBufUtils.readUTF8String(buf); - action = ByteBufUtils.readUTF8String(buf); - } - - /** - * @param buf - */ - @Override - public void toBytes(ByteBuf buf) - { - ByteBufUtils.writeTag(buf, tagCompound); - ByteBufUtils.writeUTF8String(buf, curse); - ByteBufUtils.writeUTF8String(buf, action); - } +public class PacketSendServerPlayerInfo implements IMessage, + IMessageHandler { + public NBTTagCompound tagCompound; + public String curse, action; + + /** + * @param tagCompound + */ + public PacketSendServerPlayerInfo(String action, String curse, + NBTTagCompound tagCompound) { + this.tagCompound = tagCompound; + this.curse = curse; + this.action = action; + } + + /** + * + */ + public PacketSendServerPlayerInfo() { + } + + /** + * @param message + * @param ctx + * @return + */ + @Override + public IMessage onMessage(PacketSendServerPlayerInfo message, + MessageContext ctx) { + EntityPlayerMP serverPlayer = ctx.getServerHandler().playerEntity; + NBTTagCompound playerInfo = PlayerUtils + .getModPlayerPersistTag(serverPlayer, Variables.MODID); + playerInfo.setInteger(message.curse, + message.action.equals("remove") ? 0 : 1); + playerInfo.setInteger("activeCurses", + message.tagCompound.getInteger("activeCurses")); + System.out.println(message.action + " " + message.curse + " " + + message.tagCompound.getInteger(curse) + " " + + message.tagCompound.getInteger("activeCurses")); + return null; + } + + /** + * @param buf + */ + @Override + public void fromBytes(ByteBuf buf) { + tagCompound = ByteBufUtils.readTag(buf); + curse = ByteBufUtils.readUTF8String(buf); + action = ByteBufUtils.readUTF8String(buf); + } + + /** + * @param buf + */ + @Override + public void toBytes(ByteBuf buf) { + ByteBufUtils.writeTag(buf, tagCompound); + ByteBufUtils.writeUTF8String(buf, curse); + ByteBufUtils.writeUTF8String(buf, action); + } } diff --git a/src/main/java/darkknight/jewelrycraft/network/PacketSendServerPlayersInfo.java b/src/main/java/darkknight/jewelrycraft/network/PacketSendServerPlayersInfo.java old mode 100644 new mode 100755 index bcf58ea..1785741 --- a/src/main/java/darkknight/jewelrycraft/network/PacketSendServerPlayersInfo.java +++ b/src/main/java/darkknight/jewelrycraft/network/PacketSendServerPlayersInfo.java @@ -4,6 +4,7 @@ package darkknight.jewelrycraft.network; import java.util.Iterator; + import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; @@ -20,50 +21,48 @@ import net.minecraft.server.MinecraftServer; * @author Sorin * */ -public class PacketSendServerPlayersInfo implements IMessage, IMessageHandler -{ - public PacketSendServerPlayersInfo() - { - - } - - /** - * @param message - * @param ctx - * @return - */ - @Override - public IMessage onMessage(PacketSendServerPlayersInfo message, MessageContext ctx) - { - return null; - } +public class PacketSendServerPlayersInfo implements IMessage, + IMessageHandler { + public PacketSendServerPlayersInfo() { + + } + + /** + * @param message + * @param ctx + * @return + */ + @Override + public IMessage onMessage(PacketSendServerPlayersInfo message, + MessageContext ctx) { + return null; + } - /** - * @param buf - */ - @Override - public void fromBytes(ByteBuf buf) - { - NBTTagCompound temp = ByteBufUtils.readTag(buf); - if (temp != null) - PlayerRenderHandler.playersInfo = temp; - else - PlayerRenderHandler.playersInfo = new NBTTagCompound(); - } + /** + * @param buf + */ + @Override + public void fromBytes(ByteBuf buf) { + NBTTagCompound temp = ByteBufUtils.readTag(buf); + if (temp != null) + PlayerRenderHandler.playersInfo = temp; + else + PlayerRenderHandler.playersInfo = new NBTTagCompound(); + } - /** - * @param buf - */ - @Override - public void toBytes(ByteBuf buf) - { - Iterator players = MinecraftServer.getServer().getConfigurationManager().playerEntityList.iterator(); - NBTTagCompound nbt = new NBTTagCompound(); - while (players.hasNext()) - { - EntityPlayer current = players.next(); - nbt.setTag(current.getDisplayName(), PlayerUtils.getModPlayerPersistTag(current, Variables.MODID)); - } - ByteBufUtils.writeTag(buf, nbt); - } + /** + * @param buf + */ + @Override + public void toBytes(ByteBuf buf) { + Iterator players = MinecraftServer.getServer() + .getConfigurationManager().playerEntityList.iterator(); + NBTTagCompound nbt = new NBTTagCompound(); + while (players.hasNext()) { + EntityPlayer current = players.next(); + nbt.setTag(current.getDisplayName(), PlayerUtils + .getModPlayerPersistTag(current, Variables.MODID)); + } + ByteBufUtils.writeTag(buf, nbt); + } } -- cgit v1.2.3