Refactored GCM part 2/2. Also removed unused imports in the same class.

keep-around/c2ad1056d9638eb2b3dbb39f2be4e03c2244b492
Pingex aka Raphaël 9 years ago
parent dc67379a1f
commit 85364cf910

@ -3,7 +3,7 @@ package net.pingex.dcf;
import net.pingex.dcf.commands.CommandRegistry; import net.pingex.dcf.commands.CommandRegistry;
import net.pingex.dcf.commands.InternalCommands; import net.pingex.dcf.commands.InternalCommands;
import net.pingex.dcf.core.Configuration; import net.pingex.dcf.core.Configuration;
import net.pingex.dcf.core.GatewayConnectionsManager; import net.pingex.dcf.core.GatewayConnectionManager;
import net.pingex.dcf.modularity.PluginLoader; import net.pingex.dcf.modularity.PluginLoader;
import net.pingex.dcf.permissions.PermissionsCommands; import net.pingex.dcf.permissions.PermissionsCommands;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
@ -41,7 +41,7 @@ public class DiscordCommandableFramework
ClientBuilder builder = new ClientBuilder(); ClientBuilder builder = new ClientBuilder();
if(Configuration.isConnectionToken()) builder.withToken(Configuration.CONNECTION_TOKEN); if(Configuration.isConnectionToken()) builder.withToken(Configuration.CONNECTION_TOKEN);
else builder.withLogin(Configuration.CONNECTION_USERNAME, Configuration.CONNECTION_PASSWORD); else builder.withLogin(Configuration.CONNECTION_USERNAME, Configuration.CONNECTION_PASSWORD);
GatewayConnectionsManager.registerConnection(builder); GatewayConnectionManager.registerConnection(builder);
// Register internal commands // Register internal commands
new InternalCommands().getCommands().forEach(CommandRegistry::registerCommand); new InternalCommands().getCommands().forEach(CommandRegistry::registerCommand);

@ -1,20 +1,17 @@
package net.pingex.dcf.core; package net.pingex.dcf.core;
import net.pingex.dcf.util.DiscordInteractionsUtil;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import sx.blah.discord.api.ClientBuilder; import sx.blah.discord.api.ClientBuilder;
import sx.blah.discord.api.IDiscordClient; import sx.blah.discord.api.IDiscordClient;
import sx.blah.discord.util.DiscordException; import sx.blah.discord.util.DiscordException;
import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.Map;
import java.util.Set; import java.util.Set;
/** /**
* Storage of all active connection to Discord gateway * Storage of all active connection to Discord gateway
*/ */
public class GatewayConnectionsManager public class GatewayConnectionManager
{ {
/** /**
* Main connection * Main connection
@ -29,7 +26,7 @@ public class GatewayConnectionsManager
/** /**
* Logger * Logger
*/ */
private static final Logger LOGGER = LogManager.getLogger(GatewayConnectionsManager.class); private static final Logger LOGGER = LogManager.getLogger(GatewayConnectionManager.class);
/** /**
* Registers a connection and login automatically, called once in main * Registers a connection and login automatically, called once in main

@ -1,10 +1,10 @@
package net.pingex.dcf.modularity.events; package net.pingex.dcf.modularity.events;
import net.pingex.dcf.core.GatewayConnectionsManager; import net.pingex.dcf.core.GatewayConnectionManager;
import net.pingex.dcf.modularity.PluginWrapper; import net.pingex.dcf.modularity.PluginWrapper;
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import sx.blah.discord.api.IDiscordClient;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
@ -92,6 +92,6 @@ public class EventManager
*/ */
public void updateConnectionHandlers() public void updateConnectionHandlers()
{ {
GatewayConnectionsManager.updateListeners(collectAllHandlers()); GatewayConnectionManager.updateListeners(collectAllHandlers());
} }
} }