YouHaveTrouble/CommandWhitelist
1
0
Fork 0
mirror of https://github.com/YouHaveTrouble/CommandWhitelist.git synced 2026-05-12 06:26:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

special case for velocity because it's special

Browse Source
This commit is contained in:
YouHaveTrouble
2022-02-22 20:26:42 +01:00
parent 3697bc72ce
commit ebc8a823f2
4 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CommandWhitelistBukkit/src/main/java/eu/endermite/commandwhitelist/bukkit/command/MainCommandExecutor.java
+1 -1
View File
@@ -73,6 +73,6 @@ public class MainCommandExecutor implements TabExecutor {
@Override @Override
public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) { public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
List<String> serverCommands = new ArrayList<>(Bukkit.getCommandMap().getKnownCommands().keySet()); List<String> serverCommands = new ArrayList<>(Bukkit.getCommandMap().getKnownCommands().keySet());
return CWCommand.commandSuggestions(CommandWhitelistBukkit.getConfigCache(), serverCommands, args, sender.hasPermission(CWPermission.RELOAD.permission()), sender.hasPermission(CWPermission.ADMIN.permission())); return CWCommand.commandSuggestions(CommandWhitelistBukkit.getConfigCache(), serverCommands, args, sender.hasPermission(CWPermission.RELOAD.permission()), sender.hasPermission(CWPermission.ADMIN.permission()), CWCommand.ImplementationType.BUKKIT);
} }
} }
CommandWhitelistCommon/src/main/java/eu/endermite/commandwhitelist/common/commands/CWCommand.java
+25 -1
View File
@@ -61,10 +61,34 @@ public class CWCommand {
ADD, REMOVE, HELP, RELOAD ADD, REMOVE, HELP, RELOAD
} }
public static List<String> commandSuggestions(ConfigCache config, Collection<String> serverCommands, String[] args, boolean reloadPerm, boolean adminPerm) { public enum ImplementationType {
BUKKIT, WATERFALL, VELOCITY
}
public static List<String> commandSuggestions(
ConfigCache config,
Collection<String> serverCommands,
String[] args, boolean reloadPerm,
boolean adminPerm,
ImplementationType implementationType
) {
List<String> list = new ArrayList<>(); List<String> list = new ArrayList<>();
switch (args.length) { switch (args.length) {
case 0:
// thanks velocity for handling completions entirely different from everything else
if (implementationType.equals(ImplementationType.VELOCITY)) {
list.add("help");
if (reloadPerm)
list.add("reload");
if (adminPerm) {
list.add("add");
list.add("remove");
}
}
return list;
case 1: case 1:
if ("help".startsWith(args[0]))
list.add("help");
if ("reload".startsWith(args[0]) && reloadPerm) if ("reload".startsWith(args[0]) && reloadPerm)
list.add("reload"); list.add("reload");
if ("add".startsWith(args[0]) && adminPerm) if ("add".startsWith(args[0]) && adminPerm)
CommandWhitelistVelocity/src/main/java/eu/endermite/commandwhitelist/velocity/command/VelocityMainCommand.java
+1 -1
View File
@@ -77,7 +77,7 @@ public class VelocityMainCommand implements SimpleCommand {
String[] args = invocation.arguments(); String[] args = invocation.arguments();
return CompletableFuture.supplyAsync(() -> { return CompletableFuture.supplyAsync(() -> {
List<String> serverCommands = new ArrayList<>(); List<String> serverCommands = new ArrayList<>();
return CWCommand.commandSuggestions(CommandWhitelistVelocity.getConfigCache(), serverCommands, args, source.hasPermission(CWPermission.RELOAD.permission()), source.hasPermission(CWPermission.ADMIN.permission())); return CWCommand.commandSuggestions(CommandWhitelistVelocity.getConfigCache(), serverCommands, args, source.hasPermission(CWPermission.RELOAD.permission()), source.hasPermission(CWPermission.ADMIN.permission()), CWCommand.ImplementationType.VELOCITY);
}); });
} }
} }
CommandWhitelistWaterfall/src/main/java/eu/endermite/commandwhitelist/waterfall/command/BungeeMainCommand.java
+1 -1
View File
@@ -84,6 +84,6 @@ public class BungeeMainCommand extends Command implements TabExecutor {
for (Map.Entry<String, Command> command : CommandWhitelistWaterfall.getPlugin().getProxy().getPluginManager().getCommands()) { for (Map.Entry<String, Command> command : CommandWhitelistWaterfall.getPlugin().getProxy().getPluginManager().getCommands()) {
serverCommands.add(command.getValue().getName()); serverCommands.add(command.getValue().getName());
} }
return CWCommand.commandSuggestions(CommandWhitelistWaterfall.getConfigCache(), serverCommands, args, sender.hasPermission(CWPermission.RELOAD.permission()), sender.hasPermission(CWPermission.ADMIN.permission())); return CWCommand.commandSuggestions(CommandWhitelistWaterfall.getConfigCache(), serverCommands, args, sender.hasPermission(CWPermission.RELOAD.permission()), sender.hasPermission(CWPermission.ADMIN.permission()), CWCommand.ImplementationType.WATERFALL);
} }
} }