V5.4

src/main/java/org/mvplugins/multiverse/core/command/MVCommandCompletions.java

@@ -27,6 +27,7 @@
 import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.SpawnCategory;
 import org.jetbrains.annotations.NotNull;
@@ -100,7 +101,7 @@
         registerAsyncCompletion("mvworlds", this::suggestMVWorlds);
         registerAsyncCompletion("mvworldpropsname", this::suggestMVWorldPropsName);
         registerAsyncCompletion("mvworldpropsvalue", this::suggestMVWorldPropsValue);
-        registerAsyncCompletion("playersarray", this::suggestPlayersArray);
+        registerCompletion("playersarray", this::suggestPlayersArray); // getting online players cannot be async
         registerStaticCompletion("propsmodifyaction", suggestEnums(PropertyModifyAction.class));
         registerStaticCompletion("spawncategories", suggestEnums(SpawnCategory.class));
         registerAsyncCompletion("spawncategorypropsname", this::suggestSpawnCategoryPropsName);
@@ -224,18 +225,19 @@
                         // Most likely console did not specify a player
                         return Collections.<String>emptyList();
                     }
-                    if (context.hasConfig("othersOnly") && (players.length == 1 && players[0].equals(context.getIssuer().getIssuer()))) {
+                    CommandSender sender = context.getIssuer().getIssuer();
+                    if (context.hasConfig("othersOnly") && (players.length == 1 && players[0].equals(sender))) {
                         return Collections.<String>emptyList();
                     }
-                    return suggestDestinationsWithPerms(context.getIssuer().getIssuer(), players, context.getInput());
+                    return suggestDestinationsWithPerms(sender, Arrays.asList(players), context.getInput());
                 })
                 .getOrElse(Collections.emptyList());
     }
 
-    private Collection<String> suggestDestinationsWithPerms(CommandSender teleporter, Player[] players, String deststring) {
+    private Collection<String> suggestDestinationsWithPerms(CommandSender teleporter, List<Entity> teleportees, String deststring) {
         return destinationsProvider.suggestDestinations(teleporter, deststring).stream()
                 .filter(packet -> corePermissionsChecker
-                        .checkDestinationPacketPermission(teleporter, Arrays.asList(players), packet))
+                        .checkDestinationPacketPermission(teleporter, teleportees, packet))
                 .map(DestinationSuggestionPacket::parsableString)
                 .toList();
     }

src/main/java/org/mvplugins/multiverse/core/commands/TeleportCommand.java

@@ -19,7 +19,10 @@
 
 import org.mvplugins.multiverse.core.command.MVCommandIssuer;
 import org.mvplugins.multiverse.core.command.context.issueraware.PlayerArrayValue;
+import org.mvplugins.multiverse.core.command.flag.CommandFlag;
+import org.mvplugins.multiverse.core.command.flag.CommandFlagsManager;
 import org.mvplugins.multiverse.core.command.flag.ParsedCommandFlags;
+import org.mvplugins.multiverse.core.command.flags.PageFilterFlags;
 import org.mvplugins.multiverse.core.command.flags.UnsafeFlags;
 import org.mvplugins.multiverse.core.config.CoreConfig;
 import org.mvplugins.multiverse.core.destination.DestinationInstance;
@@ -35,14 +38,14 @@
     private final CoreConfig config;
     private final CorePermissionsChecker permissionsChecker;
     private final AsyncSafetyTeleporter safetyTeleporter;
-    private final UnsafeFlags flags;
+    private final Flags flags;
 
     @Inject
     TeleportCommand(
             @NotNull CoreConfig config,
             @NotNull CorePermissionsChecker permissionsChecker,
             @NotNull AsyncSafetyTeleporter safetyTeleporter,
-            @NotNull UnsafeFlags flags
+            @NotNull Flags flags
     ) {
         this.config = config;
         this.permissionsChecker = permissionsChecker;
@@ -54,14 +57,14 @@
     @Subcommand("teleport|tp")
     @CommandPermission("@mvteleport")
     @CommandCompletion("@playersarray:checkPermissions=@mvteleportother|@destinations:byIssuerForArg=arg1 "
-            + "@destinations:notByIssuerForArg=arg1|@flags:byIssuerForArg=arg1,groupName=" + UnsafeFlags.NAME + " "
-            + "@flags:notByIssuerForArg=arg1,groupName=" + UnsafeFlags.NAME)
+            + "@destinations:notByIssuerForArg=arg1|@flags:byIssuerForArg=arg1,groupName=" + Flags.NAME + " "
+            + "@flags:notByIssuerForArg=arg1,groupName=" + Flags.NAME)
     @Syntax("[player] <destination> [--unsafe]")
     @Description("{@@mv-core.teleport.description}")
     void onTeleportCommand(
             MVCommandIssuer issuer,
 
-            @Flags("resolve=issuerAware")
+            @co.aikar.commands.annotation.Flags("resolve=issuerAware")
             @Syntax("[player]")
             @Description("{@@mv-core.teleport.player.description}")
             PlayerArrayValue playersValue,
@@ -103,16 +106,21 @@
                 .checkSafety(!parsedFlags.hasFlag(flags.unsafe) && destination.checkTeleportSafety())
                 .passengerMode(config.getPassengerMode())
                 .teleportSingle(player)
-                .onSuccess(() -> issuer.sendInfo(MVCorei18n.TELEPORT_SUCCESS,
-                        Replace.PLAYER.with(getYouOrName(issuer, player)),
-                        Replace.DESTINATION.with(destination.toString())))
+                .onSuccess(() -> {
+                    if (parsedFlags.hasFlag(flags.silent)) {
+                        return;
+                    }
+                    issuer.sendInfo(MVCorei18n.TELEPORT_SUCCESS,
+                            Replace.PLAYER.with(getYouOrName(issuer, player)),
+                            Replace.DESTINATION.with(destination.getDisplayMessage()));
+                })
                 .onFailureCount(reasonsCountMap -> {
                     for (var entry : reasonsCountMap.entrySet()) {
                         Logging.finer("Failed to teleport %s players to %s: %s",
                                 entry.getValue(), destination, entry.getKey());
                         issuer.sendError(MVCorei18n.TELEPORT_FAILED,
                                 Replace.PLAYER.with(player.getName()),
-                                Replace.DESTINATION.with(destination.toString()),
+                                Replace.DESTINATION.with(destination.getDisplayMessage()),
                                 Replace.REASON.with(Message.of(entry.getKey())));
                     }
                 });
@@ -136,18 +144,38 @@
                 .checkSafety(!parsedFlags.hasFlag(flags.unsafe) && destination.checkTeleportSafety())
                 .passengerMode(config.getPassengerMode())
                 .teleport(List.of(players))
-                .onSuccessCount(successCount -> issuer.sendInfo(MVCorei18n.TELEPORT_SUCCESS,
-                        Replace.PLAYER.with(successCount + " players"),
-                        Replace.DESTINATION.with(destination.toString())))
+                .onSuccessCount(successCount -> {
+                    if (parsedFlags.hasFlag(flags.silent)) {
+                        return;
+                    }
+                    issuer.sendInfo(MVCorei18n.TELEPORT_SUCCESS,
+                            Replace.PLAYER.with(successCount + " players"),
+                            Replace.DESTINATION.with(destination.getDisplayMessage()));
+                })
                 .onFailureCount(reasonsCountMap -> {
                     for (var entry : reasonsCountMap.entrySet()) {
                         Logging.finer("Failed to teleport %s players to %s: %s",
                                 entry.getValue(), destination, entry.getKey());
                         issuer.sendError(MVCorei18n.TELEPORT_FAILED,
                                 Replace.PLAYER.with(entry.getValue() + " players"),
-                                Replace.DESTINATION.with(destination.toString()),
+                                Replace.DESTINATION.with(destination.getDisplayMessage()),
                                 Replace.REASON.with(Message.of(entry.getKey())));
                     }
                 });
     }
+
+    @Service
+    private static final class Flags extends UnsafeFlags {
+
+        private static final String NAME = "mvteleport";
+
+        @Inject
+        private Flags(@NotNull CommandFlagsManager flagsManager) {
+            super(NAME, flagsManager);
+        }
+
+        private final CommandFlag silent = flag(CommandFlag.builder("--silent")
+                .addAlias("-s")
+                .build());
+    }
 }

src/main/java/org/mvplugins/multiverse/core/destination/DestinationInstance.java

@@ -4,8 +4,9 @@
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
 import org.bukkit.util.Vector;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
-import org.mvplugins.multiverse.core.utils.result.FailureReason;
+import org.mvplugins.multiverse.core.locale.message.Message;
 import org.mvplugins.multiverse.core.world.location.UnloadedWorldLocation;
 
 /**
@@ -79,6 +80,20 @@
      */
     public abstract @NotNull Option<String> getFinerPermissionSuffix();
 
+    /**
+     * Gets a user-friendly display text for this destination instance. This is used when displaying the destination
+     * to the player. By default, this returns the same as {@link #toString()}. Override this method to provide a more
+     * user-friendly display text with colors, formatting and localization support.
+     *
+     * @return The display message.
+     * @since 5.4
+     */
+    @ApiStatus.AvailableSince("5.4")
+    @NotNull
+    public Message getDisplayMessage() {
+        return Message.of(this.toString());
+    }
+
     /**
      * Serialises the destination instance to a savable string.
      *

src/main/java/org/mvplugins/multiverse/core/destination/core/AnchorDestinationInstance.java

@@ -7,6 +7,7 @@
 import org.jetbrains.annotations.NotNull;
 
 import org.mvplugins.multiverse.core.destination.DestinationInstance;
+import org.mvplugins.multiverse.core.locale.message.Message;
 
 /**
  * Destination instance implementation for the {@link AnchorDestination}.
@@ -63,6 +64,15 @@
         return Option.of(anchorName);
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public @NotNull Message getDisplayMessage() {
+        //TODO Localize
+        return Message.of("anchor '" + anchorName + "'");
+    }
+
     /**
      * {@inheritDoc}
      */

src/main/java/org/mvplugins/multiverse/core/destination/core/BedDestination.java

@@ -6,7 +6,7 @@
 
 import co.aikar.locales.MessageKey;
 import co.aikar.locales.MessageKeyProvider;
-import org.bukkit.Bukkit;
+import jakarta.inject.Inject;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
@@ -20,8 +20,7 @@
 import org.mvplugins.multiverse.core.utils.PlayerFinder;
 import org.mvplugins.multiverse.core.utils.result.Attempt;
 import org.mvplugins.multiverse.core.utils.result.FailureReason;
-
-import static org.mvplugins.multiverse.core.locale.message.MessageReplacement.replace;
+import org.mvplugins.multiverse.core.world.helpers.ConcurrentPlayerWorldTracker;
 
 /**
  * {@link Destination} implementation for beds.
@@ -30,7 +29,11 @@
 public final class BedDestination implements Destination<BedDestination, BedDestinationInstance, BedDestination.InstanceFailureReason> {
     static final String OWN_BED_STRING = "playerbed";
 
-    BedDestination() {
+    private final ConcurrentPlayerWorldTracker worldTracker;
+
+    @Inject
+    BedDestination(@NotNull ConcurrentPlayerWorldTracker worldTracker) {
+        this.worldTracker = worldTracker;
     }
 
     /**
@@ -62,8 +65,8 @@ public final class BedDestination implements Destination<BedDestination, BedDest
     @Override
     public @NotNull Collection<DestinationSuggestionPacket> suggestDestinations(
             @NotNull CommandSender sender, @Nullable String destinationParams) {
-        List<DestinationSuggestionPacket> collect = Bukkit.getOnlinePlayers().stream()
-                .map(player -> new DestinationSuggestionPacket(this, player.getName(), player.getName()))
+        List<DestinationSuggestionPacket> collect = worldTracker.getOnlinePlayers().stream()
+                .map(player -> new DestinationSuggestionPacket(this, player, player))
                 .collect(Collectors.toList());
         if (sender instanceof Player) {
             collect.add(new DestinationSuggestionPacket(this, OWN_BED_STRING, OWN_BED_STRING));

src/main/java/org/mvplugins/multiverse/core/destination/core/BedDestinationInstance.java

@@ -9,12 +9,13 @@
 import org.jetbrains.annotations.Nullable;
 
 import org.mvplugins.multiverse.core.destination.DestinationInstance;
+import org.mvplugins.multiverse.core.locale.message.Message;
 
 /**
  * Destination instance implementation for the {@link BedDestination}.
  */
 public final class BedDestinationInstance extends DestinationInstance<BedDestinationInstance, BedDestination> {
-    private final Player player;
+    private final @Nullable Player player;
 
     /**
      * Constructor.
@@ -64,6 +65,15 @@
         return Option.of(player != null ? player.getName() : BedDestination.OWN_BED_STRING);
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public @NotNull Message getDisplayMessage() {
+        //TODO Localize
+        return Message.of(player == null ? "your bed/respawn point" : player.getName() + "'s bed/respawn point");
+    }
+
     /**
      * {@inheritDoc}
      */

src/main/java/org/mvplugins/multiverse/core/destination/core/ExactDestination.java

@@ -23,14 +23,11 @@
 import org.mvplugins.multiverse.core.locale.MVCorei18n;
 import org.mvplugins.multiverse.core.utils.REPatterns;
 import org.mvplugins.multiverse.core.utils.position.EntityPosition;
-import org.mvplugins.multiverse.core.utils.position.PositionNumber;
-import org.mvplugins.multiverse.core.utils.position.VectorPosition;
 import org.mvplugins.multiverse.core.utils.result.Attempt;
 import org.mvplugins.multiverse.core.utils.result.FailureReason;
 import org.mvplugins.multiverse.core.world.LoadedMultiverseWorld;
 import org.mvplugins.multiverse.core.world.WorldManager;
 import org.mvplugins.multiverse.core.world.entrycheck.WorldEntryCheckerProvider;
-import org.mvplugins.multiverse.core.world.location.UnloadedWorldLocation;
 
 import static org.mvplugins.multiverse.core.locale.message.MessageReplacement.*;
 
@@ -68,6 +65,7 @@ public ExactDestination(CoreConfig config, WorldManager worldManager, WorldEntry
     public @NotNull ExactDestinationInstance fromLocation(@NotNull Location location) {
         return new ExactDestinationInstance(
                 this,
+                worldManager,
                 location.getWorld().getName(),
                 EntityPosition.ofLocation(location)
         );
@@ -88,6 +86,7 @@ public ExactDestination(CoreConfig config, WorldManager worldManager, WorldEntry
                         .map(location -> Attempt.<ExactDestinationInstance, InstanceFailureReason>success(
                                 new ExactDestinationInstance(
                                         this,
+                                        worldManager,
                                         location.getWorld().getName(),
                                         EntityPosition.ofLocation(location)
                                 )
@@ -112,7 +111,7 @@ public ExactDestination(CoreConfig config, WorldManager worldManager, WorldEntry
             return Attempt.failure(InstanceFailureReason.INVALID_NUMBER_FORMAT, Replace.ERROR.with(e));
         }
 
-        return Attempt.success(new ExactDestinationInstance(this, worldName, position));
+        return Attempt.success(new ExactDestinationInstance(this, worldManager, worldName, position));
     }
 
     //TODO: Extract to a world finder class

src/main/java/org/mvplugins/multiverse/core/destination/core/ExactDestinationInstance.java

@@ -9,14 +9,16 @@
 import org.jetbrains.annotations.NotNull;
 
 import org.mvplugins.multiverse.core.destination.DestinationInstance;
+import org.mvplugins.multiverse.core.locale.message.Message;
 import org.mvplugins.multiverse.core.utils.position.EntityPosition;
-import org.mvplugins.multiverse.core.utils.position.VectorPosition;
-import org.mvplugins.multiverse.core.world.location.UnloadedWorldLocation;
+import org.mvplugins.multiverse.core.world.MultiverseWorld;
+import org.mvplugins.multiverse.core.world.WorldManager;
 
 /**
  * Destination instance implementation for the {@link ExactDestination}.
  */
 public final class ExactDestinationInstance extends DestinationInstance<ExactDestinationInstance, ExactDestination> {
+    private final WorldManager worldManager;
     private final String worldName;
     private final EntityPosition position;
 
@@ -28,9 +30,11 @@ public final class ExactDestinationInstance extends DestinationInstance<ExactDes
      * @param position    The position in the world.
      */
     ExactDestinationInstance(@NotNull ExactDestination destination,
+                             @NotNull WorldManager worldManager,
                              @NotNull String worldName,
                              @NotNull EntityPosition position) {
         super(destination);
+        this.worldManager = worldManager;
         this.worldName = worldName;
         this.position = position;
     }
@@ -73,6 +77,17 @@ public boolean checkTeleportSafety() {
         return Option.of(worldName);
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public @NotNull Message getDisplayMessage() {
+        String displayWorldName = worldManager.getWorld(worldName)
+                .map(MultiverseWorld::getAliasOrName)
+                .getOrElse(worldName);
+        return Message.of(displayWorldName + " at " + position.toString());
+    }
+
     /**
      * {@inheritDoc}
      */