Send Magic Info Packets

src/main/java/kamkeel/npcs/network/packets/request/magic/MagicCycleRemovePacket.java

@@ -8,6 +8,7 @@ import kamkeel.npcs.network.PacketChannel;
 import kamkeel.npcs.network.PacketHandler;
 import kamkeel.npcs.network.enums.EnumRequestPacket;
 import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.NoppesUtilServer;
 import noppes.npcs.controllers.MagicController;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
@@ -53,5 +54,8 @@ public class MagicCycleRemovePacket extends AbstractPacket {
 
         int id = in.readInt();
         MagicController.getInstance().removeCycle(id);
+
+        NoppesUtilServer.sendMagicInfo((EntityPlayerMP) player, true);
+        NoppesUtilServer.sendMagicInfo((EntityPlayerMP) player, false);
     }
 }

src/main/java/kamkeel/npcs/network/packets/request/magic/MagicCycleSavePacket.java

@@ -9,6 +9,7 @@ import kamkeel.npcs.network.PacketHandler;
 import kamkeel.npcs.network.enums.EnumRequestPacket;
 import kamkeel.npcs.util.ByteBufUtils;
 import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.NoppesUtilServer;
 import noppes.npcs.controllers.MagicController;
 import noppes.npcs.controllers.data.MagicCycle;
 import net.minecraft.entity.player.EntityPlayer;
@@ -57,5 +58,8 @@ public class MagicCycleSavePacket extends AbstractPacket {
         MagicCycle cycle = new MagicCycle();
         cycle.readNBT(comp);
         MagicController.getInstance().saveCycle(cycle);
+
+        NoppesUtilServer.sendMagicInfo((EntityPlayerMP) player, true);
+        NoppesUtilServer.sendMagicInfo((EntityPlayerMP) player, false);
     }
 }

src/main/java/kamkeel/npcs/network/packets/request/magic/MagicGetAllPacket.java

@@ -8,6 +8,7 @@ import kamkeel.npcs.network.PacketChannel;
 import kamkeel.npcs.network.PacketHandler;
 import kamkeel.npcs.network.enums.EnumRequestPacket;
 import kamkeel.npcs.network.packets.data.large.GuiDataPacket;
+import noppes.npcs.NoppesUtilServer;
 import noppes.npcs.controllers.MagicController;
 import noppes.npcs.controllers.data.Magic;
 import noppes.npcs.controllers.data.MagicCycle;
@@ -20,7 +21,7 @@ public class MagicGetAllPacket extends AbstractPacket {
 
     public static String packetName = "Request|MagicGetAll";
 
-    public MagicGetAllPacket() { }
+    public MagicGetAllPacket(){}
 
     @Override
     public Enum getType() {
@@ -41,18 +42,7 @@ public class MagicGetAllPacket extends AbstractPacket {
         if (!(player instanceof EntityPlayerMP))
             return;
 
-        NBTTagCompound compound = new NBTTagCompound();
-        StringBuilder cycleNames = new StringBuilder();
-        for (MagicCycle cycle : MagicController.getInstance().cycles.values()) {
-            cycleNames.append(cycle.name).append(",");
-        }
-        compound.setString("CycleNames", cycleNames.toString());
-        // Build comma-separated list of magic names.
-        StringBuilder magicNames = new StringBuilder();
-        for (Magic magic : MagicController.getInstance().magics.values()) {
-            magicNames.append(magic.name).append(",");
-        }
-        compound.setString("MagicNames", magicNames.toString());
-        GuiDataPacket.sendGuiData((EntityPlayerMP) player, compound);
+        NoppesUtilServer.sendMagicInfo((EntityPlayerMP) player, true);
+        NoppesUtilServer.sendMagicInfo((EntityPlayerMP) player, false);
     }
 }

src/main/java/kamkeel/npcs/network/packets/request/magic/MagicRemovePacket.java

@@ -8,6 +8,7 @@ import kamkeel.npcs.network.PacketChannel;
 import kamkeel.npcs.network.PacketHandler;
 import kamkeel.npcs.network.enums.EnumRequestPacket;
 import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.NoppesUtilServer;
 import noppes.npcs.controllers.MagicController;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
@@ -53,5 +54,8 @@ public class MagicRemovePacket extends AbstractPacket {
 
         int id = in.readInt();
         MagicController.getInstance().removeMagic(id);
+
+        NoppesUtilServer.sendMagicInfo((EntityPlayerMP) player, true);
+        NoppesUtilServer.sendMagicInfo((EntityPlayerMP) player, false);
     }
 }

src/main/java/kamkeel/npcs/network/packets/request/magic/MagicSavePacket.java

@@ -9,6 +9,7 @@ import kamkeel.npcs.network.PacketHandler;
 import kamkeel.npcs.network.enums.EnumRequestPacket;
 import kamkeel.npcs.util.ByteBufUtils;
 import noppes.npcs.CustomNpcsPermissions;
+import noppes.npcs.NoppesUtilServer;
 import noppes.npcs.controllers.MagicController;
 import noppes.npcs.controllers.data.Magic;
 import net.minecraft.entity.player.EntityPlayer;
@@ -58,5 +59,8 @@ public class MagicSavePacket extends AbstractPacket {
         Magic magic = new Magic();
         magic.readNBT(comp);
         MagicController.getInstance().saveMagic(magic);
+
+        NoppesUtilServer.sendMagicInfo((EntityPlayerMP) player, true);
+        NoppesUtilServer.sendMagicInfo((EntityPlayerMP) player, false);
     }
 }

src/main/java/noppes/npcs/NoppesUtilServer.java

@@ -712,6 +712,21 @@ public class NoppesUtilServer {
 		}
 	}
 
+    public static void sendMagicInfo(EntityPlayerMP player, boolean cycles) {
+        HashMap<String,Integer> map = new HashMap<String,Integer>();
+        if(cycles){
+            for(Magic magic : MagicController.getInstance().magics.values()){
+                map.put(magic.name, magic.id);
+            }
+            sendScrollData(player, map, EnumScrollData.MAGIC);
+        } else {
+            for(MagicCycle magicCycle : MagicController.getInstance().cycles.values()){
+                map.put(magicCycle.name, magicCycle.id);
+            }
+            sendScrollData(player, map, EnumScrollData.MAGIC_CYCLES);
+        }
+    }
+
 	public static DialogOption setNpcDialog(int slot, int dialogId, EntityPlayer player) throws IOException {
 		return setNpcDialog(slot, dialogId, getEditingNpc(player));
 	}