settings changes

Draww · Jan 22, 2020 · b777f8a · b777f8a
1 parent fef0102
commit b777f8a
Show file tree

Hide file tree

Showing 3 changed files with 68 additions and 5 deletions.
diff --git a/src/main/java/me/draww/superrup/Main.java b/src/main/java/me/draww/superrup/Main.java
@@ -82,15 +82,15 @@ private boolean setupVaultManager() {
     }
 
     private boolean setupGroupManager() {
-        String permissionProvider = config.getConfig().getString("permission_provider");
+        String permissionProvider = settings.getPermissionProvider();
         if (permissionProvider.equalsIgnoreCase("LuckPerms") && this.getServer().getPluginManager().isPluginEnabled("LuckPerms")) {
             groupManager = new LuckPermsGroupManager();
             return true;
         } else if (permissionProvider.equalsIgnoreCase("PermissionsEx") && this.getServer().getPluginManager().isPluginEnabled("PermissionsEx")) {
             groupManager = new PermissionsExGroupManager();
             return true;
         } else if (permissionProvider.equalsIgnoreCase("Custom")) {
-            groupManager = new SRGroupManager(SRGroupManager.Type.valueOf(config.getConfig().getString("settings.type").toUpperCase()));
+            groupManager = new SRGroupManager(SRGroupManager.Type.valueOf(settings.getCustomSettings().getType().toUpperCase()));
             return true;
         }
         return false;
@@ -103,6 +103,7 @@ public void onDisable() {
 
     public void reload() {
         config.load();
+        settings = new Settings(this);
         ranksConfig.load();
         templateConfig.load();
         languageConfig.load();

diff --git a/src/main/java/me/draww/superrup/Settings.java b/src/main/java/me/draww/superrup/Settings.java
@@ -1,5 +1,8 @@
 package me.draww.superrup;
 
+import me.draww.superrup.utils.ItemUtil;
+import org.bukkit.inventory.ItemStack;
+
 import java.util.List;
 
 @SuppressWarnings("WeakerAccess")
@@ -28,7 +31,14 @@ public Settings(Main main) {
                 config.getConfig().getString("units.second"),
                 config.getConfig().getString("units.seconds"));
         this.menuSettings = new MenuSettings(config.getConfig().getString("menu.title"),
-                config.getConfig().getInt("menu.size"));
+                config.getConfig().isString("menu.size") && config.getConfig().getString("menu.size").equalsIgnoreCase("DYNAMIC") ? -1 : config.getConfig().getInt("menu.size"),
+                config.getConfig().getString("menu.directionArrowsPosition"),
+                new MenuSettings.EmptyFillSetting(config.getConfig().getBoolean("menu.empty_fill.rank_container.status", false),
+                        ItemUtil.deserializeItemStack(config.getConfigurationSection("menu.empty_fill.rank_container.icon"), null)),
+                new MenuSettings.EmptyFillSetting(config.getConfig().getBoolean("menu.empty_fill.arrow_container.status", false),
+                        ItemUtil.deserializeItemStack(config.getConfigurationSection("menu.empty_fill.arrow_container.icon"), null)),
+                ItemUtil.deserializeItemStack(config.getConfigurationSection("menu.elements.down_arrow"), null),
+                ItemUtil.deserializeItemStack(config.getConfigurationSection("menu.elements.up_arrow"), null));
     }
 
     public static class CustomProviderSettings {
@@ -109,10 +119,20 @@ public static class MenuSettings {
 
         private String title;
         private Integer size;
+        private String directionArrowsPosition;
+        private EmptyFillSetting emptyRankContainer;
+        private EmptyFillSetting emptyArrowContainer;
+        private ItemStack elementDownArrow;
+        private ItemStack elementUpArrow;
 
-        public MenuSettings(String title, Integer size) {
+        public MenuSettings(String title, Integer size, String directionArrowsPosition, EmptyFillSetting emptyRankContainer, EmptyFillSetting emptyArrowContainer, ItemStack elementDownArrow, ItemStack elementUpArrow) {
             this.title = title;
             this.size = size;
+            this.directionArrowsPosition = directionArrowsPosition;
+            this.emptyRankContainer = emptyRankContainer;
+            this.emptyArrowContainer = emptyArrowContainer;
+            this.elementDownArrow = elementDownArrow;
+            this.elementUpArrow = elementUpArrow;
         }
 
         public String getTitle() {
@@ -122,6 +142,46 @@ public String getTitle() {
         public Integer getSize() {
             return size;
         }
+
+        public String getDirectionArrowsPosition() {
+            return directionArrowsPosition;
+        }
+
+        public EmptyFillSetting getEmptyRankContainer() {
+            return emptyRankContainer;
+        }
+
+        public EmptyFillSetting getEmptyArrowContainer() {
+            return emptyArrowContainer;
+        }
+
+        public ItemStack getElementDownArrow() {
+            return elementDownArrow;
+        }
+
+        public ItemStack getElementUpArrow() {
+            return elementUpArrow;
+        }
+
+        public static class EmptyFillSetting {
+
+            private boolean status;
+            private ItemStack icon;
+
+            public EmptyFillSetting(boolean status, ItemStack icon) {
+                this.status = status;
+                this.icon = icon;
+            }
+
+            public boolean isStatus() {
+                return status;
+            }
+
+            public ItemStack getIcon() {
+                return icon;
+            }
+        }
+
     }
 
     public Config getConfig() {

diff --git a/src/main/java/me/draww/superrup/group/SRGroupManager.java b/src/main/java/me/draww/superrup/group/SRGroupManager.java
@@ -6,6 +6,8 @@
 import me.draww.superrup.ChatListener;
 import me.draww.superrup.Config;
 import me.draww.superrup.Main;
+import me.draww.superrup.api.SuperRankupAPI;
+import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventPriority;
 
@@ -41,7 +43,7 @@ public SRGroupManager(Type type) {
 
     private void loadManager() throws UncheckedSqlException {
         groupsConfig = new Config(Main.INSTANCE, "groups.yml", true);
-        chatListenerPriority = EventPriority.valueOf(Main.INSTANCE.getMainConfig().getConfig().getString("settings.listener_priority").toUpperCase());
+        chatListenerPriority = EventPriority.valueOf(SuperRankupAPI.INSTANCE.getSettings().getCustomSettings().getListenerPriority().toUpperCase());
         chatListener = new ChatListener(chatListenerPriority);
         chatListener.register();
         switch (type) {