add teams names as arguments

Author: MohsenDehghankar

src/main/java/ir/sharif/aichallenge/server/common/network/JsonSocket.java

@@ -141,6 +141,8 @@ public JsonObject get() throws IOException {
      * @see com.google.gson.Gson#fromJson(String, Class)
      * @see #get
      */
+    public int id;
+
     public <T> T get(Class<T> classOfInput) throws IOException {
         int length = 1000, total = 0, current;
         byte buffer[] = new byte[length];
@@ -163,7 +165,7 @@ public <T> T get(Class<T> classOfInput) throws IOException {
         }
         String json = new String(buffer, 0, total, ENCODING);
         if (GameHandler.showGameLog)
-            Log.i(TAG, "Message received: " + json);
+            Log.i(TAG, "Message received from " + id + ": " + json);
         T result = null;
         try {
             result = Json.GSON.fromJson(json, classOfInput);

src/main/java/ir/sharif/aichallenge/server/engine/config/Configs.java

@@ -85,6 +85,10 @@ private static void handleArg(String arg) {
             GameHandler.runManually = true;
         } else if (split[0].equals("--read-map")) {
             MAP_PATH = split[1];
+        } else if (split[0].equals("--first-team-name")) {
+            FIRST_TEAM_NAME = split[1];
+        } else if (split[0].equals("--second-team-name")) {
+            SECOND_TEAM_NAME = split[1];
         }
     }
 

src/main/java/ir/sharif/aichallenge/server/engine/network/ClientHandler.java

@@ -301,6 +301,7 @@ private void receive() throws IOException, InterruptedException {
         lastReceivedMessage = null;
         if (receiveTerminateFlag)
             return;
+        client.id = getId();
         lastReceivedMessage = client.get(ClientMessage.class);
         synchronized (messageNotifier) {
             messageNotifier.notifyAll();