diff --git a/src/main/java/kamkeel/npcs/network/PacketHandler.java b/src/main/java/kamkeel/npcs/network/PacketHandler.java index 1231e32f3..0c503e87f 100644 --- a/src/main/java/kamkeel/npcs/network/PacketHandler.java +++ b/src/main/java/kamkeel/npcs/network/PacketHandler.java @@ -44,6 +44,7 @@ import kamkeel.npcs.network.packets.request.naturalspawns.NaturalSpawnGetPacket; import kamkeel.npcs.network.packets.request.naturalspawns.NaturalSpawnRemovePacket; import kamkeel.npcs.network.packets.request.naturalspawns.NaturalSpawnSavePacket; import kamkeel.npcs.network.packets.request.npc.*; +import kamkeel.npcs.network.packets.request.party.*; import kamkeel.npcs.network.packets.request.playerdata.PlayerDataGetPacket; import kamkeel.npcs.network.packets.request.playerdata.PlayerDataMapRegenPacket; import kamkeel.npcs.network.packets.request.playerdata.PlayerDataRemovePacket; @@ -154,6 +155,8 @@ public class PacketHandler { REQUEST_PACKET.registerPacket(new QuestSavePacket()); REQUEST_PACKET.registerPacket(new QuestRemovePacket()); REQUEST_PACKET.registerPacket(new QuestDialogGetTitlePacket()); + REQUEST_PACKET.registerPacket(new QuestLogToServerPacket()); + REQUEST_PACKET.registerPacket(new QuestUntrackPacket()); // Faction Packets REQUEST_PACKET.registerPacket(new FactionSavePacket()); @@ -234,6 +237,20 @@ public class PacketHandler { // Trader Packets REQUEST_PACKET.registerPacket(new TraderMarketSavePacket()); + // Party Packets + REQUEST_PACKET.registerPacket(new PartySavePacket()); + REQUEST_PACKET.registerPacket(new PartyInfoPacket()); + REQUEST_PACKET.registerPacket(new PartyDisbandPacket()); + REQUEST_PACKET.registerPacket(new PartySetLeaderPacket()); + REQUEST_PACKET.registerPacket(new PartyKickPacket()); + REQUEST_PACKET.registerPacket(new PartyDisbandPacket()); + REQUEST_PACKET.registerPacket(new PartyLeavePacket()); + REQUEST_PACKET.registerPacket(new PartySetQuestPacket()); + REQUEST_PACKET.registerPacket(new PartyInvitePacket()); + REQUEST_PACKET.registerPacket(new PartyAcceptInvitePacket()); + REQUEST_PACKET.registerPacket(new PartyIgnoreInvitePacket()); + REQUEST_PACKET.registerPacket(new PartyLogToServerPacket()); + // Animation Packets REQUEST_PACKET.registerPacket(new AnimationsGetPacket()); REQUEST_PACKET.registerPacket(new AnimationGetPacket()); diff --git a/src/main/java/kamkeel/npcs/network/enums/EnumRequestPacket.java b/src/main/java/kamkeel/npcs/network/enums/EnumRequestPacket.java index 5c293ab80..ff9225140 100644 --- a/src/main/java/kamkeel/npcs/network/enums/EnumRequestPacket.java +++ b/src/main/java/kamkeel/npcs/network/enums/EnumRequestPacket.java @@ -115,7 +115,6 @@ public enum EnumRequestPacket { PartyKick, PartyLeave, PartyInvite, - PartyInviteList, PartyAcceptInvite, PartyIgnoreInvite, PartySetLeader, 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 deleted file mode 100644 index 006025a15..000000000 --- a/src/main/java/kamkeel/npcs/network/packets/request/party/PartyInviteListPacket.java +++ /dev/null @@ -1,44 +0,0 @@ -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/noppes/npcs/client/gui/player/inventory/GuiParty.java b/src/main/java/noppes/npcs/client/gui/player/inventory/GuiParty.java index 0a08de502..d5520f958 100644 --- a/src/main/java/noppes/npcs/client/gui/player/inventory/GuiParty.java +++ b/src/main/java/noppes/npcs/client/gui/player/inventory/GuiParty.java @@ -1,5 +1,8 @@ package noppes.npcs.client.gui.player.inventory; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.packets.data.large.PartyDataPacket; +import kamkeel.npcs.network.packets.request.party.*; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiYesNo; import net.minecraft.client.gui.GuiYesNoCallback; @@ -52,7 +55,7 @@ public class GuiParty extends GuiCNPCInventory implements ITextfieldListener,ICu ySize = 180; drawDefaultBackground = false; NoppesUtilPlayer.sendData(EnumPlayerPacket.TrackedQuest); - Client.sendData(EnumPacketServer.GetPartyData); + PacketClient.sendClient(new PartyInfoPacket()); } public void initGui(){ @@ -191,23 +194,23 @@ public class GuiParty extends GuiCNPCInventory implements ITextfieldListener,ICu switch (i) { case 0: // Leader New Player - Client.sendData(EnumPacketServer.SetPartyLeader, this.selectedPlayer); + PacketClient.sendClient(new PartySetLeaderPacket(this.selectedPlayer)); break; case 1: // Kick Other Player - Client.sendData(EnumPacketServer.KickPlayer, this.selectedPlayer); + PacketClient.sendClient(new PartyKickPacket(this.selectedPlayer)); break; case 2: // Disband Party - Client.sendData(EnumPacketServer.DisbandParty); + PacketClient.sendClient(new PartyDisbandPacket()); break; case 3: // Leave Party - Client.sendData(EnumPacketServer.LeavePlayer, this.player.getCommandSenderName()); + PacketClient.sendClient(new PartyLeavePacket(this.player.getCommandSenderName())); break; case 4: // Drop Party Quest - Client.sendData(EnumPacketServer.SetPartyQuest, -1); + PacketClient.sendClient(new PartySetQuestPacket(-1)); break; } receivedData = false; @@ -229,19 +232,19 @@ public class GuiParty extends GuiCNPCInventory implements ITextfieldListener,ICu switch (guibutton.id) { case 200: - Client.sendData(EnumPacketServer.CreateParty); + PacketClient.sendClient(new PartyInfoPacket(true)); receivedData = false; break; case 215: if (this.selectedInvite != null && !this.selectedInvite.isEmpty()) { - Client.sendData(EnumPacketServer.AcceptInvite, this.selectedInvite); + PacketClient.sendClient(new PartyAcceptInvitePacket(this.selectedInvite)); receivedData = false; return; } break; case 220: if (this.selectedInvite != null && !this.selectedInvite.isEmpty()) { - Client.sendData(EnumPacketServer.IgnoreInvite, this.selectedInvite); + PacketClient.sendClient(new PartyIgnoreInvitePacket(this.selectedInvite)); receivedData = false; return; } @@ -267,7 +270,7 @@ public class GuiParty extends GuiCNPCInventory implements ITextfieldListener,ICu case 330: String inviteName = this.getTextField(325).getText(); if (!inviteName.isEmpty() && !party.getPlayerNames(true).contains(inviteName.toLowerCase())) { - Client.sendData(EnumPacketServer.PartyInvite, inviteName); + PacketClient.sendClient(new PartyInvitePacket(inviteName)); this.getTextField(325).setText(""); } break; @@ -455,10 +458,10 @@ public class GuiParty extends GuiCNPCInventory implements ITextfieldListener,ICu public void save() { if (this.partyChanged) { if(ClientCacheHandler.party != null) - Client.sendData(EnumPacketServer.SavePartyData, ClientCacheHandler.party.writeClientNBT()); + PacketClient.sendClient(new PartySavePacket(ClientCacheHandler.party.writeClientNBT())); } if (!Objects.equals(this.originalTracked, data.trackedQuestKey)) { - Client.sendData(EnumPacketServer.PartyLogToServer, this.data.trackedQuestKey); + PacketClient.sendClient(new PartyLogToServerPacket(this.data.trackedQuestKey)); } } diff --git a/src/main/java/noppes/npcs/client/gui/player/inventory/GuiQuestLog.java b/src/main/java/noppes/npcs/client/gui/player/inventory/GuiQuestLog.java index a146612db..14d0af3fd 100644 --- a/src/main/java/noppes/npcs/client/gui/player/inventory/GuiQuestLog.java +++ b/src/main/java/noppes/npcs/client/gui/player/inventory/GuiQuestLog.java @@ -1,5 +1,9 @@ package noppes.npcs.client.gui.player.inventory; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.packets.request.party.PartyLogToServerPacket; +import kamkeel.npcs.network.packets.request.party.PartySetQuestPacket; +import kamkeel.npcs.network.packets.request.quest.QuestLogToServerPacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiYesNo; import net.minecraft.client.gui.GuiYesNoCallback; @@ -153,7 +157,7 @@ public class GuiQuestLog extends GuiCNPCInventory implements ICustomScrollListen String key = data.selectedCategory + ":" + data.selectedQuest; if(data.partyQuests.containsKey(key)){ int questID = data.partyQuests.get(key); - Client.sendData(EnumPacketServer.SetPartyQuest, questID); + PacketClient.sendClient(new PartySetQuestPacket(questID)); } } initGui(); @@ -192,7 +196,7 @@ public class GuiQuestLog extends GuiCNPCInventory implements ICustomScrollListen if (guibutton.id == 3) { if (Objects.equals(ClientCacheHandler.party.getCurrentQuestName(), data.selectedQuest)) { - Client.sendData(EnumPacketServer.SetPartyQuest, -1); + PacketClient.sendClient(new PartySetQuestPacket(-1)); } else { GuiYesNo yesnoDisband = new GuiYesNo(this, "Confirm", StatCollector.translateToLocal("party.setQuestConfirm"), 0); displayGuiScreen(yesnoDisband); @@ -405,7 +409,7 @@ public class GuiQuestLog extends GuiCNPCInventory implements ICustomScrollListen !Objects.equals(this.trackedQuestKeyOnOpen, data.trackedQuestKey))) { NBTTagCompound compound = new NBTTagCompound(); compound.setTag("Alerts", NBTTags.nbtStringStringMap(data.questAlerts)); - Client.sendData(EnumPacketServer.QuestLogToServer, compound, this.data.trackedQuestKey); + PacketClient.sendClient(new QuestLogToServerPacket(compound, this.data.trackedQuestKey)); } } diff --git a/src/main/java/noppes/npcs/client/gui/player/inventory/GuiSettings.java b/src/main/java/noppes/npcs/client/gui/player/inventory/GuiSettings.java index ef529ed57..da692acab 100644 --- a/src/main/java/noppes/npcs/client/gui/player/inventory/GuiSettings.java +++ b/src/main/java/noppes/npcs/client/gui/player/inventory/GuiSettings.java @@ -1,5 +1,8 @@ package noppes.npcs.client.gui.player.inventory; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.PacketHandler; +import kamkeel.npcs.network.packets.request.quest.QuestUntrackPacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiYesNo; import net.minecraft.client.gui.GuiYesNoCallback; @@ -102,7 +105,7 @@ public class GuiSettings extends GuiCNPCInventory implements ITextfieldListener, switch (i) { case 0: // Untrack Quest - Client.sendData(EnumPacketServer.UntrackQuest); + PacketClient.sendClient(new QuestUntrackPacket()); break; case 1: // Clear Skin Cache diff --git a/src/main/java/noppes/npcs/constants/EnumPacketServer.java b/src/main/java/noppes/npcs/constants/EnumPacketServer.java index d7f418d19..40f5cb8fd 100644 --- a/src/main/java/noppes/npcs/constants/EnumPacketServer.java +++ b/src/main/java/noppes/npcs/constants/EnumPacketServer.java @@ -6,9 +6,6 @@ public enum EnumPacketServer { SpawnMob(CustomNpcsPermissions.SPAWNER_MOB), MobSpawner(CustomNpcsPermissions.SPAWNER_CREATE), - - TraderMarketSave(CustomNpcsPermissions.NPC_ADVANCED, true), - ClonePreSave(CustomNpcsPermissions.NPC_CLONE), CloneSave(CustomNpcsPermissions.NPC_CLONE), CloneRemove(CustomNpcsPermissions.NPC_CLONE), @@ -35,38 +32,30 @@ public enum EnumPacketServer { ScriptBlockDataSave(CustomNpcsPermissions.SCRIPT_BLOCK, false), ScriptBlockDataGet(false), - ScriptDataSave(CustomNpcsPermissions.SCRIPT_NPC, true), ScriptDataGet(true), - EventScriptDataSave(CustomNpcsPermissions.SCRIPT_NPC, true), EventScriptDataGet(true), + ScriptDataSave(CustomNpcsPermissions.SCRIPT_NPC, true), + ScriptDataGet(true), + EventScriptDataSave(CustomNpcsPermissions.SCRIPT_NPC, true), + EventScriptDataGet(true), - DialogCategoriesGet, DialogsGetFromDialog, - DialogsGet, DialogGet, + DialogCategoriesGet, + DialogsGetFromDialog, + DialogsGet, + DialogGet, DialogRemove(CustomNpcsPermissions.GLOBAL_DIALOG), FactionsGet, FactionGet, TagGet, QuestCategoriesGet, - QuestRemove(CustomNpcsPermissions.GLOBAL_QUEST), - QuestRewardSave(CustomNpcsPermissions.GLOBAL_QUEST), - QuestSave(CustomNpcsPermissions.GLOBAL_QUEST), QuestsGetFromQuest, QuestsGet, + QuestsGetFromQuest, QuestsGet, MerchantUpdate(CustomNpcsPermissions.EDIT_VILLAGER), PlayerRider(CustomNpcsPermissions.TOOL_MOUNTER), SpawnRider(CustomNpcsPermissions.TOOL_MOUNTER), - MovingPathSave(CustomNpcsPermissions.TOOL_PATHER,true), MovingPathGet(true), - - QuestLogToServer, - PartyLogToServer, - UntrackQuest, + MovingPathSave(CustomNpcsPermissions.TOOL_PATHER,true), + MovingPathGet(true), QuestGet, - DimensionTeleport, - GetTileEntity, - IsGuiOpen, - - SavePartyData, CreateParty, GetPartyData, DisbandParty, KickPlayer, LeavePlayer, PartyInvite, GetPartyInviteList, AcceptInvite, - IgnoreInvite, SetPartyLeader, SetPartyQuest, - - ServerUpdateSkinOverlays; + DimensionTeleport; public CustomNpcsPermissions.Permission permission = null; public boolean needsNpc = false;