Revert bracket hardcode, fix player count, fix colored names

Author: 132ikl

src/club/moddedminecraft/polychat/bukkitclient/BukkitClient.java

@@ -91,7 +91,7 @@ public void onEnable() {
         handlePrefix();
 
         reattachThread = new ReattachThread(5000);
-        playerThread = new ActivePlayerThread(30000, properties.getProperty("server_id", "DEFAULT_ID"));
+        playerThread = new ActivePlayerThread(30000, id);
 
         handleClientConnection();
 
@@ -105,7 +105,7 @@ public void run() {
         }));
 
         ServerInfoMessage infoMessage = new ServerInfoMessage(
-                BukkitClient.properties.getProperty("server_id", "DEFAULT_ID"),
+                id,
                 BukkitClient.properties.getProperty("server_name", "DEFAULT_NAME"),
                 BukkitClient.properties.getProperty("server_address", "DEFAULT_ADDRESS"),
                 BukkitClient.getMaxPlayers()
@@ -134,9 +134,9 @@ public void run() {
                 commands.clear();
             }
         }, 0L, 20L);
-        if (!reattachKill) { //only start it on a fresh start, not on a reload
-            reattachThread.start();//actually start the thread at the end so the main thread is running already
-        }
+
+        reattachThread.start(); //start the thread at the end so the main thread is running already
+        playerThread.start();
     }
 
     @Override
@@ -155,7 +155,8 @@ public void onDisable() {
 
         messageBus.stop();
 
-        //TODO: Close Threads
+        playerThread.interrupt();
+        reattachThread.interrupt();
 
     }
 
@@ -209,8 +210,8 @@ public void handlePrefix() {
             if ((code < 0) || (code > 15)) {
                 code = 15;
             }
-            id = "[" + serverId + "]";
-            idFormatted = String.format("§%01x[%s]", code, serverId);
+            id = serverId;
+            idFormatted = String.format("§%01x%s", code, serverId);
         }
     }
 

src/club/moddedminecraft/polychat/bukkitclient/EventListener.java

@@ -93,17 +93,10 @@ public void onChat(AsyncPlayerChatEvent event) {
         event.setFormat(BukkitClient.idFormatted + " §7%s: §r%s");
 
         String name = event.getPlayer().getDisplayName();
-        String cleanName = "";
-        for (int i = 0; i < name.length(); ++i) {
-            if (name.charAt(i) == '§') {
-                ++i;
-            } else {
-                cleanName += name.charAt(i);
-            }
-        }
+        String cleanName = name.replaceAll("§.", "");
 
         String formattedName = BukkitClient.id + " " + cleanName + ": ";
-        ChatMessage chatMessage = new ChatMessage(formattedName, event.getMessage(), String.format(event.getFormat(), cleanName, event.getMessage()));
+        ChatMessage chatMessage = new ChatMessage(formattedName, event.getMessage(), String.format(event.getFormat(), name, event.getMessage()));
         BukkitClient.sendMessage(chatMessage);
     }
 

src/club/moddedminecraft/polychat/bukkitclient/threads/ActivePlayerThread.java

@@ -5,6 +5,7 @@
 import club.moddedminecraft.polychat.networking.io.PlayerListMessage;
 
 import java.util.ArrayList;
+import java.util.Collections;
 
 public class ActivePlayerThread extends HeartbeatThread {
 
@@ -16,16 +17,10 @@ public ActivePlayerThread(int interval, String serverID) {
     }
 
     @Override
-    protected void run() throws InterruptedException {
-        ArrayList<String> onlinePlayers = getPlayers();
+    protected void run() {
+        ArrayList<String> onlinePlayers = BukkitClient.getOnlinePlayersNames();
         PlayerListMessage message = new PlayerListMessage(serverID, onlinePlayers);
         BukkitClient.sendMessage(message);
     }
 
-    private ArrayList<String> getPlayers() { //TODO
-        ArrayList<String> playerList = new ArrayList<>();
-        playerList = BukkitClient.getOnlinePlayersNames();
-        return playerList;
-    }
-
 }

src/club/moddedminecraft/polychat/bukkitclient/threads/ReattachThread.java

@@ -9,8 +9,7 @@
 import java.net.UnknownHostException;
 import java.util.ArrayList;
 
-import static club.moddedminecraft.polychat.bukkitclient.BukkitClient.idFormatted;
-import static club.moddedminecraft.polychat.bukkitclient.BukkitClient.reattachKill;
+import static club.moddedminecraft.polychat.bukkitclient.BukkitClient.*;
 
 public class ReattachThread extends HeartbeatThread {
 
@@ -30,14 +29,14 @@ protected void run() throws InterruptedException, IOException {
 
                     //Tells players ingame that the connection failed
                     if (isConnected) {
-                        isConnected = false; //TODO
+                        isConnected = false;
                         BukkitClient.sendGameMessage("[PolyChat] Lost connection to main server, attempting reconnect...");
                     }
 
                     //Stops threads if they are still running
                     if (BukkitClient.messageBus != null) BukkitClient.messageBus.stop();
 
-                    //Attempts to start the connection //TODO
+                    //Attempts to start the connection
                     BukkitClient.messageBus = new MessageBus(new Socket(BukkitClient.properties.getProperty("address"), Integer.parseInt(BukkitClient.properties.getProperty("port"))), new ReceiverCallback() {
                         @Override
                         public void receive(AbstractMessage abstractMessage) {
@@ -48,7 +47,7 @@ public void receive(AbstractMessage abstractMessage) {
 
                     //If the socket was reopened, wait 3 seconds to make sure sending online message works
                     if (!BukkitClient.messageBus.isSocketClosed()) {
-                        Thread.sleep(2000); //TODO
+                        Thread.sleep(2000);
                         BukkitClient.sendGameMessage("[PolyChat] Connection re-established!");
                         sendServerOnline();
                         Thread.sleep(1000);
@@ -65,9 +64,10 @@ public void receive(AbstractMessage abstractMessage) {
         }
     }
 
-    public void sendServerOnline() { //TODO
+    public void sendServerOnline() {
         //Reports the server as starting
-        ServerInfoMessage infoMessage = new ServerInfoMessage(BukkitClient.properties.getProperty("server_id", "DEFAULT_ID"),
+        ServerInfoMessage infoMessage = new ServerInfoMessage(
+                id,
                 BukkitClient.properties.getProperty("server_name", "DEFAULT_NAME"),
                 BukkitClient.properties.getProperty("server_address", "DEFAULT_ADDRESS"), BukkitClient.getMaxPlayers());
         BukkitClient.sendMessage(infoMessage);
@@ -79,10 +79,10 @@ public void sendServerOnline() { //TODO
 
 
     //Sends a list of all online players silently for auto reconnect
-    public void sendOnlinePlayers() { //TODO: Check this
+    public void sendOnlinePlayers() {
         ArrayList<String> playerList;
         playerList = BukkitClient.getOnlinePlayersNames();
-        PlayerListMessage message = new PlayerListMessage(BukkitClient.properties.getProperty("server_id"), playerList);
+        PlayerListMessage message = new PlayerListMessage(id, playerList);
         BukkitClient.sendMessage(message);
     }
 }