New mcMMO options.

src/main/java/com/cnaude/purpleirc/GameListeners/GamePlayerChatListener.java

@@ -50,12 +50,12 @@ public GamePlayerChatListener(PurpleIRC plugin) {
     public void onAsyncPlayerChat(AsyncPlayerChatEvent event) {
         String message = event.getMessage();
         plugin.logDebug("ChatFormat [" + event.isCancelled() + "]: " + event.getFormat());
-        if (message.startsWith("[[townytag]]")) {
-            event.setMessage(message.replace("[[townytag]]", ""));
-            plugin.logDebug("Ignoring due to townytag");
+        if (message.startsWith(PurpleIRC.TOWNYTAG)) {
+            event.setMessage(message.replace(PurpleIRC.TOWNYTAG, ""));
+            plugin.logDebug("Ignoring due to TownyChat tag");
             return;
         }
-        event.setMessage(message.replace("[[townytag]]", ""));
+        event.setMessage(message.replace(PurpleIRC.TOWNYTAG, ""));
         if (event.isCancelled() && !plugin.isPluginEnabled("FactionChat") && !plugin.ignoreChatCancel) {
             plugin.logDebug("Ignore chat message due to event cancellation: " + event.getMessage());
             return;

src/main/java/com/cnaude/purpleirc/GameListeners/McMMOChatListener.java

@@ -39,7 +39,15 @@ public McMMOChatListener(PurpleIRC plugin) {
 
     @EventHandler
     public void onMcMMOChatEvent(McMMOChatEvent event) {
-        event.setMessage(event.getMessage().replace("[[townytag]]", ""));
+        String message = event.getMessage();
+        message = message.replace(PurpleIRC.TOWNYTAG, "");
+        if (message.contains(PurpleIRC.PURPLETAG)) {
+            message = message.replace(PurpleIRC.PURPLETAG, "");
+            event.setMessage(message);
+            plugin.logDebug("[onMcMMOChatEvent]: PurpleIRC tag detected. Not sending back IRC." );
+            return;
+        }
+
         String sender = event.getSender();
         Player player = plugin.getServer().getPlayer(sender);
         plugin.logDebug("McMMOChatEvent caught: " + sender);
@@ -54,22 +62,38 @@ public void onMcMMOChatEvent(McMMOChatEvent event) {
 
     @EventHandler
     public void onMcMMOAdminChatEvent(McMMOAdminChatEvent event) {
-        event.setMessage(event.getMessage().replace("[[townytag]]", ""));
+        String message = event.getMessage();
+        message = message.replace(PurpleIRC.TOWNYTAG, "");
+        if (message.contains(PurpleIRC.PURPLETAG)) {
+            message = message.replace(PurpleIRC.PURPLETAG, "");
+            event.setMessage(message);
+            plugin.logDebug("[onMcMMOAdminChatEvent]: PurpleIRC tag detected. Not sending back IRC." );
+            return;
+        }
+
         String sender = event.getSender();
         Player player = plugin.getServer().getPlayer(sender);
         plugin.logDebug("McMMOAdminChatEvent caught: " + sender);
         if (player != null && !sender.isEmpty()) {
             if (player.hasPermission("irc.message.gamechat")) {
                 for (PurpleBot ircBot : plugin.ircBots.values()) {
-                    ircBot.mcMMOAdminChat(player, event.getMessage());
+                    ircBot.mcMMOAdminChat(player, message);
                 }
             }
         }
     }
 
     @EventHandler
     public void onMcMMOPartyChatEvent(McMMOPartyChatEvent event) {
-        event.setMessage(event.getMessage().replace("[[townytag]]", ""));
+        String message = event.getMessage();
+        message = message.replace(PurpleIRC.TOWNYTAG, "");
+        if (message.contains(PurpleIRC.PURPLETAG)) {
+            message = message.replace(PurpleIRC.PURPLETAG, "");
+            event.setMessage(message);
+            plugin.logDebug("[onMcMMOPartyChatEvent]: PurpleIRC tag detected. Not sending back IRC." );
+            return;
+        }
+
         String sender = event.getSender();
         Player player = plugin.getServer().getPlayer(sender);
         String party = event.getParty();
@@ -80,6 +104,6 @@ public void onMcMMOPartyChatEvent(McMMOPartyChatEvent event) {
                     ircBot.mcMMOPartyChat(player, party, event.getMessage());
                 }
             }
-        }
+        }        
     }
 }

src/main/java/com/cnaude/purpleirc/Hooks/McMMOChatHook.java

@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2014 cnaude
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.cnaude.purpleirc.Hooks;
+
+import com.cnaude.purpleirc.PurpleIRC;
+import com.gmail.nossr50.api.ChatAPI;
+import com.gmail.nossr50.api.PartyAPI;
+import com.gmail.nossr50.datatypes.party.Party;
+import org.bukkit.plugin.Plugin;
+
+/**
+ *
+ * @author cnaude
+ */
+public class McMMOChatHook {
+
+    private final PurpleIRC plugin;
+    private final Plugin mcMMOPlugin;
+
+    /**
+     *
+     * @param plugin
+     */
+    public McMMOChatHook(PurpleIRC plugin) {
+        this.plugin = plugin;
+        this.mcMMOPlugin = plugin.getServer().getPluginManager().getPlugin("mcMMO");
+    }
+
+    public void sendAdminMessage(String sender, String message) {
+        if (mcMMOPlugin != null) {
+            plugin.logDebug("[mcMMOChatHook:sendAdminMessage]: " + message);
+            ChatAPI.sendAdminChat(mcMMOPlugin, sender, PurpleIRC.PURPLETAG + message);
+        }
+    }
+
+    public void sendPartyMessage(String sender, String party, String message) {
+        if (mcMMOPlugin != null) {
+            for (Party p : PartyAPI.getParties()) {                
+                if (p.getName().equalsIgnoreCase(party)) {
+                    plugin.logDebug("[mcMMOChatHook:sendPartyMessage]: " + party + " : " + message);
+                    ChatAPI.sendPartyChat(mcMMOPlugin, sender, party, PurpleIRC.PURPLETAG + message);
+                    return;
+                }
+            }
+        }
+    }
+
+}

src/main/java/com/cnaude/purpleirc/PurpleBot.java

@@ -734,7 +734,7 @@ private boolean loadConfig() {
                 }
             }
 
-            // build command notify recipient list            
+            // build command notify recipient list
             for (String recipient : config.getStringList("command-notify.recipients")) {
                 if (!channelCmdNotifyRecipients.contains(recipient)) {
                     channelCmdNotifyRecipients.add(recipient);
@@ -745,7 +745,7 @@ private boolean loadConfig() {
                 plugin.logInfo(" No command recipients defined.");
             }
 
-            // build command notify ignore list            
+            // build command notify ignore list
             for (String command : config.getStringList("command-notify.ignore")) {
                 if (!channelCmdNotifyIgnore.contains(command)) {
                     channelCmdNotifyIgnore.add(command);
@@ -1969,10 +1969,10 @@ public void fixTopic(Channel channel, String topic, String setBy) {
     }
 
     private void setTheTopic(Channel channel, String topic) {
-        String myChannel = channel.getName();
-        if (channelTopicChanserv.containsKey(myChannel)) {
-            if (channelTopicChanserv.get(myChannel)) {
-                String msg = String.format("TOPIC %s %s", myChannel, topic);
+        String channelName = channel.getName();
+        if (channelTopicChanserv.containsKey(channelName)) {
+            if (channelTopicChanserv.get(channelName)) {
+                String msg = String.format("TOPIC %s %s", channelName, topic);
                 plugin.logDebug("Sending chanserv rmessage: " + msg);
                 asyncIRCMessage("chanserv", msg);
                 return;
@@ -2323,10 +2323,10 @@ public void voiceIrcUser(Channel channel, User user) {
         }
     }
 
-    public String filterMessage(String message, String myChannel) {
-        if (filters.containsKey(myChannel)) {
-            if (!filters.get(myChannel).isEmpty()) {
-                for (String filter : filters.get(myChannel)) {
+    public String filterMessage(String message, String channelName) {
+        if (filters.containsKey(channelName)) {
+            if (!filters.get(channelName).isEmpty()) {
+                for (String filter : filters.get(channelName)) {
                     if (filter.startsWith("/") && filter.endsWith("/")) {
                         filter = filter.substring(1, filter.length() - 1);
                         plugin.logDebug("Regex filtering " + filter + " from " + message);
@@ -2341,7 +2341,7 @@ public String filterMessage(String message, String myChannel) {
         return message;
     }
 
-    // Broadcast chat messages from IRC
+    // Broadcast chat messages from IRC to the game
     /**
      *
      * @param user
@@ -2408,6 +2408,42 @@ public void broadcastChat(User user, org.pircbotx.Channel channel, String target
             }
         }
 
+        /*
+         Send messages to mcMMO if enabled
+         */
+        if (plugin.mcMMOChatHook != null) {
+            /*
+             Send to mcMMMO admin channel if enabled
+             */
+            if (isMessageEnabled(channelName, TemplateName.IRC_MCMMO_ADMIN_CHAT)) {
+                String tmpl = plugin.getMsgTemplate(botNick, channelName, TemplateName.IRC_MCMMO_ADMIN_CHAT);
+                plugin.logDebug("broadcastChat [mcMMO:admin]: " + message);
+                String rawMcMMOMessage = filterMessage(
+                        plugin.tokenizer.ircChatToGameTokenizer(this, user, channel, tmpl, message), channelName);
+                plugin.mcMMOChatHook.sendAdminMessage(user.getNick(), rawMcMMOMessage);
+                messageSent = true;
+
+            }
+            /*
+             Send to specific mcMMMO party channel if enabled
+             */
+            for (String em : getEnabledMessages(channel.getName())) {
+                if (em.startsWith("irc-mcmmo-party-") && em.endsWith("-chat")) {
+                    if (isMessageEnabled(channelName, em)) {
+                        String party = em.replace("irc-mcmmo-party-", "").replace("-chat", "");
+                        if (!party.isEmpty()) {
+                            String tmpl = plugin.getMsgTemplate(botNick, channelName, TemplateName.IRC_MCMMO_PARTY_CHAT);
+                            plugin.logDebug("broadcastChat [mcMMO:party]: " + party + " : " + message);
+                            String rawMcMMOMessage = filterMessage(
+                                    plugin.tokenizer.ircChatToGameTokenizer(this, user, channel, tmpl, message), channelName);
+                            plugin.mcMMOChatHook.sendPartyMessage(user.getNick(), party, rawMcMMOMessage);
+                            messageSent = true;
+                        }
+                    }
+                }
+            }
+        }
+
         /*
          Send messages to players if enabled
          */
@@ -2815,6 +2851,18 @@ public boolean isMessageEnabled(String channelName, String templateName) {
         return isEnabled;
     }
 
+    /**
+     *
+     * @param channelName
+     * @return
+     */
+    public Collection<String> getEnabledMessages(String channelName) {
+        if (enabledMessages.containsKey(channelName)) {
+            return enabledMessages.get(channelName);
+        }
+        return new ArrayList<>();
+    }
+
     /**
      *
      * @param channel
@@ -2903,6 +2951,7 @@ public void msgPlayer(Player sender, String nick, String message) {
         asyncIRCMessage(nick, msg);
     }
 
+
     /**
      *
      * @param nick
@@ -3130,7 +3179,10 @@ public void joinNotice(Channel channel, User user) {
             }
             String myMessage = ChatColor.translateAlternateColorCodes('&', plugin.colorConverter.gameColorsToIrc(joinNoticeMessage.replace("%NAME%", user.getNick())));
             if (joinNoticeMessage.startsWith("/")) {
-                plugin.commandQueue.add(new IRCCommand(new IRCCommandSender(this, target, plugin, joinNoticeCtcp, "CONSOLE"), myMessage.trim().substring(1)));
+                plugin.commandQueue.add(new IRCCommand(
+                        new IRCCommandSender(this, target, plugin, joinNoticeCtcp, "CONSOLE"),
+//                        new IRCConsoleCommandSender(this, target, plugin, joinNoticeCtcp, "CONSOLE"),
+                        myMessage.trim().substring(1)));
             } else {
                 if (joinNoticeCtcp) {
                     asyncCTCPMessage(target, myMessage);

src/main/java/com/cnaude/purpleirc/PurpleIRC.java

@@ -44,6 +44,7 @@
 import com.cnaude.purpleirc.Hooks.DynmapHook;
 import com.cnaude.purpleirc.Hooks.FactionChatHook;
 import com.cnaude.purpleirc.Hooks.JobsHook;
+import com.cnaude.purpleirc.Hooks.McMMOChatHook;
 import com.cnaude.purpleirc.Hooks.ReportRTSHook;
 import com.cnaude.purpleirc.Hooks.ShortifyHook;
 import com.cnaude.purpleirc.Hooks.SuperVanishHook;
@@ -174,6 +175,7 @@ public class PurpleIRC extends JavaPlugin {
     public ShortifyHook shortifyHook;
     public ReportRTSHook reportRTSHook;
     public CommandBookHook commandBookHook;
+    public McMMOChatHook mcMMOChatHook;
     public NetPackets netPackets;
     public CommandHandlers commandHandlers;
     public PurpleTabCompleter ircTabCompleter;
@@ -212,6 +214,8 @@ public class PurpleIRC extends JavaPlugin {
     final String PL_TITANCHAT = "TitanChat";
     final String PL_HEROCHAT = "Herochat";
     List<String> hookList = new ArrayList<>();
+    public static final String PURPLETAG = "UHVycGxlSVJDCg==";
+    public static final String TOWNYTAG = "VG93bnlDaGF0Cg==";
 
     public PurpleIRC() {
         this.MAINCONFIG = "MAIN-CONFIG";
@@ -376,6 +380,13 @@ public String getHeroMsgTemplate(String botName, String tmpl) {
         return "";
     }
 
+    /**
+     *
+     * @param botName
+     * @param channelName
+     * @param tmpl
+     * @return
+     */
     public String getMsgTemplate(String botName, String channelName, String tmpl) {
         if (messageTmpl.containsKey(botName + "." + channelName)) {
             if (messageTmpl.get(botName + "." + channelName).containsKey(tmpl)) {
@@ -1430,6 +1441,7 @@ private void detectHooks() {
         if (isPluginEnabled(PL_MCMMO)) {
             hookList.add(hookFormat(PL_MCMMO, true));
             getServer().getPluginManager().registerEvents(new McMMOChatListener(this), this);
+            mcMMOChatHook = new McMMOChatHook(this);
         } else {
             hookList.add(hookFormat(PL_MCMMO, false));
         }

src/main/java/com/cnaude/purpleirc/TemplateName.java

@@ -48,6 +48,9 @@ public class TemplateName {
     public final static String MCMMO_PARTY_CHAT = "mcmmo-party-chat";
     public final static String MCMMO_CHAT = "mcmmo-chat";
 
+    public final static String IRC_MCMMO_ADMIN_CHAT = "irc-mcmmo-admin-chat";
+    public final static String IRC_MCMMO_PARTY_CHAT = "irc-mcmmo-party-chat";
+
     public final static String HERO_ACTION = "hero-action";
     public final static String HERO_CHAT = "hero-chat";
 

src/main/resources/SampleBot.yml

@@ -174,6 +174,9 @@ channels:
     - mcmmo-admin-chat
     - mcmmo-party-chat
     - mcmmo-chat
+    # mcMMO messages sent from IRC. Replace [PARTY] with destination mcMMO party
+    - irc-mcmmo-admin-chat
+    - irc-mcmmo-party-[PARTY]-chat
     # FactionChat messages sent to IRC
     - faction-public-chat
     - faction-ally-chat

src/main/resources/config.yml

@@ -134,6 +134,9 @@ message-format:
   mcmmo-admin-chat: '[admin:%WORLD%]<%NAME%> %MESSAGE%'
   mcmmo-party-chat: '[party:%PARTY%]<%NAME%> %MESSAGE%'
   mcmmo-chat: '[mcMMO]<%NAME%> %MESSAGE%'
+  # Message templates for IRC to mcMMO
+  irc-mcmmo-admin-chat: '[&4IRC&r]<%NAME%> %MESSAGE%'
+  irc-mcmmo-party-chat: '[&4IRC&r]<%NAME%> %MESSAGE%'
   # Message templates for FactionChat to IRC messages
   faction-public-chat: '[%FACTIONMODE%&r][%FACTIONTAG%]<%NAME%> %MESSAGE%'
   faction-ally-chat: '[%FACTIONMODE%&r][%FACTIONTAG%]<%NAME%> %MESSAGE%'