Added new curses!

3 files changed, 16 insertions, 17 deletions

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<Packet
     @Override
     public IMessage onMessage(PacketRequestPlayerInfo message, MessageContext ctx)
     {
-        return new PacketSendPlayerInfo(PlayerUtils.getModPlayerPersistTag(ctx.getServerHandler().playerEntity, Variables.MODID));
+        return new PacketSendClientPlayerInfo(PlayerUtils.getModPlayerPersistTag(ctx.getServerHandler().playerEntity, Variables.MODID));
     }
     
     /**
diff --git a/src/main/java/darkknight/jewelrycraft/network/PacketSendPlayerInfo.java b/src/main/java/darkknight/jewelrycraft/network/PacketSendClientPlayerInfo.java
index e2f66a0..05567a0 100644
--- a/src/main/java/darkknight/jewelrycraft/network/PacketSendPlayerInfo.java
+++ b/src/main/java/darkknight/jewelrycraft/network/PacketSendClientPlayerInfo.java
@@ -8,14 +8,14 @@ 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<PacketSendPlayerInfo, IMessage>
+public class PacketSendClientPlayerInfo implements IMessage, IMessageHandler<PacketSendClientPlayerInfo, IMessage>
 {
     public NBTTagCompound tagCompound;
     
     /**
      * @param tagCompound
      */
-    public PacketSendPlayerInfo(NBTTagCompound tagCompound)
+    public PacketSendClientPlayerInfo(NBTTagCompound tagCompound)
     {
         this.tagCompound = tagCompound;
     }
@@ -23,7 +23,7 @@ public class PacketSendPlayerInfo implements IMessage, IMessageHandler<PacketSen
     /**
      * 
      */
-    public PacketSendPlayerInfo()
+    public PacketSendClientPlayerInfo()
     {}
     
     /**
@@ -32,7 +32,7 @@ public class PacketSendPlayerInfo implements IMessage, IMessageHandler<PacketSen
      * @return
      */
     @Override
-    public IMessage onMessage(PacketSendPlayerInfo message, MessageContext ctx)
+    public IMessage onMessage(PacketSendClientPlayerInfo message, MessageContext ctx)
     {
         ScreenHandler.tagCache = message.tagCompound;
         return null;
diff --git a/src/main/java/darkknight/jewelrycraft/network/PacketSendCurseStats.java b/src/main/java/darkknight/jewelrycraft/network/PacketSendServerPlayersInfo.java
index 0559f17..c87bf81 100644
--- a/src/main/java/darkknight/jewelrycraft/network/PacketSendCurseStats.java
+++ b/src/main/java/darkknight/jewelrycraft/network/PacketSendServerPlayersInfo.java
@@ -3,12 +3,11 @@
  */
 package darkknight.jewelrycraft.network;
 
+import io.netty.buffer.ByteBuf;
 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;
@@ -21,9 +20,9 @@ import darkknight.jewelrycraft.util.Variables;
  * @author Sorin
  *
  */
-public class PacketSendCurseStats implements IMessage, IMessageHandler<PacketSendCurseStats, IMessage>
+public class PacketSendServerPlayersInfo implements IMessage, IMessageHandler<PacketSendServerPlayersInfo, IMessage>
 {
-    public PacketSendCurseStats() 
+    public PacketSendServerPlayersInfo() 
     {
         
     }
@@ -34,7 +33,7 @@ public class PacketSendCurseStats implements IMessage, IMessageHandler<PacketSen
      * @return
      */
     @Override
-    public IMessage onMessage(PacketSendCurseStats message, MessageContext ctx)
+    public IMessage onMessage(PacketSendServerPlayersInfo message, MessageContext ctx)
     {
         return null;
     }
@@ -45,11 +44,11 @@ public class PacketSendCurseStats implements IMessage, IMessageHandler<PacketSen
     @Override
     public void fromBytes(ByteBuf buf)
     {
-        String temp = ByteBufUtils.readUTF8String(buf);
-        if (temp != "")
-            PlayerRenderHandler.infamyCache = temp.split(";");
+        NBTTagCompound temp = ByteBufUtils.readTag(buf);
+        if (temp != null)
+            PlayerRenderHandler.playersInfo = temp;
         else
-            PlayerRenderHandler.infamyCache = new String[] { };
+            PlayerRenderHandler.playersInfo = new NBTTagCompound();
     }
 
     /**
@@ -60,12 +59,12 @@ public class PacketSendCurseStats implements IMessage, IMessageHandler<PacketSen
     {
         Iterator<EntityPlayer> players = MinecraftServer.getServer().getConfigurationManager().playerEntityList.iterator();
         String infamyPlayers = "";
+        NBTTagCompound nbt = new NBTTagCompound();
         while (players.hasNext())
         {
             EntityPlayer current = players.next();
-            if(PlayerUtils.getModPlayerPersistTag(current, Variables.MODID).getInteger(Variables.MODNAME + ":" + "Infamy") > 0)
-                infamyPlayers = infamyPlayers + (infamyPlayers == "" ? "" : ";") + current.getDisplayName();
+            nbt.setTag(current.getDisplayName(), PlayerUtils.getModPlayerPersistTag(current, Variables.MODID));
         }
-        ByteBufUtils.writeUTF8String(buf, infamyPlayers);
+        ByteBufUtils.writeTag(buf, nbt);
     }
 }