easy whitelist support

Shimell · Nov 6, 2019 · 7904e30 · 7904e30
1 parent 210e007
commit 7904e30
Show file tree

Hide file tree

Showing 3 changed files with 328 additions and 68 deletions.
diff --git a/plugin.yml b/plugin.yml
@@ -1,5 +1,5 @@
 name: DiscordWhitelister
-version: 1.0.7
+version: 1.0.8
 author: Joe Shimell
 main: uk.co.angrybee.joe.DiscordWhitelister
 description: Discord whitelister bot.
diff --git a/src/main/java/uk/co/angrybee/joe/DiscordWhitelister.java b/src/main/java/uk/co/angrybee/joe/DiscordWhitelister.java
@@ -3,6 +3,7 @@
 import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import java.io.File;
@@ -14,20 +15,26 @@ public class DiscordWhitelister extends JavaPlugin
 
     private ServerDiscordClient serverDiscordClient;
 
-    static private File whitelisterBotConfigFile;
-    static private File userListFile;
-    static private File removedListFile;
+    private static File whitelisterBotConfigFile;
+    private static File userListFile;
+    private static File removedListFile;
 
     private static FileConfiguration whitelisterBotConfig;
     private static FileConfiguration userList;
     private static FileConfiguration removedList;
 
+    // easy whitelist
+    public static Plugin easyWhitelist;
+
+
     private String botToken;
 
     private boolean configCreated = false;
     private boolean userListCreated = false;
     private boolean removedListCreated = false;
 
+    public static boolean useEasyWhitelist = false;
+
     private boolean botEnabled;
 
     private static JavaPlugin thisPlugin;
@@ -54,39 +61,56 @@ else if(configCreated)
         }
         else
         {
-            getLogger().info("Initializing Discord client");
+            getLogger().info("Initializing Discord client...");
             serverDiscordClient = new ServerDiscordClient();
 
             // set add & remove roles
-            serverDiscordClient.allowedToAddRemoveRoles = new String[DiscordWhitelister.getWhitelisterBotConfig().getList("add-remove-roles").size()];
+            serverDiscordClient.allowedToAddRemoveRoles = new String[getWhitelisterBotConfig().getList("add-remove-roles").size()];
             for(int roles = 0; roles < serverDiscordClient.allowedToAddRemoveRoles.length; ++roles)
             {
-                serverDiscordClient.allowedToAddRemoveRoles[roles] = DiscordWhitelister.getWhitelisterBotConfig().getList("add-remove-roles").get(roles).toString();
+                serverDiscordClient.allowedToAddRemoveRoles[roles] = getWhitelisterBotConfig().getList("add-remove-roles").get(roles).toString();
             }
 
             // set add roles
-            serverDiscordClient.allowedToAddRoles = new String[DiscordWhitelister.getWhitelisterBotConfig().getList("add-roles").size()];
+            serverDiscordClient.allowedToAddRoles = new String[getWhitelisterBotConfig().getList("add-roles").size()];
             for(int roles = 0; roles < serverDiscordClient.allowedToAddRoles.length; ++roles)
             {
-                serverDiscordClient.allowedToAddRoles[roles] = DiscordWhitelister.getWhitelisterBotConfig().getList("add-roles").get(roles).toString();
+                serverDiscordClient.allowedToAddRoles[roles] = getWhitelisterBotConfig().getList("add-roles").get(roles).toString();
             }
 
             // set limited add roles
-            serverDiscordClient.allowedToAddLimitedRoles = new String[DiscordWhitelister.getWhitelisterBotConfig().getList("limited-add-roles").size()];
+            serverDiscordClient.allowedToAddLimitedRoles = new String[getWhitelisterBotConfig().getList("limited-add-roles").size()];
             for(int roles = 0; roles < serverDiscordClient.allowedToAddLimitedRoles.length; ++roles)
             {
-                serverDiscordClient.allowedToAddLimitedRoles[roles] = DiscordWhitelister.getWhitelisterBotConfig().getList("limited-add-roles").get(roles).toString();
+                serverDiscordClient.allowedToAddLimitedRoles[roles] = getWhitelisterBotConfig().getList("limited-add-roles").get(roles).toString();
+            }
+
+            // easy whitelist check
+            if(getWhitelisterBotConfig().getBoolean("use-easy-whitelist"))
+            {
+                getLogger().info("Checking for Easy Whitelist...");
+                if(getServer().getPluginManager().getPlugin("EasyWhitelist") != null)
+                {
+                    getLogger().info("Easy Whitelist found! Will use over default whitelist command.");
+                    easyWhitelist = getServer().getPluginManager().getPlugin("EasyWhitelist");
+                    useEasyWhitelist = true;
+                }
+                else
+                {
+                    getLogger().warning("Easy Whitelist was not found but is enabled in the config. " +
+                            "Falling back to default whitelist command.");
+                }
             }
 
             int initializeSuccess = serverDiscordClient.InitializeClient(botToken);
 
             if(initializeSuccess == 0)
             {
-                getLogger().info("Successfully initialized Discord client");
+                getLogger().info("Successfully initialized Discord client.");
             }
             else if(initializeSuccess == 1)
             {
-                getLogger().severe("Discord Client failed to initialize, please check if your config file is valid");
+                getLogger().severe("Discord Client failed to initialize, please check if your config file is valid.");
             }
         }
     }
@@ -308,6 +332,16 @@ public void ConfigSetup()
                 }
             }
 
+            // easy whitelist support
+            if(getWhitelisterBotConfig().get("use-easy-whitelist") == null)
+            {
+                getWhitelisterBotConfig().set("use-easy-whitelist", false);
+
+                if (!configCreated) {
+                    getPlugin().getLogger().warning("Entry 'use-easy-whitelist' was not found, adding it to the config...");
+                }
+            }
+
             if(getWhitelisterBotConfig().get("bot-enabled") == null)
             {
                 getWhitelisterBotConfig().set("bot-enabled", true);