Upstream/LuckPerms
1
0
Fork 0
mirror of https://github.com/LuckPerms/LuckPerms.git synced 2024-12-29 12:37:40 +01:00
Code Issues Projects Releases Wiki Activity

Implement support for Vanilla command target selectors (e.g. @p, @r) for Bukkit & Sponge

Browse Source
This commit is contained in:
Luck 2020-01-16 17:49:28 +00:00
parent fe3d715f09
commit abad672bef
No known key found for this signature in database
GPG Key ID: EFA9B3EC5FD90F8B
5 changed files with 111 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
bukkit/src/main/java/me/lucko/luckperms/bukkit/BukkitCommandExecutor.java
View File

@ -27,18 +27,36 @@ package me.lucko.luckperms.bukkit;
import me.lucko.luckperms.common.command.CommandManager;
import me.lucko.luckperms.common.command.utils.ArgumentTokenizer;
import me.lucko.luckperms.common.config.ConfigKeys;
import me.lucko.luckperms.common.sender.Sender;
import org.bukkit.Server;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import org.bukkit.command.PluginCommand;
import org.bukkit.command.TabExecutor;
import org.bukkit.entity.Player;
import org.checkerframework.checker.nullness.qual.NonNull;
import java.util.List;
import java.util.ListIterator;
import java.util.stream.Collectors;
public class BukkitCommandExecutor extends CommandManager implements CommandExecutor, TabExecutor {
private static final boolean SELECT_ENTITIES_SUPPORTED;
static {
boolean selectEntitiesSupported = false;
try {
Server.class.getMethod("selectEntities", CommandSender.class, String.class);
selectEntitiesSupported = true;
} catch (NoSuchMethodException e) {
// ignore
}
SELECT_ENTITIES_SUPPORTED = selectEntitiesSupported;
}
protected final LPBukkitPlugin plugin;
protected final PluginCommand command;
@ -56,7 +74,7 @@ public class BukkitCommandExecutor extends CommandManager implements CommandExec
@Override
public boolean onCommand(@NonNull CommandSender sender, @NonNull Command command, @NonNull String label, @NonNull String[] args) {
Sender wrapped = this.plugin.getSenderFactory().wrap(sender);
List<String> arguments = ArgumentTokenizer.EXECUTE.tokenizeInput(args);
List<String> arguments = processSelectors(sender, ArgumentTokenizer.EXECUTE.tokenizeInput(args));
executeCommand(wrapped, label, arguments);
return true;
}
@ -64,7 +82,51 @@ public class BukkitCommandExecutor extends CommandManager implements CommandExec
@Override
public List<String> onTabComplete(@NonNull CommandSender sender, @NonNull Command command, @NonNull String label, @NonNull String[] args) {
Sender wrapped = this.plugin.getSenderFactory().wrap(sender);
List<String> arguments = ArgumentTokenizer.TAB_COMPLETE.tokenizeInput(args);
List<String> arguments = processSelectors(sender, ArgumentTokenizer.TAB_COMPLETE.tokenizeInput(args));
return tabCompleteCommand(wrapped, arguments);
}
private List<String> processSelectors(CommandSender sender, List<String> args) {
if (!SELECT_ENTITIES_SUPPORTED) {
return args;
}
if (!this.plugin.getConfiguration().get(ConfigKeys.RESOLVE_COMMAND_SELECTORS)) {
return args;
}
ListIterator<String> it = args.listIterator();
while (it.hasNext()) {
String arg = it.next();
if (arg.isEmpty() || arg.charAt(0) != '@') {
continue;
}
List<Player> matchedPlayers;
try {
matchedPlayers = this.plugin.getBootstrap().getServer().selectEntities(sender, arg).stream()
.filter(e -> e instanceof Player)
.map(e -> ((Player) e))
.collect(Collectors.toList());
} catch (IllegalArgumentException e) {
this.plugin.getLogger().warn("Error parsing selector '" + arg + "' for " + sender + " executing " + args);
e.printStackTrace();
continue;
}
if (matchedPlayers.isEmpty()) {
continue;
}
if (matchedPlayers.size() > 1) {
this.plugin.getLogger().warn("Error parsing selector '" + arg + "' for " + sender + " executing " + args +
": ambiguous result (more than one player matched) - " + matchedPlayers);
continue;
}
Player player = matchedPlayers.get(0);
it.set(player.getUniqueId().toString());
}
return args;
}
}

4
bukkit/src/main/resources/config.yml
View File

@ -563,3 +563,7 @@ allow-invalid-usernames: false
#
# - When this happens, the plugin will set their primary group back to default.
prevent-primary-group-removal: false
# If LuckPerms should attempt to resolve Vanilla command target selectors for LP commands.
# See here for more info: https://minecraft.gamepedia.com/Commands#Target_selectors
resolve-command-selectors: false

5
common/src/main/java/me/lucko/luckperms/common/config/ConfigKeys.java
View File

@ -128,6 +128,11 @@ public final class ConfigKeys {
*/
public static final ConfigKey<Boolean> CANCEL_FAILED_LOGINS = booleanKey("cancel-failed-logins", false);
/**
* If LuckPerms should attempt to resolve Vanilla command target selectors for LP commands.
*/
public static final ConfigKey<Boolean> RESOLVE_COMMAND_SELECTORS = booleanKey("resolve-command-selectors", false);
/**
* Controls how temporary add commands should behave
*/

45
sponge/src/main/java/me/lucko/luckperms/sponge/SpongeCommandExecutor.java
View File

@ -27,6 +27,7 @@ package me.lucko.luckperms.sponge;
import me.lucko.luckperms.common.command.CommandManager;
import me.lucko.luckperms.common.command.utils.ArgumentTokenizer;
import me.lucko.luckperms.common.config.ConfigKeys;
import me.lucko.luckperms.common.sender.Sender;
import org.checkerframework.checker.nullness.qual.NonNull;
@ -43,6 +44,7 @@ import org.spongepowered.api.world.World;
import java.util.List;
import java.util.ListIterator;
import java.util.Optional;
import java.util.stream.Collectors;
public class SpongeCommandExecutor extends CommandManager implements CommandCallable {
private final LPSpongePlugin plugin;
@ -88,20 +90,41 @@ public class SpongeCommandExecutor extends CommandManager implements CommandCall
}
private List<String> processSelectors(CommandSource source, List<String> args) {
if (!this.plugin.getConfiguration().get(ConfigKeys.RESOLVE_COMMAND_SELECTORS)) {
return args;
}
ListIterator<String> it = args.listIterator();
while (it.hasNext()) {
String element = it.next();
if (element.startsWith("@")) {
try {
Selector.parse(element).resolve(source).stream()
.filter(e -> e instanceof Player)
.map(e -> ((Player) e))
.findFirst()
.ifPresent(player -> it.set(player.getUniqueId().toString()));
} catch (IllegalArgumentException e) {
// ignored
}
String arg = it.next();
if (arg.isEmpty() || arg.charAt(0) != '@') {
continue;
}
List<Player> matchedPlayers;
try {
matchedPlayers = Selector.parse(arg).resolve(source).stream()
.filter(e -> e instanceof Player)
.map(e -> ((Player) e))
.collect(Collectors.toList());
} catch (IllegalArgumentException e) {
this.plugin.getLogger().warn("Error parsing selector '" + arg + "' for " + source + " executing " + args);
e.printStackTrace();
continue;
}
if (matchedPlayers.isEmpty()) {
continue;
}
if (matchedPlayers.size() > 1) {
this.plugin.getLogger().warn("Error parsing selector '" + arg + "' for " + source + " executing " + args +
": ambiguous result (more than one player matched) - " + matchedPlayers);
continue;
}
Player player = matchedPlayers.get(0);
it.set(player.getUniqueId().toString());
}
return args;
}

4
sponge/src/main/resources/luckperms.conf
View File

@ -496,3 +496,7 @@ allow-invalid-usernames = false
#
# - When this happens, the plugin will set their primary group back to default.
prevent-primary-group-removal = false
# If LuckPerms should attempt to resolve Vanilla command target selectors for LP commands.
# See here for more info: https://minecraft.gamepedia.com/Commands#Target_selectors
resolve-command-selectors = false