From 1d97c154d066beed8bb166a1d7223e7e4677d78b Mon Sep 17 00:00:00 2001 From: Kam Date: Wed, 17 Apr 2024 00:25:02 -0400 Subject: [PATCH] Player Packet --- src/main/java/kamkeel/addon/DBCAddon.java | 2 +- src/main/java/noppes/npcs/PacketHandlerPlayer.java | 4 ++++ src/main/java/noppes/npcs/PacketHandlerServer.java | 3 --- src/main/java/noppes/npcs/constants/EnumPacketServer.java | 2 +- src/main/java/noppes/npcs/constants/EnumPlayerPacket.java | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/kamkeel/addon/DBCAddon.java b/src/main/java/kamkeel/addon/DBCAddon.java index a1a4d8dce..4bcd3535e 100644 --- a/src/main/java/kamkeel/addon/DBCAddon.java +++ b/src/main/java/kamkeel/addon/DBCAddon.java @@ -49,5 +49,5 @@ public class DBCAddon { public void formPacketGets(EntityPlayer player, ByteBuf buffer){} public void formPacketRemove(EntityPlayer player, ByteBuf buffer){} public void formPacketSave(EntityPlayer player, ByteBuf buffer){} - public void formPacketSet(EntityPlayer player, ByteBuf buffer){} + public void formPacketPlayers(EntityPlayer player){} } diff --git a/src/main/java/noppes/npcs/PacketHandlerPlayer.java b/src/main/java/noppes/npcs/PacketHandlerPlayer.java index 7d57b2184..4f7dc7188 100644 --- a/src/main/java/noppes/npcs/PacketHandlerPlayer.java +++ b/src/main/java/noppes/npcs/PacketHandlerPlayer.java @@ -3,6 +3,7 @@ package noppes.npcs; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.network.FMLNetworkEvent.ServerCustomPacketEvent; import io.netty.buffer.ByteBuf; +import kamkeel.addon.DBCAddon; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Items; @@ -218,6 +219,9 @@ public class PacketHandlerPlayer{ PlayerMailData data = PlayerDataController.Instance.getPlayerData(player).mailData; Server.sendData(player, EnumPacketClient.GUI_DATA, data.saveNBTData(new NBTTagCompound())); } + else if(type == EnumPlayerPacket.CustomFormsGet){ + DBCAddon.instance.formPacketPlayers(player); + } else if(type == EnumPlayerPacket.MailDelete){ long time = buffer.readLong(); String username = Server.readString(buffer); diff --git a/src/main/java/noppes/npcs/PacketHandlerServer.java b/src/main/java/noppes/npcs/PacketHandlerServer.java index 3b2733dd0..2e1ade42e 100644 --- a/src/main/java/noppes/npcs/PacketHandlerServer.java +++ b/src/main/java/noppes/npcs/PacketHandlerServer.java @@ -1217,9 +1217,6 @@ public class PacketHandlerServer{ } else if(type == EnumPacketServer.CustomFormSave){ DBCAddon.instance.formPacketSave(player, buffer); - } - else if(type == EnumPacketServer.CustomFormSet){ - DBCAddon.instance.formPacketSet(player, buffer); } else blockPackets(type, buffer, player); diff --git a/src/main/java/noppes/npcs/constants/EnumPacketServer.java b/src/main/java/noppes/npcs/constants/EnumPacketServer.java index 3871c97ec..c6accc68b 100644 --- a/src/main/java/noppes/npcs/constants/EnumPacketServer.java +++ b/src/main/java/noppes/npcs/constants/EnumPacketServer.java @@ -98,7 +98,7 @@ public enum EnumPacketServer { AnimationsGet, AnimationGet, AnimationRemove(CustomNpcsPermissions.GLOBAL_ANIMATION), AnimationSave(CustomNpcsPermissions.GLOBAL_ANIMATION), - CustomFormsGet, CustomFormGet, CustomFormSet, + CustomFormsGet, CustomFormGet, CustomFormRemove(CustomNpcsPermissions.GLOBAL_CUSTOMFORM), CustomFormSave(CustomNpcsPermissions.GLOBAL_CUSTOMFORM), RecipesGet, RecipeGet, QuestOpenGui, PlayerDataGet, QuestLogToServer, PartyLogToServer, UntrackQuest, diff --git a/src/main/java/noppes/npcs/constants/EnumPlayerPacket.java b/src/main/java/noppes/npcs/constants/EnumPlayerPacket.java index 4834c9d25..b94d3015c 100644 --- a/src/main/java/noppes/npcs/constants/EnumPlayerPacket.java +++ b/src/main/java/noppes/npcs/constants/EnumPlayerPacket.java @@ -3,7 +3,7 @@ package noppes.npcs.constants; public enum EnumPlayerPacket { FollowerHire,FollowerExtend,Trader, FollowerState, Transport, BankUnlock, BankUpgrade, Dialog, QuestLog, TrackedQuest, CheckQuestCompletion, BankSlotOpen, FactionsGet, - MailGet, MailDelete, MailSend, MailRead, MailboxOpenMail, + MailGet, MailDelete, MailSend, MailRead, MailboxOpenMail, CustomFormsGet, SignSave, SaveBook, CompanionOpenInv, RoleGet, KeyPressed, MouseClicked, CompanionTalentExp, ScreenSize, MarkData }