Make use of plugin channels instead of sockets connections

CommandSyncClient/src/com/fuzzoland/CommandSyncClient/CSC.java

@@ -1,127 +1,145 @@
 package com.fuzzoland.CommandSyncClient;
 
+import com.google.common.collect.Lists;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.FileReader;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.PrintStream;
-import java.net.InetAddress;
-import java.util.ArrayList;
-import java.util.Collections;
+import java.util.Arrays;
+import java.util.LinkedList;
 import java.util.List;
+import java.util.Queue;
 
 import org.bukkit.plugin.java.JavaPlugin;
 
 public class CSC extends JavaPlugin {
 
-	public ClientThread client;
-	public List<String> oq = Collections.synchronizedList(new ArrayList<String>());
-	public Integer qc = 0;
-	public String spacer = "@#@";
-	public Debugger debugger;
-
-	public void onEnable() {
-		String[] data = loadConfig();
-		if(data[3].equals("UNSET") || data[4].equals("UNSET")) {
-			debugger.debug("THE CONFIG FILE CONTAINS UNSET VALUES - YOU MUST FIX THEM BEFORE THE PLUGIN WILL WORK !!! ");
-			return;
-		}
-		try {
-			client = new ClientThread(this, InetAddress.getByName(data[0]), Integer.parseInt(data[1]), Integer.parseInt(data[2]), data[3], data[4]);
-			client.start();
-		} catch(Exception e) {
-			e.printStackTrace();
-		}
-		loadData();
-		getCommand("Sync").setExecutor(new CommandSynchronize(this));
-	}
-
-	public void onDisable() {
-		saveData();
+    private final Queue<byte[]> messageQueue = new LinkedList<>();
+
+    private String name;
+    private String password;
+
+    public Debugger debugger;
+
+    public void onEnable() {
+        String[] data = loadConfig();
+        if (data[3].equals("UNSET") || data[4].equals("UNSET")) {
+            debugger.debug("THE CONFIG FILE CONTAINS UNSET VALUES - YOU MUST FIX THEM BEFORE THE PLUGIN WILL WORK !!! ");
+            return;
+        }
+
+        loadData();
+
+        name = data[3];
+        password = data[4];
+
+        getCommand("Sync").setExecutor(new CommandSynchronize(this));
+
+        //check for incoming messages from the bungeecord version of this plugin
+        getServer().getMessenger().registerIncomingPluginChannel(this, getName(), new MessageListener(this));
+        getServer().getMessenger().registerOutgoingPluginChannel(this, getName());
+
+        getServer().getScheduler().runTaskTimer(this, new QueueMessageTask(this), 20L, 20L);
+    }
+
+    public void onDisable() {
+        saveData();
         debugger.close();
-	}
+    }
 
-	private String[] loadConfig() {
-		String[] defaults = new String[] {
-			"ip=localhost", "port=9190", "heartbeat=1000", "name=UNSET", "pass=UNSET", "debug=false"
-		};
-		String[] data = new String[defaults.length];
+    private String[] loadConfig() {
+        String[] defaults = new String[]{
+            "ip=localhost", "port=9190", "heartbeat=1000", "name=UNSET", "pass=UNSET", "debug=false"
+        };
+
+        String[] data = new String[defaults.length];
         try {
             File folder = getDataFolder();
-            if(!folder.exists()) {
+            if (!folder.exists()) {
                 folder.mkdir();
             }
+
             File file = new File(folder, "config.txt");
-            if(!file.exists()) {
+            if (!file.exists()) {
                 file.createNewFile();
             }
+
             BufferedReader br = new BufferedReader(new FileReader(file));
-            for(int i = 0; i < defaults.length; i++) {
+            for (int i = 0; i < defaults.length; i++) {
                 String l = br.readLine();
-                if(l == null || l.isEmpty()) {
+                if (l == null || l.isEmpty()) {
                     data[i] = defaults[i].split("=")[1];
                 } else {
                     data[i] = l.split("=")[1];
                     defaults[i] = l;
                 }
             }
+
             br.close();
             file.delete();
             file.createNewFile();
             PrintStream ps = new PrintStream(new FileOutputStream(file));
-            for(int i = 0; i < defaults.length; i++) {
+            for (int i = 0; i < defaults.length; i++) {
                 ps.println(defaults[i]);
             }
+
             ps.close();
             debugger = new Debugger(this, Boolean.valueOf(data[5]));
             debugger.debug("Configuration file loaded.");
-        } catch(IOException e) {
+        } catch (IOException e) {
             e.printStackTrace();
         }
         return data;
-	}
-
-	private void saveData() {
-		try{
-			OutputStream os = new FileOutputStream(new File(getDataFolder(), "data.txt"));
-			PrintStream ps = new PrintStream(os);
-			for(String s : oq) {
-				ps.println("oq:" + s);
-			}
-			ps.println("qc:" + String.valueOf(qc));
-			ps.close();
-			debugger.debug("All data saved.");
-		}catch(IOException e){
-			e.printStackTrace();
-		}
-	}
-
-	private void loadData() {
-		try{
-			File file = new File(getDataFolder(), "data.txt");
-			if(file.exists()) {
-				BufferedReader br = new BufferedReader(new FileReader(file));
-				try {
-					String l = br.readLine();
-					while(l != null) {
-						if(l.startsWith("oq:")) {
-							oq.add(new String(l.substring(3)));
-						} else if(l.startsWith("qc:")) {
-							qc = Integer.parseInt(new String(l.substring(3)));
-						}
-						l = br.readLine();
-					}
-					debugger.debug("All data loaded.");
-				} finally {
-					br.close();
-				}
-			} else {
-			    debugger.debug("A data file was not found. If this is your first start-up with the plugin, this is normal.");
-			}
-		} catch(IOException e) {
-			e.printStackTrace();
-		}
-	}
+    }
+
+    private void saveData() {
+        try {
+            OutputStream os = new FileOutputStream(new File(getDataFolder(), "data.txt"));
+            PrintStream ps = new PrintStream(os);
+            for (byte[] s : messageQueue) {
+                ps.println(Arrays.toString(s));
+            }
+
+            ps.close();
+            debugger.debug("All data saved.");
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void loadData() {
+        try {
+            File file = new File(getDataFolder(), "data.txt");
+            if (file.exists()) {
+                BufferedReader br = new BufferedReader(new FileReader(file));
+                try {
+                    String line = br.readLine();
+                    while (line != null) {
+                        String trimmed = line.replace("[", "").replace("]", "").replace(",", "");
+                        List<Byte> data = Lists.newArrayListWithExpectedSize(100);
+                        String[] components = trimmed.split(" ");
+                        for (String component : components) {
+                            data.add(Byte.parseByte(component));
+                        }
+
+                        line = br.readLine();
+                    }
+                    debugger.debug("All data loaded.");
+                } finally {
+                    br.close();
+                }
+            } else {
+                debugger.debug("A data file was not found. If this is your first start-up with the plugin, this is normal.");
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public Queue<byte[]> getMessageQueue() {
+        return messageQueue;
+    }
 }