Upstream/Multiverse-Core
1
0
Fork 0
mirror of https://github.com/Multiverse/Multiverse-Core.git synced 2024-11-25 20:16:06 +01:00
Code Issues Projects Releases Wiki Activity

Add playerOnly flag to tab-complete suggestions.

Browse Source
This commit is contained in:
benwoo1110 2020-12-28 01:04:44 +08:00
parent 22afd094b2
commit e88828f420
2 changed files with 38 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/main/java/com/onarandombox/MultiverseCore/commandTools/MVCommandCompletions.java
View File

@ -27,6 +27,7 @@ import org.bukkit.World;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
import sun.rmi.runtime.Log;
import java.io.File;
import java.text.DecimalFormat;
@ -121,13 +122,12 @@ public class MVCommandCompletions extends PaperCommandCompletions {
return this.plugin.getMVCommandManager().hasPermission(issuer, cmd.getRequiredPermissions());
}
@NotNull
private Collection<String> suggestToggles() {
return Arrays.asList("on", "off");
}
@NotNull
private Collection<String> suggestMVWorlds(@NotNull BukkitCommandCompletionContext context) {
if (isPlayerOnly(context)) {
return Collections.emptyList();
}
return this.worldManager.getMVWorlds().parallelStream()
.unordered()
.map(MultiverseWorld::getName)
@ -136,11 +136,19 @@ public class MVCommandCompletions extends PaperCommandCompletions {
@NotNull
private Collection<String> suggestUnloadedWorlds(@NotNull BukkitCommandCompletionContext context) {
if (isPlayerOnly(context)) {
return Collections.emptyList();
}
return this.worldManager.getUnloadedWorlds();
}
@NotNull
private Collection<String> suggestPotentialWorlds(@NotNull BukkitCommandCompletionContext context) {
if (isPlayerOnly(context)) {
return Collections.emptyList();
}
Collection<MultiverseWorld> worlds = this.worldManager.getMVWorlds();
Set<String> knownWorlds = worlds.parallelStream()
.unordered()
@ -158,10 +166,14 @@ public class MVCommandCompletions extends PaperCommandCompletions {
@NotNull
private Collection<String> suggestLocation(@NotNull BukkitCommandCompletionContext context) {
if (isPlayerOnly(context)) {
return Collections.emptyList();
}
Logging.info("location");
Player player = context.getPlayer();
if (player == null) {
return Collections.singletonList("0");
return Collections.emptyList();
}
DecimalFormat df = new DecimalFormat();
@ -195,6 +207,10 @@ public class MVCommandCompletions extends PaperCommandCompletions {
@NotNull
private Collection<String> suggestDestinations(@NotNull BukkitCommandCompletionContext context) {
if (isPlayerOnly(context)) {
return Collections.emptyList();
}
return this.plugin.getDestFactory().getIdentifiers().parallelStream()
.unordered()
.filter(id -> !id.isEmpty())
@ -204,9 +220,18 @@ public class MVCommandCompletions extends PaperCommandCompletions {
@NotNull
private Collection<String> suggestAnchors(@NotNull BukkitCommandCompletionContext context) {
if (isPlayerOnly(context)) {
return Collections.emptyList();
}
return this.plugin.getAnchorManager().getAnchors(context.getPlayer());
}
private boolean isPlayerOnly(@NotNull BukkitCommandCompletionContext context) {
String config = context.getConfig();
return config != null && context.getPlayer() == null && config.equals("playerOnly");
}
@NotNull
private Collection<String> suggestMVConfig() {
final Set<String> configOptions = this.plugin.getMVConfig().serialize().keySet();
@ -254,4 +279,9 @@ public class MVCommandCompletions extends PaperCommandCompletions {
.map(p -> p.toString().toLowerCase())
.collect(Collectors.toList());
}
@NotNull
private Collection<String> suggestToggles() {
return Arrays.asList("on", "off");
}
}

5
src/main/java/com/onarandombox/MultiverseCore/commands/TeleportCommand.java
View File

@ -48,7 +48,7 @@ public class TeleportCommand extends MultiverseCommand {
@Subcommand("tp|teleport")
@Syntax("[player] <destination>")
@CommandCompletion("@players|@MVWorlds|@destinations @MVWorlds|@destinations")
@CommandCompletion("@players|@MVWorlds:playerOnly|@destinations:playerOnly @MVWorlds|@destinations")
@Description("Allows you to the teleport to a location on your server!")
public void doTeleportCommand(@NotNull CommandSender sender,
@ -73,8 +73,7 @@ public class TeleportCommand extends MultiverseCommand {
@CommandAlias("mvtp")
@Syntax("[player] <destination>")
//TODO ACF: playerOnly flag
@CommandCompletion("@players|@MVWorlds|@destinations @MVWorlds|@destinations")
@CommandCompletion("@players|@MVWorlds:playerOnly|@destinations:playerOnly @MVWorlds|@destinations")
@Description("Alias for /mv tp")
public void doTeleportCommand(@NotNull CommandSender sender,