1.2.0 Reload command

# Feautres:
- Added reload for admins (**crosschat.reload**)
- Added configuration for communication channel used by the plugins (**in the config.yml**).
# Code:
 - ## Added command manager on BungeePlugin:
    1. Added class **Command Manager** which will manage subcommands for the plugin.
    2. Added absctract class **SubCommand** as a template for subcommands.
    3. Added **reload** subcommand which reload the plugin config (bungee only for now)

.gitignore

@@ -0,0 +1,2 @@
+CrossChat/
+updatenotes.md

Bungee/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>ca.mateimartin</groupId>
     <artifactId>CrossChatBungee</artifactId>
-    <version>1.1.0</version>
+    <version>1.2.0</version>
 
     <repositories>
         <repository>

Bungee/src/main/java/ca/matai/crosschat/CrossChatBungee.java

@@ -1,5 +1,6 @@
 package ca.matai.crosschat;
 
+import ca.matai.crosschat.commands.CommandManager;
 import ca.matai.crosschat.listeners.MessageListener;
 import net.md_5.bungee.api.ChatColor;
 import net.md_5.bungee.api.plugin.Plugin;
@@ -26,33 +27,34 @@ public void onEnable() {
             configuration = getConfig();
         } catch (Exception e) {
             getProxy().getLogger().log(Level.SEVERE,
-                    ChatColor.BLUE+"[CrossChat]"+ChatColor.RED+" Configuration file could not be loaded, using default config.");
+                    ChatColor.AQUA+"[CrossChat]"+ChatColor.RED+" Configuration file could not be loaded, using default config.");
         }
-
-        getProxy().registerChannel( "message:sent" );
+        getProxy().registerChannel( getConfigurationValue("communicationChannel"));
         getProxy().getPluginManager().registerListener(this,new MessageListener());
+
+        this.getProxy().getPluginManager().registerCommand(this,new CommandManager());
     }
 
     /**
      * Retrieves the config object, if it dosent exist generates it.
      * @return Return the Configuration object generated from the config file in your plugins folder.
      * @throws IOException Error thrown if config.yml could not be read.
      */
-    private Configuration getConfig() throws IOException {
+    private static Configuration getConfig() throws IOException {
         Configuration configuration;
-        if (!getDataFolder().exists()){
-            getDataFolder().mkdir();
-        File file = new File(getDataFolder(), "config.yml");
+        if (! instance.getDataFolder().exists()){
+            instance.getDataFolder().mkdir();
+        File file = new File(instance.getDataFolder(), "config.yml");
             if (!file.exists()) {
-                try (InputStream in = getResourceAsStream("config.yml")) {
+                try (InputStream in = instance.getResourceAsStream("config.yml")) {
                     Files.copy(in, file.toPath());
                 } catch (Exception e) {
-                    getProxy().getLogger().log(Level.SEVERE,
+                    instance.getProxy().getLogger().log(Level.SEVERE,
                             ChatColor.RED+"[CrossChat]"+"getConfig readfile");
                 }
             }
         }
-        configuration = ConfigurationProvider.getProvider(YamlConfiguration.class).load(new File(getDataFolder(), "config.yml"));
+        configuration = ConfigurationProvider.getProvider(YamlConfiguration.class).load(new File(instance.getDataFolder(), "config.yml"));
         return configuration;
     }
 
@@ -74,24 +76,6 @@ private void FixConfig(){
             e.printStackTrace();
         }
 
-//        if (getDefaultConfig().getKeys() == configuration.getKeys()){ //Keys are the same but content might be empty.
-//            boolean diff = false;
-//            for (String key : input.getKeys()){
-//                if (input.get(key) == null || !input.get(key).equals("")) {
-//                    input.set(key, getDefaultConfig().get(key));
-//                    diff = true;
-//                }
-//            }
-//            try {
-//                ConfigurationProvider.getProvider(YamlConfiguration.class).save(configuration, new File(getDataFolder(), "config.yml"));
-//            } catch (Exception e) {
-//                getProxy().getLogger().log(Level.WARNING,
-//                        ChatColor.BLUE+"[CrossChat]"+ChatColor.RED+" Configuration file could not be saved after Configuration Validation.");
-//                getProxy().getLogger().log(Level.CONFIG,e.getMessage());
-//            }
-//        }
-//        return input;
-
     }
 
     /**
@@ -117,9 +101,9 @@ private static Configuration getDefaultConfig(){
         Configuration configuration = new Configuration();
 
         configuration.set("separator"," → ");
+        configuration.set("communicationChannel","crosschat:message");
 
         return configuration;
     }
 
-
 }

Bungee/src/main/java/ca/matai/crosschat/listeners/MessageListener.java

@@ -7,7 +7,6 @@
 import net.md_5.bungee.api.chat.TextComponent;
 import net.md_5.bungee.api.event.PluginMessageEvent;
 import net.md_5.bungee.api.plugin.Listener;
-import net.md_5.bungee.api.plugin.PluginManager;
 import net.md_5.bungee.event.EventHandler;
 
 public class MessageListener implements Listener {
@@ -16,12 +15,13 @@ public class MessageListener implements Listener {
 
     @EventHandler
     public void PluginMessageListener(PluginMessageEvent event){
-        if (event.getTag().equalsIgnoreCase("message:sent")){
+
+        if (event.getTag().equalsIgnoreCase(CrossChatBungee.instance.getConfigurationValue("communicationChannel"))){
             ByteArrayDataInput in = ByteStreams.newDataInput(event.getData());
             String playername = in.readUTF();
             String chatmessage = in.readUTF();
-
             ProxyServer.getInstance().broadcast(new TextComponent(playername + CrossChatBungee.instance.getConfigurationValue("separator") + chatmessage));
+
         }
     }
 

Bungee/src/main/resources/config.yml

@@ -1 +1,10 @@
-separator: " → "
+separator: " → "
+
+
+
+#=================================================================================
+# Advanced Section. Don't touch this if you don't know what you are doing.
+# Trust me you might end up without chat or other functions on all your servers.
+#=================================================================================
+
+communicationChannel: "crosschat:message"

Bungee/src/main/resources/plugin.yml

@@ -1,5 +1,5 @@
 name: CrossChat
-version: 1.1.0
+version: 1.2.0
 description: Receiver plugin to chat across multiple Bungee/Waterfall servers.
 
 

README.md

@@ -15,4 +15,5 @@ Project Code and feature/issues can be found on the GitHub repo ([Right Here!](h
 
 ## RoadMap:
  1. ~~Add configuration for symbol between username and chat message.~~
- 2. Admins can toggle global chat.
+ 2. Admins can toggle global chat.
+ 3. Add option to display server user is chating from.

Spigot/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>ca.matai</groupId>
     <artifactId>CrossChatSpigot</artifactId>
-    <version>1.1.0</version>
+    <version>1.2.0</version>
     <build>
         <plugins>
             <plugin>

Spigot/src/main/java/ca/matai/CrossChat/Commands/CommandManager.java

@@ -51,7 +51,7 @@ public List<SubCommand> getSubCommands() {
     }
 
     public void helpMessage(Player p) {
-        p.sendMessage(ChatColor.YELLOW + "          [" + ChatColor.AQUA + "@Player" + ChatColor.YELLOW + "]");
+        p.sendMessage(ChatColor.AQUA+"[CrossChat]");
         p.sendMessage(ChatColor.AQUA + "Version: " + JavaPlugin.getPlugin(CrossChatSpigot.class).getDescription().getVersion());
         p.sendMessage(ChatColor.AQUA + "Available commands: ");
         getSubCommands().forEach(x -> p.sendMessage(ChatColor.AQUA + x.getSyntax()));

Spigot/src/main/java/ca/matai/CrossChat/Commands/SubCommand.java

@@ -7,7 +7,7 @@ public abstract class SubCommand {
 
     public Boolean permissionCheck(Player p){
         if(!p.hasPermission(getPermission())){
-            p.sendMessage(ChatColor.YELLOW + "[" + ChatColor.AQUA + "CrossChat" + ChatColor.YELLOW + "]" + ChatColor.RED + "You do not have the permission to use this command!");
+            p.sendMessage(ChatColor.AQUA+"[CrossChat]" + ChatColor.RED + "You do not have the permission to use this command!");
             return false;
         }
         return true;

Spigot/src/main/java/ca/matai/CrossChat/CrossChatSpigot.java

@@ -2,27 +2,35 @@
 
 import ca.matai.CrossChat.listeners.ChatListener;
 import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.configuration.Configuration;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.AsyncPlayerChatEvent;
 import org.bukkit.plugin.java.JavaPlugin;
 
+import java.io.IOException;
+import java.util.logging.Level;
+
 
 public class CrossChatSpigot extends JavaPlugin implements Listener {
 
+
     @Override
     public void onEnable() {
-        this.getServer().getMessenger().registerOutgoingPluginChannel(this, "message:sent");
+        this.saveDefaultConfig();
+
+        this.getServer().getMessenger().registerOutgoingPluginChannel(this, this.getConfig().getString("communicationChannel"));
+
         Bukkit.getServer().getPluginManager().registerEvents(this, this);
     }
-    @Override
-    public void onDisable() {
-    }
+
+
 
     @EventHandler
-    public void onPlayerChat(AsyncPlayerChatEvent event) {
+    public void onPlayerChat(AsyncPlayerChatEvent event) throws IOException {
         ChatListener info = new ChatListener(event.getPlayer().getDisplayName(),event.getMessage());
-        event.getPlayer().sendPluginMessage(JavaPlugin.getPlugin(CrossChatSpigot.class),"message:sent",info.getPluginMessage());
+        event.getPlayer().sendPluginMessage(JavaPlugin.getPlugin(CrossChatSpigot.class),this.getConfig().getString("communicationChannel"),info.getPluginMessage());
         event.setCancelled(true);
     }
 

Spigot/src/main/resources/config.yml

@@ -0,0 +1,11 @@
+settingplaceholder: "Hello World!"
+
+
+
+
+#=================================================================================
+# Advanced Section. Don't touch this if you don't know what you are doing.
+# Trust me you might end up without chat or other functions on all your servers.
+#=================================================================================
+
+communicationChannel: "crosschat:message"

Spigot/src/main/resources/plugin.yml

@@ -1,5 +1,5 @@
 name: CrossChat
-version: 1.1.0
+version: 1.2.0
 description: Sender plugin to chat across multiple Bungee/Waterfall servers.
 
 author: _Matai_