Add default max homes, enable base functionality by default

Author: RhythmicSys

pom.xml

@@ -6,7 +6,7 @@
 
   <groupId>simplexity</groupId>
   <artifactId>SimpleHomes</artifactId>
-  <version>1.2.2</version>
+  <version>1.3.0</version>
   <packaging>jar</packaging>
 
   <name>SimpleHomes</name>

src/main/java/simplexity/simplehomes/commands/CommandUtils.java

@@ -32,6 +32,8 @@ public static Home getHomeFromList(List<Home> homes, String homeName) {
     public static boolean hasMoreHomesThanAllowed(Player player){
         UUID playerUUID = player.getUniqueId();
         List<Home> playerHomeList = SQLHandler.getInstance().getHomes(playerUUID);
+        int maxHomes = maxHomesPermission(player);
+        if (maxHomes < 0) return false;
         return playerHomeList.size() > maxHomesPermission(player);
     }
 
@@ -50,6 +52,9 @@ public static int maxHomesPermission(Player player) {
                 SimpleHomes.getInstance().getLogger().warning("Found homes permission with invalid number format: " + permission);
             }
         }
+        if (maxHomes == 0) {
+            return ConfigHandler.getInstance().getDefaultMaxHomeCount();
+        }
         return maxHomes;
     }
 

src/main/java/simplexity/simplehomes/configs/ConfigHandler.java

@@ -15,7 +15,7 @@ public class ConfigHandler {
     private boolean creativeBypass, invulnerableBypass, mysql, lockoutEnabled, disableHome, disableHomeList,
             disableDeleteHome, delayEnabled, cancelOnMove, bedHomesEnabled;
     private String ip, name, username, password, bedHomesName, defaultHomeName;
-    private int timeInSeconds;
+    private int timeInSeconds, defaultMaxHomeCount;
     private double bufferMovement;
 
     public static ConfigHandler getInstance() {
@@ -40,6 +40,7 @@ public void loadConfigValues() {
         bedHomesEnabled = config.getBoolean("bed-home.enabled", false);
         bedHomesName = config.getString("bed-home.name", "bed");
         defaultHomeName = config.getString("default-home-name", "home");
+        defaultMaxHomeCount = config.getInt("default-max-home-count", 3);
         fillList(blockList);
         mysql = config.getBoolean("mysql.enabled", false);
         ip = config.getString("mysql.ip");
@@ -135,4 +136,8 @@ public String getBedHomesName() {
     public String getDefaultHomeName() {
         return defaultHomeName;
     }
+
+    public int getDefaultMaxHomeCount() {
+        return defaultMaxHomeCount;
+    }
 }

src/main/resources/config.yml

@@ -28,3 +28,6 @@ bed-home: #set a home when interacting with a bed
   enabled: false
   name: "bed" #this will be reserved and not able to be used on /sethome
 default-home-name: "home"
+# 0 for no default homes, -1 for infinite default homes
+#if you set someone's max homes lower than the default, their max homes will be what their permission is, not the default
+default-max-home-count: 3

src/main/resources/plugin.yml

@@ -25,44 +25,38 @@ commands:
     description: Console only command for importing from other plugins.
 permissions:
   homes:
-    default: op
+    default: true
     description: allows base plugin functionality
   homes.commands:
-    default: op
+    default: true
     description: allows player to use commands
+    children:
+      homes.commands.sethome: true
+      homes.commands.delhome: true
+      homes.commands.home: true
+      homes.commands.list: true
+      homes.bed: true
+  homes.bed:
+    default: true
+    description: sets a home at your bed when you interact with it
   homes.commands.sethome:
-    default: op
+    default: true
     description: allows player to set home
-    children:
-      homes.commands: true
   homes.commands.delhome:
-    default: op
+    default: true
     description: allows player to delete home
-    children:
-      homes.commands: true
   homes.commands.home:
-    default: op
+    default: true
     description: allows player to teleport to home
-    children:
-      homes.commands: true
+  homes.commands.list:
+    default: true
+    description: allows you to list your own homes
   homes.count:
     default: op
     description: base for permission on number of homes you can have
   homes.count.bypass:
     default: op
     description: allows for setting infinite homes regardless of how many you have set as the max
-    children:
-      homes.count: true
-  homes.commands.list:
-    default: op
-    description: allows you to list your own homes
-    children:
-      homes.commands: true
-  homes.bed:
-    default: op
-    description: sets a home at your bed when you interact with it
-    children:
-      homes.commands: true
   homes.safety.bypass:
     default: false
     description: allows bypassing the safety checks