Removed extraneous settings. Cleaned up config.yml.

src/main/java/bentobox/addon/acidisland/AISettings.java

@@ -1,7 +1,6 @@
 package bentobox.addon.acidisland;
 
 import java.util.ArrayList;
-import java.util.EnumMap;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -35,7 +34,7 @@ import world.bentobox.bentobox.database.objects.adapters.PotionEffectListAdapter
 @ConfigComment("This config file is dynamic and saved when the server is shutdown.")
 @ConfigComment("You cannot edit it while the server is running because changes will")
 @ConfigComment("be lost! Use in-game settings GUI or edit when server is offline.")
-@StoreAt(filename="config.yml", path="addons/BentoBox-AcidIsland") // Explicitly call out what name this should have.
+@StoreAt(filename="config.yml", path="addons/AcidIsland") // Explicitly call out what name this should have.
 public class AISettings implements DataObject, WorldSettings {
 
     // ---------------------------------------------
@@ -223,7 +222,7 @@ public class AISettings implements DataObject, WorldSettings {
     @Adapter(FlagSerializer2.class)
     private Map<Flag, Integer> defaultIslandSettings = new HashMap<>();
 
-    @ConfigComment("These are the settings visible to users.")
+    @ConfigComment("These are the settings visible to users. (Not implemented yet)")
     @ConfigEntry(path = "world.visible-settings")
     private List<String> visibleSettings = new ArrayList<>();
 
@@ -234,12 +233,6 @@ public class AISettings implements DataObject, WorldSettings {
     // ---------------------------------------------
 
     /*      ISLAND      */
-    // Entities
-    @ConfigEntry(path = "island.limits.entities")
-    private Map<EntityType, Integer> entityLimits = new EnumMap<>(EntityType.class);
-    @ConfigEntry(path = "island.limits.tile-entities")
-    private Map<String, Integer> tileEntityLimits = new HashMap<>();
-
     @ConfigComment("Default max team size")
     @ConfigComment("Use this permission to set for specific user groups: askyblock.team.maxsize.<number>")
     @ConfigComment("Permission size cannot be less than the default below. ")
@@ -530,13 +523,6 @@ public class AISettings implements DataObject, WorldSettings {
     public void setTeamJoinDeathReset(boolean teamJoinDeathReset) {
         this.teamJoinDeathReset = teamJoinDeathReset;
     }
-    /**
-     * @return the entityLimits
-     */
-    @Override
-    public Map<EntityType, Integer> getEntityLimits() {
-        return entityLimits;
-    }
     /**
      * @return the islandDistance
      */
@@ -658,13 +644,6 @@ public class AISettings implements DataObject, WorldSettings {
     public int getSeaHeight() {
         return seaHeight;
     }
-    /**
-     * @return the tileEntityLimits
-     */
-    @Override
-    public Map<String, Integer> getTileEntityLimits() {
-        return tileEntityLimits;
-    }
     /**
      * @return the togglePvPCooldown
      */
@@ -817,12 +796,6 @@ public class AISettings implements DataObject, WorldSettings {
     public void setEndIslands(boolean endIslands) {
         this.endIslands = endIslands;
     }
-    /**
-     * @param entityLimits the entityLimits to set
-     */
-    public void setEntityLimits(Map<EntityType, Integer> entityLimits) {
-        this.entityLimits = entityLimits;
-    }
     /**
      * @param immediateTeleportOnIsland the immediateTeleportOnIsland to set
      */
@@ -1003,12 +976,6 @@ public class AISettings implements DataObject, WorldSettings {
     public void setSeaHeight(int seaHeight) {
         this.seaHeight = seaHeight;
     }
-    /**
-     * @param tileEntityLimits the tileEntityLimits to set
-     */
-    public void setTileEntityLimits(Map<String, Integer> tileEntityLimits) {
-        this.tileEntityLimits = tileEntityLimits;
-    }
     /**
      * @param togglePvPCooldown the togglePvPCooldown to set
      */

src/main/java/bentobox/addon/acidisland/commands/AcidCommand.java

@@ -7,6 +7,7 @@ import world.bentobox.bentobox.api.addons.Addon;
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.commands.admin.AdminClearResetsAllCommand;
 import world.bentobox.bentobox.api.commands.admin.AdminClearResetsCommand;
+import world.bentobox.bentobox.api.commands.admin.AdminDeleteCommand;
 import world.bentobox.bentobox.api.commands.admin.AdminGetRankCommand;
 import world.bentobox.bentobox.api.commands.admin.AdminInfoCommand;
 import world.bentobox.bentobox.api.commands.admin.AdminRegisterCommand;
@@ -36,28 +37,30 @@ public class AcidCommand extends CompositeCommand {
         setParametersHelp("commands.admin.help.parameters");
         setDescription("commands.admin.help.description");
         setWorld(((AcidIsland)getAddon()).getIslandWorld());
-
+        new AdminVersionCommand(this);
+        new AdminTeleportCommand(this, "tp");
+        new AdminTeleportCommand(this, "tpnether");
+        new AdminTeleportCommand(this, "tpend");
+        new AdminGetRankCommand(this);
+        new AdminSetRankCommand(this);
+        new AdminInfoCommand(this);
         // Team commands
         new AdminTeamAddCommand(this);
         new AdminTeamKickCommand(this);
         new AdminTeamDisbandCommand(this);
         new AdminTeamMakeLeaderCommand(this);
-        // Other
-        new AdminGetRankCommand(this);
-        new AdminInfoCommand(this);
-        new AdminRegisterCommand(this);
+        // Schems
         new AdminSchemCommand(this);
-        new AdminSetRankCommand(this);
-        new AdminTeleportCommand(this, "tp");
-        new AdminTeleportCommand(this, "tpnether");
-        new AdminTeleportCommand(this, "tpend");
+        // Register/unregister islands
+        new AdminRegisterCommand(this);
         new AdminUnregisterCommand(this);
-        new AdminVersionCommand(this);
         // Range
         new AdminRangeCommand(this);
         // Resets
         new AdminClearResetsCommand(this);
         new AdminClearResetsAllCommand(this);
+        // Delete
+        new AdminDeleteCommand(this);
     }
 
     @Override

src/main/resources/config.yml

@@ -106,10 +106,10 @@ world:
   # This setting is toggled in world flags and set by the settings GUI.
   # Mob white list - these mobs will NOT be removed when logging in or doing /island
   remove-mobs-whitelist:
-  - ZOMBIE_VILLAGER
-  - WITHER
   - PIG_ZOMBIE
   - ENDERMAN
+  - WITHER
+  - ZOMBIE_VILLAGER
   # World flags. These are boolean settings for various flags for this world
   flags:
     ENTER_EXIT_MESSAGES: true
@@ -126,8 +126,8 @@ world:
     HURT_ANIMALS: 900
     COLLECT_WATER: 900
     REDSTONE: 900
-    BUCKET: 900
     BUTTON: 900
+    BUCKET: 900
     LOCK: 0
     FIRE_EXTINGUISH: 900
     ENDER_PEARL: 900
@@ -141,11 +141,12 @@ world:
     FIRE: 900
     CRAFTING: 900
     BREEDING: 900
-    SHEARING: 900
+    TNT: 500
     ENCHANTING: 900
+    SHEARING: 900
     HURT_VILLAGERS: 900
-    SPAWN_EGGS: 900
     BED: 900
+    SPAWN_EGGS: 900
     COLLECT_LAVA: 900
     MILKING: 900
     LEVER: 900
@@ -155,17 +156,17 @@ world:
     GATE: 900
     TRADING: 900
     EGGS: 900
-    ITEM_DROP: 900
     PORTAL: 900
+    ITEM_DROP: 900
     CHEST: 900
     NOTE_BLOCK: 900
     LEASH: 900
-    MOUNT_INVENTORY: 900
     BREAK_BLOCKS: 900
+    MOUNT_INVENTORY: 900
     CHORUS_FRUIT: 900
-    ITEM_PICKUP: 900
     CROP_TRAMPLE: 900
     JUKEBOX: 900
+    ITEM_PICKUP: 900
     BREWING: 900
   # These are the default settings for new islands
   default-island-settings:
@@ -175,16 +176,13 @@ world:
     MONSTER_SPAWN: true
     FIRE_SPREAD: true
     PVP_OVERWORLD: false
-  # These are the settings visible to users.
+  # These are the settings visible to users. (Not implemented yet)
   visible-settings: []
   # Visitor banned commands - Visitors to islands cannot use these commands in this world
   visitor-banned-commands:
   - spawner
   - spawnmob
 island:
-  limits:
-    entities: {}
-    tile-entities: {}
   # Default max team size
   # Use this permission to set for specific user groups: askyblock.team.maxsize.<number>
   # Permission size cannot be less than the default below. 
@@ -262,13 +260,11 @@ island:
     # When a player joins a team, reset their death count
     team-join-reset: true
   customranks: {}
+togglePvPCooldown: 0
 protection:
-  # Allow pistons to push outside of the protected area (maybe to make bridges)
-  allow-piston-push: true
-  # Restrict Wither and other flying mobs.
-  # Any flying mobs that exit the island space where they were spawned will be removed.
-  # Includes blaze and ghast. 
-  restrict-flying-mobs: true
+  # Geo restrict mobs.
+  # Mobs that exit the island space where they were spawned will be removed.
+  geo-limit-settings: []
   # Invincible visitors. List of damages that will not affect visitors.
   # Make list blank if visitors should receive all damages
   invincible-visitors:
@@ -296,15 +292,9 @@ protection:
   - HOT_FLOOR
   - CRAMMING
   - VOID
-togglePvPCooldown: 0
-allowEndermanGriefing: false
-endermanDeathDrop: false
-allowTNTDamage: false
-allowChestDamage: false
-allowCreeperDamage: false
-allowCreeperGriefing: false
-allowMobDamageToItemFrames: false
 panel:
   close-on-click-outside: true
-# Do not change this value below
+do-not-edit-these-settings:
+  # These settings should not be edited
+  reset-epoch: 0
 uniqueId: config