Skip to content

Commit bc6acfe

Browse files
authored
Command Trees v2 (#6230)
My take on command trees which fit the vibe of our codebase better than #5384 imo. Closes #5384
1 parent d16aec1 commit bc6acfe

File tree

77 files changed

+1317
-1045
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+1317
-1045
lines changed

Essentials/src/main/java/com/earth2me/essentials/commands/Commandafk.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ private void toggleAfk(final User sender, final User user, final String message)
106106
@Override
107107
protected List<String> getTabCompleteOptions(final Server server, final CommandSource sender, final String commandLabel, final String[] args) {
108108
if (args.length == 1 && sender.isAuthorized("essentials.afk.others")) {
109-
return getPlayers(server, sender);
109+
return getPlayers(sender);
110110
} else {
111111
return Collections.emptyList();
112112
}

Essentials/src/main/java/com/earth2me/essentials/commands/Commandback.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ private void teleportBack(final CommandSource sender, final User user, final Str
7777
@Override
7878
protected List<String> getTabCompleteOptions(final Server server, final User user, final String commandLabel, final String[] args) {
7979
if (user.isAuthorized("essentials.back.others") && args.length == 1) {
80-
return getPlayers(server, user);
80+
return getPlayers(user);
8181
} else {
8282
return Collections.emptyList();
8383
}

Essentials/src/main/java/com/earth2me/essentials/commands/Commandbalance.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public void run(final Server server, final User user, final String commandLabel,
3939
@Override
4040
protected List<String> getTabCompleteOptions(final Server server, final CommandSource sender, final String commandLabel, final String[] args) {
4141
if (args.length == 1 && sender.isAuthorized("essentials.balance.others")) {
42-
return getPlayers(server, sender);
42+
return getPlayers(sender);
4343
} else {
4444
return Collections.emptyList();
4545
}

Essentials/src/main/java/com/earth2me/essentials/commands/Commandban.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public void run(final Server server, final CommandSource sender, final String co
6868
@Override
6969
protected List<String> getTabCompleteOptions(final Server server, final CommandSource sender, final String commandLabel, final String[] args) {
7070
if (args.length == 1) {
71-
return getPlayers(server, sender);
71+
return getPlayers(sender);
7272
} else {
7373
return Collections.emptyList();
7474
}

Essentials/src/main/java/com/earth2me/essentials/commands/Commandbanip.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public void run(final Server server, final CommandSource sender, final String co
7070
protected List<String> getTabCompleteOptions(final Server server, final CommandSource sender, final String commandLabel, final String[] args) {
7171
if (args.length == 1) {
7272
// TODO: Also list IP addresses?
73-
return getPlayers(server, sender);
73+
return getPlayers(sender);
7474
} else {
7575
return Collections.emptyList();
7676
}

Essentials/src/main/java/com/earth2me/essentials/commands/Commandbook.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ protected List<String> getTabCompleteOptions(final Server server, final User use
106106
}
107107
return options;
108108
} else if (args.length == 2 && args[0].equalsIgnoreCase("author") && user.isAuthorized("essentials.book.author")) {
109-
final List<String> options = getPlayers(server, user);
109+
final List<String> options = getPlayers(user);
110110
options.add("Herobrine"); // #EasterEgg
111111
return options;
112112
} else {

Essentials/src/main/java/com/earth2me/essentials/commands/Commandburn.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ protected void run(final Server server, final CommandSource sender, final String
2626
@Override
2727
protected List<String> getTabCompleteOptions(final Server server, final CommandSource sender, final String commandLabel, final String[] args) {
2828
if (args.length == 1) {
29-
return getPlayers(server, sender);
29+
return getPlayers(sender);
3030
} else if (args.length == 2) {
3131
return COMMON_DURATIONS;
3232
} else {

Essentials/src/main/java/com/earth2me/essentials/commands/Commandclearinventory.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ protected void clearHandler(final CommandSource sender, final Player player, fin
153153
protected List<String> getTabCompleteOptions(final Server server, final User user, final String commandLabel, final String[] args) {
154154
if (user.isAuthorized("essentials.clearinventory.others")) {
155155
if (args.length == 1) {
156-
final List<String> options = getPlayers(server, user);
156+
final List<String> options = getPlayers(user);
157157
if (user.isAuthorized("essentials.clearinventory.all") || user.isAuthorized("essentials.clearinventory.multiple")) {
158158
// Assume that nobody will have the 'all' permission without the 'others' permission
159159
options.add("*");
@@ -182,7 +182,7 @@ protected List<String> getTabCompleteOptions(final Server server, final User use
182182
@Override
183183
protected List<String> getTabCompleteOptions(final Server server, final CommandSource sender, final String commandLabel, final String[] args) {
184184
if (args.length == 1) {
185-
final List<String> options = getPlayers(server, sender);
185+
final List<String> options = getPlayers(sender);
186186
options.add("*");
187187
return options;
188188
} else if (args.length == 2) {

Essentials/src/main/java/com/earth2me/essentials/commands/Commanddelhome.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ protected List<String> getTabCompleteOptions(final Server server, final CommandS
8787
if (canDelOthers) {
8888
final int sepIndex = args[0].indexOf(':');
8989
if (sepIndex < 0) {
90-
getPlayers(server, sender).forEach(player -> homes.add(player + ":"));
90+
getPlayers(sender).forEach(player -> homes.add(player + ":"));
9191
} else {
9292
final String namePart = args[0].substring(0, sepIndex);
9393
final User otherUser;

Essentials/src/main/java/com/earth2me/essentials/commands/Commandeco.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ protected List<String> getTabCompleteOptions(final Server server, final CommandS
8787
}
8888
return options;
8989
} else if (args.length == 2) {
90-
return getPlayers(server, sender);
90+
return getPlayers(sender);
9191
} else if (args.length == 3 && !args[0].equalsIgnoreCase(EcoCommands.RESET.name())) {
9292
if (args[0].equalsIgnoreCase(EcoCommands.SET.name())) {
9393
return Lists.newArrayList("0", ess.getSettings().getStartingBalance().toString());

0 commit comments

Comments
 (0)