diff --git a/docs/acf-jda/co/aikar/commands/CommandConfig.html b/docs/acf-jda/co/aikar/commands/CommandConfig.html index d0665c54..8f9be486 100644 --- a/docs/acf-jda/co/aikar/commands/CommandConfig.html +++ b/docs/acf-jda/co/aikar/commands/CommandConfig.html @@ -160,7 +160,7 @@ extends
default CommandConfigprovide(net.dv8tion.jda.core.events.message.MessageReceivedEvent event)provide(net.dv8tion.jda.api.events.message.MessageReceivedEvent event)default CommandConfig provide(net.dv8tion.jda.core.events.message.MessageReceivedEvent event)+
default CommandConfig provide(net.dv8tion.jda.api.events.message.MessageReceivedEvent event)
provide in interface CommandConfigProviderprovide in interface CommandConfigProviderCommandConfigprovide(net.dv8tion.jda.core.events.message.MessageReceivedEvent event)provide(net.dv8tion.jda.api.events.message.MessageReceivedEvent event)CommandConfig provide(net.dv8tion.jda.core.events.message.MessageReceivedEvent event)+
CommandConfig provide(net.dv8tion.jda.api.events.message.MessageReceivedEvent event)
provide
+provide
diff --git a/docs/acf-jda/co/aikar/commands/JDACommandContexts.html b/docs/acf-jda/co/aikar/commands/JDACommandContexts.html
index 646e596c..877b675b 100644
--- a/docs/acf-jda/co/aikar/commands/JDACommandContexts.html
+++ b/docs/acf-jda/co/aikar/commands/JDACommandContexts.html
@@ -130,7 +130,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
public class JDACommandContexts +public class JDACommandContexts extends co.aikar.commands.CommandContexts<JDACommandExecutionContext>
public JDACommandContexts(JDACommandManager manager)+
public JDACommandContexts(JDACommandManager manager)
JDACommandEvent(JDACommandManager manager,
- net.dv8tion.jda.core.events.message.MessageReceivedEvent event)JDACommandEvent(JDACommandManager manager,
+ net.dv8tion.jda.api.events.message.MessageReceivedEvent event)net.dv8tion.jda.core.events.message.MessageReceivedEventnet.dv8tion.jda.api.events.message.MessageReceivedEventgetEvent()net.dv8tion.jda.core.events.message.MessageReceivedEventnet.dv8tion.jda.api.events.message.MessageReceivedEventgetIssuer()voidsendMessage(net.dv8tion.jda.core.entities.Message message)sendMessage(net.dv8tion.jda.api.entities.Message message)voidsendMessage(net.dv8tion.jda.core.entities.MessageEmbed message)sendMessage(net.dv8tion.jda.api.entities.MessageEmbed message)public JDACommandEvent(JDACommandManager manager, - net.dv8tion.jda.core.events.message.MessageReceivedEvent event)+ net.dv8tion.jda.api.events.message.MessageReceivedEvent event)
public net.dv8tion.jda.core.events.message.MessageReceivedEvent getEvent()+
public net.dv8tion.jda.api.events.message.MessageReceivedEvent getEvent()
public net.dv8tion.jda.core.events.message.MessageReceivedEvent getIssuer()+
public net.dv8tion.jda.api.events.message.MessageReceivedEvent getIssuer()
getIssuer in interface co.aikar.commands.CommandIssuerpublic void sendMessage(net.dv8tion.jda.core.entities.Message message)+
public void sendMessage(net.dv8tion.jda.api.entities.Message message)
public void sendMessage(net.dv8tion.jda.core.entities.MessageEmbed message)+
public void sendMessage(net.dv8tion.jda.api.entities.MessageEmbed message)
public class JDACommandManager -extends co.aikar.commands.CommandManager<net.dv8tion.jda.core.events.message.MessageReceivedEvent,JDACommandEvent,String,co.aikar.commands.MessageFormatter<String>,JDACommandExecutionContext,JDAConditionContext>+extends co.aikar.commands.CommandManager<net.dv8tion.jda.api.events.message.MessageReceivedEvent,JDACommandEvent,String,co.aikar.commands.MessageFormatter<String>,JDACommandExecutionContext,JDAConditionContext>
JDACommandManager(net.dv8tion.jda.core.JDA jda)JDACommandManager(net.dv8tion.jda.api.JDA jda)JDACommandManager(net.dv8tion.jda.core.JDA jda,
+JDACommandManager(net.dv8tion.jda.api.JDA jda,
JDAOptions options)
net.dv8tion.jda.core.JDAnet.dv8tion.jda.api.JDAgetJDA()public JDACommandManager(net.dv8tion.jda.core.JDA jda)+
public JDACommandManager(net.dv8tion.jda.api.JDA jda)
public JDACommandManager(net.dv8tion.jda.core.JDA jda, +public JDACommandManager(net.dv8tion.jda.api.JDA jda, JDAOptions options)
public co.aikar.commands.CommandContexts<?> getCommandContexts()
getCommandContexts in class co.aikar.commands.CommandManager<net.dv8tion.jda.core.events.message.MessageReceivedEvent,JDACommandEvent,String,co.aikar.commands.MessageFormatter<String>,JDACommandExecutionContext,JDAConditionContext>getCommandContexts in class co.aikar.commands.CommandManager<net.dv8tion.jda.api.events.message.MessageReceivedEvent,JDACommandEvent,String,co.aikar.commands.MessageFormatter<String>,JDACommandExecutionContext,JDAConditionContext>public co.aikar.commands.CommandCompletions<?> getCommandCompletions()
getCommandCompletions in class co.aikar.commands.CommandManager<net.dv8tion.jda.core.events.message.MessageReceivedEvent,JDACommandEvent,String,co.aikar.commands.MessageFormatter<String>,JDACommandExecutionContext,JDAConditionContext>getCommandCompletions in class co.aikar.commands.CommandManager<net.dv8tion.jda.api.events.message.MessageReceivedEvent,JDACommandEvent,String,co.aikar.commands.MessageFormatter<String>,JDACommandExecutionContext,JDAConditionContext>public void registerCommand(co.aikar.commands.BaseCommand command)
registerCommand in class co.aikar.commands.CommandManager<net.dv8tion.jda.core.events.message.MessageReceivedEvent,JDACommandEvent,String,co.aikar.commands.MessageFormatter<String>,JDACommandExecutionContext,JDAConditionContext>registerCommand in class co.aikar.commands.CommandManager<net.dv8tion.jda.api.events.message.MessageReceivedEvent,JDACommandEvent,String,co.aikar.commands.MessageFormatter<String>,JDACommandExecutionContext,JDAConditionContext>public boolean hasRegisteredCommands()
hasRegisteredCommands in class co.aikar.commands.CommandManager<net.dv8tion.jda.core.events.message.MessageReceivedEvent,JDACommandEvent,String,co.aikar.commands.MessageFormatter<String>,JDACommandExecutionContext,JDAConditionContext>hasRegisteredCommands in class co.aikar.commands.CommandManager<net.dv8tion.jda.api.events.message.MessageReceivedEvent,JDACommandEvent,String,co.aikar.commands.MessageFormatter<String>,JDACommandExecutionContext,JDAConditionContext>public boolean isCommandIssuer(Class<?> type)
isCommandIssuer in class co.aikar.commands.CommandManager<net.dv8tion.jda.core.events.message.MessageReceivedEvent,JDACommandEvent,String,co.aikar.commands.MessageFormatter<String>,JDACommandExecutionContext,JDAConditionContext>isCommandIssuer in class co.aikar.commands.CommandManager<net.dv8tion.jda.api.events.message.MessageReceivedEvent,JDACommandEvent,String,co.aikar.commands.MessageFormatter<String>,JDACommandExecutionContext,JDAConditionContext>public JDACommandEvent getCommandIssuer(Object issuer)
getCommandIssuer in class co.aikar.commands.CommandManager<net.dv8tion.jda.core.events.message.MessageReceivedEvent,JDACommandEvent,String,co.aikar.commands.MessageFormatter<String>,JDACommandExecutionContext,JDAConditionContext>getCommandIssuer in class co.aikar.commands.CommandManager<net.dv8tion.jda.api.events.message.MessageReceivedEvent,JDACommandEvent,String,co.aikar.commands.MessageFormatter<String>,JDACommandExecutionContext,JDAConditionContext>public co.aikar.commands.RootCommand createRootCommand(String cmd)
createRootCommand in class co.aikar.commands.CommandManager<net.dv8tion.jda.core.events.message.MessageReceivedEvent,JDACommandEvent,String,co.aikar.commands.MessageFormatter<String>,JDACommandExecutionContext,JDAConditionContext>createRootCommand in class co.aikar.commands.CommandManager<net.dv8tion.jda.api.events.message.MessageReceivedEvent,JDACommandEvent,String,co.aikar.commands.MessageFormatter<String>,JDACommandExecutionContext,JDAConditionContext>public Collection<co.aikar.commands.RootCommand> getRegisteredRootCommands()
getRegisteredRootCommands in class co.aikar.commands.CommandManager<net.dv8tion.jda.core.events.message.MessageReceivedEvent,JDACommandEvent,String,co.aikar.commands.MessageFormatter<String>,JDACommandExecutionContext,JDAConditionContext>getRegisteredRootCommands in class co.aikar.commands.CommandManager<net.dv8tion.jda.api.events.message.MessageReceivedEvent,JDACommandEvent,String,co.aikar.commands.MessageFormatter<String>,JDACommandExecutionContext,JDAConditionContext>public co.aikar.commands.Locales getLocales()
getLocales in class co.aikar.commands.CommandManager<net.dv8tion.jda.core.events.message.MessageReceivedEvent,JDACommandEvent,String,co.aikar.commands.MessageFormatter<String>,JDACommandExecutionContext,JDAConditionContext>getLocales in class co.aikar.commands.CommandManager<net.dv8tion.jda.api.events.message.MessageReceivedEvent,JDACommandEvent,String,co.aikar.commands.MessageFormatter<String>,JDACommandExecutionContext,JDAConditionContext>createCommandContext in class co.aikar.commands.CommandManager<net.dv8tion.jda.core.events.message.MessageReceivedEvent,JDACommandEvent,String,co.aikar.commands.MessageFormatter<String>,JDACommandExecutionContext,JDAConditionContext>createCommandContext in class co.aikar.commands.CommandManager<net.dv8tion.jda.api.events.message.MessageReceivedEvent,JDACommandEvent,String,co.aikar.commands.MessageFormatter<String>,JDACommandExecutionContext,JDAConditionContext>createCompletionContext in class co.aikar.commands.CommandManager<net.dv8tion.jda.core.events.message.MessageReceivedEvent,JDACommandEvent,String,co.aikar.commands.MessageFormatter<String>,JDACommandExecutionContext,JDAConditionContext>createCompletionContext in class co.aikar.commands.CommandManager<net.dv8tion.jda.api.events.message.MessageReceivedEvent,JDACommandEvent,String,co.aikar.commands.MessageFormatter<String>,JDACommandExecutionContext,JDAConditionContext>log in class co.aikar.commands.CommandManager<net.dv8tion.jda.core.events.message.MessageReceivedEvent,JDACommandEvent,String,co.aikar.commands.MessageFormatter<String>,JDACommandExecutionContext,JDAConditionContext>log in class co.aikar.commands.CommandManager<net.dv8tion.jda.api.events.message.MessageReceivedEvent,JDACommandEvent,String,co.aikar.commands.MessageFormatter<String>,JDACommandExecutionContext,JDAConditionContext>public String getCommandPrefix(co.aikar.commands.CommandIssuer issuer)
getCommandPrefix in class co.aikar.commands.CommandManager<net.dv8tion.jda.core.events.message.MessageReceivedEvent,JDACommandEvent,String,co.aikar.commands.MessageFormatter<String>,JDACommandExecutionContext,JDAConditionContext>getCommandPrefix in class co.aikar.commands.CommandManager<net.dv8tion.jda.api.events.message.MessageReceivedEvent,JDACommandEvent,String,co.aikar.commands.MessageFormatter<String>,JDACommandExecutionContext,JDAConditionContext>net.dv8tion.jda.core.hooks.EventListenernet.dv8tion.jda.api.hooks.EventListenerpublic class JDAListener -extends net.dv8tion.jda.core.hooks.ListenerAdapter+extends net.dv8tion.jda.api.hooks.ListenerAdapter
voidonMessageReceived(net.dv8tion.jda.core.events.message.MessageReceivedEvent event)onMessageReceived(net.dv8tion.jda.api.events.message.MessageReceivedEvent event)voidonReady(net.dv8tion.jda.core.events.ReadyEvent event)onReady(net.dv8tion.jda.api.events.ReadyEvent event)onCallCreate, onCallDelete, onCallUpdateRegion, onCallUpdateRingingUsers, onCallVoiceJoin, onCallVoiceLeave, onCallVoiceSelfDeafen, onCallVoiceSelfMute, onCategoryCreate, onCategoryDelete, onCategoryUpdateName, onCategoryUpdatePermissions, onCategoryUpdatePosition, onDisconnect, onEmoteAdded, onEmoteRemoved, onEmoteUpdateName, onEmoteUpdateRoles, onEvent, onException, onFriendAdded, onFriendRemoved, onFriendRequestCanceled, onFriendRequestIgnored, onFriendRequestReceived, onFriendRequestSent, onGenericCall, onGenericCallUpdate, onGenericCallVoice, onGenericCategory, onGenericCategoryUpdate, onGenericEmote, onGenericEmoteUpdate, onGenericEvent, onGenericGroup, onGenericGroupMessage, onGenericGroupMessageReaction, onGenericGroupUpdate, onGenericGuild, onGenericGuildMember, onGenericGuildMessage, onGenericGuildMessageReaction, onGenericGuildUpdate, onGenericGuildVoice, onGenericMessage, onGenericMessageReaction, onGenericPrivateMessage, onGenericPrivateMessageReaction, onGenericRelationship, onGenericRelationshipAdd, onGenericRelationshipRemove, onGenericRole, onGenericRoleUpdate, onGenericSelfUpdate, onGenericTextChannel, onGenericTextChannelUpdate, onGenericUpdate, onGenericUser, onGenericUserPresence, onGenericVoiceChannel, onGenericVoiceChannelUpdate, onGroupJoin, onGroupLeave, onGroupMessageDelete, onGroupMessageEmbed, onGroupMessageReactionAdd, onGroupMessageReactionRemove, onGroupMessageReactionRemoveAll, onGroupMessageReceived, onGroupMessageUpdate, onGroupUpdateIcon, onGroupUpdateName, onGroupUpdateOwner, onGroupUserJoin, onGroupUserLeave, onGuildAvailable, onGuildBan, onGuildJoin, onGuildLeave, onGuildMemberJoin, onGuildMemberLeave, onGuildMemberNickChange, onGuildMemberRoleAdd, onGuildMemberRoleRemove, onGuildMessageDelete, onGuildMessageEmbed, onGuildMessageReactionAdd, onGuildMessageReactionRemove, onGuildMessageReactionRemoveAll, onGuildMessageReceived, onGuildMessageUpdate, onGuildReady, onGuildUnavailable, onGuildUnban, onGuildUpdateAfkChannel, onGuildUpdateAfkTimeout, onGuildUpdateExplicitContentLevel, onGuildUpdateFeatures, onGuildUpdateIcon, onGuildUpdateMFALevel, onGuildUpdateName, onGuildUpdateNotificationLevel, onGuildUpdateOwner, onGuildUpdateRegion, onGuildUpdateSplash, onGuildUpdateSystemChannel, onGuildUpdateVerificationLevel, onGuildVoiceDeafen, onGuildVoiceGuildDeafen, onGuildVoiceGuildMute, onGuildVoiceJoin, onGuildVoiceLeave, onGuildVoiceMove, onGuildVoiceMute, onGuildVoiceSelfDeafen, onGuildVoiceSelfMute, onGuildVoiceSuppress, onGuildVoiceUpdate, onHttpRequest, onMessageBulkDelete, onMessageDelete, onMessageEmbed, onMessageReactionAdd, onMessageReactionRemove, onMessageReactionRemoveAll, onMessageUpdate, onPrivateChannelCreate, onPrivateChannelDelete, onPrivateMessageDelete, onPrivateMessageEmbed, onPrivateMessageReactionAdd, onPrivateMessageReactionRemove, onPrivateMessageReceived, onPrivateMessageUpdate, onReconnect, onResume, onRoleCreate, onRoleDelete, onRoleUpdateColor, onRoleUpdateHoisted, onRoleUpdateMentionable, onRoleUpdateName, onRoleUpdatePermissions, onRoleUpdatePosition, onSelfUpdateAvatar, onSelfUpdateEmail, onSelfUpdateMFA, onSelfUpdateName, onSelfUpdateVerified, onShutdown, onStatusChange, onTextChannelCreate, onTextChannelDelete, onTextChannelUpdateName, onTextChannelUpdateNSFW, onTextChannelUpdateParent, onTextChannelUpdatePermissions, onTextChannelUpdatePosition, onTextChannelUpdateSlowmode, onTextChannelUpdateTopic, onUnavailableGuildJoined, onUserBlocked, onUserTyping, onUserUnblocked, onUserUpdateAvatar, onUserUpdateDiscriminator, onUserUpdateGame, onUserUpdateName, onUserUpdateOnlineStatus, onVoiceChannelCreate, onVoiceChannelDelete, onVoiceChannelUpdateBitrate, onVoiceChannelUpdateName, onVoiceChannelUpdateParent, onVoiceChannelUpdatePermissions, onVoiceChannelUpdatePosition, onVoiceChannelUpdateUserLimitonCategoryCreate, onCategoryDelete, onCategoryUpdateName, onCategoryUpdatePermissions, onCategoryUpdatePosition, onDisconnect, onEmoteAdded, onEmoteRemoved, onEmoteUpdateName, onEmoteUpdateRoles, onEvent, onException, onGatewayPing, onGenericCategory, onGenericCategoryUpdate, onGenericEmote, onGenericEmoteUpdate, onGenericEvent, onGenericGuild, onGenericGuildInvite, onGenericGuildMember, onGenericGuildMemberUpdate, onGenericGuildMessage, onGenericGuildMessageReaction, onGenericGuildUpdate, onGenericGuildVoice, onGenericMessage, onGenericMessageReaction, onGenericPermissionOverride, onGenericPrivateMessage, onGenericPrivateMessageReaction, onGenericRole, onGenericRoleUpdate, onGenericSelfUpdate, onGenericStoreChannel, onGenericStoreChannelUpdate, onGenericTextChannel, onGenericTextChannelUpdate, onGenericUpdate, onGenericUser, onGenericUserPresence, onGenericVoiceChannel, onGenericVoiceChannelUpdate, onGuildAvailable, onGuildBan, onGuildInviteCreate, onGuildInviteDelete, onGuildJoin, onGuildLeave, onGuildMemberJoin, onGuildMemberLeave, onGuildMemberRemove, onGuildMemberRoleAdd, onGuildMemberRoleRemove, onGuildMemberUpdateBoostTime, onGuildMemberUpdateNickname, onGuildMessageDelete, onGuildMessageEmbed, onGuildMessageReactionAdd, onGuildMessageReactionRemove, onGuildMessageReactionRemoveAll, onGuildMessageReactionRemoveEmote, onGuildMessageReceived, onGuildMessageUpdate, onGuildReady, onGuildUnavailable, onGuildUnban, onGuildUpdateAfkChannel, onGuildUpdateAfkTimeout, onGuildUpdateBanner, onGuildUpdateBoostCount, onGuildUpdateBoostTier, onGuildUpdateDescription, onGuildUpdateExplicitContentLevel, onGuildUpdateFeatures, onGuildUpdateIcon, onGuildUpdateMaxMembers, onGuildUpdateMaxPresences, onGuildUpdateMFALevel, onGuildUpdateName, onGuildUpdateNotificationLevel, onGuildUpdateOwner, onGuildUpdateRegion, onGuildUpdateSplash, onGuildUpdateSystemChannel, onGuildUpdateVanityCode, onGuildUpdateVerificationLevel, onGuildVoiceDeafen, onGuildVoiceGuildDeafen, onGuildVoiceGuildMute, onGuildVoiceJoin, onGuildVoiceLeave, onGuildVoiceMove, onGuildVoiceMute, onGuildVoiceSelfDeafen, onGuildVoiceSelfMute, onGuildVoiceStream, onGuildVoiceSuppress, onGuildVoiceUpdate, onHttpRequest, onMessageBulkDelete, onMessageDelete, onMessageEmbed, onMessageReactionAdd, onMessageReactionRemove, onMessageReactionRemoveAll, onMessageReactionRemoveEmote, onMessageUpdate, onPermissionOverrideCreate, onPermissionOverrideDelete, onPermissionOverrideUpdate, onPrivateChannelCreate, onPrivateChannelDelete, onPrivateMessageDelete, onPrivateMessageEmbed, onPrivateMessageReactionAdd, onPrivateMessageReactionRemove, onPrivateMessageReceived, onPrivateMessageUpdate, onRawGateway, onReconnect, onResume, onRoleCreate, onRoleDelete, onRoleUpdateColor, onRoleUpdateHoisted, onRoleUpdateMentionable, onRoleUpdateName, onRoleUpdatePermissions, onRoleUpdatePosition, onSelfUpdateAvatar, onSelfUpdateEmail, onSelfUpdateMFA, onSelfUpdateName, onSelfUpdateVerified, onShutdown, onStatusChange, onStoreChannelCreate, onStoreChannelDelete, onStoreChannelUpdateName, onStoreChannelUpdatePermissions, onStoreChannelUpdatePosition, onTextChannelCreate, onTextChannelDelete, onTextChannelUpdateName, onTextChannelUpdateNSFW, onTextChannelUpdateParent, onTextChannelUpdatePermissions, onTextChannelUpdatePosition, onTextChannelUpdateSlowmode, onTextChannelUpdateTopic, onUnavailableGuildJoined, onUnavailableGuildLeave, onUserActivityEnd, onUserActivityStart, onUserTyping, onUserUpdateActivityOrder, onUserUpdateAvatar, onUserUpdateDiscriminator, onUserUpdateFlags, onUserUpdateName, onUserUpdateOnlineStatus, onVoiceChannelCreate, onVoiceChannelDelete, onVoiceChannelUpdateBitrate, onVoiceChannelUpdateName, onVoiceChannelUpdateParent, onVoiceChannelUpdatePermissions, onVoiceChannelUpdatePosition, onVoiceChannelUpdateUserLimitpublic void onMessageReceived(net.dv8tion.jda.core.events.message.MessageReceivedEvent event)+
public void onMessageReceived(net.dv8tion.jda.api.events.message.MessageReceivedEvent event)
onMessageReceived in class net.dv8tion.jda.core.hooks.ListenerAdapteronMessageReceived in class net.dv8tion.jda.api.hooks.ListenerAdapterpublic void onReady(net.dv8tion.jda.core.events.ReadyEvent event)+
public void onReady(net.dv8tion.jda.api.events.ReadyEvent event)
onReady in class net.dv8tion.jda.core.hooks.ListenerAdapteronReady in class net.dv8tion.jda.api.hooks.ListenerAdapterJDACommandManagercreate(net.dv8tion.jda.core.JDA jda)create(net.dv8tion.jda.api.JDA jda)public JDACommandManager create(net.dv8tion.jda.core.JDA jda)+
public JDACommandManager create(net.dv8tion.jda.api.JDA jda)
default CommandConfigprovide(net.dv8tion.jda.core.events.message.MessageReceivedEvent event)provide(net.dv8tion.jda.api.events.message.MessageReceivedEvent event)CommandConfigprovide(net.dv8tion.jda.core.events.message.MessageReceivedEvent event)provide(net.dv8tion.jda.api.events.message.MessageReceivedEvent event)JDACommandManagercreate(net.dv8tion.jda.core.JDA jda)create(net.dv8tion.jda.api.JDA jda)JDACommandEvent(JDACommandManager manager,
- net.dv8tion.jda.core.events.message.MessageReceivedEvent event)JDACommandEvent(JDACommandManager manager,
+ net.dv8tion.jda.api.events.message.MessageReceivedEvent event)JDACommandManager(net.dv8tion.jda.core.JDA jda,
+JDACommandManager(net.dv8tion.jda.api.JDA jda,
JDAOptions options)
SelfUser annotation is to define whether the parameter should be represented by JDA's user object
or if it should be parsed from command input.001package co.aikar.commands; 002 -003import net.dv8tion.jda.core.events.message.MessageReceivedEvent; +003import net.dv8tion.jda.api.events.message.MessageReceivedEvent; 004import org.jetbrains.annotations.NotNull; 005 006import java.util.List; diff --git a/docs/acf-jda/src-html/co/aikar/commands/CommandConfigProvider.html b/docs/acf-jda/src-html/co/aikar/commands/CommandConfigProvider.html index b758da4e..1b18040b 100644 --- a/docs/acf-jda/src-html/co/aikar/commands/CommandConfigProvider.html +++ b/docs/acf-jda/src-html/co/aikar/commands/CommandConfigProvider.html @@ -9,7 +9,7 @@001package co.aikar.commands; 002 -003import net.dv8tion.jda.core.events.message.MessageReceivedEvent; +003import net.dv8tion.jda.api.events.message.MessageReceivedEvent; 004 005public interface CommandConfigProvider { 006 CommandConfig provide(MessageReceivedEvent event); diff --git a/docs/acf-jda/src-html/co/aikar/commands/JDACommandContexts.html b/docs/acf-jda/src-html/co/aikar/commands/JDACommandContexts.html index fecd36e0..a919ebc2 100644 --- a/docs/acf-jda/src-html/co/aikar/commands/JDACommandContexts.html +++ b/docs/acf-jda/src-html/co/aikar/commands/JDACommandContexts.html @@ -11,118 +11,117 @@ 002 003import co.aikar.commands.annotation.Author; 004import co.aikar.commands.annotation.CrossGuild; -005import co.aikar.commands.annotation.Optional; -006import co.aikar.commands.annotation.SelfUser; -007import net.dv8tion.jda.core.JDA; -008import net.dv8tion.jda.core.entities.ChannelType; -009import net.dv8tion.jda.core.entities.Guild; -010import net.dv8tion.jda.core.entities.Message; -011import net.dv8tion.jda.core.entities.MessageChannel; -012import net.dv8tion.jda.core.entities.Role; -013import net.dv8tion.jda.core.entities.TextChannel; -014import net.dv8tion.jda.core.entities.User; -015import net.dv8tion.jda.core.events.message.MessageReceivedEvent; -016 -017import java.util.List; -018 -019// TODO: Message Keys !!! -020public class JDACommandContexts extends CommandContexts<JDACommandExecutionContext> { -021 private final JDACommandManager manager; -022 private final JDA jda; -023 -024 public JDACommandContexts(JDACommandManager manager) { -025 super(manager); -026 this.manager = manager; -027 this.jda = this.manager.getJDA(); -028 this.registerIssuerOnlyContext(JDACommandEvent.class, CommandExecutionContext::getIssuer); -029 this.registerIssuerOnlyContext(MessageReceivedEvent.class, c -> c.getIssuer().getIssuer()); -030 this.registerIssuerOnlyContext(Message.class, c -> c.issuer.getIssuer().getMessage()); -031 this.registerIssuerOnlyContext(ChannelType.class, c -> c.issuer.getIssuer().getChannelType()); -032 this.registerIssuerOnlyContext(JDA.class, c -> jda); -033 this.registerIssuerOnlyContext(Guild.class, c -> { -034 MessageReceivedEvent event = c.getIssuer().getIssuer(); -035 if (event.isFromType(ChannelType.PRIVATE) && !c.isOptional()) { -036 throw new InvalidCommandArgument("This command can only be executed in a Guild.", false); -037 } else { -038 return event.getGuild(); -039 } -040 }); -041 this.registerIssuerAwareContext(MessageChannel.class, c -> { -042 if (c.hasAnnotation(Author.class)) { -043 return c.issuer.getIssuer().getChannel(); -044 } -045 boolean isCrossGuild = c.hasAnnotation(CrossGuild.class); -046 String argument = c.popFirstArg(); // we pop because we are only issuer aware if we are annotated -047 MessageChannel channel = null; -048 if (argument.startsWith("<#")) { -049 String id = argument.substring(2, argument.length() - 1); -050 channel = isCrossGuild ? jda.getTextChannelById(id) : c.issuer.getIssuer().getGuild().getTextChannelById(id); -051 } else { -052 List<TextChannel> channelList = isCrossGuild ? jda.getTextChannelsByName(argument, true) : -053 c.issuer.getEvent().getGuild().getTextChannelsByName(argument, true); -054 if (channelList.size() > 1) { -055 throw new InvalidCommandArgument("Too many channels were found with the given name. Try with the `#channelname` syntax.", false); -056 } else if (channelList.size() == 1) { -057 channel = channelList.get(0); -058 } -059 } -060 if (channel == null) { -061 throw new InvalidCommandArgument("Couldn't find a channel with that name or ID."); -062 } -063 return channel; -064 }); -065 this.registerIssuerAwareContext(User.class, c -> { -066 if (c.hasAnnotation(SelfUser.class)) { -067 return jda.getSelfUser(); -068 } -069 String arg = c.getFirstArg(); -070 if (c.isOptional() && (arg == null || arg.isEmpty())) { -071 return null; -072 } -073 arg = c.popFirstArg(); // we pop because we are only issuer aware if we are annotated -074 User user = null; -075 if (arg.startsWith("<@!")) { // for some reason a ! is added when @'ing and clicking their name. -076 user = jda.getUserById(arg.substring(3, arg.length() - 1)); -077 } else if (arg.startsWith("<@")) { // users can /also/ be mentioned like this... -078 user = jda.getUserById(arg.substring(2, arg.length() - 1)); -079 } else { -080 List<User> users = jda.getUsersByName(arg, true); -081 if (users.size() > 1) { -082 throw new InvalidCommandArgument("Too many users were found with the given name. Try with the `@username#0000` syntax.", false); -083 } -084 if (!users.isEmpty()) { -085 user = users.get(0); -086 } -087 } -088 if (user == null) { -089 throw new InvalidCommandArgument("Could not find a user with that name or ID."); -090 } -091 return user; -092 }); -093 this.registerContext(Role.class, c -> { -094 boolean isCrossGuild = c.hasAnnotation(CrossGuild.class); -095 String arg = c.popFirstArg(); -096 Role role = null; -097 if (arg.startsWith("<@&")) { -098 String id = arg.substring(3, arg.length() - 1); -099 role = isCrossGuild ? jda.getRoleById(id) : c.issuer.getIssuer().getGuild().getRoleById(id); -100 } else { -101 List<Role> roles = isCrossGuild ? jda.getRolesByName(arg, true) -102 : c.issuer.getIssuer().getGuild().getRolesByName(arg, true); -103 if (roles.size() > 1) { -104 throw new InvalidCommandArgument("Too many roles were found with the given name. Try with the `@role` syntax.", false); -105 } -106 if (!roles.isEmpty()) { -107 role = roles.get(0); -108 } -109 } -110 if (role == null) { -111 throw new InvalidCommandArgument("Could not find a role with that name or ID."); -112 } -113 return role; -114 }); -115 } -116} +005import co.aikar.commands.annotation.SelfUser; +006import net.dv8tion.jda.api.JDA; +007import net.dv8tion.jda.api.entities.ChannelType; +008import net.dv8tion.jda.api.entities.Guild; +009import net.dv8tion.jda.api.entities.Message; +010import net.dv8tion.jda.api.entities.MessageChannel; +011import net.dv8tion.jda.api.entities.Role; +012import net.dv8tion.jda.api.entities.TextChannel; +013import net.dv8tion.jda.api.entities.User; +014import net.dv8tion.jda.api.events.message.MessageReceivedEvent; +015 +016import java.util.List; +017 +018// TODO: Message Keys !!! +019public class JDACommandContexts extends CommandContexts<JDACommandExecutionContext> { +020 private final JDACommandManager manager; +021 private final JDA jda; +022 +023 public JDACommandContexts(JDACommandManager manager) { +024 super(manager); +025 this.manager = manager; +026 this.jda = this.manager.getJDA(); +027 this.registerIssuerOnlyContext(JDACommandEvent.class, CommandExecutionContext::getIssuer); +028 this.registerIssuerOnlyContext(MessageReceivedEvent.class, c -> c.getIssuer().getIssuer()); +029 this.registerIssuerOnlyContext(Message.class, c -> c.issuer.getIssuer().getMessage()); +030 this.registerIssuerOnlyContext(ChannelType.class, c -> c.issuer.getIssuer().getChannelType()); +031 this.registerIssuerOnlyContext(JDA.class, c -> jda); +032 this.registerIssuerOnlyContext(Guild.class, c -> { +033 MessageReceivedEvent event = c.getIssuer().getIssuer(); +034 if (event.isFromType(ChannelType.PRIVATE) && !c.isOptional()) { +035 throw new InvalidCommandArgument("This command can only be executed in a Guild.", false); +036 } else { +037 return event.getGuild(); +038 } +039 }); +040 this.registerIssuerAwareContext(MessageChannel.class, c -> { +041 if (c.hasAnnotation(Author.class)) { +042 return c.issuer.getIssuer().getChannel(); +043 } +044 boolean isCrossGuild = c.hasAnnotation(CrossGuild.class); +045 String argument = c.popFirstArg(); // we pop because we are only issuer aware if we are annotated +046 MessageChannel channel = null; +047 if (argument.startsWith("<#")) { +048 String id = argument.substring(2, argument.length() - 1); +049 channel = isCrossGuild ? jda.getTextChannelById(id) : c.issuer.getIssuer().getGuild().getTextChannelById(id); +050 } else { +051 List<TextChannel> channelList = isCrossGuild ? jda.getTextChannelsByName(argument, true) : +052 c.issuer.getEvent().getGuild().getTextChannelsByName(argument, true); +053 if (channelList.size() > 1) { +054 throw new InvalidCommandArgument("Too many channels were found with the given name. Try with the `#channelname` syntax.", false); +055 } else if (channelList.size() == 1) { +056 channel = channelList.get(0); +057 } +058 } +059 if (channel == null) { +060 throw new InvalidCommandArgument("Couldn't find a channel with that name or ID."); +061 } +062 return channel; +063 }); +064 this.registerIssuerAwareContext(User.class, c -> { +065 if (c.hasAnnotation(SelfUser.class)) { +066 return jda.getSelfUser(); +067 } +068 String arg = c.getFirstArg(); +069 if (c.isOptional() && (arg == null || arg.isEmpty())) { +070 return null; +071 } +072 arg = c.popFirstArg(); // we pop because we are only issuer aware if we are annotated +073 User user = null; +074 if (arg.startsWith("<@!")) { // for some reason a ! is added when @'ing and clicking their name. +075 user = jda.getUserById(arg.substring(3, arg.length() - 1)); +076 } else if (arg.startsWith("<@")) { // users can /also/ be mentioned like this... +077 user = jda.getUserById(arg.substring(2, arg.length() - 1)); +078 } else { +079 List<User> users = jda.getUsersByName(arg, true); +080 if (users.size() > 1) { +081 throw new InvalidCommandArgument("Too many users were found with the given name. Try with the `@username#0000` syntax.", false); +082 } +083 if (!users.isEmpty()) { +084 user = users.get(0); +085 } +086 } +087 if (user == null) { +088 throw new InvalidCommandArgument("Could not find a user with that name or ID."); +089 } +090 return user; +091 }); +092 this.registerContext(Role.class, c -> { +093 boolean isCrossGuild = c.hasAnnotation(CrossGuild.class); +094 String arg = c.popFirstArg(); +095 Role role = null; +096 if (arg.startsWith("<@&")) { +097 String id = arg.substring(3, arg.length() - 1); +098 role = isCrossGuild ? jda.getRoleById(id) : c.issuer.getIssuer().getGuild().getRoleById(id); +099 } else { +100 List<Role> roles = isCrossGuild ? jda.getRolesByName(arg, true) +101 : c.issuer.getIssuer().getGuild().getRolesByName(arg, true); +102 if (roles.size() > 1) { +103 throw new InvalidCommandArgument("Too many roles were found with the given name. Try with the `@role` syntax.", false); +104 } +105 if (!roles.isEmpty()) { +106 role = roles.get(0); +107 } +108 } +109 if (role == null) { +110 throw new InvalidCommandArgument("Could not find a role with that name or ID."); +111 } +112 return role; +113 }); +114 } +115} diff --git a/docs/acf-jda/src-html/co/aikar/commands/JDACommandEvent.html b/docs/acf-jda/src-html/co/aikar/commands/JDACommandEvent.html index b28f3d5c..dfb6e444 100644 --- a/docs/acf-jda/src-html/co/aikar/commands/JDACommandEvent.html +++ b/docs/acf-jda/src-html/co/aikar/commands/JDACommandEvent.html @@ -9,9 +9,9 @@001package co.aikar.commands; 002 -003import net.dv8tion.jda.core.entities.Message; -004import net.dv8tion.jda.core.entities.MessageEmbed; -005import net.dv8tion.jda.core.events.message.MessageReceivedEvent; +003import net.dv8tion.jda.api.entities.Message; +004import net.dv8tion.jda.api.entities.MessageEmbed; +005import net.dv8tion.jda.api.events.message.MessageReceivedEvent; 006import org.jetbrains.annotations.NotNull; 007 008import java.util.UUID; diff --git a/docs/acf-jda/src-html/co/aikar/commands/JDACommandManager.html b/docs/acf-jda/src-html/co/aikar/commands/JDACommandManager.html index df6decfa..fa236939 100644 --- a/docs/acf-jda/src-html/co/aikar/commands/JDACommandManager.html +++ b/docs/acf-jda/src-html/co/aikar/commands/JDACommandManager.html @@ -10,17 +10,17 @@001package co.aikar.commands; 002 003import co.aikar.commands.apachecommonslang.ApacheCommonsExceptionUtil; -004import net.dv8tion.jda.core.AccountType; -005import net.dv8tion.jda.core.JDA; -006import net.dv8tion.jda.core.entities.ChannelType; -007import net.dv8tion.jda.core.entities.Message; -008import net.dv8tion.jda.core.events.message.MessageReceivedEvent; +004import net.dv8tion.jda.api.AccountType; +005import net.dv8tion.jda.api.JDA; +006import net.dv8tion.jda.api.entities.ChannelType; +007import net.dv8tion.jda.api.entities.Message; +008import net.dv8tion.jda.api.events.message.MessageReceivedEvent; 009import org.jetbrains.annotations.NotNull; 010 011import java.util.Arrays; -012import java.util.HashMap; -013import java.util.Collection; -014import java.util.Collections; +012import java.util.Collection; +013import java.util.Collections; +014import java.util.HashMap; 015import java.util.List; 016import java.util.Locale; 017import java.util.Map; @@ -96,7 +96,7 @@ 087 void initializeBotOwner() { 088 if (botOwner == 0L) { 089 if (jda.getAccountType() == AccountType.BOT) { -090 botOwner = jda.asBot().getApplicationInfo().complete().getOwner().getIdLong(); +090 botOwner = jda.retrieveApplicationInfo().complete().getOwner().getIdLong(); 091 } else { 092 botOwner = jda.getSelfUser().getIdLong(); 093 } diff --git a/docs/acf-jda/src-html/co/aikar/commands/JDACommandPermissionResolver.html b/docs/acf-jda/src-html/co/aikar/commands/JDACommandPermissionResolver.html index a110d10a..f8ca7615 100644 --- a/docs/acf-jda/src-html/co/aikar/commands/JDACommandPermissionResolver.html +++ b/docs/acf-jda/src-html/co/aikar/commands/JDACommandPermissionResolver.html @@ -9,7 +9,7 @@001package co.aikar.commands; 002 -003import net.dv8tion.jda.core.Permission; +003import net.dv8tion.jda.api.Permission; 004 005import java.util.HashMap; 006import java.util.Locale; diff --git a/docs/acf-jda/src-html/co/aikar/commands/JDAListener.html b/docs/acf-jda/src-html/co/aikar/commands/JDAListener.html index ea95381f..a90bbbc9 100644 --- a/docs/acf-jda/src-html/co/aikar/commands/JDAListener.html +++ b/docs/acf-jda/src-html/co/aikar/commands/JDAListener.html @@ -9,10 +9,10 @@001package co.aikar.commands; 002 -003import net.dv8tion.jda.core.entities.ChannelType; -004import net.dv8tion.jda.core.events.ReadyEvent; -005import net.dv8tion.jda.core.events.message.MessageReceivedEvent; -006import net.dv8tion.jda.core.hooks.ListenerAdapter; +003import net.dv8tion.jda.api.entities.ChannelType; +004import net.dv8tion.jda.api.events.ReadyEvent; +005import net.dv8tion.jda.api.events.message.MessageReceivedEvent; +006import net.dv8tion.jda.api.hooks.ListenerAdapter; 007 008public class JDAListener extends ListenerAdapter { 009 diff --git a/docs/acf-jda/src-html/co/aikar/commands/JDAOptions.html b/docs/acf-jda/src-html/co/aikar/commands/JDAOptions.html index faeebaeb..4250c4aa 100644 --- a/docs/acf-jda/src-html/co/aikar/commands/JDAOptions.html +++ b/docs/acf-jda/src-html/co/aikar/commands/JDAOptions.html @@ -9,7 +9,7 @@