Removed nether trees from BSkyBlock - new 1.6.0 API

src/main/java/world/bentobox/bskyblock/BSkyBlock.java

@@ -1,6 +1,5 @@
 package world.bentobox.bskyblock;
 
-import org.bukkit.Bukkit;
 import org.bukkit.World;
 import org.bukkit.World.Environment;
 import org.bukkit.WorldCreator;
@@ -86,15 +85,6 @@ public class BSkyBlock extends GameModeAddon {
 
         // Create the world if it does not exist
         islandWorld = getWorld(worldName, World.Environment.NORMAL, chunkGenerator);
-        Bukkit.getLogger().info("World spawn limits ambient " + islandWorld.getAmbientSpawnLimit());
-        //islandWorld.setAnimalSpawnLimit(100);
-        //islandWorld.setAmbientSpawnLimit(100);
-        Bukkit.getLogger().info("World spawn limits animal " + islandWorld.getAnimalSpawnLimit());
-        Bukkit.getLogger().info("World spawn limits monster " + islandWorld.getMonsterSpawnLimit());
-        Bukkit.getLogger().info("World spawn limits water " + islandWorld.getWaterAnimalSpawnLimit());
-        //islandWorld.setTicksPerAnimalSpawns(1);
-        Bukkit.getLogger().info("World spawn limits ticks per animal " + islandWorld.getTicksPerAnimalSpawns());
-        Bukkit.getLogger().info("World spawn limits ticks per monster " + islandWorld.getTicksPerMonsterSpawns());
 
         // Make the nether if it does not exist
         if (settings.isNetherGenerate()) {

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

@@ -135,11 +135,6 @@ public class Settings implements WorldSettings {
     @ConfigEntry(path = "world.nether.islands", needsReset = true)
     private boolean netherIslands = true;
 
-    @ConfigComment("Nether trees are made if a player grows a tree in the nether (gravel and glowstone)")
-    @ConfigComment("Applies to both vanilla and islands Nether")
-    @ConfigEntry(path = "world.nether.trees")
-    private boolean netherTrees = true;
-
     @ConfigComment("Make the nether roof, if false, there is nothing up there")
     @ConfigComment("Change to false if lag is a problem from the generation")
     @ConfigComment("Only applies to islands Nether")
@@ -286,8 +281,8 @@ public class Settings implements WorldSettings {
     private boolean teamJoinDeathReset = true;
 
     @ConfigComment("Reset player death count when they start a new island or reset and island")
-    @ConfigEntry(path = "island.deaths.reset-on-new")
-    private boolean deathsResetOnNew = true;
+    @ConfigEntry(path = "island.deaths.reset-on-new-island")
+    private boolean deathsResetOnNewIsland = true;
 
     // ---------------------------------------------
     /*      PROTECTION      */
@@ -436,14 +431,6 @@ public class Settings implements WorldSettings {
         return netherIslands;
     }
 
-    /**
-     * @return the netherTrees
-     */
-    @Override
-    public boolean isNetherTrees() {
-        return netherTrees;
-    }
-
     /**
      * @return the netherRoof
      */
@@ -812,13 +799,6 @@ public class Settings implements WorldSettings {
         this.netherIslands = netherIslands;
     }
 
-    /**
-     * @param netherTrees the netherTrees to set
-     */
-    public void setNetherTrees(boolean netherTrees) {
-        this.netherTrees = netherTrees;
-    }
-
     /**
      * @param netherRoof the netherRoof to set
      */
@@ -1129,14 +1109,14 @@ public class Settings implements WorldSettings {
      * @return the deathsResetOnNew
      */
     @Override
-    public boolean isDeathsResetOnNew() {
-        return deathsResetOnNew;
+    public boolean isDeathsResetOnNewIsland() {
+        return deathsResetOnNewIsland;
     }
 
     /**
      * @param deathsResetOnNew the deathsResetOnNew to set
      */
-    public void setDeathsResetOnNew(boolean deathsResetOnNew) {
-        this.deathsResetOnNew = deathsResetOnNew;
+    public void setDeathsResetOnNewIsland(boolean deathsResetOnNew) {
+        this.deathsResetOnNewIsland = deathsResetOnNew;
     }
 }

src/main/resources/config.yml

@@ -67,9 +67,6 @@ world:
     generate: true
     # Islands in Nether. Change to false for standard vanilla nether.
     islands: true
-    # Nether trees are made if a player grows a tree in the nether (gravel and glowstone)
-    # Applies to both vanilla and islands Nether
-    trees: true
     # Make the nether roof, if false, there is nothing up there
     # Change to false if lag is a problem from the generation
     # Only applies to islands Nether

src/test/java/world/bentobox/bskyblock/BSkyBlockTest.java

@@ -24,7 +24,6 @@ import java.util.logging.Logger;
 import org.bukkit.Bukkit;
 import org.bukkit.Server;
 import org.bukkit.entity.Player;
-import org.eclipse.jdt.annotation.Nullable;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

src/test/java/world/bentobox/bskyblock/SettingsTest.java

@@ -179,15 +179,6 @@ public class SettingsTest {
         assertTrue(s.isNetherIslands());
     }
 
-    /**
-     * Test method for {@link world.bentobox.bskyblock.Settings#setNetherTrees(boolean)}.
-     */
-    @Test
-    public void testSetNetherTrees() {
-        s.setNetherTrees(true);
-        assertTrue(s.isNetherTrees());
-    }
-
     /**
      * Test method for {@link world.bentobox.bskyblock.Settings#setNetherRoof(boolean)}.
      */