Update to include MGMT and CA HELP discord relay channels.

Author: Sindusk

build.gradle

@@ -13,7 +13,7 @@ apply plugin: 'com.github.johnrengelman.shadow'
 
 group = 'org.nyxcode.wurm'
 
-version = '2.1'
+version = '3.0'
 
 description = "A mod that acts as a discord relay between Wurm kingdom chat and a discord server"
 
@@ -23,14 +23,15 @@ targetCompatibility = 1.8
 repositories {
     mavenCentral()
     maven { url "http://jcenter.bintray.com" }
-    maven { url "http://gotti.no-ip.org/maven/repository" }
+    maven { url "https://dl.bdew.net/agorepo/" }
     maven { url "http://repo.maven.apache.org/maven2" }
     maven { url 'https://jitpack.io' }
 }
+
 dependencies {
     compile 'net.dv8tion:JDA:3.3.1_289'
-    compile 'org.gotti.wurmunlimited:server-modlauncher:0.35-beta1'
-    compile 'com.github.Sindusk:sindusklibrary:v1.1'
+    compile 'org.gotti.wurmunlimited:server-modlauncher:0.40'
+    compile 'com.github.Sindusk:sindusklibrary:v2.1'
 }
 
 jar {
@@ -39,9 +40,9 @@ jar {
 
 shadowJar {
     dependencies {
-        exclude(dependency('org.gotti.wurmunlimited:server-modlauncher:0.35-beta1'))
-        exclude(dependency('org.gotti.wurmunlimited:common:2182584'))
-        exclude(dependency('org.gotti.wurmunlimited:server:2182584'))
+        exclude(dependency('org.gotti.wurmunlimited:server-modlauncher:0.40'))
+        exclude(dependency('org.gotti.wurmunlimited:common:3127452'))
+        exclude(dependency('org.gotti.wurmunlimited:server:3127452'))
     }
 }
 

mods/DiscordRelay.properties

@@ -12,7 +12,6 @@ botToken=
 discordServerName=ServerName
 
 # useUnderscore: This will determine whether to replace white space with underscores or remove whitespace entirely.
-# Example: True - #ca_help. False - #cahelp
 useUnderscore=true
 
 # showConnectedPlayers: Whether or not to show the amount of players connected as the "game" description of the bot in Discord.
@@ -30,4 +29,16 @@ enableRumors=true
 # enableTrade: Whether or not to enable the global trade relay.
 # Any messages sent to trade in-game will be relayed to a global #trade channel in Discord.
 # Any messages sent to the #trade channel in Discord will be relayed in-game to all kingdom's trade chats.
-enableTrade=true
+enableTrade=true
+
+# enableMGMT: Whether to enable MGMT relay
+# Any message sent to MGMT in-game will be relayed to a global #mgmt channel in Discord.
+# Any messages sent to the #mgmt channel in Discord will be relayed in-game to all players able to see the window.
+# Permissions to see #mgmt in Discord must be configured by the server administrator.
+# Permissions to see MGMT in-game is dictated by the in-game player status (CA, CM, GM, etc.)
+enableMGMT=true
+
+# enableCAHELP: Whether to enable CA HELP relay
+# Any messages sent to CA HELP in-game will be relayed to #ca-help in Discord.
+# Any messages sent to #ca-help in discord will be relayed in-game to CA HELP.
+enableCAHELP=true

src/main/java/org/nyxcode/wurm/discordrelay/DiscordRelay.java

@@ -11,6 +11,7 @@
 import javassist.CtClass;
 import javassist.NotFoundException;
 import javassist.bytecode.Descriptor;
+import mod.sin.lib.Prop;
 import mod.sin.lib.Util;
 import net.dv8tion.jda.core.AccountType;
 import net.dv8tion.jda.core.JDA;
@@ -48,7 +49,8 @@ public class DiscordRelay extends ListenerAdapter implements WurmServerMod, PreI
     protected static boolean enableRumors = true;
     protected static String rumorChannel = "rumors";
     protected static boolean enableTrade = true;
-
+    protected static boolean enableMGMT = true;
+    protected static boolean enableCAHELP = true;
 
     public static void sendRumour(Creature creature){
         sendToDiscord(rumorChannel, "Rumours of " + creature.getName() + " are starting to spread.", true);
@@ -97,6 +99,8 @@ public void preInit() {
 
     @Override
     public void configure(Properties properties) {
+        Prop.properties = properties;
+
         botToken = properties.getProperty("botToken", botToken);
         if(botToken.equals("")){
             logger.warning("Discord bot token not entered for DiscordRelay. The bot will not function without this.");
@@ -112,6 +116,8 @@ public void configure(Properties properties) {
         enableRumors = Boolean.parseBoolean(properties.getProperty("enableRumors", Boolean.toString(enableRumors)));
         rumorChannel = properties.getProperty("rumorChannel", rumorChannel);
         enableTrade = Boolean.parseBoolean(properties.getProperty("enableTrade", Boolean.toString(enableTrade)));
+        enableMGMT = Prop.getBooleanProperty("enableMGMT", enableMGMT);
+        enableCAHELP = Prop.getBooleanProperty("enableCAHELP", enableCAHELP);
     }
 
     private static final DateFormat df = new SimpleDateFormat("HH:mm:ss");
@@ -157,6 +163,24 @@ public MessagePolicy onKingdomMessage(Message message) {
         return MessagePolicy.PASS;
     }
 
+    public void sendToHelpChat(final String channel, final String message){
+        String window = "CA HELP";
+        final Message mess = new Message(null, Message.CA, window, message);
+        mess.setSenderKingdom((byte) 4);
+        if (message.trim().length() > 1) {
+            Server.getInstance().addMessage(mess);
+        }
+    }
+
+    public void sendToMGMTChat(final String channel, final String message){
+        String window = "MGMT";
+        final Message mess = new Message(null, Message.MGMT, window, message);
+        mess.setSenderKingdom((byte) 4);
+        if (message.trim().length() > 1) {
+            Server.getInstance().addMessage(mess);
+        }
+    }
+
     public void sendToTradeChat(final String channel, final String message){
         String window = "Trade";
         final Message mess = new Message(null, Message.TRADE, window, message);
@@ -219,7 +243,15 @@ public void onMessageReceived(MessageReceivedEvent event) {
                 if(enableTrade) {
                     sendToTradeChat(name, "<@" + event.getMember().getEffectiveName() + "> " + event.getMessage().getContent());
                 }
-            }else {
+            } else if (name.contains(discordifyName("ca-help"))){
+                if (enableCAHELP) {
+                    sendToHelpChat(name, "<@" + event.getMember().getEffectiveName() + "> " + event.getMessage().getContent());
+                }
+            } else if (name.contains("mgmt")){
+                if (enableMGMT) {
+                    sendToMGMTChat(name, "<@" + event.getMember().getEffectiveName() + "> " + event.getMessage().getContent());
+                }
+            } else {
                 sendToGlobalKingdomChat(name, "<@" + event.getMember().getEffectiveName() + "> " + event.getMessage().getContent());
             }
         }
@@ -234,10 +266,25 @@ private String discordifyName(String name) {
         }
     }
 
+    protected static String getPlayerPrefix(Communicator comm){
+        if (comm.getPlayer() != null) {
+            return "<" + comm.getPlayer().getName() + "> ";
+        }
+        logger.warning("Could not find player for a communicator.");
+        return "<???>";
+    }
+
     @Override
     public MessagePolicy onPlayerMessage(Communicator communicator, String message, String title){
-        /*if(title.equals("Trade")){
-        }*/
+        // Skip commands
+        if (message.startsWith("!") || message.startsWith("/") || message.startsWith("#")){
+            return MessagePolicy.PASS;
+        }
+        if (title.equals("MGMT")){
+            sendToDiscord("mgmt", getPlayerPrefix(communicator) + message, false);
+        } else if (title.equals("CA HELP")) {
+            sendToDiscord(discordifyName("ca-help"), getPlayerPrefix(communicator) + message, false);
+        }
         return MessagePolicy.PASS;
     }
 
@@ -256,8 +303,8 @@ public void onServerPoll() {
                     try {
                         jda.getPresence().setGame(Game.of(Players.getInstance().getNumberOfPlayers() + " online!"));
                     }catch(Exception e){
-                        e.printStackTrace();
-                        logger.info("Failed to update player count.");
+                        //e.printStackTrace();
+                        //logger.info("Failed to update player count.");
                     }
                 }
                 lastPolledPlayers = System.currentTimeMillis();