Adding proxy allow-only-slash-servers-for-queueing config option

api/src/main/java/us/ajg0702/queue/api/Implementation.java

@@ -8,4 +8,5 @@ public interface Implementation {
     default void unregisterCommand(IBaseCommand command) {
         unregisterCommand(command.getName());
     }
+    void reload();
 }

common/src/main/java/us/ajg0702/queue/commands/commands/manage/Reload.java

@@ -55,6 +55,7 @@ public void execute(ICommandSender sender, String[] args) {
         main.getQueueManager().reloadServers();
         main.getMessages().reload();
         main.getSlashServerManager().reload();
+        main.getImplementation().reload();
 
         main.getUpdater().setEnabled(main.getConfig().getBoolean("enable-updater"));
 

common/src/main/resources/config.yml

@@ -179,6 +179,13 @@ remove-player-on-server-switch: false
 #  Default: false
 enable-server-command: false
 
+# When set: /queue and its aliases are not registered, making slash-servers commands the only way for players
+# to queue-up.
+# Warning: This setting only effects the proxy commands, if the plugin is also installed on your Bukkit server
+# the queue command will still be available.
+#  Default: false
+allow-only-slash-servers-for-queueing: false
+
 # What servers should we make slash server commands for?
 # For example, if survival is in this list, then if a player executes /survival
 #  then they will be put in the queue for survival
@@ -411,7 +418,7 @@ debug: false
 
 
 # Don't touch this number please
-config-version: 47
+config-version: 48
 
 
 # This is ONLY here so that they can be moved to messages.yml. Please edit these in messages.yml!

platforms/bungeecord/src/main/java/us/ajg0702/queue/platforms/bungeecord/BungeeQueue.java

@@ -72,8 +72,9 @@ public void onEnable() {
             commands.add(new SendAlias(main));
         }
 
-        for(IBaseCommand command : commands) {
-            registerCommand(command);
+        int i = main.getConfig().getBoolean("allow-only-slash-servers-for-queueing") ? 1 : 0;
+        for(; i < commands.size(); i++) {
+            registerCommand(commands.get(i));
         }
 
 
@@ -185,6 +186,20 @@ public void registerCommand(IBaseCommand command) {
                 .registerCommand(this, bungeeCommand);
     }
 
+    @Override
+    public void reload() {
+        boolean wantQueueCommandRegistered = !main.getConfig().getBoolean("allow-only-slash-servers-for-queueing");
+        if (wantQueueCommandRegistered != commandMap.containsKey(commands.get(0).getName())) {
+            if (!wantQueueCommandRegistered) {
+                main.getLogger().warn("Reload is unregistering /queue command");
+                unregisterCommand(commands.get(0).getName());
+            } else {
+                main.getLogger().warn("Reload is registering /queue command");
+                registerCommand(commands.get(0));
+            }
+        }
+    }
+
     public QueueMain getMain() {
         return main;
     }

platforms/velocity/src/main/java/us/ajg0702/queue/platforms/velocity/VelocityQueue.java

@@ -69,6 +69,8 @@ public VelocityQueue(ProxyServer proxyServer, Logger logger, @DataDirectory Path
 
     List<IBaseCommand> commands;
 
+    private boolean isQueueCommandRegistered;
+
     CommandManager commandManager;
 
     @Subscribe
@@ -103,9 +105,10 @@ public void onProxyInit(ProxyInitializeEvent e) {
         proxyServer.getChannelRegistrar().register(MinecraftChannelIdentifier.create("ajqueue", "tospigot"));
         proxyServer.getChannelRegistrar().register(MinecraftChannelIdentifier.from("ajqueue:toproxy"));
 
-
-        for(IBaseCommand command : commands) {
-            registerCommand(command);
+        isQueueCommandRegistered = !main.getConfig().getBoolean("allow-only-slash-servers-for-queueing");
+        int i = isQueueCommandRegistered ? 0 : 1;
+        for(; i < commands.size(); i++) {
+            registerCommand(commands.get(i));
         }
 
 
@@ -206,6 +209,22 @@ public void registerCommand(IBaseCommand command) {
         );
     }
 
+    @Override
+    public void reload() {
+        boolean wantQueueCommandRegistered = !main.getConfig().getBoolean("allow-only-slash-servers-for-queueing");
+        if (wantQueueCommandRegistered != isQueueCommandRegistered) {
+            if (!wantQueueCommandRegistered) {
+                main.getLogger().warn("Reload is unregistering /queue command");
+                unregisterCommand(commands.get(0).getName());
+                isQueueCommandRegistered = false;
+            } else {
+                main.getLogger().warn("Reload is registering /queue command");
+                registerCommand(commands.get(0));
+                isQueueCommandRegistered = true;
+            }
+        }
+    }
+
     public QueueMain getMain() {
         return main;
     }