diff options
Diffstat (limited to 'dicore3')
3 files changed, 50 insertions, 1 deletions
diff --git a/dicore3/command/src/main/java/io/dico/dicore/command/parameter/type/EnumParameterType.java b/dicore3/command/src/main/java/io/dico/dicore/command/parameter/type/EnumParameterType.java new file mode 100644 index 0000000..e71c6cc --- /dev/null +++ b/dicore3/command/src/main/java/io/dico/dicore/command/parameter/type/EnumParameterType.java @@ -0,0 +1,44 @@ +package io.dico.dicore.command.parameter.type; + +import io.dico.dicore.command.CommandException; +import io.dico.dicore.command.parameter.ArgumentBuffer; +import io.dico.dicore.command.parameter.Parameter; +import org.bukkit.Location; +import org.bukkit.command.CommandSender; + +import java.util.ArrayList; +import java.util.List; + +public class EnumParameterType<E extends Enum> extends SimpleParameterType<E, Void> { + private final E[] universe; + + public EnumParameterType(Class<E> returnType) { + super(returnType); + universe = returnType.getEnumConstants(); + if (universe == null) { + throw new IllegalArgumentException("returnType must be an enum"); + } + } + + @Override protected E parse(Parameter<E, Void> parameter, CommandSender sender, String input) throws CommandException { + for (E constant : universe) { + if (constant.name().equalsIgnoreCase(input)) { + return constant; + } + } + + throw CommandException.invalidArgument(parameter.getName(), "the enum value does not exist"); + } + + @Override public List<String> complete(Parameter<E, Void> parameter, CommandSender sender, Location location, ArgumentBuffer buffer) { + String input = buffer.next().toUpperCase(); + List<String> result = new ArrayList<>(); + for (E constant : universe) { + if (constant.name().toUpperCase().startsWith(input.toUpperCase())) { + result.add(constant.name().toLowerCase()); + } + } + return result; + } + +} diff --git a/dicore3/command/src/main/java/io/dico/dicore/command/parameter/type/MapBasedParameterTypeSelector.java b/dicore3/command/src/main/java/io/dico/dicore/command/parameter/type/MapBasedParameterTypeSelector.java index 4e475fe..d407f87 100644 --- a/dicore3/command/src/main/java/io/dico/dicore/command/parameter/type/MapBasedParameterTypeSelector.java +++ b/dicore3/command/src/main/java/io/dico/dicore/command/parameter/type/MapBasedParameterTypeSelector.java @@ -23,6 +23,11 @@ public class MapBasedParameterTypeSelector implements IParameterTypeSelector { if (useDefault && out == null) { out = defaultSelector.selectExact(key); } + if (out == null && key.getReturnType().isEnum()) { + //noinspection unchecked + out = new EnumParameterType(key.getReturnType()); + addType(false, out); + } return cast(out); } diff --git a/dicore3/command/src/main/java/io/dico/dicore/command/registration/reflect/ReflectiveRegistration.java b/dicore3/command/src/main/java/io/dico/dicore/command/registration/reflect/ReflectiveRegistration.java index 669f440..0495ba9 100644 --- a/dicore3/command/src/main/java/io/dico/dicore/command/registration/reflect/ReflectiveRegistration.java +++ b/dicore3/command/src/main/java/io/dico/dicore/command/registration/reflect/ReflectiveRegistration.java @@ -223,7 +223,7 @@ public class ReflectiveRegistration { String[] parameterNames = lookupParameterNames(method, parameters, start); for (int i = start, n = parameters.length; i < n; i++) { - if (parameters[i].getType().getName().equals("kotlin.coroutines.experimental.Continuation")) { + if (parameters[i].getType().getName().equals("kotlin.coroutines.Continuation")) { List<String> temp = new ArrayList<>(Arrays.asList(parameterNames)); temp.remove(i - start); parameterNames = temp.toArray(new String[0]); |