Merge pull request #2118 from BentoBoxWorld/develop

Version 1.23.0
BentoBoxWorld · Apr 15, 2023 · 0ee9ff4 · 0ee9ff4
2 parents fe888a8 + 84e6523
commit 0ee9ff4
Show file tree

Hide file tree

Showing 216 changed files with 1,302 additions and 891 deletions.
diff --git a/pom.xml b/pom.xml
@@ -73,10 +73,10 @@
         <postgresql.version>42.2.18</postgresql.version>
         <hikaricp.version>5.0.1</hikaricp.version>
         <!-- More visible way to change dependency versions -->
-        <spigot.version>1.19.3-R0.1-SNAPSHOT</spigot.version>
+        <spigot.version>1.19.4-R0.1-SNAPSHOT</spigot.version>
         <!-- Might differ from the last Spigot release for short periods 
             of time -->
-        <paper.version>1.19-R0.1-SNAPSHOT</paper.version>
+        <paper.version>1.19.3-R0.1-SNAPSHOT</paper.version>
         <bstats.version>3.0.0</bstats.version>
         <vault.version>1.7.1</vault.version>
         <placeholderapi.version>2.10.9</placeholderapi.version>
@@ -88,9 +88,10 @@
         <!-- 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.22.0</build.version>
+        <build.version>1.23.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>
     </properties>
 
     <!-- Profiles will allow to automatically change build version. -->
@@ -312,7 +313,7 @@
             <version>3.2.2</version>
             <scope>provided</scope>
         </dependency>
-        <!-- Spigot NMS. Used for chunk deletion and pasting. -->
+        <!-- Spigot NMS. Used for chunk deletion and pasting.-->
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot</artifactId>

diff --git a/src/main/java/world/bentobox/bentobox/api/addons/GameModeAddon.java b/src/main/java/world/bentobox/bentobox/api/addons/GameModeAddon.java
@@ -117,7 +117,7 @@ public Optional<CompositeCommand> getAdminCommand() {
     /**
      * Defines the world generator for this game mode
      * @param worldName - name of world that this applies to
-     * @param id - id if any
+     * @param id - id if any. "delete" is used when this request is for island deletion purposes
      * @return Chunk generator or null if one does not exist, e.g. the use own generator setting is true
      * @since 1.2.0
      */
@@ -130,5 +130,14 @@ public Optional<CompositeCommand> getAdminCommand() {
      * @since 1.4.0
      */
     public abstract void saveWorldSettings();
+
+    /**
+     * Defines if the game mode uses the latest {@link ChunkGenerator} API or 
+     * deprecated {@link ChunkGenerator#generateChunkData(World, java.util.Random, int, int, org.bukkit.generator.ChunkGenerator.BiomeGrid)} approach.
+     * @return true if this game mode is a void world and should just be deleted as such
+     */
+    public boolean isUsesNewChunkGeneration() {
+        return false;
+    }
 
 }
diff --git a/src/main/java/world/bentobox/bentobox/api/addons/request/package-info.java b/src/main/java/world/bentobox/bentobox/api/addons/request/package-info.java
@@ -3,7 +3,7 @@
  * <p>
  * Addons can expose data that they want to expose. To access it, call this class with the appropriate addon name,
  * the label for the data that is requested and if required, a map of key-value pairs that will be given to the addon.
- *
+ * <p>
  * <b>Note</b> Since BentoBox 1.17.0, Addons can be declared as Pladdons and be loaded by the Bukkit classloader. This
  * enables Plugins to access Addon methods directly so this API is not required.
  * </p>

diff --git a/...ain/java/world/bentobox/bentobox/api/commands/admin/blueprints/AdminBlueprintCommand.java b/...ain/java/world/bentobox/bentobox/api/commands/admin/blueprints/AdminBlueprintCommand.java
@@ -121,11 +121,6 @@ private void paintAxis(User user, BlueprintClipboard clipboard) {
             user.spawnParticle(PARTICLE, PARTICLE_DUST_OPTIONS, maxX + 0.5, maxY + 0.5, z + 0.5);
         }
 
-        // Drawing origin
-        if (clipboard.getOrigin() != null) {
-            user.spawnParticle(Particle.VILLAGER_HAPPY, null, clipboard.getOrigin().getBlockX() + 0.5, clipboard.getOrigin().getBlockY() + 0.5, clipboard.getOrigin().getBlockZ() + 0.5);
-        }
-
     }
 
     protected void hideClipboard(User user) {

diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/IslandBanCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/IslandBanCommand.java
@@ -112,8 +112,8 @@ private boolean ban(@NonNull User issuer, User target) {
             }
             // Event is not cancelled
             if (island.ban(issuer.getUniqueId(), target.getUniqueId())) {
-                issuer.sendMessage("commands.island.ban.player-banned", TextVariables.NAME, target.getName());
-                target.sendMessage("commands.island.ban.owner-banned-you", TextVariables.NAME, issuer.getName());
+                issuer.sendMessage("commands.island.ban.player-banned", TextVariables.NAME, target.getName(), TextVariables.DISPLAY_NAME, target.getDisplayName());
+                target.sendMessage("commands.island.ban.owner-banned-you", TextVariables.NAME, issuer.getName(), TextVariables.DISPLAY_NAME, issuer.getDisplayName());
                 // If the player is online, has an island and on the banned island, move them home immediately
                 if (target.isOnline() && getIslands().hasIsland(getWorld(), target.getUniqueId()) && island.onIsland(target.getLocation())) {
                     getIslands().homeTeleportAsync(getWorld(), target.getPlayer());

diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/IslandExpelCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/IslandExpelCommand.java
@@ -116,17 +116,17 @@ public boolean execute(User user, String label, List<String> args) {
             return false;
         }
 
-        target.sendMessage("commands.island.expel.player-expelled-you", TextVariables.NAME, user.getName());
+        target.sendMessage("commands.island.expel.player-expelled-you", TextVariables.NAME, user.getName(), TextVariables.DISPLAY_NAME, user.getDisplayName());
         island.getWorld().playSound(target.getLocation(), Sound.ENTITY_GENERIC_EXPLODE, 1F, 1F);
         if (getIslands().hasIsland(getWorld(), target) || getIslands().inTeam(getWorld(), target.getUniqueId())) {
             // Success
-            user.sendMessage(SUCCESS, TextVariables.NAME, target.getName());
+            user.sendMessage(SUCCESS, TextVariables.NAME, target.getName(), TextVariables.DISPLAY_NAME, target.getDisplayName());
             // Teleport home
             getIslands().homeTeleportAsync(getWorld(), target.getPlayer());
             return true;
         } else if (getIslands().getSpawn(getWorld()).isPresent()){
             // Success
-            user.sendMessage(SUCCESS, TextVariables.NAME, target.getName());
+            user.sendMessage(SUCCESS, TextVariables.NAME, target.getName(), TextVariables.DISPLAY_NAME, target.getDisplayName());
             getIslands().spawnTeleport(getWorld(), target.getPlayer());
             return true;
         } else if (getIWM().getAddon(getWorld())
@@ -136,7 +136,7 @@ public boolean execute(User user, String label, List<String> args) {
                 .orElse(false)
                 && target.performCommand(this.getTopLabel() + " create")) {
             getAddon().logWarning("Expel: " + target.getName() + " had no island, so one was created");
-            user.sendMessage(SUCCESS, TextVariables.NAME, target.getName());
+            user.sendMessage(SUCCESS, TextVariables.NAME, target.getName(), TextVariables.DISPLAY_NAME, target.getDisplayName());
             return true;
         }
 

diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/IslandUnbanCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/IslandUnbanCommand.java
@@ -94,8 +94,8 @@ public boolean execute(User user, String label, List<String> args) {
         }
         // Event is not cancelled
         if (island.unban(user.getUniqueId(), target.getUniqueId())) {
-            user.sendMessage("commands.island.unban.player-unbanned", TextVariables.NAME, target.getName());
-            target.sendMessage("commands.island.unban.you-are-unbanned", TextVariables.NAME, user.getName());
+            user.sendMessage("commands.island.unban.player-unbanned", TextVariables.NAME, target.getName(), TextVariables.DISPLAY_NAME, target.getDisplayName());
+            target.sendMessage("commands.island.unban.you-are-unbanned", TextVariables.NAME, user.getName(), TextVariables.DISPLAY_NAME, user.getDisplayName());
             // Set cooldown
             if (getSettings().getBanCooldown() > 0 && getParent() != null) {
                 getParent().getSubCommand("ban").ifPresent(subCommand ->

diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamCoopCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamCoopCommand.java
@@ -105,8 +105,8 @@ public boolean execute(User user, String label, List<String> args) {
                 }
 
                 island.setRank(target, RanksManager.COOP_RANK);
-                user.sendMessage("commands.island.team.coop.success", TextVariables.NAME, target.getName());
-                target.sendMessage("commands.island.team.coop.you-are-a-coop-member", TextVariables.NAME, user.getName());
+                user.sendMessage("commands.island.team.coop.success", TextVariables.NAME, target.getName(), TextVariables.DISPLAY_NAME, target.getDisplayName());
+                target.sendMessage("commands.island.team.coop.you-are-a-coop-member", TextVariables.NAME, user.getName(), TextVariables.DISPLAY_NAME, user.getDisplayName());
             }
             return true;
         } else {

diff --git a/.../java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteAcceptCommand.java b/.../java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteAcceptCommand.java
@@ -111,10 +111,10 @@ private void acceptTrustInvite(User user, Invite invite) {
             .rankChange(island.getRank(user), RanksManager.TRUSTED_RANK)
             .build();
             if (inviter.isOnline()) {
-                inviter.sendMessage("commands.island.team.trust.success", TextVariables.NAME, user.getName());
+                inviter.sendMessage("commands.island.team.trust.success", TextVariables.NAME, user.getName(), TextVariables.DISPLAY_NAME, user.getDisplayName());
             }
             if (inviter.isPlayer()) {
-                user.sendMessage("commands.island.team.trust.you-are-trusted", TextVariables.NAME, inviter.getName());
+                user.sendMessage("commands.island.team.trust.you-are-trusted", TextVariables.NAME, inviter.getName(), TextVariables.DISPLAY_NAME, inviter.getDisplayName());
             }
         }
     }
@@ -138,10 +138,10 @@ private void acceptCoopInvite(User user, Invite invite) {
             .rankChange(island.getRank(user), RanksManager.COOP_RANK)
             .build();
             if (inviter.isOnline()) {
-                inviter.sendMessage("commands.island.team.coop.success", TextVariables.NAME, user.getName());
+                inviter.sendMessage("commands.island.team.coop.success", TextVariables.NAME, user.getName(), TextVariables.DISPLAY_NAME, user.getDisplayName());
             }
             if (inviter.isPlayer()) {
-                user.sendMessage("commands.island.team.coop.you-are-a-coop-member", TextVariables.NAME, inviter.getName());
+                user.sendMessage("commands.island.team.coop.you-are-a-coop-member", TextVariables.NAME, inviter.getName(), TextVariables.DISPLAY_NAME, inviter.getDisplayName());
             }
         }
     }
@@ -188,7 +188,7 @@ private void acceptTeamInvite(User user, Invite invite) {
         user.sendMessage("commands.island.team.invite.accept.you-joined-island", TextVariables.LABEL, getTopLabel());
         User inviter = User.getInstance(invite.getInviter());
         if (inviter.isOnline()) {
-            inviter.sendMessage("commands.island.team.invite.accept.name-joined-your-island", TextVariables.NAME, user.getName());
+            inviter.sendMessage("commands.island.team.invite.accept.name-joined-your-island", TextVariables.NAME, user.getName(), TextVariables.DISPLAY_NAME, user.getDisplayName());
         }
         getIslands().save(teamIsland);
         // Fire event

diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteCommand.java
@@ -129,9 +129,9 @@ public boolean execute(User user, String label, List<String> args) {
         // Put the invited player (key) onto the list with inviter (value)
         // If someone else has invited a player, then this invite will overwrite the previous invite!
         itc.addInvite(Invite.Type.TEAM, user.getUniqueId(), invitedPlayer.getUniqueId());
-        user.sendMessage("commands.island.team.invite.invitation-sent", TextVariables.NAME, invitedPlayer.getName());
+        user.sendMessage("commands.island.team.invite.invitation-sent", TextVariables.NAME, invitedPlayer.getName(), TextVariables.DISPLAY_NAME, invitedPlayer.getDisplayName());
         // Send message to online player
-        invitedPlayer.sendMessage("commands.island.team.invite.name-has-invited-you", TextVariables.NAME, user.getName());
+        invitedPlayer.sendMessage("commands.island.team.invite.name-has-invited-you", TextVariables.NAME, user.getName(), TextVariables.DISPLAY_NAME, user.getDisplayName());
         invitedPlayer.sendMessage("commands.island.team.invite.to-accept-or-reject", TextVariables.LABEL, getTopLabel());
         if (getIslands().hasIsland(getWorld(), invitedPlayer.getUniqueId())) {
             invitedPlayer.sendMessage("commands.island.team.invite.you-will-lose-your-island");

diff --git a/.../java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteRejectCommand.java b/.../java/world/bentobox/bentobox/api/commands/island/team/IslandTeamInviteRejectCommand.java
@@ -42,9 +42,9 @@ public boolean execute(User user, String label, List<String> args) {
             }
 
             Optional.ofNullable(itc.getInviter(playerUUID))
-                    .map(User::getInstance)
-                    .ifPresent(inviter ->
-                            inviter.sendMessage("commands.island.team.invite.reject.name-rejected-your-invite", TextVariables.NAME, user.getName())
+            .map(User::getInstance)
+            .ifPresent(inviter ->
+            inviter.sendMessage("commands.island.team.invite.reject.name-rejected-your-invite", TextVariables.NAME, user.getName(), TextVariables.DISPLAY_NAME, user.getDisplayName())
                     );
 
             // Remove this player from the global invite list

diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamKickCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamKickCommand.java
@@ -70,11 +70,11 @@ public boolean execute(User user, String label, List<String> args) {
 
         int targetRank = Objects.requireNonNull(island).getRank(targetUUID);
         if (rank <= targetRank) {
-            user.sendMessage("commands.island.team.kick.cannot-kick-rank", 
-                TextVariables.NAME, getPlayers().getName(targetUUID));
+            user.sendMessage("commands.island.team.kick.cannot-kick-rank",
+                    TextVariables.NAME, getPlayers().getName(targetUUID));
             return false;
         }
-        
+
         if (!getSettings().isKickConfirmation()) {
             kick(user, targetUUID);
             return true;
@@ -96,15 +96,15 @@ private void kick(User user, UUID targetUUID) {
         if (event.isCancelled()) {
             return;
         }
-        target.sendMessage("commands.island.team.kick.player-kicked", 
-            TextVariables.GAMEMODE, getAddon().getDescription().getName(),
-            TextVariables.NAME, user.getName());
+        target.sendMessage("commands.island.team.kick.player-kicked",
+                TextVariables.GAMEMODE, getAddon().getDescription().getName(),
+                TextVariables.NAME, user.getName(), TextVariables.DISPLAY_NAME, user.getDisplayName());
 
         getIslands().removePlayer(getWorld(), targetUUID);
         // Clean the target player
         getPlayers().cleanLeavingPlayer(getWorld(), target, true, oldIsland);
 
-        user.sendMessage("commands.island.team.kick.success", TextVariables.NAME, target.getName());
+        user.sendMessage("commands.island.team.kick.success", TextVariables.NAME, target.getName(), TextVariables.DISPLAY_NAME, target.getDisplayName());
         IslandEvent.builder()
         .island(oldIsland)
         .involvedPlayer(user.getUniqueId())

diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamLeaveCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamLeaveCommand.java
@@ -78,7 +78,7 @@ private void leave(User user) {
         }
         UUID ownerUUID = getIslands().getOwner(getWorld(), user.getUniqueId());
         if (ownerUUID != null) {
-            User.getInstance(ownerUUID).sendMessage("commands.island.team.leave.left-your-island", TextVariables.NAME, user.getName());
+            User.getInstance(ownerUUID).sendMessage("commands.island.team.leave.left-your-island", TextVariables.NAME, user.getName(), TextVariables.DISPLAY_NAME, user.getDisplayName());
         }
         getIslands().setLeaveTeam(getWorld(), user.getUniqueId());
         // Clean the player

diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamPromoteCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamPromoteCommand.java
@@ -82,7 +82,7 @@ private boolean change(User user, User target) {
             if (nextRank != RanksManager.OWNER_RANK && nextRank > currentRank) {
                 getIslands().getIsland(getWorld(), user.getUniqueId()).setRank(target, nextRank);
                 String rankName = user.getTranslation(getPlugin().getRanksManager().getRank(nextRank));
-                user.sendMessage("commands.island.team.promote.success", TextVariables.NAME, target.getName(), TextVariables.RANK, rankName);
+                user.sendMessage("commands.island.team.promote.success", TextVariables.NAME, target.getName(), TextVariables.RANK, rankName, TextVariables.DISPLAY_NAME, target.getDisplayName());
                 IslandEvent.builder()
                 .island(island)
                 .involvedPlayer(user.getUniqueId())
@@ -102,7 +102,7 @@ private boolean change(User user, User target) {
             if (prevRank >= RanksManager.MEMBER_RANK && prevRank < currentRank) {
                 getIslands().getIsland(getWorld(), user.getUniqueId()).setRank(target, prevRank);
                 String rankName = user.getTranslation(getPlugin().getRanksManager().getRank(prevRank));
-                user.sendMessage("commands.island.team.demote.success", TextVariables.NAME, target.getName(), TextVariables.RANK, rankName);
+                user.sendMessage("commands.island.team.demote.success", TextVariables.NAME, target.getName(), TextVariables.RANK, rankName, TextVariables.DISPLAY_NAME, target.getDisplayName());
                 IslandEvent.builder()
                 .island(island)
                 .involvedPlayer(user.getUniqueId())

diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamTrustCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamTrustCommand.java
@@ -96,9 +96,9 @@ public boolean execute(User user, String label, List<String> args) {
                 // Put the invited player (key) onto the list with inviter (value)
                 // If someone else has invited a player, then this invite will overwrite the previous invite!
                 itc.addInvite(Type.TRUST, user.getUniqueId(), target.getUniqueId());
-                user.sendMessage("commands.island.team.invite.invitation-sent", TextVariables.NAME, target.getName());
+                user.sendMessage("commands.island.team.invite.invitation-sent", TextVariables.NAME, target.getName(), TextVariables.DISPLAY_NAME, target.getDisplayName());
                 // Send message to online player
-                target.sendMessage("commands.island.team.trust.name-has-invited-you", TextVariables.NAME, user.getName());
+                target.sendMessage("commands.island.team.trust.name-has-invited-you", TextVariables.NAME, user.getName(), TextVariables.DISPLAY_NAME, user.getDisplayName());
                 target.sendMessage("commands.island.team.invite.to-accept-or-reject", TextVariables.LABEL, getTopLabel());
             } else {
                 if (island.getMemberSet(RanksManager.TRUSTED_RANK, false).size() >= getIslands().getMaxMembers(island, RanksManager.TRUSTED_RANK)) {
@@ -107,8 +107,8 @@ public boolean execute(User user, String label, List<String> args) {
                 }
 
                 island.setRank(target, RanksManager.TRUSTED_RANK);
-                user.sendMessage("commands.island.team.trust.success", TextVariables.NAME, target.getName());
-                target.sendMessage("commands.island.team.trust.you-are-trusted", TextVariables.NAME, user.getName());
+                user.sendMessage("commands.island.team.trust.success", TextVariables.NAME, target.getName(), TextVariables.DISPLAY_NAME, target.getDisplayName());
+                target.sendMessage("commands.island.team.trust.you-are-trusted", TextVariables.NAME, user.getName(), TextVariables.DISPLAY_NAME, user.getDisplayName());
             }
             return true;
         } else {

diff --git a/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamUncoopCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/island/team/IslandTeamUncoopCommand.java
@@ -84,8 +84,8 @@ private boolean unCoopCmd(User user, UUID targetUUID) {
         Island island = getIslands().getIsland(getWorld(), user.getUniqueId());
         if (island != null) {
             island.removeMember(targetUUID);
-            user.sendMessage("commands.island.team.uncoop.success", TextVariables.NAME, target.getName());
-            target.sendMessage("commands.island.team.uncoop.you-are-no-longer-a-coop-member", TextVariables.NAME, user.getName());
+            user.sendMessage("commands.island.team.uncoop.success", TextVariables.NAME, target.getName(), TextVariables.DISPLAY_NAME, target.getDisplayName());
+            target.sendMessage("commands.island.team.uncoop.you-are-no-longer-a-coop-member", TextVariables.NAME, user.getName(), TextVariables.DISPLAY_NAME, user.getDisplayName());
             // Set cooldown
             if (getSettings().getCoopCooldown() > 0 && getParent() != null) {
                 getParent().getSubCommand("coop").ifPresent(subCommand ->