Magic Packet Fixes

This commit is contained in:
Kam committed 2025-03-03 23:03:12 -05:00
1 parent c2fa74c541
commit 4e6d6b7082
13 files changed
+177 -54

No files matched your search

@@ -195,5 +195,11 @@ public enum EnumRequestPacket {
ProfileCreate,
ProfileRemove,
ProfileRename,
MagicCycleRemove, MagicCycleSave, MagicGetAll, MagicRemove, MagicSave, ProfileChange
ProfileChange,
MagicCycleRemove,
MagicCycleSave,
MagicGetAll,
MagicRemove,
MagicSave
}
@@ -7,6 +7,7 @@ import kamkeel.npcs.network.AbstractPacket;
import kamkeel.npcs.network.PacketChannel;
import kamkeel.npcs.network.PacketHandler;
import kamkeel.npcs.network.enums.EnumRequestPacket;
import noppes.npcs.CustomNpcsPermissions;
import noppes.npcs.controllers.MagicController;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
@@ -29,6 +30,11 @@ public class MagicCycleRemovePacket extends AbstractPacket {
return EnumRequestPacket.MagicCycleRemove;
}
@Override
public CustomNpcsPermissions.Permission getPermission() {
return CustomNpcsPermissions.GLOBAL_MAGIC;
}
@Override
public PacketChannel getChannel() {
return PacketHandler.REQUEST_PACKET;
@@ -46,7 +52,6 @@ public class MagicCycleRemovePacket extends AbstractPacket {
return;
int id = in.readInt();
MagicController.getInstance().cycles.remove(id);
MagicController.getInstance().saveMagicData();
MagicController.getInstance().removeCycle(id);
}
}
@@ -8,6 +8,7 @@ import kamkeel.npcs.network.PacketChannel;
import kamkeel.npcs.network.PacketHandler;
import kamkeel.npcs.network.enums.EnumRequestPacket;
import kamkeel.npcs.util.ByteBufUtils;
import noppes.npcs.CustomNpcsPermissions;
import noppes.npcs.controllers.MagicController;
import noppes.npcs.controllers.data.MagicCycle;
import net.minecraft.entity.player.EntityPlayer;
@@ -37,6 +38,11 @@ public class MagicCycleSavePacket extends AbstractPacket {
return PacketHandler.REQUEST_PACKET;
}
@Override
public CustomNpcsPermissions.Permission getPermission() {
return CustomNpcsPermissions.GLOBAL_MAGIC;
}
@SideOnly(Side.CLIENT)
@Override
public void sendData(ByteBuf out) throws IOException {
@@ -50,7 +56,6 @@ public class MagicCycleSavePacket extends AbstractPacket {
NBTTagCompound comp = ByteBufUtils.readNBT(in);
MagicCycle cycle = new MagicCycle();
cycle.readNBT(comp);
MagicController.getInstance().cycles.put(cycle.id, cycle);
MagicController.getInstance().saveMagicData();
MagicController.getInstance().saveCycle(cycle);
}
}
@@ -44,7 +44,7 @@ public class MagicGetAllPacket extends AbstractPacket {
NBTTagCompound compound = new NBTTagCompound();
StringBuilder cycleNames = new StringBuilder();
for (MagicCycle cycle : MagicController.getInstance().cycles.values()) {
cycleNames.append(cycle.title).append(",");
cycleNames.append(cycle.name).append(",");
}
compound.setString("CycleNames", cycleNames.toString());
// Build comma-separated list of magic names.
@@ -7,6 +7,7 @@ import kamkeel.npcs.network.AbstractPacket;
import kamkeel.npcs.network.PacketChannel;
import kamkeel.npcs.network.PacketHandler;
import kamkeel.npcs.network.enums.EnumRequestPacket;
import noppes.npcs.CustomNpcsPermissions;
import noppes.npcs.controllers.MagicController;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
@@ -34,6 +35,11 @@ public class MagicRemovePacket extends AbstractPacket {
return PacketHandler.REQUEST_PACKET;
}
@Override
public CustomNpcsPermissions.Permission getPermission() {
return CustomNpcsPermissions.GLOBAL_MAGIC;
}
@SideOnly(Side.CLIENT)
@Override
public void sendData(ByteBuf out) throws IOException {
@@ -46,7 +52,6 @@ public class MagicRemovePacket extends AbstractPacket {
return;
int id = in.readInt();
MagicController.getInstance().magics.remove(id);
MagicController.getInstance().saveMagicData();
MagicController.getInstance().removeMagic(id);
}
}
@@ -8,6 +8,7 @@ import kamkeel.npcs.network.PacketChannel;
import kamkeel.npcs.network.PacketHandler;
import kamkeel.npcs.network.enums.EnumRequestPacket;
import kamkeel.npcs.util.ByteBufUtils;
import noppes.npcs.CustomNpcsPermissions;
import noppes.npcs.controllers.MagicController;
import noppes.npcs.controllers.data.Magic;
import net.minecraft.entity.player.EntityPlayer;
@@ -37,6 +38,11 @@ public class MagicSavePacket extends AbstractPacket {
return PacketHandler.REQUEST_PACKET;
}
@Override
public CustomNpcsPermissions.Permission getPermission() {
return CustomNpcsPermissions.GLOBAL_MAGIC;
}
@SideOnly(Side.CLIENT)
@Override
public void sendData(ByteBuf out) throws IOException {