From 294abe4d259803b00a8eb41cdd8e6fcd5156be31 Mon Sep 17 00:00:00 2001 From: Kam Date: Sat, 22 Feb 2025 22:29:27 -0500 Subject: [PATCH] Apply Configs to Packets --- .../packets/request/profile/ProfileChangePacket.java | 8 ++++++-- .../packets/request/profile/ProfileCreatePacket.java | 6 ++++++ .../packets/request/profile/ProfileGetInfoPacket.java | 4 ++++ .../packets/request/profile/ProfileGetPacket.java | 4 ++++ .../packets/request/profile/ProfileRemovePacket.java | 9 ++++++--- .../packets/request/profile/ProfileRenamePacket.java | 7 ++++++- 6 files changed, 32 insertions(+), 6 deletions(-) diff --git a/src/main/java/kamkeel/npcs/network/packets/request/profile/ProfileChangePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/profile/ProfileChangePacket.java index c6f88fb77..19c62ffff 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/profile/ProfileChangePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/profile/ProfileChangePacket.java @@ -9,9 +9,11 @@ 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.ChatAlertPacket; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import noppes.npcs.CustomNpcsPermissions; +import noppes.npcs.config.ConfigMain; import java.io.IOException; @@ -52,11 +54,13 @@ public final class ProfileChangePacket extends AbstractPacket { if (!(player instanceof EntityPlayerMP)) return; + if(!ConfigMain.ProfilesEnabled) + return; + int slot = in.readInt(); ProfileOperation operation = ProfileController.Instance.changeSlot(player, slot); - // TODO: Check Operation and Send Message - ProfileGetPacket.sendProfileNBT(player); ProfileGetInfoPacket.sendProfileInfo(player); + ChatAlertPacket.sendChatAlert((EntityPlayerMP) player, operation.getMessage()); } } diff --git a/src/main/java/kamkeel/npcs/network/packets/request/profile/ProfileCreatePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/profile/ProfileCreatePacket.java index 56023b5af..b8d50e6d4 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/profile/ProfileCreatePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/profile/ProfileCreatePacket.java @@ -10,9 +10,11 @@ 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.ChatAlertPacket; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import noppes.npcs.CustomNpcsPermissions; +import noppes.npcs.config.ConfigMain; import java.io.IOException; @@ -45,9 +47,13 @@ public final class ProfileCreatePacket extends AbstractPacket { if (!(player instanceof EntityPlayerMP)) return; + if(!ConfigMain.ProfilesEnabled) + return; + Profile profile = ProfileController.Instance.getProfile(player); ProfileOperation operation = ProfileController.Instance.createSlotInternal(profile); ProfileGetPacket.sendProfileNBT(player); ProfileGetInfoPacket.sendProfileInfo(player); + ChatAlertPacket.sendChatAlert((EntityPlayerMP) player, operation.getMessage()); } } diff --git a/src/main/java/kamkeel/npcs/network/packets/request/profile/ProfileGetInfoPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/profile/ProfileGetInfoPacket.java index e83109ac3..50f9d8fe1 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/profile/ProfileGetInfoPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/profile/ProfileGetInfoPacket.java @@ -17,6 +17,7 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraftforge.common.util.Constants; +import noppes.npcs.config.ConfigMain; import java.io.IOException; import java.util.ArrayList; @@ -47,6 +48,9 @@ public final class ProfileGetInfoPacket extends AbstractPacket { if (!(player instanceof EntityPlayerMP)) return; + if(!ConfigMain.ProfilesEnabled) + return; + sendProfileInfo(player); } diff --git a/src/main/java/kamkeel/npcs/network/packets/request/profile/ProfileGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/profile/ProfileGetPacket.java index a37572db5..ffbdb4997 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/profile/ProfileGetPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/profile/ProfileGetPacket.java @@ -13,6 +13,7 @@ import kamkeel.npcs.network.packets.data.large.GuiDataPacket; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; +import noppes.npcs.config.ConfigMain; import java.io.IOException; @@ -40,6 +41,9 @@ public final class ProfileGetPacket extends AbstractPacket { if (!(player instanceof EntityPlayerMP)) return; + if(!ConfigMain.ProfilesEnabled) + return; + sendProfileNBT(player); } diff --git a/src/main/java/kamkeel/npcs/network/packets/request/profile/ProfileRemovePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/profile/ProfileRemovePacket.java index 6f8ff983c..c762b435b 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/profile/ProfileRemovePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/profile/ProfileRemovePacket.java @@ -9,9 +9,11 @@ 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.ChatAlertPacket; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import noppes.npcs.CustomNpcsPermissions; +import noppes.npcs.config.ConfigMain; import java.io.IOException; @@ -52,12 +54,13 @@ public final class ProfileRemovePacket extends AbstractPacket { if (!(player instanceof EntityPlayerMP)) return; + if(!ConfigMain.ProfilesEnabled) + return; + int slot = in.readInt(); ProfileOperation operation = ProfileController.Instance.removeSlot(player, slot); - // TODO: Check Operation and Send Message - - ProfileGetPacket.sendProfileNBT(player); ProfileGetInfoPacket.sendProfileInfo(player); + ChatAlertPacket.sendChatAlert((EntityPlayerMP) player, operation.getMessage()); } } diff --git a/src/main/java/kamkeel/npcs/network/packets/request/profile/ProfileRenamePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/profile/ProfileRenamePacket.java index 7322517d4..d692e1ed9 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/profile/ProfileRenamePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/profile/ProfileRenamePacket.java @@ -9,10 +9,12 @@ 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.ChatAlertPacket; import kamkeel.npcs.util.ByteBufUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import noppes.npcs.CustomNpcsPermissions; +import noppes.npcs.config.ConfigMain; import java.io.IOException; @@ -56,12 +58,15 @@ public final class ProfileRenamePacket extends AbstractPacket { if (!(player instanceof EntityPlayerMP)) return; + if(!ConfigMain.ProfilesEnabled) + return; + int slot = in.readInt(); String newName = ByteBufUtils.readString(in); Profile profile = ProfileController.Instance.getProfile(player); if(!profile.getSlots().containsKey(slot)) { - // TODO: Check Operation and Send Message + ChatAlertPacket.sendChatAlert((EntityPlayerMP) player, "No slot found"); return; }