Commit Graph

665 Commits

Author SHA1 Message Date
chickeneer 37f89ba7be Merge branch 'master' into AlbeMiglio_master
# Conflicts:
#	docs/acf-brigadier/allclasses-index.html
#	docs/acf-brigadier/allpackages-index.html
#	docs/acf-brigadier/co/aikar/commands/ACFBrigadierManager.html
#	docs/acf-brigadier/co/aikar/commands/class-use/ACFBrigadierManager.html
#	docs/acf-brigadier/co/aikar/commands/package-summary.html
#	docs/acf-brigadier/co/aikar/commands/package-tree.html
#	docs/acf-brigadier/co/aikar/commands/package-use.html
#	docs/acf-brigadier/deprecated-list.html
#	docs/acf-brigadier/index-all.html
#	docs/acf-brigadier/index.html
#	docs/acf-brigadier/overview-tree.html
#	docs/acf-bukkit/allclasses-index.html
#	docs/acf-bukkit/allpackages-index.html
#	docs/acf-bukkit/co/aikar/commands/ACFBukkitHelpTopic.html
#	docs/acf-bukkit/co/aikar/commands/ACFBukkitUtil.html
#	docs/acf-bukkit/co/aikar/commands/BukkitCommandCompletionContext.html
#	docs/acf-bukkit/co/aikar/commands/BukkitCommandCompletions.html
#	docs/acf-bukkit/co/aikar/commands/BukkitCommandContexts.html
#	docs/acf-bukkit/co/aikar/commands/BukkitCommandExecutionContext.html
#	docs/acf-bukkit/co/aikar/commands/BukkitCommandIssuer.html
#	docs/acf-bukkit/co/aikar/commands/BukkitCommandManager.html
#	docs/acf-bukkit/co/aikar/commands/BukkitConditionContext.html
#	docs/acf-bukkit/co/aikar/commands/BukkitLocales.html
#	docs/acf-bukkit/co/aikar/commands/BukkitMessageFormatter.html
#	docs/acf-bukkit/co/aikar/commands/BukkitRegisteredCommand.html
#	docs/acf-bukkit/co/aikar/commands/BukkitRootCommand.html
#	docs/acf-bukkit/co/aikar/commands/MinecraftMessageKeys.html
#	docs/acf-bukkit/co/aikar/commands/bukkit/contexts/OnlinePlayer.html
#	docs/acf-bukkit/co/aikar/commands/bukkit/contexts/class-use/OnlinePlayer.html
#	docs/acf-bukkit/co/aikar/commands/bukkit/contexts/package-summary.html
#	docs/acf-bukkit/co/aikar/commands/bukkit/contexts/package-tree.html
#	docs/acf-bukkit/co/aikar/commands/bukkit/contexts/package-use.html
#	docs/acf-bukkit/co/aikar/commands/class-use/ACFBukkitHelpTopic.html
#	docs/acf-bukkit/co/aikar/commands/class-use/ACFBukkitUtil.html
#	docs/acf-bukkit/co/aikar/commands/class-use/BukkitCommandCompletionContext.html
#	docs/acf-bukkit/co/aikar/commands/class-use/BukkitCommandCompletions.html
#	docs/acf-bukkit/co/aikar/commands/class-use/BukkitCommandContexts.html
#	docs/acf-bukkit/co/aikar/commands/class-use/BukkitCommandExecutionContext.html
#	docs/acf-bukkit/co/aikar/commands/class-use/BukkitCommandIssuer.html
#	docs/acf-bukkit/co/aikar/commands/class-use/BukkitCommandManager.html
#	docs/acf-bukkit/co/aikar/commands/class-use/BukkitConditionContext.html
#	docs/acf-bukkit/co/aikar/commands/class-use/BukkitLocales.html
#	docs/acf-bukkit/co/aikar/commands/class-use/BukkitMessageFormatter.html
#	docs/acf-bukkit/co/aikar/commands/class-use/BukkitRegisteredCommand.html
#	docs/acf-bukkit/co/aikar/commands/class-use/BukkitRootCommand.html
#	docs/acf-bukkit/co/aikar/commands/class-use/MinecraftMessageKeys.html
#	docs/acf-bukkit/co/aikar/commands/contexts/OnlinePlayer.html
#	docs/acf-bukkit/co/aikar/commands/contexts/class-use/OnlinePlayer.html
#	docs/acf-bukkit/co/aikar/commands/contexts/package-summary.html
#	docs/acf-bukkit/co/aikar/commands/contexts/package-tree.html
#	docs/acf-bukkit/co/aikar/commands/contexts/package-use.html
#	docs/acf-bukkit/co/aikar/commands/package-summary.html
#	docs/acf-bukkit/co/aikar/commands/package-tree.html
#	docs/acf-bukkit/co/aikar/commands/package-use.html
#	docs/acf-bukkit/deprecated-list.html
#	docs/acf-bukkit/index-all.html
#	docs/acf-bukkit/index.html
#	docs/acf-bukkit/overview-summary.html
#	docs/acf-bukkit/overview-tree.html
#	docs/acf-bungee/allclasses-index.html
#	docs/acf-bungee/allpackages-index.html
#	docs/acf-bungee/co/aikar/commands/ACFBungeeListener.html
#	docs/acf-bungee/co/aikar/commands/ACFBungeeUtil.html
#	docs/acf-bungee/co/aikar/commands/BungeeCommandCompletionContext.html
#	docs/acf-bungee/co/aikar/commands/BungeeCommandCompletions.html
#	docs/acf-bungee/co/aikar/commands/BungeeCommandContexts.html
#	docs/acf-bungee/co/aikar/commands/BungeeCommandExecutionContext.html
#	docs/acf-bungee/co/aikar/commands/BungeeCommandIssuer.html
#	docs/acf-bungee/co/aikar/commands/BungeeCommandManager.html
#	docs/acf-bungee/co/aikar/commands/BungeeConditionContext.html
#	docs/acf-bungee/co/aikar/commands/BungeeLocales.html
#	docs/acf-bungee/co/aikar/commands/BungeeMessageFormatter.html
#	docs/acf-bungee/co/aikar/commands/BungeeRegisteredCommand.html
#	docs/acf-bungee/co/aikar/commands/BungeeRootCommand.html
#	docs/acf-bungee/co/aikar/commands/MinecraftMessageKeys.html
#	docs/acf-bungee/co/aikar/commands/bungee/contexts/OnlinePlayer.html
#	docs/acf-bungee/co/aikar/commands/bungee/contexts/class-use/OnlinePlayer.html
#	docs/acf-bungee/co/aikar/commands/bungee/contexts/package-summary.html
#	docs/acf-bungee/co/aikar/commands/bungee/contexts/package-tree.html
#	docs/acf-bungee/co/aikar/commands/bungee/contexts/package-use.html
#	docs/acf-bungee/co/aikar/commands/class-use/ACFBungeeListener.html
#	docs/acf-bungee/co/aikar/commands/class-use/ACFBungeeUtil.html
#	docs/acf-bungee/co/aikar/commands/class-use/BungeeCommandCompletionContext.html
#	docs/acf-bungee/co/aikar/commands/class-use/BungeeCommandCompletions.html
#	docs/acf-bungee/co/aikar/commands/class-use/BungeeCommandContexts.html
#	docs/acf-bungee/co/aikar/commands/class-use/BungeeCommandExecutionContext.html
#	docs/acf-bungee/co/aikar/commands/class-use/BungeeCommandIssuer.html
#	docs/acf-bungee/co/aikar/commands/class-use/BungeeCommandManager.html
#	docs/acf-bungee/co/aikar/commands/class-use/BungeeConditionContext.html
#	docs/acf-bungee/co/aikar/commands/class-use/BungeeLocales.html
#	docs/acf-bungee/co/aikar/commands/class-use/BungeeMessageFormatter.html
#	docs/acf-bungee/co/aikar/commands/class-use/BungeeRegisteredCommand.html
#	docs/acf-bungee/co/aikar/commands/class-use/BungeeRootCommand.html
#	docs/acf-bungee/co/aikar/commands/class-use/MinecraftMessageKeys.html
#	docs/acf-bungee/co/aikar/commands/contexts/OnlineProxiedPlayer.html
#	docs/acf-bungee/co/aikar/commands/contexts/class-use/OnlineProxiedPlayer.html
#	docs/acf-bungee/co/aikar/commands/contexts/package-summary.html
#	docs/acf-bungee/co/aikar/commands/contexts/package-tree.html
#	docs/acf-bungee/co/aikar/commands/contexts/package-use.html
#	docs/acf-bungee/co/aikar/commands/package-summary.html
#	docs/acf-bungee/co/aikar/commands/package-tree.html
#	docs/acf-bungee/co/aikar/commands/package-use.html
#	docs/acf-bungee/constant-values.html
#	docs/acf-bungee/deprecated-list.html
#	docs/acf-bungee/index-all.html
#	docs/acf-bungee/index.html
#	docs/acf-bungee/overview-summary.html
#	docs/acf-bungee/overview-tree.html
#	docs/acf-core/allclasses-index.html
#	docs/acf-core/allpackages-index.html
#	docs/acf-core/co/aikar/commands/ACFUtil.html
#	docs/acf-core/co/aikar/commands/AnnotationProcessor.html
#	docs/acf-core/co/aikar/commands/BaseCommand.html
#	docs/acf-core/co/aikar/commands/CommandCompletionContext.html
#	docs/acf-core/co/aikar/commands/CommandCompletions.AsyncCommandCompletionHandler.html
#	docs/acf-core/co/aikar/commands/CommandCompletions.CommandCompletionHandler.html
#	docs/acf-core/co/aikar/commands/CommandCompletions.SyncCompletionRequired.html
#	docs/acf-core/co/aikar/commands/CommandCompletions.html
#	docs/acf-core/co/aikar/commands/CommandConditions.Condition.html
#	docs/acf-core/co/aikar/commands/CommandConditions.ParameterCondition.html
#	docs/acf-core/co/aikar/commands/CommandConditions.html
#	docs/acf-core/co/aikar/commands/CommandContexts.html
#	docs/acf-core/co/aikar/commands/CommandExecutionContext.html
#	docs/acf-core/co/aikar/commands/CommandHelp.html
#	docs/acf-core/co/aikar/commands/CommandHelpFormatter.html
#	docs/acf-core/co/aikar/commands/CommandIssuer.html
#	docs/acf-core/co/aikar/commands/CommandManager.html
#	docs/acf-core/co/aikar/commands/CommandOperationContext.html
#	docs/acf-core/co/aikar/commands/CommandParameter.html
#	docs/acf-core/co/aikar/commands/CommandReplacements.html
#	docs/acf-core/co/aikar/commands/ConditionContext.html
#	docs/acf-core/co/aikar/commands/ConditionFailedException.html
#	docs/acf-core/co/aikar/commands/ExceptionHandler.html
#	docs/acf-core/co/aikar/commands/ForwardingCommand.html
#	docs/acf-core/co/aikar/commands/HelpEntry.html
#	docs/acf-core/co/aikar/commands/InvalidCommandArgument.html
#	docs/acf-core/co/aikar/commands/InvalidCommandContextException.html
#	docs/acf-core/co/aikar/commands/IssuerLocaleChangedCallback.html
#	docs/acf-core/co/aikar/commands/Locales.html
#	docs/acf-core/co/aikar/commands/MessageFormatter.html
#	docs/acf-core/co/aikar/commands/MessageKeys.html
#	docs/acf-core/co/aikar/commands/MessageType.html
#	docs/acf-core/co/aikar/commands/RegisteredCommand.html
#	docs/acf-core/co/aikar/commands/RootCommand.html
#	docs/acf-core/co/aikar/commands/ShowCommandHelp.html
#	docs/acf-core/co/aikar/commands/UnresolvedDependencyException.html
#	docs/acf-core/co/aikar/commands/UnstableAPI.html
#	docs/acf-core/co/aikar/commands/annotation/CatchAll.html
#	docs/acf-core/co/aikar/commands/annotation/CatchUnknown.html
#	docs/acf-core/co/aikar/commands/annotation/CommandAlias.html
#	docs/acf-core/co/aikar/commands/annotation/CommandCompletion.html
#	docs/acf-core/co/aikar/commands/annotation/CommandPermission.html
#	docs/acf-core/co/aikar/commands/annotation/Conditions.html
#	docs/acf-core/co/aikar/commands/annotation/Default.html
#	docs/acf-core/co/aikar/commands/annotation/Dependency.html
#	docs/acf-core/co/aikar/commands/annotation/Description.html
#	docs/acf-core/co/aikar/commands/annotation/Flags.html
#	docs/acf-core/co/aikar/commands/annotation/HelpCommand.html
#	docs/acf-core/co/aikar/commands/annotation/HelpSearchTags.html
#	docs/acf-core/co/aikar/commands/annotation/Name.html
#	docs/acf-core/co/aikar/commands/annotation/Optional.html
#	docs/acf-core/co/aikar/commands/annotation/PreCommand.html
#	docs/acf-core/co/aikar/commands/annotation/Private.html
#	docs/acf-core/co/aikar/commands/annotation/Single.html
#	docs/acf-core/co/aikar/commands/annotation/Split.html
#	docs/acf-core/co/aikar/commands/annotation/Subcommand.html
#	docs/acf-core/co/aikar/commands/annotation/Syntax.html
#	docs/acf-core/co/aikar/commands/annotation/UnknownHandler.html
#	docs/acf-core/co/aikar/commands/annotation/Values.html
#	docs/acf-core/co/aikar/commands/annotation/class-use/CatchAll.html
#	docs/acf-core/co/aikar/commands/annotation/class-use/CatchUnknown.html
#	docs/acf-core/co/aikar/commands/annotation/class-use/CommandAlias.html
#	docs/acf-core/co/aikar/commands/annotation/class-use/CommandCompletion.html
#	docs/acf-core/co/aikar/commands/annotation/class-use/CommandPermission.html
#	docs/acf-core/co/aikar/commands/annotation/class-use/Conditions.html
#	docs/acf-core/co/aikar/commands/annotation/class-use/Default.html
#	docs/acf-core/co/aikar/commands/annotation/class-use/Dependency.html
#	docs/acf-core/co/aikar/commands/annotation/class-use/Description.html
#	docs/acf-core/co/aikar/commands/annotation/class-use/Flags.html
#	docs/acf-core/co/aikar/commands/annotation/class-use/HelpCommand.html
#	docs/acf-core/co/aikar/commands/annotation/class-use/HelpSearchTags.html
#	docs/acf-core/co/aikar/commands/annotation/class-use/Name.html
#	docs/acf-core/co/aikar/commands/annotation/class-use/Optional.html
#	docs/acf-core/co/aikar/commands/annotation/class-use/PreCommand.html
#	docs/acf-core/co/aikar/commands/annotation/class-use/Private.html
#	docs/acf-core/co/aikar/commands/annotation/class-use/Single.html
#	docs/acf-core/co/aikar/commands/annotation/class-use/Split.html
#	docs/acf-core/co/aikar/commands/annotation/class-use/Subcommand.html
#	docs/acf-core/co/aikar/commands/annotation/class-use/Syntax.html
#	docs/acf-core/co/aikar/commands/annotation/class-use/UnknownHandler.html
#	docs/acf-core/co/aikar/commands/annotation/class-use/Values.html
#	docs/acf-core/co/aikar/commands/annotation/package-summary.html
#	docs/acf-core/co/aikar/commands/annotation/package-tree.html
#	docs/acf-core/co/aikar/commands/annotation/package-use.html
#	docs/acf-core/co/aikar/commands/apachecommonslang/ApacheCommonsExceptionUtil.Nestable.html
#	docs/acf-core/co/aikar/commands/apachecommonslang/ApacheCommonsExceptionUtil.html
#	docs/acf-core/co/aikar/commands/apachecommonslang/ApacheCommonsLangUtil.html
#	docs/acf-core/co/aikar/commands/apachecommonslang/class-use/ApacheCommonsExceptionUtil.Nestable.html
#	docs/acf-core/co/aikar/commands/apachecommonslang/class-use/ApacheCommonsExceptionUtil.html
#	docs/acf-core/co/aikar/commands/apachecommonslang/class-use/ApacheCommonsLangUtil.html
#	docs/acf-core/co/aikar/commands/apachecommonslang/package-summary.html
#	docs/acf-core/co/aikar/commands/apachecommonslang/package-tree.html
#	docs/acf-core/co/aikar/commands/apachecommonslang/package-use.html
#	docs/acf-core/co/aikar/commands/class-use/ACFUtil.html
#	docs/acf-core/co/aikar/commands/class-use/AnnotationProcessor.html
#	docs/acf-core/co/aikar/commands/class-use/BaseCommand.html
#	docs/acf-core/co/aikar/commands/class-use/CommandCompletionContext.html
#	docs/acf-core/co/aikar/commands/class-use/CommandCompletions.AsyncCommandCompletionHandler.html
#	docs/acf-core/co/aikar/commands/class-use/CommandCompletions.CommandCompletionHandler.html
#	docs/acf-core/co/aikar/commands/class-use/CommandCompletions.SyncCompletionRequired.html
#	docs/acf-core/co/aikar/commands/class-use/CommandCompletions.html
#	docs/acf-core/co/aikar/commands/class-use/CommandConditions.Condition.html
#	docs/acf-core/co/aikar/commands/class-use/CommandConditions.ParameterCondition.html
#	docs/acf-core/co/aikar/commands/class-use/CommandConditions.html
#	docs/acf-core/co/aikar/commands/class-use/CommandContexts.html
#	docs/acf-core/co/aikar/commands/class-use/CommandExecutionContext.html
#	docs/acf-core/co/aikar/commands/class-use/CommandHelp.html
#	docs/acf-core/co/aikar/commands/class-use/CommandHelpFormatter.html
#	docs/acf-core/co/aikar/commands/class-use/CommandIssuer.html
#	docs/acf-core/co/aikar/commands/class-use/CommandManager.html
#	docs/acf-core/co/aikar/commands/class-use/CommandOperationContext.html
#	docs/acf-core/co/aikar/commands/class-use/CommandParameter.html
#	docs/acf-core/co/aikar/commands/class-use/CommandReplacements.html
#	docs/acf-core/co/aikar/commands/class-use/ConditionContext.html
#	docs/acf-core/co/aikar/commands/class-use/ConditionFailedException.html
#	docs/acf-core/co/aikar/commands/class-use/ExceptionHandler.html
#	docs/acf-core/co/aikar/commands/class-use/ForwardingCommand.html
#	docs/acf-core/co/aikar/commands/class-use/HelpEntry.html
#	docs/acf-core/co/aikar/commands/class-use/InvalidCommandArgument.html
#	docs/acf-core/co/aikar/commands/class-use/InvalidCommandContextException.html
#	docs/acf-core/co/aikar/commands/class-use/IssuerLocaleChangedCallback.html
#	docs/acf-core/co/aikar/commands/class-use/Locales.html
#	docs/acf-core/co/aikar/commands/class-use/MessageFormatter.html
#	docs/acf-core/co/aikar/commands/class-use/MessageKeys.html
#	docs/acf-core/co/aikar/commands/class-use/MessageType.html
#	docs/acf-core/co/aikar/commands/class-use/RegisteredCommand.html
#	docs/acf-core/co/aikar/commands/class-use/RootCommand.html
#	docs/acf-core/co/aikar/commands/class-use/ShowCommandHelp.html
#	docs/acf-core/co/aikar/commands/class-use/UnresolvedDependencyException.html
#	docs/acf-core/co/aikar/commands/class-use/UnstableAPI.html
#	docs/acf-core/co/aikar/commands/contexts/ContextResolver.html
#	docs/acf-core/co/aikar/commands/contexts/IssuerAwareContextResolver.html
#	docs/acf-core/co/aikar/commands/contexts/IssuerOnlyContextResolver.html
#	docs/acf-core/co/aikar/commands/contexts/OptionalContextResolver.html
#	docs/acf-core/co/aikar/commands/contexts/SenderAwareContextResolver.html
#	docs/acf-core/co/aikar/commands/contexts/class-use/ContextResolver.html
#	docs/acf-core/co/aikar/commands/contexts/class-use/IssuerAwareContextResolver.html
#	docs/acf-core/co/aikar/commands/contexts/class-use/IssuerOnlyContextResolver.html
#	docs/acf-core/co/aikar/commands/contexts/class-use/OptionalContextResolver.html
#	docs/acf-core/co/aikar/commands/contexts/class-use/SenderAwareContextResolver.html
#	docs/acf-core/co/aikar/commands/contexts/package-summary.html
#	docs/acf-core/co/aikar/commands/contexts/package-tree.html
#	docs/acf-core/co/aikar/commands/contexts/package-use.html
#	docs/acf-core/co/aikar/commands/package-summary.html
#	docs/acf-core/co/aikar/commands/package-tree.html
#	docs/acf-core/co/aikar/commands/package-use.html
#	docs/acf-core/co/aikar/commands/processors/ConditionsProcessor.html
#	docs/acf-core/co/aikar/commands/processors/class-use/ConditionsProcessor.html
#	docs/acf-core/co/aikar/commands/processors/package-summary.html
#	docs/acf-core/co/aikar/commands/processors/package-tree.html
#	docs/acf-core/co/aikar/commands/processors/package-use.html
#	docs/acf-core/constant-values.html
#	docs/acf-core/deprecated-list.html
#	docs/acf-core/index-all.html
#	docs/acf-core/index.html
#	docs/acf-core/overview-summary.html
#	docs/acf-core/overview-tree.html
#	docs/acf-core/serialized-form.html
#	docs/acf-jda/allclasses-index.html
#	docs/acf-jda/allpackages-index.html
#	docs/acf-jda/co/aikar/commands/CommandConfig.html
#	docs/acf-jda/co/aikar/commands/CommandConfigProvider.html
#	docs/acf-jda/co/aikar/commands/CommandPermissionResolver.html
#	docs/acf-jda/co/aikar/commands/JDACommandCompletions.html
#	docs/acf-jda/co/aikar/commands/JDACommandConfig.html
#	docs/acf-jda/co/aikar/commands/JDACommandContexts.html
#	docs/acf-jda/co/aikar/commands/JDACommandEvent.html
#	docs/acf-jda/co/aikar/commands/JDACommandExecutionContext.html
#	docs/acf-jda/co/aikar/commands/JDACommandManager.html
#	docs/acf-jda/co/aikar/commands/JDACommandPermissionResolver.html
#	docs/acf-jda/co/aikar/commands/JDAConditionContext.html
#	docs/acf-jda/co/aikar/commands/JDAListener.html
#	docs/acf-jda/co/aikar/commands/JDALocales.html
#	docs/acf-jda/co/aikar/commands/JDAMessageFormatter.html
#	docs/acf-jda/co/aikar/commands/JDAOptions.html
#	docs/acf-jda/co/aikar/commands/JDARootCommand.html
#	docs/acf-jda/co/aikar/commands/annotation/Author.html
#	docs/acf-jda/co/aikar/commands/annotation/CrossGuild.html
#	docs/acf-jda/co/aikar/commands/annotation/SelfUser.html
#	docs/acf-jda/co/aikar/commands/annotation/class-use/Author.html
#	docs/acf-jda/co/aikar/commands/annotation/class-use/CrossGuild.html
#	docs/acf-jda/co/aikar/commands/annotation/class-use/SelfUser.html
#	docs/acf-jda/co/aikar/commands/annotation/package-summary.html
#	docs/acf-jda/co/aikar/commands/annotation/package-tree.html
#	docs/acf-jda/co/aikar/commands/annotation/package-use.html
#	docs/acf-jda/co/aikar/commands/class-use/CommandConfig.html
#	docs/acf-jda/co/aikar/commands/class-use/CommandConfigProvider.html
#	docs/acf-jda/co/aikar/commands/class-use/CommandPermissionResolver.html
#	docs/acf-jda/co/aikar/commands/class-use/JDACommandCompletions.html
#	docs/acf-jda/co/aikar/commands/class-use/JDACommandConfig.html
#	docs/acf-jda/co/aikar/commands/class-use/JDACommandContexts.html
#	docs/acf-jda/co/aikar/commands/class-use/JDACommandEvent.html
#	docs/acf-jda/co/aikar/commands/class-use/JDACommandExecutionContext.html
#	docs/acf-jda/co/aikar/commands/class-use/JDACommandManager.html
#	docs/acf-jda/co/aikar/commands/class-use/JDACommandPermissionResolver.html
#	docs/acf-jda/co/aikar/commands/class-use/JDAConditionContext.html
#	docs/acf-jda/co/aikar/commands/class-use/JDAListener.html
#	docs/acf-jda/co/aikar/commands/class-use/JDALocales.html
#	docs/acf-jda/co/aikar/commands/class-use/JDAMessageFormatter.html
#	docs/acf-jda/co/aikar/commands/class-use/JDAOptions.html
#	docs/acf-jda/co/aikar/commands/class-use/JDARootCommand.html
#	docs/acf-jda/co/aikar/commands/package-summary.html
#	docs/acf-jda/co/aikar/commands/package-tree.html
#	docs/acf-jda/co/aikar/commands/package-use.html
#	docs/acf-jda/index-all.html
#	docs/acf-jda/index.html
#	docs/acf-jda/overview-summary.html
#	docs/acf-jda/overview-tree.html
#	docs/acf-paper/allclasses-index.html
#	docs/acf-paper/allpackages-index.html
#	docs/acf-paper/co/aikar/commands/PaperBrigadierManager.html
#	docs/acf-paper/co/aikar/commands/PaperCommandCompletions.html
#	docs/acf-paper/co/aikar/commands/PaperCommandContexts.html
#	docs/acf-paper/co/aikar/commands/PaperCommandManager.html
#	docs/acf-paper/co/aikar/commands/class-use/PaperBrigadierManager.html
#	docs/acf-paper/co/aikar/commands/class-use/PaperCommandCompletions.html
#	docs/acf-paper/co/aikar/commands/class-use/PaperCommandContexts.html
#	docs/acf-paper/co/aikar/commands/class-use/PaperCommandManager.html
#	docs/acf-paper/co/aikar/commands/package-summary.html
#	docs/acf-paper/co/aikar/commands/package-tree.html
#	docs/acf-paper/co/aikar/commands/package-use.html
#	docs/acf-paper/deprecated-list.html
#	docs/acf-paper/index-all.html
#	docs/acf-paper/index.html
#	docs/acf-paper/overview-tree.html
#	docs/acf-sponge/allclasses-index.html
#	docs/acf-sponge/allpackages-index.html
#	docs/acf-sponge/co/aikar/commands/ACFSpongeListener.html
#	docs/acf-sponge/co/aikar/commands/ACFSpongeUtil.html
#	docs/acf-sponge/co/aikar/commands/MinecraftMessageKeys.html
#	docs/acf-sponge/co/aikar/commands/SpongeCommandCompletionContext.html
#	docs/acf-sponge/co/aikar/commands/SpongeCommandCompletions.html
#	docs/acf-sponge/co/aikar/commands/SpongeCommandContexts.html
#	docs/acf-sponge/co/aikar/commands/SpongeCommandExecutionContext.html
#	docs/acf-sponge/co/aikar/commands/SpongeCommandIssuer.html
#	docs/acf-sponge/co/aikar/commands/SpongeCommandManager.html
#	docs/acf-sponge/co/aikar/commands/SpongeCommandOperationContext.html
#	docs/acf-sponge/co/aikar/commands/SpongeConditionContext.html
#	docs/acf-sponge/co/aikar/commands/SpongeLocales.html
#	docs/acf-sponge/co/aikar/commands/SpongeMessageFormatter.html
#	docs/acf-sponge/co/aikar/commands/SpongeRegisteredCommand.html
#	docs/acf-sponge/co/aikar/commands/SpongeRootCommand.html
#	docs/acf-sponge/co/aikar/commands/class-use/ACFSpongeListener.html
#	docs/acf-sponge/co/aikar/commands/class-use/ACFSpongeUtil.html
#	docs/acf-sponge/co/aikar/commands/class-use/MinecraftMessageKeys.html
#	docs/acf-sponge/co/aikar/commands/class-use/SpongeCommandCompletionContext.html
#	docs/acf-sponge/co/aikar/commands/class-use/SpongeCommandCompletions.html
#	docs/acf-sponge/co/aikar/commands/class-use/SpongeCommandContexts.html
#	docs/acf-sponge/co/aikar/commands/class-use/SpongeCommandExecutionContext.html
#	docs/acf-sponge/co/aikar/commands/class-use/SpongeCommandIssuer.html
#	docs/acf-sponge/co/aikar/commands/class-use/SpongeCommandManager.html
#	docs/acf-sponge/co/aikar/commands/class-use/SpongeCommandOperationContext.html
#	docs/acf-sponge/co/aikar/commands/class-use/SpongeConditionContext.html
#	docs/acf-sponge/co/aikar/commands/class-use/SpongeLocales.html
#	docs/acf-sponge/co/aikar/commands/class-use/SpongeMessageFormatter.html
#	docs/acf-sponge/co/aikar/commands/class-use/SpongeRegisteredCommand.html
#	docs/acf-sponge/co/aikar/commands/class-use/SpongeRootCommand.html
#	docs/acf-sponge/co/aikar/commands/contexts/CommandResultSupplier.html
#	docs/acf-sponge/co/aikar/commands/contexts/OnlinePlayer.html
#	docs/acf-sponge/co/aikar/commands/contexts/class-use/CommandResultSupplier.html
#	docs/acf-sponge/co/aikar/commands/contexts/class-use/OnlinePlayer.html
#	docs/acf-sponge/co/aikar/commands/contexts/package-summary.html
#	docs/acf-sponge/co/aikar/commands/contexts/package-tree.html
#	docs/acf-sponge/co/aikar/commands/contexts/package-use.html
#	docs/acf-sponge/co/aikar/commands/package-summary.html
#	docs/acf-sponge/co/aikar/commands/package-tree.html
#	docs/acf-sponge/co/aikar/commands/package-use.html
#	docs/acf-sponge/co/aikar/commands/sponge/contexts/OnlinePlayer.html
#	docs/acf-sponge/co/aikar/commands/sponge/contexts/class-use/OnlinePlayer.html
#	docs/acf-sponge/co/aikar/commands/sponge/contexts/package-summary.html
#	docs/acf-sponge/co/aikar/commands/sponge/contexts/package-tree.html
#	docs/acf-sponge/co/aikar/commands/sponge/contexts/package-use.html
#	docs/acf-sponge/deprecated-list.html
#	docs/acf-sponge/index-all.html
#	docs/acf-sponge/index.html
#	docs/acf-sponge/overview-summary.html
#	docs/acf-sponge/overview-tree.html
#	docs/acf-velocity/allclasses-index.html
#	docs/acf-velocity/allpackages-index.html
#	docs/acf-velocity/co/aikar/commands/ACFVelocityListener.html
#	docs/acf-velocity/co/aikar/commands/ACFVelocityUtil.html
#	docs/acf-velocity/co/aikar/commands/MinecraftMessageKeys.html
#	docs/acf-velocity/co/aikar/commands/VelocityCommandCompletionContext.html
#	docs/acf-velocity/co/aikar/commands/VelocityCommandCompletions.html
#	docs/acf-velocity/co/aikar/commands/VelocityCommandContexts.html
#	docs/acf-velocity/co/aikar/commands/VelocityCommandExecutionContext.html
#	docs/acf-velocity/co/aikar/commands/VelocityCommandIssuer.html
#	docs/acf-velocity/co/aikar/commands/VelocityCommandManager.html
#	docs/acf-velocity/co/aikar/commands/VelocityConditionContext.html
#	docs/acf-velocity/co/aikar/commands/VelocityLocales.html
#	docs/acf-velocity/co/aikar/commands/VelocityMessageFormatter.html
#	docs/acf-velocity/co/aikar/commands/VelocityRootCommand.html
#	docs/acf-velocity/co/aikar/commands/class-use/ACFVelocityListener.html
#	docs/acf-velocity/co/aikar/commands/class-use/ACFVelocityUtil.html
#	docs/acf-velocity/co/aikar/commands/class-use/MinecraftMessageKeys.html
#	docs/acf-velocity/co/aikar/commands/class-use/VelocityCommandCompletionContext.html
#	docs/acf-velocity/co/aikar/commands/class-use/VelocityCommandCompletions.html
#	docs/acf-velocity/co/aikar/commands/class-use/VelocityCommandContexts.html
#	docs/acf-velocity/co/aikar/commands/class-use/VelocityCommandExecutionContext.html
#	docs/acf-velocity/co/aikar/commands/class-use/VelocityCommandIssuer.html
#	docs/acf-velocity/co/aikar/commands/class-use/VelocityCommandManager.html
#	docs/acf-velocity/co/aikar/commands/class-use/VelocityConditionContext.html
#	docs/acf-velocity/co/aikar/commands/class-use/VelocityLocales.html
#	docs/acf-velocity/co/aikar/commands/class-use/VelocityMessageFormatter.html
#	docs/acf-velocity/co/aikar/commands/class-use/VelocityRootCommand.html
#	docs/acf-velocity/co/aikar/commands/contexts/OnlinePlayer.html
#	docs/acf-velocity/co/aikar/commands/contexts/class-use/OnlinePlayer.html
#	docs/acf-velocity/co/aikar/commands/contexts/package-summary.html
#	docs/acf-velocity/co/aikar/commands/contexts/package-tree.html
#	docs/acf-velocity/co/aikar/commands/contexts/package-use.html
#	docs/acf-velocity/co/aikar/commands/package-summary.html
#	docs/acf-velocity/co/aikar/commands/package-tree.html
#	docs/acf-velocity/co/aikar/commands/package-use.html
#	docs/acf-velocity/co/aikar/commands/velocity/contexts/OnlinePlayer.html
#	docs/acf-velocity/co/aikar/commands/velocity/contexts/class-use/OnlinePlayer.html
#	docs/acf-velocity/co/aikar/commands/velocity/contexts/package-summary.html
#	docs/acf-velocity/co/aikar/commands/velocity/contexts/package-tree.html
#	docs/acf-velocity/co/aikar/commands/velocity/contexts/package-use.html
#	docs/acf-velocity/deprecated-list.html
#	docs/acf-velocity/index-all.html
#	docs/acf-velocity/index.html
#	docs/acf-velocity/overview-summary.html
#	docs/acf-velocity/overview-tree.html
#	velocity/pom.xml
#	velocity/src/main/java/co/aikar/commands/ACFVelocityUtil.java
#	velocity/src/main/java/co/aikar/commands/VelocityCommandCompletions.java
#	velocity/src/main/java/co/aikar/commands/VelocityCommandContexts.java
#	velocity/src/main/java/co/aikar/commands/VelocityCommandManager.java
#	velocity/src/main/java/co/aikar/commands/VelocityMessageFormatter.java
#	velocity/src/main/java/co/aikar/commands/VelocityRootCommand.java
2021-12-21 11:42:52 -06:00
chickeneer e82c77c55c Merge branch 'master' into temp-alex 2021-12-21 11:19:12 -06:00
chickeneer 0661e678d1 Update version to 0.5.1-SNAPSHOT 2021-12-21 11:09:01 -06:00
darbyjack 5621a27dd6 Update to the final release of JDA 4.x 2021-12-21 10:38:46 -06:00
chickeneer ce9933c1b3 Revert "Improve setting the default locale of the localemanager"
This reverts commit 01796e7ac4.

Attempted fix was misguided
2021-11-06 22:07:58 -05:00
chickeneer 01796e7ac4 Improve setting the default locale of the localemanager 2021-11-06 22:00:56 -05:00
Alberto Migliorato 118616b62b + Velocity 3.x support 2021-09-13 17:40:57 +02:00
Alberto Migliorato 3a64afa0ae Travis fixes 2021-09-13 17:09:06 +02:00
Alberto Migliorato 24d97bb3eb Added Velocity 3.0.x support 2021-09-13 16:28:54 +02:00
willies952002 38b45d7651 Handle numbers in Hexadecimal (0x#) and Binary (0b#) Notation (#318) 2021-08-29 18:20:25 -05:00
Gk0Wk 533f3956a3 Add Chinese(Simplified) language support. 2021-08-29 17:55:40 -05:00
Maximilian Hammrich b4c6caa1d3 Fixed spelling mistake in German translation (#328)
"um diesen Befehl auszuführen" is a final subordinate clause and therefore needs a comma (https://www.sprachschach.de/komma-vor-um/).
2021-08-29 17:44:57 -05:00
Pablo Herrera 907944f481 Autocomplete defaults when no completion is set (#338) 2021-08-29 17:44:32 -05:00
MapleHuang 69f297260b Add Chinese(Traditional) language support. (#333)
* Add Chinese(Simplified) language support.
* Add Chinese(Traditional) language support.

Co-authored-by: Gk0Wk <nmg_wk@yeah.net>
2021-08-29 17:38:47 -05:00
chickeneer f145659dd0 Improve cached bukkit locale lookup - #GH-342 2021-08-29 17:36:14 -05:00
vSKAH 1e7a6b194b Update BukkitCommandManager.java
Increases the time of the loop that watches the players online. Why does it do this? Because every 5 ticks is an overkill. 
https://i.imgur.com/psuPuYk.png
2021-08-29 17:34:30 -05:00
AlexProgrammerDE b0792607db Add velocity 3.0.0 support 2021-07-07 19:28:22 +02:00
Edson Passos f033dd9541 Adds a new pattern for CommandReplacements: %{<key>} (#313) 2021-02-05 12:19:57 -05:00
Edson Passos 91e720011e Unwraps InvocationTargetException (#315)
This exception is just a wrapper for the one thrown on invoked methods
2021-02-04 17:28:36 -05:00
Stijn Bannink 3dfee40c57 Add Dutch translation (#304)
Co-authored-by: DarkEyeDragon <joshua.tack@student.vives.be>
2021-01-26 13:16:46 -05:00
Szymon Witek 6099e6455f Add link to acf-jda docs (#301) 2021-01-26 13:15:39 -05:00
JOO200 20aee6a59e exception check for CompletionStage instead of CompletableFuture (#309) 2021-01-26 13:15:18 -05:00
JOO200 a28e0f5ce2 Optimize OfflinePlayer context (#306)
* Only allow valid usernames in OfflinePlayer context resolver

* optimize OfflinePlayer context resolver
2021-01-26 13:14:44 -05:00
Edson Passos 6c632eb028 Adds missing messages to acf-core_es (#299) 2020-11-02 13:45:50 -05:00
Aikar 3f2f786fa4 (DEPLOYED ACF) Updated JavaDocs 2020-09-25 15:53:10 -04:00
JOO200 9c5e9fbcdd Fix NPE for plugins without special log prefix (#294) 2020-09-25 15:53:05 -04:00
Aikar 85ea761654 (DEPLOYED ACF) Updated JavaDocs 2020-09-24 23:14:07 -04:00
Glare b5cb67fcb3 Updated JDA support 4.2 (#270)
Anyone previously using jda3 and needs to stay on it until transition is complete to jda4
switch the following artifacts in your build to the final jda3 builds

acf-core -> acf-corejda3final  0.5.0-SNAPSHOT
acf-jda -> acf-da3final  0.5.0-SNAPSHOT
2020-09-24 23:13:09 -04:00
Aikar 00618f051b (DEPLOYED ACF) Updated JavaDocs 2020-09-24 23:03:06 -04:00
Jake Potrebic fd25a31c63 Fix Bukkit log prefix for custom prefixes (#237) 2020-09-24 22:39:09 -04:00
Hannes Greule e164852783 Allow properly nesting of messages (#262)
- Messages can now be defined everywhere instead of second-level only
- The data types double, int, long and boolean are supported
2020-09-24 22:35:03 -04:00
JOO200 46f689de94 Add name annotation for parameters (#272)
Co-authored-by: Daniel Ennis <aikar@aikar.co>
2020-09-24 22:19:37 -04:00
William Braeckman a26babd6d8 Fix issue #288 (#289) 2020-09-24 22:00:33 -04:00
JOO200 65428e3cae Fix wrong BungeeCord command suggestions (#292) 2020-09-24 21:59:41 -04:00
MiniDigger 9452873d13 Add initial brigadier support (implements #77) (#153)
Co-authored-by: Aikar <aikar@aikar.co>
2020-08-13 20:40:06 -04:00
Frank van der Heijden a8b69370ae Add ability to force command registrations on velocity (#285) 2020-08-13 20:38:04 -04:00
JOO200 9a04899978 Fix CommandCompletionContext.getResolvedArg (#266) 2020-08-13 18:36:54 -04:00
Dragonium 9188892e3b Fixed the typo(?) from SomeCommand.Test.TestInner#onTest1 (#281) 2020-08-13 18:36:25 -04:00
JOO200 97cd56cb93 Bugfix @Values: Completion with null value will create a NPE (#282) 2020-08-13 18:35:58 -04:00
Daniel Ennis 4813a2aee9 Create FUNDING.yml 2020-07-21 20:28:04 -04:00
JOO200 be0af2d781 Fix encodings for japanese language (#269) 2020-06-09 22:07:51 -04:00
Frank van der Heijden 7044d189b6 Implement PluginIdentifiableCommand in BukkitRootCommand (#271) 2020-06-09 22:07:33 -04:00
Aikar f4ed76d257 (DEPLOYED ACF) Updated JavaDocs 2020-06-02 03:04:06 -04:00
JOO200 b931f6ea7b Changed encoding to utf8 (#267) 2020-06-02 03:03:08 -04:00
ken_kentan 843c2a92f4 Added japanese language (#265) 2020-05-16 23:16:36 -04:00
Aikar d284bff469 (DEPLOYED ACF) Updated JavaDocs 2020-04-27 05:40:17 -04:00
Alexander Söderberg 33bd355ae4 Fixes and updates acf-core_sv.properties (#260) 2020-04-27 05:39:18 -04:00
Aikar bf9b81bf0e Clean up JavaDocs (Deployed ACF)
No longer generate the zip files in git and use proper doclint flag
Speeds up javadoc generation fixing a bug in config
2020-04-26 18:38:49 -04:00
Aikar 1eddc2cb8b Clean up build scripts and rework shading/relocation
ACF deps such as timings lib and expiring map will now properly
be relocated into ACF.

This will avoid version conflicts with ExpiringMap and TimingsLib

Sadly, because locales is an exposed API, we can not relocate locales...

It will still be on plugins to add the locales relocation themselves.
Will update wiki to document this.

also updated maven plugins to newest versions, minus surefire, as
3.0 doesn't work with current setup. Went to latest 2.x there.

Got rid of a lot of duplicated shade configuration stuff across
submodules too.
2020-04-26 17:43:08 -04:00
Aikar 9a9c366dfe (DEPLOYED ACF) Updated JavaDocs 2020-04-18 18:43:43 -04:00