2 0 0 multi island (#2185)

* Multi world WIP - stashing

* Initial work on supporting multiple islands per player

The default allowed number is 5 for now, but will be set to 1 by
default.

Lots more work to do on this!

* More work on multi island. Fixed tests so clean compile.

* Remove unused imports

* Updated island go and homes command to multi island

Updated tests.

* Do not reload addons anymore.

* Add island name when entering or leaving own island

* Remove unused import

* Adds island names to /island go command.

* Enables more homes to be set if player has more than one island

* Switch to using a set for islands and explicit primary boolean in Island

* WIP

* Fix bugs with the go command.

* Be able to delete multiple islands, e.g. when joining a team

This is not fully tested.

* Do not remove all islands when a player does reset.

Players can reset just the island they are on.

* More fixes for go command

* Fix tests

* Fix @nonnull annotation

* Fix home syntax listing reference for IslandDeleteHome

* Fixed deletehome for multiple islands.

* Fix /island command teleport to current island default home.

* Remove deprecated code.

* Fix tag for concurrent island setting in config.yml

* Improve error when trying to make additional islands over limit

* Update config.yml

* Correctly assign invites for islands.

* Switch to canExecute API in prep for multi-island handling

* Prevent players from obtaining more concurrent islands by owner transfer

* Handle leaving and disbanding of teams

* Fix tests

* Fix minor bugs or code smells.

* Restore the quarantine code from deprecation.

This code can stay. It checks if islands can load, and if not puts them
in a trash. It does no harm.

* Remove unneeded eq()'s

* Fix tests

pom.xml

@@ -88,7 +88,7 @@
         <!-- Do not change unless you want different name for local builds. -->
         <build.number>-LOCAL</build.number>
         <!-- This allows to change between versions. -->
-        <build.version>1.24.2</build.version>
+        <build.version>2.0.0</build.version>
         <sonar.organization>bentobox-world</sonar.organization>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
         <server.jars>${project.basedir}/lib</server.jars>

src/main/java/world/bentobox/bentobox/BentoBox.java

@@ -31,6 +31,7 @@
 import world.bentobox.bentobox.listeners.DeathListener;
 import world.bentobox.bentobox.listeners.JoinLeaveListener;
 import world.bentobox.bentobox.listeners.PanelListenerManager;
+import world.bentobox.bentobox.listeners.PrimaryIslandListener;
 import world.bentobox.bentobox.listeners.StandardSpawnProtectionListener;
 import world.bentobox.bentobox.listeners.teleports.EntityTeleportListener;
 import world.bentobox.bentobox.listeners.teleports.PlayerTeleportListener;
@@ -308,6 +309,8 @@ private void registerListeners() {
         // Island Delete Manager
         islandDeletionManager = new IslandDeletionManager(this);
         manager.registerEvents(islandDeletionManager, this);
+        // Primary Island Listener
+        manager.registerEvents(new PrimaryIslandListener(this), this);
     }
 
     @Override

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

@@ -190,6 +190,12 @@ public class Settings implements ConfigObject {
     /*
      * Island
      */
+    // Number of islands
+    @ConfigComment("The default number of concurrent islands a player may have.")
+    @ConfigComment("This may be overridden by individual game mode config settings.")
+    @ConfigEntry(path = "island.concurrent-islands")
+    private int islandNumber = 1;
+
     // Cooldowns
     @ConfigComment("How long a player must wait until they can rejoin a team island after being kicked in minutes.")
     @ConfigComment("This slows the effectiveness of players repeating challenges")
@@ -1045,4 +1051,21 @@ public List<String> getReadyCommands() {
     public void setReadyCommands(List<String> readyCommands) {
         this.readyCommands = readyCommands;
     }
+
+    /**
+     * @return the islandNumber
+     * @since 2.0.0
+     */
+    public int getIslandNumber() {
+        return islandNumber;
+    }
+
+    /**
+     * @param islandNumber the islandNumber to set
+     * @since 2.0.0
+     */
+    public void setIslandNumber(int islandNumber) {
+        this.islandNumber = islandNumber;
+    }
+
 }

src/main/java/world/bentobox/bentobox/api/commands/CompositeCommand.java

@@ -461,17 +461,6 @@ public Map<String, CompositeCommand> getSubCommands(boolean ignoreHelp) {
         return getSubCommands();
     }
 
-    /**
-     * Convenience method to obtain the user's island owner
-     * @param world world to check
-     * @param user the User
-     * @return UUID of player's island owner or null if user has no island
-     */
-    @Nullable
-    protected UUID getOwner(@NonNull World world, @NonNull User user) {
-        return plugin.getIslands().getOwner(world, user.getUniqueId());
-    }
-
     @Override
     public @NonNull String getUsage() {
         return "/" + usage;

src/main/java/world/bentobox/bentobox/api/commands/admin/AdminDeleteCommand.java

@@ -5,8 +5,6 @@
 import java.util.Optional;
 import java.util.UUID;
 
-import org.bukkit.util.Vector;
-
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.commands.ConfirmableCommand;
 import world.bentobox.bentobox.api.events.island.IslandEvent;
@@ -41,14 +39,14 @@ public boolean canExecute(User user, String label, List<String> args) {
             user.sendMessage("general.errors.unknown-player", TextVariables.NAME, args.get(0));
             return false;
         }
-        UUID owner = getIslands().getOwner(getWorld(), targetUUID);
-        if (owner == null) {
+        Island island = getIslands().getIsland(getWorld(), user);
+        if (island == null) {
             user.sendMessage("general.errors.player-has-no-island");
             return false;
         }
 
         // Team members should be kicked before deleting otherwise the whole team will become weird
-        if (getIslands().inTeam(getWorld(), targetUUID) && owner.equals(targetUUID)) {
+        if (getIslands().inTeam(getWorld(), targetUUID) && user.getUniqueId().equals(island.getOwner())) {
             user.sendMessage("commands.admin.delete.cannot-delete-owner");
             return false;
         }
@@ -66,10 +64,7 @@ public boolean execute(User user, String label, List<String> args) {
 
     private void deletePlayer(User user, UUID targetUUID) {
         // Delete player and island
-        // Get the target's island
-        Island oldIsland = getIslands().getIsland(getWorld(), targetUUID);
-        Vector vector = null;
-        if (oldIsland != null) {
+        for (Island oldIsland : getIslands().getIslands(getWorld(), targetUUID)) {
             // Fire island preclear event
             IslandEvent.builder()
             .involvedPlayer(user.getUniqueId())
@@ -78,21 +73,17 @@ private void deletePlayer(User user, UUID targetUUID) {
             .oldIsland(oldIsland)
             .location(oldIsland.getCenter())
             .build();
-            // Check if player is online and on the island
-            User target = User.getInstance(targetUUID);
-            // Remove them from this island (it still exists and will be deleted later)
-            getIslands().removePlayer(getWorld(), targetUUID);
-            if (target.isPlayer() && target.isOnline()) {
-                cleanUp(target);
-            }
-            vector = oldIsland.getCenter().toVector();
+            user.sendMessage("commands.admin.delete.deleted-island", TextVariables.XYZ, Util.xyz(oldIsland.getCenter().toVector()));
             getIslands().deleteIsland(oldIsland, true, targetUUID);
         }
-        if (vector == null) {
-            user.sendMessage("general.success");
-        } else {
-            user.sendMessage("commands.admin.delete.deleted-island", TextVariables.XYZ, Util.xyz(vector));
+        // Check if player is online and on the island
+        User target = User.getInstance(targetUUID);
+        // Remove them from this island (it still exists and will be deleted later)
+        getIslands().removePlayer(getWorld(), targetUUID);
+        if (target.isPlayer() && target.isOnline()) {
+            cleanUp(target);
         }
+        user.sendMessage("general.success");
     }
 
     private void cleanUp(User target) {

src/main/java/world/bentobox/bentobox/api/commands/admin/team/AdminTeamDisbandCommand.java

@@ -57,7 +57,7 @@ public boolean execute(User user, String label, List<String> args) {
             mUser.sendMessage("commands.admin.team.disband.disbanded");
             // The owner gets to keep the island
             if (!m.equals(targetUUID)) {
-                getIslands().setLeaveTeam(getWorld(), m);
+                island.removeMember(m);
                 TeamEvent.builder()
                 .island(island)
                 .reason(TeamEvent.Reason.KICK)

src/main/java/world/bentobox/bentobox/api/commands/island/IslandCreateCommand.java

@@ -42,14 +42,20 @@ public void setup() {
     public boolean canExecute(User user, String label, List<String> args) {
         // Check if the island is reserved
         @Nullable
-        Island island = getIslands().getIsland(getWorld(), user);
+        Island island = getIslands().getPrimaryIsland(getWorld(), user.getUniqueId());
         if (island != null) {
             // Reserved islands can be made
             if (island.isReserved()) {
                 return true;
             }
+            // Get how many islands this player has
+            int num = this.getIslands().getNumberOfConcurrentIslands(user.getUniqueId(), getWorld());
+            int max = this.getIWM().getWorldSettings(getWorld()).getConcurrentIslands();
+            if (num < max) {
+                return true;
+            }
             // You cannot make an island
-            user.sendMessage("general.errors.already-have-island");
+            user.sendMessage("general.errors.you-cannot-make");
             return false;
         }
         if (getIWM().getMaxIslands(getWorld()) > 0

src/main/java/world/bentobox/bentobox/api/commands/island/IslandDeletehomeCommand.java

@@ -1,12 +1,12 @@
 package world.bentobox.bentobox.api.commands.island;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 
-import org.eclipse.jdt.annotation.Nullable;
-
 import world.bentobox.bentobox.api.commands.CompositeCommand;
 import world.bentobox.bentobox.api.commands.ConfirmableCommand;
 import world.bentobox.bentobox.api.localization.TextVariables;
@@ -22,8 +22,6 @@
  */
 public class IslandDeletehomeCommand extends ConfirmableCommand {
 
-    private @Nullable Island island;
-
     /**
      * Deletes a home
      * @param islandCommand parent command
@@ -48,7 +46,7 @@ public boolean canExecute(User user, String label, List<String> args) {
             this.showHelp(this, user);
             return false;
         }
-        island = getIslands().getIsland(getWorld(), user);
+        Island island = getIslands().getIsland(getWorld(), user);
         // Check island
         if (island == null) {
             user.sendMessage("general.errors.no-island");
@@ -63,19 +61,21 @@ public boolean canExecute(User user, String label, List<String> args) {
             return false;
         }
 
-        // Check if the name is known
-        if (!getIslands().isHomeLocation(island, String.join(" ", args))) {
-            user.sendMessage("commands.island.go.unknown-home");
-            user.sendMessage("commands.island.sethome.homes-are");
-            island.getHomes().keySet().stream().filter(s -> !s.isEmpty()).forEach(s -> user.sendMessage("commands.island.sethome.home-list-syntax", TextVariables.NAME, s));
-            return false;
-        }
         return true;
     }
 
     @Override
     public boolean execute(User user, String label, List<String> args) {
-        this.askConfirmation(user, () -> delete(island, user, String.join(" ", args)));
+        // Check if the name is known
+        Map<String, Island> map = getNameIslandMap(user);
+        String name = String.join(" ", args);
+        if (!map.containsKey(name)) {
+            user.sendMessage("commands.island.go.unknown-home");
+            user.sendMessage("commands.island.sethome.homes-are");
+            map.keySet().stream().filter(s -> !s.isEmpty()).forEach(s -> user.sendMessage("commands.island.sethome.home-list-syntax", TextVariables.NAME, s));
+            return false;
+        }
+        this.askConfirmation(user, () -> delete(map.get(name), user, name));
         return true;
     }
 
@@ -88,11 +88,19 @@ private void delete(Island island, User user, String name) {
     @Override
     public Optional<List<String>> tabComplete(User user, String alias, List<String> args) {
         String lastArg = !args.isEmpty() ? args.get(args.size()-1) : "";
-        Island is = getIslands().getIsland(getWorld(), user.getUniqueId());
-        if (is != null) {
-            return Optional.of(Util.tabLimit(new ArrayList<>(is.getHomes().keySet()), lastArg));
-        } else {
-            return Optional.empty();
+
+        return Optional.of(Util.tabLimit(new ArrayList<>(getNameIslandMap(user).keySet()), lastArg));
+
+    }
+
+    private Map<String, Island> getNameIslandMap(User user) {
+        Map<String, Island> islandMap = new HashMap<>();
+        for (Island isle : getIslands().getIslands(getWorld(), user.getUniqueId())) {
+            // Add homes.
+            isle.getHomes().keySet().forEach(name -> islandMap.put(name, isle));
         }
+        return islandMap;
+
     }
+
 }