From 364bf2414f88f6d84f11f4198c661628d5bd4251 Mon Sep 17 00:00:00 2001 From: Kam Date: Sun, 2 Feb 2025 03:01:12 -0500 Subject: [PATCH] Custom GUI Packets --- .../kamkeel/npcs/network/PacketHandler.java | 22 ++++++++++++------- .../customgui/CustomGuiClosePacket.java | 2 +- .../customgui/CustomGuiUnfocusedPacket.java | 3 +-- .../customgui/CustomScrollClickPacket.java | 3 +-- .../npcs/client/gui/custom/GuiCustom.java | 17 +++++++++----- .../npcs/constants/EnumPacketServer.java | 4 ---- 6 files changed, 28 insertions(+), 23 deletions(-) diff --git a/src/main/java/kamkeel/npcs/network/PacketHandler.java b/src/main/java/kamkeel/npcs/network/PacketHandler.java index 4aea38ced..3079d711a 100644 --- a/src/main/java/kamkeel/npcs/network/PacketHandler.java +++ b/src/main/java/kamkeel/npcs/network/PacketHandler.java @@ -18,6 +18,10 @@ import kamkeel.npcs.network.packets.request.bank.BankGetPacket; import kamkeel.npcs.network.packets.request.bank.BankRemovePacket; import kamkeel.npcs.network.packets.request.bank.BankSavePacket; import kamkeel.npcs.network.packets.request.bank.BanksGetPacket; +import kamkeel.npcs.network.packets.request.customgui.CustomGuiButtonPacket; +import kamkeel.npcs.network.packets.request.customgui.CustomGuiClosePacket; +import kamkeel.npcs.network.packets.request.customgui.CustomGuiUnfocusedPacket; +import kamkeel.npcs.network.packets.request.customgui.CustomScrollClickPacket; import kamkeel.npcs.network.packets.request.dialog.*; import kamkeel.npcs.network.packets.request.faction.FactionRemovePacket; import kamkeel.npcs.network.packets.request.faction.FactionSavePacket; @@ -185,16 +189,18 @@ public class PacketHandler { REQUEST_PACKET.registerPacket(new RemoteResetPacket()); REQUEST_PACKET.registerPacket(new RemoteTpToNpcPacket()); - - - // + // CustomGUI + REQUEST_PACKET.registerPacket(new CustomGuiButtonPacket()); + REQUEST_PACKET.registerPacket(new CustomGuiClosePacket()); + REQUEST_PACKET.registerPacket(new CustomGuiUnfocusedPacket()); + REQUEST_PACKET.registerPacket(new CustomScrollClickPacket()); // Other REQUEST_PACKET.registerPacket(new GuiRequestPacket()); } public void registerDataPackets(){ - // Client Packets + // Data Packets DATA_PACKET.registerPacket(new AchievementPacket()); DATA_PACKET.registerPacket(new ChatAlertPacket()); DATA_PACKET.registerPacket(new ChatBubblePacket()); @@ -211,7 +217,7 @@ public class PacketHandler { DATA_PACKET.registerPacket(new UpdateAnimationsPacket()); DATA_PACKET.registerPacket(new VillagerListPacket()); - // Client | GUI Packets + // Data | GUI Packets DATA_PACKET.registerPacket(new GuiClosePacket()); DATA_PACKET.registerPacket(new GuiOpenPacket()); DATA_PACKET.registerPacket(new GuiErrorPacket()); @@ -221,7 +227,7 @@ public class PacketHandler { DATA_PACKET.registerPacket(new IsGuiOpenPacket()); DATA_PACKET.registerPacket(new GuiOpenBookPacket()); - // Client | NPC Packets + // Data | NPC Packets DATA_PACKET.registerPacket(new DeleteNpcPacket()); DATA_PACKET.registerPacket(new EditNpcPacket()); DATA_PACKET.registerPacket(new UpdateNpcPacket()); @@ -229,12 +235,12 @@ public class PacketHandler { DATA_PACKET.registerPacket(new RolePacket()); DATA_PACKET.registerPacket(new WeaponNpcPacket()); - // Client | Script Packets + // Data | Script Packets DATA_PACKET.registerPacket(new ScriptedParticlePacket()); DATA_PACKET.registerPacket(new ScriptOverlayClosePacket()); DATA_PACKET.registerPacket(new ScriptOverlayDataPacket()); - // Client | Large Packets + // Data | Large Packets DATA_PACKET.registerPacket(new ClonerPacket()); DATA_PACKET.registerPacket(new ScrollGroupPacket()); DATA_PACKET.registerPacket(new ScrollDataPacket()); diff --git a/src/main/java/kamkeel/npcs/network/packets/request/customgui/CustomGuiClosePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/customgui/CustomGuiClosePacket.java index f258e2473..813eccfb5 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/customgui/CustomGuiClosePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/customgui/CustomGuiClosePacket.java @@ -26,7 +26,7 @@ public final class CustomGuiClosePacket extends AbstractPacket { public CustomGuiClosePacket() { } - public CustomGuiClosePacket(int id, NBTTagCompound comp) { + public CustomGuiClosePacket(NBTTagCompound comp) { this.compound = comp; } diff --git a/src/main/java/kamkeel/npcs/network/packets/request/customgui/CustomGuiUnfocusedPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/customgui/CustomGuiUnfocusedPacket.java index 4f7982207..adb3456c4 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/customgui/CustomGuiUnfocusedPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/customgui/CustomGuiUnfocusedPacket.java @@ -23,8 +23,7 @@ public final class CustomGuiUnfocusedPacket extends AbstractPacket { private NBTTagCompound compound; private int id; - public CustomGuiUnfocusedPacket() { - } + public CustomGuiUnfocusedPacket() {} public CustomGuiUnfocusedPacket(int id, NBTTagCompound comp) { this.compound = comp; diff --git a/src/main/java/kamkeel/npcs/network/packets/request/customgui/CustomScrollClickPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/customgui/CustomScrollClickPacket.java index 980913ad7..d91502ef4 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/customgui/CustomScrollClickPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/customgui/CustomScrollClickPacket.java @@ -27,8 +27,7 @@ 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; diff --git a/src/main/java/noppes/npcs/client/gui/custom/GuiCustom.java b/src/main/java/noppes/npcs/client/gui/custom/GuiCustom.java index 91df8f5ef..e1f3213fb 100644 --- a/src/main/java/noppes/npcs/client/gui/custom/GuiCustom.java +++ b/src/main/java/noppes/npcs/client/gui/custom/GuiCustom.java @@ -1,5 +1,10 @@ package noppes.npcs.client.gui.custom; +import kamkeel.npcs.network.PacketClient; +import kamkeel.npcs.network.packets.request.customgui.CustomGuiButtonPacket; +import kamkeel.npcs.network.packets.request.customgui.CustomGuiClosePacket; +import kamkeel.npcs.network.packets.request.customgui.CustomGuiUnfocusedPacket; +import kamkeel.npcs.network.packets.request.customgui.CustomScrollClickPacket; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; @@ -449,25 +454,25 @@ public class GuiCustom extends GuiScreen implements ICustomScrollListener, IGuiD protected void actionPerformed(GuiButton button) { super.actionPerformed(button); - Client.sendData(EnumPacketServer.CustomGuiButton, new Object[]{this.updateGui().toNBT(), button.id}); + PacketClient.sendClient(new CustomGuiButtonPacket(button.id, this.updateGui().toNBT())); } public void buttonClick(CustomGuiButton button) { - Client.sendData(EnumPacketServer.CustomGuiButton, new Object[]{this.updateGui().toNBT(), button.id}); + PacketClient.sendClient(new CustomGuiButtonPacket(button.id, this.updateGui().toNBT())); } public String prevScrollClicked = null; public void customScrollClicked(int i, int j, int k, GuiCustomScroll scroll) { - Client.sendData(EnumPacketServer.CustomGuiScrollClick, new Object[]{this.updateGui().toNBT(), scroll.id, scroll.selected, this.getScrollSelection((CustomGuiScrollComponent)scroll), false}); + PacketClient.sendClient(new CustomScrollClickPacket(this.updateGui().toNBT(), scroll.id, scroll.selected, this.getScrollSelection((CustomGuiScrollComponent)scroll), false)); if(Integer.toString(scroll.selected).equals(prevScrollClicked)){ - Client.sendData(EnumPacketServer.CustomGuiScrollClick, new Object[]{this.updateGui().toNBT(), scroll.id, scroll.selected, this.getScrollSelection((CustomGuiScrollComponent)scroll), true}); + PacketClient.sendClient(new CustomScrollClickPacket(this.updateGui().toNBT(), scroll.id, scroll.selected, this.getScrollSelection((CustomGuiScrollComponent)scroll), true)); } prevScrollClicked = Integer.toString(scroll.selected); } public void onGuiClosed() { if (this.gui != null) { - Client.sendData(EnumPacketServer.CustomGuiClose, new Object[]{this.updateGui().toNBT()}); + PacketClient.sendClient(new CustomGuiClosePacket(this.updateGui().toNBT())); } if (this.mc.thePlayer != null) @@ -477,7 +482,7 @@ public class GuiCustom extends GuiScreen implements ICustomScrollListener, IGuiD } public void onTextFieldUnfocused(CustomGuiTextField textField){ - Client.sendData(EnumPacketServer.CustomGuiUnfocused, new Object[]{this.updateGui().toNBT(), textField.getID()}); + PacketClient.sendClient(new CustomGuiUnfocusedPacket(textField.getID(), this.updateGui().toNBT())); } ScriptGui updateGui() { diff --git a/src/main/java/noppes/npcs/constants/EnumPacketServer.java b/src/main/java/noppes/npcs/constants/EnumPacketServer.java index 803240be3..991b310f1 100644 --- a/src/main/java/noppes/npcs/constants/EnumPacketServer.java +++ b/src/main/java/noppes/npcs/constants/EnumPacketServer.java @@ -13,8 +13,6 @@ public enum EnumPacketServer { ModelDataSave(CustomNpcsPermissions.NPC_DISPLAY, true), - MainmenuAdvancedMarkData(CustomNpcsPermissions.NPC_ADVANCED,true), - TransformSave(CustomNpcsPermissions.NPC_ADVANCED, true), TransformGet(true), TransformLoad(CustomNpcsPermissions.NPC_ADVANCED, true), TraderMarketSave(CustomNpcsPermissions.NPC_ADVANCED, true), @@ -73,8 +71,6 @@ public enum EnumPacketServer { SaveTileEntity, MailOpenSetup, DimensionsGet, DimensionTeleport, GetTileEntity, Gui, IsGuiOpen, CacheAnimation, - CustomGuiButton,CustomGuiScrollClick,CustomGuiClose,CustomGuiUnfocused, - SavePartyData, CreateParty, GetPartyData, DisbandParty, KickPlayer, LeavePlayer, PartyInvite, GetPartyInviteList, AcceptInvite, IgnoreInvite, SetPartyLeader, SetPartyQuest,