Added translations

ChatBot.iml

@@ -3,6 +3,7 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />

src/me/dustin/chatbot/chat/ChatMessage.java

@@ -9,11 +9,13 @@
 import javax.swing.text.StyleConstants;
 import javax.swing.text.StyledDocument;
 import java.awt.*;
+import java.util.StringJoiner;
 
 public class ChatMessage {
 
-    public String senderName;
-    public String body;
+    private String senderName;
+    private String body;
+    private boolean isChat;
 
     public ChatMessage(String senderName, String body) {
         this.senderName = senderName;
@@ -34,24 +36,57 @@ public String getBody() {
         return body;
     }
 
+    public boolean isChat() {
+        return isChat;
+    }
+
+    public void setChat(boolean chat) {
+        isChat = chat;
+    }
+
     public static ChatMessage of(String jsonData) {
         if (jsonData.isEmpty())
             return new ChatMessage("", "");
         StringBuilder name = new StringBuilder();
         StringBuilder body = new StringBuilder();
+        StringJoiner insertion = new StringJoiner(",");
+        boolean isChat = false;
         JsonObject jsonObject = GeneralHelper.gson.fromJson(jsonData, JsonObject.class);
         JsonArray with = jsonObject.getAsJsonArray("with");
+        String translate = "";
+        if (jsonObject.get("translate") != null) {
+            translate = jsonObject.get("translate").getAsString();
+            if (translate.equalsIgnoreCase("chat.type.text"))
+                isChat = true;
+        }
+
         if (with != null) {
             for (int i = 0; i < with.size(); i++) {
                 try {
                     JsonObject object = with.get(i).getAsJsonObject();
+
+                    if (object.get("with") != null) {
+                        JsonArray with2 = object.getAsJsonArray("with");
+                        for (int ii = 0; ii < with2.size(); ii++) {
+                            JsonObject o = with2.get(ii).getAsJsonObject();
+                            if (o.get("insertion") != null && !insertion.toString().contains(o.get("insertion").getAsString())) {
+                                insertion.add(o.get("insertion").getAsString());
+                            }
+                        }
+                    }
+                    if (object.get("insertion") != null && insertion.toString().isEmpty()) {
+                        String s = object.get("insertion").getAsString();
+                        insertion.add(s);
+                    }
                     if (object.get("color") != null) {
                         TextColors textColors = TextColors.getFromName(object.get("color").getAsString());
                         if (textColors != null)
                             name.append("§").append(textColors.getChar());
                     }
                     String text = object.get("text").getAsString();
-                    name.append(text);
+                    if ((isChat || name.isEmpty()) && !Translator.translate(translate).startsWith("%1$s")) {
+                        name.append(text);
+                    }
                 } catch (Exception e) {
                     try {
                         body.append(" ").append(with.get(i).getAsString());
@@ -60,23 +95,49 @@ public static ChatMessage of(String jsonData) {
             }
         }
         if (jsonObject.get("translate") != null) {
-            String translate = jsonObject.get("translate").getAsString();
-            if (!translate.equalsIgnoreCase("chat.type.text"))
-                body.append(" ").append(translate);
+            if (jsonObject.get("color") != null) {
+                TextColors textColors = TextColors.getFromName(jsonObject.get("color").getAsString());
+                if (textColors != null)
+                    body.append("§").append(textColors.getChar());
+            }
+            if (!translate.equalsIgnoreCase("chat.type.text")) {
+                System.out.println(insertion);
+                String translated = Translator.translate(translate);
+                if (!insertion.toString().isEmpty()) {
+                    String[] insertions = insertion.toString().split(",");
+                    int c = 0;
+                    for (int i = 0; i < insertions.length; i++) {
+                        if (translated.contains("%" + (i + 1) + "$s")) {
+                            translated = translated.replace("%" + (i + 1) + "$s", insertions[i]);
+                            c++;
+                        } else
+                            break;
+                    }
+                    for (int i = c; i < insertions.length; i++) {
+                        System.out.println("replacing " + i + " with " + insertions[i]);
+                        translated = translated.replaceFirst("%s", insertions[i]);
+                    }
+                }
+                //translated = translated.replace("%s", insertions[insertions.length - 1]);
+                body.append(" ").append(translated);
+            }
         }
         body.append(getExtra(jsonObject));
-        if (body.toString().startsWith("<") && body.toString().contains("> ") && name.toString().isEmpty()) {//crude way to move player name to actual name field if the text is set up weird
+        if (isChat && body.toString().startsWith("<") && body.toString().contains("> ") && name.toString().isEmpty()) {//crude way to move player name to actual name field if the text is set up weird
             String s = body.toString().split("<")[1].split(">")[0];
             name.append(s);
             body = new StringBuilder(body.toString().replace("<" + s + "> ", ""));
         }
+
         if (body.toString().startsWith(" ")) {
             body = new StringBuilder(body.substring(1));
         }
         if (jsonObject.get("text") != null) {
             body.append(jsonObject.get("text").getAsString());
         }
-        return new ChatMessage(name.toString(), body.toString());
+        ChatMessage chatMessage = new ChatMessage(name.toString(), body.toString());
+        chatMessage.setChat(isChat);
+        return chatMessage;
     }
 
     private static String getExtra(JsonObject jsonObject) {
@@ -97,7 +158,21 @@ private static String getExtra(JsonObject jsonObject) {
                     if (object.get("extra") != null)
                         s.append(getExtra(object));
                 } catch (Exception e) {
-                    s.append(" ").append(extra.get(i).getAsString());
+                    try {
+                        s.append(" ").append(extra.get(i).getAsString());
+                    } catch (Exception e1) {
+                        JsonObject o = extra.get(i).getAsJsonObject();
+                        if (o.get("color") != null) {
+                            TextColors textColors = TextColors.getFromName(o.get("color").getAsString());
+                            if (textColors != null)
+                                s.append("§").append(textColors.getChar());
+                        }
+                        if (o.get("translate") != null) {
+                            String translate = o.get("translate").getAsString();
+                            if (!translate.equalsIgnoreCase("chat.type.text"))
+                                s.append(" ").append(Translator.translate(translate));
+                        }
+                    }
                 }
             }
         }

src/me/dustin/chatbot/chat/Translator.java

@@ -0,0 +1,40 @@
+package me.dustin.chatbot.chat;
+
+import com.google.gson.JsonObject;
+import me.dustin.chatbot.helper.GeneralHelper;
+
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+
+public class Translator {
+
+    private static JsonObject translations;
+
+    public static void setTranslation(String translation) {
+        try {
+            ClassLoader loader = Thread.currentThread().getContextClassLoader();
+            InputStream is = loader.getResourceAsStream("translations/" + translation + ".json");
+            InputStreamReader streamReader = new InputStreamReader(is, StandardCharsets.UTF_8);
+            BufferedReader reader = new BufferedReader(streamReader);
+            StringBuilder sb = new StringBuilder();
+            for (String line; (line = reader.readLine()) != null;) {
+                sb.append(line);
+            }
+            is.close();
+            reader.close();
+            translations = GeneralHelper.gson.fromJson(sb.toString(), JsonObject.class);
+        } catch (Exception e) {
+            e.printStackTrace();
+            GeneralHelper.print("Error grabbing translation file: " + translation + ".json", ChatMessage.TextColors.DARK_RED);
+        }
+    }
+
+    public static String translate(String s) {
+        if (translations.get(s) == null)
+            return s;
+        return translations.get(s).getAsString();
+    }
+
+}

src/me/dustin/chatbot/command/impl/CommandReload.java

@@ -19,6 +19,7 @@ public void run(String str, UUID sender) {
         getClientConnection().sendPacket(new ServerBoundClientSettingsPacket(ChatBot.getConfig().getLocale(), ChatBot.getConfig().isAllowServerListing(), ServerBoundClientSettingsPacket.SkinPart.all()));
         try {
             ChatBot.getConfig().loadConfig();
+            getClientConnection().updateTranslations();
             sendChat("Reloaded commands and config!");
         } catch (Exception e) {
             sendChat("Error in config! " + e.getMessage());

src/me/dustin/chatbot/helper/GeneralHelper.java

@@ -55,7 +55,7 @@ public static void print(String s, ChatMessage.TextColors color) {
     }
 
     public static void printChat(ChatMessage chatMessage) {
-        if (!chatMessage.getSenderName().isEmpty())
+        if (!chatMessage.getSenderName().isEmpty() && chatMessage.isChat())
             chatMessage = new ChatMessage("<" + chatMessage.getSenderName() + (chatMessage.getSenderName().contains("§") ? "§f" : "") +">", chatMessage.getBody());
         String m = chatMessage.getMessage();
         if (!m.contains("§") || !ChatBot.getConfig().isColorConsole()) {

src/me/dustin/chatbot/network/ClientConnection.java

@@ -4,7 +4,9 @@
 import me.dustin.chatbot.ChatBot;
 import me.dustin.chatbot.account.Session;
 import me.dustin.chatbot.chat.ChatMessage;
+import me.dustin.chatbot.chat.Translator;
 import me.dustin.chatbot.command.CommandManager;
+import me.dustin.chatbot.config.Config;
 import me.dustin.chatbot.event.EventLoginSuccess;
 import me.dustin.chatbot.helper.GeneralHelper;
 import me.dustin.chatbot.helper.TPSHelper;
@@ -85,6 +87,8 @@ public ClientConnection(String ip, int port, Session session) throws IOException
         this.tpsHelper = new TPSHelper();
         this.playerManager = new PlayerManager();
         this.eventManager = new EventManager();
+
+        updateTranslations();
         getEventManager().register(this);
         getEventManager().register(ChatBot.getGui());
     }
@@ -166,6 +170,10 @@ public void close() {
         }
     }
 
+    public void updateTranslations() {
+        Translator.setTranslation(ChatBot.getConfig().getLocale());
+    }
+
     public void tick() {
         getProcessManager().tick();
         getClientPlayer().tick();