update to MC 1.20.4

Author: crpmax

README.md

@@ -1,7 +1,7 @@
 # Minecraft bot stress tester
 🤖 A simple open source app written in Java used for stress testing Minecraft servers with bots (fake players).  
 💥 It can be also used to test plugins or minigames.  
-✔️ The MC version of the bots is 1.20 (supports 1.20.x).  
+✔️ The MC version of the bots is 1.20.4  
 For older MC versions please look in the [releases](https://github.com/crpmax/mc-bots/releases " releases").
 
 ## 🆒 Features
@@ -15,13 +15,13 @@ For older MC versions please look in the [releases](https://github.com/crpmax/mc
 - ✅ Control all or selected bots
 
 ## 📖 Usage
-Minimal Java version: 8  
+Minimal Java version: 17  
 Use of pre-compiled jar from [releases](https://github.com/crpmax/mc-bots/releases " releases"):  
 `java -jar mc-bots.jar -s <server address> [arguments]`  
 When running, you can write a chat message to the terminal to send it by all bots.
 
 ## 🧪 Example
-`java -jar mc-bots-1.2.6.jar -s 192.168.0.189:25565 -p BOT_ -d 4000 5000 -c 30 -r`  
+`java -jar mc-bots-1.2.10.jar -s 192.168.0.189:25565 -p BOT_ -d 4000 5000 -c 30 -r`  
 This will connect 30 bots to server at 192.168.0.189:25565 with delay 4000-5000 ms and will use real-looking nicknames prefixed with BOT_
 
 <img src="https://imgur.com/XWcckas.png" title="Connected bots" width="350px"/>

build.gradle

@@ -3,10 +3,10 @@ plugins {
 }
 
 group 'me.creepermaxcz.mc-bots'
-version '1.2.9'
+version '1.2.10'
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+sourceCompatibility = 1.17
+targetCompatibility = 1.17
 
 repositories {
     mavenCentral()
@@ -16,7 +16,8 @@ repositories {
 }
 
 dependencies {
-    implementation 'com.github.steveice10:mcprotocollib:1.20.2-1'
+    implementation 'com.github.steveice10:mcprotocollib:1.20.4-2-SNAPSHOT'
+    implementation 'net.kyori:adventure-text-serializer-gson:4.16.0'
     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/Utils.java

@@ -7,6 +7,7 @@
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.TextComponent;
 import net.kyori.adventure.text.TranslatableComponent;
+import net.kyori.adventure.text.TranslationArgument;
 import net.kyori.adventure.text.format.Style;
 import net.kyori.adventure.text.format.TextColor;
 import net.kyori.adventure.text.format.TextDecoration;
@@ -15,6 +16,7 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -121,38 +123,52 @@ public static List<Attribute> getFormats(Map<TextDecoration, TextDecoration.Stat
     }
 
     public static String translate(TranslatableComponent message) {
-        if (lang == null) {
-            try {
-                InputStream resource = Utils.class.getResourceAsStream("/files/lang.json");
-                lang = new JsonParser().parse(new InputStreamReader(resource)).getAsJsonObject();
-            } catch (Exception e) {
-                Log.crit(e);
+        try {
+            if (lang == null) {
+                try {
+                    InputStream resource = Utils.class.getResourceAsStream("/files/lang.json");
+                    if (resource == null) {
+                        throw new Exception("Failed to load lang resource.");
+                    }
+                    lang = new JsonParser().parse(new InputStreamReader(resource)).getAsJsonObject();
+                } catch (Exception e) {
+                    Log.crit(e);
+                }
             }
-        }
-        //Log.info(message.toString());
+            //Log.info(message.toString());
 
-        String key = message.key();
-        String base = key;
+            String key = message.key();
+            String base = key;
 
-        JsonElement value = lang.get(key);
-        if (value != null) {
-            base = value.getAsString();
-        }
+            JsonElement value = lang.get(key);
+            if (value != null) {
+                base = value.getAsString();
+            }
 
-        ArrayList<String> placeholders = new ArrayList<>();
+            ArrayList<String> placeholders = new ArrayList<>();
 
-        if (message.args().size() > 0) {
-            for (Component component : message.args()) {
-                if (component instanceof TranslatableComponent) {
-                    placeholders.add(translate((TranslatableComponent) component));
-                } else if (component instanceof TextComponent) {
-                    placeholders.add(getFullText((TextComponent) component, false));
+            if (message.arguments().size() > 0) {
+                for (TranslationArgument arg : message.arguments()) {
+                    Component component = arg.asComponent();
+                    if (component instanceof TranslatableComponent) {
+                        placeholders.add(translate((TranslatableComponent) component));
+                    } else if (arg instanceof TextComponent) {
+                        placeholders.add(getFullText((TextComponent) component, false));
+                    }
                 }
+                //Log.info(Arrays.toString(placeholders.toArray()));
+                try {
+                    return String.format(base, placeholders.toArray());
+                } catch (Exception e) {
+                    Log.error("Error formatting '"+base+"' with placeholders " + Arrays.toString(placeholders.toArray()));
+                }
+            } else {
+                return base;
             }
-            //Log.info(Arrays.toString(placeholders.toArray()));
-            return String.format(base, placeholders.toArray());
-        } else {
-            return base;
+        } catch (Exception e) {
+            Log.error(e);
         }
+
+        return "";
     }
 }