Use Cloud's permission annotation in all places (#88)

Signed-off-by: BT (calcastor/mame) <[email protected]>
PGMDev · Jan 19, 2025 · a52d229 · a52d229
1 parent 778dab5
commit a52d229
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/core/src/main/java/dev/pgm/community/history/MatchHistoryCommand.java b/core/src/main/java/dev/pgm/community/history/MatchHistoryCommand.java
@@ -2,7 +2,6 @@
 
 import static tc.oc.pgm.util.text.TextException.exception;
 
-import co.aikar.commands.annotation.CommandPermission;
 import dev.pgm.community.Community;
 import dev.pgm.community.CommunityPermissions;
 import dev.pgm.community.utils.CommandAudience;
@@ -11,6 +10,7 @@
 import tc.oc.pgm.lib.org.incendo.cloud.annotations.CommandDescription;
 import tc.oc.pgm.lib.org.incendo.cloud.annotations.Default;
 import tc.oc.pgm.lib.org.incendo.cloud.annotations.Flag;
+import tc.oc.pgm.lib.org.incendo.cloud.annotations.Permission;
 
 @Command("matchhistory|mh")
 public class MatchHistoryCommand {
@@ -23,7 +23,7 @@ public MatchHistoryCommand() {
 
   @Command("[page]")
   @CommandDescription("Display match history")
-  @CommandPermission(CommunityPermissions.MATCH_HISTORY)
+  @Permission(CommunityPermissions.MATCH_HISTORY)
   public void sendHistory(
       CommandAudience sender,
       @Argument("page") @Default("1") int page,

diff --git a/core/src/main/java/dev/pgm/community/squads/SquadCommands.java b/core/src/main/java/dev/pgm/community/squads/SquadCommands.java
@@ -8,7 +8,6 @@
 import static tc.oc.pgm.util.text.TextException.exception;
 import static tc.oc.pgm.util.text.TextFormatter.horizontalLineHeading;
 
-import co.aikar.commands.annotation.CommandPermission;
 import com.google.common.collect.ImmutableList;
 import dev.pgm.community.Community;
 import dev.pgm.community.CommunityPermissions;
@@ -28,6 +27,7 @@
 import tc.oc.pgm.lib.org.incendo.cloud.annotations.Command;
 import tc.oc.pgm.lib.org.incendo.cloud.annotations.CommandDescription;
 import tc.oc.pgm.lib.org.incendo.cloud.annotations.Flag;
+import tc.oc.pgm.lib.org.incendo.cloud.annotations.Permission;
 import tc.oc.pgm.lib.org.incendo.cloud.context.CommandContext;
 import tc.oc.pgm.util.Players;
 import tc.oc.pgm.util.PrettyPaginatedComponentResults;
@@ -45,23 +45,23 @@ public SquadCommands() {
 
   @Command("")
   @CommandDescription("List party members")
-  @CommandPermission(CommunityPermissions.SQUAD)
+  @Permission(CommunityPermissions.SQUAD)
   public void listDefault(MatchPlayer sender) {
     checkEnabled();
     list(sender, false);
   }
 
   @Command("<player>")
   @CommandDescription("Send a squad invitation")
-  @CommandPermission(CommunityPermissions.SQUAD_CREATE)
+  @Permission(CommunityPermissions.SQUAD_CREATE)
   public void directInvite(MatchPlayer sender, @Argument("player") MatchPlayer invited) {
     checkEnabled();
     invite(sender, invited);
   }
 
   @Command("create")
   @CommandDescription("Create a squad")
-  @CommandPermission(CommunityPermissions.SQUAD_CREATE)
+  @Permission(CommunityPermissions.SQUAD_CREATE)
   public void create(MatchPlayer sender) {
     checkEnabled();
     manager.createSquad(sender);
@@ -70,7 +70,7 @@ public void create(MatchPlayer sender) {
 
   @Command("invite <player>")
   @CommandDescription("Send a squad invitation")
-  @CommandPermission(CommunityPermissions.SQUAD_CREATE)
+  @Permission(CommunityPermissions.SQUAD_CREATE)
   public void invite(MatchPlayer sender, @Argument("player") MatchPlayer invited) {
     checkEnabled();
     manager.createInvite(invited, sender);
@@ -92,7 +92,7 @@ public void invite(MatchPlayer sender, @Argument("player") MatchPlayer invited)
 
   @Command("accept <player>")
   @CommandDescription("Accept a squad invitation")
-  @CommandPermission(CommunityPermissions.SQUAD)
+  @Permission(CommunityPermissions.SQUAD)
   public void accept(MatchPlayer sender, @Argument("player") MatchPlayer leader) {
     checkEnabled();
     manager.acceptInvite(sender, leader);
@@ -105,7 +105,7 @@ public void accept(MatchPlayer sender, @Argument("player") MatchPlayer leader) {
 
   @Command("deny <player>")
   @CommandDescription("Deny a squad invitation")
-  @CommandPermission(CommunityPermissions.SQUAD)
+  @Permission(CommunityPermissions.SQUAD)
   public void deny(MatchPlayer sender, @Argument("player") MatchPlayer leader) {
     checkEnabled();
     manager.expireInvite(sender, leader);
@@ -118,7 +118,7 @@ public void deny(MatchPlayer sender, @Argument("player") MatchPlayer leader) {
 
   @Command("leave")
   @CommandDescription("Leave your current party")
-  @CommandPermission(CommunityPermissions.SQUAD)
+  @Permission(CommunityPermissions.SQUAD)
   public void leave(MatchPlayer sender) {
     checkEnabled();
     manager.leaveSquad(sender);
@@ -127,7 +127,7 @@ public void leave(MatchPlayer sender) {
 
   @Command("list")
   @CommandDescription("List party members")
-  @CommandPermission(CommunityPermissions.SQUAD)
+  @Permission(CommunityPermissions.SQUAD)
   public void list(MatchPlayer sender, @Flag(value = "all", aliases = "a") boolean all) {
     checkEnabled();
 
@@ -201,7 +201,7 @@ public Component format(UUID player, int index) {
 
   @Command("chat [message]")
   @CommandDescription("Sends a message to your party")
-  @CommandPermission(CommunityPermissions.SQUAD)
+  @Permission(CommunityPermissions.SQUAD)
   public void chat(
       CommandContext<CommandSender> context,
       MatchPlayer sender,
@@ -216,7 +216,7 @@ public void chat(
 
   @Command("kick <player>")
   @CommandDescription("Kick a player from your party")
-  @CommandPermission(CommunityPermissions.SQUAD)
+  @Permission(CommunityPermissions.SQUAD)
   public void kick(MatchPlayer sender, @Argument("player") OfflinePlayer player) {
     checkEnabled();
     MatchPlayer target = PGM.get().getMatchManager().getPlayer(player.getUniqueId());
@@ -231,7 +231,7 @@ public void kick(MatchPlayer sender, @Argument("player") OfflinePlayer player) {
 
   @Command("disband")
   @CommandDescription("Disband your current party")
-  @CommandPermission(CommunityPermissions.SQUAD)
+  @Permission(CommunityPermissions.SQUAD)
   public void disband(MatchPlayer sender) {
     checkEnabled();
     manager.disband(sender);