[chore] Use BaseClass for all files, rewritten PluginConfig, instantiate all previously-static classes

Could be unstable?

Author: jcxldn

src/main/java/com/dumbdogdiner/betterwhitelist_bungee/BaseClass.java

@@ -0,0 +1,63 @@
+package com.dumbdogdiner.betterwhitelist_bungee;
+
+import java.io.File;
+import java.io.InputStream;
+import java.util.concurrent.ExecutorService;
+import java.util.logging.Logger;
+
+import com.dumbdogdiner.betterwhitelist_bungee.discord.WhitelistBot;
+import com.dumbdogdiner.betterwhitelist_bungee.utils.PluginConfig;
+import com.dumbdogdiner.betterwhitelist_bungee.utils.SQL;
+
+import net.dv8tion.jda.api.JDA;
+import net.md_5.bungee.api.ProxyServer;
+import net.md_5.bungee.api.plugin.PluginDescription;
+import net.md_5.bungee.config.Configuration;
+
+public interface BaseClass {
+	default BetterWhitelistBungee getInstance() {
+		return BetterWhitelistBungee.getInstance();
+	}
+	
+	default File getDataFolder() {
+		return getInstance().getDataFolder();
+	}
+	
+	default PluginDescription getPluginDescription() {
+		return getInstance().getDescription();
+	}
+	
+	default File getFile() {
+		return getInstance().getFile();
+	}
+	
+	default Logger getLogger() {
+		return getInstance().getLogger();
+	}
+	
+	default ProxyServer getProxy() {
+		return getInstance().getProxy();
+	}
+	
+	default InputStream getResourceAsStream(String name) {
+		return getInstance().getResourceAsStream(name);
+	}
+	
+	// Custom
+	
+	default PluginConfig getPluginConfig() {
+		return getInstance().getPluginConfig();
+	}
+	
+	default Configuration getConfig() {
+		return getInstance().getPluginConfig().getConfig();
+	}
+	
+	default SQL getSQL() {
+		return getInstance().getSQL();
+	}
+	
+	default WhitelistBot getBot() {
+		return getInstance().getBot();
+	}
+}

src/main/java/com/dumbdogdiner/betterwhitelist_bungee/BetterWhitelistBungee.java

@@ -5,6 +5,7 @@
 import com.dumbdogdiner.betterwhitelist_bungee.bungee.commands.WhoisCommand;
 import com.dumbdogdiner.betterwhitelist_bungee.discord.WhitelistBot;
 import com.dumbdogdiner.betterwhitelist_bungee.bungee.listeners.PlayerEventListener;
+import com.dumbdogdiner.betterwhitelist_bungee.utils.PluginConfig;
 import com.dumbdogdiner.betterwhitelist_bungee.utils.SQL;
 
 import net.dv8tion.jda.api.JDA;
@@ -23,21 +24,35 @@ public static BetterWhitelistBungee getInstance() {
         return instance;
     }
 
+    private PluginConfig config;
+    private SQL sql;
+    private WhitelistBot bot;
+    
+    public PluginConfig getPluginConfig() {
+    	return config;
+    }
+    
+    public SQL getSQL() {
+    	return sql;
+    }
+    
+    public WhitelistBot getBot() {
+    	return bot;
+    }
+
     @Override
     public void onEnable() {
         instance = this;
+        config = new PluginConfig();
+        bot = new WhitelistBot();
+        sql = new SQL();
 
         PluginManager manager = getProxy().getPluginManager();
 
         manager.registerListener(this, new PlayerEventListener());
         manager.registerCommand(this, new WhoisCommand());
         manager.registerCommand(this, new WhitelistCommand());
         manager.registerCommand(this, new UnwhitelistCommand());
-
-        WhitelistBot.getInstance().init();
-        
-        SQL.init();
-        SQL.checkTable();
     }
 
     @Override
@@ -47,8 +62,8 @@ public void onDisable() {
         /* PluginConfig.saveConfig(); */
 
         // Shut down the Discord bot gracefully.
-        JDA jda = WhitelistBot.getJda();
-        if (jda != null) WhitelistBot.getJda().shutdown();
+        JDA jda = getBot().getJDA();
+        if (jda != null) getBot().getJDA().shutdown();
 
 
         getLogger().info("Aarrff!! (see you again soon :3)");

src/main/java/com/dumbdogdiner/betterwhitelist_bungee/bungee/commands/UnwhitelistCommand.java

@@ -1,15 +1,15 @@
 package com.dumbdogdiner.betterwhitelist_bungee.bungee.commands;
 
+import com.dumbdogdiner.betterwhitelist_bungee.BaseClass;
 import com.dumbdogdiner.betterwhitelist_bungee.utils.MojangUser;
-import com.dumbdogdiner.betterwhitelist_bungee.utils.SQL;
 import com.dumbdogdiner.betterwhitelist_bungee.utils.UsernameValidator;
 
 import net.md_5.bungee.api.ChatColor;
 import net.md_5.bungee.api.CommandSender;
 import net.md_5.bungee.api.chat.TextComponent;
 import net.md_5.bungee.api.plugin.Command;
 
-public class UnwhitelistCommand extends Command {
+public class UnwhitelistCommand extends Command implements BaseClass {
 
     public UnwhitelistCommand() {
         super("btw_unwhitelist", "betterwhitelist.admin.unwhitelist");
@@ -29,12 +29,12 @@ public void execute(CommandSender sender, String[] args) {
             return;
         }
 
-        if (SQL.getDiscordIDFromMinecraft(user.id) == null) {
+        if (getSQL().getDiscordIDFromMinecraft(user.id) == null) {
             sender.sendMessage(new TextComponent(ChatColor.RED + "Player '" + args[0] + "' is not whitelisted."));
             return;
         }
 
-        if (SQL.removeEntryUsingUuid(user.id)) {
+        if (getSQL().removeEntryUsingUuid(user.id)) {
             sender.sendMessage(new TextComponent(
                     ChatColor.AQUA + "Removed user " + user.name + " ('" + user.id + "') from the whitelist."));
         } else {

src/main/java/com/dumbdogdiner/betterwhitelist_bungee/bungee/commands/WhitelistCommand.java

@@ -1,15 +1,15 @@
 package com.dumbdogdiner.betterwhitelist_bungee.bungee.commands;
 
+import com.dumbdogdiner.betterwhitelist_bungee.BaseClass;
 import com.dumbdogdiner.betterwhitelist_bungee.utils.MojangUser;
-import com.dumbdogdiner.betterwhitelist_bungee.utils.SQL;
 import com.dumbdogdiner.betterwhitelist_bungee.utils.UsernameValidator;
 
 import net.md_5.bungee.api.ChatColor;
 import net.md_5.bungee.api.CommandSender;
 import net.md_5.bungee.api.chat.TextComponent;
 import net.md_5.bungee.api.plugin.Command;
 
-public class WhitelistCommand extends Command {
+public class WhitelistCommand extends Command implements BaseClass {
 
     public WhitelistCommand() {
         super("btw_whitelist", "betterwhitelist.admin.whitelist");
@@ -31,13 +31,13 @@ public void execute(CommandSender sender, String[] args) {
             return;
         }
 
-        if (SQL.getDiscordIDFromMinecraft(user.id) != null) {
+        if (getSQL().getDiscordIDFromMinecraft(user.id) != null) {
             sender.sendMessage(new TextComponent(ChatColor.RED + "Player " + args[0]
                     + " is already whitelisted. Run 'unwhitelist <player_name>' to remove them."));
             return;
         }
 
-        if (SQL.addEntry(discordId, user.id)) {
+        if (getSQL().addEntry(discordId, user.id)) {
             sender.sendMessage(new TextComponent(
                     ChatColor.AQUA + "Mapped user " + user.name + " to Discord ID '" + discordId + "'."));
         } else {

src/main/java/com/dumbdogdiner/betterwhitelist_bungee/bungee/commands/WhoisCommand.java

@@ -1,15 +1,15 @@
 package com.dumbdogdiner.betterwhitelist_bungee.bungee.commands;
 
+import com.dumbdogdiner.betterwhitelist_bungee.BaseClass;
 import com.dumbdogdiner.betterwhitelist_bungee.BetterWhitelistBungee;
-import com.dumbdogdiner.betterwhitelist_bungee.utils.SQL;
 
 import net.md_5.bungee.api.ChatColor;
 import net.md_5.bungee.api.CommandSender;
 import net.md_5.bungee.api.chat.TextComponent;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.plugin.Command;
 
-public class WhoisCommand extends Command {
+public class WhoisCommand extends Command implements BaseClass {
 
     public WhoisCommand() {
         super("btw_whois", "betterwhitelist.read.whois");
@@ -33,10 +33,10 @@ public void execute(CommandSender sender, String[] args) {
                 || target.matches("[a-zA-Z0-9_]{1,16}")) {
             player = BetterWhitelistBungee.getInstance().getProxy().getPlayer(target);
         } else {
-            playerUuid = SQL.getUuidFromDiscordId(target);
+            playerUuid = getSQL().getUuidFromDiscordId(target);
             if (playerUuid != null) {
                 player = BetterWhitelistBungee.getInstance().getProxy().getPlayer(playerUuid);
-                discordId = SQL.getDiscordIDFromMinecraft(playerUuid);
+                discordId = getSQL().getDiscordIDFromMinecraft(playerUuid);
             }
         }
 

src/main/java/com/dumbdogdiner/betterwhitelist_bungee/bungee/listeners/PlayerEventListener.java

@@ -2,10 +2,9 @@
 
 import java.util.List;
 
+import com.dumbdogdiner.betterwhitelist_bungee.BaseClass;
 import com.dumbdogdiner.betterwhitelist_bungee.BetterWhitelistBungee;
 import com.dumbdogdiner.betterwhitelist_bungee.utils.MojangUser;
-import com.dumbdogdiner.betterwhitelist_bungee.utils.PluginConfig;
-import com.dumbdogdiner.betterwhitelist_bungee.utils.SQL;
 import com.dumbdogdiner.betterwhitelist_bungee.utils.UsernameValidator;
 
 import net.md_5.bungee.api.ChatColor;
@@ -17,20 +16,20 @@
 /**
  * Listen for player joins and check them against the SQL database.
  */
-public class PlayerEventListener implements Listener {
+public class PlayerEventListener implements Listener, BaseClass {
     @EventHandler
     /**
      * Check whether players are allowed to log in.
      */
     public void onPreLoginEvent(PreLoginEvent e) {
-        if (PluginConfig.getConfig().getBoolean("disableUuidChecking")) {
+        if (getConfig().getBoolean("disableUuidChecking")) {
             BetterWhitelistBungee.getInstance().getLogger()
                     .info("Skipping handling new player connection - checking disabled.");
             return;
         }
 
         // Can someone specify what type of data is in this list, thanks!
-        List<?> playerOverrides = PluginConfig.getConfig().getList("overrides");
+        List<?> playerOverrides = getConfig().getList("overrides");
         if (playerOverrides.contains(e.getConnection().getName())) {
             BetterWhitelistBungee.getInstance().getLogger()
                     .info("Skipping handling new player connection - user is in overrides.");
@@ -45,7 +44,7 @@ public void onPreLoginEvent(PreLoginEvent e) {
 
         BetterWhitelistBungee.getInstance().getLogger().info("Checking that UUID '" + user.id + "' is whitelisted...");
 
-        if (SQL.getDiscordIDFromMinecraft(user.id) == null) {
+        if (getSQL().getDiscordIDFromMinecraft(user.id) == null) {
             e.setCancelled(true);
             e.setCancelReason(new TextComponent(ChatColor.RED + "You are not whitelisted on this network!"));
         }

src/main/java/com/dumbdogdiner/betterwhitelist_bungee/discord/WhitelistBot.java

@@ -1,6 +1,6 @@
 package com.dumbdogdiner.betterwhitelist_bungee.discord;
 
-import com.dumbdogdiner.betterwhitelist_bungee.BetterWhitelistBungee;
+import com.dumbdogdiner.betterwhitelist_bungee.BaseClass;
 import com.dumbdogdiner.betterwhitelist_bungee.discord.commands.GetStatusCommand;
 import com.dumbdogdiner.betterwhitelist_bungee.discord.commands.HelpCommand;
 import com.dumbdogdiner.betterwhitelist_bungee.discord.commands.UnwhitelistCommand;
@@ -9,8 +9,6 @@
 import com.dumbdogdiner.betterwhitelist_bungee.discord.listeners.GuildEventListener;
 import com.dumbdogdiner.betterwhitelist_bungee.discord.listeners.MessageListener;
 import com.dumbdogdiner.betterwhitelist_bungee.discord.listeners.ReadyListener;
-import com.dumbdogdiner.betterwhitelist_bungee.utils.PluginConfig;
-
 import net.dv8tion.jda.api.AccountType;
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.JDABuilder;
@@ -21,50 +19,24 @@
 
 import java.util.EnumSet;
 import java.util.HashMap;
-import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
 /**
  * Discord bot for whitelisting users from DDD itself.
  */
-public class WhitelistBot {
-
-    private static WhitelistBot instance;
-    public static WhitelistBot getInstance() {
-        if (instance == null) {
-            instance = new WhitelistBot();
-        }
-        return instance;
-    }
-
-    private WhitelistBot() { }
-
-    private static JDA jda = null;
-    public static JDA getJda() {
-        return jda;
-    }
-
-    private static HashMap<String, Command> commands = new HashMap<>();
-    public static HashMap<String, Command> getCommands() {
-        return commands;
-    }
+public class WhitelistBot implements BaseClass {
+	
+	private JDA jda;
 
-    public static Logger getLogger() {
-        return BetterWhitelistBungee.getInstance().getLogger();
-    }
-
-    /**
-     * Initialize the bot.
-     */
-    public void init() {
-        JDABuilder builder = new JDABuilder(AccountType.BOT)
-            .setToken(PluginConfig.getConfig().getString("discord.token"));
-
-        configureMemory(builder);
+    public WhitelistBot() {
+    	// constructor
+    	JDABuilder builder = new JDABuilder(AccountType.BOT).setToken(getConfig().getString("discord.token"));
+    	
+    	configureMemory(builder);
 
         // Register Events
         builder.addEventListeners(
-            new ReadyListener(),
+        	new ReadyListener(),
             new GuildEventListener(),
             new MessageListener()
         );
@@ -84,7 +56,6 @@ public void init() {
         ));
 
         builder.setActivity(Activity.watching("the cutest fuzzballs \uD83E\uDDE1"));
-
         try {
             getLogger().info("[discord] Attempting connection to Discord...");
             jda = builder.build();
@@ -93,13 +64,22 @@ public void init() {
             err.printStackTrace();
         }
     }
+    
+    public JDA getJDA() {
+    	return jda;
+    }
+
+    private HashMap<String, Command> commands = new HashMap<>();
+    public HashMap<String, Command> getCommands() {
+        return commands;
+    }
 
     /**
      * Configure flags for the JDABuilder. Saves memory :3
      * @param builder
      */
 
-    private static void configureMemory(JDABuilder builder) {
+    private void configureMemory(JDABuilder builder) {
         builder.setDisabledCacheFlags(
                 EnumSet.of(CacheFlag.ACTIVITY, CacheFlag.VOICE_STATE, CacheFlag.EMOTE)
         );
@@ -109,7 +89,7 @@ private static void configureMemory(JDABuilder builder) {
      * Add commands to the bot.
      * @param commandsToAdd
      */
-    public static void addCommand(Command... commandsToAdd) {
+    public void addCommand(Command... commandsToAdd) {
         for (Command cmd : commandsToAdd) {
             commands.put(cmd.getName(), cmd);
         }