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

Allow overriding of all argument suggestions

Browse source
This commit is contained in:
Alexander Söderberg 2020-09-19 23:23:28 +02:00
parent 62bc4dc005
commit 95f903bb1f
No known key found for this signature in database
GPG key ID: C0207FF7EA146678
15 changed files with 156 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cloud-minecraft/cloud-bukkit/src/main/java/com/intellectualsites/commands/bukkit/parsers/MaterialArgument.java
View file

@ -30,8 +30,11 @@ import com.intellectualsites.commands.context.CommandContext;
import org.bukkit.Material;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.EnumSet;
import java.util.List;
import java.util.Queue;
import java.util.function.BiFunction;
import java.util.stream.Collectors;
/**
@ -43,8 +46,9 @@ public class MaterialArgument<C> extends CommandArgument<C, Material> {
protected MaterialArgument(final boolean required,
@Nonnull final String name,
@Nonnull final String defaultValue) {
super(required, name, new MaterialParser<>(), defaultValue, Material.class);
@Nonnull final String defaultValue,
@Nullable final BiFunction<CommandContext<C>, String, List<String>> suggestionsProvider) {
super(required, name, new MaterialParser<>(), defaultValue, Material.class, suggestionsProvider);
}
/**

9
cloud-minecraft/cloud-bukkit/src/main/java/com/intellectualsites/commands/bukkit/parsers/WorldArgument.java
View file

@ -31,8 +31,10 @@ import org.bukkit.Bukkit;
import org.bukkit.World;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.List;
import java.util.Queue;
import java.util.function.BiFunction;
import java.util.stream.Collectors;
/**
@ -44,8 +46,9 @@ public class WorldArgument<C> extends CommandArgument<C, World> {
protected WorldArgument(final boolean required,
@Nonnull final String name,
@Nonnull final String defaultValue) {
super(required, name, new WorldParser<>(), defaultValue, World.class);
@Nonnull final String defaultValue,
@Nullable final BiFunction<CommandContext<C>, String, List<String>> suggestionsProvider) {
super(required, name, new WorldParser<>(), defaultValue, World.class, suggestionsProvider);
}
/**
@ -108,7 +111,7 @@ public class WorldArgument<C> extends CommandArgument<C, World> {
@Nonnull
@Override
public CommandArgument<C, World> build() {
return new WorldArgument<>(this.isRequired(), this.getName(), this.getDefaultValue());
return new WorldArgument<>(this.isRequired(), this.getName(), this.getDefaultValue(), this.getSuggestionsProvider());
}
}