From 20e44c919fa2684b1da3c59f5c7d0f9e3f87d256 Mon Sep 17 00:00:00 2001 From: somehussar <148253652+somehussar@users.noreply.github.com> Date: Mon, 3 Feb 2025 01:47:47 +0100 Subject: [PATCH] Rename BankPacket to BankActionPacket --- .../java/kamkeel/npcs/network/PacketHandler.java | 4 ++-- .../{BankPacket.java => BankActionPacket.java} | 12 ++++++------ .../npcs/network/packets/request/MountPacket.java | 4 ---- .../npcs/client/gui/player/GuiNPCBankChest.java | 11 ++++------- .../java/noppes/npcs/constants/EnumPlayerPacket.java | 4 ++-- 5 files changed, 14 insertions(+), 21 deletions(-) rename src/main/java/kamkeel/npcs/network/packets/player/{BankPacket.java => BankActionPacket.java} (86%) diff --git a/src/main/java/kamkeel/npcs/network/PacketHandler.java b/src/main/java/kamkeel/npcs/network/PacketHandler.java index 92ae24c50..52e9a3ede 100644 --- a/src/main/java/kamkeel/npcs/network/PacketHandler.java +++ b/src/main/java/kamkeel/npcs/network/PacketHandler.java @@ -14,7 +14,7 @@ import kamkeel.npcs.network.packets.data.gui.IsGuiOpenPacket; import kamkeel.npcs.network.packets.data.large.*; import kamkeel.npcs.network.packets.data.npc.*; import kamkeel.npcs.network.packets.data.script.*; -import kamkeel.npcs.network.packets.player.BankPacket; +import kamkeel.npcs.network.packets.player.BankActionPacket; import kamkeel.npcs.network.packets.player.FollowerPacket; import kamkeel.npcs.network.packets.player.InputDevicePacket; import kamkeel.npcs.network.packets.player.TransportPacket; @@ -341,7 +341,7 @@ public class PacketHandler { PLAYER_PACKET.registerPacket(new TransportPacket()); - PLAYER_PACKET.registerPacket(new BankPacket()); + PLAYER_PACKET.registerPacket(new BankActionPacket()); PLAYER_PACKET.registerPacket(new InputDevicePacket()); } diff --git a/src/main/java/kamkeel/npcs/network/packets/player/BankPacket.java b/src/main/java/kamkeel/npcs/network/packets/player/BankActionPacket.java similarity index 86% rename from src/main/java/kamkeel/npcs/network/packets/player/BankPacket.java rename to src/main/java/kamkeel/npcs/network/packets/player/BankActionPacket.java index d2597f6e9..589d48796 100644 --- a/src/main/java/kamkeel/npcs/network/packets/player/BankPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/player/BankActionPacket.java @@ -17,18 +17,18 @@ import noppes.npcs.controllers.data.BankData; import java.io.IOException; -public class BankPacket extends AbstractPacket { +public class BankActionPacket extends AbstractPacket { public static final String packetName = "Player|Bank"; private Action type; private int slotID; private int bankID; - public BankPacket() { + public BankActionPacket() { } - private BankPacket(Action action, int bankID, int slotID) { + private BankActionPacket(Action action, int bankID, int slotID) { this.type = action; this.bankID = bankID; this.slotID = slotID; @@ -40,13 +40,13 @@ public class BankPacket extends AbstractPacket { } public static void Open(int bankID, int slotID) { - PacketClient.sendClient(new BankPacket(Action.OpenSlot, bankID, slotID)); + PacketClient.sendClient(new BankActionPacket(Action.OpenSlot, bankID, slotID)); } public static void Upgrade() { - PacketClient.sendClient(new BankPacket(Action.Upgrade, -1, -1)); + PacketClient.sendClient(new BankActionPacket(Action.Upgrade, -1, -1)); } public static void Unlock() { - PacketClient.sendClient(new BankPacket(Action.Unlock, -1, -1)); + PacketClient.sendClient(new BankActionPacket(Action.Unlock, -1, -1)); } @Override diff --git a/src/main/java/kamkeel/npcs/network/packets/request/MountPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/MountPacket.java index 13df839be..79572a782 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/MountPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/MountPacket.java @@ -9,16 +9,12 @@ import kamkeel.npcs.network.PacketHandler; import kamkeel.npcs.network.PacketUtil; import kamkeel.npcs.network.enums.EnumItemPacketType; import kamkeel.npcs.network.enums.EnumRequestPacket; -import kamkeel.npcs.network.packets.data.large.GuiDataPacket; -import kamkeel.npcs.network.packets.player.BankPacket; import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.Constants; import noppes.npcs.CustomNpcsPermissions; import noppes.npcs.ServerEventsHandler; diff --git a/src/main/java/noppes/npcs/client/gui/player/GuiNPCBankChest.java b/src/main/java/noppes/npcs/client/gui/player/GuiNPCBankChest.java index 8ec528f54..1db1ff318 100644 --- a/src/main/java/noppes/npcs/client/gui/player/GuiNPCBankChest.java +++ b/src/main/java/noppes/npcs/client/gui/player/GuiNPCBankChest.java @@ -1,20 +1,17 @@ package noppes.npcs.client.gui.player; -import kamkeel.npcs.network.PacketClient; -import kamkeel.npcs.network.packets.player.BankPacket; +import kamkeel.npcs.network.packets.player.BankActionPacket; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; -import noppes.npcs.NoppesUtilPlayer; import noppes.npcs.NoppesUtilServer; import noppes.npcs.client.CustomNpcResourceListener; import noppes.npcs.client.gui.util.GuiContainerNPCInterface; import noppes.npcs.client.gui.util.GuiNpcButton; import noppes.npcs.client.gui.util.IGuiData; -import noppes.npcs.constants.EnumPlayerPacket; import noppes.npcs.containers.ContainerNPCBankInterface; import noppes.npcs.entity.EntityNPCInterface; import org.lwjgl.opengl.GL11; @@ -72,13 +69,13 @@ public class GuiNPCBankChest extends GuiContainerNPCInterface implements IGuiDat int id = guibutton.id; if(id < 6){ close(); - BankPacket.Open(container.bankid, id); + BankActionPacket.Open(container.bankid, id); } if(id == 8){ - BankPacket.Unlock(); + BankActionPacket.Unlock(); } if(id == 9){ - BankPacket.Upgrade(); + BankActionPacket.Upgrade(); } diff --git a/src/main/java/noppes/npcs/constants/EnumPlayerPacket.java b/src/main/java/noppes/npcs/constants/EnumPlayerPacket.java index 8f1d4a54a..cc12a09f7 100644 --- a/src/main/java/noppes/npcs/constants/EnumPlayerPacket.java +++ b/src/main/java/noppes/npcs/constants/EnumPlayerPacket.java @@ -22,8 +22,8 @@ public enum EnumPlayerPacket { SaveBook, CompanionOpenInv, RoleGet, - KeyPressed, - MouseClicked, +// KeyPressed, +// MouseClicked, CompanionTalentExp, ScreenSize }