diff --git a/src/main/java/kamkeel/npcs/network/PacketHandler.java b/src/main/java/kamkeel/npcs/network/PacketHandler.java index 91079c6da..08a491ae5 100644 --- a/src/main/java/kamkeel/npcs/network/PacketHandler.java +++ b/src/main/java/kamkeel/npcs/network/PacketHandler.java @@ -348,6 +348,8 @@ public class PacketHandler { PLAYER_PACKET.registerPacket(new BankActionPacket()); + PLAYER_PACKET.registerPacket(new CheckPlayerValue()); + PLAYER_PACKET.registerPacket(new MailActionPacket()); PLAYER_PACKET.registerPacket(new MailActionPacket.MailSendPacket()); diff --git a/src/main/java/kamkeel/npcs/network/enums/EnumPlayerPacket.java b/src/main/java/kamkeel/npcs/network/enums/EnumPlayerPacket.java index d1893b557..8d8e7b1ab 100644 --- a/src/main/java/kamkeel/npcs/network/enums/EnumPlayerPacket.java +++ b/src/main/java/kamkeel/npcs/network/enums/EnumPlayerPacket.java @@ -5,16 +5,13 @@ public enum EnumPlayerPacket { Transport, BankAction, Dialog, // TODO - QuestLog, // TODO - TrackedQuest, // TODO - CheckQuestCompletion, // TODO - FactionsGet, // TODO + GetPlayerValue, MailBoxAction, MailSend, SaveSign, // TODO SaveBook, // TODO Companion, // TODO: OpenInv, TalentExp - RoleGet, // TODO + GetRole, // TODO InputDevice, ScreenSize } diff --git a/src/main/java/kamkeel/npcs/network/packets/player/CheckPlayerValue.java b/src/main/java/kamkeel/npcs/network/packets/player/CheckPlayerValue.java new file mode 100644 index 000000000..9c3eb4c62 --- /dev/null +++ b/src/main/java/kamkeel/npcs/network/packets/player/CheckPlayerValue.java @@ -0,0 +1,87 @@ +package kamkeel.npcs.network.packets.player; + +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.EnumPlayerPacket; +import kamkeel.npcs.network.packets.data.large.GuiDataPacket; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import noppes.npcs.NoppesUtilPlayer; +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.controllers.data.PlayerFactionData; +import noppes.npcs.controllers.data.PlayerQuestData; + +import java.io.IOException; + +public class CheckPlayerValue extends AbstractPacket { + public static final String packetName = "Player|CheckPlayerVal"; + + private Type type; + + public CheckPlayerValue() { + } + + public CheckPlayerValue(Type type) { + this.type = type; + } + + @Override + public Enum getType() { + return EnumPlayerPacket.GetPlayerValue; + } + + @Override + public PacketChannel getChannel() { + return PacketHandler.PLAYER_PACKET; + } + + @Override + @SideOnly(Side.CLIENT) + public void sendData(ByteBuf out) throws IOException { + out.writeInt(type.ordinal()); + } + + @Override + public void receiveData(ByteBuf in, EntityPlayer player) throws IOException { + if (!(player instanceof EntityPlayerMP)) + return; + EntityPlayerMP playerMP = (EntityPlayerMP) player; + Type type = Type.values()[in.readInt()]; + switch (type) { + case Faction: + PlayerFactionData data = PlayerDataController.Instance.getPlayerData(playerMP).factionData; + GuiDataPacket.sendGuiData(playerMP, data.getPlayerGuiData()); + break; + case QuestLog: + NoppesUtilPlayer.sendQuestLogData(playerMP); + break; + case TrackedQuest: + NoppesUtilPlayer.sendTrackedQuest(playerMP); + break; + case CheckQuestCompletion: + PlayerData playerData = PlayerDataController.Instance.getPlayerData(playerMP); + PlayerQuestData questData = PlayerDataController.Instance.getPlayerData(playerMP).questData; + Party playerParty = playerData.getPlayerParty(); + if(playerParty != null) + PartyController.Instance().checkQuestCompletion(playerParty, null); + + questData.checkQuestCompletion(playerData, null); + break; + + } + } + + public enum Type { + Faction, + QuestLog, + TrackedQuest, + CheckQuestCompletion + } +} diff --git a/src/main/java/noppes/npcs/PacketHandlerPlayer.java b/src/main/java/noppes/npcs/PacketHandlerPlayer.java index 598074e20..e25109423 100644 --- a/src/main/java/noppes/npcs/PacketHandlerPlayer.java +++ b/src/main/java/noppes/npcs/PacketHandlerPlayer.java @@ -185,25 +185,25 @@ public class PacketHandlerPlayer{ return; NoppesUtilPlayer.dialogSelected(buffer.readInt(), buffer.readInt(), player, npc); } - else if(type == EnumPlayerPacket.CheckQuestCompletion){ - PlayerData playerData = PlayerDataController.Instance.getPlayerData(player); - PlayerQuestData questData = PlayerDataController.Instance.getPlayerData(player).questData; - Party playerParty = playerData.getPlayerParty(); - if(playerParty != null) - PartyController.Instance().checkQuestCompletion(playerParty, null); - - questData.checkQuestCompletion(playerData, null); - } - else if(type == EnumPlayerPacket.QuestLog){ - NoppesUtilPlayer.sendQuestLogData(player); - } - else if(type == EnumPlayerPacket.TrackedQuest){ - NoppesUtilPlayer.sendTrackedQuest(player); - } - else if(type == EnumPlayerPacket.FactionsGet){ - PlayerFactionData data = PlayerDataController.Instance.getPlayerData(player).factionData; - GuiDataPacket.sendGuiData(player, data.getPlayerGuiData()); - } +// else if(type == EnumPlayerPacket.CheckQuestCompletion){ +// PlayerData playerData = PlayerDataController.Instance.getPlayerData(player); +// PlayerQuestData questData = PlayerDataController.Instance.getPlayerData(player).questData; +// Party playerParty = playerData.getPlayerParty(); +// if(playerParty != null) +// PartyController.Instance().checkQuestCompletion(playerParty, null); +// +// questData.checkQuestCompletion(playerData, null); +// } +// else if(type == EnumPlayerPacket.QuestLog){ +// NoppesUtilPlayer.sendQuestLogData(player); +// } +// else if(type == EnumPlayerPacket.TrackedQuest){ +// NoppesUtilPlayer.sendTrackedQuest(player); +// } +// else if(type == EnumPlayerPacket.FactionsGet){ +// PlayerFactionData data = PlayerDataController.Instance.getPlayerData(player).factionData; +// GuiDataPacket.sendGuiData(player, data.getPlayerGuiData()); +// } // else if(type == EnumPlayerPacket.MailGet){ // PlayerMailData data = PlayerDataController.Instance.getPlayerData(player).mailData; // GuiDataPacket.sendGuiData(player, data.saveNBTData(new NBTTagCompound())); diff --git a/src/main/java/noppes/npcs/client/ClientTickHandler.java b/src/main/java/noppes/npcs/client/ClientTickHandler.java index 812b3f29f..d53bc21e5 100644 --- a/src/main/java/noppes/npcs/client/ClientTickHandler.java +++ b/src/main/java/noppes/npcs/client/ClientTickHandler.java @@ -7,6 +7,7 @@ import cpw.mods.fml.common.gameevent.TickEvent; import cpw.mods.fml.common.gameevent.TickEvent.Phase; import kamkeel.npcs.addon.client.DBCClient; import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.packets.player.CheckPlayerValue; import kamkeel.npcs.network.packets.player.InputDevicePacket; import kamkeel.npcs.network.packets.player.ScreenSizePacket; import net.minecraft.client.Minecraft; @@ -49,7 +50,7 @@ public class ClientTickHandler{ } if(mc.thePlayer != null && mc.thePlayer.openContainer instanceof ContainerPlayer){ if(otherContainer){ - NoppesUtilPlayer.sendData(EnumPlayerPacket.CheckQuestCompletion); + PacketClient.sendClient(new CheckPlayerValue(CheckPlayerValue.Type.CheckQuestCompletion)); otherContainer = false; } } diff --git a/src/main/java/noppes/npcs/client/gui/player/GuiDialogInteract.java b/src/main/java/noppes/npcs/client/gui/player/GuiDialogInteract.java index 648e9511d..1f06092c4 100644 --- a/src/main/java/noppes/npcs/client/gui/player/GuiDialogInteract.java +++ b/src/main/java/noppes/npcs/client/gui/player/GuiDialogInteract.java @@ -1,5 +1,7 @@ package noppes.npcs.client.gui.player; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.packets.player.CheckPlayerValue; import net.minecraft.client.Minecraft; import net.minecraft.client.audio.PositionedSoundRecord; import net.minecraft.client.gui.FontRenderer; @@ -644,7 +646,7 @@ public class GuiDialogInteract extends GuiNPCInterface implements IGuiClose } private void closed(){ grabMouse(false); - NoppesUtilPlayer.sendData(EnumPlayerPacket.CheckQuestCompletion); + PacketClient.sendClient(new CheckPlayerValue(CheckPlayerValue.Type.CheckQuestCompletion)); } public void save() { diff --git a/src/main/java/noppes/npcs/client/gui/player/inventory/GuiFaction.java b/src/main/java/noppes/npcs/client/gui/player/inventory/GuiFaction.java index 41ff92a08..9e7b39cf6 100644 --- a/src/main/java/noppes/npcs/client/gui/player/inventory/GuiFaction.java +++ b/src/main/java/noppes/npcs/client/gui/player/inventory/GuiFaction.java @@ -1,5 +1,7 @@ package noppes.npcs.client.gui.player.inventory; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.packets.player.CheckPlayerValue; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; @@ -35,7 +37,7 @@ public class GuiFaction extends GuiCNPCInventory implements IGuiData { ySize = 180; this.drawDefaultBackground = false; title = ""; - NoppesUtilPlayer.sendData(EnumPlayerPacket.FactionsGet); + PacketClient.sendClient(new CheckPlayerValue(CheckPlayerValue.Type.Faction)); } @Override 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 d5520f958..26def4100 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 @@ -2,6 +2,7 @@ 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.player.CheckPlayerValue; import kamkeel.npcs.network.packets.request.party.*; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiYesNo; @@ -54,7 +55,7 @@ public class GuiParty extends GuiCNPCInventory implements ITextfieldListener,ICu xSize = 280; ySize = 180; drawDefaultBackground = false; - NoppesUtilPlayer.sendData(EnumPlayerPacket.TrackedQuest); + PacketClient.sendClient(new CheckPlayerValue(CheckPlayerValue.Type.TrackedQuest)); PacketClient.sendClient(new PartyInfoPacket()); } diff --git a/src/main/java/noppes/npcs/client/gui/player/inventory/GuiProfiles.java b/src/main/java/noppes/npcs/client/gui/player/inventory/GuiProfiles.java index d874a4e19..053deddac 100644 --- a/src/main/java/noppes/npcs/client/gui/player/inventory/GuiProfiles.java +++ b/src/main/java/noppes/npcs/client/gui/player/inventory/GuiProfiles.java @@ -1,5 +1,7 @@ package noppes.npcs.client.gui.player.inventory; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.packets.player.CheckPlayerValue; import net.minecraft.client.gui.GuiButton; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; @@ -35,7 +37,7 @@ public class GuiProfiles extends GuiCNPCInventory implements IGuiData { ySize = 180; this.drawDefaultBackground = false; title = ""; - NoppesUtilPlayer.sendData(EnumPlayerPacket.FactionsGet); + PacketClient.sendClient(new CheckPlayerValue(CheckPlayerValue.Type.Faction)); } @Override 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 14d0af3fd..cd6c8c381 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,6 +1,7 @@ package noppes.npcs.client.gui.player.inventory; import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.packets.player.CheckPlayerValue; import kamkeel.npcs.network.packets.request.party.PartyLogToServerPacket; import kamkeel.npcs.network.packets.request.party.PartySetQuestPacket; import kamkeel.npcs.network.packets.request.quest.QuestLogToServerPacket; @@ -51,7 +52,7 @@ public class GuiQuestLog extends GuiCNPCInventory implements ICustomScrollListen xSize = 280; ySize = 180; drawDefaultBackground = false; - NoppesUtilPlayer.sendData(EnumPlayerPacket.QuestLog); + PacketClient.sendClient(new CheckPlayerValue(CheckPlayerValue.Type.QuestLog)); } public void initGui(){ super.initGui(); diff --git a/src/main/java/noppes/npcs/constants/EnumPlayerPacket.java b/src/main/java/noppes/npcs/constants/EnumPlayerPacket.java index e8e68e455..809979483 100644 --- a/src/main/java/noppes/npcs/constants/EnumPlayerPacket.java +++ b/src/main/java/noppes/npcs/constants/EnumPlayerPacket.java @@ -8,11 +8,11 @@ public enum EnumPlayerPacket { // BankUnlock, // BankUpgrade, Dialog, - QuestLog, - TrackedQuest, - CheckQuestCompletion, +// QuestLog, +// TrackedQuest, +// CheckQuestCompletion, // BankSlotOpen, - FactionsGet, +// FactionsGet, // MailGet, // MailDelete, // MailSend,