Settings clean up.

src/main/java/us/tastybento/bskyblock/Settings.java

@@ -11,7 +11,6 @@ import java.util.Set;
 
 import org.bukkit.GameMode;
 import org.bukkit.entity.EntityType;
-import org.bukkit.inventory.ItemStack;
 
 import us.tastybento.bskyblock.api.addons.Addon;
 import us.tastybento.bskyblock.api.configuration.ConfigComment;
@@ -372,12 +371,17 @@ public class Settings implements DataObject, WorldSettings {
     private boolean respawnOnIsland = true;
 
     // Deaths
+    @ConfigComment("Maximum number of deaths to count. The death count can be used by add-ons.")
     @ConfigEntry(path = "island.deaths.max")
     private int deathsMax = 10;
 
     @ConfigEntry(path = "island.deaths.sum-team")
     private boolean deathsSumTeam = false;
 
+    @ConfigComment("When a player joins a team, reset their death count")
+    @ConfigEntry(path = "island.deaths.team-join-reset")
+    private boolean teamJoinDeathReset = true;
+
     // Ranks
     @ConfigEntry(path = "island.customranks")
     private Map<String, Integer> customRanks = new HashMap<>();
@@ -414,18 +418,6 @@ public class Settings implements DataObject, WorldSettings {
 
     // ---------------------------------------------
 
-
-    /*      SCHEMATICS      */
-    private List<String> companionNames = new ArrayList<>();
-
-    @ConfigEntry(path = "island.chest-items")
-    private List<ItemStack> chestItems = new ArrayList<>();
-
-    private EntityType companionType = EntityType.COW;
-
-    private Map<String,Integer> limitedBlocks = new HashMap<>();
-    private boolean teamJoinDeathReset;
-
     // Timeout for team kick and leave commands
     @ConfigComment("Ask the player to confirm the command he is using by typing it again.")
     @ConfigComment("The 'wait' value is the number of seconds to wait for confirmation.")
@@ -497,24 +489,6 @@ public class Settings implements DataObject, WorldSettings {
     public void setMuteDeathMessages(boolean muteDeathMessages) {
         this.muteDeathMessages = muteDeathMessages;
     }
-    /**
-     * @return the chestItems
-     */
-    public List<ItemStack> getChestItems() {
-        return chestItems;
-    }
-    /**
-     * @return the companionNames
-     */
-    public List<String> getCompanionNames() {
-        return companionNames;
-    }
-    /**
-     * @return the companionType
-     */
-    public EntityType getCompanionType() {
-        return companionType;
-    }
     /**
      * @return the customRanks
      */
@@ -569,6 +543,12 @@ public class Settings implements DataObject, WorldSettings {
     public int getDeathsMax() {
         return deathsMax;
     }
+    /**
+     * @param teamJoinDeathReset the teamJoinDeathReset to set
+     */
+    public void setTeamJoinDeathReset(boolean teamJoinDeathReset) {
+        this.teamJoinDeathReset = teamJoinDeathReset;
+    }
     /**
      * @return the defaultLanguage
      */
@@ -650,12 +630,6 @@ public class Settings implements DataObject, WorldSettings {
     public long getLeaveWait() {
         return leaveWait;
     }
-    /**
-     * @return the limitedBlocks
-     */
-    public Map<String, Integer> getLimitedBlocks() {
-        return limitedBlocks;
-    }
     /**
      * @return the maxHomes
      */
@@ -915,12 +889,6 @@ public class Settings implements DataObject, WorldSettings {
     public boolean isRestrictFlyingMobs() {
         return restrictFlyingMobs;
     }
-    /**
-     * @return the teamJoinDeathReset
-     */
-    public boolean isTeamJoinDeathReset() {
-        return teamJoinDeathReset;
-    }
     /**
      * @return the useEconomy
      */
@@ -988,24 +956,6 @@ public class Settings implements DataObject, WorldSettings {
     public void setCheckUpdates(boolean checkUpdates) {
         this.checkUpdates = checkUpdates;
     }
-    /**
-     * @param chestItems the chestItems to set
-     */
-    public void setChestItems(List<ItemStack> chestItems) {
-        this.chestItems = chestItems;
-    }
-    /**
-     * @param companionNames the companionNames to set
-     */
-    public void setCompanionNames(List<String> companionNames) {
-        this.companionNames = companionNames;
-    }
-    /**
-     * @param companionType the companionType to set
-     */
-    public void setCompanionType(EntityType companionType) {
-        this.companionType = companionType;
-    }
     /**
      * @param customRanks the customRanks to set
      */
@@ -1186,12 +1136,6 @@ public class Settings implements DataObject, WorldSettings {
     public void setLeaveWait(long leaveWait) {
         this.leaveWait = leaveWait;
     }
-    /**
-     * @param limitedBlocks the limitedBlocks to set
-     */
-    public void setLimitedBlocks(Map<String, Integer> limitedBlocks) {
-        this.limitedBlocks = limitedBlocks;
-    }
     /**
      * @param makeIslandIfNone the makeIslandIfNone to set
      */
@@ -1306,12 +1250,6 @@ public class Settings implements DataObject, WorldSettings {
     public void setSeaHeight(int seaHeight) {
         this.seaHeight = seaHeight;
     }
-    /**
-     * @param teamJoinDeathReset the teamJoinDeathReset to set
-     */
-    public void setTeamJoinDeathReset(boolean teamJoinDeathReset) {
-        this.teamJoinDeathReset = teamJoinDeathReset;
-    }
     /**
      * @param tileEntityLimits the tileEntityLimits to set
      */
@@ -1600,5 +1538,9 @@ public class Settings implements DataObject, WorldSettings {
         this.defaultIslandSettings = defaultIslandSettings;
     }
 
+    public boolean isTeamJoinDeathReset() {
+        return teamJoinDeathReset;
+    }
+
 
 }