Merge pull request #6 from ModdedMinecraftClub/feature/command-override

Feature/command override

Author: john01dav

.gitignore

@@ -1 +1,2 @@
 /out
+libs

.idea/misc.xml

@@ -2,3 +2,12 @@
 Polychat Client Bukkit Port WIP
 
 This is a bukkit port of the Polychat Forge mod client, https://github.com/ModdedMinecraftClub/polychat-client
+
+Example config overide for !promote function:
+  override_command_ranks=manuadd $3 $4
+
+The following on discord:
+  !promote im joe member
+
+Results in:
+  manuadd joe member

.idea/polychat-client-bukkit.iml

@@ -1,42 +1,63 @@
 package club.moddedminecraft.polychat.bukkitclient;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.net.Socket;
-import java.util.ArrayList;
-import java.util.Properties;
-
+import club.moddedminecraft.polychat.bukkitclient.threads.ActivePlayerThread;
+import club.moddedminecraft.polychat.bukkitclient.threads.ReattachThread;
 import club.moddedminecraft.polychat.networking.io.*;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
+import org.bukkit.Server;
 import org.bukkit.entity.Player;
-import org.bukkit.event.*;
+import org.bukkit.event.Listener;
 import org.bukkit.plugin.java.JavaPlugin;
-
-import club.moddedminecraft.polychat.bukkitclient.threads.ActivePlayerThread;
-import club.moddedminecraft.polychat.bukkitclient.threads.ReattachThread;
 import org.bukkit.scheduler.BukkitScheduler;
 
-public final class BukkitClient extends JavaPlugin implements Listener{
-	
-	public static boolean shutdownClean = false;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.net.Socket;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Properties;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public final class BukkitClient extends JavaPlugin implements Listener {
+
+    private static final HashMap<Integer, ChatColor> colorHashMap = new HashMap<Integer, ChatColor>() {{
+        put(0, ChatColor.getByChar('0'));
+        put(1, ChatColor.getByChar('1'));
+        put(2, ChatColor.getByChar('2'));
+        put(3, ChatColor.getByChar('3'));
+        put(4, ChatColor.getByChar('4'));
+        put(5, ChatColor.getByChar('5'));
+        put(6, ChatColor.getByChar('6'));
+        put(7, ChatColor.getByChar('7'));
+        put(8, ChatColor.getByChar('8'));
+        put(9, ChatColor.getByChar('9'));
+        put(10, ChatColor.getByChar('a'));
+        put(11, ChatColor.getByChar('b'));
+        put(12, ChatColor.getByChar('c'));
+        put(13, ChatColor.getByChar('d'));
+        put(14, ChatColor.getByChar('e'));
+        put(15, ChatColor.getByChar('f'));
+    }};
+    public static boolean shutdownClean = false;
     public static MessageBus messageBus = null;
     public static Properties properties;
+    public static File propertiesFolder;
     public static ReattachThread reattachThread;
     public static ActivePlayerThread playerThread;
     public static String idJson = null;
     public static String idJsonNoColor = null;
     public static boolean reattachKill = false;
-	public static String serverIdText = null;
-	public static ArrayList<String> commands = new ArrayList<>();
+    public static ArrayList<BukkitCommandSender> commands = new ArrayList<>();
 
     public static void handleClientConnection() {
         try {
-            messageBus = new MessageBus(new Socket(properties.getProperty("address"), Integer.parseInt(properties.getProperty("port"))), new ReceiverCallback(){
+            messageBus = new MessageBus(new Socket(properties.getProperty("address"), Integer.parseInt(properties.getProperty("port"))), new ReceiverCallback() {
                 @Override
-                public void receive(AbstractMessage abstractMessage){
+                public void receive(AbstractMessage abstractMessage) {
                     EventListener.handleMessage(abstractMessage);
                 }
             });
@@ -50,18 +71,44 @@ public void receive(AbstractMessage abstractMessage){
     public static void sendMessage(AbstractMessage message) {
         try {
             messageBus.sendMessage(message);
-        } catch (NullPointerException ignored) {}
+        } catch (NullPointerException ignored) {
+        }
     }
 
     public static void sendGameMessage(String message) {
         Bukkit.broadcastMessage(message);
     }
 
-    public static void runCommand(String command) {  //Command Firer
-        Bukkit.dispatchCommand(Bukkit.getConsoleSender(), command);
+    public static int calculateParameters(String command) {
+        Pattern pattern = Pattern.compile("(\\$\\d+)");
+        Matcher matcher = pattern.matcher(command);
+        return matcher.groupCount();
     }
-    public static void addCommand(String command) {  //Holding place for commands
-        commands.add(command);
+
+    public static ChatColor getColor(int color) {
+        return colorHashMap.getOrDefault(color, ChatColor.getByChar("0"));
+    }
+
+
+    public static void queueCommand(BukkitCommandSender sender) {  //Holding place for commands
+        commands.add(sender);
+    }
+
+    public static ArrayList<String> getOnlinePlayersNames() { //Might have to fix return type
+        ArrayList<String> playerList = new ArrayList<>();
+
+        for (Player player : Bukkit.getServer().getOnlinePlayers()) {
+            playerList.add(player.getName());
+        }
+        return playerList;
+    }
+
+    public static int getMaxPlayers() {
+        return Bukkit.getMaxPlayers();
+    }
+
+    public Server getBukkitServer() {
+        return getServer();
     }
 
     @Override
@@ -75,11 +122,11 @@ public void onEnable() {
 
         handleClientConnection();
 
-    	new EventListener(this);
+        new EventListener(this);
 
-    	Runtime.getRuntime().addShutdownHook(new Thread(new Runnable(){
+        Runtime.getRuntime().addShutdownHook(new Thread(new Runnable() {
             @Override
-            public void run(){
+            public void run() {
                 shutdownHook();
             }
         }));
@@ -100,26 +147,23 @@ public void run(){
         scheduler.scheduleSyncRepeatingTask(this, new Runnable() { //Repeating task for listening for commands so they are ran on the right thread
             @Override
             public void run() {
-                if (commands.size() != 0) {
-                    int i = 0;
-                    while(i<commands.size()){
-                        runCommand(commands.get(i));
-                        i++;
+                for (BukkitCommandSender sender : commands) {
+                    String command = sender.getCommand();
+                    if (command != null) {
+                        getServer().dispatchCommand(sender, command);
                     }
-                    commands.clear();
                 }
+                commands.clear();
             }
         }, 0L, 20L);
-        if(!reattachKill) { //only start it on a fresh start, not on a reload
+        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
-        }else{
-
         }
     }
-    
+
     @Override
     public void onDisable() {
-    	shutdownClean = true;
+        shutdownClean = true;
         reattachKill = true;
 
         ServerStatusMessage offlineMsg = new ServerStatusMessage(properties.getProperty("server_id"), idJson, (short) 2);
@@ -137,7 +181,6 @@ public void onDisable() {
 
     }
 
-    
     public void shutdownHook() {
         //Sends either crashed or offline depending on if shutdown happened cleanly
         if (!shutdownClean) {
@@ -152,43 +195,8 @@ public void shutdownHook() {
         messageBus.stop();
     }
 
-	public static ArrayList<String> getOnlinePlayersNames() { //Might have to fix return type
-		ArrayList<String> playerList = new ArrayList<> ();
-		
-		for (Player player : Bukkit.getServer().getOnlinePlayers()) {
-		    playerList.add(player.getName());
-		}
-		return playerList;
-	}
-	
-	public static int getMaxPlayers() { 
-		return Bukkit.getMaxPlayers();
-	}
-
-
-	public static ChatColor colorSwitch(int colorInt){
-        switch(colorInt){
-            case 0: return ChatColor.getByChar('0');
-            case 1: return ChatColor.getByChar('1');
-            case 2: return ChatColor.getByChar('2');
-            case 3: return ChatColor.getByChar('3');
-            case 4: return ChatColor.getByChar('4');
-            case 5: return ChatColor.getByChar('5');
-            case 6: return ChatColor.getByChar('6');
-            case 7: return ChatColor.getByChar('7');
-            case 8: return ChatColor.getByChar('8');
-            case 9: return ChatColor.getByChar('9');
-            case 10: return ChatColor.getByChar('a');
-            case 11: return ChatColor.getByChar('b');
-            case 12: return ChatColor.getByChar('c');
-            case 13: return ChatColor.getByChar('d');
-            case 14: return ChatColor.getByChar('e');
-            case 15: return ChatColor.getByChar('f');
-            default: return ChatColor.getByChar("0");
-        }
-    }
-
     public void handleConfiguration(File modConfigDir) {
+        BukkitClient.propertiesFolder = modConfigDir;
         BukkitClient.properties = new Properties();
         File config = new File(modConfigDir, "polychat.properties");
 
@@ -215,6 +223,7 @@ public void handleConfiguration(File modConfigDir) {
             }
         }
     }
+
     public void handlePrefix() {
         String idText = properties.getProperty("server_id");
         ChatColor color;
@@ -223,14 +232,12 @@ public void handlePrefix() {
             if ((code < 0) || (code > 15)) {
                 color = ChatColor.getByChar('f');
             } else {
-                color = colorSwitch(code);
+                color = getColor(code);
             }
             idJsonNoColor = idText;
             idText = color + "" + idText;
             idJson = idText;
         }
     }
 
-
-
 }