From 94fef1461e726908acaa9f3bd733db04c678cc99 Mon Sep 17 00:00:00 2001 From: Kam Date: Fri, 31 May 2024 12:13:17 -0400 Subject: [PATCH] Remove Packet Dependencies from CNPC+ --- src/main/java/kamkeel/addon/DBCAddon.java | 9 --------- src/main/java/kamkeel/addon/client/DBCClient.java | 2 ++ .../java/noppes/npcs/CustomNpcsPermissions.java | 2 -- .../java/noppes/npcs/PacketHandlerPlayer.java | 3 --- .../java/noppes/npcs/PacketHandlerServer.java | 15 --------------- src/main/java/noppes/npcs/client/ClientProxy.java | 3 +++ .../client/gui/mainmenu/GuiNPCGlobalMainMenu.java | 9 +++++++-- .../java/noppes/npcs/constants/EnumGuiType.java | 1 + .../noppes/npcs/constants/EnumPacketServer.java | 3 --- .../noppes/npcs/constants/EnumPlayerPacket.java | 2 +- .../resources/assets/customnpcs/lang/en_US.lang | 1 - 11 files changed, 14 insertions(+), 36 deletions(-) diff --git a/src/main/java/kamkeel/addon/DBCAddon.java b/src/main/java/kamkeel/addon/DBCAddon.java index 8f67ca1d1..e8f446143 100644 --- a/src/main/java/kamkeel/addon/DBCAddon.java +++ b/src/main/java/kamkeel/addon/DBCAddon.java @@ -39,13 +39,4 @@ public class DBCAddon { // Client Sync public void syncPlayer(EntityPlayerMP playerMP){} - - - // Packet Handling - public void formPacketGet(EntityPlayer player, ByteBuf buffer){} - 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/kamkeel/addon/client/DBCClient.java b/src/main/java/kamkeel/addon/client/DBCClient.java index 07c0120fa..f148439d6 100644 --- a/src/main/java/kamkeel/addon/client/DBCClient.java +++ b/src/main/java/kamkeel/addon/client/DBCClient.java @@ -37,6 +37,8 @@ public class DBCClient { // Manage Custom Forms public GuiNPCInterface2 manageCustomForms(EntityNPCInterface npcInterface){ return null; } + // Manage Custom Forms + public GuiNPCInterface2 manageCustomAuras(EntityNPCInterface npcInterface){ return null; } // Inventory GUI public GuiCNPCInventory inventoryGUI(){ return null; } diff --git a/src/main/java/noppes/npcs/CustomNpcsPermissions.java b/src/main/java/noppes/npcs/CustomNpcsPermissions.java index b2d278409..ebb749fe5 100644 --- a/src/main/java/noppes/npcs/CustomNpcsPermissions.java +++ b/src/main/java/noppes/npcs/CustomNpcsPermissions.java @@ -49,8 +49,6 @@ public class CustomNpcsPermissions{ public static final Permission GLOBAL_NATURALSPAWN = new Permission("customnpcs.global.naturalspawn"); public static final Permission GLOBAL_TAG = new Permission("customnpcs.global.tag"); public static final Permission GLOBAL_ANIMATION = new Permission("customnpcs.global.animation"); - public static final Permission GLOBAL_CUSTOMFORM = new Permission("customnpcs.global.customform"); - public static final Permission SPAWNER_MOB = new Permission("customnpcs.spawner.mob"); public static final Permission SPAWNER_CREATE = new Permission("customnpcs.spawner.create"); diff --git a/src/main/java/noppes/npcs/PacketHandlerPlayer.java b/src/main/java/noppes/npcs/PacketHandlerPlayer.java index 4f7dc7188..ec85c256b 100644 --- a/src/main/java/noppes/npcs/PacketHandlerPlayer.java +++ b/src/main/java/noppes/npcs/PacketHandlerPlayer.java @@ -219,9 +219,6 @@ 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 40a6c14f5..1d69a86b1 100644 --- a/src/main/java/noppes/npcs/PacketHandlerServer.java +++ b/src/main/java/noppes/npcs/PacketHandlerServer.java @@ -1207,21 +1207,6 @@ public class PacketHandlerServer{ NoppesUtilServer.sendAnimationDataAll(player); Server.sendData(player, EnumPacketClient.GUI_DATA, animation.writeToNBT()); } - else if(type == EnumPacketServer.CustomFormsGet){ - DBCAddon.instance.formPacketGets(player, buffer); - } - else if(type == EnumPacketServer.CustomFormGet){ - DBCAddon.instance.formPacketGet(player, buffer); - } - else if(type == EnumPacketServer.CustomFormRemove){ - DBCAddon.instance.formPacketRemove(player, buffer); - } - 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/client/ClientProxy.java b/src/main/java/noppes/npcs/client/ClientProxy.java index e9de292a3..b13a75387 100644 --- a/src/main/java/noppes/npcs/client/ClientProxy.java +++ b/src/main/java/noppes/npcs/client/ClientProxy.java @@ -249,6 +249,9 @@ public class ClientProxy extends CommonProxy { else if (gui == EnumGuiType.ManageCustomForms) return DBCClient.Instance.manageCustomForms(npc); + else if (gui == EnumGuiType.ManageCustomAuras) + return DBCClient.Instance.manageCustomAuras(npc); + else if (gui == EnumGuiType.ManageTags) return new GuiNPCManageTags(npc); diff --git a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNPCGlobalMainMenu.java b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNPCGlobalMainMenu.java index 561e4d4d1..363cb5b58 100644 --- a/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNPCGlobalMainMenu.java +++ b/src/main/java/noppes/npcs/client/gui/mainmenu/GuiNPCGlobalMainMenu.java @@ -33,8 +33,10 @@ public class GuiNPCGlobalMainMenu extends GuiNPCInterface2{ y = guiTop + 10; this.addButton(new GuiNpcButton(18, guiLeft + 210, y, "menu.animations")); this.addButton(new GuiNpcButton(17, guiLeft + 210, y += 22, "menu.tags")); - if(Loader.isModLoaded("npcdbc")) - this.addButton(new GuiNpcButton(200, guiLeft + 210, y += 22, "global.customforms")); + if(Loader.isModLoaded("npcdbc")){ + this.addButton(new GuiNpcButton(200, guiLeft + 210, y + 154, 99, 20, "global.customforms")); + this.addButton(new GuiNpcButton(201, guiLeft + 210 + 99 + 3, y + 154, 99, 20, "global.customauras")); + } } @Override @@ -78,6 +80,9 @@ public class GuiNPCGlobalMainMenu extends GuiNPCInterface2{ if (id == 200) { NoppesUtil.requestOpenGUI(EnumGuiType.ManageCustomForms); } + if (id == 201) { + NoppesUtil.requestOpenGUI(EnumGuiType.ManageCustomAuras); + } } @Override public void save() { diff --git a/src/main/java/noppes/npcs/constants/EnumGuiType.java b/src/main/java/noppes/npcs/constants/EnumGuiType.java index 6c8975200..7d356220e 100644 --- a/src/main/java/noppes/npcs/constants/EnumGuiType.java +++ b/src/main/java/noppes/npcs/constants/EnumGuiType.java @@ -7,6 +7,7 @@ public enum EnumGuiType { ManageFactions, ManageTags, ManageCustomForms, + ManageCustomAuras, ManageAnimations, MainMenuAdvanced, MainMenuGlobal, diff --git a/src/main/java/noppes/npcs/constants/EnumPacketServer.java b/src/main/java/noppes/npcs/constants/EnumPacketServer.java index 3871c97ec..1b9136686 100644 --- a/src/main/java/noppes/npcs/constants/EnumPacketServer.java +++ b/src/main/java/noppes/npcs/constants/EnumPacketServer.java @@ -98,9 +98,6 @@ public enum EnumPacketServer { AnimationsGet, AnimationGet, AnimationRemove(CustomNpcsPermissions.GLOBAL_ANIMATION), AnimationSave(CustomNpcsPermissions.GLOBAL_ANIMATION), - CustomFormsGet, CustomFormGet, CustomFormSet, - CustomFormRemove(CustomNpcsPermissions.GLOBAL_CUSTOMFORM), CustomFormSave(CustomNpcsPermissions.GLOBAL_CUSTOMFORM), - RecipesGet, RecipeGet, QuestOpenGui, PlayerDataGet, QuestLogToServer, PartyLogToServer, UntrackQuest, RemoteNpcsGet(CustomNpcsPermissions.NPC_GUI), diff --git a/src/main/java/noppes/npcs/constants/EnumPlayerPacket.java b/src/main/java/noppes/npcs/constants/EnumPlayerPacket.java index b94d3015c..4834c9d25 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, CustomFormsGet, + MailGet, MailDelete, MailSend, MailRead, MailboxOpenMail, SignSave, SaveBook, CompanionOpenInv, RoleGet, KeyPressed, MouseClicked, CompanionTalentExp, ScreenSize, MarkData } diff --git a/src/main/resources/assets/customnpcs/lang/en_US.lang b/src/main/resources/assets/customnpcs/lang/en_US.lang index 8976c0fe6..1ea355b10 100644 --- a/src/main/resources/assets/customnpcs/lang/en_US.lang +++ b/src/main/resources/assets/customnpcs/lang/en_US.lang @@ -523,7 +523,6 @@ global.playerdata=PlayerData global.recipes=Recipes global.naturalspawn=Natural Spawns global.linked=Linked -global.customforms=Custom Forms bank.slot=Slot bank.unlock=Unlock