From 6237856f70d5814abe66316804caad4f8e29faba Mon Sep 17 00:00:00 2001 From: Kam Date: Fri, 14 Mar 2025 20:38:11 -0400 Subject: [PATCH] Better Advanced Packet Permissions --- .../request/dialog/DialogNpcRemovePacket.java | 2 +- .../packets/request/dialog/DialogNpcSetPacket.java | 2 +- .../network/packets/request/jobs/JobGetPacket.java | 2 +- .../network/packets/request/jobs/JobSavePacket.java | 2 +- .../packets/request/jobs/JobSpawnerAddPacket.java | 2 +- .../packets/request/jobs/JobSpawnerRemovePacket.java | 2 +- .../packets/request/linked/LinkedSetPacket.java | 2 +- .../packets/request/magic/MagicNpcSavePacket.java | 2 +- .../network/packets/request/role/RoleSavePacket.java | 2 +- .../network/packets/request/tags/TagSetPacket.java | 2 +- .../request/transform/TransformGetPacket.java | 2 +- .../request/transform/TransformSavePacket.java | 2 +- .../request/transport/TransportSavePacket.java | 2 +- src/main/java/noppes/npcs/CustomNpcsPermissions.java | 12 ++++++++++++ 14 files changed, 25 insertions(+), 13 deletions(-) diff --git a/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogNpcRemovePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogNpcRemovePacket.java index 43769e16d..9dec75c0f 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogNpcRemovePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogNpcRemovePacket.java @@ -39,7 +39,7 @@ public final class DialogNpcRemovePacket extends AbstractPacket { @Override public CustomNpcsPermissions.Permission getPermission() { - return CustomNpcsPermissions.NPC_ADVANCED; + return CustomNpcsPermissions.NPC_ADVANCED_DIALOG; } @Override diff --git a/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogNpcSetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogNpcSetPacket.java index a7db1b184..acfc77001 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogNpcSetPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogNpcSetPacket.java @@ -45,7 +45,7 @@ public final class DialogNpcSetPacket extends AbstractPacket { @Override public CustomNpcsPermissions.Permission getPermission() { - return CustomNpcsPermissions.NPC_ADVANCED; + return CustomNpcsPermissions.NPC_ADVANCED_DIALOG; } @Override diff --git a/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobGetPacket.java index 39bfdbc22..9d65e3d91 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobGetPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobGetPacket.java @@ -37,7 +37,7 @@ public final class JobGetPacket extends AbstractPacket { @Override public CustomNpcsPermissions.Permission getPermission() { - return CustomNpcsPermissions.NPC_ADVANCED; + return CustomNpcsPermissions.NPC_ADVANCED_JOB; } @Override diff --git a/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobSavePacket.java index d2f68bd23..9d2eb9152 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobSavePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobSavePacket.java @@ -40,7 +40,7 @@ public final class JobSavePacket extends AbstractPacket { @Override public CustomNpcsPermissions.Permission getPermission() { - return CustomNpcsPermissions.NPC_ADVANCED; + return CustomNpcsPermissions.NPC_ADVANCED_JOB; } @Override diff --git a/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobSpawnerAddPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobSpawnerAddPacket.java index 6bd16d215..7e1d17fb8 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobSpawnerAddPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobSpawnerAddPacket.java @@ -60,7 +60,7 @@ public final class JobSpawnerAddPacket extends AbstractPacket { @Override public CustomNpcsPermissions.Permission getPermission() { - return CustomNpcsPermissions.NPC_ADVANCED; + return CustomNpcsPermissions.NPC_ADVANCED_JOB; } @Override diff --git a/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobSpawnerRemovePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobSpawnerRemovePacket.java index b70e85742..ceb49b232 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobSpawnerRemovePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/jobs/JobSpawnerRemovePacket.java @@ -42,7 +42,7 @@ public final class JobSpawnerRemovePacket extends AbstractPacket { @Override public CustomNpcsPermissions.Permission getPermission() { - return CustomNpcsPermissions.NPC_ADVANCED; + return CustomNpcsPermissions.NPC_ADVANCED_JOB; } @Override diff --git a/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedSetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedSetPacket.java index c0f8ca121..f6433700f 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedSetPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/linked/LinkedSetPacket.java @@ -41,7 +41,7 @@ public final class LinkedSetPacket extends AbstractPacket { @Override public CustomNpcsPermissions.Permission getPermission() { - return CustomNpcsPermissions.NPC_ADVANCED; + return CustomNpcsPermissions.NPC_ADVANCED_LINKED; } @Override diff --git a/src/main/java/kamkeel/npcs/network/packets/request/magic/MagicNpcSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/magic/MagicNpcSavePacket.java index cc1f5bcc3..b75084916 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/magic/MagicNpcSavePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/magic/MagicNpcSavePacket.java @@ -46,7 +46,7 @@ public final class MagicNpcSavePacket extends AbstractPacket { @Override public CustomNpcsPermissions.Permission getPermission() { - return CustomNpcsPermissions.NPC_ADVANCED; + return CustomNpcsPermissions.NPC_ADVANCED_MAGIC; } @SideOnly(Side.CLIENT) diff --git a/src/main/java/kamkeel/npcs/network/packets/request/role/RoleSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/role/RoleSavePacket.java index 6f0180b2c..4dbcfe234 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/role/RoleSavePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/role/RoleSavePacket.java @@ -41,7 +41,7 @@ public final class RoleSavePacket extends AbstractPacket { @Override public CustomNpcsPermissions.Permission getPermission() { - return CustomNpcsPermissions.NPC_ADVANCED; + return CustomNpcsPermissions.NPC_ADVANCED_ROLE; } @Override diff --git a/src/main/java/kamkeel/npcs/network/packets/request/tags/TagSetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/tags/TagSetPacket.java index 271143276..e7f016106 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/tags/TagSetPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/tags/TagSetPacket.java @@ -44,7 +44,7 @@ public final class TagSetPacket extends AbstractPacket { @Override public CustomNpcsPermissions.Permission getPermission() { - return CustomNpcsPermissions.NPC_ADVANCED; + return CustomNpcsPermissions.NPC_ADVANCED_TAGS; } @Override diff --git a/src/main/java/kamkeel/npcs/network/packets/request/transform/TransformGetPacket.java b/src/main/java/kamkeel/npcs/network/packets/request/transform/TransformGetPacket.java index 0f2400af7..6b1b49c77 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/transform/TransformGetPacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/transform/TransformGetPacket.java @@ -35,7 +35,7 @@ public final class TransformGetPacket extends AbstractPacket { @Override public CustomNpcsPermissions.Permission getPermission() { - return CustomNpcsPermissions.NPC_ADVANCED; + return CustomNpcsPermissions.NPC_ADVANCED_TRANSFORM; } @Override diff --git a/src/main/java/kamkeel/npcs/network/packets/request/transform/TransformSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/transform/TransformSavePacket.java index 4f1e85ebd..4d89ffe15 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/transform/TransformSavePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/transform/TransformSavePacket.java @@ -41,7 +41,7 @@ public final class TransformSavePacket extends AbstractPacket { @Override public CustomNpcsPermissions.Permission getPermission() { - return CustomNpcsPermissions.NPC_ADVANCED; + return CustomNpcsPermissions.NPC_ADVANCED_TRANSFORM; } @Override diff --git a/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportSavePacket.java index b4aad2e92..edca6ee97 100644 --- a/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportSavePacket.java +++ b/src/main/java/kamkeel/npcs/network/packets/request/transport/TransportSavePacket.java @@ -47,7 +47,7 @@ public final class TransportSavePacket extends AbstractPacket { @Override public CustomNpcsPermissions.Permission getPermission() { - return CustomNpcsPermissions.NPC_ADVANCED; + return CustomNpcsPermissions.NPC_ADVANCED_TRANSPORT; } @Override diff --git a/src/main/java/noppes/npcs/CustomNpcsPermissions.java b/src/main/java/noppes/npcs/CustomNpcsPermissions.java index 3308dce9f..47ec8d0e7 100644 --- a/src/main/java/noppes/npcs/CustomNpcsPermissions.java +++ b/src/main/java/noppes/npcs/CustomNpcsPermissions.java @@ -39,6 +39,18 @@ public class CustomNpcsPermissions { public static final Permission NPC_STATS = new Permission("customnpcs.npc.stats"); public static final Permission NPC_CLONE = new Permission("customnpcs.npc.clone"); + public static final Permission NPC_ADVANCED_TRADER = new Permission("customnpcs.npc.advanced.trader"); + public static final Permission NPC_ADVANCED_DIALOG = new Permission("customnpcs.npc.advanced.dialog"); + public static final Permission NPC_ADVANCED_FACTION = new Permission("customnpcs.npc.advanced.faction"); + public static final Permission NPC_ADVANCED_JOB = new Permission("customnpcs.npc.advanced.job"); + public static final Permission NPC_ADVANCED_ROLE = new Permission("customnpcs.npc.advanced.role"); + public static final Permission NPC_ADVANCED_TRANSPORT = new Permission("customnpcs.npc.advanced.transport"); + public static final Permission NPC_ADVANCED_TRANSFORM = new Permission("customnpcs.npc.advanced.transform"); + public static final Permission NPC_ADVANCED_LINKED = new Permission("customnpcs.npc.advanced.linked"); + public static final Permission NPC_ADVANCED_MAGIC = new Permission("customnpcs.npc.advanced.linked"); + public static final Permission NPC_ADVANCED_TAGS = new Permission("customnpcs.npc.advanced.tags"); + + public static final Permission GLOBAL_REMOTE = new Permission("customnpcs.global.remote"); // Save Global Preferences