From 05f43b228ae0de5bd33ccd303ebbadfaaa464bc7 Mon Sep 17 00:00:00 2001 From: OnyxDarkKnight Date: Thu, 23 Apr 2015 18:08:44 +0100 Subject: Added new curses! --- .../network/PacketRequestPlayerInfo.java | 2 +- .../network/PacketSendClientPlayerInfo.java | 58 ++++++++++++++++++ .../jewelrycraft/network/PacketSendCurseStats.java | 71 ---------------------- .../jewelrycraft/network/PacketSendPlayerInfo.java | 58 ------------------ .../network/PacketSendServerPlayersInfo.java | 70 +++++++++++++++++++++ 5 files changed, 129 insertions(+), 130 deletions(-) create mode 100644 src/main/java/darkknight/jewelrycraft/network/PacketSendClientPlayerInfo.java delete mode 100644 src/main/java/darkknight/jewelrycraft/network/PacketSendCurseStats.java delete mode 100644 src/main/java/darkknight/jewelrycraft/network/PacketSendPlayerInfo.java create mode 100644 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/PacketRequestPlayerInfo.java b/src/main/java/darkknight/jewelrycraft/network/PacketRequestPlayerInfo.java index e6c7b40..0e48968 100644 --- a/src/main/java/darkknight/jewelrycraft/network/PacketRequestPlayerInfo.java +++ b/src/main/java/darkknight/jewelrycraft/network/PacketRequestPlayerInfo.java @@ -24,7 +24,7 @@ public class PacketRequestPlayerInfo 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/PacketSendCurseStats.java b/src/main/java/darkknight/jewelrycraft/network/PacketSendCurseStats.java deleted file mode 100644 index 0559f17..0000000 --- a/src/main/java/darkknight/jewelrycraft/network/PacketSendCurseStats.java +++ /dev/null @@ -1,71 +0,0 @@ -/** - * - */ -package darkknight.jewelrycraft.network; - -import java.util.Iterator; -import java.util.List; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.server.MinecraftServer; -import io.netty.buffer.ByteBuf; -import cpw.mods.fml.common.network.ByteBufUtils; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import darkknight.jewelrycraft.events.PlayerRenderHandler; -import darkknight.jewelrycraft.util.PlayerUtils; -import darkknight.jewelrycraft.util.Variables; - -/** - * @author Sorin - * - */ -public class PacketSendCurseStats implements IMessage, IMessageHandler -{ - public PacketSendCurseStats() - { - - } - - /** - * @param message - * @param ctx - * @return - */ - @Override - public IMessage onMessage(PacketSendCurseStats message, MessageContext ctx) - { - return null; - } - - /** - * @param buf - */ - @Override - public void fromBytes(ByteBuf buf) - { - String temp = ByteBufUtils.readUTF8String(buf); - if (temp != "") - PlayerRenderHandler.infamyCache = temp.split(";"); - else - PlayerRenderHandler.infamyCache = new String[] { }; - } - - /** - * @param buf - */ - @Override - public void toBytes(ByteBuf buf) - { - Iterator players = MinecraftServer.getServer().getConfigurationManager().playerEntityList.iterator(); - String infamyPlayers = ""; - while (players.hasNext()) - { - EntityPlayer current = players.next(); - if(PlayerUtils.getModPlayerPersistTag(current, Variables.MODID).getInteger(Variables.MODNAME + ":" + "Infamy") > 0) - infamyPlayers = infamyPlayers + (infamyPlayers == "" ? "" : ";") + current.getDisplayName(); - } - ByteBufUtils.writeUTF8String(buf, infamyPlayers); - } -} diff --git a/src/main/java/darkknight/jewelrycraft/network/PacketSendPlayerInfo.java b/src/main/java/darkknight/jewelrycraft/network/PacketSendPlayerInfo.java deleted file mode 100644 index e2f66a0..0000000 --- a/src/main/java/darkknight/jewelrycraft/network/PacketSendPlayerInfo.java +++ /dev/null @@ -1,58 +0,0 @@ -package darkknight.jewelrycraft.network; - -import io.netty.buffer.ByteBuf; -import net.minecraft.nbt.NBTTagCompound; -import cpw.mods.fml.common.network.ByteBufUtils; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import darkknight.jewelrycraft.events.ScreenHandler; - -public class PacketSendPlayerInfo implements IMessage, IMessageHandler -{ - public NBTTagCompound tagCompound; - - /** - * @param tagCompound - */ - public PacketSendPlayerInfo(NBTTagCompound tagCompound) - { - this.tagCompound = tagCompound; - } - - /** - * - */ - public PacketSendPlayerInfo() - {} - - /** - * @param message - * @param ctx - * @return - */ - @Override - public IMessage onMessage(PacketSendPlayerInfo 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/PacketSendServerPlayersInfo.java b/src/main/java/darkknight/jewelrycraft/network/PacketSendServerPlayersInfo.java new file mode 100644 index 0000000..c87bf81 --- /dev/null +++ b/src/main/java/darkknight/jewelrycraft/network/PacketSendServerPlayersInfo.java @@ -0,0 +1,70 @@ +/** + * + */ +package darkknight.jewelrycraft.network; + +import io.netty.buffer.ByteBuf; +import java.util.Iterator; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.server.MinecraftServer; +import cpw.mods.fml.common.network.ByteBufUtils; +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import darkknight.jewelrycraft.events.PlayerRenderHandler; +import darkknight.jewelrycraft.util.PlayerUtils; +import darkknight.jewelrycraft.util.Variables; + +/** + * @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; + } + + /** + * @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(); + String infamyPlayers = ""; + 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