From fb5dd60b843c1218b76022e6504eea93583770e1 Mon Sep 17 00:00:00 2001
From: NorbiPeti <szatmari.norbert.peter@gmail.com>
Date: Wed, 2 Nov 2016 18:37:36 +0100
Subject: [PATCH] Fixes and stuff

---
 pom.xml                                              |  4 ++--
 .../buttondevteam/discordplugin/DiscordPlugin.java   |  3 ++-
 .../discordplugin/EventExceptionDiscordSender.java   | 12 ------------
 .../{TBMCDiscordAPI.java => ExceptionListener.java}  | 11 ++++++++++-
 .../discordplugin/commands/ConnectCommand.java       |  4 ++--
 5 files changed, 16 insertions(+), 18 deletions(-)
 delete mode 100644 src/main/java/buttondevteam/discordplugin/EventExceptionDiscordSender.java
 rename src/main/java/buttondevteam/discordplugin/{TBMCDiscordAPI.java => ExceptionListener.java} (61%)

diff --git a/pom.xml b/pom.xml
index 18aa7f7..28bb95a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -137,8 +137,8 @@
 			<version>1.7.21</version>
 		</dependency>
 		<dependency>
-			<groupId>com.github.TBMCPlugins.ButtonLib</groupId>
-			<artifactId>ButtonLib</artifactId>
+			<groupId>com.github.TBMCPlugins.ButtonCore</groupId>
+			<artifactId>ButtonCore</artifactId>
 			<version>master-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
diff --git a/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java b/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java
index bb979df..e85f685 100644
--- a/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java
+++ b/src/main/java/buttondevteam/discordplugin/DiscordPlugin.java
@@ -55,7 +55,8 @@ public class DiscordPlugin extends JavaPlugin implements IListener<ReadyEvent> {
 			dc.getDispatcher().registerListener(this);
 			for (IListener<?> listener : CommandListener.getListeners())
 				dc.getDispatcher().registerListener(listener);
-			Bukkit.getPluginManager().registerEvents(new MCListener(), this);
+			Bukkit.getPluginManager().registerEvents(new ExceptionListener(), this);
+			TBMCCoreAPI.RegisterEventsForExceptions(new MCListener(), this);
 			TBMCChatAPI.AddCommands(this, DiscordMCCommandBase.class);
 		} catch (Exception e) {
 			e.printStackTrace();
diff --git a/src/main/java/buttondevteam/discordplugin/EventExceptionDiscordSender.java b/src/main/java/buttondevteam/discordplugin/EventExceptionDiscordSender.java
deleted file mode 100644
index f6103ca..0000000
--- a/src/main/java/buttondevteam/discordplugin/EventExceptionDiscordSender.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package buttondevteam.discordplugin;
-
-import org.bukkit.event.Event;
-import buttondevteam.lib.EventExceptionHandler;
-
-public class EventExceptionDiscordSender extends EventExceptionHandler {
-	@Override
-	public boolean handle(Throwable ex, Event event) {
-		TBMCDiscordAPI.SendException(ex, "An error occured while executing " + event.getEventName() + "!");
-		return true;
-	}
-}
diff --git a/src/main/java/buttondevteam/discordplugin/TBMCDiscordAPI.java b/src/main/java/buttondevteam/discordplugin/ExceptionListener.java
similarity index 61%
rename from src/main/java/buttondevteam/discordplugin/TBMCDiscordAPI.java
rename to src/main/java/buttondevteam/discordplugin/ExceptionListener.java
index bd3b983..ff65459 100644
--- a/src/main/java/buttondevteam/discordplugin/TBMCDiscordAPI.java
+++ b/src/main/java/buttondevteam/discordplugin/ExceptionListener.java
@@ -1,8 +1,17 @@
 package buttondevteam.discordplugin;
 
 import org.apache.commons.lang.exception.ExceptionUtils;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+
+import buttondevteam.lib.TBMCExceptionEvent;
+
+public class ExceptionListener implements Listener {
+	@EventHandler
+	public void onException(TBMCExceptionEvent e) {
+		SendException(e.getException(), e.getSourceMessage());
+	}
 
-public final class TBMCDiscordAPI {
 	public static void SendException(Throwable e, String sourcemessage) {
 		try {
 			StringBuilder sb = new StringBuilder();
diff --git a/src/main/java/buttondevteam/discordplugin/commands/ConnectCommand.java b/src/main/java/buttondevteam/discordplugin/commands/ConnectCommand.java
index 0b7ce2a..0ed98ed 100644
--- a/src/main/java/buttondevteam/discordplugin/commands/ConnectCommand.java
+++ b/src/main/java/buttondevteam/discordplugin/commands/ConnectCommand.java
@@ -8,7 +8,7 @@ import com.google.common.collect.HashBiMap;
 
 import buttondevteam.discordplugin.DiscordPlayer;
 import buttondevteam.discordplugin.DiscordPlugin;
-import buttondevteam.discordplugin.TBMCDiscordAPI;
+import buttondevteam.lib.TBMCCoreAPI;
 import buttondevteam.lib.TBMCPlayer;
 import sx.blah.discord.handle.obj.IMessage;
 
@@ -53,7 +53,7 @@ public class ConnectCommand extends DiscordCommandBase {
 				return;
 			}
 		} catch (Exception e) {
-			TBMCDiscordAPI.SendException(e, "An error occured while connecting a Discord account!");
+			TBMCCoreAPI.SendException("An error occured while connecting a Discord account!", e);
 			DiscordPlugin.sendMessageToChannel(message.getChannel(), "An internal error occured!\n" + e);
 		}
 		WaitingToConnect.put(args, message.getAuthor().getID());