zhdev/oblak
1
0
Fork 0
Code Issues Pull requests Activity

bukkit: Make KeyedWorldArgument fallback to normal WorldParser when World does not implement Keyed (#298)

Browse source
This commit is contained in:
Jason 2021-09-16 19:46:18 -05:00
parent fa118f8305
commit 0cf8030f72
1 changed files with 26 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

26
cloud-minecraft/cloud-paper/src/main/java/cloud/commandframework/paper/argument/KeyedWorldArgument.java
View file

@ -27,6 +27,7 @@ import cloud.commandframework.ArgumentDescription;
import cloud.commandframework.arguments.CommandArgument; import cloud.commandframework.arguments.CommandArgument;
import cloud.commandframework.arguments.parser.ArgumentParseResult; import cloud.commandframework.arguments.parser.ArgumentParseResult;
import cloud.commandframework.arguments.parser.ArgumentParser; import cloud.commandframework.arguments.parser.ArgumentParser;
import cloud.commandframework.bukkit.internal.CraftBukkitReflection;
import cloud.commandframework.bukkit.parsers.WorldArgument; import cloud.commandframework.bukkit.parsers.WorldArgument;
import cloud.commandframework.context.CommandContext; import cloud.commandframework.context.CommandContext;
import cloud.commandframework.exceptions.parsing.NoInputProvidedException; import cloud.commandframework.exceptions.parsing.NoInputProvidedException;
@ -44,6 +45,9 @@ import java.util.function.BiFunction;
/** /**
* Argument type that parses Bukkit {@link World worlds} from a {@link NamespacedKey}. * Argument type that parses Bukkit {@link World worlds} from a {@link NamespacedKey}.
* *
* <p>Falls back to parsing by name, using the {@link WorldArgument.WorldParser} on server implementations where {@link World}
* does not implement {@link org.bukkit.Keyed}.</p>
*
* @param <C> Command sender type * @param <C> Command sender type
* @since 1.6.0 * @since 1.6.0
*/ */
@ -162,6 +166,20 @@ public final class KeyedWorldArgument<C> extends CommandArgument<C, World> {
*/ */
public static final class Parser<C> implements ArgumentParser<C, World> { public static final class Parser<C> implements ArgumentParser<C, World> {
private final ArgumentParser<C, World> parser;
/**
* Create a new {@link Parser}.
*/
public Parser() {
final Class<?> keyed = CraftBukkitReflection.findClass("org.bukkit.Keyed");
if (keyed != null && keyed.isAssignableFrom(World.class)) {
this.parser = null;
} else {
this.parser = new WorldArgument.WorldParser<>();
}
}
@Override @Override
public @NonNull ArgumentParseResult<@NonNull World> parse( public @NonNull ArgumentParseResult<@NonNull World> parse(
@NonNull final CommandContext<@NonNull C> commandContext, @NonNull final CommandContext<@NonNull C> commandContext,
@ -175,6 +193,10 @@ public final class KeyedWorldArgument<C> extends CommandArgument<C, World> {
)); ));
} }
if (this.parser != null) {
return this.parser.parse(commandContext, inputQueue);
}
final NamespacedKey key = NamespacedKey.fromString(input); final NamespacedKey key = NamespacedKey.fromString(input);
if (key == null) { if (key == null) {
return ArgumentParseResult.failure(new WorldArgument.WorldParseException(input, commandContext)); return ArgumentParseResult.failure(new WorldArgument.WorldParseException(input, commandContext));
@ -194,6 +216,10 @@ public final class KeyedWorldArgument<C> extends CommandArgument<C, World> {
final @NonNull CommandContext<C> commandContext, final @NonNull CommandContext<C> commandContext,
final @NonNull String input final @NonNull String input
) { ) {
if (this.parser != null) {
return this.parser.suggestions(commandContext, input);
}
final List<String> completions = new ArrayList<>(); final List<String> completions = new ArrayList<>();
for (final World world : Bukkit.getWorlds()) { for (final World world : Bukkit.getWorlds()) {
if (world.getKey().getNamespace().equals(NamespacedKey.MINECRAFT)) { if (world.getKey().getNamespace().equals(NamespacedKey.MINECRAFT)) {