From 03540b430cde27333fd3f0db6c090302fd7025b6 Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Thu, 22 Dec 2016 20:29:08 +0100 Subject: [PATCH 01/11] Made the test notification not show in chat --- src/main/java/buttondevteam/discordplugin/DiscordPlugin.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java b/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java index 24be49a..a8e078d 100644 --- a/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java +++ b/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java @@ -208,8 +208,8 @@ public class DiscordPlugin extends JavaPlugin implements IListener { e2.printStackTrace(); } try { - return channel - .sendMessage(Test ? "*The following message is from a test server*\n" + message : message); + return channel.sendMessage(Test && channel != chatchannel + ? "*The following message is from a test server*\n" + message : message); } catch (RateLimitException e) { try { Thread.sleep(e.getRetryDelay()); From aeee423c5a702cd96e35c218d2d527a1fb881df8 Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Thu, 22 Dec 2016 20:52:14 +0100 Subject: [PATCH 02/11] Added auto-updater listener --- .../discordplugin/DiscordPlugin.java | 4 +++- .../listeners/AutoUpdaterListener.java | 21 +++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 src/main/java/buttondevteam/discordplugin/listeners/AutoUpdaterListener.java diff --git a/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java b/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java index a8e078d..85f6869 100644 --- a/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java +++ b/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java @@ -74,6 +74,7 @@ public class DiscordPlugin extends JavaPlugin implements IListener { public static IChannel chatchannel; public static IChannel issuechannel; public static IChannel botroomchannel; + public static IChannel officechannel; public static IGuild mainServer; public static IGuild devServer; @@ -94,7 +95,8 @@ public class DiscordPlugin extends JavaPlugin implements IListener { genchannel = mainServer.getChannelByID("125813020357165056"); // general chatchannel = mainServer.getChannelByID("249663564057411596"); // minecraft_chat issuechannel = devServer.getChannelByID("219643416496046081"); // server-issues - botroomchannel = devServer.getChannelByID("239519012529111040");// bot-room + botroomchannel = devServer.getChannelByID("239519012529111040"); // bot-room + officechannel = devServer.getChannelByID("219626707458457603"); // developers-office dc.changeStatus(Status.game("on TBMC")); } else { botchannel = devServer.getChannelByID("239519012529111040"); // bot-room diff --git a/src/main/java/buttondevteam/discordplugin/listeners/AutoUpdaterListener.java b/src/main/java/buttondevteam/discordplugin/listeners/AutoUpdaterListener.java new file mode 100644 index 0000000..1a5284b --- /dev/null +++ b/src/main/java/buttondevteam/discordplugin/listeners/AutoUpdaterListener.java @@ -0,0 +1,21 @@ +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 AutoUpdaterListener implements IListener { + @Override + public void handle(MessageReceivedEvent event) { + if (!event.getMessage().getChannel().equals(DiscordPlugin.officechannel)) + return; + if (event.getMessage().getWebhookID() == null) + return; + System.out.println(event.getMessage().getWebhookID()); + if (event.getMessage().getEmbedded().size() == 0) { + System.out.println("No embed"); + return; + } + System.out.println(event.getMessage().getEmbedded().get(0).getDescription()); + } +} From 3c167959644deac90ec64dbae0eec2cf85fb1d22 Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Thu, 22 Dec 2016 20:57:13 +0100 Subject: [PATCH 03/11] Fixed timeout delay after ratelimit --- .../buttondevteam/discordplugin/listeners/MCChatListener.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java b/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java index b53a3e4..34f33bb 100644 --- a/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java +++ b/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java @@ -111,7 +111,8 @@ public class MCChatListener implements Listener, IListener Thread.sleep(100); break; } catch (RateLimitException e) { - Thread.sleep(e.getRetryDelay()); + if (e.getRetryDelay() > 0) + Thread.sleep(e.getRetryDelay()); } } } catch (Exception e) { From 8f92c8eb9bdbc07ce6ff3a33f27661f808463eb9 Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Thu, 22 Dec 2016 20:59:15 +0100 Subject: [PATCH 04/11] Why do I keep forgetting registering --- src/main/java/buttondevteam/discordplugin/DiscordPlugin.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java b/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java index 85f6869..c5eb466 100644 --- a/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java +++ b/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java @@ -59,6 +59,7 @@ public class DiscordPlugin extends JavaPlugin implements IListener { MCChatListener mcchat = new MCChatListener(); dc.getDispatcher().registerListener(mcchat); TBMCCoreAPI.RegisterEventsForExceptions(mcchat, this); + dc.getDispatcher().registerListener(new AutoUpdaterListener()); Bukkit.getPluginManager().registerEvents(new ExceptionListener(), this); TBMCCoreAPI.RegisterEventsForExceptions(new MCListener(), this); TBMCChatAPI.AddCommands(this, DiscordMCCommandBase.class); From 599f853f1903fb36d6bcf4414999af0f2c971769 Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Thu, 22 Dec 2016 21:17:24 +0100 Subject: [PATCH 05/11] Made it use the core's test detection --- .../java/buttondevteam/discordplugin/DiscordPlugin.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java b/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java index c5eb466..c0d94b5 100644 --- a/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java +++ b/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java @@ -47,7 +47,6 @@ public class DiscordPlugin extends JavaPlugin implements IListener { } else { lastannouncementtime = getConfig().getLong("lastannouncementtime"); lastseentime = getConfig().getLong("lastseentime"); - Test = getConfig().getBoolean("test", true); saveConfig(); } ClientBuilder cb = new ClientBuilder(); @@ -79,8 +78,6 @@ public class DiscordPlugin extends JavaPlugin implements IListener { public static IGuild mainServer; public static IGuild devServer; - public static boolean Test = true; - @Override public void handle(ReadyEvent event) { try { @@ -90,7 +87,7 @@ public class DiscordPlugin extends JavaPlugin implements IListener { devServer = event.getClient().getGuildByID("219529124321034241"); Thread.sleep(100); } while ((mainServer == null || devServer == null) && retryc++ < 10); - if (!Test) { + if (!TBMCCoreAPI.IsTestServer()) { botchannel = mainServer.getChannelByID("209720707188260864"); // bot annchannel = mainServer.getChannelByID("126795071927353344"); // announcements genchannel = mainServer.getChannelByID("125813020357165056"); // general @@ -211,7 +208,7 @@ public class DiscordPlugin extends JavaPlugin implements IListener { e2.printStackTrace(); } try { - return channel.sendMessage(Test && channel != chatchannel + return channel.sendMessage(TBMCCoreAPI.IsTestServer() && channel != chatchannel ? "*The following message is from a test server*\n" + message : message); } catch (RateLimitException e) { try { From e51c2fe32f391b08f14c61676a0122f3fe3075e8 Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Thu, 22 Dec 2016 21:22:55 +0100 Subject: [PATCH 06/11] Comparing IDs Now I'm finally only committing after my server is up --- .../discordplugin/listeners/AutoUpdaterListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/buttondevteam/discordplugin/listeners/AutoUpdaterListener.java b/src/main/java/buttondevteam/discordplugin/listeners/AutoUpdaterListener.java index 1a5284b..39fadee 100644 --- a/src/main/java/buttondevteam/discordplugin/listeners/AutoUpdaterListener.java +++ b/src/main/java/buttondevteam/discordplugin/listeners/AutoUpdaterListener.java @@ -7,7 +7,7 @@ import sx.blah.discord.handle.impl.events.MessageReceivedEvent; public class AutoUpdaterListener implements IListener { @Override public void handle(MessageReceivedEvent event) { - if (!event.getMessage().getChannel().equals(DiscordPlugin.officechannel)) + if (!event.getMessage().getChannel().getID().equals(DiscordPlugin.officechannel)) return; if (event.getMessage().getWebhookID() == null) return; From 74fe66ec7db861fcf03c637582b1f33aa464f68f Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Thu, 22 Dec 2016 21:29:55 +0100 Subject: [PATCH 07/11] I'm only committing to test it btw --- src/main/java/buttondevteam/discordplugin/DiscordPlugin.java | 1 + .../discordplugin/listeners/AutoUpdaterListener.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java b/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java index c0d94b5..57cce6e 100644 --- a/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java +++ b/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java @@ -103,6 +103,7 @@ public class DiscordPlugin extends JavaPlugin implements IListener { botroomchannel = botchannel;// bot-room issuechannel = botchannel; // bot-room chatchannel = devServer.getChannelByID("248185455508455424"); // minecraft_chat_test + officechannel = devServer.getChannelByID("219626707458457603"); // developers-office dc.changeStatus(Status.game("testing")); } Bukkit.getScheduler().runTaskAsynchronously(this, diff --git a/src/main/java/buttondevteam/discordplugin/listeners/AutoUpdaterListener.java b/src/main/java/buttondevteam/discordplugin/listeners/AutoUpdaterListener.java index 39fadee..e3104dd 100644 --- a/src/main/java/buttondevteam/discordplugin/listeners/AutoUpdaterListener.java +++ b/src/main/java/buttondevteam/discordplugin/listeners/AutoUpdaterListener.java @@ -7,7 +7,7 @@ import sx.blah.discord.handle.impl.events.MessageReceivedEvent; public class AutoUpdaterListener implements IListener { @Override public void handle(MessageReceivedEvent event) { - if (!event.getMessage().getChannel().getID().equals(DiscordPlugin.officechannel)) + if (!event.getMessage().getChannel().getID().equals(DiscordPlugin.officechannel.getID())) return; if (event.getMessage().getWebhookID() == null) return; From c3cc559b61000a14b12909361270423da0af81ff Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Thu, 22 Dec 2016 21:40:09 +0100 Subject: [PATCH 08/11] Added some debug code, testing them now --- .../discordplugin/listeners/AutoUpdaterListener.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/buttondevteam/discordplugin/listeners/AutoUpdaterListener.java b/src/main/java/buttondevteam/discordplugin/listeners/AutoUpdaterListener.java index e3104dd..ba5b396 100644 --- a/src/main/java/buttondevteam/discordplugin/listeners/AutoUpdaterListener.java +++ b/src/main/java/buttondevteam/discordplugin/listeners/AutoUpdaterListener.java @@ -16,6 +16,11 @@ public class AutoUpdaterListener implements IListener { System.out.println("No embed"); return; } - System.out.println(event.getMessage().getEmbedded().get(0).getDescription()); + final String title = event.getMessage().getEmbedded().get(0).getTitle(); + System.out.println(title); + System.out.println(title.indexOf(':')); + System.out.println(title.indexOf(']')); + System.out.println(title.substring(title.indexOf(':') + 1, title.indexOf(']'))); + System.out.println(title.contains("new commit")); } } From ab90f935fa7d58a33dfdcfef1876b0684259b254 Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Thu, 22 Dec 2016 21:56:26 +0100 Subject: [PATCH 09/11] Testing autoupdate with this commit - Finished autoupdate - Made DiscordSender work with no Discord user - Made the DiscordPlayerSender return the player's name on getName() --- .../discordplugin/DiscordPlayerSender.java | 2 +- .../discordplugin/DiscordSender.java | 2 ++ .../discordplugin/DiscordSenderBase.java | 10 +++++++++- .../listeners/AutoUpdaterListener.java | 20 +++++++++---------- 4 files changed, 22 insertions(+), 12 deletions(-) diff --git a/src/main/java/buttondevteam/discordplugin/DiscordPlayerSender.java b/src/main/java/buttondevteam/discordplugin/DiscordPlayerSender.java index 2889a0a..de9caea 100644 --- a/src/main/java/buttondevteam/discordplugin/DiscordPlayerSender.java +++ b/src/main/java/buttondevteam/discordplugin/DiscordPlayerSender.java @@ -106,7 +106,7 @@ public class DiscordPlayerSender extends DiscordSenderBase implements Player { @Override public String getName() { - return user.getDisplayName(DiscordPlugin.mainServer); + return player.getName(); } // Find: " (\w+)\(\) \{\s+\/\/ TO\DO Auto-generated method stub\s+return null;" - Replace: " $1() { return player.$1();" diff --git a/src/main/java/buttondevteam/discordplugin/DiscordSender.java b/src/main/java/buttondevteam/discordplugin/DiscordSender.java index 33fb168..c9ad56e 100644 --- a/src/main/java/buttondevteam/discordplugin/DiscordSender.java +++ b/src/main/java/buttondevteam/discordplugin/DiscordSender.java @@ -90,6 +90,8 @@ public class DiscordSender extends DiscordSenderBase implements CommandSender { @Override public String getName() { + if (user == null) + return "Discord user"; return user.getDisplayName(DiscordPlugin.mainServer); } diff --git a/src/main/java/buttondevteam/discordplugin/DiscordSenderBase.java b/src/main/java/buttondevteam/discordplugin/DiscordSenderBase.java index 65bfd10..172b738 100644 --- a/src/main/java/buttondevteam/discordplugin/DiscordSenderBase.java +++ b/src/main/java/buttondevteam/discordplugin/DiscordSenderBase.java @@ -14,6 +14,9 @@ import sx.blah.discord.handle.obj.IChannel; import sx.blah.discord.handle.obj.IUser; public abstract class DiscordSenderBase implements IDiscordSender { + /** + * May be null. + */ protected IUser user; protected IChannel channel; @@ -27,6 +30,11 @@ public abstract class DiscordSenderBase implements IDiscordSender { private volatile String msgtosend = ""; private volatile BukkitTask sendtask; + /** + * Returns the user. May be null. + * + * @return The user or null. + */ public IUser getUser() { return user; } @@ -51,7 +59,7 @@ public abstract class DiscordSenderBase implements IDiscordSender { if (sendtask == null) sendtask = Bukkit.getScheduler().runTaskLaterAsynchronously(DiscordPlugin.plugin, () -> { DiscordPlugin.sendMessageToChannel(channel, - (!broadcast ? user.mention() + "\n" : "") + msgtosend.trim()); + (!broadcast && user != null ? user.mention() + "\n" : "") + msgtosend.trim()); sendtask = null; msgtosend = ""; }, 10); // Waits a half second to gather all/most of the different messages diff --git a/src/main/java/buttondevteam/discordplugin/listeners/AutoUpdaterListener.java b/src/main/java/buttondevteam/discordplugin/listeners/AutoUpdaterListener.java index ba5b396..8be018e 100644 --- a/src/main/java/buttondevteam/discordplugin/listeners/AutoUpdaterListener.java +++ b/src/main/java/buttondevteam/discordplugin/listeners/AutoUpdaterListener.java @@ -1,6 +1,8 @@ package buttondevteam.discordplugin.listeners; import buttondevteam.discordplugin.DiscordPlugin; +import buttondevteam.discordplugin.DiscordSender; +import buttondevteam.lib.TBMCCoreAPI; import sx.blah.discord.api.events.IListener; import sx.blah.discord.handle.impl.events.MessageReceivedEvent; @@ -9,18 +11,16 @@ public class AutoUpdaterListener implements IListener { public void handle(MessageReceivedEvent event) { if (!event.getMessage().getChannel().getID().equals(DiscordPlugin.officechannel.getID())) return; - if (event.getMessage().getWebhookID() == null) + if (!"239123781401051138".equals(event.getMessage().getWebhookID())) return; - System.out.println(event.getMessage().getWebhookID()); - if (event.getMessage().getEmbedded().size() == 0) { - System.out.println("No embed"); + if (event.getMessage().getEmbedded().size() == 0) return; - } final String title = event.getMessage().getEmbedded().get(0).getTitle(); - System.out.println(title); - System.out.println(title.indexOf(':')); - System.out.println(title.indexOf(']')); - System.out.println(title.substring(title.indexOf(':') + 1, title.indexOf(']'))); - System.out.println(title.contains("new commit")); + if (!title.contains("new commit")) + return; + String branch = title.substring(title.indexOf(':') + 1, title.indexOf(']')); + String project = title.substring(title.indexOf('[') + 1, title.indexOf(':')); + if (branch.equals("master") || (TBMCCoreAPI.IsTestServer() && branch.equals("dev"))) + TBMCCoreAPI.UpdatePlugin(project, new DiscordSender(null, DiscordPlugin.officechannel)); } } From 6151fa0de95f221a4082f93f8217654bc2b3281e Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Thu, 22 Dec 2016 22:41:38 +0100 Subject: [PATCH 10/11] Made the updater use the chat channel And fixed branch... --- .../discordplugin/listeners/AutoUpdaterListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/buttondevteam/discordplugin/listeners/AutoUpdaterListener.java b/src/main/java/buttondevteam/discordplugin/listeners/AutoUpdaterListener.java index 8be018e..54a7ef3 100644 --- a/src/main/java/buttondevteam/discordplugin/listeners/AutoUpdaterListener.java +++ b/src/main/java/buttondevteam/discordplugin/listeners/AutoUpdaterListener.java @@ -21,6 +21,6 @@ public class AutoUpdaterListener implements IListener { String branch = title.substring(title.indexOf(':') + 1, title.indexOf(']')); String project = title.substring(title.indexOf('[') + 1, title.indexOf(':')); if (branch.equals("master") || (TBMCCoreAPI.IsTestServer() && branch.equals("dev"))) - TBMCCoreAPI.UpdatePlugin(project, new DiscordSender(null, DiscordPlugin.officechannel)); + TBMCCoreAPI.UpdatePlugin(project, new DiscordSender(null, DiscordPlugin.chatchannel), branch); } } From 4ecbb15bd2aded0f93c3c780aee5d455ef16d06c Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Thu, 22 Dec 2016 23:20:27 +0100 Subject: [PATCH 11/11] Added reaction after plugin update --- .../java/buttondevteam/discordplugin/DiscordPlugin.java | 1 + .../discordplugin/listeners/AutoUpdaterListener.java | 9 ++++++++- .../discordplugin/listeners/MCChatListener.java | 9 ++------- .../discordplugin/listeners/MCListener.java | 1 - 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java b/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java index 57cce6e..96e0f23 100644 --- a/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java +++ b/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java @@ -144,6 +144,7 @@ public class DiscordPlugin extends JavaPlugin implements IListener { private long lastannouncementtime = 0; private long lastseentime = 0; + public static final String DELIVERED_REACTION = "✅"; private void AnnouncementGetterThreadMethod() { while (!stop) { diff --git a/src/main/java/buttondevteam/discordplugin/listeners/AutoUpdaterListener.java b/src/main/java/buttondevteam/discordplugin/listeners/AutoUpdaterListener.java index 54a7ef3..0c14ce8 100644 --- a/src/main/java/buttondevteam/discordplugin/listeners/AutoUpdaterListener.java +++ b/src/main/java/buttondevteam/discordplugin/listeners/AutoUpdaterListener.java @@ -5,6 +5,7 @@ import buttondevteam.discordplugin.DiscordSender; import buttondevteam.lib.TBMCCoreAPI; import sx.blah.discord.api.events.IListener; import sx.blah.discord.handle.impl.events.MessageReceivedEvent; +import sx.blah.discord.util.RateLimitException; public class AutoUpdaterListener implements IListener { @Override @@ -21,6 +22,12 @@ public class AutoUpdaterListener implements IListener { String branch = title.substring(title.indexOf(':') + 1, title.indexOf(']')); String project = title.substring(title.indexOf('[') + 1, title.indexOf(':')); if (branch.equals("master") || (TBMCCoreAPI.IsTestServer() && branch.equals("dev"))) - TBMCCoreAPI.UpdatePlugin(project, new DiscordSender(null, DiscordPlugin.chatchannel), branch); + if (TBMCCoreAPI.UpdatePlugin(project, new DiscordSender(null, DiscordPlugin.chatchannel), branch)) + try { + event.getMessage().addReaction(DiscordPlugin.DELIVERED_REACTION); + } catch (RateLimitException e) { // TODO: Handle + } catch (Exception e) { + TBMCCoreAPI.SendException("An error occured while reacting to plugin update!", e); + } } } diff --git a/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java b/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java index 34f33bb..69ee4cd 100644 --- a/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java +++ b/src/main/java/buttondevteam/discordplugin/listeners/MCChatListener.java @@ -19,14 +19,9 @@ import sx.blah.discord.api.events.IListener; import sx.blah.discord.handle.impl.events.MessageReceivedEvent; import sx.blah.discord.handle.obj.IReaction; import sx.blah.discord.handle.obj.IUser; -import sx.blah.discord.util.DiscordException; -import sx.blah.discord.util.EmbedBuilder; -import sx.blah.discord.util.MissingPermissionsException; import sx.blah.discord.util.RateLimitException; public class MCChatListener implements Listener, IListener { - private static final String DELIVERED_REACTION = "✅"; - @EventHandler // Minecraft public void onMCChat(TBMCChatEvent e) { if (e.isCancelled()) @@ -100,10 +95,10 @@ public class MCChatListener implements Listener, IListener dmessage + (event.getMessage().getAttachments().size() > 0 ? "\n" + event.getMessage() .getAttachments().stream().map(a -> a.getUrl()).collect(Collectors.joining("\n")) : "")); - event.getMessage().addReaction(DELIVERED_REACTION); + event.getMessage().addReaction(DiscordPlugin.DELIVERED_REACTION); event.getMessage().getChannel().getMessages().stream().forEach(m -> { try { - final IReaction reaction = m.getReactionByName(DELIVERED_REACTION); + final IReaction reaction = m.getReactionByName(DiscordPlugin.DELIVERED_REACTION); if (reaction != null) { while (true) try { diff --git a/src/main/java/buttondevteam/discordplugin/listeners/MCListener.java b/src/main/java/buttondevteam/discordplugin/listeners/MCListener.java index cf38145..0b31068 100644 --- a/src/main/java/buttondevteam/discordplugin/listeners/MCListener.java +++ b/src/main/java/buttondevteam/discordplugin/listeners/MCListener.java @@ -12,7 +12,6 @@ import buttondevteam.discordplugin.commands.ConnectCommand; import buttondevteam.lib.TBMCPlayerGetInfoEvent; import buttondevteam.lib.TBMCPlayerJoinEvent; import buttondevteam.lib.TBMCPlayerQuitEvent; -import buttondevteam.lib.TBMCYEEHAWEvent; import net.ess3.api.events.AfkStatusChangeEvent; import sx.blah.discord.handle.obj.IUser; import sx.blah.discord.handle.obj.Status.StatusType;