feat: command: leave - disconnect bots

Author: crpmax

src/main/java/me/creepermaxcz/mcbots/Bot.java

@@ -44,6 +44,8 @@ public class Bot extends Thread {
 
     private boolean connected;
 
+    private boolean manualDisconnecting = false;
+
     public Bot(String nickname, InetSocketAddress address, ProxyInfo proxy) {
         this.nickname = nickname;
         this.address = address;
@@ -112,32 +114,35 @@ public void run() {
                 @Override
                 public void disconnected(DisconnectedEvent event) {
                     connected = false;
-                    Log.info();
+                    Main.removeBot(Bot.this);
                     Log.info(nickname + " disconnected");
 
-                    //Log.info(" -> " + event.getReason());
+                    // Do not write disconnect reason if disconnected by command
+                    if (!manualDisconnecting) {
+                        //Log.info(" -> " + event.getReason());
 
-                    //fix broken reason string by finding the content with regex
-                    Pattern pattern = Pattern.compile("content=\"(.*?)\"");
-                    Matcher matcher = pattern.matcher(event.getReason());
+                        //fix broken reason string by finding the content with regex
+                        Pattern pattern = Pattern.compile("content=\"(.*?)\"");
+                        Matcher matcher = pattern.matcher(event.getReason());
 
-                    StringBuilder reason = new StringBuilder();
-                    while (matcher.find()) {
-                        reason.append(matcher.group(1));
-                    }
+                        StringBuilder reason = new StringBuilder();
+                        while (matcher.find()) {
+                            reason.append(matcher.group(1));
+                        }
 
-                    Log.info(" -> " + reason.toString());
+                        Log.info(" -> " + reason.toString());
 
-                    if(event.getCause() != null) {
-                        event.getCause().printStackTrace();
+                        if(event.getCause() != null) {
+                            event.getCause().printStackTrace();
 
-                        if (event.getCause() instanceof UnexpectedEncryptionException) {
-                            Log.warn("Server is running in online (premium) mode. Please use the -o option to use online mode bot.");
-                            System.exit(1);
+                            if (event.getCause() instanceof UnexpectedEncryptionException) {
+                                Log.warn("Server is running in online (premium) mode. Please use the -o option to use online mode bot.");
+                                System.exit(1);
+                            }
                         }
+                        Log.info();
                     }
-                    Log.info();
-                    Main.removeBot(Bot.this);
+
                     Thread.currentThread().interrupt();
                 }
             });
@@ -214,4 +219,10 @@ public void moveTo(double x, double y, double z)
     public boolean isConnected() {
         return connected;
     }
+
+    public void disconnect()
+    {
+        manualDisconnecting = true;
+        client.disconnect("Leaving");
+    }
 }

src/main/java/me/creepermaxcz/mcbots/Log.java

@@ -9,7 +9,7 @@ public class Log {
 
     public static void log(String in) {
         System.out.println("\r[" + formatter.format(new Date()) + "] " + in);
-        System.out.print(Main.prompt + "> ");
+        System.out.print(Main.getPrompt() + "> ");
     }
 
     public static void error(String in) {

src/main/java/me/creepermaxcz/mcbots/Main.java

@@ -390,7 +390,7 @@ public void run() {
             String line = scanner.nextLine();
 
             if (line.isEmpty()) {
-                System.out.print(prompt + "> ");
+                System.out.print(getPrompt() + "> ");
                 continue;
             }
 
@@ -430,10 +430,8 @@ public void run() {
                                     .collect(Collectors.joining(", "));
 
                             if (newBotCount == 1) {
-                                prompt = botNames;
                                 Log.info("Now controlling 1 bot: " + botNames);
                             } else {
-                                prompt = newBotCount + " BOTS";
                                 Log.info("Now controlling " + newBotCount + " bots: " + botNames);
                             }
 
@@ -445,7 +443,6 @@ public void run() {
                     } else {
                         // If no bot names are supplied, remove all bots
                         controlledBots.clear();
-                        prompt = "ALL";
                         Log.info("No bots selected - now controlling all bots.");
                     }
                 }
@@ -460,6 +457,21 @@ else if (commandName.equalsIgnoreCase("list") || commandName.equalsIgnoreCase("l
                     }
                 }
 
+                else if (commandName.equalsIgnoreCase("leave") || commandName.equalsIgnoreCase("exit"))
+                {
+                    if (!controlledBots.isEmpty()) {
+                        Log.info("Disconnecting controlled bots.");
+                        for (Bot bot : controlledBots) {
+                            bot.disconnect();
+                        }
+                    } else {
+                        Log.info("Disconnecting all bots.");
+                        for (Bot bot : bots) {
+                            bot.disconnect();
+                        }
+                    }
+                }
+
                 else {
                     Log.warn("Invalid command");
                 }
@@ -485,6 +497,7 @@ public static synchronized void renewMainListener() {
 
     public static synchronized void removeBot(Bot bot) {
         bots.remove(bot);
+        controlledBots.remove(bot);
         if (bot.hasMainListener()) {
             Log.info("Bot with MainListener removed");
             isMainListenerMissing = true;
@@ -522,4 +535,19 @@ public static Bot findBotByName(String text) {
         }
         return null;
     }
+
+    public static String getPrompt()
+    {
+        int count = controlledBots.size();
+        if (count == 0) {
+            return "ALL";
+        } else if (count == 1)
+        {
+            //If controlling only one bot, return its nickname
+            return controlledBots.iterator().next().getNickname();
+        }
+        else {
+            return count + " BOTS";
+        }
+    }
 }