From 9a8538b84406c914075d6d0893ca3aca3dee7085 Mon Sep 17 00:00:00 2001
From: CmdrKittens <52665651+CmdrKittens@users.noreply.github.com>
Date: Thu, 9 Apr 2020 00:49:34 -0400
Subject: [PATCH] Customizable default (no perms) vault size

---
 .../java/com/drtshock/playervaults/PlayerVaults.java   |  9 +++++++++
 .../com/drtshock/playervaults/config/file/Config.java  |  8 ++++++++
 .../playervaults/vaultmanagement/UUIDVaultManager.java |  4 ++--
 .../playervaults/vaultmanagement/VaultManager.java     |  4 ++--
 .../playervaults/vaultmanagement/VaultOperations.java  | 10 +++++-----
 5 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/drtshock/playervaults/PlayerVaults.java b/src/main/java/com/drtshock/playervaults/PlayerVaults.java
index 56b75a1..3cec953 100644
--- a/src/main/java/com/drtshock/playervaults/PlayerVaults.java
+++ b/src/main/java/com/drtshock/playervaults/PlayerVaults.java
@@ -523,6 +523,15 @@ public class PlayerVaults extends JavaPlugin {
         return _versionString;
     }
 
+    public int getDefaultVaultRows() {
+        int def = this.config.getDefaultVaultRows();
+        return (def >= 1 && def <=6) ? def : 6;
+    }
+
+    public int getDefaultVaultSize() {
+        return this.getDefaultVaultRows() * 9;
+    }
+
     public boolean isSign(Material mat) {
         return mat.name().toUpperCase().contains("SIGN");
     }
diff --git a/src/main/java/com/drtshock/playervaults/config/file/Config.java b/src/main/java/com/drtshock/playervaults/config/file/Config.java
index f0bada7..b36b604 100644
--- a/src/main/java/com/drtshock/playervaults/config/file/Config.java
+++ b/src/main/java/com/drtshock/playervaults/config/file/Config.java
@@ -122,6 +122,10 @@ public class Config {
             " You should only enable this if you're working with a contributor to fix something.")
     private boolean debug = false;
 
+    @Comment("Can be 1 through 6.\n" +
+            "Default: 6")
+    private int defaultVaultRows = 6;
+
     @Comment("Language\n" +
             " This determines which language file the plugin will read from.\n" +
             "  Valid options are (don't include .yml): bulgarian, dutch, english, german, turkish, russian")
@@ -179,6 +183,10 @@ public class Config {
         return this.debug;
     }
 
+    public int getDefaultVaultRows() {
+        return this.defaultVaultRows;
+    }
+
     public String getLanguage() {
         return this.language;
     }
diff --git a/src/main/java/com/drtshock/playervaults/vaultmanagement/UUIDVaultManager.java b/src/main/java/com/drtshock/playervaults/vaultmanagement/UUIDVaultManager.java
index ca79b93..0f5661c 100644
--- a/src/main/java/com/drtshock/playervaults/vaultmanagement/UUIDVaultManager.java
+++ b/src/main/java/com/drtshock/playervaults/vaultmanagement/UUIDVaultManager.java
@@ -96,7 +96,7 @@ public class UUIDVaultManager {
      */
     public Inventory loadOwnVault(Player player, int number, int size) {
         if (size % 9 != 0) {
-            size = 54;
+            size = PlayerVaults.getInstance().getDefaultVaultSize();
         }
 
         String title = Lang.VAULT_TITLE.toString().replace("%number", String.valueOf(number)).replace("%p", player.getName());
@@ -137,7 +137,7 @@ public class UUIDVaultManager {
      */
     public Inventory loadOtherVault(String holder, int number, int size) {
         if (size % 9 != 0) {
-            size = 54;
+            size = PlayerVaults.getInstance().getDefaultVaultSize();
         }
         String title = Lang.VAULT_TITLE.toString().replace("%number", String.valueOf(number)).replace("%p", PlayerVaults.getInstance().getNameIfPlayer(holder));
         VaultViewInfo info = new VaultViewInfo(holder, number);
diff --git a/src/main/java/com/drtshock/playervaults/vaultmanagement/VaultManager.java b/src/main/java/com/drtshock/playervaults/vaultmanagement/VaultManager.java
index 0263638..94e6652 100644
--- a/src/main/java/com/drtshock/playervaults/vaultmanagement/VaultManager.java
+++ b/src/main/java/com/drtshock/playervaults/vaultmanagement/VaultManager.java
@@ -82,7 +82,7 @@ public class VaultManager {
      */
     public Inventory loadOwnVault(Player player, int number, int size) {
         if (size % 9 != 0) {
-            size = 54;
+            size = PlayerVaults.getInstance().getDefaultVaultSize();
         }
 
         String title = Lang.VAULT_TITLE.toString().replace("%number", String.valueOf(number)).replace("%p", player.getName());
@@ -110,7 +110,7 @@ public class VaultManager {
      */
     public Inventory loadOtherVault(String name, int number, int size) {
         if (size % 9 != 0) {
-            size = 54;
+            size = PlayerVaults.getInstance().getDefaultVaultSize();
         }
 
         String holder = name;
diff --git a/src/main/java/com/drtshock/playervaults/vaultmanagement/VaultOperations.java b/src/main/java/com/drtshock/playervaults/vaultmanagement/VaultOperations.java
index c39c912..291ddaf 100644
--- a/src/main/java/com/drtshock/playervaults/vaultmanagement/VaultOperations.java
+++ b/src/main/java/com/drtshock/playervaults/vaultmanagement/VaultOperations.java
@@ -89,7 +89,7 @@ public class VaultOperations {
      * Get the max size vault a player is allowed to have.
      *
      * @param name that is having his permissions checked.
-     * @return max size as integer. If no max size is set then it will default to 54.
+     * @return max size as integer. If no max size is set then it will default to the configured default.
      */
     public static int getMaxVaultSize(String name) {
         try {
@@ -99,25 +99,25 @@ public class VaultOperations {
             // Not a UUID
         }
 
-        return 54;
+        return PlayerVaults.getInstance().getDefaultVaultSize();
     }
 
     /**
      * Get the max size vault a player is allowed to have.
      *
      * @param player that is having his permissions checked.
-     * @return max size as integer. If no max size is set then it will default to 54.
+     * @return max size as integer. If no max size is set then it will default to the configured default.
      */
     public static int getMaxVaultSize(OfflinePlayer player) {
         if (player == null || !player.isOnline()) {
-            return 54;
+            return PlayerVaults.getInstance().getDefaultVaultSize();
         }
         for (int i = 6; i != 0; i--) {
             if (player.getPlayer().hasPermission("playervaults.size." + i)) {
                 return i * 9;
             }
         }
-        return 54;
+        return PlayerVaults.getInstance().getDefaultVaultSize();
     }
 
     /**