Use longer labels as aliases instead of the main label

md5sha256 · Mar 23, 2024 · 489f52d · 489f52d
1 parent dca6305
commit 489f52d
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 60 deletions.
diff --git a/AreaShop/src/main/java/me/wiefferink/areashop/commands/DelCommand.java b/AreaShop/src/main/java/me/wiefferink/areashop/commands/DelCommand.java
@@ -57,7 +57,8 @@ public String stringDescription() {
 
     @Override
     public String getHelpKey(CommandSender target) {
-        if(target.hasPermission("areashop.destroyrent") || target.hasPermission("areashop.destroybuy") || target.hasPermission("areashop.destroyrent.landlord") || target.hasPermission("areashop.destroybuy.landlord")) {
+        if (target.hasPermission("areashop.destroyrent") || target.hasPermission("areashop.destroybuy") || target.hasPermission(
+                "areashop.destroyrent.landlord") || target.hasPermission("areashop.destroybuy.landlord")) {
             return "help-del";
         }
         return null;
@@ -74,7 +75,7 @@ public String getHelpKey(CommandSender target) {
                 new GeneralRegionParser<>(this.fileManager),
                 GeneralRegion.class
         );
-        return builder.literal("delete", "del")
+        return builder.literal("del", "delete")
                 .optional(KEY_REGION, regionParser)
                 .handler(this::handleCommand);
     }

diff --git a/AreaShop/src/main/java/me/wiefferink/areashop/commands/DelFriendCommand.java b/AreaShop/src/main/java/me/wiefferink/areashop/commands/DelFriendCommand.java
@@ -82,7 +82,7 @@ public String stringDescription() {
 
     @Override
     protected @Nonnull Command.Builder<? extends CommandSender> configureCommand(@Nonnull Command.Builder<CommandSender> builder) {
-        return builder.literal("deletefriend", "delfriend")
+        return builder.literal("delfriend", "deletefriend")
                 .required(KEY_PLAYER, ValidatedOfflinePlayerParser.validatedOfflinePlayerParser(), this::suggestFriends)
                 .flag(this.regionFlag)
                 .handler(this::handleCommand);

diff --git a/AreaShop/src/main/java/me/wiefferink/areashop/commands/DelSignCommand.java b/AreaShop/src/main/java/me/wiefferink/areashop/commands/DelSignCommand.java
@@ -23,67 +23,68 @@
 @Singleton
 public class DelSignCommand extends AreashopCommandBean {
 
-	private final SignManager signManager;
-	private final MessageBridge messageBridge;
-	@Inject
-	public DelSignCommand(@Nonnull MessageBridge messageBridge, @Nonnull SignManager signManager) {
-		this.signManager = signManager;
-		this.messageBridge = messageBridge;
-	}
+    private final SignManager signManager;
+    private final MessageBridge messageBridge;
 
-	@Override
-	public String stringDescription() {
-		return null;
-	}
+    @Inject
+    public DelSignCommand(@Nonnull MessageBridge messageBridge, @Nonnull SignManager signManager) {
+        this.signManager = signManager;
+        this.messageBridge = messageBridge;
+    }
+
+    @Override
+    public String stringDescription() {
+        return null;
+    }
 
 
     @Override
     protected @Nonnull CommandProperties properties() {
-		return CommandProperties.of("deletesign", "delsign");
-	}
-
-	@Override
-	protected @Nonnull Command.Builder<? extends CommandSender> configureCommand(@Nonnull Command.Builder<CommandSender> builder) {
-		return builder.literal("deletesign", "delsign")
-				.senderType(Player.class)
-				.handler(this::handleCommand);
-	}
-
-	@Override
-	public String getHelpKey(CommandSender target) {
-		if(target.hasPermission("areashop.delsign")) {
-			return "help-delsign";
-		}
-		return null;
-	}
-
-	private void handleCommand(@Nonnull CommandContext<Player> context) {
-		Player sender = context.sender();
-		if (!sender.hasPermission("areashop.delsign")) {
-			throw new AreaShopCommandException("delsign-noPermission");
-		}
-		// Get the sign
-		Block block = null;
-		BlockIterator blockIterator = new BlockIterator(sender, 100);
-		while(blockIterator.hasNext() && block == null) {
-			Block next = blockIterator.next();
-			if(!next.getType().isAir()) {
-				block = next;
-			}
-		}
-		if(block == null || !Materials.isSign(block.getType())) {
-			throw new AreaShopCommandException("delsign-noSign");
-		}
-		Optional<RegionSign> optionalSign = signManager.removeSign(block.getLocation());
-		if(optionalSign.isEmpty()) {
-			throw new AreaShopCommandException("delsign-noRegion");
-		}
-		RegionSign regionSign = optionalSign.get();
-		messageBridge.message(sender, "delsign-success", regionSign.getRegion());
-		regionSign.remove();
-		// Sometimes the RegionSign data is corrupted. Forcefully set the block to air
-		block.setType(Material.AIR);
-	}
+        return CommandProperties.of("deletesign", "delsign");
+    }
+
+    @Override
+    protected @Nonnull Command.Builder<? extends CommandSender> configureCommand(@Nonnull Command.Builder<CommandSender> builder) {
+        return builder.literal("delsign", "deletesign")
+                .senderType(Player.class)
+                .handler(this::handleCommand);
+    }
+
+    @Override
+    public String getHelpKey(CommandSender target) {
+        if (target.hasPermission("areashop.delsign")) {
+            return "help-delsign";
+        }
+        return null;
+    }
+
+    private void handleCommand(@Nonnull CommandContext<Player> context) {
+        Player sender = context.sender();
+        if (!sender.hasPermission("areashop.delsign")) {
+            throw new AreaShopCommandException("delsign-noPermission");
+        }
+        // Get the sign
+        Block block = null;
+        BlockIterator blockIterator = new BlockIterator(sender, 100);
+        while (blockIterator.hasNext() && block == null) {
+            Block next = blockIterator.next();
+            if (!next.getType().isAir()) {
+                block = next;
+            }
+        }
+        if (block == null || !Materials.isSign(block.getType())) {
+            throw new AreaShopCommandException("delsign-noSign");
+        }
+        Optional<RegionSign> optionalSign = signManager.removeSign(block.getLocation());
+        if (optionalSign.isEmpty()) {
+            throw new AreaShopCommandException("delsign-noRegion");
+        }
+        RegionSign regionSign = optionalSign.get();
+        messageBridge.message(sender, "delsign-success", regionSign.getRegion());
+        regionSign.remove();
+        // Sometimes the RegionSign data is corrupted. Forcefully set the block to air
+        block.setType(Material.AIR);
+    }
 
 }
 

diff --git a/AreaShop/src/main/java/me/wiefferink/areashop/commands/TeleportCommand.java b/AreaShop/src/main/java/me/wiefferink/areashop/commands/TeleportCommand.java
@@ -68,7 +68,7 @@ public String stringDescription() {
     @NotNull
     @Override
     protected Command.Builder<? extends CommandSender> configureCommand(@NotNull Command.Builder<CommandSender> builder) {
-        return builder.literal("teleport", "tp")
+        return builder.literal("tp", "teleport")
                 .senderType(Player.class)
                 .required(KEY_REGION, GeneralRegionParser.generalRegionParser(this.fileManager))
                 .handler(this::handleCommand);