From 20d6cd73136e356e4255a12a8c9639cd5c6eca30 Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Fri, 25 Nov 2016 21:05:35 +0100 Subject: [PATCH] IT WORKS! Chat works! With some bugs ofc --- .../discordplugin/DiscordPlugin.java | 16 +++++++++------- .../discordplugin/listeners/ChatListener.java | 19 ------------------- .../listeners/MCChatListener.java | 3 ++- 3 files changed, 11 insertions(+), 27 deletions(-) delete mode 100644 src/main/java/buttondevteam/discordplugin/listeners/ChatListener.java diff --git a/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java b/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java index 4bba07b..fdf2ddd 100644 --- a/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java +++ b/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java @@ -14,9 +14,9 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import buttondevteam.discordplugin.listeners.ChatListener; import buttondevteam.discordplugin.listeners.CommandListener; import buttondevteam.discordplugin.listeners.ExceptionListener; +import buttondevteam.discordplugin.listeners.MCChatListener; import buttondevteam.discordplugin.listeners.MCListener; import buttondevteam.discordplugin.mccommands.DiscordMCCommandBase; import buttondevteam.lib.TBMCCoreAPI; @@ -61,7 +61,9 @@ public class DiscordPlugin extends JavaPlugin implements IListener { dc.getDispatcher().registerListener(this); for (IListener listener : CommandListener.getListeners()) dc.getDispatcher().registerListener(listener); - dc.getDispatcher().registerListener(new ChatListener()); + MCChatListener mcchat = new MCChatListener(); + dc.getDispatcher().registerListener(mcchat); + TBMCCoreAPI.RegisterEventsForExceptions(mcchat, this); Bukkit.getPluginManager().registerEvents(new ExceptionListener(), this); TBMCCoreAPI.RegisterEventsForExceptions(new MCListener(), this); TBMCChatAPI.AddCommands(this, DiscordMCCommandBase.class); @@ -96,16 +98,16 @@ public class DiscordPlugin extends JavaPlugin implements IListener { annchannel = mainServer.getChannelByID("126795071927353344"); // announcements genchannel = mainServer.getChannelByID("125813020357165056"); // general chatchannel = mainServer.getChannelByID("249663564057411596"); // minecraft_chat - issuechannel = devServer.getChannelByID("219643416496046081"); //server-issues - debugchannel = devServer.getChannelByID("250332016199860224"); //debug-channel - botroomchannel = devServer.getChannelByID("239519012529111040");//bot-room + issuechannel = devServer.getChannelByID("219643416496046081"); // server-issues + debugchannel = devServer.getChannelByID("250332016199860224"); // debug-channel + botroomchannel = devServer.getChannelByID("239519012529111040");// bot-room dc.changeStatus(Status.game("on TBMC")); } else { botchannel = devServer.getChannelByID("239519012529111040"); // bot-room annchannel = devServer.getChannelByID("239519012529111040"); // bot-room genchannel = devServer.getChannelByID("239519012529111040"); // bot-room - botroomchannel = devServer.getChannelByID("239519012529111040");//bot-room - issuechannel = devServer.getChannelByID("239519012529111040"); //bot-room + botroomchannel = devServer.getChannelByID("239519012529111040");// bot-room + issuechannel = devServer.getChannelByID("239519012529111040"); // bot-room debugchannel = devServer.getChannelByID("239519012529111040"); // bot-room chatchannel = devServer.getChannelByID("248185455508455424"); // minecraft_chat_test dc.changeStatus(Status.game("testing")); diff --git a/src/main/java/buttondevteam/discordplugin/listeners/ChatListener.java b/src/main/java/buttondevteam/discordplugin/listeners/ChatListener.java deleted file mode 100644 index 5bcf348..0000000 --- a/src/main/java/buttondevteam/discordplugin/listeners/ChatListener.java +++ /dev/null @@ -1,19 +0,0 @@ -package buttondevteam.discordplugin.listeners; - -import buttondevteam.discordplugin.DiscordPlugin; -import sx.blah.discord.api.events.IListener; -import sx.blah.discord.handle.impl.events.MessageReceivedEvent; - -public class ChatListener implements IListener { - - @Override - public void handle(MessageReceivedEvent event) { - if (!event.getMessage().getChannel().getID().equals(DiscordPlugin.chatchannel.getID())) - return; - if (event.getMessage().getContent().startsWith("/")) - ; // Call API method - else - ; - } - -} diff --git a/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java b/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java index 79beb33..7ad5636 100644 --- a/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java +++ b/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java @@ -20,6 +20,7 @@ public class MCChatListener implements Listener, IListener @Override public void handle(MessageReceivedEvent event) { - TBMCChatAPI.SendChatMessage(Channel.GlobalChat, Bukkit.getConsoleSender(), event.getMessage().getContent()); + if (event.getMessage().getChannel().getID().equals(DiscordPlugin.chatchannel.getID())) + TBMCChatAPI.SendChatMessage(Channel.GlobalChat, Bukkit.getConsoleSender(), event.getMessage().getContent()); } }