From f33b8e124940edf96ebd825ceee2d4df980b0976 Mon Sep 17 00:00:00 2001
From: Pingex <pingex@pingex.net>
Date: Fri, 22 Jul 2016 16:35:32 +0200
Subject: [PATCH] Static CEH

---
 .../pingex/dcf/core/CoreEventsHandler.java    | 35 +++++--------------
 .../dcf/core/GatewayConnectionsManager.java   |  5 +--
 2 files changed, 9 insertions(+), 31 deletions(-)

diff --git a/src/main/java/net/pingex/dcf/core/CoreEventsHandler.java b/src/main/java/net/pingex/dcf/core/CoreEventsHandler.java
index bf64843..5138637 100644
--- a/src/main/java/net/pingex/dcf/core/CoreEventsHandler.java
+++ b/src/main/java/net/pingex/dcf/core/CoreEventsHandler.java
@@ -16,69 +16,50 @@ public class CoreEventsHandler
 	 */
 	private static Logger LOGGER = LogManager.getLogger(CoreEventsHandler.class);
 
-	/**
-	 * Singleton instance
-	 */
-	private static CoreEventsHandler INSTANCE = new CoreEventsHandler();
-
-	/**
-	 * Get current instance
-	 */
-	public static CoreEventsHandler getInstance()
-	{
-		return INSTANCE;
-	}
-
-	/**
-	 * Basic constructor, enforcing singleton
-	 */
-	private CoreEventsHandler()
-	{}
-
 	@EventSubscriber
-	public void onReady(ReadyEvent event)
+	public static void onReady(ReadyEvent event)
 	{
 		LOGGER.info("Connection with user #{} ready.", event.getClient().getOurUser().getID());
 	}
 
 	@EventSubscriber
-	public void onDiscordDisconnected(DiscordDisconnectedEvent event)
+	public static void onDiscordDisconnected(DiscordDisconnectedEvent event)
 	{
 		LOGGER.warn("Discord connection with user #{} lost ({}).", event.getClient().getOurUser().getID(), event.getReason());
 	}
 
 	@EventSubscriber
-	public void onDiscordReconnected(DiscordReconnectedEvent event)
+	public static void onDiscordReconnected(DiscordReconnectedEvent event)
 	{
 		LOGGER.info("Gateway connection reconnected (user #{}).", event.getClient().getOurUser().getID());
 	}
 
 	@EventSubscriber
-	public void onMessageSend(MessageSendEvent event)
+	public static void onMessageSend(MessageSendEvent event)
 	{
 		LOGGER.trace("Sent message to channel #{}.", event.getMessage().getChannel().getID());
 	}
 
 	@EventSubscriber
-	public void onMention(MentionEvent event)
+	public static void onMention(MentionEvent event)
 	{
 		LOGGER.trace("Received mention from channel #{}.", event.getMessage().getChannel().getID());
 	}
 
 	@EventSubscriber
-	public void onMessageReceived(MessageReceivedEvent event)
+	public static void onMessageReceived(MessageReceivedEvent event)
 	{
 		LOGGER.trace("Received message from channel #{}.", event.getMessage().getChannel().getID());
 	}
 
 	@EventSubscriber
-	public void onGuildUnavailable(GuildUnavailableEvent event)
+	public static void onGuildUnavailable(GuildUnavailableEvent event)
 	{
 		LOGGER.warn("Guild #{} is unavailable.", event.getGuildID());
 	}
 
 	@EventSubscriber
-	public void onGuildCreate(GuildCreateEvent event)
+	public static void onGuildCreate(GuildCreateEvent event)
 	{
 		LOGGER.info("Joined guild #{}.", event.getGuild().getID());
 	}
diff --git a/src/main/java/net/pingex/dcf/core/GatewayConnectionsManager.java b/src/main/java/net/pingex/dcf/core/GatewayConnectionsManager.java
index adfebc4..c2e0a04 100644
--- a/src/main/java/net/pingex/dcf/core/GatewayConnectionsManager.java
+++ b/src/main/java/net/pingex/dcf/core/GatewayConnectionsManager.java
@@ -6,9 +6,6 @@ import org.apache.logging.log4j.Logger;
 import sx.blah.discord.api.ClientBuilder;
 import sx.blah.discord.api.IDiscordClient;
 import sx.blah.discord.util.DiscordException;
-import sx.blah.discord.util.HTTP429Exception;
-import sx.blah.discord.util.MessageBuilder;
-
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
@@ -68,7 +65,7 @@ public class GatewayConnectionsManager
 		{
 			IDiscordClient builtConnection = builder.login();
 			connectionsDatastore.add(builtConnection);
-			builtConnection.getDispatcher().registerListener(CoreEventsHandler.getInstance()); // Register the core event handler independently from the events package
+			builtConnection.getDispatcher().registerListener(CoreEventsHandler.class); // Register the core event handler independently from the events package
 			//updateListeners(builtConnection, null); // TODO: EventRegistry
 		}
 		catch (DiscordException e)