Add /velocitywhitelist command

resolve #1

Author: Fallen-Breath

README.md

@@ -60,6 +60,8 @@ uuids:
 
 Require permission `velocitywhitelist.command`
 
+### Whitelist / Blacklist Control
+
 - `/whitelist` and `/vwhitelist` (alias) commands are for whitelist control
 - `/blacklist` and `/vblacklist` (alias) commands are for whitelist control
 
@@ -78,6 +80,11 @@ For player operation commands, `<value>` has different meaning depends on the id
   If it's a player name, and the player is connected to the proxy, the player's UUID will be used, 
   otherwise it will try to fetch and use the player's online UUID from mojang API
 
+### Plugin Control
+
+- `/velocitywhitelist`: Show plugin information
+- `/velocitywhitelist reload`: Reload config, whitelist and blacklist
+
 ## TODO
 
 - [x] UUID support

src/main/java/me/fallenbreath/velocitywhitelist/VelocityWhitelistPlugin.java

@@ -7,6 +7,7 @@
 import com.velocitypowered.api.plugin.Plugin;
 import com.velocitypowered.api.plugin.annotation.DataDirectory;
 import com.velocitypowered.api.proxy.ProxyServer;
+import me.fallenbreath.velocitywhitelist.command.PluginControlCommand;
 import me.fallenbreath.velocitywhitelist.command.WhitelistCommand;
 import me.fallenbreath.velocitywhitelist.config.Configuration;
 import org.slf4j.Logger;
@@ -57,6 +58,7 @@ public void onProxyInitialization(ProxyInitializeEvent event)
 
 		this.server.getEventManager().register(this, LoginEvent.class, this.whitelistManager::onPlayerLogin);
 		new WhitelistCommand(this.config, this.whitelistManager).register(this.server.getCommandManager());
+		new PluginControlCommand(this.logger, this.config, this.whitelistManager).register(this.server.getCommandManager());
 	}
 
 	private boolean prepareConfig()

src/main/java/me/fallenbreath/velocitywhitelist/command/PluginControlCommand.java

@@ -0,0 +1,65 @@
+package me.fallenbreath.velocitywhitelist.command;
+
+import com.velocitypowered.api.command.BrigadierCommand;
+import com.velocitypowered.api.command.CommandManager;
+import com.velocitypowered.api.command.CommandSource;
+import me.fallenbreath.velocitywhitelist.PluginMeta;
+import me.fallenbreath.velocitywhitelist.WhitelistManager;
+import me.fallenbreath.velocitywhitelist.config.Configuration;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.event.ClickEvent;
+import net.kyori.adventure.text.format.NamedTextColor;
+import net.kyori.adventure.text.format.TextDecoration;
+import org.slf4j.Logger;
+
+import static me.fallenbreath.velocitywhitelist.command.CommandUtils.literal;
+
+public class PluginControlCommand
+{
+	private final Logger logger;
+	private final Configuration config;
+	private final WhitelistManager manager;
+
+	public PluginControlCommand(Logger logger, Configuration config, WhitelistManager whitelistManager)
+	{
+		this.logger = logger;
+		this.config = config;
+		this.manager = whitelistManager;
+	}
+
+	@SuppressWarnings("deprecation")  // Next time for sure...
+	public void register(CommandManager commandManager)
+	{
+		var root = literal("velocitywhitelist").
+				requires(s -> s.hasPermission(PluginMeta.ID + ".command")).
+				executes(c -> showPluginInfo(c.getSource())).
+				then(literal("reload").
+						executes(c -> reloadAll(c.getSource()))
+				);
+		commandManager.register(new BrigadierCommand(root.build()));
+	}
+
+	private int reloadAll(CommandSource source)
+	{
+		try
+		{
+			this.config.reload();
+			this.manager.loadLists();
+			source.sendMessage(Component.text("Reloaded config, whitelist and blacklist"));
+			return 1;
+		}
+		catch (Exception e)
+		{
+			this.logger.error("Failed to reload", e);
+			source.sendMessage(Component.text("Reload failed, see console for details"));
+		}
+		return 0;
+	}
+
+	private int showPluginInfo(CommandSource source)
+	{
+		source.sendMessage(Component.text(String.format("%s v%s", PluginMeta.NAME, PluginMeta.VERSION)));
+		source.sendMessage(Component.text(PluginMeta.REPOSITORY_URL, NamedTextColor.BLUE, TextDecoration.UNDERLINED).clickEvent(ClickEvent.openUrl(PluginMeta.REPOSITORY_URL)));
+		return 0;
+	}
+}

src/main/java/me/fallenbreath/velocitywhitelist/command/WhitelistCommand.java

@@ -21,16 +21,16 @@
 public class WhitelistCommand
 {
 	private final Configuration config;
-	private final WhitelistManager whitelistManager;
+	private final WhitelistManager manager;
 
 	public WhitelistCommand(Configuration config, WhitelistManager whitelistManager)
 	{
 		this.config = config;
-		this.whitelistManager = whitelistManager;
+		this.manager = whitelistManager;
 	}
 
 	@SuppressWarnings("deprecation")  // Next time for sure...
-	private void registerOne(CommandManager commandManager, String[] roots, Supplier<@Nullable PlayerList> listSupplier, Runnable listReloader)
+	private void registerOne(CommandManager commandManager, String[] roots, Supplier<Boolean> enableStateGetter, Supplier<@Nullable PlayerList> listSupplier, Runnable listReloader)
 	{
 		if (roots.length == 0)
 		{
@@ -39,15 +39,15 @@ private void registerOne(CommandManager commandManager, String[] roots, Supplier
 
 		var root = literal(roots[0]).
 				requires(s -> s.hasPermission(PluginMeta.ID + ".command")).
-				executes(c -> showPluginInfo(c.getSource())).
+				executes(c -> showPluginInfo(c.getSource(), listSupplier.get(), enableStateGetter.get())).
 				then(literal("add").
 						then(argument("name", word()).
 								executes(c -> addWhitelist(c.getSource(), listSupplier.get(), getString(c, "name")))
 						)
 				).
 				then(literal("remove").
 						then(argument("name", word()).
-								suggests((c, sb) -> suggestMatching(this.whitelistManager.getValuesForRemovalSuggestion(listSupplier.get()), sb)).
+								suggests((c, sb) -> suggestMatching(this.manager.getValuesForRemovalSuggestion(listSupplier.get()), sb)).
 								executes(c -> removeWhitelist(c.getSource(), listSupplier.get(), getString(c, "name")))
 						)
 				).
@@ -71,33 +71,38 @@ private void registerOne(CommandManager commandManager, String[] roots, Supplier
 
 	public void register(CommandManager commandManager)
 	{
-		this.registerOne(commandManager, new String[]{"whitelist", "vwhitelist"}, this.whitelistManager::getWhitelist, this.whitelistManager::loadWhitelist);
-		this.registerOne(commandManager, new String[]{"blacklist", "vblacklist"}, this.whitelistManager::getBlacklist, this.whitelistManager::loadBlacklist);
+		this.registerOne(commandManager, new String[]{"whitelist", "vwhitelist"}, this.config::isWhitelistEnabled, this.manager::getWhitelist, this.manager::loadWhitelist);
+		this.registerOne(commandManager, new String[]{"blacklist", "vblacklist"}, this.config::isBlacklistEnabled, this.manager::getBlacklist, this.manager::loadBlacklist);
 	}
 
-	private int showPluginInfo(CommandSource source)
+	private int showPluginInfo(CommandSource source, @Nullable PlayerList list, boolean enabled)
 	{
+		if (list == null)
+		{
+			source.sendMessage(Component.text("Uninitialized"));
+			return 0;
+		}
+
 		source.sendMessage(Component.text(String.format("%s v%s", PluginMeta.NAME, PluginMeta.VERSION)));
-		source.sendMessage(Component.text(String.format("Whitelist enabled: %s", this.config.isWhitelistEnabled())));
-		source.sendMessage(Component.text(String.format("Blacklist enabled: %s", this.config.isBlacklistEnabled())));
-		return 0;
+		source.sendMessage(Component.text(String.format("%s enabled: %s", list.getName(), enabled)));
+		return enabled ? 2 : 1;
 	}
 
-	private int addWhitelist(CommandSource source, @Nullable PlayerList list,  String name)
+	private int addWhitelist(CommandSource source, @Nullable PlayerList list, String name)
 	{
-		if (this.whitelistManager.addPlayer(source, list,name))
+		if (this.manager.addPlayer(source, list,name))
 		{
-			this.whitelistManager.saveList(list);
+			this.manager.saveList(list);
 			return 1;
 		}
 		return 0;
 	}
 
 	private int removeWhitelist(CommandSource source, @Nullable PlayerList list, String name)
 	{
-		if (this.whitelistManager.removePlayer(source, list, name))
+		if (this.manager.removePlayer(source, list, name))
 		{
-			this.whitelistManager.saveList(list);
+			this.manager.saveList(list);
 			return 1;
 		}
 		return 0;
@@ -111,7 +116,7 @@ private int listWhitelist(CommandSource source, @Nullable PlayerList list)
 			return 0;
 		}
 
-		var players = this.whitelistManager.getValuesForListing(list);
+		var players = this.manager.getValuesForListing(list);
 		source.sendMessage(Component.text(String.format("%s size: %d", list.getName(), players.size())));
 		source.sendMessage(Component.text(String.format("%s players: %s", list.getName(), Joiner.on(", ").join(players))));
 		return players.size();

src/main/java/me/fallenbreath/velocitywhitelist/config/Configuration.java

@@ -8,6 +8,7 @@
 import org.yaml.snakeyaml.Yaml;
 
 import java.io.IOException;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Map;
 import java.util.Optional;
@@ -38,6 +39,12 @@ public void load(String yamlContent)
 		this.identifyMode = this.makeIdentifyMode();
 	}
 
+	public void reload() throws IOException
+	{
+		String content = Files.readString(this.configFilePath);
+		this.load(content);
+	}
+
 	private void migrate()
 	{
 		boolean migrated = false;