diff --git a/bungee/src/main/java/me/lucko/luckperms/BungeeListener.java b/bungee/src/main/java/me/lucko/luckperms/BungeeListener.java index efe88a0e7..dbf1548ee 100644 --- a/bungee/src/main/java/me/lucko/luckperms/BungeeListener.java +++ b/bungee/src/main/java/me/lucko/luckperms/BungeeListener.java @@ -29,7 +29,10 @@ import me.lucko.luckperms.utils.AbstractListener; import net.md_5.bungee.api.chat.TextComponent; import net.md_5.bungee.api.connection.PendingConnection; import net.md_5.bungee.api.connection.ProxiedPlayer; -import net.md_5.bungee.api.event.*; +import net.md_5.bungee.api.event.LoginEvent; +import net.md_5.bungee.api.event.PermissionCheckEvent; +import net.md_5.bungee.api.event.PlayerDisconnectEvent; +import net.md_5.bungee.api.event.PostLoginEvent; import net.md_5.bungee.api.plugin.Listener; import net.md_5.bungee.event.EventHandler; diff --git a/common/src/main/java/me/lucko/luckperms/commands/MainCommand.java b/common/src/main/java/me/lucko/luckperms/commands/MainCommand.java index 0cf202dee..dd650608c 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/MainCommand.java +++ b/common/src/main/java/me/lucko/luckperms/commands/MainCommand.java @@ -98,7 +98,7 @@ public abstract class MainCommand { } if (sub.getIsArgumentInvalid().test(strippedArgs.size())) { - sub.sendUsage(sender, label); + sub.sendUsage(sender); return CommandResult.INVALID_ARGS; } @@ -146,10 +146,10 @@ public abstract class MainCommand { .collect(Collectors.toList()); if (subs.size() > 0) { - Util.sendPluginMessage(sender, "&e" + getName() + " Sub Commands:"); + Util.sendPluginMessage(sender, "&e" + getName() + " Sub Commands: &7(" + String.format(getUsage(), label) + " ...)"); for (SubCommand s : subs) { - s.sendUsage(sender, label); + s.sendUsage(sender); } } else { diff --git a/common/src/main/java/me/lucko/luckperms/commands/SubCommand.java b/common/src/main/java/me/lucko/luckperms/commands/SubCommand.java index bb103b8fe..5a188993f 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/SubCommand.java +++ b/common/src/main/java/me/lucko/luckperms/commands/SubCommand.java @@ -22,7 +22,6 @@ package me.lucko.luckperms.commands; -import lombok.AllArgsConstructor; import lombok.Getter; import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.constants.Message; @@ -42,7 +41,6 @@ import java.util.stream.Collectors; * Abstract SubCommand class */ @Getter -@AllArgsConstructor public abstract class SubCommand { /** @@ -70,6 +68,14 @@ public abstract class SubCommand { */ private final Predicate isArgumentInvalid; + public SubCommand(String name, String description, String usage, Permission permission, Predicate isArgumentInvalid) { + this.name = name; + this.description = description; + this.permission = permission; + this.isArgumentInvalid = isArgumentInvalid; + this.usage = usage.replace("<", "&8<&7").replace(">", "&8>&7").replace("[", "&8[&7").replace("]", "&8]&7"); + } + /** * Called when this sub command is ran * @param plugin a link to the main plugin instance @@ -95,10 +101,9 @@ public abstract class SubCommand { /** * Send the command usage to a sender * @param sender the sender to send the usage to - * @param label the command label used */ - public void sendUsage(Sender sender, String label) { - Util.sendPluginMessage(sender, "&e-> &d" + String.format(getUsage(), label)); + public void sendUsage(Sender sender) { + Util.sendPluginMessage(sender, "&e-> &6" + getName() + (usage.isEmpty() ? "" : "&e - &7" + getUsage())); } /** diff --git a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupAddPrefix.java b/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupAddPrefix.java index d6b916c4b..d6696f322 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupAddPrefix.java +++ b/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupAddPrefix.java @@ -38,7 +38,7 @@ import java.util.List; public class GroupAddPrefix extends SubCommand { public GroupAddPrefix() { - super("addprefix", "Adds a prefix to the group", "/%s group addprefix [server] [world]", + super("addprefix", "Adds a prefix to the group", " [server] [world]", Permission.GROUP_ADDPREFIX, Predicate.notInRange(2, 4)); } diff --git a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupAddSuffix.java b/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupAddSuffix.java index c818e3d62..cb92e5252 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupAddSuffix.java +++ b/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupAddSuffix.java @@ -38,7 +38,7 @@ import java.util.List; public class GroupAddSuffix extends SubCommand { public GroupAddSuffix() { - super("addsuffix", "Adds a suffix to the group", "/%s group addsuffix [server] [world]", + super("addsuffix", "Adds a suffix to the group", " [server] [world]", Permission.GROUP_ADDSUFFIX, Predicate.notInRange(2, 4)); } diff --git a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupAddTempPrefix.java b/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupAddTempPrefix.java index c0943b3ad..0403956bb 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupAddTempPrefix.java +++ b/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupAddTempPrefix.java @@ -39,7 +39,7 @@ import java.util.List; public class GroupAddTempPrefix extends SubCommand { public GroupAddTempPrefix() { - super("addtempprefix", "Adds a prefix to the group temporarily", "/%s group addtempprefix [server] [world]", + super("addtempprefix", "Adds a prefix to the group temporarily", " [server] [world]", Permission.GROUP_ADD_TEMP_PREFIX, Predicate.notInRange(3, 5)); } diff --git a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupAddTempSuffix.java b/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupAddTempSuffix.java index c6c7b7d9b..c5fd5b60a 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupAddTempSuffix.java +++ b/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupAddTempSuffix.java @@ -39,7 +39,7 @@ import java.util.List; public class GroupAddTempSuffix extends SubCommand { public GroupAddTempSuffix() { - super("addtempsuffix", "Adds a suffix to the group temporarily", "/%s group addtempsuffix [server] [world]", + super("addtempsuffix", "Adds a suffix to the group temporarily", " [server] [world]", Permission.GROUP_ADD_TEMP_SUFFIX, Predicate.notInRange(3, 5)); } diff --git a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupChatMeta.java b/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupChatMeta.java index b09abc181..d13e76c76 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupChatMeta.java +++ b/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupChatMeta.java @@ -34,8 +34,7 @@ import java.util.*; public class GroupChatMeta extends SubCommand { public GroupChatMeta() { - super("chatmeta", "Displays a groups chat meta", "/%s group chatmeta", Permission.GROUP_CHATMETA, - Predicate.alwaysFalse()); + super("chatmeta", "Displays a groups chat meta", "", Permission.GROUP_CHATMETA, Predicate.alwaysFalse()); } @Override diff --git a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupClear.java b/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupClear.java index a3f357508..fd5a036de 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupClear.java +++ b/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupClear.java @@ -36,8 +36,7 @@ import java.util.List; public class GroupClear extends SubCommand { public GroupClear() { - super("clear", "Clears a groups permissions", "/%s group clear", Permission.GROUP_CLEAR, - Predicate.alwaysFalse()); + super("clear", "Clears a groups permissions", "", Permission.GROUP_CLEAR, Predicate.alwaysFalse()); } @Override diff --git a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupHasPerm.java b/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupHasPerm.java index a0498a413..9c4cac127 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupHasPerm.java +++ b/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupHasPerm.java @@ -33,9 +33,8 @@ import java.util.List; public class GroupHasPerm extends SubCommand { public GroupHasPerm() { - super("haspermission", "Checks to see if a group has a certain permission node", - "/%s group haspermission [server] [world]", Permission.GROUP_HASPERMISSION, - Predicate.notInRange(1, 3)); + super("haspermission", "Checks to see if a group has a certain permission node", " [server] [world]", + Permission.GROUP_HASPERMISSION, Predicate.notInRange(1, 3)); } @Override diff --git a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupInfo.java b/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupInfo.java index d707b8f5d..a2306d02c 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupInfo.java +++ b/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupInfo.java @@ -35,8 +35,7 @@ import java.util.List; public class GroupInfo extends SubCommand { public GroupInfo() { - super("info", "Gives info about the group", "/%s group info", Permission.GROUP_INFO, - Predicate.alwaysFalse()); + super("info", "Gives info about the group", "", Permission.GROUP_INFO, Predicate.alwaysFalse()); } @Override diff --git a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupInheritsPerm.java b/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupInheritsPerm.java index 5e1bc7799..fab0c609c 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupInheritsPerm.java +++ b/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupInheritsPerm.java @@ -33,9 +33,8 @@ import java.util.List; public class GroupInheritsPerm extends SubCommand { public GroupInheritsPerm() { - super("inheritspermission", "Checks to see if a group inherits a certain permission node", - "/%s group inheritspermission [server] [world]", Permission.GROUP_INHERITSPERMISSION, - Predicate.notInRange(1, 3)); + super("inheritspermission", "Checks to see if a group inherits a certain permission node", " [server] [world]", + Permission.GROUP_INHERITSPERMISSION, Predicate.notInRange(1, 3)); } @Override diff --git a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupListNodes.java b/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupListNodes.java index d653ab3a6..34ec81e70 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupListNodes.java +++ b/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupListNodes.java @@ -32,8 +32,7 @@ import java.util.List; public class GroupListNodes extends SubCommand { public GroupListNodes() { - super("listnodes", "Lists the permission nodes the group has", "/%s group listnodes", - Permission.GROUP_LISTNODES, Predicate.alwaysFalse()); + super("listnodes", "Lists the permission nodes the group has", "", Permission.GROUP_LISTNODES, Predicate.alwaysFalse()); } @Override diff --git a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupListParents.java b/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupListParents.java index 354b2ea22..7d9a175fb 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupListParents.java +++ b/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupListParents.java @@ -32,8 +32,7 @@ import java.util.List; public class GroupListParents extends SubCommand { public GroupListParents() { - super("listparents", "Lists the groups that this group inherits from", "/%s group listparents", - Permission.GROUP_LISTPARENTS, Predicate.alwaysFalse()); + super("listparents", "Lists the groups that this group inherits from", "", Permission.GROUP_LISTPARENTS, Predicate.alwaysFalse()); } @Override diff --git a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupRemovePrefix.java b/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupRemovePrefix.java index 368c59f04..b663a4639 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupRemovePrefix.java +++ b/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupRemovePrefix.java @@ -38,7 +38,7 @@ import java.util.List; public class GroupRemovePrefix extends SubCommand { public GroupRemovePrefix() { - super("removeprefix", "Removes a prefix from a group", "/%s group removeprefix [server] [world]", + super("removeprefix", "Removes a prefix from a group", " [server] [world]", Permission.GROUP_REMOVEPREFIX, Predicate.notInRange(2, 4)); } diff --git a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupRemoveSuffix.java b/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupRemoveSuffix.java index 36f88130d..0578154ff 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupRemoveSuffix.java +++ b/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupRemoveSuffix.java @@ -38,7 +38,7 @@ import java.util.List; public class GroupRemoveSuffix extends SubCommand { public GroupRemoveSuffix() { - super("removesuffix", "Removes a suffix from a group", "/%s group removesuffix [server] [world]", + super("removesuffix", "Removes a suffix from a group", " [server] [world]", Permission.GROUP_REMOVESUFFIX, Predicate.notInRange(2, 4)); } diff --git a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupRemoveTempPrefix.java b/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupRemoveTempPrefix.java index 2efd839bb..f1f17c67c 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupRemoveTempPrefix.java +++ b/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupRemoveTempPrefix.java @@ -38,7 +38,7 @@ import java.util.List; public class GroupRemoveTempPrefix extends SubCommand { public GroupRemoveTempPrefix() { - super("removetempprefix", "Removes a temporary prefix from a group", "/%s group removetempprefix [server] [world]", + super("removetempprefix", "Removes a temporary prefix from a group", " [server] [world]", Permission.GROUP_REMOVE_TEMP_PREFIX, Predicate.notInRange(2, 4)); } diff --git a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupRemoveTempSuffix.java b/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupRemoveTempSuffix.java index 95454bf7f..1eb4634bf 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupRemoveTempSuffix.java +++ b/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupRemoveTempSuffix.java @@ -38,7 +38,7 @@ import java.util.List; public class GroupRemoveTempSuffix extends SubCommand { public GroupRemoveTempSuffix() { - super("removetempsuffix", "Removes a temporary suffix from a group", "/%s group removetempsuffix [server] [world]", + super("removetempsuffix", "Removes a temporary suffix from a group", " [server] [world]", Permission.GROUP_REMOVE_TEMP_SUFFIX, Predicate.notInRange(2, 4)); } diff --git a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupRename.java b/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupRename.java index a5b2c53ce..f09dce08d 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupRename.java +++ b/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupRename.java @@ -37,8 +37,7 @@ import java.util.List; public class GroupRename extends SubCommand { public GroupRename() { - super("rename", "Rename this group", "/%s group rename ", - Permission.TRACK_APPEND, Predicate.not(1)); + super("rename", "Rename this group", "", Permission.TRACK_APPEND, Predicate.not(1)); } @Override diff --git a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupSetInherit.java b/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupSetInherit.java index 3c151f08f..381f7d52b 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupSetInherit.java +++ b/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupSetInherit.java @@ -38,9 +38,8 @@ import java.util.List; public class GroupSetInherit extends SubCommand { public GroupSetInherit() { - super("setinherit", "Sets another group for this group to inherit permissions from", - "/%s group setinherit [server] [world]", Permission.GROUP_SETINHERIT, - Predicate.notInRange(1, 3)); + super("setinherit", "Sets another group for this group to inherit permissions from", " [server] [world]", + Permission.GROUP_SETINHERIT, Predicate.notInRange(1, 3)); } @Override @@ -48,7 +47,7 @@ public class GroupSetInherit extends SubCommand { String groupName = args.get(0).toLowerCase(); if (ArgumentChecker.checkNode(groupName)) { - sendUsage(sender, label); + sendUsage(sender); return CommandResult.INVALID_ARGS; } diff --git a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupSetPermission.java b/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupSetPermission.java index c75efe9f4..75fb76db1 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupSetPermission.java +++ b/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupSetPermission.java @@ -38,8 +38,8 @@ import java.util.List; public class GroupSetPermission extends SubCommand { public GroupSetPermission() { - super("set", "Sets a permission for a group", "/%s group set [server] [world]", - Permission.GROUP_SETPERMISSION, Predicate.notInRange(2, 4)); + super("set", "Sets a permission for a group", " [server] [world]", Permission.GROUP_SETPERMISSION, + Predicate.notInRange(2, 4)); } @Override @@ -48,7 +48,7 @@ public class GroupSetPermission extends SubCommand { String bool = args.get(1).toLowerCase(); if (ArgumentChecker.checkNode(node)) { - sendUsage(sender, label); + sendUsage(sender); return CommandResult.INVALID_ARGS; } @@ -58,7 +58,7 @@ public class GroupSetPermission extends SubCommand { } if (!bool.equalsIgnoreCase("true") && !bool.equalsIgnoreCase("false")) { - sendUsage(sender, label); + sendUsage(sender); return CommandResult.INVALID_ARGS; } diff --git a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupSetTempInherit.java b/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupSetTempInherit.java index 2c4e48172..798fa37e9 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupSetTempInherit.java +++ b/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupSetTempInherit.java @@ -40,8 +40,7 @@ import java.util.List; public class GroupSetTempInherit extends SubCommand { public GroupSetTempInherit() { super("settempinherit", "Sets another group for this group to inherit permissions from temporarily", - "/%s group settempinherit [server] [world]", - Permission.GROUP_SET_TEMP_INHERIT, Predicate.notInRange(2, 4)); + " [server] [world]", Permission.GROUP_SET_TEMP_INHERIT, Predicate.notInRange(2, 4)); } @Override @@ -49,7 +48,7 @@ public class GroupSetTempInherit extends SubCommand { String groupName = args.get(0).toLowerCase(); if (ArgumentChecker.checkNode(groupName)) { - sendUsage(sender, label); + sendUsage(sender); return CommandResult.INVALID_ARGS; } diff --git a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupSetTempPermission.java b/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupSetTempPermission.java index 6dfe81c12..a4bc2beb4 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupSetTempPermission.java +++ b/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupSetTempPermission.java @@ -39,8 +39,7 @@ import java.util.List; public class GroupSetTempPermission extends SubCommand { public GroupSetTempPermission() { - super("settemp", "Sets a temporary permission for a group", - "/%s group settemp [server] [world]", + super("settemp", "Sets a temporary permission for a group", " [server] [world]", Permission.GROUP_SET_TEMP_PERMISSION, Predicate.notInRange(3, 5)); } @@ -50,7 +49,7 @@ public class GroupSetTempPermission extends SubCommand { String bool = args.get(1).toLowerCase(); if (ArgumentChecker.checkNode(node)) { - sendUsage(sender, label); + sendUsage(sender); return CommandResult.INVALID_ARGS; } @@ -60,7 +59,7 @@ public class GroupSetTempPermission extends SubCommand { } if (!bool.equalsIgnoreCase("true") && !bool.equalsIgnoreCase("false")) { - sendUsage(sender, label); + sendUsage(sender); return CommandResult.INVALID_ARGS; } diff --git a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupShowTracks.java b/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupShowTracks.java index 39cdd9cc4..e3713e56f 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupShowTracks.java +++ b/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupShowTracks.java @@ -34,8 +34,7 @@ import java.util.stream.Collectors; public class GroupShowTracks extends SubCommand { public GroupShowTracks() { - super("showtracks", "Lists the tracks that this group features on", "/%s group showtracks", - Permission.GROUP_SHOWTRACKS, Predicate.alwaysFalse()); + super("showtracks", "Lists the tracks that this group features on", "", Permission.GROUP_SHOWTRACKS, Predicate.alwaysFalse()); } @Override diff --git a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupUnSetPermission.java b/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupUnSetPermission.java index 7b44299b0..b198d48a7 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupUnSetPermission.java +++ b/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupUnSetPermission.java @@ -38,8 +38,8 @@ import java.util.List; public class GroupUnSetPermission extends SubCommand { public GroupUnSetPermission() { - super("unset", "Unsets a permission for a group", "/%s group unset [server] [world]", - Permission.GROUP_UNSETPERMISSION, Predicate.notInRange(1, 3)); + super("unset", "Unsets a permission for a group", " [server] [world]", Permission.GROUP_UNSETPERMISSION, + Predicate.notInRange(1, 3)); } @Override @@ -47,7 +47,7 @@ public class GroupUnSetPermission extends SubCommand { String node = args.get(0).replace("{SPACE}", " "); if (ArgumentChecker.checkNode(node)) { - sendUsage(sender, label); + sendUsage(sender); return CommandResult.INVALID_ARGS; } diff --git a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupUnsetInherit.java b/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupUnsetInherit.java index 5d38976ff..efa65f73d 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupUnsetInherit.java +++ b/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupUnsetInherit.java @@ -39,8 +39,7 @@ import java.util.List; public class GroupUnsetInherit extends SubCommand { public GroupUnsetInherit() { super("unsetinherit", "Unsets another group for this group to inherit permissions from", - "/%s group unsetinherit [server] [world]", Permission.GROUP_UNSETINHERIT, - Predicate.notInRange(1, 3)); + " [server] [world]", Permission.GROUP_UNSETINHERIT, Predicate.notInRange(1, 3)); } @Override @@ -48,7 +47,7 @@ public class GroupUnsetInherit extends SubCommand { String groupName = args.get(0).toLowerCase(); if (ArgumentChecker.checkNode(groupName)) { - sendUsage(sender, label); + sendUsage(sender); return CommandResult.INVALID_ARGS; } diff --git a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupUnsetTempInherit.java b/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupUnsetTempInherit.java index ee44f9864..09bb0f594 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupUnsetTempInherit.java +++ b/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupUnsetTempInherit.java @@ -39,8 +39,7 @@ import java.util.List; public class GroupUnsetTempInherit extends SubCommand { public GroupUnsetTempInherit() { super("unsettempinherit", "Unsets another group for this group to inherit permissions from", - "/%s group unsettempinherit [server] [world]", Permission.GROUP_UNSET_TEMP_INHERIT, - Predicate.notInRange(1, 3)); + " [server] [world]", Permission.GROUP_UNSET_TEMP_INHERIT, Predicate.notInRange(1, 3)); } @Override @@ -48,7 +47,7 @@ public class GroupUnsetTempInherit extends SubCommand { String groupName = args.get(0).toLowerCase(); if (ArgumentChecker.checkNode(groupName)) { - sendUsage(sender, label); + sendUsage(sender); return CommandResult.INVALID_ARGS; } diff --git a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupUnsetTempPermission.java b/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupUnsetTempPermission.java index ec1ca4532..9a51d8726 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupUnsetTempPermission.java +++ b/common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupUnsetTempPermission.java @@ -38,9 +38,8 @@ import java.util.List; public class GroupUnsetTempPermission extends SubCommand { public GroupUnsetTempPermission() { - super("unsettemp", "Unsets a temporary permission for a group", - "/%s group unsettemp [server] [world]", Permission.GROUP_UNSET_TEMP_PERMISSION, - Predicate.notInRange(1, 3)); + super("unsettemp", "Unsets a temporary permission for a group", " [server] [world]", + Permission.GROUP_UNSET_TEMP_PERMISSION, Predicate.notInRange(1, 3)); } @Override @@ -48,7 +47,7 @@ public class GroupUnsetTempPermission extends SubCommand { String node = args.get(0).replace("{SPACE}", " "); if (ArgumentChecker.checkNode(node)) { - sendUsage(sender, label); + sendUsage(sender); return CommandResult.INVALID_ARGS; } diff --git a/common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogExport.java b/common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogExport.java index 272248dfb..3d5fc831a 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogExport.java +++ b/common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogExport.java @@ -41,7 +41,7 @@ import java.util.List; public class LogExport extends SubCommand { public LogExport() { - super("export", "Export the log to a file", "/%s log export ", Permission.LOG_EXPORT, Predicate.not(1)); + super("export", "Export the log to a file", "", Permission.LOG_EXPORT, Predicate.not(1)); } @Override diff --git a/common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogGroupHistory.java b/common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogGroupHistory.java index 432847144..e53976aec 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogGroupHistory.java +++ b/common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogGroupHistory.java @@ -40,7 +40,7 @@ import java.util.SortedMap; public class LogGroupHistory extends SubCommand { public LogGroupHistory() { - super("grouphistory", "View an objects history", "/%s log grouphistory [page]", Permission.LOG_GROUP_HISTORY, + super("grouphistory", "View an objects history", " [page]", Permission.LOG_GROUP_HISTORY, Predicate.notInRange(1, 2)); } diff --git a/common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogNotify.java b/common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogNotify.java index bb2072995..c531bd0a2 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogNotify.java +++ b/common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogNotify.java @@ -37,8 +37,7 @@ import java.util.UUID; public class LogNotify extends SubCommand { public LogNotify() { - super("notify", "Toggle notifications", "/%s log notify [on|off]", Permission.LOG_NOTIFY, - Predicate.notInRange(0, 1)); + super("notify", "Toggle notifications", "[on|off]", Permission.LOG_NOTIFY, Predicate.notInRange(0, 1)); } @Override diff --git a/common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogRecent.java b/common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogRecent.java index a3276791d..fbf0e8c45 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogRecent.java +++ b/common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogRecent.java @@ -38,8 +38,7 @@ import java.util.UUID; public class LogRecent extends SubCommand { public LogRecent() { - super("recent", "View recent actions", "/%s log recent [user] [page]", Permission.LOG_RECENT, - Predicate.notInRange(0, 2)); + super("recent", "View recent actions", "[user] [page]", Permission.LOG_RECENT, Predicate.notInRange(0, 2)); } @Override diff --git a/common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogSearch.java b/common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogSearch.java index b9e16f7be..80059f2b6 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogSearch.java +++ b/common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogSearch.java @@ -40,8 +40,7 @@ import java.util.stream.Collectors; public class LogSearch extends SubCommand { public LogSearch() { - super("search", "Search the log for an entry", "/%s log search [page]", Permission.LOG_SEARCH, - Predicate.is(0)); + super("search", "Search the log for an entry", " [page]", Permission.LOG_SEARCH, Predicate.is(0)); } @Override diff --git a/common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogTrackHistory.java b/common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogTrackHistory.java index d4b8b8dae..415b0c1eb 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogTrackHistory.java +++ b/common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogTrackHistory.java @@ -40,8 +40,7 @@ import java.util.SortedMap; public class LogTrackHistory extends SubCommand { public LogTrackHistory() { - super("trackhistory", "View an objects history", "/%s log trackhistory [page]", Permission.LOG_TRACK_HISTORY, - Predicate.notInRange(1, 2)); + super("trackhistory", "View an objects history", " [page]", Permission.LOG_TRACK_HISTORY, Predicate.notInRange(1, 2)); } @Override diff --git a/common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogUserHistory.java b/common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogUserHistory.java index 5d0ff6aad..78d826178 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogUserHistory.java +++ b/common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogUserHistory.java @@ -38,8 +38,7 @@ import java.util.UUID; public class LogUserHistory extends SubCommand { public LogUserHistory() { - super("userhistory", "View an objects history", "/%s log userhistory [page]", Permission.LOG_USER_HISTORY, - Predicate.notInRange(1, 2)); + super("userhistory", "View an objects history", " [page]", Permission.LOG_USER_HISTORY, Predicate.notInRange(1, 2)); } @Override diff --git a/common/src/main/java/me/lucko/luckperms/commands/migration/subcommands/MigrationBPermissions.java b/common/src/main/java/me/lucko/luckperms/commands/migration/subcommands/MigrationBPermissions.java index d2d01bc8e..51777b8ce 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/migration/subcommands/MigrationBPermissions.java +++ b/common/src/main/java/me/lucko/luckperms/commands/migration/subcommands/MigrationBPermissions.java @@ -82,7 +82,7 @@ public class MigrationBPermissions extends SubCommand { } public MigrationBPermissions() { - super("bpermissions", "Migration from bPermissions", "/%s migration bpermissions", MIGRATION, Predicate.alwaysFalse()); + super("bpermissions", "Migration from bPermissions", "", MIGRATION, Predicate.alwaysFalse()); } @Override diff --git a/common/src/main/java/me/lucko/luckperms/commands/migration/subcommands/MigrationBungeePerms.java b/common/src/main/java/me/lucko/luckperms/commands/migration/subcommands/MigrationBungeePerms.java index e996179a8..f35127c8d 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/migration/subcommands/MigrationBungeePerms.java +++ b/common/src/main/java/me/lucko/luckperms/commands/migration/subcommands/MigrationBungeePerms.java @@ -43,8 +43,7 @@ import java.util.Map; */ public class MigrationBungeePerms extends SubCommand { public MigrationBungeePerms() { - super("bungeeperms", "Migration from BungeePerms", "/%s migration bungeeperms", - Permission.MIGRATION, Predicate.alwaysFalse()); + super("bungeeperms", "Migration from BungeePerms", "", Permission.MIGRATION, Predicate.alwaysFalse()); } @Override diff --git a/common/src/main/java/me/lucko/luckperms/commands/migration/subcommands/MigrationGroupManager.java b/common/src/main/java/me/lucko/luckperms/commands/migration/subcommands/MigrationGroupManager.java index cf7cce890..4a2e19353 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/migration/subcommands/MigrationGroupManager.java +++ b/common/src/main/java/me/lucko/luckperms/commands/migration/subcommands/MigrationGroupManager.java @@ -45,8 +45,7 @@ import java.util.stream.Collectors; public class MigrationGroupManager extends SubCommand { public MigrationGroupManager() { - super("groupmanager", "Migration from GroupManager", "/%s migration groupmanager [world names]", - Permission.MIGRATION, Predicate.is(0)); + super("groupmanager", "Migration from GroupManager", "[world names...]", Permission.MIGRATION, Predicate.is(0)); } @Override diff --git a/common/src/main/java/me/lucko/luckperms/commands/migration/subcommands/MigrationPermissionsEx.java b/common/src/main/java/me/lucko/luckperms/commands/migration/subcommands/MigrationPermissionsEx.java index 1e7ad3490..559709401 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/migration/subcommands/MigrationPermissionsEx.java +++ b/common/src/main/java/me/lucko/luckperms/commands/migration/subcommands/MigrationPermissionsEx.java @@ -50,8 +50,7 @@ import java.util.stream.Collectors; public class MigrationPermissionsEx extends SubCommand { public MigrationPermissionsEx() { - super("permissionsex", "Migration from PermissionsEx", "/%s migration permissionsex [world names]", - Permission.MIGRATION, Predicate.alwaysFalse()); + super("permissionsex", "Migration from PermissionsEx", "[world names...]", Permission.MIGRATION, Predicate.alwaysFalse()); } @SuppressWarnings("deprecation") diff --git a/common/src/main/java/me/lucko/luckperms/commands/migration/subcommands/MigrationPowerfulPerms.java b/common/src/main/java/me/lucko/luckperms/commands/migration/subcommands/MigrationPowerfulPerms.java index 482f78527..22e666205 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/migration/subcommands/MigrationPowerfulPerms.java +++ b/common/src/main/java/me/lucko/luckperms/commands/migration/subcommands/MigrationPowerfulPerms.java @@ -119,8 +119,8 @@ public class MigrationPowerfulPerms extends SubCommand { public MigrationPowerfulPerms() { - super("powerfulperms", "Migration from PowerfulPerms", - "/%s migration powerfulperms
", MIGRATION, Predicate.not(5)); + super("powerfulperms", "Migration from PowerfulPerms", "
", + MIGRATION, Predicate.not(5)); } @Override diff --git a/common/src/main/java/me/lucko/luckperms/commands/migration/subcommands/MigrationZPermissions.java b/common/src/main/java/me/lucko/luckperms/commands/migration/subcommands/MigrationZPermissions.java index 72eeb0606..a335dba20 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/migration/subcommands/MigrationZPermissions.java +++ b/common/src/main/java/me/lucko/luckperms/commands/migration/subcommands/MigrationZPermissions.java @@ -49,8 +49,7 @@ import java.util.stream.Collectors; */ public class MigrationZPermissions extends SubCommand { public MigrationZPermissions() { - super("zpermissions", "Migration from zPermissions", "/%s migration zpermissions [world names]", - Permission.MIGRATION, Predicate.alwaysFalse()); + super("zpermissions", "Migration from zPermissions", "[world names...]", Permission.MIGRATION, Predicate.alwaysFalse()); } @Override diff --git a/common/src/main/java/me/lucko/luckperms/commands/track/subcommands/TrackAppend.java b/common/src/main/java/me/lucko/luckperms/commands/track/subcommands/TrackAppend.java index e2ffe24cb..38dc051d1 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/track/subcommands/TrackAppend.java +++ b/common/src/main/java/me/lucko/luckperms/commands/track/subcommands/TrackAppend.java @@ -36,8 +36,7 @@ import java.util.List; public class TrackAppend extends SubCommand { public TrackAppend() { - super("append", "Appends a group onto the end of the track", "/%s track append ", - Permission.TRACK_APPEND, Predicate.not(1)); + super("append", "Appends a group onto the end of the track", "", Permission.TRACK_APPEND, Predicate.not(1)); } @Override @@ -45,7 +44,7 @@ public class TrackAppend extends SubCommand { String groupName = args.get(0).toLowerCase(); if (ArgumentChecker.checkNode(groupName)) { - sendUsage(sender, label); + sendUsage(sender); return CommandResult.INVALID_ARGS; } diff --git a/common/src/main/java/me/lucko/luckperms/commands/track/subcommands/TrackClear.java b/common/src/main/java/me/lucko/luckperms/commands/track/subcommands/TrackClear.java index 8e89952df..50f33a464 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/track/subcommands/TrackClear.java +++ b/common/src/main/java/me/lucko/luckperms/commands/track/subcommands/TrackClear.java @@ -36,8 +36,7 @@ import java.util.List; public class TrackClear extends SubCommand { public TrackClear() { - super("clear", "Clears the groups on the track", "/%s track clear", Permission.TRACK_CLEAR, - Predicate.alwaysFalse()); + super("clear", "Clears the groups on the track", "", Permission.TRACK_CLEAR, Predicate.alwaysFalse()); } @Override diff --git a/common/src/main/java/me/lucko/luckperms/commands/track/subcommands/TrackInfo.java b/common/src/main/java/me/lucko/luckperms/commands/track/subcommands/TrackInfo.java index 1b9cf07e3..d122f00ce 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/track/subcommands/TrackInfo.java +++ b/common/src/main/java/me/lucko/luckperms/commands/track/subcommands/TrackInfo.java @@ -32,8 +32,7 @@ import java.util.List; public class TrackInfo extends SubCommand { public TrackInfo() { - super("info", "Gives info about the track", "/%s track info", Permission.TRACK_INFO, - Predicate.alwaysFalse()); + super("info", "Gives info about the track", "", Permission.TRACK_INFO, Predicate.alwaysFalse()); } @Override diff --git a/common/src/main/java/me/lucko/luckperms/commands/track/subcommands/TrackInsert.java b/common/src/main/java/me/lucko/luckperms/commands/track/subcommands/TrackInsert.java index e3bbd3214..32dac8fa2 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/track/subcommands/TrackInsert.java +++ b/common/src/main/java/me/lucko/luckperms/commands/track/subcommands/TrackInsert.java @@ -36,8 +36,8 @@ import java.util.List; public class TrackInsert extends SubCommand { public TrackInsert() { - super("insert", "Inserts a group at a given position along the track", - "/%s track insert ", Permission.TRACK_INSERT, Predicate.not(2)); + super("insert", "Inserts a group at a given position along the track", " ", + Permission.TRACK_INSERT, Predicate.not(2)); } @Override @@ -45,7 +45,7 @@ public class TrackInsert extends SubCommand { String groupName = args.get(0).toLowerCase(); if (ArgumentChecker.checkNode(groupName)) { - sendUsage(sender, label); + sendUsage(sender); return CommandResult.INVALID_ARGS; } diff --git a/common/src/main/java/me/lucko/luckperms/commands/track/subcommands/TrackRemove.java b/common/src/main/java/me/lucko/luckperms/commands/track/subcommands/TrackRemove.java index 061f19265..5e652e080 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/track/subcommands/TrackRemove.java +++ b/common/src/main/java/me/lucko/luckperms/commands/track/subcommands/TrackRemove.java @@ -35,8 +35,7 @@ import java.util.List; public class TrackRemove extends SubCommand { public TrackRemove() { - super("remove", "Removes a group from the track", "/%s track remove ", Permission.TRACK_REMOVE, - Predicate.not(1)); + super("remove", "Removes a group from the track", "", Permission.TRACK_REMOVE, Predicate.not(1)); } @Override @@ -44,7 +43,7 @@ public class TrackRemove extends SubCommand { String groupName = args.get(0).toLowerCase(); if (ArgumentChecker.checkNode(groupName)) { - sendUsage(sender, label); + sendUsage(sender); return CommandResult.INVALID_ARGS; } diff --git a/common/src/main/java/me/lucko/luckperms/commands/track/subcommands/TrackRename.java b/common/src/main/java/me/lucko/luckperms/commands/track/subcommands/TrackRename.java index 733acffcb..0e0b1f5e5 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/track/subcommands/TrackRename.java +++ b/common/src/main/java/me/lucko/luckperms/commands/track/subcommands/TrackRename.java @@ -37,8 +37,7 @@ import java.util.List; public class TrackRename extends SubCommand { public TrackRename() { - super("rename", "Rename this track", "/%s track rename ", - Permission.TRACK_APPEND, Predicate.not(1)); + super("rename", "Rename this track", "", Permission.TRACK_APPEND, Predicate.not(1)); } @Override diff --git a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserAddGroup.java b/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserAddGroup.java index ff74ed433..a30128bcd 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserAddGroup.java +++ b/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserAddGroup.java @@ -39,8 +39,7 @@ import java.util.List; public class UserAddGroup extends SubCommand { public UserAddGroup() { - super("addgroup", "Adds the user to a group", "/%s user addgroup [server] [world]", - Permission.USER_ADDGROUP, Predicate.notInRange(1, 3)); + super("addgroup", "Adds the user to a group", " [server] [world]", Permission.USER_ADDGROUP, Predicate.notInRange(1, 3)); } @Override @@ -48,7 +47,7 @@ public class UserAddGroup extends SubCommand { String groupName = args.get(0).toLowerCase(); if (ArgumentChecker.checkNode(groupName)) { - sendUsage(sender, label); + sendUsage(sender); return CommandResult.INVALID_ARGS; } diff --git a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserAddPrefix.java b/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserAddPrefix.java index 3a9d0b17a..76138d944 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserAddPrefix.java +++ b/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserAddPrefix.java @@ -38,8 +38,8 @@ import java.util.List; public class UserAddPrefix extends SubCommand { public UserAddPrefix() { - super("addprefix", "Adds a prefix to the user", "/%s user addprefix [server] [world]", - Permission.USER_ADDPREFIX, Predicate.notInRange(2, 4)); + super("addprefix", "Adds a prefix to the user", " [server] [world]", Permission.USER_ADDPREFIX, + Predicate.notInRange(2, 4)); } @Override diff --git a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserAddSuffix.java b/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserAddSuffix.java index 45f969b5c..0438ceb15 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserAddSuffix.java +++ b/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserAddSuffix.java @@ -38,8 +38,8 @@ import java.util.List; public class UserAddSuffix extends SubCommand { public UserAddSuffix() { - super("addsuffix", "Adds a suffix to the user", "/%s user addsuffix [server] [world]", - Permission.USER_ADDSUFFIX, Predicate.notInRange(2, 4)); + super("addsuffix", "Adds a suffix to the user", " [server] [world]", Permission.USER_ADDSUFFIX, + Predicate.notInRange(2, 4)); } @Override diff --git a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserAddTempGroup.java b/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserAddTempGroup.java index d0f69142f..a38830f61 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserAddTempGroup.java +++ b/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserAddTempGroup.java @@ -40,9 +40,8 @@ import java.util.List; public class UserAddTempGroup extends SubCommand { public UserAddTempGroup() { - super("addtempgroup", "Adds the user to a group temporarily", - "/%s user addtempgroup [server] [world]", Permission.USER_ADDTEMPGROUP, - Predicate.notInRange(2, 4)); + super("addtempgroup", "Adds the user to a group temporarily", " [server] [world]", + Permission.USER_ADDTEMPGROUP, Predicate.notInRange(2, 4)); } @Override @@ -50,7 +49,7 @@ public class UserAddTempGroup extends SubCommand { String groupName = args.get(0).toLowerCase(); if (ArgumentChecker.checkNode(groupName)) { - sendUsage(sender, label); + sendUsage(sender); return CommandResult.INVALID_ARGS; } diff --git a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserAddTempPrefix.java b/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserAddTempPrefix.java index 4a3ea2353..351678e88 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserAddTempPrefix.java +++ b/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserAddTempPrefix.java @@ -39,7 +39,7 @@ import java.util.List; public class UserAddTempPrefix extends SubCommand { public UserAddTempPrefix() { - super("addtempprefix", "Adds a prefix to the user temporarily", "/%s user addtempprefix [server] [world]", + super("addtempprefix", "Adds a prefix to the user temporarily", " [server] [world]", Permission.USER_ADD_TEMP_PREFIX, Predicate.notInRange(3, 5)); } diff --git a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserAddTempSuffix.java b/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserAddTempSuffix.java index 4f4a162c0..fff297619 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserAddTempSuffix.java +++ b/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserAddTempSuffix.java @@ -39,7 +39,7 @@ import java.util.List; public class UserAddTempSuffix extends SubCommand { public UserAddTempSuffix() { - super("addtempsuffix", "Adds a suffix to the user temporarily", "/%s user addtempsuffix [server] [world]", + super("addtempsuffix", "Adds a suffix to the user temporarily", " [server] [world]", Permission.USER_ADD_TEMP_SUFFIX, Predicate.notInRange(3, 5)); } diff --git a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserChatMeta.java b/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserChatMeta.java index e77f50e33..d56ff0d12 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserChatMeta.java +++ b/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserChatMeta.java @@ -38,8 +38,7 @@ import java.util.TreeSet; public class UserChatMeta extends SubCommand { public UserChatMeta() { - super("chatmeta", "Displays a users chat meta", "/%s user chatmeta", Permission.USER_CHATMETA, - Predicate.alwaysFalse()); + super("chatmeta", "Displays a users chat meta", "", Permission.USER_CHATMETA, Predicate.alwaysFalse()); } @Override diff --git a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserClear.java b/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserClear.java index 4a72f3d83..0290d335e 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserClear.java +++ b/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserClear.java @@ -36,8 +36,7 @@ import java.util.List; public class UserClear extends SubCommand { public UserClear() { - super("clear", "Clears a users permissions and groups", "/%s user clear", Permission.USER_CLEAR, - Predicate.alwaysFalse()); + super("clear", "Clears a users permissions and groups", "", Permission.USER_CLEAR, Predicate.alwaysFalse()); } @Override diff --git a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserDemote.java b/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserDemote.java index c31cf950a..bf3ea0da2 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserDemote.java +++ b/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserDemote.java @@ -41,8 +41,7 @@ import java.util.List; public class UserDemote extends SubCommand { public UserDemote() { - super("demote", "Demotes a user along a track", "/%s user demote ", Permission.USER_DEMOTE, - Predicate.not(1)); + super("demote", "Demotes a user along a track", "", Permission.USER_DEMOTE, Predicate.not(1)); } @Override diff --git a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserGetUUID.java b/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserGetUUID.java index 76cc15c73..b0705dba9 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserGetUUID.java +++ b/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserGetUUID.java @@ -35,8 +35,7 @@ import java.util.List; public class UserGetUUID extends SubCommand { public UserGetUUID() { - super("getuuid", "Get the UUID of a user", "/%s user getuuid", Permission.USER_GETUUID, - Predicate.alwaysFalse()); + super("getuuid", "Get the UUID of a user", "", Permission.USER_GETUUID, Predicate.alwaysFalse()); } @Override diff --git a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserHasPerm.java b/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserHasPerm.java index 8f7833427..454cd8f23 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserHasPerm.java +++ b/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserHasPerm.java @@ -33,9 +33,8 @@ import java.util.List; public class UserHasPerm extends SubCommand { public UserHasPerm() { - super("haspermission", "Checks to see if a user has a certain permission node", - "/%s user haspermission [server] [world]", Permission.USER_HASPERMISSION, - Predicate.notInRange(1, 3)); + super("haspermission", "Checks to see if a user has a certain permission node", " [server] [world]", + Permission.USER_HASPERMISSION, Predicate.notInRange(1, 3)); } @Override diff --git a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserInfo.java b/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserInfo.java index ec4735b4e..0a5562131 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserInfo.java +++ b/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserInfo.java @@ -35,7 +35,7 @@ import java.util.List; public class UserInfo extends SubCommand { public UserInfo() { - super("info", "Gives info about the user", "/%s user info", Permission.USER_INFO, Predicate.alwaysFalse()); + super("info", "Gives info about the user", "", Permission.USER_INFO, Predicate.alwaysFalse()); } @Override diff --git a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserInheritsPerm.java b/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserInheritsPerm.java index c875e86d5..77596889a 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserInheritsPerm.java +++ b/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserInheritsPerm.java @@ -34,8 +34,7 @@ import java.util.List; public class UserInheritsPerm extends SubCommand { public UserInheritsPerm() { super("inheritspermission", "Checks to see if a user inherits a certain permission node", - "/%s user inheritspermission [server] [world]", Permission.USER_INHERITSPERMISSION, - Predicate.notInRange(1, 3)); + " [server] [world]", Permission.USER_INHERITSPERMISSION, Predicate.notInRange(1, 3)); } @Override diff --git a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserListGroups.java b/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserListGroups.java index 18207ae40..b0d1dbc4e 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserListGroups.java +++ b/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserListGroups.java @@ -32,8 +32,7 @@ import java.util.List; public class UserListGroups extends SubCommand { public UserListGroups() { - super("listgroups", "Lists the groups a user is in", "/%s user listgroups", - Permission.USER_LISTGROUPS, Predicate.alwaysFalse()); + super("listgroups", "Lists the groups a user is in", "", Permission.USER_LISTGROUPS, Predicate.alwaysFalse()); } @Override diff --git a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserListNodes.java b/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserListNodes.java index 8d34d0dc3..f79dbee14 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserListNodes.java +++ b/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserListNodes.java @@ -32,8 +32,7 @@ import java.util.List; public class UserListNodes extends SubCommand { public UserListNodes() { - super("listnodes", "Lists the permission nodes the user has", "/%s user listnodes", - Permission.USER_LISTNODES, Predicate.alwaysFalse()); + super("listnodes", "Lists the permission nodes the user has", "", Permission.USER_LISTNODES, Predicate.alwaysFalse()); } @Override diff --git a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserPromote.java b/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserPromote.java index 549edd165..2c68c1afe 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserPromote.java +++ b/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserPromote.java @@ -41,8 +41,7 @@ import java.util.List; public class UserPromote extends SubCommand { public UserPromote() { - super("promote", "Promotes the user along a track", "/%s user promote ", Permission.USER_PROMOTE, - Predicate.not(1)); + super("promote", "Promotes the user along a track", "", Permission.USER_PROMOTE, Predicate.not(1)); } @Override diff --git a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserRemoveGroup.java b/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserRemoveGroup.java index c3342a672..930fb4e5a 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserRemoveGroup.java +++ b/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserRemoveGroup.java @@ -38,8 +38,8 @@ import java.util.List; public class UserRemoveGroup extends SubCommand { public UserRemoveGroup() { - super("removegroup", "Removes a user from a group", "/%s user removegroup [server] [world]", - Permission.USER_REMOVEGROUP, Predicate.notInRange(1, 3)); + super("removegroup", "Removes a user from a group", " [server] [world]", Permission.USER_REMOVEGROUP, + Predicate.notInRange(1, 3)); } @Override @@ -47,7 +47,7 @@ public class UserRemoveGroup extends SubCommand { String groupName = args.get(0).toLowerCase(); if (ArgumentChecker.checkNode(groupName)) { - sendUsage(sender, label); + sendUsage(sender); return CommandResult.INVALID_ARGS; } diff --git a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserRemovePrefix.java b/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserRemovePrefix.java index 20713ce8f..e6acb808a 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserRemovePrefix.java +++ b/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserRemovePrefix.java @@ -38,7 +38,7 @@ import java.util.List; public class UserRemovePrefix extends SubCommand { public UserRemovePrefix() { - super("removeprefix", "Removes a prefix from a user", "/%s user removeprefix [server] [world]", + super("removeprefix", "Removes a prefix from a user", " [server] [world]", Permission.USER_REMOVEPREFIX, Predicate.notInRange(2, 4)); } diff --git a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserRemoveSuffix.java b/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserRemoveSuffix.java index 92ebaab17..9cee183f6 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserRemoveSuffix.java +++ b/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserRemoveSuffix.java @@ -38,7 +38,7 @@ import java.util.List; public class UserRemoveSuffix extends SubCommand { public UserRemoveSuffix() { - super("removesuffix", "Removes a suffix from a user", "/%s user removesuffix [server] [world]", + super("removesuffix", "Removes a suffix from a user", " [server] [world]", Permission.USER_REMOVESUFFIX, Predicate.notInRange(2, 4)); } diff --git a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserRemoveTempGroup.java b/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserRemoveTempGroup.java index a64a7174e..ff2140d68 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserRemoveTempGroup.java +++ b/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserRemoveTempGroup.java @@ -38,9 +38,8 @@ import java.util.List; public class UserRemoveTempGroup extends SubCommand { public UserRemoveTempGroup() { - super("removetempgroup", "Removes a user from a temporary group", - "/%s user removetempgroup [server] [world]", Permission.USER_REMOVETEMPGROUP, - Predicate.notInRange(1, 3)); + super("removetempgroup", "Removes a user from a temporary group", " [server] [world]", + Permission.USER_REMOVETEMPGROUP, Predicate.notInRange(1, 3)); } @Override @@ -48,7 +47,7 @@ public class UserRemoveTempGroup extends SubCommand { String groupName = args.get(0).toLowerCase(); if (ArgumentChecker.checkNode(groupName)) { - sendUsage(sender, label); + sendUsage(sender); return CommandResult.INVALID_ARGS; } diff --git a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserRemoveTempPrefix.java b/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserRemoveTempPrefix.java index b93627840..96a095fcb 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserRemoveTempPrefix.java +++ b/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserRemoveTempPrefix.java @@ -38,7 +38,7 @@ import java.util.List; public class UserRemoveTempPrefix extends SubCommand { public UserRemoveTempPrefix() { - super("removetempprefix", "Removes a temporary prefix from a user", "/%s user removetempprefix [server] [world]", + super("removetempprefix", "Removes a temporary prefix from a user", " [server] [world]", Permission.USER_REMOVE_TEMP_PREFIX, Predicate.notInRange(2, 4)); } diff --git a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserRemoveTempSuffix.java b/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserRemoveTempSuffix.java index 5c65a1551..018e294c6 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserRemoveTempSuffix.java +++ b/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserRemoveTempSuffix.java @@ -38,7 +38,7 @@ import java.util.List; public class UserRemoveTempSuffix extends SubCommand { public UserRemoveTempSuffix() { - super("removetempsuffix", "Removes a temporary suffix from a user", "/%s user removetempsuffix [server] [world]", + super("removetempsuffix", "Removes a temporary suffix from a user", " [server] [world]", Permission.USER_REMOVE_TEMP_SUFFIX, Predicate.notInRange(2, 4)); } diff --git a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserSetPermission.java b/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserSetPermission.java index a9fb8230a..21a159f88 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserSetPermission.java +++ b/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserSetPermission.java @@ -38,8 +38,7 @@ import java.util.List; public class UserSetPermission extends SubCommand { public UserSetPermission() { - super("set", "Sets a permission for a user", - "/%s user set [server] [world]", Permission.USER_SETPERMISSION, + super("set", "Sets a permission for a user", " [server] [world]", Permission.USER_SETPERMISSION, Predicate.notInRange(2, 4)); } @@ -49,7 +48,7 @@ public class UserSetPermission extends SubCommand { String bool = args.get(1).toLowerCase(); if (ArgumentChecker.checkNode(node)) { - sendUsage(sender, label); + sendUsage(sender); return CommandResult.INVALID_ARGS; } @@ -59,7 +58,7 @@ public class UserSetPermission extends SubCommand { } if (!bool.equalsIgnoreCase("true") && !bool.equalsIgnoreCase("false")) { - sendUsage(sender, label); + sendUsage(sender); return CommandResult.INVALID_ARGS; } diff --git a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserSetPrimaryGroup.java b/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserSetPrimaryGroup.java index 5e88ea5d8..20ed22fb7 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserSetPrimaryGroup.java +++ b/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserSetPrimaryGroup.java @@ -38,8 +38,7 @@ import java.util.List; public class UserSetPrimaryGroup extends SubCommand { public UserSetPrimaryGroup() { - super("setprimarygroup", "Sets a users primary group", - "/%s user setprimarygroup ", Permission.USER_SETPRIMARYGROUP, Predicate.not(1)); + super("setprimarygroup", "Sets a users primary group", "", Permission.USER_SETPRIMARYGROUP, Predicate.not(1)); } @Override diff --git a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserSetTempPermission.java b/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserSetTempPermission.java index a27a5e7eb..7b5b893dd 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserSetTempPermission.java +++ b/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserSetTempPermission.java @@ -39,8 +39,7 @@ import java.util.List; public class UserSetTempPermission extends SubCommand { public UserSetTempPermission() { - super("settemp", "Sets a temporary permission for a user", - "/%s user settemp [server] [world]", + super("settemp", "Sets a temporary permission for a user", " [server] [world]", Permission.USER_SET_TEMP_PERMISSION, Predicate.notInRange(3, 5)); } @@ -50,7 +49,7 @@ public class UserSetTempPermission extends SubCommand { String bool = args.get(1).toLowerCase(); if (ArgumentChecker.checkNode(node)) { - sendUsage(sender, label); + sendUsage(sender); return CommandResult.INVALID_ARGS; } @@ -60,7 +59,7 @@ public class UserSetTempPermission extends SubCommand { } if (!bool.equalsIgnoreCase("true") && !bool.equalsIgnoreCase("false")) { - sendUsage(sender, label); + sendUsage(sender); return CommandResult.INVALID_ARGS; } diff --git a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserShowPos.java b/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserShowPos.java index 3e66507b4..5d421ace1 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserShowPos.java +++ b/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserShowPos.java @@ -34,8 +34,7 @@ import java.util.List; public class UserShowPos extends SubCommand { public UserShowPos() { - super("showpos", "Shows a users position on a track", "/%s user showpos ", Permission.USER_SHOWPOS, - Predicate.not(1)); + super("showpos", "Shows a users position on a track", "", Permission.USER_SHOWPOS, Predicate.not(1)); } @Override diff --git a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserShowTracks.java b/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserShowTracks.java index ec4aedc7c..9a633a2c0 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserShowTracks.java +++ b/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserShowTracks.java @@ -34,8 +34,8 @@ import java.util.stream.Collectors; public class UserShowTracks extends SubCommand { public UserShowTracks() { - super("showtracks", "Lists the tracks that this user's primary group features on", "/%s user showtracks", - Permission.USER_SHOWTRACKS, Predicate.alwaysFalse()); + super("showtracks", "Lists the tracks that this user's primary group features on", "", Permission.USER_SHOWTRACKS, + Predicate.alwaysFalse()); } @Override diff --git a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserUnSetPermission.java b/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserUnSetPermission.java index a5059e5d8..d649ca7c2 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserUnSetPermission.java +++ b/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserUnSetPermission.java @@ -38,8 +38,8 @@ import java.util.List; public class UserUnSetPermission extends SubCommand { public UserUnSetPermission() { - super("unset", "Unsets a permission for a user", - "/%s user unset [server] [world]", Permission.USER_UNSETPERMISSION, Predicate.notInRange(1, 3)); + super("unset", "Unsets a permission for a user", " [server] [world]", Permission.USER_UNSETPERMISSION, + Predicate.notInRange(1, 3)); } @Override @@ -47,7 +47,7 @@ public class UserUnSetPermission extends SubCommand { String node = args.get(0).replace("{SPACE}", " "); if (ArgumentChecker.checkNode(node)) { - sendUsage(sender, label); + sendUsage(sender); return CommandResult.INVALID_ARGS; } diff --git a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserUnsetTempPermission.java b/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserUnsetTempPermission.java index cf28cad7e..f69ba7999 100644 --- a/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserUnsetTempPermission.java +++ b/common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserUnsetTempPermission.java @@ -38,9 +38,8 @@ import java.util.List; public class UserUnsetTempPermission extends SubCommand { public UserUnsetTempPermission() { - super("unsettemp", "Unsets a temporary permission for a user", - "/%s user unsettemp [server] [world]", Permission.USER_UNSET_TEMP_PERMISSION, - Predicate.notInRange(1, 3)); + super("unsettemp", "Unsets a temporary permission for a user", " [server] [world]", + Permission.USER_UNSET_TEMP_PERMISSION, Predicate.notInRange(1, 3)); } @Override @@ -48,7 +47,7 @@ public class UserUnsetTempPermission extends SubCommand { String node = args.get(0).replace("{SPACE}", " "); if (ArgumentChecker.checkNode(node)) { - sendUsage(sender, label); + sendUsage(sender); return CommandResult.INVALID_ARGS; }