Merge pull request #2325 from BentoBoxWorld/develop

Release 2.2.0

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>2.1.1</build.version>
+        <build.version>2.2.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>
@@ -189,6 +189,12 @@
             <id>MG-Dev Jenkins CI Maven Repository</id>
             <url>https://ci.mg-dev.eu/plugin/repository/everything</url>
         </repository>
+        <!-- For MythicMobs -->
+        <repository>
+            <id>nexus</id>
+            <name>Lumine Releases</name>
+            <url>https://mvn.lumine.io/repository/maven-public/</url>
+        </repository>
     </repositories>
 
     <dependencies>
@@ -297,6 +303,12 @@
             <version>${myworlds.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>io.lumine</groupId>
+            <artifactId>Mythic-Dist</artifactId>
+            <version>5.3.5</version>  
+            <scope>provided</scope>
+        </dependency>
         <!-- Shaded APIs -->
         <dependency>
             <groupId>com.github.TheBusyBiscuit</groupId>

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

@@ -27,6 +27,7 @@
 import world.bentobox.bentobox.hooks.ItemsAdderHook;
 import world.bentobox.bentobox.hooks.MultiverseCoreHook;
 import world.bentobox.bentobox.hooks.MyWorldsHook;
+import world.bentobox.bentobox.hooks.MythicMobsHook;
 import world.bentobox.bentobox.hooks.SlimefunHook;
 import world.bentobox.bentobox.hooks.VaultHook;
 import world.bentobox.bentobox.hooks.placeholders.PlaceholderAPIHook;
@@ -185,6 +186,9 @@ private void completeSetup(long loadTime) {
         final long enableStart = System.currentTimeMillis();
         hooksManager.registerHook(new VaultHook());
 
+        // MythicMobs
+        hooksManager.registerHook(new MythicMobsHook());
+
         hooksManager.registerHook(new PlaceholderAPIHook());
         // Setup the Placeholders manager
         placeholdersManager = new PlaceholdersManager(this);

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

@@ -82,7 +82,7 @@ public boolean canExecute(User user, String label, List<String> args) {
 
     private Map<String, Island> getIslandsXYZ(UUID target) {
         return getIslands().getOwnedIslands(getWorld(), target).stream().filter(is -> is.getMemberSet().size() > 1) // Filter for teams
-                .collect(Collectors.toMap(island -> Util.xyz(island.getCenter().toVector()), island -> island));
+                .collect(Collectors.toMap(is -> Util.xyz(is.getCenter().toVector()), is -> is));
     }
 
     @Override

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

@@ -1,9 +1,17 @@
 package world.bentobox.bentobox.api.commands.admin.team;
 
 import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
 import java.util.UUID;
 
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.eclipse.jdt.annotation.Nullable;
+
+import world.bentobox.bentobox.api.addons.GameModeAddon;
 import world.bentobox.bentobox.api.commands.CompositeCommand;
+import world.bentobox.bentobox.api.commands.ConfirmableCommand;
 import world.bentobox.bentobox.api.events.island.IslandEvent;
 import world.bentobox.bentobox.api.events.team.TeamEvent;
 import world.bentobox.bentobox.api.localization.TextVariables;
@@ -17,7 +25,11 @@
  * 
  * @author tastybento
  */
-public class AdminTeamSetownerCommand extends CompositeCommand {
+public class AdminTeamSetownerCommand extends ConfirmableCommand {
+
+    private @Nullable UUID targetUUID;
+    private Island island;
+    private @Nullable UUID previousOwnerUUID;
 
     public AdminTeamSetownerCommand(CompositeCommand parent) {
         super(parent, "setowner");
@@ -28,35 +40,50 @@ public void setup() {
         setPermission("mod.team.setowner");
         setParametersHelp("commands.admin.team.setowner.parameters");
         setDescription("commands.admin.team.setowner.description");
+        this.setOnlyPlayer(true);
     }
 
     @Override
-    public boolean execute(User user, String label, List<String> args) {
+    public boolean canExecute(User user, String label, List<String> args) {
         // If args are not right, show help
         if (args.size() != 1) {
             showHelp(this, user);
             return false;
         }
+
         // Get target
-        UUID targetUUID = Util.getUUID(args.get(0));
+        targetUUID = Util.getUUID(args.get(0));
         if (targetUUID == null) {
             user.sendMessage("general.errors.unknown-player", TextVariables.NAME, args.get(0));
             return false;
         }
-        if (!getIslands().inTeam(getWorld(), targetUUID)) {
-            user.sendMessage("general.errors.not-in-team");
+        // Check that user is on an island
+        Optional<Island> opIsland = getIslands().getIslandAt(user.getLocation());
+        if (opIsland.isEmpty()) {
+            user.sendMessage("commands.admin.team.setowner.must-be-on-island");
             return false;
         }
-        Island island = getIslands().getPrimaryIsland(getWorld(), targetUUID);
-        UUID previousOwnerUUID = island.getOwner();
+        island = opIsland.get();
+        previousOwnerUUID = island.getOwner();
         if (targetUUID.equals(previousOwnerUUID)) {
             user.sendMessage("commands.admin.team.setowner.already-owner", TextVariables.NAME, args.get(0));
             return false;
         }
+        return true;
+    }
 
-        // Get the User corresponding to the current owner
-        User target = User.getInstance(targetUUID);
+    public boolean execute(User user, String label, List<String> args) {
+        Objects.requireNonNull(island);
+        Objects.requireNonNull(targetUUID);
+
+        this.askConfirmation(user, user.getTranslation("commands.admin.team.setowner.confirmation", TextVariables.NAME,
+                args.get(0), TextVariables.XYZ, Util.xyz(island.getCenter().toVector())), () -> changeOwner(user));
+        return true;
 
+    }
+
+    protected void changeOwner(User user) {
+        User target = User.getInstance(targetUUID);
         // Fire event so add-ons know
         // Call the setowner event
         TeamEvent.builder().island(island).reason(TeamEvent.Reason.SETOWNER).involvedPlayer(targetUUID).admin(true)
@@ -70,8 +97,20 @@ public boolean execute(User user, String label, List<String> args) {
                 .build();
 
         // Make new owner
-        getIslands().setOwner(getWorld(), user, targetUUID);
-        user.sendMessage("commands.admin.team.setowner.success", TextVariables.NAME, args.get(0));
+        getIslands().setOwner(user, targetUUID, island, RanksManager.MEMBER_RANK);
+        user.sendMessage("commands.admin.team.setowner.success", TextVariables.NAME, target.getName());
+
+        // Report if this made player have more islands than expected
+        // Get how many islands this player has
+        int num = this.getIslands().getNumberOfConcurrentIslands(targetUUID, getWorld());
+        int max = target.getPermissionValue(
+                this.getIWM().getAddon(getWorld()).map(GameModeAddon::getPermissionPrefix).orElse("") + "island.number",
+                this.getIWM().getWorldSettings(getWorld()).getConcurrentIslands());
+        if (num > max) {
+            // You cannot make an island
+            user.sendMessage("commands.admin.team.setowner.extra-islands", TextVariables.NUMBER, String.valueOf(num),
+                    "[max]", String.valueOf(max));
+        }
 
         // Call the rank change event for the old island owner
         if (previousOwnerUUID != null) {
@@ -80,6 +119,13 @@ public boolean execute(User user, String label, List<String> args) {
                     .reason(IslandEvent.Reason.RANK_CHANGE)
                     .rankChange(RanksManager.OWNER_RANK, island.getRank(previousOwnerUUID)).build();
         }
-        return true;
+
+    }
+
+    @Override
+    public Optional<List<String>> tabComplete(User user, String alias, List<String> args) {
+        String lastArg = !args.isEmpty() ? args.get(args.size() - 1) : "";
+        List<String> options = Bukkit.getOnlinePlayers().stream().map(Player::getName).toList();
+        return Optional.of(Util.tabLimit(options, lastArg));
     }
 }

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

@@ -53,7 +53,7 @@ public boolean canExecute(User user, String label, List<String> args) {
 
         // Check number of homes
 
-        int maxHomes = getIslands().getIslands(getWorld(), user).stream().mapToInt(getIslands()::getMaxHomes).sum();
+        int maxHomes = getIslands().getMaxHomes(island);
         if (getIslands().getNumberOfHomesIfAdded(island, String.join(" ", args)) > maxHomes) {
             user.sendMessage("commands.island.sethome.too-many-homes", TextVariables.NUMBER, String.valueOf(maxHomes));
             user.sendMessage("commands.island.sethome.homes-are");