From 8e25dac340a07f7a57a13bdde53b0605779ea920 Mon Sep 17 00:00:00 2001 From: Luck Date: Mon, 15 Oct 2018 22:00:05 +0100 Subject: Implement tab completion, update readme --- .../spark/bungeecord/SparkBungeeCordPlugin.java | 43 +++++++++++++++------- spark-bungeecord/src/main/resources/bungee.yml | 2 +- 2 files changed, 31 insertions(+), 14 deletions(-) (limited to 'spark-bungeecord/src') diff --git a/spark-bungeecord/src/main/java/me/lucko/spark/bungeecord/SparkBungeeCordPlugin.java b/spark-bungeecord/src/main/java/me/lucko/spark/bungeecord/SparkBungeeCordPlugin.java index 4d54b42..da8ebf9 100644 --- a/spark-bungeecord/src/main/java/me/lucko/spark/bungeecord/SparkBungeeCordPlugin.java +++ b/spark-bungeecord/src/main/java/me/lucko/spark/bungeecord/SparkBungeeCordPlugin.java @@ -32,6 +32,9 @@ import net.md_5.bungee.api.chat.TextComponent; import net.md_5.bungee.api.connection.ProxiedPlayer; import net.md_5.bungee.api.plugin.Command; import net.md_5.bungee.api.plugin.Plugin; +import net.md_5.bungee.api.plugin.TabExecutor; + +import java.util.Collections; public class SparkBungeeCordPlugin extends Plugin { @@ -43,7 +46,7 @@ public class SparkBungeeCordPlugin extends Plugin { private void broadcast(BaseComponent... msg) { getProxy().getConsole().sendMessage(msg); for (ProxiedPlayer player : getProxy().getPlayers()) { - if (player.hasPermission("spark.profiler")) { + if (player.hasPermission("spark")) { player.sendMessage(msg); } } @@ -56,7 +59,7 @@ public class SparkBungeeCordPlugin extends Plugin { @Override public String getLabel() { - return "sparkbungee"; + return "sparkb"; } @Override @@ -95,18 +98,32 @@ public class SparkBungeeCordPlugin extends Plugin { @Override public void onEnable() { - getProxy().getPluginManager().registerCommand(this, new Command("sparkbungee", null, "gprofiler") { - @Override - public void execute(CommandSender sender, String[] args) { - if (!sender.hasPermission("spark.profiler")) { - TextComponent msg = new TextComponent("You do not have permission to use this command."); - msg.setColor(ChatColor.RED); - sender.sendMessage(msg); - return; - } + getProxy().getPluginManager().registerCommand(this, new SparkCommand()); + } + + private final class SparkCommand extends Command implements TabExecutor { + public SparkCommand() { + super("sparkb", null, "sparkbungee"); + } + + @Override + public void execute(CommandSender sender, String[] args) { + if (!sender.hasPermission("spark")) { + TextComponent msg = new TextComponent("You do not have permission to use this command."); + msg.setColor(ChatColor.RED); + sender.sendMessage(msg); + return; + } + + SparkBungeeCordPlugin.this.sparkPlatform.executeCommand(sender, args); + } - SparkBungeeCordPlugin.this.sparkPlatform.executeCommand(sender, args); + @Override + public Iterable onTabComplete(CommandSender sender, String[] args) { + if (!sender.hasPermission("spark")) { + return Collections.emptyList(); } - }); + return SparkBungeeCordPlugin.this.sparkPlatform.tabCompleteCommand(sender, args); + } } } diff --git a/spark-bungeecord/src/main/resources/bungee.yml b/spark-bungeecord/src/main/resources/bungee.yml index fa65fbc..2194180 100644 --- a/spark-bungeecord/src/main/resources/bungee.yml +++ b/spark-bungeecord/src/main/resources/bungee.yml @@ -1,5 +1,5 @@ name: spark version: ${pluginVersion} -description: Spark is a CPU profiling plugin based on sk89q's WarmRoast profiler +description: ${pluginDesc} author: Luck, sk89q main: me.lucko.spark.bungeecord.SparkBungeeCordPlugin -- cgit