diff --git a/src/main/java/kamkeel/npcs/network/PacketHandler.java b/src/main/java/kamkeel/npcs/network/PacketHandler.java index 6425de62d..7c62a1747 100644 --- a/src/main/java/kamkeel/npcs/network/PacketHandler.java +++ b/src/main/java/kamkeel/npcs/network/PacketHandler.java @@ -5,6 +5,7 @@ import cpw.mods.fml.common.network.FMLEventChannel; import cpw.mods.fml.common.network.FMLNetworkEvent; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.network.internal.FMLProxyPacket; +import cpw.mods.fml.relauncher.Side; import io.netty.buffer.ByteBuf; import kamkeel.npcs.network.enums.EnumChannelType; import kamkeel.npcs.network.enums.EnumRequestPacket; @@ -130,15 +131,15 @@ public final class PacketHandler { @SubscribeEvent public void onServerPacket(FMLNetworkEvent.ServerCustomPacketEvent event) { - handlePacket(event.packet, ((NetHandlerPlayServer) event.handler).playerEntity); + handlePacket(event.packet, ((NetHandlerPlayServer) event.handler).playerEntity, Side.SERVER); } @SubscribeEvent public void onClientPacket(FMLNetworkEvent.ClientCustomPacketEvent event) { - handlePacket(event.packet, CustomNpcs.proxy.getPlayer()); + handlePacket(event.packet, CustomNpcs.proxy.getPlayer(), Side.CLIENT); } - private void handlePacket(FMLProxyPacket packet, EntityPlayer player) { + private void handlePacket(FMLProxyPacket packet, EntityPlayer player, Side side) { ByteBuf buf = packet.payload(); try { int packetTypeOrdinal = buf.readInt(); @@ -157,16 +158,17 @@ public final class PacketHandler { return; } - // Check if permission is allowed - if(abstractPacket.getPermission() != null && !CustomNpcsPermissions.hasPermission(player, abstractPacket.getPermission())){ - return; - } - - // Check for required NPC - if(abstractPacket.needsNPC()){ - EntityNPCInterface npc = NoppesUtilServer.getEditingNpc(player); - if(npc == null) + if(side == Side.SERVER){ + // Check if permission is allowed + if(abstractPacket.getPermission() != null && !CustomNpcsPermissions.hasPermission(player, abstractPacket.getPermission())){ return; + } + + // Check for required NPC + EntityNPCInterface npc = NoppesUtilServer.getEditingNpc(player); + if(abstractPacket.needsNPC() && npc == null){ + return; + } abstractPacket.setNPC(npc); } diff --git a/src/main/java/kamkeel/npcs/network/PacketUtil.java b/src/main/java/kamkeel/npcs/network/PacketUtil.java index 86823f7fd..ae4d6f026 100644 --- a/src/main/java/kamkeel/npcs/network/PacketUtil.java +++ b/src/main/java/kamkeel/npcs/network/PacketUtil.java @@ -1,6 +1,69 @@ package kamkeel.npcs.network; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import noppes.npcs.CustomItems; +import noppes.npcs.LogWriter; + public class PacketUtil { + public static boolean verifyItemPacket(EnumItemPacketType type, EntityPlayer player){ + if(player == null) + return false; + ItemStack item = player.inventory.getCurrentItem(); + if(item == null){ + LogWriter.error(String.format("%s attempted to utilize a %s Packet without an item, they could be a hacker", player.getCommandSenderName(), type.toString())); + return false; + } + + switch (type){ + case WAND: + if(item.getItem() != CustomItems.wand){ + LogWriter.error(String.format("%s attempted to utilize a %s Packet without a Wand, they could be a hacker", player.getCommandSenderName(), type.toString())); + return false; + } + break; + case MOUNTER: + if(item.getItem() != CustomItems.mount){ + LogWriter.error(String.format("%s attempted to utilize a %s Packet without a Mounter, they could be a hacker", player.getCommandSenderName(), type.toString())); + return false; + } + break; + case CLONER: + if(item.getItem() != CustomItems.cloner){ + LogWriter.error(String.format("%s attempted to utilize a %s Packet without a Cloner, they could be a hacker", player.getCommandSenderName(), type.toString())); + return false; + } + break; + case TELEPORTER: + if(item.getItem() != CustomItems.teleporter){ + LogWriter.error(String.format("%s attempted to utilize a %s Packet without a Teleporter, they could be a hacker", player.getCommandSenderName(), type.toString())); + return false; + } + break; + case SCRIPTER: + if(item.getItem() != CustomItems.scripter){ + LogWriter.error(String.format("%s attempted to utilize a %s Packet without a Scripter, they could be a hacker", player.getCommandSenderName(), type.toString())); + return false; + } + break; + case PATHER: + if(item.getItem() != CustomItems.moving){ + LogWriter.error(String.format("%s attempted to utilize a %s Packet without a Pather, they could be a hacker", player.getCommandSenderName(), type.toString())); + return false; + } + break; + case BLOCK: + if(item.getItem() == Item.getItemFromBlock(CustomItems.waypoint) || item.getItem() == Item.getItemFromBlock(CustomItems.border) || item.getItem() == Item.getItemFromBlock(CustomItems.redstoneBlock)){ + LogWriter.error(String.format("%s attempted to utilize a %s Packet without a valid Block, they could be a hacker", player.getCommandSenderName(), type.toString())); + return false; + } + break; + } + + return true; + } } diff --git a/src/main/java/kamkeel/npcs/network/enums/EnumItemPacketType.java b/src/main/java/kamkeel/npcs/network/enums/EnumItemPacketType.java new file mode 100644 index 000000000..8c1513966 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/enums/EnumItemPacketType.java @@ -0,0 +1,11 @@ +package kamkeel.npcs.network.enums; + +public enum EnumItemPacketType { + WAND, + MOUNTER, + CLONER, + TELEPORTER, + SCRIPTER, + PATHER, + BLOCK +} diff --git a/src/main/java/kamkeel/npcs/network/enums/EnumRequestPacket.java b/src/main/java/kamkeel/npcs/network/enums/EnumRequestPacket.java index 087e35190..bb40e8d83 100644 --- a/src/main/java/kamkeel/npcs/network/enums/EnumRequestPacket.java +++ b/src/main/java/kamkeel/npcs/network/enums/EnumRequestPacket.java @@ -1,9 +1,9 @@ package kamkeel.npcs.network.enums; public enum EnumRequestPacket { - Delete, + NPCDelete, RemoteMainMenu, RemoteGlobalMenu, - NpcMenuClose, + NpcClose, RemoteDelete, RemoteFreeze, RemoteFreezeGet, @@ -109,18 +109,17 @@ public enum EnumRequestPacket { CustomGuiUnfocused, PartyLogToServer, - SavePartyData, - CreateParty, - GetPartyData, - DisbandParty, - KickPlayer, - LeavePlayer, + PartySave, + PartyInfo, + PartyDisband, + PartyKick, + PartyLeave, PartyInvite, - GetPartyInviteList, - AcceptInvite, - IgnoreInvite, - SetPartyLeader, - SetPartyQuest, + PartyInviteList, + PartyAcceptInvite, + PartyIgnoreInvite, + PartySetLeader, + PartySetQuest, - ServerUpdateSkinOverlays + LinkedRemove, LinkedAdd, LinkedGetAll, LinkedSet, BankGet, BanksGet, BankSave, BankRemove, QuestCategoryGet, PlayerDataGet, PlayerDataRemove, PlayerDataMapRegen, JobSave, JobGet, JobSpawnerAdd, RoleCompanionUpdate, JobSpawnerRemove, RoleSave, RoleGet, MailOpenSetup, TransformSave, TransformGet, TransformLoad, TraderMarketSave, ServerUpdateSkinOverlays } diff --git a/src/main/java/kamkeel/npcs/network/packets/data/AchievementPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/AchievementPacket.java index e089bce5d..88f1b0b7e 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/AchievementPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/AchievementPacket.java @@ -29,7 +29,8 @@ public final class AchievementPacket extends AbstractPacket { private String description; private String message; - public AchievementPacket() {} + public AchievementPacket() { + } public AchievementPacket(boolean isParty, String description, String message) { this.isParty = isParty; @@ -37,7 +38,7 @@ public final class AchievementPacket extends AbstractPacket { this.message = message; } - public static void sendAchievement(EntityPlayerMP playerMP, boolean isParty, String description, String message){ + public static void sendAchievement(EntityPlayerMP playerMP, boolean isParty, String description, String message) { AchievementPacket packet = new AchievementPacket(isParty, description, message); PacketHandler.Instance.sendToPlayer(packet, playerMP); } @@ -62,7 +63,7 @@ public final class AchievementPacket extends AbstractPacket { @SideOnly(Side.CLIENT) @Override public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { - if(!ConfigClient.BannerAlerts) + if (!ConfigClient.BannerAlerts) return; boolean isNotParty = !in.readBoolean(); diff --git a/src/main/java/kamkeel/npcs/network/packets/data/ChatAlertPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/ChatAlertPacket.java index 7a54ab92e..b57661e90 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/ChatAlertPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/ChatAlertPacket.java @@ -20,13 +20,14 @@ public final class ChatAlertPacket extends AbstractPacket { private Object[] objects; - public ChatAlertPacket() {} + public ChatAlertPacket() { + } public ChatAlertPacket(final Object... obs) { this.objects = obs; } - public static void sendChatAlert(EntityPlayerMP playerMP, final Object... obs){ + public static void sendChatAlert(EntityPlayerMP playerMP, final Object... obs) { ChatAlertPacket packet = new ChatAlertPacket(obs); PacketHandler.Instance.sendToPlayer(packet, playerMP); } @@ -49,7 +50,7 @@ public final class ChatAlertPacket extends AbstractPacket { @SideOnly(Side.CLIENT) @Override public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { - if(!ConfigClient.ChatAlerts) + if (!ConfigClient.ChatAlerts) return; StringBuilder message = new StringBuilder(); diff --git a/src/main/java/kamkeel/npcs/network/packets/data/ChatBubblePacket.java b/src/main/java/kamkeel/npcs/network/packets/data/ChatBubblePacket.java index eaf0c0d56..1d9892252 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/ChatBubblePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/ChatBubblePacket.java @@ -25,7 +25,8 @@ public final class ChatBubblePacket extends AbstractPacket { private String text; private boolean hideText; - public ChatBubblePacket() {} + public ChatBubblePacket() { + } public ChatBubblePacket(int entityId, String text, boolean hideText) { this.entityId = entityId; @@ -54,16 +55,16 @@ public final class ChatBubblePacket extends AbstractPacket { @Override public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { Entity entity = Minecraft.getMinecraft().theWorld.getEntityByID(in.readInt()); - if(!(entity instanceof EntityNPCInterface)) + if (!(entity instanceof EntityNPCInterface)) return; EntityNPCInterface npc = (EntityNPCInterface) entity; - if(npc.messages == null) + if (npc.messages == null) npc.messages = new RenderChatMessages(); String text = NoppesStringUtils.formatText(ByteBufUtils.readString(in), player, npc); npc.messages.addMessage(text, npc); - if(in.readBoolean()) + if (in.readBoolean()) player.addChatMessage(new ChatComponentTranslation(npc.getCommandSenderName() + ": " + text)); } } diff --git a/src/main/java/kamkeel/npcs/network/packets/data/ClonerPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/ClonerPacket.java index 9c9472957..594ea2bcb 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/ClonerPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/ClonerPacket.java @@ -21,9 +21,10 @@ public final class ClonerPacket extends LargeAbstractPacket { private NBTTagCompound compound; - public ClonerPacket() {} + public ClonerPacket() { + } - public ClonerPacket(NBTTagCompound comp){ + public ClonerPacket(NBTTagCompound comp) { this.compound = comp; } diff --git a/src/main/java/kamkeel/npcs/network/packets/data/ConfigCommandPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/ConfigCommandPacket.java index 057549c60..c4e5b1e2a 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/ConfigCommandPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/ConfigCommandPacket.java @@ -6,14 +6,14 @@ import io.netty.buffer.ByteBuf; import kamkeel.npcs.network.AbstractPacket; import kamkeel.npcs.network.PacketChannel; import kamkeel.npcs.network.PacketHandler; -import kamkeel.npcs.network.enums.EnumDataPacket; import kamkeel.npcs.network.enums.EnumConfigOperation; +import kamkeel.npcs.network.enums.EnumDataPacket; import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.entity.player.EntityPlayer; -import noppes.npcs.client.ClientProxy; -import noppes.npcs.config.ConfigClient; -import noppes.npcs.client.ClientProxy.FontContainer; import net.minecraft.util.ChatComponentTranslation; +import noppes.npcs.client.ClientProxy; +import noppes.npcs.client.ClientProxy.FontContainer; +import noppes.npcs.config.ConfigClient; import java.io.IOException; @@ -23,7 +23,8 @@ public final class ConfigCommandPacket extends AbstractPacket { private EnumConfigOperation configOperation; private Object[] objects; - public ConfigCommandPacket() {} + public ConfigCommandPacket() { + } public ConfigCommandPacket(EnumConfigOperation operation, Object... obs) { this.configOperation = operation; diff --git a/src/main/java/kamkeel/npcs/network/packets/data/DisableMouseInputPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/DisableMouseInputPacket.java index 64141be58..290cdf609 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/DisableMouseInputPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/DisableMouseInputPacket.java @@ -19,7 +19,8 @@ public final class DisableMouseInputPacket extends AbstractPacket { private long duration; private String keys; - public DisableMouseInputPacket() {} + public DisableMouseInputPacket() { + } public DisableMouseInputPacket(long duration, String keys) { this.duration = duration; diff --git a/src/main/java/kamkeel/npcs/network/packets/data/LoginPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/LoginPacket.java index ac1c9b049..385b8fda4 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/LoginPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/LoginPacket.java @@ -13,7 +13,8 @@ import java.io.IOException; public final class LoginPacket extends AbstractPacket { public static final String packetName = "CNPC+|Login"; - public LoginPacket() {} + public LoginPacket() { + } @Override diff --git a/src/main/java/kamkeel/npcs/network/packets/data/MarkDataPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/MarkDataPacket.java index ff6f029c2..8fa4265bc 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/MarkDataPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/MarkDataPacket.java @@ -22,7 +22,8 @@ public final class MarkDataPacket extends AbstractPacket { private int entityID; private NBTTagCompound compound; - public MarkDataPacket() {} + public MarkDataPacket() { + } public MarkDataPacket(int entityID, NBTTagCompound compound) { this.entityID = entityID; diff --git a/src/main/java/kamkeel/npcs/network/packets/data/OverlayQuestTrackingPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/OverlayQuestTrackingPacket.java index b37886ac8..f31baf305 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/OverlayQuestTrackingPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/OverlayQuestTrackingPacket.java @@ -11,8 +11,8 @@ import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; -import noppes.npcs.client.gui.OverlayQuestTracking; import noppes.npcs.client.ClientCacheHandler; +import noppes.npcs.client.gui.OverlayQuestTracking; import java.io.IOException; @@ -21,7 +21,8 @@ public final class OverlayQuestTrackingPacket extends AbstractPacket { private NBTTagCompound compound; - public OverlayQuestTrackingPacket() {} + public OverlayQuestTrackingPacket() { + } public OverlayQuestTrackingPacket(NBTTagCompound compound) { this.compound = compound; diff --git a/src/main/java/kamkeel/npcs/network/packets/data/ParticlePacket.java b/src/main/java/kamkeel/npcs/network/packets/data/ParticlePacket.java index dc0c5d7e2..f2b018dc7 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/ParticlePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/ParticlePacket.java @@ -28,7 +28,8 @@ public final class ParticlePacket extends AbstractPacket { private String particle; - public ParticlePacket() {} + public ParticlePacket() { + } public ParticlePacket(double x, double y, double z, float height, float width, float yOffset, String particle) { this.x = x; @@ -70,7 +71,7 @@ public final class ParticlePacket extends AbstractPacket { } @SideOnly(Side.CLIENT) - public static void spawnParticle(ByteBuf buffer) throws IOException{ + public static void spawnParticle(ByteBuf buffer) throws IOException { double posX = buffer.readDouble(); double posY = buffer.readDouble(); double posZ = buffer.readDouble(); @@ -82,11 +83,10 @@ public final class ParticlePacket extends AbstractPacket { World worldObj = Minecraft.getMinecraft().theWorld; Random rand = worldObj.rand; - if(particle.equals("heal")){ - for (int k = 0; k < 6; k++) - { - worldObj.spawnParticle("instantSpell", posX + (rand.nextDouble() - 0.5D) * (double)width, (posY + rand.nextDouble() * (double)height) - (double)yOffset, posZ + (rand.nextDouble() - 0.5D) * (double)width, 0, 0, 0); - worldObj.spawnParticle("spell", posX + (rand.nextDouble() - 0.5D) * (double)width, (posY + rand.nextDouble() * (double)height) - (double)yOffset, posZ + (rand.nextDouble() - 0.5D) * (double)width, 0, 0, 0); + if (particle.equals("heal")) { + for (int k = 0; k < 6; k++) { + worldObj.spawnParticle("instantSpell", posX + (rand.nextDouble() - 0.5D) * (double) width, (posY + rand.nextDouble() * (double) height) - (double) yOffset, posZ + (rand.nextDouble() - 0.5D) * (double) width, 0, 0, 0); + worldObj.spawnParticle("spell", posX + (rand.nextDouble() - 0.5D) * (double) width, (posY + rand.nextDouble() * (double) height) - (double) yOffset, posZ + (rand.nextDouble() - 0.5D) * (double) width, 0, 0, 0); } } } diff --git a/src/main/java/kamkeel/npcs/network/packets/data/PlayerUpdateSkinOverlaysPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/PlayerUpdateSkinOverlaysPacket.java index e46d61b0e..e16d7c06b 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/PlayerUpdateSkinOverlaysPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/PlayerUpdateSkinOverlaysPacket.java @@ -21,7 +21,8 @@ public final class PlayerUpdateSkinOverlaysPacket extends AbstractPacket { private String playerName; private NBTTagCompound compound; - public PlayerUpdateSkinOverlaysPacket() {} + public PlayerUpdateSkinOverlaysPacket() { + } public PlayerUpdateSkinOverlaysPacket(String playerName, NBTTagCompound compound) { this.playerName = playerName; diff --git a/src/main/java/kamkeel/npcs/network/packets/data/QuestCompletionPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/QuestCompletionPacket.java index 55b197205..d4eda9be3 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/QuestCompletionPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/QuestCompletionPacket.java @@ -20,13 +20,14 @@ public final class QuestCompletionPacket extends AbstractPacket { private NBTTagCompound compound; - public QuestCompletionPacket() {} + public QuestCompletionPacket() { + } public QuestCompletionPacket(NBTTagCompound compound) { this.compound = compound; } - public static void sendQuestComplete(EntityPlayerMP playerMP, NBTTagCompound compound){ + public static void sendQuestComplete(EntityPlayerMP playerMP, NBTTagCompound compound) { QuestCompletionPacket packet = new QuestCompletionPacket(compound); PacketHandler.Instance.sendToPlayer(packet, playerMP); } diff --git a/src/main/java/kamkeel/npcs/network/packets/data/ScrollSelectedPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/ScrollSelectedPacket.java index dcdcb8ce1..ff10fe045 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/ScrollSelectedPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/ScrollSelectedPacket.java @@ -21,13 +21,14 @@ public final class ScrollSelectedPacket extends AbstractPacket { private String selected; - public ScrollSelectedPacket() {} + public ScrollSelectedPacket() { + } public ScrollSelectedPacket(String selected) { this.selected = selected; } - public static void setSelectedList(EntityPlayerMP playerMP, String item){ + public static void setSelectedList(EntityPlayerMP playerMP, String item) { ScrollSelectedPacket packet = new ScrollSelectedPacket(item); PacketHandler.Instance.sendToPlayer(packet, playerMP); } diff --git a/src/main/java/kamkeel/npcs/network/packets/data/SoundManagementPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/SoundManagementPacket.java index 74ce3312f..8971cd8bc 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/SoundManagementPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/SoundManagementPacket.java @@ -24,7 +24,8 @@ public final class SoundManagementPacket extends AbstractPacket { private NBTTagCompound nbt; private int soundId; - public SoundManagementPacket() {} + public SoundManagementPacket() { + } public SoundManagementPacket(EnumSoundOperation operation) { this.operation = operation; diff --git a/src/main/java/kamkeel/npcs/network/packets/data/SwingPlayerArmPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/SwingPlayerArmPacket.java index dd7341c00..04095517f 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/SwingPlayerArmPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/SwingPlayerArmPacket.java @@ -15,7 +15,8 @@ import java.io.IOException; public final class SwingPlayerArmPacket extends AbstractPacket { public static final String packetName = "Data|SwingPlayerArm"; - public SwingPlayerArmPacket() {} + public SwingPlayerArmPacket() { + } @Override public Enum getType() { @@ -28,7 +29,8 @@ public final class SwingPlayerArmPacket extends AbstractPacket { } @Override - public void sendData(ByteBuf out) throws IOException {} + public void sendData(ByteBuf out) throws IOException { + } @SideOnly(Side.CLIENT) @Override diff --git a/src/main/java/kamkeel/npcs/network/packets/data/UpdateAnimationsPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/UpdateAnimationsPacket.java index 78a26384d..19582dd4f 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/UpdateAnimationsPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/UpdateAnimationsPacket.java @@ -25,7 +25,8 @@ public final class UpdateAnimationsPacket extends AbstractPacket { private NBTTagCompound animationCompound; private String playername; - public UpdateAnimationsPacket() {} + public UpdateAnimationsPacket() { + } public UpdateAnimationsPacket(NBTTagCompound animationCompound, String playername) { this.animationCompound = animationCompound; diff --git a/src/main/java/kamkeel/npcs/network/packets/data/VillagerListPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/VillagerListPacket.java index cdf014600..af1535e27 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/VillagerListPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/VillagerListPacket.java @@ -10,8 +10,8 @@ import kamkeel.npcs.network.enums.EnumDataPacket; import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.network.PacketBuffer; -import noppes.npcs.ServerEventsHandler; import net.minecraft.village.MerchantRecipeList; +import noppes.npcs.ServerEventsHandler; import java.io.IOException; @@ -20,7 +20,8 @@ public final class VillagerListPacket extends AbstractPacket { private MerchantRecipeList merchantrecipelist; - public VillagerListPacket() {} + public VillagerListPacket() { + } public VillagerListPacket(MerchantRecipeList merchantrecipelist) { this.merchantrecipelist = merchantrecipelist; diff --git a/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiClosePacket.java b/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiClosePacket.java index f0ce1324d..29dd90ddd 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiClosePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiClosePacket.java @@ -23,14 +23,15 @@ public final class GuiClosePacket extends AbstractPacket { private int code; private NBTTagCompound compound; - public GuiClosePacket() {} + public GuiClosePacket() { + } public GuiClosePacket(int code, NBTTagCompound compound) { this.code = code; this.compound = compound; } - public static void closeGUI(EntityPlayerMP playerMP, int closeCode, NBTTagCompound compound){ + public static void closeGUI(EntityPlayerMP playerMP, int closeCode, NBTTagCompound compound) { GuiClosePacket packet = new GuiClosePacket(closeCode, compound); PacketHandler.Instance.sendToPlayer(packet, playerMP); } diff --git a/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiErrorPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiErrorPacket.java index 64fa3010b..8342375da 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiErrorPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiErrorPacket.java @@ -23,14 +23,15 @@ public final class GuiErrorPacket extends AbstractPacket { private int code; private NBTTagCompound compound; - public GuiErrorPacket() {} + public GuiErrorPacket() { + } public GuiErrorPacket(int code, NBTTagCompound compound) { this.code = code; this.compound = compound; } - public static void errorGUI(EntityPlayerMP playerMP, int closeCode, NBTTagCompound compound){ + public static void errorGUI(EntityPlayerMP playerMP, int closeCode, NBTTagCompound compound) { GuiErrorPacket packet = new GuiErrorPacket(closeCode, compound); PacketHandler.Instance.sendToPlayer(packet, playerMP); } diff --git a/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiOpenBookPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiOpenBookPacket.java index 701df2b0e..2df1e0aa4 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiOpenBookPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiOpenBookPacket.java @@ -11,8 +11,8 @@ import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import noppes.npcs.client.gui.player.GuiBook; import noppes.npcs.client.NoppesUtil; +import noppes.npcs.client.gui.player.GuiBook; import java.io.IOException; @@ -24,7 +24,8 @@ public final class GuiOpenBookPacket extends AbstractPacket { private int k; private NBTTagCompound nbtTagCompound; - public GuiOpenBookPacket() {} + public GuiOpenBookPacket() { + } public GuiOpenBookPacket(int i, int j, int k, NBTTagCompound nbtTagCompound) { this.i = i; diff --git a/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiOpenPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiOpenPacket.java index a42b3e057..1a8324c66 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiOpenPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiOpenPacket.java @@ -23,7 +23,8 @@ public final class GuiOpenPacket extends AbstractPacket { private int y; private int z; - public GuiOpenPacket() {} + public GuiOpenPacket() { + } public GuiOpenPacket(EnumGuiType type, int x, int y, int z) { this.type = type; @@ -32,7 +33,7 @@ public final class GuiOpenPacket extends AbstractPacket { this.z = z; } - public static void openGUI(EntityPlayerMP playerMP, EnumGuiType type, int x, int y, int z){ + public static void openGUI(EntityPlayerMP playerMP, EnumGuiType type, int x, int y, int z) { GuiOpenPacket packet = new GuiOpenPacket(type, x, y, z); PacketHandler.Instance.sendToPlayer(packet, playerMP); } diff --git a/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiRedstonePacket.java b/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiRedstonePacket.java index b5b674873..e1d5e5ba7 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiRedstonePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiRedstonePacket.java @@ -19,7 +19,8 @@ public final class GuiRedstonePacket extends AbstractPacket { private NBTTagCompound compound; - public GuiRedstonePacket() {} + public GuiRedstonePacket() { + } public GuiRedstonePacket(NBTTagCompound compound) { this.compound = compound; diff --git a/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiTeleporterPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiTeleporterPacket.java index 2d9f0ea8d..ccda3e54c 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiTeleporterPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiTeleporterPacket.java @@ -17,7 +17,8 @@ import java.io.IOException; public final class GuiTeleporterPacket extends AbstractPacket { public static final String packetName = "Data|Teleporter"; - public GuiTeleporterPacket(){} + public GuiTeleporterPacket() { + } @Override public Enum getType() { @@ -30,11 +31,12 @@ public final class GuiTeleporterPacket extends AbstractPacket { } @Override - public void sendData(ByteBuf out) throws IOException {} + public void sendData(ByteBuf out) throws IOException { + } @SideOnly(Side.CLIENT) @Override public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { - CustomNpcs.proxy.openGui((EntityNPCInterface)null, EnumGuiType.NpcDimensions); + CustomNpcs.proxy.openGui((EntityNPCInterface) null, EnumGuiType.NpcDimensions); } } diff --git a/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiWaypointPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiWaypointPacket.java index 041d8d8c1..94e059508 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiWaypointPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/gui/GuiWaypointPacket.java @@ -19,7 +19,8 @@ public final class GuiWaypointPacket extends AbstractPacket { private NBTTagCompound compound; - public GuiWaypointPacket() {} + public GuiWaypointPacket() { + } public GuiWaypointPacket(NBTTagCompound compound) { this.compound = compound; diff --git a/src/main/java/kamkeel/npcs/network/packets/data/gui/IsGuiOpenPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/gui/IsGuiOpenPacket.java index e6557efe2..25281bf3d 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/gui/IsGuiOpenPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/gui/IsGuiOpenPacket.java @@ -16,7 +16,8 @@ import java.io.IOException; public final class IsGuiOpenPacket extends AbstractPacket { public static final String packetName = "Data|IsGuiOpen"; - public IsGuiOpenPacket() {} + public IsGuiOpenPacket() { + } @Override public Enum getType() { @@ -29,7 +30,8 @@ public final class IsGuiOpenPacket extends AbstractPacket { } @Override - public void sendData(ByteBuf out) throws IOException {} + public void sendData(ByteBuf out) throws IOException { + } @SideOnly(Side.CLIENT) @Override diff --git a/src/main/java/kamkeel/npcs/network/packets/data/large/GuiDataPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/large/GuiDataPacket.java index a8f996025..631e32bf2 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/large/GuiDataPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/large/GuiDataPacket.java @@ -25,13 +25,14 @@ public final class GuiDataPacket extends LargeAbstractPacket { private NBTTagCompound compound; - public GuiDataPacket(){} + public GuiDataPacket() { + } - public GuiDataPacket(NBTTagCompound comp){ + public GuiDataPacket(NBTTagCompound comp) { this.compound = comp; } - public static void sendGuiData(EntityPlayerMP playerMP, NBTTagCompound compound){ + public static void sendGuiData(EntityPlayerMP playerMP, NBTTagCompound compound) { GuiDataPacket packet = new GuiDataPacket(compound); PacketHandler.Instance.sendToPlayer(packet, playerMP); } @@ -60,9 +61,9 @@ public final class GuiDataPacket extends LargeAbstractPacket { protected void handleCompleteData(ByteBuf data, EntityPlayer player) throws IOException { GuiScreen gui = Minecraft.getMinecraft().currentScreen; if (gui instanceof GuiNPCInterface && ((GuiNPCInterface) gui).hasSubGui()) { - gui = (GuiScreen) ((GuiNPCInterface) gui).getSubGui(); + gui = ((GuiNPCInterface) gui).getSubGui(); } else if (gui instanceof GuiContainerNPCInterface && ((GuiContainerNPCInterface) gui).hasSubGui()) { - gui = (GuiScreen) ((GuiContainerNPCInterface) gui).getSubGui(); + gui = ((GuiContainerNPCInterface) gui).getSubGui(); } if (gui instanceof IGuiData) { NBTTagCompound nbt = ByteBufUtils.readBigNBT(data); diff --git a/src/main/java/kamkeel/npcs/network/packets/data/large/PartyDataPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/large/PartyDataPacket.java index 7cc9654ae..1579a50ca 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/large/PartyDataPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/large/PartyDataPacket.java @@ -25,13 +25,14 @@ public final class PartyDataPacket extends LargeAbstractPacket { private NBTTagCompound compound; - public PartyDataPacket(){} + public PartyDataPacket() { + } - public PartyDataPacket(NBTTagCompound comp){ + public PartyDataPacket(NBTTagCompound comp) { this.compound = comp; } - public static void sendPartyData(EntityPlayerMP playerMP, NBTTagCompound compound){ + public static void sendPartyData(EntityPlayerMP playerMP, NBTTagCompound compound) { PartyDataPacket packet = new PartyDataPacket(compound); PacketHandler.Instance.sendToPlayer(packet, playerMP); } @@ -60,9 +61,9 @@ public final class PartyDataPacket extends LargeAbstractPacket { protected void handleCompleteData(ByteBuf data, EntityPlayer player) throws IOException { GuiScreen gui = Minecraft.getMinecraft().currentScreen; if (gui instanceof GuiNPCInterface && ((GuiNPCInterface) gui).hasSubGui()) { - gui = (GuiScreen) ((GuiNPCInterface) gui).getSubGui(); + gui = ((GuiNPCInterface) gui).getSubGui(); } else if (gui instanceof GuiContainerNPCInterface && ((GuiContainerNPCInterface) gui).hasSubGui()) { - gui = (GuiScreen) ((GuiContainerNPCInterface) gui).getSubGui(); + gui = ((GuiContainerNPCInterface) gui).getSubGui(); } if (gui instanceof IPartyData) { NBTTagCompound nbt = ByteBufUtils.readBigNBT(data); diff --git a/src/main/java/kamkeel/npcs/network/packets/data/large/ScrollDataPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/large/ScrollDataPacket.java index dbb79c3b5..53fe29e7c 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/large/ScrollDataPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/large/ScrollDataPacket.java @@ -19,7 +19,8 @@ public final class ScrollDataPacket extends LargeAbstractPacket { private Map data; - public ScrollDataPacket() {} + public ScrollDataPacket() { + } public ScrollDataPacket(Map data) { this.data = data; diff --git a/src/main/java/kamkeel/npcs/network/packets/data/large/ScrollGroupPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/large/ScrollGroupPacket.java index c6b8e4e89..129035824 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/large/ScrollGroupPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/large/ScrollGroupPacket.java @@ -19,13 +19,14 @@ public final class ScrollGroupPacket extends LargeAbstractPacket { private Map data; - public ScrollGroupPacket() {} + public ScrollGroupPacket() { + } public ScrollGroupPacket(Map data) { this.data = data; } - public static void sendScrollGroup(EntityPlayerMP player, Map map){ + public static void sendScrollGroup(EntityPlayerMP player, Map map) { ScrollGroupPacket packet = new ScrollGroupPacket(map); PacketHandler.Instance.sendToPlayer(packet, player); } diff --git a/src/main/java/kamkeel/npcs/network/packets/data/large/ScrollListPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/large/ScrollListPacket.java index d15d7c178..a78d71b3f 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/large/ScrollListPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/large/ScrollListPacket.java @@ -19,13 +19,14 @@ public final class ScrollListPacket extends LargeAbstractPacket { private List data; - public ScrollListPacket() {} + public ScrollListPacket() { + } public ScrollListPacket(List data) { this.data = data; } - public static void sendList(EntityPlayerMP player, List list){ + public static void sendList(EntityPlayerMP player, List list) { ScrollListPacket packet = new ScrollListPacket(list); PacketHandler.Instance.sendToPlayer(packet, player); } diff --git a/src/main/java/kamkeel/npcs/network/packets/data/large/SyncPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/large/SyncPacket.java index b9861b85c..048d5be17 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/large/SyncPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/large/SyncPacket.java @@ -28,7 +28,8 @@ public final class SyncPacket extends LargeAbstractPacket { private NBTTagCompound syncData; private int operationID; - public SyncPacket() {} + public SyncPacket() { + } /** * Constructs a new LargeSyncPacket. @@ -70,7 +71,7 @@ public final class SyncPacket extends LargeAbstractPacket { @Override protected void handleCompleteData(ByteBuf data, EntityPlayer player) throws IOException { - if(CustomNpcs.side() != Side.CLIENT) + if (CustomNpcs.side() != Side.CLIENT) return; // Reconstruct everything from the ByteBuf diff --git a/src/main/java/kamkeel/npcs/network/packets/data/npc/DeleteNpcPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/npc/DeleteNpcPacket.java index dca895776..ee0dc7599 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/npc/DeleteNpcPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/npc/DeleteNpcPacket.java @@ -19,9 +19,10 @@ public final class DeleteNpcPacket extends AbstractPacket { private int entityId; - public DeleteNpcPacket() {} + public DeleteNpcPacket() { + } - public DeleteNpcPacket(int id){ + public DeleteNpcPacket(int id) { this.entityId = id; } diff --git a/src/main/java/kamkeel/npcs/network/packets/data/npc/DialogPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/npc/DialogPacket.java index 4807a852e..83be63878 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/npc/DialogPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/npc/DialogPacket.java @@ -25,7 +25,8 @@ public final class DialogPacket extends AbstractPacket { private int entityID; private NBTTagCompound compound; - public DialogPacket() {} + public DialogPacket() { + } public DialogPacket(String dummyName, int entityID, NBTTagCompound compound) { this.dummyName = dummyName; @@ -58,12 +59,11 @@ public final class DialogPacket extends AbstractPacket { NBTTagCompound tagCompound = ByteBufUtils.readNBT(in); // Dummy NPC - if(entityID == -1){ + if (entityID == -1) { EntityDialogNpc npc = new EntityDialogNpc(player.worldObj); npc.display.name = name; NoppesUtil.openDialog(tagCompound, npc, player); - } - else { + } else { Entity entity = Minecraft.getMinecraft().theWorld.getEntityByID(entityID); if (!(entity instanceof EntityNPCInterface)) { return; diff --git a/src/main/java/kamkeel/npcs/network/packets/data/npc/EditNpcPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/npc/EditNpcPacket.java index 5e4914c0e..199cf319f 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/npc/EditNpcPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/npc/EditNpcPacket.java @@ -19,7 +19,9 @@ public final class EditNpcPacket extends AbstractPacket { public static final String packetName = "Data|EditNpc"; int entityId; - public EditNpcPacket() {} + + public EditNpcPacket() { + } public EditNpcPacket(int entityId) { this.entityId = entityId; diff --git a/src/main/java/kamkeel/npcs/network/packets/data/npc/RolePacket.java b/src/main/java/kamkeel/npcs/network/packets/data/npc/RolePacket.java index 6a8f21e3e..a6f5869e9 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/npc/RolePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/npc/RolePacket.java @@ -22,7 +22,8 @@ public final class RolePacket extends AbstractPacket { private NBTTagCompound compound; - public RolePacket() {} + public RolePacket() { + } public RolePacket(NBTTagCompound compound) { this.compound = compound; diff --git a/src/main/java/kamkeel/npcs/network/packets/data/npc/UpdateNpcPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/npc/UpdateNpcPacket.java index 496e65be8..10472ef5e 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/npc/UpdateNpcPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/npc/UpdateNpcPacket.java @@ -21,7 +21,8 @@ public final class UpdateNpcPacket extends AbstractPacket { private NBTTagCompound npcCompound; - public UpdateNpcPacket() {} + public UpdateNpcPacket() { + } public UpdateNpcPacket(NBTTagCompound npcCompound) { this.npcCompound = npcCompound; diff --git a/src/main/java/kamkeel/npcs/network/packets/data/npc/WeaponNpcPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/npc/WeaponNpcPacket.java index b04309c1b..255583f7c 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/npc/WeaponNpcPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/npc/WeaponNpcPacket.java @@ -24,7 +24,8 @@ public final class WeaponNpcPacket extends AbstractPacket { private int weaponIndex; private NBTTagCompound compound; - public WeaponNpcPacket() {} + public WeaponNpcPacket() { + } public WeaponNpcPacket(int entityId, int weaponIndex, NBTTagCompound compound) { this.entityId = entityId; @@ -54,11 +55,11 @@ public final class WeaponNpcPacket extends AbstractPacket { @Override public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { Entity entity = Minecraft.getMinecraft().theWorld.getEntityByID(in.readInt()); - if(!(entity instanceof EntityNPCInterface)) + if (!(entity instanceof EntityNPCInterface)) return; EntityNPCInterface npc = (EntityNPCInterface) entity; int weaponSlotIndex = in.readInt(); ItemStack stack = ItemStack.loadItemStackFromNBT(ByteBufUtils.readNBT(in)); - npc.inventory.weapons.put(weaponSlotIndex,stack); + npc.inventory.weapons.put(weaponSlotIndex, stack); } } diff --git a/src/main/java/kamkeel/npcs/network/packets/data/script/ScriptOverlayClosePacket.java b/src/main/java/kamkeel/npcs/network/packets/data/script/ScriptOverlayClosePacket.java index 44be40d80..88c197207 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/script/ScriptOverlayClosePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/script/ScriptOverlayClosePacket.java @@ -17,7 +17,8 @@ public final class ScriptOverlayClosePacket extends AbstractPacket { private int particleId; - public ScriptOverlayClosePacket() {} + public ScriptOverlayClosePacket() { + } public ScriptOverlayClosePacket(int particleId) { this.particleId = particleId; diff --git a/src/main/java/kamkeel/npcs/network/packets/data/script/ScriptOverlayDataPacket.java b/src/main/java/kamkeel/npcs/network/packets/data/script/ScriptOverlayDataPacket.java index 3430130d8..fb800a1cd 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/script/ScriptOverlayDataPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/script/ScriptOverlayDataPacket.java @@ -11,8 +11,8 @@ import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; -import noppes.npcs.client.gui.customoverlay.OverlayCustom; import noppes.npcs.client.ClientCacheHandler; +import noppes.npcs.client.gui.customoverlay.OverlayCustom; import java.io.IOException; @@ -21,7 +21,8 @@ public final class ScriptOverlayDataPacket extends AbstractPacket { private NBTTagCompound overlayCompound; - public ScriptOverlayDataPacket() {} + public ScriptOverlayDataPacket() { + } public ScriptOverlayDataPacket(NBTTagCompound overlayCompound) { this.overlayCompound = overlayCompound; diff --git a/src/main/java/kamkeel/npcs/network/packets/data/script/ScriptedParticlePacket.java b/src/main/java/kamkeel/npcs/network/packets/data/script/ScriptedParticlePacket.java index 80c93fcdc..db489b234 100644 --- a/src/main/java/kamkeel/npcs/network/packets/data/script/ScriptedParticlePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/data/script/ScriptedParticlePacket.java @@ -24,7 +24,8 @@ public final class ScriptedParticlePacket extends AbstractPacket { private NBTTagCompound compound; - public ScriptedParticlePacket() {} + public ScriptedParticlePacket() { + } public ScriptedParticlePacket(NBTTagCompound compound) { this.compound = compound; @@ -48,15 +49,15 @@ public final class ScriptedParticlePacket extends AbstractPacket { @SideOnly(Side.CLIENT) @Override public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { - if(CustomNpcs.side() != Side.CLIENT) + if (CustomNpcs.side() != Side.CLIENT) return; spawnScriptedParticle(player, in); } @SideOnly(Side.CLIENT) - public static void spawnScriptedParticle(EntityPlayer player, ByteBuf buffer){ - Minecraft minecraft = Minecraft.getMinecraft(); + public static void spawnScriptedParticle(EntityPlayer player, ByteBuf buffer) { + Minecraft minecraft = Minecraft.getMinecraft(); NBTTagCompound compound; ScriptParticle particle; @@ -82,7 +83,7 @@ public final class ScriptedParticlePacket extends AbstractPacket { CustomFX fx = CustomFX.fromScriptedParticle(particle, worldObj, entity); - for(int i = 0; i < particle.amount; i++){ + for (int i = 0; i < particle.amount; i++) { minecraft.effectRenderer.addEffect(fx); } } diff --git a/src/main/java/kamkeel/npcs/network/packets/request/AnimationCachePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/AnimationCachePacket.java index 7496f08df..0ba14f9d3 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/AnimationCachePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/AnimationCachePacket.java @@ -8,15 +8,20 @@ import kamkeel.npcs.network.PacketChannel; import kamkeel.npcs.network.PacketHandler; import kamkeel.npcs.network.enums.EnumRequestPacket; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import noppes.npcs.NoppesUtilServer; +import noppes.npcs.controllers.PlayerDataController; import java.io.IOException; public final class AnimationCachePacket extends AbstractPacket { public static final String packetName = "Request|AnimationCache"; + private int id; - public AnimationCachePacket() {} + public AnimationCachePacket() { + } + + public AnimationCachePacket(int id) { + this.id = id; + } @Override public Enum getType() { @@ -30,11 +35,13 @@ public final class AnimationCachePacket extends AbstractPacket { @SideOnly(Side.CLIENT) @Override - public void sendData(ByteBuf out) throws IOException {} + public void sendData(ByteBuf out) throws IOException { + out.writeInt(this.id); + } @Override public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { - NoppesUtilServer.sendTagDataAll((EntityPlayerMP) player); + PlayerDataController.Instance.getPlayerData(player).animationData.cacheAnimation(in.readInt()); } diff --git a/src/main/java/kamkeel/npcs/network/packets/request/DimensionsGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/DimensionsGetPacket.java index 5e678765c..2d64a8f63 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/DimensionsGetPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/DimensionsGetPacket.java @@ -12,7 +12,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.world.WorldProvider; import net.minecraftforge.common.DimensionManager; -import noppes.npcs.NoppesUtilPlayer; import java.io.IOException; import java.util.HashMap; @@ -20,7 +19,8 @@ import java.util.HashMap; public final class DimensionsGetPacket extends AbstractPacket { public static final String packetName = "Request|DimensionsGet"; - public DimensionsGetPacket() {} + public DimensionsGetPacket() { + } @Override public Enum getType() { @@ -34,12 +34,13 @@ public final class DimensionsGetPacket extends AbstractPacket { @SideOnly(Side.CLIENT) @Override - public void sendData(ByteBuf out) throws IOException {} + public void sendData(ByteBuf out) throws IOException { + } @Override public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { - HashMap map = new HashMap(); - for(int id : DimensionManager.getStaticDimensionIDs()){ + HashMap map = new HashMap(); + for (int id : DimensionManager.getStaticDimensionIDs()) { WorldProvider provider = DimensionManager.createProviderFor(id); map.put(provider.getDimensionName(), id); } diff --git a/src/main/java/kamkeel/npcs/network/packets/request/GuiPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/GuiPacket.java new file mode 100644 index 000000000..a1e7369f0 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/GuiPacket.java @@ -0,0 +1,73 @@ +package kamkeel.npcs.network.packets.request; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import noppes.npcs.NoppesUtilServer; +import noppes.npcs.constants.EnumGuiType; + +import java.io.IOException; + +public final class GuiPacket extends AbstractPacket { + public static String packetName = "Request|Gui"; + + private int guiIndex, posX, posY, posZ; + + public GuiPacket(int guiIndex, int posX, int posY, int posZ) { + this.guiIndex = guiIndex; + this.posX = posX; + this.posY = posY; + this.posZ = posZ; + } + + public GuiPacket() { + } + + @Override + public Enum getType() { + return EnumRequestPacket.Gui; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public boolean needsNPC() { + return true; + } + + // No permission override + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + out.writeInt(guiIndex); + out.writeInt(posX); + out.writeInt(posY); + out.writeInt(posZ); + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) + return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) + return; + int index = in.readInt(); + int x = in.readInt(); + int y = in.readInt(); + int z = in.readInt(); + EnumGuiType gui = EnumGuiType.values()[index]; + NoppesUtilServer.sendOpenGui(player, gui, npc, x, y, z); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/IsGuiOpenPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/IsGuiOpenPacket.java index ce2a8298c..4fe16d795 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/IsGuiOpenPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/IsGuiOpenPacket.java @@ -8,8 +8,6 @@ import kamkeel.npcs.network.PacketChannel; import kamkeel.npcs.network.PacketHandler; import kamkeel.npcs.network.enums.EnumRequestPacket; import net.minecraft.entity.player.EntityPlayer; -import noppes.npcs.CustomNpcsPermissions; -import noppes.npcs.NoppesUtilServer; import noppes.npcs.controllers.PlayerDataController; import noppes.npcs.controllers.data.PlayerData; @@ -20,9 +18,10 @@ public final class IsGuiOpenPacket extends AbstractPacket { private boolean isOpen; - public IsGuiOpenPacket() {} + public IsGuiOpenPacket() { + } - public IsGuiOpenPacket(boolean isOpen){ + public IsGuiOpenPacket(boolean isOpen) { this.isOpen = isOpen; } diff --git a/src/main/java/kamkeel/npcs/network/packets/request/MailOpenSetupPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/MailOpenSetupPacket.java new file mode 100644 index 000000000..7f1a909cf --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/MailOpenSetupPacket.java @@ -0,0 +1,50 @@ +package kamkeel.npcs.network.packets.request; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.util.ByteBufUtils; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import noppes.npcs.CustomNpcs; +import noppes.npcs.constants.EnumGuiType; +import noppes.npcs.containers.ContainerMail; +import noppes.npcs.controllers.data.PlayerMail; + +import java.io.IOException; + +public final class MailOpenSetupPacket extends AbstractPacket { + public static String packetName = "Request|MailOpenSetup"; + + public MailOpenSetupPacket() { } + + @Override + public Enum getType() { + return EnumRequestPacket.MailOpenSetup; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return; + PlayerMail mail = new PlayerMail(); + mail.readNBT(ByteBufUtils.readNBT(in)); + ContainerMail.staticmail = mail; + player.openGui(CustomNpcs.instance, EnumGuiType.PlayerMailman.ordinal(), player.worldObj, 1, 0, 0); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/MerchantUpdatePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/MerchantUpdatePacket.java new file mode 100644 index 000000000..1c830b376 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/MerchantUpdatePacket.java @@ -0,0 +1,62 @@ +package kamkeel.npcs.network.packets.request; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import net.minecraft.entity.Entity; +import net.minecraft.entity.passive.EntityVillager; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.network.PacketBuffer; +import net.minecraft.village.MerchantRecipeList; +import noppes.npcs.CustomNpcsPermissions; + +import java.io.IOException; + +public final class MerchantUpdatePacket extends AbstractPacket { + public static String packetName = "Request|MerchantUpdate"; + + public MerchantUpdatePacket() { } + + @Override + public Enum getType() { + return EnumRequestPacket.MerchantUpdate; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.EDIT_VILLAGER; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) + return; + + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) + return; + + int entityId = in.readInt(); + Entity entity = player.worldObj.getEntityByID(entityId); + if (!(entity instanceof EntityVillager)) + return; + + MerchantRecipeList list = MerchantRecipeList.func_151390_b(new PacketBuffer(in)); + ((EntityVillager)entity).setRecipes(list); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/QuestLogToServerPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/QuestLogToServerPacket.java index 56e3da3b6..c62646706 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/QuestLogToServerPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/QuestLogToServerPacket.java @@ -11,7 +11,6 @@ import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; -import noppes.npcs.CustomNpcsPermissions; import noppes.npcs.NoppesUtilPlayer; import java.io.IOException; @@ -22,7 +21,8 @@ public final class QuestLogToServerPacket extends AbstractPacket { private NBTTagCompound compound; private String key; - public QuestLogToServerPacket() {} + public QuestLogToServerPacket() { + } public QuestLogToServerPacket(NBTTagCompound compound, String key) { this.compound = compound; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/QuestUntrackPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/QuestUntrackPacket.java index 7f4667cea..f136f71cc 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/QuestUntrackPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/QuestUntrackPacket.java @@ -7,10 +7,8 @@ import kamkeel.npcs.network.AbstractPacket; import kamkeel.npcs.network.PacketChannel; import kamkeel.npcs.network.PacketHandler; import kamkeel.npcs.network.enums.EnumRequestPacket; -import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.NoppesUtilPlayer; import java.io.IOException; @@ -18,7 +16,8 @@ import java.io.IOException; public final class QuestUntrackPacket extends AbstractPacket { public static final String packetName = "Request|QuestUntrack"; - public QuestUntrackPacket() {} + public QuestUntrackPacket() { + } @Override public Enum getType() { @@ -32,7 +31,8 @@ public final class QuestUntrackPacket extends AbstractPacket { @SideOnly(Side.CLIENT) @Override - public void sendData(ByteBuf out) throws IOException {} + public void sendData(ByteBuf out) throws IOException { + } @Override public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { diff --git a/src/main/java/kamkeel/npcs/network/packets/request/REQUESTPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/REQUESTPacket.java index a6432b7cd..1dd50ade0 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/REQUESTPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/REQUESTPacket.java @@ -6,27 +6,22 @@ import io.netty.buffer.ByteBuf; import kamkeel.npcs.network.AbstractPacket; import kamkeel.npcs.network.PacketChannel; import kamkeel.npcs.network.PacketHandler; -import kamkeel.npcs.network.enums.EnumDataPacket; import kamkeel.npcs.network.enums.EnumRequestPacket; -import kamkeel.npcs.util.ByteBufUtils; -import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.CustomNpcsPermissions; -import noppes.npcs.controllers.data.MarkData; -import noppes.npcs.entity.EntityNPCInterface; import java.io.IOException; public final class REQUESTPacket extends AbstractPacket { public static final String packetName = "Request|Name"; - public REQUESTPacket() {} + public REQUESTPacket() { + } @Override public Enum getType() { - return EnumRequestPacket.Delete; + return EnumRequestPacket.NPCDelete; } @Override @@ -35,12 +30,12 @@ public final class REQUESTPacket extends AbstractPacket { } @Override - public CustomNpcsPermissions.Permission getPermission(){ + public CustomNpcsPermissions.Permission getPermission() { return null; } @Override - public boolean needsNPC(){ + public boolean needsNPC() { return false; } diff --git a/src/main/java/kamkeel/npcs/network/packets/request/TagsGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/TagsGetPacket.java index b07d54b96..450d9c62d 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/TagsGetPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/TagsGetPacket.java @@ -7,20 +7,17 @@ import kamkeel.npcs.network.AbstractPacket; import kamkeel.npcs.network.PacketChannel; import kamkeel.npcs.network.PacketHandler; import kamkeel.npcs.network.enums.EnumRequestPacket; -import kamkeel.npcs.network.packets.data.large.ScrollDataPacket; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.world.WorldProvider; -import net.minecraftforge.common.DimensionManager; import noppes.npcs.NoppesUtilServer; import java.io.IOException; -import java.util.HashMap; public final class TagsGetPacket extends AbstractPacket { public static final String packetName = "Request|TagsGet"; - public TagsGetPacket() {} + public TagsGetPacket() { + } @Override public Enum getType() { @@ -34,7 +31,8 @@ public final class TagsGetPacket extends AbstractPacket { @SideOnly(Side.CLIENT) @Override - public void sendData(ByteBuf out) throws IOException {} + public void sendData(ByteBuf out) throws IOException { + } @Override public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { diff --git a/src/main/java/kamkeel/npcs/network/packets/request/TagsNpcGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/TagsNpcGetPacket.java index ef9257985..62b77e0b9 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/TagsNpcGetPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/TagsNpcGetPacket.java @@ -13,7 +13,6 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagString; -import noppes.npcs.NoppesUtilServer; import noppes.npcs.controllers.TagController; import noppes.npcs.controllers.data.Tag; @@ -23,7 +22,8 @@ import java.util.UUID; public final class TagsNpcGetPacket extends AbstractPacket { public static final String packetName = "Request|NpcTagsGet"; - public TagsNpcGetPacket() {} + public TagsNpcGetPacket() { + } @Override public Enum getType() { @@ -36,13 +36,14 @@ public final class TagsNpcGetPacket extends AbstractPacket { } @Override - public boolean needsNPC(){ + public boolean needsNPC() { return true; } @SideOnly(Side.CLIENT) @Override - public void sendData(ByteBuf out) throws IOException {} + public void sendData(ByteBuf out) throws IOException { + } @Override public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { @@ -54,7 +55,7 @@ public final class TagsNpcGetPacket extends AbstractPacket { tagList.appendTag(new NBTTagString(tag.name)); } } - compound.setTag("TagNames",tagList); + compound.setTag("TagNames", tagList); GuiDataPacket.sendGuiData((EntityPlayerMP) player, compound); } } diff --git a/src/main/java/kamkeel/npcs/network/packets/request/TraderMarketSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/TraderMarketSavePacket.java new file mode 100644 index 000000000..4e597f43e --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/TraderMarketSavePacket.java @@ -0,0 +1,64 @@ +package kamkeel.npcs.network.packets.request; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import foxz.utils.Market; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.util.ByteBufUtils; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import noppes.npcs.CustomNpcsPermissions; +import noppes.npcs.roles.RoleTrader; + +import java.io.IOException; + +public final class TraderMarketSavePacket extends AbstractPacket { + public static String packetName = "Request|TraderMarketSave"; + + public TraderMarketSavePacket() { } + + @Override + public Enum getType() { + return EnumRequestPacket.TraderMarketSave; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.NPC_ADVANCED; + } + + @Override + public boolean needsNPC() { + return true; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return; + String market = ByteBufUtils.readString(in); + if (market == null) return; + boolean bo = in.readBoolean(); + if(npc.roleInterface instanceof RoleTrader){ + if(bo) + Market.setMarket(npc, market); + else + Market.save((RoleTrader)npc.roleInterface, market); + } + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/animation/AnimationGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/animation/AnimationGetPacket.java new file mode 100644 index 000000000..8c295002a --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/animation/AnimationGetPacket.java @@ -0,0 +1,50 @@ +package kamkeel.npcs.network.packets.request.animation; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.network.packets.data.large.GuiDataPacket; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.controllers.AnimationController; +import noppes.npcs.controllers.data.Animation; + +import java.io.IOException; + +public final class AnimationGetPacket extends AbstractPacket { + public static String packetName = "Request|AnimationGet"; + + public AnimationGetPacket() { } + + @Override + public Enum getType() { + return EnumRequestPacket.AnimationGet; + } + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + out.writeInt(0); + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return; + int id = in.readInt(); + Animation animation = (Animation) AnimationController.getInstance().get(id); + NBTTagCompound compound = animation.writeToNBT(); + GuiDataPacket.sendGuiData((EntityPlayerMP) player, compound); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/animation/AnimationRemovePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/animation/AnimationRemovePacket.java new file mode 100644 index 000000000..e77bbdf36 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/animation/AnimationRemovePacket.java @@ -0,0 +1,59 @@ +package kamkeel.npcs.network.packets.request.animation; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.network.packets.data.large.GuiDataPacket; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.CustomNpcsPermissions; +import noppes.npcs.NoppesUtilServer; +import noppes.npcs.controllers.AnimationController; +import noppes.npcs.controllers.data.Animation; + +import java.io.IOException; + +public final class AnimationRemovePacket extends AbstractPacket { + public static String packetName = "Request|AnimationRemove"; + + public AnimationRemovePacket() { } + + @Override + public Enum getType() { + return EnumRequestPacket.AnimationRemove; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.GLOBAL_ANIMATION; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + out.writeInt(0); + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return; + int id = in.readInt(); + AnimationController.getInstance().delete(id); + NoppesUtilServer.sendAnimationDataAll((EntityPlayerMP) player); + NBTTagCompound compound = new Animation().writeToNBT(); + GuiDataPacket.sendGuiData((EntityPlayerMP) player, compound); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/animation/AnimationSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/animation/AnimationSavePacket.java new file mode 100644 index 000000000..0ad3fe4f4 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/animation/AnimationSavePacket.java @@ -0,0 +1,66 @@ +package kamkeel.npcs.network.packets.request.animation; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.network.packets.data.large.GuiDataPacket; +import kamkeel.npcs.util.ByteBufUtils; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.CustomNpcsPermissions; +import noppes.npcs.NoppesUtilServer; +import noppes.npcs.controllers.AnimationController; +import noppes.npcs.controllers.data.Animation; + +import java.io.IOException; + +public final class AnimationSavePacket extends AbstractPacket { + public static String packetName = "Request|AnimationSave"; + + private NBTTagCompound animationNBT; + + public AnimationSavePacket(NBTTagCompound animationNBT) { + this.animationNBT = animationNBT; + } + public AnimationSavePacket() { } + + @Override + public Enum getType() { + return EnumRequestPacket.AnimationSave; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.GLOBAL_ANIMATION; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + ByteBufUtils.writeNBT(out, animationNBT); + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return; + NBTTagCompound compound = ByteBufUtils.readNBT(in); + Animation animation = new Animation(); + animation.readFromNBT(compound); + AnimationController.getInstance().saveAnimation(animation); + NoppesUtilServer.sendAnimationDataAll((EntityPlayerMP) player); + GuiDataPacket.sendGuiData((EntityPlayerMP) player, animation.writeToNBT()); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/animation/AnimationsGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/animation/AnimationsGetPacket.java new file mode 100644 index 000000000..ba6f8de24 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/animation/AnimationsGetPacket.java @@ -0,0 +1,43 @@ +package kamkeel.npcs.network.packets.request.animation; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import noppes.npcs.NoppesUtilServer; + +import java.io.IOException; + +public final class AnimationsGetPacket extends AbstractPacket { + public static String packetName = "Request|AnimationsGet"; + + public AnimationsGetPacket() { } + + @Override + public Enum getType() { + return EnumRequestPacket.AnimationsGet; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return; + NoppesUtilServer.sendAnimationDataAll((EntityPlayerMP) player); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/bank/BankGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/bank/BankGetPacket.java new file mode 100644 index 000000000..e49a50e39 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/bank/BankGetPacket.java @@ -0,0 +1,59 @@ +package kamkeel.npcs.network.packets.request.bank; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import noppes.npcs.NoppesUtilServer; +import noppes.npcs.controllers.BankController; +import noppes.npcs.controllers.data.Bank; + +import java.io.IOException; + +public final class BankGetPacket extends AbstractPacket { + public static String packetName = "Request|BankGet"; + + private int bankId; + + public BankGetPacket(int bankId) { + this.bankId = bankId; + } + + public BankGetPacket() { + } + + @Override + public Enum getType() { + return EnumRequestPacket.BankGet; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + out.writeInt(bankId); + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) + return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) + return; + int id = in.readInt(); + + Bank bank = BankController.getInstance().getBank(id); + NoppesUtilServer.sendBank((EntityPlayerMP) player, bank); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/bank/BankRemovePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/bank/BankRemovePacket.java new file mode 100644 index 000000000..fb21141de --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/bank/BankRemovePacket.java @@ -0,0 +1,67 @@ +package kamkeel.npcs.network.packets.request.bank; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import noppes.npcs.CustomNpcsPermissions; +import noppes.npcs.NoppesUtilServer; +import noppes.npcs.controllers.BankController; +import noppes.npcs.controllers.data.Bank; + +import java.io.IOException; + +public final class BankRemovePacket extends AbstractPacket { + public static String packetName = "Request|BankRemove"; + + private int bankId; + + public BankRemovePacket(int bankId) { + this.bankId = bankId; + } + + public BankRemovePacket() { + } + + @Override + public Enum getType() { + return EnumRequestPacket.BankRemove; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.GLOBAL_BANK; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + out.writeInt(bankId); + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) + return; + + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) + return; + + int id = in.readInt(); + BankController.getInstance().removeBank(id); + NoppesUtilServer.sendBankDataAll((EntityPlayerMP) player); + NoppesUtilServer.sendBank((EntityPlayerMP) player, new Bank()); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/bank/BankSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/bank/BankSavePacket.java new file mode 100644 index 000000000..42c29b719 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/bank/BankSavePacket.java @@ -0,0 +1,70 @@ +package kamkeel.npcs.network.packets.request.bank; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.util.ByteBufUtils; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.CustomNpcsPermissions; +import noppes.npcs.NoppesUtilServer; +import noppes.npcs.controllers.BankController; +import noppes.npcs.controllers.data.Bank; + +import java.io.IOException; + +public final class BankSavePacket extends AbstractPacket { + public static String packetName = "Request|BankSave"; + + private NBTTagCompound bankNBT; + + public BankSavePacket(NBTTagCompound bankNBT) { + this.bankNBT = bankNBT; + } + + public BankSavePacket() { + } + + @Override + public Enum getType() { + return EnumRequestPacket.BankSave; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.GLOBAL_BANK; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + ByteBufUtils.writeNBT(out, bankNBT); + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) + return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) + return; + + NBTTagCompound compound = ByteBufUtils.readNBT(in); + Bank bank = new Bank(); + bank.readEntityFromNBT(compound); + BankController.getInstance().saveBank(bank); + NoppesUtilServer.sendBankDataAll((EntityPlayerMP) player); + NoppesUtilServer.sendBank((EntityPlayerMP) player, bank); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/bank/BanksGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/bank/BanksGetPacket.java new file mode 100644 index 000000000..9c14168b1 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/bank/BanksGetPacket.java @@ -0,0 +1,49 @@ +package kamkeel.npcs.network.packets.request.bank; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import noppes.npcs.NoppesUtilServer; + +import java.io.IOException; + +public final class BanksGetPacket extends AbstractPacket { + public static String packetName = "Request|BanksGet"; + + public BanksGetPacket() { + } + + @Override + public Enum getType() { + return EnumRequestPacket.BanksGet; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + // No permission override since BanksGet is null in the enum + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) + return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) + return; + NoppesUtilServer.sendBankDataAll((EntityPlayerMP) player); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/CustomGuiButtonPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/customgui/CustomGuiButtonPacket.java similarity index 87% rename from src/main/java/kamkeel/npcs/network/packets/request/CustomGuiButtonPacket.java rename to src/main/java/kamkeel/npcs/network/packets/request/customgui/CustomGuiButtonPacket.java index b8a18cd2c..4dbec3676 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/CustomGuiButtonPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/customgui/CustomGuiButtonPacket.java @@ -1,4 +1,4 @@ -package kamkeel.npcs.network.packets.request; +package kamkeel.npcs.network.packets.request.customgui; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -23,9 +23,10 @@ public final class CustomGuiButtonPacket extends AbstractPacket { private NBTTagCompound compound; private int id; - public CustomGuiButtonPacket() {} + public CustomGuiButtonPacket() { + } - public CustomGuiButtonPacket(int id, NBTTagCompound comp){ + public CustomGuiButtonPacket(int id, NBTTagCompound comp) { this.compound = comp; this.id = id; } @@ -50,7 +51,7 @@ public final class CustomGuiButtonPacket extends AbstractPacket { @Override public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { - if(!(player.openContainer instanceof ContainerCustomGui)) + if (!(player.openContainer instanceof ContainerCustomGui)) return; int id = in.readInt(); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/CustomGuiClosePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/customgui/CustomGuiClosePacket.java similarity index 86% rename from src/main/java/kamkeel/npcs/network/packets/request/CustomGuiClosePacket.java rename to src/main/java/kamkeel/npcs/network/packets/request/customgui/CustomGuiClosePacket.java index 787481f7d..f258e2473 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/CustomGuiClosePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/customgui/CustomGuiClosePacket.java @@ -1,4 +1,4 @@ -package kamkeel.npcs.network.packets.request; +package kamkeel.npcs.network.packets.request.customgui; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -23,9 +23,10 @@ public final class CustomGuiClosePacket extends AbstractPacket { private NBTTagCompound compound; - public CustomGuiClosePacket() {} + public CustomGuiClosePacket() { + } - public CustomGuiClosePacket(int id, NBTTagCompound comp){ + public CustomGuiClosePacket(int id, NBTTagCompound comp) { this.compound = comp; } @@ -48,7 +49,7 @@ public final class CustomGuiClosePacket extends AbstractPacket { @Override public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { - if(!(player.openContainer instanceof ContainerCustomGui)) + if (!(player.openContainer instanceof ContainerCustomGui)) return; NBTTagCompound comp = ByteBufUtils.readNBT(in); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/CustomGuiUnfocusedPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/customgui/CustomGuiUnfocusedPacket.java similarity index 91% rename from src/main/java/kamkeel/npcs/network/packets/request/CustomGuiUnfocusedPacket.java rename to src/main/java/kamkeel/npcs/network/packets/request/customgui/CustomGuiUnfocusedPacket.java index 0f81ce863..4f7982207 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/CustomGuiUnfocusedPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/customgui/CustomGuiUnfocusedPacket.java @@ -1,4 +1,4 @@ -package kamkeel.npcs.network.packets.request; +package kamkeel.npcs.network.packets.request.customgui; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -23,9 +23,10 @@ public final class CustomGuiUnfocusedPacket extends AbstractPacket { private NBTTagCompound compound; private int id; - public CustomGuiUnfocusedPacket() {} + public CustomGuiUnfocusedPacket() { + } - public CustomGuiUnfocusedPacket(int id, NBTTagCompound comp){ + public CustomGuiUnfocusedPacket(int id, NBTTagCompound comp) { this.compound = comp; this.id = id; } @@ -50,7 +51,7 @@ public final class CustomGuiUnfocusedPacket extends AbstractPacket { @Override public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { - if(!(player.openContainer instanceof ContainerCustomGui)) + if (!(player.openContainer instanceof ContainerCustomGui)) return; int id = in.readInt(); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/CustomScrollClickPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/customgui/CustomScrollClickPacket.java similarity index 93% rename from src/main/java/kamkeel/npcs/network/packets/request/CustomScrollClickPacket.java rename to src/main/java/kamkeel/npcs/network/packets/request/customgui/CustomScrollClickPacket.java index 27b2a6e0a..980913ad7 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/CustomScrollClickPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/customgui/CustomScrollClickPacket.java @@ -1,4 +1,4 @@ -package kamkeel.npcs.network.packets.request; +package kamkeel.npcs.network.packets.request.customgui; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -27,7 +27,8 @@ public final class CustomScrollClickPacket extends AbstractPacket { private boolean doubleClick; private NBTTagCompound compound; - public CustomScrollClickPacket() {} + public CustomScrollClickPacket() { + } public CustomScrollClickPacket(NBTTagCompound compound, int scrollId, int scrollIndex, NBTTagCompound selection, boolean doubleClick) { this.compound = compound; @@ -60,7 +61,7 @@ public final class CustomScrollClickPacket extends AbstractPacket { @Override public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { - if(!(player.openContainer instanceof ContainerCustomGui)) + if (!(player.openContainer instanceof ContainerCustomGui)) return; NBTTagCompound comp = ByteBufUtils.readNBT(in); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogCategoryGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogCategoryGetPacket.java new file mode 100644 index 000000000..edfa2b989 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogCategoryGetPacket.java @@ -0,0 +1,55 @@ +package kamkeel.npcs.network.packets.request.dialog; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.network.packets.data.large.GuiDataPacket; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.controllers.DialogController; +import noppes.npcs.controllers.data.DialogCategory; + +import java.io.IOException; + +public final class DialogCategoryGetPacket extends AbstractPacket { + public static String packetName = "Request|DialogCategoryGet"; + + public DialogCategoryGetPacket() { + } + + @Override + public Enum getType() { + return EnumRequestPacket.DialogCategoryGet; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + // No permission override + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return; + int id = in.readInt(); + DialogCategory category = DialogController.Instance.categories.get(id); + if (category != null) { + NBTTagCompound comp = category.writeNBT(new NBTTagCompound()); + comp.removeTag("Dialogs"); + GuiDataPacket.sendGuiData((EntityPlayerMP) player, comp); + } + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogCategoryRemovePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogCategoryRemovePacket.java new file mode 100644 index 000000000..1861411c8 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogCategoryRemovePacket.java @@ -0,0 +1,61 @@ +package kamkeel.npcs.network.packets.request.dialog; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.network.packets.data.large.ScrollDataPacket; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import noppes.npcs.CustomNpcsPermissions; +import noppes.npcs.controllers.DialogController; + +import java.io.IOException; + +public final class DialogCategoryRemovePacket extends AbstractPacket { + public static String packetName = "Request|DialogCategoryRemove"; + + private int categoryId; + + public DialogCategoryRemovePacket(int categoryId) { + this.categoryId = categoryId; + } + + public DialogCategoryRemovePacket() { + } + + @Override + public Enum getType() { + return EnumRequestPacket.DialogCategoryRemove; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.GLOBAL_DIALOG; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + out.writeInt(categoryId); + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return; + int id = in.readInt(); + DialogController.Instance.removeCategory(id); + ScrollDataPacket.sendScrollData((EntityPlayerMP) player, DialogController.Instance.getScroll()); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogCategorySavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogCategorySavePacket.java new file mode 100644 index 000000000..fb58afcef --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogCategorySavePacket.java @@ -0,0 +1,66 @@ +package kamkeel.npcs.network.packets.request.dialog; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.network.packets.data.large.ScrollDataPacket; +import kamkeel.npcs.util.ByteBufUtils; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.CustomNpcsPermissions; +import noppes.npcs.controllers.DialogController; +import noppes.npcs.controllers.data.DialogCategory; + +import java.io.IOException; + +public final class DialogCategorySavePacket extends AbstractPacket { + public static String packetName = "Request|DialogCategorySave"; + + private NBTTagCompound categoryNBT; + + public DialogCategorySavePacket(NBTTagCompound categoryNBT) { + this.categoryNBT = categoryNBT; + } + + public DialogCategorySavePacket() { + } + + @Override + public Enum getType() { + return EnumRequestPacket.DialogCategorySave; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.GLOBAL_DIALOG; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + ByteBufUtils.writeNBT(out, categoryNBT); + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return; + NBTTagCompound compound = ByteBufUtils.readNBT(in); + DialogCategory category = new DialogCategory(); + category.readNBT(compound); + DialogController.Instance.saveCategory(category); + ScrollDataPacket.sendScrollData((EntityPlayerMP) player, DialogController.Instance.getScroll()); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogNpcGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogNpcGetPacket.java new file mode 100644 index 000000000..35eebf0c7 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogNpcGetPacket.java @@ -0,0 +1,47 @@ +package kamkeel.npcs.network.packets.request.dialog; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import noppes.npcs.NoppesUtilServer; + +import java.io.IOException; + +public final class DialogNpcGetPacket extends AbstractPacket { + public static String packetName = "Request|DialogNpcGet"; + + public DialogNpcGetPacket() { + } + + @Override + public Enum getType() { + return EnumRequestPacket.DialogNpcGet; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + // No permission override + @SideOnly(Side.CLIENT) + + @Override + public void sendData(ByteBuf out) throws IOException { + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return; + NoppesUtilServer.sendNpcDialogs(player); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogNpcRemovePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogNpcRemovePacket.java new file mode 100644 index 000000000..71698ffae --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogNpcRemovePacket.java @@ -0,0 +1,63 @@ +package kamkeel.npcs.network.packets.request.dialog; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import noppes.npcs.CustomNpcsPermissions; + +import java.io.IOException; + +public final class DialogNpcRemovePacket extends AbstractPacket { + public static String packetName = "Request|DialogNpcRemove"; + + private int index; + + public DialogNpcRemovePacket(int index) { + this.index = index; + } + + public DialogNpcRemovePacket() { + } + + @Override + public Enum getType() { + return EnumRequestPacket.DialogNpcRemove; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.NPC_ADVANCED; + } + + @Override + public boolean needsNPC() { + return true; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + out.writeInt(index); + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return; + int idx = in.readInt(); + npc.dialogs.remove(idx); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogNpcSetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogNpcSetPacket.java new file mode 100644 index 000000000..a7db1b184 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogNpcSetPacket.java @@ -0,0 +1,76 @@ +package kamkeel.npcs.network.packets.request.dialog; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.network.packets.data.large.GuiDataPacket; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.CustomNpcsPermissions; +import noppes.npcs.NoppesUtilServer; +import noppes.npcs.controllers.data.DialogOption; + +import java.io.IOException; + +public final class DialogNpcSetPacket extends AbstractPacket { + public static String packetName = "Request|DialogNpcSet"; + + private int slot; + private int dialog; + + public DialogNpcSetPacket(int slot, int dialog) { + this.slot = slot; + this.dialog = dialog; + } + + public DialogNpcSetPacket() { + } + + @Override + public Enum getType() { + return EnumRequestPacket.DialogNpcSet; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.NPC_ADVANCED; + } + + @Override + public boolean needsNPC() { + return true; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + out.writeInt(slot); + out.writeInt(dialog); + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return; + int s = in.readInt(); + int d = in.readInt(); + DialogOption option = NoppesUtilServer.setNpcDialog(s, d, player); + if (option != null && option.hasDialog()) { + NBTTagCompound compound = option.writeNBT(); + compound.setInteger("Position", s); + GuiDataPacket.sendGuiData((EntityPlayerMP) player, compound); + } + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogRemovePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogRemovePacket.java new file mode 100644 index 000000000..1f62d8304 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogRemovePacket.java @@ -0,0 +1,73 @@ +package kamkeel.npcs.network.packets.request.dialog; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import noppes.npcs.CustomNpcsPermissions; +import noppes.npcs.NoppesUtilServer; +import noppes.npcs.controllers.DialogController; +import noppes.npcs.controllers.data.Dialog; + +import java.io.IOException; + +public final class DialogRemovePacket extends AbstractPacket { + public static String packetName = "Request|DialogRemove"; + + private int diagId; + private boolean sendGroup; + + public DialogRemovePacket(int diagId, boolean sendGroup) { + this.diagId = diagId; + this.sendGroup = sendGroup; + } + + public DialogRemovePacket() { + } + + @Override + public Enum getType() { + return EnumRequestPacket.DialogRemove; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.GLOBAL_DIALOG; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + out.writeInt(diagId); + out.writeBoolean(sendGroup); + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return; + int id = in.readInt(); + boolean sendGroup = in.readBoolean(); + Dialog dialog = DialogController.Instance.dialogs.get(id); + if (dialog != null && dialog.category != null) { + DialogController.Instance.removeDialog(dialog); + if (sendGroup) { + NoppesUtilServer.sendDialogGroup((EntityPlayerMP) player, dialog.category); + } else { + NoppesUtilServer.sendDialogData((EntityPlayerMP) player, dialog.category); + } + } + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogSavePacket.java new file mode 100644 index 000000000..c221e043e --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogSavePacket.java @@ -0,0 +1,85 @@ +package kamkeel.npcs.network.packets.request.dialog; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.util.ByteBufUtils; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.CustomNpcsPermissions; +import noppes.npcs.NoppesUtilServer; +import noppes.npcs.controllers.DialogController; +import noppes.npcs.controllers.data.Dialog; + +import java.io.IOException; + +public final class DialogSavePacket extends AbstractPacket { + public static String packetName = "Request|DialogSave"; + + private int categoryId; + private NBTTagCompound dialogNBT; + private boolean sendGroup; + + public DialogSavePacket(int categoryId, NBTTagCompound dialogNBT, boolean sendGroup) { + this.categoryId = categoryId; + this.dialogNBT = dialogNBT; + this.sendGroup = sendGroup; + } + + public DialogSavePacket() { + } + + @Override + public Enum getType() { + return EnumRequestPacket.DialogSave; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.GLOBAL_DIALOG; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + out.writeInt(categoryId); + ByteBufUtils.writeNBT(out, dialogNBT); + out.writeBoolean(sendGroup); + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) + return; + + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) + return; + + int cat = in.readInt(); + NBTTagCompound compound = ByteBufUtils.readNBT(in); + boolean sendGroup = in.readBoolean(); + Dialog dialog = new Dialog(); + dialog.readNBT(compound); + DialogController.Instance.saveDialog(cat, dialog); + + if (dialog.category != null) { + if (sendGroup) { + NoppesUtilServer.sendDialogGroup((EntityPlayerMP) player, dialog.category); + } else { + NoppesUtilServer.sendDialogData((EntityPlayerMP) player, dialog.category); + } + } + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/faction/FactionRemovePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/faction/FactionRemovePacket.java new file mode 100644 index 000000000..2a2859398 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/faction/FactionRemovePacket.java @@ -0,0 +1,73 @@ +package kamkeel.npcs.network.packets.request.faction; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.network.packets.data.large.GuiDataPacket; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.CustomNpcsPermissions; +import noppes.npcs.NoppesUtilServer; +import noppes.npcs.controllers.FactionController; +import noppes.npcs.controllers.data.Faction; + +import java.io.IOException; + +public final class FactionRemovePacket extends AbstractPacket { + public static String packetName = "Request|FactionRemove"; + + private int factionId; + + public FactionRemovePacket(int factionId) { + this.factionId = factionId; + } + + public FactionRemovePacket() { + + } + + @Override + public Enum getType() { + return EnumRequestPacket.FactionRemove; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.GLOBAL_FACTION; + } + + @Override + public boolean needsNPC() { + return true; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + out.writeInt(factionId); + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return; + int id = in.readInt(); + FactionController.getInstance().delete(id); + NoppesUtilServer.sendFactionDataAll((EntityPlayerMP) player); + NBTTagCompound comp = new NBTTagCompound(); + new Faction().writeNBT(comp); + GuiDataPacket.sendGuiData((EntityPlayerMP) player, comp); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/faction/FactionSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/faction/FactionSavePacket.java new file mode 100644 index 000000000..0446834fb --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/faction/FactionSavePacket.java @@ -0,0 +1,75 @@ +package kamkeel.npcs.network.packets.request.faction; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.network.packets.data.large.GuiDataPacket; +import kamkeel.npcs.util.ByteBufUtils; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.CustomNpcsPermissions; +import noppes.npcs.NoppesUtilServer; +import noppes.npcs.controllers.FactionController; +import noppes.npcs.controllers.data.Faction; + +import java.io.IOException; + +public final class FactionSavePacket extends AbstractPacket { + public static String packetName = "Request|FactionSave"; + + private NBTTagCompound factionNBT; + + public FactionSavePacket(NBTTagCompound factionNBT) { + this.factionNBT = factionNBT; + } + + public FactionSavePacket() { + } + + @Override + public Enum getType() { + return EnumRequestPacket.FactionSave; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.GLOBAL_FACTION; + } + + @Override + public boolean needsNPC() { + return true; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + ByteBufUtils.writeNBT(out, factionNBT); + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return; + NBTTagCompound compound = ByteBufUtils.readNBT(in); + Faction faction = new Faction(); + faction.readNBT(compound); + FactionController.getInstance().saveFaction(faction); + NoppesUtilServer.sendFactionDataAll((EntityPlayerMP) player); + NBTTagCompound comp = new NBTTagCompound(); + faction.writeNBT(comp); + GuiDataPacket.sendGuiData((EntityPlayerMP) player, comp); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/faction/FactionSetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/faction/FactionSetPacket.java new file mode 100644 index 000000000..3c9a550f1 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/faction/FactionSetPacket.java @@ -0,0 +1,63 @@ +package kamkeel.npcs.network.packets.request.faction; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import noppes.npcs.CustomNpcsPermissions; + +import java.io.IOException; + +public final class FactionSetPacket extends AbstractPacket { + public static String packetName = "Request|FactionSet"; + + private int facID; + + public FactionSetPacket() { + } + + public FactionSetPacket(int id) { + this.facID = id; + } + + @Override + public Enum getType() { + return EnumRequestPacket.FactionSet; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.NPC_ADVANCED; + } + + @Override + public boolean needsNPC() { + return true; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + out.writeInt(this.facID); + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return; + int factionId = in.readInt(); + npc.setFaction(factionId); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobGetPacket.java new file mode 100644 index 000000000..d2c1fd772 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobGetPacket.java @@ -0,0 +1,65 @@ +package kamkeel.npcs.network.packets.request.jobs; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.network.packets.data.large.GuiDataPacket; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.CustomNpcsPermissions; +import noppes.npcs.constants.EnumJobType; +import noppes.npcs.roles.JobSpawner; + +import java.io.IOException; + +public final class JobGetPacket extends AbstractPacket { + public static String packetName = "Request|JobGet"; + + public JobGetPacket() { } + + @Override + public Enum getType() { + return EnumRequestPacket.JobGet; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.NPC_ADVANCED; + } + + @Override + public boolean needsNPC() { + return true; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return; + if(npc.jobInterface == null) return; + NBTTagCompound compound = new NBTTagCompound(); + compound.setBoolean("JobData", true); + npc.jobInterface.writeToNBT(compound); + if(npc.advanced.job == EnumJobType.Spawner) + ((JobSpawner)npc.jobInterface).cleanCompound(compound); + GuiDataPacket.sendGuiData((EntityPlayerMP) player, compound); + if(npc.advanced.job == EnumJobType.Spawner) + GuiDataPacket.sendGuiData((EntityPlayerMP) player, ((JobSpawner)npc.jobInterface).getTitles()); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobSavePacket.java new file mode 100644 index 000000000..9349bae65 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobSavePacket.java @@ -0,0 +1,63 @@ +package kamkeel.npcs.network.packets.request.jobs; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.util.ByteBufUtils; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.CustomNpcsPermissions; + +import java.io.IOException; +import java.util.Set; + +public final class JobSavePacket extends AbstractPacket { + public static String packetName = "Request|JobSave"; + + public JobSavePacket() { } + + @Override + public Enum getType() { + return EnumRequestPacket.JobSave; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.NPC_ADVANCED; + } + + @Override + public boolean needsNPC() { + return true; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return; + NBTTagCompound original = npc.jobInterface.writeToNBT(new NBTTagCompound()); + NBTTagCompound compound = ByteBufUtils.readNBT(in); + Set names = compound.func_150296_c(); + for(String name : names) + original.setTag(name, compound.getTag(name)); + + npc.jobInterface.readFromNBT(original); + npc.updateClient = true; + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobSpawnerAddPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobSpawnerAddPacket.java new file mode 100644 index 000000000..5af9844b7 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobSpawnerAddPacket.java @@ -0,0 +1,68 @@ +package kamkeel.npcs.network.packets.request.jobs; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.network.packets.data.large.GuiDataPacket; +import kamkeel.npcs.util.ByteBufUtils; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.CustomNpcsPermissions; +import noppes.npcs.constants.EnumJobType; +import noppes.npcs.controllers.ServerCloneController; +import noppes.npcs.roles.JobSpawner; + +import java.io.IOException; + +public final class JobSpawnerAddPacket extends AbstractPacket { + public static String packetName = "Request|JobSpawnerAdd"; + + public JobSpawnerAddPacket() { } + + @Override + public Enum getType() { + return EnumRequestPacket.JobSpawnerAdd; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.NPC_ADVANCED; + } + + @Override + public boolean needsNPC() { + return true; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return; + if(npc.advanced.job != EnumJobType.Spawner) return; + JobSpawner job = (JobSpawner) npc.jobInterface; + boolean useServerClone = in.readBoolean(); + if(useServerClone){ + NBTTagCompound compound = ServerCloneController.Instance.getCloneData(null, ByteBufUtils.readString(in), in.readInt()); + job.setJobCompound(in.readInt(), compound); + } else { + job.setJobCompound(in.readInt(), ByteBufUtils.readNBT(in)); + } + GuiDataPacket.sendGuiData((EntityPlayerMP) player, job.getTitles()); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobSpawnerRemovePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobSpawnerRemovePacket.java new file mode 100644 index 000000000..0fa6cd82b --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobSpawnerRemovePacket.java @@ -0,0 +1,59 @@ +package kamkeel.npcs.network.packets.request.jobs; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.network.packets.data.large.GuiDataPacket; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import noppes.npcs.CustomNpcsPermissions; +import noppes.npcs.constants.EnumJobType; +import noppes.npcs.roles.JobSpawner; + +import java.io.IOException; + +public final class JobSpawnerRemovePacket extends AbstractPacket { + public static String packetName = "Request|JobSpawnerRemove"; + + public JobSpawnerRemovePacket() { } + + @Override + public Enum getType() { + return EnumRequestPacket.JobSpawnerRemove; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.NPC_ADVANCED; + } + + @Override + public boolean needsNPC() { + return true; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return; + if(npc.advanced.job != EnumJobType.Spawner) return; + JobSpawner job = (JobSpawner) npc.jobInterface; + job.setJobCompound(in.readInt(), null); + GuiDataPacket.sendGuiData((EntityPlayerMP) player, job.getTitles()); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedAddPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedAddPacket.java new file mode 100644 index 000000000..c7bc20b48 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedAddPacket.java @@ -0,0 +1,72 @@ +package kamkeel.npcs.network.packets.request.linked; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.network.packets.data.large.ScrollListPacket; +import kamkeel.npcs.util.ByteBufUtils; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import noppes.npcs.CustomNpcsPermissions; +import noppes.npcs.controllers.LinkedNpcController; +import noppes.npcs.controllers.LinkedNpcController.LinkedData; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + +public final class LinkedAddPacket extends AbstractPacket { + public static String packetName = "Request|LinkedAdd"; + + private String data; + + public LinkedAddPacket(String data) { + this.data = data; + } + + public LinkedAddPacket() { + } + + @Override + public Enum getType() { + return EnumRequestPacket.LinkedAdd; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.GLOBAL_LINKED; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + ByteBufUtils.writeString(out, data); + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) + return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) + return; + + String received = ByteBufUtils.readString(in); + LinkedNpcController.Instance.addData(received); + List list = new ArrayList<>(); + for (LinkedData d : LinkedNpcController.Instance.list) { + list.add(d.name); + } + ScrollListPacket.sendList((EntityPlayerMP) player, list); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedGetAllPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedGetAllPacket.java new file mode 100644 index 000000000..279f572cf --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedGetAllPacket.java @@ -0,0 +1,58 @@ +package kamkeel.npcs.network.packets.request.linked; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.network.packets.data.ScrollSelectedPacket; +import kamkeel.npcs.network.packets.data.large.ScrollListPacket; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import noppes.npcs.controllers.LinkedNpcController; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + +public final class LinkedGetAllPacket extends AbstractPacket { + public static String packetName = "Request|LinkedGetAll"; + + public LinkedGetAllPacket() { + } + + @Override + public Enum getType() { + return EnumRequestPacket.LinkedGetAll; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) + return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) + return; + List list = new ArrayList<>(); + for (LinkedNpcController.LinkedData d : LinkedNpcController.Instance.list) { + list.add(d.name); + } + ScrollListPacket.sendList((EntityPlayerMP) player, list); + if (npc != null) { + ScrollSelectedPacket.setSelectedList((EntityPlayerMP) player, npc.linkedName); + } + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedRemovePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedRemovePacket.java new file mode 100644 index 000000000..b60bd3249 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedRemovePacket.java @@ -0,0 +1,71 @@ +package kamkeel.npcs.network.packets.request.linked; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.network.packets.data.large.ScrollListPacket; +import kamkeel.npcs.util.ByteBufUtils; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import noppes.npcs.CustomNpcsPermissions; +import noppes.npcs.controllers.LinkedNpcController; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + +public final class LinkedRemovePacket extends AbstractPacket { + public static String packetName = "Request|LinkedRemove"; + + private String data; + + public LinkedRemovePacket(String data) { + this.data = data; + } + + public LinkedRemovePacket() { + } + + @Override + public Enum getType() { + return EnumRequestPacket.LinkedRemove; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.GLOBAL_LINKED; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + ByteBufUtils.writeString(out, data); + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) + return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) + return; + + String received = ByteBufUtils.readString(in); + LinkedNpcController.Instance.removeData(received); + List list = new ArrayList<>(); + for (LinkedNpcController.LinkedData d : LinkedNpcController.Instance.list) { + list.add(d.name); + } + ScrollListPacket.sendList((EntityPlayerMP) player, list); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedSetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedSetPacket.java new file mode 100644 index 000000000..e2c664f56 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedSetPacket.java @@ -0,0 +1,67 @@ +package kamkeel.npcs.network.packets.request.linked; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.util.ByteBufUtils; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import noppes.npcs.CustomNpcsPermissions; +import noppes.npcs.controllers.LinkedNpcController; + +import java.io.IOException; + +public final class LinkedSetPacket extends AbstractPacket { + public static String packetName = "Request|LinkedSet"; + + private String linkedName; + + public LinkedSetPacket(String linkedName) { + this.linkedName = linkedName; + } + + public LinkedSetPacket() { + } + + @Override + public Enum getType() { + return EnumRequestPacket.LinkedSet; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.NPC_ADVANCED; + } + + @Override + public boolean needsNPC() { + return true; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + ByteBufUtils.writeString(out, linkedName); + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) + return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) + return; + npc.linkedName = ByteBufUtils.readString(in); + LinkedNpcController.Instance.loadNpcData(npc); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuAIGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuAIGetPacket.java new file mode 100644 index 000000000..9787971da --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuAIGetPacket.java @@ -0,0 +1,44 @@ +package kamkeel.npcs.network.packets.request.mainmenu; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.network.packets.data.large.GuiDataPacket; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.nbt.NBTTagCompound; + +import java.io.IOException; + +public final class MainmenuAIGetPacket extends AbstractPacket { + public static String packetName = "Request|MainmenuAIGet"; + + public MainmenuAIGetPacket() { } + + @Override + public Enum getType() { + return EnumRequestPacket.MainmenuAIGet; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return; + GuiDataPacket.sendGuiData((EntityPlayerMP) player, npc.ai.writeToNBT(new NBTTagCompound())); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuAISavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuAISavePacket.java new file mode 100644 index 000000000..2be4a82e8 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuAISavePacket.java @@ -0,0 +1,57 @@ +package kamkeel.npcs.network.packets.request.mainmenu; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.util.ByteBufUtils; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import noppes.npcs.CustomNpcsPermissions; + +import java.io.IOException; + +public final class MainmenuAISavePacket extends AbstractPacket { + public static String packetName = "Request|MainmenuAISave"; + + public MainmenuAISavePacket() { } + + @Override + public Enum getType() { + return EnumRequestPacket.MainmenuAISave; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.NPC_AI; + } + + @Override + public boolean needsNPC() { + return true; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return; + npc.ai.readToNBT(ByteBufUtils.readNBT(in)); + npc.setHealth(npc.getMaxHealth()); + npc.updateAI = true; + npc.updateClient = true; + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuAdvancedGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuAdvancedGetPacket.java new file mode 100644 index 000000000..922dc380a --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuAdvancedGetPacket.java @@ -0,0 +1,55 @@ +package kamkeel.npcs.network.packets.request.mainmenu; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.network.packets.data.large.GuiDataPacket; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.CustomNpcsPermissions; + +import java.io.IOException; + +public final class MainmenuAdvancedGetPacket extends AbstractPacket { + public static String packetName = "Request|MainmenuAdvancedGet"; + + public MainmenuAdvancedGetPacket() { } + + @Override + public Enum getType() { + return EnumRequestPacket.MainmenuAdvancedGet; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.NPC_ADVANCED; + } + + @Override + public boolean needsNPC() { + return true; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return; + GuiDataPacket.sendGuiData((EntityPlayerMP) player, npc.advanced.writeToNBT(new NBTTagCompound())); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuAdvancedMarkDataPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuAdvancedMarkDataPacket.java new file mode 100644 index 000000000..8e687fa7a --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuAdvancedMarkDataPacket.java @@ -0,0 +1,57 @@ +package kamkeel.npcs.network.packets.request.mainmenu; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.util.ByteBufUtils; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import noppes.npcs.CustomNpcsPermissions; +import noppes.npcs.controllers.data.MarkData; + +import java.io.IOException; + +public final class MainmenuAdvancedMarkDataPacket extends AbstractPacket { + public static String packetName = "Request|MainmenuAdvancedMarkData"; + + public MainmenuAdvancedMarkDataPacket() { } + + @Override + public Enum getType() { + return EnumRequestPacket.MainmenuAdvancedMarkData; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.NPC_ADVANCED; + } + + @Override + public boolean needsNPC() { + return true; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return; + MarkData data = MarkData.get(npc); + data.setNBT(ByteBufUtils.readNBT(in)); + data.syncClients(); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuAdvancedSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuAdvancedSavePacket.java new file mode 100644 index 000000000..e1bc7264e --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuAdvancedSavePacket.java @@ -0,0 +1,56 @@ +package kamkeel.npcs.network.packets.request.mainmenu; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.util.ByteBufUtils; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import noppes.npcs.CustomNpcsPermissions; + +import java.io.IOException; + +public final class MainmenuAdvancedSavePacket extends AbstractPacket { + public static String packetName = "Request|MainmenuAdvancedSave"; + + public MainmenuAdvancedSavePacket() { } + + @Override + public Enum getType() { + return EnumRequestPacket.MainmenuAdvancedSave; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.NPC_ADVANCED; + } + + @Override + public boolean needsNPC() { + return true; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return; + npc.advanced.readToNBT(ByteBufUtils.readNBT(in)); + npc.updateAI = true; + npc.updateClient = true; + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuDisplayGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuDisplayGetPacket.java new file mode 100644 index 000000000..d22b39680 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuDisplayGetPacket.java @@ -0,0 +1,57 @@ +package kamkeel.npcs.network.packets.request.mainmenu; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.network.packets.data.large.GuiDataPacket; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.CustomNpcsPermissions; + +import java.io.IOException; + +public final class MainmenuDisplayGetPacket extends AbstractPacket { + public static String packetName = "Request|MainmenuDisplayGet"; + + public MainmenuDisplayGetPacket() { + } + + @Override + public Enum getType() { + return EnumRequestPacket.MainmenuDisplayGet; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.NPC_DISPLAY; + } + + @Override + public boolean needsNPC() { + return true; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return; + GuiDataPacket.sendGuiData((EntityPlayerMP) player, npc.display.writeToNBT(new NBTTagCompound())); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuDisplaySavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuDisplaySavePacket.java new file mode 100644 index 000000000..9d82076a8 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuDisplaySavePacket.java @@ -0,0 +1,57 @@ +package kamkeel.npcs.network.packets.request.mainmenu; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.util.ByteBufUtils; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import noppes.npcs.CustomNpcsPermissions; + +import java.io.IOException; + +public final class MainmenuDisplaySavePacket extends AbstractPacket { + public static String packetName = "Request|MainmenuDisplaySave"; + + public MainmenuDisplaySavePacket() { + } + + @Override + public Enum getType() { + return EnumRequestPacket.MainmenuDisplaySave; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.NPC_DISPLAY; + } + + @Override + public boolean needsNPC() { + return true; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return; + npc.display.readToNBT(ByteBufUtils.readNBT(in)); + npc.updateClient = true; + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuInvGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuInvGetPacket.java new file mode 100644 index 000000000..765d0f382 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuInvGetPacket.java @@ -0,0 +1,57 @@ +package kamkeel.npcs.network.packets.request.mainmenu; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.network.packets.data.large.GuiDataPacket; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.CustomNpcsPermissions; + +import java.io.IOException; + +public final class MainmenuInvGetPacket extends AbstractPacket { + public static String packetName = "Request|MainmenuInvGet"; + + public MainmenuInvGetPacket() { + } + + @Override + public Enum getType() { + return EnumRequestPacket.MainmenuInvGet; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.NPC_INVENTORY; + } + + @Override + public boolean needsNPC() { + return true; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return; + GuiDataPacket.sendGuiData((EntityPlayerMP) player, npc.inventory.writeEntityToNBT(new NBTTagCompound())); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuInvSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuInvSavePacket.java new file mode 100644 index 000000000..86fc4ad78 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuInvSavePacket.java @@ -0,0 +1,56 @@ +package kamkeel.npcs.network.packets.request.mainmenu; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.util.ByteBufUtils; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import noppes.npcs.CustomNpcsPermissions; + +import java.io.IOException; + +public final class MainmenuInvSavePacket extends AbstractPacket { + public static String packetName = "Request|MainmenuInvSave"; + + public MainmenuInvSavePacket() { } + + @Override + public Enum getType() { + return EnumRequestPacket.MainmenuInvSave; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.NPC_INVENTORY; + } + + @Override + public boolean needsNPC() { + return true; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return; + npc.inventory.readEntityFromNBT(ByteBufUtils.readNBT(in)); + npc.updateAI = true; + npc.updateClient = true; + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuStatsGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuStatsGetPacket.java new file mode 100644 index 000000000..4598e8f4d --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuStatsGetPacket.java @@ -0,0 +1,57 @@ +package kamkeel.npcs.network.packets.request.mainmenu; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.network.packets.data.large.GuiDataPacket; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.CustomNpcsPermissions; + +import java.io.IOException; + +public final class MainmenuStatsGetPacket extends AbstractPacket { + public static String packetName = "Request|MainmenuStatsGet"; + + public MainmenuStatsGetPacket() { + } + + @Override + public Enum getType() { + return EnumRequestPacket.MainmenuStatsGet; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.NPC_STATS; + } + + @Override + public boolean needsNPC() { + return true; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return; + GuiDataPacket.sendGuiData((EntityPlayerMP) player, npc.stats.writeToNBT(new NBTTagCompound())); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuStatsSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuStatsSavePacket.java new file mode 100644 index 000000000..b840a8e3a --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/mainmenu/MainmenuStatsSavePacket.java @@ -0,0 +1,57 @@ +package kamkeel.npcs.network.packets.request.mainmenu; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.util.ByteBufUtils; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import noppes.npcs.CustomNpcsPermissions; + +import java.io.IOException; + +public final class MainmenuStatsSavePacket extends AbstractPacket { + public static String packetName = "Request|MainmenuStatsSave"; + + public MainmenuStatsSavePacket() { + } + + @Override + public Enum getType() { + return EnumRequestPacket.MainmenuStatsSave; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.NPC_STATS; + } + + @Override + public boolean needsNPC() { + return true; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return; + npc.stats.readToNBT(ByteBufUtils.readNBT(in)); + npc.updateClient = true; + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/naturalspawns/NaturalSpawnGetAllPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/naturalspawns/NaturalSpawnGetAllPacket.java new file mode 100644 index 000000000..5058f5e00 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/naturalspawns/NaturalSpawnGetAllPacket.java @@ -0,0 +1,48 @@ +package kamkeel.npcs.network.packets.request.naturalspawns; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.network.packets.data.large.ScrollDataPacket; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import noppes.npcs.controllers.SpawnController; + +import java.io.IOException; + +public final class NaturalSpawnGetAllPacket extends AbstractPacket { + public static String packetName = "Request|NaturalSpawnGetAll"; + + public NaturalSpawnGetAllPacket() { + } + + @Override + public Enum getType() { + return EnumRequestPacket.NaturalSpawnGetAll; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) + return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) + return; + ScrollDataPacket.sendScrollData((EntityPlayerMP) player, SpawnController.Instance.getScroll()); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/naturalspawns/NaturalSpawnGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/naturalspawns/NaturalSpawnGetPacket.java new file mode 100644 index 000000000..7294874f6 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/naturalspawns/NaturalSpawnGetPacket.java @@ -0,0 +1,62 @@ +package kamkeel.npcs.network.packets.request.naturalspawns; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.network.packets.data.large.GuiDataPacket; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.controllers.SpawnController; +import noppes.npcs.controllers.data.SpawnData; + +import java.io.IOException; + +public final class NaturalSpawnGetPacket extends AbstractPacket { + public static String packetName = "Request|NaturalSpawnGet"; + + private int spawnId; + + public NaturalSpawnGetPacket(int spawnId) { + this.spawnId = spawnId; + } + + public NaturalSpawnGetPacket() { + } + + @Override + public Enum getType() { + return EnumRequestPacket.NaturalSpawnGet; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + out.writeInt(spawnId); + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) + return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) + return; + int id = in.readInt(); + SpawnData spawn = SpawnController.Instance.getSpawnData(id); + if (spawn != null) { + GuiDataPacket.sendGuiData((EntityPlayerMP) player, spawn.writeNBT(new NBTTagCompound())); + } + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/naturalspawns/NaturalSpawnRemovePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/naturalspawns/NaturalSpawnRemovePacket.java new file mode 100644 index 000000000..03e71a7a5 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/naturalspawns/NaturalSpawnRemovePacket.java @@ -0,0 +1,63 @@ +package kamkeel.npcs.network.packets.request.naturalspawns; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.network.packets.data.large.ScrollDataPacket; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import noppes.npcs.CustomNpcsPermissions; +import noppes.npcs.controllers.SpawnController; + +import java.io.IOException; + +public final class NaturalSpawnRemovePacket extends AbstractPacket { + public static String packetName = "Request|NaturalSpawnRemove"; + + private int spawnId; + + public NaturalSpawnRemovePacket(int spawnId) { + this.spawnId = spawnId; + } + + public NaturalSpawnRemovePacket() { + } + + @Override + public Enum getType() { + return EnumRequestPacket.NaturalSpawnRemove; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.GLOBAL_NATURALSPAWN; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + out.writeInt(spawnId); + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) + return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) + return; + int id = in.readInt(); + SpawnController.Instance.removeSpawnData(id); + ScrollDataPacket.sendScrollData((EntityPlayerMP) player, SpawnController.Instance.getScroll()); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/naturalspawns/NaturalSpawnSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/naturalspawns/NaturalSpawnSavePacket.java new file mode 100644 index 000000000..c9ab359a5 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/naturalspawns/NaturalSpawnSavePacket.java @@ -0,0 +1,68 @@ +package kamkeel.npcs.network.packets.request.naturalspawns; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.network.packets.data.large.ScrollDataPacket; +import kamkeel.npcs.util.ByteBufUtils; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.CustomNpcsPermissions; +import noppes.npcs.controllers.SpawnController; +import noppes.npcs.controllers.data.SpawnData; + +import java.io.IOException; + +public final class NaturalSpawnSavePacket extends AbstractPacket { + public static String packetName = "Request|NaturalSpawnSave"; + + private NBTTagCompound spawnNBT; + + public NaturalSpawnSavePacket(NBTTagCompound spawnNBT) { + this.spawnNBT = spawnNBT; + } + + public NaturalSpawnSavePacket() { + } + + @Override + public Enum getType() { + return EnumRequestPacket.NaturalSpawnSave; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.GLOBAL_NATURALSPAWN; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + ByteBufUtils.writeNBT(out, spawnNBT); + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) + return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) + return; + NBTTagCompound compound = ByteBufUtils.readNBT(in); + SpawnData data = new SpawnData(); + data.readNBT(compound); + SpawnController.Instance.saveSpawnData(data); + ScrollDataPacket.sendScrollData((EntityPlayerMP) player, SpawnController.Instance.getScroll()); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/npc/ModelDataSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/npc/ModelDataSavePacket.java new file mode 100644 index 000000000..06e6412de --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/npc/ModelDataSavePacket.java @@ -0,0 +1,58 @@ +package kamkeel.npcs.network.packets.request.npc; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.util.ByteBufUtils; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import noppes.npcs.CustomNpcsPermissions; +import noppes.npcs.entity.EntityCustomNpc; + +import java.io.IOException; + +public final class ModelDataSavePacket extends AbstractPacket { + public static String packetName = "Request|ModelDataSave"; + + public ModelDataSavePacket() { } + + @Override + public Enum getType() { + return EnumRequestPacket.ModelDataSave; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.NPC_DISPLAY; + } + + @Override + public boolean needsNPC() { + return true; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return; + if(npc instanceof EntityCustomNpc) + ((EntityCustomNpc)npc).modelData.readFromNBT(ByteBufUtils.readNBT(in)); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/npc/NpcClosePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/npc/NpcClosePacket.java new file mode 100644 index 000000000..53cbb4e2c --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/npc/NpcClosePacket.java @@ -0,0 +1,67 @@ +package kamkeel.npcs.network.packets.request.npc; + +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import net.minecraft.entity.player.EntityPlayer; +import noppes.npcs.CustomNpcsPermissions; +import noppes.npcs.LogWriter; +import noppes.npcs.NoppesUtilServer; +import noppes.npcs.config.ConfigDebug; +import noppes.npcs.controllers.LinkedNpcController; + +import java.io.IOException; + +public final class NpcClosePacket extends AbstractPacket { + public static final String packetName = "Request|NPCClose"; + + public NpcClosePacket() { + } + + @Override + public Enum getType() { + return EnumRequestPacket.NpcClose; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.NPC_GUI; + } + + @Override + public boolean needsNPC() { + return true; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) + return; + + npc.reset(); + if (npc.linkedData != null) + LinkedNpcController.Instance.saveNpcData(npc); + + if (ConfigDebug.PlayerLogging && FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER) { + LogWriter.script(String.format("[%s] (Player) %s CLOSE NPC %s (%s, %s, %s) [%s]", "WAND", player.getCommandSenderName(), npc.display.getName(), (int) npc.posX, (int) npc.posY, (int) npc.posZ, npc.worldObj.getWorldInfo().getWorldName())); + } + NoppesUtilServer.setEditingNpc(player, null); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/npc/NpcDeletePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/npc/NpcDeletePacket.java new file mode 100644 index 000000000..373b75823 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/npc/NpcDeletePacket.java @@ -0,0 +1,67 @@ +package kamkeel.npcs.network.packets.request.npc; + +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import net.minecraft.entity.player.EntityPlayer; +import noppes.npcs.CustomNpcsPermissions; +import noppes.npcs.LogWriter; +import noppes.npcs.NoppesUtilServer; +import noppes.npcs.config.ConfigDebug; + +import java.io.IOException; + +public final class NpcDeletePacket extends AbstractPacket { + public static final String packetName = "Request|NPCDelete"; + + public NpcDeletePacket() { + } + + + @Override + public Enum getType() { + return EnumRequestPacket.NPCDelete; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.NPC_DELETE; + } + + @Override + public boolean needsNPC() { + return true; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) + return; + + if (ConfigDebug.PlayerLogging && FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER) { + LogWriter.script(String.format("[%s] (Player) %s DELETE NPC %s (%s, %s, %s) [%s]", "WAND", player.getCommandSenderName(), npc.display.getName(), (int) npc.posX, (int) npc.posY, (int) npc.posZ, npc.worldObj.getWorldInfo().getWorldName())); + } + + npc.delete(); + NoppesUtilServer.deleteNpc(npc, player); + } + + +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteDeletePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteDeletePacket.java new file mode 100644 index 000000000..da20d663f --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteDeletePacket.java @@ -0,0 +1,81 @@ +package kamkeel.npcs.network.packets.request.npc; + +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import noppes.npcs.CustomNpcsPermissions; +import noppes.npcs.LogWriter; +import noppes.npcs.NoppesUtilServer; +import noppes.npcs.config.ConfigDebug; +import noppes.npcs.entity.EntityNPCInterface; + +import java.io.IOException; + +public final class RemoteDeletePacket extends AbstractPacket { + public static String packetName = "Request|RemoteDelete"; + + private int entityId; + + public RemoteDeletePacket(int entityId) { + this.entityId = entityId; + } + + public RemoteDeletePacket() { + } + + @Override + public Enum getType() { + return EnumRequestPacket.RemoteDelete; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.NPC_DELETE; + } + + @Override + public boolean needsNPC() { + return true; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + out.writeInt(entityId); + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof net.minecraft.entity.player.EntityPlayerMP)) + return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) + return; + int id = in.readInt(); + Entity entity = player.worldObj.getEntityByID(id); + if (!(entity instanceof EntityNPCInterface)) + return; + + npc = (EntityNPCInterface) entity; + if (ConfigDebug.PlayerLogging && FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER) { + LogWriter.script(String.format("[%s] (Player) %s DELETE NPC %s (%s, %s, %s) [%s]", "WAND", player.getCommandSenderName(), npc.display.getName(), (int) npc.posX, (int) npc.posY, (int) npc.posZ, npc.worldObj.getWorldInfo().getWorldName())); + } + npc.delete(); + NoppesUtilServer.deleteNpc(npc, player); + NoppesUtilServer.sendNearbyNpcs((EntityPlayerMP) player); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteFreezeGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteFreezeGetPacket.java new file mode 100644 index 000000000..7eeede76c --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteFreezeGetPacket.java @@ -0,0 +1,48 @@ +package kamkeel.npcs.network.packets.request.npc; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.network.packets.data.ScrollSelectedPacket; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import noppes.npcs.CustomNpcs; + +import java.io.IOException; + +public final class RemoteFreezeGetPacket extends AbstractPacket { + public static String packetName = "Request|RemoteFreezeGet"; + + public RemoteFreezeGetPacket() { + } + + @Override + public Enum getType() { + return EnumRequestPacket.RemoteFreezeGet; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) + return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) + return; + ScrollSelectedPacket.setSelectedList((EntityPlayerMP) player, CustomNpcs.FreezeNPCs ? "Unfreeze NPCs" : "Freeze NPCs"); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteFreezePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteFreezePacket.java new file mode 100644 index 000000000..0604bedae --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteFreezePacket.java @@ -0,0 +1,55 @@ +package kamkeel.npcs.network.packets.request.npc; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.network.packets.data.ScrollSelectedPacket; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import noppes.npcs.CustomNpcs; +import noppes.npcs.CustomNpcsPermissions; + +import java.io.IOException; + +public final class RemoteFreezePacket extends AbstractPacket { + public static String packetName = "Request|RemoteFreeze"; + + public RemoteFreezePacket() { + } + + @Override + public Enum getType() { + return EnumRequestPacket.RemoteFreeze; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.NPC_FREEZE; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) + return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) + return; + CustomNpcs.FreezeNPCs = !CustomNpcs.FreezeNPCs; + ScrollSelectedPacket.setSelectedList((EntityPlayerMP) player, CustomNpcs.FreezeNPCs ? "Unfreeze NPCs" : "Freeze NPCs"); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteGlobalMenuPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteGlobalMenuPacket.java new file mode 100644 index 000000000..e2f4a2af2 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteGlobalMenuPacket.java @@ -0,0 +1,61 @@ +package kamkeel.npcs.network.packets.request.npc; + +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import noppes.npcs.CustomNpcsPermissions; +import noppes.npcs.LogWriter; +import noppes.npcs.NoppesUtilServer; +import noppes.npcs.config.ConfigDebug; +import noppes.npcs.constants.EnumGuiType; + +import java.io.IOException; + +public final class RemoteGlobalMenuPacket extends AbstractPacket { + public static String packetName = "Request|RemoteGlobalMenu"; + + public RemoteGlobalMenuPacket() { + } + + @Override + public Enum getType() { + return EnumRequestPacket.RemoteGlobalMenu; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.GLOBAL_REMOTE; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) + return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) + return; + NoppesUtilServer.sendOpenGui(player, EnumGuiType.GlobalRemote, null); + if (ConfigDebug.PlayerLogging && FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER) { + LogWriter.script(String.format("[%s] (Player) %s OPEN GLOBAL MENU", + "WAND", player.getCommandSenderName())); + } + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteMainMenuPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteMainMenuPacket.java new file mode 100644 index 000000000..cedf13d76 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteMainMenuPacket.java @@ -0,0 +1,69 @@ +package kamkeel.npcs.network.packets.request.npc; + +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import noppes.npcs.CustomNpcsPermissions; +import noppes.npcs.LogWriter; +import noppes.npcs.NoppesUtilServer; +import noppes.npcs.config.ConfigDebug; +import noppes.npcs.constants.EnumGuiType; + +import java.io.IOException; + +public final class RemoteMainMenuPacket extends AbstractPacket { + public static String packetName = "Request|RemoteMainMenu"; + + public RemoteMainMenuPacket() { + } + + @Override + public Enum getType() { + return EnumRequestPacket.RemoteMainMenu; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.NPC_GUI; + } + + @Override + public boolean needsNPC() { + return true; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + // No extra data since npc is provided externally. + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) + return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) + return; + NoppesUtilServer.sendOpenGui(player, EnumGuiType.MainMenuDisplay, npc); + if (ConfigDebug.PlayerLogging && FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER) { + LogWriter.script(String.format("[%s] (Player) %s OPEN NPC %s (%s, %s, %s) [%s]", + "WAND", player.getCommandSenderName(), npc.display.getName(), + (int) npc.posX, (int) npc.posY, (int) npc.posZ, + npc.worldObj.getWorldInfo().getWorldName())); + } + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteNpcsGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteNpcsGetPacket.java new file mode 100644 index 000000000..6d4e84647 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteNpcsGetPacket.java @@ -0,0 +1,53 @@ +package kamkeel.npcs.network.packets.request.npc; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import noppes.npcs.CustomNpcsPermissions; +import noppes.npcs.NoppesUtilServer; + +import java.io.IOException; + +public final class RemoteNpcsGetPacket extends AbstractPacket { + public static String packetName = "Request|RemoteNpcsGet"; + + public RemoteNpcsGetPacket() { + } + + @Override + public Enum getType() { + return EnumRequestPacket.RemoteNpcsGet; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.NPC_GUI; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) + return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) + return; + NoppesUtilServer.sendNearbyNpcs((EntityPlayerMP) player); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteResetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteResetPacket.java new file mode 100644 index 000000000..3667f1526 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteResetPacket.java @@ -0,0 +1,57 @@ +package kamkeel.npcs.network.packets.request.npc; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import noppes.npcs.CustomNpcsPermissions; + +import java.io.IOException; + +public final class RemoteResetPacket extends AbstractPacket { + public static String packetName = "Request|RemoteReset"; + + public RemoteResetPacket() { + } + + @Override + public Enum getType() { + return EnumRequestPacket.RemoteReset; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.NPC_RESET; + } + + @Override + public boolean needsNPC() { + return true; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) + return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) + return; + npc.reset(); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteTpToNpcPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteTpToNpcPacket.java new file mode 100644 index 000000000..af8577e98 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/npc/RemoteTpToNpcPacket.java @@ -0,0 +1,57 @@ +package kamkeel.npcs.network.packets.request.npc; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import noppes.npcs.CustomNpcsPermissions; + +import java.io.IOException; + +public final class RemoteTpToNpcPacket extends AbstractPacket { + public static String packetName = "Request|RemoteTpToNpc"; + + public RemoteTpToNpcPacket() { + } + + @Override + public Enum getType() { + return EnumRequestPacket.RemoteTpToNpc; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.NPC_TELEPORT; + } + + @Override + public boolean needsNPC() { + return true; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) + return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) + return; + ((EntityPlayerMP) player).playerNetServerHandler.setPlayerLocation(npc.posX, npc.posY, npc.posZ, 0, 0); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/party/PartyAcceptInvitePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/party/PartyAcceptInvitePacket.java new file mode 100644 index 000000000..be9bf04ba --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/party/PartyAcceptInvitePacket.java @@ -0,0 +1,56 @@ +package kamkeel.npcs.network.packets.request.party; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.util.ByteBufUtils; +import net.minecraft.entity.player.EntityPlayer; +import noppes.npcs.controllers.PlayerDataController; +import noppes.npcs.controllers.data.PlayerData; + +import java.io.IOException; +import java.util.UUID; + +public final class PartyAcceptInvitePacket extends AbstractPacket { + public static final String packetName = "Request|PartyAcceptInvite"; + + private String uuid; + + public PartyAcceptInvitePacket() { + } + + public PartyAcceptInvitePacket(String playerUUID) { + this.uuid = playerUUID; + } + + @Override + public Enum getType() { + return EnumRequestPacket.PartyAcceptInvite; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + ByteBufUtils.writeString(out, this.uuid); + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + PlayerData playerData = PlayerDataController.Instance.getPlayerData(player); + String uuidString = ByteBufUtils.readString(in); + if (uuidString != null) { + UUID uuid = UUID.fromString(uuidString); + playerData.acceptInvite(uuid); + } + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/party/PartyDisbandPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/party/PartyDisbandPacket.java new file mode 100644 index 000000000..e22f8f349 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/party/PartyDisbandPacket.java @@ -0,0 +1,53 @@ +package kamkeel.npcs.network.packets.request.party; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.network.packets.data.large.PartyDataPacket; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.controllers.PartyController; +import noppes.npcs.controllers.PlayerDataController; +import noppes.npcs.controllers.data.PlayerData; + +import java.io.IOException; + +public final class PartyDisbandPacket extends AbstractPacket { + public static final String packetName = "Request|PartyDisband"; + + + public PartyDisbandPacket() { + } + + @Override + public Enum getType() { + return EnumRequestPacket.PartyDisband; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + PlayerData playerData = PlayerDataController.Instance.getPlayerData(player); + if (playerData.partyUUID != null) { + PartyController.Instance().disbandParty(playerData.partyUUID); + } + NBTTagCompound compound = new NBTTagCompound(); + compound.setBoolean("Disband", true); + PartyDataPacket.sendPartyData((EntityPlayerMP) player, compound); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/party/PartyIgnoreInvitePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/party/PartyIgnoreInvitePacket.java new file mode 100644 index 000000000..bc8c5733b --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/party/PartyIgnoreInvitePacket.java @@ -0,0 +1,56 @@ +package kamkeel.npcs.network.packets.request.party; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.util.ByteBufUtils; +import net.minecraft.entity.player.EntityPlayer; +import noppes.npcs.controllers.PlayerDataController; +import noppes.npcs.controllers.data.PlayerData; + +import java.io.IOException; +import java.util.UUID; + +public final class PartyIgnoreInvitePacket extends AbstractPacket { + public static final String packetName = "Request|PartyIgnoreInvite"; + + private String uuid; + + public PartyIgnoreInvitePacket() { + } + + public PartyIgnoreInvitePacket(String partyUUID) { + this.uuid = partyUUID; + } + + @Override + public Enum getType() { + return EnumRequestPacket.PartyIgnoreInvite; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + ByteBufUtils.writeString(out, this.uuid); + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + PlayerData playerData = PlayerDataController.Instance.getPlayerData(player); + String uuidString = ByteBufUtils.readString(in); + if (uuidString != null) { + UUID uuid = UUID.fromString(uuidString); + playerData.ignoreInvite(uuid); + } + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/party/PartyInfoPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/party/PartyInfoPacket.java new file mode 100644 index 000000000..3883b0a09 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/party/PartyInfoPacket.java @@ -0,0 +1,63 @@ +package kamkeel.npcs.network.packets.request.party; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import noppes.npcs.config.ConfigMain; +import noppes.npcs.controllers.PartyController; +import noppes.npcs.controllers.data.Party; + +import java.io.IOException; + +import static noppes.npcs.PacketHandlerServer.sendPartyData; + +public final class PartyInfoPacket extends AbstractPacket { + public static final String packetName = "Request|PartyInfo"; + + + boolean newParty; + + public PartyInfoPacket() { + } + + public PartyInfoPacket(boolean party) { + this.newParty = party; + } + + @Override + public Enum getType() { + return EnumRequestPacket.PartyInfo; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + out.writeBoolean(this.newParty); + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + boolean isNew = in.readBoolean(); + if (!ConfigMain.PartiesEnabled) + return; + + if (isNew) { + Party party = PartyController.Instance().createParty(); + party.addPlayer(player); + party.setLeader(player); + } + sendPartyData((EntityPlayerMP) player); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/party/PartyInviteListPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/party/PartyInviteListPacket.java new file mode 100644 index 000000000..006025a15 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/party/PartyInviteListPacket.java @@ -0,0 +1,44 @@ +package kamkeel.npcs.network.packets.request.party; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; + +import java.io.IOException; + +import static noppes.npcs.PacketHandlerServer.sendInviteData; + +public final class PartyInviteListPacket extends AbstractPacket { + public static final String packetName = "Request|PartyInviteList"; + + + public PartyInviteListPacket() { + } + + @Override + public Enum getType() { + return EnumRequestPacket.PartyInviteList; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + sendInviteData((EntityPlayerMP) player); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/party/PartyInvitePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/party/PartyInvitePacket.java new file mode 100644 index 000000000..518d77e07 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/party/PartyInvitePacket.java @@ -0,0 +1,75 @@ +package kamkeel.npcs.network.packets.request.party; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.util.ByteBufUtils; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import noppes.npcs.EventHooks; +import noppes.npcs.NoppesUtilServer; +import noppes.npcs.api.entity.IPlayer; +import noppes.npcs.controllers.PartyController; +import noppes.npcs.controllers.PlayerDataController; +import noppes.npcs.controllers.data.Party; +import noppes.npcs.controllers.data.PlayerData; +import noppes.npcs.scripted.NpcAPI; +import noppes.npcs.scripted.event.PartyEvent; + +import java.io.IOException; + +import static noppes.npcs.PacketHandlerServer.sendInviteData; + +public final class PartyInvitePacket extends AbstractPacket { + public static final String packetName = "Request|PartyInvite"; + + private String name; + + public PartyInvitePacket() { + } + + public PartyInvitePacket(String playername) { + this.name = playername; + } + + @Override + public Enum getType() { + return EnumRequestPacket.PartyInvite; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + ByteBufUtils.writeString(out, this.name); + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + EntityPlayer invitedPlayer = NoppesUtilServer.getPlayerByName(ByteBufUtils.readString(in)); + if (invitedPlayer != null) { + PlayerData senderData = PlayerDataController.Instance.getPlayerData(player); + PlayerData invitedData = PlayerDataController.Instance.getPlayerData(invitedPlayer); + if (senderData.partyUUID != null && invitedData.partyUUID == null) { + Party party = PartyController.Instance().getParty(senderData.partyUUID); + if (!party.getIsLocked()) { + PartyEvent.PartyInviteEvent partyEvent = new PartyEvent.PartyInviteEvent(party, party.getQuest(), (IPlayer) NpcAPI.Instance().getIEntity(invitedPlayer)); + EventHooks.onPartyInvite(partyEvent); + if (!partyEvent.isCancelled()) { + invitedData.inviteToParty(party); + sendInviteData((EntityPlayerMP) invitedPlayer); + } + } + } + } + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/party/PartyKickPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/party/PartyKickPacket.java new file mode 100644 index 000000000..b4ca36fcc --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/party/PartyKickPacket.java @@ -0,0 +1,96 @@ +package kamkeel.npcs.network.packets.request.party; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.util.ByteBufUtils; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import noppes.npcs.EventHooks; +import noppes.npcs.NoppesUtilServer; +import noppes.npcs.api.entity.IPlayer; +import noppes.npcs.controllers.PartyController; +import noppes.npcs.controllers.PlayerDataController; +import noppes.npcs.controllers.data.Party; +import noppes.npcs.controllers.data.PlayerData; +import noppes.npcs.scripted.NpcAPI; +import noppes.npcs.scripted.event.PartyEvent; + +import java.io.IOException; +import java.util.UUID; + +import static noppes.npcs.PacketHandlerServer.sendInviteData; + +public final class PartyKickPacket extends AbstractPacket { + public static final String packetName = "Request|PartyKick"; + + private String name; + + public PartyKickPacket() { + } + + public PartyKickPacket(String playername) { + this.name = playername; + } + + @Override + public Enum getType() { + return EnumRequestPacket.PartyKick; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + ByteBufUtils.writeString(out, this.name); + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + String kickPlayerName = ByteBufUtils.readString(in); + EntityPlayer kickPlayer = NoppesUtilServer.getPlayerByName(kickPlayerName); + PlayerData playerData = null; + UUID playerUUID = null; + if (kickPlayer != null) { + playerData = PlayerDataController.Instance.getPlayerData(player); + } else { + String uuid = PlayerDataController.Instance.getPlayerUUIDFromName(kickPlayerName); + if (!uuid.isEmpty()) { + playerData = PlayerDataController.Instance.getPlayerDataCache(uuid); + playerUUID = UUID.fromString(uuid); + } + } + + if (playerData != null) { + if (playerData.partyUUID != null) { + Party party = PartyController.Instance().getParty(playerData.partyUUID); + if (!party.getIsLocked()) { + PartyEvent.PartyKickEvent partyEvent = new PartyEvent.PartyKickEvent(party, party.getQuest(), (IPlayer) NpcAPI.Instance().getIEntity(kickPlayer)); + EventHooks.onPartyKick(partyEvent); + if (!partyEvent.isCancelled()) { + boolean successful = party.removePlayer(kickPlayer); + if (!successful) + successful = party.removePlayer(playerUUID); + + if (successful) { + if (kickPlayer != null) { + sendInviteData((EntityPlayerMP) kickPlayer); + } + PartyController.Instance().pingPartyUpdate(party); + PartyController.Instance().sendKickMessages(party, kickPlayer, kickPlayerName); + } + } + } + } + } + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/party/PartyLeavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/party/PartyLeavePacket.java new file mode 100644 index 000000000..d2439e218 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/party/PartyLeavePacket.java @@ -0,0 +1,74 @@ +package kamkeel.npcs.network.packets.request.party; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.util.ByteBufUtils; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import noppes.npcs.EventHooks; +import noppes.npcs.NoppesUtilServer; +import noppes.npcs.api.entity.IPlayer; +import noppes.npcs.controllers.PartyController; +import noppes.npcs.controllers.PlayerDataController; +import noppes.npcs.controllers.data.Party; +import noppes.npcs.controllers.data.PlayerData; +import noppes.npcs.scripted.NpcAPI; +import noppes.npcs.scripted.event.PartyEvent; + +import java.io.IOException; + +import static noppes.npcs.PacketHandlerServer.sendInviteData; + +public final class PartyLeavePacket extends AbstractPacket { + public static final String packetName = "Request|PartyLeave"; + + private String name; + + public PartyLeavePacket() { + } + + public PartyLeavePacket(String playername) { + this.name = playername; + } + + @Override + public Enum getType() { + return EnumRequestPacket.PartyLeave; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + ByteBufUtils.writeString(out, this.name); + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + EntityPlayer leavingPlayer = NoppesUtilServer.getPlayerByName(ByteBufUtils.readString(in)); + if (leavingPlayer != null) { + PlayerData playerData = PlayerDataController.Instance.getPlayerData(player); + if (playerData.partyUUID != null) { + Party party = PartyController.Instance().getParty(playerData.partyUUID); + boolean successful = party.removePlayer(leavingPlayer); + if (successful) { + PartyEvent.PartyLeaveEvent partyEvent = new PartyEvent.PartyLeaveEvent(party, party.getQuest(), (IPlayer) NpcAPI.Instance().getIEntity(leavingPlayer)); + EventHooks.onPartyLeave(partyEvent); + sendInviteData((EntityPlayerMP) leavingPlayer); + PartyController.Instance().pingPartyUpdate(party); + PartyController.Instance().sendLeavingMessages(party, leavingPlayer); + } + } + } + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/PartyLogToServerPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/party/PartyLogToServerPacket.java similarity index 91% rename from src/main/java/kamkeel/npcs/network/packets/request/PartyLogToServerPacket.java rename to src/main/java/kamkeel/npcs/network/packets/request/party/PartyLogToServerPacket.java index 0c3db732e..bcf2c0bc3 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/PartyLogToServerPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/party/PartyLogToServerPacket.java @@ -1,4 +1,4 @@ -package kamkeel.npcs.network.packets.request; +package kamkeel.npcs.network.packets.request.party; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -10,7 +10,6 @@ import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.nbt.NBTTagCompound; import noppes.npcs.NoppesUtilPlayer; import java.io.IOException; @@ -20,7 +19,8 @@ public final class PartyLogToServerPacket extends AbstractPacket { private String key; - public PartyLogToServerPacket() {} + public PartyLogToServerPacket() { + } public PartyLogToServerPacket(String key) { this.key = key; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/party/PartySavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/party/PartySavePacket.java new file mode 100644 index 000000000..7248b6f27 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/party/PartySavePacket.java @@ -0,0 +1,57 @@ +package kamkeel.npcs.network.packets.request.party; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.util.ByteBufUtils; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.controllers.PartyController; +import noppes.npcs.controllers.PlayerDataController; +import noppes.npcs.controllers.data.Party; +import noppes.npcs.controllers.data.PlayerData; + +import java.io.IOException; + +public final class PartySavePacket extends AbstractPacket { + public static final String packetName = "Request|PartySave"; + + private NBTTagCompound compound; + + public PartySavePacket() { + } + + public PartySavePacket(NBTTagCompound partyCompound) { + this.compound = partyCompound; + } + + @Override + public Enum getType() { + return EnumRequestPacket.PartySave; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + ByteBufUtils.writeNBT(out, this.compound); + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + PlayerData playerData = PlayerDataController.Instance.getPlayerData(player); + if (playerData.partyUUID != null) { + Party party = PartyController.Instance().getParty(playerData.partyUUID); + party.readClientNBT(ByteBufUtils.readNBT(in)); + } + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/party/PartySetLeaderPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/party/PartySetLeaderPacket.java new file mode 100644 index 000000000..2d90068c8 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/party/PartySetLeaderPacket.java @@ -0,0 +1,60 @@ +package kamkeel.npcs.network.packets.request.party; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.util.ByteBufUtils; +import net.minecraft.entity.player.EntityPlayer; +import noppes.npcs.NoppesUtilServer; +import noppes.npcs.controllers.PartyController; +import noppes.npcs.controllers.PlayerDataController; +import noppes.npcs.controllers.data.Party; +import noppes.npcs.controllers.data.PlayerData; + +import java.io.IOException; + +public final class PartySetLeaderPacket extends AbstractPacket { + public static final String packetName = "Request|PartySetLeader"; + + private String name; + + public PartySetLeaderPacket() { + } + + public PartySetLeaderPacket(String playername) { + this.name = playername; + } + + @Override + public Enum getType() { + return EnumRequestPacket.PartySetLeader; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + ByteBufUtils.writeString(out, this.name); + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + PlayerData playerData = PlayerDataController.Instance.getPlayerData(player); + if (playerData.partyUUID != null) { + Party party = PartyController.Instance().getParty(playerData.partyUUID); + if (!party.getIsLocked()) { + party.setLeader(NoppesUtilServer.getPlayerByName(ByteBufUtils.readString(in))); + PartyController.Instance().pingPartyUpdate(party); + } + } + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/party/PartySetQuestPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/party/PartySetQuestPacket.java new file mode 100644 index 000000000..932b852c2 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/party/PartySetQuestPacket.java @@ -0,0 +1,85 @@ +package kamkeel.npcs.network.packets.request.party; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import net.minecraft.entity.player.EntityPlayer; +import noppes.npcs.EventHooks; +import noppes.npcs.controllers.PartyController; +import noppes.npcs.controllers.PlayerDataController; +import noppes.npcs.controllers.QuestController; +import noppes.npcs.controllers.data.Party; +import noppes.npcs.controllers.data.PlayerData; +import noppes.npcs.controllers.data.Quest; +import noppes.npcs.controllers.data.QuestData; +import noppes.npcs.scripted.event.PartyEvent; + +import java.io.IOException; + +public final class PartySetQuestPacket extends AbstractPacket { + public static final String packetName = "Request|PartySetQuest"; + + private int questID; + + public PartySetQuestPacket() { + } + + public PartySetQuestPacket(int questID) { + this.questID = questID; + } + + @Override + public Enum getType() { + return EnumRequestPacket.PartySetQuest; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + out.writeInt(this.questID); + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + PlayerData playerData = PlayerDataController.Instance.getPlayerData(player); + if (playerData.partyUUID != null) { + Party party = PartyController.Instance().getParty(playerData.partyUUID); + if (party != null) { + if (party.getLeaderUUID().equals(player.getUniqueID())) { + int questID = in.readInt(); + party.setQuest(null); + if (questID != -1) { + Quest foundQuest = QuestController.Instance.quests.get(questID); + if (foundQuest != null) { + if (foundQuest.partyOptions.allowParty) { + if (party.validateQuest(questID, true)) { + PartyEvent.PartyQuestSetEvent partyEvent = new PartyEvent.PartyQuestSetEvent(party, foundQuest); + EventHooks.onPartyQuestSet(partyEvent); + if (!partyEvent.isCancelled()) { + if (playerData.questData.hasActiveQuest(questID)) { + QuestData questdata = new QuestData(foundQuest); + playerData.questData.activeQuests.put(questID, questdata); + } + party.setQuest(foundQuest); + PartyController.Instance().sendQuestChat(party, "party.setChat", " ", foundQuest.title); + } + } + } + } + } + PartyController.Instance().pingPartyUpdate(party); + } + } + } + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/playerdata/PlayerDataGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/playerdata/PlayerDataGetPacket.java new file mode 100644 index 000000000..978e0c4f1 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/playerdata/PlayerDataGetPacket.java @@ -0,0 +1,54 @@ +package kamkeel.npcs.network.packets.request.playerdata; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.util.ByteBufUtils; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import noppes.npcs.NoppesUtilServer; +import noppes.npcs.constants.EnumPlayerData; + +import java.io.IOException; + +public final class PlayerDataGetPacket extends AbstractPacket { + public static String packetName = "Request|PlayerDataGet"; + + public PlayerDataGetPacket() { + } + + @Override + public Enum getType() { + return EnumRequestPacket.PlayerDataGet; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + // TODO: Fix PlayerData + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return; + int id = in.readInt(); + if (EnumPlayerData.values().length <= id) return; + String name = null; + EnumPlayerData datatype = EnumPlayerData.values()[id]; + if (datatype != EnumPlayerData.Players) + name = ByteBufUtils.readString(in); + NoppesUtilServer.sendPlayerData(datatype, (EntityPlayerMP) player, name); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/playerdata/PlayerDataMapRegenPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/playerdata/PlayerDataMapRegenPacket.java new file mode 100644 index 000000000..ac0f488f3 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/playerdata/PlayerDataMapRegenPacket.java @@ -0,0 +1,51 @@ +package kamkeel.npcs.network.packets.request.playerdata; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import noppes.npcs.CustomNpcsPermissions; +import noppes.npcs.NoppesUtilServer; + +import java.io.IOException; + +public final class PlayerDataMapRegenPacket extends AbstractPacket { + public static String packetName = "Request|PlayerDataMapRegen"; + + public PlayerDataMapRegenPacket() { + } + + @Override + public Enum getType() { + return EnumRequestPacket.PlayerDataMapRegen; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.GLOBAL_PLAYERDATA; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return; + NoppesUtilServer.regenPlayerData((EntityPlayerMP) player); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/playerdata/PlayerDataRemovePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/playerdata/PlayerDataRemovePacket.java new file mode 100644 index 000000000..806bcb19d --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/playerdata/PlayerDataRemovePacket.java @@ -0,0 +1,52 @@ +package kamkeel.npcs.network.packets.request.playerdata; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import noppes.npcs.CustomNpcsPermissions; +import noppes.npcs.NoppesUtilServer; + +import java.io.IOException; + +public final class PlayerDataRemovePacket extends AbstractPacket { + public static String packetName = "Request|PlayerDataRemove"; + + public PlayerDataRemovePacket() { + } + + @Override + public Enum getType() { + return EnumRequestPacket.PlayerDataRemove; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.GLOBAL_PLAYERDATA; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + // TODO: Fix Send + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return; + NoppesUtilServer.removePlayerData(in, (EntityPlayerMP) player); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestCategoryGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestCategoryGetPacket.java new file mode 100644 index 000000000..ff63a5fe0 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestCategoryGetPacket.java @@ -0,0 +1,54 @@ +package kamkeel.npcs.network.packets.request.quest; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.network.packets.data.large.GuiDataPacket; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.controllers.QuestController; +import noppes.npcs.controllers.data.QuestCategory; + +import java.io.IOException; + +public final class QuestCategoryGetPacket extends AbstractPacket { + public static String packetName = "Request|QuestCategoryGet"; + + public QuestCategoryGetPacket() { + } + + @Override + public Enum getType() { + return EnumRequestPacket.QuestCategoryGet; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return; + int id = in.readInt(); + QuestCategory category = QuestController.Instance.categories.get(id); + if (category != null) { + NBTTagCompound comp = category.writeNBT(new NBTTagCompound()); + comp.removeTag("Dialogs"); + GuiDataPacket.sendGuiData((EntityPlayerMP) player, comp); + } + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestCategoryRemovePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestCategoryRemovePacket.java new file mode 100644 index 000000000..4961b3788 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestCategoryRemovePacket.java @@ -0,0 +1,61 @@ +package kamkeel.npcs.network.packets.request.quest; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import noppes.npcs.CustomNpcsPermissions; +import noppes.npcs.NoppesUtilServer; +import noppes.npcs.controllers.QuestController; + +import java.io.IOException; + +public final class QuestCategoryRemovePacket extends AbstractPacket { + public static String packetName = "Request|QuestCategoryRemove"; + + private int categoryId; + + public QuestCategoryRemovePacket(int categoryId) { + this.categoryId = categoryId; + } + + public QuestCategoryRemovePacket() { + } + + @Override + public Enum getType() { + return EnumRequestPacket.QuestCategoryRemove; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.GLOBAL_QUEST; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + out.writeInt(categoryId); + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return; + int id = in.readInt(); + QuestController.Instance.removeCategory(id); + NoppesUtilServer.sendQuestCategoryData((EntityPlayerMP) player); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestCategorySavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestCategorySavePacket.java new file mode 100644 index 000000000..b1a94cef1 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestCategorySavePacket.java @@ -0,0 +1,66 @@ +package kamkeel.npcs.network.packets.request.quest; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.util.ByteBufUtils; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.CustomNpcsPermissions; +import noppes.npcs.NoppesUtilServer; +import noppes.npcs.controllers.QuestController; +import noppes.npcs.controllers.data.QuestCategory; + +import java.io.IOException; + +public final class QuestCategorySavePacket extends AbstractPacket { + public static String packetName = "Request|QuestCategorySave"; + + private NBTTagCompound categoryNBT; + + public QuestCategorySavePacket(NBTTagCompound categoryNBT) { + this.categoryNBT = categoryNBT; + } + + public QuestCategorySavePacket() { + } + + @Override + public Enum getType() { + return EnumRequestPacket.QuestCategorySave; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.GLOBAL_QUEST; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + ByteBufUtils.writeNBT(out, categoryNBT); + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return; + NBTTagCompound compound = ByteBufUtils.readNBT(in); + QuestCategory category = new QuestCategory(); + category.readNBT(compound); + QuestController.Instance.saveCategory(category); + NoppesUtilServer.sendQuestCategoryData((EntityPlayerMP) player); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestDialogGetTitlePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestDialogGetTitlePacket.java new file mode 100644 index 000000000..36b71825d --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestDialogGetTitlePacket.java @@ -0,0 +1,64 @@ +package kamkeel.npcs.network.packets.request.quest; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.network.packets.data.large.GuiDataPacket; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.CustomNpcsPermissions; +import noppes.npcs.controllers.DialogController; +import noppes.npcs.controllers.data.Dialog; + +import java.io.IOException; + +public final class QuestDialogGetTitlePacket extends AbstractPacket { + public static String packetName = "Request|QuestDialogGetTitle"; + + public QuestDialogGetTitlePacket() { + } + + @Override + public Enum getType() { + return EnumRequestPacket.QuestDialogGetTitle; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.GLOBAL_QUEST; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return; + Dialog quest = DialogController.Instance.dialogs.get(in.readInt()); + Dialog quest2 = DialogController.Instance.dialogs.get(in.readInt()); + Dialog quest3 = DialogController.Instance.dialogs.get(in.readInt()); + NBTTagCompound compound = new NBTTagCompound(); + if (quest != null) + compound.setString("1", quest.title); + if (quest2 != null) + compound.setString("2", quest2.title); + if (quest3 != null) + compound.setString("3", quest3.title); + GuiDataPacket.sendGuiData((EntityPlayerMP) player, compound); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestOpenGuiPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestOpenGuiPacket.java new file mode 100644 index 000000000..2935fca57 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestOpenGuiPacket.java @@ -0,0 +1,67 @@ +package kamkeel.npcs.network.packets.request.quest; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.util.ByteBufUtils; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.CustomNpcs; +import noppes.npcs.NoppesUtilServer; +import noppes.npcs.controllers.data.Quest; + +import java.io.IOException; + +public final class QuestOpenGuiPacket extends AbstractPacket { + public static String packetName = "Request|QuestOpenGui"; + + private int guiId; + private NBTTagCompound questNBT; + + public QuestOpenGuiPacket(int guiId, NBTTagCompound questNBT) { + this.guiId = guiId; + this.questNBT = questNBT; + } + + public QuestOpenGuiPacket() { + } + + @Override + public Enum getType() { + return EnumRequestPacket.QuestOpenGui; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + out.writeInt(guiId); + ByteBufUtils.writeNBT(out, questNBT); + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) + return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) + return; + + int gui = in.readInt(); + NBTTagCompound compound = ByteBufUtils.readNBT(in); + Quest quest = new Quest(); + quest.readNBT(compound); + NoppesUtilServer.setEditingQuest(player, quest); + player.openGui(CustomNpcs.instance, gui, player.worldObj, 0, 0, 0); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestSavePacket.java new file mode 100644 index 000000000..aa699e873 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestSavePacket.java @@ -0,0 +1,80 @@ +package kamkeel.npcs.network.packets.request.quest; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.util.ByteBufUtils; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.CustomNpcsPermissions; +import noppes.npcs.NoppesUtilServer; +import noppes.npcs.controllers.QuestController; +import noppes.npcs.controllers.data.Quest; + +import java.io.IOException; + +public final class QuestSavePacket extends AbstractPacket { + public static String packetName = "Request|QuestSave"; + + private int categoryId; + private NBTTagCompound questNBT; + private boolean sendGroup; + + public QuestSavePacket(int categoryId, NBTTagCompound questNBT, boolean sendGroup) { + this.categoryId = categoryId; + this.questNBT = questNBT; + this.sendGroup = sendGroup; + } + + public QuestSavePacket() { + } + + @Override + public Enum getType() { + return EnumRequestPacket.QuestSave; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.GLOBAL_QUEST; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + out.writeInt(categoryId); + ByteBufUtils.writeNBT(out, questNBT); + out.writeBoolean(sendGroup); + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return; + int cat = in.readInt(); + NBTTagCompound compound = ByteBufUtils.readNBT(in); + boolean sendGroup = in.readBoolean(); + Quest quest = new Quest(); + quest.readNBT(compound); + QuestController.Instance.saveQuest(cat, quest); + if (quest.category != null) { + if (sendGroup) { + NoppesUtilServer.sendQuestGroup((EntityPlayerMP) player, quest.category); + } else { + NoppesUtilServer.sendQuestData((EntityPlayerMP) player, quest.category); + } + } + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/recipe/RecipeGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/recipe/RecipeGetPacket.java new file mode 100644 index 000000000..643399c76 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/recipe/RecipeGetPacket.java @@ -0,0 +1,59 @@ +package kamkeel.npcs.network.packets.request.recipe; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import noppes.npcs.NoppesUtilServer; +import noppes.npcs.controllers.RecipeController; +import noppes.npcs.controllers.data.RecipeCarpentry; + +import java.io.IOException; + +public final class RecipeGetPacket extends AbstractPacket { + public static String packetName = "Request|RecipeGet"; + + private int recipeId; + + public RecipeGetPacket(int recipeId) { + this.recipeId = recipeId; + } + + public RecipeGetPacket() { + } + + @Override + public Enum getType() { + return EnumRequestPacket.RecipeGet; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + out.writeInt(recipeId); + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) + return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) + return; + int id = in.readInt(); + RecipeCarpentry recipe = RecipeController.Instance.getRecipe(id); + NoppesUtilServer.setRecipeGui((EntityPlayerMP) player, recipe); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/recipe/RecipeRemovePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/recipe/RecipeRemovePacket.java new file mode 100644 index 000000000..cd8ab6136 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/recipe/RecipeRemovePacket.java @@ -0,0 +1,65 @@ +package kamkeel.npcs.network.packets.request.recipe; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import noppes.npcs.CustomNpcsPermissions; +import noppes.npcs.NoppesUtilServer; +import noppes.npcs.controllers.RecipeController; +import noppes.npcs.controllers.data.RecipeCarpentry; + +import java.io.IOException; + +public final class RecipeRemovePacket extends AbstractPacket { + public static String packetName = "Request|RecipeRemove"; + + private int recipeId; + + public RecipeRemovePacket(int recipeId) { + this.recipeId = recipeId; + } + + public RecipeRemovePacket() { + } + + @Override + public Enum getType() { + return EnumRequestPacket.RecipeRemove; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.GLOBAL_RECIPE; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + out.writeInt(recipeId); + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) + return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) + return; + int id = in.readInt(); + RecipeCarpentry recipe = RecipeController.Instance.delete(id); + NoppesUtilServer.sendRecipeData((EntityPlayerMP) player, recipe.isGlobal ? 3 : 4); + NoppesUtilServer.setRecipeGui((EntityPlayerMP) player, new RecipeCarpentry("")); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/recipe/RecipeSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/recipe/RecipeSavePacket.java new file mode 100644 index 000000000..e4e5e4fa8 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/recipe/RecipeSavePacket.java @@ -0,0 +1,67 @@ +package kamkeel.npcs.network.packets.request.recipe; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.util.ByteBufUtils; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.CustomNpcsPermissions; +import noppes.npcs.NoppesUtilServer; +import noppes.npcs.controllers.RecipeController; +import noppes.npcs.controllers.data.RecipeCarpentry; + +import java.io.IOException; + +public final class RecipeSavePacket extends AbstractPacket { + public static String packetName = "Request|RecipeSave"; + + private NBTTagCompound recipeNBT; + + public RecipeSavePacket(NBTTagCompound recipeNBT) { + this.recipeNBT = recipeNBT; + } + + public RecipeSavePacket() { + } + + @Override + public Enum getType() { + return EnumRequestPacket.RecipeSave; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.GLOBAL_RECIPE; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + ByteBufUtils.writeNBT(out, recipeNBT); + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) + return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) + return; + NBTTagCompound compound = ByteBufUtils.readNBT(in); + RecipeCarpentry recipe = RecipeController.Instance.saveRecipe(compound); + NoppesUtilServer.sendRecipeData((EntityPlayerMP) player, recipe.isGlobal ? 3 : 4); + NoppesUtilServer.setRecipeGui((EntityPlayerMP) player, recipe); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/recipe/RecipesGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/recipe/RecipesGetPacket.java new file mode 100644 index 000000000..cf148693d --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/recipe/RecipesGetPacket.java @@ -0,0 +1,53 @@ +package kamkeel.npcs.network.packets.request.recipe; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import noppes.npcs.NoppesUtilServer; + +import java.io.IOException; + +public final class RecipesGetPacket extends AbstractPacket { + public static String packetName = "Request|RecipesGet"; + + private int categoryId; + + public RecipesGetPacket(int categoryId) { + this.categoryId = categoryId; + } + + public RecipesGetPacket() { + } + + @Override + public Enum getType() { + return EnumRequestPacket.RecipesGet; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + out.writeInt(categoryId); + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return; + int id = in.readInt(); + NoppesUtilServer.sendRecipeData((EntityPlayerMP) player, id); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/role/RoleCompanionUpdatePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/role/RoleCompanionUpdatePacket.java new file mode 100644 index 000000000..5465cc029 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/role/RoleCompanionUpdatePacket.java @@ -0,0 +1,56 @@ +package kamkeel.npcs.network.packets.request.role; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import noppes.npcs.CustomNpcsPermissions; +import noppes.npcs.constants.EnumCompanionStage; +import noppes.npcs.roles.RoleCompanion; + +import java.io.IOException; + +public final class RoleCompanionUpdatePacket extends AbstractPacket { + public static String packetName = "Request|RoleCompanionUpdate"; + + public RoleCompanionUpdatePacket() { } + + @Override + public Enum getType() { + return EnumRequestPacket.RoleCompanionUpdate; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.NPC_ADVANCED; + } + + @Override + public boolean needsNPC() { + return true; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return; + ((RoleCompanion)npc.roleInterface).matureTo(EnumCompanionStage.values()[in.readInt()]); + npc.updateClient = true; + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/role/RoleGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/role/RoleGetPacket.java new file mode 100644 index 000000000..057f8d08c --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/role/RoleGetPacket.java @@ -0,0 +1,58 @@ +package kamkeel.npcs.network.packets.request.role; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.network.packets.data.large.GuiDataPacket; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.CustomNpcsPermissions; + +import java.io.IOException; + +public final class RoleGetPacket extends AbstractPacket { + public static String packetName = "Request|RoleGet"; + + public RoleGetPacket() { } + + @Override + public Enum getType() { + return EnumRequestPacket.RoleGet; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.NPC_ADVANCED; + } + + @Override + public boolean needsNPC() { + return true; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return; + if(npc.roleInterface == null) return; + NBTTagCompound compound = new NBTTagCompound(); + compound.setBoolean("RoleData", true); + GuiDataPacket.sendGuiData((EntityPlayerMP) player, npc.roleInterface.writeToNBT(compound)); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/role/RoleSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/role/RoleSavePacket.java new file mode 100644 index 000000000..564798031 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/role/RoleSavePacket.java @@ -0,0 +1,55 @@ +package kamkeel.npcs.network.packets.request.role; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.util.ByteBufUtils; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import noppes.npcs.CustomNpcsPermissions; + +import java.io.IOException; + +public final class RoleSavePacket extends AbstractPacket { + public static String packetName = "Request|RoleSave"; + + public RoleSavePacket() { } + + @Override + public Enum getType() { + return EnumRequestPacket.RoleSave; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.NPC_ADVANCED; + } + + @Override + public boolean needsNPC() { + return true; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return; + npc.roleInterface.readFromNBT(ByteBufUtils.readNBT(in)); + npc.updateClient = true; + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/tags/TagRemovePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/tags/TagRemovePacket.java new file mode 100644 index 000000000..6b27b738c --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/tags/TagRemovePacket.java @@ -0,0 +1,73 @@ +package kamkeel.npcs.network.packets.request.tags; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.network.packets.data.large.GuiDataPacket; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.CustomNpcsPermissions; +import noppes.npcs.NoppesUtilServer; +import noppes.npcs.controllers.TagController; +import noppes.npcs.controllers.data.Tag; + +import java.io.IOException; + +public final class TagRemovePacket extends AbstractPacket { + public static String packetName = "Request|TagRemove"; + + private int tagId; + + public TagRemovePacket(int tagId) { + this.tagId = tagId; + } + + public TagRemovePacket() { + } + + @Override + public Enum getType() { + return EnumRequestPacket.TagRemove; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.GLOBAL_TAG; + } + + @Override + public boolean needsNPC() { + return true; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + out.writeInt(tagId); + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return; + + int id = in.readInt(); + TagController.getInstance().delete(id); + NoppesUtilServer.sendTagDataAll((EntityPlayerMP) player); + NBTTagCompound comp = new NBTTagCompound(); + new Tag().writeNBT(comp); + GuiDataPacket.sendGuiData((EntityPlayerMP) player, comp); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/tags/TagSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/tags/TagSavePacket.java new file mode 100644 index 000000000..04b8482e1 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/tags/TagSavePacket.java @@ -0,0 +1,74 @@ +package kamkeel.npcs.network.packets.request.tags; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.network.packets.data.large.GuiDataPacket; +import kamkeel.npcs.util.ByteBufUtils; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.CustomNpcsPermissions; +import noppes.npcs.NoppesUtilServer; +import noppes.npcs.controllers.TagController; +import noppes.npcs.controllers.data.Tag; + +import java.io.IOException; + +public final class TagSavePacket extends AbstractPacket { + public static String packetName = "Request|TagSave"; + + private NBTTagCompound tagNBT; + + public TagSavePacket(NBTTagCompound tagNBT) { + this.tagNBT = tagNBT; + } + + public TagSavePacket() { + } + + @Override + public Enum getType() { + return EnumRequestPacket.TagSave; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.GLOBAL_TAG; + } + + @Override + public boolean needsNPC() { + return true; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + ByteBufUtils.writeNBT(out, tagNBT); + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return; + Tag tag = new Tag(); + tag.readNBT(ByteBufUtils.readNBT(in)); + TagController.getInstance().saveTag(tag); + NoppesUtilServer.sendTagDataAll((EntityPlayerMP) player); + NBTTagCompound comp = new NBTTagCompound(); + tag.writeNBT(comp); + GuiDataPacket.sendGuiData((EntityPlayerMP) player, comp); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/tags/TagSetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/tags/TagSetPacket.java new file mode 100644 index 000000000..764b6ad85 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/tags/TagSetPacket.java @@ -0,0 +1,72 @@ +package kamkeel.npcs.network.packets.request.tags; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.util.ByteBufUtils; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import noppes.npcs.CustomNpcsPermissions; +import noppes.npcs.controllers.TagController; +import noppes.npcs.controllers.data.Tag; +import noppes.npcs.entity.EntityNPCInterface; + +import java.io.IOException; + +public final class TagSetPacket extends AbstractPacket { + public static String packetName = "Request|TagSet"; + + public TagSetPacket() { + } + + @Override + public Enum getType() { + return EnumRequestPacket.TagSet; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.NPC_ADVANCED; + } + + @Override + public boolean needsNPC() { + return true; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + // TODO: Fix Tag Set + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return; + this.setTags(npc, in); + } + + private void setTags(EntityNPCInterface npc, ByteBuf buffer) throws IOException { + npc.advanced.tagUUIDs.removeIf(uuid -> TagController.getInstance().getTagFromUUID(uuid) != null); + NBTTagCompound compound = ByteBufUtils.readNBT(buffer); + NBTTagList list = compound.getTagList("TagNames", 8); + for (int i = 0; i < list.tagCount(); i++) { + String tagName = list.getStringTagAt(i); + npc.advanced.tagUUIDs.add(TagController.getInstance().getTagFromName(tagName).uuid); + } + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/transform/TransformGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/transform/TransformGetPacket.java new file mode 100644 index 000000000..5825b695e --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/transform/TransformGetPacket.java @@ -0,0 +1,55 @@ +package kamkeel.npcs.network.packets.request.transform; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.network.packets.data.large.GuiDataPacket; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.CustomNpcsPermissions; + +import java.io.IOException; + +public final class TransformGetPacket extends AbstractPacket { + public static String packetName = "Request|TransformGet"; + + public TransformGetPacket() { } + + @Override + public Enum getType() { + return EnumRequestPacket.TransformGet; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.NPC_ADVANCED; + } + + @Override + public boolean needsNPC() { + return true; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return; + GuiDataPacket.sendGuiData((EntityPlayerMP) player, npc.transform.writeOptions(new NBTTagCompound())); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/transform/TransformLoadPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/transform/TransformLoadPacket.java new file mode 100644 index 000000000..61cc24001 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/transform/TransformLoadPacket.java @@ -0,0 +1,54 @@ +package kamkeel.npcs.network.packets.request.transform; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import noppes.npcs.CustomNpcsPermissions; + +import java.io.IOException; + +public final class TransformLoadPacket extends AbstractPacket { + public static String packetName = "Request|TransformLoad"; + + public TransformLoadPacket() { } + + @Override + public Enum getType() { + return EnumRequestPacket.TransformLoad; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.NPC_ADVANCED; + } + + @Override + public boolean needsNPC() { + return true; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return; + if(npc.transform.isValid()) + npc.transform.transform(in.readBoolean()); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/transform/TransformSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/transform/TransformSavePacket.java new file mode 100644 index 000000000..f5583b17d --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/transform/TransformSavePacket.java @@ -0,0 +1,57 @@ +package kamkeel.npcs.network.packets.request.transform; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.util.ByteBufUtils; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import noppes.npcs.CustomNpcsPermissions; + +import java.io.IOException; + +public final class TransformSavePacket extends AbstractPacket { + public static String packetName = "Request|TransformSave"; + + public TransformSavePacket() { } + + @Override + public Enum getType() { + return EnumRequestPacket.TransformSave; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.NPC_ADVANCED; + } + + @Override + public boolean needsNPC() { + return true; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return; + boolean isValid = npc.transform.isValid(); + npc.transform.readOptions(ByteBufUtils.readNBT(in)); + if (isValid != npc.transform.isValid()) + npc.updateAI = true; + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportCategoriesGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportCategoriesGetPacket.java new file mode 100644 index 000000000..fac055385 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportCategoriesGetPacket.java @@ -0,0 +1,45 @@ +package kamkeel.npcs.network.packets.request.transport; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import noppes.npcs.NoppesUtilServer; + +import java.io.IOException; + +public final class TransportCategoriesGetPacket extends AbstractPacket { + public static String packetName = "Request|TransportCategoriesGet"; + + public TransportCategoriesGetPacket() { + } + + @Override + public Enum getType() { + return EnumRequestPacket.TransportCategoriesGet; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return; + NoppesUtilServer.sendTransportCategoryData((EntityPlayerMP) player); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportCategoryRemovePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportCategoryRemovePacket.java new file mode 100644 index 000000000..34cc8bad8 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportCategoryRemovePacket.java @@ -0,0 +1,61 @@ +package kamkeel.npcs.network.packets.request.transport; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import noppes.npcs.CustomNpcsPermissions; +import noppes.npcs.NoppesUtilServer; +import noppes.npcs.controllers.TransportController; + +import java.io.IOException; + +public final class TransportCategoryRemovePacket extends AbstractPacket { + public static String packetName = "Request|TransportCategoryRemove"; + + private int categoryId; + + public TransportCategoryRemovePacket(int categoryId) { + this.categoryId = categoryId; + } + + public TransportCategoryRemovePacket() { + } + + @Override + public Enum getType() { + return EnumRequestPacket.TransportCategoryRemove; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.GLOBAL_TRANSPORT; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + out.writeInt(categoryId); + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return; + int id = in.readInt(); + TransportController.getInstance().removeCategory(id); + NoppesUtilServer.sendTransportCategoryData((EntityPlayerMP) player); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportCategorySavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportCategorySavePacket.java new file mode 100644 index 000000000..0bc413d09 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportCategorySavePacket.java @@ -0,0 +1,64 @@ +package kamkeel.npcs.network.packets.request.transport; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.util.ByteBufUtils; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import noppes.npcs.CustomNpcsPermissions; +import noppes.npcs.controllers.TransportController; + +import java.io.IOException; + +public final class TransportCategorySavePacket extends AbstractPacket { + public static String packetName = "Request|TransportCategorySave"; + + private String categoryName; + private int id; + + public TransportCategorySavePacket(String categoryName, int id) { + this.categoryName = categoryName; + this.id = id; + } + + public TransportCategorySavePacket() { + } + + @Override + public Enum getType() { + return EnumRequestPacket.TransportCategorySave; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.GLOBAL_TRANSPORT; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + ByteBufUtils.writeString(out, categoryName); + out.writeInt(id); + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return; + String name = ByteBufUtils.readString(in); + int id = in.readInt(); + TransportController.getInstance().saveCategory(name, id); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportGetLocationPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportGetLocationPacket.java new file mode 100644 index 000000000..ec3dd8b15 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportGetLocationPacket.java @@ -0,0 +1,58 @@ +package kamkeel.npcs.network.packets.request.transport; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.network.packets.data.ScrollSelectedPacket; +import kamkeel.npcs.network.packets.data.large.GuiDataPacket; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import noppes.npcs.constants.EnumRoleType; +import noppes.npcs.roles.RoleTransporter; + +import java.io.IOException; + +public final class TransportGetLocationPacket extends AbstractPacket { + public static String packetName = "Request|TransportGetLocation"; + + public TransportGetLocationPacket() { + } + + @Override + public Enum getType() { + return EnumRequestPacket.TransportGetLocation; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public boolean needsNPC() { + return true; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return; + if (npc.advanced.role != EnumRoleType.Transporter) return; + RoleTransporter role = (RoleTransporter) npc.roleInterface; + if (role.hasTransport()) { + GuiDataPacket.sendGuiData((EntityPlayerMP) player, role.getLocation().writeNBT()); + ScrollSelectedPacket.setSelectedList((EntityPlayerMP) player, role.getLocation().category.title); + } + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportRemovePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportRemovePacket.java new file mode 100644 index 000000000..c85a45226 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportRemovePacket.java @@ -0,0 +1,63 @@ +package kamkeel.npcs.network.packets.request.transport; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import noppes.npcs.CustomNpcsPermissions; +import noppes.npcs.NoppesUtilServer; +import noppes.npcs.controllers.TransportController; +import noppes.npcs.controllers.data.TransportLocation; + +import java.io.IOException; + +public final class TransportRemovePacket extends AbstractPacket { + public static String packetName = "Request|TransportRemove"; + + private int locationId; + + public TransportRemovePacket(int locationId) { + this.locationId = locationId; + } + + public TransportRemovePacket() { + } + + @Override + public Enum getType() { + return EnumRequestPacket.TransportRemove; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.GLOBAL_TRANSPORT; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + out.writeInt(locationId); + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return; + int id = in.readInt(); + TransportLocation loc = TransportController.getInstance().removeLocation(id); + if (loc != null) + NoppesUtilServer.sendTransportData((EntityPlayerMP) player, loc.category.id); + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportSavePacket.java new file mode 100644 index 000000000..bb87d304f --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportSavePacket.java @@ -0,0 +1,89 @@ +package kamkeel.npcs.network.packets.request.transport; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.network.packets.data.large.GuiDataPacket; +import kamkeel.npcs.util.ByteBufUtils; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.CustomNpcsPermissions; +import noppes.npcs.constants.EnumJobType; +import noppes.npcs.controllers.ServerCloneController; +import noppes.npcs.controllers.TransportController; +import noppes.npcs.controllers.data.TransportLocation; +import noppes.npcs.roles.JobSpawner; + +import java.io.IOException; + +public final class TransportSavePacket extends AbstractPacket { + public static String packetName = "Request|TransportSave"; + + private int categoryId; + private NBTTagCompound compound; + + public TransportSavePacket(int categoryId, NBTTagCompound compound) { + this.categoryId = categoryId; + this.compound = compound; + } + + public TransportSavePacket() { + } + + @Override + public Enum getType() { + return EnumRequestPacket.TransportSave; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @Override + public CustomNpcsPermissions.Permission getPermission() { + return CustomNpcsPermissions.NPC_ADVANCED; + } + + @Override + public boolean needsNPC() { + return true; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + out.writeInt(categoryId); + ByteBufUtils.writeNBT(out, compound); + + // TODO: FIX TRANSPORT SAVE + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return; + int cat = in.readInt(); + NBTTagCompound nbt = ByteBufUtils.readNBT(in); + TransportLocation location = TransportController.getInstance().saveLocation(cat, nbt, npc); + if (location != null) { + if (npc.advanced.job != EnumJobType.Spawner) return; + JobSpawner job = (JobSpawner) npc.jobInterface; + boolean useServerClone = in.readBoolean(); + if (useServerClone) { + NBTTagCompound compound = ServerCloneController.Instance.getCloneData(null, ByteBufUtils.readString(in), in.readInt()); + job.setJobCompound(in.readInt(), compound); + } else { + job.setJobCompound(in.readInt(), ByteBufUtils.readNBT(in)); + } + GuiDataPacket.sendGuiData((EntityPlayerMP) player, job.getTitles()); + } + } +} diff --git a/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportsGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportsGetPacket.java new file mode 100644 index 000000000..01d3ec21f --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportsGetPacket.java @@ -0,0 +1,46 @@ +package kamkeel.npcs.network.packets.request.transport; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import kamkeel.npcs.network.AbstractPacket; +import kamkeel.npcs.network.PacketChannel; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.PacketUtil; +import kamkeel.npcs.network.enums.EnumItemPacketType; +import kamkeel.npcs.network.enums.EnumRequestPacket; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import noppes.npcs.NoppesUtilServer; + +import java.io.IOException; + +public final class TransportsGetPacket extends AbstractPacket { + public static String packetName = "Request|TransportsGet"; + + public TransportsGetPacket() { + } + + @Override + public Enum getType() { + return EnumRequestPacket.TransportsGet; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.REQUEST_PACKET; + } + + @SideOnly(Side.CLIENT) + @Override + public void sendData(ByteBuf out) throws IOException { + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) return; + if (!PacketUtil.verifyItemPacket(EnumItemPacketType.WAND, player)) return; + int id = in.readInt(); + NoppesUtilServer.sendTransportData((EntityPlayerMP) player, id); + } +} diff --git a/src/main/java/noppes/npcs/PacketHandlerServer.java b/src/main/java/noppes/npcs/PacketHandlerServer.java index 2ead5179a..883e08735 100644 --- a/src/main/java/noppes/npcs/PacketHandlerServer.java +++ b/src/main/java/noppes/npcs/PacketHandlerServer.java @@ -29,16 +29,12 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentText; import net.minecraft.util.ChunkCoordinates; import net.minecraft.village.MerchantRecipeList; -import net.minecraft.world.WorldProvider; import net.minecraft.world.WorldServer; -import net.minecraftforge.common.DimensionManager; -import noppes.npcs.api.entity.IPlayer; import noppes.npcs.blocks.tiles.TileScripted; import noppes.npcs.config.ConfigDebug; import noppes.npcs.config.ConfigMain; import noppes.npcs.config.ConfigScript; import noppes.npcs.constants.*; -import noppes.npcs.containers.ContainerCustomGui; import noppes.npcs.containers.ContainerMail; import noppes.npcs.controllers.*; import noppes.npcs.controllers.LinkedNpcController.LinkedData; @@ -50,8 +46,6 @@ import noppes.npcs.roles.RoleCompanion; import noppes.npcs.roles.RoleTrader; import noppes.npcs.roles.RoleTransporter; import noppes.npcs.scripted.NpcAPI; -import noppes.npcs.scripted.event.PartyEvent; -import noppes.npcs.scripted.gui.ScriptGui; import noppes.npcs.scripted.item.ScriptCustomItem; import java.io.IOException; @@ -74,162 +68,6 @@ public class PacketHandlerServer{ ItemStack item = player.inventory.getCurrentItem(); EntityNPCInterface npc = NoppesUtilServer.getEditingNpc(player); - - if (type == EnumPacketServer.CacheAnimation) { - PlayerDataController.Instance.getPlayerData(player).animationData.cacheAnimation(in.readInt()); - return; - } else if (type == EnumPacketServer.GetPartyData || type == EnumPacketServer.CreateParty) { - if(!ConfigMain.PartiesEnabled) - return; - - if (type == EnumPacketServer.CreateParty) { - Party party = PartyController.Instance().createParty(); - party.addPlayer(player); - party.setLeader(player); - } - sendPartyData(player); - } else if (type == EnumPacketServer.DisbandParty) { - PlayerData playerData = PlayerDataController.Instance.getPlayerData(player); - if (playerData.partyUUID != null) { - PartyController.Instance().disbandParty(playerData.partyUUID); - } - NBTTagCompound compound = new NBTTagCompound(); - compound.setBoolean("Disband", true); - PartyDataPacket.sendPartyData(player, compound); - } else if (type == EnumPacketServer.KickPlayer) { - String kickPlayerName = ByteBufUtils.readString(in); - EntityPlayer kickPlayer = NoppesUtilServer.getPlayerByName(kickPlayerName); - PlayerData playerData = null; - UUID playerUUID = null; - if (kickPlayer != null) { - playerData = PlayerDataController.Instance.getPlayerData(player); - } else { - String uuid = PlayerDataController.Instance.getPlayerUUIDFromName(kickPlayerName); - if(!uuid.isEmpty()){ - playerData = PlayerDataController.Instance.getPlayerDataCache(uuid); - playerUUID = UUID.fromString(uuid); - } - } - - if(playerData != null){ - if (playerData.partyUUID != null) { - Party party = PartyController.Instance().getParty(playerData.partyUUID); - if (!party.getIsLocked()) { - PartyEvent.PartyKickEvent partyEvent = new PartyEvent.PartyKickEvent(party, party.getQuest(), (IPlayer) NpcAPI.Instance().getIEntity(kickPlayer)); - EventHooks.onPartyKick(partyEvent); - if (!partyEvent.isCancelled()){ - boolean successful = party.removePlayer(kickPlayer); - if(!successful) - successful = party.removePlayer(playerUUID); - - if(successful){ - if(kickPlayer != null){ - sendInviteData((EntityPlayerMP) kickPlayer); - } - PartyController.Instance().pingPartyUpdate(party); - PartyController.Instance().sendKickMessages(party, kickPlayer, kickPlayerName); - } - } - } - } - } - } else if (type == EnumPacketServer.LeavePlayer) { - EntityPlayer leavingPlayer = NoppesUtilServer.getPlayerByName(ByteBufUtils.readString(in)); - if (leavingPlayer != null) { - PlayerData playerData = PlayerDataController.Instance.getPlayerData(player); - if (playerData.partyUUID != null) { - Party party = PartyController.Instance().getParty(playerData.partyUUID); - boolean successful = party.removePlayer(leavingPlayer); - if(successful){ - PartyEvent.PartyLeaveEvent partyEvent = new PartyEvent.PartyLeaveEvent(party, party.getQuest(), (IPlayer) NpcAPI.Instance().getIEntity(leavingPlayer)); - EventHooks.onPartyLeave(partyEvent); - sendInviteData((EntityPlayerMP) leavingPlayer); - PartyController.Instance().pingPartyUpdate(party); - PartyController.Instance().sendLeavingMessages(party, leavingPlayer); - } - } - } - } else if (type == EnumPacketServer.SavePartyData) { - PlayerData playerData = PlayerDataController.Instance.getPlayerData(player); - if (playerData.partyUUID != null) { - Party party = PartyController.Instance().getParty(playerData.partyUUID); - party.readClientNBT(ByteBufUtils.readNBT(in)); - } - } else if (type == EnumPacketServer.SetPartyLeader) { - PlayerData playerData = PlayerDataController.Instance.getPlayerData(player); - if (playerData.partyUUID != null) { - Party party = PartyController.Instance().getParty(playerData.partyUUID); - if (!party.getIsLocked()) { - party.setLeader(NoppesUtilServer.getPlayerByName(ByteBufUtils.readString(in))); - PartyController.Instance().pingPartyUpdate(party); - } - } - } else if (type == EnumPacketServer.PartyInvite) { - EntityPlayer invitedPlayer = NoppesUtilServer.getPlayerByName(ByteBufUtils.readString(in)); - if (invitedPlayer != null) { - PlayerData senderData = PlayerDataController.Instance.getPlayerData(player); - PlayerData invitedData = PlayerDataController.Instance.getPlayerData(invitedPlayer); - if (senderData.partyUUID != null && invitedData.partyUUID == null) {//only send invite if player is not in a party - Party party = PartyController.Instance().getParty(senderData.partyUUID); - if (!party.getIsLocked()) { - PartyEvent.PartyInviteEvent partyEvent = new PartyEvent.PartyInviteEvent(party, party.getQuest(), (IPlayer) NpcAPI.Instance().getIEntity(invitedPlayer)); - EventHooks.onPartyInvite(partyEvent); - if (!partyEvent.isCancelled()){ - invitedData.inviteToParty(party); - sendInviteData((EntityPlayerMP) invitedPlayer); - } - } - } - } - } else if (type == EnumPacketServer.GetPartyInviteList) { - sendInviteData(player); - } else if (type == EnumPacketServer.AcceptInvite) { - PlayerData playerData = PlayerDataController.Instance.getPlayerData(player); - String uuidString = ByteBufUtils.readString(in); - if (uuidString != null) { - UUID uuid = UUID.fromString(uuidString); - playerData.acceptInvite(uuid); - } - } else if (type == EnumPacketServer.IgnoreInvite) { - PlayerData playerData = PlayerDataController.Instance.getPlayerData(player); - String uuidString = ByteBufUtils.readString(in); - if (uuidString != null) { - UUID uuid = UUID.fromString(uuidString); - playerData.ignoreInvite(uuid); - } - } else if (type == EnumPacketServer.SetPartyQuest) { - PlayerData playerData = PlayerDataController.Instance.getPlayerData(player); - if(playerData.partyUUID != null){ - Party party = PartyController.Instance().getParty(playerData.partyUUID); - if (party != null) { - if (party.getLeaderUUID().equals(player.getUniqueID())) { - int questID = in.readInt(); - party.setQuest(null); - if(questID != -1){ - Quest foundQuest = QuestController.Instance.quests.get(questID); - if(foundQuest != null){ - if (foundQuest.partyOptions.allowParty) { - if(party.validateQuest(questID, true)){ - PartyEvent.PartyQuestSetEvent partyEvent = new PartyEvent.PartyQuestSetEvent(party, foundQuest); - EventHooks.onPartyQuestSet(partyEvent); - if (!partyEvent.isCancelled()){ - if(playerData.questData.hasActiveQuest(questID)){ - QuestData questdata = new QuestData(foundQuest); - playerData.questData.activeQuests.put(questID, questdata); - } - party.setQuest(foundQuest); - PartyController.Instance().sendQuestChat(party, "party.setChat", " ", foundQuest.title); - } - } - } - } - } - PartyController.Instance().pingPartyUpdate(party); - } - } - } - } - if(type.needsNpc && npc == null){ } @@ -617,22 +455,7 @@ public class PacketHandlerServer{ } private void wandPackets(EnumPacketServer type, ByteBuf buffer, EntityPlayerMP player, EntityNPCInterface npc) throws IOException{ - if(type == EnumPacketServer.Delete){ - if(ConfigDebug.PlayerLogging && FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER){ - LogWriter.script(String.format("[%s] (Player) %s DELETE NPC %s (%s, %s, %s) [%s]", "WAND", player.getCommandSenderName(), npc.display.getName(), (int)npc.posX, (int)npc.posY, (int)npc.posZ, npc.worldObj.getWorldInfo().getWorldName())); - } - npc.delete(); - NoppesUtilServer.deleteNpc(npc,player); - } - else if(type == EnumPacketServer.LinkedAdd){ - LinkedNpcController.Instance.addData(ByteBufUtils.readString(buffer)); - - List list = new ArrayList(); - for(LinkedData data : LinkedNpcController.Instance.list) - list.add(data.name); - ScrollListPacket.sendList((EntityPlayerMP)player, list); - } - else if(type == EnumPacketServer.LinkedRemove){ + if(type == EnumPacketServer.LinkedRemove){ LinkedNpcController.Instance.removeData(ByteBufUtils.readString(buffer)); List list = new ArrayList(); @@ -652,15 +475,6 @@ public class PacketHandlerServer{ npc.linkedName = ByteBufUtils.readString(buffer); LinkedNpcController.Instance.loadNpcData(npc); } - else if(type == EnumPacketServer.NpcMenuClose){ - npc.reset(); - if(npc.linkedData != null) - LinkedNpcController.Instance.saveNpcData(npc); - if(ConfigDebug.PlayerLogging && FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER){ - LogWriter.script(String.format("[%s] (Player) %s CLOSE NPC %s (%s, %s, %s) [%s]", "WAND", player.getCommandSenderName(), npc.display.getName(), (int)npc.posX, (int)npc.posY, (int)npc.posZ, npc.worldObj.getWorldInfo().getWorldName())); - } - NoppesUtilServer.setEditingNpc(player, null); - } else if(type == EnumPacketServer.BanksGet){ NoppesUtilServer.sendBankDataAll(player); } @@ -1167,7 +981,6 @@ public class PacketHandlerServer{ } else blockPackets(type, buffer, player); - } private void mountPackets(EnumPacketServer type, ByteBuf buffer, EntityPlayerMP player) throws IOException{ if(type == EnumPacketServer.SpawnRider){ diff --git a/src/main/java/noppes/npcs/client/gui/util/GuiNpcMenu.java b/src/main/java/noppes/npcs/client/gui/util/GuiNpcMenu.java index 01bbb8d20..0e9941d25 100644 --- a/src/main/java/noppes/npcs/client/gui/util/GuiNpcMenu.java +++ b/src/main/java/noppes/npcs/client/gui/util/GuiNpcMenu.java @@ -132,7 +132,7 @@ public class GuiNpcMenu implements GuiYesNoCallback { public void confirmClicked(boolean flag, int i) { Minecraft mc = Minecraft.getMinecraft(); if (flag) { - Client.sendData(EnumPacketServer.Delete); + Client.sendData(EnumPacketServer.NPCDelete); mc.displayGuiScreen(null); mc.setIngameFocus(); } else { diff --git a/src/main/java/noppes/npcs/constants/EnumPacketServer.java b/src/main/java/noppes/npcs/constants/EnumPacketServer.java index 1b9136686..1b0b44a7f 100644 --- a/src/main/java/noppes/npcs/constants/EnumPacketServer.java +++ b/src/main/java/noppes/npcs/constants/EnumPacketServer.java @@ -3,7 +3,7 @@ package noppes.npcs.constants; import noppes.npcs.CustomNpcsPermissions; public enum EnumPacketServer { - Delete(CustomNpcsPermissions.NPC_DELETE, true), + NPCDelete(CustomNpcsPermissions.NPC_DELETE, true), RemoteMainMenu(CustomNpcsPermissions.NPC_GUI), RemoteGlobalMenu(CustomNpcsPermissions.GLOBAL_REMOTE), NpcMenuClose(CustomNpcsPermissions.NPC_GUI, true),