Update to Herochat 5.7.0.

cnaude · Mar 21, 2016 · ff1e49e · ff1e49e
1 parent 5a9c5a9
commit ff1e49e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -185,7 +185,7 @@
         <dependency>
             <groupId>com.cnaude.herochat</groupId>
             <artifactId>Herochat</artifactId>
-            <version>5.6.7</version>
+            <version>5.7.0</version>
         </dependency>
 
         <!-- VentureChat -->

diff --git a/src/main/java/com/cnaude/purpleirc/GameListeners/HeroChatListener.java b/src/main/java/com/cnaude/purpleirc/GameListeners/HeroChatListener.java
@@ -18,9 +18,9 @@
 
 import com.cnaude.purpleirc.PurpleBot;
 import com.cnaude.purpleirc.PurpleIRC;
-import com.dthielke.herochat.ChannelChatEvent;
-import com.dthielke.herochat.Chatter;
-import com.dthielke.herochat.Chatter.Result;
+import com.dthielke.api.ChatResult;
+import com.dthielke.api.Chatter;
+import com.dthielke.api.event.ChannelChatEvent;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -49,15 +49,16 @@ public HeroChatListener(PurpleIRC plugin) {
      */
     @EventHandler(ignoreCancelled = true, priority = EventPriority.NORMAL)
     public void onChannelChatEvent(ChannelChatEvent event) {
-        Chatter chatter = event.getSender();
+        Chatter chatter = event.getChatter();
+        ChatResult result = event.getResult();
         plugin.logDebug("HC Format: " + event.getFormat());
         plugin.logDebug("HC Result: " + event.getResult());
 
         ChatColor chatColor = event.getChannel().getColor();
         Player player = chatter.getPlayer();
         if (player.hasPermission("irc.message.gamechat")
                 && chatter.getChannels().contains(event.getChannel())
-                && event.getResult().equals(Result.ALLOWED)) {
+                && result.equals(ChatResult.ALLOWED)) {
             for (PurpleBot ircBot : plugin.ircBots.values()) {
                 if (plugin.heroChatEmoteFormat.equals(event.getFormat())) {
                     plugin.logDebug("HC Emote: TRUE");

diff --git a/src/main/java/com/cnaude/purpleirc/PurpleBot.java b/src/main/java/com/cnaude/purpleirc/PurpleBot.java
@@ -35,8 +35,8 @@
 import com.cnaude.purpleirc.IRCListeners.TopicListener;
 import com.cnaude.purpleirc.IRCListeners.WhoisListener;
 import com.cnaude.purpleirc.Utilities.CaseInsensitiveMap;
-import com.dthielke.herochat.Chatter;
-import com.dthielke.herochat.Herochat;
+import com.dthielke.Herochat;
+import com.dthielke.api.Chatter;
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableSortedSet;
 import com.massivecraft.factions.entity.Faction;

diff --git a/src/main/java/com/cnaude/purpleirc/Utilities/ChatTokenizer.java b/src/main/java/com/cnaude/purpleirc/Utilities/ChatTokenizer.java
@@ -20,7 +20,7 @@
 import com.cnaude.purpleirc.PurpleBot;
 import com.cnaude.purpleirc.PurpleIRC;
 import com.cnaude.purpleirc.TemplateName;
-import com.dthielke.herochat.ChannelManager;
+import com.dthielke.channel.ChannelManager;
 import com.gmail.nossr50.util.player.UserManager;
 import com.nyancraft.reportrts.data.Ticket;
 import com.palmergames.bukkit.TownyChat.channels.Channel;