SteamWar/SpigotCore
Archiviert
13
0

Merge pull request 'Add SWCommand.StaticValue' (#137) from CMDStaticValue into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful

Reviewed-on: #137
Reviewed-by: Lixfel <lixfel@steamwar.de>
Dieser Commit ist enthalten in:
YoyoNow 2021-12-08 17:03:04 +01:00
Commit b3b3657463
3 geänderte Dateien mit 17 neuen und 0 gelöschten Zeilen

Datei anzeigen

@ -328,4 +328,10 @@ public abstract class SWCommand {
boolean local() default false; boolean local() default false;
} }
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.PARAMETER})
protected @interface StaticValue {
String value();
}
} }

Datei anzeigen

@ -163,6 +163,10 @@ public class SWCommandUtils {
GUARD_FUNCTIONS.putIfAbsent(name, guardChecker); GUARD_FUNCTIONS.putIfAbsent(name, guardChecker);
} }
public static TypeMapper<String> createMapper(String value) {
return createMapper((s) -> value.equals(s) ? value : null, s -> Collections.singletonList(value));
}
public static <T> TypeMapper<T> createMapper(Function<String, T> mapper, Function<String, List<String>> tabCompleter) { public static <T> TypeMapper<T> createMapper(Function<String, T> mapper, Function<String, List<String>> tabCompleter) {
return createMapper(mapper, (commandSender, s) -> tabCompleter.apply(s)); return createMapper(mapper, (commandSender, s) -> tabCompleter.apply(s));
} }

Datei anzeigen

@ -84,6 +84,13 @@ class SubCommand {
String name = clazz.getTypeName(); String name = clazz.getTypeName();
if (mapper != null) { if (mapper != null) {
name = mapper.value(); name = mapper.value();
} else {
SWCommand.StaticValue staticValue = parameter.getAnnotation(SWCommand.StaticValue.class);
if (parameter.getType() == String.class) {
arguments[i - 1] = SWCommandUtils.createMapper(staticValue.value());
guards[i - 1] = getGuardChecker(parameter, localGuardChecker);
continue;
}
} }
arguments[i - 1] = localTypeMapper.containsKey(name) arguments[i - 1] = localTypeMapper.containsKey(name)
? localTypeMapper.get(name) ? localTypeMapper.get(name)