From 55211907f29f0d1fbf8764559e03287697678dc1 Mon Sep 17 00:00:00 2001 From: Hannes Greule Date: Thu, 20 Aug 2020 23:09:31 +0200 Subject: [PATCH] Use command descriptions from translations --- .../com/plotsquared/core/command/Add.java | 1 - .../com/plotsquared/core/command/Alias.java | 1 - .../com/plotsquared/core/command/Area.java | 1 - .../com/plotsquared/core/command/Auto.java | 1 - .../com/plotsquared/core/command/Backup.java | 4 --- .../com/plotsquared/core/command/Biome.java | 1 - .../com/plotsquared/core/command/Buy.java | 1 - .../com/plotsquared/core/command/Caps.java | 1 - .../com/plotsquared/core/command/Chat.java | 1 - .../com/plotsquared/core/command/Claim.java | 1 - .../com/plotsquared/core/command/Clear.java | 1 - .../com/plotsquared/core/command/Cluster.java | 3 +-- .../com/plotsquared/core/command/Command.java | 26 ++++++++++++++----- .../com/plotsquared/core/command/Comment.java | 1 - .../plotsquared/core/command/Condense.java | 1 - .../com/plotsquared/core/command/Confirm.java | 1 - .../plotsquared/core/command/Continue.java | 1 - .../com/plotsquared/core/command/Copy.java | 1 - .../core/command/CreateRoadSchematic.java | 1 - .../core/command/DatabaseCommand.java | 1 - .../com/plotsquared/core/command/Debug.java | 1 - .../core/command/DebugAllowUnsafe.java | 1 - .../plotsquared/core/command/DebugExec.java | 1 - .../core/command/DebugImportWorlds.java | 1 - .../core/command/DebugLoadTest.java | 1 - .../plotsquared/core/command/DebugPaste.java | 1 - .../core/command/DebugRoadRegen.java | 1 - .../core/command/DebugSaveTest.java | 3 +-- .../com/plotsquared/core/command/Delete.java | 1 - .../com/plotsquared/core/command/Deny.java | 1 - .../com/plotsquared/core/command/Desc.java | 1 - .../com/plotsquared/core/command/Dislike.java | 1 - .../com/plotsquared/core/command/Done.java | 1 - .../plotsquared/core/command/Download.java | 1 - .../plotsquared/core/command/FlagCommand.java | 6 ----- .../com/plotsquared/core/command/Grant.java | 1 - .../com/plotsquared/core/command/Help.java | 1 - .../plotsquared/core/command/HomeCommand.java | 1 - .../com/plotsquared/core/command/Inbox.java | 1 - .../com/plotsquared/core/command/Info.java | 1 - .../com/plotsquared/core/command/Kick.java | 1 - .../com/plotsquared/core/command/Leave.java | 1 - .../com/plotsquared/core/command/Like.java | 1 - .../com/plotsquared/core/command/ListCmd.java | 1 - .../com/plotsquared/core/command/Load.java | 1 - .../com/plotsquared/core/command/Merge.java | 3 +-- .../com/plotsquared/core/command/Middle.java | 1 - .../com/plotsquared/core/command/Move.java | 1 - .../com/plotsquared/core/command/Music.java | 1 - .../com/plotsquared/core/command/Near.java | 1 - .../com/plotsquared/core/command/Owner.java | 1 - .../plotsquared/core/command/PluginCmd.java | 1 - .../com/plotsquared/core/command/Purge.java | 1 - .../com/plotsquared/core/command/Rate.java | 1 - .../core/command/RegenAllRoads.java | 1 - .../com/plotsquared/core/command/Relight.java | 1 - .../com/plotsquared/core/command/Reload.java | 1 - .../com/plotsquared/core/command/Remove.java | 1 - .../com/plotsquared/core/command/Save.java | 1 - .../core/command/SchematicCmd.java | 1 - .../com/plotsquared/core/command/Set.java | 1 - .../com/plotsquared/core/command/SetHome.java | 1 - .../com/plotsquared/core/command/Setup.java | 1 - .../com/plotsquared/core/command/Swap.java | 1 - .../com/plotsquared/core/command/Target.java | 3 +-- .../plotsquared/core/command/Template.java | 1 - .../com/plotsquared/core/command/Toggle.java | 22 +++++----------- .../com/plotsquared/core/command/Trim.java | 1 - .../com/plotsquared/core/command/Trust.java | 1 - .../com/plotsquared/core/command/Unlink.java | 1 - .../com/plotsquared/core/command/Visit.java | 1 - .../plotsquared/core/command/WE_Anywhere.java | 1 - .../core/util/helpmenu/HelpObject.java | 16 +++++++----- Core/src/main/resources/lang/messages_en.json | 16 ++++++++++-- 74 files changed, 54 insertions(+), 112 deletions(-) diff --git a/Core/src/main/java/com/plotsquared/core/command/Add.java b/Core/src/main/java/com/plotsquared/core/command/Add.java index 108fa932d..836ed2d11 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Add.java +++ b/Core/src/main/java/com/plotsquared/core/command/Add.java @@ -48,7 +48,6 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeoutException; @CommandDeclaration(command = "add", - description = "Allow a user to build in a plot while the plot owner is online.", usage = "/plot add ", category = CommandCategory.SETTINGS, permission = "plots.add", diff --git a/Core/src/main/java/com/plotsquared/core/command/Alias.java b/Core/src/main/java/com/plotsquared/core/command/Alias.java index f7c101ea6..ce12ed780 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Alias.java +++ b/Core/src/main/java/com/plotsquared/core/command/Alias.java @@ -44,7 +44,6 @@ import java.util.concurrent.TimeoutException; @CommandDeclaration(command = "alias", permission = "plots.alias", - description = "Set the plot name", usage = "/plot alias ", aliases = {"setalias", "sa", "name", "rename", "setname", "seta", "nameplot"}, category = CommandCategory.SETTINGS, diff --git a/Core/src/main/java/com/plotsquared/core/command/Area.java b/Core/src/main/java/com/plotsquared/core/command/Area.java index 29a437459..8d1bc9a75 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Area.java +++ b/Core/src/main/java/com/plotsquared/core/command/Area.java @@ -93,7 +93,6 @@ import java.util.UUID; permission = "plots.area", category = CommandCategory.ADMINISTRATION, requiredType = RequiredType.NONE, - description = "Create a new PlotArea", aliases = "world", usage = "/plot area ", confirmation = true) diff --git a/Core/src/main/java/com/plotsquared/core/command/Auto.java b/Core/src/main/java/com/plotsquared/core/command/Auto.java index 0cd5241b8..26ac1b3f9 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Auto.java +++ b/Core/src/main/java/com/plotsquared/core/command/Auto.java @@ -63,7 +63,6 @@ import java.util.Set; permission = "plots.auto", category = CommandCategory.CLAIMING, requiredType = RequiredType.NONE, - description = "Claim the nearest plot", aliases = "a", usage = "/plot auto [length, width]") public class Auto extends SubCommand { diff --git a/Core/src/main/java/com/plotsquared/core/command/Backup.java b/Core/src/main/java/com/plotsquared/core/command/Backup.java index 65ee52a88..5ba71cc03 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Backup.java +++ b/Core/src/main/java/com/plotsquared/core/command/Backup.java @@ -57,7 +57,6 @@ import java.util.stream.Stream; @CommandDeclaration(command = "backup", usage = "/plot backup ", - description = "Manage plot backups", category = CommandCategory.SETTINGS, requiredType = RequiredType.PLAYER, permission = "plots.backup") @@ -123,7 +122,6 @@ public final class Backup extends Command { @CommandDeclaration(command = "save", usage = "/plot backup save", - description = "Create a plot backup", category = CommandCategory.SETTINGS, requiredType = RequiredType.PLAYER, permission = "plots.backup.save") @@ -174,7 +172,6 @@ public final class Backup extends Command { @CommandDeclaration(command = "list", usage = "/plot backup list", - description = "List available plot backups", category = CommandCategory.SETTINGS, requiredType = RequiredType.PLAYER, permission = "plots.backup.list") @@ -241,7 +238,6 @@ public final class Backup extends Command { @CommandDeclaration(command = "load", usage = "/plot backup load <#>", - description = "Restore a plot backup", category = CommandCategory.SETTINGS, requiredType = RequiredType.PLAYER, permission = "plots.backup.load") diff --git a/Core/src/main/java/com/plotsquared/core/command/Biome.java b/Core/src/main/java/com/plotsquared/core/command/Biome.java index e8d7b7871..de6c46fbb 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Biome.java +++ b/Core/src/main/java/com/plotsquared/core/command/Biome.java @@ -40,7 +40,6 @@ import java.util.stream.Collectors; @CommandDeclaration(command = "setbiome", permission = "plots.set.biome", - description = "Set the plot biome", usage = "/plot biome [biome]", aliases = {"biome", "sb", "setb", "b"}, category = CommandCategory.APPEARANCE, diff --git a/Core/src/main/java/com/plotsquared/core/command/Buy.java b/Core/src/main/java/com/plotsquared/core/command/Buy.java index 27476119c..f49d0d238 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Buy.java +++ b/Core/src/main/java/com/plotsquared/core/command/Buy.java @@ -46,7 +46,6 @@ import java.util.Set; import java.util.concurrent.CompletableFuture; @CommandDeclaration(command = "buy", - description = "Buy the plot you are standing on", usage = "/plot buy", permission = "plots.buy", category = CommandCategory.CLAIMING, diff --git a/Core/src/main/java/com/plotsquared/core/command/Caps.java b/Core/src/main/java/com/plotsquared/core/command/Caps.java index d94d6e955..9f495cd9c 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Caps.java +++ b/Core/src/main/java/com/plotsquared/core/command/Caps.java @@ -47,7 +47,6 @@ import static com.plotsquared.core.util.entity.EntityCategories.CAP_VEHICLE; @CommandDeclaration(command = "caps", category = CommandCategory.INFO, - description = "Show plot entity caps", usage = "/plot caps") public class Caps extends SubCommand { diff --git a/Core/src/main/java/com/plotsquared/core/command/Chat.java b/Core/src/main/java/com/plotsquared/core/command/Chat.java index c3eec3c4b..e0f44813d 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Chat.java +++ b/Core/src/main/java/com/plotsquared/core/command/Chat.java @@ -29,7 +29,6 @@ import com.plotsquared.core.configuration.caption.TranslatableCaption; import com.plotsquared.core.player.PlotPlayer; @CommandDeclaration(command = "chat", - description = "Toggles plot chat on or off", usage = "/plot chat", permission = "plots.chat", category = CommandCategory.CHAT, diff --git a/Core/src/main/java/com/plotsquared/core/command/Claim.java b/Core/src/main/java/com/plotsquared/core/command/Claim.java index 9c8244798..1906c1713 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Claim.java +++ b/Core/src/main/java/com/plotsquared/core/command/Claim.java @@ -55,7 +55,6 @@ import javax.annotation.Nullable; @CommandDeclaration( command = "claim", aliases = "c", - description = "Claim the current plot you're standing on", category = CommandCategory.CLAIMING, requiredType = RequiredType.PLAYER, permission = "plots.claim", usage = "/plot claim") diff --git a/Core/src/main/java/com/plotsquared/core/command/Clear.java b/Core/src/main/java/com/plotsquared/core/command/Clear.java index ab49db1b4..da40ef248 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Clear.java +++ b/Core/src/main/java/com/plotsquared/core/command/Clear.java @@ -47,7 +47,6 @@ import javax.annotation.Nonnull; import java.util.concurrent.CompletableFuture; @CommandDeclaration(command = "clear", - description = "Clear the plot you stand on", requiredType = RequiredType.NONE, permission = "plots.clear", category = CommandCategory.APPEARANCE, diff --git a/Core/src/main/java/com/plotsquared/core/command/Cluster.java b/Core/src/main/java/com/plotsquared/core/command/Cluster.java index 497a8a701..4a4ae37f2 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Cluster.java +++ b/Core/src/main/java/com/plotsquared/core/command/Cluster.java @@ -53,8 +53,7 @@ import java.util.concurrent.TimeoutException; aliases = "clusters", category = CommandCategory.ADMINISTRATION, requiredType = RequiredType.NONE, - permission = "plots.cluster", - description = "Manage a plot cluster") + permission = "plots.cluster") public class Cluster extends SubCommand { @Override public boolean onCommand(PlotPlayer player, String[] args) { diff --git a/Core/src/main/java/com/plotsquared/core/command/Command.java b/Core/src/main/java/com/plotsquared/core/command/Command.java index 2f02beb5c..006b93433 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Command.java +++ b/Core/src/main/java/com/plotsquared/core/command/Command.java @@ -71,7 +71,7 @@ public abstract class Command { private List aliases; private RequiredType required; private String usage; - private String description; + private Caption description; private String permission; private boolean confirmation; private CommandCategory category; @@ -171,7 +171,7 @@ public abstract class Command { return this.aliases; } - public String getDescription() { + public Caption getDescription() { return this.description; } @@ -198,7 +198,21 @@ public abstract class Command { aliasOptions.addAll(Arrays.asList(declaration.aliases())); this.aliases = aliasOptions; - this.description = declaration.description(); + if (declaration.description().isEmpty()) { + Command parent = getParent(); + // we're collecting the "path" of the command + List path = new ArrayList<>(); + path.add(this.id); + while (parent != null && !parent.equals(MainCommand.getInstance())) { + path.add(parent.getId()); + parent = parent.getParent(); + } + Collections.reverse(path); + String descriptionKey = String.join(".", path); + this.description = TranslatableCaption.of(String.format("commands.description.%s", descriptionKey)); + } else { + this.description = StaticCaption.of(declaration.description()); + } this.usage = declaration.usage(); this.confirmation = declaration.confirmation(); @@ -335,7 +349,7 @@ public abstract class Command { String[] allArgs = setArgs.toArray(new String[0]); int best = 0; for (Command current : commands) { - int match = getMatch(allArgs, current); + int match = getMatch(allArgs, current, player); if (match > best) { cmd = current; } @@ -385,12 +399,12 @@ public abstract class Command { return true; } - public int getMatch(String[] args, Command cmd) { + public int getMatch(String[] args, Command cmd, PlotPlayer player) { String perm = cmd.getPermission(); HashSet desc = new HashSet<>(); int count = cmd.getAliases().stream().filter(alias -> alias.startsWith(args[0])) .mapToInt(alias -> 5).sum(); - Collections.addAll(desc, cmd.getDescription().split(" ")); + Collections.addAll(desc, cmd.getDescription().getComponent(player).split(" ")); for (String arg : args) { if (perm.startsWith(arg)) { count++; diff --git a/Core/src/main/java/com/plotsquared/core/command/Comment.java b/Core/src/main/java/com/plotsquared/core/command/Comment.java index 2a9cba67a..25766f3f0 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Comment.java +++ b/Core/src/main/java/com/plotsquared/core/command/Comment.java @@ -41,7 +41,6 @@ import java.util.Locale; @CommandDeclaration(command = "comment", aliases = {"msg"}, - description = "Comment on a plot", category = CommandCategory.CHAT, requiredType = RequiredType.PLAYER, permission = "plots.comment") diff --git a/Core/src/main/java/com/plotsquared/core/command/Condense.java b/Core/src/main/java/com/plotsquared/core/command/Condense.java index 738f07acc..01891ca56 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Condense.java +++ b/Core/src/main/java/com/plotsquared/core/command/Condense.java @@ -51,7 +51,6 @@ import java.util.concurrent.atomic.AtomicBoolean; @CommandDeclaration(command = "condense", permission = "plots.admin", usage = "/plot condense [radius]", - description = "Condense a plotworld", category = CommandCategory.ADMINISTRATION, requiredType = RequiredType.CONSOLE) public class Condense extends SubCommand { diff --git a/Core/src/main/java/com/plotsquared/core/command/Confirm.java b/Core/src/main/java/com/plotsquared/core/command/Confirm.java index 35f480378..98fc3b39a 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Confirm.java +++ b/Core/src/main/java/com/plotsquared/core/command/Confirm.java @@ -32,7 +32,6 @@ import com.plotsquared.core.util.task.TaskManager; @CommandDeclaration(command = "confirm", permission = "plots.use", - description = "Confirm an action", category = CommandCategory.INFO) public class Confirm extends SubCommand { diff --git a/Core/src/main/java/com/plotsquared/core/command/Continue.java b/Core/src/main/java/com/plotsquared/core/command/Continue.java index 68f2da942..49ffeca04 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Continue.java +++ b/Core/src/main/java/com/plotsquared/core/command/Continue.java @@ -42,7 +42,6 @@ import net.kyori.adventure.text.minimessage.Template; import javax.annotation.Nonnull; @CommandDeclaration(command = "continue", - description = "Continue a plot that was previously marked as done", permission = "plots.continue", category = CommandCategory.SETTINGS, requiredType = RequiredType.PLAYER) diff --git a/Core/src/main/java/com/plotsquared/core/command/Copy.java b/Core/src/main/java/com/plotsquared/core/command/Copy.java index b8d4e08fc..64ae43b8a 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Copy.java +++ b/Core/src/main/java/com/plotsquared/core/command/Copy.java @@ -37,7 +37,6 @@ import net.kyori.adventure.text.minimessage.Template; permission = "plots.copy", aliases = {"copypaste"}, category = CommandCategory.CLAIMING, - description = "Copy a plot", usage = "/plot copy ", requiredType = RequiredType.NONE) public class Copy extends SubCommand { diff --git a/Core/src/main/java/com/plotsquared/core/command/CreateRoadSchematic.java b/Core/src/main/java/com/plotsquared/core/command/CreateRoadSchematic.java index 037b4d8e4..da4d67b42 100644 --- a/Core/src/main/java/com/plotsquared/core/command/CreateRoadSchematic.java +++ b/Core/src/main/java/com/plotsquared/core/command/CreateRoadSchematic.java @@ -41,7 +41,6 @@ import javax.annotation.Nonnull; category = CommandCategory.ADMINISTRATION, requiredType = RequiredType.PLAYER, permission = "plots.createroadschematic", - description = "Add a road schematic to your world using the roads around your current plot", usage = "/plot createroadschematic") public class CreateRoadSchematic extends SubCommand { diff --git a/Core/src/main/java/com/plotsquared/core/command/DatabaseCommand.java b/Core/src/main/java/com/plotsquared/core/command/DatabaseCommand.java index 2cc93c4df..09382ca9a 100644 --- a/Core/src/main/java/com/plotsquared/core/command/DatabaseCommand.java +++ b/Core/src/main/java/com/plotsquared/core/command/DatabaseCommand.java @@ -62,7 +62,6 @@ import java.util.Map.Entry; aliases = {"convert"}, category = CommandCategory.ADMINISTRATION, permission = "plots.database", - description = "Convert/Backup Storage", requiredType = RequiredType.CONSOLE, usage = "/plot database [area] ") public class DatabaseCommand extends SubCommand { diff --git a/Core/src/main/java/com/plotsquared/core/command/Debug.java b/Core/src/main/java/com/plotsquared/core/command/Debug.java index 82c5a0379..67eb61d3f 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Debug.java +++ b/Core/src/main/java/com/plotsquared/core/command/Debug.java @@ -55,7 +55,6 @@ import java.util.Set; @CommandDeclaration(command = "debug", category = CommandCategory.DEBUG, - description = "Show debug information", usage = "/plot debug [msg]", permission = "plots.admin") public class Debug extends SubCommand { diff --git a/Core/src/main/java/com/plotsquared/core/command/DebugAllowUnsafe.java b/Core/src/main/java/com/plotsquared/core/command/DebugAllowUnsafe.java index c872d1e54..08948bc29 100644 --- a/Core/src/main/java/com/plotsquared/core/command/DebugAllowUnsafe.java +++ b/Core/src/main/java/com/plotsquared/core/command/DebugAllowUnsafe.java @@ -33,7 +33,6 @@ import java.util.List; import java.util.UUID; @CommandDeclaration(command = "debugallowunsafe", - description = "Allow unsafe actions until toggled off", usage = "/plot debugallowunsafe", category = CommandCategory.DEBUG, requiredType = RequiredType.NONE, diff --git a/Core/src/main/java/com/plotsquared/core/command/DebugExec.java b/Core/src/main/java/com/plotsquared/core/command/DebugExec.java index b71e2f2ba..5d0ffbc37 100644 --- a/Core/src/main/java/com/plotsquared/core/command/DebugExec.java +++ b/Core/src/main/java/com/plotsquared/core/command/DebugExec.java @@ -89,7 +89,6 @@ import java.util.concurrent.CompletableFuture; @CommandDeclaration(command = "debugexec", permission = "plots.admin", - description = "Mutli-purpose debug command", aliases = {"exec", "$"}, category = CommandCategory.DEBUG) public class DebugExec extends SubCommand { diff --git a/Core/src/main/java/com/plotsquared/core/command/DebugImportWorlds.java b/Core/src/main/java/com/plotsquared/core/command/DebugImportWorlds.java index dce7ca1da..22282d5e5 100644 --- a/Core/src/main/java/com/plotsquared/core/command/DebugImportWorlds.java +++ b/Core/src/main/java/com/plotsquared/core/command/DebugImportWorlds.java @@ -45,7 +45,6 @@ import java.util.concurrent.CompletableFuture; @CommandDeclaration(command = "debugimportworlds", permission = "plots.admin", - description = "Import worlds by player name", requiredType = RequiredType.CONSOLE, category = CommandCategory.TELEPORT) public class DebugImportWorlds extends Command { diff --git a/Core/src/main/java/com/plotsquared/core/command/DebugLoadTest.java b/Core/src/main/java/com/plotsquared/core/command/DebugLoadTest.java index 6523e77e1..00aa27558 100644 --- a/Core/src/main/java/com/plotsquared/core/command/DebugLoadTest.java +++ b/Core/src/main/java/com/plotsquared/core/command/DebugLoadTest.java @@ -31,7 +31,6 @@ import com.plotsquared.core.player.PlotPlayer; @CommandDeclaration(command = "debugloadtest", permission = "plots.debugloadtest", - description = "This debug command will force the reload of all plots in the DB", usage = "/plot debugloadtest", category = CommandCategory.DEBUG, requiredType = RequiredType.CONSOLE) diff --git a/Core/src/main/java/com/plotsquared/core/command/DebugPaste.java b/Core/src/main/java/com/plotsquared/core/command/DebugPaste.java index 5f3dc7b8d..a79a8a240 100644 --- a/Core/src/main/java/com/plotsquared/core/command/DebugPaste.java +++ b/Core/src/main/java/com/plotsquared/core/command/DebugPaste.java @@ -56,7 +56,6 @@ import java.util.stream.Collectors; @CommandDeclaration(command = "debugpaste", aliases = "dp", usage = "/plot debugpaste", - description = "Upload settings.yml, worlds.yml, your latest.log and Multiverse's worlds.yml (if being used) to https://athion.net/ISPaster/paste", permission = "plots.debugpaste", category = CommandCategory.DEBUG, confirmation = true, diff --git a/Core/src/main/java/com/plotsquared/core/command/DebugRoadRegen.java b/Core/src/main/java/com/plotsquared/core/command/DebugRoadRegen.java index 9f357794d..d95bbff35 100644 --- a/Core/src/main/java/com/plotsquared/core/command/DebugRoadRegen.java +++ b/Core/src/main/java/com/plotsquared/core/command/DebugRoadRegen.java @@ -43,7 +43,6 @@ import java.util.Arrays; @CommandDeclaration(command = "debugroadregen", usage = DebugRoadRegen.USAGE, requiredType = RequiredType.NONE, - description = "Regenerate roads in the plot or region the user is, based on the road schematic", category = CommandCategory.DEBUG, permission = "plots.debugroadregen") public class DebugRoadRegen extends SubCommand { diff --git a/Core/src/main/java/com/plotsquared/core/command/DebugSaveTest.java b/Core/src/main/java/com/plotsquared/core/command/DebugSaveTest.java index 99aa91505..1274fb531 100644 --- a/Core/src/main/java/com/plotsquared/core/command/DebugSaveTest.java +++ b/Core/src/main/java/com/plotsquared/core/command/DebugSaveTest.java @@ -37,8 +37,7 @@ import java.util.List; permission = "plots.debugsavetest", category = CommandCategory.DEBUG, requiredType = RequiredType.CONSOLE, - usage = "/plot debugsavetest", - description = "This command will force the recreation of all plots in the DB") + usage = "/plot debugsavetest") public class DebugSaveTest extends SubCommand { @Override public boolean onCommand(final PlotPlayer player, String[] args) { diff --git a/Core/src/main/java/com/plotsquared/core/command/Delete.java b/Core/src/main/java/com/plotsquared/core/command/Delete.java index 93621eb47..be4774982 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Delete.java +++ b/Core/src/main/java/com/plotsquared/core/command/Delete.java @@ -47,7 +47,6 @@ import javax.annotation.Nullable; @CommandDeclaration(command = "delete", permission = "plots.delete", - description = "Delete the plot you stand on", usage = "/plot delete", aliases = {"dispose", "del"}, category = CommandCategory.CLAIMING, diff --git a/Core/src/main/java/com/plotsquared/core/command/Deny.java b/Core/src/main/java/com/plotsquared/core/command/Deny.java index 0b6358d8d..cfe357c42 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Deny.java +++ b/Core/src/main/java/com/plotsquared/core/command/Deny.java @@ -50,7 +50,6 @@ import java.util.concurrent.TimeoutException; @CommandDeclaration(command = "deny", aliases = {"d", "ban"}, - description = "Deny a user from entering a plot", usage = "/plot deny ", category = CommandCategory.SETTINGS, requiredType = RequiredType.PLAYER) diff --git a/Core/src/main/java/com/plotsquared/core/command/Desc.java b/Core/src/main/java/com/plotsquared/core/command/Desc.java index fdc63ab0f..24d3f165a 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Desc.java +++ b/Core/src/main/java/com/plotsquared/core/command/Desc.java @@ -40,7 +40,6 @@ import javax.annotation.Nonnull; @CommandDeclaration(command = "setdescription", permission = "plots.set.desc", - description = "Set the plot description", usage = "/plot desc ", aliases = {"desc", "setdesc", "setd", "description"}, category = CommandCategory.SETTINGS, diff --git a/Core/src/main/java/com/plotsquared/core/command/Dislike.java b/Core/src/main/java/com/plotsquared/core/command/Dislike.java index aacee7880..3e4db188c 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Dislike.java +++ b/Core/src/main/java/com/plotsquared/core/command/Dislike.java @@ -32,7 +32,6 @@ import javax.annotation.Nonnull; @CommandDeclaration(command = "dislike", permission = "plots.dislike", - description = "Dislike the plot", usage = "/plot dislike [next|purge]", category = CommandCategory.INFO, requiredType = RequiredType.PLAYER) diff --git a/Core/src/main/java/com/plotsquared/core/command/Done.java b/Core/src/main/java/com/plotsquared/core/command/Done.java index 64e9161d5..ab38a329b 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Done.java +++ b/Core/src/main/java/com/plotsquared/core/command/Done.java @@ -49,7 +49,6 @@ import javax.annotation.Nonnull; @CommandDeclaration(command = "done", aliases = {"submit"}, - description = "Mark a plot as done", permission = "plots.done", category = CommandCategory.SETTINGS, requiredType = RequiredType.NONE) diff --git a/Core/src/main/java/com/plotsquared/core/command/Download.java b/Core/src/main/java/com/plotsquared/core/command/Download.java index 9d7c88b94..b83eb4703 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Download.java +++ b/Core/src/main/java/com/plotsquared/core/command/Download.java @@ -50,7 +50,6 @@ import java.net.URL; aliases = {"dl"}, category = CommandCategory.SCHEMATIC, requiredType = RequiredType.NONE, - description = "Download your plot", permission = "plots.download") public class Download extends SubCommand { diff --git a/Core/src/main/java/com/plotsquared/core/command/FlagCommand.java b/Core/src/main/java/com/plotsquared/core/command/FlagCommand.java index 40801147b..b383a0db9 100644 --- a/Core/src/main/java/com/plotsquared/core/command/FlagCommand.java +++ b/Core/src/main/java/com/plotsquared/core/command/FlagCommand.java @@ -71,7 +71,6 @@ import java.util.stream.Stream; @CommandDeclaration(command = "flag", aliases = {"f", "flag"}, usage = "/plot flag ", - description = "Manage plot flags", category = CommandCategory.SETTINGS, requiredType = RequiredType.NONE, permission = "plots.flag") @@ -282,7 +281,6 @@ public final class FlagCommand extends Command { @CommandDeclaration(command = "set", aliases = {"s", "set"}, usage = "/plot flag set ", - description = "Set a plot flag", category = CommandCategory.SETTINGS, requiredType = RequiredType.NONE, permission = "plots.set.flag") @@ -335,7 +333,6 @@ public final class FlagCommand extends Command { @CommandDeclaration(command = "add", aliases = {"a", "add"}, usage = "/plot flag add ", - description = "Add a plot flag value", category = CommandCategory.SETTINGS, requiredType = RequiredType.NONE, permission = "plots.flag.add") @@ -399,7 +396,6 @@ public final class FlagCommand extends Command { @CommandDeclaration(command = "remove", aliases = {"r", "remove", "delete"}, usage = "/plot flag remove [values]", - description = "Remove a flag", category = CommandCategory.SETTINGS, requiredType = RequiredType.NONE, permission = "plots.flag.remove") @@ -503,7 +499,6 @@ public final class FlagCommand extends Command { @CommandDeclaration(command = "list", aliases = {"l", "list", "flags"}, usage = "/plot flag list", - description = "List all available plot flags", category = CommandCategory.SETTINGS, requiredType = RequiredType.NONE, permission = "plots.flag.list") @@ -543,7 +538,6 @@ public final class FlagCommand extends Command { @CommandDeclaration(command = "info", aliases = {"i", "info"}, usage = "/plot flag info ", - description = "View information about a flag", category = CommandCategory.SETTINGS, requiredType = RequiredType.NONE, permission = "plots.flag.info") diff --git a/Core/src/main/java/com/plotsquared/core/command/Grant.java b/Core/src/main/java/com/plotsquared/core/command/Grant.java index 4a2e83f5d..1745eec0c 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Grant.java +++ b/Core/src/main/java/com/plotsquared/core/command/Grant.java @@ -53,7 +53,6 @@ import java.util.stream.Stream; category = CommandCategory.CLAIMING, usage = "/plot grant [player]", permission = "plots.grant", - description = "Manage plot grants.", requiredType = RequiredType.NONE) public class Grant extends Command { diff --git a/Core/src/main/java/com/plotsquared/core/command/Help.java b/Core/src/main/java/com/plotsquared/core/command/Help.java index 53b719928..8ec4f7e40 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Help.java +++ b/Core/src/main/java/com/plotsquared/core/command/Help.java @@ -39,7 +39,6 @@ import net.kyori.adventure.text.minimessage.Template; import java.util.concurrent.CompletableFuture; @CommandDeclaration(command = "help", - description = "Get this help menu", aliases = "?", category = CommandCategory.INFO, usage = "help [category|#]", diff --git a/Core/src/main/java/com/plotsquared/core/command/HomeCommand.java b/Core/src/main/java/com/plotsquared/core/command/HomeCommand.java index dae35ed34..24f2a544c 100644 --- a/Core/src/main/java/com/plotsquared/core/command/HomeCommand.java +++ b/Core/src/main/java/com/plotsquared/core/command/HomeCommand.java @@ -50,7 +50,6 @@ import java.util.List; import java.util.concurrent.CompletableFuture; @CommandDeclaration(command = "home", - description = "Teleport to your plot(s)", permission = "plots.home", usage = "/plot home [ | | | | ]", aliases = {"h"}, diff --git a/Core/src/main/java/com/plotsquared/core/command/Inbox.java b/Core/src/main/java/com/plotsquared/core/command/Inbox.java index 4062615a6..b722c2caa 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Inbox.java +++ b/Core/src/main/java/com/plotsquared/core/command/Inbox.java @@ -44,7 +44,6 @@ import net.kyori.adventure.text.minimessage.Template; import java.util.List; @CommandDeclaration(command = "inbox", - description = "Review the comments for a plot", usage = "/plot inbox [inbox] [delete | clear | page]", permission = "plots.inbox", category = CommandCategory.CHAT, diff --git a/Core/src/main/java/com/plotsquared/core/command/Info.java b/Core/src/main/java/com/plotsquared/core/command/Info.java index 8304c8f0a..dde661891 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Info.java +++ b/Core/src/main/java/com/plotsquared/core/command/Info.java @@ -38,7 +38,6 @@ import net.kyori.adventure.text.minimessage.Template; @CommandDeclaration(command = "info", aliases = "i", - description = "Display plot info", usage = "/plot info [-f to force info]", category = CommandCategory.INFO) public class Info extends SubCommand { diff --git a/Core/src/main/java/com/plotsquared/core/command/Kick.java b/Core/src/main/java/com/plotsquared/core/command/Kick.java index 7edaa4ca1..11fb6352e 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Kick.java +++ b/Core/src/main/java/com/plotsquared/core/command/Kick.java @@ -50,7 +50,6 @@ import java.util.concurrent.TimeoutException; @CommandDeclaration(command = "kick", aliases = "k", - description = "Kick a player from your plot", permission = "plots.kick", usage = "/plot kick ", category = CommandCategory.TELEPORT, diff --git a/Core/src/main/java/com/plotsquared/core/command/Leave.java b/Core/src/main/java/com/plotsquared/core/command/Leave.java index aba358231..7afa25ff7 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Leave.java +++ b/Core/src/main/java/com/plotsquared/core/command/Leave.java @@ -39,7 +39,6 @@ import java.util.UUID; import java.util.concurrent.CompletableFuture; @CommandDeclaration(command = "leave", - description = "Removes self from being trusted or a member of the plot", permission = "plots.leave", usage = "/plot leave", category = CommandCategory.CLAIMING, diff --git a/Core/src/main/java/com/plotsquared/core/command/Like.java b/Core/src/main/java/com/plotsquared/core/command/Like.java index 063c4f798..199bd09e3 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Like.java +++ b/Core/src/main/java/com/plotsquared/core/command/Like.java @@ -50,7 +50,6 @@ import java.util.UUID; @CommandDeclaration(command = "like", permission = "plots.like", - description = "Like the plot", usage = "/plot like [next | purge]", category = CommandCategory.INFO, requiredType = RequiredType.PLAYER) diff --git a/Core/src/main/java/com/plotsquared/core/command/ListCmd.java b/Core/src/main/java/com/plotsquared/core/command/ListCmd.java index 89e386f1a..d01e3ea3e 100644 --- a/Core/src/main/java/com/plotsquared/core/command/ListCmd.java +++ b/Core/src/main/java/com/plotsquared/core/command/ListCmd.java @@ -72,7 +72,6 @@ import java.util.stream.Collectors; @CommandDeclaration(command = "list", aliases = {"l", "find", "search"}, - description = "List plots", permission = "plots.list", category = CommandCategory.INFO, usage = "/plot list > [#]") diff --git a/Core/src/main/java/com/plotsquared/core/command/Load.java b/Core/src/main/java/com/plotsquared/core/command/Load.java index 834c1e991..585a41234 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Load.java +++ b/Core/src/main/java/com/plotsquared/core/command/Load.java @@ -54,7 +54,6 @@ import java.util.List; aliases = "restore", category = CommandCategory.SCHEMATIC, requiredType = RequiredType.NONE, - description = "Load your plot", permission = "plots.load", usage = "/plot load") public class Load extends SubCommand { diff --git a/Core/src/main/java/com/plotsquared/core/command/Merge.java b/Core/src/main/java/com/plotsquared/core/command/Merge.java index 4eea6cbbc..12d0a5ec6 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Merge.java +++ b/Core/src/main/java/com/plotsquared/core/command/Merge.java @@ -27,13 +27,13 @@ package com.plotsquared.core.command; import com.google.inject.Inject; import com.plotsquared.core.PlotSquared; -import com.plotsquared.core.permissions.Permission; import com.plotsquared.core.configuration.Settings; import com.plotsquared.core.configuration.caption.TranslatableCaption; import com.plotsquared.core.events.PlotMergeEvent; import com.plotsquared.core.events.Result; import com.plotsquared.core.location.Direction; import com.plotsquared.core.location.Location; +import com.plotsquared.core.permissions.Permission; import com.plotsquared.core.player.PlotPlayer; import com.plotsquared.core.plot.Plot; import com.plotsquared.core.plot.PlotArea; @@ -50,7 +50,6 @@ import java.util.UUID; @CommandDeclaration(command = "merge", aliases = "m", - description = "Merge the plot you are standing on with another plot", permission = "plots.merge", usage = "/plot merge [removeroads]", category = CommandCategory.SETTINGS, diff --git a/Core/src/main/java/com/plotsquared/core/command/Middle.java b/Core/src/main/java/com/plotsquared/core/command/Middle.java index 45ed32038..a8342c6df 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Middle.java +++ b/Core/src/main/java/com/plotsquared/core/command/Middle.java @@ -36,7 +36,6 @@ import com.plotsquared.core.plot.Plot; */ @CommandDeclaration(command = "middle", aliases = {"center", "centre"}, - description = "Teleports you to the center of the plot", usage = "/plot middle", category = CommandCategory.TELEPORT, requiredType = RequiredType.PLAYER) diff --git a/Core/src/main/java/com/plotsquared/core/command/Move.java b/Core/src/main/java/com/plotsquared/core/command/Move.java index 7a7893026..e4c2a64d3 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Move.java +++ b/Core/src/main/java/com/plotsquared/core/command/Move.java @@ -43,7 +43,6 @@ import java.util.concurrent.CompletableFuture; @CommandDeclaration(usage = "/plot move ", command = "move", - description = "Move a plot", permission = "plots.move", category = CommandCategory.CLAIMING, requiredType = RequiredType.PLAYER) diff --git a/Core/src/main/java/com/plotsquared/core/command/Music.java b/Core/src/main/java/com/plotsquared/core/command/Music.java index ba6bb84ca..ffab80dcf 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Music.java +++ b/Core/src/main/java/com/plotsquared/core/command/Music.java @@ -48,7 +48,6 @@ import java.util.Locale; @CommandDeclaration(command = "music", permission = "plots.music", - description = "Play music in your plot", usage = "/plot music", category = CommandCategory.APPEARANCE, requiredType = RequiredType.PLAYER) diff --git a/Core/src/main/java/com/plotsquared/core/command/Near.java b/Core/src/main/java/com/plotsquared/core/command/Near.java index 05381de80..e14b14ddc 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Near.java +++ b/Core/src/main/java/com/plotsquared/core/command/Near.java @@ -37,7 +37,6 @@ import java.util.concurrent.CompletableFuture; @CommandDeclaration(command = "near", aliases = "n", - description = "Display nearby players", usage = "/plot near", category = CommandCategory.INFO, requiredType = RequiredType.PLAYER) diff --git a/Core/src/main/java/com/plotsquared/core/command/Owner.java b/Core/src/main/java/com/plotsquared/core/command/Owner.java index b7e4552b5..c29034584 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Owner.java +++ b/Core/src/main/java/com/plotsquared/core/command/Owner.java @@ -49,7 +49,6 @@ import java.util.function.Consumer; @CommandDeclaration(command = "setowner", permission = "plots.set.owner", - description = "Set the plot owner", usage = "/plot setowner ", aliases = {"owner", "so", "seto"}, category = CommandCategory.CLAIMING, diff --git a/Core/src/main/java/com/plotsquared/core/command/PluginCmd.java b/Core/src/main/java/com/plotsquared/core/command/PluginCmd.java index caa74c347..695b045f6 100644 --- a/Core/src/main/java/com/plotsquared/core/command/PluginCmd.java +++ b/Core/src/main/java/com/plotsquared/core/command/PluginCmd.java @@ -34,7 +34,6 @@ import net.kyori.adventure.text.minimessage.Template; @CommandDeclaration(command = "plugin", permission = "plots.use", - description = "Show plugin information", usage = "/plot plugin", aliases = "version", category = CommandCategory.INFO) diff --git a/Core/src/main/java/com/plotsquared/core/command/Purge.java b/Core/src/main/java/com/plotsquared/core/command/Purge.java index 727fdda46..2d75807b8 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Purge.java +++ b/Core/src/main/java/com/plotsquared/core/command/Purge.java @@ -54,7 +54,6 @@ import java.util.concurrent.atomic.AtomicBoolean; @CommandDeclaration(usage = "/plot purge world: area: id: owner: shared: unknown:[true | false] clear:[true | false]", command = "purge", permission = "plots.admin", - description = "Purge all plots for a world", category = CommandCategory.ADMINISTRATION, requiredType = RequiredType.CONSOLE, confirmation = true) diff --git a/Core/src/main/java/com/plotsquared/core/command/Rate.java b/Core/src/main/java/com/plotsquared/core/command/Rate.java index b649842a8..035ed41d3 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Rate.java +++ b/Core/src/main/java/com/plotsquared/core/command/Rate.java @@ -54,7 +54,6 @@ import java.util.UUID; @CommandDeclaration(command = "rate", permission = "plots.rate", - description = "Rate the plot", usage = "/plot rate [# | next | purge]", aliases = "rt", category = CommandCategory.INFO, diff --git a/Core/src/main/java/com/plotsquared/core/command/RegenAllRoads.java b/Core/src/main/java/com/plotsquared/core/command/RegenAllRoads.java index ac2940fb9..7b5e0651f 100644 --- a/Core/src/main/java/com/plotsquared/core/command/RegenAllRoads.java +++ b/Core/src/main/java/com/plotsquared/core/command/RegenAllRoads.java @@ -38,7 +38,6 @@ import net.kyori.adventure.text.minimessage.Template; import javax.annotation.Nonnull; @CommandDeclaration(command = "regenallroads", - description = "Regenerate all roads in the map using the set road schematic", aliases = {"rgar"}, usage = "/plot regenallroads [height]", category = CommandCategory.ADMINISTRATION, diff --git a/Core/src/main/java/com/plotsquared/core/command/Relight.java b/Core/src/main/java/com/plotsquared/core/command/Relight.java index 7bca69673..184a99571 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Relight.java +++ b/Core/src/main/java/com/plotsquared/core/command/Relight.java @@ -33,7 +33,6 @@ import com.plotsquared.core.util.task.RunnableVal3; import java.util.concurrent.CompletableFuture; @CommandDeclaration(command = "relight", - description = "Relight your plot", usage = "/plot relight", category = CommandCategory.DEBUG, requiredType = RequiredType.PLAYER) diff --git a/Core/src/main/java/com/plotsquared/core/command/Reload.java b/Core/src/main/java/com/plotsquared/core/command/Reload.java index f509d446a..1d4e1298d 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Reload.java +++ b/Core/src/main/java/com/plotsquared/core/command/Reload.java @@ -44,7 +44,6 @@ import java.util.Objects; @CommandDeclaration(command = "reload", aliases = "rl", permission = "plots.admin.command.reload", - description = "Reload translations and world settings", usage = "/plot reload", category = CommandCategory.ADMINISTRATION) public class Reload extends SubCommand { diff --git a/Core/src/main/java/com/plotsquared/core/command/Remove.java b/Core/src/main/java/com/plotsquared/core/command/Remove.java index 7bb7da695..aeee2a30d 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Remove.java +++ b/Core/src/main/java/com/plotsquared/core/command/Remove.java @@ -46,7 +46,6 @@ import java.util.concurrent.TimeoutException; @CommandDeclaration(command = "remove", aliases = {"r", "untrust", "ut", "undeny", "unban", "ud"}, - description = "Remove a player from a plot", usage = "/plot remove ", category = CommandCategory.SETTINGS, requiredType = RequiredType.NONE, diff --git a/Core/src/main/java/com/plotsquared/core/command/Save.java b/Core/src/main/java/com/plotsquared/core/command/Save.java index 1e6dd9325..636096943 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Save.java +++ b/Core/src/main/java/com/plotsquared/core/command/Save.java @@ -47,7 +47,6 @@ import java.util.List; import java.util.UUID; @CommandDeclaration(command = "save", - description = "Save your plot", category = CommandCategory.SCHEMATIC, requiredType = RequiredType.NONE, permission = "plots.save") diff --git a/Core/src/main/java/com/plotsquared/core/command/SchematicCmd.java b/Core/src/main/java/com/plotsquared/core/command/SchematicCmd.java index 6661efdf6..2146c81ab 100644 --- a/Core/src/main/java/com/plotsquared/core/command/SchematicCmd.java +++ b/Core/src/main/java/com/plotsquared/core/command/SchematicCmd.java @@ -52,7 +52,6 @@ import java.util.UUID; @CommandDeclaration(command = "schematic", permission = "plots.schematic", - description = "Schematic command", aliases = {"sch", "schem"}, category = CommandCategory.SCHEMATIC, usage = "/plot schematic ") diff --git a/Core/src/main/java/com/plotsquared/core/command/Set.java b/Core/src/main/java/com/plotsquared/core/command/Set.java index f3f2a3648..11015b70d 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Set.java +++ b/Core/src/main/java/com/plotsquared/core/command/Set.java @@ -58,7 +58,6 @@ import java.util.stream.Collectors; import java.util.stream.Stream; @CommandDeclaration(command = "set", - description = "Set a plot value", aliases = {"s"}, usage = "/plot set ", permission = "plots.set", diff --git a/Core/src/main/java/com/plotsquared/core/command/SetHome.java b/Core/src/main/java/com/plotsquared/core/command/SetHome.java index b9813f621..95940ea39 100644 --- a/Core/src/main/java/com/plotsquared/core/command/SetHome.java +++ b/Core/src/main/java/com/plotsquared/core/command/SetHome.java @@ -34,7 +34,6 @@ import net.kyori.adventure.text.minimessage.Template; @CommandDeclaration(command = "sethome", permission = "plots.set.home", - description = "Set the plot home to your current position", usage = "/plot sethome [none]", aliases = {"sh", "seth"}, category = CommandCategory.SETTINGS, diff --git a/Core/src/main/java/com/plotsquared/core/command/Setup.java b/Core/src/main/java/com/plotsquared/core/command/Setup.java index aa957553b..eb870880b 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Setup.java +++ b/Core/src/main/java/com/plotsquared/core/command/Setup.java @@ -47,7 +47,6 @@ import java.util.Map.Entry; @CommandDeclaration(command = "setup", permission = "plots.admin.command.setup", - description = "Setup wizard for plot worlds", usage = "/plot setup", aliases = {"create"}, category = CommandCategory.ADMINISTRATION) diff --git a/Core/src/main/java/com/plotsquared/core/command/Swap.java b/Core/src/main/java/com/plotsquared/core/command/Swap.java index 6d31ef7ae..6bb379c6c 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Swap.java +++ b/Core/src/main/java/com/plotsquared/core/command/Swap.java @@ -39,7 +39,6 @@ import java.util.concurrent.CompletableFuture; @CommandDeclaration(usage = "/plot swap ", command = "swap", - description = "Swap two plots", aliases = {"switch"}, category = CommandCategory.CLAIMING, requiredType = RequiredType.PLAYER) diff --git a/Core/src/main/java/com/plotsquared/core/command/Target.java b/Core/src/main/java/com/plotsquared/core/command/Target.java index bd860616a..94366ce45 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Target.java +++ b/Core/src/main/java/com/plotsquared/core/command/Target.java @@ -42,7 +42,6 @@ import java.util.stream.Stream; @CommandDeclaration(command = "target", usage = "/plot target < | nearest>", - description = "Target a plot with your compass", permission = "plots.target", requiredType = RequiredType.PLAYER, category = CommandCategory.INFO) @@ -61,7 +60,7 @@ public class Target extends SubCommand { if (args.length == 0) { player.sendMessage( TranslatableCaption.of("commandconfig.command_syntax"), - Template.of("value", "/plot target < | nearest>") + Template.of("value", "/plot target < | nearest>") ); return false; } diff --git a/Core/src/main/java/com/plotsquared/core/command/Template.java b/Core/src/main/java/com/plotsquared/core/command/Template.java index c7bde1161..a384c74ac 100644 --- a/Core/src/main/java/com/plotsquared/core/command/Template.java +++ b/Core/src/main/java/com/plotsquared/core/command/Template.java @@ -65,7 +65,6 @@ import java.util.zip.ZipOutputStream; @CommandDeclaration(command = "template", permission = "plots.admin", - description = "Create or use a world template", usage = "/plot template [import | export]