feat: multiple join commands

Author: crpmax

build.gradle

@@ -3,7 +3,7 @@ plugins {
 }
 
 group 'me.creepermaxcz.mc-bots'
-version '1.2.5'
+version '1.2.6'
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'com.github.steveice10:mcprotocollib:1.19.1-SNAPSHOT'
+    implementation 'com.github.steveice10:mcprotocollib:1.19.2-1'
     implementation 'commons-cli:commons-cli:1.5.0'
     implementation 'com.diogonunes:JColor:5.2.0'
     implementation 'dnsjava:dnsjava:3.4.3'

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

@@ -81,8 +81,16 @@ public void packetReceived(Session session, Packet packet) {
                     if (packet instanceof ClientboundLoginPacket) {
                         connected = true;
                         Log.info(nickname + " connected");
-                        if (Main.joinMessage != null) {
-                            sendChat(Main.joinMessage);
+
+                        if (Main.joinMessages.size() > 0) {
+                            for (String msg : Main.joinMessages) {
+                                sendChat(msg);
+
+                                try {
+                                    Thread.sleep(100);
+                                } catch (InterruptedException ignored) {
+                                }
+                            }
                         }
                     }
                     else if (packet instanceof ClientboundPlayerPositionPacket) {
@@ -114,7 +122,6 @@ public void run() {
                 @Override
                 public void disconnected(DisconnectedEvent event) {
                     connected = false;
-                    Main.removeBot(Bot.this);
                     Log.info(nickname + " disconnected");
 
                     // Do not write disconnect reason if disconnected by command
@@ -143,6 +150,8 @@ public void disconnected(DisconnectedEvent event) {
                         Log.info();
                     }
 
+                    Main.removeBot(Bot.this);
+
                     Thread.currentThread().interrupt();
                 }
             });

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

@@ -31,7 +31,7 @@ public class Main {
     private static int delayMax = 5000;
     private static boolean minimal = false;
     private static boolean mostMinimal = false;
-    public static String joinMessage;
+    public static ArrayList<String> joinMessages = new ArrayList<>();
 
     public static String prompt = "?";
 
@@ -188,7 +188,14 @@ public static void main(String[] args) throws Exception {
         String address = cmd.getOptionValue('s');
         coloredChat = !cmd.hasOption('n');
 
-        joinMessage = cmd.getOptionValue('j');
+        if (cmd.hasOption('j')) {
+            // Split messages by &&, trim and append to arraylist
+            String[] messages = cmd.getOptionValue('j').split("&&");
+            for (String msg : messages) {
+                joinMessages.add(msg.trim());
+            }
+        }
+
 
         int port = 25565;
         if (address.contains(":")) {