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;
@@ -43,9 +44,9 @@
 import org.mvplugins.multiverse.core.destination.DestinationInstance;
 import org.mvplugins.multiverse.core.destination.DestinationSuggestionPacket;
 import org.mvplugins.multiverse.core.destination.DestinationsProvider;
+import org.mvplugins.multiverse.core.destination.core.WorldDestination;
 import org.mvplugins.multiverse.core.permissions.CorePermissionsChecker;
 import org.mvplugins.multiverse.core.utils.REPatterns;
-import org.mvplugins.multiverse.core.utils.StringFormatter;
 import org.mvplugins.multiverse.core.world.LoadedMultiverseWorld;
 import org.mvplugins.multiverse.core.world.MultiverseWorld;
 import org.mvplugins.multiverse.core.world.WorldManager;
@@ -100,7 +101,7 @@ public class MVCommandCompletions extends PaperCommandCompletions {
         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,22 @@ private Collection<String> suggestDestinations(BukkitCommandCompletionContext co
                         // 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 -> !config.getSimplifiedDestinationTabCompletion()
+                        || packet.destination() instanceof WorldDestination
+                        || deststring.startsWith(packet.destination().getIdentifier() + ":"))
                 .filter(packet -> corePermissionsChecker
-                        .checkDestinationPacketPermission(teleporter, Arrays.asList(players), packet))
+                        .checkDestinationPacketPermission(teleporter, teleportees, packet))
                 .map(DestinationSuggestionPacket::parsableString)
                 .toList();
     }

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

@@ -278,7 +278,12 @@ private IssuerAwareContextBuilder<Player[]> playerArrayContextBuilder() {
                 })
                 .issuerOnlyFailMessage((context) -> Message.of("This command can only be used by a player."))
                 .issuerAwareInputFailMessage((context, input) -> Message.of("Invalid player: " + input + ". Either specify an online player or use this command as a player."))
-                .inputOnlyFailMessage((context, input) -> Message.of("Player " + input + " not found."));
+                .inputOnlyFailMessage((context, input) -> {
+                    if (PlayerFinder.isSelector(input)) {
+                        return Message.of("No player(s) matched selector: " + input + ".");
+                    }
+                    return Message.of("Player(s) " + input + " not found.");
+                });
     }
 
     private PlayerLocation parsePlayerLocation(BukkitCommandExecutionContext context) {

src/main/java/org/mvplugins/multiverse/core/command/context/issueraware/IssuerAwareContextBuilder.java

@@ -123,48 +123,8 @@
      */
     @ApiStatus.AvailableSince("5.1")
     public IssuerAwareContextResolver<T, BukkitCommandExecutionContext> generateContext() {
-        Objects.requireNonNull(fromPlayer);
-        Objects.requireNonNull(fromInput);
-        Objects.requireNonNull(issuerOnlyFailMessage);
-        Objects.requireNonNull(issuerAwarePlayerFailMessage);
-        Objects.requireNonNull(issuerAwareInputFailMessage);
-        Objects.requireNonNull(inputOnlyFailMessage);
-
-        return context -> {
-            BukkitCommandIssuer issuer = context.getIssuer();
-            String resolve = context.getFlagValue("resolve", "");
-
-            if (resolve.equals("issuerOnly")) {
-                if (issuer.isPlayer()) {
-                    T result = fromPlayer.apply(context, issuer.getPlayer());
-                    if (result != null) {
-                        return result;
-                    }
-                }
-                throw new InvalidCommandArgument(issuerOnlyFailMessage.apply(context).formatted(issuer));
-            }
-
-            String input = context.getFirstArg();
-            T result = fromInput.apply(context, input);
-            if (result != null) {
-                context.popFirstArg();
-                return result;
-            }
-
-            if (resolve.equals("issuerAware")) {
-                if (issuer.isPlayer()) {
-                    Player player = issuer.getPlayer();
-                    result = fromPlayer.apply(context, player);
-                    if (result != null) {
-                        return result;
-                    }
-                    throw new InvalidCommandArgument(issuerAwarePlayerFailMessage.apply(context, player).formatted(issuer));
-                }
-                throw new InvalidCommandArgument(issuerAwareInputFailMessage.apply(context, input).formatted(issuer));
-            }
-
-            throw new InvalidCommandArgument(inputOnlyFailMessage.apply(context, input).formatted(issuer));
-        };
+        validateRequiredVariables();
+        return context -> resolveValue(context, GenericIssuerAwareValue::new).value;
     }
 
     /**
@@ -178,49 +138,66 @@
      */
     @ApiStatus.AvailableSince("5.1")
     public <I extends IssuerAwareValue> IssuerAwareContextResolver<I, BukkitCommandExecutionContext> generateContext(BiFunction<Boolean, T, I> createValue) {
-        // todo: This is a copy and paste from above
+        validateRequiredVariables();
+        return context -> resolveValue(context, createValue);
+    }
 
+    private void validateRequiredVariables() {
         Objects.requireNonNull(fromPlayer);
         Objects.requireNonNull(fromInput);
         Objects.requireNonNull(issuerOnlyFailMessage);
         Objects.requireNonNull(issuerAwarePlayerFailMessage);
         Objects.requireNonNull(issuerAwareInputFailMessage);
         Objects.requireNonNull(inputOnlyFailMessage);
+    }
 
-        return context -> {
-            BukkitCommandIssuer issuer = context.getIssuer();
-            String resolve = context.getFlagValue("resolve", "");
+    private <I extends IssuerAwareValue> I resolveValue(BukkitCommandExecutionContext context, BiFunction<Boolean, T, I> createValue) {
+        BukkitCommandIssuer issuer = context.getIssuer();
+        String resolve = context.getFlagValue("resolve", "");
 
-            if (resolve.equals("issuerOnly")) {
-                if (issuer.isPlayer()) {
-                    T result = fromPlayer.apply(context, issuer.getPlayer());
-                    if (result != null) {
-                        return createValue.apply(true, result);
-                    }
+        if (resolve.equals("issuerOnly")) {
+            if (issuer.isPlayer()) {
+                T result = fromPlayer.apply(context, issuer.getPlayer());
+                if (result != null) {
+                    return createValue.apply(true, result);
                 }
-                throw new InvalidCommandArgument(issuerOnlyFailMessage.apply(context).formatted(issuer));
             }
-
-            String input = context.getFirstArg();
-            T result = fromInput.apply(context, input);
-            if (result != null) {
-                context.popFirstArg();
-                return createValue.apply(false, result);
-            }
-
-            if (resolve.equals("issuerAware")) {
-                if (issuer.isPlayer()) {
-                    Player player = issuer.getPlayer();
-                    result = fromPlayer.apply(context, player);
-                    if (result != null) {
-                        return createValue.apply(true, result);
-                    }
-                    throw new InvalidCommandArgument(issuerAwarePlayerFailMessage.apply(context, player).formatted(issuer));
+            throw new InvalidCommandArgument(issuerOnlyFailMessage.apply(context).formatted(issuer));
+        }
+
+        String input = context.getFirstArg();
+        T result = fromInput.apply(context, input);
+        if (result != null) {
+            context.popFirstArg();
+            return createValue.apply(false, result);
+        }
+
+        int maxArgForAware = context.getFlagValue("maxArgForAware", Integer.MAX_VALUE);
+        long argLengthWithoutFlags = context.getArgs().stream()
+                .takeWhile(value -> !value.startsWith("--") && !value.isEmpty())
+                .count();
+
+        if (resolve.equals("issuerAware") && argLengthWithoutFlags <= maxArgForAware) {
+            if (issuer.isPlayer()) {
+                Player player = issuer.getPlayer();
+                result = fromPlayer.apply(context, player);
+                if (result != null) {
+                    return createValue.apply(true, result);
                 }
-                throw new InvalidCommandArgument(issuerAwareInputFailMessage.apply(context, input).formatted(issuer));
+                throw new InvalidCommandArgument(issuerAwarePlayerFailMessage.apply(context, player).formatted(issuer));
             }
+            throw new InvalidCommandArgument(issuerAwareInputFailMessage.apply(context, input).formatted(issuer));
+        }
+
+        throw new InvalidCommandArgument(inputOnlyFailMessage.apply(context, input).formatted(issuer));
+    }
+
+    private static class GenericIssuerAwareValue<T> extends IssuerAwareValue {
+        private final T value;
 
-            throw new InvalidCommandArgument(inputOnlyFailMessage.apply(context, input).formatted(issuer));
-        };
+        public GenericIssuerAwareValue(boolean byIssuer, T value) {
+            super(byIssuer);
+            this.value = value;
+        }
     }
 }

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,maxArgForAware=1")
             @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/config/CoreConfig.java

@@ -8,16 +8,13 @@
 import com.dumptruckman.minecraft.util.Logging;
 import io.vavr.control.Try;
 import jakarta.inject.Inject;
-import jakarta.inject.Provider;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.event.EventPriority;
-import org.bukkit.plugin.PluginManager;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jvnet.hk2.annotations.Service;
 
 import org.mvplugins.multiverse.core.MultiverseCore;
-import org.mvplugins.multiverse.core.command.MVCommandManager;
 import org.mvplugins.multiverse.core.command.queue.ConfirmMode;
 import org.mvplugins.multiverse.core.config.handle.CommentedConfigurationHandle;
 import org.mvplugins.multiverse.core.config.handle.StringPropertyHandle;
@@ -28,7 +25,6 @@
 import org.mvplugins.multiverse.core.config.migration.action.MoveMigratorAction;
 import org.mvplugins.multiverse.core.config.migration.VersionMigrator;
 import org.mvplugins.multiverse.core.config.migration.action.SetMigratorAction;
-import org.mvplugins.multiverse.core.destination.DestinationsProvider;
 import org.mvplugins.multiverse.core.teleportation.PassengerMode;
 import org.mvplugins.multiverse.core.teleportation.PassengerModes;
 import org.mvplugins.multiverse.core.world.helpers.DimensionFinder.DimensionFormat;
@@ -539,6 +535,16 @@ public boolean getResolveAliasName() {
         return configHandle.get(configNodes.resolveAliasName);
     }
 
+    @ApiStatus.AvailableSince("5.4")
+    public Try<Void> setSimplifiedDestinationTabCompletion(boolean simplifiedDestinationTabCompletion) {
+        return configHandle.set(configNodes.simplifiedDestinationTabCompletion, simplifiedDestinationTabCompletion);
+    }
+
+    @ApiStatus.AvailableSince("5.4")
+    public boolean getSimplifiedDestinationTabCompletion() {
+        return configHandle.get(configNodes.simplifiedDestinationTabCompletion);
+    }
+
     /**
      * {@inheritDoc}
      */