Registers a context resolver that may conditionally consume input, falling back to using the context of the
issuer to potentially fulfill this context.
@@ -279,7 +279,7 @@ public <T> void
registerIssuerOnlyContext
-public <T> void registerIssuerOnlyContext(Class<T> context,
+public <T> void registerIssuerOnlyContext(Class<T> context,
IssuerOnlyContextResolver<T,R> supplier)
Registers a context resolver that will never consume input. It will always satisfy its context based on the
issuer of the command, so it will not appear in syntax strings.
@@ -291,7 +291,7 @@ public <T> void
registerOptionalContext
-public <T> void registerOptionalContext(Class<T> context,
+public <T> void registerOptionalContext(Class<T> context,
OptionalContextResolver<T,R> supplier)
@@ -303,7 +303,7 @@ public <T> void
registerContext
-public <T> void registerContext(Class<T> context,
+public <T> void registerContext(Class<T> context,
ContextResolver<T,R> supplier)
@@ -315,7 +315,7 @@ public <T> void
getResolver
-public ContextResolver<?,R> getResolver(Class<?> type)
+public ContextResolver<?,R> getResolver(Class<?> type)
diff --git a/docs/acf-core/co/aikar/commands/Locales.html b/docs/acf-core/co/aikar/commands/Locales.html
index 0ab66b0a..ed45dda9 100644
--- a/docs/acf-core/co/aikar/commands/Locales.html
+++ b/docs/acf-core/co/aikar/commands/Locales.html
@@ -186,77 +186,81 @@ extends
static Locale |
-ITALIAN |
+HUNGARIAN |
static Locale |
+ITALIAN |
+
+
+static Locale |
JAPANESE |
-
+
static Locale |
KOREAN |
-
+
static Locale |
LATIN |
-
+
static Locale |
NORWEGIAN_BOKMAAL |
-
+
static Locale |
NORWEGIAN_NYNORSK |
-
+
static Locale |
POLISH |
-
+
static Locale |
PORTUGUESE |
-
+
static Locale |
ROMANIAN |
-
+
static Locale |
RUSSIAN |
-
+
static Locale |
SIMPLIFIED_CHINESE |
-
+
static Locale |
SPANISH |
-
+
static Locale |
SWEDISH |
-
+
static Locale |
THAI |
-
+
static Locale |
TRADITIONAL_CHINESE |
-
+
static Locale |
TURKISH |
-
+
static Locale |
UKRANIAN |
-
+
static Locale |
VIETNAMESE |
-
+
static Locale |
WELSH |
@@ -667,12 +671,21 @@ extends
-
@@ -687,7 +700,7 @@ extends
Locales
-public Locales(CommandManager manager)
+public Locales(CommandManager manager)
@@ -704,7 +717,7 @@ extends
loadLanguages
-public void loadLanguages()
+public void loadLanguages()
@@ -713,7 +726,7 @@ extends
getDefaultLocale
-public Locale getDefaultLocale()
+public Locale getDefaultLocale()
@@ -722,7 +735,7 @@ extends
setDefaultLocale
-public Locale setDefaultLocale(Locale locale)
+public Locale setDefaultLocale(Locale locale)
@@ -731,7 +744,7 @@ extends
loadMissingBundles
-public void loadMissingBundles()
+public void loadMissingBundles()
Looks for all previously loaded bundles, and if any new Supported Languages have been added, load them.
@@ -741,7 +754,7 @@ extends
addMessageBundles
-public void addMessageBundles(String... bundleNames)
+public void addMessageBundles(String... bundleNames)
@@ -750,7 +763,7 @@ extends
addMessageBundle
-public boolean addMessageBundle(String bundleName,
+public boolean addMessageBundle(String bundleName,
Locale locale)
@@ -760,7 +773,7 @@ extends
addMessageBundle
-public boolean addMessageBundle(ClassLoader classLoader,
+public boolean addMessageBundle(ClassLoader classLoader,
String bundleName,
Locale locale)
@@ -771,7 +784,7 @@ extends
addMessageStrings
-public void addMessageStrings(Locale locale,
+public void addMessageStrings(Locale locale,
@NotNull
@NotNull Map<String,String> messages)
@@ -782,7 +795,7 @@ extends
addMessages
-public void addMessages(Locale locale,
+public void addMessages(Locale locale,
@NotNull
@NotNull Map<? extends co.aikar.locales.MessageKeyProvider,String> messages)
@@ -793,7 +806,7 @@ extends
addMessage
-public String addMessage(Locale locale,
+public String addMessage(Locale locale,
co.aikar.locales.MessageKeyProvider key,
String message)
@@ -804,7 +817,7 @@ extends
getMessage
-public String getMessage(CommandIssuer issuer,
+public String getMessage(CommandIssuer issuer,
co.aikar.locales.MessageKeyProvider key)
@@ -814,7 +827,7 @@ extends
replaceI18NStrings
-public String replaceI18NStrings(String message)
+public String replaceI18NStrings(String message)
@@ -823,7 +836,7 @@ extends
addBundleClassLoader
-public boolean addBundleClassLoader(ClassLoader classLoader)
+public boolean addBundleClassLoader(ClassLoader classLoader)
diff --git a/docs/acf-core/index-all.html b/docs/acf-core/index-all.html
index a15f5113..6e5fe18b 100644
--- a/docs/acf-core/index-all.html
+++ b/docs/acf-core/index-all.html
@@ -990,6 +990,8 @@
HINDI - Static variable in class co.aikar.commands.Locales
+HUNGARIAN - Static variable in class co.aikar.commands.Locales
+
diff --git a/docs/acf-core/src-html/co/aikar/commands/BaseCommand.html b/docs/acf-core/src-html/co/aikar/commands/BaseCommand.html
index 7ef565fb..479a30c1 100644
--- a/docs/acf-core/src-html/co/aikar/commands/BaseCommand.html
+++ b/docs/acf-core/src-html/co/aikar/commands/BaseCommand.html
@@ -693,7 +693,7 @@
685 * @return All results to complete the command.
686 */
687 private List<String> completeCommand(CommandIssuer issuer, RegisteredCommand cmd, String[] args, String commandLabel, boolean isAsync) {
-
688 if (!cmd.hasPermission(issuer) || args.length == 0) {
+
688 if (!cmd.hasPermission(issuer) || args.length == 0 || cmd.parameters.length == 0) {
689 return Collections.emptyList();
690 }
691
diff --git a/docs/acf-core/src-html/co/aikar/commands/CommandCompletions.AsyncCommandCompletionHandler.html b/docs/acf-core/src-html/co/aikar/commands/CommandCompletions.AsyncCommandCompletionHandler.html
index 5f2010a5..f2dc2c4c 100644
--- a/docs/acf-core/src-html/co/aikar/commands/CommandCompletions.AsyncCommandCompletionHandler.html
+++ b/docs/acf-core/src-html/co/aikar/commands/CommandCompletions.AsyncCommandCompletionHandler.html
@@ -271,49 +271,50 @@
263 && args.length > ACFPatterns.SPACE.split(command.complete).length) {
264 String start = String.join(" ", args);
265 completions = completions.stream()
-
266 .filter(s -> s != null && s.split(" ").length >= args.length)
-
267 .filter(s -> ApacheCommonsLangUtil.startsWithIgnoreCase(s, start))
-
268 .map(s -> {
-
269 String[] completionArgs = s.split(" ");
-
270 return String.join(" ",
-
271 Arrays.copyOfRange(completionArgs, args.length - 1, completionArgs.length));
-
272 }).collect(Collectors.toList());
-
273 }
-
274
-
275 if (completions != null) {
-
276 allCompletions.addAll(completions);
-
277 continue;
-
278 }
-
279 //noinspection ConstantIfStatement,ConstantConditions
-
280 if (false) { // Hack to fool compiler. since its sneakily thrown.
-
281 throw new CommandCompletionTextLookupException();
-
282 }
-
283 } catch (CommandCompletionTextLookupException ignored) {
-
284 // This should only happen if some other feedback error occured.
-
285 } catch (Exception e) {
-
286 command.handleException(sender, Arrays.asList(args), e);
-
287 }
-
288 // Something went wrong in lookup, fall back to input
-
289 return Collections.singletonList(input);
-
290 } else {
-
291 // Plaintext value
-
292 allCompletions.add(value);
-
293 }
-
294 }
-
295 return allCompletions;
-
296 }
-
297
-
298 public interface CommandCompletionHandler<C extends CommandCompletionContext> {
-
299 Collection<String> getCompletions(C context) throws InvalidCommandArgument;
-
300 }
-
301
-
302 public interface AsyncCommandCompletionHandler<C extends CommandCompletionContext> extends CommandCompletionHandler<C> {
-
303 }
-
304
-
305 public static class SyncCompletionRequired extends RuntimeException {
-
306 }
-
307
-
308}
+
266 .map(s -> {
+
267 if (s != null && s.split(" ").length >= args.length && ApacheCommonsLangUtil.startsWithIgnoreCase(s, start)) {
+
268 String[] completionArgs = s.split(" ");
+
269 return String.join(" ", Arrays.copyOfRange(completionArgs, args.length - 1, completionArgs.length));
+
270 } else {
+
271 return s;
+
272 }
+
273 }).collect(Collectors.toList());
+
274 }
+
275
+
276 if (completions != null) {
+
277 allCompletions.addAll(completions);
+
278 continue;
+
279 }
+
280 //noinspection ConstantIfStatement,ConstantConditions
+
281 if (false) { // Hack to fool compiler. since its sneakily thrown.
+
282 throw new CommandCompletionTextLookupException();
+
283 }
+
284 } catch (CommandCompletionTextLookupException ignored) {
+
285 // This should only happen if some other feedback error occured.
+
286 } catch (Exception e) {
+
287 command.handleException(sender, Arrays.asList(args), e);
+
288 }
+
289 // Something went wrong in lookup, fall back to input
+
290 return Collections.singletonList(input);
+
291 } else {
+
292 // Plaintext value
+
293 allCompletions.add(value);
+
294 }
+
295 }
+
296 return allCompletions;
+
297 }
+
298
+
299 public interface CommandCompletionHandler<C extends CommandCompletionContext> {
+
300 Collection<String> getCompletions(C context) throws InvalidCommandArgument;
+
301 }
+
302
+
303 public interface AsyncCommandCompletionHandler<C extends CommandCompletionContext> extends CommandCompletionHandler<C> {
+
304 }
+
305
+
306 public static class SyncCompletionRequired extends RuntimeException {
+
307 }
+
308
+
309}
diff --git a/docs/acf-core/src-html/co/aikar/commands/CommandCompletions.CommandCompletionHandler.html b/docs/acf-core/src-html/co/aikar/commands/CommandCompletions.CommandCompletionHandler.html
index 5f2010a5..f2dc2c4c 100644
--- a/docs/acf-core/src-html/co/aikar/commands/CommandCompletions.CommandCompletionHandler.html
+++ b/docs/acf-core/src-html/co/aikar/commands/CommandCompletions.CommandCompletionHandler.html
@@ -271,49 +271,50 @@
263 && args.length > ACFPatterns.SPACE.split(command.complete).length) {
264 String start = String.join(" ", args);
265 completions = completions.stream()
-
266 .filter(s -> s != null && s.split(" ").length >= args.length)
-
267 .filter(s -> ApacheCommonsLangUtil.startsWithIgnoreCase(s, start))
-
268 .map(s -> {
-
269 String[] completionArgs = s.split(" ");
-
270 return String.join(" ",
-
271 Arrays.copyOfRange(completionArgs, args.length - 1, completionArgs.length));
-
272 }).collect(Collectors.toList());
-
273 }
-
274
-
275 if (completions != null) {
-
276 allCompletions.addAll(completions);
-
277 continue;
-
278 }
-
279 //noinspection ConstantIfStatement,ConstantConditions
-
280 if (false) { // Hack to fool compiler. since its sneakily thrown.
-
281 throw new CommandCompletionTextLookupException();
-
282 }
-
283 } catch (CommandCompletionTextLookupException ignored) {
-
284 // This should only happen if some other feedback error occured.
-
285 } catch (Exception e) {
-
286 command.handleException(sender, Arrays.asList(args), e);
-
287 }
-
288 // Something went wrong in lookup, fall back to input
-
289 return Collections.singletonList(input);
-
290 } else {
-
291 // Plaintext value
-
292 allCompletions.add(value);
-
293 }
-
294 }
-
295 return allCompletions;
-
296 }
-
297
-
298 public interface CommandCompletionHandler<C extends CommandCompletionContext> {
-
299 Collection<String> getCompletions(C context) throws InvalidCommandArgument;
-
300 }
-
301
-
302 public interface AsyncCommandCompletionHandler<C extends CommandCompletionContext> extends CommandCompletionHandler<C> {
-
303 }
-
304
-
305 public static class SyncCompletionRequired extends RuntimeException {
-
306 }
-
307
-
308}
+
266 .map(s -> {
+
267 if (s != null && s.split(" ").length >= args.length && ApacheCommonsLangUtil.startsWithIgnoreCase(s, start)) {
+
268 String[] completionArgs = s.split(" ");
+
269 return String.join(" ", Arrays.copyOfRange(completionArgs, args.length - 1, completionArgs.length));
+
270 } else {
+
271 return s;
+
272 }
+
273 }).collect(Collectors.toList());
+
274 }
+
275
+
276 if (completions != null) {
+
277 allCompletions.addAll(completions);
+
278 continue;
+
279 }
+
280 //noinspection ConstantIfStatement,ConstantConditions
+
281 if (false) { // Hack to fool compiler. since its sneakily thrown.
+
282 throw new CommandCompletionTextLookupException();
+
283 }
+
284 } catch (CommandCompletionTextLookupException ignored) {
+
285 // This should only happen if some other feedback error occured.
+
286 } catch (Exception e) {
+
287 command.handleException(sender, Arrays.asList(args), e);
+
288 }
+
289 // Something went wrong in lookup, fall back to input
+
290 return Collections.singletonList(input);
+
291 } else {
+
292 // Plaintext value
+
293 allCompletions.add(value);
+
294 }
+
295 }
+
296 return allCompletions;
+
297 }
+
298
+
299 public interface CommandCompletionHandler<C extends CommandCompletionContext> {
+
300 Collection<String> getCompletions(C context) throws InvalidCommandArgument;
+
301 }
+
302
+
303 public interface AsyncCommandCompletionHandler<C extends CommandCompletionContext> extends CommandCompletionHandler<C> {
+
304 }
+
305
+
306 public static class SyncCompletionRequired extends RuntimeException {
+
307 }
+
308
+
309}
diff --git a/docs/acf-core/src-html/co/aikar/commands/CommandCompletions.SyncCompletionRequired.html b/docs/acf-core/src-html/co/aikar/commands/CommandCompletions.SyncCompletionRequired.html
index 5f2010a5..f2dc2c4c 100644
--- a/docs/acf-core/src-html/co/aikar/commands/CommandCompletions.SyncCompletionRequired.html
+++ b/docs/acf-core/src-html/co/aikar/commands/CommandCompletions.SyncCompletionRequired.html
@@ -271,49 +271,50 @@
263 && args.length > ACFPatterns.SPACE.split(command.complete).length) {
264 String start = String.join(" ", args);
265 completions = completions.stream()
-
266 .filter(s -> s != null && s.split(" ").length >= args.length)
-
267 .filter(s -> ApacheCommonsLangUtil.startsWithIgnoreCase(s, start))
-
268 .map(s -> {
-
269 String[] completionArgs = s.split(" ");
-
270 return String.join(" ",
-
271 Arrays.copyOfRange(completionArgs, args.length - 1, completionArgs.length));
-
272 }).collect(Collectors.toList());
-
273 }
-
274
-
275 if (completions != null) {
-
276 allCompletions.addAll(completions);
-
277 continue;
-
278 }
-
279 //noinspection ConstantIfStatement,ConstantConditions
-
280 if (false) { // Hack to fool compiler. since its sneakily thrown.
-
281 throw new CommandCompletionTextLookupException();
-
282 }
-
283 } catch (CommandCompletionTextLookupException ignored) {
-
284 // This should only happen if some other feedback error occured.
-
285 } catch (Exception e) {
-
286 command.handleException(sender, Arrays.asList(args), e);
-
287 }
-
288 // Something went wrong in lookup, fall back to input
-
289 return Collections.singletonList(input);
-
290 } else {
-
291 // Plaintext value
-
292 allCompletions.add(value);
-
293 }
-
294 }
-
295 return allCompletions;
-
296 }
-
297
-
298 public interface CommandCompletionHandler<C extends CommandCompletionContext> {
-
299 Collection<String> getCompletions(C context) throws InvalidCommandArgument;
-
300 }
-
301
-
302 public interface AsyncCommandCompletionHandler<C extends CommandCompletionContext> extends CommandCompletionHandler<C> {
-
303 }
-
304
-
305 public static class SyncCompletionRequired extends RuntimeException {
-
306 }
-
307
-
308}
+
266 .map(s -> {
+
267 if (s != null && s.split(" ").length >= args.length && ApacheCommonsLangUtil.startsWithIgnoreCase(s, start)) {
+
268 String[] completionArgs = s.split(" ");
+
269 return String.join(" ", Arrays.copyOfRange(completionArgs, args.length - 1, completionArgs.length));
+
270 } else {
+
271 return s;
+
272 }
+
273 }).collect(Collectors.toList());
+
274 }
+
275
+
276 if (completions != null) {
+
277 allCompletions.addAll(completions);
+
278 continue;
+
279 }
+
280 //noinspection ConstantIfStatement,ConstantConditions
+
281 if (false) { // Hack to fool compiler. since its sneakily thrown.
+
282 throw new CommandCompletionTextLookupException();
+
283 }
+
284 } catch (CommandCompletionTextLookupException ignored) {
+
285 // This should only happen if some other feedback error occured.
+
286 } catch (Exception e) {
+
287 command.handleException(sender, Arrays.asList(args), e);
+
288 }
+
289 // Something went wrong in lookup, fall back to input
+
290 return Collections.singletonList(input);
+
291 } else {
+
292 // Plaintext value
+
293 allCompletions.add(value);
+
294 }
+
295 }
+
296 return allCompletions;
+
297 }
+
298
+
299 public interface CommandCompletionHandler<C extends CommandCompletionContext> {
+
300 Collection<String> getCompletions(C context) throws InvalidCommandArgument;
+
301 }
+
302
+
303 public interface AsyncCommandCompletionHandler<C extends CommandCompletionContext> extends CommandCompletionHandler<C> {
+
304 }
+
305
+
306 public static class SyncCompletionRequired extends RuntimeException {
+
307 }
+
308
+
309}
diff --git a/docs/acf-core/src-html/co/aikar/commands/CommandCompletions.html b/docs/acf-core/src-html/co/aikar/commands/CommandCompletions.html
index 5f2010a5..f2dc2c4c 100644
--- a/docs/acf-core/src-html/co/aikar/commands/CommandCompletions.html
+++ b/docs/acf-core/src-html/co/aikar/commands/CommandCompletions.html
@@ -271,49 +271,50 @@
263 && args.length > ACFPatterns.SPACE.split(command.complete).length) {
264 String start = String.join(" ", args);
265 completions = completions.stream()
-
266 .filter(s -> s != null && s.split(" ").length >= args.length)
-
267 .filter(s -> ApacheCommonsLangUtil.startsWithIgnoreCase(s, start))
-
268 .map(s -> {
-
269 String[] completionArgs = s.split(" ");
-
270 return String.join(" ",
-
271 Arrays.copyOfRange(completionArgs, args.length - 1, completionArgs.length));
-
272 }).collect(Collectors.toList());
-
273 }
-
274
-
275 if (completions != null) {
-
276 allCompletions.addAll(completions);
-
277 continue;
-
278 }
-
279 //noinspection ConstantIfStatement,ConstantConditions
-
280 if (false) { // Hack to fool compiler. since its sneakily thrown.
-
281 throw new CommandCompletionTextLookupException();
-
282 }
-
283 } catch (CommandCompletionTextLookupException ignored) {
-
284 // This should only happen if some other feedback error occured.
-
285 } catch (Exception e) {
-
286 command.handleException(sender, Arrays.asList(args), e);
-
287 }
-
288 // Something went wrong in lookup, fall back to input
-
289 return Collections.singletonList(input);
-
290 } else {
-
291 // Plaintext value
-
292 allCompletions.add(value);
-
293 }
-
294 }
-
295 return allCompletions;
-
296 }
-
297
-
298 public interface CommandCompletionHandler<C extends CommandCompletionContext> {
-
299 Collection<String> getCompletions(C context) throws InvalidCommandArgument;
-
300 }
-
301
-
302 public interface AsyncCommandCompletionHandler<C extends CommandCompletionContext> extends CommandCompletionHandler<C> {
-
303 }
-
304
-
305 public static class SyncCompletionRequired extends RuntimeException {
-
306 }
-
307
-
308}
+
266 .map(s -> {
+
267 if (s != null && s.split(" ").length >= args.length && ApacheCommonsLangUtil.startsWithIgnoreCase(s, start)) {
+
268 String[] completionArgs = s.split(" ");
+
269 return String.join(" ", Arrays.copyOfRange(completionArgs, args.length - 1, completionArgs.length));
+
270 } else {
+
271 return s;
+
272 }
+
273 }).collect(Collectors.toList());
+
274 }
+
275
+
276 if (completions != null) {
+
277 allCompletions.addAll(completions);
+
278 continue;
+
279 }
+
280 //noinspection ConstantIfStatement,ConstantConditions
+
281 if (false) { // Hack to fool compiler. since its sneakily thrown.
+
282 throw new CommandCompletionTextLookupException();
+
283 }
+
284 } catch (CommandCompletionTextLookupException ignored) {
+
285 // This should only happen if some other feedback error occured.
+
286 } catch (Exception e) {
+
287 command.handleException(sender, Arrays.asList(args), e);
+
288 }
+
289 // Something went wrong in lookup, fall back to input
+
290 return Collections.singletonList(input);
+
291 } else {
+
292 // Plaintext value
+
293 allCompletions.add(value);
+
294 }
+
295 }
+
296 return allCompletions;
+
297 }
+
298
+
299 public interface CommandCompletionHandler<C extends CommandCompletionContext> {
+
300 Collection<String> getCompletions(C context) throws InvalidCommandArgument;
+
301 }
+
302
+
303 public interface AsyncCommandCompletionHandler<C extends CommandCompletionContext> extends CommandCompletionHandler<C> {
+
304 }
+
305
+
306 public static class SyncCompletionRequired extends RuntimeException {
+
307 }
+
308
+
309}
diff --git a/docs/acf-core/src-html/co/aikar/commands/CommandContexts.html b/docs/acf-core/src-html/co/aikar/commands/CommandContexts.html
index 2c13c8bf..90643a8e 100644
--- a/docs/acf-core/src-html/co/aikar/commands/CommandContexts.html
+++ b/docs/acf-core/src-html/co/aikar/commands/CommandContexts.html
@@ -55,292 +55,305 @@
047 this.manager = manager;
048 registerIssuerOnlyContext(CommandIssuer.class, c -> c.getIssuer());
049 registerContext(Short.class, (c) -> {
-
050 try {
-
051 return parseAndValidateNumber(c, Short.MIN_VALUE, Short.MAX_VALUE).shortValue();
-
052 } catch (NumberFormatException e) {
-
053 throw new InvalidCommandArgument(MessageKeys.MUST_BE_A_NUMBER, "{num}", c.getFirstArg());
-
054 }
-
055 });
-
056 registerContext(short.class, (c) -> {
-
057 try {
-
058 return parseAndValidateNumber(c, Short.MIN_VALUE, Short.MAX_VALUE).shortValue();
-
059 } catch (NumberFormatException e) {
-
060 throw new InvalidCommandArgument(MessageKeys.MUST_BE_A_NUMBER, "{num}", c.getFirstArg());
-
061 }
-
062 });
-
063 registerContext(Integer.class, (c) -> {
-
064 try {
-
065 return parseAndValidateNumber(c, Integer.MIN_VALUE, Integer.MAX_VALUE).intValue();
-
066 } catch (NumberFormatException e) {
-
067 throw new InvalidCommandArgument(MessageKeys.MUST_BE_A_NUMBER, "{num}", c.getFirstArg());
-
068 }
-
069 });
-
070 registerContext(int.class, (c) -> {
-
071 try {
-
072 return parseAndValidateNumber(c, Integer.MIN_VALUE, Integer.MAX_VALUE).intValue();
-
073 } catch (NumberFormatException e) {
-
074 throw new InvalidCommandArgument(MessageKeys.MUST_BE_A_NUMBER, "{num}", c.getFirstArg());
-
075 }
-
076 });
-
077 registerContext(Long.class, (c) -> {
-
078 try {
-
079 return parseAndValidateNumber(c, Long.MIN_VALUE, Long.MAX_VALUE).longValue();
-
080 } catch (NumberFormatException e) {
-
081 throw new InvalidCommandArgument(MessageKeys.MUST_BE_A_NUMBER, "{num}", c.getFirstArg());
-
082 }
-
083 });
-
084 registerContext(long.class, (c) -> {
-
085 try {
-
086 return parseAndValidateNumber(c, Long.MIN_VALUE, Long.MAX_VALUE).longValue();
-
087 } catch (NumberFormatException e) {
-
088 throw new InvalidCommandArgument(MessageKeys.MUST_BE_A_NUMBER, "{num}", c.getFirstArg());
-
089 }
-
090 });
-
091 registerContext(Float.class, (c) -> {
-
092 try {
-
093 return parseAndValidateNumber(c, -Float.MAX_VALUE, Float.MAX_VALUE).floatValue();
-
094 } catch (NumberFormatException e) {
-
095 throw new InvalidCommandArgument(MessageKeys.MUST_BE_A_NUMBER, "{num}", c.getFirstArg());
-
096 }
-
097 });
-
098 registerContext(float.class, (c) -> {
+
050 String number = c.popFirstArg();
+
051 try {
+
052 return parseAndValidateNumber(number, c, Short.MIN_VALUE, Short.MAX_VALUE).shortValue();
+
053 } catch (NumberFormatException e) {
+
054 throw new InvalidCommandArgument(MessageKeys.MUST_BE_A_NUMBER, "{num}", number);
+
055 }
+
056 });
+
057 registerContext(short.class, (c) -> {
+
058 String number = c.popFirstArg();
+
059 try {
+
060 return parseAndValidateNumber(number, c, Short.MIN_VALUE, Short.MAX_VALUE).shortValue();
+
061 } catch (NumberFormatException e) {
+
062 throw new InvalidCommandArgument(MessageKeys.MUST_BE_A_NUMBER, "{num}", number);
+
063 }
+
064 });
+
065 registerContext(Integer.class, (c) -> {
+
066 String number = c.popFirstArg();
+
067 try {
+
068 return parseAndValidateNumber(number, c, Integer.MIN_VALUE, Integer.MAX_VALUE).intValue();
+
069 } catch (NumberFormatException e) {
+
070 throw new InvalidCommandArgument(MessageKeys.MUST_BE_A_NUMBER, "{num}", number);
+
071 }
+
072 });
+
073 registerContext(int.class, (c) -> {
+
074 String number = c.popFirstArg();
+
075 try {
+
076 return parseAndValidateNumber(number, c, Integer.MIN_VALUE, Integer.MAX_VALUE).intValue();
+
077 } catch (NumberFormatException e) {
+
078 throw new InvalidCommandArgument(MessageKeys.MUST_BE_A_NUMBER, "{num}", number);
+
079 }
+
080 });
+
081 registerContext(Long.class, (c) -> {
+
082 String number = c.popFirstArg();
+
083 try {
+
084 return parseAndValidateNumber(number, c, Long.MIN_VALUE, Long.MAX_VALUE).longValue();
+
085 } catch (NumberFormatException e) {
+
086 throw new InvalidCommandArgument(MessageKeys.MUST_BE_A_NUMBER, "{num}", number);
+
087 }
+
088 });
+
089 registerContext(long.class, (c) -> {
+
090 String number = c.popFirstArg();
+
091 try {
+
092 return parseAndValidateNumber(number, c, Long.MIN_VALUE, Long.MAX_VALUE).longValue();
+
093 } catch (NumberFormatException e) {
+
094 throw new InvalidCommandArgument(MessageKeys.MUST_BE_A_NUMBER, "{num}", number);
+
095 }
+
096 });
+
097 registerContext(Float.class, (c) -> {
+
098 String number = c.popFirstArg();
099 try {
-
100 return parseAndValidateNumber(c, -Float.MAX_VALUE, Float.MAX_VALUE).floatValue();
+
100 return parseAndValidateNumber(number, c, -Float.MAX_VALUE, Float.MAX_VALUE).floatValue();
101 } catch (NumberFormatException e) {
-
102 throw new InvalidCommandArgument(MessageKeys.MUST_BE_A_NUMBER, "{num}", c.getFirstArg());
+
102 throw new InvalidCommandArgument(MessageKeys.MUST_BE_A_NUMBER, "{num}", number);
103 }
104 });
-
105 registerContext(Double.class, (c) -> {
-
106 try {
-
107 return parseAndValidateNumber(c, -Double.MAX_VALUE, Double.MAX_VALUE).doubleValue();
-
108 } catch (NumberFormatException e) {
-
109 throw new InvalidCommandArgument(MessageKeys.MUST_BE_A_NUMBER, "{num}", c.getFirstArg());
-
110 }
-
111 });
-
112 registerContext(double.class, (c) -> {
-
113 try {
-
114 return parseAndValidateNumber(c, -Double.MAX_VALUE, Double.MAX_VALUE).doubleValue();
-
115 } catch (NumberFormatException e) {
-
116 throw new InvalidCommandArgument(MessageKeys.MUST_BE_A_NUMBER, "{num}", c.getFirstArg());
-
117 }
-
118 });
-
119 registerContext(Number.class, (c) -> {
-
120 try {
-
121 return parseAndValidateNumber(c, -Double.MAX_VALUE, Double.MAX_VALUE);
-
122 } catch (NumberFormatException e) {
-
123 throw new InvalidCommandArgument(MessageKeys.MUST_BE_A_NUMBER, "{num}", c.getFirstArg());
-
124 }
-
125 });
-
126 registerContext(BigDecimal.class, (c) -> {
-
127 try {
-
128 BigDecimal number = ACFUtil.parseBigNumber(c.popFirstArg(), c.hasFlag("suffixes"));
-
129 validateMinMax(c, number);
-
130 return number;
-
131 } catch (NumberFormatException e) {
-
132 throw new InvalidCommandArgument(MessageKeys.MUST_BE_A_NUMBER, "{num}", c.getFirstArg());
-
133 }
-
134 });
-
135 registerContext(BigInteger.class, (c) -> {
-
136 try {
-
137 BigDecimal number = ACFUtil.parseBigNumber(c.popFirstArg(), c.hasFlag("suffixes"));
-
138 validateMinMax(c, number);
-
139 return number.toBigIntegerExact();
-
140 } catch (NumberFormatException e) {
-
141 throw new InvalidCommandArgument(MessageKeys.MUST_BE_A_NUMBER, "{num}", c.getFirstArg());
-
142 }
-
143 });
-
144 registerContext(Boolean.class, (c) -> ACFUtil.isTruthy(c.popFirstArg()));
-
145 registerContext(boolean.class, (c) -> ACFUtil.isTruthy(c.popFirstArg()));
-
146 registerContext(char.class, c -> {
-
147 String s = c.popFirstArg();
-
148 if (s.length() > 1) {
-
149 throw new InvalidCommandArgument(MessageKeys.MUST_BE_MAX_LENGTH, "{max}", String.valueOf(1));
-
150 }
-
151 return s.charAt(0);
-
152 });
-
153 registerContext(String.class, (c) -> {
-
154 // This will fail fast, its either in the values or its not
-
155 if (c.hasAnnotation(Values.class)) {
-
156 return c.popFirstArg();
-
157 }
-
158 String ret = (c.isLastArg() && !c.hasAnnotation(Single.class)) ?
-
159 ACFUtil.join(c.getArgs())
-
160 :
-
161 c.popFirstArg();
-
162
-
163 Integer minLen = c.getFlagValue("minlen", (Integer) null);
-
164 Integer maxLen = c.getFlagValue("maxlen", (Integer) null);
-
165 if (minLen != null) {
-
166 if (ret.length() < minLen) {
-
167 throw new InvalidCommandArgument(MessageKeys.MUST_BE_MIN_LENGTH, "{min}", String.valueOf(minLen));
-
168 }
-
169 }
-
170 if (maxLen != null) {
-
171 if (ret.length() > maxLen) {
-
172 throw new InvalidCommandArgument(MessageKeys.MUST_BE_MAX_LENGTH, "{max}", String.valueOf(maxLen));
-
173 }
-
174 }
+
105 registerContext(float.class, (c) -> {
+
106 String number = c.popFirstArg();
+
107 try {
+
108 return parseAndValidateNumber(number, c, -Float.MAX_VALUE, Float.MAX_VALUE).floatValue();
+
109 } catch (NumberFormatException e) {
+
110 throw new InvalidCommandArgument(MessageKeys.MUST_BE_A_NUMBER, "{num}", number);
+
111 }
+
112 });
+
113 registerContext(Double.class, (c) -> {
+
114 String number = c.popFirstArg();
+
115 try {
+
116 return parseAndValidateNumber(number, c, -Double.MAX_VALUE, Double.MAX_VALUE).doubleValue();
+
117 } catch (NumberFormatException e) {
+
118 throw new InvalidCommandArgument(MessageKeys.MUST_BE_A_NUMBER, "{num}", number);
+
119 }
+
120 });
+
121 registerContext(double.class, (c) -> {
+
122 String number = c.popFirstArg();
+
123 try {
+
124 return parseAndValidateNumber(number, c, -Double.MAX_VALUE, Double.MAX_VALUE).doubleValue();
+
125 } catch (NumberFormatException e) {
+
126 throw new InvalidCommandArgument(MessageKeys.MUST_BE_A_NUMBER, "{num}", number);
+
127 }
+
128 });
+
129 registerContext(Number.class, (c) -> {
+
130 String number = c.popFirstArg();
+
131 try {
+
132 return parseAndValidateNumber(number, c, -Double.MAX_VALUE, Double.MAX_VALUE);
+
133 } catch (NumberFormatException e) {
+
134 throw new InvalidCommandArgument(MessageKeys.MUST_BE_A_NUMBER, "{num}", number);
+
135 }
+
136 });
+
137 registerContext(BigDecimal.class, (c) -> {
+
138 String numberStr = c.popFirstArg();
+
139 try {
+
140 BigDecimal number = ACFUtil.parseBigNumber(numberStr, c.hasFlag("suffixes"));
+
141 validateMinMax(c, number);
+
142 return number;
+
143 } catch (NumberFormatException e) {
+
144 throw new InvalidCommandArgument(MessageKeys.MUST_BE_A_NUMBER, "{num}", numberStr);
+
145 }
+
146 });
+
147 registerContext(BigInteger.class, (c) -> {
+
148 String numberStr = c.popFirstArg();
+
149 try {
+
150 BigDecimal number = ACFUtil.parseBigNumber(numberStr, c.hasFlag("suffixes"));
+
151 validateMinMax(c, number);
+
152 return number.toBigIntegerExact();
+
153 } catch (NumberFormatException e) {
+
154 throw new InvalidCommandArgument(MessageKeys.MUST_BE_A_NUMBER, "{num}", numberStr);
+
155 }
+
156 });
+
157 registerContext(Boolean.class, (c) -> ACFUtil.isTruthy(c.popFirstArg()));
+
158 registerContext(boolean.class, (c) -> ACFUtil.isTruthy(c.popFirstArg()));
+
159 registerContext(char.class, c -> {
+
160 String s = c.popFirstArg();
+
161 if (s.length() > 1) {
+
162 throw new InvalidCommandArgument(MessageKeys.MUST_BE_MAX_LENGTH, "{max}", String.valueOf(1));
+
163 }
+
164 return s.charAt(0);
+
165 });
+
166 registerContext(String.class, (c) -> {
+
167 // This will fail fast, its either in the values or its not
+
168 if (c.hasAnnotation(Values.class)) {
+
169 return c.popFirstArg();
+
170 }
+
171 String ret = (c.isLastArg() && !c.hasAnnotation(Single.class)) ?
+
172 ACFUtil.join(c.getArgs())
+
173 :
+
174 c.popFirstArg();
175
-
176 return ret;
-
177 });
-
178 registerContext(String[].class, (c) -> {
-
179 String val;
-
180 List<String> args = c.getArgs();
-
181 if (c.isLastArg() && !c.hasAnnotation(Single.class)) {
-
182 val = ACFUtil.join(args);
-
183 } else {
-
184 val = c.popFirstArg();
-
185 }
-
186 String split = c.getAnnotationValue(Split.class, Annotations.NOTHING | Annotations.NO_EMPTY);
-
187 if (split != null) {
-
188 if (val.isEmpty()) {
-
189 throw new InvalidCommandArgument();
-
190 }
-
191 return ACFPatterns.getPattern(split).split(val);
-
192 } else if (!c.isLastArg()) {
-
193 ACFUtil.sneaky(new IllegalStateException("Weird Command signature... String[] should be last or @Split"));
-
194 }
-
195
-
196 String[] result = args.toArray(new String[0]);
-
197 args.clear();
-
198 return result;
-
199 });
-
200
-
201 registerContext(Enum.class, (c) -> {
-
202 final String first = c.popFirstArg();
-
203 //noinspection unchecked
-
204 Class<? extends Enum<?>> enumCls = (Class<? extends Enum<?>>) c.getParam().getType();
-
205 Enum<?> match = ACFUtil.simpleMatch(enumCls, first);
-
206 if (match == null) {
-
207 List<String> names = ACFUtil.enumNames(enumCls);
-
208 throw new InvalidCommandArgument(MessageKeys.PLEASE_SPECIFY_ONE_OF, "{valid}", ACFUtil.join(names, ", "));
-
209 }
-
210 return match;
-
211 });
-
212 registerOptionalContext(CommandHelp.class, (c) -> {
-
213 String first = c.getFirstArg();
-
214 String last = c.getLastArg();
-
215 int page = 1;
-
216 List<String> search = null;
-
217 if (last != null && ACFUtil.isInteger(last)) {
-
218 c.popLastArg();
-
219 page = ACFUtil.parseInt(last);
-
220 if (!c.getArgs().isEmpty()) {
-
221 search = c.getArgs();
-
222 }
-
223 } else if (first != null && ACFUtil.isInteger(first)) {
-
224 c.popFirstArg();
-
225 page = ACFUtil.parseInt(first);
-
226 if (!c.getArgs().isEmpty()) {
-
227 search = c.getArgs();
-
228 }
-
229 } else if (!c.getArgs().isEmpty()) {
-
230 search = c.getArgs();
-
231 }
-
232 CommandHelp commandHelp = manager.generateCommandHelp();
-
233 commandHelp.setPage(page);
-
234 Integer perPage = c.getFlagValue("perpage", (Integer) null);
-
235 if (perPage != null) {
-
236 commandHelp.setPerPage(perPage);
-
237 }
-
238
-
239 // check if we have an exact match and should display the help page for that sub command instead
-
240 if (search != null) {
-
241 String cmd = String.join(" ", search);
-
242 if (commandHelp.testExactMatch(cmd)) {
-
243 return commandHelp;
-
244 }
-
245 }
-
246
-
247 commandHelp.setSearch(search);
-
248 return commandHelp;
-
249 });
-
250 }
+
176 Integer minLen = c.getFlagValue("minlen", (Integer) null);
+
177 Integer maxLen = c.getFlagValue("maxlen", (Integer) null);
+
178 if (minLen != null) {
+
179 if (ret.length() < minLen) {
+
180 throw new InvalidCommandArgument(MessageKeys.MUST_BE_MIN_LENGTH, "{min}", String.valueOf(minLen));
+
181 }
+
182 }
+
183 if (maxLen != null) {
+
184 if (ret.length() > maxLen) {
+
185 throw new InvalidCommandArgument(MessageKeys.MUST_BE_MAX_LENGTH, "{max}", String.valueOf(maxLen));
+
186 }
+
187 }
+
188
+
189 return ret;
+
190 });
+
191 registerContext(String[].class, (c) -> {
+
192 String val;
+
193 List<String> args = c.getArgs();
+
194 if (c.isLastArg() && !c.hasAnnotation(Single.class)) {
+
195 val = ACFUtil.join(args);
+
196 } else {
+
197 val = c.popFirstArg();
+
198 }
+
199 String split = c.getAnnotationValue(Split.class, Annotations.NOTHING | Annotations.NO_EMPTY);
+
200 if (split != null) {
+
201 if (val.isEmpty()) {
+
202 throw new InvalidCommandArgument();
+
203 }
+
204 return ACFPatterns.getPattern(split).split(val);
+
205 } else if (!c.isLastArg()) {
+
206 ACFUtil.sneaky(new IllegalStateException("Weird Command signature... String[] should be last or @Split"));
+
207 }
+
208
+
209 String[] result = args.toArray(new String[0]);
+
210 args.clear();
+
211 return result;
+
212 });
+
213
+
214 registerContext(Enum.class, (c) -> {
+
215 final String first = c.popFirstArg();
+
216 //noinspection unchecked
+
217 Class<? extends Enum<?>> enumCls = (Class<? extends Enum<?>>) c.getParam().getType();
+
218 Enum<?> match = ACFUtil.simpleMatch(enumCls, first);
+
219 if (match == null) {
+
220 List<String> names = ACFUtil.enumNames(enumCls);
+
221 throw new InvalidCommandArgument(MessageKeys.PLEASE_SPECIFY_ONE_OF, "{valid}", ACFUtil.join(names, ", "));
+
222 }
+
223 return match;
+
224 });
+
225 registerOptionalContext(CommandHelp.class, (c) -> {
+
226 String first = c.getFirstArg();
+
227 String last = c.getLastArg();
+
228 int page = 1;
+
229 List<String> search = null;
+
230 if (last != null && ACFUtil.isInteger(last)) {
+
231 c.popLastArg();
+
232 page = ACFUtil.parseInt(last);
+
233 if (!c.getArgs().isEmpty()) {
+
234 search = c.getArgs();
+
235 }
+
236 } else if (first != null && ACFUtil.isInteger(first)) {
+
237 c.popFirstArg();
+
238 page = ACFUtil.parseInt(first);
+
239 if (!c.getArgs().isEmpty()) {
+
240 search = c.getArgs();
+
241 }
+
242 } else if (!c.getArgs().isEmpty()) {
+
243 search = c.getArgs();
+
244 }
+
245 CommandHelp commandHelp = manager.generateCommandHelp();
+
246 commandHelp.setPage(page);
+
247 Integer perPage = c.getFlagValue("perpage", (Integer) null);
+
248 if (perPage != null) {
+
249 commandHelp.setPerPage(perPage);
+
250 }
251
-
252 @NotNull
-
253 private Number parseAndValidateNumber(R c, Number minValue, Number maxValue) throws InvalidCommandArgument {
-
254 final Number val = ACFUtil.parseNumber(c.popFirstArg(), c.hasFlag("suffixes"));
-
255 validateMinMax(c, val, minValue, maxValue);
-
256 return val;
-
257 }
-
258
-
259 private void validateMinMax(R c, Number val) throws InvalidCommandArgument {
-
260 validateMinMax(c, val, null, null);
-
261 }
-
262
-
263 private void validateMinMax(R c, Number val, Number minValue, Number maxValue) throws InvalidCommandArgument {
-
264 minValue = c.getFlagValue("min", minValue);
-
265 maxValue = c.getFlagValue("max", maxValue);
-
266 if (maxValue != null && val.doubleValue() > maxValue.doubleValue()) {
-
267 throw new InvalidCommandArgument(MessageKeys.PLEASE_SPECIFY_AT_MOST, "{max}", String.valueOf(maxValue));
-
268 }
-
269 if (minValue != null && val.doubleValue() < minValue.doubleValue()) {
-
270 throw new InvalidCommandArgument(MessageKeys.PLEASE_SPECIFY_AT_LEAST, "{min}", String.valueOf(minValue));
-
271 }
-
272 }
-
273
-
274
-
275 /**
-
276 * @see #registerIssuerAwareContext(Class, IssuerAwareContextResolver)
-
277 * @deprecated Please switch to {@link #registerIssuerAwareContext(Class, IssuerAwareContextResolver)}
-
278 * as the core wants to use the platform agnostic term of "Issuer" instead of Sender
-
279 */
-
280 @Deprecated
-
281 public <T> void registerSenderAwareContext(Class<T> context, IssuerAwareContextResolver<T, R> supplier) {
-
282 contextMap.put(context, supplier);
-
283 }
-
284
-
285 /**
-
286 * Registers a context resolver that may conditionally consume input, falling back to using the context of the
-
287 * issuer to potentially fulfill this context.
-
288 * You may call {@link CommandExecutionContext#getFirstArg()} and then conditionally call {@link CommandExecutionContext#popFirstArg()}
-
289 * if you want to consume that input.
-
290 */
-
291 public <T> void registerIssuerAwareContext(Class<T> context, IssuerAwareContextResolver<T, R> supplier) {
-
292 contextMap.put(context, supplier);
-
293 }
-
294
-
295 /**
-
296 * Registers a context resolver that will never consume input. It will always satisfy its context based on the
-
297 * issuer of the command, so it will not appear in syntax strings.
-
298 */
-
299 public <T> void registerIssuerOnlyContext(Class<T> context, IssuerOnlyContextResolver<T, R> supplier) {
-
300 contextMap.put(context, supplier);
-
301 }
-
302
-
303 /**
-
304 * Registers a context that can safely accept a null input from the command issuer to resolve. This resolver should always
-
305 * call {@link CommandExecutionContext#popFirstArg()}
-
306 */
-
307 public <T> void registerOptionalContext(Class<T> context, OptionalContextResolver<T, R> supplier) {
-
308 contextMap.put(context, supplier);
-
309 }
-
310
-
311 /**
-
312 * Registers a context that requires input from the command issuer to resolve. This resolver should always
-
313 * call {@link CommandExecutionContext#popFirstArg()}
-
314 */
-
315 public <T> void registerContext(Class<T> context, ContextResolver<T, R> supplier) {
-
316 contextMap.put(context, supplier);
-
317 }
-
318
-
319 public ContextResolver<?, R> getResolver(Class<?> type) {
-
320 Class<?> rootType = type;
-
321 do {
-
322 if (type == Object.class) {
-
323 break;
-
324 }
-
325
-
326 final ContextResolver<?, R> resolver = contextMap.get(type);
-
327 if (resolver != null) {
-
328 return resolver;
-
329 }
-
330 } while ((type = type.getSuperclass()) != null);
+
252 // check if we have an exact match and should display the help page for that sub command instead
+
253 if (search != null) {
+
254 String cmd = String.join(" ", search);
+
255 if (commandHelp.testExactMatch(cmd)) {
+
256 return commandHelp;
+
257 }
+
258 }
+
259
+
260 commandHelp.setSearch(search);
+
261 return commandHelp;
+
262 });
+
263 }
+
264
+
265 @NotNull
+
266 private Number parseAndValidateNumber(String number, R c, Number minValue, Number maxValue) throws InvalidCommandArgument {
+
267 final Number val = ACFUtil.parseNumber(number, c.hasFlag("suffixes"));
+
268 validateMinMax(c, val, minValue, maxValue);
+
269 return val;
+
270 }
+
271
+
272 private void validateMinMax(R c, Number val) throws InvalidCommandArgument {
+
273 validateMinMax(c, val, null, null);
+
274 }
+
275
+
276 private void validateMinMax(R c, Number val, Number minValue, Number maxValue) throws InvalidCommandArgument {
+
277 minValue = c.getFlagValue("min", minValue);
+
278 maxValue = c.getFlagValue("max", maxValue);
+
279 if (maxValue != null && val.doubleValue() > maxValue.doubleValue()) {
+
280 throw new InvalidCommandArgument(MessageKeys.PLEASE_SPECIFY_AT_MOST, "{max}", String.valueOf(maxValue));
+
281 }
+
282 if (minValue != null && val.doubleValue() < minValue.doubleValue()) {
+
283 throw new InvalidCommandArgument(MessageKeys.PLEASE_SPECIFY_AT_LEAST, "{min}", String.valueOf(minValue));
+
284 }
+
285 }
+
286
+
287
+
288 /**
+
289 * @see #registerIssuerAwareContext(Class, IssuerAwareContextResolver)
+
290 * @deprecated Please switch to {@link #registerIssuerAwareContext(Class, IssuerAwareContextResolver)}
+
291 * as the core wants to use the platform agnostic term of "Issuer" instead of Sender
+
292 */
+
293 @Deprecated
+
294 public <T> void registerSenderAwareContext(Class<T> context, IssuerAwareContextResolver<T, R> supplier) {
+
295 contextMap.put(context, supplier);
+
296 }
+
297
+
298 /**
+
299 * Registers a context resolver that may conditionally consume input, falling back to using the context of the
+
300 * issuer to potentially fulfill this context.
+
301 * You may call {@link CommandExecutionContext#getFirstArg()} and then conditionally call {@link CommandExecutionContext#popFirstArg()}
+
302 * if you want to consume that input.
+
303 */
+
304 public <T> void registerIssuerAwareContext(Class<T> context, IssuerAwareContextResolver<T, R> supplier) {
+
305 contextMap.put(context, supplier);
+
306 }
+
307
+
308 /**
+
309 * Registers a context resolver that will never consume input. It will always satisfy its context based on the
+
310 * issuer of the command, so it will not appear in syntax strings.
+
311 */
+
312 public <T> void registerIssuerOnlyContext(Class<T> context, IssuerOnlyContextResolver<T, R> supplier) {
+
313 contextMap.put(context, supplier);
+
314 }
+
315
+
316 /**
+
317 * Registers a context that can safely accept a null input from the command issuer to resolve. This resolver should always
+
318 * call {@link CommandExecutionContext#popFirstArg()}
+
319 */
+
320 public <T> void registerOptionalContext(Class<T> context, OptionalContextResolver<T, R> supplier) {
+
321 contextMap.put(context, supplier);
+
322 }
+
323
+
324 /**
+
325 * Registers a context that requires input from the command issuer to resolve. This resolver should always
+
326 * call {@link CommandExecutionContext#popFirstArg()}
+
327 */
+
328 public <T> void registerContext(Class<T> context, ContextResolver<T, R> supplier) {
+
329 contextMap.put(context, supplier);
+
330 }
331
-
332 this.manager.log(LogLevel.ERROR, "Could not find context resolver", new IllegalStateException("No context resolver defined for " + rootType.getName()));
-
333 return null;
-
334 }
-
335}
+
332 public ContextResolver<?, R> getResolver(Class<?> type) {
+
333 Class<?> rootType = type;
+
334 do {
+
335 if (type == Object.class) {
+
336 break;
+
337 }
+
338
+
339 final ContextResolver<?, R> resolver = contextMap.get(type);
+
340 if (resolver != null) {
+
341 return resolver;
+
342 }
+
343 } while ((type = type.getSuperclass()) != null);
+
344
+
345 this.manager.log(LogLevel.ERROR, "Could not find context resolver", new IllegalStateException("No context resolver defined for " + rootType.getName()));
+
346 return null;
+
347 }
+
348}
diff --git a/docs/acf-core/src-html/co/aikar/commands/CommandManager.html b/docs/acf-core/src-html/co/aikar/commands/CommandManager.html
index fe4ce6b9..414b474a 100644
--- a/docs/acf-core/src-html/co/aikar/commands/CommandManager.html
+++ b/docs/acf-core/src-html/co/aikar/commands/CommandManager.html
@@ -84,7 +84,7 @@
076
077 protected boolean usePerIssuerLocale = false;
078 protected List<IssuerLocaleChangedCallback<I>> localeChangedCallbacks = new ArrayList<>();
-
079 protected Set<Locale> supportedLanguages = new HashSet<>(Arrays.asList(Locales.ENGLISH, Locales.GERMAN, Locales.SPANISH, Locales.FRENCH, Locales.CZECH, Locales.PORTUGUESE, Locales.SWEDISH, Locales.NORWEGIAN_BOKMAAL, Locales.NORWEGIAN_NYNORSK, Locales.RUSSIAN, Locales.BULGARIAN));
+
079 protected Set<Locale> supportedLanguages = new HashSet<>(Arrays.asList(Locales.ENGLISH, Locales.GERMAN, Locales.SPANISH, Locales.FRENCH, Locales.CZECH, Locales.PORTUGUESE, Locales.SWEDISH, Locales.NORWEGIAN_BOKMAAL, Locales.NORWEGIAN_NYNORSK, Locales.RUSSIAN, Locales.BULGARIAN, Locales.HUNGARIAN));
080 protected Map<MessageType, MF> formatters = new IdentityHashMap<>();
081 protected MF defaultFormatter;
082 protected int defaultHelpPerPage = 10;
diff --git a/docs/acf-core/src-html/co/aikar/commands/Locales.html b/docs/acf-core/src-html/co/aikar/commands/Locales.html
index 59a7ab34..f7b6b39f 100644
--- a/docs/acf-core/src-html/co/aikar/commands/Locales.html
+++ b/docs/acf-core/src-html/co/aikar/commands/Locales.html
@@ -84,135 +84,136 @@
076 public static final Locale WELSH = new Locale("cy");
077 public static final Locale NORWEGIAN_BOKMAAL = new Locale("nb");
078 public static final Locale NORWEGIAN_NYNORSK = new Locale("nn");
-
079
-
080 private final CommandManager manager;
-
081 private final LocaleManager<CommandIssuer> localeManager;
-
082 private final Map<ClassLoader, SetMultimap<String, Locale>> loadedBundles = new HashMap<>();
-
083 private final List<ClassLoader> registeredClassLoaders = new ArrayList<>();
-
084
-
085 public Locales(CommandManager manager) {
-
086 this.manager = manager;
-
087 this.localeManager = LocaleManager.create(manager::getIssuerLocale);
-
088 this.addBundleClassLoader(this.getClass().getClassLoader());
-
089 }
-
090
-
091 public void loadLanguages() {
-
092 addMessageBundles("acf-core");
-
093 }
-
094
-
095 public Locale getDefaultLocale() {
-
096 return this.localeManager.getDefaultLocale();
-
097 }
-
098
-
099 public Locale setDefaultLocale(Locale locale) {
-
100 return this.localeManager.setDefaultLocale(locale);
-
101 }
-
102
-
103 /**
-
104 * Looks for all previously loaded bundles, and if any new Supported Languages have been added, load them.
-
105 */
-
106 public void loadMissingBundles() {
-
107 //noinspection unchecked
-
108 Set<Locale> supportedLanguages = manager.getSupportedLanguages();
-
109 for (Locale locale : supportedLanguages) {
-
110 for(SetMultimap<String, Locale> localeData: this.loadedBundles.values()) {
-
111 for (String bundleName : new HashSet<>(localeData.keys())) {
-
112 addMessageBundle(bundleName, locale);
-
113 }
-
114 }
-
115
-
116 }
-
117 }
-
118
-
119 public void addMessageBundles(String... bundleNames) {
-
120 for (String bundleName : bundleNames) {
-
121 //noinspection unchecked
-
122 Set<Locale> supportedLanguages = manager.getSupportedLanguages();
-
123 for (Locale locale : supportedLanguages) {
-
124 addMessageBundle(bundleName, locale);
-
125 }
-
126 }
-
127 }
-
128
-
129 public boolean addMessageBundle(String bundleName, Locale locale) {
-
130 boolean found = false;
-
131 for(ClassLoader classLoader: this.registeredClassLoaders) {
-
132 if(this.addMessageBundle(classLoader, bundleName, locale)) {
-
133 found = true;
-
134 }
-
135 }
-
136
-
137 return found;
-
138 }
-
139
-
140 public boolean addMessageBundle(ClassLoader classLoader, String bundleName, Locale locale) {
-
141 SetMultimap<String, Locale> classLoadersLocales = this.loadedBundles.getOrDefault(classLoader, HashMultimap.create());
-
142 if(!classLoadersLocales.containsEntry(bundleName, locale)) {
-
143 if(this.localeManager.addMessageBundle(classLoader, bundleName, locale)) {
-
144 classLoadersLocales.put(bundleName, locale);
-
145 this.loadedBundles.put(classLoader, classLoadersLocales);
-
146 return true;
-
147 }
-
148 }
-
149
-
150 return false;
-
151 }
-
152
-
153 public void addMessageStrings(Locale locale, @NotNull Map<String, String> messages) {
-
154 Map<MessageKey, String> map = new HashMap<>(messages.size());
-
155 messages.forEach((key, value) -> map.put(MessageKey.of(key), value));
-
156 this.localeManager.addMessages(locale, map);
-
157 }
-
158
-
159 public void addMessages(Locale locale, @NotNull Map<? extends MessageKeyProvider, String> messages) {
-
160 Map<MessageKey, String> messagesMap = new LinkedHashMap<>();
-
161 for (Map.Entry<? extends MessageKeyProvider, String> entry : messages.entrySet()) {
-
162 messagesMap.put(entry.getKey().getMessageKey(), entry.getValue());
-
163 }
-
164
-
165 this.localeManager.addMessages(locale, messagesMap);
-
166 }
-
167
-
168 public String addMessage(Locale locale, MessageKeyProvider key, String message) {
-
169 return this.localeManager.addMessage(locale, key.getMessageKey(), message);
-
170 }
-
171
-
172 public String getMessage(CommandIssuer issuer, MessageKeyProvider key) {
-
173 final MessageKey msgKey = key.getMessageKey();
-
174 String message = this.localeManager.getMessage(issuer, msgKey);
-
175 if (message == null) {
-
176 manager.log(LogLevel.ERROR, "Missing Language Key: " + msgKey.getKey());
-
177 message = "<MISSING_LANGUAGE_KEY:" + msgKey.getKey() + ">";
-
178 }
-
179 return message;
-
180 }
-
181
-
182 public String replaceI18NStrings(String message) {
-
183 if (message == null) {
-
184 return null;
-
185 }
-
186 Matcher matcher = ACFPatterns.I18N_STRING.matcher(message);
-
187 if (!matcher.find()) {
-
188 return message;
-
189 }
-
190
-
191 CommandIssuer issuer = CommandManager.getCurrentCommandIssuer();
-
192
-
193 matcher.reset();
-
194 StringBuffer sb = new StringBuffer(message.length());
-
195 while (matcher.find()) {
-
196 MessageKey key = MessageKey.of(matcher.group("key"));
-
197 matcher.appendReplacement(sb, Matcher.quoteReplacement(getMessage(issuer, key)));
-
198 }
-
199 matcher.appendTail(sb);
-
200 return sb.toString();
-
201 }
-
202
-
203 public boolean addBundleClassLoader(ClassLoader classLoader) {
-
204 return !this.registeredClassLoaders.contains(classLoader) && this.registeredClassLoaders.add(classLoader);
-
205
-
206 }
-
207}
+
079 public static final Locale HUNGARIAN = new Locale("hu");
+
080
+
081 private final CommandManager manager;
+
082 private final LocaleManager<CommandIssuer> localeManager;
+
083 private final Map<ClassLoader, SetMultimap<String, Locale>> loadedBundles = new HashMap<>();
+
084 private final List<ClassLoader> registeredClassLoaders = new ArrayList<>();
+
085
+
086 public Locales(CommandManager manager) {
+
087 this.manager = manager;
+
088 this.localeManager = LocaleManager.create(manager::getIssuerLocale);
+
089 this.addBundleClassLoader(this.getClass().getClassLoader());
+
090 }
+
091
+
092 public void loadLanguages() {
+
093 addMessageBundles("acf-core");
+
094 }
+
095
+
096 public Locale getDefaultLocale() {
+
097 return this.localeManager.getDefaultLocale();
+
098 }
+
099
+
100 public Locale setDefaultLocale(Locale locale) {
+
101 return this.localeManager.setDefaultLocale(locale);
+
102 }
+
103
+
104 /**
+
105 * Looks for all previously loaded bundles, and if any new Supported Languages have been added, load them.
+
106 */
+
107 public void loadMissingBundles() {
+
108 //noinspection unchecked
+
109 Set<Locale> supportedLanguages = manager.getSupportedLanguages();
+
110 for (Locale locale : supportedLanguages) {
+
111 for(SetMultimap<String, Locale> localeData: this.loadedBundles.values()) {
+
112 for (String bundleName : new HashSet<>(localeData.keys())) {
+
113 addMessageBundle(bundleName, locale);
+
114 }
+
115 }
+
116
+
117 }
+
118 }
+
119
+
120 public void addMessageBundles(String... bundleNames) {
+
121 for (String bundleName : bundleNames) {
+
122 //noinspection unchecked
+
123 Set<Locale> supportedLanguages = manager.getSupportedLanguages();
+
124 for (Locale locale : supportedLanguages) {
+
125 addMessageBundle(bundleName, locale);
+
126 }
+
127 }
+
128 }
+
129
+
130 public boolean addMessageBundle(String bundleName, Locale locale) {
+
131 boolean found = false;
+
132 for(ClassLoader classLoader: this.registeredClassLoaders) {
+
133 if(this.addMessageBundle(classLoader, bundleName, locale)) {
+
134 found = true;
+
135 }
+
136 }
+
137
+
138 return found;
+
139 }
+
140
+
141 public boolean addMessageBundle(ClassLoader classLoader, String bundleName, Locale locale) {
+
142 SetMultimap<String, Locale> classLoadersLocales = this.loadedBundles.getOrDefault(classLoader, HashMultimap.create());
+
143 if(!classLoadersLocales.containsEntry(bundleName, locale)) {
+
144 if(this.localeManager.addMessageBundle(classLoader, bundleName, locale)) {
+
145 classLoadersLocales.put(bundleName, locale);
+
146 this.loadedBundles.put(classLoader, classLoadersLocales);
+
147 return true;
+
148 }
+
149 }
+
150
+
151 return false;
+
152 }
+
153
+
154 public void addMessageStrings(Locale locale, @NotNull Map<String, String> messages) {
+
155 Map<MessageKey, String> map = new HashMap<>(messages.size());
+
156 messages.forEach((key, value) -> map.put(MessageKey.of(key), value));
+
157 this.localeManager.addMessages(locale, map);
+
158 }
+
159
+
160 public void addMessages(Locale locale, @NotNull Map<? extends MessageKeyProvider, String> messages) {
+
161 Map<MessageKey, String> messagesMap = new LinkedHashMap<>();
+
162 for (Map.Entry<? extends MessageKeyProvider, String> entry : messages.entrySet()) {
+
163 messagesMap.put(entry.getKey().getMessageKey(), entry.getValue());
+
164 }
+
165
+
166 this.localeManager.addMessages(locale, messagesMap);
+
167 }
+
168
+
169 public String addMessage(Locale locale, MessageKeyProvider key, String message) {
+
170 return this.localeManager.addMessage(locale, key.getMessageKey(), message);
+
171 }
+
172
+
173 public String getMessage(CommandIssuer issuer, MessageKeyProvider key) {
+
174 final MessageKey msgKey = key.getMessageKey();
+
175 String message = this.localeManager.getMessage(issuer, msgKey);
+
176 if (message == null) {
+
177 manager.log(LogLevel.ERROR, "Missing Language Key: " + msgKey.getKey());
+
178 message = "<MISSING_LANGUAGE_KEY:" + msgKey.getKey() + ">";
+
179 }
+
180 return message;
+
181 }
+
182
+
183 public String replaceI18NStrings(String message) {
+
184 if (message == null) {
+
185 return null;
+
186 }
+
187 Matcher matcher = ACFPatterns.I18N_STRING.matcher(message);
+
188 if (!matcher.find()) {
+
189 return message;
+
190 }
+
191
+
192 CommandIssuer issuer = CommandManager.getCurrentCommandIssuer();
+
193
+
194 matcher.reset();
+
195 StringBuffer sb = new StringBuffer(message.length());
+
196 while (matcher.find()) {
+
197 MessageKey key = MessageKey.of(matcher.group("key"));
+
198 matcher.appendReplacement(sb, Matcher.quoteReplacement(getMessage(issuer, key)));
+
199 }
+
200 matcher.appendTail(sb);
+
201 return sb.toString();
+
202 }
+
203
+
204 public boolean addBundleClassLoader(ClassLoader classLoader) {
+
205 return !this.registeredClassLoaders.contains(classLoader) && this.registeredClassLoaders.add(classLoader);
+
206
+
207 }
+
208}
diff --git a/docs/acf-core/src-html/co/aikar/commands/RegisteredCommand.html b/docs/acf-core/src-html/co/aikar/commands/RegisteredCommand.html
index 9597a0c5..69a286da 100644
--- a/docs/acf-core/src-html/co/aikar/commands/RegisteredCommand.html
+++ b/docs/acf-core/src-html/co/aikar/commands/RegisteredCommand.html
@@ -153,7 +153,7 @@
145 }
146 preCommand();
147 try {
-
148 this.manager.conditions.validateConditions(context);
+
148 this.manager.getCommandConditions().validateConditions(context);
149 Map<String, Object> passedArgs = resolveContexts(sender, args);
150 if (passedArgs == null) return;
151
@@ -264,7 +264,7 @@
256 throw new IllegalStateException("Parameter " + parameter.getName() + " is primitive and does not support Optional.");
257 }
258 //noinspection unchecked
-
259 this.manager.conditions.validateConditions(context, value);
+
259 this.manager.getCommandConditions().validateConditions(context, value);
260 passedArgs.put(parameterName, value);
261 continue;
262 } else if (requiresInput) {
@@ -304,7 +304,7 @@
296 Object paramValue = resolver.getContext(context);
297
298 //noinspection unchecked
-
299 this.manager.conditions.validateConditions(context, paramValue);
+
299 this.manager.getCommandConditions().validateConditions(context, paramValue);
300 passedArgs.put(parameterName, paramValue);
301 }
302 return passedArgs;
diff --git a/docs/acf-jda/co/aikar/commands/JDALocales.html b/docs/acf-jda/co/aikar/commands/JDALocales.html
index e8c38436..a57a5e1b 100644
--- a/docs/acf-jda/co/aikar/commands/JDALocales.html
+++ b/docs/acf-jda/co/aikar/commands/JDALocales.html
@@ -126,7 +126,7 @@ extends co.aikar.commands.Locales
Fields inherited from class co.aikar.commands.Locales
-
AFRIKAANS, ARABIC, BULGARIAN, CHINESE, CZECH, DANISH, DUTCH, ENGLISH, FINNISH, FRENCH, GERMAN, GREEK, HEBREW, HINDI, ITALIAN, JAPANESE, KOREAN, LATIN, NORWEGIAN_BOKMAAL, NORWEGIAN_NYNORSK, POLISH, PORTUGUESE, ROMANIAN, RUSSIAN, SIMPLIFIED_CHINESE, SPANISH, SWEDISH, THAI, TRADITIONAL_CHINESE, TURKISH, UKRANIAN, VIETNAMESE, WELSH
+
AFRIKAANS, ARABIC, BULGARIAN, CHINESE, CZECH, DANISH, DUTCH, ENGLISH, FINNISH, FRENCH, GERMAN, GREEK, HEBREW, HINDI, HUNGARIAN, ITALIAN, JAPANESE, KOREAN, LATIN, NORWEGIAN_BOKMAAL, NORWEGIAN_NYNORSK, POLISH, PORTUGUESE, ROMANIAN, RUSSIAN, SIMPLIFIED_CHINESE, SPANISH, SWEDISH, THAI, TRADITIONAL_CHINESE, TURKISH, UKRANIAN, VIETNAMESE, WELSH
diff --git a/docs/acf-sponge/co/aikar/commands/ACFSpongeUtil.html b/docs/acf-sponge/co/aikar/commands/ACFSpongeUtil.html
index f32e0d58..bc116555 100644
--- a/docs/acf-sponge/co/aikar/commands/ACFSpongeUtil.html
+++ b/docs/acf-sponge/co/aikar/commands/ACFSpongeUtil.html
@@ -213,7 +213,7 @@ extends
matchPlayer
-public static List<org.spongepowered.api.entity.living.player.Player> matchPlayer(String partialName)
+public static List<org.spongepowered.api.entity.living.player.Player> matchPlayer(String partialName)
@@ -222,7 +222,7 @@ extends
isValidName
-public static boolean isValidName(String name)
+public static boolean isValidName(String name)
diff --git a/docs/acf-sponge/co/aikar/commands/SpongeLocales.html b/docs/acf-sponge/co/aikar/commands/SpongeLocales.html
index 537a291a..4f3c4314 100644
--- a/docs/acf-sponge/co/aikar/commands/SpongeLocales.html
+++ b/docs/acf-sponge/co/aikar/commands/SpongeLocales.html
@@ -132,7 +132,7 @@ extends co.aikar.commands.Locales
Fields inherited from class co.aikar.commands.Locales
-
AFRIKAANS, ARABIC, BULGARIAN, CHINESE, CZECH, DANISH, DUTCH, ENGLISH, FINNISH, FRENCH, GERMAN, GREEK, HEBREW, HINDI, ITALIAN, JAPANESE, KOREAN, LATIN, NORWEGIAN_BOKMAAL, NORWEGIAN_NYNORSK, POLISH, PORTUGUESE, ROMANIAN, RUSSIAN, SIMPLIFIED_CHINESE, SPANISH, SWEDISH, THAI, TRADITIONAL_CHINESE, TURKISH, UKRANIAN, VIETNAMESE, WELSH
+
AFRIKAANS, ARABIC, BULGARIAN, CHINESE, CZECH, DANISH, DUTCH, ENGLISH, FINNISH, FRENCH, GERMAN, GREEK, HEBREW, HINDI, HUNGARIAN, ITALIAN, JAPANESE, KOREAN, LATIN, NORWEGIAN_BOKMAAL, NORWEGIAN_NYNORSK, POLISH, PORTUGUESE, ROMANIAN, RUSSIAN, SIMPLIFIED_CHINESE, SPANISH, SWEDISH, THAI, TRADITIONAL_CHINESE, TURKISH, UKRANIAN, VIETNAMESE, WELSH
diff --git a/docs/acf-sponge/src-html/co/aikar/commands/ACFSpongeUtil.html b/docs/acf-sponge/src-html/co/aikar/commands/ACFSpongeUtil.html
index f3c5c465..e23d2ab6 100644
--- a/docs/acf-sponge/src-html/co/aikar/commands/ACFSpongeUtil.html
+++ b/docs/acf-sponge/src-html/co/aikar/commands/ACFSpongeUtil.html
@@ -25,87 +25,83 @@
017 return null;
018 }
019 String name = ACFUtil.replace(search, ":confirm", "");
-
020 if (name.length() < 3) {
-
021 issuer.sendError(MinecraftMessageKeys.USERNAME_TOO_SHORT);
+
020 if (!isValidName(name)) {
+
021 issuer.sendError(MinecraftMessageKeys.IS_NOT_A_VALID_NAME, "{name}", name);
022 return null;
023 }
-
024 if (!isValidName(name)) {
-
025 issuer.sendError(MinecraftMessageKeys.IS_NOT_A_VALID_NAME, "{name}", name);
-
026 return null;
-
027 }
+
024
+
025 List<Player> matches = matchPlayer(name);
+
026 List<Player> confirmList = new ArrayList<>();
+
027 findMatches(search, requester, matches, confirmList);
028
-
029 List<Player> matches = matchPlayer(name);
-
030 List<Player> confirmList = new ArrayList<>();
-
031 findMatches(search, requester, matches, confirmList);
-
032
-
033
-
034 if (matches.size() > 1 || confirmList.size() > 1) {
-
035 String allMatches = matches.stream().map(Player::getName).collect(Collectors.joining(", "));
-
036 issuer.sendError(MinecraftMessageKeys.MULTIPLE_PLAYERS_MATCH,
-
037 "{search}", name, "{all}", allMatches);
-
038 return null;
-
039 }
-
040
-
041 if (matches.isEmpty()) {
-
042 Player player = ACFUtil.getFirstElement(confirmList);
-
043 if (player == null) {
-
044 issuer.sendError(MinecraftMessageKeys.NO_PLAYER_FOUND_SERVER, "{search}", name);
+
029
+
030 if (matches.size() > 1 || confirmList.size() > 1) {
+
031 String allMatches = matches.stream().map(Player::getName).collect(Collectors.joining(", "));
+
032 issuer.sendError(MinecraftMessageKeys.MULTIPLE_PLAYERS_MATCH,
+
033 "{search}", name, "{all}", allMatches);
+
034 return null;
+
035 }
+
036
+
037 if (matches.isEmpty()) {
+
038 Player player = ACFUtil.getFirstElement(confirmList);
+
039 if (player == null) {
+
040 issuer.sendError(MinecraftMessageKeys.NO_PLAYER_FOUND_SERVER, "{search}", name);
+
041 return null;
+
042 } else {
+
043
+
044 issuer.sendInfo(MinecraftMessageKeys.PLAYER_IS_VANISHED_CONFIRM, "{vanished}", player.getName());
045 return null;
-
046 } else {
-
047
-
048 issuer.sendInfo(MinecraftMessageKeys.PLAYER_IS_VANISHED_CONFIRM, "{vanished}", player.getName());
-
049 return null;
-
050 }
-
051 }
-
052
-
053 return matches.get(0);
-
054 }
-
055
-
056 private static void findMatches(String search, CommandSource requester, List<Player> matches, List<Player> confirmList) {
-
057 // Remove vanished players from smart matching.
-
058 Iterator<Player> iter = matches.iterator();
-
059 //noinspection Duplicates
-
060 while (iter.hasNext()) {
-
061 Player player = iter.next();
-
062 if (requester instanceof Player && !((Player) requester).canSee(player)) {
-
063 if (requester.hasPermission("acf.seevanish")) {
-
064 if (!search.endsWith(":confirm")) {
-
065 confirmList.add(player);
-
066 iter.remove();
-
067 }
-
068 } else {
-
069 iter.remove();
-
070 }
-
071 }
-
072 }
-
073 }
-
074
-
075 public static List<Player> matchPlayer(String partialName) {
-
076 List<Player> matchedPlayers = new ArrayList<>();
-
077
-
078 for (Player iterPlayer : Sponge.getServer().getOnlinePlayers()) {
-
079 String iterPlayerName = iterPlayer.getName();
-
080
-
081 if (partialName.equalsIgnoreCase(iterPlayerName)) {
-
082 // Exact match
-
083 matchedPlayers.clear();
-
084 matchedPlayers.add(iterPlayer);
-
085 break;
+
046 }
+
047 }
+
048
+
049 return matches.get(0);
+
050 }
+
051
+
052 private static void findMatches(String search, CommandSource requester, List<Player> matches, List<Player> confirmList) {
+
053 // Remove vanished players from smart matching.
+
054 Iterator<Player> iter = matches.iterator();
+
055 //noinspection Duplicates
+
056 while (iter.hasNext()) {
+
057 Player player = iter.next();
+
058 if (requester instanceof Player && !((Player) requester).canSee(player)) {
+
059 if (requester.hasPermission("acf.seevanish")) {
+
060 if (!search.endsWith(":confirm")) {
+
061 confirmList.add(player);
+
062 iter.remove();
+
063 }
+
064 } else {
+
065 iter.remove();
+
066 }
+
067 }
+
068 }
+
069 }
+
070
+
071 public static List<Player> matchPlayer(String partialName) {
+
072 List<Player> matchedPlayers = new ArrayList<>();
+
073
+
074 for (Player iterPlayer : Sponge.getServer().getOnlinePlayers()) {
+
075 String iterPlayerName = iterPlayer.getName();
+
076
+
077 if (partialName.equalsIgnoreCase(iterPlayerName)) {
+
078 // Exact match
+
079 matchedPlayers.clear();
+
080 matchedPlayers.add(iterPlayer);
+
081 break;
+
082 }
+
083 if (iterPlayerName.toLowerCase(java.util.Locale.ENGLISH).contains(partialName.toLowerCase(java.util.Locale.ENGLISH))) {
+
084 // Partial match
+
085 matchedPlayers.add(iterPlayer);
086 }
-
087 if (iterPlayerName.toLowerCase(java.util.Locale.ENGLISH).contains(partialName.toLowerCase(java.util.Locale.ENGLISH))) {
-
088 // Partial match
-
089 matchedPlayers.add(iterPlayer);
-
090 }
-
091 }
-
092
-
093 return matchedPlayers;
+
087 }
+
088
+
089 return matchedPlayers;
+
090 }
+
091
+
092 public static boolean isValidName(String name) {
+
093 return name != null && !name.isEmpty() && ACFPatterns.VALID_NAME_PATTERN.matcher(name).matches();
094 }
095
-
096 public static boolean isValidName(String name) {
-
097 return name != null && !name.isEmpty() && ACFPatterns.VALID_NAME_PATTERN.matcher(name).matches();
-
098 }
-
099
-
100}
+
096}
diff --git a/docs/acf-velocity/co/aikar/commands/ACFVelocityUtil.html b/docs/acf-velocity/co/aikar/commands/ACFVelocityUtil.html
index e8dbeaa6..bd3012f0 100644
--- a/docs/acf-velocity/co/aikar/commands/ACFVelocityUtil.html
+++ b/docs/acf-velocity/co/aikar/commands/ACFVelocityUtil.html
@@ -230,7 +230,7 @@ extends
isValidName
-public static boolean isValidName(String name)
+public static boolean isValidName(String name)
@@ -241,7 +241,7 @@ extends
validate
-public static <T> T validate(T object,
+public static <T> T validate(T object,
String message,
Object... values)
diff --git a/docs/acf-velocity/co/aikar/commands/VelocityLocales.html b/docs/acf-velocity/co/aikar/commands/VelocityLocales.html
index f22084bf..af054fc3 100644
--- a/docs/acf-velocity/co/aikar/commands/VelocityLocales.html
+++ b/docs/acf-velocity/co/aikar/commands/VelocityLocales.html
@@ -132,7 +132,7 @@ extends co.aikar.commands.Locales
Fields inherited from class co.aikar.commands.Locales
-
AFRIKAANS, ARABIC, BULGARIAN, CHINESE, CZECH, DANISH, DUTCH, ENGLISH, FINNISH, FRENCH, GERMAN, GREEK, HEBREW, HINDI, ITALIAN, JAPANESE, KOREAN, LATIN, NORWEGIAN_BOKMAAL, NORWEGIAN_NYNORSK, POLISH, PORTUGUESE, ROMANIAN, RUSSIAN, SIMPLIFIED_CHINESE, SPANISH, SWEDISH, THAI, TRADITIONAL_CHINESE, TURKISH, UKRANIAN, VIETNAMESE, WELSH
+
AFRIKAANS, ARABIC, BULGARIAN, CHINESE, CZECH, DANISH, DUTCH, ENGLISH, FINNISH, FRENCH, GERMAN, GREEK, HEBREW, HINDI, HUNGARIAN, ITALIAN, JAPANESE, KOREAN, LATIN, NORWEGIAN_BOKMAAL, NORWEGIAN_NYNORSK, POLISH, PORTUGUESE, ROMANIAN, RUSSIAN, SIMPLIFIED_CHINESE, SPANISH, SWEDISH, THAI, TRADITIONAL_CHINESE, TURKISH, UKRANIAN, VIETNAMESE, WELSH
diff --git a/docs/acf-velocity/src-html/co/aikar/commands/ACFVelocityUtil.html b/docs/acf-velocity/src-html/co/aikar/commands/ACFVelocityUtil.html
index ff1784f5..f551aae8 100644
--- a/docs/acf-velocity/src-html/co/aikar/commands/ACFVelocityUtil.html
+++ b/docs/acf-velocity/src-html/co/aikar/commands/ACFVelocityUtil.html
@@ -20,76 +20,72 @@
012import com.velocitypowered.api.proxy.ProxyServer;
013
014import net.kyori.text.TextComponent;
-
015import net.kyori.text.serializer.ComponentSerializers;
+
015import net.kyori.text.serializer.legacy.LegacyComponentSerializer;
016
017public class ACFVelocityUtil {
018
019 @SuppressWarnings("deprecation")
020 public static TextComponent color(String message) {
-
021 return ComponentSerializers.LEGACY.deserialize(message);
+
021 return LegacyComponentSerializer.legacy().deserialize(message);
022 }
023
024 public static Player findPlayerSmart(ProxyServer server, CommandIssuer issuer, String search) {
025 CommandSource requester = issuer.getIssuer();
026 String name = ACFUtil.replace(search, ":confirm", "");
-
027 if (name.length() < 3) {
-
028 issuer.sendError(MinecraftMessageKeys.USERNAME_TOO_SHORT);
+
027 if (!isValidName(name)) {
+
028 issuer.sendError(MinecraftMessageKeys.IS_NOT_A_VALID_NAME, "{name}", name);
029 return null;
030 }
-
031 if (!isValidName(name)) {
-
032 issuer.sendError(MinecraftMessageKeys.IS_NOT_A_VALID_NAME, "{name}", name);
-
033 return null;
-
034 }
-
035
-
036 List<Player> matches = new ArrayList<>(matchPlayer(server, name));
-
037
-
038 if (matches.size() > 1) {
-
039 String allMatches = matches.stream().map(Player::getUsername).collect(Collectors.joining(", "));
-
040 issuer.sendError(MinecraftMessageKeys.MULTIPLE_PLAYERS_MATCH, "{search}", name, "{all}", allMatches);
-
041 return null;
-
042 }
-
043
-
044 if (matches.isEmpty()) {
-
045 issuer.sendError(MinecraftMessageKeys.NO_PLAYER_FOUND_SERVER, "{search}", name);
-
046 return null;
-
047 }
-
048
-
049 return matches.get(0);
-
050 }
-
051
-
052 /*
-
053 * Original code written by md_5
-
054 *
-
055 * Modified to work with Velocity by Crypnotic
-
056 */
-
057 private static Collection<Player> matchPlayer(ProxyServer server, final String partialName) {
-
058 // A better error message might be nice. This just mimics the previous output
-
059 if (partialName == null) {
-
060 throw new NullPointerException("partialName");
-
061 }
-
062
-
063 Optional<Player> exactMatch = server.getPlayer(partialName);
-
064 //noinspection OptionalIsPresent
-
065 if (exactMatch.isPresent()) {
-
066 return Collections.singleton(exactMatch.get());
-
067 }
-
068
-
069 return server.getAllPlayers().stream()
-
070 .filter(player -> player.getUsername().regionMatches(true, 0, partialName, 0, partialName.length()))
-
071 .collect(Collectors.toList());
+
031
+
032 List<Player> matches = new ArrayList<>(matchPlayer(server, name));
+
033
+
034 if (matches.size() > 1) {
+
035 String allMatches = matches.stream().map(Player::getUsername).collect(Collectors.joining(", "));
+
036 issuer.sendError(MinecraftMessageKeys.MULTIPLE_PLAYERS_MATCH, "{search}", name, "{all}", allMatches);
+
037 return null;
+
038 }
+
039
+
040 if (matches.isEmpty()) {
+
041 issuer.sendError(MinecraftMessageKeys.NO_PLAYER_FOUND_SERVER, "{search}", name);
+
042 return null;
+
043 }
+
044
+
045 return matches.get(0);
+
046 }
+
047
+
048 /*
+
049 * Original code written by md_5
+
050 *
+
051 * Modified to work with Velocity by Crypnotic
+
052 */
+
053 private static Collection<Player> matchPlayer(ProxyServer server, final String partialName) {
+
054 // A better error message might be nice. This just mimics the previous output
+
055 if (partialName == null) {
+
056 throw new NullPointerException("partialName");
+
057 }
+
058
+
059 Optional<Player> exactMatch = server.getPlayer(partialName);
+
060 //noinspection OptionalIsPresent
+
061 if (exactMatch.isPresent()) {
+
062 return Collections.singleton(exactMatch.get());
+
063 }
+
064
+
065 return server.getAllPlayers().stream()
+
066 .filter(player -> player.getUsername().regionMatches(true, 0, partialName, 0, partialName.length()))
+
067 .collect(Collectors.toList());
+
068 }
+
069
+
070 public static boolean isValidName(String name) {
+
071 return name != null && !name.isEmpty() && ACFPatterns.VALID_NAME_PATTERN.matcher(name).matches();
072 }
073
-
074 public static boolean isValidName(String name) {
-
075 return name != null && !name.isEmpty() && ACFPatterns.VALID_NAME_PATTERN.matcher(name).matches();
-
076 }
-
077
-
078 public static <T> T validate(T object, String message, Object... values) {
-
079 if (object == null) {
-
080 throw new NullPointerException(String.format(message, values));
-
081 }
-
082 return object;
-
083 }
-
084}
+
074 public static <T> T validate(T object, String message, Object... values) {
+
075 if (object == null) {
+
076 throw new NullPointerException(String.format(message, values));
+
077 }
+
078 return object;
+
079 }
+
080}
diff --git a/docs/acf-velocity/src-html/co/aikar/commands/VelocityMessageFormatter.html b/docs/acf-velocity/src-html/co/aikar/commands/VelocityMessageFormatter.html
index 11783aec..071a4752 100644
--- a/docs/acf-velocity/src-html/co/aikar/commands/VelocityMessageFormatter.html
+++ b/docs/acf-velocity/src-html/co/aikar/commands/VelocityMessageFormatter.html
@@ -9,7 +9,7 @@
001package co.aikar.commands;
002
003import net.kyori.text.format.TextColor;
-004import net.kyori.text.serializer.ComponentSerializers;
+004import net.kyori.text.serializer.legacy.LegacyComponentSerializer;
005
006public class VelocityMessageFormatter extends MessageFormatter<TextColor> {
007
@@ -20,7 +20,7 @@
012 @Override
013 @SuppressWarnings("deprecation")
014 String format(TextColor color, String message) {
-015 return ComponentSerializers.LEGACY.serialize(ComponentSerializers.LEGACY.deserialize(message).color(color));
+015 return LegacyComponentSerializer.legacy().serialize(LegacyComponentSerializer.legacy().deserialize(message).color(color));
016 }
017}