worldofcraft/LuckPerms-DBA
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make command usage output easier to read

Browse Source
This commit is contained in:
Luck 2016-09-25 14:34:27 +01:00
parent 6540ffa4dd
commit c53623dd67
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
76 changed files with 130 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bungee/src/main/java/me/lucko/luckperms/BungeeListener.java
View File

@ -29,7 +29,10 @@ import me.lucko.luckperms.utils.AbstractListener;
import net.md_5.bungee.api.chat.TextComponent; import net.md_5.bungee.api.chat.TextComponent;
import net.md_5.bungee.api.connection.PendingConnection; import net.md_5.bungee.api.connection.PendingConnection;
import net.md_5.bungee.api.connection.ProxiedPlayer; 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.api.plugin.Listener;
import net.md_5.bungee.event.EventHandler; import net.md_5.bungee.event.EventHandler;

6
common/src/main/java/me/lucko/luckperms/commands/MainCommand.java
View File

@ -98,7 +98,7 @@ public abstract class MainCommand<T> {
} }
if (sub.getIsArgumentInvalid().test(strippedArgs.size())) { if (sub.getIsArgumentInvalid().test(strippedArgs.size())) {
sub.sendUsage(sender, label); sub.sendUsage(sender);
return CommandResult.INVALID_ARGS; return CommandResult.INVALID_ARGS;
} }
@ -146,10 +146,10 @@ public abstract class MainCommand<T> {
.collect(Collectors.toList()); .collect(Collectors.toList());
if (subs.size() > 0) { 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) { for (SubCommand s : subs) {
s.sendUsage(sender, label); s.sendUsage(sender);
} }
} else { } else {

15
common/src/main/java/me/lucko/luckperms/commands/SubCommand.java
View File

@ -22,7 +22,6 @@
package me.lucko.luckperms.commands; package me.lucko.luckperms.commands;
import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;
import me.lucko.luckperms.LuckPermsPlugin; import me.lucko.luckperms.LuckPermsPlugin;
import me.lucko.luckperms.constants.Message; import me.lucko.luckperms.constants.Message;
@ -42,7 +41,6 @@ import java.util.stream.Collectors;
* Abstract SubCommand class * Abstract SubCommand class
*/ */
@Getter @Getter
@AllArgsConstructor
public abstract class SubCommand<T> { public abstract class SubCommand<T> {
/** /**
@ -70,6 +68,14 @@ public abstract class SubCommand<T> {
*/ */
private final Predicate<? super Integer> isArgumentInvalid; private final Predicate<? super Integer> isArgumentInvalid;
public SubCommand(String name, String description, String usage, Permission permission, Predicate<? super Integer> 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 * Called when this sub command is ran
* @param plugin a link to the main plugin instance * @param plugin a link to the main plugin instance
@ -95,10 +101,9 @@ public abstract class SubCommand<T> {
/** /**
* Send the command usage to a sender * Send the command usage to a sender
* @param sender the sender to send the usage to * @param sender the sender to send the usage to
* @param label the command label used
*/ */
public void sendUsage(Sender sender, String label) { public void sendUsage(Sender sender) {
Util.sendPluginMessage(sender, "&e-> &d" + String.format(getUsage(), label)); Util.sendPluginMessage(sender, "&e-> &6" + getName() + (usage.isEmpty() ? "" : "&e - &7" + getUsage()));
} }
/** /**

2
common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupAddPrefix.java
View File

@ -38,7 +38,7 @@ import java.util.List;
public class GroupAddPrefix extends SubCommand<Group> { public class GroupAddPrefix extends SubCommand<Group> {
public GroupAddPrefix() { public GroupAddPrefix() {
super("addprefix", "Adds a prefix to the group", "/%s group <group> addprefix <priority> <prefix> [server] [world]", super("addprefix", "Adds a prefix to the group", "<priority> <prefix> [server] [world]",
Permission.GROUP_ADDPREFIX, Predicate.notInRange(2, 4)); Permission.GROUP_ADDPREFIX, Predicate.notInRange(2, 4));
} }

2
common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupAddSuffix.java
View File

@ -38,7 +38,7 @@ import java.util.List;
public class GroupAddSuffix extends SubCommand<Group> { public class GroupAddSuffix extends SubCommand<Group> {
public GroupAddSuffix() { public GroupAddSuffix() {
super("addsuffix", "Adds a suffix to the group", "/%s group <group> addsuffix <priority> <suffix> [server] [world]", super("addsuffix", "Adds a suffix to the group", "<priority> <suffix> [server] [world]",
Permission.GROUP_ADDSUFFIX, Predicate.notInRange(2, 4)); Permission.GROUP_ADDSUFFIX, Predicate.notInRange(2, 4));
} }

2
common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupAddTempPrefix.java
View File

@ -39,7 +39,7 @@ import java.util.List;
public class GroupAddTempPrefix extends SubCommand<Group> { public class GroupAddTempPrefix extends SubCommand<Group> {
public GroupAddTempPrefix() { public GroupAddTempPrefix() {
super("addtempprefix", "Adds a prefix to the group temporarily", "/%s group <group> addtempprefix <priority> <prefix> <duration> [server] [world]", super("addtempprefix", "Adds a prefix to the group temporarily", "<priority> <prefix> <duration> [server] [world]",
Permission.GROUP_ADD_TEMP_PREFIX, Predicate.notInRange(3, 5)); Permission.GROUP_ADD_TEMP_PREFIX, Predicate.notInRange(3, 5));
} }

2
common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupAddTempSuffix.java
View File

@ -39,7 +39,7 @@ import java.util.List;
public class GroupAddTempSuffix extends SubCommand<Group> { public class GroupAddTempSuffix extends SubCommand<Group> {
public GroupAddTempSuffix() { public GroupAddTempSuffix() {
super("addtempsuffix", "Adds a suffix to the group temporarily", "/%s group <group> addtempsuffix <priority> <suffix> <duration> [server] [world]", super("addtempsuffix", "Adds a suffix to the group temporarily", "<priority> <suffix> <duration> [server] [world]",
Permission.GROUP_ADD_TEMP_SUFFIX, Predicate.notInRange(3, 5)); Permission.GROUP_ADD_TEMP_SUFFIX, Predicate.notInRange(3, 5));
} }

3
common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupChatMeta.java
View File

@ -34,8 +34,7 @@ import java.util.*;
public class GroupChatMeta extends SubCommand<Group> { public class GroupChatMeta extends SubCommand<Group> {
public GroupChatMeta() { public GroupChatMeta() {
super("chatmeta", "Displays a groups chat meta", "/%s group <group> chatmeta", Permission.GROUP_CHATMETA, super("chatmeta", "Displays a groups chat meta", "", Permission.GROUP_CHATMETA, Predicate.alwaysFalse());
Predicate.alwaysFalse());
} }
@Override @Override

3
common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupClear.java
View File

@ -36,8 +36,7 @@ import java.util.List;
public class GroupClear extends SubCommand<Group> { public class GroupClear extends SubCommand<Group> {
public GroupClear() { public GroupClear() {
super("clear", "Clears a groups permissions", "/%s group <group> clear", Permission.GROUP_CLEAR, super("clear", "Clears a groups permissions", "", Permission.GROUP_CLEAR, Predicate.alwaysFalse());
Predicate.alwaysFalse());
} }
@Override @Override

5
common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupHasPerm.java
View File

@ -33,9 +33,8 @@ import java.util.List;
public class GroupHasPerm extends SubCommand<Group> { public class GroupHasPerm extends SubCommand<Group> {
public GroupHasPerm() { public GroupHasPerm() {
super("haspermission", "Checks to see if a group has a certain permission node", super("haspermission", "Checks to see if a group has a certain permission node", "<node> [server] [world]",
"/%s group <group> haspermission <node> [server] [world]", Permission.GROUP_HASPERMISSION, Permission.GROUP_HASPERMISSION, Predicate.notInRange(1, 3));
Predicate.notInRange(1, 3));
} }
@Override @Override

3
common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupInfo.java
View File

@ -35,8 +35,7 @@ import java.util.List;
public class GroupInfo extends SubCommand<Group> { public class GroupInfo extends SubCommand<Group> {
public GroupInfo() { public GroupInfo() {
super("info", "Gives info about the group", "/%s group <group> info", Permission.GROUP_INFO, super("info", "Gives info about the group", "", Permission.GROUP_INFO, Predicate.alwaysFalse());
Predicate.alwaysFalse());
} }
@Override @Override

5
common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupInheritsPerm.java
View File

@ -33,9 +33,8 @@ import java.util.List;
public class GroupInheritsPerm extends SubCommand<Group> { public class GroupInheritsPerm extends SubCommand<Group> {
public GroupInheritsPerm() { public GroupInheritsPerm() {
super("inheritspermission", "Checks to see if a group inherits a certain permission node", super("inheritspermission", "Checks to see if a group inherits a certain permission node", "<node> [server] [world]",
"/%s group <group> inheritspermission <node> [server] [world]", Permission.GROUP_INHERITSPERMISSION, Permission.GROUP_INHERITSPERMISSION, Predicate.notInRange(1, 3));
Predicate.notInRange(1, 3));
} }
@Override @Override

3
common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupListNodes.java
View File

@ -32,8 +32,7 @@ import java.util.List;
public class GroupListNodes extends SubCommand<Group> { public class GroupListNodes extends SubCommand<Group> {
public GroupListNodes() { public GroupListNodes() {
super("listnodes", "Lists the permission nodes the group has", "/%s group <group> listnodes", super("listnodes", "Lists the permission nodes the group has", "", Permission.GROUP_LISTNODES, Predicate.alwaysFalse());
Permission.GROUP_LISTNODES, Predicate.alwaysFalse());
} }
@Override @Override

3
common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupListParents.java
View File

@ -32,8 +32,7 @@ import java.util.List;
public class GroupListParents extends SubCommand<Group> { public class GroupListParents extends SubCommand<Group> {
public GroupListParents() { public GroupListParents() {
super("listparents", "Lists the groups that this group inherits from", "/%s group <group> listparents", super("listparents", "Lists the groups that this group inherits from", "", Permission.GROUP_LISTPARENTS, Predicate.alwaysFalse());
Permission.GROUP_LISTPARENTS, Predicate.alwaysFalse());
} }
@Override @Override

2
common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupRemovePrefix.java
View File

@ -38,7 +38,7 @@ import java.util.List;
public class GroupRemovePrefix extends SubCommand<Group> { public class GroupRemovePrefix extends SubCommand<Group> {
public GroupRemovePrefix() { public GroupRemovePrefix() {
super("removeprefix", "Removes a prefix from a group", "/%s group <group> removeprefix <priority> <prefix> [server] [world]", super("removeprefix", "Removes a prefix from a group", "<priority> <prefix> [server] [world]",
Permission.GROUP_REMOVEPREFIX, Predicate.notInRange(2, 4)); Permission.GROUP_REMOVEPREFIX, Predicate.notInRange(2, 4));
} }

2
common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupRemoveSuffix.java
View File

@ -38,7 +38,7 @@ import java.util.List;
public class GroupRemoveSuffix extends SubCommand<Group> { public class GroupRemoveSuffix extends SubCommand<Group> {
public GroupRemoveSuffix() { public GroupRemoveSuffix() {
super("removesuffix", "Removes a suffix from a group", "/%s group <group> removesuffix <priority> <suffix> [server] [world]", super("removesuffix", "Removes a suffix from a group", "<priority> <suffix> [server] [world]",
Permission.GROUP_REMOVESUFFIX, Predicate.notInRange(2, 4)); Permission.GROUP_REMOVESUFFIX, Predicate.notInRange(2, 4));
} }

2
common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupRemoveTempPrefix.java
View File

@ -38,7 +38,7 @@ import java.util.List;
public class GroupRemoveTempPrefix extends SubCommand<Group> { public class GroupRemoveTempPrefix extends SubCommand<Group> {
public GroupRemoveTempPrefix() { public GroupRemoveTempPrefix() {
super("removetempprefix", "Removes a temporary prefix from a group", "/%s group <group> removetempprefix <priority> <prefix> [server] [world]", super("removetempprefix", "Removes a temporary prefix from a group", "<priority> <prefix> [server] [world]",
Permission.GROUP_REMOVE_TEMP_PREFIX, Predicate.notInRange(2, 4)); Permission.GROUP_REMOVE_TEMP_PREFIX, Predicate.notInRange(2, 4));
} }

2
common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupRemoveTempSuffix.java
View File

@ -38,7 +38,7 @@ import java.util.List;
public class GroupRemoveTempSuffix extends SubCommand<Group> { public class GroupRemoveTempSuffix extends SubCommand<Group> {
public GroupRemoveTempSuffix() { public GroupRemoveTempSuffix() {
super("removetempsuffix", "Removes a temporary suffix from a group", "/%s group <group> removetempsuffix <priority> <suffix> [server] [world]", super("removetempsuffix", "Removes a temporary suffix from a group", "<priority> <suffix> [server] [world]",
Permission.GROUP_REMOVE_TEMP_SUFFIX, Predicate.notInRange(2, 4)); Permission.GROUP_REMOVE_TEMP_SUFFIX, Predicate.notInRange(2, 4));
} }

3
common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupRename.java
View File

@ -37,8 +37,7 @@ import java.util.List;
public class GroupRename extends SubCommand<Group> { public class GroupRename extends SubCommand<Group> {
public GroupRename() { public GroupRename() {
super("rename", "Rename this group", "/%s group <group> rename <new name>", super("rename", "Rename this group", "<new name>", Permission.TRACK_APPEND, Predicate.not(1));
Permission.TRACK_APPEND, Predicate.not(1));
} }
@Override @Override

7
common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupSetInherit.java
View File

@ -38,9 +38,8 @@ import java.util.List;
public class GroupSetInherit extends SubCommand<Group> { public class GroupSetInherit extends SubCommand<Group> {
public GroupSetInherit() { public GroupSetInherit() {
super("setinherit", "Sets another group for this group to inherit permissions from", super("setinherit", "Sets another group for this group to inherit permissions from", "<group> [server] [world]",
"/%s group <group> setinherit <group> [server] [world]", Permission.GROUP_SETINHERIT, Permission.GROUP_SETINHERIT, Predicate.notInRange(1, 3));
Predicate.notInRange(1, 3));
} }
@Override @Override
@ -48,7 +47,7 @@ public class GroupSetInherit extends SubCommand<Group> {
String groupName = args.get(0).toLowerCase(); String groupName = args.get(0).toLowerCase();
if (ArgumentChecker.checkNode(groupName)) { if (ArgumentChecker.checkNode(groupName)) {
sendUsage(sender, label); sendUsage(sender);
return CommandResult.INVALID_ARGS; return CommandResult.INVALID_ARGS;
} }

8
common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupSetPermission.java
View File

@ -38,8 +38,8 @@ import java.util.List;
public class GroupSetPermission extends SubCommand<Group> { public class GroupSetPermission extends SubCommand<Group> {
public GroupSetPermission() { public GroupSetPermission() {
super("set", "Sets a permission for a group", "/%s group <group> set <node> <true|false> [server] [world]", super("set", "Sets a permission for a group", "<node> <true|false> [server] [world]", Permission.GROUP_SETPERMISSION,
Permission.GROUP_SETPERMISSION, Predicate.notInRange(2, 4)); Predicate.notInRange(2, 4));
} }
@Override @Override
@ -48,7 +48,7 @@ public class GroupSetPermission extends SubCommand<Group> {
String bool = args.get(1).toLowerCase(); String bool = args.get(1).toLowerCase();
if (ArgumentChecker.checkNode(node)) { if (ArgumentChecker.checkNode(node)) {
sendUsage(sender, label); sendUsage(sender);
return CommandResult.INVALID_ARGS; return CommandResult.INVALID_ARGS;
} }
@ -58,7 +58,7 @@ public class GroupSetPermission extends SubCommand<Group> {
} }
if (!bool.equalsIgnoreCase("true") && !bool.equalsIgnoreCase("false")) { if (!bool.equalsIgnoreCase("true") && !bool.equalsIgnoreCase("false")) {
sendUsage(sender, label); sendUsage(sender);
return CommandResult.INVALID_ARGS; return CommandResult.INVALID_ARGS;
} }

5
common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupSetTempInherit.java
View File

@ -40,8 +40,7 @@ import java.util.List;
public class GroupSetTempInherit extends SubCommand<Group> { public class GroupSetTempInherit extends SubCommand<Group> {
public GroupSetTempInherit() { public GroupSetTempInherit() {
super("settempinherit", "Sets another group for this group to inherit permissions from temporarily", super("settempinherit", "Sets another group for this group to inherit permissions from temporarily",
"/%s group <group> settempinherit <group> <duration> [server] [world]", "<group> <duration> [server] [world]", Permission.GROUP_SET_TEMP_INHERIT, Predicate.notInRange(2, 4));
Permission.GROUP_SET_TEMP_INHERIT, Predicate.notInRange(2, 4));
} }
@Override @Override
@ -49,7 +48,7 @@ public class GroupSetTempInherit extends SubCommand<Group> {
String groupName = args.get(0).toLowerCase(); String groupName = args.get(0).toLowerCase();
if (ArgumentChecker.checkNode(groupName)) { if (ArgumentChecker.checkNode(groupName)) {
sendUsage(sender, label); sendUsage(sender);
return CommandResult.INVALID_ARGS; return CommandResult.INVALID_ARGS;
} }

7
common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupSetTempPermission.java
View File

@ -39,8 +39,7 @@ import java.util.List;
public class GroupSetTempPermission extends SubCommand<Group> { public class GroupSetTempPermission extends SubCommand<Group> {
public GroupSetTempPermission() { public GroupSetTempPermission() {
super("settemp", "Sets a temporary permission for a group", super("settemp", "Sets a temporary permission for a group", "<node> <true|false> <duration> [server] [world]",
"/%s group <group> settemp <node> <true|false> <duration> [server] [world]",
Permission.GROUP_SET_TEMP_PERMISSION, Predicate.notInRange(3, 5)); Permission.GROUP_SET_TEMP_PERMISSION, Predicate.notInRange(3, 5));
} }
@ -50,7 +49,7 @@ public class GroupSetTempPermission extends SubCommand<Group> {
String bool = args.get(1).toLowerCase(); String bool = args.get(1).toLowerCase();
if (ArgumentChecker.checkNode(node)) { if (ArgumentChecker.checkNode(node)) {
sendUsage(sender, label); sendUsage(sender);
return CommandResult.INVALID_ARGS; return CommandResult.INVALID_ARGS;
} }
@ -60,7 +59,7 @@ public class GroupSetTempPermission extends SubCommand<Group> {
} }
if (!bool.equalsIgnoreCase("true") && !bool.equalsIgnoreCase("false")) { if (!bool.equalsIgnoreCase("true") && !bool.equalsIgnoreCase("false")) {
sendUsage(sender, label); sendUsage(sender);
return CommandResult.INVALID_ARGS; return CommandResult.INVALID_ARGS;
} }

3
common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupShowTracks.java
View File

@ -34,8 +34,7 @@ import java.util.stream.Collectors;
public class GroupShowTracks extends SubCommand<Group> { public class GroupShowTracks extends SubCommand<Group> {
public GroupShowTracks() { public GroupShowTracks() {
super("showtracks", "Lists the tracks that this group features on", "/%s group <group> showtracks", super("showtracks", "Lists the tracks that this group features on", "", Permission.GROUP_SHOWTRACKS, Predicate.alwaysFalse());
Permission.GROUP_SHOWTRACKS, Predicate.alwaysFalse());
} }
@Override @Override

6
common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupUnSetPermission.java
View File

@ -38,8 +38,8 @@ import java.util.List;
public class GroupUnSetPermission extends SubCommand<Group> { public class GroupUnSetPermission extends SubCommand<Group> {
public GroupUnSetPermission() { public GroupUnSetPermission() {
super("unset", "Unsets a permission for a group", "/%s group <group> unset <node> [server] [world]", super("unset", "Unsets a permission for a group", "<node> [server] [world]", Permission.GROUP_UNSETPERMISSION,
Permission.GROUP_UNSETPERMISSION, Predicate.notInRange(1, 3)); Predicate.notInRange(1, 3));
} }
@Override @Override
@ -47,7 +47,7 @@ public class GroupUnSetPermission extends SubCommand<Group> {
String node = args.get(0).replace("{SPACE}", " "); String node = args.get(0).replace("{SPACE}", " ");
if (ArgumentChecker.checkNode(node)) { if (ArgumentChecker.checkNode(node)) {
sendUsage(sender, label); sendUsage(sender);
return CommandResult.INVALID_ARGS; return CommandResult.INVALID_ARGS;
} }

5
common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupUnsetInherit.java
View File

@ -39,8 +39,7 @@ import java.util.List;
public class GroupUnsetInherit extends SubCommand<Group> { public class GroupUnsetInherit extends SubCommand<Group> {
public GroupUnsetInherit() { public GroupUnsetInherit() {
super("unsetinherit", "Unsets another group for this group to inherit permissions from", super("unsetinherit", "Unsets another group for this group to inherit permissions from",
"/%s group <group> unsetinherit <group> [server] [world]", Permission.GROUP_UNSETINHERIT, "<group> [server] [world]", Permission.GROUP_UNSETINHERIT, Predicate.notInRange(1, 3));
Predicate.notInRange(1, 3));
} }
@Override @Override
@ -48,7 +47,7 @@ public class GroupUnsetInherit extends SubCommand<Group> {
String groupName = args.get(0).toLowerCase(); String groupName = args.get(0).toLowerCase();
if (ArgumentChecker.checkNode(groupName)) { if (ArgumentChecker.checkNode(groupName)) {
sendUsage(sender, label); sendUsage(sender);
return CommandResult.INVALID_ARGS; return CommandResult.INVALID_ARGS;
} }

5
common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupUnsetTempInherit.java
View File

@ -39,8 +39,7 @@ import java.util.List;
public class GroupUnsetTempInherit extends SubCommand<Group> { public class GroupUnsetTempInherit extends SubCommand<Group> {
public GroupUnsetTempInherit() { public GroupUnsetTempInherit() {
super("unsettempinherit", "Unsets another group for this group to inherit permissions from", super("unsettempinherit", "Unsets another group for this group to inherit permissions from",
"/%s group <group> unsettempinherit <group> [server] [world]", Permission.GROUP_UNSET_TEMP_INHERIT, "<group> [server] [world]", Permission.GROUP_UNSET_TEMP_INHERIT, Predicate.notInRange(1, 3));
Predicate.notInRange(1, 3));
} }
@Override @Override
@ -48,7 +47,7 @@ public class GroupUnsetTempInherit extends SubCommand<Group> {
String groupName = args.get(0).toLowerCase(); String groupName = args.get(0).toLowerCase();
if (ArgumentChecker.checkNode(groupName)) { if (ArgumentChecker.checkNode(groupName)) {
sendUsage(sender, label); sendUsage(sender);
return CommandResult.INVALID_ARGS; return CommandResult.INVALID_ARGS;
} }

7
common/src/main/java/me/lucko/luckperms/commands/group/subcommands/GroupUnsetTempPermission.java
View File

@ -38,9 +38,8 @@ import java.util.List;
public class GroupUnsetTempPermission extends SubCommand<Group> { public class GroupUnsetTempPermission extends SubCommand<Group> {
public GroupUnsetTempPermission() { public GroupUnsetTempPermission() {
super("unsettemp", "Unsets a temporary permission for a group", super("unsettemp", "Unsets a temporary permission for a group", "<node> [server] [world]",
"/%s group <group> unsettemp <node> [server] [world]", Permission.GROUP_UNSET_TEMP_PERMISSION, Permission.GROUP_UNSET_TEMP_PERMISSION, Predicate.notInRange(1, 3));
Predicate.notInRange(1, 3));
} }
@Override @Override
@ -48,7 +47,7 @@ public class GroupUnsetTempPermission extends SubCommand<Group> {
String node = args.get(0).replace("{SPACE}", " "); String node = args.get(0).replace("{SPACE}", " ");
if (ArgumentChecker.checkNode(node)) { if (ArgumentChecker.checkNode(node)) {
sendUsage(sender, label); sendUsage(sender);
return CommandResult.INVALID_ARGS; return CommandResult.INVALID_ARGS;
} }

2
common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogExport.java
View File

@ -41,7 +41,7 @@ import java.util.List;
public class LogExport extends SubCommand<Log> { public class LogExport extends SubCommand<Log> {
public LogExport() { public LogExport() {
super("export", "Export the log to a file", "/%s log export <file>", Permission.LOG_EXPORT, Predicate.not(1)); super("export", "Export the log to a file", "<file>", Permission.LOG_EXPORT, Predicate.not(1));
} }
@Override @Override

2
common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogGroupHistory.java
View File

@ -40,7 +40,7 @@ import java.util.SortedMap;
public class LogGroupHistory extends SubCommand<Log> { public class LogGroupHistory extends SubCommand<Log> {
public LogGroupHistory() { public LogGroupHistory() {
super("grouphistory", "View an objects history", "/%s log grouphistory <group> [page]", Permission.LOG_GROUP_HISTORY, super("grouphistory", "View an objects history", "<group> [page]", Permission.LOG_GROUP_HISTORY,
Predicate.notInRange(1, 2)); Predicate.notInRange(1, 2));
} }

3
common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogNotify.java
View File

@ -37,8 +37,7 @@ import java.util.UUID;
public class LogNotify extends SubCommand<Log> { public class LogNotify extends SubCommand<Log> {
public LogNotify() { public LogNotify() {
super("notify", "Toggle notifications", "/%s log notify [on|off]", Permission.LOG_NOTIFY, super("notify", "Toggle notifications", "[on|off]", Permission.LOG_NOTIFY, Predicate.notInRange(0, 1));
Predicate.notInRange(0, 1));
} }
@Override @Override

3
common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogRecent.java
View File

@ -38,8 +38,7 @@ import java.util.UUID;
public class LogRecent extends SubCommand<Log> { public class LogRecent extends SubCommand<Log> {
public LogRecent() { public LogRecent() {
super("recent", "View recent actions", "/%s log recent [user] [page]", Permission.LOG_RECENT, super("recent", "View recent actions", "[user] [page]", Permission.LOG_RECENT, Predicate.notInRange(0, 2));
Predicate.notInRange(0, 2));
} }
@Override @Override

3
common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogSearch.java
View File

@ -40,8 +40,7 @@ import java.util.stream.Collectors;
public class LogSearch extends SubCommand<Log> { public class LogSearch extends SubCommand<Log> {
public LogSearch() { public LogSearch() {
super("search", "Search the log for an entry", "/%s log search <query> [page]", Permission.LOG_SEARCH, super("search", "Search the log for an entry", "<query> [page]", Permission.LOG_SEARCH, Predicate.is(0));
Predicate.is(0));
} }
@Override @Override

3
common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogTrackHistory.java
View File

@ -40,8 +40,7 @@ import java.util.SortedMap;
public class LogTrackHistory extends SubCommand<Log> { public class LogTrackHistory extends SubCommand<Log> {
public LogTrackHistory() { public LogTrackHistory() {
super("trackhistory", "View an objects history", "/%s log trackhistory <track> [page]", Permission.LOG_TRACK_HISTORY, super("trackhistory", "View an objects history", "<track> [page]", Permission.LOG_TRACK_HISTORY, Predicate.notInRange(1, 2));
Predicate.notInRange(1, 2));
} }
@Override @Override

3
common/src/main/java/me/lucko/luckperms/commands/log/subcommands/LogUserHistory.java
View File

@ -38,8 +38,7 @@ import java.util.UUID;
public class LogUserHistory extends SubCommand<Log> { public class LogUserHistory extends SubCommand<Log> {
public LogUserHistory() { public LogUserHistory() {
super("userhistory", "View an objects history", "/%s log userhistory <user> [page]", Permission.LOG_USER_HISTORY, super("userhistory", "View an objects history", "<user> [page]", Permission.LOG_USER_HISTORY, Predicate.notInRange(1, 2));
Predicate.notInRange(1, 2));
} }
@Override @Override

2
common/src/main/java/me/lucko/luckperms/commands/migration/subcommands/MigrationBPermissions.java
View File

@ -82,7 +82,7 @@ public class MigrationBPermissions extends SubCommand<Object> {
} }
public MigrationBPermissions() { public MigrationBPermissions() {
super("bpermissions", "Migration from bPermissions", "/%s migration bpermissions", MIGRATION, Predicate.alwaysFalse()); super("bpermissions", "Migration from bPermissions", "", MIGRATION, Predicate.alwaysFalse());
} }
@Override @Override

3
common/src/main/java/me/lucko/luckperms/commands/migration/subcommands/MigrationBungeePerms.java
View File

@ -43,8 +43,7 @@ import java.util.Map;
*/ */
public class MigrationBungeePerms extends SubCommand<Object> { public class MigrationBungeePerms extends SubCommand<Object> {
public MigrationBungeePerms() { public MigrationBungeePerms() {
super("bungeeperms", "Migration from BungeePerms", "/%s migration bungeeperms", super("bungeeperms", "Migration from BungeePerms", "", Permission.MIGRATION, Predicate.alwaysFalse());
Permission.MIGRATION, Predicate.alwaysFalse());
} }
@Override @Override

3
common/src/main/java/me/lucko/luckperms/commands/migration/subcommands/MigrationGroupManager.java
View File

@ -45,8 +45,7 @@ import java.util.stream.Collectors;
public class MigrationGroupManager extends SubCommand<Object> { public class MigrationGroupManager extends SubCommand<Object> {
public MigrationGroupManager() { public MigrationGroupManager() {
super("groupmanager", "Migration from GroupManager", "/%s migration groupmanager [world names]", super("groupmanager", "Migration from GroupManager", "[world names...]", Permission.MIGRATION, Predicate.is(0));
Permission.MIGRATION, Predicate.is(0));
} }
@Override @Override

3
common/src/main/java/me/lucko/luckperms/commands/migration/subcommands/MigrationPermissionsEx.java
View File

@ -50,8 +50,7 @@ import java.util.stream.Collectors;
public class MigrationPermissionsEx extends SubCommand<Object> { public class MigrationPermissionsEx extends SubCommand<Object> {
public MigrationPermissionsEx() { public MigrationPermissionsEx() {
super("permissionsex", "Migration from PermissionsEx", "/%s migration permissionsex [world names]", super("permissionsex", "Migration from PermissionsEx", "[world names...]", Permission.MIGRATION, Predicate.alwaysFalse());
Permission.MIGRATION, Predicate.alwaysFalse());
} }
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")

4
common/src/main/java/me/lucko/luckperms/commands/migration/subcommands/MigrationPowerfulPerms.java
View File

@ -119,8 +119,8 @@ public class MigrationPowerfulPerms extends SubCommand<Object> {
public MigrationPowerfulPerms() { public MigrationPowerfulPerms() {
super("powerfulperms", "Migration from PowerfulPerms", super("powerfulperms", "Migration from PowerfulPerms", "<address> <database> <username> <password> <db table>",
"/%s migration powerfulperms <address> <database> <username> <password> <db table>", MIGRATION, Predicate.not(5)); MIGRATION, Predicate.not(5));
} }
@Override @Override

3
common/src/main/java/me/lucko/luckperms/commands/migration/subcommands/MigrationZPermissions.java
View File

@ -49,8 +49,7 @@ import java.util.stream.Collectors;
*/ */
public class MigrationZPermissions extends SubCommand<Object> { public class MigrationZPermissions extends SubCommand<Object> {
public MigrationZPermissions() { public MigrationZPermissions() {
super("zpermissions", "Migration from zPermissions", "/%s migration zpermissions [world names]", super("zpermissions", "Migration from zPermissions", "[world names...]", Permission.MIGRATION, Predicate.alwaysFalse());
Permission.MIGRATION, Predicate.alwaysFalse());
} }
@Override @Override

5
common/src/main/java/me/lucko/luckperms/commands/track/subcommands/TrackAppend.java
View File

@ -36,8 +36,7 @@ import java.util.List;
public class TrackAppend extends SubCommand<Track> { public class TrackAppend extends SubCommand<Track> {
public TrackAppend() { public TrackAppend() {
super("append", "Appends a group onto the end of the track", "/%s track <track> append <group>", super("append", "Appends a group onto the end of the track", "<group>", Permission.TRACK_APPEND, Predicate.not(1));
Permission.TRACK_APPEND, Predicate.not(1));
} }
@Override @Override
@ -45,7 +44,7 @@ public class TrackAppend extends SubCommand<Track> {
String groupName = args.get(0).toLowerCase(); String groupName = args.get(0).toLowerCase();
if (ArgumentChecker.checkNode(groupName)) { if (ArgumentChecker.checkNode(groupName)) {
sendUsage(sender, label); sendUsage(sender);
return CommandResult.INVALID_ARGS; return CommandResult.INVALID_ARGS;
} }

3
common/src/main/java/me/lucko/luckperms/commands/track/subcommands/TrackClear.java
View File

@ -36,8 +36,7 @@ import java.util.List;
public class TrackClear extends SubCommand<Track> { public class TrackClear extends SubCommand<Track> {
public TrackClear() { public TrackClear() {
super("clear", "Clears the groups on the track", "/%s track <track> clear", Permission.TRACK_CLEAR, super("clear", "Clears the groups on the track", "", Permission.TRACK_CLEAR, Predicate.alwaysFalse());
Predicate.alwaysFalse());
} }
@Override @Override

3
common/src/main/java/me/lucko/luckperms/commands/track/subcommands/TrackInfo.java
View File

@ -32,8 +32,7 @@ import java.util.List;
public class TrackInfo extends SubCommand<Track> { public class TrackInfo extends SubCommand<Track> {
public TrackInfo() { public TrackInfo() {
super("info", "Gives info about the track", "/%s track <track> info", Permission.TRACK_INFO, super("info", "Gives info about the track", "", Permission.TRACK_INFO, Predicate.alwaysFalse());
Predicate.alwaysFalse());
} }
@Override @Override

6
common/src/main/java/me/lucko/luckperms/commands/track/subcommands/TrackInsert.java
View File

@ -36,8 +36,8 @@ import java.util.List;
public class TrackInsert extends SubCommand<Track> { public class TrackInsert extends SubCommand<Track> {
public TrackInsert() { public TrackInsert() {
super("insert", "Inserts a group at a given position along the track", super("insert", "Inserts a group at a given position along the track", "<group> <position>",
"/%s track <track> insert <group> <position>", Permission.TRACK_INSERT, Predicate.not(2)); Permission.TRACK_INSERT, Predicate.not(2));
} }
@Override @Override
@ -45,7 +45,7 @@ public class TrackInsert extends SubCommand<Track> {
String groupName = args.get(0).toLowerCase(); String groupName = args.get(0).toLowerCase();
if (ArgumentChecker.checkNode(groupName)) { if (ArgumentChecker.checkNode(groupName)) {
sendUsage(sender, label); sendUsage(sender);
return CommandResult.INVALID_ARGS; return CommandResult.INVALID_ARGS;
} }

5
common/src/main/java/me/lucko/luckperms/commands/track/subcommands/TrackRemove.java
View File

@ -35,8 +35,7 @@ import java.util.List;
public class TrackRemove extends SubCommand<Track> { public class TrackRemove extends SubCommand<Track> {
public TrackRemove() { public TrackRemove() {
super("remove", "Removes a group from the track", "/%s track <track> remove <group>", Permission.TRACK_REMOVE, super("remove", "Removes a group from the track", "<group>", Permission.TRACK_REMOVE, Predicate.not(1));
Predicate.not(1));
} }
@Override @Override
@ -44,7 +43,7 @@ public class TrackRemove extends SubCommand<Track> {
String groupName = args.get(0).toLowerCase(); String groupName = args.get(0).toLowerCase();
if (ArgumentChecker.checkNode(groupName)) { if (ArgumentChecker.checkNode(groupName)) {
sendUsage(sender, label); sendUsage(sender);
return CommandResult.INVALID_ARGS; return CommandResult.INVALID_ARGS;
} }

3
common/src/main/java/me/lucko/luckperms/commands/track/subcommands/TrackRename.java
View File

@ -37,8 +37,7 @@ import java.util.List;
public class TrackRename extends SubCommand<Track> { public class TrackRename extends SubCommand<Track> {
public TrackRename() { public TrackRename() {
super("rename", "Rename this track", "/%s track <track> rename <new name>", super("rename", "Rename this track", "<new name>", Permission.TRACK_APPEND, Predicate.not(1));
Permission.TRACK_APPEND, Predicate.not(1));
} }
@Override @Override

5
common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserAddGroup.java
View File

@ -39,8 +39,7 @@ import java.util.List;
public class UserAddGroup extends SubCommand<User> { public class UserAddGroup extends SubCommand<User> {
public UserAddGroup() { public UserAddGroup() {
super("addgroup", "Adds the user to a group", "/%s user <user> addgroup <group> [server] [world]", super("addgroup", "Adds the user to a group", "<group> [server] [world]", Permission.USER_ADDGROUP, Predicate.notInRange(1, 3));
Permission.USER_ADDGROUP, Predicate.notInRange(1, 3));
} }
@Override @Override
@ -48,7 +47,7 @@ public class UserAddGroup extends SubCommand<User> {
String groupName = args.get(0).toLowerCase(); String groupName = args.get(0).toLowerCase();
if (ArgumentChecker.checkNode(groupName)) { if (ArgumentChecker.checkNode(groupName)) {
sendUsage(sender, label); sendUsage(sender);
return CommandResult.INVALID_ARGS; return CommandResult.INVALID_ARGS;
} }

4
common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserAddPrefix.java
View File

@ -38,8 +38,8 @@ import java.util.List;
public class UserAddPrefix extends SubCommand<User> { public class UserAddPrefix extends SubCommand<User> {
public UserAddPrefix() { public UserAddPrefix() {
super("addprefix", "Adds a prefix to the user", "/%s user <user> addprefix <priority> <prefix> [server] [world]", super("addprefix", "Adds a prefix to the user", "<priority> <prefix> [server] [world]", Permission.USER_ADDPREFIX,
Permission.USER_ADDPREFIX, Predicate.notInRange(2, 4)); Predicate.notInRange(2, 4));
} }
@Override @Override

4
common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserAddSuffix.java
View File

@ -38,8 +38,8 @@ import java.util.List;
public class UserAddSuffix extends SubCommand<User> { public class UserAddSuffix extends SubCommand<User> {
public UserAddSuffix() { public UserAddSuffix() {
super("addsuffix", "Adds a suffix to the user", "/%s user <user> addsuffix <priority> <suffix> [server] [world]", super("addsuffix", "Adds a suffix to the user", "<priority> <suffix> [server] [world]", Permission.USER_ADDSUFFIX,
Permission.USER_ADDSUFFIX, Predicate.notInRange(2, 4)); Predicate.notInRange(2, 4));
} }
@Override @Override

7
common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserAddTempGroup.java
View File

@ -40,9 +40,8 @@ import java.util.List;
public class UserAddTempGroup extends SubCommand<User> { public class UserAddTempGroup extends SubCommand<User> {
public UserAddTempGroup() { public UserAddTempGroup() {
super("addtempgroup", "Adds the user to a group temporarily", super("addtempgroup", "Adds the user to a group temporarily", "<group> <duration> [server] [world]",
"/%s user <user> addtempgroup <group> <duration> [server] [world]", Permission.USER_ADDTEMPGROUP, Permission.USER_ADDTEMPGROUP, Predicate.notInRange(2, 4));
Predicate.notInRange(2, 4));
} }
@Override @Override
@ -50,7 +49,7 @@ public class UserAddTempGroup extends SubCommand<User> {
String groupName = args.get(0).toLowerCase(); String groupName = args.get(0).toLowerCase();
if (ArgumentChecker.checkNode(groupName)) { if (ArgumentChecker.checkNode(groupName)) {
sendUsage(sender, label); sendUsage(sender);
return CommandResult.INVALID_ARGS; return CommandResult.INVALID_ARGS;
} }

2
common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserAddTempPrefix.java
View File

@ -39,7 +39,7 @@ import java.util.List;
public class UserAddTempPrefix extends SubCommand<User> { public class UserAddTempPrefix extends SubCommand<User> {
public UserAddTempPrefix() { public UserAddTempPrefix() {
super("addtempprefix", "Adds a prefix to the user temporarily", "/%s user <user> addtempprefix <priority> <prefix> <duration> [server] [world]", super("addtempprefix", "Adds a prefix to the user temporarily", "<priority> <prefix> <duration> [server] [world]",
Permission.USER_ADD_TEMP_PREFIX, Predicate.notInRange(3, 5)); Permission.USER_ADD_TEMP_PREFIX, Predicate.notInRange(3, 5));
} }

2
common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserAddTempSuffix.java
View File

@ -39,7 +39,7 @@ import java.util.List;
public class UserAddTempSuffix extends SubCommand<User> { public class UserAddTempSuffix extends SubCommand<User> {
public UserAddTempSuffix() { public UserAddTempSuffix() {
super("addtempsuffix", "Adds a suffix to the user temporarily", "/%s user <user> addtempsuffix <priority> <suffix> <duration> [server] [world]", super("addtempsuffix", "Adds a suffix to the user temporarily", "<priority> <suffix> <duration> [server] [world]",
Permission.USER_ADD_TEMP_SUFFIX, Predicate.notInRange(3, 5)); Permission.USER_ADD_TEMP_SUFFIX, Predicate.notInRange(3, 5));
} }

3
common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserChatMeta.java
View File

@ -38,8 +38,7 @@ import java.util.TreeSet;
public class UserChatMeta extends SubCommand<User> { public class UserChatMeta extends SubCommand<User> {
public UserChatMeta() { public UserChatMeta() {
super("chatmeta", "Displays a users chat meta", "/%s user <user> chatmeta", Permission.USER_CHATMETA, super("chatmeta", "Displays a users chat meta", "", Permission.USER_CHATMETA, Predicate.alwaysFalse());
Predicate.alwaysFalse());
} }
@Override @Override

3
common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserClear.java
View File

@ -36,8 +36,7 @@ import java.util.List;
public class UserClear extends SubCommand<User> { public class UserClear extends SubCommand<User> {
public UserClear() { public UserClear() {
super("clear", "Clears a users permissions and groups", "/%s user <user> clear", Permission.USER_CLEAR, super("clear", "Clears a users permissions and groups", "", Permission.USER_CLEAR, Predicate.alwaysFalse());
Predicate.alwaysFalse());
} }
@Override @Override

3
common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserDemote.java
View File

@ -41,8 +41,7 @@ import java.util.List;
public class UserDemote extends SubCommand<User> { public class UserDemote extends SubCommand<User> {
public UserDemote() { public UserDemote() {
super("demote", "Demotes a user along a track", "/%s user <user> demote <track>", Permission.USER_DEMOTE, super("demote", "Demotes a user along a track", "<track>", Permission.USER_DEMOTE, Predicate.not(1));
Predicate.not(1));
} }
@Override @Override

3
common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserGetUUID.java
View File

@ -35,8 +35,7 @@ import java.util.List;
public class UserGetUUID extends SubCommand<User> { public class UserGetUUID extends SubCommand<User> {
public UserGetUUID() { public UserGetUUID() {
super("getuuid", "Get the UUID of a user", "/%s user <user> getuuid", Permission.USER_GETUUID, super("getuuid", "Get the UUID of a user", "", Permission.USER_GETUUID, Predicate.alwaysFalse());
Predicate.alwaysFalse());
} }
@Override @Override

5
common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserHasPerm.java
View File

@ -33,9 +33,8 @@ import java.util.List;
public class UserHasPerm extends SubCommand<User> { public class UserHasPerm extends SubCommand<User> {
public UserHasPerm() { public UserHasPerm() {
super("haspermission", "Checks to see if a user has a certain permission node", super("haspermission", "Checks to see if a user has a certain permission node", "<node> [server] [world]",
"/%s user <user> haspermission <node> [server] [world]", Permission.USER_HASPERMISSION, Permission.USER_HASPERMISSION, Predicate.notInRange(1, 3));
Predicate.notInRange(1, 3));
} }
@Override @Override

2
common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserInfo.java
View File

@ -35,7 +35,7 @@ import java.util.List;
public class UserInfo extends SubCommand<User> { public class UserInfo extends SubCommand<User> {
public UserInfo() { public UserInfo() {
super("info", "Gives info about the user", "/%s user <user> info", Permission.USER_INFO, Predicate.alwaysFalse()); super("info", "Gives info about the user", "", Permission.USER_INFO, Predicate.alwaysFalse());
} }
@Override @Override

3
common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserInheritsPerm.java
View File

@ -34,8 +34,7 @@ import java.util.List;
public class UserInheritsPerm extends SubCommand<User> { public class UserInheritsPerm extends SubCommand<User> {
public UserInheritsPerm() { public UserInheritsPerm() {
super("inheritspermission", "Checks to see if a user inherits a certain permission node", super("inheritspermission", "Checks to see if a user inherits a certain permission node",
"/%s user <user> inheritspermission <node> [server] [world]", Permission.USER_INHERITSPERMISSION, "<node> [server] [world]", Permission.USER_INHERITSPERMISSION, Predicate.notInRange(1, 3));
Predicate.notInRange(1, 3));
} }
@Override @Override

3
common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserListGroups.java
View File

@ -32,8 +32,7 @@ import java.util.List;
public class UserListGroups extends SubCommand<User> { public class UserListGroups extends SubCommand<User> {
public UserListGroups() { public UserListGroups() {
super("listgroups", "Lists the groups a user is in", "/%s user <user> listgroups", super("listgroups", "Lists the groups a user is in", "", Permission.USER_LISTGROUPS, Predicate.alwaysFalse());
Permission.USER_LISTGROUPS, Predicate.alwaysFalse());
} }
@Override @Override

3
common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserListNodes.java
View File

@ -32,8 +32,7 @@ import java.util.List;
public class UserListNodes extends SubCommand<User> { public class UserListNodes extends SubCommand<User> {
public UserListNodes() { public UserListNodes() {
super("listnodes", "Lists the permission nodes the user has", "/%s user <user> listnodes", super("listnodes", "Lists the permission nodes the user has", "", Permission.USER_LISTNODES, Predicate.alwaysFalse());
Permission.USER_LISTNODES, Predicate.alwaysFalse());
} }
@Override @Override

3
common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserPromote.java
View File

@ -41,8 +41,7 @@ import java.util.List;
public class UserPromote extends SubCommand<User> { public class UserPromote extends SubCommand<User> {
public UserPromote() { public UserPromote() {
super("promote", "Promotes the user along a track", "/%s user <user> promote <track>", Permission.USER_PROMOTE, super("promote", "Promotes the user along a track", "<track>", Permission.USER_PROMOTE, Predicate.not(1));
Predicate.not(1));
} }
@Override @Override

6
common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserRemoveGroup.java
View File

@ -38,8 +38,8 @@ import java.util.List;
public class UserRemoveGroup extends SubCommand<User> { public class UserRemoveGroup extends SubCommand<User> {
public UserRemoveGroup() { public UserRemoveGroup() {
super("removegroup", "Removes a user from a group", "/%s user <user> removegroup <group> [server] [world]", super("removegroup", "Removes a user from a group", "<group> [server] [world]", Permission.USER_REMOVEGROUP,
Permission.USER_REMOVEGROUP, Predicate.notInRange(1, 3)); Predicate.notInRange(1, 3));
} }
@Override @Override
@ -47,7 +47,7 @@ public class UserRemoveGroup extends SubCommand<User> {
String groupName = args.get(0).toLowerCase(); String groupName = args.get(0).toLowerCase();
if (ArgumentChecker.checkNode(groupName)) { if (ArgumentChecker.checkNode(groupName)) {
sendUsage(sender, label); sendUsage(sender);
return CommandResult.INVALID_ARGS; return CommandResult.INVALID_ARGS;
} }

2
common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserRemovePrefix.java
View File

@ -38,7 +38,7 @@ import java.util.List;
public class UserRemovePrefix extends SubCommand<User> { public class UserRemovePrefix extends SubCommand<User> {
public UserRemovePrefix() { public UserRemovePrefix() {
super("removeprefix", "Removes a prefix from a user", "/%s user <user> removeprefix <priority> <prefix> [server] [world]", super("removeprefix", "Removes a prefix from a user", "<priority> <prefix> [server] [world]",
Permission.USER_REMOVEPREFIX, Predicate.notInRange(2, 4)); Permission.USER_REMOVEPREFIX, Predicate.notInRange(2, 4));
} }

2
common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserRemoveSuffix.java
View File

@ -38,7 +38,7 @@ import java.util.List;
public class UserRemoveSuffix extends SubCommand<User> { public class UserRemoveSuffix extends SubCommand<User> {
public UserRemoveSuffix() { public UserRemoveSuffix() {
super("removesuffix", "Removes a suffix from a user", "/%s user <user> removesuffix <priority> <suffix> [server] [world]", super("removesuffix", "Removes a suffix from a user", "<priority> <suffix> [server] [world]",
Permission.USER_REMOVESUFFIX, Predicate.notInRange(2, 4)); Permission.USER_REMOVESUFFIX, Predicate.notInRange(2, 4));
} }

7
common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserRemoveTempGroup.java
View File

@ -38,9 +38,8 @@ import java.util.List;
public class UserRemoveTempGroup extends SubCommand<User> { public class UserRemoveTempGroup extends SubCommand<User> {
public UserRemoveTempGroup() { public UserRemoveTempGroup() {
super("removetempgroup", "Removes a user from a temporary group", super("removetempgroup", "Removes a user from a temporary group", "<group> [server] [world]",
"/%s user <user> removetempgroup <group> [server] [world]", Permission.USER_REMOVETEMPGROUP, Permission.USER_REMOVETEMPGROUP, Predicate.notInRange(1, 3));
Predicate.notInRange(1, 3));
} }
@Override @Override
@ -48,7 +47,7 @@ public class UserRemoveTempGroup extends SubCommand<User> {
String groupName = args.get(0).toLowerCase(); String groupName = args.get(0).toLowerCase();
if (ArgumentChecker.checkNode(groupName)) { if (ArgumentChecker.checkNode(groupName)) {
sendUsage(sender, label); sendUsage(sender);
return CommandResult.INVALID_ARGS; return CommandResult.INVALID_ARGS;
} }

2
common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserRemoveTempPrefix.java
View File

@ -38,7 +38,7 @@ import java.util.List;
public class UserRemoveTempPrefix extends SubCommand<User> { public class UserRemoveTempPrefix extends SubCommand<User> {
public UserRemoveTempPrefix() { public UserRemoveTempPrefix() {
super("removetempprefix", "Removes a temporary prefix from a user", "/%s user <user> removetempprefix <priority> <prefix> [server] [world]", super("removetempprefix", "Removes a temporary prefix from a user", "<priority> <prefix> [server] [world]",
Permission.USER_REMOVE_TEMP_PREFIX, Predicate.notInRange(2, 4)); Permission.USER_REMOVE_TEMP_PREFIX, Predicate.notInRange(2, 4));
} }

2
common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserRemoveTempSuffix.java
View File

@ -38,7 +38,7 @@ import java.util.List;
public class UserRemoveTempSuffix extends SubCommand<User> { public class UserRemoveTempSuffix extends SubCommand<User> {
public UserRemoveTempSuffix() { public UserRemoveTempSuffix() {
super("removetempsuffix", "Removes a temporary suffix from a user", "/%s user <user> removetempsuffix <priority> <suffix> [server] [world]", super("removetempsuffix", "Removes a temporary suffix from a user", "<priority> <suffix> [server] [world]",
Permission.USER_REMOVE_TEMP_SUFFIX, Predicate.notInRange(2, 4)); Permission.USER_REMOVE_TEMP_SUFFIX, Predicate.notInRange(2, 4));
} }

7
common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserSetPermission.java
View File

@ -38,8 +38,7 @@ import java.util.List;
public class UserSetPermission extends SubCommand<User> { public class UserSetPermission extends SubCommand<User> {
public UserSetPermission() { public UserSetPermission() {
super("set", "Sets a permission for a user", super("set", "Sets a permission for a user", "<node> <true|false> [server] [world]", Permission.USER_SETPERMISSION,
"/%s user <user> set <node> <true|false> [server] [world]", Permission.USER_SETPERMISSION,
Predicate.notInRange(2, 4)); Predicate.notInRange(2, 4));
} }
@ -49,7 +48,7 @@ public class UserSetPermission extends SubCommand<User> {
String bool = args.get(1).toLowerCase(); String bool = args.get(1).toLowerCase();
if (ArgumentChecker.checkNode(node)) { if (ArgumentChecker.checkNode(node)) {
sendUsage(sender, label); sendUsage(sender);
return CommandResult.INVALID_ARGS; return CommandResult.INVALID_ARGS;
} }
@ -59,7 +58,7 @@ public class UserSetPermission extends SubCommand<User> {
} }
if (!bool.equalsIgnoreCase("true") && !bool.equalsIgnoreCase("false")) { if (!bool.equalsIgnoreCase("true") && !bool.equalsIgnoreCase("false")) {
sendUsage(sender, label); sendUsage(sender);
return CommandResult.INVALID_ARGS; return CommandResult.INVALID_ARGS;
} }

3
common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserSetPrimaryGroup.java
View File

@ -38,8 +38,7 @@ import java.util.List;
public class UserSetPrimaryGroup extends SubCommand<User> { public class UserSetPrimaryGroup extends SubCommand<User> {
public UserSetPrimaryGroup() { public UserSetPrimaryGroup() {
super("setprimarygroup", "Sets a users primary group", super("setprimarygroup", "Sets a users primary group", "<group>", Permission.USER_SETPRIMARYGROUP, Predicate.not(1));
"/%s user <user> setprimarygroup <group>", Permission.USER_SETPRIMARYGROUP, Predicate.not(1));
} }
@Override @Override

7
common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserSetTempPermission.java
View File

@ -39,8 +39,7 @@ import java.util.List;
public class UserSetTempPermission extends SubCommand<User> { public class UserSetTempPermission extends SubCommand<User> {
public UserSetTempPermission() { public UserSetTempPermission() {
super("settemp", "Sets a temporary permission for a user", super("settemp", "Sets a temporary permission for a user", "<node> <true|false> <duration> [server] [world]",
"/%s user <user> settemp <node> <true|false> <duration> [server] [world]",
Permission.USER_SET_TEMP_PERMISSION, Predicate.notInRange(3, 5)); Permission.USER_SET_TEMP_PERMISSION, Predicate.notInRange(3, 5));
} }
@ -50,7 +49,7 @@ public class UserSetTempPermission extends SubCommand<User> {
String bool = args.get(1).toLowerCase(); String bool = args.get(1).toLowerCase();
if (ArgumentChecker.checkNode(node)) { if (ArgumentChecker.checkNode(node)) {
sendUsage(sender, label); sendUsage(sender);
return CommandResult.INVALID_ARGS; return CommandResult.INVALID_ARGS;
} }
@ -60,7 +59,7 @@ public class UserSetTempPermission extends SubCommand<User> {
} }
if (!bool.equalsIgnoreCase("true") && !bool.equalsIgnoreCase("false")) { if (!bool.equalsIgnoreCase("true") && !bool.equalsIgnoreCase("false")) {
sendUsage(sender, label); sendUsage(sender);
return CommandResult.INVALID_ARGS; return CommandResult.INVALID_ARGS;
} }

3
common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserShowPos.java
View File

@ -34,8 +34,7 @@ import java.util.List;
public class UserShowPos extends SubCommand<User> { public class UserShowPos extends SubCommand<User> {
public UserShowPos() { public UserShowPos() {
super("showpos", "Shows a users position on a track", "/%s user <user> showpos <track>", Permission.USER_SHOWPOS, super("showpos", "Shows a users position on a track", "<track>", Permission.USER_SHOWPOS, Predicate.not(1));
Predicate.not(1));
} }
@Override @Override

4
common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserShowTracks.java
View File

@ -34,8 +34,8 @@ import java.util.stream.Collectors;
public class UserShowTracks extends SubCommand<User> { public class UserShowTracks extends SubCommand<User> {
public UserShowTracks() { public UserShowTracks() {
super("showtracks", "Lists the tracks that this user's primary group features on", "/%s user <user> showtracks", super("showtracks", "Lists the tracks that this user's primary group features on", "", Permission.USER_SHOWTRACKS,
Permission.USER_SHOWTRACKS, Predicate.alwaysFalse()); Predicate.alwaysFalse());
} }
@Override @Override

6
common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserUnSetPermission.java
View File

@ -38,8 +38,8 @@ import java.util.List;
public class UserUnSetPermission extends SubCommand<User> { public class UserUnSetPermission extends SubCommand<User> {
public UserUnSetPermission() { public UserUnSetPermission() {
super("unset", "Unsets a permission for a user", super("unset", "Unsets a permission for a user", "<node> [server] [world]", Permission.USER_UNSETPERMISSION,
"/%s user <user> unset <node> [server] [world]", Permission.USER_UNSETPERMISSION, Predicate.notInRange(1, 3)); Predicate.notInRange(1, 3));
} }
@Override @Override
@ -47,7 +47,7 @@ public class UserUnSetPermission extends SubCommand<User> {
String node = args.get(0).replace("{SPACE}", " "); String node = args.get(0).replace("{SPACE}", " ");
if (ArgumentChecker.checkNode(node)) { if (ArgumentChecker.checkNode(node)) {
sendUsage(sender, label); sendUsage(sender);
return CommandResult.INVALID_ARGS; return CommandResult.INVALID_ARGS;
} }

7
common/src/main/java/me/lucko/luckperms/commands/user/subcommands/UserUnsetTempPermission.java
View File

@ -38,9 +38,8 @@ import java.util.List;
public class UserUnsetTempPermission extends SubCommand<User> { public class UserUnsetTempPermission extends SubCommand<User> {
public UserUnsetTempPermission() { public UserUnsetTempPermission() {
super("unsettemp", "Unsets a temporary permission for a user", super("unsettemp", "Unsets a temporary permission for a user", "<node> [server] [world]",
"/%s user <user> unsettemp <node> [server] [world]", Permission.USER_UNSET_TEMP_PERMISSION, Permission.USER_UNSET_TEMP_PERMISSION, Predicate.notInRange(1, 3));
Predicate.notInRange(1, 3));
} }
@Override @Override
@ -48,7 +47,7 @@ public class UserUnsetTempPermission extends SubCommand<User> {
String node = args.get(0).replace("{SPACE}", " "); String node = args.get(0).replace("{SPACE}", " ");
if (ArgumentChecker.checkNode(node)) { if (ArgumentChecker.checkNode(node)) {
sendUsage(sender, label); sendUsage(sender);
return CommandResult.INVALID_ARGS; return CommandResult.INVALID_ARGS;
} }