From d37368efc801003981dfb758a4f7131f5344328a Mon Sep 17 00:00:00 2001 From: Kam Date: Sun, 9 Mar 2025 18:15:51 -0400 Subject: [PATCH] Profile Packets are Permission Based and not Op Based --- .../kamkeel/npcs/network/PacketHandler.java | 18 +++++++++--------- .../npcs/network/enums/EnumPlayerPacket.java | 5 +++++ .../npcs/network/enums/EnumRequestPacket.java | 8 -------- .../profile/ProfileChangePacket.java | 8 ++++---- .../profile/ProfileCreatePacket.java | 8 ++++---- .../profile/ProfileGetInfoPacket.java | 8 ++++---- .../profile/ProfileGetPacket.java | 8 ++++---- .../profile/ProfileRemovePacket.java | 8 ++++---- .../profile/ProfileRenamePacket.java | 8 ++++---- .../gui/player/inventory/GuiProfiles.java | 2 +- 10 files changed, 39 insertions(+), 42 deletions(-) rename src/main/java/kamkeel/npcs/network/packets/{request => player}/profile/ProfileChangePacket.java (90%) rename src/main/java/kamkeel/npcs/network/packets/{request => player}/profile/ProfileCreatePacket.java (89%) rename src/main/java/kamkeel/npcs/network/packets/{request => player}/profile/ProfileGetInfoPacket.java (94%) rename src/main/java/kamkeel/npcs/network/packets/{request => player}/profile/ProfileGetPacket.java (88%) rename src/main/java/kamkeel/npcs/network/packets/{request => player}/profile/ProfileRemovePacket.java (90%) rename src/main/java/kamkeel/npcs/network/packets/{request => player}/profile/ProfileRenamePacket.java (91%) diff --git a/src/main/java/kamkeel/npcs/network/PacketHandler.java b/src/main/java/kamkeel/npcs/network/PacketHandler.java index 1e573ad1d..919fdbd2a 100644 --- a/src/main/java/kamkeel/npcs/network/PacketHandler.java +++ b/src/main/java/kamkeel/npcs/network/PacketHandler.java @@ -16,6 +16,7 @@ import kamkeel.npcs.network.packets.data.script.ScriptOverlayClosePacket; import kamkeel.npcs.network.packets.data.script.ScriptOverlayDataPacket; import kamkeel.npcs.network.packets.data.script.ScriptedParticlePacket; import kamkeel.npcs.network.packets.player.*; +import kamkeel.npcs.network.packets.player.profile.*; import kamkeel.npcs.network.packets.request.*; import kamkeel.npcs.network.packets.request.animation.AnimationGetPacket; import kamkeel.npcs.network.packets.request.animation.AnimationRemovePacket; @@ -55,7 +56,6 @@ import kamkeel.npcs.network.packets.request.party.*; import kamkeel.npcs.network.packets.request.pather.MovingPathGetPacket; import kamkeel.npcs.network.packets.request.pather.MovingPathSavePacket; import kamkeel.npcs.network.packets.request.playerdata.*; -import kamkeel.npcs.network.packets.request.profile.*; import kamkeel.npcs.network.packets.request.quest.*; import kamkeel.npcs.network.packets.request.recipe.RecipeGetPacket; import kamkeel.npcs.network.packets.request.recipe.RecipeRemovePacket; @@ -320,14 +320,6 @@ public class PacketHandler { REQUEST_PACKET.registerPacket(new EffectSavePacket()); REQUEST_PACKET.registerPacket(new EffectRemovePacket()); - // Profile Packets - REQUEST_PACKET.registerPacket(new ProfileGetPacket()); - REQUEST_PACKET.registerPacket(new ProfileGetInfoPacket()); - REQUEST_PACKET.registerPacket(new ProfileCreatePacket()); - REQUEST_PACKET.registerPacket(new ProfileRemovePacket()); - REQUEST_PACKET.registerPacket(new ProfileRenamePacket()); - REQUEST_PACKET.registerPacket(new ProfileChangePacket()); - // Magic Packets REQUEST_PACKET.registerPacket(new MagicCycleRemovePacket()); REQUEST_PACKET.registerPacket(new MagicCycleSavePacket()); @@ -434,6 +426,14 @@ public class PacketHandler { PLAYER_PACKET.registerPacket(new CustomGuiClosePacket()); PLAYER_PACKET.registerPacket(new CustomGuiUnfocusedPacket()); PLAYER_PACKET.registerPacket(new CustomScrollClickPacket()); + + // Profile Packets + PLAYER_PACKET.registerPacket(new ProfileCreatePacket()); + PLAYER_PACKET.registerPacket(new ProfileRemovePacket()); + PLAYER_PACKET.registerPacket(new ProfileRenamePacket()); + PLAYER_PACKET.registerPacket(new ProfileChangePacket()); + PLAYER_PACKET.registerPacket(new ProfileGetPacket()); + PLAYER_PACKET.registerPacket(new ProfileGetInfoPacket()); } public void registerChannels() { diff --git a/src/main/java/kamkeel/npcs/network/enums/EnumPlayerPacket.java b/src/main/java/kamkeel/npcs/network/enums/EnumPlayerPacket.java index b228fc6c8..31056b711 100644 --- a/src/main/java/kamkeel/npcs/network/enums/EnumPlayerPacket.java +++ b/src/main/java/kamkeel/npcs/network/enums/EnumPlayerPacket.java @@ -19,4 +19,9 @@ public enum EnumPlayerPacket { CustomGuiScrollClick, CustomGuiClose, CustomGuiUnfocused, + + ProfileCreate, + ProfileRemove, + ProfileRename, + ProfileChange, ProfileGet, ProfileGetInfo, } diff --git a/src/main/java/kamkeel/npcs/network/enums/EnumRequestPacket.java b/src/main/java/kamkeel/npcs/network/enums/EnumRequestPacket.java index e2f7dad5e..026a9f049 100644 --- a/src/main/java/kamkeel/npcs/network/enums/EnumRequestPacket.java +++ b/src/main/java/kamkeel/npcs/network/enums/EnumRequestPacket.java @@ -185,14 +185,6 @@ public enum EnumRequestPacket { ColorSet, ColorBrush, - ProfileGet, - ProfileGetAll, - ProfileGetInfo, - ProfileCreate, - ProfileRemove, - ProfileRename, - ProfileChange, - MagicCycleRemove, MagicCycleSave, MagicGetAll, diff --git a/src/main/java/kamkeel/npcs/network/packets/request/profile/ProfileChangePacket.java b/src/main/java/kamkeel/npcs/network/packets/player/profile/ProfileChangePacket.java similarity index 90% rename from src/main/java/kamkeel/npcs/network/packets/request/profile/ProfileChangePacket.java rename to src/main/java/kamkeel/npcs/network/packets/player/profile/ProfileChangePacket.java index da7cb8236..da05e2739 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/profile/ProfileChangePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/player/profile/ProfileChangePacket.java @@ -1,4 +1,4 @@ -package kamkeel.npcs.network.packets.request.profile; +package kamkeel.npcs.network.packets.player.profile; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -8,7 +8,7 @@ import kamkeel.npcs.controllers.data.profile.ProfileOperation; import kamkeel.npcs.network.AbstractPacket; import kamkeel.npcs.network.PacketChannel; import kamkeel.npcs.network.PacketHandler; -import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.network.enums.EnumPlayerPacket; import kamkeel.npcs.network.packets.data.ChatAlertPacket; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -30,12 +30,12 @@ public final class ProfileChangePacket extends AbstractPacket { @Override public Enum getType() { - return EnumRequestPacket.ProfileChange; + return EnumPlayerPacket.ProfileChange; } @Override public PacketChannel getChannel() { - return PacketHandler.REQUEST_PACKET; + return PacketHandler.PLAYER_PACKET; } @Override diff --git a/src/main/java/kamkeel/npcs/network/packets/request/profile/ProfileCreatePacket.java b/src/main/java/kamkeel/npcs/network/packets/player/profile/ProfileCreatePacket.java similarity index 89% rename from src/main/java/kamkeel/npcs/network/packets/request/profile/ProfileCreatePacket.java rename to src/main/java/kamkeel/npcs/network/packets/player/profile/ProfileCreatePacket.java index 6438ab9bc..02700cafb 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/profile/ProfileCreatePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/player/profile/ProfileCreatePacket.java @@ -1,4 +1,4 @@ -package kamkeel.npcs.network.packets.request.profile; +package kamkeel.npcs.network.packets.player.profile; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -9,7 +9,7 @@ import kamkeel.npcs.controllers.data.profile.ProfileOperation; import kamkeel.npcs.network.AbstractPacket; import kamkeel.npcs.network.PacketChannel; import kamkeel.npcs.network.PacketHandler; -import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.network.enums.EnumPlayerPacket; import kamkeel.npcs.network.packets.data.ChatAlertPacket; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -25,12 +25,12 @@ public final class ProfileCreatePacket extends AbstractPacket { @Override public Enum getType() { - return EnumRequestPacket.ProfileCreate; + return EnumPlayerPacket.ProfileCreate; } @Override public PacketChannel getChannel() { - return PacketHandler.REQUEST_PACKET; + return PacketHandler.PLAYER_PACKET; } @Override diff --git a/src/main/java/kamkeel/npcs/network/packets/request/profile/ProfileGetInfoPacket.java b/src/main/java/kamkeel/npcs/network/packets/player/profile/ProfileGetInfoPacket.java similarity index 94% rename from src/main/java/kamkeel/npcs/network/packets/request/profile/ProfileGetInfoPacket.java rename to src/main/java/kamkeel/npcs/network/packets/player/profile/ProfileGetInfoPacket.java index 46a755cd6..debb8a43c 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/profile/ProfileGetInfoPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/player/profile/ProfileGetInfoPacket.java @@ -1,16 +1,16 @@ -package kamkeel.npcs.network.packets.request.profile; +package kamkeel.npcs.network.packets.player.profile; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; import kamkeel.npcs.controllers.ProfileController; +import kamkeel.npcs.network.enums.EnumPlayerPacket; import noppes.npcs.api.handler.data.ISlot; import kamkeel.npcs.controllers.data.profile.ProfileInfoEntry; import kamkeel.npcs.controllers.data.profile.Profile; import kamkeel.npcs.network.AbstractPacket; import kamkeel.npcs.network.PacketChannel; import kamkeel.npcs.network.PacketHandler; -import kamkeel.npcs.network.enums.EnumRequestPacket; import kamkeel.npcs.network.packets.data.large.GuiDataPacket; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -31,12 +31,12 @@ public final class ProfileGetInfoPacket extends AbstractPacket { @Override public Enum getType() { - return EnumRequestPacket.ProfileGetInfo; + return EnumPlayerPacket.ProfileGetInfo; } @Override public PacketChannel getChannel() { - return PacketHandler.REQUEST_PACKET; + return PacketHandler.PLAYER_PACKET; } @SideOnly(Side.CLIENT) diff --git a/src/main/java/kamkeel/npcs/network/packets/request/profile/ProfileGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/player/profile/ProfileGetPacket.java similarity index 88% rename from src/main/java/kamkeel/npcs/network/packets/request/profile/ProfileGetPacket.java rename to src/main/java/kamkeel/npcs/network/packets/player/profile/ProfileGetPacket.java index 94d577b30..fa7cbc196 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/profile/ProfileGetPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/player/profile/ProfileGetPacket.java @@ -1,4 +1,4 @@ -package kamkeel.npcs.network.packets.request.profile; +package kamkeel.npcs.network.packets.player.profile; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -8,7 +8,7 @@ import kamkeel.npcs.controllers.data.profile.Profile; import kamkeel.npcs.network.AbstractPacket; import kamkeel.npcs.network.PacketChannel; import kamkeel.npcs.network.PacketHandler; -import kamkeel.npcs.network.enums.EnumRequestPacket; +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; @@ -24,12 +24,12 @@ public final class ProfileGetPacket extends AbstractPacket { @Override public Enum getType() { - return EnumRequestPacket.ProfileGet; + return EnumPlayerPacket.ProfileGet; } @Override public PacketChannel getChannel() { - return PacketHandler.REQUEST_PACKET; + return PacketHandler.PLAYER_PACKET; } @SideOnly(Side.CLIENT) diff --git a/src/main/java/kamkeel/npcs/network/packets/request/profile/ProfileRemovePacket.java b/src/main/java/kamkeel/npcs/network/packets/player/profile/ProfileRemovePacket.java similarity index 90% rename from src/main/java/kamkeel/npcs/network/packets/request/profile/ProfileRemovePacket.java rename to src/main/java/kamkeel/npcs/network/packets/player/profile/ProfileRemovePacket.java index 111c8ab98..92c145b57 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/profile/ProfileRemovePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/player/profile/ProfileRemovePacket.java @@ -1,4 +1,4 @@ -package kamkeel.npcs.network.packets.request.profile; +package kamkeel.npcs.network.packets.player.profile; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -8,7 +8,7 @@ import kamkeel.npcs.controllers.data.profile.ProfileOperation; import kamkeel.npcs.network.AbstractPacket; import kamkeel.npcs.network.PacketChannel; import kamkeel.npcs.network.PacketHandler; -import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.network.enums.EnumPlayerPacket; import kamkeel.npcs.network.packets.data.ChatAlertPacket; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -30,12 +30,12 @@ public final class ProfileRemovePacket extends AbstractPacket { @Override public Enum getType() { - return EnumRequestPacket.ProfileRemove; + return EnumPlayerPacket.ProfileRemove; } @Override public PacketChannel getChannel() { - return PacketHandler.REQUEST_PACKET; + return PacketHandler.PLAYER_PACKET; } @Override diff --git a/src/main/java/kamkeel/npcs/network/packets/request/profile/ProfileRenamePacket.java b/src/main/java/kamkeel/npcs/network/packets/player/profile/ProfileRenamePacket.java similarity index 91% rename from src/main/java/kamkeel/npcs/network/packets/request/profile/ProfileRenamePacket.java rename to src/main/java/kamkeel/npcs/network/packets/player/profile/ProfileRenamePacket.java index 354b60e24..6ce78dc79 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/profile/ProfileRenamePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/player/profile/ProfileRenamePacket.java @@ -1,4 +1,4 @@ -package kamkeel.npcs.network.packets.request.profile; +package kamkeel.npcs.network.packets.player.profile; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -8,7 +8,7 @@ import kamkeel.npcs.controllers.data.profile.Profile; import kamkeel.npcs.network.AbstractPacket; import kamkeel.npcs.network.PacketChannel; import kamkeel.npcs.network.PacketHandler; -import kamkeel.npcs.network.enums.EnumRequestPacket; +import kamkeel.npcs.network.enums.EnumPlayerPacket; import kamkeel.npcs.network.packets.data.ChatAlertPacket; import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.entity.player.EntityPlayer; @@ -33,12 +33,12 @@ public final class ProfileRenamePacket extends AbstractPacket { @Override public Enum getType() { - return EnumRequestPacket.ProfileRename; + return EnumPlayerPacket.ProfileRename; } @Override public PacketChannel getChannel() { - return PacketHandler.REQUEST_PACKET; + return PacketHandler.PLAYER_PACKET; } @Override 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 5c4ec863d..a4518901f 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,11 +1,11 @@ package noppes.npcs.client.gui.player.inventory; +import kamkeel.npcs.network.packets.player.profile.*; import noppes.npcs.api.handler.data.ISlot; import kamkeel.npcs.controllers.data.profile.ProfileInfoEntry; import kamkeel.npcs.controllers.data.profile.Profile; import kamkeel.npcs.controllers.data.profile.Slot; import kamkeel.npcs.network.PacketClient; -import kamkeel.npcs.network.packets.request.profile.*; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiYesNo; import net.minecraft.client.gui.GuiYesNoCallback;