Updated to 1.6.0 BentoBox API

src/main/java/world/bentobox/skygrid/Settings.java

@@ -66,10 +66,6 @@ public class Settings implements WorldSettings {
     @ConfigEntry(path = "world.nether.generate")
     private boolean netherGenerate = true;
 
-    @ConfigComment("Nether trees are made if a player grows a tree in the nether (gravel and glowstone)")
-    @ConfigEntry(path = "world.nether.trees")
-    private boolean netherTrees = true;
-
     @ConfigComment("Nether block types")
     @ConfigComment("Beware with glowstone and lava - the lighting calcs will lag the")
     @ConfigComment("server badly if there are too many blocks.")
@@ -261,6 +257,10 @@ public class Settings implements WorldSettings {
     @ConfigEntry(path = "area.deaths.team-join-reset")
     private boolean teamJoinDeathReset = true;
 
+    @ConfigComment("Reset player death count when they start reset")
+    @ConfigEntry(path = "island.deaths.reset-on-new-island")
+    private boolean deathsResetOnNewIsland = true;
+
     // ---------------------------------------------
     /*      PROTECTION      */
 
@@ -534,21 +534,6 @@ public void setNetherGenerate(boolean netherGenerate) {
         this.netherGenerate = netherGenerate;
     }
 
-    /**
-     * @return the netherTrees
-     */
-    @Override
-    public boolean isNetherTrees() {
-        return netherTrees;
-    }
-
-    /**
-     * @param netherTrees the netherTrees to set
-     */
-    public void setNetherTrees(boolean netherTrees) {
-        this.netherTrees = netherTrees;
-    }
-
     /**
      * @return the endGenerate
      */
@@ -1114,4 +1099,19 @@ public int getChestFillEnd() {
     public void setChestFillEnd(int chestFillEnd) {
         this.chestFillEnd = chestFillEnd;
     }
+
+    /**
+     * @return the deathsResetOnNewIsland
+     */
+    @Override
+    public boolean isDeathsResetOnNewIsland() {
+        return deathsResetOnNewIsland;
+    }
+
+    /**
+     * @param deathsResetOnNewIsland the deathsResetOnNewIsland to set
+     */
+    public void setDeathsResetOnNewIsland(boolean deathsResetOnNewIsland) {
+        this.deathsResetOnNewIsland = deathsResetOnNewIsland;
+    }
 }

src/main/resources/config.yml

@@ -128,8 +128,6 @@ world:
   nether:
     # Generate SkyGrid Nether - if this is false, the nether world will not be made
     generate: true
-    # Nether trees are made if a player grows a tree in the nether (gravel and glowstone)
-    trees: true
     # Nether block types
     # Beware with glowstone and lava - the lighting calcs will lag the
     # server badly if there are too many blocks.
@@ -340,6 +338,9 @@ area:
     max: 10
     # When a player joins a team, reset their death count
     team-join-reset: true
+    # Reset player death count when they start new or reset
+    reset-on-new-island: true
+
 protection:
   # Geo restrict mobs.
   # Mobs that exit the protected space where they were spawned will be removed.