From fb8ff28c61f268704b9b7a473a234d01542bb3f0 Mon Sep 17 00:00:00 2001 From: Sky Date: Sat, 18 Jan 2025 21:46:20 +0100 Subject: [PATCH 1/5] :rocket: Package name change ... :P --- build.gradle | 2 +- .../disky/api/emojis/TwemojiType.java | 6 ---- .../itsthesky/disky/BotApplication.java | 4 +-- .../{info => net}/itsthesky/disky/DiSky.java | 30 +++++++++---------- .../itsthesky/disky/api/DiSkyRegistry.java | 4 +-- .../itsthesky/disky/api/DiSkyType.java | 2 +- .../itsthesky/disky/api/EmbedManager.java | 2 +- .../itsthesky/disky/api/ReflectionUtils.java | 2 +- .../api/changers/ChangeableExpression.java | 2 +- .../ChangeablePropertyExpression.java | 2 +- .../changers/ChangeableSimpleExpression.java | 2 +- .../ChangeableSimplePropertyExpression.java | 2 +- .../disky/api/changers/DiSkyChanger.java | 6 ++-- .../api/changers/DiSkyChangerElement.java | 6 ++-- .../MultipleChangeablePropertyExpression.java | 4 +-- .../api/datastruct/BaseDataStructElement.java | 13 ++------ .../datastruct/ChainDataStructElement.java | 12 +++----- .../disky/api/datastruct/DataStructure.java | 7 +++-- .../api/datastruct/DataStructureEntry.java | 5 ++-- .../api/datastruct/DataStructureFactory.java | 19 ++++++------ .../disky/api/datastruct/EasyDSRegistry.java | 10 +++---- .../api/datastruct/EditDataStructElement.java | 6 ++-- .../datastruct/ReflectBasicDataStructure.java | 4 +-- .../disky/api/datastruct/base/BasicDS.java | 2 +- .../disky/api/datastruct/base/ChainDS.java | 2 +- .../disky/api/datastruct/base/DataStruct.java | 2 +- .../base/EditableDataStructure.java | 2 +- .../itsthesky/disky/api/emojis/Action.java | 2 +- .../disky/api/emojis/ActionImpl.java | 4 +-- .../disky/api/emojis/ActionSupplier.java | 2 +- .../itsthesky/disky/api/emojis/Emoji.java | 6 ++-- .../disky/api/emojis/EmojiParser.java | 2 +- .../disky/api/emojis/EmojiStore.java | 4 +-- .../itsthesky/disky/api/emojis/Emojis.java | 4 +-- .../itsthesky/disky/api/emojis/Emote.java | 2 +- .../disky/api/emojis/ExtendedEmoji.java | 2 +- .../itsthesky/disky/api/emojis/HttpUtils.java | 2 +- .../disky/api/emojis/StringUtils.java | 2 +- .../disky/api/emojis/TwemojiType.java | 6 ++++ .../disky/api/events/BukkitEvent.java | 2 +- .../disky/api/events/DiSkyEvent.java | 8 ++--- .../disky/api/events/DiSkyGetter.java | 2 +- .../disky/api/events/EventListener.java | 4 +-- .../disky/api/events/EventValue.java | 2 +- .../disky/api/events/SimpleDiSkyEvent.java | 2 +- .../specific/ComponentInteractionEvent.java | 2 +- .../api/events/specific/InteractionEvent.java | 2 +- .../disky/api/events/specific/LogEvent.java | 2 +- .../api/events/specific/MessageEvent.java | 2 +- .../disky/api/events/specific/ModalEvent.java | 2 +- .../disky/api/generator/DocBuilder.java | 8 ++--- .../api/generator/EventValuesGetter.java | 2 +- .../itsthesky/disky/api/generator/Module.java | 2 +- .../disky/api/generator/ReflectionUtils.java | 2 +- .../disky/api/modules/DiSkyModule.java | 4 +-- .../disky/api/modules/DiSkyModuleInfo.java | 2 +- .../disky/api/modules/EventValueInfo.java | 4 +-- .../disky/api/modules/ModuleManager.java | 13 ++------ .../disky/api/modules/ModuleOrigin.java | 2 +- .../disky/api/skript/AsyncEffectSection.java | 2 +- .../disky/api/skript/BaseBukkitEvent.java | 2 +- .../itsthesky/disky/api/skript/BaseScope.java | 6 ++-- .../api/skript/BetterExpressionEntryData.java | 6 +--- .../disky/api/skript/EasyElement.java | 6 ++-- .../api/skript/EasyPropertyCondition.java | 2 +- .../disky/api/skript/ErrorHandler.java | 2 +- .../disky/api/skript/INodeHolder.java | 2 +- .../api/skript/MultipleGetterExpression.java | 2 +- .../skript/MultiplyPropertyExpression.java | 2 +- .../disky/api/skript/NodeInformation.java | 2 +- .../disky/api/skript/ReturningSection.java | 2 +- .../api/skript/SimpleGetterExpression.java | 2 +- .../disky/api/skript/SpecificBotEffect.java | 6 ++-- .../disky/api/skript/WaiterEffect.java | 4 +-- .../api/skript/action/AbstractNewAction.java | 8 ++--- .../api/skript/action/ActionProperty.java | 14 ++++----- .../api/skript/action/ChannelAction.java | 2 +- .../disky/api/skript/action/GuildAction.java | 2 +- .../skript/action/MultipleActionProperty.java | 8 ++--- .../api/skript/entries/MutexEntryData.java | 2 +- .../skript/entries/SimpleKeyValueEntries.java | 2 +- .../api/skript/entries/SubEntryData.java | 2 +- .../skript/reflects/ReflectClassFactory.java | 6 ++-- .../ReflectEventExpressionFactory.java | 6 ++-- .../reflects/ReflectGetterExpression.java | 4 +-- .../api/skript/reflects/ReflectProperty.java | 2 +- .../reflects/state/DiSkyStateCondition.java | 4 +-- .../reflects/state/DiSkyStateProperty.java | 6 ++-- .../reflects/state/SkriptStateRegistry.java | 10 +++---- .../itsthesky/disky/core/Bot.java | 14 ++++----- .../itsthesky/disky/core/BotOptions.java | 14 ++++----- .../itsthesky/disky/core/Debug.java | 8 ++--- .../itsthesky/disky/core/DiSkyCommand.java | 15 +++++----- .../itsthesky/disky/core/DiSkyMetrics.java | 4 +-- .../itsthesky/disky/core/JDAUtils.java | 4 +-- .../disky/core/MemberRemoveEventListener.java | 6 ++-- .../disky/core/ReactionListener.java | 6 ++-- .../itsthesky/disky/core/SkriptUtils.java | 18 +++++------ .../itsthesky/disky/core/Utils.java | 4 +-- .../disky/elements/BaseBotEffect.java | 10 +++---- .../itsthesky/disky/elements/Types.java | 24 +++++++-------- .../disky/elements/changers/Change.java | 12 ++++---- .../changers/IAsyncChangeableExpression.java | 2 +- .../changers/IAsyncGettableExpression.java | 2 +- .../disky/elements/commands/Argument.java | 2 +- .../disky/elements/commands/CommandData.java | 2 +- .../disky/elements/commands/CommandEvent.java | 4 +-- .../elements/commands/CommandFactory.java | 12 ++++---- .../elements/commands/CommandListener.java | 4 +-- .../elements/commands/CommandObject.java | 8 ++--- .../elements/commands/CommandRegistry.java | 8 ++--- .../disky/elements/commands/DiSkyCommand.java | 12 ++++---- .../disky/elements/commands/ExprArgument.java | 2 +- .../elements/commands/values/UsedAlias.java | 4 +-- .../commands/values/UsedArgument.java | 4 +-- .../elements/commands/values/UsedPrefix.java | 4 +-- .../disky/elements/components/OpenModal.java | 10 +++---- .../disky/elements/components/Test.java | 2 +- .../components/commands/EditComponent.java | 10 +++---- .../commands/EditMessageComponent.java | 6 ++-- .../commands/EffEnableDisableCommand.java | 6 ++-- .../components/commands/EffUpdateCommand.java | 10 +++---- .../commands/ExprArgumentChoices.java | 8 ++--- .../components/commands/ExprCommandGroup.java | 8 ++--- .../commands/ExprGroupCommands.java | 8 ++--- .../commands/ExprNewMessageCommand.java | 4 +-- .../commands/ExprNewOptionChoice.java | 4 +-- .../commands/ExprNewSlashCommand.java | 4 +-- .../commands/ExprNewSlashOption.java | 4 +-- .../commands/ExprNewUserCommand.java | 4 +-- .../commands/UnregisterCommand.java | 10 +++---- .../components/core/ComponentRow.java | 2 +- .../components/create/ExprNewButton.java | 6 ++-- .../components/create/ExprNewButtonsRow.java | 4 +-- .../components/create/ExprNewDropdown.java | 4 +-- .../create/ExprNewDropdownOption.java | 6 ++-- .../components/create/ExprNewInput.java | 4 +-- .../components/create/ExprNewModal.java | 4 +-- .../components/properties/ComponentValue.java | 6 ++-- .../components/properties/ExprMaxRange.java | 2 +- .../components/properties/ExprMinRange.java | 2 +- .../properties/ExprNewLocaleData.java | 4 +-- .../properties/ExprPlaceholder.java | 2 +- .../properties/ExprRequireState.java | 2 +- .../components/properties/ExprValue.java | 2 +- .../properties/PropDefaultValues.java | 6 ++-- .../properties/PropLocalization.java | 6 ++-- .../components/properties/PropOptions.java | 6 ++-- .../properties/SimpleChangeableProperty.java | 4 +-- .../conditions/BotMemberIsInThread.java | 6 ++-- .../elements/conditions/HasPermissions.java | 6 ++-- .../disky/elements/conditions/HasRole.java | 6 ++-- .../disky/elements/conditions/IsBot.java | 2 +- .../disky/elements/conditions/IsDeafen.java | 2 +- .../disky/elements/conditions/IsMuted.java | 2 +- .../disky/elements/conditions/IsTimeout.java | 6 ++-- .../elements/conditions/MessageOrigin.java | 6 ++-- .../disky/elements/conditions/isInline.java | 2 +- .../elements/datastructs/BasicStructs.java | 8 ++--- .../disky/elements/datastructs/RoleDS.java | 16 +++++----- .../structures/ButtonStructure.java | 8 ++--- .../structures/EmbedFieldStructure.java | 6 ++-- .../structures/EmbedStructure.java | 10 +++---- .../effects/ArchiveUnarchiveThread.java | 4 +-- .../disky/elements/effects/AwaitEffect.java | 10 +++---- .../disky/elements/effects/BanMember.java | 4 +-- .../disky/elements/effects/ConnectBot.java | 10 +++---- .../disky/elements/effects/CreateAction.java | 10 +++---- .../disky/elements/effects/CreateEmote.java | 10 +++---- .../disky/elements/effects/CreateInvite.java | 10 +++---- .../disky/elements/effects/CreatePost.java | 6 ++-- .../effects/CreateScheduledEvent.java | 10 +++---- .../disky/elements/effects/CreateThread.java | 10 +++---- .../elements/effects/DeferInteraction.java | 8 ++--- .../disky/elements/effects/DestroyEntity.java | 19 ++++++------ .../disky/elements/effects/EditMessage.java | 12 ++++---- .../disky/elements/effects/EndPoll.java | 6 ++-- .../elements/effects/ForwardMessage.java | 6 ++-- .../disky/elements/effects/KickMember.java | 6 ++-- .../disky/elements/effects/LoadMembers.java | 6 ++-- .../elements/effects/LockUnlockThread.java | 6 ++-- .../disky/elements/effects/MakeBotLeave.java | 6 ++-- .../disky/elements/effects/MoveMember.java | 6 ++-- .../disky/elements/effects/MoveRole.java | 6 ++-- .../disky/elements/effects/MuteMember.java | 6 ++-- .../elements/effects/OpenPrivateChannel.java | 8 ++--- .../disky/elements/effects/PinMessage.java | 6 ++-- .../disky/elements/effects/PostMessage.java | 8 ++--- .../elements/effects/PublishMessage.java | 8 ++--- .../disky/elements/effects/PurgeMessages.java | 6 ++-- .../disky/elements/effects/ReplyWith.java | 18 +++++------ .../elements/effects/RetrieveEventValue.java | 8 ++--- .../disky/elements/effects/SendTyping.java | 8 ++--- .../disky/elements/effects/StopBot.java | 6 ++-- .../elements/effects/SuppressReaction.java | 10 +++---- .../disky/elements/effects/TimeOutMember.java | 10 +++---- .../disky/elements/effects/UnbanMember.java | 6 ++-- .../effects/find/FindMembersWithNickname.java | 4 +-- .../effects/find/FindMembersWithRoles.java | 6 ++-- .../retrieve/RetrieveApplicationInfo.java | 6 ++-- .../effects/retrieve/RetrieveBans.java | 6 ++-- .../effects/retrieve/RetrieveEmotes.java | 8 ++--- .../retrieve/RetrieveInterestedMembers.java | 6 ++-- .../effects/retrieve/RetrieveInvite.java | 6 ++-- .../effects/retrieve/RetrieveInvites.java | 6 ++-- .../effects/retrieve/RetrieveLogs.java | 6 ++-- .../effects/retrieve/RetrieveMember.java | 4 +-- .../effects/retrieve/RetrieveMessage.java | 6 ++-- .../effects/retrieve/RetrieveMessages.java | 4 +-- .../effects/retrieve/RetrieveOwner.java | 4 +-- .../effects/retrieve/RetrieveProfile.java | 4 +-- .../retrieve/RetrieveStartMessage.java | 4 +-- .../effects/retrieve/RetrieveSticker.java | 6 ++-- .../effects/retrieve/RetrieveStickers.java | 4 +-- .../retrieve/RetrieveThreadMembers.java | 6 ++-- .../retrieve/RetrieveThreadMessage.java | 4 +-- .../effects/retrieve/RetrieveThreads.java | 6 ++-- .../effects/retrieve/RetrieveUser.java | 6 ++-- .../effects/retrieve/RetrieveWebhooks.java | 4 +-- .../effects/webhooks/MakeClientSpeak.java | 8 ++--- .../effects/webhooks/RegisterClient.java | 8 ++--- .../effects/webhooks/RetrieveWebhooks.java | 4 +-- .../effects/webhooks/UnregisterClient.java | 6 ++-- .../elements/events/DiSkyErrorEvent.java | 6 ++-- .../elements/events/ExprEventValues.java | 4 +-- .../elements/events/bots/BotJoinEvent.java | 8 ++--- .../elements/events/bots/BotLeaveEvent.java | 8 ++--- .../elements/events/bots/BotStopEvent.java | 8 ++--- .../elements/events/bots/GuildReadyEvent.java | 8 ++--- .../elements/events/bots/ReadyEvent.java | 8 ++--- .../events/channel/ChannelCreateEvent.java | 8 ++--- .../events/channel/ChannelDeleteEvent.java | 8 ++--- .../events/guild/GuildAFKChannelEvent.java | 8 ++--- .../events/guild/GuildAFKTimeoutEvent.java | 8 ++--- .../elements/events/guild/GuildBanEvent.java | 8 ++--- .../events/guild/GuildBannerEvent.java | 8 ++--- .../events/guild/GuildBoostCountEvent.java | 8 ++--- .../events/guild/GuildBoostTierEvent.java | 8 ++--- .../elements/events/guild/GuildIconEvent.java | 8 ++--- .../events/guild/GuildInviteCreateEvent.java | 8 ++--- .../events/guild/GuildInviteDeleteEvent.java | 8 ++--- .../elements/events/guild/GuildJoinEvent.java | 8 ++--- .../events/guild/GuildLogEntryEvent.java | 8 ++--- .../elements/events/guild/GuildNameEvent.java | 8 ++--- .../events/guild/GuildOwnerEvent.java | 8 ++--- .../events/guild/GuildSplashEvent.java | 8 ++--- .../events/guild/GuildUnbanEvent.java | 8 ++--- .../events/guild/GuildVoiceDeafenEvent.java | 8 ++--- .../events/guild/GuildVoiceMuteEvent.java | 8 ++--- .../events/interactions/ButtonClickEvent.java | 12 ++++---- .../EntityDropdownClickEvent.java | 14 ++++----- .../interactions/MessageCommandEvent.java | 14 ++++----- .../events/interactions/ModalSendEvent.java | 10 +++---- .../SlashCommandReceiveEvent.java | 18 +++++------ .../interactions/SlashCompletionEvent.java | 16 +++++----- .../StringDropdownClickEvent.java | 14 ++++----- .../events/interactions/UserCommandEvent.java | 14 ++++----- .../member/BukkitMemberRemoveEvent.java | 2 +- .../member/MemberAcceptScreenEvent.java | 8 ++--- .../events/member/MemberAvatarEvent.java | 8 ++--- .../events/member/MemberBanEvent.java | 6 ++-- .../events/member/MemberBoostEvent.java | 10 +++---- .../member/MemberBoostTimeUpdateEvent.java | 8 ++--- .../events/member/MemberJoinEvent.java | 8 ++--- .../events/member/MemberKickEvent.java | 6 ++-- .../events/member/MemberNicknameEvent.java | 8 ++--- .../events/member/MemberRemoveEvent.java | 8 ++--- .../events/member/MemberRoleAddEvent.java | 8 ++--- .../events/member/MemberRoleRemoveEvent.java | 8 ++--- .../events/member/MemberSelfDeafenEvent.java | 8 ++--- .../events/member/MemberSelfMuteEvent.java | 8 ++--- .../events/member/MemberTimeoutEvent.java | 12 ++++---- .../events/member/MemberVoiceJoinEvent.java | 8 ++--- .../events/member/MemberVoiceLeaveEvent.java | 8 ++--- .../events/messages/MessageDeleteEvent.java | 15 +++++----- .../events/messages/MessageEditEvent.java | 13 ++++---- .../events/messages/MessageEvent.java | 10 +++---- .../events/polls/PollVoteAddEvent.java | 8 ++--- .../events/polls/PollVoteRemoveEvent.java | 8 ++--- .../events/react/ReactionAddEvent.java | 13 ++++---- .../events/react/ReactionRemoveAllEvent.java | 11 +++---- .../events/react/ReactionRemoveEvent.java | 13 ++++---- .../elements/events/role/RoleColorEvent.java | 8 ++--- .../elements/events/role/RoleCreateEvent.java | 8 ++--- .../elements/events/role/RoleDeleteEvent.java | 8 ++--- .../events/role/RoleHoistedEvent.java | 8 ++--- .../elements/events/role/RoleIconEvent.java | 8 ++--- .../elements/events/role/RoleNameEvent.java | 8 ++--- .../events/role/RolePermissionEvent.java | 8 ++--- .../events/role/RolePositionEvent.java | 8 ++--- .../events/thread/ThreadJoinEvent.java | 8 ++--- .../events/thread/ThreadLeaveEvent.java | 8 ++--- .../events/user/UserActivityOrderEvent.java | 10 +++---- .../elements/events/user/UserAvatarEvent.java | 8 ++--- .../events/user/UserDiscriminatorEvent.java | 8 ++--- .../elements/events/user/UserNameEvent.java | 8 ++--- .../events/user/UserOnlineStatusEvent.java | 8 ++--- .../elements/events/user/UserTypingEvent.java | 8 ++--- .../getters/BaseGetterExpression.java | 10 +++---- .../disky/elements/getters/ColorFromHex.java | 4 +-- .../disky/elements/getters/ExprEmoji.java | 14 ++++----- .../elements/getters/GetAudioChannel.java | 4 +-- .../disky/elements/getters/GetBot.java | 6 ++-- .../disky/elements/getters/GetCategory.java | 4 +-- .../disky/elements/getters/GetChannel.java | 4 +-- .../elements/getters/GetForumChannel.java | 4 +-- .../disky/elements/getters/GetGuild.java | 4 +-- .../elements/getters/GetGuildChannel.java | 4 +-- .../disky/elements/getters/GetMember.java | 8 ++--- .../elements/getters/GetMessageChannel.java | 4 +-- .../elements/getters/GetNewsChannel.java | 4 +-- .../disky/elements/getters/GetRole.java | 4 +-- .../elements/getters/GetScheduledEvent.java | 4 +-- .../elements/getters/GetStageChannel.java | 4 +-- .../disky/elements/getters/GetSticker.java | 6 ++-- .../elements/getters/GetTextChannel.java | 4 +-- .../disky/elements/getters/GetThread.java | 4 +-- .../disky/elements/getters/GetUser.java | 4 +-- .../elements/getters/GetUserInGuild.java | 6 ++-- .../elements/getters/GetVoiceChannel.java | 4 +-- .../elements/getters/LastDiSkyException.java | 4 +-- .../disky/elements/properties/AvatarURL.java | 16 +++++----- .../disky/elements/properties/ChannelOf.java | 2 +- .../disky/elements/properties/ColorOf.java | 12 ++++---- .../elements/properties/CreationDate.java | 2 +- .../disky/elements/properties/DiscordId.java | 2 +- .../elements/properties/DiscordMembersOf.java | 6 ++-- .../elements/properties/DiscordName.java | 10 +++---- .../elements/properties/DiscordRoles.java | 10 +++---- .../elements/properties/DynamicElements.java | 8 ++--- .../disky/elements/properties/GuildOf.java | 2 +- .../disky/elements/properties/MentionTag.java | 2 +- .../elements/properties/PermissionsOf.java | 10 +++---- .../properties/RoleChannelPosition.java | 6 ++-- .../disky/elements/properties/UserLocal.java | 6 ++-- .../properties/activity/ActivityEmote.java | 4 +-- .../properties/activity/ActivityText.java | 2 +- .../properties/activity/ActivityType.java | 2 +- .../properties/activity/ActivityURL.java | 2 +- .../application/ApplicationDescription.java | 2 +- .../application/ApplicationOwner.java | 2 +- .../application/ApplicationPolicy.java | 2 +- .../application/ApplicationTOS.java | 2 +- .../properties/attachments/CondIsAudio.java | 2 +- .../properties/attachments/CondIsImage.java | 2 +- .../properties/attachments/CondIsSpoiler.java | 2 +- .../properties/attachments/CondIsVideo.java | 2 +- .../attachments/EffAttDownload.java | 6 ++-- .../attachments/ExprAttDuration.java | 4 +-- .../attachments/ExprAttFileExt.java | 2 +- .../attachments/ExprAttFileName.java | 2 +- .../properties/attachments/ExprAttURL.java | 2 +- .../elements/properties/ban/BanReason.java | 2 +- .../elements/properties/ban/BanUser.java | 2 +- .../elements/properties/bot/BotGuilds.java | 6 ++-- .../elements/properties/bot/BotIsLoaded.java | 4 +-- .../elements/properties/bot/BotPing.java | 8 ++--- .../elements/properties/bot/BotPresence.java | 8 ++--- .../elements/properties/bot/BotStatus.java | 10 +++---- .../elements/properties/bot/BotToken.java | 12 ++++---- .../elements/properties/bot/BotUptime.java | 8 ++--- .../elements/properties/bot/ExprPresence.java | 6 ++-- .../elements/properties/bot/SelfMember.java | 6 ++-- .../properties/channels/ChannelBitrate.java | 4 +-- .../properties/channels/ChannelChannels.java | 4 +-- .../properties/channels/ChannelJumpURL.java | 2 +- .../properties/channels/ChannelMaxUser.java | 4 +-- .../properties/channels/ChannelMembers.java | 4 +-- .../properties/channels/ChannelNSFW.java | 4 +-- .../properties/channels/ChannelName.java | 4 +-- .../properties/channels/ChannelParent.java | 4 +-- .../properties/channels/ChannelRegion.java | 4 +-- .../properties/channels/ChannelSlowmode.java | 4 +-- .../properties/channels/ChannelStatus.java | 8 ++--- .../properties/channels/ChannelThreads.java | 4 +-- .../properties/channels/ChannelTopic.java | 4 +-- .../channels/NewCategoryAction.java | 4 +-- .../properties/channels/NewMediaChannel.java | 4 +-- .../properties/channels/NewNewsChannel.java | 4 +-- .../properties/channels/NewStageChannel.java | 4 +-- .../properties/channels/NewTextAction.java | 4 +-- .../properties/channels/NewVoiceAction.java | 4 +-- .../properties/embeds/EffAddField.java | 4 +-- .../properties/embeds/EmbedAuthor.java | 2 +- .../properties/embeds/EmbedAuthorIcon.java | 2 +- .../properties/embeds/EmbedAuthorURL.java | 2 +- .../properties/embeds/EmbedDescription.java | 2 +- .../properties/embeds/EmbedFields.java | 4 +-- .../properties/embeds/EmbedFooter.java | 2 +- .../properties/embeds/EmbedFooterIcon.java | 2 +- .../properties/embeds/EmbedFromJSON.java | 6 ++-- .../properties/embeds/EmbedImage.java | 2 +- .../properties/embeds/EmbedProperty.java | 4 +-- .../properties/embeds/EmbedThumbnail.java | 2 +- .../properties/embeds/EmbedTimeStamp.java | 2 +- .../properties/embeds/EmbedTitle.java | 2 +- .../properties/embeds/EmbedTitleURL.java | 2 +- .../properties/embeds/EmbedToJSON.java | 6 ++-- .../elements/properties/embeds/EmbedURL.java | 2 +- .../properties/embeds/ExprLastEmbed.java | 4 +-- .../properties/emotes/EmoteGuild.java | 4 +-- .../properties/emotes/EmoteIsAnimated.java | 4 +-- .../properties/emotes/EmoteIsEmote.java | 4 +-- .../elements/properties/emotes/EmoteName.java | 10 +++---- .../elements/properties/emotes/EmoteURL.java | 4 +-- .../properties/events/EventChannel.java | 2 +- .../properties/events/EventCover.java | 4 +-- .../properties/events/EventCreator.java | 2 +- .../properties/events/EventEndDate.java | 2 +- .../properties/events/EventLocation.java | 2 +- .../properties/events/EventStartDate.java | 2 +- .../properties/events/EventStatus.java | 2 +- .../elements/properties/events/EventType.java | 2 +- .../SimpleScheduledEventExpression.java | 4 +-- .../properties/forums/CondTagRequired.java | 2 +- .../properties/forums/DefaultEmoji.java | 8 ++--- .../properties/forums/ExprTagRequired.java | 4 +-- .../properties/forums/ForumLayout.java | 8 ++--- .../properties/forums/ForumSortOrder.java | 8 ++--- .../properties/guilds/GuildAFKChannel.java | 10 +++---- .../properties/guilds/GuildAFKTimeout.java | 10 +++---- .../properties/guilds/GuildBanner.java | 12 ++++---- .../properties/guilds/GuildBoostCount.java | 2 +- .../properties/guilds/GuildBoostRole.java | 2 +- .../properties/guilds/GuildBoostTier.java | 2 +- .../properties/guilds/GuildBoosters.java | 2 +- .../properties/guilds/GuildBotRole.java | 2 +- .../properties/guilds/GuildEveryone.java | 2 +- .../properties/guilds/GuildGuildChannels.java | 2 +- .../properties/guilds/GuildMemberCount.java | 4 +-- .../properties/guilds/GuildNewsChannels.java | 2 +- .../properties/guilds/GuildProperty.java | 2 +- .../guilds/GuildScheduledEvents.java | 2 +- .../properties/guilds/GuildStageChannels.java | 2 +- .../properties/guilds/GuildTextChannels.java | 2 +- .../guilds/GuildVerificationLevel.java | 8 ++--- .../properties/guilds/GuildVoiceChannels.java | 2 +- .../guilds/MultipleGuildProperty.java | 4 +-- .../properties/invites/InviteCode.java | 2 +- .../properties/invites/InviteInviter.java | 2 +- .../properties/invites/InviteMaxAge.java | 2 +- .../properties/invites/InviteMaxUses.java | 2 +- .../properties/invites/InviteProperty.java | 2 +- .../properties/invites/InviteURL.java | 2 +- .../properties/invites/InviteUses.java | 2 +- .../members/MemberEffectiveName.java | 2 +- .../properties/members/MemberFlags.java | 6 ++-- .../properties/members/MemberJoinDate.java | 2 +- .../properties/members/MemberNickname.java | 8 ++--- .../properties/members/MemberProperty.java | 2 +- .../members/MemberVoiceChannel.java | 2 +- .../members/MultipleMemberProperty.java | 4 +-- .../messages/MessageAttachments.java | 6 ++-- .../properties/messages/MessageAuthor.java | 2 +- .../properties/messages/MessageContent.java | 2 +- .../properties/messages/MessageEmbeds.java | 4 +-- .../properties/messages/MessageGuild.java | 2 +- .../properties/messages/MessageHasPoll.java | 2 +- .../properties/messages/MessageIsEdited.java | 2 +- .../messages/MessageIsEphemeral.java | 2 +- .../messages/MessageIsForwarded.java | 2 +- .../properties/messages/MessageIsPinned.java | 2 +- .../properties/messages/MessageIsPosted.java | 2 +- .../properties/messages/MessageIsTTS.java | 2 +- .../properties/messages/MessageJumpURL.java | 2 +- .../properties/messages/MessageMember.java | 2 +- .../messages/MessageMentionedChannels.java | 4 +-- .../messages/MessageMentionedEmotes.java | 6 ++-- .../messages/MessageMentionedMembers.java | 4 +-- .../messages/MessageMentionedRoles.java | 4 +-- .../messages/MessageMentionedUsers.java | 4 +-- .../MessageMentionedVoiceChannels.java | 4 +-- .../properties/messages/MessagePoll.java | 2 +- .../properties/messages/MessageReactions.java | 6 ++-- .../messages/MessageReferenced.java | 2 +- .../elements/properties/polls/NewPoll.java | 2 +- .../properties/polls/NewPollAnswer.java | 4 +-- .../properties/polls/PollAnswerData.java | 4 +-- .../properties/polls/PollAnswers.java | 6 ++-- .../properties/polls/PollDuration.java | 2 +- .../properties/polls/PollIsExpired.java | 2 +- .../properties/polls/PollIsFinalized.java | 2 +- .../properties/polls/PollQuestion.java | 2 +- .../polls/answers/PollAnswerEmote.java | 6 ++-- .../polls/answers/PollAnswerText.java | 4 +-- .../polls/answers/PollAnswerVotes.java | 4 +-- .../properties/profile/HasBanner.java | 2 +- .../properties/profile/ProfileBanner.java | 10 +++---- .../properties/profile/ProfileColor.java | 4 +-- .../properties/reactions/ReactionEmote.java | 4 +-- .../properties/reactions/ReactionIsSelf.java | 2 +- .../properties/reactions/ReactionIsSuper.java | 2 +- .../properties/role/NewRoleAction.java | 4 +-- .../elements/properties/role/RoleColor.java | 6 ++-- .../elements/properties/role/RoleName.java | 4 +-- .../elements/properties/tags/GetTag.java | 4 +-- .../elements/properties/tags/NewTag.java | 6 ++-- .../elements/properties/tags/TagEmoji.java | 4 +-- .../elements/properties/tags/ThreadTags.java | 10 +++---- .../properties/threads/ThreadIsPublic.java | 2 +- .../properties/threads/ThreadParent.java | 2 +- .../users/MultipleUserProperty.java | 4 +-- .../elements/properties/users/UserBadges.java | 2 +- .../users/UserDecorationAvatar.java | 2 +- .../properties/users/UserDiscriminator.java | 2 +- .../properties/users/UserMutualGuilds.java | 2 +- .../properties/users/UserProperty.java | 2 +- .../disky/elements/sections/EmbedSection.java | 6 ++-- .../elements/sections/FindMemberSection.java | 9 ++---- .../disky/elements/sections/ReactSection.java | 12 ++++---- .../sections/automod/AutomodResponse.java | 8 ++--- .../sections/automod/AutomodType.java | 6 ++-- .../sections/automod/CreateAutoMod.java | 6 ++-- .../elements/sections/automod/CreateRule.java | 8 ++--- .../elements/sections/automod/FilterType.java | 2 +- .../sections/automod/NewRuleResponse.java | 4 +-- .../sections/automod/NewRuleType.java | 4 +-- .../sections/components/CreateRow.java | 6 ++-- .../sections/components/RowComponents.java | 8 ++--- .../sections/handler/DiSkyRuntimeHandler.java | 10 +++---- .../elements/sections/handler/SecTry.java | 4 +-- .../sections/message/CreateMessage.java | 4 +-- .../message/InlineMessageBuilder.java | 6 ++-- .../sections/message/MessageAttachments.java | 8 ++--- .../sections/message/MessageContent.java | 4 +-- .../sections/message/MessageEmbeds.java | 6 ++-- .../sections/message/MessageModalRows.java | 8 ++--- .../sections/once/EffOuterExecution.java | 2 +- .../sections/once/ExprOuterExpression.java | 2 +- .../sections/once/ExprSubEventExpression.java | 4 +-- .../elements/sections/once/SecListenOnce.java | 14 ++++----- .../sections/welcome/AddScreenChannel.java | 6 ++-- .../sections/welcome/ModifySection.java | 2 +- .../sections/welcome/ScreenDescription.java | 2 +- .../sections/welcome/ScreenElement.java | 2 +- .../disky/elements/structures/StructBot.java | 18 +++++------ .../context/ContextCommandManager.java | 8 ++--- .../context/ParsedContextCommand.java | 6 ++-- .../context/StructContextCommand.java | 15 +++++----- .../structures/slash/BotReadyWaiter.java | 8 ++--- .../structures/slash/SlashManager.java | 16 +++++----- .../structures/slash/StructSlashCommand.java | 24 +++++++-------- .../slash/elements/ExprRemainingTime.java | 4 +-- .../slash/elements/ExprSlashArgument.java | 6 ++-- .../slash/elements/OnCooldownEvent.java | 8 ++--- .../structures/slash/models/CommandGroup.java | 4 +-- .../structures/slash/models/CommandType.java | 2 +- .../slash/models/ParsedArgument.java | 2 +- .../slash/models/ParsedCommand.java | 8 ++--- .../slash/models/RegisteredCommand.java | 2 +- .../slash/models/SlashCommandInformation.java | 2 +- .../itsthesky/disky/experimental/Case.java | 6 ++-- .../itsthesky/disky/experimental/Switch.java | 6 ++-- .../itsthesky/disky/managers/BotChangers.java | 4 +-- .../itsthesky/disky/managers/BotManager.java | 12 ++++---- .../disky/managers/ConfigManager.java | 4 +-- .../disky/managers/CoreEventListener.java | 12 ++++---- .../disky/managers/DiSkyErrorHandler.java | 12 ++++---- .../disky/managers/MessageManager.java | 8 ++--- .../disky/managers/WebhooksManager.java | 8 ++--- .../managers/wrappers/AutoModRuleBuilder.java | 2 +- .../managers/wrappers/MessageWrapper.java | 2 +- .../managers/wrappers/RegisteredWebhook.java | 6 ++-- src/main/resources/plugin.yml | 2 +- 564 files changed, 1570 insertions(+), 1592 deletions(-) delete mode 100644 src/main/java/info/itsthesky/disky/api/emojis/TwemojiType.java rename src/main/java/{info => net}/itsthesky/disky/BotApplication.java (91%) rename src/main/java/{info => net}/itsthesky/disky/DiSky.java (89%) rename src/main/java/{info => net}/itsthesky/disky/api/DiSkyRegistry.java (98%) rename src/main/java/{info => net}/itsthesky/disky/api/DiSkyType.java (99%) rename src/main/java/{info => net}/itsthesky/disky/api/EmbedManager.java (96%) rename src/main/java/{info => net}/itsthesky/disky/api/ReflectionUtils.java (99%) rename src/main/java/{info => net}/itsthesky/disky/api/changers/ChangeableExpression.java (90%) rename src/main/java/{info => net}/itsthesky/disky/api/changers/ChangeablePropertyExpression.java (91%) rename src/main/java/{info => net}/itsthesky/disky/api/changers/ChangeableSimpleExpression.java (91%) rename src/main/java/{info => net}/itsthesky/disky/api/changers/ChangeableSimplePropertyExpression.java (91%) rename src/main/java/{info => net}/itsthesky/disky/api/changers/DiSkyChanger.java (77%) rename src/main/java/{info => net}/itsthesky/disky/api/changers/DiSkyChangerElement.java (70%) rename src/main/java/{info => net}/itsthesky/disky/api/changers/MultipleChangeablePropertyExpression.java (79%) rename src/main/java/{info => net}/itsthesky/disky/api/datastruct/BaseDataStructElement.java (75%) rename src/main/java/{info => net}/itsthesky/disky/api/datastruct/ChainDataStructElement.java (84%) rename src/main/java/{info => net}/itsthesky/disky/api/datastruct/DataStructure.java (66%) rename src/main/java/{info => net}/itsthesky/disky/api/datastruct/DataStructureEntry.java (87%) rename src/main/java/{info => net}/itsthesky/disky/api/datastruct/DataStructureFactory.java (97%) rename src/main/java/{info => net}/itsthesky/disky/api/datastruct/EasyDSRegistry.java (91%) rename src/main/java/{info => net}/itsthesky/disky/api/datastruct/EditDataStructElement.java (92%) rename src/main/java/{info => net}/itsthesky/disky/api/datastruct/ReflectBasicDataStructure.java (88%) rename src/main/java/{info => net}/itsthesky/disky/api/datastruct/base/BasicDS.java (87%) rename src/main/java/{info => net}/itsthesky/disky/api/datastruct/base/ChainDS.java (89%) rename src/main/java/{info => net}/itsthesky/disky/api/datastruct/base/DataStruct.java (80%) rename src/main/java/{info => net}/itsthesky/disky/api/datastruct/base/EditableDataStructure.java (92%) rename src/main/java/{info => net}/itsthesky/disky/api/emojis/Action.java (91%) rename src/main/java/{info => net}/itsthesky/disky/api/emojis/ActionImpl.java (95%) rename src/main/java/{info => net}/itsthesky/disky/api/emojis/ActionSupplier.java (62%) rename src/main/java/{info => net}/itsthesky/disky/api/emojis/Emoji.java (97%) rename src/main/java/{info => net}/itsthesky/disky/api/emojis/EmojiParser.java (96%) rename src/main/java/{info => net}/itsthesky/disky/api/emojis/EmojiStore.java (92%) rename src/main/java/{info => net}/itsthesky/disky/api/emojis/Emojis.java (97%) rename src/main/java/{info => net}/itsthesky/disky/api/emojis/Emote.java (98%) rename src/main/java/{info => net}/itsthesky/disky/api/emojis/ExtendedEmoji.java (97%) rename src/main/java/{info => net}/itsthesky/disky/api/emojis/HttpUtils.java (95%) rename src/main/java/{info => net}/itsthesky/disky/api/emojis/StringUtils.java (99%) create mode 100644 src/main/java/net/itsthesky/disky/api/emojis/TwemojiType.java rename src/main/java/{info => net}/itsthesky/disky/api/events/BukkitEvent.java (92%) rename src/main/java/{info => net}/itsthesky/disky/api/events/DiSkyEvent.java (97%) rename src/main/java/{info => net}/itsthesky/disky/api/events/DiSkyGetter.java (58%) rename src/main/java/{info => net}/itsthesky/disky/api/events/EventListener.java (98%) rename src/main/java/{info => net}/itsthesky/disky/api/events/EventValue.java (95%) rename src/main/java/{info => net}/itsthesky/disky/api/events/SimpleDiSkyEvent.java (96%) rename src/main/java/{info => net}/itsthesky/disky/api/events/specific/ComponentInteractionEvent.java (84%) rename src/main/java/{info => net}/itsthesky/disky/api/events/specific/InteractionEvent.java (92%) rename src/main/java/{info => net}/itsthesky/disky/api/events/specific/LogEvent.java (76%) rename src/main/java/{info => net}/itsthesky/disky/api/events/specific/MessageEvent.java (83%) rename src/main/java/{info => net}/itsthesky/disky/api/events/specific/ModalEvent.java (84%) rename src/main/java/{info => net}/itsthesky/disky/api/generator/DocBuilder.java (98%) rename src/main/java/{info => net}/itsthesky/disky/api/generator/EventValuesGetter.java (97%) rename src/main/java/{info => net}/itsthesky/disky/api/generator/Module.java (86%) rename src/main/java/{info => net}/itsthesky/disky/api/generator/ReflectionUtils.java (99%) rename src/main/java/{info => net}/itsthesky/disky/api/modules/DiSkyModule.java (97%) rename src/main/java/{info => net}/itsthesky/disky/api/modules/DiSkyModuleInfo.java (98%) rename src/main/java/{info => net}/itsthesky/disky/api/modules/EventValueInfo.java (95%) rename src/main/java/{info => net}/itsthesky/disky/api/modules/ModuleManager.java (91%) rename src/main/java/{info => net}/itsthesky/disky/api/modules/ModuleOrigin.java (90%) rename src/main/java/{info => net}/itsthesky/disky/api/skript/AsyncEffectSection.java (98%) rename src/main/java/{info => net}/itsthesky/disky/api/skript/BaseBukkitEvent.java (88%) rename src/main/java/{info => net}/itsthesky/disky/api/skript/BaseScope.java (96%) rename src/main/java/{info => net}/itsthesky/disky/api/skript/BetterExpressionEntryData.java (96%) rename src/main/java/{info => net}/itsthesky/disky/api/skript/EasyElement.java (97%) rename src/main/java/{info => net}/itsthesky/disky/api/skript/EasyPropertyCondition.java (98%) rename src/main/java/{info => net}/itsthesky/disky/api/skript/ErrorHandler.java (94%) rename src/main/java/{info => net}/itsthesky/disky/api/skript/INodeHolder.java (77%) rename src/main/java/{info => net}/itsthesky/disky/api/skript/MultipleGetterExpression.java (96%) rename src/main/java/{info => net}/itsthesky/disky/api/skript/MultiplyPropertyExpression.java (97%) rename src/main/java/{info => net}/itsthesky/disky/api/skript/NodeInformation.java (96%) rename src/main/java/{info => net}/itsthesky/disky/api/skript/ReturningSection.java (98%) rename src/main/java/{info => net}/itsthesky/disky/api/skript/SimpleGetterExpression.java (96%) rename src/main/java/{info => net}/itsthesky/disky/api/skript/SpecificBotEffect.java (86%) rename src/main/java/{info => net}/itsthesky/disky/api/skript/WaiterEffect.java (98%) rename src/main/java/{info => net}/itsthesky/disky/api/skript/action/AbstractNewAction.java (90%) rename src/main/java/{info => net}/itsthesky/disky/api/skript/action/ActionProperty.java (88%) rename src/main/java/{info => net}/itsthesky/disky/api/skript/action/ChannelAction.java (95%) rename src/main/java/{info => net}/itsthesky/disky/api/skript/action/GuildAction.java (95%) rename src/main/java/{info => net}/itsthesky/disky/api/skript/action/MultipleActionProperty.java (89%) rename src/main/java/{info => net}/itsthesky/disky/api/skript/entries/MutexEntryData.java (98%) rename src/main/java/{info => net}/itsthesky/disky/api/skript/entries/SimpleKeyValueEntries.java (97%) rename src/main/java/{info => net}/itsthesky/disky/api/skript/entries/SubEntryData.java (95%) rename src/main/java/{info => net}/itsthesky/disky/api/skript/reflects/ReflectClassFactory.java (96%) rename src/main/java/{info => net}/itsthesky/disky/api/skript/reflects/ReflectEventExpressionFactory.java (94%) rename src/main/java/{info => net}/itsthesky/disky/api/skript/reflects/ReflectGetterExpression.java (89%) rename src/main/java/{info => net}/itsthesky/disky/api/skript/reflects/ReflectProperty.java (93%) rename src/main/java/{info => net}/itsthesky/disky/api/skript/reflects/state/DiSkyStateCondition.java (90%) rename src/main/java/{info => net}/itsthesky/disky/api/skript/reflects/state/DiSkyStateProperty.java (92%) rename src/main/java/{info => net}/itsthesky/disky/api/skript/reflects/state/SkriptStateRegistry.java (95%) rename src/main/java/{info => net}/itsthesky/disky/core/Bot.java (90%) rename src/main/java/{info => net}/itsthesky/disky/core/BotOptions.java (90%) rename src/main/java/{info => net}/itsthesky/disky/core/Debug.java (91%) rename src/main/java/{info => net}/itsthesky/disky/core/DiSkyCommand.java (96%) rename src/main/java/{info => net}/itsthesky/disky/core/DiSkyMetrics.java (94%) rename src/main/java/{info => net}/itsthesky/disky/core/JDAUtils.java (97%) rename src/main/java/{info => net}/itsthesky/disky/core/MemberRemoveEventListener.java (92%) rename src/main/java/{info => net}/itsthesky/disky/core/ReactionListener.java (94%) rename src/main/java/{info => net}/itsthesky/disky/core/SkriptUtils.java (96%) rename src/main/java/{info => net}/itsthesky/disky/core/Utils.java (98%) rename src/main/java/{info => net}/itsthesky/disky/elements/BaseBotEffect.java (90%) rename src/main/java/{info => net}/itsthesky/disky/elements/Types.java (96%) rename src/main/java/{info => net}/itsthesky/disky/elements/changers/Change.java (97%) rename src/main/java/{info => net}/itsthesky/disky/elements/changers/IAsyncChangeableExpression.java (80%) rename src/main/java/{info => net}/itsthesky/disky/elements/changers/IAsyncGettableExpression.java (97%) rename src/main/java/{info => net}/itsthesky/disky/elements/commands/Argument.java (99%) rename src/main/java/{info => net}/itsthesky/disky/elements/commands/CommandData.java (87%) rename src/main/java/{info => net}/itsthesky/disky/elements/commands/CommandEvent.java (96%) rename src/main/java/{info => net}/itsthesky/disky/elements/commands/CommandFactory.java (96%) rename src/main/java/{info => net}/itsthesky/disky/elements/commands/CommandListener.java (98%) rename src/main/java/{info => net}/itsthesky/disky/elements/commands/CommandObject.java (96%) rename src/main/java/{info => net}/itsthesky/disky/elements/commands/CommandRegistry.java (96%) rename src/main/java/{info => net}/itsthesky/disky/elements/commands/DiSkyCommand.java (91%) rename src/main/java/{info => net}/itsthesky/disky/elements/commands/ExprArgument.java (99%) rename src/main/java/{info => net}/itsthesky/disky/elements/commands/values/UsedAlias.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/commands/values/UsedArgument.java (94%) rename src/main/java/{info => net}/itsthesky/disky/elements/commands/values/UsedPrefix.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/components/OpenModal.java (83%) rename src/main/java/{info => net}/itsthesky/disky/elements/components/Test.java (66%) rename src/main/java/{info => net}/itsthesky/disky/elements/components/commands/EditComponent.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/components/commands/EditMessageComponent.java (96%) rename src/main/java/{info => net}/itsthesky/disky/elements/components/commands/EffEnableDisableCommand.java (94%) rename src/main/java/{info => net}/itsthesky/disky/elements/components/commands/EffUpdateCommand.java (91%) rename src/main/java/{info => net}/itsthesky/disky/elements/components/commands/ExprArgumentChoices.java (86%) rename src/main/java/{info => net}/itsthesky/disky/elements/components/commands/ExprCommandGroup.java (91%) rename src/main/java/{info => net}/itsthesky/disky/elements/components/commands/ExprGroupCommands.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/components/commands/ExprNewMessageCommand.java (94%) rename src/main/java/{info => net}/itsthesky/disky/elements/components/commands/ExprNewOptionChoice.java (95%) rename src/main/java/{info => net}/itsthesky/disky/elements/components/commands/ExprNewSlashCommand.java (96%) rename src/main/java/{info => net}/itsthesky/disky/elements/components/commands/ExprNewSlashOption.java (95%) rename src/main/java/{info => net}/itsthesky/disky/elements/components/commands/ExprNewUserCommand.java (94%) rename src/main/java/{info => net}/itsthesky/disky/elements/components/commands/UnregisterCommand.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/components/core/ComponentRow.java (97%) rename src/main/java/{info => net}/itsthesky/disky/elements/components/create/ExprNewButton.java (96%) rename src/main/java/{info => net}/itsthesky/disky/elements/components/create/ExprNewButtonsRow.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/components/create/ExprNewDropdown.java (97%) rename src/main/java/{info => net}/itsthesky/disky/elements/components/create/ExprNewDropdownOption.java (95%) rename src/main/java/{info => net}/itsthesky/disky/elements/components/create/ExprNewInput.java (96%) rename src/main/java/{info => net}/itsthesky/disky/elements/components/create/ExprNewModal.java (94%) rename src/main/java/{info => net}/itsthesky/disky/elements/components/properties/ComponentValue.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/components/properties/ExprMaxRange.java (95%) rename src/main/java/{info => net}/itsthesky/disky/elements/components/properties/ExprMinRange.java (95%) rename src/main/java/{info => net}/itsthesky/disky/elements/components/properties/ExprNewLocaleData.java (96%) rename src/main/java/{info => net}/itsthesky/disky/elements/components/properties/ExprPlaceholder.java (95%) rename src/main/java/{info => net}/itsthesky/disky/elements/components/properties/ExprRequireState.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/components/properties/ExprValue.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/components/properties/PropDefaultValues.java (91%) rename src/main/java/{info => net}/itsthesky/disky/elements/components/properties/PropLocalization.java (95%) rename src/main/java/{info => net}/itsthesky/disky/elements/components/properties/PropOptions.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/components/properties/SimpleChangeableProperty.java (90%) rename src/main/java/{info => net}/itsthesky/disky/elements/conditions/BotMemberIsInThread.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/conditions/HasPermissions.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/conditions/HasRole.java (90%) rename src/main/java/{info => net}/itsthesky/disky/elements/conditions/IsBot.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/conditions/IsDeafen.java (97%) rename src/main/java/{info => net}/itsthesky/disky/elements/conditions/IsMuted.java (97%) rename src/main/java/{info => net}/itsthesky/disky/elements/conditions/IsTimeout.java (87%) rename src/main/java/{info => net}/itsthesky/disky/elements/conditions/MessageOrigin.java (91%) rename src/main/java/{info => net}/itsthesky/disky/elements/conditions/isInline.java (94%) rename src/main/java/{info => net}/itsthesky/disky/elements/datastructs/BasicStructs.java (68%) rename src/main/java/{info => net}/itsthesky/disky/elements/datastructs/RoleDS.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/datastructs/structures/ButtonStructure.java (90%) rename src/main/java/{info => net}/itsthesky/disky/elements/datastructs/structures/EmbedFieldStructure.java (73%) rename src/main/java/{info => net}/itsthesky/disky/elements/datastructs/structures/EmbedStructure.java (90%) rename src/main/java/{info => net}/itsthesky/disky/elements/effects/ArchiveUnarchiveThread.java (95%) rename src/main/java/{info => net}/itsthesky/disky/elements/effects/AwaitEffect.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/effects/BanMember.java (96%) rename src/main/java/{info => net}/itsthesky/disky/elements/effects/ConnectBot.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/effects/CreateAction.java (87%) rename src/main/java/{info => net}/itsthesky/disky/elements/effects/CreateEmote.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/effects/CreateInvite.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/effects/CreatePost.java (97%) rename src/main/java/{info => net}/itsthesky/disky/elements/effects/CreateScheduledEvent.java (94%) rename src/main/java/{info => net}/itsthesky/disky/elements/effects/CreateThread.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/effects/DeferInteraction.java (94%) rename src/main/java/{info => net}/itsthesky/disky/elements/effects/DestroyEntity.java (82%) rename src/main/java/{info => net}/itsthesky/disky/elements/effects/EditMessage.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/effects/EndPoll.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/effects/ForwardMessage.java (94%) rename src/main/java/{info => net}/itsthesky/disky/elements/effects/KickMember.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/effects/LoadMembers.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/effects/LockUnlockThread.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/effects/MakeBotLeave.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/effects/MoveMember.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/effects/MoveRole.java (94%) rename src/main/java/{info => net}/itsthesky/disky/elements/effects/MuteMember.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/effects/OpenPrivateChannel.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/effects/PinMessage.java (94%) rename src/main/java/{info => net}/itsthesky/disky/elements/effects/PostMessage.java (95%) rename src/main/java/{info => net}/itsthesky/disky/elements/effects/PublishMessage.java (88%) rename src/main/java/{info => net}/itsthesky/disky/elements/effects/PurgeMessages.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/effects/ReplyWith.java (95%) rename src/main/java/{info => net}/itsthesky/disky/elements/effects/RetrieveEventValue.java (94%) rename src/main/java/{info => net}/itsthesky/disky/elements/effects/SendTyping.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/effects/StopBot.java (91%) rename src/main/java/{info => net}/itsthesky/disky/elements/effects/SuppressReaction.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/effects/TimeOutMember.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/effects/UnbanMember.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/effects/find/FindMembersWithNickname.java (96%) rename src/main/java/{info => net}/itsthesky/disky/elements/effects/find/FindMembersWithRoles.java (95%) rename src/main/java/{info => net}/itsthesky/disky/elements/effects/retrieve/RetrieveApplicationInfo.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/effects/retrieve/RetrieveBans.java (94%) rename src/main/java/{info => net}/itsthesky/disky/elements/effects/retrieve/RetrieveEmotes.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/effects/retrieve/RetrieveInterestedMembers.java (94%) rename src/main/java/{info => net}/itsthesky/disky/elements/effects/retrieve/RetrieveInvite.java (95%) rename src/main/java/{info => net}/itsthesky/disky/elements/effects/retrieve/RetrieveInvites.java (94%) rename src/main/java/{info => net}/itsthesky/disky/elements/effects/retrieve/RetrieveLogs.java (95%) rename src/main/java/{info => net}/itsthesky/disky/elements/effects/retrieve/RetrieveMember.java (96%) rename src/main/java/{info => net}/itsthesky/disky/elements/effects/retrieve/RetrieveMessage.java (95%) rename src/main/java/{info => net}/itsthesky/disky/elements/effects/retrieve/RetrieveMessages.java (96%) rename src/main/java/{info => net}/itsthesky/disky/elements/effects/retrieve/RetrieveOwner.java (95%) rename src/main/java/{info => net}/itsthesky/disky/elements/effects/retrieve/RetrieveProfile.java (96%) rename src/main/java/{info => net}/itsthesky/disky/elements/effects/retrieve/RetrieveStartMessage.java (95%) rename src/main/java/{info => net}/itsthesky/disky/elements/effects/retrieve/RetrieveSticker.java (95%) rename src/main/java/{info => net}/itsthesky/disky/elements/effects/retrieve/RetrieveStickers.java (96%) rename src/main/java/{info => net}/itsthesky/disky/elements/effects/retrieve/RetrieveThreadMembers.java (95%) rename src/main/java/{info => net}/itsthesky/disky/elements/effects/retrieve/RetrieveThreadMessage.java (95%) rename src/main/java/{info => net}/itsthesky/disky/elements/effects/retrieve/RetrieveThreads.java (95%) rename src/main/java/{info => net}/itsthesky/disky/elements/effects/retrieve/RetrieveUser.java (94%) rename src/main/java/{info => net}/itsthesky/disky/elements/effects/retrieve/RetrieveWebhooks.java (96%) rename src/main/java/{info => net}/itsthesky/disky/elements/effects/webhooks/MakeClientSpeak.java (95%) rename src/main/java/{info => net}/itsthesky/disky/elements/effects/webhooks/RegisterClient.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/effects/webhooks/RetrieveWebhooks.java (95%) rename src/main/java/{info => net}/itsthesky/disky/elements/effects/webhooks/UnregisterClient.java (91%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/DiSkyErrorEvent.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/ExprEventValues.java (96%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/bots/BotJoinEvent.java (78%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/bots/BotLeaveEvent.java (78%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/bots/BotStopEvent.java (70%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/bots/GuildReadyEvent.java (79%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/bots/ReadyEvent.java (72%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/channel/ChannelCreateEvent.java (84%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/channel/ChannelDeleteEvent.java (84%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/guild/GuildAFKChannelEvent.java (89%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/guild/GuildAFKTimeoutEvent.java (89%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/guild/GuildBanEvent.java (86%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/guild/GuildBannerEvent.java (88%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/guild/GuildBoostCountEvent.java (89%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/guild/GuildBoostTierEvent.java (89%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/guild/GuildIconEvent.java (88%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/guild/GuildInviteCreateEvent.java (88%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/guild/GuildInviteDeleteEvent.java (86%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/guild/GuildJoinEvent.java (80%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/guild/GuildLogEntryEvent.java (86%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/guild/GuildNameEvent.java (87%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/guild/GuildOwnerEvent.java (88%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/guild/GuildSplashEvent.java (88%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/guild/GuildUnbanEvent.java (85%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/guild/GuildVoiceDeafenEvent.java (85%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/guild/GuildVoiceMuteEvent.java (84%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/interactions/ButtonClickEvent.java (91%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/interactions/EntityDropdownClickEvent.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/interactions/MessageCommandEvent.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/interactions/ModalSendEvent.java (91%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/interactions/SlashCommandReceiveEvent.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/interactions/SlashCompletionEvent.java (94%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/interactions/StringDropdownClickEvent.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/interactions/UserCommandEvent.java (91%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/member/BukkitMemberRemoveEvent.java (94%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/member/MemberAcceptScreenEvent.java (90%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/member/MemberAvatarEvent.java (89%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/member/MemberBanEvent.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/member/MemberBoostEvent.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/member/MemberBoostTimeUpdateEvent.java (89%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/member/MemberJoinEvent.java (83%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/member/MemberKickEvent.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/member/MemberNicknameEvent.java (89%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/member/MemberRemoveEvent.java (85%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/member/MemberRoleAddEvent.java (87%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/member/MemberRoleRemoveEvent.java (87%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/member/MemberSelfDeafenEvent.java (87%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/member/MemberSelfMuteEvent.java (86%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/member/MemberTimeoutEvent.java (87%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/member/MemberVoiceJoinEvent.java (94%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/member/MemberVoiceLeaveEvent.java (90%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/messages/MessageDeleteEvent.java (90%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/messages/MessageEditEvent.java (89%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/messages/MessageEvent.java (91%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/polls/PollVoteAddEvent.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/polls/PollVoteRemoveEvent.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/react/ReactionAddEvent.java (90%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/react/ReactionRemoveAllEvent.java (89%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/react/ReactionRemoveEvent.java (89%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/role/RoleColorEvent.java (89%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/role/RoleCreateEvent.java (85%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/role/RoleDeleteEvent.java (85%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/role/RoleHoistedEvent.java (89%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/role/RoleIconEvent.java (88%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/role/RoleNameEvent.java (88%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/role/RolePermissionEvent.java (87%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/role/RolePositionEvent.java (88%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/thread/ThreadJoinEvent.java (87%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/thread/ThreadLeaveEvent.java (87%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/user/UserActivityOrderEvent.java (83%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/user/UserAvatarEvent.java (86%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/user/UserDiscriminatorEvent.java (88%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/user/UserNameEvent.java (86%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/user/UserOnlineStatusEvent.java (90%) rename src/main/java/{info => net}/itsthesky/disky/elements/events/user/UserTypingEvent.java (87%) rename src/main/java/{info => net}/itsthesky/disky/elements/getters/BaseGetterExpression.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/getters/ColorFromHex.java (95%) rename src/main/java/{info => net}/itsthesky/disky/elements/getters/ExprEmoji.java (94%) rename src/main/java/{info => net}/itsthesky/disky/elements/getters/GetAudioChannel.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/getters/GetBot.java (94%) rename src/main/java/{info => net}/itsthesky/disky/elements/getters/GetCategory.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/getters/GetChannel.java (94%) rename src/main/java/{info => net}/itsthesky/disky/elements/getters/GetForumChannel.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/getters/GetGuild.java (90%) rename src/main/java/{info => net}/itsthesky/disky/elements/getters/GetGuildChannel.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/getters/GetMember.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/getters/GetMessageChannel.java (94%) rename src/main/java/{info => net}/itsthesky/disky/elements/getters/GetNewsChannel.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/getters/GetRole.java (91%) rename src/main/java/{info => net}/itsthesky/disky/elements/getters/GetScheduledEvent.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/getters/GetStageChannel.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/getters/GetSticker.java (94%) rename src/main/java/{info => net}/itsthesky/disky/elements/getters/GetTextChannel.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/getters/GetThread.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/getters/GetUser.java (89%) rename src/main/java/{info => net}/itsthesky/disky/elements/getters/GetUserInGuild.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/getters/GetVoiceChannel.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/getters/LastDiSkyException.java (95%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/AvatarURL.java (89%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/ChannelOf.java (96%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/ColorOf.java (88%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/CreationDate.java (96%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/DiscordId.java (96%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/DiscordMembersOf.java (94%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/DiscordName.java (94%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/DiscordRoles.java (91%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/DynamicElements.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/GuildOf.java (97%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/MentionTag.java (95%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/PermissionsOf.java (96%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/RoleChannelPosition.java (95%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/UserLocal.java (91%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/activity/ActivityEmote.java (89%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/activity/ActivityText.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/activity/ActivityType.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/activity/ActivityURL.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/application/ApplicationDescription.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/application/ApplicationOwner.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/application/ApplicationPolicy.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/application/ApplicationTOS.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/attachments/CondIsAudio.java (88%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/attachments/CondIsImage.java (95%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/attachments/CondIsSpoiler.java (95%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/attachments/CondIsVideo.java (95%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/attachments/EffAttDownload.java (94%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/attachments/ExprAttDuration.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/attachments/ExprAttFileExt.java (95%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/attachments/ExprAttFileName.java (95%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/attachments/ExprAttURL.java (95%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/ban/BanReason.java (94%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/ban/BanUser.java (94%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/bot/BotGuilds.java (78%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/bot/BotIsLoaded.java (86%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/bot/BotPing.java (87%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/bot/BotPresence.java (91%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/bot/BotStatus.java (95%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/bot/BotToken.java (87%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/bot/BotUptime.java (87%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/bot/ExprPresence.java (95%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/bot/SelfMember.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/channels/ChannelBitrate.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/channels/ChannelChannels.java (89%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/channels/ChannelJumpURL.java (95%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/channels/ChannelMaxUser.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/channels/ChannelMembers.java (89%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/channels/ChannelNSFW.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/channels/ChannelName.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/channels/ChannelParent.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/channels/ChannelRegion.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/channels/ChannelSlowmode.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/channels/ChannelStatus.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/channels/ChannelThreads.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/channels/ChannelTopic.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/channels/NewCategoryAction.java (85%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/channels/NewMediaChannel.java (85%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/channels/NewNewsChannel.java (85%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/channels/NewStageChannel.java (85%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/channels/NewTextAction.java (85%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/channels/NewVoiceAction.java (85%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/embeds/EffAddField.java (96%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/embeds/EmbedAuthor.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/embeds/EmbedAuthorIcon.java (95%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/embeds/EmbedAuthorURL.java (95%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/embeds/EmbedDescription.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/embeds/EmbedFields.java (89%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/embeds/EmbedFooter.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/embeds/EmbedFooterIcon.java (95%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/embeds/EmbedFromJSON.java (91%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/embeds/EmbedImage.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/embeds/EmbedProperty.java (94%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/embeds/EmbedThumbnail.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/embeds/EmbedTimeStamp.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/embeds/EmbedTitle.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/embeds/EmbedTitleURL.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/embeds/EmbedToJSON.java (91%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/embeds/EmbedURL.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/embeds/ExprLastEmbed.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/emotes/EmoteGuild.java (91%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/emotes/EmoteIsAnimated.java (84%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/emotes/EmoteIsEmote.java (84%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/emotes/EmoteName.java (90%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/emotes/EmoteURL.java (91%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/events/EventChannel.java (95%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/events/EventCover.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/events/EventCreator.java (95%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/events/EventEndDate.java (96%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/events/EventLocation.java (96%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/events/EventStartDate.java (95%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/events/EventStatus.java (95%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/events/EventType.java (94%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/events/SimpleScheduledEventExpression.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/forums/CondTagRequired.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/forums/DefaultEmoji.java (91%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/forums/ExprTagRequired.java (94%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/forums/ForumLayout.java (91%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/forums/ForumSortOrder.java (91%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/guilds/GuildAFKChannel.java (89%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/guilds/GuildAFKTimeout.java (91%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/guilds/GuildBanner.java (90%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/guilds/GuildBoostCount.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/guilds/GuildBoostRole.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/guilds/GuildBoostTier.java (87%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/guilds/GuildBoosters.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/guilds/GuildBotRole.java (87%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/guilds/GuildEveryone.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/guilds/GuildGuildChannels.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/guilds/GuildMemberCount.java (91%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/guilds/GuildNewsChannels.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/guilds/GuildProperty.java (94%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/guilds/GuildScheduledEvents.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/guilds/GuildStageChannels.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/guilds/GuildTextChannels.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/guilds/GuildVerificationLevel.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/guilds/GuildVoiceChannels.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/guilds/MultipleGuildProperty.java (87%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/invites/InviteCode.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/invites/InviteInviter.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/invites/InviteMaxAge.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/invites/InviteMaxUses.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/invites/InviteProperty.java (90%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/invites/InviteURL.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/invites/InviteUses.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/members/MemberEffectiveName.java (94%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/members/MemberFlags.java (91%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/members/MemberJoinDate.java (94%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/members/MemberNickname.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/members/MemberProperty.java (90%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/members/MemberVoiceChannel.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/members/MultipleMemberProperty.java (79%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/messages/MessageAttachments.java (88%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/messages/MessageAuthor.java (95%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/messages/MessageContent.java (94%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/messages/MessageEmbeds.java (89%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/messages/MessageGuild.java (95%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/messages/MessageHasPoll.java (90%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/messages/MessageIsEdited.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/messages/MessageIsEphemeral.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/messages/MessageIsForwarded.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/messages/MessageIsPinned.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/messages/MessageIsPosted.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/messages/MessageIsTTS.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/messages/MessageJumpURL.java (95%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/messages/MessageMember.java (95%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/messages/MessageMentionedChannels.java (89%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/messages/MessageMentionedEmotes.java (86%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/messages/MessageMentionedMembers.java (89%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/messages/MessageMentionedRoles.java (89%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/messages/MessageMentionedUsers.java (89%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/messages/MessageMentionedVoiceChannels.java (89%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/messages/MessagePoll.java (97%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/messages/MessageReactions.java (87%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/messages/MessageReferenced.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/polls/NewPoll.java (97%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/polls/NewPollAnswer.java (95%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/polls/PollAnswerData.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/polls/PollAnswers.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/polls/PollDuration.java (96%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/polls/PollIsExpired.java (91%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/polls/PollIsFinalized.java (91%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/polls/PollQuestion.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/polls/answers/PollAnswerEmote.java (79%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/polls/answers/PollAnswerText.java (84%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/polls/answers/PollAnswerVotes.java (84%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/profile/HasBanner.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/profile/ProfileBanner.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/profile/ProfileColor.java (91%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/reactions/ReactionEmote.java (88%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/reactions/ReactionIsSelf.java (91%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/reactions/ReactionIsSuper.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/role/NewRoleAction.java (85%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/role/RoleColor.java (89%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/role/RoleName.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/tags/GetTag.java (95%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/tags/NewTag.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/tags/TagEmoji.java (90%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/tags/ThreadTags.java (94%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/threads/ThreadIsPublic.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/threads/ThreadParent.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/users/MultipleUserProperty.java (79%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/users/UserBadges.java (94%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/users/UserDecorationAvatar.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/users/UserDiscriminator.java (94%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/users/UserMutualGuilds.java (94%) rename src/main/java/{info => net}/itsthesky/disky/elements/properties/users/UserProperty.java (90%) rename src/main/java/{info => net}/itsthesky/disky/elements/sections/EmbedSection.java (96%) rename src/main/java/{info => net}/itsthesky/disky/elements/sections/FindMemberSection.java (97%) rename src/main/java/{info => net}/itsthesky/disky/elements/sections/ReactSection.java (87%) rename src/main/java/{info => net}/itsthesky/disky/elements/sections/automod/AutomodResponse.java (90%) rename src/main/java/{info => net}/itsthesky/disky/elements/sections/automod/AutomodType.java (91%) rename src/main/java/{info => net}/itsthesky/disky/elements/sections/automod/CreateAutoMod.java (79%) rename src/main/java/{info => net}/itsthesky/disky/elements/sections/automod/CreateRule.java (86%) rename src/main/java/{info => net}/itsthesky/disky/elements/sections/automod/FilterType.java (50%) rename src/main/java/{info => net}/itsthesky/disky/elements/sections/automod/NewRuleResponse.java (96%) rename src/main/java/{info => net}/itsthesky/disky/elements/sections/automod/NewRuleType.java (96%) rename src/main/java/{info => net}/itsthesky/disky/elements/sections/components/CreateRow.java (88%) rename src/main/java/{info => net}/itsthesky/disky/elements/sections/components/RowComponents.java (89%) rename src/main/java/{info => net}/itsthesky/disky/elements/sections/handler/DiSkyRuntimeHandler.java (96%) rename src/main/java/{info => net}/itsthesky/disky/elements/sections/handler/SecTry.java (97%) rename src/main/java/{info => net}/itsthesky/disky/elements/sections/message/CreateMessage.java (97%) rename src/main/java/{info => net}/itsthesky/disky/elements/sections/message/InlineMessageBuilder.java (96%) rename src/main/java/{info => net}/itsthesky/disky/elements/sections/message/MessageAttachments.java (94%) rename src/main/java/{info => net}/itsthesky/disky/elements/sections/message/MessageContent.java (95%) rename src/main/java/{info => net}/itsthesky/disky/elements/sections/message/MessageEmbeds.java (93%) rename src/main/java/{info => net}/itsthesky/disky/elements/sections/message/MessageModalRows.java (92%) rename src/main/java/{info => net}/itsthesky/disky/elements/sections/once/EffOuterExecution.java (96%) rename src/main/java/{info => net}/itsthesky/disky/elements/sections/once/ExprOuterExpression.java (97%) rename src/main/java/{info => net}/itsthesky/disky/elements/sections/once/ExprSubEventExpression.java (97%) rename src/main/java/{info => net}/itsthesky/disky/elements/sections/once/SecListenOnce.java (96%) rename src/main/java/{info => net}/itsthesky/disky/elements/sections/welcome/AddScreenChannel.java (95%) rename src/main/java/{info => net}/itsthesky/disky/elements/sections/welcome/ModifySection.java (97%) rename src/main/java/{info => net}/itsthesky/disky/elements/sections/welcome/ScreenDescription.java (97%) rename src/main/java/{info => net}/itsthesky/disky/elements/sections/welcome/ScreenElement.java (87%) rename src/main/java/{info => net}/itsthesky/disky/elements/structures/StructBot.java (95%) rename src/main/java/{info => net}/itsthesky/disky/elements/structures/context/ContextCommandManager.java (97%) rename src/main/java/{info => net}/itsthesky/disky/elements/structures/context/ParsedContextCommand.java (94%) rename src/main/java/{info => net}/itsthesky/disky/elements/structures/context/StructContextCommand.java (95%) rename src/main/java/{info => net}/itsthesky/disky/elements/structures/slash/BotReadyWaiter.java (81%) rename src/main/java/{info => net}/itsthesky/disky/elements/structures/slash/SlashManager.java (97%) rename src/main/java/{info => net}/itsthesky/disky/elements/structures/slash/StructSlashCommand.java (96%) rename src/main/java/{info => net}/itsthesky/disky/elements/structures/slash/elements/ExprRemainingTime.java (89%) rename src/main/java/{info => net}/itsthesky/disky/elements/structures/slash/elements/ExprSlashArgument.java (96%) rename src/main/java/{info => net}/itsthesky/disky/elements/structures/slash/elements/OnCooldownEvent.java (75%) rename src/main/java/{info => net}/itsthesky/disky/elements/structures/slash/models/CommandGroup.java (98%) rename src/main/java/{info => net}/itsthesky/disky/elements/structures/slash/models/CommandType.java (83%) rename src/main/java/{info => net}/itsthesky/disky/elements/structures/slash/models/ParsedArgument.java (98%) rename src/main/java/{info => net}/itsthesky/disky/elements/structures/slash/models/ParsedCommand.java (96%) rename src/main/java/{info => net}/itsthesky/disky/elements/structures/slash/models/RegisteredCommand.java (96%) rename src/main/java/{info => net}/itsthesky/disky/elements/structures/slash/models/SlashCommandInformation.java (95%) rename src/main/java/{info => net}/itsthesky/disky/experimental/Case.java (92%) rename src/main/java/{info => net}/itsthesky/disky/experimental/Switch.java (91%) rename src/main/java/{info => net}/itsthesky/disky/managers/BotChangers.java (96%) rename src/main/java/{info => net}/itsthesky/disky/managers/BotManager.java (93%) rename src/main/java/{info => net}/itsthesky/disky/managers/ConfigManager.java (97%) rename src/main/java/{info => net}/itsthesky/disky/managers/CoreEventListener.java (59%) rename src/main/java/{info => net}/itsthesky/disky/managers/DiSkyErrorHandler.java (95%) rename src/main/java/{info => net}/itsthesky/disky/managers/MessageManager.java (95%) rename src/main/java/{info => net}/itsthesky/disky/managers/WebhooksManager.java (89%) rename src/main/java/{info => net}/itsthesky/disky/managers/wrappers/AutoModRuleBuilder.java (92%) rename src/main/java/{info => net}/itsthesky/disky/managers/wrappers/MessageWrapper.java (95%) rename src/main/java/{info => net}/itsthesky/disky/managers/wrappers/RegisteredWebhook.java (81%) diff --git a/build.gradle b/build.gradle index d5a92df5..17149451 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ plugins { id "com.gradleup.shadow" version "9.0.0-beta4" } -group = 'info.itsthesky' +group = 'net.itsthesky' // Semantic Versioning def major = '4' diff --git a/src/main/java/info/itsthesky/disky/api/emojis/TwemojiType.java b/src/main/java/info/itsthesky/disky/api/emojis/TwemojiType.java deleted file mode 100644 index 0b8b7180..00000000 --- a/src/main/java/info/itsthesky/disky/api/emojis/TwemojiType.java +++ /dev/null @@ -1,6 +0,0 @@ -package info.itsthesky.disky.api.emojis; - -public enum TwemojiType { - X72, - SVG -} diff --git a/src/main/java/info/itsthesky/disky/BotApplication.java b/src/main/java/net/itsthesky/disky/BotApplication.java similarity index 91% rename from src/main/java/info/itsthesky/disky/BotApplication.java rename to src/main/java/net/itsthesky/disky/BotApplication.java index a47c0e9c..511931a5 100644 --- a/src/main/java/info/itsthesky/disky/BotApplication.java +++ b/src/main/java/net/itsthesky/disky/BotApplication.java @@ -1,6 +1,6 @@ -package info.itsthesky.disky; +package net.itsthesky.disky; -import info.itsthesky.disky.core.Bot; +import net.itsthesky.disky.core.Bot; /** * Class that will store and handle information about a bot's application. diff --git a/src/main/java/info/itsthesky/disky/DiSky.java b/src/main/java/net/itsthesky/disky/DiSky.java similarity index 89% rename from src/main/java/info/itsthesky/disky/DiSky.java rename to src/main/java/net/itsthesky/disky/DiSky.java index ddf58d34..1aebb3e6 100644 --- a/src/main/java/info/itsthesky/disky/DiSky.java +++ b/src/main/java/net/itsthesky/disky/DiSky.java @@ -1,22 +1,22 @@ -package info.itsthesky.disky; +package net.itsthesky.disky; import ch.njol.skript.Skript; import ch.njol.skript.SkriptAddon; import ch.njol.skript.util.Version; -import info.itsthesky.disky.api.emojis.EmojiStore; -import info.itsthesky.disky.api.generator.DocBuilder; -import info.itsthesky.disky.api.modules.DiSkyModule; -import info.itsthesky.disky.api.modules.ModuleManager; -import info.itsthesky.disky.api.skript.ErrorHandler; -import info.itsthesky.disky.core.DiSkyCommand; -import info.itsthesky.disky.core.DiSkyMetrics; -import info.itsthesky.disky.core.Utils; -import info.itsthesky.disky.elements.properties.DynamicElements; -import info.itsthesky.disky.elements.structures.context.ContextCommandManager; -import info.itsthesky.disky.elements.structures.slash.SlashManager; -import info.itsthesky.disky.managers.BotManager; -import info.itsthesky.disky.managers.ConfigManager; -import info.itsthesky.disky.managers.WebhooksManager; +import net.itsthesky.disky.api.emojis.EmojiStore; +import net.itsthesky.disky.api.generator.DocBuilder; +import net.itsthesky.disky.api.modules.DiSkyModule; +import net.itsthesky.disky.api.modules.ModuleManager; +import net.itsthesky.disky.api.skript.ErrorHandler; +import net.itsthesky.disky.core.DiSkyCommand; +import net.itsthesky.disky.core.DiSkyMetrics; +import net.itsthesky.disky.core.Utils; +import net.itsthesky.disky.elements.properties.DynamicElements; +import net.itsthesky.disky.elements.structures.context.ContextCommandManager; +import net.itsthesky.disky.elements.structures.slash.SlashManager; +import net.itsthesky.disky.managers.BotManager; +import net.itsthesky.disky.managers.ConfigManager; +import net.itsthesky.disky.managers.WebhooksManager; import net.dv8tion.jda.api.requests.RestAction; import org.bukkit.Bukkit; import org.bukkit.ChatColor; diff --git a/src/main/java/info/itsthesky/disky/api/DiSkyRegistry.java b/src/main/java/net/itsthesky/disky/api/DiSkyRegistry.java similarity index 98% rename from src/main/java/info/itsthesky/disky/api/DiSkyRegistry.java rename to src/main/java/net/itsthesky/disky/api/DiSkyRegistry.java index 0229bca4..04b5d297 100644 --- a/src/main/java/info/itsthesky/disky/api/DiSkyRegistry.java +++ b/src/main/java/net/itsthesky/disky/api/DiSkyRegistry.java @@ -1,9 +1,9 @@ -package info.itsthesky.disky.api; +package net.itsthesky.disky.api; import ch.njol.skript.conditions.base.PropertyCondition; import ch.njol.skript.expressions.base.PropertyExpression; import ch.njol.skript.lang.*; -import info.itsthesky.disky.DiSky; +import net.itsthesky.disky.DiSky; import org.skriptlang.skript.registration.SyntaxInfo; import org.skriptlang.skript.registration.SyntaxOrigin; import org.skriptlang.skript.registration.SyntaxRegistry; diff --git a/src/main/java/info/itsthesky/disky/api/DiSkyType.java b/src/main/java/net/itsthesky/disky/api/DiSkyType.java similarity index 99% rename from src/main/java/info/itsthesky/disky/api/DiSkyType.java rename to src/main/java/net/itsthesky/disky/api/DiSkyType.java index bced2ade..94abae3e 100644 --- a/src/main/java/info/itsthesky/disky/api/DiSkyType.java +++ b/src/main/java/net/itsthesky/disky/api/DiSkyType.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.api; +package net.itsthesky.disky.api; import ch.njol.skript.classes.ClassInfo; import ch.njol.skript.classes.Parser; diff --git a/src/main/java/info/itsthesky/disky/api/EmbedManager.java b/src/main/java/net/itsthesky/disky/api/EmbedManager.java similarity index 96% rename from src/main/java/info/itsthesky/disky/api/EmbedManager.java rename to src/main/java/net/itsthesky/disky/api/EmbedManager.java index 75506fe8..98d86ca2 100644 --- a/src/main/java/info/itsthesky/disky/api/EmbedManager.java +++ b/src/main/java/net/itsthesky/disky/api/EmbedManager.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.api; +package net.itsthesky.disky.api; import net.dv8tion.jda.api.EmbedBuilder; diff --git a/src/main/java/info/itsthesky/disky/api/ReflectionUtils.java b/src/main/java/net/itsthesky/disky/api/ReflectionUtils.java similarity index 99% rename from src/main/java/info/itsthesky/disky/api/ReflectionUtils.java rename to src/main/java/net/itsthesky/disky/api/ReflectionUtils.java index 6fc1bb2f..c4df1e04 100644 --- a/src/main/java/info/itsthesky/disky/api/ReflectionUtils.java +++ b/src/main/java/net/itsthesky/disky/api/ReflectionUtils.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.api; +package net.itsthesky.disky.api; import ch.njol.skript.Skript; import ch.njol.skript.lang.Effect; diff --git a/src/main/java/info/itsthesky/disky/api/changers/ChangeableExpression.java b/src/main/java/net/itsthesky/disky/api/changers/ChangeableExpression.java similarity index 90% rename from src/main/java/info/itsthesky/disky/api/changers/ChangeableExpression.java rename to src/main/java/net/itsthesky/disky/api/changers/ChangeableExpression.java index dc3a4e8e..4073f083 100644 --- a/src/main/java/info/itsthesky/disky/api/changers/ChangeableExpression.java +++ b/src/main/java/net/itsthesky/disky/api/changers/ChangeableExpression.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.api.changers; +package net.itsthesky.disky.api.changers; import ch.njol.skript.classes.Changer; import ch.njol.skript.lang.Expression; diff --git a/src/main/java/info/itsthesky/disky/api/changers/ChangeablePropertyExpression.java b/src/main/java/net/itsthesky/disky/api/changers/ChangeablePropertyExpression.java similarity index 91% rename from src/main/java/info/itsthesky/disky/api/changers/ChangeablePropertyExpression.java rename to src/main/java/net/itsthesky/disky/api/changers/ChangeablePropertyExpression.java index d595e686..c4759824 100644 --- a/src/main/java/info/itsthesky/disky/api/changers/ChangeablePropertyExpression.java +++ b/src/main/java/net/itsthesky/disky/api/changers/ChangeablePropertyExpression.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.api.changers; +package net.itsthesky.disky.api.changers; import ch.njol.skript.classes.Changer; import ch.njol.skript.expressions.base.PropertyExpression; diff --git a/src/main/java/info/itsthesky/disky/api/changers/ChangeableSimpleExpression.java b/src/main/java/net/itsthesky/disky/api/changers/ChangeableSimpleExpression.java similarity index 91% rename from src/main/java/info/itsthesky/disky/api/changers/ChangeableSimpleExpression.java rename to src/main/java/net/itsthesky/disky/api/changers/ChangeableSimpleExpression.java index 9ade8344..02958676 100644 --- a/src/main/java/info/itsthesky/disky/api/changers/ChangeableSimpleExpression.java +++ b/src/main/java/net/itsthesky/disky/api/changers/ChangeableSimpleExpression.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.api.changers; +package net.itsthesky.disky.api.changers; import ch.njol.skript.classes.Changer; import ch.njol.skript.lang.util.SimpleExpression; diff --git a/src/main/java/info/itsthesky/disky/api/changers/ChangeableSimplePropertyExpression.java b/src/main/java/net/itsthesky/disky/api/changers/ChangeableSimplePropertyExpression.java similarity index 91% rename from src/main/java/info/itsthesky/disky/api/changers/ChangeableSimplePropertyExpression.java rename to src/main/java/net/itsthesky/disky/api/changers/ChangeableSimplePropertyExpression.java index 4efea72b..747b1dd1 100644 --- a/src/main/java/info/itsthesky/disky/api/changers/ChangeableSimplePropertyExpression.java +++ b/src/main/java/net/itsthesky/disky/api/changers/ChangeableSimplePropertyExpression.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.api.changers; +package net.itsthesky.disky.api.changers; import ch.njol.skript.classes.Changer; import ch.njol.skript.expressions.base.SimplePropertyExpression; diff --git a/src/main/java/info/itsthesky/disky/api/changers/DiSkyChanger.java b/src/main/java/net/itsthesky/disky/api/changers/DiSkyChanger.java similarity index 77% rename from src/main/java/info/itsthesky/disky/api/changers/DiSkyChanger.java rename to src/main/java/net/itsthesky/disky/api/changers/DiSkyChanger.java index 63184c92..20d9b913 100644 --- a/src/main/java/info/itsthesky/disky/api/changers/DiSkyChanger.java +++ b/src/main/java/net/itsthesky/disky/api/changers/DiSkyChanger.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.api.changers; +package net.itsthesky.disky.api.changers; import ch.njol.skript.classes.Changer; -import info.itsthesky.disky.core.Bot; -import info.itsthesky.disky.elements.changers.Change; +import net.itsthesky.disky.core.Bot; +import net.itsthesky.disky.elements.changers.Change; import org.jetbrains.annotations.NotNull; public abstract class DiSkyChanger implements Changer { diff --git a/src/main/java/info/itsthesky/disky/api/changers/DiSkyChangerElement.java b/src/main/java/net/itsthesky/disky/api/changers/DiSkyChangerElement.java similarity index 70% rename from src/main/java/info/itsthesky/disky/api/changers/DiSkyChangerElement.java rename to src/main/java/net/itsthesky/disky/api/changers/DiSkyChangerElement.java index f296e796..5affc888 100644 --- a/src/main/java/info/itsthesky/disky/api/changers/DiSkyChangerElement.java +++ b/src/main/java/net/itsthesky/disky/api/changers/DiSkyChangerElement.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.api.changers; +package net.itsthesky.disky.api.changers; import ch.njol.skript.classes.Changer; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.core.Bot; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.core.Bot; import org.bukkit.event.Event; public interface DiSkyChangerElement { diff --git a/src/main/java/info/itsthesky/disky/api/changers/MultipleChangeablePropertyExpression.java b/src/main/java/net/itsthesky/disky/api/changers/MultipleChangeablePropertyExpression.java similarity index 79% rename from src/main/java/info/itsthesky/disky/api/changers/MultipleChangeablePropertyExpression.java rename to src/main/java/net/itsthesky/disky/api/changers/MultipleChangeablePropertyExpression.java index 3cf53621..2acbbf71 100644 --- a/src/main/java/info/itsthesky/disky/api/changers/MultipleChangeablePropertyExpression.java +++ b/src/main/java/net/itsthesky/disky/api/changers/MultipleChangeablePropertyExpression.java @@ -1,7 +1,7 @@ -package info.itsthesky.disky.api.changers; +package net.itsthesky.disky.api.changers; import ch.njol.skript.classes.Changer; -import info.itsthesky.disky.api.skript.MultiplyPropertyExpression; +import net.itsthesky.disky.api.skript.MultiplyPropertyExpression; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/api/datastruct/BaseDataStructElement.java b/src/main/java/net/itsthesky/disky/api/datastruct/BaseDataStructElement.java similarity index 75% rename from src/main/java/info/itsthesky/disky/api/datastruct/BaseDataStructElement.java rename to src/main/java/net/itsthesky/disky/api/datastruct/BaseDataStructElement.java index d413d85c..6bf5b745 100644 --- a/src/main/java/info/itsthesky/disky/api/datastruct/BaseDataStructElement.java +++ b/src/main/java/net/itsthesky/disky/api/datastruct/BaseDataStructElement.java @@ -1,25 +1,16 @@ -package info.itsthesky.disky.api.datastruct; +package net.itsthesky.disky.api.datastruct; -import ch.njol.skript.Skript; -import ch.njol.skript.config.Node; import ch.njol.skript.config.SectionNode; import ch.njol.skript.expressions.base.SectionExpression; import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.SkriptParser; import ch.njol.skript.lang.TriggerItem; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.api.datastruct.base.DataStruct; -import info.itsthesky.disky.elements.sections.handler.DiSkyRuntimeHandler; +import net.itsthesky.disky.api.datastruct.base.DataStruct; import org.bukkit.event.Event; import org.jetbrains.annotations.Nullable; -import org.skriptlang.skript.lang.entry.EntryContainer; -import java.lang.reflect.InvocationTargetException; -import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; public abstract class BaseDataStructElement> extends SectionExpression { diff --git a/src/main/java/info/itsthesky/disky/api/datastruct/ChainDataStructElement.java b/src/main/java/net/itsthesky/disky/api/datastruct/ChainDataStructElement.java similarity index 84% rename from src/main/java/info/itsthesky/disky/api/datastruct/ChainDataStructElement.java rename to src/main/java/net/itsthesky/disky/api/datastruct/ChainDataStructElement.java index 2507269b..2b179b75 100644 --- a/src/main/java/info/itsthesky/disky/api/datastruct/ChainDataStructElement.java +++ b/src/main/java/net/itsthesky/disky/api/datastruct/ChainDataStructElement.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.api.datastruct; +package net.itsthesky.disky.api.datastruct; import ch.njol.skript.config.Node; import ch.njol.skript.config.SectionNode; @@ -7,18 +7,14 @@ import ch.njol.skript.lang.SkriptParser; import ch.njol.skript.lang.TriggerItem; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.datastruct.base.DataStruct; -import info.itsthesky.disky.elements.changers.IAsyncGettableExpression; -import info.itsthesky.disky.elements.sections.handler.DiSkyRuntimeHandler; +import net.itsthesky.disky.api.datastruct.base.DataStruct; +import net.itsthesky.disky.elements.changers.IAsyncGettableExpression; +import net.itsthesky.disky.elements.sections.handler.DiSkyRuntimeHandler; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.skriptlang.skript.lang.entry.EntryContainer; -import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; public abstract class ChainDataStructElement> extends SectionExpression implements IAsyncGettableExpression { diff --git a/src/main/java/info/itsthesky/disky/api/datastruct/DataStructure.java b/src/main/java/net/itsthesky/disky/api/datastruct/DataStructure.java similarity index 66% rename from src/main/java/info/itsthesky/disky/api/datastruct/DataStructure.java rename to src/main/java/net/itsthesky/disky/api/datastruct/DataStructure.java index 386b82af..f7482fc8 100644 --- a/src/main/java/info/itsthesky/disky/api/datastruct/DataStructure.java +++ b/src/main/java/net/itsthesky/disky/api/datastruct/DataStructure.java @@ -1,4 +1,7 @@ -package info.itsthesky.disky.api.datastruct; +package net.itsthesky.disky.api.datastruct; + +import net.itsthesky.disky.elements.datastructs.structures.EmbedFieldStructure; +import net.itsthesky.disky.elements.datastructs.structures.EmbedStructure; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -14,7 +17,7 @@ /** * Whether this structure can be made from a {@link info.itsthesky.disky.elements.sections.CreateStructSection create structure section}. - * A data structure may only serve as "sub-data structure" for other structures (like {@link info.itsthesky.disky.elements.datastructs.structures.EmbedFieldStructure} for {@link info.itsthesky.disky.elements.datastructs.structures.EmbedStructure}). + * A data structure may only serve as "sub-data structure" for other structures (like {@link EmbedFieldStructure} for {@link EmbedStructure}). */ boolean canBeCreated() default true; diff --git a/src/main/java/info/itsthesky/disky/api/datastruct/DataStructureEntry.java b/src/main/java/net/itsthesky/disky/api/datastruct/DataStructureEntry.java similarity index 87% rename from src/main/java/info/itsthesky/disky/api/datastruct/DataStructureEntry.java rename to src/main/java/net/itsthesky/disky/api/datastruct/DataStructureEntry.java index 11e4984d..3dd4d01b 100644 --- a/src/main/java/info/itsthesky/disky/api/datastruct/DataStructureEntry.java +++ b/src/main/java/net/itsthesky/disky/api/datastruct/DataStructureEntry.java @@ -1,8 +1,7 @@ -package info.itsthesky.disky.api.datastruct; +package net.itsthesky.disky.api.datastruct; -import info.itsthesky.disky.api.datastruct.base.DataStruct; +import net.itsthesky.disky.api.datastruct.base.DataStruct; -import javax.annotation.Nullable; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/src/main/java/info/itsthesky/disky/api/datastruct/DataStructureFactory.java b/src/main/java/net/itsthesky/disky/api/datastruct/DataStructureFactory.java similarity index 97% rename from src/main/java/info/itsthesky/disky/api/datastruct/DataStructureFactory.java rename to src/main/java/net/itsthesky/disky/api/datastruct/DataStructureFactory.java index 09226fdc..ca1686a3 100644 --- a/src/main/java/info/itsthesky/disky/api/datastruct/DataStructureFactory.java +++ b/src/main/java/net/itsthesky/disky/api/datastruct/DataStructureFactory.java @@ -1,17 +1,17 @@ -package info.itsthesky.disky.api.datastruct; +package net.itsthesky.disky.api.datastruct; import ch.njol.skript.config.Node; import ch.njol.skript.config.SectionNode; import ch.njol.skript.lang.Expression; import ch.njol.skript.registrations.Classes; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.api.ReflectionUtils; -import info.itsthesky.disky.api.datastruct.base.BasicDS; -import info.itsthesky.disky.api.datastruct.base.ChainDS; -import info.itsthesky.disky.api.datastruct.base.DataStruct; -import info.itsthesky.disky.api.skript.BetterExpressionEntryData; -import info.itsthesky.disky.core.SkriptUtils; -import info.itsthesky.disky.elements.sections.handler.DiSkyRuntimeHandler; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.api.ReflectionUtils; +import net.itsthesky.disky.api.datastruct.base.BasicDS; +import net.itsthesky.disky.api.datastruct.base.ChainDS; +import net.itsthesky.disky.api.datastruct.base.DataStruct; +import net.itsthesky.disky.api.skript.BetterExpressionEntryData; +import net.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.elements.sections.handler.DiSkyRuntimeHandler; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -19,7 +19,6 @@ import org.skriptlang.skript.lang.entry.EntryValidator; import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; import java.util.*; /** diff --git a/src/main/java/info/itsthesky/disky/api/datastruct/EasyDSRegistry.java b/src/main/java/net/itsthesky/disky/api/datastruct/EasyDSRegistry.java similarity index 91% rename from src/main/java/info/itsthesky/disky/api/datastruct/EasyDSRegistry.java rename to src/main/java/net/itsthesky/disky/api/datastruct/EasyDSRegistry.java index 7568db87..261ccdbc 100644 --- a/src/main/java/info/itsthesky/disky/api/datastruct/EasyDSRegistry.java +++ b/src/main/java/net/itsthesky/disky/api/datastruct/EasyDSRegistry.java @@ -1,10 +1,10 @@ -package info.itsthesky.disky.api.datastruct; +package net.itsthesky.disky.api.datastruct; import ch.njol.skript.lang.ExpressionType; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.api.DiSkyRegistry; -import info.itsthesky.disky.api.datastruct.base.DataStruct; -import info.itsthesky.disky.elements.datastructs.structures.EmbedStructure; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.api.DiSkyRegistry; +import net.itsthesky.disky.api.datastruct.base.DataStruct; +import net.itsthesky.disky.elements.datastructs.structures.EmbedStructure; import net.bytebuddy.ByteBuddy; import net.bytebuddy.implementation.MethodDelegation; import net.bytebuddy.implementation.bind.annotation.AllArguments; diff --git a/src/main/java/info/itsthesky/disky/api/datastruct/EditDataStructElement.java b/src/main/java/net/itsthesky/disky/api/datastruct/EditDataStructElement.java similarity index 92% rename from src/main/java/info/itsthesky/disky/api/datastruct/EditDataStructElement.java rename to src/main/java/net/itsthesky/disky/api/datastruct/EditDataStructElement.java index e7dcde59..92f7703c 100644 --- a/src/main/java/info/itsthesky/disky/api/datastruct/EditDataStructElement.java +++ b/src/main/java/net/itsthesky/disky/api/datastruct/EditDataStructElement.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.api.datastruct; +package net.itsthesky.disky.api.datastruct; import ch.njol.skript.config.SectionNode; import ch.njol.skript.lang.Expression; @@ -6,8 +6,8 @@ import ch.njol.skript.lang.SkriptParser; import ch.njol.skript.lang.TriggerItem; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.datastruct.base.DataStruct; -import info.itsthesky.disky.elements.sections.handler.DiSkyRuntimeHandler; +import net.itsthesky.disky.api.datastruct.base.DataStruct; +import net.itsthesky.disky.elements.sections.handler.DiSkyRuntimeHandler; import org.bukkit.event.Event; import org.jetbrains.annotations.Nullable; import org.skriptlang.skript.lang.entry.EntryContainer; diff --git a/src/main/java/info/itsthesky/disky/api/datastruct/ReflectBasicDataStructure.java b/src/main/java/net/itsthesky/disky/api/datastruct/ReflectBasicDataStructure.java similarity index 88% rename from src/main/java/info/itsthesky/disky/api/datastruct/ReflectBasicDataStructure.java rename to src/main/java/net/itsthesky/disky/api/datastruct/ReflectBasicDataStructure.java index 6ef93baa..1552e542 100644 --- a/src/main/java/info/itsthesky/disky/api/datastruct/ReflectBasicDataStructure.java +++ b/src/main/java/net/itsthesky/disky/api/datastruct/ReflectBasicDataStructure.java @@ -1,6 +1,6 @@ -package info.itsthesky.disky.api.datastruct; +package net.itsthesky.disky.api.datastruct; -import info.itsthesky.disky.api.datastruct.base.DataStruct; +import net.itsthesky.disky.api.datastruct.base.DataStruct; import org.bukkit.event.Event; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/info/itsthesky/disky/api/datastruct/base/BasicDS.java b/src/main/java/net/itsthesky/disky/api/datastruct/base/BasicDS.java similarity index 87% rename from src/main/java/info/itsthesky/disky/api/datastruct/base/BasicDS.java rename to src/main/java/net/itsthesky/disky/api/datastruct/base/BasicDS.java index b8d7229b..ff8d56a7 100644 --- a/src/main/java/info/itsthesky/disky/api/datastruct/base/BasicDS.java +++ b/src/main/java/net/itsthesky/disky/api/datastruct/base/BasicDS.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.api.datastruct.base; +package net.itsthesky.disky.api.datastruct.base; /** * Represent a "basic" data structure: the class diff --git a/src/main/java/info/itsthesky/disky/api/datastruct/base/ChainDS.java b/src/main/java/net/itsthesky/disky/api/datastruct/base/ChainDS.java similarity index 89% rename from src/main/java/info/itsthesky/disky/api/datastruct/base/ChainDS.java rename to src/main/java/net/itsthesky/disky/api/datastruct/base/ChainDS.java index 36606b23..27b4bbe3 100644 --- a/src/main/java/info/itsthesky/disky/api/datastruct/base/ChainDS.java +++ b/src/main/java/net/itsthesky/disky/api/datastruct/base/ChainDS.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.api.datastruct.base; +package net.itsthesky.disky.api.datastruct.base; /** * Represent a "chain" data structure: the class diff --git a/src/main/java/info/itsthesky/disky/api/datastruct/base/DataStruct.java b/src/main/java/net/itsthesky/disky/api/datastruct/base/DataStruct.java similarity index 80% rename from src/main/java/info/itsthesky/disky/api/datastruct/base/DataStruct.java rename to src/main/java/net/itsthesky/disky/api/datastruct/base/DataStruct.java index cec4a6ab..13873995 100644 --- a/src/main/java/info/itsthesky/disky/api/datastruct/base/DataStruct.java +++ b/src/main/java/net/itsthesky/disky/api/datastruct/base/DataStruct.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.api.datastruct.base; +package net.itsthesky.disky.api.datastruct.base; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/info/itsthesky/disky/api/datastruct/base/EditableDataStructure.java b/src/main/java/net/itsthesky/disky/api/datastruct/base/EditableDataStructure.java similarity index 92% rename from src/main/java/info/itsthesky/disky/api/datastruct/base/EditableDataStructure.java rename to src/main/java/net/itsthesky/disky/api/datastruct/base/EditableDataStructure.java index b9b9949d..6cd4c4b9 100644 --- a/src/main/java/info/itsthesky/disky/api/datastruct/base/EditableDataStructure.java +++ b/src/main/java/net/itsthesky/disky/api/datastruct/base/EditableDataStructure.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.api.datastruct.base; +package net.itsthesky.disky.api.datastruct.base; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/api/emojis/Action.java b/src/main/java/net/itsthesky/disky/api/emojis/Action.java similarity index 91% rename from src/main/java/info/itsthesky/disky/api/emojis/Action.java rename to src/main/java/net/itsthesky/disky/api/emojis/Action.java index ff43e761..46b75874 100644 --- a/src/main/java/info/itsthesky/disky/api/emojis/Action.java +++ b/src/main/java/net/itsthesky/disky/api/emojis/Action.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.api.emojis; +package net.itsthesky.disky.api.emojis; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/info/itsthesky/disky/api/emojis/ActionImpl.java b/src/main/java/net/itsthesky/disky/api/emojis/ActionImpl.java similarity index 95% rename from src/main/java/info/itsthesky/disky/api/emojis/ActionImpl.java rename to src/main/java/net/itsthesky/disky/api/emojis/ActionImpl.java index 28141432..a76fb59d 100644 --- a/src/main/java/info/itsthesky/disky/api/emojis/ActionImpl.java +++ b/src/main/java/net/itsthesky/disky/api/emojis/ActionImpl.java @@ -1,6 +1,6 @@ -package info.itsthesky.disky.api.emojis; +package net.itsthesky.disky.api.emojis; -import info.itsthesky.disky.DiSky; +import net.itsthesky.disky.DiSky; import org.jetbrains.annotations.Nullable; import java.util.concurrent.ExecutorService; diff --git a/src/main/java/info/itsthesky/disky/api/emojis/ActionSupplier.java b/src/main/java/net/itsthesky/disky/api/emojis/ActionSupplier.java similarity index 62% rename from src/main/java/info/itsthesky/disky/api/emojis/ActionSupplier.java rename to src/main/java/net/itsthesky/disky/api/emojis/ActionSupplier.java index 95b74794..473e78e4 100644 --- a/src/main/java/info/itsthesky/disky/api/emojis/ActionSupplier.java +++ b/src/main/java/net/itsthesky/disky/api/emojis/ActionSupplier.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.api.emojis; +package net.itsthesky.disky.api.emojis; public interface ActionSupplier { T get() throws Throwable; diff --git a/src/main/java/info/itsthesky/disky/api/emojis/Emoji.java b/src/main/java/net/itsthesky/disky/api/emojis/Emoji.java similarity index 97% rename from src/main/java/info/itsthesky/disky/api/emojis/Emoji.java rename to src/main/java/net/itsthesky/disky/api/emojis/Emoji.java index 47e1aed8..209a6690 100644 --- a/src/main/java/info/itsthesky/disky/api/emojis/Emoji.java +++ b/src/main/java/net/itsthesky/disky/api/emojis/Emoji.java @@ -1,13 +1,13 @@ -package info.itsthesky.disky.api.emojis; +package net.itsthesky.disky.api.emojis; -import info.itsthesky.disky.core.Utils; +import net.itsthesky.disky.core.Utils; import org.jetbrains.annotations.NotNull; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; -import static info.itsthesky.disky.api.emojis.TwemojiType.X72; +import static net.itsthesky.disky.api.emojis.TwemojiType.X72; /** * Class containing basic info about an emoji such as their Unicode and shortcode representations with a few helper methods diff --git a/src/main/java/info/itsthesky/disky/api/emojis/EmojiParser.java b/src/main/java/net/itsthesky/disky/api/emojis/EmojiParser.java similarity index 96% rename from src/main/java/info/itsthesky/disky/api/emojis/EmojiParser.java rename to src/main/java/net/itsthesky/disky/api/emojis/EmojiParser.java index 762f11f5..663257a1 100644 --- a/src/main/java/info/itsthesky/disky/api/emojis/EmojiParser.java +++ b/src/main/java/net/itsthesky/disky/api/emojis/EmojiParser.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.api.emojis; +package net.itsthesky.disky.api.emojis; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/src/main/java/info/itsthesky/disky/api/emojis/EmojiStore.java b/src/main/java/net/itsthesky/disky/api/emojis/EmojiStore.java similarity index 92% rename from src/main/java/info/itsthesky/disky/api/emojis/EmojiStore.java rename to src/main/java/net/itsthesky/disky/api/emojis/EmojiStore.java index df08dcb3..8a8e6044 100644 --- a/src/main/java/info/itsthesky/disky/api/emojis/EmojiStore.java +++ b/src/main/java/net/itsthesky/disky/api/emojis/EmojiStore.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.api.emojis; +package net.itsthesky.disky.api.emojis; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import info.itsthesky.disky.DiSky; +import net.itsthesky.disky.DiSky; import java.io.*; import java.nio.charset.StandardCharsets; diff --git a/src/main/java/info/itsthesky/disky/api/emojis/Emojis.java b/src/main/java/net/itsthesky/disky/api/emojis/Emojis.java similarity index 97% rename from src/main/java/info/itsthesky/disky/api/emojis/Emojis.java rename to src/main/java/net/itsthesky/disky/api/emojis/Emojis.java index 3fa4009b..d804f035 100644 --- a/src/main/java/info/itsthesky/disky/api/emojis/Emojis.java +++ b/src/main/java/net/itsthesky/disky/api/emojis/Emojis.java @@ -1,6 +1,6 @@ -package info.itsthesky.disky.api.emojis; +package net.itsthesky.disky.api.emojis; -import info.itsthesky.disky.DiSky; +import net.itsthesky.disky.DiSky; import java.io.IOException; import java.util.Collections; diff --git a/src/main/java/info/itsthesky/disky/api/emojis/Emote.java b/src/main/java/net/itsthesky/disky/api/emojis/Emote.java similarity index 98% rename from src/main/java/info/itsthesky/disky/api/emojis/Emote.java rename to src/main/java/net/itsthesky/disky/api/emojis/Emote.java index 53a3743e..2cd26f40 100644 --- a/src/main/java/info/itsthesky/disky/api/emojis/Emote.java +++ b/src/main/java/net/itsthesky/disky/api/emojis/Emote.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.api.emojis; +package net.itsthesky.disky.api.emojis; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.IMentionable; diff --git a/src/main/java/info/itsthesky/disky/api/emojis/ExtendedEmoji.java b/src/main/java/net/itsthesky/disky/api/emojis/ExtendedEmoji.java similarity index 97% rename from src/main/java/info/itsthesky/disky/api/emojis/ExtendedEmoji.java rename to src/main/java/net/itsthesky/disky/api/emojis/ExtendedEmoji.java index 530f331b..3bf7b2cd 100644 --- a/src/main/java/info/itsthesky/disky/api/emojis/ExtendedEmoji.java +++ b/src/main/java/net/itsthesky/disky/api/emojis/ExtendedEmoji.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.api.emojis; +package net.itsthesky.disky.api.emojis; import java.io.IOException; import java.util.regex.Matcher; diff --git a/src/main/java/info/itsthesky/disky/api/emojis/HttpUtils.java b/src/main/java/net/itsthesky/disky/api/emojis/HttpUtils.java similarity index 95% rename from src/main/java/info/itsthesky/disky/api/emojis/HttpUtils.java rename to src/main/java/net/itsthesky/disky/api/emojis/HttpUtils.java index a5dab2ec..5bae5119 100644 --- a/src/main/java/info/itsthesky/disky/api/emojis/HttpUtils.java +++ b/src/main/java/net/itsthesky/disky/api/emojis/HttpUtils.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.api.emojis; +package net.itsthesky.disky.api.emojis; import okhttp3.Call; import okhttp3.OkHttpClient; diff --git a/src/main/java/info/itsthesky/disky/api/emojis/StringUtils.java b/src/main/java/net/itsthesky/disky/api/emojis/StringUtils.java similarity index 99% rename from src/main/java/info/itsthesky/disky/api/emojis/StringUtils.java rename to src/main/java/net/itsthesky/disky/api/emojis/StringUtils.java index 4cd8a577..472113d9 100644 --- a/src/main/java/info/itsthesky/disky/api/emojis/StringUtils.java +++ b/src/main/java/net/itsthesky/disky/api/emojis/StringUtils.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.api.emojis; +package net.itsthesky.disky.api.emojis; import java.io.StringWriter; import java.text.Normalizer; diff --git a/src/main/java/net/itsthesky/disky/api/emojis/TwemojiType.java b/src/main/java/net/itsthesky/disky/api/emojis/TwemojiType.java new file mode 100644 index 00000000..38fdf319 --- /dev/null +++ b/src/main/java/net/itsthesky/disky/api/emojis/TwemojiType.java @@ -0,0 +1,6 @@ +package net.itsthesky.disky.api.emojis; + +public enum TwemojiType { + X72, + SVG +} diff --git a/src/main/java/info/itsthesky/disky/api/events/BukkitEvent.java b/src/main/java/net/itsthesky/disky/api/events/BukkitEvent.java similarity index 92% rename from src/main/java/info/itsthesky/disky/api/events/BukkitEvent.java rename to src/main/java/net/itsthesky/disky/api/events/BukkitEvent.java index 0b0ecf6e..7f389846 100644 --- a/src/main/java/info/itsthesky/disky/api/events/BukkitEvent.java +++ b/src/main/java/net/itsthesky/disky/api/events/BukkitEvent.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.api.events; +package net.itsthesky.disky.api.events; import org.bukkit.event.HandlerList; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/api/events/DiSkyEvent.java b/src/main/java/net/itsthesky/disky/api/events/DiSkyEvent.java similarity index 97% rename from src/main/java/info/itsthesky/disky/api/events/DiSkyEvent.java rename to src/main/java/net/itsthesky/disky/api/events/DiSkyEvent.java index 2adc5211..f73d8efc 100644 --- a/src/main/java/info/itsthesky/disky/api/events/DiSkyEvent.java +++ b/src/main/java/net/itsthesky/disky/api/events/DiSkyEvent.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.api.events; +package net.itsthesky.disky.api.events; import ch.njol.skript.ScriptLoader; import ch.njol.skript.Skript; @@ -9,9 +9,9 @@ import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.skript.lang.Trigger; import ch.njol.skript.log.SkriptLogger; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.core.SkriptUtils; -import info.itsthesky.disky.managers.CoreEventListener; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.managers.CoreEventListener; import net.dv8tion.jda.api.audit.ActionType; import net.dv8tion.jda.api.events.guild.GuildAuditLogEntryCreateEvent; import org.bukkit.event.Event; diff --git a/src/main/java/info/itsthesky/disky/api/events/DiSkyGetter.java b/src/main/java/net/itsthesky/disky/api/events/DiSkyGetter.java similarity index 58% rename from src/main/java/info/itsthesky/disky/api/events/DiSkyGetter.java rename to src/main/java/net/itsthesky/disky/api/events/DiSkyGetter.java index 584c197a..ff20a219 100644 --- a/src/main/java/info/itsthesky/disky/api/events/DiSkyGetter.java +++ b/src/main/java/net/itsthesky/disky/api/events/DiSkyGetter.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.api.events; +package net.itsthesky.disky.api.events; public interface DiSkyGetter { F get(T arg); diff --git a/src/main/java/info/itsthesky/disky/api/events/EventListener.java b/src/main/java/net/itsthesky/disky/api/events/EventListener.java similarity index 98% rename from src/main/java/info/itsthesky/disky/api/events/EventListener.java rename to src/main/java/net/itsthesky/disky/api/events/EventListener.java index ab571ca3..4bb6bf05 100644 --- a/src/main/java/info/itsthesky/disky/api/events/EventListener.java +++ b/src/main/java/net/itsthesky/disky/api/events/EventListener.java @@ -1,7 +1,7 @@ -package info.itsthesky.disky.api.events; +package net.itsthesky.disky.api.events; import ch.njol.skript.config.Node; -import info.itsthesky.disky.DiSky; +import net.itsthesky.disky.DiSky; import net.dv8tion.jda.api.audit.ActionType; import net.dv8tion.jda.api.events.GenericEvent; import net.dv8tion.jda.api.events.guild.GuildAuditLogEntryCreateEvent; diff --git a/src/main/java/info/itsthesky/disky/api/events/EventValue.java b/src/main/java/net/itsthesky/disky/api/events/EventValue.java similarity index 95% rename from src/main/java/info/itsthesky/disky/api/events/EventValue.java rename to src/main/java/net/itsthesky/disky/api/events/EventValue.java index afdcd48e..04cd1a23 100644 --- a/src/main/java/info/itsthesky/disky/api/events/EventValue.java +++ b/src/main/java/net/itsthesky/disky/api/events/EventValue.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.api.events; +package net.itsthesky.disky.api.events; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/api/events/SimpleDiSkyEvent.java b/src/main/java/net/itsthesky/disky/api/events/SimpleDiSkyEvent.java similarity index 96% rename from src/main/java/info/itsthesky/disky/api/events/SimpleDiSkyEvent.java rename to src/main/java/net/itsthesky/disky/api/events/SimpleDiSkyEvent.java index 8062f37f..a4824c8d 100644 --- a/src/main/java/info/itsthesky/disky/api/events/SimpleDiSkyEvent.java +++ b/src/main/java/net/itsthesky/disky/api/events/SimpleDiSkyEvent.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.api.events; +package net.itsthesky.disky.api.events; import net.dv8tion.jda.api.events.guild.GuildAuditLogEntryCreateEvent; diff --git a/src/main/java/info/itsthesky/disky/api/events/specific/ComponentInteractionEvent.java b/src/main/java/net/itsthesky/disky/api/events/specific/ComponentInteractionEvent.java similarity index 84% rename from src/main/java/info/itsthesky/disky/api/events/specific/ComponentInteractionEvent.java rename to src/main/java/net/itsthesky/disky/api/events/specific/ComponentInteractionEvent.java index 53bf53d6..5b0c2c17 100644 --- a/src/main/java/info/itsthesky/disky/api/events/specific/ComponentInteractionEvent.java +++ b/src/main/java/net/itsthesky/disky/api/events/specific/ComponentInteractionEvent.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.api.events.specific; +package net.itsthesky.disky.api.events.specific; import net.dv8tion.jda.api.interactions.components.ComponentInteraction; diff --git a/src/main/java/info/itsthesky/disky/api/events/specific/InteractionEvent.java b/src/main/java/net/itsthesky/disky/api/events/specific/InteractionEvent.java similarity index 92% rename from src/main/java/info/itsthesky/disky/api/events/specific/InteractionEvent.java rename to src/main/java/net/itsthesky/disky/api/events/specific/InteractionEvent.java index cc99901e..f2b455f0 100644 --- a/src/main/java/info/itsthesky/disky/api/events/specific/InteractionEvent.java +++ b/src/main/java/net/itsthesky/disky/api/events/specific/InteractionEvent.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.api.events.specific; +package net.itsthesky.disky.api.events.specific; import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel; import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent; diff --git a/src/main/java/info/itsthesky/disky/api/events/specific/LogEvent.java b/src/main/java/net/itsthesky/disky/api/events/specific/LogEvent.java similarity index 76% rename from src/main/java/info/itsthesky/disky/api/events/specific/LogEvent.java rename to src/main/java/net/itsthesky/disky/api/events/specific/LogEvent.java index 2313c2f7..71b3a269 100644 --- a/src/main/java/info/itsthesky/disky/api/events/specific/LogEvent.java +++ b/src/main/java/net/itsthesky/disky/api/events/specific/LogEvent.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.api.events.specific; +package net.itsthesky.disky.api.events.specific; import net.dv8tion.jda.api.entities.User; diff --git a/src/main/java/info/itsthesky/disky/api/events/specific/MessageEvent.java b/src/main/java/net/itsthesky/disky/api/events/specific/MessageEvent.java similarity index 83% rename from src/main/java/info/itsthesky/disky/api/events/specific/MessageEvent.java rename to src/main/java/net/itsthesky/disky/api/events/specific/MessageEvent.java index 2b64faf8..4f23c4b0 100644 --- a/src/main/java/info/itsthesky/disky/api/events/specific/MessageEvent.java +++ b/src/main/java/net/itsthesky/disky/api/events/specific/MessageEvent.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.api.events.specific; +package net.itsthesky.disky.api.events.specific; import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel; diff --git a/src/main/java/info/itsthesky/disky/api/events/specific/ModalEvent.java b/src/main/java/net/itsthesky/disky/api/events/specific/ModalEvent.java similarity index 84% rename from src/main/java/info/itsthesky/disky/api/events/specific/ModalEvent.java rename to src/main/java/net/itsthesky/disky/api/events/specific/ModalEvent.java index 17d4e4fa..7bdacd37 100644 --- a/src/main/java/info/itsthesky/disky/api/events/specific/ModalEvent.java +++ b/src/main/java/net/itsthesky/disky/api/events/specific/ModalEvent.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.api.events.specific; +package net.itsthesky.disky.api.events.specific; import net.dv8tion.jda.api.interactions.modals.Modal; import net.dv8tion.jda.api.requests.restaction.interactions.ModalCallbackAction; diff --git a/src/main/java/info/itsthesky/disky/api/generator/DocBuilder.java b/src/main/java/net/itsthesky/disky/api/generator/DocBuilder.java similarity index 98% rename from src/main/java/info/itsthesky/disky/api/generator/DocBuilder.java rename to src/main/java/net/itsthesky/disky/api/generator/DocBuilder.java index dbd4920c..58cdb354 100644 --- a/src/main/java/info/itsthesky/disky/api/generator/DocBuilder.java +++ b/src/main/java/net/itsthesky/disky/api/generator/DocBuilder.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.api.generator; +package net.itsthesky.disky.api.generator; import ch.njol.skript.Skript; import ch.njol.skript.SkriptAddon; @@ -8,9 +8,9 @@ import ch.njol.skript.registrations.Classes; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.api.modules.DiSkyModule; -import info.itsthesky.disky.elements.effects.RetrieveEventValue; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.api.modules.DiSkyModule; +import net.itsthesky.disky.elements.effects.RetrieveEventValue; import org.bukkit.event.Cancellable; import org.bukkit.event.Event; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/info/itsthesky/disky/api/generator/EventValuesGetter.java b/src/main/java/net/itsthesky/disky/api/generator/EventValuesGetter.java similarity index 97% rename from src/main/java/info/itsthesky/disky/api/generator/EventValuesGetter.java rename to src/main/java/net/itsthesky/disky/api/generator/EventValuesGetter.java index 5517a3bf..9fccb37d 100644 --- a/src/main/java/info/itsthesky/disky/api/generator/EventValuesGetter.java +++ b/src/main/java/net/itsthesky/disky/api/generator/EventValuesGetter.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.api.generator; +package net.itsthesky.disky.api.generator; import ch.njol.skript.registrations.EventValues; import org.bukkit.event.Event; diff --git a/src/main/java/info/itsthesky/disky/api/generator/Module.java b/src/main/java/net/itsthesky/disky/api/generator/Module.java similarity index 86% rename from src/main/java/info/itsthesky/disky/api/generator/Module.java rename to src/main/java/net/itsthesky/disky/api/generator/Module.java index f7be5021..9d54bd0a 100644 --- a/src/main/java/info/itsthesky/disky/api/generator/Module.java +++ b/src/main/java/net/itsthesky/disky/api/generator/Module.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.api.generator; +package net.itsthesky.disky.api.generator; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/src/main/java/info/itsthesky/disky/api/generator/ReflectionUtils.java b/src/main/java/net/itsthesky/disky/api/generator/ReflectionUtils.java similarity index 99% rename from src/main/java/info/itsthesky/disky/api/generator/ReflectionUtils.java rename to src/main/java/net/itsthesky/disky/api/generator/ReflectionUtils.java index 02f4fa0b..4985c3f9 100644 --- a/src/main/java/info/itsthesky/disky/api/generator/ReflectionUtils.java +++ b/src/main/java/net/itsthesky/disky/api/generator/ReflectionUtils.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.api.generator; +package net.itsthesky.disky.api.generator; import org.bukkit.Bukkit; diff --git a/src/main/java/info/itsthesky/disky/api/modules/DiSkyModule.java b/src/main/java/net/itsthesky/disky/api/modules/DiSkyModule.java similarity index 97% rename from src/main/java/info/itsthesky/disky/api/modules/DiSkyModule.java rename to src/main/java/net/itsthesky/disky/api/modules/DiSkyModule.java index 44f111de..a2126906 100644 --- a/src/main/java/info/itsthesky/disky/api/modules/DiSkyModule.java +++ b/src/main/java/net/itsthesky/disky/api/modules/DiSkyModule.java @@ -1,7 +1,7 @@ -package info.itsthesky.disky.api.modules; +package net.itsthesky.disky.api.modules; import ch.njol.skript.SkriptAddon; -import info.itsthesky.disky.DiSky; +import net.itsthesky.disky.DiSky; import org.skriptlang.skript.util.ClassLoader; import java.io.File; diff --git a/src/main/java/info/itsthesky/disky/api/modules/DiSkyModuleInfo.java b/src/main/java/net/itsthesky/disky/api/modules/DiSkyModuleInfo.java similarity index 98% rename from src/main/java/info/itsthesky/disky/api/modules/DiSkyModuleInfo.java rename to src/main/java/net/itsthesky/disky/api/modules/DiSkyModuleInfo.java index c6ab3ef4..783c80c6 100644 --- a/src/main/java/info/itsthesky/disky/api/modules/DiSkyModuleInfo.java +++ b/src/main/java/net/itsthesky/disky/api/modules/DiSkyModuleInfo.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.api.modules; +package net.itsthesky.disky.api.modules; import ch.njol.skript.util.Version; import org.bukkit.configuration.file.YamlConfiguration; diff --git a/src/main/java/info/itsthesky/disky/api/modules/EventValueInfo.java b/src/main/java/net/itsthesky/disky/api/modules/EventValueInfo.java similarity index 95% rename from src/main/java/info/itsthesky/disky/api/modules/EventValueInfo.java rename to src/main/java/net/itsthesky/disky/api/modules/EventValueInfo.java index e990c8cf..cccfbfba 100644 --- a/src/main/java/info/itsthesky/disky/api/modules/EventValueInfo.java +++ b/src/main/java/net/itsthesky/disky/api/modules/EventValueInfo.java @@ -1,6 +1,6 @@ -package info.itsthesky.disky.api.modules; +package net.itsthesky.disky.api.modules; -import info.itsthesky.disky.api.ReflectionUtils; +import net.itsthesky.disky.api.ReflectionUtils; import org.bukkit.event.Event; import org.jetbrains.annotations.Nullable; import org.skriptlang.skript.lang.converter.Converter; diff --git a/src/main/java/info/itsthesky/disky/api/modules/ModuleManager.java b/src/main/java/net/itsthesky/disky/api/modules/ModuleManager.java similarity index 91% rename from src/main/java/info/itsthesky/disky/api/modules/ModuleManager.java rename to src/main/java/net/itsthesky/disky/api/modules/ModuleManager.java index f60eb5bb..b7361b0d 100644 --- a/src/main/java/info/itsthesky/disky/api/modules/ModuleManager.java +++ b/src/main/java/net/itsthesky/disky/api/modules/ModuleManager.java @@ -1,24 +1,15 @@ -package info.itsthesky.disky.api.modules; +package net.itsthesky.disky.api.modules; -import ch.njol.skript.Skript; import ch.njol.skript.SkriptAddon; -import ch.njol.skript.classes.ClassInfo; -import ch.njol.skript.lang.ExpressionInfo; -import ch.njol.skript.lang.SyntaxElementInfo; -import ch.njol.skript.registrations.Classes; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.api.ReflectionUtils; -import info.itsthesky.disky.api.generator.DocBuilder; +import net.itsthesky.disky.DiSky; import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.file.YamlConfiguration; -import org.jetbrains.annotations.Nullable; import java.io.BufferedReader; import java.io.File; import java.io.IOException; import java.io.InputStreamReader; import java.lang.reflect.Constructor; -import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.net.URL; import java.net.URLClassLoader; diff --git a/src/main/java/info/itsthesky/disky/api/modules/ModuleOrigin.java b/src/main/java/net/itsthesky/disky/api/modules/ModuleOrigin.java similarity index 90% rename from src/main/java/info/itsthesky/disky/api/modules/ModuleOrigin.java rename to src/main/java/net/itsthesky/disky/api/modules/ModuleOrigin.java index a550dbf8..6711bbb7 100644 --- a/src/main/java/info/itsthesky/disky/api/modules/ModuleOrigin.java +++ b/src/main/java/net/itsthesky/disky/api/modules/ModuleOrigin.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.api.modules; +package net.itsthesky.disky.api.modules; import org.jetbrains.annotations.NotNull; import org.skriptlang.skript.registration.SyntaxOrigin; diff --git a/src/main/java/info/itsthesky/disky/api/skript/AsyncEffectSection.java b/src/main/java/net/itsthesky/disky/api/skript/AsyncEffectSection.java similarity index 98% rename from src/main/java/info/itsthesky/disky/api/skript/AsyncEffectSection.java rename to src/main/java/net/itsthesky/disky/api/skript/AsyncEffectSection.java index ec296e1a..90316707 100644 --- a/src/main/java/info/itsthesky/disky/api/skript/AsyncEffectSection.java +++ b/src/main/java/net/itsthesky/disky/api/skript/AsyncEffectSection.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.api.skript; +package net.itsthesky.disky.api.skript; import ch.njol.skript.Skript; import ch.njol.skript.effects.Delay; diff --git a/src/main/java/info/itsthesky/disky/api/skript/BaseBukkitEvent.java b/src/main/java/net/itsthesky/disky/api/skript/BaseBukkitEvent.java similarity index 88% rename from src/main/java/info/itsthesky/disky/api/skript/BaseBukkitEvent.java rename to src/main/java/net/itsthesky/disky/api/skript/BaseBukkitEvent.java index 4646d0b5..f98af6ed 100644 --- a/src/main/java/info/itsthesky/disky/api/skript/BaseBukkitEvent.java +++ b/src/main/java/net/itsthesky/disky/api/skript/BaseBukkitEvent.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.api.skript; +package net.itsthesky.disky.api.skript; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; diff --git a/src/main/java/info/itsthesky/disky/api/skript/BaseScope.java b/src/main/java/net/itsthesky/disky/api/skript/BaseScope.java similarity index 96% rename from src/main/java/info/itsthesky/disky/api/skript/BaseScope.java rename to src/main/java/net/itsthesky/disky/api/skript/BaseScope.java index 58ce0e20..48728058 100644 --- a/src/main/java/info/itsthesky/disky/api/skript/BaseScope.java +++ b/src/main/java/net/itsthesky/disky/api/skript/BaseScope.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.api.skript; +package net.itsthesky.disky.api.skript; import ch.njol.skript.ScriptLoader; import ch.njol.skript.Skript; @@ -9,8 +9,8 @@ import ch.njol.skript.lang.util.SimpleLiteral; import ch.njol.skript.log.SkriptLogger; import ch.njol.skript.util.StringMode; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.core.SkriptUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/info/itsthesky/disky/api/skript/BetterExpressionEntryData.java b/src/main/java/net/itsthesky/disky/api/skript/BetterExpressionEntryData.java similarity index 96% rename from src/main/java/info/itsthesky/disky/api/skript/BetterExpressionEntryData.java rename to src/main/java/net/itsthesky/disky/api/skript/BetterExpressionEntryData.java index 23168a6a..8be89544 100644 --- a/src/main/java/info/itsthesky/disky/api/skript/BetterExpressionEntryData.java +++ b/src/main/java/net/itsthesky/disky/api/skript/BetterExpressionEntryData.java @@ -1,19 +1,15 @@ -package info.itsthesky.disky.api.skript; +package net.itsthesky.disky.api.skript; import ch.njol.skript.ScriptLoader; -import ch.njol.skript.Skript; import ch.njol.skript.config.Node; import ch.njol.skript.config.SectionNode; import ch.njol.skript.config.SimpleNode; import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.ParseContext; import ch.njol.skript.lang.SkriptParser; -import ch.njol.skript.lang.parser.ParserInstance; import ch.njol.skript.localization.Message; import ch.njol.skript.log.ErrorQuality; import ch.njol.skript.log.ParseLogHandler; -import ch.njol.skript.log.SkriptLogger; -import info.itsthesky.disky.DiSky; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.skriptlang.skript.lang.entry.EntryData; diff --git a/src/main/java/info/itsthesky/disky/api/skript/EasyElement.java b/src/main/java/net/itsthesky/disky/api/skript/EasyElement.java similarity index 97% rename from src/main/java/info/itsthesky/disky/api/skript/EasyElement.java rename to src/main/java/net/itsthesky/disky/api/skript/EasyElement.java index f045e651..5538cf28 100644 --- a/src/main/java/info/itsthesky/disky/api/skript/EasyElement.java +++ b/src/main/java/net/itsthesky/disky/api/skript/EasyElement.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.api.skript; +package net.itsthesky.disky.api.skript; import ch.njol.skript.Skript; import ch.njol.skript.classes.Changer; @@ -6,8 +6,8 @@ import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.Variable; import ch.njol.skript.lang.parser.ParserInstance; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.core.Debug; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.core.Debug; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/info/itsthesky/disky/api/skript/EasyPropertyCondition.java b/src/main/java/net/itsthesky/disky/api/skript/EasyPropertyCondition.java similarity index 98% rename from src/main/java/info/itsthesky/disky/api/skript/EasyPropertyCondition.java rename to src/main/java/net/itsthesky/disky/api/skript/EasyPropertyCondition.java index ac41ded9..a7aac056 100644 --- a/src/main/java/info/itsthesky/disky/api/skript/EasyPropertyCondition.java +++ b/src/main/java/net/itsthesky/disky/api/skript/EasyPropertyCondition.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.api.skript; +package net.itsthesky.disky.api.skript; import ch.njol.skript.Skript; import ch.njol.skript.SkriptAPIException; diff --git a/src/main/java/info/itsthesky/disky/api/skript/ErrorHandler.java b/src/main/java/net/itsthesky/disky/api/skript/ErrorHandler.java similarity index 94% rename from src/main/java/info/itsthesky/disky/api/skript/ErrorHandler.java rename to src/main/java/net/itsthesky/disky/api/skript/ErrorHandler.java index 78ab209f..6fa55196 100644 --- a/src/main/java/info/itsthesky/disky/api/skript/ErrorHandler.java +++ b/src/main/java/net/itsthesky/disky/api/skript/ErrorHandler.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.api.skript; +package net.itsthesky.disky.api.skript; import ch.njol.skript.config.Node; import org.bukkit.event.Event; diff --git a/src/main/java/info/itsthesky/disky/api/skript/INodeHolder.java b/src/main/java/net/itsthesky/disky/api/skript/INodeHolder.java similarity index 77% rename from src/main/java/info/itsthesky/disky/api/skript/INodeHolder.java rename to src/main/java/net/itsthesky/disky/api/skript/INodeHolder.java index f0c43941..373d27c6 100644 --- a/src/main/java/info/itsthesky/disky/api/skript/INodeHolder.java +++ b/src/main/java/net/itsthesky/disky/api/skript/INodeHolder.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.api.skript; +package net.itsthesky.disky.api.skript; import ch.njol.skript.config.Node; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/api/skript/MultipleGetterExpression.java b/src/main/java/net/itsthesky/disky/api/skript/MultipleGetterExpression.java similarity index 96% rename from src/main/java/info/itsthesky/disky/api/skript/MultipleGetterExpression.java rename to src/main/java/net/itsthesky/disky/api/skript/MultipleGetterExpression.java index d09dac3e..67c31fef 100644 --- a/src/main/java/info/itsthesky/disky/api/skript/MultipleGetterExpression.java +++ b/src/main/java/net/itsthesky/disky/api/skript/MultipleGetterExpression.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.api.skript; +package net.itsthesky.disky.api.skript; import ch.njol.skript.Skript; import ch.njol.skript.lang.Expression; diff --git a/src/main/java/info/itsthesky/disky/api/skript/MultiplyPropertyExpression.java b/src/main/java/net/itsthesky/disky/api/skript/MultiplyPropertyExpression.java similarity index 97% rename from src/main/java/info/itsthesky/disky/api/skript/MultiplyPropertyExpression.java rename to src/main/java/net/itsthesky/disky/api/skript/MultiplyPropertyExpression.java index 211a0430..df467ce2 100644 --- a/src/main/java/info/itsthesky/disky/api/skript/MultiplyPropertyExpression.java +++ b/src/main/java/net/itsthesky/disky/api/skript/MultiplyPropertyExpression.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.api.skript; +package net.itsthesky.disky.api.skript; import ch.njol.skript.Skript; import ch.njol.skript.lang.Expression; diff --git a/src/main/java/info/itsthesky/disky/api/skript/NodeInformation.java b/src/main/java/net/itsthesky/disky/api/skript/NodeInformation.java similarity index 96% rename from src/main/java/info/itsthesky/disky/api/skript/NodeInformation.java rename to src/main/java/net/itsthesky/disky/api/skript/NodeInformation.java index f6019a3c..de6c801d 100644 --- a/src/main/java/info/itsthesky/disky/api/skript/NodeInformation.java +++ b/src/main/java/net/itsthesky/disky/api/skript/NodeInformation.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.api.skript; +package net.itsthesky.disky.api.skript; import ch.njol.skript.config.Node; import ch.njol.skript.log.SkriptLogger; diff --git a/src/main/java/info/itsthesky/disky/api/skript/ReturningSection.java b/src/main/java/net/itsthesky/disky/api/skript/ReturningSection.java similarity index 98% rename from src/main/java/info/itsthesky/disky/api/skript/ReturningSection.java rename to src/main/java/net/itsthesky/disky/api/skript/ReturningSection.java index 36c662ae..3d4375fc 100644 --- a/src/main/java/info/itsthesky/disky/api/skript/ReturningSection.java +++ b/src/main/java/net/itsthesky/disky/api/skript/ReturningSection.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.api.skript; +package net.itsthesky.disky.api.skript; import ch.njol.skript.Skript; import ch.njol.skript.classes.Changer; diff --git a/src/main/java/info/itsthesky/disky/api/skript/SimpleGetterExpression.java b/src/main/java/net/itsthesky/disky/api/skript/SimpleGetterExpression.java similarity index 96% rename from src/main/java/info/itsthesky/disky/api/skript/SimpleGetterExpression.java rename to src/main/java/net/itsthesky/disky/api/skript/SimpleGetterExpression.java index e3afd1bb..b7a6bdb7 100644 --- a/src/main/java/info/itsthesky/disky/api/skript/SimpleGetterExpression.java +++ b/src/main/java/net/itsthesky/disky/api/skript/SimpleGetterExpression.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.api.skript; +package net.itsthesky.disky.api.skript; import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.SkriptParser.ParseResult; diff --git a/src/main/java/info/itsthesky/disky/api/skript/SpecificBotEffect.java b/src/main/java/net/itsthesky/disky/api/skript/SpecificBotEffect.java similarity index 86% rename from src/main/java/info/itsthesky/disky/api/skript/SpecificBotEffect.java rename to src/main/java/net/itsthesky/disky/api/skript/SpecificBotEffect.java index bea15b3b..34c26af1 100644 --- a/src/main/java/info/itsthesky/disky/api/skript/SpecificBotEffect.java +++ b/src/main/java/net/itsthesky/disky/api/skript/SpecificBotEffect.java @@ -1,7 +1,7 @@ -package info.itsthesky.disky.api.skript; +package net.itsthesky.disky.api.skript; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.core.Bot; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.core.Bot; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/info/itsthesky/disky/api/skript/WaiterEffect.java b/src/main/java/net/itsthesky/disky/api/skript/WaiterEffect.java similarity index 98% rename from src/main/java/info/itsthesky/disky/api/skript/WaiterEffect.java rename to src/main/java/net/itsthesky/disky/api/skript/WaiterEffect.java index 793d3146..91cfab1d 100644 --- a/src/main/java/info/itsthesky/disky/api/skript/WaiterEffect.java +++ b/src/main/java/net/itsthesky/disky/api/skript/WaiterEffect.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.api.skript; +package net.itsthesky.disky.api.skript; import ch.njol.skript.Skript; import ch.njol.skript.classes.Changer; @@ -11,7 +11,7 @@ import ch.njol.skript.timings.SkriptTimings; import ch.njol.skript.variables.Variables; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; +import net.itsthesky.disky.DiSky; import org.bukkit.Bukkit; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/api/skript/action/AbstractNewAction.java b/src/main/java/net/itsthesky/disky/api/skript/action/AbstractNewAction.java similarity index 90% rename from src/main/java/info/itsthesky/disky/api/skript/action/AbstractNewAction.java rename to src/main/java/net/itsthesky/disky/api/skript/action/AbstractNewAction.java index 79a77257..9dac4cf3 100644 --- a/src/main/java/info/itsthesky/disky/api/skript/action/AbstractNewAction.java +++ b/src/main/java/net/itsthesky/disky/api/skript/action/AbstractNewAction.java @@ -1,12 +1,12 @@ -package info.itsthesky.disky.api.skript.action; +package net.itsthesky.disky.api.skript.action; import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.skript.lang.util.SimpleExpression; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.skript.EasyElement; -import info.itsthesky.disky.core.Bot; -import info.itsthesky.disky.managers.BotChangers; +import net.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.core.Bot; +import net.itsthesky.disky.managers.BotChangers; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/info/itsthesky/disky/api/skript/action/ActionProperty.java b/src/main/java/net/itsthesky/disky/api/skript/action/ActionProperty.java similarity index 88% rename from src/main/java/info/itsthesky/disky/api/skript/action/ActionProperty.java rename to src/main/java/net/itsthesky/disky/api/skript/action/ActionProperty.java index 3e6f8120..cab61eff 100644 --- a/src/main/java/info/itsthesky/disky/api/skript/action/ActionProperty.java +++ b/src/main/java/net/itsthesky/disky/api/skript/action/ActionProperty.java @@ -1,16 +1,16 @@ -package info.itsthesky.disky.api.skript.action; +package net.itsthesky.disky.api.skript.action; import ch.njol.skript.classes.Changer; import ch.njol.skript.config.Node; import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.changers.ChangeablePropertyExpression; -import info.itsthesky.disky.api.skript.EasyElement; -import info.itsthesky.disky.api.skript.INodeHolder; -import info.itsthesky.disky.core.Bot; -import info.itsthesky.disky.elements.changers.IAsyncChangeableExpression; -import info.itsthesky.disky.elements.changers.IAsyncGettableExpression; +import net.itsthesky.disky.api.changers.ChangeablePropertyExpression; +import net.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.api.skript.INodeHolder; +import net.itsthesky.disky.core.Bot; +import net.itsthesky.disky.elements.changers.IAsyncChangeableExpression; +import net.itsthesky.disky.elements.changers.IAsyncGettableExpression; import net.dv8tion.jda.api.requests.restaction.AuditableRestAction; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/api/skript/action/ChannelAction.java b/src/main/java/net/itsthesky/disky/api/skript/action/ChannelAction.java similarity index 95% rename from src/main/java/info/itsthesky/disky/api/skript/action/ChannelAction.java rename to src/main/java/net/itsthesky/disky/api/skript/action/ChannelAction.java index cc404fe6..9ab7fd1f 100644 --- a/src/main/java/info/itsthesky/disky/api/skript/action/ChannelAction.java +++ b/src/main/java/net/itsthesky/disky/api/skript/action/ChannelAction.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.api.skript.action; +package net.itsthesky.disky.api.skript.action; import ch.njol.skript.Skript; import ch.njol.skript.lang.Expression; diff --git a/src/main/java/info/itsthesky/disky/api/skript/action/GuildAction.java b/src/main/java/net/itsthesky/disky/api/skript/action/GuildAction.java similarity index 95% rename from src/main/java/info/itsthesky/disky/api/skript/action/GuildAction.java rename to src/main/java/net/itsthesky/disky/api/skript/action/GuildAction.java index 343e6648..59d62381 100644 --- a/src/main/java/info/itsthesky/disky/api/skript/action/GuildAction.java +++ b/src/main/java/net/itsthesky/disky/api/skript/action/GuildAction.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.api.skript.action; +package net.itsthesky.disky.api.skript.action; import ch.njol.skript.Skript; import ch.njol.skript.lang.Expression; diff --git a/src/main/java/info/itsthesky/disky/api/skript/action/MultipleActionProperty.java b/src/main/java/net/itsthesky/disky/api/skript/action/MultipleActionProperty.java similarity index 89% rename from src/main/java/info/itsthesky/disky/api/skript/action/MultipleActionProperty.java rename to src/main/java/net/itsthesky/disky/api/skript/action/MultipleActionProperty.java index c82cf717..e6aaeb85 100644 --- a/src/main/java/info/itsthesky/disky/api/skript/action/MultipleActionProperty.java +++ b/src/main/java/net/itsthesky/disky/api/skript/action/MultipleActionProperty.java @@ -1,12 +1,12 @@ -package info.itsthesky.disky.api.skript.action; +package net.itsthesky.disky.api.skript.action; import ch.njol.skript.classes.Changer; import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.changers.ChangeablePropertyExpression; -import info.itsthesky.disky.api.skript.EasyElement; -import info.itsthesky.disky.core.Bot; +import net.itsthesky.disky.api.changers.ChangeablePropertyExpression; +import net.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.core.Bot; import net.dv8tion.jda.api.entities.Role; import net.dv8tion.jda.api.requests.restaction.AuditableRestAction; import org.bukkit.event.Event; diff --git a/src/main/java/info/itsthesky/disky/api/skript/entries/MutexEntryData.java b/src/main/java/net/itsthesky/disky/api/skript/entries/MutexEntryData.java similarity index 98% rename from src/main/java/info/itsthesky/disky/api/skript/entries/MutexEntryData.java rename to src/main/java/net/itsthesky/disky/api/skript/entries/MutexEntryData.java index 146433d4..b5e24b6c 100644 --- a/src/main/java/info/itsthesky/disky/api/skript/entries/MutexEntryData.java +++ b/src/main/java/net/itsthesky/disky/api/skript/entries/MutexEntryData.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.api.skript.entries; +package net.itsthesky.disky.api.skript.entries; import ch.njol.skript.ScriptLoader; import ch.njol.skript.config.Node; diff --git a/src/main/java/info/itsthesky/disky/api/skript/entries/SimpleKeyValueEntries.java b/src/main/java/net/itsthesky/disky/api/skript/entries/SimpleKeyValueEntries.java similarity index 97% rename from src/main/java/info/itsthesky/disky/api/skript/entries/SimpleKeyValueEntries.java rename to src/main/java/net/itsthesky/disky/api/skript/entries/SimpleKeyValueEntries.java index d2828797..384a88fa 100644 --- a/src/main/java/info/itsthesky/disky/api/skript/entries/SimpleKeyValueEntries.java +++ b/src/main/java/net/itsthesky/disky/api/skript/entries/SimpleKeyValueEntries.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.api.skript.entries; +package net.itsthesky.disky.api.skript.entries; import ch.njol.skript.Skript; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/api/skript/entries/SubEntryData.java b/src/main/java/net/itsthesky/disky/api/skript/entries/SubEntryData.java similarity index 95% rename from src/main/java/info/itsthesky/disky/api/skript/entries/SubEntryData.java rename to src/main/java/net/itsthesky/disky/api/skript/entries/SubEntryData.java index 3fd67e09..c4374fa1 100644 --- a/src/main/java/info/itsthesky/disky/api/skript/entries/SubEntryData.java +++ b/src/main/java/net/itsthesky/disky/api/skript/entries/SubEntryData.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.api.skript.entries; +package net.itsthesky.disky.api.skript.entries; import ch.njol.skript.ScriptLoader; import ch.njol.skript.config.Node; diff --git a/src/main/java/info/itsthesky/disky/api/skript/reflects/ReflectClassFactory.java b/src/main/java/net/itsthesky/disky/api/skript/reflects/ReflectClassFactory.java similarity index 96% rename from src/main/java/info/itsthesky/disky/api/skript/reflects/ReflectClassFactory.java rename to src/main/java/net/itsthesky/disky/api/skript/reflects/ReflectClassFactory.java index 263ed55f..db3d1568 100644 --- a/src/main/java/info/itsthesky/disky/api/skript/reflects/ReflectClassFactory.java +++ b/src/main/java/net/itsthesky/disky/api/skript/reflects/ReflectClassFactory.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.api.skript.reflects; +package net.itsthesky.disky.api.skript.reflects; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; @@ -6,8 +6,8 @@ import ch.njol.skript.doc.Since; import ch.njol.skript.expressions.base.SimplePropertyExpression; import ch.njol.skript.lang.Expression; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.api.DiSkyRegistry; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.api.DiSkyRegistry; import net.bytebuddy.ByteBuddy; import net.bytebuddy.description.annotation.AnnotationDescription; import net.bytebuddy.implementation.MethodDelegation; diff --git a/src/main/java/info/itsthesky/disky/api/skript/reflects/ReflectEventExpressionFactory.java b/src/main/java/net/itsthesky/disky/api/skript/reflects/ReflectEventExpressionFactory.java similarity index 94% rename from src/main/java/info/itsthesky/disky/api/skript/reflects/ReflectEventExpressionFactory.java rename to src/main/java/net/itsthesky/disky/api/skript/reflects/ReflectEventExpressionFactory.java index da8d1ee6..8fd5221d 100644 --- a/src/main/java/info/itsthesky/disky/api/skript/reflects/ReflectEventExpressionFactory.java +++ b/src/main/java/net/itsthesky/disky/api/skript/reflects/ReflectEventExpressionFactory.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.api.skript.reflects; +package net.itsthesky.disky.api.skript.reflects; import ch.njol.skript.lang.ExpressionType; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.api.DiSkyRegistry; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.api.DiSkyRegistry; import net.bytebuddy.ByteBuddy; import net.bytebuddy.implementation.MethodDelegation; import org.bukkit.event.Event; diff --git a/src/main/java/info/itsthesky/disky/api/skript/reflects/ReflectGetterExpression.java b/src/main/java/net/itsthesky/disky/api/skript/reflects/ReflectGetterExpression.java similarity index 89% rename from src/main/java/info/itsthesky/disky/api/skript/reflects/ReflectGetterExpression.java rename to src/main/java/net/itsthesky/disky/api/skript/reflects/ReflectGetterExpression.java index 0804939b..3407e3c6 100644 --- a/src/main/java/info/itsthesky/disky/api/skript/reflects/ReflectGetterExpression.java +++ b/src/main/java/net/itsthesky/disky/api/skript/reflects/ReflectGetterExpression.java @@ -1,6 +1,6 @@ -package info.itsthesky.disky.api.skript.reflects; +package net.itsthesky.disky.api.skript.reflects; -import info.itsthesky.disky.api.skript.SimpleGetterExpression; +import net.itsthesky.disky.api.skript.SimpleGetterExpression; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/api/skript/reflects/ReflectProperty.java b/src/main/java/net/itsthesky/disky/api/skript/reflects/ReflectProperty.java similarity index 93% rename from src/main/java/info/itsthesky/disky/api/skript/reflects/ReflectProperty.java rename to src/main/java/net/itsthesky/disky/api/skript/reflects/ReflectProperty.java index 06981801..8a294e3f 100644 --- a/src/main/java/info/itsthesky/disky/api/skript/reflects/ReflectProperty.java +++ b/src/main/java/net/itsthesky/disky/api/skript/reflects/ReflectProperty.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.api.skript.reflects; +package net.itsthesky.disky.api.skript.reflects; import ch.njol.skript.expressions.base.SimplePropertyExpression; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/api/skript/reflects/state/DiSkyStateCondition.java b/src/main/java/net/itsthesky/disky/api/skript/reflects/state/DiSkyStateCondition.java similarity index 90% rename from src/main/java/info/itsthesky/disky/api/skript/reflects/state/DiSkyStateCondition.java rename to src/main/java/net/itsthesky/disky/api/skript/reflects/state/DiSkyStateCondition.java index 8999ba43..9a482fcd 100644 --- a/src/main/java/info/itsthesky/disky/api/skript/reflects/state/DiSkyStateCondition.java +++ b/src/main/java/net/itsthesky/disky/api/skript/reflects/state/DiSkyStateCondition.java @@ -1,11 +1,11 @@ -package info.itsthesky.disky.api.skript.reflects.state; +package net.itsthesky.disky.api.skript.reflects.state; import ch.njol.skript.conditions.base.PropertyCondition; import ch.njol.skript.config.Node; import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.SkriptParser; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.skript.INodeHolder; +import net.itsthesky.disky.api.skript.INodeHolder; import org.jetbrains.annotations.NotNull; public class DiSkyStateCondition extends PropertyCondition implements INodeHolder { diff --git a/src/main/java/info/itsthesky/disky/api/skript/reflects/state/DiSkyStateProperty.java b/src/main/java/net/itsthesky/disky/api/skript/reflects/state/DiSkyStateProperty.java similarity index 92% rename from src/main/java/info/itsthesky/disky/api/skript/reflects/state/DiSkyStateProperty.java rename to src/main/java/net/itsthesky/disky/api/skript/reflects/state/DiSkyStateProperty.java index b9100b73..66bb9f9b 100644 --- a/src/main/java/info/itsthesky/disky/api/skript/reflects/state/DiSkyStateProperty.java +++ b/src/main/java/net/itsthesky/disky/api/skript/reflects/state/DiSkyStateProperty.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.api.skript.reflects.state; +package net.itsthesky.disky.api.skript.reflects.state; import ch.njol.skript.classes.Changer; import ch.njol.skript.config.Node; @@ -6,8 +6,8 @@ import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.skript.INodeHolder; -import info.itsthesky.disky.elements.changers.IAsyncChangeableExpression; +import net.itsthesky.disky.api.skript.INodeHolder; +import net.itsthesky.disky.elements.changers.IAsyncChangeableExpression; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/info/itsthesky/disky/api/skript/reflects/state/SkriptStateRegistry.java b/src/main/java/net/itsthesky/disky/api/skript/reflects/state/SkriptStateRegistry.java similarity index 95% rename from src/main/java/info/itsthesky/disky/api/skript/reflects/state/SkriptStateRegistry.java rename to src/main/java/net/itsthesky/disky/api/skript/reflects/state/SkriptStateRegistry.java index d3bc2df6..225f3db2 100644 --- a/src/main/java/info/itsthesky/disky/api/skript/reflects/state/SkriptStateRegistry.java +++ b/src/main/java/net/itsthesky/disky/api/skript/reflects/state/SkriptStateRegistry.java @@ -1,12 +1,12 @@ -package info.itsthesky.disky.api.skript.reflects.state; +package net.itsthesky.disky.api.skript.reflects.state; import ch.njol.skript.classes.Changer; import ch.njol.skript.expressions.base.SimplePropertyExpression; import ch.njol.skript.lang.Condition; -import info.itsthesky.disky.api.DiSkyRegistry; -import info.itsthesky.disky.api.skript.INodeHolder; -import info.itsthesky.disky.elements.sections.handler.DiSkyRuntimeHandler; -import info.itsthesky.disky.managers.ConfigManager; +import net.itsthesky.disky.api.DiSkyRegistry; +import net.itsthesky.disky.api.skript.INodeHolder; +import net.itsthesky.disky.elements.sections.handler.DiSkyRuntimeHandler; +import net.itsthesky.disky.managers.ConfigManager; import net.bytebuddy.ByteBuddy; import net.bytebuddy.implementation.MethodDelegation; import net.bytebuddy.implementation.bind.annotation.AllArguments; diff --git a/src/main/java/info/itsthesky/disky/core/Bot.java b/src/main/java/net/itsthesky/disky/core/Bot.java similarity index 90% rename from src/main/java/info/itsthesky/disky/core/Bot.java rename to src/main/java/net/itsthesky/disky/core/Bot.java index ccdbeb8a..e29a5283 100644 --- a/src/main/java/info/itsthesky/disky/core/Bot.java +++ b/src/main/java/net/itsthesky/disky/core/Bot.java @@ -1,13 +1,13 @@ -package info.itsthesky.disky.core; +package net.itsthesky.disky.core; import ch.njol.skript.lang.Expression; import ch.njol.skript.util.Timespan; -import info.itsthesky.disky.BotApplication; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.elements.structures.context.ContextCommandManager; -import info.itsthesky.disky.elements.structures.slash.BotReadyWaiter; -import info.itsthesky.disky.elements.structures.slash.SlashManager; +import net.itsthesky.disky.BotApplication; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.elements.structures.context.ContextCommandManager; +import net.itsthesky.disky.elements.structures.slash.BotReadyWaiter; +import net.itsthesky.disky.elements.structures.slash.SlashManager; import net.dv8tion.jda.api.JDA; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Role; diff --git a/src/main/java/info/itsthesky/disky/core/BotOptions.java b/src/main/java/net/itsthesky/disky/core/BotOptions.java similarity index 90% rename from src/main/java/info/itsthesky/disky/core/BotOptions.java rename to src/main/java/net/itsthesky/disky/core/BotOptions.java index 1d494055..8dd7121d 100644 --- a/src/main/java/info/itsthesky/disky/core/BotOptions.java +++ b/src/main/java/net/itsthesky/disky/core/BotOptions.java @@ -1,10 +1,10 @@ -package info.itsthesky.disky.core; +package net.itsthesky.disky.core; import ch.njol.skript.lang.TriggerItem; -import info.itsthesky.disky.BotApplication; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.elements.events.bots.BotStopEvent; -import info.itsthesky.disky.elements.events.bots.GuildReadyEvent.BukkitGuildReadyEvent; +import net.itsthesky.disky.BotApplication; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.elements.events.bots.BotStopEvent; +import net.itsthesky.disky.elements.events.bots.GuildReadyEvent.BukkitGuildReadyEvent; import net.dv8tion.jda.api.JDA; import net.dv8tion.jda.api.JDABuilder; import net.dv8tion.jda.api.events.guild.GuildReadyEvent; @@ -62,7 +62,7 @@ public JDABuilder toBuilder() { public void runReady(ReadyEvent event) { if (getOnReady().isEmpty()) return; - final info.itsthesky.disky.elements.events.bots.ReadyEvent.BukkitReadyEvent e = new info.itsthesky.disky.elements.events.bots.ReadyEvent.BukkitReadyEvent(new info.itsthesky.disky.elements.events.bots.ReadyEvent()); + final net.itsthesky.disky.elements.events.bots.ReadyEvent.BukkitReadyEvent e = new net.itsthesky.disky.elements.events.bots.ReadyEvent.BukkitReadyEvent(new net.itsthesky.disky.elements.events.bots.ReadyEvent()); e.setJDAEvent(event); TriggerItem.walk(getOnReady().get(0), e); } @@ -70,7 +70,7 @@ public void runReady(ReadyEvent event) { public void runGuildReady(GuildReadyEvent event) { if (getOnGuildReady().isEmpty()) return; - final BukkitGuildReadyEvent e = new BukkitGuildReadyEvent(new info.itsthesky.disky.elements.events.bots.GuildReadyEvent()); + final BukkitGuildReadyEvent e = new BukkitGuildReadyEvent(new net.itsthesky.disky.elements.events.bots.GuildReadyEvent()); e.setJDAEvent(event); TriggerItem.walk(getOnGuildReady().get(0), e); } diff --git a/src/main/java/info/itsthesky/disky/core/Debug.java b/src/main/java/net/itsthesky/disky/core/Debug.java similarity index 91% rename from src/main/java/info/itsthesky/disky/core/Debug.java rename to src/main/java/net/itsthesky/disky/core/Debug.java index 6c7da02e..56f146e5 100644 --- a/src/main/java/info/itsthesky/disky/core/Debug.java +++ b/src/main/java/net/itsthesky/disky/core/Debug.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.core; +package net.itsthesky.disky.core; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.api.skript.NodeInformation; -import info.itsthesky.disky.api.skript.WaiterEffect; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.api.skript.NodeInformation; +import net.itsthesky.disky.api.skript.WaiterEffect; import java.lang.reflect.Field; import java.lang.reflect.Method; diff --git a/src/main/java/info/itsthesky/disky/core/DiSkyCommand.java b/src/main/java/net/itsthesky/disky/core/DiSkyCommand.java similarity index 96% rename from src/main/java/info/itsthesky/disky/core/DiSkyCommand.java rename to src/main/java/net/itsthesky/disky/core/DiSkyCommand.java index 04361205..89d01f1a 100644 --- a/src/main/java/info/itsthesky/disky/core/DiSkyCommand.java +++ b/src/main/java/net/itsthesky/disky/core/DiSkyCommand.java @@ -1,12 +1,13 @@ -package info.itsthesky.disky.core; +package net.itsthesky.disky.core; import ch.njol.skript.Skript; import ch.njol.skript.SkriptAddon; import ch.njol.skript.util.Date; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.api.modules.DiSkyModule; -import info.itsthesky.disky.managers.ConfigManager; -import info.itsthesky.disky.managers.CoreEventListener; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.api.events.EventListener; +import net.itsthesky.disky.api.modules.DiSkyModule; +import net.itsthesky.disky.managers.ConfigManager; +import net.itsthesky.disky.managers.CoreEventListener; import net.dv8tion.jda.api.JDA; import net.dv8tion.jda.api.JDAInfo; import net.dv8tion.jda.api.requests.GatewayIntent; @@ -16,13 +17,11 @@ import org.bukkit.command.CommandSender; import org.bukkit.plugin.Plugin; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import java.io.File; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.util.HashMap; -import java.util.Locale; import java.util.Map; public class DiSkyCommand implements CommandExecutor { @@ -105,7 +104,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command debugSections.put("listeners", () -> { sb.append("== | (DiSky) Listeners Information\n\n"); sb.append("Loaded Listeners: ").append(CoreEventListener.AllRegisteredListeners.size()).append("\n"); - for (info.itsthesky.disky.api.events.EventListener listener : CoreEventListener.AllRegisteredListeners) { + for (EventListener listener : CoreEventListener.AllRegisteredListeners) { sb.append(" - ").append(listener.getAttachedNode()).append(" / ").append(listener.isEnabled() ? "Enabled" : "Disabled").append("\n"); sb.append(" - Specific Bot Name: ").append(listener.getSpecificBotName()).append("\n"); sb.append(" - Waiting Log Event: ").append(listener.isWaitingLogEvent()) diff --git a/src/main/java/info/itsthesky/disky/core/DiSkyMetrics.java b/src/main/java/net/itsthesky/disky/core/DiSkyMetrics.java similarity index 94% rename from src/main/java/info/itsthesky/disky/core/DiSkyMetrics.java rename to src/main/java/net/itsthesky/disky/core/DiSkyMetrics.java index dfa97d11..099d7987 100644 --- a/src/main/java/info/itsthesky/disky/core/DiSkyMetrics.java +++ b/src/main/java/net/itsthesky/disky/core/DiSkyMetrics.java @@ -1,7 +1,7 @@ -package info.itsthesky.disky.core; +package net.itsthesky.disky.core; import ch.njol.skript.Skript; -import info.itsthesky.disky.DiSky; +import net.itsthesky.disky.DiSky; import org.bstats.bukkit.Metrics; import org.bstats.charts.SimplePie; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/core/JDAUtils.java b/src/main/java/net/itsthesky/disky/core/JDAUtils.java similarity index 97% rename from src/main/java/info/itsthesky/disky/core/JDAUtils.java rename to src/main/java/net/itsthesky/disky/core/JDAUtils.java index edb3f498..966aeedc 100644 --- a/src/main/java/info/itsthesky/disky/core/JDAUtils.java +++ b/src/main/java/net/itsthesky/disky/core/JDAUtils.java @@ -1,6 +1,6 @@ -package info.itsthesky.disky.core; +package net.itsthesky.disky.core; -import info.itsthesky.disky.elements.components.core.ComponentRow; +import net.itsthesky.disky.elements.components.core.ComponentRow; import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.entities.*; import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel; diff --git a/src/main/java/info/itsthesky/disky/core/MemberRemoveEventListener.java b/src/main/java/net/itsthesky/disky/core/MemberRemoveEventListener.java similarity index 92% rename from src/main/java/info/itsthesky/disky/core/MemberRemoveEventListener.java rename to src/main/java/net/itsthesky/disky/core/MemberRemoveEventListener.java index 4c936910..8199d1ee 100644 --- a/src/main/java/info/itsthesky/disky/core/MemberRemoveEventListener.java +++ b/src/main/java/net/itsthesky/disky/core/MemberRemoveEventListener.java @@ -1,7 +1,7 @@ -package info.itsthesky.disky.core; +package net.itsthesky.disky.core; -import info.itsthesky.disky.elements.events.member.MemberBanEvent; -import info.itsthesky.disky.elements.events.member.MemberKickEvent; +import net.itsthesky.disky.elements.events.member.MemberBanEvent; +import net.itsthesky.disky.elements.events.member.MemberKickEvent; import net.dv8tion.jda.api.audit.ActionType; import net.dv8tion.jda.api.events.guild.GuildAuditLogEntryCreateEvent; import net.dv8tion.jda.api.events.guild.member.GuildMemberRemoveEvent; diff --git a/src/main/java/info/itsthesky/disky/core/ReactionListener.java b/src/main/java/net/itsthesky/disky/core/ReactionListener.java similarity index 94% rename from src/main/java/info/itsthesky/disky/core/ReactionListener.java rename to src/main/java/net/itsthesky/disky/core/ReactionListener.java index ffc39320..e1011374 100644 --- a/src/main/java/info/itsthesky/disky/core/ReactionListener.java +++ b/src/main/java/net/itsthesky/disky/core/ReactionListener.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.core; +package net.itsthesky.disky.core; import ch.njol.skript.lang.Trigger; -import info.itsthesky.disky.api.emojis.Emote; -import info.itsthesky.disky.elements.events.react.ReactionAddEvent; +import net.itsthesky.disky.api.emojis.Emote; +import net.itsthesky.disky.elements.events.react.ReactionAddEvent; import net.dv8tion.jda.api.entities.User; import net.dv8tion.jda.api.events.message.react.MessageReactionAddEvent; import net.dv8tion.jda.api.hooks.ListenerAdapter; diff --git a/src/main/java/info/itsthesky/disky/core/SkriptUtils.java b/src/main/java/net/itsthesky/disky/core/SkriptUtils.java similarity index 96% rename from src/main/java/info/itsthesky/disky/core/SkriptUtils.java rename to src/main/java/net/itsthesky/disky/core/SkriptUtils.java index ff81dc50..ea534dde 100644 --- a/src/main/java/info/itsthesky/disky/core/SkriptUtils.java +++ b/src/main/java/net/itsthesky/disky/core/SkriptUtils.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.core; +package net.itsthesky.disky.core; import ch.njol.skript.ScriptLoader; import ch.njol.skript.Skript; @@ -16,14 +16,14 @@ import ch.njol.skript.util.ColorRGB; import ch.njol.skript.util.Date; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.api.ReflectionUtils; -import info.itsthesky.disky.api.events.EventValue; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.api.skript.EasyElement; -import info.itsthesky.disky.elements.effects.RetrieveEventValue; -import info.itsthesky.disky.elements.events.ExprEventValues; -import info.itsthesky.disky.elements.sections.handler.DiSkyRuntimeHandler; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.api.ReflectionUtils; +import net.itsthesky.disky.api.events.EventValue; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.elements.effects.RetrieveEventValue; +import net.itsthesky.disky.elements.events.ExprEventValues; +import net.itsthesky.disky.elements.sections.handler.DiSkyRuntimeHandler; import net.dv8tion.jda.api.JDA; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Icon; diff --git a/src/main/java/info/itsthesky/disky/core/Utils.java b/src/main/java/net/itsthesky/disky/core/Utils.java similarity index 98% rename from src/main/java/info/itsthesky/disky/core/Utils.java rename to src/main/java/net/itsthesky/disky/core/Utils.java index ac4ca882..dfed94c9 100644 --- a/src/main/java/info/itsthesky/disky/core/Utils.java +++ b/src/main/java/net/itsthesky/disky/core/Utils.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.core; +package net.itsthesky.disky.core; import ch.njol.util.NonNullPair; import com.google.common.collect.Lists; -import info.itsthesky.disky.DiSky; +import net.itsthesky.disky.DiSky; import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.entities.MessageEmbed; import net.dv8tion.jda.api.requests.RestAction; diff --git a/src/main/java/info/itsthesky/disky/elements/BaseBotEffect.java b/src/main/java/net/itsthesky/disky/elements/BaseBotEffect.java similarity index 90% rename from src/main/java/info/itsthesky/disky/elements/BaseBotEffect.java rename to src/main/java/net/itsthesky/disky/elements/BaseBotEffect.java index bbaec735..028a55ac 100644 --- a/src/main/java/info/itsthesky/disky/elements/BaseBotEffect.java +++ b/src/main/java/net/itsthesky/disky/elements/BaseBotEffect.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements; +package net.itsthesky.disky.elements; import ch.njol.skript.Skript; import ch.njol.skript.doc.Description; @@ -7,10 +7,10 @@ import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.api.skript.SpecificBotEffect; -import info.itsthesky.disky.api.skript.WaiterEffect; -import info.itsthesky.disky.core.Bot; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.api.skript.SpecificBotEffect; +import net.itsthesky.disky.api.skript.WaiterEffect; +import net.itsthesky.disky.core.Bot; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/info/itsthesky/disky/elements/Types.java b/src/main/java/net/itsthesky/disky/elements/Types.java similarity index 96% rename from src/main/java/info/itsthesky/disky/elements/Types.java rename to src/main/java/net/itsthesky/disky/elements/Types.java index 00b90ab3..4c91232d 100644 --- a/src/main/java/info/itsthesky/disky/elements/Types.java +++ b/src/main/java/net/itsthesky/disky/elements/Types.java @@ -1,16 +1,16 @@ -package info.itsthesky.disky.elements; +package net.itsthesky.disky.elements; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.api.DiSkyType; -import info.itsthesky.disky.api.emojis.Emote; -import info.itsthesky.disky.core.Bot; -import info.itsthesky.disky.elements.commands.CommandEvent; -import info.itsthesky.disky.elements.commands.CommandObject; -import info.itsthesky.disky.elements.components.core.ComponentRow; -import info.itsthesky.disky.elements.properties.polls.PollAnswerData; -import info.itsthesky.disky.elements.sections.automod.FilterType; -import info.itsthesky.disky.managers.ConfigManager; -import info.itsthesky.disky.managers.wrappers.AutoModRuleBuilder; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.api.DiSkyType; +import net.itsthesky.disky.api.emojis.Emote; +import net.itsthesky.disky.core.Bot; +import net.itsthesky.disky.elements.commands.CommandEvent; +import net.itsthesky.disky.elements.commands.CommandObject; +import net.itsthesky.disky.elements.components.core.ComponentRow; +import net.itsthesky.disky.elements.properties.polls.PollAnswerData; +import net.itsthesky.disky.elements.sections.automod.FilterType; +import net.itsthesky.disky.managers.ConfigManager; +import net.itsthesky.disky.managers.wrappers.AutoModRuleBuilder; import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.OnlineStatus; import net.dv8tion.jda.api.Permission; diff --git a/src/main/java/info/itsthesky/disky/elements/changers/Change.java b/src/main/java/net/itsthesky/disky/elements/changers/Change.java similarity index 97% rename from src/main/java/info/itsthesky/disky/elements/changers/Change.java rename to src/main/java/net/itsthesky/disky/elements/changers/Change.java index 1de26bec..e89315a0 100644 --- a/src/main/java/info/itsthesky/disky/elements/changers/Change.java +++ b/src/main/java/net/itsthesky/disky/elements/changers/Change.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.changers; +package net.itsthesky.disky.elements.changers; /** * This file is part of Skript. @@ -38,11 +38,11 @@ import ch.njol.skript.util.Patterns; import ch.njol.skript.util.Utils; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.api.changers.DiSkyChangerElement; -import info.itsthesky.disky.api.skript.EasyElement; -import info.itsthesky.disky.api.skript.NodeInformation; -import info.itsthesky.disky.core.Bot; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.api.changers.DiSkyChangerElement; +import net.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.api.skript.NodeInformation; +import net.itsthesky.disky.core.Bot; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/info/itsthesky/disky/elements/changers/IAsyncChangeableExpression.java b/src/main/java/net/itsthesky/disky/elements/changers/IAsyncChangeableExpression.java similarity index 80% rename from src/main/java/info/itsthesky/disky/elements/changers/IAsyncChangeableExpression.java rename to src/main/java/net/itsthesky/disky/elements/changers/IAsyncChangeableExpression.java index 2abde002..f1de5faa 100644 --- a/src/main/java/info/itsthesky/disky/elements/changers/IAsyncChangeableExpression.java +++ b/src/main/java/net/itsthesky/disky/elements/changers/IAsyncChangeableExpression.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.changers; +package net.itsthesky.disky.elements.changers; import ch.njol.skript.classes.Changer; import org.bukkit.event.Event; diff --git a/src/main/java/info/itsthesky/disky/elements/changers/IAsyncGettableExpression.java b/src/main/java/net/itsthesky/disky/elements/changers/IAsyncGettableExpression.java similarity index 97% rename from src/main/java/info/itsthesky/disky/elements/changers/IAsyncGettableExpression.java rename to src/main/java/net/itsthesky/disky/elements/changers/IAsyncGettableExpression.java index dbeacf73..e50303f2 100644 --- a/src/main/java/info/itsthesky/disky/elements/changers/IAsyncGettableExpression.java +++ b/src/main/java/net/itsthesky/disky/elements/changers/IAsyncGettableExpression.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.changers; +package net.itsthesky.disky.elements.changers; import ch.njol.skript.lang.Expression; import ch.njol.skript.util.Utils; diff --git a/src/main/java/info/itsthesky/disky/elements/commands/Argument.java b/src/main/java/net/itsthesky/disky/elements/commands/Argument.java similarity index 99% rename from src/main/java/info/itsthesky/disky/elements/commands/Argument.java rename to src/main/java/net/itsthesky/disky/elements/commands/Argument.java index 4a7fca80..4cfbb3ec 100644 --- a/src/main/java/info/itsthesky/disky/elements/commands/Argument.java +++ b/src/main/java/net/itsthesky/disky/elements/commands/Argument.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.commands; +package net.itsthesky.disky.elements.commands; import ch.njol.skript.Skript; import ch.njol.skript.classes.ClassInfo; diff --git a/src/main/java/info/itsthesky/disky/elements/commands/CommandData.java b/src/main/java/net/itsthesky/disky/elements/commands/CommandData.java similarity index 87% rename from src/main/java/info/itsthesky/disky/elements/commands/CommandData.java rename to src/main/java/net/itsthesky/disky/elements/commands/CommandData.java index 779a85e3..809047f9 100644 --- a/src/main/java/info/itsthesky/disky/elements/commands/CommandData.java +++ b/src/main/java/net/itsthesky/disky/elements/commands/CommandData.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.commands; +package net.itsthesky.disky.elements.commands; public class CommandData { private String name; diff --git a/src/main/java/info/itsthesky/disky/elements/commands/CommandEvent.java b/src/main/java/net/itsthesky/disky/elements/commands/CommandEvent.java similarity index 96% rename from src/main/java/info/itsthesky/disky/elements/commands/CommandEvent.java rename to src/main/java/net/itsthesky/disky/elements/commands/CommandEvent.java index dcdf4e5b..2435a00c 100644 --- a/src/main/java/info/itsthesky/disky/elements/commands/CommandEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/commands/CommandEvent.java @@ -1,6 +1,6 @@ -package info.itsthesky.disky.elements.commands; +package net.itsthesky.disky.elements.commands; -import info.itsthesky.disky.api.events.specific.MessageEvent; +import net.itsthesky.disky.api.events.specific.MessageEvent; import net.dv8tion.jda.api.JDA; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; diff --git a/src/main/java/info/itsthesky/disky/elements/commands/CommandFactory.java b/src/main/java/net/itsthesky/disky/elements/commands/CommandFactory.java similarity index 96% rename from src/main/java/info/itsthesky/disky/elements/commands/CommandFactory.java rename to src/main/java/net/itsthesky/disky/elements/commands/CommandFactory.java index 703cdecb..961df80e 100644 --- a/src/main/java/info/itsthesky/disky/elements/commands/CommandFactory.java +++ b/src/main/java/net/itsthesky/disky/elements/commands/CommandFactory.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.commands; +package net.itsthesky.disky.elements.commands; import ch.njol.skript.ScriptLoader; import ch.njol.skript.Skript; @@ -17,7 +17,7 @@ import ch.njol.skript.util.Utils; import ch.njol.util.NonNullPair; import ch.njol.util.StringUtils; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.channel.ChannelType; import org.bukkit.event.Event; @@ -135,13 +135,13 @@ else if (newValue != null) public ArrayList parsePlaces(String[] places) { ArrayList types = new ArrayList<>(); for (String place : places) { - if (info.itsthesky.disky.core.Utils.equalsAnyIgnoreCase(place, "server", "guild")) { + if (net.itsthesky.disky.core.Utils.equalsAnyIgnoreCase(place, "server", "guild")) { types.addAll(Arrays.asList(ChannelType.TEXT, ChannelType.NEWS)); - } else if (info.itsthesky.disky.core.Utils.equalsAnyIgnoreCase(place, "dm", "pm", "direct message", "private message")) { + } else if (net.itsthesky.disky.core.Utils.equalsAnyIgnoreCase(place, "dm", "pm", "direct message", "private message")) { types.add(ChannelType.PRIVATE); - } else if (info.itsthesky.disky.core.Utils.equalsAnyIgnoreCase(place, "thread", "threads")) { + } else if (net.itsthesky.disky.core.Utils.equalsAnyIgnoreCase(place, "thread", "threads")) { types.addAll(Arrays.asList(ChannelType.GUILD_PUBLIC_THREAD, ChannelType.GUILD_PRIVATE_THREAD)); - } else if (info.itsthesky.disky.core.Utils.equalsAnyIgnoreCase(place, "voice")) { + } else if (net.itsthesky.disky.core.Utils.equalsAnyIgnoreCase(place, "voice")) { types.add(ChannelType.VOICE); } else { Skript.error("'executable in' should be any of ['guild', 'dm', 'voice', 'threads'], but found '" + place + "'"); diff --git a/src/main/java/info/itsthesky/disky/elements/commands/CommandListener.java b/src/main/java/net/itsthesky/disky/elements/commands/CommandListener.java similarity index 98% rename from src/main/java/info/itsthesky/disky/elements/commands/CommandListener.java rename to src/main/java/net/itsthesky/disky/elements/commands/CommandListener.java index 8b3e922c..65e3c966 100644 --- a/src/main/java/info/itsthesky/disky/elements/commands/CommandListener.java +++ b/src/main/java/net/itsthesky/disky/elements/commands/CommandListener.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.commands; +package net.itsthesky.disky.elements.commands; import ch.njol.skript.lang.Expression; import ch.njol.skript.localization.Language; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.User; diff --git a/src/main/java/info/itsthesky/disky/elements/commands/CommandObject.java b/src/main/java/net/itsthesky/disky/elements/commands/CommandObject.java similarity index 96% rename from src/main/java/info/itsthesky/disky/elements/commands/CommandObject.java rename to src/main/java/net/itsthesky/disky/elements/commands/CommandObject.java index b019044b..0c841f1d 100644 --- a/src/main/java/info/itsthesky/disky/elements/commands/CommandObject.java +++ b/src/main/java/net/itsthesky/disky/elements/commands/CommandObject.java @@ -1,13 +1,13 @@ -package info.itsthesky.disky.elements.commands; +package net.itsthesky.disky.elements.commands; import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.TriggerItem; import ch.njol.skript.log.ParseLogHandler; import ch.njol.skript.log.SkriptLogger; import ch.njol.skript.util.Timespan; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.core.SkriptUtils; -import info.itsthesky.disky.core.Utils; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.core.Utils; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.channel.ChannelType; diff --git a/src/main/java/info/itsthesky/disky/elements/commands/CommandRegistry.java b/src/main/java/net/itsthesky/disky/elements/commands/CommandRegistry.java similarity index 96% rename from src/main/java/info/itsthesky/disky/elements/commands/CommandRegistry.java rename to src/main/java/net/itsthesky/disky/elements/commands/CommandRegistry.java index 55714396..066a1e18 100644 --- a/src/main/java/info/itsthesky/disky/elements/commands/CommandRegistry.java +++ b/src/main/java/net/itsthesky/disky/elements/commands/CommandRegistry.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.commands; +package net.itsthesky.disky.elements.commands; import ch.njol.skript.ScriptLoader; import ch.njol.skript.Skript; @@ -10,9 +10,9 @@ import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.skript.lang.Trigger; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.core.Bot; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.core.Bot; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; diff --git a/src/main/java/info/itsthesky/disky/elements/commands/DiSkyCommand.java b/src/main/java/net/itsthesky/disky/elements/commands/DiSkyCommand.java similarity index 91% rename from src/main/java/info/itsthesky/disky/elements/commands/DiSkyCommand.java rename to src/main/java/net/itsthesky/disky/elements/commands/DiSkyCommand.java index d924b31d..c3ba3b32 100644 --- a/src/main/java/info/itsthesky/disky/elements/commands/DiSkyCommand.java +++ b/src/main/java/net/itsthesky/disky/elements/commands/DiSkyCommand.java @@ -1,13 +1,13 @@ -package info.itsthesky.disky.elements.commands; +package net.itsthesky.disky.elements.commands; import ch.njol.skript.lang.Literal; import ch.njol.skript.lang.SkriptEvent; import ch.njol.skript.lang.SkriptParser.ParseResult; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.api.events.BukkitEvent; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.core.Bot; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.api.events.BukkitEvent; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.core.Bot; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; diff --git a/src/main/java/info/itsthesky/disky/elements/commands/ExprArgument.java b/src/main/java/net/itsthesky/disky/elements/commands/ExprArgument.java similarity index 99% rename from src/main/java/info/itsthesky/disky/elements/commands/ExprArgument.java rename to src/main/java/net/itsthesky/disky/elements/commands/ExprArgument.java index dc228739..a59d1dc4 100644 --- a/src/main/java/info/itsthesky/disky/elements/commands/ExprArgument.java +++ b/src/main/java/net/itsthesky/disky/elements/commands/ExprArgument.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.commands; +package net.itsthesky.disky.elements.commands; import ch.njol.skript.Skript; import ch.njol.skript.classes.ClassInfo; diff --git a/src/main/java/info/itsthesky/disky/elements/commands/values/UsedAlias.java b/src/main/java/net/itsthesky/disky/elements/commands/values/UsedAlias.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/commands/values/UsedAlias.java rename to src/main/java/net/itsthesky/disky/elements/commands/values/UsedAlias.java index c71b5834..7491f61c 100644 --- a/src/main/java/info/itsthesky/disky/elements/commands/values/UsedAlias.java +++ b/src/main/java/net/itsthesky/disky/elements/commands/values/UsedAlias.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.commands.values; +package net.itsthesky.disky.elements.commands.values; import ch.njol.skript.Skript; import ch.njol.skript.doc.Description; @@ -9,7 +9,7 @@ import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.skript.lang.util.SimpleExpression; import ch.njol.util.Kleenean; -import info.itsthesky.disky.elements.commands.CommandEvent; +import net.itsthesky.disky.elements.commands.CommandEvent; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/info/itsthesky/disky/elements/commands/values/UsedArgument.java b/src/main/java/net/itsthesky/disky/elements/commands/values/UsedArgument.java similarity index 94% rename from src/main/java/info/itsthesky/disky/elements/commands/values/UsedArgument.java rename to src/main/java/net/itsthesky/disky/elements/commands/values/UsedArgument.java index 050332d2..fd001d8a 100644 --- a/src/main/java/info/itsthesky/disky/elements/commands/values/UsedArgument.java +++ b/src/main/java/net/itsthesky/disky/elements/commands/values/UsedArgument.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.commands.values; +package net.itsthesky.disky.elements.commands.values; import ch.njol.skript.Skript; import ch.njol.skript.doc.Description; @@ -8,7 +8,7 @@ import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.skript.lang.util.SimpleExpression; import ch.njol.util.Kleenean; -import info.itsthesky.disky.elements.commands.CommandEvent; +import net.itsthesky.disky.elements.commands.CommandEvent; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/info/itsthesky/disky/elements/commands/values/UsedPrefix.java b/src/main/java/net/itsthesky/disky/elements/commands/values/UsedPrefix.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/commands/values/UsedPrefix.java rename to src/main/java/net/itsthesky/disky/elements/commands/values/UsedPrefix.java index 4c016f4c..ba9bbd1a 100644 --- a/src/main/java/info/itsthesky/disky/elements/commands/values/UsedPrefix.java +++ b/src/main/java/net/itsthesky/disky/elements/commands/values/UsedPrefix.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.commands.values; +package net.itsthesky.disky.elements.commands.values; import ch.njol.skript.Skript; import ch.njol.skript.doc.Description; @@ -9,7 +9,7 @@ import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.skript.lang.util.SimpleExpression; import ch.njol.util.Kleenean; -import info.itsthesky.disky.elements.commands.CommandEvent; +import net.itsthesky.disky.elements.commands.CommandEvent; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/info/itsthesky/disky/elements/components/OpenModal.java b/src/main/java/net/itsthesky/disky/elements/components/OpenModal.java similarity index 83% rename from src/main/java/info/itsthesky/disky/elements/components/OpenModal.java rename to src/main/java/net/itsthesky/disky/elements/components/OpenModal.java index a8f957e8..fbe926e2 100644 --- a/src/main/java/info/itsthesky/disky/elements/components/OpenModal.java +++ b/src/main/java/net/itsthesky/disky/elements/components/OpenModal.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.components; +package net.itsthesky.disky.elements.components; import ch.njol.skript.Skript; import ch.njol.skript.config.Node; @@ -6,15 +6,15 @@ import ch.njol.skript.lang.SkriptParser; import ch.njol.skript.util.AsyncEffect; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.events.specific.ModalEvent; -import info.itsthesky.disky.elements.sections.handler.DiSkyRuntimeHandler; +import net.itsthesky.disky.api.events.specific.ModalEvent; +import net.itsthesky.disky.elements.sections.handler.DiSkyRuntimeHandler; import net.dv8tion.jda.api.interactions.modals.Modal; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import static info.itsthesky.disky.api.skript.EasyElement.containsInterfaces; -import static info.itsthesky.disky.api.skript.EasyElement.parseSingle; +import static net.itsthesky.disky.api.skript.EasyElement.containsInterfaces; +import static net.itsthesky.disky.api.skript.EasyElement.parseSingle; public class OpenModal extends AsyncEffect { diff --git a/src/main/java/info/itsthesky/disky/elements/components/Test.java b/src/main/java/net/itsthesky/disky/elements/components/Test.java similarity index 66% rename from src/main/java/info/itsthesky/disky/elements/components/Test.java rename to src/main/java/net/itsthesky/disky/elements/components/Test.java index b3800e42..173763a9 100644 --- a/src/main/java/info/itsthesky/disky/elements/components/Test.java +++ b/src/main/java/net/itsthesky/disky/elements/components/Test.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.components; +package net.itsthesky.disky.elements.components; import net.dv8tion.jda.api.hooks.ListenerAdapter; diff --git a/src/main/java/info/itsthesky/disky/elements/components/commands/EditComponent.java b/src/main/java/net/itsthesky/disky/elements/components/commands/EditComponent.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/components/commands/EditComponent.java rename to src/main/java/net/itsthesky/disky/elements/components/commands/EditComponent.java index f454f977..9dd5bf9e 100644 --- a/src/main/java/info/itsthesky/disky/elements/components/commands/EditComponent.java +++ b/src/main/java/net/itsthesky/disky/elements/components/commands/EditComponent.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.components.commands; +package net.itsthesky.disky.elements.components.commands; import ch.njol.skript.Skript; import ch.njol.skript.config.Node; @@ -6,10 +6,10 @@ import ch.njol.skript.lang.SkriptParser; import ch.njol.skript.util.AsyncEffect; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.api.events.specific.ComponentInteractionEvent; -import info.itsthesky.disky.api.skript.EasyElement; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.api.events.specific.ComponentInteractionEvent; +import net.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.interactions.components.Component; import net.dv8tion.jda.api.interactions.components.buttons.Button; import net.dv8tion.jda.api.interactions.components.buttons.ButtonInteraction; diff --git a/src/main/java/info/itsthesky/disky/elements/components/commands/EditMessageComponent.java b/src/main/java/net/itsthesky/disky/elements/components/commands/EditMessageComponent.java similarity index 96% rename from src/main/java/info/itsthesky/disky/elements/components/commands/EditMessageComponent.java rename to src/main/java/net/itsthesky/disky/elements/components/commands/EditMessageComponent.java index c4e8b7c9..62ce24fd 100644 --- a/src/main/java/info/itsthesky/disky/elements/components/commands/EditMessageComponent.java +++ b/src/main/java/net/itsthesky/disky/elements/components/commands/EditMessageComponent.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.components.commands; +package net.itsthesky.disky.elements.components.commands; import ch.njol.skript.Skript; import ch.njol.skript.config.Node; @@ -6,8 +6,8 @@ import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.skript.util.AsyncEffect; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.interactions.components.ActionComponent; import net.dv8tion.jda.api.interactions.components.ActionRow; diff --git a/src/main/java/info/itsthesky/disky/elements/components/commands/EffEnableDisableCommand.java b/src/main/java/net/itsthesky/disky/elements/components/commands/EffEnableDisableCommand.java similarity index 94% rename from src/main/java/info/itsthesky/disky/elements/components/commands/EffEnableDisableCommand.java rename to src/main/java/net/itsthesky/disky/elements/components/commands/EffEnableDisableCommand.java index f115e9ac..48fbb6b4 100644 --- a/src/main/java/info/itsthesky/disky/elements/components/commands/EffEnableDisableCommand.java +++ b/src/main/java/net/itsthesky/disky/elements/components/commands/EffEnableDisableCommand.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.components.commands; +package net.itsthesky.disky.elements.components.commands; import ch.njol.skript.Skript; import ch.njol.skript.doc.Description; @@ -7,8 +7,8 @@ import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.skript.SpecificBotEffect; -import info.itsthesky.disky.core.Bot; +import net.itsthesky.disky.api.skript.SpecificBotEffect; +import net.itsthesky.disky.core.Bot; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.interactions.commands.DefaultMemberPermissions; import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData; diff --git a/src/main/java/info/itsthesky/disky/elements/components/commands/EffUpdateCommand.java b/src/main/java/net/itsthesky/disky/elements/components/commands/EffUpdateCommand.java similarity index 91% rename from src/main/java/info/itsthesky/disky/elements/components/commands/EffUpdateCommand.java rename to src/main/java/net/itsthesky/disky/elements/components/commands/EffUpdateCommand.java index 18d113ee..cd0533d5 100644 --- a/src/main/java/info/itsthesky/disky/elements/components/commands/EffUpdateCommand.java +++ b/src/main/java/net/itsthesky/disky/elements/components/commands/EffUpdateCommand.java @@ -1,13 +1,13 @@ -package info.itsthesky.disky.elements.components.commands; +package net.itsthesky.disky.elements.components.commands; import ch.njol.skript.Skript; import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.api.skript.WaiterEffect; -import info.itsthesky.disky.core.Bot; -import info.itsthesky.disky.core.Debug; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.api.skript.WaiterEffect; +import net.itsthesky.disky.core.Bot; +import net.itsthesky.disky.core.Debug; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData; import net.dv8tion.jda.api.requests.restaction.CommandListUpdateAction; diff --git a/src/main/java/info/itsthesky/disky/elements/components/commands/ExprArgumentChoices.java b/src/main/java/net/itsthesky/disky/elements/components/commands/ExprArgumentChoices.java similarity index 86% rename from src/main/java/info/itsthesky/disky/elements/components/commands/ExprArgumentChoices.java rename to src/main/java/net/itsthesky/disky/elements/components/commands/ExprArgumentChoices.java index 2576d398..91c7766b 100644 --- a/src/main/java/info/itsthesky/disky/elements/components/commands/ExprArgumentChoices.java +++ b/src/main/java/net/itsthesky/disky/elements/components/commands/ExprArgumentChoices.java @@ -1,9 +1,9 @@ -package info.itsthesky.disky.elements.components.commands; +package net.itsthesky.disky.elements.components.commands; import ch.njol.skript.classes.Changer; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.api.skript.EasyElement; -import info.itsthesky.disky.api.skript.MultiplyPropertyExpression; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.api.skript.MultiplyPropertyExpression; import net.dv8tion.jda.api.interactions.commands.Command; import net.dv8tion.jda.api.interactions.commands.build.OptionData; import org.bukkit.event.Event; diff --git a/src/main/java/info/itsthesky/disky/elements/components/commands/ExprCommandGroup.java b/src/main/java/net/itsthesky/disky/elements/components/commands/ExprCommandGroup.java similarity index 91% rename from src/main/java/info/itsthesky/disky/elements/components/commands/ExprCommandGroup.java rename to src/main/java/net/itsthesky/disky/elements/components/commands/ExprCommandGroup.java index c5e3fda6..ff795851 100644 --- a/src/main/java/info/itsthesky/disky/elements/components/commands/ExprCommandGroup.java +++ b/src/main/java/net/itsthesky/disky/elements/components/commands/ExprCommandGroup.java @@ -1,11 +1,11 @@ -package info.itsthesky.disky.elements.components.commands; +package net.itsthesky.disky.elements.components.commands; import ch.njol.skript.classes.Changer; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Name; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.api.skript.EasyElement; -import info.itsthesky.disky.api.skript.MultiplyPropertyExpression; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.api.skript.MultiplyPropertyExpression; import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData; import net.dv8tion.jda.api.interactions.commands.build.SubcommandGroupData; import org.bukkit.event.Event; diff --git a/src/main/java/info/itsthesky/disky/elements/components/commands/ExprGroupCommands.java b/src/main/java/net/itsthesky/disky/elements/components/commands/ExprGroupCommands.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/components/commands/ExprGroupCommands.java rename to src/main/java/net/itsthesky/disky/elements/components/commands/ExprGroupCommands.java index bbf9beea..de93bb38 100644 --- a/src/main/java/info/itsthesky/disky/elements/components/commands/ExprGroupCommands.java +++ b/src/main/java/net/itsthesky/disky/elements/components/commands/ExprGroupCommands.java @@ -1,11 +1,11 @@ -package info.itsthesky.disky.elements.components.commands; +package net.itsthesky.disky.elements.components.commands; import ch.njol.skript.classes.Changer; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Name; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.api.skript.EasyElement; -import info.itsthesky.disky.api.skript.MultiplyPropertyExpression; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.api.skript.MultiplyPropertyExpression; import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData; import net.dv8tion.jda.api.interactions.commands.build.SubcommandData; import net.dv8tion.jda.api.interactions.commands.build.SubcommandGroupData; diff --git a/src/main/java/info/itsthesky/disky/elements/components/commands/ExprNewMessageCommand.java b/src/main/java/net/itsthesky/disky/elements/components/commands/ExprNewMessageCommand.java similarity index 94% rename from src/main/java/info/itsthesky/disky/elements/components/commands/ExprNewMessageCommand.java rename to src/main/java/net/itsthesky/disky/elements/components/commands/ExprNewMessageCommand.java index 7c95cdec..45009a2d 100644 --- a/src/main/java/info/itsthesky/disky/elements/components/commands/ExprNewMessageCommand.java +++ b/src/main/java/net/itsthesky/disky/elements/components/commands/ExprNewMessageCommand.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.components.commands; +package net.itsthesky.disky.elements.components.commands; import ch.njol.skript.Skript; import ch.njol.skript.doc.Description; @@ -9,7 +9,7 @@ import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.skript.lang.util.SimpleExpression; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.api.skript.EasyElement; import net.dv8tion.jda.api.interactions.commands.build.CommandData; import net.dv8tion.jda.api.interactions.commands.build.Commands; import org.bukkit.event.Event; diff --git a/src/main/java/info/itsthesky/disky/elements/components/commands/ExprNewOptionChoice.java b/src/main/java/net/itsthesky/disky/elements/components/commands/ExprNewOptionChoice.java similarity index 95% rename from src/main/java/info/itsthesky/disky/elements/components/commands/ExprNewOptionChoice.java rename to src/main/java/net/itsthesky/disky/elements/components/commands/ExprNewOptionChoice.java index 47ec6a0f..06bc9b02 100644 --- a/src/main/java/info/itsthesky/disky/elements/components/commands/ExprNewOptionChoice.java +++ b/src/main/java/net/itsthesky/disky/elements/components/commands/ExprNewOptionChoice.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.components.commands; +package net.itsthesky.disky.elements.components.commands; import ch.njol.skript.Skript; import ch.njol.skript.doc.Description; @@ -9,7 +9,7 @@ import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.skript.lang.util.SimpleExpression; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.api.skript.EasyElement; import net.dv8tion.jda.api.interactions.commands.Command; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/components/commands/ExprNewSlashCommand.java b/src/main/java/net/itsthesky/disky/elements/components/commands/ExprNewSlashCommand.java similarity index 96% rename from src/main/java/info/itsthesky/disky/elements/components/commands/ExprNewSlashCommand.java rename to src/main/java/net/itsthesky/disky/elements/components/commands/ExprNewSlashCommand.java index c0892d73..6d71ce28 100644 --- a/src/main/java/info/itsthesky/disky/elements/components/commands/ExprNewSlashCommand.java +++ b/src/main/java/net/itsthesky/disky/elements/components/commands/ExprNewSlashCommand.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.components.commands; +package net.itsthesky.disky.elements.components.commands; import ch.njol.skript.Skript; import ch.njol.skript.lang.Expression; @@ -6,7 +6,7 @@ import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.skript.lang.util.SimpleExpression; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.api.skript.EasyElement; import net.dv8tion.jda.api.interactions.commands.build.Commands; import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData; import net.dv8tion.jda.api.interactions.commands.build.SubcommandData; diff --git a/src/main/java/info/itsthesky/disky/elements/components/commands/ExprNewSlashOption.java b/src/main/java/net/itsthesky/disky/elements/components/commands/ExprNewSlashOption.java similarity index 95% rename from src/main/java/info/itsthesky/disky/elements/components/commands/ExprNewSlashOption.java rename to src/main/java/net/itsthesky/disky/elements/components/commands/ExprNewSlashOption.java index ead6d704..b820a16c 100644 --- a/src/main/java/info/itsthesky/disky/elements/components/commands/ExprNewSlashOption.java +++ b/src/main/java/net/itsthesky/disky/elements/components/commands/ExprNewSlashOption.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.components.commands; +package net.itsthesky.disky.elements.components.commands; import ch.njol.skript.Skript; import ch.njol.skript.lang.Expression; @@ -6,7 +6,7 @@ import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.skript.lang.util.SimpleExpression; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.api.skript.EasyElement; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.OptionData; import org.bukkit.event.Event; diff --git a/src/main/java/info/itsthesky/disky/elements/components/commands/ExprNewUserCommand.java b/src/main/java/net/itsthesky/disky/elements/components/commands/ExprNewUserCommand.java similarity index 94% rename from src/main/java/info/itsthesky/disky/elements/components/commands/ExprNewUserCommand.java rename to src/main/java/net/itsthesky/disky/elements/components/commands/ExprNewUserCommand.java index 0db45c83..a98ecd97 100644 --- a/src/main/java/info/itsthesky/disky/elements/components/commands/ExprNewUserCommand.java +++ b/src/main/java/net/itsthesky/disky/elements/components/commands/ExprNewUserCommand.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.components.commands; +package net.itsthesky.disky.elements.components.commands; import ch.njol.skript.Skript; import ch.njol.skript.doc.Description; @@ -9,7 +9,7 @@ import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.skript.lang.util.SimpleExpression; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.api.skript.EasyElement; import net.dv8tion.jda.api.interactions.commands.build.CommandData; import net.dv8tion.jda.api.interactions.commands.build.Commands; import org.bukkit.event.Event; diff --git a/src/main/java/info/itsthesky/disky/elements/components/commands/UnregisterCommand.java b/src/main/java/net/itsthesky/disky/elements/components/commands/UnregisterCommand.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/components/commands/UnregisterCommand.java rename to src/main/java/net/itsthesky/disky/elements/components/commands/UnregisterCommand.java index 2cfddde2..5bcc6212 100644 --- a/src/main/java/info/itsthesky/disky/elements/components/commands/UnregisterCommand.java +++ b/src/main/java/net/itsthesky/disky/elements/components/commands/UnregisterCommand.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.components.commands; +package net.itsthesky.disky.elements.components.commands; import ch.njol.skript.Skript; import ch.njol.skript.doc.Description; @@ -7,10 +7,10 @@ import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.api.skript.SpecificBotEffect; -import info.itsthesky.disky.core.Bot; -import info.itsthesky.disky.core.Debug; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.api.skript.SpecificBotEffect; +import net.itsthesky.disky.core.Bot; +import net.itsthesky.disky.core.Debug; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.interactions.commands.Command; import net.dv8tion.jda.api.requests.RestAction; diff --git a/src/main/java/info/itsthesky/disky/elements/components/core/ComponentRow.java b/src/main/java/net/itsthesky/disky/elements/components/core/ComponentRow.java similarity index 97% rename from src/main/java/info/itsthesky/disky/elements/components/core/ComponentRow.java rename to src/main/java/net/itsthesky/disky/elements/components/core/ComponentRow.java index ecc5939f..d8752857 100644 --- a/src/main/java/info/itsthesky/disky/elements/components/core/ComponentRow.java +++ b/src/main/java/net/itsthesky/disky/elements/components/core/ComponentRow.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.components.core; +package net.itsthesky.disky.elements.components.core; import net.dv8tion.jda.api.interactions.components.ActionRow; import net.dv8tion.jda.api.interactions.components.Component; diff --git a/src/main/java/info/itsthesky/disky/elements/components/create/ExprNewButton.java b/src/main/java/net/itsthesky/disky/elements/components/create/ExprNewButton.java similarity index 96% rename from src/main/java/info/itsthesky/disky/elements/components/create/ExprNewButton.java rename to src/main/java/net/itsthesky/disky/elements/components/create/ExprNewButton.java index bb44582b..670ba487 100644 --- a/src/main/java/info/itsthesky/disky/elements/components/create/ExprNewButton.java +++ b/src/main/java/net/itsthesky/disky/elements/components/create/ExprNewButton.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.components.create; +package net.itsthesky.disky.elements.components.create; import ch.njol.skript.Skript; import ch.njol.skript.config.Node; @@ -10,8 +10,8 @@ import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.skript.lang.util.SimpleExpression; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.emojis.Emote; -import info.itsthesky.disky.elements.sections.handler.DiSkyRuntimeHandler; +import net.itsthesky.disky.api.emojis.Emote; +import net.itsthesky.disky.elements.sections.handler.DiSkyRuntimeHandler; import net.dv8tion.jda.api.entities.SkuSnowflake; import net.dv8tion.jda.api.interactions.components.buttons.Button; import net.dv8tion.jda.api.interactions.components.buttons.ButtonStyle; diff --git a/src/main/java/info/itsthesky/disky/elements/components/create/ExprNewButtonsRow.java b/src/main/java/net/itsthesky/disky/elements/components/create/ExprNewButtonsRow.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/components/create/ExprNewButtonsRow.java rename to src/main/java/net/itsthesky/disky/elements/components/create/ExprNewButtonsRow.java index aa54957e..b7b150aa 100644 --- a/src/main/java/info/itsthesky/disky/elements/components/create/ExprNewButtonsRow.java +++ b/src/main/java/net/itsthesky/disky/elements/components/create/ExprNewButtonsRow.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.components.create; +package net.itsthesky.disky.elements.components.create; import ch.njol.skript.Skript; import ch.njol.skript.doc.Description; @@ -8,7 +8,7 @@ import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.skript.lang.util.SimpleExpression; import ch.njol.util.Kleenean; -import info.itsthesky.disky.elements.components.core.ComponentRow; +import net.itsthesky.disky.elements.components.core.ComponentRow; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/components/create/ExprNewDropdown.java b/src/main/java/net/itsthesky/disky/elements/components/create/ExprNewDropdown.java similarity index 97% rename from src/main/java/info/itsthesky/disky/elements/components/create/ExprNewDropdown.java rename to src/main/java/net/itsthesky/disky/elements/components/create/ExprNewDropdown.java index a5a5c9cb..e80829ef 100644 --- a/src/main/java/info/itsthesky/disky/elements/components/create/ExprNewDropdown.java +++ b/src/main/java/net/itsthesky/disky/elements/components/create/ExprNewDropdown.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.components.create; +package net.itsthesky.disky.elements.components.create; import ch.njol.skript.Skript; import ch.njol.skript.doc.Description; @@ -10,7 +10,7 @@ import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.skript.lang.util.SimpleExpression; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.api.skript.EasyElement; import net.dv8tion.jda.api.interactions.components.selections.EntitySelectMenu; import net.dv8tion.jda.api.interactions.components.selections.SelectMenu; import net.dv8tion.jda.api.interactions.components.selections.StringSelectMenu; diff --git a/src/main/java/info/itsthesky/disky/elements/components/create/ExprNewDropdownOption.java b/src/main/java/net/itsthesky/disky/elements/components/create/ExprNewDropdownOption.java similarity index 95% rename from src/main/java/info/itsthesky/disky/elements/components/create/ExprNewDropdownOption.java rename to src/main/java/net/itsthesky/disky/elements/components/create/ExprNewDropdownOption.java index 83961eaa..85a49f03 100644 --- a/src/main/java/info/itsthesky/disky/elements/components/create/ExprNewDropdownOption.java +++ b/src/main/java/net/itsthesky/disky/elements/components/create/ExprNewDropdownOption.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.components.create; +package net.itsthesky.disky.elements.components.create; import ch.njol.skript.Skript; import ch.njol.skript.doc.Description; @@ -9,8 +9,8 @@ import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.skript.lang.util.SimpleExpression; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.emojis.Emote; -import info.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.api.emojis.Emote; +import net.itsthesky.disky.api.skript.EasyElement; import net.dv8tion.jda.api.interactions.components.selections.SelectOption; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/components/create/ExprNewInput.java b/src/main/java/net/itsthesky/disky/elements/components/create/ExprNewInput.java similarity index 96% rename from src/main/java/info/itsthesky/disky/elements/components/create/ExprNewInput.java rename to src/main/java/net/itsthesky/disky/elements/components/create/ExprNewInput.java index f1dfd178..b79ad379 100644 --- a/src/main/java/info/itsthesky/disky/elements/components/create/ExprNewInput.java +++ b/src/main/java/net/itsthesky/disky/elements/components/create/ExprNewInput.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.components.create; +package net.itsthesky.disky.elements.components.create; import ch.njol.skript.Skript; import ch.njol.skript.lang.Expression; @@ -6,7 +6,7 @@ import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.skript.lang.util.SimpleExpression; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.api.skript.EasyElement; import net.dv8tion.jda.api.interactions.components.text.TextInput; import net.dv8tion.jda.api.interactions.components.text.TextInputStyle; import org.bukkit.event.Event; diff --git a/src/main/java/info/itsthesky/disky/elements/components/create/ExprNewModal.java b/src/main/java/net/itsthesky/disky/elements/components/create/ExprNewModal.java similarity index 94% rename from src/main/java/info/itsthesky/disky/elements/components/create/ExprNewModal.java rename to src/main/java/net/itsthesky/disky/elements/components/create/ExprNewModal.java index ca40e676..dac85c22 100644 --- a/src/main/java/info/itsthesky/disky/elements/components/create/ExprNewModal.java +++ b/src/main/java/net/itsthesky/disky/elements/components/create/ExprNewModal.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.components.create; +package net.itsthesky.disky.elements.components.create; import ch.njol.skript.Skript; import ch.njol.skript.lang.Expression; @@ -6,7 +6,7 @@ import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.skript.lang.util.SimpleExpression; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.api.skript.EasyElement; import net.dv8tion.jda.api.interactions.modals.Modal; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/components/properties/ComponentValue.java b/src/main/java/net/itsthesky/disky/elements/components/properties/ComponentValue.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/components/properties/ComponentValue.java rename to src/main/java/net/itsthesky/disky/elements/components/properties/ComponentValue.java index fbc74ba6..de582002 100644 --- a/src/main/java/info/itsthesky/disky/elements/components/properties/ComponentValue.java +++ b/src/main/java/net/itsthesky/disky/elements/components/properties/ComponentValue.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.components.properties; +package net.itsthesky.disky.elements.components.properties; import ch.njol.skript.Skript; import ch.njol.skript.doc.Description; @@ -9,8 +9,8 @@ import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.skript.lang.util.SimpleExpression; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.skript.EasyElement; -import info.itsthesky.disky.elements.events.interactions.ModalSendEvent; +import net.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.elements.events.interactions.ModalSendEvent; import net.dv8tion.jda.api.interactions.modals.ModalMapping; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/components/properties/ExprMaxRange.java b/src/main/java/net/itsthesky/disky/elements/components/properties/ExprMaxRange.java similarity index 95% rename from src/main/java/info/itsthesky/disky/elements/components/properties/ExprMaxRange.java rename to src/main/java/net/itsthesky/disky/elements/components/properties/ExprMaxRange.java index 95de7769..1acfc157 100644 --- a/src/main/java/info/itsthesky/disky/elements/components/properties/ExprMaxRange.java +++ b/src/main/java/net/itsthesky/disky/elements/components/properties/ExprMaxRange.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.components.properties; +package net.itsthesky.disky.elements.components.properties; import net.dv8tion.jda.api.interactions.components.selections.SelectMenu; import net.dv8tion.jda.api.interactions.components.text.TextInput; diff --git a/src/main/java/info/itsthesky/disky/elements/components/properties/ExprMinRange.java b/src/main/java/net/itsthesky/disky/elements/components/properties/ExprMinRange.java similarity index 95% rename from src/main/java/info/itsthesky/disky/elements/components/properties/ExprMinRange.java rename to src/main/java/net/itsthesky/disky/elements/components/properties/ExprMinRange.java index 005fd62a..9d5b4a28 100644 --- a/src/main/java/info/itsthesky/disky/elements/components/properties/ExprMinRange.java +++ b/src/main/java/net/itsthesky/disky/elements/components/properties/ExprMinRange.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.components.properties; +package net.itsthesky.disky.elements.components.properties; import net.dv8tion.jda.api.interactions.components.selections.SelectMenu; import net.dv8tion.jda.api.interactions.components.text.TextInput; diff --git a/src/main/java/info/itsthesky/disky/elements/components/properties/ExprNewLocaleData.java b/src/main/java/net/itsthesky/disky/elements/components/properties/ExprNewLocaleData.java similarity index 96% rename from src/main/java/info/itsthesky/disky/elements/components/properties/ExprNewLocaleData.java rename to src/main/java/net/itsthesky/disky/elements/components/properties/ExprNewLocaleData.java index 7665845b..7b019f21 100644 --- a/src/main/java/info/itsthesky/disky/elements/components/properties/ExprNewLocaleData.java +++ b/src/main/java/net/itsthesky/disky/elements/components/properties/ExprNewLocaleData.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.components.properties; +package net.itsthesky.disky.elements.components.properties; import ch.njol.skript.Skript; import ch.njol.skript.doc.Description; @@ -9,7 +9,7 @@ import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.skript.lang.util.SimpleExpression; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.api.skript.EasyElement; import net.dv8tion.jda.api.interactions.DiscordLocale; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/components/properties/ExprPlaceholder.java b/src/main/java/net/itsthesky/disky/elements/components/properties/ExprPlaceholder.java similarity index 95% rename from src/main/java/info/itsthesky/disky/elements/components/properties/ExprPlaceholder.java rename to src/main/java/net/itsthesky/disky/elements/components/properties/ExprPlaceholder.java index c047a084..be784dce 100644 --- a/src/main/java/info/itsthesky/disky/elements/components/properties/ExprPlaceholder.java +++ b/src/main/java/net/itsthesky/disky/elements/components/properties/ExprPlaceholder.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.components.properties; +package net.itsthesky.disky.elements.components.properties; import net.dv8tion.jda.api.interactions.components.selections.SelectMenu; import net.dv8tion.jda.api.interactions.components.text.TextInput; diff --git a/src/main/java/info/itsthesky/disky/elements/components/properties/ExprRequireState.java b/src/main/java/net/itsthesky/disky/elements/components/properties/ExprRequireState.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/components/properties/ExprRequireState.java rename to src/main/java/net/itsthesky/disky/elements/components/properties/ExprRequireState.java index ff63abab..545744fa 100644 --- a/src/main/java/info/itsthesky/disky/elements/components/properties/ExprRequireState.java +++ b/src/main/java/net/itsthesky/disky/elements/components/properties/ExprRequireState.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.components.properties; +package net.itsthesky.disky.elements.components.properties; import net.dv8tion.jda.api.interactions.components.text.TextInput; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/components/properties/ExprValue.java b/src/main/java/net/itsthesky/disky/elements/components/properties/ExprValue.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/components/properties/ExprValue.java rename to src/main/java/net/itsthesky/disky/elements/components/properties/ExprValue.java index fae6ebc8..38a6c90f 100644 --- a/src/main/java/info/itsthesky/disky/elements/components/properties/ExprValue.java +++ b/src/main/java/net/itsthesky/disky/elements/components/properties/ExprValue.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.components.properties; +package net.itsthesky.disky.elements.components.properties; import net.dv8tion.jda.api.interactions.components.text.TextInput; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/components/properties/PropDefaultValues.java b/src/main/java/net/itsthesky/disky/elements/components/properties/PropDefaultValues.java similarity index 91% rename from src/main/java/info/itsthesky/disky/elements/components/properties/PropDefaultValues.java rename to src/main/java/net/itsthesky/disky/elements/components/properties/PropDefaultValues.java index 73014303..6b76b25a 100644 --- a/src/main/java/info/itsthesky/disky/elements/components/properties/PropDefaultValues.java +++ b/src/main/java/net/itsthesky/disky/elements/components/properties/PropDefaultValues.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.components.properties; +package net.itsthesky.disky.elements.components.properties; import ch.njol.skript.classes.Changer; -import info.itsthesky.disky.api.skript.EasyElement; -import info.itsthesky.disky.api.skript.MultiplyPropertyExpression; +import net.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.api.skript.MultiplyPropertyExpression; import net.dv8tion.jda.api.entities.Role; import net.dv8tion.jda.api.entities.User; import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel; diff --git a/src/main/java/info/itsthesky/disky/elements/components/properties/PropLocalization.java b/src/main/java/net/itsthesky/disky/elements/components/properties/PropLocalization.java similarity index 95% rename from src/main/java/info/itsthesky/disky/elements/components/properties/PropLocalization.java rename to src/main/java/net/itsthesky/disky/elements/components/properties/PropLocalization.java index 4d8cc323..e3f54ec9 100644 --- a/src/main/java/info/itsthesky/disky/elements/components/properties/PropLocalization.java +++ b/src/main/java/net/itsthesky/disky/elements/components/properties/PropLocalization.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.components.properties; +package net.itsthesky.disky.elements.components.properties; import ch.njol.skript.Skript; import ch.njol.skript.classes.Changer; @@ -7,8 +7,8 @@ import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.skript.EasyElement; -import info.itsthesky.disky.api.skript.MultiplyPropertyExpression; +import net.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.api.skript.MultiplyPropertyExpression; import net.dv8tion.jda.api.interactions.DiscordLocale; import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData; import net.dv8tion.jda.api.interactions.commands.build.SubcommandData; diff --git a/src/main/java/info/itsthesky/disky/elements/components/properties/PropOptions.java b/src/main/java/net/itsthesky/disky/elements/components/properties/PropOptions.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/components/properties/PropOptions.java rename to src/main/java/net/itsthesky/disky/elements/components/properties/PropOptions.java index 0f62dcf1..877dbdda 100644 --- a/src/main/java/info/itsthesky/disky/elements/components/properties/PropOptions.java +++ b/src/main/java/net/itsthesky/disky/elements/components/properties/PropOptions.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.components.properties; +package net.itsthesky.disky.elements.components.properties; import ch.njol.skript.classes.Changer; -import info.itsthesky.disky.api.skript.EasyElement; -import info.itsthesky.disky.api.skript.MultiplyPropertyExpression; +import net.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.api.skript.MultiplyPropertyExpression; import net.dv8tion.jda.api.interactions.commands.build.OptionData; import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData; import net.dv8tion.jda.api.interactions.commands.build.SubcommandData; diff --git a/src/main/java/info/itsthesky/disky/elements/components/properties/SimpleChangeableProperty.java b/src/main/java/net/itsthesky/disky/elements/components/properties/SimpleChangeableProperty.java similarity index 90% rename from src/main/java/info/itsthesky/disky/elements/components/properties/SimpleChangeableProperty.java rename to src/main/java/net/itsthesky/disky/elements/components/properties/SimpleChangeableProperty.java index b16f3378..3cb54570 100644 --- a/src/main/java/info/itsthesky/disky/elements/components/properties/SimpleChangeableProperty.java +++ b/src/main/java/net/itsthesky/disky/elements/components/properties/SimpleChangeableProperty.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.components.properties; +package net.itsthesky.disky.elements.components.properties; import ch.njol.skript.classes.Changer; import ch.njol.skript.expressions.base.SimplePropertyExpression; -import info.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.api.skript.EasyElement; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/info/itsthesky/disky/elements/conditions/BotMemberIsInThread.java b/src/main/java/net/itsthesky/disky/elements/conditions/BotMemberIsInThread.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/conditions/BotMemberIsInThread.java rename to src/main/java/net/itsthesky/disky/elements/conditions/BotMemberIsInThread.java index 5fffac8f..ffe3d2b5 100644 --- a/src/main/java/info/itsthesky/disky/elements/conditions/BotMemberIsInThread.java +++ b/src/main/java/net/itsthesky/disky/elements/conditions/BotMemberIsInThread.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.conditions; +package net.itsthesky.disky.elements.conditions; import ch.njol.skript.conditions.base.PropertyCondition; import ch.njol.skript.doc.Description; @@ -6,8 +6,8 @@ import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.skript.EasyPropertyCondition; -import info.itsthesky.disky.core.Bot; +import net.itsthesky.disky.api.skript.EasyPropertyCondition; +import net.itsthesky.disky.core.Bot; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel; import org.bukkit.event.Event; diff --git a/src/main/java/info/itsthesky/disky/elements/conditions/HasPermissions.java b/src/main/java/net/itsthesky/disky/elements/conditions/HasPermissions.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/conditions/HasPermissions.java rename to src/main/java/net/itsthesky/disky/elements/conditions/HasPermissions.java index dfdefc9b..a7b852fc 100644 --- a/src/main/java/info/itsthesky/disky/elements/conditions/HasPermissions.java +++ b/src/main/java/net/itsthesky/disky/elements/conditions/HasPermissions.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.conditions; +package net.itsthesky.disky.elements.conditions; import ch.njol.skript.conditions.base.PropertyCondition; import ch.njol.skript.doc.Description; @@ -7,8 +7,8 @@ import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.SkriptParser; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.skript.EasyElement; -import info.itsthesky.disky.api.skript.EasyPropertyCondition; +import net.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.api.skript.EasyPropertyCondition; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel; diff --git a/src/main/java/info/itsthesky/disky/elements/conditions/HasRole.java b/src/main/java/net/itsthesky/disky/elements/conditions/HasRole.java similarity index 90% rename from src/main/java/info/itsthesky/disky/elements/conditions/HasRole.java rename to src/main/java/net/itsthesky/disky/elements/conditions/HasRole.java index 875f317a..b6df6433 100644 --- a/src/main/java/info/itsthesky/disky/elements/conditions/HasRole.java +++ b/src/main/java/net/itsthesky/disky/elements/conditions/HasRole.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.conditions; +package net.itsthesky.disky.elements.conditions; import ch.njol.skript.conditions.base.PropertyCondition; import ch.njol.skript.doc.Description; @@ -7,8 +7,8 @@ import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.skript.EasyElement; -import info.itsthesky.disky.api.skript.EasyPropertyCondition; +import net.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.api.skript.EasyPropertyCondition; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Role; import org.bukkit.event.Event; diff --git a/src/main/java/info/itsthesky/disky/elements/conditions/IsBot.java b/src/main/java/net/itsthesky/disky/elements/conditions/IsBot.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/conditions/IsBot.java rename to src/main/java/net/itsthesky/disky/elements/conditions/IsBot.java index 3fd561fa..34c02ddb 100644 --- a/src/main/java/info/itsthesky/disky/elements/conditions/IsBot.java +++ b/src/main/java/net/itsthesky/disky/elements/conditions/IsBot.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.conditions; +package net.itsthesky.disky.elements.conditions; import ch.njol.skript.conditions.base.PropertyCondition; import ch.njol.skript.doc.Description; diff --git a/src/main/java/info/itsthesky/disky/elements/conditions/IsDeafen.java b/src/main/java/net/itsthesky/disky/elements/conditions/IsDeafen.java similarity index 97% rename from src/main/java/info/itsthesky/disky/elements/conditions/IsDeafen.java rename to src/main/java/net/itsthesky/disky/elements/conditions/IsDeafen.java index d954c70c..e63452f9 100644 --- a/src/main/java/info/itsthesky/disky/elements/conditions/IsDeafen.java +++ b/src/main/java/net/itsthesky/disky/elements/conditions/IsDeafen.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.conditions; +package net.itsthesky.disky.elements.conditions; import ch.njol.skript.conditions.base.PropertyCondition; import ch.njol.skript.lang.Expression; diff --git a/src/main/java/info/itsthesky/disky/elements/conditions/IsMuted.java b/src/main/java/net/itsthesky/disky/elements/conditions/IsMuted.java similarity index 97% rename from src/main/java/info/itsthesky/disky/elements/conditions/IsMuted.java rename to src/main/java/net/itsthesky/disky/elements/conditions/IsMuted.java index 52bc6cf3..006d2dea 100644 --- a/src/main/java/info/itsthesky/disky/elements/conditions/IsMuted.java +++ b/src/main/java/net/itsthesky/disky/elements/conditions/IsMuted.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.conditions; +package net.itsthesky.disky.elements.conditions; import ch.njol.skript.conditions.base.PropertyCondition; import ch.njol.skript.lang.Expression; diff --git a/src/main/java/info/itsthesky/disky/elements/conditions/IsTimeout.java b/src/main/java/net/itsthesky/disky/elements/conditions/IsTimeout.java similarity index 87% rename from src/main/java/info/itsthesky/disky/elements/conditions/IsTimeout.java rename to src/main/java/net/itsthesky/disky/elements/conditions/IsTimeout.java index a6d8f839..32e82b69 100644 --- a/src/main/java/info/itsthesky/disky/elements/conditions/IsTimeout.java +++ b/src/main/java/net/itsthesky/disky/elements/conditions/IsTimeout.java @@ -1,12 +1,12 @@ -package info.itsthesky.disky.elements.conditions; +package net.itsthesky.disky.elements.conditions; import ch.njol.skript.conditions.base.PropertyCondition; import ch.njol.skript.config.Node; import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.SkriptParser; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.ReflectionUtils; -import info.itsthesky.disky.elements.sections.handler.DiSkyRuntimeHandler; +import net.itsthesky.disky.api.ReflectionUtils; +import net.itsthesky.disky.elements.sections.handler.DiSkyRuntimeHandler; import net.dv8tion.jda.api.entities.Member; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/conditions/MessageOrigin.java b/src/main/java/net/itsthesky/disky/elements/conditions/MessageOrigin.java similarity index 91% rename from src/main/java/info/itsthesky/disky/elements/conditions/MessageOrigin.java rename to src/main/java/net/itsthesky/disky/elements/conditions/MessageOrigin.java index b7c9d29e..2536757a 100644 --- a/src/main/java/info/itsthesky/disky/elements/conditions/MessageOrigin.java +++ b/src/main/java/net/itsthesky/disky/elements/conditions/MessageOrigin.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.conditions; +package net.itsthesky.disky.elements.conditions; import ch.njol.skript.Skript; import ch.njol.skript.doc.Description; @@ -8,8 +8,8 @@ import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.SkriptParser; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.events.specific.MessageEvent; -import info.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.api.events.specific.MessageEvent; +import net.itsthesky.disky.api.skript.EasyElement; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/info/itsthesky/disky/elements/conditions/isInline.java b/src/main/java/net/itsthesky/disky/elements/conditions/isInline.java similarity index 94% rename from src/main/java/info/itsthesky/disky/elements/conditions/isInline.java rename to src/main/java/net/itsthesky/disky/elements/conditions/isInline.java index 7fc56f09..b370e03e 100644 --- a/src/main/java/info/itsthesky/disky/elements/conditions/isInline.java +++ b/src/main/java/net/itsthesky/disky/elements/conditions/isInline.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.conditions; +package net.itsthesky.disky.elements.conditions; import ch.njol.skript.conditions.base.PropertyCondition; import ch.njol.skript.doc.Description; diff --git a/src/main/java/info/itsthesky/disky/elements/datastructs/BasicStructs.java b/src/main/java/net/itsthesky/disky/elements/datastructs/BasicStructs.java similarity index 68% rename from src/main/java/info/itsthesky/disky/elements/datastructs/BasicStructs.java rename to src/main/java/net/itsthesky/disky/elements/datastructs/BasicStructs.java index b3ddcafb..0af0c089 100644 --- a/src/main/java/info/itsthesky/disky/elements/datastructs/BasicStructs.java +++ b/src/main/java/net/itsthesky/disky/elements/datastructs/BasicStructs.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.datastructs; +package net.itsthesky.disky.elements.datastructs; -import info.itsthesky.disky.api.datastruct.EasyDSRegistry; -import info.itsthesky.disky.elements.datastructs.structures.ButtonStructure; -import info.itsthesky.disky.elements.datastructs.structures.EmbedStructure; +import net.itsthesky.disky.api.datastruct.EasyDSRegistry; +import net.itsthesky.disky.elements.datastructs.structures.ButtonStructure; +import net.itsthesky.disky.elements.datastructs.structures.EmbedStructure; import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.interactions.components.buttons.Button; diff --git a/src/main/java/info/itsthesky/disky/elements/datastructs/RoleDS.java b/src/main/java/net/itsthesky/disky/elements/datastructs/RoleDS.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/datastructs/RoleDS.java rename to src/main/java/net/itsthesky/disky/elements/datastructs/RoleDS.java index 43cde2e0..2b1f5f8f 100644 --- a/src/main/java/info/itsthesky/disky/elements/datastructs/RoleDS.java +++ b/src/main/java/net/itsthesky/disky/elements/datastructs/RoleDS.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.datastructs; +package net.itsthesky.disky.elements.datastructs; import ch.njol.skript.Skript; import ch.njol.skript.config.SectionNode; @@ -8,13 +8,13 @@ import ch.njol.skript.lang.TriggerItem; import ch.njol.skript.util.Color; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.datastruct.ChainDataStructElement; -import info.itsthesky.disky.api.datastruct.DataStructureEntry; -import info.itsthesky.disky.api.datastruct.base.ChainDS; -import info.itsthesky.disky.api.datastruct.base.EditableDataStructure; -import info.itsthesky.disky.api.skript.EasyElement; -import info.itsthesky.disky.core.SkriptUtils; -import info.itsthesky.disky.elements.sections.handler.DiSkyRuntimeHandler; +import net.itsthesky.disky.api.datastruct.ChainDataStructElement; +import net.itsthesky.disky.api.datastruct.DataStructureEntry; +import net.itsthesky.disky.api.datastruct.base.ChainDS; +import net.itsthesky.disky.api.datastruct.base.EditableDataStructure; +import net.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.elements.sections.handler.DiSkyRuntimeHandler; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Role; diff --git a/src/main/java/info/itsthesky/disky/elements/datastructs/structures/ButtonStructure.java b/src/main/java/net/itsthesky/disky/elements/datastructs/structures/ButtonStructure.java similarity index 90% rename from src/main/java/info/itsthesky/disky/elements/datastructs/structures/ButtonStructure.java rename to src/main/java/net/itsthesky/disky/elements/datastructs/structures/ButtonStructure.java index d7f1a2c0..1e59c8f0 100644 --- a/src/main/java/info/itsthesky/disky/elements/datastructs/structures/ButtonStructure.java +++ b/src/main/java/net/itsthesky/disky/elements/datastructs/structures/ButtonStructure.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.datastructs.structures; +package net.itsthesky.disky.elements.datastructs.structures; -import info.itsthesky.disky.api.datastruct.DataStructureEntry; -import info.itsthesky.disky.api.datastruct.base.BasicDS; -import info.itsthesky.disky.api.emojis.Emote; +import net.itsthesky.disky.api.datastruct.DataStructureEntry; +import net.itsthesky.disky.api.datastruct.base.BasicDS; +import net.itsthesky.disky.api.emojis.Emote; import net.dv8tion.jda.api.interactions.components.buttons.Button; import net.dv8tion.jda.api.interactions.components.buttons.ButtonStyle; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/info/itsthesky/disky/elements/datastructs/structures/EmbedFieldStructure.java b/src/main/java/net/itsthesky/disky/elements/datastructs/structures/EmbedFieldStructure.java similarity index 73% rename from src/main/java/info/itsthesky/disky/elements/datastructs/structures/EmbedFieldStructure.java rename to src/main/java/net/itsthesky/disky/elements/datastructs/structures/EmbedFieldStructure.java index 9e60842e..7baf8cb4 100644 --- a/src/main/java/info/itsthesky/disky/elements/datastructs/structures/EmbedFieldStructure.java +++ b/src/main/java/net/itsthesky/disky/elements/datastructs/structures/EmbedFieldStructure.java @@ -1,7 +1,7 @@ -package info.itsthesky.disky.elements.datastructs.structures; +package net.itsthesky.disky.elements.datastructs.structures; -import info.itsthesky.disky.api.datastruct.DataStructureEntry; -import info.itsthesky.disky.api.datastruct.base.BasicDS; +import net.itsthesky.disky.api.datastruct.DataStructureEntry; +import net.itsthesky.disky.api.datastruct.base.BasicDS; import net.dv8tion.jda.api.entities.MessageEmbed; public class EmbedFieldStructure implements BasicDS { diff --git a/src/main/java/info/itsthesky/disky/elements/datastructs/structures/EmbedStructure.java b/src/main/java/net/itsthesky/disky/elements/datastructs/structures/EmbedStructure.java similarity index 90% rename from src/main/java/info/itsthesky/disky/elements/datastructs/structures/EmbedStructure.java rename to src/main/java/net/itsthesky/disky/elements/datastructs/structures/EmbedStructure.java index 40945b86..580af82a 100644 --- a/src/main/java/info/itsthesky/disky/elements/datastructs/structures/EmbedStructure.java +++ b/src/main/java/net/itsthesky/disky/elements/datastructs/structures/EmbedStructure.java @@ -1,12 +1,12 @@ -package info.itsthesky.disky.elements.datastructs.structures; +package net.itsthesky.disky.elements.datastructs.structures; import ch.njol.skript.util.Color; import ch.njol.skript.util.Date; import ch.njol.skript.util.SkriptColor; -import info.itsthesky.disky.api.datastruct.DataStructure; -import info.itsthesky.disky.api.datastruct.DataStructureEntry; -import info.itsthesky.disky.api.datastruct.base.BasicDS; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.datastruct.DataStructure; +import net.itsthesky.disky.api.datastruct.DataStructureEntry; +import net.itsthesky.disky.api.datastruct.base.BasicDS; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.entities.MessageEmbed; diff --git a/src/main/java/info/itsthesky/disky/elements/effects/ArchiveUnarchiveThread.java b/src/main/java/net/itsthesky/disky/elements/effects/ArchiveUnarchiveThread.java similarity index 95% rename from src/main/java/info/itsthesky/disky/elements/effects/ArchiveUnarchiveThread.java rename to src/main/java/net/itsthesky/disky/elements/effects/ArchiveUnarchiveThread.java index 4c7d64a4..1c54bb3c 100644 --- a/src/main/java/info/itsthesky/disky/elements/effects/ArchiveUnarchiveThread.java +++ b/src/main/java/net/itsthesky/disky/elements/effects/ArchiveUnarchiveThread.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.effects; +package net.itsthesky.disky.elements.effects; import ch.njol.skript.Skript; import ch.njol.skript.doc.Description; @@ -9,7 +9,7 @@ import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.skript.util.AsyncEffect; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; +import net.itsthesky.disky.DiSky; import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel; import net.dv8tion.jda.api.managers.channel.concrete.ThreadChannelManager; import org.bukkit.event.Event; diff --git a/src/main/java/info/itsthesky/disky/elements/effects/AwaitEffect.java b/src/main/java/net/itsthesky/disky/elements/effects/AwaitEffect.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/effects/AwaitEffect.java rename to src/main/java/net/itsthesky/disky/elements/effects/AwaitEffect.java index 0c034d79..059ca034 100644 --- a/src/main/java/info/itsthesky/disky/elements/effects/AwaitEffect.java +++ b/src/main/java/net/itsthesky/disky/elements/effects/AwaitEffect.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.effects; +package net.itsthesky.disky.elements.effects; import ch.njol.skript.Skript; import ch.njol.skript.classes.Changer; @@ -8,10 +8,10 @@ import ch.njol.skript.lang.SkriptParser; import ch.njol.skript.util.AsyncEffect; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.api.ReflectionUtils; -import info.itsthesky.disky.elements.changers.IAsyncChangeableExpression; -import info.itsthesky.disky.elements.changers.IAsyncGettableExpression; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.api.ReflectionUtils; +import net.itsthesky.disky.elements.changers.IAsyncChangeableExpression; +import net.itsthesky.disky.elements.changers.IAsyncGettableExpression; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/info/itsthesky/disky/elements/effects/BanMember.java b/src/main/java/net/itsthesky/disky/elements/effects/BanMember.java similarity index 96% rename from src/main/java/info/itsthesky/disky/elements/effects/BanMember.java rename to src/main/java/net/itsthesky/disky/elements/effects/BanMember.java index 951c9e57..d522566a 100644 --- a/src/main/java/info/itsthesky/disky/elements/effects/BanMember.java +++ b/src/main/java/net/itsthesky/disky/elements/effects/BanMember.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.effects; +package net.itsthesky.disky.elements.effects; import ch.njol.skript.Skript; import ch.njol.skript.config.Node; @@ -10,7 +10,7 @@ import ch.njol.skript.util.AsyncEffect; import ch.njol.skript.util.Timespan; import ch.njol.util.Kleenean; -import info.itsthesky.disky.elements.sections.handler.DiSkyRuntimeHandler; +import net.itsthesky.disky.elements.sections.handler.DiSkyRuntimeHandler; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.UserSnowflake; diff --git a/src/main/java/info/itsthesky/disky/elements/effects/ConnectBot.java b/src/main/java/net/itsthesky/disky/elements/effects/ConnectBot.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/effects/ConnectBot.java rename to src/main/java/net/itsthesky/disky/elements/effects/ConnectBot.java index 1fd57e74..5e6b923e 100644 --- a/src/main/java/info/itsthesky/disky/elements/effects/ConnectBot.java +++ b/src/main/java/net/itsthesky/disky/elements/effects/ConnectBot.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.effects; +package net.itsthesky.disky.elements.effects; import ch.njol.skript.Skript; import ch.njol.skript.doc.Description; @@ -9,16 +9,16 @@ import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.skript.util.AsyncEffect; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.skript.EasyElement; -import info.itsthesky.disky.core.Bot; -import info.itsthesky.disky.core.Debug; +import net.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.core.Bot; +import net.itsthesky.disky.core.Debug; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.channel.middleman.AudioChannel; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import static info.itsthesky.disky.api.skript.EasyElement.parseSingle; +import static net.itsthesky.disky.api.skript.EasyElement.parseSingle; @SuppressWarnings("rawtypes") @Name("Connect / Disconnect Bot") diff --git a/src/main/java/info/itsthesky/disky/elements/effects/CreateAction.java b/src/main/java/net/itsthesky/disky/elements/effects/CreateAction.java similarity index 87% rename from src/main/java/info/itsthesky/disky/elements/effects/CreateAction.java rename to src/main/java/net/itsthesky/disky/elements/effects/CreateAction.java index 8de6f43a..2544b4f6 100644 --- a/src/main/java/info/itsthesky/disky/elements/effects/CreateAction.java +++ b/src/main/java/net/itsthesky/disky/elements/effects/CreateAction.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.effects; +package net.itsthesky.disky.elements.effects; import ch.njol.skript.Skript; import ch.njol.skript.classes.Changer; @@ -7,15 +7,15 @@ import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.skript.util.AsyncEffect; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.skript.INodeHolder; -import info.itsthesky.disky.elements.sections.handler.DiSkyRuntimeHandler; +import net.itsthesky.disky.api.skript.INodeHolder; +import net.itsthesky.disky.elements.sections.handler.DiSkyRuntimeHandler; import net.dv8tion.jda.api.requests.restaction.AuditableRestAction; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import static info.itsthesky.disky.api.skript.EasyElement.anyNull; -import static info.itsthesky.disky.api.skript.EasyElement.parseSingle; +import static net.itsthesky.disky.api.skript.EasyElement.anyNull; +import static net.itsthesky.disky.api.skript.EasyElement.parseSingle; @SuppressWarnings("unchecked") public class CreateAction extends AsyncEffect implements INodeHolder { diff --git a/src/main/java/info/itsthesky/disky/elements/effects/CreateEmote.java b/src/main/java/net/itsthesky/disky/elements/effects/CreateEmote.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/effects/CreateEmote.java rename to src/main/java/net/itsthesky/disky/elements/effects/CreateEmote.java index 37ca22c6..2f8141c6 100644 --- a/src/main/java/info/itsthesky/disky/elements/effects/CreateEmote.java +++ b/src/main/java/net/itsthesky/disky/elements/effects/CreateEmote.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.effects; +package net.itsthesky.disky.elements.effects; import ch.njol.skript.Skript; import ch.njol.skript.classes.Changer; @@ -9,16 +9,16 @@ import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.skript.util.AsyncEffect; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.api.emojis.Emote; -import info.itsthesky.disky.core.JDAUtils; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.api.emojis.Emote; +import net.itsthesky.disky.core.JDAUtils; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Icon; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import static info.itsthesky.disky.api.skript.EasyElement.anyNull; +import static net.itsthesky.disky.api.skript.EasyElement.anyNull; @Name("Create Emote") @Description({ diff --git a/src/main/java/info/itsthesky/disky/elements/effects/CreateInvite.java b/src/main/java/net/itsthesky/disky/elements/effects/CreateInvite.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/effects/CreateInvite.java rename to src/main/java/net/itsthesky/disky/elements/effects/CreateInvite.java index 8e43107c..c01d579c 100644 --- a/src/main/java/info/itsthesky/disky/elements/effects/CreateInvite.java +++ b/src/main/java/net/itsthesky/disky/elements/effects/CreateInvite.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.effects; +package net.itsthesky.disky.elements.effects; import ch.njol.skript.Skript; import ch.njol.skript.classes.Changer; @@ -8,8 +8,8 @@ import ch.njol.skript.util.AsyncEffect; import ch.njol.skript.util.Timespan; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Invite; import net.dv8tion.jda.api.entities.channel.attribute.IInviteContainer; @@ -18,8 +18,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import static info.itsthesky.disky.api.skript.EasyElement.anyNull; -import static info.itsthesky.disky.api.skript.EasyElement.parseSingle; +import static net.itsthesky.disky.api.skript.EasyElement.anyNull; +import static net.itsthesky.disky.api.skript.EasyElement.parseSingle; public class CreateInvite extends AsyncEffect { diff --git a/src/main/java/info/itsthesky/disky/elements/effects/CreatePost.java b/src/main/java/net/itsthesky/disky/elements/effects/CreatePost.java similarity index 97% rename from src/main/java/info/itsthesky/disky/elements/effects/CreatePost.java rename to src/main/java/net/itsthesky/disky/elements/effects/CreatePost.java index d699ea41..70c8a240 100644 --- a/src/main/java/info/itsthesky/disky/elements/effects/CreatePost.java +++ b/src/main/java/net/itsthesky/disky/elements/effects/CreatePost.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.effects; +package net.itsthesky.disky.elements.effects; import ch.njol.skript.Skript; import ch.njol.skript.classes.Changer; @@ -10,7 +10,7 @@ import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.skript.util.AsyncEffect; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; +import net.itsthesky.disky.DiSky; import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.entities.channel.concrete.ForumChannel; import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel; @@ -27,7 +27,7 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; -import static info.itsthesky.disky.api.skript.EasyElement.*; +import static net.itsthesky.disky.api.skript.EasyElement.*; @Name("Create Post") @Description({"Create a new post in a forum channel. The output value will be the newly created thread channel."}) diff --git a/src/main/java/info/itsthesky/disky/elements/effects/CreateScheduledEvent.java b/src/main/java/net/itsthesky/disky/elements/effects/CreateScheduledEvent.java similarity index 94% rename from src/main/java/info/itsthesky/disky/elements/effects/CreateScheduledEvent.java rename to src/main/java/net/itsthesky/disky/elements/effects/CreateScheduledEvent.java index 23c64aa9..b105d564 100644 --- a/src/main/java/info/itsthesky/disky/elements/effects/CreateScheduledEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/effects/CreateScheduledEvent.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.effects; +package net.itsthesky.disky.elements.effects; import ch.njol.skript.Skript; import ch.njol.skript.classes.Changer; @@ -10,8 +10,8 @@ import ch.njol.skript.util.AsyncEffect; import ch.njol.skript.util.Date; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.ScheduledEvent; import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel; @@ -19,8 +19,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import static info.itsthesky.disky.api.skript.EasyElement.anyNull; -import static info.itsthesky.disky.api.skript.EasyElement.parseSingle; +import static net.itsthesky.disky.api.skript.EasyElement.anyNull; +import static net.itsthesky.disky.api.skript.EasyElement.parseSingle; @Name("Create Scheduled Event") @Description({"Create a new scheduled event in a specific channel or at a specific place.", diff --git a/src/main/java/info/itsthesky/disky/elements/effects/CreateThread.java b/src/main/java/net/itsthesky/disky/elements/effects/CreateThread.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/effects/CreateThread.java rename to src/main/java/net/itsthesky/disky/elements/effects/CreateThread.java index 227710dd..4839db70 100644 --- a/src/main/java/info/itsthesky/disky/elements/effects/CreateThread.java +++ b/src/main/java/net/itsthesky/disky/elements/effects/CreateThread.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.effects; +package net.itsthesky.disky.elements.effects; import ch.njol.skript.Skript; import ch.njol.skript.classes.Changer; @@ -8,8 +8,8 @@ import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.skript.util.AsyncEffect; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.core.Bot; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.core.Bot; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel; import net.dv8tion.jda.api.entities.channel.middleman.StandardGuildMessageChannel; @@ -18,8 +18,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import static info.itsthesky.disky.api.skript.EasyElement.anyNull; -import static info.itsthesky.disky.api.skript.EasyElement.parseSingle; +import static net.itsthesky.disky.api.skript.EasyElement.anyNull; +import static net.itsthesky.disky.api.skript.EasyElement.parseSingle; @Name("Create Thread") @Description({"Create a new thread in a text channel with a base name.", diff --git a/src/main/java/info/itsthesky/disky/elements/effects/DeferInteraction.java b/src/main/java/net/itsthesky/disky/elements/effects/DeferInteraction.java similarity index 94% rename from src/main/java/info/itsthesky/disky/elements/effects/DeferInteraction.java rename to src/main/java/net/itsthesky/disky/elements/effects/DeferInteraction.java index 9a01e70c..0438f537 100644 --- a/src/main/java/info/itsthesky/disky/elements/effects/DeferInteraction.java +++ b/src/main/java/net/itsthesky/disky/elements/effects/DeferInteraction.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.effects; +package net.itsthesky.disky.elements.effects; import ch.njol.skript.Skript; import ch.njol.skript.doc.Description; @@ -8,9 +8,9 @@ import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.skript.util.AsyncEffect; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.api.events.specific.InteractionEvent; -import info.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.api.events.specific.InteractionEvent; +import net.itsthesky.disky.api.skript.EasyElement; import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent; import net.dv8tion.jda.api.events.interaction.ModalInteractionEvent; import net.dv8tion.jda.api.events.interaction.component.GenericComponentInteractionCreateEvent; diff --git a/src/main/java/info/itsthesky/disky/elements/effects/DestroyEntity.java b/src/main/java/net/itsthesky/disky/elements/effects/DestroyEntity.java similarity index 82% rename from src/main/java/info/itsthesky/disky/elements/effects/DestroyEntity.java rename to src/main/java/net/itsthesky/disky/elements/effects/DestroyEntity.java index 3a817c3c..5378f662 100644 --- a/src/main/java/info/itsthesky/disky/elements/effects/DestroyEntity.java +++ b/src/main/java/net/itsthesky/disky/elements/effects/DestroyEntity.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.effects; +package net.itsthesky.disky.elements.effects; import ch.njol.skript.Skript; import ch.njol.skript.config.Node; @@ -9,10 +9,11 @@ import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.skript.util.AsyncEffect; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.api.events.specific.InteractionEvent; -import info.itsthesky.disky.elements.sections.handler.DiSkyRuntimeHandler; -import info.itsthesky.disky.managers.wrappers.RegisteredWebhook; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.api.emojis.Emote; +import net.itsthesky.disky.api.events.specific.InteractionEvent; +import net.itsthesky.disky.elements.sections.handler.DiSkyRuntimeHandler; +import net.itsthesky.disky.managers.wrappers.RegisteredWebhook; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.Role; @@ -23,8 +24,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import static info.itsthesky.disky.api.skript.EasyElement.anyNull; -import static info.itsthesky.disky.api.skript.EasyElement.parseSingle; +import static net.itsthesky.disky.api.skript.EasyElement.anyNull; +import static net.itsthesky.disky.api.skript.EasyElement.parseSingle; @Name("Destroy Discord Entity") @Description("Destroy on Discord the wanted entity.") @@ -75,8 +76,8 @@ else if (entity instanceof Role) action = ((Role) entity).delete(); else if (entity instanceof Channel) action = ((Channel) entity).delete(); - else if (entity instanceof info.itsthesky.disky.api.emojis.Emote && ((info.itsthesky.disky.api.emojis.Emote) entity).isCustom()) - action = ((info.itsthesky.disky.api.emojis.Emote) entity).getEmote().delete(); + else if (entity instanceof Emote && ((Emote) entity).isCustom()) + action = ((Emote) entity).getEmote().delete(); else if (entity instanceof Webhook) action = ((Webhook) entity).delete(); else diff --git a/src/main/java/info/itsthesky/disky/elements/effects/EditMessage.java b/src/main/java/net/itsthesky/disky/elements/effects/EditMessage.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/effects/EditMessage.java rename to src/main/java/net/itsthesky/disky/elements/effects/EditMessage.java index 18ee21aa..9219a22c 100644 --- a/src/main/java/info/itsthesky/disky/elements/effects/EditMessage.java +++ b/src/main/java/net/itsthesky/disky/elements/effects/EditMessage.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.effects; +package net.itsthesky.disky.elements.effects; import ch.njol.skript.Skript; import ch.njol.skript.config.Node; @@ -10,10 +10,10 @@ import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.skript.util.AsyncEffect; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.api.events.specific.InteractionEvent; -import info.itsthesky.disky.core.SkriptUtils; -import info.itsthesky.disky.managers.wrappers.RegisteredWebhook; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.api.events.specific.InteractionEvent; +import net.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.managers.wrappers.RegisteredWebhook; import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.interactions.components.ComponentInteraction; @@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import static info.itsthesky.disky.api.skript.EasyElement.parseSingle; +import static net.itsthesky.disky.api.skript.EasyElement.parseSingle; @Name("Edit Message") @Description({"Edit a specific message/interaction hook to show a new rich or simple message.", diff --git a/src/main/java/info/itsthesky/disky/elements/effects/EndPoll.java b/src/main/java/net/itsthesky/disky/elements/effects/EndPoll.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/effects/EndPoll.java rename to src/main/java/net/itsthesky/disky/elements/effects/EndPoll.java index e80f1f8d..8d8dfe88 100644 --- a/src/main/java/info/itsthesky/disky/elements/effects/EndPoll.java +++ b/src/main/java/net/itsthesky/disky/elements/effects/EndPoll.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.effects; +package net.itsthesky.disky.elements.effects; import ch.njol.skript.Skript; import ch.njol.skript.config.Node; @@ -6,8 +6,8 @@ import ch.njol.skript.lang.SkriptParser; import ch.njol.skript.util.AsyncEffect; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Message; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/effects/ForwardMessage.java b/src/main/java/net/itsthesky/disky/elements/effects/ForwardMessage.java similarity index 94% rename from src/main/java/info/itsthesky/disky/elements/effects/ForwardMessage.java rename to src/main/java/net/itsthesky/disky/elements/effects/ForwardMessage.java index caf57199..db1ae471 100644 --- a/src/main/java/info/itsthesky/disky/elements/effects/ForwardMessage.java +++ b/src/main/java/net/itsthesky/disky/elements/effects/ForwardMessage.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.effects; +package net.itsthesky.disky.elements.effects; import ch.njol.skript.Skript; import ch.njol.skript.classes.Changer; @@ -7,8 +7,8 @@ import ch.njol.skript.lang.SkriptParser; import ch.njol.skript.util.AsyncEffect; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.skript.INodeHolder; -import info.itsthesky.disky.elements.sections.handler.DiSkyRuntimeHandler; +import net.itsthesky.disky.api.skript.INodeHolder; +import net.itsthesky.disky.elements.sections.handler.DiSkyRuntimeHandler; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel; import org.bukkit.event.Event; diff --git a/src/main/java/info/itsthesky/disky/elements/effects/KickMember.java b/src/main/java/net/itsthesky/disky/elements/effects/KickMember.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/effects/KickMember.java rename to src/main/java/net/itsthesky/disky/elements/effects/KickMember.java index 6e7e536e..6ae90ec8 100644 --- a/src/main/java/info/itsthesky/disky/elements/effects/KickMember.java +++ b/src/main/java/net/itsthesky/disky/elements/effects/KickMember.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.effects; +package net.itsthesky.disky.elements.effects; import ch.njol.skript.Skript; import ch.njol.skript.doc.Description; @@ -8,13 +8,13 @@ import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.skript.util.AsyncEffect; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; +import net.itsthesky.disky.DiSky; import net.dv8tion.jda.api.entities.Member; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import static info.itsthesky.disky.api.skript.EasyElement.parseSingle; +import static net.itsthesky.disky.api.skript.EasyElement.parseSingle; @Name("Kick Member") @Description("Kick a specific member out of its guild. You can also specify a reason if needed.") diff --git a/src/main/java/info/itsthesky/disky/elements/effects/LoadMembers.java b/src/main/java/net/itsthesky/disky/elements/effects/LoadMembers.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/effects/LoadMembers.java rename to src/main/java/net/itsthesky/disky/elements/effects/LoadMembers.java index cb4262d1..3be3c3e9 100644 --- a/src/main/java/info/itsthesky/disky/elements/effects/LoadMembers.java +++ b/src/main/java/net/itsthesky/disky/elements/effects/LoadMembers.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.effects; +package net.itsthesky.disky.elements.effects; import ch.njol.skript.Skript; import ch.njol.skript.classes.Changer; @@ -10,7 +10,7 @@ import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.skript.util.AsyncEffect; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; +import net.itsthesky.disky.DiSky; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; import org.bukkit.event.Event; @@ -19,7 +19,7 @@ import java.util.List; -import static info.itsthesky.disky.api.skript.EasyElement.parseSingle; +import static net.itsthesky.disky.api.skript.EasyElement.parseSingle; @Name("Load Members") @Description({"Load every members of a guild.", diff --git a/src/main/java/info/itsthesky/disky/elements/effects/LockUnlockThread.java b/src/main/java/net/itsthesky/disky/elements/effects/LockUnlockThread.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/effects/LockUnlockThread.java rename to src/main/java/net/itsthesky/disky/elements/effects/LockUnlockThread.java index 81846ff1..78466a39 100644 --- a/src/main/java/info/itsthesky/disky/elements/effects/LockUnlockThread.java +++ b/src/main/java/net/itsthesky/disky/elements/effects/LockUnlockThread.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.effects; +package net.itsthesky.disky.elements.effects; import ch.njol.skript.Skript; import ch.njol.skript.doc.Description; @@ -9,14 +9,14 @@ import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.skript.util.AsyncEffect; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; +import net.itsthesky.disky.DiSky; import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel; import net.dv8tion.jda.api.managers.channel.concrete.ThreadChannelManager; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import static info.itsthesky.disky.api.skript.EasyElement.parseSingle; +import static net.itsthesky.disky.api.skript.EasyElement.parseSingle; @Name("Lock / Unlock Thread") @Description("Lock or unlock a specific thread.") diff --git a/src/main/java/info/itsthesky/disky/elements/effects/MakeBotLeave.java b/src/main/java/net/itsthesky/disky/elements/effects/MakeBotLeave.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/effects/MakeBotLeave.java rename to src/main/java/net/itsthesky/disky/elements/effects/MakeBotLeave.java index 288aee43..6bdc2c2b 100644 --- a/src/main/java/info/itsthesky/disky/elements/effects/MakeBotLeave.java +++ b/src/main/java/net/itsthesky/disky/elements/effects/MakeBotLeave.java @@ -1,12 +1,12 @@ -package info.itsthesky.disky.elements.effects; +package net.itsthesky.disky.elements.effects; import ch.njol.skript.Skript; import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.skript.util.AsyncEffect; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.core.Bot; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.core.Bot; import net.dv8tion.jda.api.entities.Guild; import org.bukkit.event.Event; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/info/itsthesky/disky/elements/effects/MoveMember.java b/src/main/java/net/itsthesky/disky/elements/effects/MoveMember.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/effects/MoveMember.java rename to src/main/java/net/itsthesky/disky/elements/effects/MoveMember.java index 61bd1ed9..7774e88f 100644 --- a/src/main/java/info/itsthesky/disky/elements/effects/MoveMember.java +++ b/src/main/java/net/itsthesky/disky/elements/effects/MoveMember.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.effects; +package net.itsthesky.disky.elements.effects; import ch.njol.skript.Skript; import ch.njol.skript.doc.Description; @@ -8,14 +8,14 @@ import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.skript.util.AsyncEffect; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; +import net.itsthesky.disky.DiSky; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.channel.concrete.VoiceChannel; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import static info.itsthesky.disky.api.skript.EasyElement.parseSingle; +import static net.itsthesky.disky.api.skript.EasyElement.parseSingle; @Name("Move Member") @Description({"Move a member to another voice chat.", diff --git a/src/main/java/info/itsthesky/disky/elements/effects/MoveRole.java b/src/main/java/net/itsthesky/disky/elements/effects/MoveRole.java similarity index 94% rename from src/main/java/info/itsthesky/disky/elements/effects/MoveRole.java rename to src/main/java/net/itsthesky/disky/elements/effects/MoveRole.java index 9c1704a2..d7f755c3 100644 --- a/src/main/java/info/itsthesky/disky/elements/effects/MoveRole.java +++ b/src/main/java/net/itsthesky/disky/elements/effects/MoveRole.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.effects; +package net.itsthesky.disky.elements.effects; import ch.njol.skript.Skript; import ch.njol.skript.config.Node; @@ -9,14 +9,14 @@ import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.skript.util.AsyncEffect; import ch.njol.util.Kleenean; -import info.itsthesky.disky.elements.sections.handler.DiSkyRuntimeHandler; +import net.itsthesky.disky.elements.sections.handler.DiSkyRuntimeHandler; import net.dv8tion.jda.api.entities.Role; import net.dv8tion.jda.api.requests.restaction.order.RoleOrderAction; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import static info.itsthesky.disky.api.skript.EasyElement.parseSingle; +import static net.itsthesky.disky.api.skript.EasyElement.parseSingle; @Name("Move Role Above/Under Role") @Description({"Move a specific role above or under another role within the same guild.", diff --git a/src/main/java/info/itsthesky/disky/elements/effects/MuteMember.java b/src/main/java/net/itsthesky/disky/elements/effects/MuteMember.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/effects/MuteMember.java rename to src/main/java/net/itsthesky/disky/elements/effects/MuteMember.java index 696daffd..133628bc 100644 --- a/src/main/java/info/itsthesky/disky/elements/effects/MuteMember.java +++ b/src/main/java/net/itsthesky/disky/elements/effects/MuteMember.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.effects; +package net.itsthesky.disky.elements.effects; import ch.njol.skript.Skript; import ch.njol.skript.doc.Description; @@ -8,13 +8,13 @@ import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.skript.util.AsyncEffect; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; +import net.itsthesky.disky.DiSky; import net.dv8tion.jda.api.entities.Member; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import static info.itsthesky.disky.api.skript.EasyElement.parseSingle; +import static net.itsthesky.disky.api.skript.EasyElement.parseSingle; @Name("Mute Member") @Description({"Mute or unmute a member in their guild."}) diff --git a/src/main/java/info/itsthesky/disky/elements/effects/OpenPrivateChannel.java b/src/main/java/net/itsthesky/disky/elements/effects/OpenPrivateChannel.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/effects/OpenPrivateChannel.java rename to src/main/java/net/itsthesky/disky/elements/effects/OpenPrivateChannel.java index 65eb9565..9798e8de 100644 --- a/src/main/java/info/itsthesky/disky/elements/effects/OpenPrivateChannel.java +++ b/src/main/java/net/itsthesky/disky/elements/effects/OpenPrivateChannel.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.effects; +package net.itsthesky.disky.elements.effects; import ch.njol.skript.Skript; import ch.njol.skript.classes.Changer; @@ -10,15 +10,15 @@ import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.skript.util.AsyncEffect; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.elements.sections.handler.DiSkyRuntimeHandler; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.elements.sections.handler.DiSkyRuntimeHandler; import net.dv8tion.jda.api.entities.User; import net.dv8tion.jda.api.entities.channel.concrete.PrivateChannel; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import static info.itsthesky.disky.api.skript.EasyElement.parseSingle; +import static net.itsthesky.disky.api.skript.EasyElement.parseSingle; @Name("Open Private Channel") @Description({"Opens a private channel with a specific user.", diff --git a/src/main/java/info/itsthesky/disky/elements/effects/PinMessage.java b/src/main/java/net/itsthesky/disky/elements/effects/PinMessage.java similarity index 94% rename from src/main/java/info/itsthesky/disky/elements/effects/PinMessage.java rename to src/main/java/net/itsthesky/disky/elements/effects/PinMessage.java index 22cf1067..9bf3c380 100644 --- a/src/main/java/info/itsthesky/disky/elements/effects/PinMessage.java +++ b/src/main/java/net/itsthesky/disky/elements/effects/PinMessage.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.effects; +package net.itsthesky.disky.elements.effects; import ch.njol.skript.Skript; import ch.njol.skript.config.Node; @@ -6,8 +6,8 @@ import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.skript.util.AsyncEffect; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.requests.RestAction; import org.bukkit.event.Event; diff --git a/src/main/java/info/itsthesky/disky/elements/effects/PostMessage.java b/src/main/java/net/itsthesky/disky/elements/effects/PostMessage.java similarity index 95% rename from src/main/java/info/itsthesky/disky/elements/effects/PostMessage.java rename to src/main/java/net/itsthesky/disky/elements/effects/PostMessage.java index 90461bac..9d2af17a 100644 --- a/src/main/java/info/itsthesky/disky/elements/effects/PostMessage.java +++ b/src/main/java/net/itsthesky/disky/elements/effects/PostMessage.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.effects; +package net.itsthesky.disky.elements.effects; import ch.njol.skript.Skript; import ch.njol.skript.classes.Changer; @@ -11,8 +11,8 @@ import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.skript.util.AsyncEffect; import ch.njol.util.Kleenean; -import info.itsthesky.disky.core.Bot; -import info.itsthesky.disky.elements.sections.handler.DiSkyRuntimeHandler; +import net.itsthesky.disky.core.Bot; +import net.itsthesky.disky.elements.sections.handler.DiSkyRuntimeHandler; import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.channel.Channel; @@ -26,7 +26,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import static info.itsthesky.disky.api.skript.EasyElement.parseSingle; +import static net.itsthesky.disky.api.skript.EasyElement.parseSingle; @Name("Post Message") @Description({"Posts a message to a message-channel.", diff --git a/src/main/java/info/itsthesky/disky/elements/effects/PublishMessage.java b/src/main/java/net/itsthesky/disky/elements/effects/PublishMessage.java similarity index 88% rename from src/main/java/info/itsthesky/disky/elements/effects/PublishMessage.java rename to src/main/java/net/itsthesky/disky/elements/effects/PublishMessage.java index f8de3286..a880561a 100644 --- a/src/main/java/info/itsthesky/disky/elements/effects/PublishMessage.java +++ b/src/main/java/net/itsthesky/disky/elements/effects/PublishMessage.java @@ -1,12 +1,12 @@ -package info.itsthesky.disky.elements.effects; +package net.itsthesky.disky.elements.effects; import ch.njol.skript.Skript; import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.api.skript.SpecificBotEffect; -import info.itsthesky.disky.core.Bot; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.api.skript.SpecificBotEffect; +import net.itsthesky.disky.core.Bot; import net.dv8tion.jda.api.entities.Message; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/effects/PurgeMessages.java b/src/main/java/net/itsthesky/disky/elements/effects/PurgeMessages.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/effects/PurgeMessages.java rename to src/main/java/net/itsthesky/disky/elements/effects/PurgeMessages.java index c9ddd6db..0bb90bf6 100644 --- a/src/main/java/info/itsthesky/disky/elements/effects/PurgeMessages.java +++ b/src/main/java/net/itsthesky/disky/elements/effects/PurgeMessages.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.effects; +package net.itsthesky.disky.elements.effects; import ch.njol.skript.Skript; import ch.njol.skript.doc.Description; @@ -7,8 +7,8 @@ import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.skript.SpecificBotEffect; -import info.itsthesky.disky.core.Bot; +import net.itsthesky.disky.api.skript.SpecificBotEffect; +import net.itsthesky.disky.core.Bot; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel; import org.bukkit.event.Event; diff --git a/src/main/java/info/itsthesky/disky/elements/effects/ReplyWith.java b/src/main/java/net/itsthesky/disky/elements/effects/ReplyWith.java similarity index 95% rename from src/main/java/info/itsthesky/disky/elements/effects/ReplyWith.java rename to src/main/java/net/itsthesky/disky/elements/effects/ReplyWith.java index b43c95d5..5803d5f5 100644 --- a/src/main/java/info/itsthesky/disky/elements/effects/ReplyWith.java +++ b/src/main/java/net/itsthesky/disky/elements/effects/ReplyWith.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.effects; +package net.itsthesky.disky.elements.effects; import ch.njol.skript.Skript; import ch.njol.skript.classes.Changer; @@ -12,13 +12,13 @@ import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.skript.lang.TriggerItem; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.api.events.specific.InteractionEvent; -import info.itsthesky.disky.api.events.specific.MessageEvent; -import info.itsthesky.disky.api.skript.AsyncEffectSection; -import info.itsthesky.disky.api.skript.BetterExpressionEntryData; -import info.itsthesky.disky.core.SkriptUtils; -import info.itsthesky.disky.elements.components.core.ComponentRow; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.api.events.specific.InteractionEvent; +import net.itsthesky.disky.api.events.specific.MessageEvent; +import net.itsthesky.disky.api.skript.AsyncEffectSection; +import net.itsthesky.disky.api.skript.BetterExpressionEntryData; +import net.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.elements.components.core.ComponentRow; import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel; @@ -43,7 +43,7 @@ import java.util.Arrays; import java.util.List; -import static info.itsthesky.disky.api.skript.EasyElement.*; +import static net.itsthesky.disky.api.skript.EasyElement.*; @Name("Reply With") @Description({"Reply with a specific message to the channel where a message-event was triggered.", diff --git a/src/main/java/info/itsthesky/disky/elements/effects/RetrieveEventValue.java b/src/main/java/net/itsthesky/disky/elements/effects/RetrieveEventValue.java similarity index 94% rename from src/main/java/info/itsthesky/disky/elements/effects/RetrieveEventValue.java rename to src/main/java/net/itsthesky/disky/elements/effects/RetrieveEventValue.java index b49b7098..545804cc 100644 --- a/src/main/java/info/itsthesky/disky/elements/effects/RetrieveEventValue.java +++ b/src/main/java/net/itsthesky/disky/elements/effects/RetrieveEventValue.java @@ -1,13 +1,13 @@ -package info.itsthesky.disky.elements.effects; +package net.itsthesky.disky.elements.effects; import ch.njol.skript.Skript; import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.skript.lang.parser.ParserInstance; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.api.skript.WaiterEffect; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.api.skript.WaiterEffect; import net.dv8tion.jda.api.requests.RestAction; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/effects/SendTyping.java b/src/main/java/net/itsthesky/disky/elements/effects/SendTyping.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/effects/SendTyping.java rename to src/main/java/net/itsthesky/disky/elements/effects/SendTyping.java index 5a7a1476..3d8cdbf9 100644 --- a/src/main/java/info/itsthesky/disky/elements/effects/SendTyping.java +++ b/src/main/java/net/itsthesky/disky/elements/effects/SendTyping.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.effects; +package net.itsthesky.disky.elements.effects; import ch.njol.skript.Skript; import ch.njol.skript.doc.Description; @@ -7,9 +7,9 @@ import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.api.skript.SpecificBotEffect; -import info.itsthesky.disky.core.Bot; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.api.skript.SpecificBotEffect; +import net.itsthesky.disky.core.Bot; import net.dv8tion.jda.api.entities.channel.Channel; import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel; import org.bukkit.event.Event; diff --git a/src/main/java/info/itsthesky/disky/elements/effects/StopBot.java b/src/main/java/net/itsthesky/disky/elements/effects/StopBot.java similarity index 91% rename from src/main/java/info/itsthesky/disky/elements/effects/StopBot.java rename to src/main/java/net/itsthesky/disky/elements/effects/StopBot.java index be206cc2..98bfe3ee 100644 --- a/src/main/java/info/itsthesky/disky/elements/effects/StopBot.java +++ b/src/main/java/net/itsthesky/disky/elements/effects/StopBot.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.effects; +package net.itsthesky.disky.elements.effects; import ch.njol.skript.Skript; import ch.njol.skript.doc.Description; @@ -7,8 +7,8 @@ import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.skript.WaiterEffect; -import info.itsthesky.disky.core.Bot; +import net.itsthesky.disky.api.skript.WaiterEffect; +import net.itsthesky.disky.core.Bot; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/info/itsthesky/disky/elements/effects/SuppressReaction.java b/src/main/java/net/itsthesky/disky/elements/effects/SuppressReaction.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/effects/SuppressReaction.java rename to src/main/java/net/itsthesky/disky/elements/effects/SuppressReaction.java index c5de6d38..f84bcd55 100644 --- a/src/main/java/info/itsthesky/disky/elements/effects/SuppressReaction.java +++ b/src/main/java/net/itsthesky/disky/elements/effects/SuppressReaction.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.effects; +package net.itsthesky.disky.elements.effects; import ch.njol.skript.Skript; import ch.njol.skript.doc.Description; @@ -8,10 +8,10 @@ import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.api.emojis.Emote; -import info.itsthesky.disky.api.skript.SpecificBotEffect; -import info.itsthesky.disky.core.Bot; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.api.emojis.Emote; +import net.itsthesky.disky.api.skript.SpecificBotEffect; +import net.itsthesky.disky.core.Bot; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.User; import net.dv8tion.jda.api.requests.RestAction; diff --git a/src/main/java/info/itsthesky/disky/elements/effects/TimeOutMember.java b/src/main/java/net/itsthesky/disky/elements/effects/TimeOutMember.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/effects/TimeOutMember.java rename to src/main/java/net/itsthesky/disky/elements/effects/TimeOutMember.java index 5070bcb7..234799ad 100644 --- a/src/main/java/info/itsthesky/disky/elements/effects/TimeOutMember.java +++ b/src/main/java/net/itsthesky/disky/elements/effects/TimeOutMember.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.effects; +package net.itsthesky.disky.elements.effects; import ch.njol.skript.Skript; import ch.njol.skript.doc.Description; @@ -9,10 +9,10 @@ import ch.njol.skript.util.Date; import ch.njol.skript.util.Timespan; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.api.skript.SpecificBotEffect; -import info.itsthesky.disky.core.Bot; -import info.itsthesky.disky.core.Utils; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.api.skript.SpecificBotEffect; +import net.itsthesky.disky.core.Bot; +import net.itsthesky.disky.core.Utils; import net.dv8tion.jda.api.entities.Member; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/effects/UnbanMember.java b/src/main/java/net/itsthesky/disky/elements/effects/UnbanMember.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/effects/UnbanMember.java rename to src/main/java/net/itsthesky/disky/elements/effects/UnbanMember.java index 78437861..a8f613a9 100644 --- a/src/main/java/info/itsthesky/disky/elements/effects/UnbanMember.java +++ b/src/main/java/net/itsthesky/disky/elements/effects/UnbanMember.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.effects; +package net.itsthesky.disky.elements.effects; import ch.njol.skript.Skript; import ch.njol.skript.config.Node; @@ -9,8 +9,8 @@ import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.skript.util.AsyncEffect; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.skript.EasyElement; -import info.itsthesky.disky.elements.sections.handler.DiSkyRuntimeHandler; +import net.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.elements.sections.handler.DiSkyRuntimeHandler; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.User; import org.bukkit.event.Event; diff --git a/src/main/java/info/itsthesky/disky/elements/effects/find/FindMembersWithNickname.java b/src/main/java/net/itsthesky/disky/elements/effects/find/FindMembersWithNickname.java similarity index 96% rename from src/main/java/info/itsthesky/disky/elements/effects/find/FindMembersWithNickname.java rename to src/main/java/net/itsthesky/disky/elements/effects/find/FindMembersWithNickname.java index f032e15c..75beb4ec 100644 --- a/src/main/java/info/itsthesky/disky/elements/effects/find/FindMembersWithNickname.java +++ b/src/main/java/net/itsthesky/disky/elements/effects/find/FindMembersWithNickname.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.effects.find; +package net.itsthesky.disky.elements.effects.find; import ch.njol.skript.Skript; import ch.njol.skript.classes.Changer; @@ -7,7 +7,7 @@ import ch.njol.skript.lang.SkriptParser; import ch.njol.skript.util.AsyncEffect; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; +import net.itsthesky.disky.DiSky; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; import org.bukkit.event.Event; diff --git a/src/main/java/info/itsthesky/disky/elements/effects/find/FindMembersWithRoles.java b/src/main/java/net/itsthesky/disky/elements/effects/find/FindMembersWithRoles.java similarity index 95% rename from src/main/java/info/itsthesky/disky/elements/effects/find/FindMembersWithRoles.java rename to src/main/java/net/itsthesky/disky/elements/effects/find/FindMembersWithRoles.java index 1fa49ebe..f563cb7a 100644 --- a/src/main/java/info/itsthesky/disky/elements/effects/find/FindMembersWithRoles.java +++ b/src/main/java/net/itsthesky/disky/elements/effects/find/FindMembersWithRoles.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.effects.find; +package net.itsthesky.disky.elements.effects.find; import ch.njol.skript.Skript; import ch.njol.skript.classes.Changer; @@ -7,8 +7,8 @@ import ch.njol.skript.lang.SkriptParser; import ch.njol.skript.util.AsyncEffect; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Role; diff --git a/src/main/java/info/itsthesky/disky/elements/effects/retrieve/RetrieveApplicationInfo.java b/src/main/java/net/itsthesky/disky/elements/effects/retrieve/RetrieveApplicationInfo.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/effects/retrieve/RetrieveApplicationInfo.java rename to src/main/java/net/itsthesky/disky/elements/effects/retrieve/RetrieveApplicationInfo.java index c5cf4717..66e26ea0 100644 --- a/src/main/java/info/itsthesky/disky/elements/effects/retrieve/RetrieveApplicationInfo.java +++ b/src/main/java/net/itsthesky/disky/elements/effects/retrieve/RetrieveApplicationInfo.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.effects.retrieve; +package net.itsthesky.disky.elements.effects.retrieve; import ch.njol.skript.Skript; import ch.njol.skript.classes.Changer; @@ -6,8 +6,8 @@ import ch.njol.skript.lang.SkriptParser; import ch.njol.skript.util.AsyncEffect; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.core.Bot; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.core.Bot; import net.dv8tion.jda.api.entities.ApplicationInfo; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/effects/retrieve/RetrieveBans.java b/src/main/java/net/itsthesky/disky/elements/effects/retrieve/RetrieveBans.java similarity index 94% rename from src/main/java/info/itsthesky/disky/elements/effects/retrieve/RetrieveBans.java rename to src/main/java/net/itsthesky/disky/elements/effects/retrieve/RetrieveBans.java index 3b9d6426..f8433e7d 100644 --- a/src/main/java/info/itsthesky/disky/elements/effects/retrieve/RetrieveBans.java +++ b/src/main/java/net/itsthesky/disky/elements/effects/retrieve/RetrieveBans.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.effects.retrieve; +package net.itsthesky.disky.elements.effects.retrieve; import ch.njol.skript.Skript; import ch.njol.skript.classes.Changer; @@ -6,8 +6,8 @@ import ch.njol.skript.lang.SkriptParser; import ch.njol.skript.util.AsyncEffect; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.core.Bot; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.core.Bot; import net.dv8tion.jda.api.entities.Guild; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/effects/retrieve/RetrieveEmotes.java b/src/main/java/net/itsthesky/disky/elements/effects/retrieve/RetrieveEmotes.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/effects/retrieve/RetrieveEmotes.java rename to src/main/java/net/itsthesky/disky/elements/effects/retrieve/RetrieveEmotes.java index f37aabf0..6b9868ec 100644 --- a/src/main/java/info/itsthesky/disky/elements/effects/retrieve/RetrieveEmotes.java +++ b/src/main/java/net/itsthesky/disky/elements/effects/retrieve/RetrieveEmotes.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.effects.retrieve; +package net.itsthesky.disky.elements.effects.retrieve; import ch.njol.skript.Skript; import ch.njol.skript.classes.Changer; @@ -6,9 +6,9 @@ import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.skript.util.AsyncEffect; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.api.emojis.Emote; -import info.itsthesky.disky.core.Bot; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.api.emojis.Emote; +import net.itsthesky.disky.core.Bot; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.emoji.RichCustomEmoji; import org.bukkit.event.Event; diff --git a/src/main/java/info/itsthesky/disky/elements/effects/retrieve/RetrieveInterestedMembers.java b/src/main/java/net/itsthesky/disky/elements/effects/retrieve/RetrieveInterestedMembers.java similarity index 94% rename from src/main/java/info/itsthesky/disky/elements/effects/retrieve/RetrieveInterestedMembers.java rename to src/main/java/net/itsthesky/disky/elements/effects/retrieve/RetrieveInterestedMembers.java index ea91ef40..a43e471f 100644 --- a/src/main/java/info/itsthesky/disky/elements/effects/retrieve/RetrieveInterestedMembers.java +++ b/src/main/java/net/itsthesky/disky/elements/effects/retrieve/RetrieveInterestedMembers.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.effects.retrieve; +package net.itsthesky.disky.elements.effects.retrieve; import ch.njol.skript.Skript; import ch.njol.skript.classes.Changer; @@ -8,8 +8,8 @@ import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.skript.util.AsyncEffect; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.core.Bot; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.core.Bot; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.ScheduledEvent; import org.bukkit.event.Event; diff --git a/src/main/java/info/itsthesky/disky/elements/effects/retrieve/RetrieveInvite.java b/src/main/java/net/itsthesky/disky/elements/effects/retrieve/RetrieveInvite.java similarity index 95% rename from src/main/java/info/itsthesky/disky/elements/effects/retrieve/RetrieveInvite.java rename to src/main/java/net/itsthesky/disky/elements/effects/retrieve/RetrieveInvite.java index 67c16990..b9a2ab4c 100644 --- a/src/main/java/info/itsthesky/disky/elements/effects/retrieve/RetrieveInvite.java +++ b/src/main/java/net/itsthesky/disky/elements/effects/retrieve/RetrieveInvite.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.effects.retrieve; +package net.itsthesky.disky.elements.effects.retrieve; import ch.njol.skript.Skript; import ch.njol.skript.classes.Changer; @@ -6,8 +6,8 @@ import ch.njol.skript.lang.SkriptParser; import ch.njol.skript.util.AsyncEffect; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.core.Bot; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.core.Bot; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Invite; import org.bukkit.event.Event; diff --git a/src/main/java/info/itsthesky/disky/elements/effects/retrieve/RetrieveInvites.java b/src/main/java/net/itsthesky/disky/elements/effects/retrieve/RetrieveInvites.java similarity index 94% rename from src/main/java/info/itsthesky/disky/elements/effects/retrieve/RetrieveInvites.java rename to src/main/java/net/itsthesky/disky/elements/effects/retrieve/RetrieveInvites.java index 9ea90cdd..0c69a750 100644 --- a/src/main/java/info/itsthesky/disky/elements/effects/retrieve/RetrieveInvites.java +++ b/src/main/java/net/itsthesky/disky/elements/effects/retrieve/RetrieveInvites.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.effects.retrieve; +package net.itsthesky.disky.elements.effects.retrieve; import ch.njol.skript.Skript; import ch.njol.skript.classes.Changer; @@ -6,8 +6,8 @@ import ch.njol.skript.lang.SkriptParser; import ch.njol.skript.util.AsyncEffect; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.core.Bot; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.core.Bot; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Invite; import org.bukkit.event.Event; diff --git a/src/main/java/info/itsthesky/disky/elements/effects/retrieve/RetrieveLogs.java b/src/main/java/net/itsthesky/disky/elements/effects/retrieve/RetrieveLogs.java similarity index 95% rename from src/main/java/info/itsthesky/disky/elements/effects/retrieve/RetrieveLogs.java rename to src/main/java/net/itsthesky/disky/elements/effects/retrieve/RetrieveLogs.java index 99b69a7e..f677406e 100644 --- a/src/main/java/info/itsthesky/disky/elements/effects/retrieve/RetrieveLogs.java +++ b/src/main/java/net/itsthesky/disky/elements/effects/retrieve/RetrieveLogs.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.effects.retrieve; +package net.itsthesky.disky.elements.effects.retrieve; import ch.njol.skript.Skript; import ch.njol.skript.classes.Changer; @@ -10,8 +10,8 @@ import ch.njol.skript.lang.SkriptParser; import ch.njol.skript.util.AsyncEffect; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.core.Bot; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.core.Bot; import net.dv8tion.jda.api.audit.AuditLogEntry; import net.dv8tion.jda.api.entities.Guild; import org.bukkit.event.Event; diff --git a/src/main/java/info/itsthesky/disky/elements/effects/retrieve/RetrieveMember.java b/src/main/java/net/itsthesky/disky/elements/effects/retrieve/RetrieveMember.java similarity index 96% rename from src/main/java/info/itsthesky/disky/elements/effects/retrieve/RetrieveMember.java rename to src/main/java/net/itsthesky/disky/elements/effects/retrieve/RetrieveMember.java index 997f7983..780edd3f 100644 --- a/src/main/java/info/itsthesky/disky/elements/effects/retrieve/RetrieveMember.java +++ b/src/main/java/net/itsthesky/disky/elements/effects/retrieve/RetrieveMember.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.effects.retrieve; +package net.itsthesky.disky.elements.effects.retrieve; import ch.njol.skript.Skript; import ch.njol.skript.classes.Changer; @@ -6,7 +6,7 @@ import ch.njol.skript.lang.SkriptParser; import ch.njol.skript.util.AsyncEffect; import ch.njol.util.Kleenean; -import info.itsthesky.disky.core.Bot; +import net.itsthesky.disky.core.Bot; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; import org.bukkit.event.Event; diff --git a/src/main/java/info/itsthesky/disky/elements/effects/retrieve/RetrieveMessage.java b/src/main/java/net/itsthesky/disky/elements/effects/retrieve/RetrieveMessage.java similarity index 95% rename from src/main/java/info/itsthesky/disky/elements/effects/retrieve/RetrieveMessage.java rename to src/main/java/net/itsthesky/disky/elements/effects/retrieve/RetrieveMessage.java index 3f1c48db..6a0a4faa 100644 --- a/src/main/java/info/itsthesky/disky/elements/effects/retrieve/RetrieveMessage.java +++ b/src/main/java/net/itsthesky/disky/elements/effects/retrieve/RetrieveMessage.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.effects.retrieve; +package net.itsthesky.disky.elements.effects.retrieve; import ch.njol.skript.Skript; import ch.njol.skript.classes.Changer; @@ -7,8 +7,8 @@ import ch.njol.skript.lang.SkriptParser; import ch.njol.skript.util.AsyncEffect; import ch.njol.util.Kleenean; -import info.itsthesky.disky.core.Bot; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.core.Bot; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.channel.Channel; import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel; diff --git a/src/main/java/info/itsthesky/disky/elements/effects/retrieve/RetrieveMessages.java b/src/main/java/net/itsthesky/disky/elements/effects/retrieve/RetrieveMessages.java similarity index 96% rename from src/main/java/info/itsthesky/disky/elements/effects/retrieve/RetrieveMessages.java rename to src/main/java/net/itsthesky/disky/elements/effects/retrieve/RetrieveMessages.java index b2d8f948..59a53834 100644 --- a/src/main/java/info/itsthesky/disky/elements/effects/retrieve/RetrieveMessages.java +++ b/src/main/java/net/itsthesky/disky/elements/effects/retrieve/RetrieveMessages.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.effects.retrieve; +package net.itsthesky.disky.elements.effects.retrieve; import ch.njol.skript.Skript; import ch.njol.skript.classes.Changer; @@ -9,7 +9,7 @@ import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.skript.util.AsyncEffect; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; +import net.itsthesky.disky.DiSky; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel; import org.bukkit.event.Event; diff --git a/src/main/java/info/itsthesky/disky/elements/effects/retrieve/RetrieveOwner.java b/src/main/java/net/itsthesky/disky/elements/effects/retrieve/RetrieveOwner.java similarity index 95% rename from src/main/java/info/itsthesky/disky/elements/effects/retrieve/RetrieveOwner.java rename to src/main/java/net/itsthesky/disky/elements/effects/retrieve/RetrieveOwner.java index 493003c3..487f95fd 100644 --- a/src/main/java/info/itsthesky/disky/elements/effects/retrieve/RetrieveOwner.java +++ b/src/main/java/net/itsthesky/disky/elements/effects/retrieve/RetrieveOwner.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.effects.retrieve; +package net.itsthesky.disky.elements.effects.retrieve; import ch.njol.skript.Skript; import ch.njol.skript.classes.Changer; @@ -6,7 +6,7 @@ import ch.njol.skript.lang.SkriptParser; import ch.njol.skript.util.AsyncEffect; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; +import net.itsthesky.disky.DiSky; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; import org.bukkit.event.Event; diff --git a/src/main/java/info/itsthesky/disky/elements/effects/retrieve/RetrieveProfile.java b/src/main/java/net/itsthesky/disky/elements/effects/retrieve/RetrieveProfile.java similarity index 96% rename from src/main/java/info/itsthesky/disky/elements/effects/retrieve/RetrieveProfile.java rename to src/main/java/net/itsthesky/disky/elements/effects/retrieve/RetrieveProfile.java index 03af3bca..be3371fd 100644 --- a/src/main/java/info/itsthesky/disky/elements/effects/retrieve/RetrieveProfile.java +++ b/src/main/java/net/itsthesky/disky/elements/effects/retrieve/RetrieveProfile.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.effects.retrieve; +package net.itsthesky.disky.elements.effects.retrieve; import ch.njol.skript.Skript; import ch.njol.skript.classes.Changer; @@ -8,7 +8,7 @@ import ch.njol.skript.lang.SkriptParser; import ch.njol.skript.util.AsyncEffect; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; +import net.itsthesky.disky.DiSky; import net.dv8tion.jda.api.entities.User; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/effects/retrieve/RetrieveStartMessage.java b/src/main/java/net/itsthesky/disky/elements/effects/retrieve/RetrieveStartMessage.java similarity index 95% rename from src/main/java/info/itsthesky/disky/elements/effects/retrieve/RetrieveStartMessage.java rename to src/main/java/net/itsthesky/disky/elements/effects/retrieve/RetrieveStartMessage.java index e46925f4..b3f14517 100644 --- a/src/main/java/info/itsthesky/disky/elements/effects/retrieve/RetrieveStartMessage.java +++ b/src/main/java/net/itsthesky/disky/elements/effects/retrieve/RetrieveStartMessage.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.effects.retrieve; +package net.itsthesky.disky.elements.effects.retrieve; import ch.njol.skript.Skript; import ch.njol.skript.classes.Changer; @@ -6,7 +6,7 @@ import ch.njol.skript.lang.SkriptParser; import ch.njol.skript.util.AsyncEffect; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; +import net.itsthesky.disky.DiSky; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel; import org.bukkit.event.Event; diff --git a/src/main/java/info/itsthesky/disky/elements/effects/retrieve/RetrieveSticker.java b/src/main/java/net/itsthesky/disky/elements/effects/retrieve/RetrieveSticker.java similarity index 95% rename from src/main/java/info/itsthesky/disky/elements/effects/retrieve/RetrieveSticker.java rename to src/main/java/net/itsthesky/disky/elements/effects/retrieve/RetrieveSticker.java index 8b24a39f..2a6a7791 100644 --- a/src/main/java/info/itsthesky/disky/elements/effects/retrieve/RetrieveSticker.java +++ b/src/main/java/net/itsthesky/disky/elements/effects/retrieve/RetrieveSticker.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.effects.retrieve; +package net.itsthesky.disky.elements.effects.retrieve; import ch.njol.skript.Skript; import ch.njol.skript.classes.Changer; @@ -8,8 +8,8 @@ import ch.njol.skript.lang.SkriptParser; import ch.njol.skript.util.AsyncEffect; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.core.Bot; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.core.Bot; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.sticker.Sticker; import org.bukkit.event.Event; diff --git a/src/main/java/info/itsthesky/disky/elements/effects/retrieve/RetrieveStickers.java b/src/main/java/net/itsthesky/disky/elements/effects/retrieve/RetrieveStickers.java similarity index 96% rename from src/main/java/info/itsthesky/disky/elements/effects/retrieve/RetrieveStickers.java rename to src/main/java/net/itsthesky/disky/elements/effects/retrieve/RetrieveStickers.java index 555ad147..2e91234c 100644 --- a/src/main/java/info/itsthesky/disky/elements/effects/retrieve/RetrieveStickers.java +++ b/src/main/java/net/itsthesky/disky/elements/effects/retrieve/RetrieveStickers.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.effects.retrieve; +package net.itsthesky.disky.elements.effects.retrieve; import ch.njol.skript.Skript; import ch.njol.skript.classes.Changer; @@ -8,7 +8,7 @@ import ch.njol.skript.lang.SkriptParser; import ch.njol.skript.util.AsyncEffect; import ch.njol.util.Kleenean; -import info.itsthesky.disky.core.Bot; +import net.itsthesky.disky.core.Bot; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.sticker.GuildSticker; import org.bukkit.event.Event; diff --git a/src/main/java/info/itsthesky/disky/elements/effects/retrieve/RetrieveThreadMembers.java b/src/main/java/net/itsthesky/disky/elements/effects/retrieve/RetrieveThreadMembers.java similarity index 95% rename from src/main/java/info/itsthesky/disky/elements/effects/retrieve/RetrieveThreadMembers.java rename to src/main/java/net/itsthesky/disky/elements/effects/retrieve/RetrieveThreadMembers.java index bbcef5d9..4aa71da4 100644 --- a/src/main/java/info/itsthesky/disky/elements/effects/retrieve/RetrieveThreadMembers.java +++ b/src/main/java/net/itsthesky/disky/elements/effects/retrieve/RetrieveThreadMembers.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.effects.retrieve; +package net.itsthesky.disky.elements.effects.retrieve; import ch.njol.skript.Skript; import ch.njol.skript.classes.Changer; @@ -8,8 +8,8 @@ import ch.njol.skript.lang.SkriptParser; import ch.njol.skript.util.AsyncEffect; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.core.Bot; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.core.Bot; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.ThreadMember; import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel; diff --git a/src/main/java/info/itsthesky/disky/elements/effects/retrieve/RetrieveThreadMessage.java b/src/main/java/net/itsthesky/disky/elements/effects/retrieve/RetrieveThreadMessage.java similarity index 95% rename from src/main/java/info/itsthesky/disky/elements/effects/retrieve/RetrieveThreadMessage.java rename to src/main/java/net/itsthesky/disky/elements/effects/retrieve/RetrieveThreadMessage.java index 8896090c..6742ee2f 100644 --- a/src/main/java/info/itsthesky/disky/elements/effects/retrieve/RetrieveThreadMessage.java +++ b/src/main/java/net/itsthesky/disky/elements/effects/retrieve/RetrieveThreadMessage.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.effects.retrieve; +package net.itsthesky.disky.elements.effects.retrieve; import ch.njol.skript.Skript; import ch.njol.skript.classes.Changer; @@ -6,7 +6,7 @@ import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.skript.util.AsyncEffect; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; +import net.itsthesky.disky.DiSky; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel; import org.bukkit.event.Event; diff --git a/src/main/java/info/itsthesky/disky/elements/effects/retrieve/RetrieveThreads.java b/src/main/java/net/itsthesky/disky/elements/effects/retrieve/RetrieveThreads.java similarity index 95% rename from src/main/java/info/itsthesky/disky/elements/effects/retrieve/RetrieveThreads.java rename to src/main/java/net/itsthesky/disky/elements/effects/retrieve/RetrieveThreads.java index 583f2d7d..cd471cdf 100644 --- a/src/main/java/info/itsthesky/disky/elements/effects/retrieve/RetrieveThreads.java +++ b/src/main/java/net/itsthesky/disky/elements/effects/retrieve/RetrieveThreads.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.effects.retrieve; +package net.itsthesky.disky.elements.effects.retrieve; import ch.njol.skript.Skript; import ch.njol.skript.classes.Changer; @@ -8,8 +8,8 @@ import ch.njol.skript.lang.SkriptParser; import ch.njol.skript.util.AsyncEffect; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.core.Bot; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.core.Bot; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.channel.attribute.IPostContainer; import net.dv8tion.jda.api.entities.channel.concrete.ForumChannel; diff --git a/src/main/java/info/itsthesky/disky/elements/effects/retrieve/RetrieveUser.java b/src/main/java/net/itsthesky/disky/elements/effects/retrieve/RetrieveUser.java similarity index 94% rename from src/main/java/info/itsthesky/disky/elements/effects/retrieve/RetrieveUser.java rename to src/main/java/net/itsthesky/disky/elements/effects/retrieve/RetrieveUser.java index ea26031f..afc9ac96 100644 --- a/src/main/java/info/itsthesky/disky/elements/effects/retrieve/RetrieveUser.java +++ b/src/main/java/net/itsthesky/disky/elements/effects/retrieve/RetrieveUser.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.effects.retrieve; +package net.itsthesky.disky.elements.effects.retrieve; import ch.njol.skript.Skript; import ch.njol.skript.classes.Changer; @@ -6,8 +6,8 @@ import ch.njol.skript.lang.SkriptParser; import ch.njol.skript.util.AsyncEffect; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.core.Bot; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.core.Bot; import net.dv8tion.jda.api.entities.User; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/effects/retrieve/RetrieveWebhooks.java b/src/main/java/net/itsthesky/disky/elements/effects/retrieve/RetrieveWebhooks.java similarity index 96% rename from src/main/java/info/itsthesky/disky/elements/effects/retrieve/RetrieveWebhooks.java rename to src/main/java/net/itsthesky/disky/elements/effects/retrieve/RetrieveWebhooks.java index 54e2afc3..51b2a264 100644 --- a/src/main/java/info/itsthesky/disky/elements/effects/retrieve/RetrieveWebhooks.java +++ b/src/main/java/net/itsthesky/disky/elements/effects/retrieve/RetrieveWebhooks.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.effects.retrieve; +package net.itsthesky.disky.elements.effects.retrieve; import ch.njol.skript.Skript; import ch.njol.skript.classes.Changer; @@ -6,7 +6,7 @@ import ch.njol.skript.lang.SkriptParser; import ch.njol.skript.util.AsyncEffect; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; +import net.itsthesky.disky.DiSky; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Webhook; import net.dv8tion.jda.api.entities.channel.concrete.TextChannel; diff --git a/src/main/java/info/itsthesky/disky/elements/effects/webhooks/MakeClientSpeak.java b/src/main/java/net/itsthesky/disky/elements/effects/webhooks/MakeClientSpeak.java similarity index 95% rename from src/main/java/info/itsthesky/disky/elements/effects/webhooks/MakeClientSpeak.java rename to src/main/java/net/itsthesky/disky/elements/effects/webhooks/MakeClientSpeak.java index f047dd31..8b44a890 100644 --- a/src/main/java/info/itsthesky/disky/elements/effects/webhooks/MakeClientSpeak.java +++ b/src/main/java/net/itsthesky/disky/elements/effects/webhooks/MakeClientSpeak.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.effects.webhooks; +package net.itsthesky.disky.elements.effects.webhooks; import ch.njol.skript.Skript; import ch.njol.skript.classes.Changer; @@ -7,9 +7,9 @@ import ch.njol.skript.lang.SkriptParser; import ch.njol.skript.util.AsyncEffect; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.core.SkriptUtils; -import info.itsthesky.disky.managers.wrappers.RegisteredWebhook; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.managers.wrappers.RegisteredWebhook; import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.WebhookClient; diff --git a/src/main/java/info/itsthesky/disky/elements/effects/webhooks/RegisterClient.java b/src/main/java/net/itsthesky/disky/elements/effects/webhooks/RegisterClient.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/effects/webhooks/RegisterClient.java rename to src/main/java/net/itsthesky/disky/elements/effects/webhooks/RegisterClient.java index 98a0eebd..2675459f 100644 --- a/src/main/java/info/itsthesky/disky/elements/effects/webhooks/RegisterClient.java +++ b/src/main/java/net/itsthesky/disky/elements/effects/webhooks/RegisterClient.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.effects.webhooks; +package net.itsthesky.disky.elements.effects.webhooks; import ch.njol.skript.Skript; import ch.njol.skript.config.Node; @@ -6,9 +6,9 @@ import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.SkriptParser; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.core.Bot; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.core.Bot; +import net.itsthesky.disky.core.SkriptUtils; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/info/itsthesky/disky/elements/effects/webhooks/RetrieveWebhooks.java b/src/main/java/net/itsthesky/disky/elements/effects/webhooks/RetrieveWebhooks.java similarity index 95% rename from src/main/java/info/itsthesky/disky/elements/effects/webhooks/RetrieveWebhooks.java rename to src/main/java/net/itsthesky/disky/elements/effects/webhooks/RetrieveWebhooks.java index 9ab1b42e..e739291d 100644 --- a/src/main/java/info/itsthesky/disky/elements/effects/webhooks/RetrieveWebhooks.java +++ b/src/main/java/net/itsthesky/disky/elements/effects/webhooks/RetrieveWebhooks.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.effects.webhooks; +package net.itsthesky.disky.elements.effects.webhooks; import ch.njol.skript.Skript; import ch.njol.skript.classes.Changer; @@ -7,7 +7,7 @@ import ch.njol.skript.lang.SkriptParser; import ch.njol.skript.util.AsyncEffect; import ch.njol.util.Kleenean; -import info.itsthesky.disky.elements.sections.handler.DiSkyRuntimeHandler; +import net.itsthesky.disky.elements.sections.handler.DiSkyRuntimeHandler; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Webhook; import net.dv8tion.jda.api.entities.channel.Channel; diff --git a/src/main/java/info/itsthesky/disky/elements/effects/webhooks/UnregisterClient.java b/src/main/java/net/itsthesky/disky/elements/effects/webhooks/UnregisterClient.java similarity index 91% rename from src/main/java/info/itsthesky/disky/elements/effects/webhooks/UnregisterClient.java rename to src/main/java/net/itsthesky/disky/elements/effects/webhooks/UnregisterClient.java index c44420bd..c5c93c76 100644 --- a/src/main/java/info/itsthesky/disky/elements/effects/webhooks/UnregisterClient.java +++ b/src/main/java/net/itsthesky/disky/elements/effects/webhooks/UnregisterClient.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.effects.webhooks; +package net.itsthesky.disky.elements.effects.webhooks; import ch.njol.skript.Skript; import ch.njol.skript.config.Node; @@ -6,8 +6,8 @@ import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.SkriptParser; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.core.SkriptUtils; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/info/itsthesky/disky/elements/events/DiSkyErrorEvent.java b/src/main/java/net/itsthesky/disky/elements/events/DiSkyErrorEvent.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/events/DiSkyErrorEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/DiSkyErrorEvent.java index 3fe043c5..cd8ba852 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/DiSkyErrorEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/DiSkyErrorEvent.java @@ -1,12 +1,12 @@ -package info.itsthesky.disky.elements.events; +package net.itsthesky.disky.elements.events; import ch.njol.skript.Skript; import ch.njol.skript.lang.Literal; import ch.njol.skript.lang.SelfRegisteringSkriptEvent; import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.skript.lang.Trigger; -import info.itsthesky.disky.api.events.BukkitEvent; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.BukkitEvent; +import net.itsthesky.disky.core.SkriptUtils; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/info/itsthesky/disky/elements/events/ExprEventValues.java b/src/main/java/net/itsthesky/disky/elements/events/ExprEventValues.java similarity index 96% rename from src/main/java/info/itsthesky/disky/elements/events/ExprEventValues.java rename to src/main/java/net/itsthesky/disky/elements/events/ExprEventValues.java index f600cbf4..128c2dbb 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/ExprEventValues.java +++ b/src/main/java/net/itsthesky/disky/elements/events/ExprEventValues.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.events; +package net.itsthesky.disky.elements.events; import ch.njol.skript.Skript; import ch.njol.skript.lang.Expression; @@ -7,7 +7,7 @@ import ch.njol.skript.lang.parser.ParserInstance; import ch.njol.skript.lang.util.SimpleExpression; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.events.EventValue; +import net.itsthesky.disky.api.events.EventValue; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/info/itsthesky/disky/elements/events/bots/BotJoinEvent.java b/src/main/java/net/itsthesky/disky/elements/events/bots/BotJoinEvent.java similarity index 78% rename from src/main/java/info/itsthesky/disky/elements/events/bots/BotJoinEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/bots/BotJoinEvent.java index a2ebb8a1..1dbcc0f9 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/bots/BotJoinEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/bots/BotJoinEvent.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.events.bots; +package net.itsthesky.disky.elements.events.bots; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.events.guild.GuildJoinEvent; diff --git a/src/main/java/info/itsthesky/disky/elements/events/bots/BotLeaveEvent.java b/src/main/java/net/itsthesky/disky/elements/events/bots/BotLeaveEvent.java similarity index 78% rename from src/main/java/info/itsthesky/disky/elements/events/bots/BotLeaveEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/bots/BotLeaveEvent.java index 4c1f8113..faa6572e 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/bots/BotLeaveEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/bots/BotLeaveEvent.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.events.bots; +package net.itsthesky.disky.elements.events.bots; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.events.guild.GuildLeaveEvent; diff --git a/src/main/java/info/itsthesky/disky/elements/events/bots/BotStopEvent.java b/src/main/java/net/itsthesky/disky/elements/events/bots/BotStopEvent.java similarity index 70% rename from src/main/java/info/itsthesky/disky/elements/events/bots/BotStopEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/bots/BotStopEvent.java index 50870f6c..a70b64bb 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/bots/BotStopEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/bots/BotStopEvent.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.events.bots; +package net.itsthesky.disky.elements.events.bots; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.events.session.ShutdownEvent; public class BotStopEvent extends DiSkyEvent { diff --git a/src/main/java/info/itsthesky/disky/elements/events/bots/GuildReadyEvent.java b/src/main/java/net/itsthesky/disky/elements/events/bots/GuildReadyEvent.java similarity index 79% rename from src/main/java/info/itsthesky/disky/elements/events/bots/GuildReadyEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/bots/GuildReadyEvent.java index 69a1da3c..4313da52 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/bots/GuildReadyEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/bots/GuildReadyEvent.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.events.bots; +package net.itsthesky.disky.elements.events.bots; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Guild; public class GuildReadyEvent extends DiSkyEvent { diff --git a/src/main/java/info/itsthesky/disky/elements/events/bots/ReadyEvent.java b/src/main/java/net/itsthesky/disky/elements/events/bots/ReadyEvent.java similarity index 72% rename from src/main/java/info/itsthesky/disky/elements/events/bots/ReadyEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/bots/ReadyEvent.java index 620a208f..77c9f3df 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/bots/ReadyEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/bots/ReadyEvent.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.events.bots; +package net.itsthesky.disky.elements.events.bots; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.core.SkriptUtils; public class ReadyEvent extends DiSkyEvent { diff --git a/src/main/java/info/itsthesky/disky/elements/events/channel/ChannelCreateEvent.java b/src/main/java/net/itsthesky/disky/elements/events/channel/ChannelCreateEvent.java similarity index 84% rename from src/main/java/info/itsthesky/disky/elements/events/channel/ChannelCreateEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/channel/ChannelCreateEvent.java index 1458ba6d..1c8ca9ac 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/channel/ChannelCreateEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/channel/ChannelCreateEvent.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.events.channel; +package net.itsthesky.disky.elements.events.channel; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.channel.Channel; diff --git a/src/main/java/info/itsthesky/disky/elements/events/channel/ChannelDeleteEvent.java b/src/main/java/net/itsthesky/disky/elements/events/channel/ChannelDeleteEvent.java similarity index 84% rename from src/main/java/info/itsthesky/disky/elements/events/channel/ChannelDeleteEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/channel/ChannelDeleteEvent.java index d241c05c..7c32f0b4 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/channel/ChannelDeleteEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/channel/ChannelDeleteEvent.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.events.channel; +package net.itsthesky.disky.elements.events.channel; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.channel.Channel; diff --git a/src/main/java/info/itsthesky/disky/elements/events/guild/GuildAFKChannelEvent.java b/src/main/java/net/itsthesky/disky/elements/events/guild/GuildAFKChannelEvent.java similarity index 89% rename from src/main/java/info/itsthesky/disky/elements/events/guild/GuildAFKChannelEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/guild/GuildAFKChannelEvent.java index 8bc90932..b1d0dfc9 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/guild/GuildAFKChannelEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/guild/GuildAFKChannelEvent.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.events.guild; +package net.itsthesky.disky.elements.events.guild; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.channel.concrete.VoiceChannel; import net.dv8tion.jda.api.events.guild.update.GuildUpdateAfkChannelEvent; diff --git a/src/main/java/info/itsthesky/disky/elements/events/guild/GuildAFKTimeoutEvent.java b/src/main/java/net/itsthesky/disky/elements/events/guild/GuildAFKTimeoutEvent.java similarity index 89% rename from src/main/java/info/itsthesky/disky/elements/events/guild/GuildAFKTimeoutEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/guild/GuildAFKTimeoutEvent.java index f022587e..2d28d3c5 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/guild/GuildAFKTimeoutEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/guild/GuildAFKTimeoutEvent.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.events.guild; +package net.itsthesky.disky.elements.events.guild; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.events.guild.update.GuildUpdateAfkTimeoutEvent; diff --git a/src/main/java/info/itsthesky/disky/elements/events/guild/GuildBanEvent.java b/src/main/java/net/itsthesky/disky/elements/events/guild/GuildBanEvent.java similarity index 86% rename from src/main/java/info/itsthesky/disky/elements/events/guild/GuildBanEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/guild/GuildBanEvent.java index 4b68af5c..203c908a 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/guild/GuildBanEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/guild/GuildBanEvent.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.events.guild; +package net.itsthesky.disky.elements.events.guild; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.User; diff --git a/src/main/java/info/itsthesky/disky/elements/events/guild/GuildBannerEvent.java b/src/main/java/net/itsthesky/disky/elements/events/guild/GuildBannerEvent.java similarity index 88% rename from src/main/java/info/itsthesky/disky/elements/events/guild/GuildBannerEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/guild/GuildBannerEvent.java index 9448a82a..f3bd9ce9 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/guild/GuildBannerEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/guild/GuildBannerEvent.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.events.guild; +package net.itsthesky.disky.elements.events.guild; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.events.guild.update.GuildUpdateBannerEvent; diff --git a/src/main/java/info/itsthesky/disky/elements/events/guild/GuildBoostCountEvent.java b/src/main/java/net/itsthesky/disky/elements/events/guild/GuildBoostCountEvent.java similarity index 89% rename from src/main/java/info/itsthesky/disky/elements/events/guild/GuildBoostCountEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/guild/GuildBoostCountEvent.java index ef15ec1d..0e5981c7 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/guild/GuildBoostCountEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/guild/GuildBoostCountEvent.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.events.guild; +package net.itsthesky.disky.elements.events.guild; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Guild; public class GuildBoostCountEvent extends DiSkyEvent { diff --git a/src/main/java/info/itsthesky/disky/elements/events/guild/GuildBoostTierEvent.java b/src/main/java/net/itsthesky/disky/elements/events/guild/GuildBoostTierEvent.java similarity index 89% rename from src/main/java/info/itsthesky/disky/elements/events/guild/GuildBoostTierEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/guild/GuildBoostTierEvent.java index 93a4a050..edec1902 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/guild/GuildBoostTierEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/guild/GuildBoostTierEvent.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.events.guild; +package net.itsthesky.disky.elements.events.guild; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Guild; public class GuildBoostTierEvent extends DiSkyEvent { diff --git a/src/main/java/info/itsthesky/disky/elements/events/guild/GuildIconEvent.java b/src/main/java/net/itsthesky/disky/elements/events/guild/GuildIconEvent.java similarity index 88% rename from src/main/java/info/itsthesky/disky/elements/events/guild/GuildIconEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/guild/GuildIconEvent.java index 43688a45..cfafacb6 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/guild/GuildIconEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/guild/GuildIconEvent.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.events.guild; +package net.itsthesky.disky.elements.events.guild; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.events.guild.update.GuildUpdateIconEvent; diff --git a/src/main/java/info/itsthesky/disky/elements/events/guild/GuildInviteCreateEvent.java b/src/main/java/net/itsthesky/disky/elements/events/guild/GuildInviteCreateEvent.java similarity index 88% rename from src/main/java/info/itsthesky/disky/elements/events/guild/GuildInviteCreateEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/guild/GuildInviteCreateEvent.java index fceda37f..b18f7bbd 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/guild/GuildInviteCreateEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/guild/GuildInviteCreateEvent.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.events.guild; +package net.itsthesky.disky.elements.events.guild; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Invite; import net.dv8tion.jda.api.entities.channel.Channel; diff --git a/src/main/java/info/itsthesky/disky/elements/events/guild/GuildInviteDeleteEvent.java b/src/main/java/net/itsthesky/disky/elements/events/guild/GuildInviteDeleteEvent.java similarity index 86% rename from src/main/java/info/itsthesky/disky/elements/events/guild/GuildInviteDeleteEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/guild/GuildInviteDeleteEvent.java index 91aabc38..4aae6c11 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/guild/GuildInviteDeleteEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/guild/GuildInviteDeleteEvent.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.events.guild; +package net.itsthesky.disky.elements.events.guild; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.channel.Channel; diff --git a/src/main/java/info/itsthesky/disky/elements/events/guild/GuildJoinEvent.java b/src/main/java/net/itsthesky/disky/elements/events/guild/GuildJoinEvent.java similarity index 80% rename from src/main/java/info/itsthesky/disky/elements/events/guild/GuildJoinEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/guild/GuildJoinEvent.java index 014e1572..f9dd19fd 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/guild/GuildJoinEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/guild/GuildJoinEvent.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.events.guild; +package net.itsthesky.disky.elements.events.guild; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Guild; public class GuildJoinEvent extends DiSkyEvent { diff --git a/src/main/java/info/itsthesky/disky/elements/events/guild/GuildLogEntryEvent.java b/src/main/java/net/itsthesky/disky/elements/events/guild/GuildLogEntryEvent.java similarity index 86% rename from src/main/java/info/itsthesky/disky/elements/events/guild/GuildLogEntryEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/guild/GuildLogEntryEvent.java index eed8add4..51068d12 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/guild/GuildLogEntryEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/guild/GuildLogEntryEvent.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.events.guild; +package net.itsthesky.disky.elements.events.guild; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.audit.AuditLogEntry; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.events.guild.GuildAuditLogEntryCreateEvent; diff --git a/src/main/java/info/itsthesky/disky/elements/events/guild/GuildNameEvent.java b/src/main/java/net/itsthesky/disky/elements/events/guild/GuildNameEvent.java similarity index 87% rename from src/main/java/info/itsthesky/disky/elements/events/guild/GuildNameEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/guild/GuildNameEvent.java index 3d6b7e47..e0387ebe 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/guild/GuildNameEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/guild/GuildNameEvent.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.events.guild; +package net.itsthesky.disky.elements.events.guild; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.events.guild.update.GuildUpdateNameEvent; diff --git a/src/main/java/info/itsthesky/disky/elements/events/guild/GuildOwnerEvent.java b/src/main/java/net/itsthesky/disky/elements/events/guild/GuildOwnerEvent.java similarity index 88% rename from src/main/java/info/itsthesky/disky/elements/events/guild/GuildOwnerEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/guild/GuildOwnerEvent.java index 1cf6ea74..8122f886 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/guild/GuildOwnerEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/guild/GuildOwnerEvent.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.events.guild; +package net.itsthesky.disky.elements.events.guild; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.events.guild.update.GuildUpdateOwnerEvent; diff --git a/src/main/java/info/itsthesky/disky/elements/events/guild/GuildSplashEvent.java b/src/main/java/net/itsthesky/disky/elements/events/guild/GuildSplashEvent.java similarity index 88% rename from src/main/java/info/itsthesky/disky/elements/events/guild/GuildSplashEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/guild/GuildSplashEvent.java index ac74423e..c18c6236 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/guild/GuildSplashEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/guild/GuildSplashEvent.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.events.guild; +package net.itsthesky.disky.elements.events.guild; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.events.guild.update.GuildUpdateSplashEvent; diff --git a/src/main/java/info/itsthesky/disky/elements/events/guild/GuildUnbanEvent.java b/src/main/java/net/itsthesky/disky/elements/events/guild/GuildUnbanEvent.java similarity index 85% rename from src/main/java/info/itsthesky/disky/elements/events/guild/GuildUnbanEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/guild/GuildUnbanEvent.java index a76814a3..143bb4e8 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/guild/GuildUnbanEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/guild/GuildUnbanEvent.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.events.guild; +package net.itsthesky.disky.elements.events.guild; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.User; diff --git a/src/main/java/info/itsthesky/disky/elements/events/guild/GuildVoiceDeafenEvent.java b/src/main/java/net/itsthesky/disky/elements/events/guild/GuildVoiceDeafenEvent.java similarity index 85% rename from src/main/java/info/itsthesky/disky/elements/events/guild/GuildVoiceDeafenEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/guild/GuildVoiceDeafenEvent.java index 15446c37..78a72a87 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/guild/GuildVoiceDeafenEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/guild/GuildVoiceDeafenEvent.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.events.guild; +package net.itsthesky.disky.elements.events.guild; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.events.guild.voice.GuildVoiceGuildDeafenEvent; diff --git a/src/main/java/info/itsthesky/disky/elements/events/guild/GuildVoiceMuteEvent.java b/src/main/java/net/itsthesky/disky/elements/events/guild/GuildVoiceMuteEvent.java similarity index 84% rename from src/main/java/info/itsthesky/disky/elements/events/guild/GuildVoiceMuteEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/guild/GuildVoiceMuteEvent.java index d7ca378f..82f69394 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/guild/GuildVoiceMuteEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/guild/GuildVoiceMuteEvent.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.events.guild; +package net.itsthesky.disky.elements.events.guild; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.events.guild.voice.GuildVoiceGuildMuteEvent; diff --git a/src/main/java/info/itsthesky/disky/elements/events/interactions/ButtonClickEvent.java b/src/main/java/net/itsthesky/disky/elements/events/interactions/ButtonClickEvent.java similarity index 91% rename from src/main/java/info/itsthesky/disky/elements/events/interactions/ButtonClickEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/interactions/ButtonClickEvent.java index 784926b1..6b5a3d5f 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/interactions/ButtonClickEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/interactions/ButtonClickEvent.java @@ -1,10 +1,10 @@ -package info.itsthesky.disky.elements.events.interactions; +package net.itsthesky.disky.elements.events.interactions; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.api.events.specific.ComponentInteractionEvent; -import info.itsthesky.disky.api.events.specific.ModalEvent; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.api.events.specific.ComponentInteractionEvent; +import net.itsthesky.disky.api.events.specific.ModalEvent; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; diff --git a/src/main/java/info/itsthesky/disky/elements/events/interactions/EntityDropdownClickEvent.java b/src/main/java/net/itsthesky/disky/elements/events/interactions/EntityDropdownClickEvent.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/events/interactions/EntityDropdownClickEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/interactions/EntityDropdownClickEvent.java index 597fabaf..e84d0339 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/interactions/EntityDropdownClickEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/interactions/EntityDropdownClickEvent.java @@ -1,16 +1,16 @@ -package info.itsthesky.disky.elements.events.interactions; +package net.itsthesky.disky.elements.events.interactions; import ch.njol.skript.Skript; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; import ch.njol.skript.doc.Name; import ch.njol.skript.lang.ExpressionType; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.api.events.specific.ComponentInteractionEvent; -import info.itsthesky.disky.api.events.specific.ModalEvent; -import info.itsthesky.disky.api.skript.MultipleGetterExpression; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.api.events.specific.ComponentInteractionEvent; +import net.itsthesky.disky.api.events.specific.ModalEvent; +import net.itsthesky.disky.api.skript.MultipleGetterExpression; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.*; import net.dv8tion.jda.api.entities.channel.concrete.NewsChannel; import net.dv8tion.jda.api.entities.channel.concrete.PrivateChannel; diff --git a/src/main/java/info/itsthesky/disky/elements/events/interactions/MessageCommandEvent.java b/src/main/java/net/itsthesky/disky/elements/events/interactions/MessageCommandEvent.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/events/interactions/MessageCommandEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/interactions/MessageCommandEvent.java index 48aa960d..10dd6596 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/interactions/MessageCommandEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/interactions/MessageCommandEvent.java @@ -1,16 +1,16 @@ -package info.itsthesky.disky.elements.events.interactions; +package net.itsthesky.disky.elements.events.interactions; import ch.njol.skript.Skript; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; import ch.njol.skript.doc.Name; import ch.njol.skript.lang.ExpressionType; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.api.events.specific.InteractionEvent; -import info.itsthesky.disky.api.events.specific.ModalEvent; -import info.itsthesky.disky.api.skript.SimpleGetterExpression; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.api.events.specific.InteractionEvent; +import net.itsthesky.disky.api.events.specific.ModalEvent; +import net.itsthesky.disky.api.skript.SimpleGetterExpression; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; diff --git a/src/main/java/info/itsthesky/disky/elements/events/interactions/ModalSendEvent.java b/src/main/java/net/itsthesky/disky/elements/events/interactions/ModalSendEvent.java similarity index 91% rename from src/main/java/info/itsthesky/disky/elements/events/interactions/ModalSendEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/interactions/ModalSendEvent.java index 2268708b..789882d8 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/interactions/ModalSendEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/interactions/ModalSendEvent.java @@ -1,9 +1,9 @@ -package info.itsthesky.disky.elements.events.interactions; +package net.itsthesky.disky.elements.events.interactions; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.api.events.specific.InteractionEvent; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.api.events.specific.InteractionEvent; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.User; diff --git a/src/main/java/info/itsthesky/disky/elements/events/interactions/SlashCommandReceiveEvent.java b/src/main/java/net/itsthesky/disky/elements/events/interactions/SlashCommandReceiveEvent.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/events/interactions/SlashCommandReceiveEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/interactions/SlashCommandReceiveEvent.java index 57ce65d9..734def11 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/interactions/SlashCommandReceiveEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/interactions/SlashCommandReceiveEvent.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.events.interactions; +package net.itsthesky.disky.elements.events.interactions; import ch.njol.skript.Skript; import ch.njol.skript.doc.Description; @@ -8,14 +8,14 @@ import ch.njol.skript.lang.ExpressionType; import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.api.events.specific.InteractionEvent; -import info.itsthesky.disky.api.events.specific.ModalEvent; -import info.itsthesky.disky.api.skript.EasyElement; -import info.itsthesky.disky.api.skript.SimpleGetterExpression; -import info.itsthesky.disky.core.JDAUtils; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.api.events.specific.InteractionEvent; +import net.itsthesky.disky.api.events.specific.ModalEvent; +import net.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.api.skript.SimpleGetterExpression; +import net.itsthesky.disky.core.JDAUtils; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.User; diff --git a/src/main/java/info/itsthesky/disky/elements/events/interactions/SlashCompletionEvent.java b/src/main/java/net/itsthesky/disky/elements/events/interactions/SlashCompletionEvent.java similarity index 94% rename from src/main/java/info/itsthesky/disky/elements/events/interactions/SlashCompletionEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/interactions/SlashCompletionEvent.java index 20cec757..152fd577 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/interactions/SlashCompletionEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/interactions/SlashCompletionEvent.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.events.interactions; +package net.itsthesky.disky.elements.events.interactions; import ch.njol.skript.Skript; import ch.njol.skript.doc.Description; @@ -9,13 +9,13 @@ import ch.njol.skript.sections.SecLoop; import ch.njol.skript.sections.SecWhile; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.api.events.specific.InteractionEvent; -import info.itsthesky.disky.api.skript.EasyElement; -import info.itsthesky.disky.api.skript.SimpleGetterExpression; -import info.itsthesky.disky.core.JDAUtils; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.api.events.specific.InteractionEvent; +import net.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.api.skript.SimpleGetterExpression; +import net.itsthesky.disky.core.JDAUtils; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.User; diff --git a/src/main/java/info/itsthesky/disky/elements/events/interactions/StringDropdownClickEvent.java b/src/main/java/net/itsthesky/disky/elements/events/interactions/StringDropdownClickEvent.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/events/interactions/StringDropdownClickEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/interactions/StringDropdownClickEvent.java index 27dabb5b..3a55c24b 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/interactions/StringDropdownClickEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/interactions/StringDropdownClickEvent.java @@ -1,16 +1,16 @@ -package info.itsthesky.disky.elements.events.interactions; +package net.itsthesky.disky.elements.events.interactions; import ch.njol.skript.Skript; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; import ch.njol.skript.doc.Name; import ch.njol.skript.lang.ExpressionType; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.api.events.specific.ComponentInteractionEvent; -import info.itsthesky.disky.api.events.specific.ModalEvent; -import info.itsthesky.disky.api.skript.MultipleGetterExpression; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.api.events.specific.ComponentInteractionEvent; +import net.itsthesky.disky.api.events.specific.ModalEvent; +import net.itsthesky.disky.api.skript.MultipleGetterExpression; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; diff --git a/src/main/java/info/itsthesky/disky/elements/events/interactions/UserCommandEvent.java b/src/main/java/net/itsthesky/disky/elements/events/interactions/UserCommandEvent.java similarity index 91% rename from src/main/java/info/itsthesky/disky/elements/events/interactions/UserCommandEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/interactions/UserCommandEvent.java index 3e93491e..f54bd14d 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/interactions/UserCommandEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/interactions/UserCommandEvent.java @@ -1,16 +1,16 @@ -package info.itsthesky.disky.elements.events.interactions; +package net.itsthesky.disky.elements.events.interactions; import ch.njol.skript.Skript; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; import ch.njol.skript.doc.Name; import ch.njol.skript.lang.ExpressionType; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.api.events.specific.InteractionEvent; -import info.itsthesky.disky.api.events.specific.ModalEvent; -import info.itsthesky.disky.api.skript.SimpleGetterExpression; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.api.events.specific.InteractionEvent; +import net.itsthesky.disky.api.events.specific.ModalEvent; +import net.itsthesky.disky.api.skript.SimpleGetterExpression; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.User; diff --git a/src/main/java/info/itsthesky/disky/elements/events/member/BukkitMemberRemoveEvent.java b/src/main/java/net/itsthesky/disky/elements/events/member/BukkitMemberRemoveEvent.java similarity index 94% rename from src/main/java/info/itsthesky/disky/elements/events/member/BukkitMemberRemoveEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/member/BukkitMemberRemoveEvent.java index e8b58d54..b0c4ae7b 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/member/BukkitMemberRemoveEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/member/BukkitMemberRemoveEvent.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.events.member; +package net.itsthesky.disky.elements.events.member; import net.dv8tion.jda.api.JDA; import net.dv8tion.jda.api.entities.Guild; diff --git a/src/main/java/info/itsthesky/disky/elements/events/member/MemberAcceptScreenEvent.java b/src/main/java/net/itsthesky/disky/elements/events/member/MemberAcceptScreenEvent.java similarity index 90% rename from src/main/java/info/itsthesky/disky/elements/events/member/MemberAcceptScreenEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/member/MemberAcceptScreenEvent.java index da455698..031ab036 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/member/MemberAcceptScreenEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/member/MemberAcceptScreenEvent.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.events.member; +package net.itsthesky.disky.elements.events.member; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.events.guild.member.update.GuildMemberUpdatePendingEvent; diff --git a/src/main/java/info/itsthesky/disky/elements/events/member/MemberAvatarEvent.java b/src/main/java/net/itsthesky/disky/elements/events/member/MemberAvatarEvent.java similarity index 89% rename from src/main/java/info/itsthesky/disky/elements/events/member/MemberAvatarEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/member/MemberAvatarEvent.java index 9d47bba6..47ac5146 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/member/MemberAvatarEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/member/MemberAvatarEvent.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.events.member; +package net.itsthesky.disky.elements.events.member; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.events.guild.member.update.GuildMemberUpdateAvatarEvent; diff --git a/src/main/java/info/itsthesky/disky/elements/events/member/MemberBanEvent.java b/src/main/java/net/itsthesky/disky/elements/events/member/MemberBanEvent.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/events/member/MemberBanEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/member/MemberBanEvent.java index 0d34066b..857181b7 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/member/MemberBanEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/member/MemberBanEvent.java @@ -1,11 +1,11 @@ -package info.itsthesky.disky.elements.events.member; +package net.itsthesky.disky.elements.events.member; import ch.njol.skript.Skript; import ch.njol.skript.lang.Literal; import ch.njol.skript.lang.SkriptEvent; import ch.njol.skript.lang.SkriptParser; -import info.itsthesky.disky.core.Bot; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.core.Bot; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.JDA; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; diff --git a/src/main/java/info/itsthesky/disky/elements/events/member/MemberBoostEvent.java b/src/main/java/net/itsthesky/disky/elements/events/member/MemberBoostEvent.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/events/member/MemberBoostEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/member/MemberBoostEvent.java index f781e5b2..2d336a74 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/member/MemberBoostEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/member/MemberBoostEvent.java @@ -1,9 +1,9 @@ -package info.itsthesky.disky.elements.events.member; +package net.itsthesky.disky.elements.events.member; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.api.events.specific.MessageEvent; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.api.events.specific.MessageEvent; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.MessageType; diff --git a/src/main/java/info/itsthesky/disky/elements/events/member/MemberBoostTimeUpdateEvent.java b/src/main/java/net/itsthesky/disky/elements/events/member/MemberBoostTimeUpdateEvent.java similarity index 89% rename from src/main/java/info/itsthesky/disky/elements/events/member/MemberBoostTimeUpdateEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/member/MemberBoostTimeUpdateEvent.java index d32bbd59..afdb1822 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/member/MemberBoostTimeUpdateEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/member/MemberBoostTimeUpdateEvent.java @@ -1,9 +1,9 @@ -package info.itsthesky.disky.elements.events.member; +package net.itsthesky.disky.elements.events.member; import ch.njol.skript.util.Date; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.User; diff --git a/src/main/java/info/itsthesky/disky/elements/events/member/MemberJoinEvent.java b/src/main/java/net/itsthesky/disky/elements/events/member/MemberJoinEvent.java similarity index 83% rename from src/main/java/info/itsthesky/disky/elements/events/member/MemberJoinEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/member/MemberJoinEvent.java index 9c98a77b..6f059157 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/member/MemberJoinEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/member/MemberJoinEvent.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.events.member; +package net.itsthesky.disky.elements.events.member; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.events.guild.member.GuildMemberJoinEvent; diff --git a/src/main/java/info/itsthesky/disky/elements/events/member/MemberKickEvent.java b/src/main/java/net/itsthesky/disky/elements/events/member/MemberKickEvent.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/events/member/MemberKickEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/member/MemberKickEvent.java index acbd8ca7..70289140 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/member/MemberKickEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/member/MemberKickEvent.java @@ -1,11 +1,11 @@ -package info.itsthesky.disky.elements.events.member; +package net.itsthesky.disky.elements.events.member; import ch.njol.skript.Skript; import ch.njol.skript.lang.Literal; import ch.njol.skript.lang.SkriptEvent; import ch.njol.skript.lang.SkriptParser; -import info.itsthesky.disky.core.Bot; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.core.Bot; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.JDA; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; diff --git a/src/main/java/info/itsthesky/disky/elements/events/member/MemberNicknameEvent.java b/src/main/java/net/itsthesky/disky/elements/events/member/MemberNicknameEvent.java similarity index 89% rename from src/main/java/info/itsthesky/disky/elements/events/member/MemberNicknameEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/member/MemberNicknameEvent.java index 4b30f966..6891914f 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/member/MemberNicknameEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/member/MemberNicknameEvent.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.events.member; +package net.itsthesky.disky.elements.events.member; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.events.guild.member.update.GuildMemberUpdateNicknameEvent; diff --git a/src/main/java/info/itsthesky/disky/elements/events/member/MemberRemoveEvent.java b/src/main/java/net/itsthesky/disky/elements/events/member/MemberRemoveEvent.java similarity index 85% rename from src/main/java/info/itsthesky/disky/elements/events/member/MemberRemoveEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/member/MemberRemoveEvent.java index bdefc466..914ab1dd 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/member/MemberRemoveEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/member/MemberRemoveEvent.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.events.member; +package net.itsthesky.disky.elements.events.member; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.events.guild.member.GuildMemberRemoveEvent; diff --git a/src/main/java/info/itsthesky/disky/elements/events/member/MemberRoleAddEvent.java b/src/main/java/net/itsthesky/disky/elements/events/member/MemberRoleAddEvent.java similarity index 87% rename from src/main/java/info/itsthesky/disky/elements/events/member/MemberRoleAddEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/member/MemberRoleAddEvent.java index 0d628b87..86c26967 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/member/MemberRoleAddEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/member/MemberRoleAddEvent.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.events.member; +package net.itsthesky.disky.elements.events.member; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Role; diff --git a/src/main/java/info/itsthesky/disky/elements/events/member/MemberRoleRemoveEvent.java b/src/main/java/net/itsthesky/disky/elements/events/member/MemberRoleRemoveEvent.java similarity index 87% rename from src/main/java/info/itsthesky/disky/elements/events/member/MemberRoleRemoveEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/member/MemberRoleRemoveEvent.java index dc7e6bd9..8e70bdc2 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/member/MemberRoleRemoveEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/member/MemberRoleRemoveEvent.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.events.member; +package net.itsthesky.disky.elements.events.member; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Role; diff --git a/src/main/java/info/itsthesky/disky/elements/events/member/MemberSelfDeafenEvent.java b/src/main/java/net/itsthesky/disky/elements/events/member/MemberSelfDeafenEvent.java similarity index 87% rename from src/main/java/info/itsthesky/disky/elements/events/member/MemberSelfDeafenEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/member/MemberSelfDeafenEvent.java index 240b2971..21b694d8 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/member/MemberSelfDeafenEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/member/MemberSelfDeafenEvent.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.events.member; +package net.itsthesky.disky.elements.events.member; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.events.guild.voice.GuildVoiceSelfDeafenEvent; diff --git a/src/main/java/info/itsthesky/disky/elements/events/member/MemberSelfMuteEvent.java b/src/main/java/net/itsthesky/disky/elements/events/member/MemberSelfMuteEvent.java similarity index 86% rename from src/main/java/info/itsthesky/disky/elements/events/member/MemberSelfMuteEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/member/MemberSelfMuteEvent.java index 34892252..41c6fb12 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/member/MemberSelfMuteEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/member/MemberSelfMuteEvent.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.events.member; +package net.itsthesky.disky.elements.events.member; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.events.guild.voice.GuildVoiceSelfMuteEvent; diff --git a/src/main/java/info/itsthesky/disky/elements/events/member/MemberTimeoutEvent.java b/src/main/java/net/itsthesky/disky/elements/events/member/MemberTimeoutEvent.java similarity index 87% rename from src/main/java/info/itsthesky/disky/elements/events/member/MemberTimeoutEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/member/MemberTimeoutEvent.java index 0234d063..08b3bc35 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/member/MemberTimeoutEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/member/MemberTimeoutEvent.java @@ -1,10 +1,10 @@ -package info.itsthesky.disky.elements.events.member; +package net.itsthesky.disky.elements.events.member; import ch.njol.skript.util.Date; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.api.skript.reflects.ReflectEventExpressionFactory; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.api.skript.reflects.ReflectEventExpressionFactory; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.audit.ActionType; import net.dv8tion.jda.api.audit.AuditLogKey; import net.dv8tion.jda.api.entities.Guild; @@ -16,7 +16,7 @@ import java.util.function.Predicate; -import static info.itsthesky.disky.core.SkriptUtils.convertDateTime; +import static net.itsthesky.disky.core.SkriptUtils.convertDateTime; public class MemberTimeoutEvent extends DiSkyEvent { diff --git a/src/main/java/info/itsthesky/disky/elements/events/member/MemberVoiceJoinEvent.java b/src/main/java/net/itsthesky/disky/elements/events/member/MemberVoiceJoinEvent.java similarity index 94% rename from src/main/java/info/itsthesky/disky/elements/events/member/MemberVoiceJoinEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/member/MemberVoiceJoinEvent.java index 6c644c8b..58aca540 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/member/MemberVoiceJoinEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/member/MemberVoiceJoinEvent.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.events.member; +package net.itsthesky.disky.elements.events.member; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.channel.concrete.StageChannel; diff --git a/src/main/java/info/itsthesky/disky/elements/events/member/MemberVoiceLeaveEvent.java b/src/main/java/net/itsthesky/disky/elements/events/member/MemberVoiceLeaveEvent.java similarity index 90% rename from src/main/java/info/itsthesky/disky/elements/events/member/MemberVoiceLeaveEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/member/MemberVoiceLeaveEvent.java index 748d8e08..396762a0 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/member/MemberVoiceLeaveEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/member/MemberVoiceLeaveEvent.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.events.member; +package net.itsthesky.disky.elements.events.member; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.channel.concrete.StageChannel; diff --git a/src/main/java/info/itsthesky/disky/elements/events/messages/MessageDeleteEvent.java b/src/main/java/net/itsthesky/disky/elements/events/messages/MessageDeleteEvent.java similarity index 90% rename from src/main/java/info/itsthesky/disky/elements/events/messages/MessageDeleteEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/messages/MessageDeleteEvent.java index 022b3336..5dcdf546 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/messages/MessageDeleteEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/messages/MessageDeleteEvent.java @@ -1,10 +1,10 @@ -package info.itsthesky.disky.elements.events.messages; +package net.itsthesky.disky.elements.events.messages; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.core.SkriptUtils; -import info.itsthesky.disky.managers.MessageManager; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.managers.MessageManager; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.channel.concrete.NewsChannel; @@ -13,6 +13,7 @@ import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel; import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel; import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel; +import net.itsthesky.disky.api.events.specific.MessageEvent; public class MessageDeleteEvent extends DiSkyEvent { @@ -59,7 +60,7 @@ public class MessageDeleteEvent extends DiSkyEvent event.getJDAEvent().getMessageIdLong()); } - public static class BukkitMessageDeleteEvent extends SimpleDiSkyEvent implements info.itsthesky.disky.api.events.specific.MessageEvent { + public static class BukkitMessageDeleteEvent extends SimpleDiSkyEvent implements MessageEvent { public BukkitMessageDeleteEvent(MessageDeleteEvent event) {} @Override diff --git a/src/main/java/info/itsthesky/disky/elements/events/messages/MessageEditEvent.java b/src/main/java/net/itsthesky/disky/elements/events/messages/MessageEditEvent.java similarity index 89% rename from src/main/java/info/itsthesky/disky/elements/events/messages/MessageEditEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/messages/MessageEditEvent.java index d8f57efc..ba3d0996 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/messages/MessageEditEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/messages/MessageEditEvent.java @@ -1,9 +1,9 @@ -package info.itsthesky.disky.elements.events.messages; +package net.itsthesky.disky.elements.events.messages; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.core.SkriptUtils; -import info.itsthesky.disky.managers.MessageManager; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.managers.MessageManager; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.channel.concrete.NewsChannel; @@ -13,6 +13,7 @@ import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel; import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel; import net.dv8tion.jda.api.events.message.MessageUpdateEvent; +import net.itsthesky.disky.api.events.specific.MessageEvent; public class MessageEditEvent extends DiSkyEvent { @@ -49,7 +50,7 @@ public class MessageEditEvent extends DiSkyEvent { event -> !event.getJDAEvent().isFromGuild() ? event.getJDAEvent().getChannel().asPrivateChannel() : null); } - public static class BukkitMessageEditEvent extends SimpleDiSkyEvent implements info.itsthesky.disky.api.events.specific.MessageEvent { + public static class BukkitMessageEditEvent extends SimpleDiSkyEvent implements MessageEvent { public BukkitMessageEditEvent(MessageEditEvent event) {} @Override diff --git a/src/main/java/info/itsthesky/disky/elements/events/messages/MessageEvent.java b/src/main/java/net/itsthesky/disky/elements/events/messages/MessageEvent.java similarity index 91% rename from src/main/java/info/itsthesky/disky/elements/events/messages/MessageEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/messages/MessageEvent.java index a50f3a11..52f4c6ba 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/messages/MessageEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/messages/MessageEvent.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.events.messages; +package net.itsthesky.disky.elements.events.messages; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; @@ -55,7 +55,7 @@ public class MessageEvent extends DiSkyEvent { event -> !event.getJDAEvent().isFromGuild() ? event.getJDAEvent().getChannel().asPrivateChannel() : null); } - public static class BukkitMessageEvent extends SimpleDiSkyEvent implements info.itsthesky.disky.api.events.specific.MessageEvent { + public static class BukkitMessageEvent extends SimpleDiSkyEvent implements net.itsthesky.disky.api.events.specific.MessageEvent { public BukkitMessageEvent(MessageEvent event) {} @Override diff --git a/src/main/java/info/itsthesky/disky/elements/events/polls/PollVoteAddEvent.java b/src/main/java/net/itsthesky/disky/elements/events/polls/PollVoteAddEvent.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/events/polls/PollVoteAddEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/polls/PollVoteAddEvent.java index da211df0..c776bdf5 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/polls/PollVoteAddEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/polls/PollVoteAddEvent.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.events.polls; +package net.itsthesky.disky.elements.events.polls; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.channel.concrete.NewsChannel; import net.dv8tion.jda.api.entities.channel.concrete.PrivateChannel; diff --git a/src/main/java/info/itsthesky/disky/elements/events/polls/PollVoteRemoveEvent.java b/src/main/java/net/itsthesky/disky/elements/events/polls/PollVoteRemoveEvent.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/events/polls/PollVoteRemoveEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/polls/PollVoteRemoveEvent.java index e1d8014b..836e8ece 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/polls/PollVoteRemoveEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/polls/PollVoteRemoveEvent.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.events.polls; +package net.itsthesky.disky.elements.events.polls; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.channel.concrete.NewsChannel; import net.dv8tion.jda.api.entities.channel.concrete.PrivateChannel; diff --git a/src/main/java/info/itsthesky/disky/elements/events/react/ReactionAddEvent.java b/src/main/java/net/itsthesky/disky/elements/events/react/ReactionAddEvent.java similarity index 90% rename from src/main/java/info/itsthesky/disky/elements/events/react/ReactionAddEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/react/ReactionAddEvent.java index 50c7443a..2caf2ebb 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/react/ReactionAddEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/react/ReactionAddEvent.java @@ -1,9 +1,9 @@ -package info.itsthesky.disky.elements.events.react; +package net.itsthesky.disky.elements.events.react; -import info.itsthesky.disky.api.emojis.Emote; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.emojis.Emote; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.MessageReaction; @@ -15,6 +15,7 @@ import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel; import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel; import net.dv8tion.jda.api.events.message.react.MessageReactionAddEvent; +import net.itsthesky.disky.api.events.specific.MessageEvent; public class ReactionAddEvent extends DiSkyEvent { @@ -58,7 +59,7 @@ public class ReactionAddEvent extends DiSkyEvent { event -> !event.getJDAEvent().isFromGuild() ? event.getJDAEvent().getChannel().asPrivateChannel() : null); } - public static class BukkitReactionAddEvent extends SimpleDiSkyEvent implements info.itsthesky.disky.api.events.specific.MessageEvent { + public static class BukkitReactionAddEvent extends SimpleDiSkyEvent implements MessageEvent { public BukkitReactionAddEvent(ReactionAddEvent event) {} @Override diff --git a/src/main/java/info/itsthesky/disky/elements/events/react/ReactionRemoveAllEvent.java b/src/main/java/net/itsthesky/disky/elements/events/react/ReactionRemoveAllEvent.java similarity index 89% rename from src/main/java/info/itsthesky/disky/elements/events/react/ReactionRemoveAllEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/react/ReactionRemoveAllEvent.java index a0884de6..60bf8760 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/react/ReactionRemoveAllEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/react/ReactionRemoveAllEvent.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.events.react; +package net.itsthesky.disky.elements.events.react; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.channel.concrete.NewsChannel; import net.dv8tion.jda.api.entities.channel.concrete.PrivateChannel; @@ -11,6 +11,7 @@ import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel; import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel; import net.dv8tion.jda.api.events.message.react.MessageReactionRemoveAllEvent; +import net.itsthesky.disky.api.events.specific.MessageEvent; public class ReactionRemoveAllEvent extends DiSkyEvent { @@ -47,7 +48,7 @@ public class ReactionRemoveAllEvent extends DiSkyEvent !event.getJDAEvent().isFromGuild() ? event.getJDAEvent().getChannel().asPrivateChannel() : null); } - public static class BukkitReactionRemoveAllEvent extends SimpleDiSkyEvent implements info.itsthesky.disky.api.events.specific.MessageEvent { + public static class BukkitReactionRemoveAllEvent extends SimpleDiSkyEvent implements MessageEvent { public BukkitReactionRemoveAllEvent(ReactionRemoveAllEvent event) {} @Override diff --git a/src/main/java/info/itsthesky/disky/elements/events/react/ReactionRemoveEvent.java b/src/main/java/net/itsthesky/disky/elements/events/react/ReactionRemoveEvent.java similarity index 89% rename from src/main/java/info/itsthesky/disky/elements/events/react/ReactionRemoveEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/react/ReactionRemoveEvent.java index 0c3dd600..1a17d628 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/react/ReactionRemoveEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/react/ReactionRemoveEvent.java @@ -1,9 +1,9 @@ -package info.itsthesky.disky.elements.events.react; +package net.itsthesky.disky.elements.events.react; -import info.itsthesky.disky.api.emojis.Emote; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.emojis.Emote; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.User; @@ -14,6 +14,7 @@ import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel; import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel; import net.dv8tion.jda.api.events.message.react.MessageReactionRemoveEvent; +import net.itsthesky.disky.api.events.specific.MessageEvent; public class ReactionRemoveEvent extends DiSkyEvent { @@ -53,7 +54,7 @@ public class ReactionRemoveEvent extends DiSkyEvent event -> !event.getJDAEvent().isFromGuild() ? event.getJDAEvent().getChannel().asPrivateChannel() : null); } - public static class BukkitReactionRemoveEvent extends SimpleDiSkyEvent implements info.itsthesky.disky.api.events.specific.MessageEvent { + public static class BukkitReactionRemoveEvent extends SimpleDiSkyEvent implements MessageEvent { public BukkitReactionRemoveEvent(ReactionRemoveEvent event) {} @Override diff --git a/src/main/java/info/itsthesky/disky/elements/events/role/RoleColorEvent.java b/src/main/java/net/itsthesky/disky/elements/events/role/RoleColorEvent.java similarity index 89% rename from src/main/java/info/itsthesky/disky/elements/events/role/RoleColorEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/role/RoleColorEvent.java index 02796412..5da81d77 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/role/RoleColorEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/role/RoleColorEvent.java @@ -1,9 +1,9 @@ -package info.itsthesky.disky.elements.events.role; +package net.itsthesky.disky.elements.events.role; import ch.njol.skript.util.Color; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Role; import net.dv8tion.jda.api.events.role.update.RoleUpdateColorEvent; diff --git a/src/main/java/info/itsthesky/disky/elements/events/role/RoleCreateEvent.java b/src/main/java/net/itsthesky/disky/elements/events/role/RoleCreateEvent.java similarity index 85% rename from src/main/java/info/itsthesky/disky/elements/events/role/RoleCreateEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/role/RoleCreateEvent.java index 1a525e95..21ac9aaa 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/role/RoleCreateEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/role/RoleCreateEvent.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.events.role; +package net.itsthesky.disky.elements.events.role; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Role; diff --git a/src/main/java/info/itsthesky/disky/elements/events/role/RoleDeleteEvent.java b/src/main/java/net/itsthesky/disky/elements/events/role/RoleDeleteEvent.java similarity index 85% rename from src/main/java/info/itsthesky/disky/elements/events/role/RoleDeleteEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/role/RoleDeleteEvent.java index 6a2ffa60..66e17e4c 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/role/RoleDeleteEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/role/RoleDeleteEvent.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.events.role; +package net.itsthesky.disky.elements.events.role; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Role; diff --git a/src/main/java/info/itsthesky/disky/elements/events/role/RoleHoistedEvent.java b/src/main/java/net/itsthesky/disky/elements/events/role/RoleHoistedEvent.java similarity index 89% rename from src/main/java/info/itsthesky/disky/elements/events/role/RoleHoistedEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/role/RoleHoistedEvent.java index 3da3db1e..1da921a0 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/role/RoleHoistedEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/role/RoleHoistedEvent.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.events.role; +package net.itsthesky.disky.elements.events.role; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Role; import net.dv8tion.jda.api.events.role.update.RoleUpdateHoistedEvent; diff --git a/src/main/java/info/itsthesky/disky/elements/events/role/RoleIconEvent.java b/src/main/java/net/itsthesky/disky/elements/events/role/RoleIconEvent.java similarity index 88% rename from src/main/java/info/itsthesky/disky/elements/events/role/RoleIconEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/role/RoleIconEvent.java index b233b1ee..d65f4cf6 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/role/RoleIconEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/role/RoleIconEvent.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.events.role; +package net.itsthesky.disky.elements.events.role; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Role; import net.dv8tion.jda.api.events.role.update.RoleUpdateIconEvent; diff --git a/src/main/java/info/itsthesky/disky/elements/events/role/RoleNameEvent.java b/src/main/java/net/itsthesky/disky/elements/events/role/RoleNameEvent.java similarity index 88% rename from src/main/java/info/itsthesky/disky/elements/events/role/RoleNameEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/role/RoleNameEvent.java index 65461fcb..58b71af8 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/role/RoleNameEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/role/RoleNameEvent.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.events.role; +package net.itsthesky.disky.elements.events.role; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Role; import net.dv8tion.jda.api.events.role.update.RoleUpdateNameEvent; diff --git a/src/main/java/info/itsthesky/disky/elements/events/role/RolePermissionEvent.java b/src/main/java/net/itsthesky/disky/elements/events/role/RolePermissionEvent.java similarity index 87% rename from src/main/java/info/itsthesky/disky/elements/events/role/RolePermissionEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/role/RolePermissionEvent.java index 16356b32..8c002b23 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/role/RolePermissionEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/role/RolePermissionEvent.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.events.role; +package net.itsthesky.disky.elements.events.role; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Role; diff --git a/src/main/java/info/itsthesky/disky/elements/events/role/RolePositionEvent.java b/src/main/java/net/itsthesky/disky/elements/events/role/RolePositionEvent.java similarity index 88% rename from src/main/java/info/itsthesky/disky/elements/events/role/RolePositionEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/role/RolePositionEvent.java index 10af3e39..fbc70b4c 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/role/RolePositionEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/role/RolePositionEvent.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.events.role; +package net.itsthesky.disky.elements.events.role; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Role; import net.dv8tion.jda.api.events.role.update.RoleUpdatePositionEvent; diff --git a/src/main/java/info/itsthesky/disky/elements/events/thread/ThreadJoinEvent.java b/src/main/java/net/itsthesky/disky/elements/events/thread/ThreadJoinEvent.java similarity index 87% rename from src/main/java/info/itsthesky/disky/elements/events/thread/ThreadJoinEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/thread/ThreadJoinEvent.java index b17ab3ca..185e3095 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/thread/ThreadJoinEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/thread/ThreadJoinEvent.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.events.thread; +package net.itsthesky.disky.elements.events.thread; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel; diff --git a/src/main/java/info/itsthesky/disky/elements/events/thread/ThreadLeaveEvent.java b/src/main/java/net/itsthesky/disky/elements/events/thread/ThreadLeaveEvent.java similarity index 87% rename from src/main/java/info/itsthesky/disky/elements/events/thread/ThreadLeaveEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/thread/ThreadLeaveEvent.java index 6e76750a..70ec8b4a 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/thread/ThreadLeaveEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/thread/ThreadLeaveEvent.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.events.thread; +package net.itsthesky.disky.elements.events.thread; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel; diff --git a/src/main/java/info/itsthesky/disky/elements/events/user/UserActivityOrderEvent.java b/src/main/java/net/itsthesky/disky/elements/events/user/UserActivityOrderEvent.java similarity index 83% rename from src/main/java/info/itsthesky/disky/elements/events/user/UserActivityOrderEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/user/UserActivityOrderEvent.java index fe82ab96..b3de8393 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/user/UserActivityOrderEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/user/UserActivityOrderEvent.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.events.user; +package net.itsthesky.disky.elements.events.user; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Activity; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; @@ -33,7 +33,7 @@ public class UserActivityOrderEvent extends DiSkyEvent { - public BukkitUserActivityOrderEvent(info.itsthesky.disky.elements.events.user.UserActivityOrderEvent event) { + public BukkitUserActivityOrderEvent(UserActivityOrderEvent event) { } } } diff --git a/src/main/java/info/itsthesky/disky/elements/events/user/UserAvatarEvent.java b/src/main/java/net/itsthesky/disky/elements/events/user/UserAvatarEvent.java similarity index 86% rename from src/main/java/info/itsthesky/disky/elements/events/user/UserAvatarEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/user/UserAvatarEvent.java index 4ebab2b5..36700385 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/user/UserAvatarEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/user/UserAvatarEvent.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.events.user; +package net.itsthesky.disky.elements.events.user; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.User; import net.dv8tion.jda.api.events.user.update.UserUpdateAvatarEvent; diff --git a/src/main/java/info/itsthesky/disky/elements/events/user/UserDiscriminatorEvent.java b/src/main/java/net/itsthesky/disky/elements/events/user/UserDiscriminatorEvent.java similarity index 88% rename from src/main/java/info/itsthesky/disky/elements/events/user/UserDiscriminatorEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/user/UserDiscriminatorEvent.java index 50304557..dba29e1c 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/user/UserDiscriminatorEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/user/UserDiscriminatorEvent.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.events.user; +package net.itsthesky.disky.elements.events.user; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.User; import net.dv8tion.jda.api.events.user.update.UserUpdateDiscriminatorEvent; diff --git a/src/main/java/info/itsthesky/disky/elements/events/user/UserNameEvent.java b/src/main/java/net/itsthesky/disky/elements/events/user/UserNameEvent.java similarity index 86% rename from src/main/java/info/itsthesky/disky/elements/events/user/UserNameEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/user/UserNameEvent.java index 66049136..12eb8cd6 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/user/UserNameEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/user/UserNameEvent.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.events.user; +package net.itsthesky.disky.elements.events.user; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.User; import net.dv8tion.jda.api.events.user.update.UserUpdateNameEvent; diff --git a/src/main/java/info/itsthesky/disky/elements/events/user/UserOnlineStatusEvent.java b/src/main/java/net/itsthesky/disky/elements/events/user/UserOnlineStatusEvent.java similarity index 90% rename from src/main/java/info/itsthesky/disky/elements/events/user/UserOnlineStatusEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/user/UserOnlineStatusEvent.java index 434cf450..c08dd9db 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/user/UserOnlineStatusEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/user/UserOnlineStatusEvent.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.events.user; +package net.itsthesky.disky.elements.events.user; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.OnlineStatus; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; diff --git a/src/main/java/info/itsthesky/disky/elements/events/user/UserTypingEvent.java b/src/main/java/net/itsthesky/disky/elements/events/user/UserTypingEvent.java similarity index 87% rename from src/main/java/info/itsthesky/disky/elements/events/user/UserTypingEvent.java rename to src/main/java/net/itsthesky/disky/elements/events/user/UserTypingEvent.java index 43acf0b0..e14840bc 100644 --- a/src/main/java/info/itsthesky/disky/elements/events/user/UserTypingEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/events/user/UserTypingEvent.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.events.user; +package net.itsthesky.disky.elements.events.user; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.User; diff --git a/src/main/java/info/itsthesky/disky/elements/getters/BaseGetterExpression.java b/src/main/java/net/itsthesky/disky/elements/getters/BaseGetterExpression.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/getters/BaseGetterExpression.java rename to src/main/java/net/itsthesky/disky/elements/getters/BaseGetterExpression.java index e78e9510..767ab0ae 100644 --- a/src/main/java/info/itsthesky/disky/elements/getters/BaseGetterExpression.java +++ b/src/main/java/net/itsthesky/disky/elements/getters/BaseGetterExpression.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.getters; +package net.itsthesky.disky.elements.getters; import ch.njol.skript.Skript; import ch.njol.skript.config.Node; @@ -7,10 +7,10 @@ import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.skript.lang.util.SimpleExpression; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.skript.EasyElement; -import info.itsthesky.disky.core.Bot; -import info.itsthesky.disky.core.SkriptUtils; -import info.itsthesky.disky.elements.changers.IAsyncGettableExpression; +import net.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.core.Bot; +import net.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.elements.changers.IAsyncGettableExpression; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/info/itsthesky/disky/elements/getters/ColorFromHex.java b/src/main/java/net/itsthesky/disky/elements/getters/ColorFromHex.java similarity index 95% rename from src/main/java/info/itsthesky/disky/elements/getters/ColorFromHex.java rename to src/main/java/net/itsthesky/disky/elements/getters/ColorFromHex.java index 425ff4f5..0b12ccac 100644 --- a/src/main/java/info/itsthesky/disky/elements/getters/ColorFromHex.java +++ b/src/main/java/net/itsthesky/disky/elements/getters/ColorFromHex.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.getters; +package net.itsthesky.disky.elements.getters; import ch.njol.skript.Skript; import ch.njol.skript.doc.Description; @@ -11,7 +11,7 @@ import ch.njol.skript.util.Color; import ch.njol.skript.util.ColorRGB; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.api.skript.EasyElement; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/info/itsthesky/disky/elements/getters/ExprEmoji.java b/src/main/java/net/itsthesky/disky/elements/getters/ExprEmoji.java similarity index 94% rename from src/main/java/info/itsthesky/disky/elements/getters/ExprEmoji.java rename to src/main/java/net/itsthesky/disky/elements/getters/ExprEmoji.java index 881d5526..871b5eb2 100644 --- a/src/main/java/info/itsthesky/disky/elements/getters/ExprEmoji.java +++ b/src/main/java/net/itsthesky/disky/elements/getters/ExprEmoji.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.getters; +package net.itsthesky.disky.elements.getters; import ch.njol.skript.Skript; import ch.njol.skript.config.Node; @@ -10,12 +10,12 @@ import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.skript.lang.util.SimpleExpression; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.api.emojis.Emoji; -import info.itsthesky.disky.api.emojis.Emojis; -import info.itsthesky.disky.api.emojis.Emote; -import info.itsthesky.disky.elements.changers.IAsyncGettableExpression; -import info.itsthesky.disky.elements.sections.handler.DiSkyRuntimeHandler; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.api.emojis.Emoji; +import net.itsthesky.disky.api.emojis.Emojis; +import net.itsthesky.disky.api.emojis.Emote; +import net.itsthesky.disky.elements.changers.IAsyncGettableExpression; +import net.itsthesky.disky.elements.sections.handler.DiSkyRuntimeHandler; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.emoji.RichCustomEmoji; import org.bukkit.event.Event; diff --git a/src/main/java/info/itsthesky/disky/elements/getters/GetAudioChannel.java b/src/main/java/net/itsthesky/disky/elements/getters/GetAudioChannel.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/getters/GetAudioChannel.java rename to src/main/java/net/itsthesky/disky/elements/getters/GetAudioChannel.java index 83c02337..1d577efd 100644 --- a/src/main/java/info/itsthesky/disky/elements/getters/GetAudioChannel.java +++ b/src/main/java/net/itsthesky/disky/elements/getters/GetAudioChannel.java @@ -1,10 +1,10 @@ -package info.itsthesky.disky.elements.getters; +package net.itsthesky.disky.elements.getters; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; import ch.njol.skript.doc.Name; import ch.njol.skript.doc.Since; -import info.itsthesky.disky.core.Bot; +import net.itsthesky.disky.core.Bot; import net.dv8tion.jda.api.entities.channel.middleman.AudioChannel; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/getters/GetBot.java b/src/main/java/net/itsthesky/disky/elements/getters/GetBot.java similarity index 94% rename from src/main/java/info/itsthesky/disky/elements/getters/GetBot.java rename to src/main/java/net/itsthesky/disky/elements/getters/GetBot.java index 81d9f4bf..ed80a985 100644 --- a/src/main/java/info/itsthesky/disky/elements/getters/GetBot.java +++ b/src/main/java/net/itsthesky/disky/elements/getters/GetBot.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.getters; +package net.itsthesky.disky.elements.getters; import ch.njol.skript.Skript; import ch.njol.skript.doc.Description; @@ -9,8 +9,8 @@ import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.skript.lang.util.SimpleExpression; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.core.Bot; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.core.Bot; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/info/itsthesky/disky/elements/getters/GetCategory.java b/src/main/java/net/itsthesky/disky/elements/getters/GetCategory.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/getters/GetCategory.java rename to src/main/java/net/itsthesky/disky/elements/getters/GetCategory.java index 37cdcc7a..ae95a83e 100644 --- a/src/main/java/info/itsthesky/disky/elements/getters/GetCategory.java +++ b/src/main/java/net/itsthesky/disky/elements/getters/GetCategory.java @@ -1,9 +1,9 @@ -package info.itsthesky.disky.elements.getters; +package net.itsthesky.disky.elements.getters; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; import ch.njol.skript.doc.Name; -import info.itsthesky.disky.core.Bot; +import net.itsthesky.disky.core.Bot; import net.dv8tion.jda.api.entities.channel.concrete.Category; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/getters/GetChannel.java b/src/main/java/net/itsthesky/disky/elements/getters/GetChannel.java similarity index 94% rename from src/main/java/info/itsthesky/disky/elements/getters/GetChannel.java rename to src/main/java/net/itsthesky/disky/elements/getters/GetChannel.java index 5e422d57..4fbfe627 100644 --- a/src/main/java/info/itsthesky/disky/elements/getters/GetChannel.java +++ b/src/main/java/net/itsthesky/disky/elements/getters/GetChannel.java @@ -1,10 +1,10 @@ -package info.itsthesky.disky.elements.getters; +package net.itsthesky.disky.elements.getters; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; import ch.njol.skript.doc.Name; import ch.njol.skript.doc.Since; -import info.itsthesky.disky.core.Bot; +import net.itsthesky.disky.core.Bot; import net.dv8tion.jda.api.entities.channel.Channel; @Name("Get Channel") diff --git a/src/main/java/info/itsthesky/disky/elements/getters/GetForumChannel.java b/src/main/java/net/itsthesky/disky/elements/getters/GetForumChannel.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/getters/GetForumChannel.java rename to src/main/java/net/itsthesky/disky/elements/getters/GetForumChannel.java index 26696666..097619fb 100644 --- a/src/main/java/info/itsthesky/disky/elements/getters/GetForumChannel.java +++ b/src/main/java/net/itsthesky/disky/elements/getters/GetForumChannel.java @@ -1,9 +1,9 @@ -package info.itsthesky.disky.elements.getters; +package net.itsthesky.disky.elements.getters; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; import ch.njol.skript.doc.Name; -import info.itsthesky.disky.core.Bot; +import net.itsthesky.disky.core.Bot; import net.dv8tion.jda.api.entities.channel.concrete.ForumChannel; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/getters/GetGuild.java b/src/main/java/net/itsthesky/disky/elements/getters/GetGuild.java similarity index 90% rename from src/main/java/info/itsthesky/disky/elements/getters/GetGuild.java rename to src/main/java/net/itsthesky/disky/elements/getters/GetGuild.java index 0844b9a5..69868efb 100644 --- a/src/main/java/info/itsthesky/disky/elements/getters/GetGuild.java +++ b/src/main/java/net/itsthesky/disky/elements/getters/GetGuild.java @@ -1,9 +1,9 @@ -package info.itsthesky.disky.elements.getters; +package net.itsthesky.disky.elements.getters; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; import ch.njol.skript.doc.Name; -import info.itsthesky.disky.core.Bot; +import net.itsthesky.disky.core.Bot; import net.dv8tion.jda.api.entities.Guild; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/getters/GetGuildChannel.java b/src/main/java/net/itsthesky/disky/elements/getters/GetGuildChannel.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/getters/GetGuildChannel.java rename to src/main/java/net/itsthesky/disky/elements/getters/GetGuildChannel.java index 4e7a5a55..1daae855 100644 --- a/src/main/java/info/itsthesky/disky/elements/getters/GetGuildChannel.java +++ b/src/main/java/net/itsthesky/disky/elements/getters/GetGuildChannel.java @@ -1,9 +1,9 @@ -package info.itsthesky.disky.elements.getters; +package net.itsthesky.disky.elements.getters; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; import ch.njol.skript.doc.Name; -import info.itsthesky.disky.core.Bot; +import net.itsthesky.disky.core.Bot; import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/getters/GetMember.java b/src/main/java/net/itsthesky/disky/elements/getters/GetMember.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/getters/GetMember.java rename to src/main/java/net/itsthesky/disky/elements/getters/GetMember.java index f1b704b1..4f7ccd69 100644 --- a/src/main/java/info/itsthesky/disky/elements/getters/GetMember.java +++ b/src/main/java/net/itsthesky/disky/elements/getters/GetMember.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.getters; +package net.itsthesky.disky.elements.getters; import ch.njol.skript.Skript; import ch.njol.skript.doc.Description; @@ -9,9 +9,9 @@ import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.skript.lang.util.SimpleExpression; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.api.skript.EasyElement; -import info.itsthesky.disky.elements.changers.IAsyncGettableExpression; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.elements.changers.IAsyncGettableExpression; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; import org.bukkit.event.Event; diff --git a/src/main/java/info/itsthesky/disky/elements/getters/GetMessageChannel.java b/src/main/java/net/itsthesky/disky/elements/getters/GetMessageChannel.java similarity index 94% rename from src/main/java/info/itsthesky/disky/elements/getters/GetMessageChannel.java rename to src/main/java/net/itsthesky/disky/elements/getters/GetMessageChannel.java index 6bf35d39..0ad0a575 100644 --- a/src/main/java/info/itsthesky/disky/elements/getters/GetMessageChannel.java +++ b/src/main/java/net/itsthesky/disky/elements/getters/GetMessageChannel.java @@ -1,10 +1,10 @@ -package info.itsthesky.disky.elements.getters; +package net.itsthesky.disky.elements.getters; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; import ch.njol.skript.doc.Name; import ch.njol.skript.doc.Since; -import info.itsthesky.disky.core.Bot; +import net.itsthesky.disky.core.Bot; import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/getters/GetNewsChannel.java b/src/main/java/net/itsthesky/disky/elements/getters/GetNewsChannel.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/getters/GetNewsChannel.java rename to src/main/java/net/itsthesky/disky/elements/getters/GetNewsChannel.java index 4a3fa2d5..860b38da 100644 --- a/src/main/java/info/itsthesky/disky/elements/getters/GetNewsChannel.java +++ b/src/main/java/net/itsthesky/disky/elements/getters/GetNewsChannel.java @@ -1,9 +1,9 @@ -package info.itsthesky.disky.elements.getters; +package net.itsthesky.disky.elements.getters; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; import ch.njol.skript.doc.Name; -import info.itsthesky.disky.core.Bot; +import net.itsthesky.disky.core.Bot; import net.dv8tion.jda.api.entities.channel.concrete.NewsChannel; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/getters/GetRole.java b/src/main/java/net/itsthesky/disky/elements/getters/GetRole.java similarity index 91% rename from src/main/java/info/itsthesky/disky/elements/getters/GetRole.java rename to src/main/java/net/itsthesky/disky/elements/getters/GetRole.java index 589b5e1b..7329efd6 100644 --- a/src/main/java/info/itsthesky/disky/elements/getters/GetRole.java +++ b/src/main/java/net/itsthesky/disky/elements/getters/GetRole.java @@ -1,9 +1,9 @@ -package info.itsthesky.disky.elements.getters; +package net.itsthesky.disky.elements.getters; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; import ch.njol.skript.doc.Name; -import info.itsthesky.disky.core.Bot; +import net.itsthesky.disky.core.Bot; import net.dv8tion.jda.api.entities.Role; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/getters/GetScheduledEvent.java b/src/main/java/net/itsthesky/disky/elements/getters/GetScheduledEvent.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/getters/GetScheduledEvent.java rename to src/main/java/net/itsthesky/disky/elements/getters/GetScheduledEvent.java index 902e7637..60b3b1ba 100644 --- a/src/main/java/info/itsthesky/disky/elements/getters/GetScheduledEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/getters/GetScheduledEvent.java @@ -1,9 +1,9 @@ -package info.itsthesky.disky.elements.getters; +package net.itsthesky.disky.elements.getters; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; import ch.njol.skript.doc.Name; -import info.itsthesky.disky.core.Bot; +import net.itsthesky.disky.core.Bot; import net.dv8tion.jda.api.entities.ScheduledEvent; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/getters/GetStageChannel.java b/src/main/java/net/itsthesky/disky/elements/getters/GetStageChannel.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/getters/GetStageChannel.java rename to src/main/java/net/itsthesky/disky/elements/getters/GetStageChannel.java index c9b81a95..1508e092 100644 --- a/src/main/java/info/itsthesky/disky/elements/getters/GetStageChannel.java +++ b/src/main/java/net/itsthesky/disky/elements/getters/GetStageChannel.java @@ -1,9 +1,9 @@ -package info.itsthesky.disky.elements.getters; +package net.itsthesky.disky.elements.getters; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; import ch.njol.skript.doc.Name; -import info.itsthesky.disky.core.Bot; +import net.itsthesky.disky.core.Bot; import net.dv8tion.jda.api.entities.channel.concrete.StageChannel; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/getters/GetSticker.java b/src/main/java/net/itsthesky/disky/elements/getters/GetSticker.java similarity index 94% rename from src/main/java/info/itsthesky/disky/elements/getters/GetSticker.java rename to src/main/java/net/itsthesky/disky/elements/getters/GetSticker.java index bd50393f..d56be282 100644 --- a/src/main/java/info/itsthesky/disky/elements/getters/GetSticker.java +++ b/src/main/java/net/itsthesky/disky/elements/getters/GetSticker.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.getters; +package net.itsthesky.disky.elements.getters; import ch.njol.skript.Skript; import ch.njol.skript.doc.Description; @@ -9,8 +9,8 @@ import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.skript.lang.util.SimpleExpression; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.skript.EasyElement; -import info.itsthesky.disky.elements.changers.IAsyncGettableExpression; +import net.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.elements.changers.IAsyncGettableExpression; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.sticker.GuildSticker; import net.dv8tion.jda.api.entities.sticker.Sticker; diff --git a/src/main/java/info/itsthesky/disky/elements/getters/GetTextChannel.java b/src/main/java/net/itsthesky/disky/elements/getters/GetTextChannel.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/getters/GetTextChannel.java rename to src/main/java/net/itsthesky/disky/elements/getters/GetTextChannel.java index ee2ec837..9bc22300 100644 --- a/src/main/java/info/itsthesky/disky/elements/getters/GetTextChannel.java +++ b/src/main/java/net/itsthesky/disky/elements/getters/GetTextChannel.java @@ -1,9 +1,9 @@ -package info.itsthesky.disky.elements.getters; +package net.itsthesky.disky.elements.getters; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; import ch.njol.skript.doc.Name; -import info.itsthesky.disky.core.Bot; +import net.itsthesky.disky.core.Bot; import net.dv8tion.jda.api.entities.channel.concrete.TextChannel; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/getters/GetThread.java b/src/main/java/net/itsthesky/disky/elements/getters/GetThread.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/getters/GetThread.java rename to src/main/java/net/itsthesky/disky/elements/getters/GetThread.java index 40184222..313469a3 100644 --- a/src/main/java/info/itsthesky/disky/elements/getters/GetThread.java +++ b/src/main/java/net/itsthesky/disky/elements/getters/GetThread.java @@ -1,9 +1,9 @@ -package info.itsthesky.disky.elements.getters; +package net.itsthesky.disky.elements.getters; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; import ch.njol.skript.doc.Name; -import info.itsthesky.disky.core.Bot; +import net.itsthesky.disky.core.Bot; import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/getters/GetUser.java b/src/main/java/net/itsthesky/disky/elements/getters/GetUser.java similarity index 89% rename from src/main/java/info/itsthesky/disky/elements/getters/GetUser.java rename to src/main/java/net/itsthesky/disky/elements/getters/GetUser.java index 7a0b5516..1e9bde13 100644 --- a/src/main/java/info/itsthesky/disky/elements/getters/GetUser.java +++ b/src/main/java/net/itsthesky/disky/elements/getters/GetUser.java @@ -1,6 +1,6 @@ -package info.itsthesky.disky.elements.getters; +package net.itsthesky.disky.elements.getters; -import info.itsthesky.disky.core.Bot; +import net.itsthesky.disky.core.Bot; import net.dv8tion.jda.api.entities.User; import net.dv8tion.jda.api.entities.channel.concrete.TextChannel; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/getters/GetUserInGuild.java b/src/main/java/net/itsthesky/disky/elements/getters/GetUserInGuild.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/getters/GetUserInGuild.java rename to src/main/java/net/itsthesky/disky/elements/getters/GetUserInGuild.java index e2f55307..0e8075c1 100644 --- a/src/main/java/info/itsthesky/disky/elements/getters/GetUserInGuild.java +++ b/src/main/java/net/itsthesky/disky/elements/getters/GetUserInGuild.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.getters; +package net.itsthesky.disky.elements.getters; import ch.njol.skript.Skript; import ch.njol.skript.doc.Description; @@ -8,8 +8,8 @@ import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.skript.lang.util.SimpleExpression; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.skript.EasyElement; -import info.itsthesky.disky.elements.changers.IAsyncGettableExpression; +import net.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.elements.changers.IAsyncGettableExpression; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.User; diff --git a/src/main/java/info/itsthesky/disky/elements/getters/GetVoiceChannel.java b/src/main/java/net/itsthesky/disky/elements/getters/GetVoiceChannel.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/getters/GetVoiceChannel.java rename to src/main/java/net/itsthesky/disky/elements/getters/GetVoiceChannel.java index d7a1daa2..8f64678a 100644 --- a/src/main/java/info/itsthesky/disky/elements/getters/GetVoiceChannel.java +++ b/src/main/java/net/itsthesky/disky/elements/getters/GetVoiceChannel.java @@ -1,9 +1,9 @@ -package info.itsthesky.disky.elements.getters; +package net.itsthesky.disky.elements.getters; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; import ch.njol.skript.doc.Name; -import info.itsthesky.disky.core.Bot; +import net.itsthesky.disky.core.Bot; import net.dv8tion.jda.api.entities.channel.concrete.VoiceChannel; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/getters/LastDiSkyException.java b/src/main/java/net/itsthesky/disky/elements/getters/LastDiSkyException.java similarity index 95% rename from src/main/java/info/itsthesky/disky/elements/getters/LastDiSkyException.java rename to src/main/java/net/itsthesky/disky/elements/getters/LastDiSkyException.java index 0fee1932..0277e005 100644 --- a/src/main/java/info/itsthesky/disky/elements/getters/LastDiSkyException.java +++ b/src/main/java/net/itsthesky/disky/elements/getters/LastDiSkyException.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.getters; +package net.itsthesky.disky.elements.getters; import ch.njol.skript.Skript; import ch.njol.skript.doc.Description; @@ -9,7 +9,7 @@ import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.skript.lang.util.SimpleExpression; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; +import net.itsthesky.disky.DiSky; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/AvatarURL.java b/src/main/java/net/itsthesky/disky/elements/properties/AvatarURL.java similarity index 89% rename from src/main/java/info/itsthesky/disky/elements/properties/AvatarURL.java rename to src/main/java/net/itsthesky/disky/elements/properties/AvatarURL.java index 9f8c6a25..aa423078 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/AvatarURL.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/AvatarURL.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties; +package net.itsthesky.disky.elements.properties; import ch.njol.skript.classes.Changer; import ch.njol.skript.config.Node; @@ -8,13 +8,13 @@ import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.SkriptParser; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.changers.ChangeableSimplePropertyExpression; -import info.itsthesky.disky.api.skript.EasyElement; -import info.itsthesky.disky.api.skript.INodeHolder; -import info.itsthesky.disky.core.Bot; -import info.itsthesky.disky.core.SkriptUtils; -import info.itsthesky.disky.elements.changers.IAsyncChangeableExpression; -import info.itsthesky.disky.elements.sections.handler.DiSkyRuntimeHandler; +import net.itsthesky.disky.api.changers.ChangeableSimplePropertyExpression; +import net.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.api.skript.INodeHolder; +import net.itsthesky.disky.core.Bot; +import net.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.elements.changers.IAsyncChangeableExpression; +import net.itsthesky.disky.elements.sections.handler.DiSkyRuntimeHandler; import net.dv8tion.jda.api.entities.ApplicationInfo; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/ChannelOf.java b/src/main/java/net/itsthesky/disky/elements/properties/ChannelOf.java similarity index 96% rename from src/main/java/info/itsthesky/disky/elements/properties/ChannelOf.java rename to src/main/java/net/itsthesky/disky/elements/properties/ChannelOf.java index 0b598255..916939f7 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/ChannelOf.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/ChannelOf.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties; +package net.itsthesky.disky.elements.properties; import ch.njol.skript.expressions.base.SimplePropertyExpression; import net.dv8tion.jda.api.entities.Message; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/ColorOf.java b/src/main/java/net/itsthesky/disky/elements/properties/ColorOf.java similarity index 88% rename from src/main/java/info/itsthesky/disky/elements/properties/ColorOf.java rename to src/main/java/net/itsthesky/disky/elements/properties/ColorOf.java index e0af1131..049700dc 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/ColorOf.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/ColorOf.java @@ -1,15 +1,15 @@ -package info.itsthesky.disky.elements.properties; +package net.itsthesky.disky.elements.properties; import ch.njol.skript.classes.Changer; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; import ch.njol.skript.doc.Name; import ch.njol.skript.util.Color; -import info.itsthesky.disky.api.changers.ChangeableSimplePropertyExpression; -import info.itsthesky.disky.api.skript.EasyElement; -import info.itsthesky.disky.core.Bot; -import info.itsthesky.disky.core.SkriptUtils; -import info.itsthesky.disky.elements.changers.IAsyncChangeableExpression; +import net.itsthesky.disky.api.changers.ChangeableSimplePropertyExpression; +import net.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.core.Bot; +import net.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.elements.changers.IAsyncChangeableExpression; import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.entities.Role; import org.bukkit.event.Event; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/CreationDate.java b/src/main/java/net/itsthesky/disky/elements/properties/CreationDate.java similarity index 96% rename from src/main/java/info/itsthesky/disky/elements/properties/CreationDate.java rename to src/main/java/net/itsthesky/disky/elements/properties/CreationDate.java index f1f91ce8..b237b56a 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/CreationDate.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/CreationDate.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties; +package net.itsthesky.disky.elements.properties; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/DiscordId.java b/src/main/java/net/itsthesky/disky/elements/properties/DiscordId.java similarity index 96% rename from src/main/java/info/itsthesky/disky/elements/properties/DiscordId.java rename to src/main/java/net/itsthesky/disky/elements/properties/DiscordId.java index 40db049e..c4cfaec1 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/DiscordId.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/DiscordId.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties; +package net.itsthesky.disky.elements.properties; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/DiscordMembersOf.java b/src/main/java/net/itsthesky/disky/elements/properties/DiscordMembersOf.java similarity index 94% rename from src/main/java/info/itsthesky/disky/elements/properties/DiscordMembersOf.java rename to src/main/java/net/itsthesky/disky/elements/properties/DiscordMembersOf.java index 0014698c..b4dccc8f 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/DiscordMembersOf.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/DiscordMembersOf.java @@ -1,11 +1,11 @@ -package info.itsthesky.disky.elements.properties; +package net.itsthesky.disky.elements.properties; import ch.njol.skript.classes.Changer; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; import ch.njol.skript.doc.Name; -import info.itsthesky.disky.api.skript.MultiplyPropertyExpression; -import info.itsthesky.disky.elements.changers.IAsyncGettableExpression; +import net.itsthesky.disky.api.skript.MultiplyPropertyExpression; +import net.itsthesky.disky.elements.changers.IAsyncGettableExpression; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.channel.attribute.IMemberContainer; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/DiscordName.java b/src/main/java/net/itsthesky/disky/elements/properties/DiscordName.java similarity index 94% rename from src/main/java/info/itsthesky/disky/elements/properties/DiscordName.java rename to src/main/java/net/itsthesky/disky/elements/properties/DiscordName.java index 86306e78..3d9c8cf9 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/DiscordName.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/DiscordName.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties; +package net.itsthesky.disky.elements.properties; import ch.njol.skript.classes.Changer; import ch.njol.skript.config.Node; @@ -9,10 +9,10 @@ import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.SkriptParser; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.emojis.Emote; -import info.itsthesky.disky.core.Bot; -import info.itsthesky.disky.elements.changers.IAsyncChangeableExpression; -import info.itsthesky.disky.elements.sections.handler.DiSkyRuntimeHandler; +import net.itsthesky.disky.api.emojis.Emote; +import net.itsthesky.disky.core.Bot; +import net.itsthesky.disky.elements.changers.IAsyncChangeableExpression; +import net.itsthesky.disky.elements.sections.handler.DiSkyRuntimeHandler; import net.dv8tion.jda.api.entities.*; import net.dv8tion.jda.api.entities.channel.Channel; import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/DiscordRoles.java b/src/main/java/net/itsthesky/disky/elements/properties/DiscordRoles.java similarity index 91% rename from src/main/java/info/itsthesky/disky/elements/properties/DiscordRoles.java rename to src/main/java/net/itsthesky/disky/elements/properties/DiscordRoles.java index 495ce086..1923986f 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/DiscordRoles.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/DiscordRoles.java @@ -1,14 +1,14 @@ -package info.itsthesky.disky.elements.properties; +package net.itsthesky.disky.elements.properties; import ch.njol.skript.classes.Changer; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; import ch.njol.skript.doc.Name; import ch.njol.util.coll.CollectionUtils; -import info.itsthesky.disky.api.changers.MultipleChangeablePropertyExpression; -import info.itsthesky.disky.api.skript.EasyElement; -import info.itsthesky.disky.core.Bot; -import info.itsthesky.disky.elements.changers.IAsyncChangeableExpression; +import net.itsthesky.disky.api.changers.MultipleChangeablePropertyExpression; +import net.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.core.Bot; +import net.itsthesky.disky.elements.changers.IAsyncChangeableExpression; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Role; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/DynamicElements.java b/src/main/java/net/itsthesky/disky/elements/properties/DynamicElements.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/properties/DynamicElements.java rename to src/main/java/net/itsthesky/disky/elements/properties/DynamicElements.java index f3fbe275..f342b6b9 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/DynamicElements.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/DynamicElements.java @@ -1,7 +1,7 @@ -package info.itsthesky.disky.elements.properties; +package net.itsthesky.disky.elements.properties; -import info.itsthesky.disky.api.skript.reflects.ReflectClassFactory; -import info.itsthesky.disky.api.skript.reflects.state.SkriptStateRegistry; +import net.itsthesky.disky.api.skript.reflects.ReflectClassFactory; +import net.itsthesky.disky.api.skript.reflects.state.SkriptStateRegistry; import net.dv8tion.jda.api.audit.ActionType; import net.dv8tion.jda.api.audit.AuditLogEntry; import net.dv8tion.jda.api.entities.Guild; @@ -9,7 +9,7 @@ import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel; import net.dv8tion.jda.api.requests.RestAction; -import static info.itsthesky.disky.api.skript.reflects.ReflectClassFactory.register; +import static net.itsthesky.disky.api.skript.reflects.ReflectClassFactory.register; public final class DynamicElements { diff --git a/src/main/java/info/itsthesky/disky/elements/properties/GuildOf.java b/src/main/java/net/itsthesky/disky/elements/properties/GuildOf.java similarity index 97% rename from src/main/java/info/itsthesky/disky/elements/properties/GuildOf.java rename to src/main/java/net/itsthesky/disky/elements/properties/GuildOf.java index 4b7103a0..27429638 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/GuildOf.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/GuildOf.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties; +package net.itsthesky.disky.elements.properties; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/MentionTag.java b/src/main/java/net/itsthesky/disky/elements/properties/MentionTag.java similarity index 95% rename from src/main/java/info/itsthesky/disky/elements/properties/MentionTag.java rename to src/main/java/net/itsthesky/disky/elements/properties/MentionTag.java index 21d35d0f..b157f3ba 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/MentionTag.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/MentionTag.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties; +package net.itsthesky.disky.elements.properties; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/PermissionsOf.java b/src/main/java/net/itsthesky/disky/elements/properties/PermissionsOf.java similarity index 96% rename from src/main/java/info/itsthesky/disky/elements/properties/PermissionsOf.java rename to src/main/java/net/itsthesky/disky/elements/properties/PermissionsOf.java index 8ec343f0..f9a114c4 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/PermissionsOf.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/PermissionsOf.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties; +package net.itsthesky.disky.elements.properties; import ch.njol.skript.Skript; import ch.njol.skript.classes.Changer; @@ -12,10 +12,10 @@ import ch.njol.skript.lang.SkriptParser; import ch.njol.skript.lang.util.SimpleExpression; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.api.DiSkyRegistry; -import info.itsthesky.disky.api.skript.EasyElement; -import info.itsthesky.disky.elements.changers.IAsyncChangeableExpression; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.api.DiSkyRegistry; +import net.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.elements.changers.IAsyncChangeableExpression; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.IPermissionHolder; import net.dv8tion.jda.api.entities.Role; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/RoleChannelPosition.java b/src/main/java/net/itsthesky/disky/elements/properties/RoleChannelPosition.java similarity index 95% rename from src/main/java/info/itsthesky/disky/elements/properties/RoleChannelPosition.java rename to src/main/java/net/itsthesky/disky/elements/properties/RoleChannelPosition.java index 909805a8..0a29575f 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/RoleChannelPosition.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/RoleChannelPosition.java @@ -1,9 +1,9 @@ -package info.itsthesky.disky.elements.properties; +package net.itsthesky.disky.elements.properties; import ch.njol.skript.classes.Changer; import ch.njol.skript.expressions.base.SimplePropertyExpression; -import info.itsthesky.disky.api.skript.EasyElement; -import info.itsthesky.disky.elements.changers.IAsyncChangeableExpression; +import net.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.elements.changers.IAsyncChangeableExpression; import net.dv8tion.jda.api.entities.Role; import net.dv8tion.jda.api.entities.channel.attribute.IPositionableChannel; import net.dv8tion.jda.api.requests.RestAction; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/UserLocal.java b/src/main/java/net/itsthesky/disky/elements/properties/UserLocal.java similarity index 91% rename from src/main/java/info/itsthesky/disky/elements/properties/UserLocal.java rename to src/main/java/net/itsthesky/disky/elements/properties/UserLocal.java index 0246c772..defdd860 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/UserLocal.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/UserLocal.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties; +package net.itsthesky.disky.elements.properties; import ch.njol.skript.Skript; import ch.njol.skript.doc.Description; @@ -9,8 +9,8 @@ import ch.njol.skript.lang.SkriptParser; import ch.njol.skript.lang.util.SimpleExpression; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.events.specific.InteractionEvent; -import info.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.api.events.specific.InteractionEvent; +import net.itsthesky.disky.api.skript.EasyElement; import net.dv8tion.jda.api.events.interaction.GenericInteractionCreateEvent; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/activity/ActivityEmote.java b/src/main/java/net/itsthesky/disky/elements/properties/activity/ActivityEmote.java similarity index 89% rename from src/main/java/info/itsthesky/disky/elements/properties/activity/ActivityEmote.java rename to src/main/java/net/itsthesky/disky/elements/properties/activity/ActivityEmote.java index dca36a3a..1199f286 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/activity/ActivityEmote.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/activity/ActivityEmote.java @@ -1,7 +1,7 @@ -package info.itsthesky.disky.elements.properties.activity; +package net.itsthesky.disky.elements.properties.activity; import ch.njol.skript.expressions.base.SimplePropertyExpression; -import info.itsthesky.disky.api.emojis.Emote; +import net.itsthesky.disky.api.emojis.Emote; import net.dv8tion.jda.api.entities.Activity; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/activity/ActivityText.java b/src/main/java/net/itsthesky/disky/elements/properties/activity/ActivityText.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/properties/activity/ActivityText.java rename to src/main/java/net/itsthesky/disky/elements/properties/activity/ActivityText.java index 2a570b4e..14aabbc4 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/activity/ActivityText.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/activity/ActivityText.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.activity; +package net.itsthesky.disky.elements.properties.activity; import ch.njol.skript.expressions.base.SimplePropertyExpression; import net.dv8tion.jda.api.entities.Activity; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/activity/ActivityType.java b/src/main/java/net/itsthesky/disky/elements/properties/activity/ActivityType.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/properties/activity/ActivityType.java rename to src/main/java/net/itsthesky/disky/elements/properties/activity/ActivityType.java index 08a8c2ae..dc2741a2 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/activity/ActivityType.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/activity/ActivityType.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.activity; +package net.itsthesky.disky.elements.properties.activity; import ch.njol.skript.expressions.base.SimplePropertyExpression; import net.dv8tion.jda.api.entities.Activity; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/activity/ActivityURL.java b/src/main/java/net/itsthesky/disky/elements/properties/activity/ActivityURL.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/properties/activity/ActivityURL.java rename to src/main/java/net/itsthesky/disky/elements/properties/activity/ActivityURL.java index 938232ea..5e527179 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/activity/ActivityURL.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/activity/ActivityURL.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.activity; +package net.itsthesky.disky.elements.properties.activity; import ch.njol.skript.expressions.base.SimplePropertyExpression; import net.dv8tion.jda.api.entities.Activity; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/application/ApplicationDescription.java b/src/main/java/net/itsthesky/disky/elements/properties/application/ApplicationDescription.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/properties/application/ApplicationDescription.java rename to src/main/java/net/itsthesky/disky/elements/properties/application/ApplicationDescription.java index c394b8b2..04ac2f3a 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/application/ApplicationDescription.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/application/ApplicationDescription.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.application; +package net.itsthesky.disky.elements.properties.application; import ch.njol.skript.expressions.base.SimplePropertyExpression; import net.dv8tion.jda.api.entities.ApplicationInfo; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/application/ApplicationOwner.java b/src/main/java/net/itsthesky/disky/elements/properties/application/ApplicationOwner.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/properties/application/ApplicationOwner.java rename to src/main/java/net/itsthesky/disky/elements/properties/application/ApplicationOwner.java index 08756deb..4c04769d 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/application/ApplicationOwner.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/application/ApplicationOwner.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.application; +package net.itsthesky.disky.elements.properties.application; import ch.njol.skript.expressions.base.SimplePropertyExpression; import net.dv8tion.jda.api.entities.ApplicationInfo; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/application/ApplicationPolicy.java b/src/main/java/net/itsthesky/disky/elements/properties/application/ApplicationPolicy.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/properties/application/ApplicationPolicy.java rename to src/main/java/net/itsthesky/disky/elements/properties/application/ApplicationPolicy.java index c62f7e03..aa9b2741 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/application/ApplicationPolicy.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/application/ApplicationPolicy.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.application; +package net.itsthesky.disky.elements.properties.application; import ch.njol.skript.expressions.base.SimplePropertyExpression; import net.dv8tion.jda.api.entities.ApplicationInfo; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/application/ApplicationTOS.java b/src/main/java/net/itsthesky/disky/elements/properties/application/ApplicationTOS.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/properties/application/ApplicationTOS.java rename to src/main/java/net/itsthesky/disky/elements/properties/application/ApplicationTOS.java index dfc2029e..c54b3939 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/application/ApplicationTOS.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/application/ApplicationTOS.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.application; +package net.itsthesky.disky.elements.properties.application; import ch.njol.skript.expressions.base.SimplePropertyExpression; import net.dv8tion.jda.api.entities.ApplicationInfo; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/attachments/CondIsAudio.java b/src/main/java/net/itsthesky/disky/elements/properties/attachments/CondIsAudio.java similarity index 88% rename from src/main/java/info/itsthesky/disky/elements/properties/attachments/CondIsAudio.java rename to src/main/java/net/itsthesky/disky/elements/properties/attachments/CondIsAudio.java index 1f60f30f..a9df8621 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/attachments/CondIsAudio.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/attachments/CondIsAudio.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.attachments; +package net.itsthesky.disky.elements.properties.attachments; import ch.njol.skript.conditions.base.PropertyCondition; import net.dv8tion.jda.api.entities.Message; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/attachments/CondIsImage.java b/src/main/java/net/itsthesky/disky/elements/properties/attachments/CondIsImage.java similarity index 95% rename from src/main/java/info/itsthesky/disky/elements/properties/attachments/CondIsImage.java rename to src/main/java/net/itsthesky/disky/elements/properties/attachments/CondIsImage.java index 4672efba..8f2403ac 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/attachments/CondIsImage.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/attachments/CondIsImage.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.attachments; +package net.itsthesky.disky.elements.properties.attachments; import ch.njol.skript.Skript; import ch.njol.skript.doc.Description; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/attachments/CondIsSpoiler.java b/src/main/java/net/itsthesky/disky/elements/properties/attachments/CondIsSpoiler.java similarity index 95% rename from src/main/java/info/itsthesky/disky/elements/properties/attachments/CondIsSpoiler.java rename to src/main/java/net/itsthesky/disky/elements/properties/attachments/CondIsSpoiler.java index 57ccc213..859f1045 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/attachments/CondIsSpoiler.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/attachments/CondIsSpoiler.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.attachments; +package net.itsthesky.disky.elements.properties.attachments; import ch.njol.skript.Skript; import ch.njol.skript.doc.Description; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/attachments/CondIsVideo.java b/src/main/java/net/itsthesky/disky/elements/properties/attachments/CondIsVideo.java similarity index 95% rename from src/main/java/info/itsthesky/disky/elements/properties/attachments/CondIsVideo.java rename to src/main/java/net/itsthesky/disky/elements/properties/attachments/CondIsVideo.java index 1c3fac37..576400a1 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/attachments/CondIsVideo.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/attachments/CondIsVideo.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.attachments; +package net.itsthesky.disky.elements.properties.attachments; import ch.njol.skript.Skript; import ch.njol.skript.doc.Description; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/attachments/EffAttDownload.java b/src/main/java/net/itsthesky/disky/elements/properties/attachments/EffAttDownload.java similarity index 94% rename from src/main/java/info/itsthesky/disky/elements/properties/attachments/EffAttDownload.java rename to src/main/java/net/itsthesky/disky/elements/properties/attachments/EffAttDownload.java index b137cc94..9df6acde 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/attachments/EffAttDownload.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/attachments/EffAttDownload.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.attachments; +package net.itsthesky.disky.elements.properties.attachments; import ch.njol.skript.Skript; import ch.njol.skript.doc.Description; @@ -7,8 +7,8 @@ import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.SkriptParser; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.api.skript.WaiterEffect; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.api.skript.WaiterEffect; import net.dv8tion.jda.api.entities.Message; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/attachments/ExprAttDuration.java b/src/main/java/net/itsthesky/disky/elements/properties/attachments/ExprAttDuration.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/properties/attachments/ExprAttDuration.java rename to src/main/java/net/itsthesky/disky/elements/properties/attachments/ExprAttDuration.java index 071830fe..79fdb86e 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/attachments/ExprAttDuration.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/attachments/ExprAttDuration.java @@ -1,10 +1,10 @@ -package info.itsthesky.disky.elements.properties.attachments; +package net.itsthesky.disky.elements.properties.attachments; import ch.njol.skript.classes.Changer; import ch.njol.skript.expressions.base.SimplePropertyExpression; import ch.njol.skript.util.Timespan; import ch.njol.util.coll.CollectionUtils; -import info.itsthesky.disky.core.Debug; +import net.itsthesky.disky.core.Debug; import net.dv8tion.jda.api.entities.Message; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/attachments/ExprAttFileExt.java b/src/main/java/net/itsthesky/disky/elements/properties/attachments/ExprAttFileExt.java similarity index 95% rename from src/main/java/info/itsthesky/disky/elements/properties/attachments/ExprAttFileExt.java rename to src/main/java/net/itsthesky/disky/elements/properties/attachments/ExprAttFileExt.java index 26110100..9fa9da10 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/attachments/ExprAttFileExt.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/attachments/ExprAttFileExt.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.attachments; +package net.itsthesky.disky.elements.properties.attachments; import ch.njol.skript.classes.Changer; import ch.njol.skript.doc.Description; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/attachments/ExprAttFileName.java b/src/main/java/net/itsthesky/disky/elements/properties/attachments/ExprAttFileName.java similarity index 95% rename from src/main/java/info/itsthesky/disky/elements/properties/attachments/ExprAttFileName.java rename to src/main/java/net/itsthesky/disky/elements/properties/attachments/ExprAttFileName.java index d2d390fc..0b3dd5b6 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/attachments/ExprAttFileName.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/attachments/ExprAttFileName.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.attachments; +package net.itsthesky.disky.elements.properties.attachments; import ch.njol.skript.classes.Changer; import ch.njol.skript.doc.Description; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/attachments/ExprAttURL.java b/src/main/java/net/itsthesky/disky/elements/properties/attachments/ExprAttURL.java similarity index 95% rename from src/main/java/info/itsthesky/disky/elements/properties/attachments/ExprAttURL.java rename to src/main/java/net/itsthesky/disky/elements/properties/attachments/ExprAttURL.java index 61797669..b7c7167f 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/attachments/ExprAttURL.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/attachments/ExprAttURL.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.attachments; +package net.itsthesky.disky.elements.properties.attachments; import ch.njol.skript.classes.Changer; import ch.njol.skript.doc.Description; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/ban/BanReason.java b/src/main/java/net/itsthesky/disky/elements/properties/ban/BanReason.java similarity index 94% rename from src/main/java/info/itsthesky/disky/elements/properties/ban/BanReason.java rename to src/main/java/net/itsthesky/disky/elements/properties/ban/BanReason.java index 3e9016ae..b367568f 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/ban/BanReason.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/ban/BanReason.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.ban; +package net.itsthesky.disky.elements.properties.ban; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Name; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/ban/BanUser.java b/src/main/java/net/itsthesky/disky/elements/properties/ban/BanUser.java similarity index 94% rename from src/main/java/info/itsthesky/disky/elements/properties/ban/BanUser.java rename to src/main/java/net/itsthesky/disky/elements/properties/ban/BanUser.java index ff9b3bcd..a46cc5ba 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/ban/BanUser.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/ban/BanUser.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.ban; +package net.itsthesky.disky.elements.properties.ban; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Name; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/bot/BotGuilds.java b/src/main/java/net/itsthesky/disky/elements/properties/bot/BotGuilds.java similarity index 78% rename from src/main/java/info/itsthesky/disky/elements/properties/bot/BotGuilds.java rename to src/main/java/net/itsthesky/disky/elements/properties/bot/BotGuilds.java index e923a3f3..4deafd86 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/bot/BotGuilds.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/bot/BotGuilds.java @@ -1,7 +1,7 @@ -package info.itsthesky.disky.elements.properties.bot; +package net.itsthesky.disky.elements.properties.bot; -import info.itsthesky.disky.api.skript.MultiplyPropertyExpression; -import info.itsthesky.disky.core.Bot; +import net.itsthesky.disky.api.skript.MultiplyPropertyExpression; +import net.itsthesky.disky.core.Bot; import net.dv8tion.jda.api.entities.Guild; public class BotGuilds extends MultiplyPropertyExpression { diff --git a/src/main/java/info/itsthesky/disky/elements/properties/bot/BotIsLoaded.java b/src/main/java/net/itsthesky/disky/elements/properties/bot/BotIsLoaded.java similarity index 86% rename from src/main/java/info/itsthesky/disky/elements/properties/bot/BotIsLoaded.java rename to src/main/java/net/itsthesky/disky/elements/properties/bot/BotIsLoaded.java index 5fcae144..269cc3ae 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/bot/BotIsLoaded.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/bot/BotIsLoaded.java @@ -1,7 +1,7 @@ -package info.itsthesky.disky.elements.properties.bot; +package net.itsthesky.disky.elements.properties.bot; import ch.njol.skript.conditions.base.PropertyCondition; -import info.itsthesky.disky.DiSky; +import net.itsthesky.disky.DiSky; import org.jetbrains.annotations.NotNull; public class BotIsLoaded extends PropertyCondition { diff --git a/src/main/java/info/itsthesky/disky/elements/properties/bot/BotPing.java b/src/main/java/net/itsthesky/disky/elements/properties/bot/BotPing.java similarity index 87% rename from src/main/java/info/itsthesky/disky/elements/properties/bot/BotPing.java rename to src/main/java/net/itsthesky/disky/elements/properties/bot/BotPing.java index cb83acf1..cf26145e 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/bot/BotPing.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/bot/BotPing.java @@ -1,13 +1,13 @@ -package info.itsthesky.disky.elements.properties.bot; +package net.itsthesky.disky.elements.properties.bot; import ch.njol.skript.classes.Changer; import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.SkriptParser; import ch.njol.util.Kleenean; import ch.njol.util.coll.CollectionUtils; -import info.itsthesky.disky.api.changers.ChangeablePropertyExpression; -import info.itsthesky.disky.api.skript.NodeInformation; -import info.itsthesky.disky.core.Bot; +import net.itsthesky.disky.api.changers.ChangeablePropertyExpression; +import net.itsthesky.disky.api.skript.NodeInformation; +import net.itsthesky.disky.core.Bot; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/bot/BotPresence.java b/src/main/java/net/itsthesky/disky/elements/properties/bot/BotPresence.java similarity index 91% rename from src/main/java/info/itsthesky/disky/elements/properties/bot/BotPresence.java rename to src/main/java/net/itsthesky/disky/elements/properties/bot/BotPresence.java index 3a7b1348..947c85f9 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/bot/BotPresence.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/bot/BotPresence.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.bot; +package net.itsthesky.disky.elements.properties.bot; import ch.njol.skript.classes.Changer; import ch.njol.skript.expressions.base.PropertyExpression; @@ -6,9 +6,9 @@ import ch.njol.skript.lang.SkriptParser; import ch.njol.util.Kleenean; import ch.njol.util.coll.CollectionUtils; -import info.itsthesky.disky.api.skript.EasyElement; -import info.itsthesky.disky.api.skript.NodeInformation; -import info.itsthesky.disky.core.Bot; +import net.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.api.skript.NodeInformation; +import net.itsthesky.disky.core.Bot; import net.dv8tion.jda.api.entities.Activity; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/bot/BotStatus.java b/src/main/java/net/itsthesky/disky/elements/properties/bot/BotStatus.java similarity index 95% rename from src/main/java/info/itsthesky/disky/elements/properties/bot/BotStatus.java rename to src/main/java/net/itsthesky/disky/elements/properties/bot/BotStatus.java index 20ba06ca..a90ab1d3 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/bot/BotStatus.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/bot/BotStatus.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.bot; +package net.itsthesky.disky.elements.properties.bot; import ch.njol.skript.classes.Changer; import ch.njol.skript.expressions.base.PropertyExpression; @@ -6,10 +6,10 @@ import ch.njol.skript.lang.SkriptParser; import ch.njol.util.Kleenean; import ch.njol.util.coll.CollectionUtils; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.api.skript.EasyElement; -import info.itsthesky.disky.core.Bot; -import info.itsthesky.disky.managers.ConfigManager; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.core.Bot; +import net.itsthesky.disky.managers.ConfigManager; import net.dv8tion.jda.api.OnlineStatus; import net.dv8tion.jda.api.entities.Member; import org.bukkit.event.Event; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/bot/BotToken.java b/src/main/java/net/itsthesky/disky/elements/properties/bot/BotToken.java similarity index 87% rename from src/main/java/info/itsthesky/disky/elements/properties/bot/BotToken.java rename to src/main/java/net/itsthesky/disky/elements/properties/bot/BotToken.java index 3aa9490c..8f521dba 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/bot/BotToken.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/bot/BotToken.java @@ -1,15 +1,15 @@ -package info.itsthesky.disky.elements.properties.bot; +package net.itsthesky.disky.elements.properties.bot; import ch.njol.skript.classes.Changer; import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.SkriptParser; import ch.njol.util.Kleenean; import ch.njol.util.coll.CollectionUtils; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.api.changers.ChangeablePropertyExpression; -import info.itsthesky.disky.api.skript.EasyElement; -import info.itsthesky.disky.core.Bot; -import info.itsthesky.disky.managers.ConfigManager; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.api.changers.ChangeablePropertyExpression; +import net.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.core.Bot; +import net.itsthesky.disky.managers.ConfigManager; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/bot/BotUptime.java b/src/main/java/net/itsthesky/disky/elements/properties/bot/BotUptime.java similarity index 87% rename from src/main/java/info/itsthesky/disky/elements/properties/bot/BotUptime.java rename to src/main/java/net/itsthesky/disky/elements/properties/bot/BotUptime.java index 49c2ce67..fb103fa3 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/bot/BotUptime.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/bot/BotUptime.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.bot; +package net.itsthesky.disky.elements.properties.bot; import ch.njol.skript.classes.Changer; import ch.njol.skript.lang.Expression; @@ -6,9 +6,9 @@ import ch.njol.skript.util.Timespan; import ch.njol.util.Kleenean; import ch.njol.util.coll.CollectionUtils; -import info.itsthesky.disky.api.changers.ChangeablePropertyExpression; -import info.itsthesky.disky.api.skript.NodeInformation; -import info.itsthesky.disky.core.Bot; +import net.itsthesky.disky.api.changers.ChangeablePropertyExpression; +import net.itsthesky.disky.api.skript.NodeInformation; +import net.itsthesky.disky.core.Bot; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/bot/ExprPresence.java b/src/main/java/net/itsthesky/disky/elements/properties/bot/ExprPresence.java similarity index 95% rename from src/main/java/info/itsthesky/disky/elements/properties/bot/ExprPresence.java rename to src/main/java/net/itsthesky/disky/elements/properties/bot/ExprPresence.java index f9006e6f..286715f1 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/bot/ExprPresence.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/bot/ExprPresence.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.bot; +package net.itsthesky.disky.elements.properties.bot; import ch.njol.skript.Skript; import ch.njol.skript.lang.Expression; @@ -6,8 +6,8 @@ import ch.njol.skript.lang.SkriptParser; import ch.njol.skript.lang.util.SimpleExpression; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.api.skript.NodeInformation; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.api.skript.NodeInformation; import net.dv8tion.jda.api.entities.Activity; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/bot/SelfMember.java b/src/main/java/net/itsthesky/disky/elements/properties/bot/SelfMember.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/properties/bot/SelfMember.java rename to src/main/java/net/itsthesky/disky/elements/properties/bot/SelfMember.java index d4f52cf9..bb289364 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/bot/SelfMember.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/bot/SelfMember.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.bot; +package net.itsthesky.disky.elements.properties.bot; import ch.njol.skript.Skript; import ch.njol.skript.doc.Description; @@ -10,8 +10,8 @@ import ch.njol.skript.lang.SkriptParser; import ch.njol.skript.lang.util.SimpleExpression; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.skript.EasyElement; -import info.itsthesky.disky.core.Bot; +import net.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.core.Bot; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; import org.bukkit.event.Event; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/channels/ChannelBitrate.java b/src/main/java/net/itsthesky/disky/elements/properties/channels/ChannelBitrate.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/properties/channels/ChannelBitrate.java rename to src/main/java/net/itsthesky/disky/elements/properties/channels/ChannelBitrate.java index 979b8908..1513e51f 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/channels/ChannelBitrate.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/channels/ChannelBitrate.java @@ -1,7 +1,7 @@ -package info.itsthesky.disky.elements.properties.channels; +package net.itsthesky.disky.elements.properties.channels; import ch.njol.skript.classes.Changer; -import info.itsthesky.disky.api.skript.action.ActionProperty; +import net.itsthesky.disky.api.skript.action.ActionProperty; import net.dv8tion.jda.api.entities.channel.middleman.AudioChannel; import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel; import net.dv8tion.jda.api.requests.restaction.ChannelAction; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/channels/ChannelChannels.java b/src/main/java/net/itsthesky/disky/elements/properties/channels/ChannelChannels.java similarity index 89% rename from src/main/java/info/itsthesky/disky/elements/properties/channels/ChannelChannels.java rename to src/main/java/net/itsthesky/disky/elements/properties/channels/ChannelChannels.java index 0726e9b4..58eacd4a 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/channels/ChannelChannels.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/channels/ChannelChannels.java @@ -1,6 +1,6 @@ -package info.itsthesky.disky.elements.properties.channels; +package net.itsthesky.disky.elements.properties.channels; -import info.itsthesky.disky.api.skript.MultiplyPropertyExpression; +import net.itsthesky.disky.api.skript.MultiplyPropertyExpression; import net.dv8tion.jda.api.entities.channel.concrete.Category; import net.dv8tion.jda.api.entities.channel.concrete.TextChannel; import org.bukkit.event.Event; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/channels/ChannelJumpURL.java b/src/main/java/net/itsthesky/disky/elements/properties/channels/ChannelJumpURL.java similarity index 95% rename from src/main/java/info/itsthesky/disky/elements/properties/channels/ChannelJumpURL.java rename to src/main/java/net/itsthesky/disky/elements/properties/channels/ChannelJumpURL.java index 5de0a4af..c00eb84e 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/channels/ChannelJumpURL.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/channels/ChannelJumpURL.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.channels; +package net.itsthesky.disky.elements.properties.channels; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/channels/ChannelMaxUser.java b/src/main/java/net/itsthesky/disky/elements/properties/channels/ChannelMaxUser.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/properties/channels/ChannelMaxUser.java rename to src/main/java/net/itsthesky/disky/elements/properties/channels/ChannelMaxUser.java index a226d294..1aa76400 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/channels/ChannelMaxUser.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/channels/ChannelMaxUser.java @@ -1,7 +1,7 @@ -package info.itsthesky.disky.elements.properties.channels; +package net.itsthesky.disky.elements.properties.channels; import ch.njol.skript.classes.Changer; -import info.itsthesky.disky.api.skript.action.ActionProperty; +import net.itsthesky.disky.api.skript.action.ActionProperty; import net.dv8tion.jda.api.entities.channel.concrete.VoiceChannel; import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel; import net.dv8tion.jda.api.requests.restaction.ChannelAction; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/channels/ChannelMembers.java b/src/main/java/net/itsthesky/disky/elements/properties/channels/ChannelMembers.java similarity index 89% rename from src/main/java/info/itsthesky/disky/elements/properties/channels/ChannelMembers.java rename to src/main/java/net/itsthesky/disky/elements/properties/channels/ChannelMembers.java index da752a16..32aca5d7 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/channels/ChannelMembers.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/channels/ChannelMembers.java @@ -1,9 +1,9 @@ -package info.itsthesky.disky.elements.properties.channels; +package net.itsthesky.disky.elements.properties.channels; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; import ch.njol.skript.doc.Name; -import info.itsthesky.disky.api.skript.MultiplyPropertyExpression; +import net.itsthesky.disky.api.skript.MultiplyPropertyExpression; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.channel.concrete.VoiceChannel; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/channels/ChannelNSFW.java b/src/main/java/net/itsthesky/disky/elements/properties/channels/ChannelNSFW.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/properties/channels/ChannelNSFW.java rename to src/main/java/net/itsthesky/disky/elements/properties/channels/ChannelNSFW.java index 0567a85a..b5cadaf1 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/channels/ChannelNSFW.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/channels/ChannelNSFW.java @@ -1,7 +1,7 @@ -package info.itsthesky.disky.elements.properties.channels; +package net.itsthesky.disky.elements.properties.channels; import ch.njol.skript.classes.Changer; -import info.itsthesky.disky.api.skript.action.ActionProperty; +import net.itsthesky.disky.api.skript.action.ActionProperty; import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel; import net.dv8tion.jda.api.entities.channel.middleman.StandardGuildMessageChannel; import net.dv8tion.jda.api.requests.restaction.ChannelAction; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/channels/ChannelName.java b/src/main/java/net/itsthesky/disky/elements/properties/channels/ChannelName.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/properties/channels/ChannelName.java rename to src/main/java/net/itsthesky/disky/elements/properties/channels/ChannelName.java index b2581872..455ce53e 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/channels/ChannelName.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/channels/ChannelName.java @@ -1,7 +1,7 @@ -package info.itsthesky.disky.elements.properties.channels; +package net.itsthesky.disky.elements.properties.channels; import ch.njol.skript.classes.Changer; -import info.itsthesky.disky.api.skript.action.ActionProperty; +import net.itsthesky.disky.api.skript.action.ActionProperty; import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel; import net.dv8tion.jda.api.requests.restaction.ChannelAction; import org.bukkit.event.Event; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/channels/ChannelParent.java b/src/main/java/net/itsthesky/disky/elements/properties/channels/ChannelParent.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/properties/channels/ChannelParent.java rename to src/main/java/net/itsthesky/disky/elements/properties/channels/ChannelParent.java index 3c8760d9..969d677f 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/channels/ChannelParent.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/channels/ChannelParent.java @@ -1,7 +1,7 @@ -package info.itsthesky.disky.elements.properties.channels; +package net.itsthesky.disky.elements.properties.channels; import ch.njol.skript.classes.Changer; -import info.itsthesky.disky.api.skript.action.ActionProperty; +import net.itsthesky.disky.api.skript.action.ActionProperty; import net.dv8tion.jda.api.entities.channel.attribute.ICategorizableChannel; import net.dv8tion.jda.api.entities.channel.concrete.Category; import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/channels/ChannelRegion.java b/src/main/java/net/itsthesky/disky/elements/properties/channels/ChannelRegion.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/properties/channels/ChannelRegion.java rename to src/main/java/net/itsthesky/disky/elements/properties/channels/ChannelRegion.java index 189a15c3..5e417b29 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/channels/ChannelRegion.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/channels/ChannelRegion.java @@ -1,7 +1,7 @@ -package info.itsthesky.disky.elements.properties.channels; +package net.itsthesky.disky.elements.properties.channels; import ch.njol.skript.classes.Changer; -import info.itsthesky.disky.api.skript.action.ActionProperty; +import net.itsthesky.disky.api.skript.action.ActionProperty; import net.dv8tion.jda.api.Region; import net.dv8tion.jda.api.entities.channel.middleman.AudioChannel; import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/channels/ChannelSlowmode.java b/src/main/java/net/itsthesky/disky/elements/properties/channels/ChannelSlowmode.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/properties/channels/ChannelSlowmode.java rename to src/main/java/net/itsthesky/disky/elements/properties/channels/ChannelSlowmode.java index c84450dd..c4f4276d 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/channels/ChannelSlowmode.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/channels/ChannelSlowmode.java @@ -1,7 +1,7 @@ -package info.itsthesky.disky.elements.properties.channels; +package net.itsthesky.disky.elements.properties.channels; import ch.njol.skript.classes.Changer; -import info.itsthesky.disky.api.skript.action.ActionProperty; +import net.itsthesky.disky.api.skript.action.ActionProperty; import net.dv8tion.jda.api.entities.channel.concrete.TextChannel; import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel; import net.dv8tion.jda.api.requests.restaction.ChannelAction; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/channels/ChannelStatus.java b/src/main/java/net/itsthesky/disky/elements/properties/channels/ChannelStatus.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/properties/channels/ChannelStatus.java rename to src/main/java/net/itsthesky/disky/elements/properties/channels/ChannelStatus.java index fc4b9024..3c49622f 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/channels/ChannelStatus.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/channels/ChannelStatus.java @@ -1,10 +1,10 @@ -package info.itsthesky.disky.elements.properties.channels; +package net.itsthesky.disky.elements.properties.channels; import ch.njol.skript.Skript; import ch.njol.skript.classes.Changer; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.api.skript.action.ActionProperty; -import info.itsthesky.disky.elements.sections.handler.DiSkyRuntimeHandler; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.api.skript.action.ActionProperty; +import net.itsthesky.disky.elements.sections.handler.DiSkyRuntimeHandler; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.channel.attribute.IVoiceStatusChannel; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/channels/ChannelThreads.java b/src/main/java/net/itsthesky/disky/elements/properties/channels/ChannelThreads.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/properties/channels/ChannelThreads.java rename to src/main/java/net/itsthesky/disky/elements/properties/channels/ChannelThreads.java index cdb00918..9dcd2d3e 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/channels/ChannelThreads.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/channels/ChannelThreads.java @@ -1,11 +1,11 @@ -package info.itsthesky.disky.elements.properties.channels; +package net.itsthesky.disky.elements.properties.channels; import ch.njol.skript.Skript; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; import ch.njol.skript.doc.Name; import ch.njol.skript.doc.Since; -import info.itsthesky.disky.api.skript.MultiplyPropertyExpression; +import net.itsthesky.disky.api.skript.MultiplyPropertyExpression; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.channel.attribute.IThreadContainer; import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/channels/ChannelTopic.java b/src/main/java/net/itsthesky/disky/elements/properties/channels/ChannelTopic.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/properties/channels/ChannelTopic.java rename to src/main/java/net/itsthesky/disky/elements/properties/channels/ChannelTopic.java index b86eef51..032e92d8 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/channels/ChannelTopic.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/channels/ChannelTopic.java @@ -1,7 +1,7 @@ -package info.itsthesky.disky.elements.properties.channels; +package net.itsthesky.disky.elements.properties.channels; import ch.njol.skript.classes.Changer; -import info.itsthesky.disky.api.skript.action.ActionProperty; +import net.itsthesky.disky.api.skript.action.ActionProperty; import net.dv8tion.jda.api.entities.channel.concrete.ForumChannel; import net.dv8tion.jda.api.entities.channel.middleman.GuildChannel; import net.dv8tion.jda.api.entities.channel.middleman.StandardGuildMessageChannel; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/channels/NewCategoryAction.java b/src/main/java/net/itsthesky/disky/elements/properties/channels/NewCategoryAction.java similarity index 85% rename from src/main/java/info/itsthesky/disky/elements/properties/channels/NewCategoryAction.java rename to src/main/java/net/itsthesky/disky/elements/properties/channels/NewCategoryAction.java index 00797c5d..d41edc5e 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/channels/NewCategoryAction.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/channels/NewCategoryAction.java @@ -1,6 +1,6 @@ -package info.itsthesky.disky.elements.properties.channels; +package net.itsthesky.disky.elements.properties.channels; -import info.itsthesky.disky.api.skript.action.GuildAction; +import net.itsthesky.disky.api.skript.action.GuildAction; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.requests.restaction.ChannelAction; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/channels/NewMediaChannel.java b/src/main/java/net/itsthesky/disky/elements/properties/channels/NewMediaChannel.java similarity index 85% rename from src/main/java/info/itsthesky/disky/elements/properties/channels/NewMediaChannel.java rename to src/main/java/net/itsthesky/disky/elements/properties/channels/NewMediaChannel.java index dad42614..e3ff2889 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/channels/NewMediaChannel.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/channels/NewMediaChannel.java @@ -1,6 +1,6 @@ -package info.itsthesky.disky.elements.properties.channels; +package net.itsthesky.disky.elements.properties.channels; -import info.itsthesky.disky.api.skript.action.GuildAction; +import net.itsthesky.disky.api.skript.action.GuildAction; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.requests.restaction.ChannelAction; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/channels/NewNewsChannel.java b/src/main/java/net/itsthesky/disky/elements/properties/channels/NewNewsChannel.java similarity index 85% rename from src/main/java/info/itsthesky/disky/elements/properties/channels/NewNewsChannel.java rename to src/main/java/net/itsthesky/disky/elements/properties/channels/NewNewsChannel.java index dc67012f..4163866f 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/channels/NewNewsChannel.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/channels/NewNewsChannel.java @@ -1,6 +1,6 @@ -package info.itsthesky.disky.elements.properties.channels; +package net.itsthesky.disky.elements.properties.channels; -import info.itsthesky.disky.api.skript.action.GuildAction; +import net.itsthesky.disky.api.skript.action.GuildAction; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.requests.restaction.ChannelAction; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/channels/NewStageChannel.java b/src/main/java/net/itsthesky/disky/elements/properties/channels/NewStageChannel.java similarity index 85% rename from src/main/java/info/itsthesky/disky/elements/properties/channels/NewStageChannel.java rename to src/main/java/net/itsthesky/disky/elements/properties/channels/NewStageChannel.java index eb71e130..32ef2a94 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/channels/NewStageChannel.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/channels/NewStageChannel.java @@ -1,6 +1,6 @@ -package info.itsthesky.disky.elements.properties.channels; +package net.itsthesky.disky.elements.properties.channels; -import info.itsthesky.disky.api.skript.action.GuildAction; +import net.itsthesky.disky.api.skript.action.GuildAction; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.requests.restaction.ChannelAction; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/channels/NewTextAction.java b/src/main/java/net/itsthesky/disky/elements/properties/channels/NewTextAction.java similarity index 85% rename from src/main/java/info/itsthesky/disky/elements/properties/channels/NewTextAction.java rename to src/main/java/net/itsthesky/disky/elements/properties/channels/NewTextAction.java index f39b2947..3f7b562f 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/channels/NewTextAction.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/channels/NewTextAction.java @@ -1,6 +1,6 @@ -package info.itsthesky.disky.elements.properties.channels; +package net.itsthesky.disky.elements.properties.channels; -import info.itsthesky.disky.api.skript.action.GuildAction; +import net.itsthesky.disky.api.skript.action.GuildAction; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.requests.restaction.ChannelAction; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/channels/NewVoiceAction.java b/src/main/java/net/itsthesky/disky/elements/properties/channels/NewVoiceAction.java similarity index 85% rename from src/main/java/info/itsthesky/disky/elements/properties/channels/NewVoiceAction.java rename to src/main/java/net/itsthesky/disky/elements/properties/channels/NewVoiceAction.java index 9e77da13..21818fd6 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/channels/NewVoiceAction.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/channels/NewVoiceAction.java @@ -1,6 +1,6 @@ -package info.itsthesky.disky.elements.properties.channels; +package net.itsthesky.disky.elements.properties.channels; -import info.itsthesky.disky.api.skript.action.GuildAction; +import net.itsthesky.disky.api.skript.action.GuildAction; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.requests.restaction.ChannelAction; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/embeds/EffAddField.java b/src/main/java/net/itsthesky/disky/elements/properties/embeds/EffAddField.java similarity index 96% rename from src/main/java/info/itsthesky/disky/elements/properties/embeds/EffAddField.java rename to src/main/java/net/itsthesky/disky/elements/properties/embeds/EffAddField.java index 0b8eb370..259333a9 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/embeds/EffAddField.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/embeds/EffAddField.java @@ -1,11 +1,11 @@ -package info.itsthesky.disky.elements.properties.embeds; +package net.itsthesky.disky.elements.properties.embeds; import ch.njol.skript.Skript; import ch.njol.skript.lang.Effect; import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.SkriptParser; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; +import net.itsthesky.disky.DiSky; import net.dv8tion.jda.api.EmbedBuilder; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/embeds/EmbedAuthor.java b/src/main/java/net/itsthesky/disky/elements/properties/embeds/EmbedAuthor.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/properties/embeds/EmbedAuthor.java rename to src/main/java/net/itsthesky/disky/elements/properties/embeds/EmbedAuthor.java index 64a60663..be4e2b19 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/embeds/EmbedAuthor.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/embeds/EmbedAuthor.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.embeds; +package net.itsthesky.disky.elements.properties.embeds; import ch.njol.skript.classes.Changer; import net.dv8tion.jda.api.EmbedBuilder; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/embeds/EmbedAuthorIcon.java b/src/main/java/net/itsthesky/disky/elements/properties/embeds/EmbedAuthorIcon.java similarity index 95% rename from src/main/java/info/itsthesky/disky/elements/properties/embeds/EmbedAuthorIcon.java rename to src/main/java/net/itsthesky/disky/elements/properties/embeds/EmbedAuthorIcon.java index 936ded55..c4b6baee 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/embeds/EmbedAuthorIcon.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/embeds/EmbedAuthorIcon.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.embeds; +package net.itsthesky.disky.elements.properties.embeds; import ch.njol.skript.Skript; import ch.njol.skript.classes.Changer; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/embeds/EmbedAuthorURL.java b/src/main/java/net/itsthesky/disky/elements/properties/embeds/EmbedAuthorURL.java similarity index 95% rename from src/main/java/info/itsthesky/disky/elements/properties/embeds/EmbedAuthorURL.java rename to src/main/java/net/itsthesky/disky/elements/properties/embeds/EmbedAuthorURL.java index a394ae8e..5f123581 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/embeds/EmbedAuthorURL.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/embeds/EmbedAuthorURL.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.embeds; +package net.itsthesky.disky.elements.properties.embeds; import ch.njol.skript.Skript; import ch.njol.skript.classes.Changer; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/embeds/EmbedDescription.java b/src/main/java/net/itsthesky/disky/elements/properties/embeds/EmbedDescription.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/properties/embeds/EmbedDescription.java rename to src/main/java/net/itsthesky/disky/elements/properties/embeds/EmbedDescription.java index da6a9f2e..3d0f39ed 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/embeds/EmbedDescription.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/embeds/EmbedDescription.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.embeds; +package net.itsthesky.disky.elements.properties.embeds; import ch.njol.skript.classes.Changer; import net.dv8tion.jda.api.EmbedBuilder; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/embeds/EmbedFields.java b/src/main/java/net/itsthesky/disky/elements/properties/embeds/EmbedFields.java similarity index 89% rename from src/main/java/info/itsthesky/disky/elements/properties/embeds/EmbedFields.java rename to src/main/java/net/itsthesky/disky/elements/properties/embeds/EmbedFields.java index d1580b59..0ca0a5b2 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/embeds/EmbedFields.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/embeds/EmbedFields.java @@ -1,9 +1,9 @@ -package info.itsthesky.disky.elements.properties.embeds; +package net.itsthesky.disky.elements.properties.embeds; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; import ch.njol.skript.doc.Name; -import info.itsthesky.disky.api.skript.MultiplyPropertyExpression; +import net.itsthesky.disky.api.skript.MultiplyPropertyExpression; import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.entities.MessageEmbed; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/embeds/EmbedFooter.java b/src/main/java/net/itsthesky/disky/elements/properties/embeds/EmbedFooter.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/properties/embeds/EmbedFooter.java rename to src/main/java/net/itsthesky/disky/elements/properties/embeds/EmbedFooter.java index 584d10a3..cab97ab3 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/embeds/EmbedFooter.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/embeds/EmbedFooter.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.embeds; +package net.itsthesky.disky.elements.properties.embeds; import ch.njol.skript.classes.Changer; import net.dv8tion.jda.api.EmbedBuilder; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/embeds/EmbedFooterIcon.java b/src/main/java/net/itsthesky/disky/elements/properties/embeds/EmbedFooterIcon.java similarity index 95% rename from src/main/java/info/itsthesky/disky/elements/properties/embeds/EmbedFooterIcon.java rename to src/main/java/net/itsthesky/disky/elements/properties/embeds/EmbedFooterIcon.java index b6a51769..272c1a34 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/embeds/EmbedFooterIcon.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/embeds/EmbedFooterIcon.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.embeds; +package net.itsthesky.disky.elements.properties.embeds; import ch.njol.skript.Skript; import ch.njol.skript.classes.Changer; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/embeds/EmbedFromJSON.java b/src/main/java/net/itsthesky/disky/elements/properties/embeds/EmbedFromJSON.java similarity index 91% rename from src/main/java/info/itsthesky/disky/elements/properties/embeds/EmbedFromJSON.java rename to src/main/java/net/itsthesky/disky/elements/properties/embeds/EmbedFromJSON.java index fd15503c..52cb99d2 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/embeds/EmbedFromJSON.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/embeds/EmbedFromJSON.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.embeds; +package net.itsthesky.disky.elements.properties.embeds; import ch.njol.skript.Skript; import ch.njol.skript.lang.Expression; @@ -6,8 +6,8 @@ import ch.njol.skript.lang.SkriptParser; import ch.njol.skript.lang.util.SimpleExpression; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.skript.EasyElement; -import info.itsthesky.disky.core.Utils; +import net.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.core.Utils; import net.dv8tion.jda.api.EmbedBuilder; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/embeds/EmbedImage.java b/src/main/java/net/itsthesky/disky/elements/properties/embeds/EmbedImage.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/properties/embeds/EmbedImage.java rename to src/main/java/net/itsthesky/disky/elements/properties/embeds/EmbedImage.java index 49e5425a..b2027809 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/embeds/EmbedImage.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/embeds/EmbedImage.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.embeds; +package net.itsthesky.disky.elements.properties.embeds; import ch.njol.skript.classes.Changer; import net.dv8tion.jda.api.EmbedBuilder; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/embeds/EmbedProperty.java b/src/main/java/net/itsthesky/disky/elements/properties/embeds/EmbedProperty.java similarity index 94% rename from src/main/java/info/itsthesky/disky/elements/properties/embeds/EmbedProperty.java rename to src/main/java/net/itsthesky/disky/elements/properties/embeds/EmbedProperty.java index 2bb46604..e5ce215f 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/embeds/EmbedProperty.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/embeds/EmbedProperty.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.embeds; +package net.itsthesky.disky.elements.properties.embeds; import ch.njol.skript.Skript; import ch.njol.skript.classes.Changer; @@ -6,7 +6,7 @@ import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.SkriptParser; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.api.skript.EasyElement; import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.entities.MessageEmbed; import org.bukkit.event.Event; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/embeds/EmbedThumbnail.java b/src/main/java/net/itsthesky/disky/elements/properties/embeds/EmbedThumbnail.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/properties/embeds/EmbedThumbnail.java rename to src/main/java/net/itsthesky/disky/elements/properties/embeds/EmbedThumbnail.java index ec818a3b..0d61b30f 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/embeds/EmbedThumbnail.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/embeds/EmbedThumbnail.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.embeds; +package net.itsthesky.disky.elements.properties.embeds; import ch.njol.skript.classes.Changer; import net.dv8tion.jda.api.EmbedBuilder; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/embeds/EmbedTimeStamp.java b/src/main/java/net/itsthesky/disky/elements/properties/embeds/EmbedTimeStamp.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/properties/embeds/EmbedTimeStamp.java rename to src/main/java/net/itsthesky/disky/elements/properties/embeds/EmbedTimeStamp.java index df2f7bdb..1324700e 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/embeds/EmbedTimeStamp.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/embeds/EmbedTimeStamp.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.embeds; +package net.itsthesky.disky.elements.properties.embeds; import ch.njol.skript.classes.Changer; import ch.njol.skript.util.Date; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/embeds/EmbedTitle.java b/src/main/java/net/itsthesky/disky/elements/properties/embeds/EmbedTitle.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/properties/embeds/EmbedTitle.java rename to src/main/java/net/itsthesky/disky/elements/properties/embeds/EmbedTitle.java index 84bcdd85..c5a6c043 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/embeds/EmbedTitle.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/embeds/EmbedTitle.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.embeds; +package net.itsthesky.disky.elements.properties.embeds; import ch.njol.skript.classes.Changer; import net.dv8tion.jda.api.EmbedBuilder; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/embeds/EmbedTitleURL.java b/src/main/java/net/itsthesky/disky/elements/properties/embeds/EmbedTitleURL.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/properties/embeds/EmbedTitleURL.java rename to src/main/java/net/itsthesky/disky/elements/properties/embeds/EmbedTitleURL.java index 26d9b9ab..5c02093f 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/embeds/EmbedTitleURL.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/embeds/EmbedTitleURL.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.embeds; +package net.itsthesky.disky.elements.properties.embeds; import ch.njol.skript.classes.Changer; import net.dv8tion.jda.api.EmbedBuilder; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/embeds/EmbedToJSON.java b/src/main/java/net/itsthesky/disky/elements/properties/embeds/EmbedToJSON.java similarity index 91% rename from src/main/java/info/itsthesky/disky/elements/properties/embeds/EmbedToJSON.java rename to src/main/java/net/itsthesky/disky/elements/properties/embeds/EmbedToJSON.java index 2dfdfa8d..95b5a2eb 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/embeds/EmbedToJSON.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/embeds/EmbedToJSON.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.embeds; +package net.itsthesky.disky.elements.properties.embeds; import ch.njol.skript.Skript; import ch.njol.skript.lang.Expression; @@ -6,8 +6,8 @@ import ch.njol.skript.lang.SkriptParser; import ch.njol.skript.lang.util.SimpleExpression; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.skript.EasyElement; -import info.itsthesky.disky.core.Utils; +import net.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.core.Utils; import net.dv8tion.jda.api.EmbedBuilder; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/embeds/EmbedURL.java b/src/main/java/net/itsthesky/disky/elements/properties/embeds/EmbedURL.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/properties/embeds/EmbedURL.java rename to src/main/java/net/itsthesky/disky/elements/properties/embeds/EmbedURL.java index 985fc832..3db82cb3 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/embeds/EmbedURL.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/embeds/EmbedURL.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.embeds; +package net.itsthesky.disky.elements.properties.embeds; import ch.njol.skript.classes.Changer; import net.dv8tion.jda.api.EmbedBuilder; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/embeds/ExprLastEmbed.java b/src/main/java/net/itsthesky/disky/elements/properties/embeds/ExprLastEmbed.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/properties/embeds/ExprLastEmbed.java rename to src/main/java/net/itsthesky/disky/elements/properties/embeds/ExprLastEmbed.java index 4a71d2d3..3ba9e85c 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/embeds/ExprLastEmbed.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/embeds/ExprLastEmbed.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.embeds; +package net.itsthesky.disky.elements.properties.embeds; import ch.njol.skript.Skript; import ch.njol.skript.doc.Description; @@ -9,7 +9,7 @@ import ch.njol.skript.lang.SkriptParser; import ch.njol.skript.lang.util.SimpleExpression; import ch.njol.util.Kleenean; -import info.itsthesky.disky.elements.sections.EmbedSection; +import net.itsthesky.disky.elements.sections.EmbedSection; import net.dv8tion.jda.api.EmbedBuilder; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/emotes/EmoteGuild.java b/src/main/java/net/itsthesky/disky/elements/properties/emotes/EmoteGuild.java similarity index 91% rename from src/main/java/info/itsthesky/disky/elements/properties/emotes/EmoteGuild.java rename to src/main/java/net/itsthesky/disky/elements/properties/emotes/EmoteGuild.java index 61d2f13b..007927ed 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/emotes/EmoteGuild.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/emotes/EmoteGuild.java @@ -1,10 +1,10 @@ -package info.itsthesky.disky.elements.properties.emotes; +package net.itsthesky.disky.elements.properties.emotes; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; import ch.njol.skript.doc.Name; import ch.njol.skript.expressions.base.SimplePropertyExpression; -import info.itsthesky.disky.api.emojis.Emote; +import net.itsthesky.disky.api.emojis.Emote; import net.dv8tion.jda.api.entities.Guild; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/emotes/EmoteIsAnimated.java b/src/main/java/net/itsthesky/disky/elements/properties/emotes/EmoteIsAnimated.java similarity index 84% rename from src/main/java/info/itsthesky/disky/elements/properties/emotes/EmoteIsAnimated.java rename to src/main/java/net/itsthesky/disky/elements/properties/emotes/EmoteIsAnimated.java index 702b6590..ea967823 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/emotes/EmoteIsAnimated.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/emotes/EmoteIsAnimated.java @@ -1,7 +1,7 @@ -package info.itsthesky.disky.elements.properties.emotes; +package net.itsthesky.disky.elements.properties.emotes; import ch.njol.skript.conditions.base.PropertyCondition; -import info.itsthesky.disky.api.emojis.Emote; +import net.itsthesky.disky.api.emojis.Emote; import org.jetbrains.annotations.NotNull; public class EmoteIsAnimated extends PropertyCondition { diff --git a/src/main/java/info/itsthesky/disky/elements/properties/emotes/EmoteIsEmote.java b/src/main/java/net/itsthesky/disky/elements/properties/emotes/EmoteIsEmote.java similarity index 84% rename from src/main/java/info/itsthesky/disky/elements/properties/emotes/EmoteIsEmote.java rename to src/main/java/net/itsthesky/disky/elements/properties/emotes/EmoteIsEmote.java index 6a4ef8ea..e99d29ff 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/emotes/EmoteIsEmote.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/emotes/EmoteIsEmote.java @@ -1,7 +1,7 @@ -package info.itsthesky.disky.elements.properties.emotes; +package net.itsthesky.disky.elements.properties.emotes; import ch.njol.skript.conditions.base.PropertyCondition; -import info.itsthesky.disky.api.emojis.Emote; +import net.itsthesky.disky.api.emojis.Emote; import org.jetbrains.annotations.NotNull; public class EmoteIsEmote extends PropertyCondition { diff --git a/src/main/java/info/itsthesky/disky/elements/properties/emotes/EmoteName.java b/src/main/java/net/itsthesky/disky/elements/properties/emotes/EmoteName.java similarity index 90% rename from src/main/java/info/itsthesky/disky/elements/properties/emotes/EmoteName.java rename to src/main/java/net/itsthesky/disky/elements/properties/emotes/EmoteName.java index 743f46b0..596a8e00 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/emotes/EmoteName.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/emotes/EmoteName.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.emotes; +package net.itsthesky.disky.elements.properties.emotes; import ch.njol.skript.classes.Changer; import ch.njol.skript.doc.Description; @@ -7,10 +7,10 @@ import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.SkriptParser; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.changers.ChangeableSimplePropertyExpression; -import info.itsthesky.disky.api.emojis.Emote; -import info.itsthesky.disky.core.Bot; -import info.itsthesky.disky.elements.changers.IAsyncChangeableExpression; +import net.itsthesky.disky.api.changers.ChangeableSimplePropertyExpression; +import net.itsthesky.disky.api.emojis.Emote; +import net.itsthesky.disky.core.Bot; +import net.itsthesky.disky.elements.changers.IAsyncChangeableExpression; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/emotes/EmoteURL.java b/src/main/java/net/itsthesky/disky/elements/properties/emotes/EmoteURL.java similarity index 91% rename from src/main/java/info/itsthesky/disky/elements/properties/emotes/EmoteURL.java rename to src/main/java/net/itsthesky/disky/elements/properties/emotes/EmoteURL.java index 6ff71afe..569933a4 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/emotes/EmoteURL.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/emotes/EmoteURL.java @@ -1,10 +1,10 @@ -package info.itsthesky.disky.elements.properties.emotes; +package net.itsthesky.disky.elements.properties.emotes; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; import ch.njol.skript.doc.Name; import ch.njol.skript.expressions.base.SimplePropertyExpression; -import info.itsthesky.disky.api.emojis.Emote; +import net.itsthesky.disky.api.emojis.Emote; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/events/EventChannel.java b/src/main/java/net/itsthesky/disky/elements/properties/events/EventChannel.java similarity index 95% rename from src/main/java/info/itsthesky/disky/elements/properties/events/EventChannel.java rename to src/main/java/net/itsthesky/disky/elements/properties/events/EventChannel.java index 19109e37..d67da913 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/events/EventChannel.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/events/EventChannel.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.events; +package net.itsthesky.disky.elements.properties.events; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Name; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/events/EventCover.java b/src/main/java/net/itsthesky/disky/elements/properties/events/EventCover.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/properties/events/EventCover.java rename to src/main/java/net/itsthesky/disky/elements/properties/events/EventCover.java index a0592d22..63f3fb70 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/events/EventCover.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/events/EventCover.java @@ -1,9 +1,9 @@ -package info.itsthesky.disky.elements.properties.events; +package net.itsthesky.disky.elements.properties.events; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Name; import ch.njol.skript.doc.Since; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Icon; import net.dv8tion.jda.api.entities.ScheduledEvent; import net.dv8tion.jda.api.requests.RestAction; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/events/EventCreator.java b/src/main/java/net/itsthesky/disky/elements/properties/events/EventCreator.java similarity index 95% rename from src/main/java/info/itsthesky/disky/elements/properties/events/EventCreator.java rename to src/main/java/net/itsthesky/disky/elements/properties/events/EventCreator.java index 92ecfa39..4b9edc26 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/events/EventCreator.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/events/EventCreator.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.events; +package net.itsthesky.disky.elements.properties.events; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Name; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/events/EventEndDate.java b/src/main/java/net/itsthesky/disky/elements/properties/events/EventEndDate.java similarity index 96% rename from src/main/java/info/itsthesky/disky/elements/properties/events/EventEndDate.java rename to src/main/java/net/itsthesky/disky/elements/properties/events/EventEndDate.java index a9de3b07..b7a252ff 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/events/EventEndDate.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/events/EventEndDate.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.events; +package net.itsthesky.disky.elements.properties.events; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Name; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/events/EventLocation.java b/src/main/java/net/itsthesky/disky/elements/properties/events/EventLocation.java similarity index 96% rename from src/main/java/info/itsthesky/disky/elements/properties/events/EventLocation.java rename to src/main/java/net/itsthesky/disky/elements/properties/events/EventLocation.java index 36d67e3d..2d424c4c 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/events/EventLocation.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/events/EventLocation.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.events; +package net.itsthesky.disky.elements.properties.events; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Name; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/events/EventStartDate.java b/src/main/java/net/itsthesky/disky/elements/properties/events/EventStartDate.java similarity index 95% rename from src/main/java/info/itsthesky/disky/elements/properties/events/EventStartDate.java rename to src/main/java/net/itsthesky/disky/elements/properties/events/EventStartDate.java index 31651681..76ed58e3 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/events/EventStartDate.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/events/EventStartDate.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.events; +package net.itsthesky.disky.elements.properties.events; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Name; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/events/EventStatus.java b/src/main/java/net/itsthesky/disky/elements/properties/events/EventStatus.java similarity index 95% rename from src/main/java/info/itsthesky/disky/elements/properties/events/EventStatus.java rename to src/main/java/net/itsthesky/disky/elements/properties/events/EventStatus.java index e2ee9a94..9b406186 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/events/EventStatus.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/events/EventStatus.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.events; +package net.itsthesky.disky.elements.properties.events; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Name; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/events/EventType.java b/src/main/java/net/itsthesky/disky/elements/properties/events/EventType.java similarity index 94% rename from src/main/java/info/itsthesky/disky/elements/properties/events/EventType.java rename to src/main/java/net/itsthesky/disky/elements/properties/events/EventType.java index 19a9a397..27a2b47a 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/events/EventType.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/events/EventType.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.events; +package net.itsthesky.disky.elements.properties.events; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Name; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/events/SimpleScheduledEventExpression.java b/src/main/java/net/itsthesky/disky/elements/properties/events/SimpleScheduledEventExpression.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/properties/events/SimpleScheduledEventExpression.java rename to src/main/java/net/itsthesky/disky/elements/properties/events/SimpleScheduledEventExpression.java index 2c294c52..9f303a8c 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/events/SimpleScheduledEventExpression.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/events/SimpleScheduledEventExpression.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.properties.events; +package net.itsthesky.disky.elements.properties.events; import ch.njol.skript.classes.Changer; import ch.njol.skript.expressions.base.SimplePropertyExpression; -import info.itsthesky.disky.elements.changers.IAsyncChangeableExpression; +import net.itsthesky.disky.elements.changers.IAsyncChangeableExpression; import net.dv8tion.jda.api.entities.ScheduledEvent; import net.dv8tion.jda.api.requests.RestAction; import org.bukkit.event.Event; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/forums/CondTagRequired.java b/src/main/java/net/itsthesky/disky/elements/properties/forums/CondTagRequired.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/properties/forums/CondTagRequired.java rename to src/main/java/net/itsthesky/disky/elements/properties/forums/CondTagRequired.java index 03111343..4c9b5ab9 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/forums/CondTagRequired.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/forums/CondTagRequired.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.forums; +package net.itsthesky.disky.elements.properties.forums; import ch.njol.skript.conditions.base.PropertyCondition; import ch.njol.skript.doc.Description; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/forums/DefaultEmoji.java b/src/main/java/net/itsthesky/disky/elements/properties/forums/DefaultEmoji.java similarity index 91% rename from src/main/java/info/itsthesky/disky/elements/properties/forums/DefaultEmoji.java rename to src/main/java/net/itsthesky/disky/elements/properties/forums/DefaultEmoji.java index d3858979..ef7296dc 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/forums/DefaultEmoji.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/forums/DefaultEmoji.java @@ -1,13 +1,13 @@ -package info.itsthesky.disky.elements.properties.forums; +package net.itsthesky.disky.elements.properties.forums; import ch.njol.skript.classes.Changer; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; import ch.njol.skript.doc.Name; import ch.njol.skript.expressions.base.SimplePropertyExpression; -import info.itsthesky.disky.api.emojis.Emote; -import info.itsthesky.disky.api.skript.EasyElement; -import info.itsthesky.disky.elements.changers.IAsyncChangeableExpression; +import net.itsthesky.disky.api.emojis.Emote; +import net.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.elements.changers.IAsyncChangeableExpression; import net.dv8tion.jda.api.entities.channel.concrete.ForumChannel; import net.dv8tion.jda.api.requests.RestAction; import org.bukkit.event.Event; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/forums/ExprTagRequired.java b/src/main/java/net/itsthesky/disky/elements/properties/forums/ExprTagRequired.java similarity index 94% rename from src/main/java/info/itsthesky/disky/elements/properties/forums/ExprTagRequired.java rename to src/main/java/net/itsthesky/disky/elements/properties/forums/ExprTagRequired.java index a97b0926..bb5857d1 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/forums/ExprTagRequired.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/forums/ExprTagRequired.java @@ -1,11 +1,11 @@ -package info.itsthesky.disky.elements.properties.forums; +package net.itsthesky.disky.elements.properties.forums; import ch.njol.skript.classes.Changer; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; import ch.njol.skript.doc.Name; import ch.njol.skript.expressions.base.SimplePropertyExpression; -import info.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.api.skript.EasyElement; import net.dv8tion.jda.api.entities.channel.concrete.ForumChannel; import net.dv8tion.jda.api.requests.RestAction; import org.bukkit.event.Event; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/forums/ForumLayout.java b/src/main/java/net/itsthesky/disky/elements/properties/forums/ForumLayout.java similarity index 91% rename from src/main/java/info/itsthesky/disky/elements/properties/forums/ForumLayout.java rename to src/main/java/net/itsthesky/disky/elements/properties/forums/ForumLayout.java index 294711d9..c96ea900 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/forums/ForumLayout.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/forums/ForumLayout.java @@ -1,11 +1,11 @@ -package info.itsthesky.disky.elements.properties.forums; +package net.itsthesky.disky.elements.properties.forums; import ch.njol.skript.Skript; import ch.njol.skript.classes.Changer; import ch.njol.skript.expressions.base.SimplePropertyExpression; -import info.itsthesky.disky.api.ReflectionUtils; -import info.itsthesky.disky.api.skript.EasyElement; -import info.itsthesky.disky.elements.changers.IAsyncChangeableExpression; +import net.itsthesky.disky.api.ReflectionUtils; +import net.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.elements.changers.IAsyncChangeableExpression; import net.dv8tion.jda.api.entities.channel.concrete.ForumChannel; import net.dv8tion.jda.api.requests.RestAction; import org.bukkit.event.Event; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/forums/ForumSortOrder.java b/src/main/java/net/itsthesky/disky/elements/properties/forums/ForumSortOrder.java similarity index 91% rename from src/main/java/info/itsthesky/disky/elements/properties/forums/ForumSortOrder.java rename to src/main/java/net/itsthesky/disky/elements/properties/forums/ForumSortOrder.java index 616adf69..cad985c3 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/forums/ForumSortOrder.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/forums/ForumSortOrder.java @@ -1,11 +1,11 @@ -package info.itsthesky.disky.elements.properties.forums; +package net.itsthesky.disky.elements.properties.forums; import ch.njol.skript.Skript; import ch.njol.skript.classes.Changer; import ch.njol.skript.expressions.base.SimplePropertyExpression; -import info.itsthesky.disky.api.ReflectionUtils; -import info.itsthesky.disky.api.skript.EasyElement; -import info.itsthesky.disky.elements.changers.IAsyncChangeableExpression; +import net.itsthesky.disky.api.ReflectionUtils; +import net.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.elements.changers.IAsyncChangeableExpression; import net.dv8tion.jda.api.entities.channel.attribute.IPostContainer; import net.dv8tion.jda.api.entities.channel.concrete.ForumChannel; import net.dv8tion.jda.api.requests.RestAction; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/guilds/GuildAFKChannel.java b/src/main/java/net/itsthesky/disky/elements/properties/guilds/GuildAFKChannel.java similarity index 89% rename from src/main/java/info/itsthesky/disky/elements/properties/guilds/GuildAFKChannel.java rename to src/main/java/net/itsthesky/disky/elements/properties/guilds/GuildAFKChannel.java index 5e049895..3d9cdc85 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/guilds/GuildAFKChannel.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/guilds/GuildAFKChannel.java @@ -1,14 +1,14 @@ -package info.itsthesky.disky.elements.properties.guilds; +package net.itsthesky.disky.elements.properties.guilds; import ch.njol.skript.classes.Changer; import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.SkriptParser; import ch.njol.util.Kleenean; import ch.njol.util.coll.CollectionUtils; -import info.itsthesky.disky.api.changers.ChangeablePropertyExpression; -import info.itsthesky.disky.api.skript.EasyElement; -import info.itsthesky.disky.core.Bot; -import info.itsthesky.disky.elements.changers.IAsyncChangeableExpression; +import net.itsthesky.disky.api.changers.ChangeablePropertyExpression; +import net.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.core.Bot; +import net.itsthesky.disky.elements.changers.IAsyncChangeableExpression; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.channel.concrete.VoiceChannel; import org.bukkit.event.Event; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/guilds/GuildAFKTimeout.java b/src/main/java/net/itsthesky/disky/elements/properties/guilds/GuildAFKTimeout.java similarity index 91% rename from src/main/java/info/itsthesky/disky/elements/properties/guilds/GuildAFKTimeout.java rename to src/main/java/net/itsthesky/disky/elements/properties/guilds/GuildAFKTimeout.java index 9fe630df..b03f72fb 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/guilds/GuildAFKTimeout.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/guilds/GuildAFKTimeout.java @@ -1,14 +1,14 @@ -package info.itsthesky.disky.elements.properties.guilds; +package net.itsthesky.disky.elements.properties.guilds; import ch.njol.skript.classes.Changer; import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.SkriptParser; import ch.njol.util.Kleenean; import ch.njol.util.coll.CollectionUtils; -import info.itsthesky.disky.api.changers.ChangeablePropertyExpression; -import info.itsthesky.disky.api.skript.EasyElement; -import info.itsthesky.disky.core.Bot; -import info.itsthesky.disky.core.Utils; +import net.itsthesky.disky.api.changers.ChangeablePropertyExpression; +import net.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.core.Bot; +import net.itsthesky.disky.core.Utils; import net.dv8tion.jda.api.entities.Guild; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/guilds/GuildBanner.java b/src/main/java/net/itsthesky/disky/elements/properties/guilds/GuildBanner.java similarity index 90% rename from src/main/java/info/itsthesky/disky/elements/properties/guilds/GuildBanner.java rename to src/main/java/net/itsthesky/disky/elements/properties/guilds/GuildBanner.java index 6a5c87fd..07cce934 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/guilds/GuildBanner.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/guilds/GuildBanner.java @@ -1,15 +1,15 @@ -package info.itsthesky.disky.elements.properties.guilds; +package net.itsthesky.disky.elements.properties.guilds; import ch.njol.skript.classes.Changer; import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.SkriptParser; import ch.njol.util.Kleenean; import ch.njol.util.coll.CollectionUtils; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.api.changers.ChangeablePropertyExpression; -import info.itsthesky.disky.api.skript.EasyElement; -import info.itsthesky.disky.core.Bot; -import info.itsthesky.disky.core.Utils; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.api.changers.ChangeablePropertyExpression; +import net.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.core.Bot; +import net.itsthesky.disky.core.Utils; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Icon; import org.bukkit.event.Event; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/guilds/GuildBoostCount.java b/src/main/java/net/itsthesky/disky/elements/properties/guilds/GuildBoostCount.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/properties/guilds/GuildBoostCount.java rename to src/main/java/net/itsthesky/disky/elements/properties/guilds/GuildBoostCount.java index 0cd147fd..7ba342af 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/guilds/GuildBoostCount.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/guilds/GuildBoostCount.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.guilds; +package net.itsthesky.disky.elements.properties.guilds; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/guilds/GuildBoostRole.java b/src/main/java/net/itsthesky/disky/elements/properties/guilds/GuildBoostRole.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/properties/guilds/GuildBoostRole.java rename to src/main/java/net/itsthesky/disky/elements/properties/guilds/GuildBoostRole.java index 849120d5..595aedce 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/guilds/GuildBoostRole.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/guilds/GuildBoostRole.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.guilds; +package net.itsthesky.disky.elements.properties.guilds; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/guilds/GuildBoostTier.java b/src/main/java/net/itsthesky/disky/elements/properties/guilds/GuildBoostTier.java similarity index 87% rename from src/main/java/info/itsthesky/disky/elements/properties/guilds/GuildBoostTier.java rename to src/main/java/net/itsthesky/disky/elements/properties/guilds/GuildBoostTier.java index d9701cf4..90fe6e31 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/guilds/GuildBoostTier.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/guilds/GuildBoostTier.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.guilds; +package net.itsthesky.disky.elements.properties.guilds; import net.dv8tion.jda.api.entities.Guild; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/guilds/GuildBoosters.java b/src/main/java/net/itsthesky/disky/elements/properties/guilds/GuildBoosters.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/properties/guilds/GuildBoosters.java rename to src/main/java/net/itsthesky/disky/elements/properties/guilds/GuildBoosters.java index 4e879c2d..b14b50be 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/guilds/GuildBoosters.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/guilds/GuildBoosters.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.guilds; +package net.itsthesky.disky.elements.properties.guilds; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/guilds/GuildBotRole.java b/src/main/java/net/itsthesky/disky/elements/properties/guilds/GuildBotRole.java similarity index 87% rename from src/main/java/info/itsthesky/disky/elements/properties/guilds/GuildBotRole.java rename to src/main/java/net/itsthesky/disky/elements/properties/guilds/GuildBotRole.java index e30840fa..319f2d68 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/guilds/GuildBotRole.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/guilds/GuildBotRole.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.guilds; +package net.itsthesky.disky.elements.properties.guilds; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Role; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/guilds/GuildEveryone.java b/src/main/java/net/itsthesky/disky/elements/properties/guilds/GuildEveryone.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/properties/guilds/GuildEveryone.java rename to src/main/java/net/itsthesky/disky/elements/properties/guilds/GuildEveryone.java index 8246d94e..4b798d14 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/guilds/GuildEveryone.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/guilds/GuildEveryone.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.guilds; +package net.itsthesky.disky.elements.properties.guilds; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/guilds/GuildGuildChannels.java b/src/main/java/net/itsthesky/disky/elements/properties/guilds/GuildGuildChannels.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/properties/guilds/GuildGuildChannels.java rename to src/main/java/net/itsthesky/disky/elements/properties/guilds/GuildGuildChannels.java index bde1437e..fd2e308a 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/guilds/GuildGuildChannels.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/guilds/GuildGuildChannels.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.guilds; +package net.itsthesky.disky.elements.properties.guilds; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/guilds/GuildMemberCount.java b/src/main/java/net/itsthesky/disky/elements/properties/guilds/GuildMemberCount.java similarity index 91% rename from src/main/java/info/itsthesky/disky/elements/properties/guilds/GuildMemberCount.java rename to src/main/java/net/itsthesky/disky/elements/properties/guilds/GuildMemberCount.java index c3726492..a81e095a 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/guilds/GuildMemberCount.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/guilds/GuildMemberCount.java @@ -1,11 +1,11 @@ -package info.itsthesky.disky.elements.properties.guilds; +package net.itsthesky.disky.elements.properties.guilds; import ch.njol.skript.config.Node; import ch.njol.skript.expressions.base.SimplePropertyExpression; import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.SkriptParser; import ch.njol.util.Kleenean; -import info.itsthesky.disky.elements.sections.handler.DiSkyRuntimeHandler; +import net.itsthesky.disky.elements.sections.handler.DiSkyRuntimeHandler; import net.dv8tion.jda.api.entities.Guild; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/guilds/GuildNewsChannels.java b/src/main/java/net/itsthesky/disky/elements/properties/guilds/GuildNewsChannels.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/properties/guilds/GuildNewsChannels.java rename to src/main/java/net/itsthesky/disky/elements/properties/guilds/GuildNewsChannels.java index 0aa99f9b..4146d908 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/guilds/GuildNewsChannels.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/guilds/GuildNewsChannels.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.guilds; +package net.itsthesky.disky.elements.properties.guilds; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/guilds/GuildProperty.java b/src/main/java/net/itsthesky/disky/elements/properties/guilds/GuildProperty.java similarity index 94% rename from src/main/java/info/itsthesky/disky/elements/properties/guilds/GuildProperty.java rename to src/main/java/net/itsthesky/disky/elements/properties/guilds/GuildProperty.java index ccbfba50..39aa3ee8 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/guilds/GuildProperty.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/guilds/GuildProperty.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.guilds; +package net.itsthesky.disky.elements.properties.guilds; import ch.njol.skript.expressions.base.SimplePropertyExpression; import net.dv8tion.jda.api.entities.Guild; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/guilds/GuildScheduledEvents.java b/src/main/java/net/itsthesky/disky/elements/properties/guilds/GuildScheduledEvents.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/properties/guilds/GuildScheduledEvents.java rename to src/main/java/net/itsthesky/disky/elements/properties/guilds/GuildScheduledEvents.java index 5aea3dca..f50fcea1 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/guilds/GuildScheduledEvents.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/guilds/GuildScheduledEvents.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.guilds; +package net.itsthesky.disky.elements.properties.guilds; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/guilds/GuildStageChannels.java b/src/main/java/net/itsthesky/disky/elements/properties/guilds/GuildStageChannels.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/properties/guilds/GuildStageChannels.java rename to src/main/java/net/itsthesky/disky/elements/properties/guilds/GuildStageChannels.java index 5f1371c8..19c4bb72 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/guilds/GuildStageChannels.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/guilds/GuildStageChannels.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.guilds; +package net.itsthesky.disky.elements.properties.guilds; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/guilds/GuildTextChannels.java b/src/main/java/net/itsthesky/disky/elements/properties/guilds/GuildTextChannels.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/properties/guilds/GuildTextChannels.java rename to src/main/java/net/itsthesky/disky/elements/properties/guilds/GuildTextChannels.java index 43f9e8ba..77107d86 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/guilds/GuildTextChannels.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/guilds/GuildTextChannels.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.guilds; +package net.itsthesky.disky.elements.properties.guilds; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/guilds/GuildVerificationLevel.java b/src/main/java/net/itsthesky/disky/elements/properties/guilds/GuildVerificationLevel.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/properties/guilds/GuildVerificationLevel.java rename to src/main/java/net/itsthesky/disky/elements/properties/guilds/GuildVerificationLevel.java index cff9fe28..a2b77a0f 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/guilds/GuildVerificationLevel.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/guilds/GuildVerificationLevel.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.guilds; +package net.itsthesky.disky.elements.properties.guilds; import ch.njol.skript.classes.Changer; import ch.njol.skript.config.Node; @@ -8,9 +8,9 @@ import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.SkriptParser; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.skript.INodeHolder; -import info.itsthesky.disky.elements.changers.IAsyncChangeableExpression; -import info.itsthesky.disky.elements.sections.handler.DiSkyRuntimeHandler; +import net.itsthesky.disky.api.skript.INodeHolder; +import net.itsthesky.disky.elements.changers.IAsyncChangeableExpression; +import net.itsthesky.disky.elements.sections.handler.DiSkyRuntimeHandler; import net.dv8tion.jda.api.entities.Guild; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/guilds/GuildVoiceChannels.java b/src/main/java/net/itsthesky/disky/elements/properties/guilds/GuildVoiceChannels.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/properties/guilds/GuildVoiceChannels.java rename to src/main/java/net/itsthesky/disky/elements/properties/guilds/GuildVoiceChannels.java index 006f73bd..5e9bc1af 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/guilds/GuildVoiceChannels.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/guilds/GuildVoiceChannels.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.guilds; +package net.itsthesky.disky.elements.properties.guilds; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/guilds/MultipleGuildProperty.java b/src/main/java/net/itsthesky/disky/elements/properties/guilds/MultipleGuildProperty.java similarity index 87% rename from src/main/java/info/itsthesky/disky/elements/properties/guilds/MultipleGuildProperty.java rename to src/main/java/net/itsthesky/disky/elements/properties/guilds/MultipleGuildProperty.java index f59aaa1c..ebc3b81e 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/guilds/MultipleGuildProperty.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/guilds/MultipleGuildProperty.java @@ -1,6 +1,6 @@ -package info.itsthesky.disky.elements.properties.guilds; +package net.itsthesky.disky.elements.properties.guilds; -import info.itsthesky.disky.api.skript.MultiplyPropertyExpression; +import net.itsthesky.disky.api.skript.MultiplyPropertyExpression; import net.dv8tion.jda.api.entities.Guild; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/invites/InviteCode.java b/src/main/java/net/itsthesky/disky/elements/properties/invites/InviteCode.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/properties/invites/InviteCode.java rename to src/main/java/net/itsthesky/disky/elements/properties/invites/InviteCode.java index e38f719a..47a611e8 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/invites/InviteCode.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/invites/InviteCode.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.invites; +package net.itsthesky.disky.elements.properties.invites; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/invites/InviteInviter.java b/src/main/java/net/itsthesky/disky/elements/properties/invites/InviteInviter.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/properties/invites/InviteInviter.java rename to src/main/java/net/itsthesky/disky/elements/properties/invites/InviteInviter.java index cc82807d..5e1cd38b 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/invites/InviteInviter.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/invites/InviteInviter.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.invites; +package net.itsthesky.disky.elements.properties.invites; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/invites/InviteMaxAge.java b/src/main/java/net/itsthesky/disky/elements/properties/invites/InviteMaxAge.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/properties/invites/InviteMaxAge.java rename to src/main/java/net/itsthesky/disky/elements/properties/invites/InviteMaxAge.java index 134a96d6..8f8ce7bc 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/invites/InviteMaxAge.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/invites/InviteMaxAge.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.invites; +package net.itsthesky.disky.elements.properties.invites; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/invites/InviteMaxUses.java b/src/main/java/net/itsthesky/disky/elements/properties/invites/InviteMaxUses.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/properties/invites/InviteMaxUses.java rename to src/main/java/net/itsthesky/disky/elements/properties/invites/InviteMaxUses.java index 6f09fcc8..45ae6c60 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/invites/InviteMaxUses.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/invites/InviteMaxUses.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.invites; +package net.itsthesky.disky.elements.properties.invites; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/invites/InviteProperty.java b/src/main/java/net/itsthesky/disky/elements/properties/invites/InviteProperty.java similarity index 90% rename from src/main/java/info/itsthesky/disky/elements/properties/invites/InviteProperty.java rename to src/main/java/net/itsthesky/disky/elements/properties/invites/InviteProperty.java index 176413ed..4fed1a94 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/invites/InviteProperty.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/invites/InviteProperty.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.invites; +package net.itsthesky.disky.elements.properties.invites; import ch.njol.skript.expressions.base.SimplePropertyExpression; import net.dv8tion.jda.api.entities.Invite; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/invites/InviteURL.java b/src/main/java/net/itsthesky/disky/elements/properties/invites/InviteURL.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/properties/invites/InviteURL.java rename to src/main/java/net/itsthesky/disky/elements/properties/invites/InviteURL.java index 5e1061ec..626fc2af 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/invites/InviteURL.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/invites/InviteURL.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.invites; +package net.itsthesky.disky.elements.properties.invites; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/invites/InviteUses.java b/src/main/java/net/itsthesky/disky/elements/properties/invites/InviteUses.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/properties/invites/InviteUses.java rename to src/main/java/net/itsthesky/disky/elements/properties/invites/InviteUses.java index 7cb2b68b..97e686e8 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/invites/InviteUses.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/invites/InviteUses.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.invites; +package net.itsthesky.disky.elements.properties.invites; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/members/MemberEffectiveName.java b/src/main/java/net/itsthesky/disky/elements/properties/members/MemberEffectiveName.java similarity index 94% rename from src/main/java/info/itsthesky/disky/elements/properties/members/MemberEffectiveName.java rename to src/main/java/net/itsthesky/disky/elements/properties/members/MemberEffectiveName.java index dc60fc1d..75192ca0 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/members/MemberEffectiveName.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/members/MemberEffectiveName.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.members; +package net.itsthesky.disky.elements.properties.members; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/members/MemberFlags.java b/src/main/java/net/itsthesky/disky/elements/properties/members/MemberFlags.java similarity index 91% rename from src/main/java/info/itsthesky/disky/elements/properties/members/MemberFlags.java rename to src/main/java/net/itsthesky/disky/elements/properties/members/MemberFlags.java index 05a0b961..d5a44012 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/members/MemberFlags.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/members/MemberFlags.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.properties.members; +package net.itsthesky.disky.elements.properties.members; import ch.njol.skript.classes.Changer; -import info.itsthesky.disky.api.skript.EasyElement; -import info.itsthesky.disky.core.Debug; +import net.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.core.Debug; import net.dv8tion.jda.api.entities.Member; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/members/MemberJoinDate.java b/src/main/java/net/itsthesky/disky/elements/properties/members/MemberJoinDate.java similarity index 94% rename from src/main/java/info/itsthesky/disky/elements/properties/members/MemberJoinDate.java rename to src/main/java/net/itsthesky/disky/elements/properties/members/MemberJoinDate.java index 0408105e..cf05e842 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/members/MemberJoinDate.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/members/MemberJoinDate.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.members; +package net.itsthesky.disky.elements.properties.members; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/members/MemberNickname.java b/src/main/java/net/itsthesky/disky/elements/properties/members/MemberNickname.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/properties/members/MemberNickname.java rename to src/main/java/net/itsthesky/disky/elements/properties/members/MemberNickname.java index f0d6504f..2cac6097 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/members/MemberNickname.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/members/MemberNickname.java @@ -1,12 +1,12 @@ -package info.itsthesky.disky.elements.properties.members; +package net.itsthesky.disky.elements.properties.members; import ch.njol.skript.classes.Changer; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; import ch.njol.skript.doc.Name; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.api.skript.EasyElement; -import info.itsthesky.disky.elements.changers.IAsyncChangeableExpression; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.elements.changers.IAsyncChangeableExpression; import net.dv8tion.jda.api.entities.Member; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/members/MemberProperty.java b/src/main/java/net/itsthesky/disky/elements/properties/members/MemberProperty.java similarity index 90% rename from src/main/java/info/itsthesky/disky/elements/properties/members/MemberProperty.java rename to src/main/java/net/itsthesky/disky/elements/properties/members/MemberProperty.java index 272225b9..5a100ed4 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/members/MemberProperty.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/members/MemberProperty.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.members; +package net.itsthesky.disky.elements.properties.members; import ch.njol.skript.expressions.base.SimplePropertyExpression; import net.dv8tion.jda.api.entities.Member; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/members/MemberVoiceChannel.java b/src/main/java/net/itsthesky/disky/elements/properties/members/MemberVoiceChannel.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/properties/members/MemberVoiceChannel.java rename to src/main/java/net/itsthesky/disky/elements/properties/members/MemberVoiceChannel.java index bcdd0687..016f3dba 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/members/MemberVoiceChannel.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/members/MemberVoiceChannel.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.members; +package net.itsthesky.disky.elements.properties.members; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.channel.middleman.AudioChannel; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/members/MultipleMemberProperty.java b/src/main/java/net/itsthesky/disky/elements/properties/members/MultipleMemberProperty.java similarity index 79% rename from src/main/java/info/itsthesky/disky/elements/properties/members/MultipleMemberProperty.java rename to src/main/java/net/itsthesky/disky/elements/properties/members/MultipleMemberProperty.java index bde0126a..ae88d611 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/members/MultipleMemberProperty.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/members/MultipleMemberProperty.java @@ -1,6 +1,6 @@ -package info.itsthesky.disky.elements.properties.members; +package net.itsthesky.disky.elements.properties.members; -import info.itsthesky.disky.api.skript.MultiplyPropertyExpression; +import net.itsthesky.disky.api.skript.MultiplyPropertyExpression; import net.dv8tion.jda.api.entities.Member; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/messages/MessageAttachments.java b/src/main/java/net/itsthesky/disky/elements/properties/messages/MessageAttachments.java similarity index 88% rename from src/main/java/info/itsthesky/disky/elements/properties/messages/MessageAttachments.java rename to src/main/java/net/itsthesky/disky/elements/properties/messages/MessageAttachments.java index 748061f6..7b82acc8 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/messages/MessageAttachments.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/messages/MessageAttachments.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.messages; +package net.itsthesky.disky.elements.properties.messages; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; @@ -6,8 +6,8 @@ import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.SkriptParser; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.skript.MultiplyPropertyExpression; -import info.itsthesky.disky.elements.sections.message.CreateMessage; +import net.itsthesky.disky.api.skript.MultiplyPropertyExpression; +import net.itsthesky.disky.elements.sections.message.CreateMessage; import net.dv8tion.jda.api.entities.Message; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/messages/MessageAuthor.java b/src/main/java/net/itsthesky/disky/elements/properties/messages/MessageAuthor.java similarity index 95% rename from src/main/java/info/itsthesky/disky/elements/properties/messages/MessageAuthor.java rename to src/main/java/net/itsthesky/disky/elements/properties/messages/MessageAuthor.java index 137f35dc..edf4f263 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/messages/MessageAuthor.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/messages/MessageAuthor.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.messages; +package net.itsthesky.disky.elements.properties.messages; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/messages/MessageContent.java b/src/main/java/net/itsthesky/disky/elements/properties/messages/MessageContent.java similarity index 94% rename from src/main/java/info/itsthesky/disky/elements/properties/messages/MessageContent.java rename to src/main/java/net/itsthesky/disky/elements/properties/messages/MessageContent.java index 225f5f70..4ee4a6b7 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/messages/MessageContent.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/messages/MessageContent.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.messages; +package net.itsthesky.disky.elements.properties.messages; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/messages/MessageEmbeds.java b/src/main/java/net/itsthesky/disky/elements/properties/messages/MessageEmbeds.java similarity index 89% rename from src/main/java/info/itsthesky/disky/elements/properties/messages/MessageEmbeds.java rename to src/main/java/net/itsthesky/disky/elements/properties/messages/MessageEmbeds.java index 7b38315d..41cde697 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/messages/MessageEmbeds.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/messages/MessageEmbeds.java @@ -1,9 +1,9 @@ -package info.itsthesky.disky.elements.properties.messages; +package net.itsthesky.disky.elements.properties.messages; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; import ch.njol.skript.doc.Name; -import info.itsthesky.disky.api.skript.MultiplyPropertyExpression; +import net.itsthesky.disky.api.skript.MultiplyPropertyExpression; import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.entities.Message; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/messages/MessageGuild.java b/src/main/java/net/itsthesky/disky/elements/properties/messages/MessageGuild.java similarity index 95% rename from src/main/java/info/itsthesky/disky/elements/properties/messages/MessageGuild.java rename to src/main/java/net/itsthesky/disky/elements/properties/messages/MessageGuild.java index 287d0da4..7e17e670 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/messages/MessageGuild.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/messages/MessageGuild.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.messages; +package net.itsthesky.disky.elements.properties.messages; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/messages/MessageHasPoll.java b/src/main/java/net/itsthesky/disky/elements/properties/messages/MessageHasPoll.java similarity index 90% rename from src/main/java/info/itsthesky/disky/elements/properties/messages/MessageHasPoll.java rename to src/main/java/net/itsthesky/disky/elements/properties/messages/MessageHasPoll.java index 3052f26f..14c8e71b 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/messages/MessageHasPoll.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/messages/MessageHasPoll.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.messages; +package net.itsthesky.disky.elements.properties.messages; import ch.njol.skript.conditions.base.PropertyCondition; import net.dv8tion.jda.api.entities.Message; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/messages/MessageIsEdited.java b/src/main/java/net/itsthesky/disky/elements/properties/messages/MessageIsEdited.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/properties/messages/MessageIsEdited.java rename to src/main/java/net/itsthesky/disky/elements/properties/messages/MessageIsEdited.java index 659f8450..63580f6e 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/messages/MessageIsEdited.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/messages/MessageIsEdited.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.messages; +package net.itsthesky.disky.elements.properties.messages; import ch.njol.skript.conditions.base.PropertyCondition; import ch.njol.skript.doc.Description; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/messages/MessageIsEphemeral.java b/src/main/java/net/itsthesky/disky/elements/properties/messages/MessageIsEphemeral.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/properties/messages/MessageIsEphemeral.java rename to src/main/java/net/itsthesky/disky/elements/properties/messages/MessageIsEphemeral.java index 3773c5b4..ff2e287f 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/messages/MessageIsEphemeral.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/messages/MessageIsEphemeral.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.messages; +package net.itsthesky.disky.elements.properties.messages; import ch.njol.skript.conditions.base.PropertyCondition; import ch.njol.skript.doc.Description; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/messages/MessageIsForwarded.java b/src/main/java/net/itsthesky/disky/elements/properties/messages/MessageIsForwarded.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/properties/messages/MessageIsForwarded.java rename to src/main/java/net/itsthesky/disky/elements/properties/messages/MessageIsForwarded.java index 40c7538e..8fc31305 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/messages/MessageIsForwarded.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/messages/MessageIsForwarded.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.messages; +package net.itsthesky.disky.elements.properties.messages; import ch.njol.skript.conditions.base.PropertyCondition; import net.dv8tion.jda.api.entities.Message; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/messages/MessageIsPinned.java b/src/main/java/net/itsthesky/disky/elements/properties/messages/MessageIsPinned.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/properties/messages/MessageIsPinned.java rename to src/main/java/net/itsthesky/disky/elements/properties/messages/MessageIsPinned.java index 2b319569..bcb538e1 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/messages/MessageIsPinned.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/messages/MessageIsPinned.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.messages; +package net.itsthesky.disky.elements.properties.messages; import ch.njol.skript.conditions.base.PropertyCondition; import ch.njol.skript.doc.Description; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/messages/MessageIsPosted.java b/src/main/java/net/itsthesky/disky/elements/properties/messages/MessageIsPosted.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/properties/messages/MessageIsPosted.java rename to src/main/java/net/itsthesky/disky/elements/properties/messages/MessageIsPosted.java index 3e9b93fc..f7ac7445 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/messages/MessageIsPosted.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/messages/MessageIsPosted.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.messages; +package net.itsthesky.disky.elements.properties.messages; import ch.njol.skript.conditions.base.PropertyCondition; import ch.njol.skript.doc.Description; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/messages/MessageIsTTS.java b/src/main/java/net/itsthesky/disky/elements/properties/messages/MessageIsTTS.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/properties/messages/MessageIsTTS.java rename to src/main/java/net/itsthesky/disky/elements/properties/messages/MessageIsTTS.java index 9e817334..d3f2ef0d 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/messages/MessageIsTTS.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/messages/MessageIsTTS.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.messages; +package net.itsthesky.disky.elements.properties.messages; import ch.njol.skript.conditions.base.PropertyCondition; import ch.njol.skript.doc.Description; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/messages/MessageJumpURL.java b/src/main/java/net/itsthesky/disky/elements/properties/messages/MessageJumpURL.java similarity index 95% rename from src/main/java/info/itsthesky/disky/elements/properties/messages/MessageJumpURL.java rename to src/main/java/net/itsthesky/disky/elements/properties/messages/MessageJumpURL.java index 8fc95230..1b56914f 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/messages/MessageJumpURL.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/messages/MessageJumpURL.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.messages; +package net.itsthesky.disky.elements.properties.messages; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/messages/MessageMember.java b/src/main/java/net/itsthesky/disky/elements/properties/messages/MessageMember.java similarity index 95% rename from src/main/java/info/itsthesky/disky/elements/properties/messages/MessageMember.java rename to src/main/java/net/itsthesky/disky/elements/properties/messages/MessageMember.java index 6514d72a..06283d27 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/messages/MessageMember.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/messages/MessageMember.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.messages; +package net.itsthesky.disky.elements.properties.messages; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/messages/MessageMentionedChannels.java b/src/main/java/net/itsthesky/disky/elements/properties/messages/MessageMentionedChannels.java similarity index 89% rename from src/main/java/info/itsthesky/disky/elements/properties/messages/MessageMentionedChannels.java rename to src/main/java/net/itsthesky/disky/elements/properties/messages/MessageMentionedChannels.java index ed4a2f02..90478ada 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/messages/MessageMentionedChannels.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/messages/MessageMentionedChannels.java @@ -1,9 +1,9 @@ -package info.itsthesky.disky.elements.properties.messages; +package net.itsthesky.disky.elements.properties.messages; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; import ch.njol.skript.doc.Name; -import info.itsthesky.disky.api.skript.MultiplyPropertyExpression; +import net.itsthesky.disky.api.skript.MultiplyPropertyExpression; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.channel.concrete.TextChannel; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/messages/MessageMentionedEmotes.java b/src/main/java/net/itsthesky/disky/elements/properties/messages/MessageMentionedEmotes.java similarity index 86% rename from src/main/java/info/itsthesky/disky/elements/properties/messages/MessageMentionedEmotes.java rename to src/main/java/net/itsthesky/disky/elements/properties/messages/MessageMentionedEmotes.java index f57aad86..aa66cf16 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/messages/MessageMentionedEmotes.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/messages/MessageMentionedEmotes.java @@ -1,10 +1,10 @@ -package info.itsthesky.disky.elements.properties.messages; +package net.itsthesky.disky.elements.properties.messages; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; import ch.njol.skript.doc.Name; -import info.itsthesky.disky.api.emojis.Emote; -import info.itsthesky.disky.api.skript.MultiplyPropertyExpression; +import net.itsthesky.disky.api.emojis.Emote; +import net.itsthesky.disky.api.skript.MultiplyPropertyExpression; import net.dv8tion.jda.api.entities.Message; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/messages/MessageMentionedMembers.java b/src/main/java/net/itsthesky/disky/elements/properties/messages/MessageMentionedMembers.java similarity index 89% rename from src/main/java/info/itsthesky/disky/elements/properties/messages/MessageMentionedMembers.java rename to src/main/java/net/itsthesky/disky/elements/properties/messages/MessageMentionedMembers.java index 8eb224f0..d2dec395 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/messages/MessageMentionedMembers.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/messages/MessageMentionedMembers.java @@ -1,9 +1,9 @@ -package info.itsthesky.disky.elements.properties.messages; +package net.itsthesky.disky.elements.properties.messages; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; import ch.njol.skript.doc.Name; -import info.itsthesky.disky.api.skript.MultiplyPropertyExpression; +import net.itsthesky.disky.api.skript.MultiplyPropertyExpression; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/messages/MessageMentionedRoles.java b/src/main/java/net/itsthesky/disky/elements/properties/messages/MessageMentionedRoles.java similarity index 89% rename from src/main/java/info/itsthesky/disky/elements/properties/messages/MessageMentionedRoles.java rename to src/main/java/net/itsthesky/disky/elements/properties/messages/MessageMentionedRoles.java index bb288d10..895361b1 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/messages/MessageMentionedRoles.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/messages/MessageMentionedRoles.java @@ -1,9 +1,9 @@ -package info.itsthesky.disky.elements.properties.messages; +package net.itsthesky.disky.elements.properties.messages; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; import ch.njol.skript.doc.Name; -import info.itsthesky.disky.api.skript.MultiplyPropertyExpression; +import net.itsthesky.disky.api.skript.MultiplyPropertyExpression; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.Role; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/messages/MessageMentionedUsers.java b/src/main/java/net/itsthesky/disky/elements/properties/messages/MessageMentionedUsers.java similarity index 89% rename from src/main/java/info/itsthesky/disky/elements/properties/messages/MessageMentionedUsers.java rename to src/main/java/net/itsthesky/disky/elements/properties/messages/MessageMentionedUsers.java index f558fa4d..5f7f8863 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/messages/MessageMentionedUsers.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/messages/MessageMentionedUsers.java @@ -1,9 +1,9 @@ -package info.itsthesky.disky.elements.properties.messages; +package net.itsthesky.disky.elements.properties.messages; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; import ch.njol.skript.doc.Name; -import info.itsthesky.disky.api.skript.MultiplyPropertyExpression; +import net.itsthesky.disky.api.skript.MultiplyPropertyExpression; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.User; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/messages/MessageMentionedVoiceChannels.java b/src/main/java/net/itsthesky/disky/elements/properties/messages/MessageMentionedVoiceChannels.java similarity index 89% rename from src/main/java/info/itsthesky/disky/elements/properties/messages/MessageMentionedVoiceChannels.java rename to src/main/java/net/itsthesky/disky/elements/properties/messages/MessageMentionedVoiceChannels.java index f8a4d3de..1d4bbcfa 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/messages/MessageMentionedVoiceChannels.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/messages/MessageMentionedVoiceChannels.java @@ -1,9 +1,9 @@ -package info.itsthesky.disky.elements.properties.messages; +package net.itsthesky.disky.elements.properties.messages; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; import ch.njol.skript.doc.Name; -import info.itsthesky.disky.api.skript.MultiplyPropertyExpression; +import net.itsthesky.disky.api.skript.MultiplyPropertyExpression; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.channel.concrete.VoiceChannel; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/messages/MessagePoll.java b/src/main/java/net/itsthesky/disky/elements/properties/messages/MessagePoll.java similarity index 97% rename from src/main/java/info/itsthesky/disky/elements/properties/messages/MessagePoll.java rename to src/main/java/net/itsthesky/disky/elements/properties/messages/MessagePoll.java index 06a18da7..82e9e7c5 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/messages/MessagePoll.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/messages/MessagePoll.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.messages; +package net.itsthesky.disky.elements.properties.messages; import ch.njol.skript.classes.Changer; import ch.njol.skript.expressions.base.SimplePropertyExpression; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/messages/MessageReactions.java b/src/main/java/net/itsthesky/disky/elements/properties/messages/MessageReactions.java similarity index 87% rename from src/main/java/info/itsthesky/disky/elements/properties/messages/MessageReactions.java rename to src/main/java/net/itsthesky/disky/elements/properties/messages/MessageReactions.java index 35375348..826f5195 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/messages/MessageReactions.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/messages/MessageReactions.java @@ -1,10 +1,10 @@ -package info.itsthesky.disky.elements.properties.messages; +package net.itsthesky.disky.elements.properties.messages; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; import ch.njol.skript.doc.Name; -import info.itsthesky.disky.api.emojis.Emote; -import info.itsthesky.disky.api.skript.MultiplyPropertyExpression; +import net.itsthesky.disky.api.emojis.Emote; +import net.itsthesky.disky.api.skript.MultiplyPropertyExpression; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.MessageReaction; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/messages/MessageReferenced.java b/src/main/java/net/itsthesky/disky/elements/properties/messages/MessageReferenced.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/properties/messages/MessageReferenced.java rename to src/main/java/net/itsthesky/disky/elements/properties/messages/MessageReferenced.java index fd420156..ca08efd9 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/messages/MessageReferenced.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/messages/MessageReferenced.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.messages; +package net.itsthesky.disky.elements.properties.messages; import ch.njol.skript.expressions.base.SimplePropertyExpression; import net.dv8tion.jda.api.entities.Message; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/polls/NewPoll.java b/src/main/java/net/itsthesky/disky/elements/properties/polls/NewPoll.java similarity index 97% rename from src/main/java/info/itsthesky/disky/elements/properties/polls/NewPoll.java rename to src/main/java/net/itsthesky/disky/elements/properties/polls/NewPoll.java index 901a6767..c03388b8 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/polls/NewPoll.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/polls/NewPoll.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.polls; +package net.itsthesky.disky.elements.properties.polls; import ch.njol.skript.Skript; import ch.njol.skript.lang.Expression; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/polls/NewPollAnswer.java b/src/main/java/net/itsthesky/disky/elements/properties/polls/NewPollAnswer.java similarity index 95% rename from src/main/java/info/itsthesky/disky/elements/properties/polls/NewPollAnswer.java rename to src/main/java/net/itsthesky/disky/elements/properties/polls/NewPollAnswer.java index cfdc6ba9..68e5b189 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/polls/NewPollAnswer.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/polls/NewPollAnswer.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.polls; +package net.itsthesky.disky.elements.properties.polls; import ch.njol.skript.Skript; import ch.njol.skript.lang.Expression; @@ -6,7 +6,7 @@ import ch.njol.skript.lang.SkriptParser; import ch.njol.skript.lang.util.SimpleExpression; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.emojis.Emote; +import net.itsthesky.disky.api.emojis.Emote; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/polls/PollAnswerData.java b/src/main/java/net/itsthesky/disky/elements/properties/polls/PollAnswerData.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/properties/polls/PollAnswerData.java rename to src/main/java/net/itsthesky/disky/elements/properties/polls/PollAnswerData.java index 2869c785..15f3c9d4 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/polls/PollAnswerData.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/polls/PollAnswerData.java @@ -1,6 +1,6 @@ -package info.itsthesky.disky.elements.properties.polls; +package net.itsthesky.disky.elements.properties.polls; -import info.itsthesky.disky.api.emojis.Emote; +import net.itsthesky.disky.api.emojis.Emote; import net.dv8tion.jda.api.entities.emoji.Emoji; import net.dv8tion.jda.api.entities.messages.MessagePoll; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/polls/PollAnswers.java b/src/main/java/net/itsthesky/disky/elements/properties/polls/PollAnswers.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/properties/polls/PollAnswers.java rename to src/main/java/net/itsthesky/disky/elements/properties/polls/PollAnswers.java index eb28e9a1..03a76308 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/polls/PollAnswers.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/polls/PollAnswers.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.properties.polls; +package net.itsthesky.disky.elements.properties.polls; import ch.njol.skript.classes.Changer; -import info.itsthesky.disky.api.changers.MultipleChangeablePropertyExpression; -import info.itsthesky.disky.core.Bot; +import net.itsthesky.disky.api.changers.MultipleChangeablePropertyExpression; +import net.itsthesky.disky.core.Bot; import net.dv8tion.jda.api.entities.messages.MessagePoll; import net.dv8tion.jda.api.utils.messages.MessagePollBuilder; import org.bukkit.event.Event; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/polls/PollDuration.java b/src/main/java/net/itsthesky/disky/elements/properties/polls/PollDuration.java similarity index 96% rename from src/main/java/info/itsthesky/disky/elements/properties/polls/PollDuration.java rename to src/main/java/net/itsthesky/disky/elements/properties/polls/PollDuration.java index 7ed9e515..a19f02e4 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/polls/PollDuration.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/polls/PollDuration.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.polls; +package net.itsthesky.disky.elements.properties.polls; import ch.njol.skript.classes.Changer; import ch.njol.skript.expressions.base.SimplePropertyExpression; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/polls/PollIsExpired.java b/src/main/java/net/itsthesky/disky/elements/properties/polls/PollIsExpired.java similarity index 91% rename from src/main/java/info/itsthesky/disky/elements/properties/polls/PollIsExpired.java rename to src/main/java/net/itsthesky/disky/elements/properties/polls/PollIsExpired.java index 69beba90..74d9b41b 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/polls/PollIsExpired.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/polls/PollIsExpired.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.polls; +package net.itsthesky.disky.elements.properties.polls; import ch.njol.skript.conditions.base.PropertyCondition; import net.dv8tion.jda.api.entities.messages.MessagePoll; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/polls/PollIsFinalized.java b/src/main/java/net/itsthesky/disky/elements/properties/polls/PollIsFinalized.java similarity index 91% rename from src/main/java/info/itsthesky/disky/elements/properties/polls/PollIsFinalized.java rename to src/main/java/net/itsthesky/disky/elements/properties/polls/PollIsFinalized.java index 35c2377c..90328e09 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/polls/PollIsFinalized.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/polls/PollIsFinalized.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.polls; +package net.itsthesky.disky.elements.properties.polls; import ch.njol.skript.conditions.base.PropertyCondition; import net.dv8tion.jda.api.entities.messages.MessagePoll; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/polls/PollQuestion.java b/src/main/java/net/itsthesky/disky/elements/properties/polls/PollQuestion.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/properties/polls/PollQuestion.java rename to src/main/java/net/itsthesky/disky/elements/properties/polls/PollQuestion.java index 4dc65a2c..1b674383 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/polls/PollQuestion.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/polls/PollQuestion.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.polls; +package net.itsthesky.disky.elements.properties.polls; import ch.njol.skript.expressions.base.SimplePropertyExpression; import net.dv8tion.jda.api.entities.messages.MessagePoll; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/polls/answers/PollAnswerEmote.java b/src/main/java/net/itsthesky/disky/elements/properties/polls/answers/PollAnswerEmote.java similarity index 79% rename from src/main/java/info/itsthesky/disky/elements/properties/polls/answers/PollAnswerEmote.java rename to src/main/java/net/itsthesky/disky/elements/properties/polls/answers/PollAnswerEmote.java index 07aa62e5..05a5943b 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/polls/answers/PollAnswerEmote.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/polls/answers/PollAnswerEmote.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.properties.polls.answers; +package net.itsthesky.disky.elements.properties.polls.answers; import ch.njol.skript.expressions.base.SimplePropertyExpression; -import info.itsthesky.disky.api.emojis.Emote; -import info.itsthesky.disky.elements.properties.polls.PollAnswerData; +import net.itsthesky.disky.api.emojis.Emote; +import net.itsthesky.disky.elements.properties.polls.PollAnswerData; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/polls/answers/PollAnswerText.java b/src/main/java/net/itsthesky/disky/elements/properties/polls/answers/PollAnswerText.java similarity index 84% rename from src/main/java/info/itsthesky/disky/elements/properties/polls/answers/PollAnswerText.java rename to src/main/java/net/itsthesky/disky/elements/properties/polls/answers/PollAnswerText.java index b90e4b7f..8df8edc3 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/polls/answers/PollAnswerText.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/polls/answers/PollAnswerText.java @@ -1,7 +1,7 @@ -package info.itsthesky.disky.elements.properties.polls.answers; +package net.itsthesky.disky.elements.properties.polls.answers; import ch.njol.skript.expressions.base.SimplePropertyExpression; -import info.itsthesky.disky.elements.properties.polls.PollAnswerData; +import net.itsthesky.disky.elements.properties.polls.PollAnswerData; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/polls/answers/PollAnswerVotes.java b/src/main/java/net/itsthesky/disky/elements/properties/polls/answers/PollAnswerVotes.java similarity index 84% rename from src/main/java/info/itsthesky/disky/elements/properties/polls/answers/PollAnswerVotes.java rename to src/main/java/net/itsthesky/disky/elements/properties/polls/answers/PollAnswerVotes.java index 36d18a9a..1b52156e 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/polls/answers/PollAnswerVotes.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/polls/answers/PollAnswerVotes.java @@ -1,7 +1,7 @@ -package info.itsthesky.disky.elements.properties.polls.answers; +package net.itsthesky.disky.elements.properties.polls.answers; import ch.njol.skript.expressions.base.SimplePropertyExpression; -import info.itsthesky.disky.elements.properties.polls.PollAnswerData; +import net.itsthesky.disky.elements.properties.polls.PollAnswerData; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/profile/HasBanner.java b/src/main/java/net/itsthesky/disky/elements/properties/profile/HasBanner.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/properties/profile/HasBanner.java rename to src/main/java/net/itsthesky/disky/elements/properties/profile/HasBanner.java index 7f3c0d22..777d94b2 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/profile/HasBanner.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/profile/HasBanner.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.profile; +package net.itsthesky.disky.elements.properties.profile; import ch.njol.skript.conditions.base.PropertyCondition; import ch.njol.skript.doc.Description; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/profile/ProfileBanner.java b/src/main/java/net/itsthesky/disky/elements/properties/profile/ProfileBanner.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/properties/profile/ProfileBanner.java rename to src/main/java/net/itsthesky/disky/elements/properties/profile/ProfileBanner.java index e6eefd12..247d6a66 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/profile/ProfileBanner.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/profile/ProfileBanner.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.profile; +package net.itsthesky.disky.elements.properties.profile; import ch.njol.skript.classes.Changer; import ch.njol.skript.config.Node; @@ -8,10 +8,10 @@ import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.SkriptParser; import ch.njol.util.Kleenean; -import info.itsthesky.disky.core.Bot; -import info.itsthesky.disky.core.SkriptUtils; -import info.itsthesky.disky.elements.changers.IAsyncChangeableExpression; -import info.itsthesky.disky.elements.sections.handler.DiSkyRuntimeHandler; +import net.itsthesky.disky.core.Bot; +import net.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.elements.changers.IAsyncChangeableExpression; +import net.itsthesky.disky.elements.sections.handler.DiSkyRuntimeHandler; import net.dv8tion.jda.api.entities.Icon; import net.dv8tion.jda.api.entities.User; import net.dv8tion.jda.api.managers.AccountManager; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/profile/ProfileColor.java b/src/main/java/net/itsthesky/disky/elements/properties/profile/ProfileColor.java similarity index 91% rename from src/main/java/info/itsthesky/disky/elements/properties/profile/ProfileColor.java rename to src/main/java/net/itsthesky/disky/elements/properties/profile/ProfileColor.java index 8e72b524..98a9d492 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/profile/ProfileColor.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/profile/ProfileColor.java @@ -1,10 +1,10 @@ -package info.itsthesky.disky.elements.properties.profile; +package net.itsthesky.disky.elements.properties.profile; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Name; import ch.njol.skript.expressions.base.SimplePropertyExpression; import ch.njol.skript.util.Color; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.User; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/reactions/ReactionEmote.java b/src/main/java/net/itsthesky/disky/elements/properties/reactions/ReactionEmote.java similarity index 88% rename from src/main/java/info/itsthesky/disky/elements/properties/reactions/ReactionEmote.java rename to src/main/java/net/itsthesky/disky/elements/properties/reactions/ReactionEmote.java index 25482f07..8ad5370e 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/reactions/ReactionEmote.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/reactions/ReactionEmote.java @@ -1,7 +1,7 @@ -package info.itsthesky.disky.elements.properties.reactions; +package net.itsthesky.disky.elements.properties.reactions; import ch.njol.skript.expressions.base.SimplePropertyExpression; -import info.itsthesky.disky.api.emojis.Emote; +import net.itsthesky.disky.api.emojis.Emote; import net.dv8tion.jda.api.entities.MessageReaction; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/reactions/ReactionIsSelf.java b/src/main/java/net/itsthesky/disky/elements/properties/reactions/ReactionIsSelf.java similarity index 91% rename from src/main/java/info/itsthesky/disky/elements/properties/reactions/ReactionIsSelf.java rename to src/main/java/net/itsthesky/disky/elements/properties/reactions/ReactionIsSelf.java index 9adf83e9..af3b3671 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/reactions/ReactionIsSelf.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/reactions/ReactionIsSelf.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.reactions; +package net.itsthesky.disky.elements.properties.reactions; import ch.njol.skript.conditions.base.PropertyCondition; import net.dv8tion.jda.api.entities.MessageReaction; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/reactions/ReactionIsSuper.java b/src/main/java/net/itsthesky/disky/elements/properties/reactions/ReactionIsSuper.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/properties/reactions/ReactionIsSuper.java rename to src/main/java/net/itsthesky/disky/elements/properties/reactions/ReactionIsSuper.java index ea92f5f0..fa59ad97 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/reactions/ReactionIsSuper.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/reactions/ReactionIsSuper.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.reactions; +package net.itsthesky.disky.elements.properties.reactions; import ch.njol.skript.conditions.base.PropertyCondition; import net.dv8tion.jda.api.entities.MessageReaction; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/role/NewRoleAction.java b/src/main/java/net/itsthesky/disky/elements/properties/role/NewRoleAction.java similarity index 85% rename from src/main/java/info/itsthesky/disky/elements/properties/role/NewRoleAction.java rename to src/main/java/net/itsthesky/disky/elements/properties/role/NewRoleAction.java index ff8f1231..dad114a9 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/role/NewRoleAction.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/role/NewRoleAction.java @@ -1,6 +1,6 @@ -package info.itsthesky.disky.elements.properties.role; +package net.itsthesky.disky.elements.properties.role; -import info.itsthesky.disky.api.skript.action.GuildAction; +import net.itsthesky.disky.api.skript.action.GuildAction; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.requests.restaction.RoleAction; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/role/RoleColor.java b/src/main/java/net/itsthesky/disky/elements/properties/role/RoleColor.java similarity index 89% rename from src/main/java/info/itsthesky/disky/elements/properties/role/RoleColor.java rename to src/main/java/net/itsthesky/disky/elements/properties/role/RoleColor.java index a7561acd..5a057fae 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/role/RoleColor.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/role/RoleColor.java @@ -1,9 +1,9 @@ -package info.itsthesky.disky.elements.properties.role; +package net.itsthesky.disky.elements.properties.role; import ch.njol.skript.classes.Changer; import ch.njol.skript.util.Color; -import info.itsthesky.disky.api.skript.action.ActionProperty; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.skript.action.ActionProperty; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.entities.Role; import net.dv8tion.jda.api.requests.restaction.RoleAction; import org.bukkit.event.Event; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/role/RoleName.java b/src/main/java/net/itsthesky/disky/elements/properties/role/RoleName.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/properties/role/RoleName.java rename to src/main/java/net/itsthesky/disky/elements/properties/role/RoleName.java index fec18b1f..f2fc0ffd 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/role/RoleName.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/role/RoleName.java @@ -1,7 +1,7 @@ -package info.itsthesky.disky.elements.properties.role; +package net.itsthesky.disky.elements.properties.role; import ch.njol.skript.classes.Changer; -import info.itsthesky.disky.api.skript.action.ActionProperty; +import net.itsthesky.disky.api.skript.action.ActionProperty; import net.dv8tion.jda.api.entities.Role; import net.dv8tion.jda.api.requests.restaction.RoleAction; import org.bukkit.event.Event; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/tags/GetTag.java b/src/main/java/net/itsthesky/disky/elements/properties/tags/GetTag.java similarity index 95% rename from src/main/java/info/itsthesky/disky/elements/properties/tags/GetTag.java rename to src/main/java/net/itsthesky/disky/elements/properties/tags/GetTag.java index 297c4d1f..4ed2f528 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/tags/GetTag.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/tags/GetTag.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.tags; +package net.itsthesky.disky.elements.properties.tags; import ch.njol.skript.Skript; import ch.njol.skript.doc.Description; @@ -10,7 +10,7 @@ import ch.njol.skript.lang.SkriptParser; import ch.njol.skript.lang.util.SimpleExpression; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.api.skript.EasyElement; import net.dv8tion.jda.api.entities.channel.concrete.ForumChannel; import net.dv8tion.jda.api.entities.channel.forums.ForumTag; import org.bukkit.event.Event; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/tags/NewTag.java b/src/main/java/net/itsthesky/disky/elements/properties/tags/NewTag.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/properties/tags/NewTag.java rename to src/main/java/net/itsthesky/disky/elements/properties/tags/NewTag.java index 43ea4fc7..3a167902 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/tags/NewTag.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/tags/NewTag.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.tags; +package net.itsthesky.disky.elements.properties.tags; import ch.njol.skript.Skript; import ch.njol.skript.doc.Description; @@ -10,8 +10,8 @@ import ch.njol.skript.lang.SkriptParser; import ch.njol.skript.lang.util.SimpleExpression; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.emojis.Emote; -import info.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.api.emojis.Emote; +import net.itsthesky.disky.api.skript.EasyElement; import net.dv8tion.jda.api.entities.channel.forums.BaseForumTag; import net.dv8tion.jda.api.entities.channel.forums.ForumTagData; import org.bukkit.event.Event; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/tags/TagEmoji.java b/src/main/java/net/itsthesky/disky/elements/properties/tags/TagEmoji.java similarity index 90% rename from src/main/java/info/itsthesky/disky/elements/properties/tags/TagEmoji.java rename to src/main/java/net/itsthesky/disky/elements/properties/tags/TagEmoji.java index 6cdcf80a..ad7f18c6 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/tags/TagEmoji.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/tags/TagEmoji.java @@ -1,10 +1,10 @@ -package info.itsthesky.disky.elements.properties.tags; +package net.itsthesky.disky.elements.properties.tags; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Name; import ch.njol.skript.doc.Since; import ch.njol.skript.expressions.base.SimplePropertyExpression; -import info.itsthesky.disky.api.emojis.Emote; +import net.itsthesky.disky.api.emojis.Emote; import net.dv8tion.jda.api.entities.channel.forums.ForumTag; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/tags/ThreadTags.java b/src/main/java/net/itsthesky/disky/elements/properties/tags/ThreadTags.java similarity index 94% rename from src/main/java/info/itsthesky/disky/elements/properties/tags/ThreadTags.java rename to src/main/java/net/itsthesky/disky/elements/properties/tags/ThreadTags.java index 5bf5f3a9..191891b4 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/tags/ThreadTags.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/tags/ThreadTags.java @@ -1,5 +1,5 @@ -package info.itsthesky.disky.elements.properties.tags; +package net.itsthesky.disky.elements.properties.tags; import ch.njol.skript.Skript; import ch.njol.skript.classes.Changer; @@ -10,10 +10,10 @@ import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.SkriptParser; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.skript.EasyElement; -import info.itsthesky.disky.api.skript.MultiplyPropertyExpression; -import info.itsthesky.disky.elements.changers.IAsyncChangeableExpression; -import info.itsthesky.disky.elements.sections.handler.DiSkyRuntimeHandler; +import net.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.api.skript.MultiplyPropertyExpression; +import net.itsthesky.disky.elements.changers.IAsyncChangeableExpression; +import net.itsthesky.disky.elements.sections.handler.DiSkyRuntimeHandler; import net.dv8tion.jda.api.entities.channel.ChannelType; import net.dv8tion.jda.api.entities.channel.concrete.ForumChannel; import net.dv8tion.jda.api.entities.channel.concrete.ThreadChannel; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/threads/ThreadIsPublic.java b/src/main/java/net/itsthesky/disky/elements/properties/threads/ThreadIsPublic.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/properties/threads/ThreadIsPublic.java rename to src/main/java/net/itsthesky/disky/elements/properties/threads/ThreadIsPublic.java index 84aeabe2..2decf67f 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/threads/ThreadIsPublic.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/threads/ThreadIsPublic.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.threads; +package net.itsthesky.disky.elements.properties.threads; import ch.njol.skript.conditions.base.PropertyCondition; import ch.njol.skript.doc.Description; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/threads/ThreadParent.java b/src/main/java/net/itsthesky/disky/elements/properties/threads/ThreadParent.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/properties/threads/ThreadParent.java rename to src/main/java/net/itsthesky/disky/elements/properties/threads/ThreadParent.java index 19154276..92e17fb2 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/threads/ThreadParent.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/threads/ThreadParent.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.threads; +package net.itsthesky.disky.elements.properties.threads; import ch.njol.skript.doc.Name; import ch.njol.skript.expressions.base.SimplePropertyExpression; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/users/MultipleUserProperty.java b/src/main/java/net/itsthesky/disky/elements/properties/users/MultipleUserProperty.java similarity index 79% rename from src/main/java/info/itsthesky/disky/elements/properties/users/MultipleUserProperty.java rename to src/main/java/net/itsthesky/disky/elements/properties/users/MultipleUserProperty.java index f4bb6ef3..ebb0274a 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/users/MultipleUserProperty.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/users/MultipleUserProperty.java @@ -1,6 +1,6 @@ -package info.itsthesky.disky.elements.properties.users; +package net.itsthesky.disky.elements.properties.users; -import info.itsthesky.disky.api.skript.MultiplyPropertyExpression; +import net.itsthesky.disky.api.skript.MultiplyPropertyExpression; import net.dv8tion.jda.api.entities.User; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/users/UserBadges.java b/src/main/java/net/itsthesky/disky/elements/properties/users/UserBadges.java similarity index 94% rename from src/main/java/info/itsthesky/disky/elements/properties/users/UserBadges.java rename to src/main/java/net/itsthesky/disky/elements/properties/users/UserBadges.java index 79bb67ac..72a94df1 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/users/UserBadges.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/users/UserBadges.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.users; +package net.itsthesky.disky.elements.properties.users; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/users/UserDecorationAvatar.java b/src/main/java/net/itsthesky/disky/elements/properties/users/UserDecorationAvatar.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/properties/users/UserDecorationAvatar.java rename to src/main/java/net/itsthesky/disky/elements/properties/users/UserDecorationAvatar.java index cba2369c..1d5e0c82 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/users/UserDecorationAvatar.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/users/UserDecorationAvatar.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.users; +package net.itsthesky.disky.elements.properties.users; import net.dv8tion.jda.api.entities.User; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/users/UserDiscriminator.java b/src/main/java/net/itsthesky/disky/elements/properties/users/UserDiscriminator.java similarity index 94% rename from src/main/java/info/itsthesky/disky/elements/properties/users/UserDiscriminator.java rename to src/main/java/net/itsthesky/disky/elements/properties/users/UserDiscriminator.java index 51a6b30c..34528c61 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/users/UserDiscriminator.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/users/UserDiscriminator.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.users; +package net.itsthesky.disky.elements.properties.users; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/users/UserMutualGuilds.java b/src/main/java/net/itsthesky/disky/elements/properties/users/UserMutualGuilds.java similarity index 94% rename from src/main/java/info/itsthesky/disky/elements/properties/users/UserMutualGuilds.java rename to src/main/java/net/itsthesky/disky/elements/properties/users/UserMutualGuilds.java index 83ad1e56..535f5106 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/users/UserMutualGuilds.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/users/UserMutualGuilds.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.users; +package net.itsthesky.disky.elements.properties.users; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; diff --git a/src/main/java/info/itsthesky/disky/elements/properties/users/UserProperty.java b/src/main/java/net/itsthesky/disky/elements/properties/users/UserProperty.java similarity index 90% rename from src/main/java/info/itsthesky/disky/elements/properties/users/UserProperty.java rename to src/main/java/net/itsthesky/disky/elements/properties/users/UserProperty.java index 72b29dc5..99c29292 100644 --- a/src/main/java/info/itsthesky/disky/elements/properties/users/UserProperty.java +++ b/src/main/java/net/itsthesky/disky/elements/properties/users/UserProperty.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.properties.users; +package net.itsthesky.disky.elements.properties.users; import ch.njol.skript.expressions.base.SimplePropertyExpression; import net.dv8tion.jda.api.entities.User; diff --git a/src/main/java/info/itsthesky/disky/elements/sections/EmbedSection.java b/src/main/java/net/itsthesky/disky/elements/sections/EmbedSection.java similarity index 96% rename from src/main/java/info/itsthesky/disky/elements/sections/EmbedSection.java rename to src/main/java/net/itsthesky/disky/elements/sections/EmbedSection.java index 0f753bc7..f7032a08 100644 --- a/src/main/java/info/itsthesky/disky/elements/sections/EmbedSection.java +++ b/src/main/java/net/itsthesky/disky/elements/sections/EmbedSection.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.sections; +package net.itsthesky.disky.elements.sections; import ch.njol.skript.config.SectionNode; import ch.njol.skript.doc.Description; @@ -9,8 +9,8 @@ import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.skript.lang.TriggerItem; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.EmbedManager; -import info.itsthesky.disky.api.skript.ReturningSection; +import net.itsthesky.disky.api.EmbedManager; +import net.itsthesky.disky.api.skript.ReturningSection; import net.dv8tion.jda.api.EmbedBuilder; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/sections/FindMemberSection.java b/src/main/java/net/itsthesky/disky/elements/sections/FindMemberSection.java similarity index 97% rename from src/main/java/info/itsthesky/disky/elements/sections/FindMemberSection.java rename to src/main/java/net/itsthesky/disky/elements/sections/FindMemberSection.java index 869d1272..99dfa233 100644 --- a/src/main/java/info/itsthesky/disky/elements/sections/FindMemberSection.java +++ b/src/main/java/net/itsthesky/disky/elements/sections/FindMemberSection.java @@ -1,12 +1,10 @@ -package info.itsthesky.disky.elements.sections; +package net.itsthesky.disky.elements.sections; import ch.njol.skript.Skript; import ch.njol.skript.classes.Changer; import ch.njol.skript.classes.ClassInfo; import ch.njol.skript.config.SectionNode; import ch.njol.skript.effects.Delay; -import ch.njol.skript.effects.EffReturn; -import ch.njol.skript.expressions.ExprPermissions; import ch.njol.skript.lang.*; import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.skript.lang.function.FunctionEvent; @@ -17,9 +15,8 @@ import ch.njol.skript.timings.SkriptTimings; import ch.njol.skript.variables.Variables; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.api.DiSkyRegistry; -import info.itsthesky.disky.api.ReflectionUtils; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.api.DiSkyRegistry; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; import org.bukkit.Bukkit; diff --git a/src/main/java/info/itsthesky/disky/elements/sections/ReactSection.java b/src/main/java/net/itsthesky/disky/elements/sections/ReactSection.java similarity index 87% rename from src/main/java/info/itsthesky/disky/elements/sections/ReactSection.java rename to src/main/java/net/itsthesky/disky/elements/sections/ReactSection.java index 852e0937..51aec1e2 100644 --- a/src/main/java/info/itsthesky/disky/elements/sections/ReactSection.java +++ b/src/main/java/net/itsthesky/disky/elements/sections/ReactSection.java @@ -1,15 +1,15 @@ -package info.itsthesky.disky.elements.sections; +package net.itsthesky.disky.elements.sections; import ch.njol.skript.Skript; import ch.njol.skript.config.SectionNode; import ch.njol.skript.lang.*; import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.emojis.Emote; -import info.itsthesky.disky.api.skript.EasyElement; -import info.itsthesky.disky.core.ReactionListener; -import info.itsthesky.disky.core.SkriptUtils; -import info.itsthesky.disky.elements.events.react.ReactionAddEvent; +import net.itsthesky.disky.api.emojis.Emote; +import net.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.core.ReactionListener; +import net.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.elements.events.react.ReactionAddEvent; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.User; import org.bukkit.event.Event; diff --git a/src/main/java/info/itsthesky/disky/elements/sections/automod/AutomodResponse.java b/src/main/java/net/itsthesky/disky/elements/sections/automod/AutomodResponse.java similarity index 90% rename from src/main/java/info/itsthesky/disky/elements/sections/automod/AutomodResponse.java rename to src/main/java/net/itsthesky/disky/elements/sections/automod/AutomodResponse.java index 5baae257..18bd4021 100644 --- a/src/main/java/info/itsthesky/disky/elements/sections/automod/AutomodResponse.java +++ b/src/main/java/net/itsthesky/disky/elements/sections/automod/AutomodResponse.java @@ -1,13 +1,13 @@ -package info.itsthesky.disky.elements.sections.automod; +package net.itsthesky.disky.elements.sections.automod; import ch.njol.skript.Skript; import ch.njol.skript.classes.Changer; import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.skript.EasyElement; -import info.itsthesky.disky.api.skript.MultiplyPropertyExpression; -import info.itsthesky.disky.managers.wrappers.AutoModRuleBuilder; +import net.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.api.skript.MultiplyPropertyExpression; +import net.itsthesky.disky.managers.wrappers.AutoModRuleBuilder; import net.dv8tion.jda.api.entities.automod.AutoModResponse; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/sections/automod/AutomodType.java b/src/main/java/net/itsthesky/disky/elements/sections/automod/AutomodType.java similarity index 91% rename from src/main/java/info/itsthesky/disky/elements/sections/automod/AutomodType.java rename to src/main/java/net/itsthesky/disky/elements/sections/automod/AutomodType.java index 96fc656b..4a3b28fd 100644 --- a/src/main/java/info/itsthesky/disky/elements/sections/automod/AutomodType.java +++ b/src/main/java/net/itsthesky/disky/elements/sections/automod/AutomodType.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.sections.automod; +package net.itsthesky.disky.elements.sections.automod; import ch.njol.skript.Skript; import ch.njol.skript.classes.Changer; @@ -6,8 +6,8 @@ import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.skript.EasyElement; -import info.itsthesky.disky.managers.wrappers.AutoModRuleBuilder; +import net.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.managers.wrappers.AutoModRuleBuilder; import net.dv8tion.jda.api.entities.automod.build.AutoModRuleData; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/sections/automod/CreateAutoMod.java b/src/main/java/net/itsthesky/disky/elements/sections/automod/CreateAutoMod.java similarity index 79% rename from src/main/java/info/itsthesky/disky/elements/sections/automod/CreateAutoMod.java rename to src/main/java/net/itsthesky/disky/elements/sections/automod/CreateAutoMod.java index cb0a1db7..fd750d5c 100644 --- a/src/main/java/info/itsthesky/disky/elements/sections/automod/CreateAutoMod.java +++ b/src/main/java/net/itsthesky/disky/elements/sections/automod/CreateAutoMod.java @@ -1,7 +1,7 @@ -package info.itsthesky.disky.elements.sections.automod; +package net.itsthesky.disky.elements.sections.automod; -import info.itsthesky.disky.api.skript.ReturningSection; -import info.itsthesky.disky.managers.wrappers.AutoModRuleBuilder; +import net.itsthesky.disky.api.skript.ReturningSection; +import net.itsthesky.disky.managers.wrappers.AutoModRuleBuilder; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/info/itsthesky/disky/elements/sections/automod/CreateRule.java b/src/main/java/net/itsthesky/disky/elements/sections/automod/CreateRule.java similarity index 86% rename from src/main/java/info/itsthesky/disky/elements/sections/automod/CreateRule.java rename to src/main/java/net/itsthesky/disky/elements/sections/automod/CreateRule.java index d713c65b..8d2f12cb 100644 --- a/src/main/java/info/itsthesky/disky/elements/sections/automod/CreateRule.java +++ b/src/main/java/net/itsthesky/disky/elements/sections/automod/CreateRule.java @@ -1,12 +1,12 @@ -package info.itsthesky.disky.elements.sections.automod; +package net.itsthesky.disky.elements.sections.automod; import ch.njol.skript.Skript; import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.skript.SpecificBotEffect; -import info.itsthesky.disky.core.Bot; -import info.itsthesky.disky.managers.wrappers.AutoModRuleBuilder; +import net.itsthesky.disky.api.skript.SpecificBotEffect; +import net.itsthesky.disky.core.Bot; +import net.itsthesky.disky.managers.wrappers.AutoModRuleBuilder; import net.dv8tion.jda.api.entities.Guild; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/sections/automod/FilterType.java b/src/main/java/net/itsthesky/disky/elements/sections/automod/FilterType.java similarity index 50% rename from src/main/java/info/itsthesky/disky/elements/sections/automod/FilterType.java rename to src/main/java/net/itsthesky/disky/elements/sections/automod/FilterType.java index 4b5c9496..e6807262 100644 --- a/src/main/java/info/itsthesky/disky/elements/sections/automod/FilterType.java +++ b/src/main/java/net/itsthesky/disky/elements/sections/automod/FilterType.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.sections.automod; +package net.itsthesky.disky.elements.sections.automod; public enum FilterType { KEYWORD, diff --git a/src/main/java/info/itsthesky/disky/elements/sections/automod/NewRuleResponse.java b/src/main/java/net/itsthesky/disky/elements/sections/automod/NewRuleResponse.java similarity index 96% rename from src/main/java/info/itsthesky/disky/elements/sections/automod/NewRuleResponse.java rename to src/main/java/net/itsthesky/disky/elements/sections/automod/NewRuleResponse.java index 13c35575..1e6cdbd6 100644 --- a/src/main/java/info/itsthesky/disky/elements/sections/automod/NewRuleResponse.java +++ b/src/main/java/net/itsthesky/disky/elements/sections/automod/NewRuleResponse.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.sections.automod; +package net.itsthesky.disky.elements.sections.automod; import ch.njol.skript.Skript; import ch.njol.skript.lang.Expression; @@ -7,7 +7,7 @@ import ch.njol.skript.lang.util.SimpleExpression; import ch.njol.skript.util.Timespan; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.api.skript.EasyElement; import net.dv8tion.jda.api.entities.automod.AutoModResponse; import net.dv8tion.jda.api.entities.channel.Channel; import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel; diff --git a/src/main/java/info/itsthesky/disky/elements/sections/automod/NewRuleType.java b/src/main/java/net/itsthesky/disky/elements/sections/automod/NewRuleType.java similarity index 96% rename from src/main/java/info/itsthesky/disky/elements/sections/automod/NewRuleType.java rename to src/main/java/net/itsthesky/disky/elements/sections/automod/NewRuleType.java index 73711e48..9aee5c84 100644 --- a/src/main/java/info/itsthesky/disky/elements/sections/automod/NewRuleType.java +++ b/src/main/java/net/itsthesky/disky/elements/sections/automod/NewRuleType.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.sections.automod; +package net.itsthesky.disky.elements.sections.automod; import ch.njol.skript.Skript; import ch.njol.skript.lang.Expression; @@ -6,7 +6,7 @@ import ch.njol.skript.lang.SkriptParser; import ch.njol.skript.lang.util.SimpleExpression; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.api.skript.EasyElement; import net.dv8tion.jda.api.entities.automod.build.AutoModRuleData; import net.dv8tion.jda.api.entities.automod.build.TriggerConfig; import org.bukkit.event.Event; diff --git a/src/main/java/info/itsthesky/disky/elements/sections/components/CreateRow.java b/src/main/java/net/itsthesky/disky/elements/sections/components/CreateRow.java similarity index 88% rename from src/main/java/info/itsthesky/disky/elements/sections/components/CreateRow.java rename to src/main/java/net/itsthesky/disky/elements/sections/components/CreateRow.java index e4c3a0a2..fe55c756 100644 --- a/src/main/java/info/itsthesky/disky/elements/sections/components/CreateRow.java +++ b/src/main/java/net/itsthesky/disky/elements/sections/components/CreateRow.java @@ -1,10 +1,10 @@ -package info.itsthesky.disky.elements.sections.components; +package net.itsthesky.disky.elements.sections.components; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Examples; import ch.njol.skript.doc.Name; -import info.itsthesky.disky.api.skript.ReturningSection; -import info.itsthesky.disky.elements.components.core.ComponentRow; +import net.itsthesky.disky.api.skript.ReturningSection; +import net.itsthesky.disky.elements.components.core.ComponentRow; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/info/itsthesky/disky/elements/sections/components/RowComponents.java b/src/main/java/net/itsthesky/disky/elements/sections/components/RowComponents.java similarity index 89% rename from src/main/java/info/itsthesky/disky/elements/sections/components/RowComponents.java rename to src/main/java/net/itsthesky/disky/elements/sections/components/RowComponents.java index 9181c21f..4bd7909f 100644 --- a/src/main/java/info/itsthesky/disky/elements/sections/components/RowComponents.java +++ b/src/main/java/net/itsthesky/disky/elements/sections/components/RowComponents.java @@ -1,11 +1,11 @@ -package info.itsthesky.disky.elements.sections.components; +package net.itsthesky.disky.elements.sections.components; import ch.njol.skript.classes.Changer; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Name; -import info.itsthesky.disky.api.skript.EasyElement; -import info.itsthesky.disky.api.skript.MultiplyPropertyExpression; -import info.itsthesky.disky.elements.components.core.ComponentRow; +import net.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.api.skript.MultiplyPropertyExpression; +import net.itsthesky.disky.elements.components.core.ComponentRow; import net.dv8tion.jda.api.interactions.components.ItemComponent; import net.dv8tion.jda.api.interactions.components.buttons.Button; import net.dv8tion.jda.api.interactions.components.selections.SelectMenu; diff --git a/src/main/java/info/itsthesky/disky/elements/sections/handler/DiSkyRuntimeHandler.java b/src/main/java/net/itsthesky/disky/elements/sections/handler/DiSkyRuntimeHandler.java similarity index 96% rename from src/main/java/info/itsthesky/disky/elements/sections/handler/DiSkyRuntimeHandler.java rename to src/main/java/net/itsthesky/disky/elements/sections/handler/DiSkyRuntimeHandler.java index 5e473213..7770d899 100644 --- a/src/main/java/info/itsthesky/disky/elements/sections/handler/DiSkyRuntimeHandler.java +++ b/src/main/java/net/itsthesky/disky/elements/sections/handler/DiSkyRuntimeHandler.java @@ -1,11 +1,11 @@ -package info.itsthesky.disky.elements.sections.handler; +package net.itsthesky.disky.elements.sections.handler; import ch.njol.skript.config.Node; import ch.njol.skript.lang.Expression; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.core.JDAUtils; -import info.itsthesky.disky.core.Utils; -import info.itsthesky.disky.managers.ConfigManager; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.core.JDAUtils; +import net.itsthesky.disky.core.Utils; +import net.itsthesky.disky.managers.ConfigManager; import org.bukkit.Bukkit; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/info/itsthesky/disky/elements/sections/handler/SecTry.java b/src/main/java/net/itsthesky/disky/elements/sections/handler/SecTry.java similarity index 97% rename from src/main/java/info/itsthesky/disky/elements/sections/handler/SecTry.java rename to src/main/java/net/itsthesky/disky/elements/sections/handler/SecTry.java index 50c285d4..e1f01d35 100644 --- a/src/main/java/info/itsthesky/disky/elements/sections/handler/SecTry.java +++ b/src/main/java/net/itsthesky/disky/elements/sections/handler/SecTry.java @@ -1,11 +1,11 @@ -package info.itsthesky.disky.elements.sections.handler; +package net.itsthesky.disky.elements.sections.handler; import ch.njol.skript.Skript; import ch.njol.skript.classes.Changer; import ch.njol.skript.config.SectionNode; import ch.njol.skript.lang.*; import ch.njol.util.Kleenean; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.core.SkriptUtils; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/info/itsthesky/disky/elements/sections/message/CreateMessage.java b/src/main/java/net/itsthesky/disky/elements/sections/message/CreateMessage.java similarity index 97% rename from src/main/java/info/itsthesky/disky/elements/sections/message/CreateMessage.java rename to src/main/java/net/itsthesky/disky/elements/sections/message/CreateMessage.java index 0e853e97..3224120c 100644 --- a/src/main/java/info/itsthesky/disky/elements/sections/message/CreateMessage.java +++ b/src/main/java/net/itsthesky/disky/elements/sections/message/CreateMessage.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.sections.message; +package net.itsthesky.disky.elements.sections.message; import ch.njol.skript.config.SectionNode; import ch.njol.skript.doc.Description; @@ -8,7 +8,7 @@ import ch.njol.skript.lang.SkriptParser; import ch.njol.skript.lang.TriggerItem; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.skript.ReturningSection; +import net.itsthesky.disky.api.skript.ReturningSection; import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/sections/message/InlineMessageBuilder.java b/src/main/java/net/itsthesky/disky/elements/sections/message/InlineMessageBuilder.java similarity index 96% rename from src/main/java/info/itsthesky/disky/elements/sections/message/InlineMessageBuilder.java rename to src/main/java/net/itsthesky/disky/elements/sections/message/InlineMessageBuilder.java index a3f0005f..1b750c92 100644 --- a/src/main/java/info/itsthesky/disky/elements/sections/message/InlineMessageBuilder.java +++ b/src/main/java/net/itsthesky/disky/elements/sections/message/InlineMessageBuilder.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.sections.message; +package net.itsthesky.disky.elements.sections.message; import ch.njol.skript.Skript; import ch.njol.skript.doc.Description; @@ -10,8 +10,8 @@ import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.skript.lang.util.SimpleExpression; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.skript.EasyElement; -import info.itsthesky.disky.elements.components.core.ComponentRow; +import net.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.elements.components.core.ComponentRow; import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.interactions.components.ActionRow; import net.dv8tion.jda.api.interactions.components.buttons.Button; diff --git a/src/main/java/info/itsthesky/disky/elements/sections/message/MessageAttachments.java b/src/main/java/net/itsthesky/disky/elements/sections/message/MessageAttachments.java similarity index 94% rename from src/main/java/info/itsthesky/disky/elements/sections/message/MessageAttachments.java rename to src/main/java/net/itsthesky/disky/elements/sections/message/MessageAttachments.java index 4b17ef32..618d97ef 100644 --- a/src/main/java/info/itsthesky/disky/elements/sections/message/MessageAttachments.java +++ b/src/main/java/net/itsthesky/disky/elements/sections/message/MessageAttachments.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.sections.message; +package net.itsthesky.disky.elements.sections.message; import ch.njol.skript.Skript; import ch.njol.skript.classes.Changer; @@ -7,9 +7,9 @@ import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.util.Kleenean; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.api.skript.EasyElement; -import info.itsthesky.disky.api.skript.MultiplyPropertyExpression; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.api.skript.MultiplyPropertyExpression; import net.dv8tion.jda.api.utils.FileUpload; import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder; import org.bukkit.event.Event; diff --git a/src/main/java/info/itsthesky/disky/elements/sections/message/MessageContent.java b/src/main/java/net/itsthesky/disky/elements/sections/message/MessageContent.java similarity index 95% rename from src/main/java/info/itsthesky/disky/elements/sections/message/MessageContent.java rename to src/main/java/net/itsthesky/disky/elements/sections/message/MessageContent.java index 5fe1aa94..3f66d34f 100644 --- a/src/main/java/info/itsthesky/disky/elements/sections/message/MessageContent.java +++ b/src/main/java/net/itsthesky/disky/elements/sections/message/MessageContent.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.sections.message; +package net.itsthesky.disky.elements.sections.message; import ch.njol.skript.Skript; import ch.njol.skript.classes.Changer; @@ -8,7 +8,7 @@ import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.api.skript.EasyElement; import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/info/itsthesky/disky/elements/sections/message/MessageEmbeds.java b/src/main/java/net/itsthesky/disky/elements/sections/message/MessageEmbeds.java similarity index 93% rename from src/main/java/info/itsthesky/disky/elements/sections/message/MessageEmbeds.java rename to src/main/java/net/itsthesky/disky/elements/sections/message/MessageEmbeds.java index ec514506..edfcdcd7 100644 --- a/src/main/java/info/itsthesky/disky/elements/sections/message/MessageEmbeds.java +++ b/src/main/java/net/itsthesky/disky/elements/sections/message/MessageEmbeds.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.sections.message; +package net.itsthesky.disky.elements.sections.message; import ch.njol.skript.Skript; import ch.njol.skript.classes.Changer; @@ -7,8 +7,8 @@ import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.SkriptParser.ParseResult; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.skript.EasyElement; -import info.itsthesky.disky.api.skript.MultiplyPropertyExpression; +import net.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.api.skript.MultiplyPropertyExpression; import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.entities.MessageEmbed; import net.dv8tion.jda.api.utils.messages.MessageCreateBuilder; diff --git a/src/main/java/info/itsthesky/disky/elements/sections/message/MessageModalRows.java b/src/main/java/net/itsthesky/disky/elements/sections/message/MessageModalRows.java similarity index 92% rename from src/main/java/info/itsthesky/disky/elements/sections/message/MessageModalRows.java rename to src/main/java/net/itsthesky/disky/elements/sections/message/MessageModalRows.java index a2bc35aa..99f49ece 100644 --- a/src/main/java/info/itsthesky/disky/elements/sections/message/MessageModalRows.java +++ b/src/main/java/net/itsthesky/disky/elements/sections/message/MessageModalRows.java @@ -1,11 +1,11 @@ -package info.itsthesky.disky.elements.sections.message; +package net.itsthesky.disky.elements.sections.message; import ch.njol.skript.classes.Changer; import ch.njol.skript.doc.Description; import ch.njol.skript.doc.Name; -import info.itsthesky.disky.api.skript.EasyElement; -import info.itsthesky.disky.api.skript.MultiplyPropertyExpression; -import info.itsthesky.disky.elements.components.core.ComponentRow; +import net.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.api.skript.MultiplyPropertyExpression; +import net.itsthesky.disky.elements.components.core.ComponentRow; import net.dv8tion.jda.api.interactions.components.ActionRow; import net.dv8tion.jda.api.interactions.components.LayoutComponent; import net.dv8tion.jda.api.interactions.components.buttons.Button; diff --git a/src/main/java/info/itsthesky/disky/elements/sections/once/EffOuterExecution.java b/src/main/java/net/itsthesky/disky/elements/sections/once/EffOuterExecution.java similarity index 96% rename from src/main/java/info/itsthesky/disky/elements/sections/once/EffOuterExecution.java rename to src/main/java/net/itsthesky/disky/elements/sections/once/EffOuterExecution.java index 3b2e8a2b..60336c6e 100644 --- a/src/main/java/info/itsthesky/disky/elements/sections/once/EffOuterExecution.java +++ b/src/main/java/net/itsthesky/disky/elements/sections/once/EffOuterExecution.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.sections.once; +package net.itsthesky.disky.elements.sections.once; import ch.njol.skript.Skript; import ch.njol.skript.lang.Effect; diff --git a/src/main/java/info/itsthesky/disky/elements/sections/once/ExprOuterExpression.java b/src/main/java/net/itsthesky/disky/elements/sections/once/ExprOuterExpression.java similarity index 97% rename from src/main/java/info/itsthesky/disky/elements/sections/once/ExprOuterExpression.java rename to src/main/java/net/itsthesky/disky/elements/sections/once/ExprOuterExpression.java index a2410e29..78d2f39d 100644 --- a/src/main/java/info/itsthesky/disky/elements/sections/once/ExprOuterExpression.java +++ b/src/main/java/net/itsthesky/disky/elements/sections/once/ExprOuterExpression.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.sections.once; +package net.itsthesky.disky.elements.sections.once; import ch.njol.skript.Skript; import ch.njol.skript.lang.Expression; diff --git a/src/main/java/info/itsthesky/disky/elements/sections/once/ExprSubEventExpression.java b/src/main/java/net/itsthesky/disky/elements/sections/once/ExprSubEventExpression.java similarity index 97% rename from src/main/java/info/itsthesky/disky/elements/sections/once/ExprSubEventExpression.java rename to src/main/java/net/itsthesky/disky/elements/sections/once/ExprSubEventExpression.java index 877b3388..520c2d05 100644 --- a/src/main/java/info/itsthesky/disky/elements/sections/once/ExprSubEventExpression.java +++ b/src/main/java/net/itsthesky/disky/elements/sections/once/ExprSubEventExpression.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.sections.once; +package net.itsthesky.disky.elements.sections.once; import ch.njol.skript.Skript; import ch.njol.skript.classes.ClassInfo; @@ -12,7 +12,7 @@ import ch.njol.skript.util.Utils; import ch.njol.util.Kleenean; import ch.njol.util.coll.CollectionUtils; -import info.itsthesky.disky.DiSky; +import net.itsthesky.disky.DiSky; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/info/itsthesky/disky/elements/sections/once/SecListenOnce.java b/src/main/java/net/itsthesky/disky/elements/sections/once/SecListenOnce.java similarity index 96% rename from src/main/java/info/itsthesky/disky/elements/sections/once/SecListenOnce.java rename to src/main/java/net/itsthesky/disky/elements/sections/once/SecListenOnce.java index f621e630..877d74a7 100644 --- a/src/main/java/info/itsthesky/disky/elements/sections/once/SecListenOnce.java +++ b/src/main/java/net/itsthesky/disky/elements/sections/once/SecListenOnce.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.sections.once; +package net.itsthesky.disky.elements.sections.once; import ch.njol.skript.Skript; import ch.njol.skript.config.Node; @@ -8,11 +8,11 @@ import ch.njol.skript.variables.Variables; import ch.njol.util.Kleenean; import ch.njol.util.coll.iterator.ConsumingIterator; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.api.events.DiSkyEvent; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.core.Bot; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.api.events.DiSkyEvent; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.core.Bot; +import net.itsthesky.disky.core.SkriptUtils; import net.dv8tion.jda.api.events.GenericEvent; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; @@ -26,7 +26,7 @@ import java.util.concurrent.TimeoutException; import java.util.function.Supplier; -import static info.itsthesky.disky.core.SkriptUtils.async; +import static net.itsthesky.disky.core.SkriptUtils.async; public class SecListenOnce extends Section { diff --git a/src/main/java/info/itsthesky/disky/elements/sections/welcome/AddScreenChannel.java b/src/main/java/net/itsthesky/disky/elements/sections/welcome/AddScreenChannel.java similarity index 95% rename from src/main/java/info/itsthesky/disky/elements/sections/welcome/AddScreenChannel.java rename to src/main/java/net/itsthesky/disky/elements/sections/welcome/AddScreenChannel.java index dd23053f..2ec507b0 100644 --- a/src/main/java/info/itsthesky/disky/elements/sections/welcome/AddScreenChannel.java +++ b/src/main/java/net/itsthesky/disky/elements/sections/welcome/AddScreenChannel.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.sections.welcome; +package net.itsthesky.disky.elements.sections.welcome; import ch.njol.skript.Skript; import ch.njol.skript.doc.Description; @@ -9,8 +9,8 @@ import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.SkriptParser; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.emojis.Emote; -import info.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.api.emojis.Emote; +import net.itsthesky.disky.api.skript.EasyElement; import net.dv8tion.jda.api.entities.GuildWelcomeScreen; import net.dv8tion.jda.api.entities.channel.Channel; import net.dv8tion.jda.api.entities.channel.middleman.StandardGuildChannel; diff --git a/src/main/java/info/itsthesky/disky/elements/sections/welcome/ModifySection.java b/src/main/java/net/itsthesky/disky/elements/sections/welcome/ModifySection.java similarity index 97% rename from src/main/java/info/itsthesky/disky/elements/sections/welcome/ModifySection.java rename to src/main/java/net/itsthesky/disky/elements/sections/welcome/ModifySection.java index 9dba78c0..aad1ddb2 100644 --- a/src/main/java/info/itsthesky/disky/elements/sections/welcome/ModifySection.java +++ b/src/main/java/net/itsthesky/disky/elements/sections/welcome/ModifySection.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.sections.welcome; +package net.itsthesky.disky.elements.sections.welcome; import ch.njol.skript.Skript; import ch.njol.skript.config.SectionNode; diff --git a/src/main/java/info/itsthesky/disky/elements/sections/welcome/ScreenDescription.java b/src/main/java/net/itsthesky/disky/elements/sections/welcome/ScreenDescription.java similarity index 97% rename from src/main/java/info/itsthesky/disky/elements/sections/welcome/ScreenDescription.java rename to src/main/java/net/itsthesky/disky/elements/sections/welcome/ScreenDescription.java index 288ee627..150d0585 100644 --- a/src/main/java/info/itsthesky/disky/elements/sections/welcome/ScreenDescription.java +++ b/src/main/java/net/itsthesky/disky/elements/sections/welcome/ScreenDescription.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.sections.welcome; +package net.itsthesky.disky.elements.sections.welcome; import ch.njol.skript.Skript; import ch.njol.skript.doc.Description; diff --git a/src/main/java/info/itsthesky/disky/elements/sections/welcome/ScreenElement.java b/src/main/java/net/itsthesky/disky/elements/sections/welcome/ScreenElement.java similarity index 87% rename from src/main/java/info/itsthesky/disky/elements/sections/welcome/ScreenElement.java rename to src/main/java/net/itsthesky/disky/elements/sections/welcome/ScreenElement.java index eda1c6f5..cd602e4b 100644 --- a/src/main/java/info/itsthesky/disky/elements/sections/welcome/ScreenElement.java +++ b/src/main/java/net/itsthesky/disky/elements/sections/welcome/ScreenElement.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.sections.welcome; +package net.itsthesky.disky.elements.sections.welcome; import net.dv8tion.jda.api.managers.GuildWelcomeScreenManager; import org.bukkit.event.Event; diff --git a/src/main/java/info/itsthesky/disky/elements/structures/StructBot.java b/src/main/java/net/itsthesky/disky/elements/structures/StructBot.java similarity index 95% rename from src/main/java/info/itsthesky/disky/elements/structures/StructBot.java rename to src/main/java/net/itsthesky/disky/elements/structures/StructBot.java index c84c21b9..713fd784 100644 --- a/src/main/java/info/itsthesky/disky/elements/structures/StructBot.java +++ b/src/main/java/net/itsthesky/disky/elements/structures/StructBot.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.structures; +package net.itsthesky.disky.elements.structures; import ch.njol.skript.Skript; import ch.njol.skript.config.SectionNode; @@ -7,14 +7,14 @@ import ch.njol.skript.lang.Trigger; import ch.njol.skript.lang.VariableString; import ch.njol.skript.lang.util.SimpleEvent; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.api.events.SimpleDiSkyEvent; -import info.itsthesky.disky.core.Bot; -import info.itsthesky.disky.core.BotOptions; -import info.itsthesky.disky.core.SkriptUtils; -import info.itsthesky.disky.elements.events.bots.BotStopEvent; -import info.itsthesky.disky.elements.events.bots.GuildReadyEvent; -import info.itsthesky.disky.elements.events.bots.ReadyEvent; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.api.events.SimpleDiSkyEvent; +import net.itsthesky.disky.core.Bot; +import net.itsthesky.disky.core.BotOptions; +import net.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.elements.events.bots.BotStopEvent; +import net.itsthesky.disky.elements.events.bots.GuildReadyEvent; +import net.itsthesky.disky.elements.events.bots.ReadyEvent; import net.dv8tion.jda.api.JDA; import net.dv8tion.jda.api.hooks.EventListener; import net.dv8tion.jda.api.requests.GatewayIntent; diff --git a/src/main/java/info/itsthesky/disky/elements/structures/context/ContextCommandManager.java b/src/main/java/net/itsthesky/disky/elements/structures/context/ContextCommandManager.java similarity index 97% rename from src/main/java/info/itsthesky/disky/elements/structures/context/ContextCommandManager.java rename to src/main/java/net/itsthesky/disky/elements/structures/context/ContextCommandManager.java index 1a688ef0..cbba03e1 100644 --- a/src/main/java/info/itsthesky/disky/elements/structures/context/ContextCommandManager.java +++ b/src/main/java/net/itsthesky/disky/elements/structures/context/ContextCommandManager.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.structures.context; +package net.itsthesky.disky.elements.structures.context; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.core.Bot; -import info.itsthesky.disky.elements.sections.handler.DiSkyRuntimeHandler; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.core.Bot; +import net.itsthesky.disky.elements.sections.handler.DiSkyRuntimeHandler; import net.dv8tion.jda.api.events.interaction.command.MessageContextInteractionEvent; import net.dv8tion.jda.api.events.interaction.command.UserContextInteractionEvent; import net.dv8tion.jda.api.hooks.ListenerAdapter; diff --git a/src/main/java/info/itsthesky/disky/elements/structures/context/ParsedContextCommand.java b/src/main/java/net/itsthesky/disky/elements/structures/context/ParsedContextCommand.java similarity index 94% rename from src/main/java/info/itsthesky/disky/elements/structures/context/ParsedContextCommand.java rename to src/main/java/net/itsthesky/disky/elements/structures/context/ParsedContextCommand.java index 0c009a63..469ed657 100644 --- a/src/main/java/info/itsthesky/disky/elements/structures/context/ParsedContextCommand.java +++ b/src/main/java/net/itsthesky/disky/elements/structures/context/ParsedContextCommand.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.structures.context; +package net.itsthesky.disky.elements.structures.context; import ch.njol.skript.lang.Trigger; -import info.itsthesky.disky.elements.events.interactions.MessageCommandEvent; -import info.itsthesky.disky.elements.events.interactions.UserCommandEvent; +import net.itsthesky.disky.elements.events.interactions.MessageCommandEvent; +import net.itsthesky.disky.elements.events.interactions.UserCommandEvent; import net.dv8tion.jda.api.events.interaction.command.MessageContextInteractionEvent; import net.dv8tion.jda.api.events.interaction.command.UserContextInteractionEvent; import net.dv8tion.jda.api.interactions.DiscordLocale; diff --git a/src/main/java/info/itsthesky/disky/elements/structures/context/StructContextCommand.java b/src/main/java/net/itsthesky/disky/elements/structures/context/StructContextCommand.java similarity index 95% rename from src/main/java/info/itsthesky/disky/elements/structures/context/StructContextCommand.java rename to src/main/java/net/itsthesky/disky/elements/structures/context/StructContextCommand.java index 207e170f..59e38cf6 100644 --- a/src/main/java/info/itsthesky/disky/elements/structures/context/StructContextCommand.java +++ b/src/main/java/net/itsthesky/disky/elements/structures/context/StructContextCommand.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.structures.context; +package net.itsthesky.disky.elements.structures.context; import ch.njol.skript.Skript; import ch.njol.skript.config.Node; @@ -6,11 +6,12 @@ import ch.njol.skript.lang.Literal; import ch.njol.skript.lang.SkriptParser; import ch.njol.skript.lang.Trigger; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.core.SkriptUtils; -import info.itsthesky.disky.elements.events.interactions.MessageCommandEvent; -import info.itsthesky.disky.elements.events.interactions.UserCommandEvent; -import info.itsthesky.disky.elements.structures.slash.BotReadyWaiter; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.elements.events.bots.ReadyEvent; +import net.itsthesky.disky.elements.events.interactions.MessageCommandEvent; +import net.itsthesky.disky.elements.events.interactions.UserCommandEvent; +import net.itsthesky.disky.elements.structures.slash.BotReadyWaiter; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.interactions.DiscordLocale; import net.dv8tion.jda.api.interactions.commands.Command; @@ -206,7 +207,7 @@ private boolean parseTrigger() { final Trigger trigger = new Trigger( getParser().getCurrentScript(), "on " + parsedCommand.getType().name().toLowerCase() + " command " + parsedCommand.getName(), - new info.itsthesky.disky.elements.events.bots.ReadyEvent(), + new ReadyEvent(), SkriptUtils.loadCode(sectionNode, eventClass) ); diff --git a/src/main/java/info/itsthesky/disky/elements/structures/slash/BotReadyWaiter.java b/src/main/java/net/itsthesky/disky/elements/structures/slash/BotReadyWaiter.java similarity index 81% rename from src/main/java/info/itsthesky/disky/elements/structures/slash/BotReadyWaiter.java rename to src/main/java/net/itsthesky/disky/elements/structures/slash/BotReadyWaiter.java index 39cdab7a..de74d40a 100644 --- a/src/main/java/info/itsthesky/disky/elements/structures/slash/BotReadyWaiter.java +++ b/src/main/java/net/itsthesky/disky/elements/structures/slash/BotReadyWaiter.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.structures.slash; +package net.itsthesky.disky.elements.structures.slash; -import info.itsthesky.disky.core.Bot; -import info.itsthesky.disky.elements.structures.context.ParsedContextCommand; -import info.itsthesky.disky.elements.structures.slash.models.ParsedCommand; +import net.itsthesky.disky.core.Bot; +import net.itsthesky.disky.elements.structures.context.ParsedContextCommand; +import net.itsthesky.disky.elements.structures.slash.models.ParsedCommand; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/info/itsthesky/disky/elements/structures/slash/SlashManager.java b/src/main/java/net/itsthesky/disky/elements/structures/slash/SlashManager.java similarity index 97% rename from src/main/java/info/itsthesky/disky/elements/structures/slash/SlashManager.java rename to src/main/java/net/itsthesky/disky/elements/structures/slash/SlashManager.java index 7a4049af..2ad596ac 100644 --- a/src/main/java/info/itsthesky/disky/elements/structures/slash/SlashManager.java +++ b/src/main/java/net/itsthesky/disky/elements/structures/slash/SlashManager.java @@ -1,13 +1,6 @@ -package info.itsthesky.disky.elements.structures.slash; +package net.itsthesky.disky.elements.structures.slash; import ch.njol.skript.lang.Trigger; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.core.Bot; -import info.itsthesky.disky.core.SkriptUtils; -import info.itsthesky.disky.elements.events.interactions.SlashCommandReceiveEvent; -import info.itsthesky.disky.elements.events.interactions.SlashCompletionEvent; -import info.itsthesky.disky.elements.structures.slash.elements.OnCooldownEvent; -import info.itsthesky.disky.elements.structures.slash.models.*; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.events.guild.GuildReadyEvent; import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent; @@ -17,6 +10,13 @@ import net.dv8tion.jda.api.hooks.ListenerAdapter; import net.dv8tion.jda.api.interactions.commands.Command; import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.core.Bot; +import net.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.elements.events.interactions.SlashCommandReceiveEvent; +import net.itsthesky.disky.elements.events.interactions.SlashCompletionEvent; +import net.itsthesky.disky.elements.structures.slash.elements.OnCooldownEvent; +import net.itsthesky.disky.elements.structures.slash.models.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/info/itsthesky/disky/elements/structures/slash/StructSlashCommand.java b/src/main/java/net/itsthesky/disky/elements/structures/slash/StructSlashCommand.java similarity index 96% rename from src/main/java/info/itsthesky/disky/elements/structures/slash/StructSlashCommand.java rename to src/main/java/net/itsthesky/disky/elements/structures/slash/StructSlashCommand.java index fc003c23..1947454f 100644 --- a/src/main/java/info/itsthesky/disky/elements/structures/slash/StructSlashCommand.java +++ b/src/main/java/net/itsthesky/disky/elements/structures/slash/StructSlashCommand.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.structures.slash; +package net.itsthesky.disky.elements.structures.slash; import ch.njol.skript.Skript; import ch.njol.skript.config.Node; @@ -8,17 +8,17 @@ import ch.njol.skript.lang.Trigger; import ch.njol.skript.lang.util.SimpleEvent; import ch.njol.skript.util.Timespan; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.api.skript.entries.MutexEntryData; -import info.itsthesky.disky.api.skript.entries.SimpleKeyValueEntries; -import info.itsthesky.disky.core.SkriptUtils; -import info.itsthesky.disky.elements.events.bots.ReadyEvent; -import info.itsthesky.disky.elements.events.interactions.SlashCommandReceiveEvent; -import info.itsthesky.disky.elements.events.interactions.SlashCompletionEvent; -import info.itsthesky.disky.elements.structures.slash.elements.OnCooldownEvent; -import info.itsthesky.disky.elements.structures.slash.models.ParsedArgument; -import info.itsthesky.disky.elements.structures.slash.models.ParsedCommand; -import info.itsthesky.disky.elements.structures.slash.models.SlashCommandInformation; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.api.skript.entries.MutexEntryData; +import net.itsthesky.disky.api.skript.entries.SimpleKeyValueEntries; +import net.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.elements.events.bots.ReadyEvent; +import net.itsthesky.disky.elements.events.interactions.SlashCommandReceiveEvent; +import net.itsthesky.disky.elements.events.interactions.SlashCompletionEvent; +import net.itsthesky.disky.elements.structures.slash.elements.OnCooldownEvent; +import net.itsthesky.disky.elements.structures.slash.models.ParsedArgument; +import net.itsthesky.disky.elements.structures.slash.models.ParsedCommand; +import net.itsthesky.disky.elements.structures.slash.models.SlashCommandInformation; import net.dv8tion.jda.api.JDA; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.interactions.DiscordLocale; diff --git a/src/main/java/info/itsthesky/disky/elements/structures/slash/elements/ExprRemainingTime.java b/src/main/java/net/itsthesky/disky/elements/structures/slash/elements/ExprRemainingTime.java similarity index 89% rename from src/main/java/info/itsthesky/disky/elements/structures/slash/elements/ExprRemainingTime.java rename to src/main/java/net/itsthesky/disky/elements/structures/slash/elements/ExprRemainingTime.java index e3f9332b..60827dde 100644 --- a/src/main/java/info/itsthesky/disky/elements/structures/slash/elements/ExprRemainingTime.java +++ b/src/main/java/net/itsthesky/disky/elements/structures/slash/elements/ExprRemainingTime.java @@ -1,9 +1,9 @@ -package info.itsthesky.disky.elements.structures.slash.elements; +package net.itsthesky.disky.elements.structures.slash.elements; import ch.njol.skript.Skript; import ch.njol.skript.lang.ExpressionType; import ch.njol.skript.util.Timespan; -import info.itsthesky.disky.api.skript.SimpleGetterExpression; +import net.itsthesky.disky.api.skript.SimpleGetterExpression; import org.jetbrains.annotations.NotNull; public class ExprRemainingTime extends SimpleGetterExpression { diff --git a/src/main/java/info/itsthesky/disky/elements/structures/slash/elements/ExprSlashArgument.java b/src/main/java/net/itsthesky/disky/elements/structures/slash/elements/ExprSlashArgument.java similarity index 96% rename from src/main/java/info/itsthesky/disky/elements/structures/slash/elements/ExprSlashArgument.java rename to src/main/java/net/itsthesky/disky/elements/structures/slash/elements/ExprSlashArgument.java index 69999c97..57ef1eee 100644 --- a/src/main/java/info/itsthesky/disky/elements/structures/slash/elements/ExprSlashArgument.java +++ b/src/main/java/net/itsthesky/disky/elements/structures/slash/elements/ExprSlashArgument.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.structures.slash.elements; +package net.itsthesky.disky.elements.structures.slash.elements; import ch.njol.skript.Skript; import ch.njol.skript.classes.ClassInfo; @@ -12,8 +12,8 @@ import ch.njol.skript.util.Utils; import ch.njol.util.Kleenean; import ch.njol.util.StringUtils; -import info.itsthesky.disky.elements.structures.slash.StructSlashCommand; -import info.itsthesky.disky.elements.structures.slash.models.ParsedArgument; +import net.itsthesky.disky.elements.structures.slash.StructSlashCommand; +import net.itsthesky.disky.elements.structures.slash.models.ParsedArgument; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/info/itsthesky/disky/elements/structures/slash/elements/OnCooldownEvent.java b/src/main/java/net/itsthesky/disky/elements/structures/slash/elements/OnCooldownEvent.java similarity index 75% rename from src/main/java/info/itsthesky/disky/elements/structures/slash/elements/OnCooldownEvent.java rename to src/main/java/net/itsthesky/disky/elements/structures/slash/elements/OnCooldownEvent.java index 5dca574a..639b6fe2 100644 --- a/src/main/java/info/itsthesky/disky/elements/structures/slash/elements/OnCooldownEvent.java +++ b/src/main/java/net/itsthesky/disky/elements/structures/slash/elements/OnCooldownEvent.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.elements.structures.slash.elements; +package net.itsthesky.disky.elements.structures.slash.elements; -import info.itsthesky.disky.api.events.specific.InteractionEvent; -import info.itsthesky.disky.api.events.specific.ModalEvent; -import info.itsthesky.disky.elements.events.interactions.SlashCommandReceiveEvent; +import net.itsthesky.disky.api.events.specific.InteractionEvent; +import net.itsthesky.disky.api.events.specific.ModalEvent; +import net.itsthesky.disky.elements.events.interactions.SlashCommandReceiveEvent; import org.bukkit.event.Cancellable; public class OnCooldownEvent extends SlashCommandReceiveEvent { diff --git a/src/main/java/info/itsthesky/disky/elements/structures/slash/models/CommandGroup.java b/src/main/java/net/itsthesky/disky/elements/structures/slash/models/CommandGroup.java similarity index 98% rename from src/main/java/info/itsthesky/disky/elements/structures/slash/models/CommandGroup.java rename to src/main/java/net/itsthesky/disky/elements/structures/slash/models/CommandGroup.java index f6037ea1..8ea3f6d6 100644 --- a/src/main/java/info/itsthesky/disky/elements/structures/slash/models/CommandGroup.java +++ b/src/main/java/net/itsthesky/disky/elements/structures/slash/models/CommandGroup.java @@ -1,6 +1,6 @@ -package info.itsthesky.disky.elements.structures.slash.models; +package net.itsthesky.disky.elements.structures.slash.models; -import info.itsthesky.disky.DiSky; +import net.itsthesky.disky.DiSky; import net.dv8tion.jda.api.interactions.DiscordLocale; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.*; diff --git a/src/main/java/info/itsthesky/disky/elements/structures/slash/models/CommandType.java b/src/main/java/net/itsthesky/disky/elements/structures/slash/models/CommandType.java similarity index 83% rename from src/main/java/info/itsthesky/disky/elements/structures/slash/models/CommandType.java rename to src/main/java/net/itsthesky/disky/elements/structures/slash/models/CommandType.java index 97943315..b101eee2 100644 --- a/src/main/java/info/itsthesky/disky/elements/structures/slash/models/CommandType.java +++ b/src/main/java/net/itsthesky/disky/elements/structures/slash/models/CommandType.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.structures.slash.models; +package net.itsthesky.disky.elements.structures.slash.models; public enum CommandType { /** diff --git a/src/main/java/info/itsthesky/disky/elements/structures/slash/models/ParsedArgument.java b/src/main/java/net/itsthesky/disky/elements/structures/slash/models/ParsedArgument.java similarity index 98% rename from src/main/java/info/itsthesky/disky/elements/structures/slash/models/ParsedArgument.java rename to src/main/java/net/itsthesky/disky/elements/structures/slash/models/ParsedArgument.java index bda50ff7..9cb7bbc7 100644 --- a/src/main/java/info/itsthesky/disky/elements/structures/slash/models/ParsedArgument.java +++ b/src/main/java/net/itsthesky/disky/elements/structures/slash/models/ParsedArgument.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.structures.slash.models; +package net.itsthesky.disky.elements.structures.slash.models; import ch.njol.skript.classes.ClassInfo; import ch.njol.skript.lang.Trigger; diff --git a/src/main/java/info/itsthesky/disky/elements/structures/slash/models/ParsedCommand.java b/src/main/java/net/itsthesky/disky/elements/structures/slash/models/ParsedCommand.java similarity index 96% rename from src/main/java/info/itsthesky/disky/elements/structures/slash/models/ParsedCommand.java rename to src/main/java/net/itsthesky/disky/elements/structures/slash/models/ParsedCommand.java index e67f1691..f04dee5f 100644 --- a/src/main/java/info/itsthesky/disky/elements/structures/slash/models/ParsedCommand.java +++ b/src/main/java/net/itsthesky/disky/elements/structures/slash/models/ParsedCommand.java @@ -1,9 +1,9 @@ -package info.itsthesky.disky.elements.structures.slash.models; +package net.itsthesky.disky.elements.structures.slash.models; import ch.njol.skript.lang.Trigger; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.core.Bot; -import info.itsthesky.disky.core.JDAUtils; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.core.Bot; +import net.itsthesky.disky.core.JDAUtils; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.interactions.DiscordLocale; import net.dv8tion.jda.api.interactions.commands.OptionMapping; diff --git a/src/main/java/info/itsthesky/disky/elements/structures/slash/models/RegisteredCommand.java b/src/main/java/net/itsthesky/disky/elements/structures/slash/models/RegisteredCommand.java similarity index 96% rename from src/main/java/info/itsthesky/disky/elements/structures/slash/models/RegisteredCommand.java rename to src/main/java/net/itsthesky/disky/elements/structures/slash/models/RegisteredCommand.java index ecd9ec80..b50cd7c9 100644 --- a/src/main/java/info/itsthesky/disky/elements/structures/slash/models/RegisteredCommand.java +++ b/src/main/java/net/itsthesky/disky/elements/structures/slash/models/RegisteredCommand.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.structures.slash.models; +package net.itsthesky.disky.elements.structures.slash.models; import net.dv8tion.jda.api.entities.User; diff --git a/src/main/java/info/itsthesky/disky/elements/structures/slash/models/SlashCommandInformation.java b/src/main/java/net/itsthesky/disky/elements/structures/slash/models/SlashCommandInformation.java similarity index 95% rename from src/main/java/info/itsthesky/disky/elements/structures/slash/models/SlashCommandInformation.java rename to src/main/java/net/itsthesky/disky/elements/structures/slash/models/SlashCommandInformation.java index b1e99eed..1b690cb9 100644 --- a/src/main/java/info/itsthesky/disky/elements/structures/slash/models/SlashCommandInformation.java +++ b/src/main/java/net/itsthesky/disky/elements/structures/slash/models/SlashCommandInformation.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.elements.structures.slash.models; +package net.itsthesky.disky.elements.structures.slash.models; import ch.njol.skript.config.Node; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/info/itsthesky/disky/experimental/Case.java b/src/main/java/net/itsthesky/disky/experimental/Case.java similarity index 92% rename from src/main/java/info/itsthesky/disky/experimental/Case.java rename to src/main/java/net/itsthesky/disky/experimental/Case.java index 84c5150c..e485abd9 100644 --- a/src/main/java/info/itsthesky/disky/experimental/Case.java +++ b/src/main/java/net/itsthesky/disky/experimental/Case.java @@ -1,11 +1,11 @@ -package info.itsthesky.disky.experimental; +package net.itsthesky.disky.experimental; import ch.njol.skript.Skript; import ch.njol.skript.config.SectionNode; import ch.njol.skript.lang.*; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.skript.EasyElement; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.core.SkriptUtils; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/info/itsthesky/disky/experimental/Switch.java b/src/main/java/net/itsthesky/disky/experimental/Switch.java similarity index 91% rename from src/main/java/info/itsthesky/disky/experimental/Switch.java rename to src/main/java/net/itsthesky/disky/experimental/Switch.java index cc53cada..0a15d79d 100644 --- a/src/main/java/info/itsthesky/disky/experimental/Switch.java +++ b/src/main/java/net/itsthesky/disky/experimental/Switch.java @@ -1,11 +1,11 @@ -package info.itsthesky.disky.experimental; +package net.itsthesky.disky.experimental; import ch.njol.skript.Skript; import ch.njol.skript.config.SectionNode; import ch.njol.skript.lang.*; import ch.njol.util.Kleenean; -import info.itsthesky.disky.api.skript.EasyElement; -import info.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.api.skript.EasyElement; +import net.itsthesky.disky.core.SkriptUtils; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/info/itsthesky/disky/managers/BotChangers.java b/src/main/java/net/itsthesky/disky/managers/BotChangers.java similarity index 96% rename from src/main/java/info/itsthesky/disky/managers/BotChangers.java rename to src/main/java/net/itsthesky/disky/managers/BotChangers.java index 8c9baf68..b8099082 100644 --- a/src/main/java/info/itsthesky/disky/managers/BotChangers.java +++ b/src/main/java/net/itsthesky/disky/managers/BotChangers.java @@ -1,6 +1,6 @@ -package info.itsthesky.disky.managers; +package net.itsthesky.disky.managers; -import info.itsthesky.disky.core.Bot; +import net.itsthesky.disky.core.Bot; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; diff --git a/src/main/java/info/itsthesky/disky/managers/BotManager.java b/src/main/java/net/itsthesky/disky/managers/BotManager.java similarity index 93% rename from src/main/java/info/itsthesky/disky/managers/BotManager.java rename to src/main/java/net/itsthesky/disky/managers/BotManager.java index 7078e8db..486adf56 100644 --- a/src/main/java/info/itsthesky/disky/managers/BotManager.java +++ b/src/main/java/net/itsthesky/disky/managers/BotManager.java @@ -1,11 +1,11 @@ -package info.itsthesky.disky.managers; +package net.itsthesky.disky.managers; import com.google.common.collect.Sets; -import info.itsthesky.disky.api.skript.ErrorHandler; -import info.itsthesky.disky.core.Bot; -import info.itsthesky.disky.core.MemberRemoveEventListener; -import info.itsthesky.disky.core.ReactionListener; -import info.itsthesky.disky.elements.commands.CommandListener; +import net.itsthesky.disky.api.skript.ErrorHandler; +import net.itsthesky.disky.core.Bot; +import net.itsthesky.disky.core.MemberRemoveEventListener; +import net.itsthesky.disky.core.ReactionListener; +import net.itsthesky.disky.elements.commands.CommandListener; import net.dv8tion.jda.api.JDA; import net.dv8tion.jda.api.events.session.ShutdownEvent; import org.bukkit.plugin.java.JavaPlugin; diff --git a/src/main/java/info/itsthesky/disky/managers/ConfigManager.java b/src/main/java/net/itsthesky/disky/managers/ConfigManager.java similarity index 97% rename from src/main/java/info/itsthesky/disky/managers/ConfigManager.java rename to src/main/java/net/itsthesky/disky/managers/ConfigManager.java index e68db23b..5c221c96 100644 --- a/src/main/java/info/itsthesky/disky/managers/ConfigManager.java +++ b/src/main/java/net/itsthesky/disky/managers/ConfigManager.java @@ -1,6 +1,6 @@ -package info.itsthesky.disky.managers; +package net.itsthesky.disky.managers; -import info.itsthesky.disky.DiSky; +import net.itsthesky.disky.DiSky; import org.bukkit.configuration.file.YamlConfiguration; import java.io.File; diff --git a/src/main/java/info/itsthesky/disky/managers/CoreEventListener.java b/src/main/java/net/itsthesky/disky/managers/CoreEventListener.java similarity index 59% rename from src/main/java/info/itsthesky/disky/managers/CoreEventListener.java rename to src/main/java/net/itsthesky/disky/managers/CoreEventListener.java index 264394ca..8d5c5bdd 100644 --- a/src/main/java/info/itsthesky/disky/managers/CoreEventListener.java +++ b/src/main/java/net/itsthesky/disky/managers/CoreEventListener.java @@ -1,6 +1,6 @@ -package info.itsthesky.disky.managers; +package net.itsthesky.disky.managers; -import info.itsthesky.disky.core.Bot; +import net.itsthesky.disky.core.Bot; import net.dv8tion.jda.api.events.Event; import net.dv8tion.jda.api.events.GenericEvent; import net.dv8tion.jda.api.events.guild.GuildAuditLogEntryCreateEvent; @@ -10,7 +10,7 @@ public class CoreEventListener implements EventListener { - public final static ArrayList> AllRegisteredListeners = new ArrayList<>(); + public final static ArrayList> AllRegisteredListeners = new ArrayList<>(); private final Bot bot; public CoreEventListener(Bot bot) { @@ -22,15 +22,15 @@ public void onEvent(GenericEvent event) { if (event instanceof final GuildAuditLogEntryCreateEvent e) AllRegisteredListeners.forEach(listener -> listener.onGuildAuditLogEntryCreate(e)); - for (final info.itsthesky.disky.api.events.EventListener listener : AllRegisteredListeners) + for (final net.itsthesky.disky.api.events.EventListener listener : AllRegisteredListeners) listener.onGenericEvent(event); } - public static void addListener(info.itsthesky.disky.api.events.EventListener listener) { + public static void addListener(net.itsthesky.disky.api.events.EventListener listener) { AllRegisteredListeners.add(listener); } - public static void removeListener(info.itsthesky.disky.api.events.EventListener listener) { + public static void removeListener(net.itsthesky.disky.api.events.EventListener listener) { AllRegisteredListeners.remove(listener); } diff --git a/src/main/java/info/itsthesky/disky/managers/DiSkyErrorHandler.java b/src/main/java/net/itsthesky/disky/managers/DiSkyErrorHandler.java similarity index 95% rename from src/main/java/info/itsthesky/disky/managers/DiSkyErrorHandler.java rename to src/main/java/net/itsthesky/disky/managers/DiSkyErrorHandler.java index 46bfa8d6..4b036dc2 100644 --- a/src/main/java/info/itsthesky/disky/managers/DiSkyErrorHandler.java +++ b/src/main/java/net/itsthesky/disky/managers/DiSkyErrorHandler.java @@ -1,11 +1,11 @@ -package info.itsthesky.disky.managers; +package net.itsthesky.disky.managers; import ch.njol.skript.config.Node; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.api.skript.ErrorHandler; -import info.itsthesky.disky.core.SkriptUtils; -import info.itsthesky.disky.core.Utils; -import info.itsthesky.disky.elements.events.DiSkyErrorEvent; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.api.skript.ErrorHandler; +import net.itsthesky.disky.core.SkriptUtils; +import net.itsthesky.disky.core.Utils; +import net.itsthesky.disky.elements.events.DiSkyErrorEvent; import net.dv8tion.jda.api.exceptions.ErrorResponseException; import net.dv8tion.jda.api.requests.ErrorResponse; import org.bukkit.Bukkit; diff --git a/src/main/java/info/itsthesky/disky/managers/MessageManager.java b/src/main/java/net/itsthesky/disky/managers/MessageManager.java similarity index 95% rename from src/main/java/info/itsthesky/disky/managers/MessageManager.java rename to src/main/java/net/itsthesky/disky/managers/MessageManager.java index 2b5493fd..b9dc6904 100644 --- a/src/main/java/info/itsthesky/disky/managers/MessageManager.java +++ b/src/main/java/net/itsthesky/disky/managers/MessageManager.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.managers; +package net.itsthesky.disky.managers; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.core.Bot; -import info.itsthesky.disky.managers.wrappers.MessageWrapper; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.core.Bot; +import net.itsthesky.disky.managers.wrappers.MessageWrapper; import net.dv8tion.jda.api.JDA; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.events.message.MessageReceivedEvent; diff --git a/src/main/java/info/itsthesky/disky/managers/WebhooksManager.java b/src/main/java/net/itsthesky/disky/managers/WebhooksManager.java similarity index 89% rename from src/main/java/info/itsthesky/disky/managers/WebhooksManager.java rename to src/main/java/net/itsthesky/disky/managers/WebhooksManager.java index a3950cfd..3e1ff6ee 100644 --- a/src/main/java/info/itsthesky/disky/managers/WebhooksManager.java +++ b/src/main/java/net/itsthesky/disky/managers/WebhooksManager.java @@ -1,8 +1,8 @@ -package info.itsthesky.disky.managers; +package net.itsthesky.disky.managers; -import info.itsthesky.disky.DiSky; -import info.itsthesky.disky.core.Bot; -import info.itsthesky.disky.managers.wrappers.RegisteredWebhook; +import net.itsthesky.disky.DiSky; +import net.itsthesky.disky.core.Bot; +import net.itsthesky.disky.managers.wrappers.RegisteredWebhook; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.WebhookClient; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/info/itsthesky/disky/managers/wrappers/AutoModRuleBuilder.java b/src/main/java/net/itsthesky/disky/managers/wrappers/AutoModRuleBuilder.java similarity index 92% rename from src/main/java/info/itsthesky/disky/managers/wrappers/AutoModRuleBuilder.java rename to src/main/java/net/itsthesky/disky/managers/wrappers/AutoModRuleBuilder.java index 39696d07..5680385f 100644 --- a/src/main/java/info/itsthesky/disky/managers/wrappers/AutoModRuleBuilder.java +++ b/src/main/java/net/itsthesky/disky/managers/wrappers/AutoModRuleBuilder.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.managers.wrappers; +package net.itsthesky.disky.managers.wrappers; import net.dv8tion.jda.api.entities.automod.AutoModResponse; import net.dv8tion.jda.api.entities.automod.build.AutoModRuleData; diff --git a/src/main/java/info/itsthesky/disky/managers/wrappers/MessageWrapper.java b/src/main/java/net/itsthesky/disky/managers/wrappers/MessageWrapper.java similarity index 95% rename from src/main/java/info/itsthesky/disky/managers/wrappers/MessageWrapper.java rename to src/main/java/net/itsthesky/disky/managers/wrappers/MessageWrapper.java index 4a3d8046..5cc6fde4 100644 --- a/src/main/java/info/itsthesky/disky/managers/wrappers/MessageWrapper.java +++ b/src/main/java/net/itsthesky/disky/managers/wrappers/MessageWrapper.java @@ -1,4 +1,4 @@ -package info.itsthesky.disky.managers.wrappers; +package net.itsthesky.disky.managers.wrappers; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.internal.entities.ReceivedMessage; diff --git a/src/main/java/info/itsthesky/disky/managers/wrappers/RegisteredWebhook.java b/src/main/java/net/itsthesky/disky/managers/wrappers/RegisteredWebhook.java similarity index 81% rename from src/main/java/info/itsthesky/disky/managers/wrappers/RegisteredWebhook.java rename to src/main/java/net/itsthesky/disky/managers/wrappers/RegisteredWebhook.java index eeca7b32..b8a7ba60 100644 --- a/src/main/java/info/itsthesky/disky/managers/wrappers/RegisteredWebhook.java +++ b/src/main/java/net/itsthesky/disky/managers/wrappers/RegisteredWebhook.java @@ -1,11 +1,11 @@ -package info.itsthesky.disky.managers.wrappers; +package net.itsthesky.disky.managers.wrappers; -import info.itsthesky.disky.core.Bot; +import net.itsthesky.disky.core.Bot; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.WebhookClient; /** - * Pair a {@link net.dv8tion.jda.api.entities.WebhookClient webhooks client} with a {@link info.itsthesky.disky.core.Bot bot} + * Pair a {@link net.dv8tion.jda.api.entities.WebhookClient webhooks client} with a {@link Bot bot} */ public class RegisteredWebhook { diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 3b4d7de2..82a09748 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ name: DiSky version: '${version}' -main: info.itsthesky.disky.DiSky +main: net.itsthesky.disky.DiSky api-version: 1.13 softdepend: [ Skript ] authors: [ ItsTheSky ] From d21a19aa17f53a0a866929e1a600eff89ed5d22f Mon Sep 17 00:00:00 2001 From: Sky Date: Sat, 18 Jan 2025 21:48:04 +0100 Subject: [PATCH 2/5] =?UTF-8?q?=F0=9F=94=A8=20Refactor=20module=20file=20c?= =?UTF-8?q?hecks=20in=20ModuleManager?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Refactored the conditional checks to improve readability and clarity. Directories are now explicitly skipped before evaluating file extensions, ensuring more precise handling. --- .../java/net/itsthesky/disky/api/modules/ModuleManager.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/itsthesky/disky/api/modules/ModuleManager.java b/src/main/java/net/itsthesky/disky/api/modules/ModuleManager.java index b7361b0d..b669c249 100644 --- a/src/main/java/net/itsthesky/disky/api/modules/ModuleManager.java +++ b/src/main/java/net/itsthesky/disky/api/modules/ModuleManager.java @@ -62,7 +62,10 @@ public void loadModules() throws IOException, ClassNotFoundException, Invocation final File[] modulesFile = this.moduleFolder.listFiles(); assert modulesFile != null; for (final File moduleFile : modulesFile) { - if (moduleFile.isDirectory() || !moduleFile.getName().endsWith(".jar")) { + if (moduleFile.isDirectory()) + continue; // Skip directories + + if (!moduleFile.getName().endsWith(".jar")) { getLogger().warning("Skipping file '"+moduleFile.getPath()+"' as it's not a valid module file."); continue; } From 9f56551c0f65eb6fc5cd539687d4f6052e4e8bb0 Mon Sep 17 00:00:00 2001 From: Sky Date: Sat, 18 Jan 2025 21:52:31 +0100 Subject: [PATCH 3/5] =?UTF-8?q?=F0=9F=94=92=20Add=20validation=20to=20prev?= =?UTF-8?q?ent=20loading=20outdated=20modules?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Modules targeting versions 4.20 or below are now blocked from loading, with clear error messages logged for unsupported modules. This ensures compatibility and directs users to update modules via provided links. --- .../net/itsthesky/disky/api/modules/DiSkyModuleInfo.java | 3 +++ .../java/net/itsthesky/disky/api/modules/ModuleManager.java | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/src/main/java/net/itsthesky/disky/api/modules/DiSkyModuleInfo.java b/src/main/java/net/itsthesky/disky/api/modules/DiSkyModuleInfo.java index 783c80c6..24810259 100644 --- a/src/main/java/net/itsthesky/disky/api/modules/DiSkyModuleInfo.java +++ b/src/main/java/net/itsthesky/disky/api/modules/DiSkyModuleInfo.java @@ -65,6 +65,9 @@ private DiSkyModuleInfo(@NotNull String mainClass, * @return The deserialized module info */ public static DiSkyModuleInfo fromYaml(YamlConfiguration configuration) { + if (!configuration.contains("main")) + return null; // old version, unsupported + return new DiSkyModuleInfo( configuration.getString("main"), configuration.getString("name"), diff --git a/src/main/java/net/itsthesky/disky/api/modules/ModuleManager.java b/src/main/java/net/itsthesky/disky/api/modules/ModuleManager.java index b669c249..b21cf957 100644 --- a/src/main/java/net/itsthesky/disky/api/modules/ModuleManager.java +++ b/src/main/java/net/itsthesky/disky/api/modules/ModuleManager.java @@ -44,6 +44,11 @@ private DiSkyModule loadModule(final File file) throws IOException, ClassNotFoun final YamlConfiguration config = new YamlConfiguration(); config.loadFromString(moduleYml); final DiSkyModuleInfo info = DiSkyModuleInfo.fromYaml(config); + if (info == null) { + getLogger().severe("The module '"+file.getName()+"' was made for an older (4.20 or below) version of DiSky and cannot be loaded."); + getLogger().severe("Please update the module at https://patreon.disky.me/ or on the wiki page (https://disky.me/docs)!"); + return null; + } if (DiSky.getVersion().isSmallerThan(info.requiredMinVersion)) { getLogger().severe("The module '"+info.name+"' v"+info.version+" by '"+info.author+"' requires at least DiSky v"+info.requiredMinVersion+" to work! (You're using v"+DiSky.getVersion()+")"); return null; From 6590c097e225434ac089d4dd2328f4662af78a9d Mon Sep 17 00:00:00 2001 From: Sky Date: Sat, 18 Jan 2025 21:58:02 +0100 Subject: [PATCH 4/5] =?UTF-8?q?=F0=9F=8E=A8=20Update=20package=20structure?= =?UTF-8?q?=20to=20use=20'net'=20convention?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Replaced occurrences of 'info.itsthesky.disky' with 'net.itsthesky.disky' across various classes to align with the updated package naming convention. This standardizes the project structure and improves consistency. --- src/main/java/net/itsthesky/disky/DiSky.java | 2 +- .../net/itsthesky/disky/api/datastruct/DataStructure.java | 2 +- .../net/itsthesky/disky/api/datastruct/EasyDSRegistry.java | 2 +- .../disky/api/skript/reflects/ReflectClassFactory.java | 2 +- .../api/skript/reflects/ReflectEventExpressionFactory.java | 2 +- .../disky/api/skript/reflects/state/SkriptStateRegistry.java | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/net/itsthesky/disky/DiSky.java b/src/main/java/net/itsthesky/disky/DiSky.java index 1aebb3e6..e08d1122 100644 --- a/src/main/java/net/itsthesky/disky/DiSky.java +++ b/src/main/java/net/itsthesky/disky/DiSky.java @@ -130,7 +130,7 @@ public void onEnable() { DynamicElements.registerLogs(); DynamicElements.registerThreadProperties(); - addonInstance.loadClasses("info.itsthesky.disky.elements"); + addonInstance.loadClasses("net.itsthesky.disky.elements"); moduleManager.loadModules(); } catch (IOException e) { errorHandler.exception(null, e); diff --git a/src/main/java/net/itsthesky/disky/api/datastruct/DataStructure.java b/src/main/java/net/itsthesky/disky/api/datastruct/DataStructure.java index f7482fc8..57a4dd46 100644 --- a/src/main/java/net/itsthesky/disky/api/datastruct/DataStructure.java +++ b/src/main/java/net/itsthesky/disky/api/datastruct/DataStructure.java @@ -16,7 +16,7 @@ Class clazz(); /** - * Whether this structure can be made from a {@link info.itsthesky.disky.elements.sections.CreateStructSection create structure section}. + * Whether this structure can be made from a {@link net.itsthesky.disky.elements.sections.CreateStructSection create structure section}. * A data structure may only serve as "sub-data structure" for other structures (like {@link EmbedFieldStructure} for {@link EmbedStructure}). */ boolean canBeCreated() default true; diff --git a/src/main/java/net/itsthesky/disky/api/datastruct/EasyDSRegistry.java b/src/main/java/net/itsthesky/disky/api/datastruct/EasyDSRegistry.java index 261ccdbc..da546f32 100644 --- a/src/main/java/net/itsthesky/disky/api/datastruct/EasyDSRegistry.java +++ b/src/main/java/net/itsthesky/disky/api/datastruct/EasyDSRegistry.java @@ -32,7 +32,7 @@ public static > void registerBasicDataStructure(Class final Class elementClass = new ByteBuddy() .redefine(ReflectBasicDataStructure.class) - .name("info.itsthesky.disky.elements.reflects.ReflectDataStructureElement_" + COUNT.incrementAndGet()) + .name("net.itsthesky.disky.elements.reflects.ReflectDataStructureElement_" + COUNT.incrementAndGet()) .method(named("getReturnType")).intercept(MethodDelegation.to(new ReturnClassMethodInterceptor(returnType))) .method(named("getDataStructClass")).intercept(MethodDelegation.to(new ReturnClassMethodInterceptor(clazz))) diff --git a/src/main/java/net/itsthesky/disky/api/skript/reflects/ReflectClassFactory.java b/src/main/java/net/itsthesky/disky/api/skript/reflects/ReflectClassFactory.java index db3d1568..3a6fcbfc 100644 --- a/src/main/java/net/itsthesky/disky/api/skript/reflects/ReflectClassFactory.java +++ b/src/main/java/net/itsthesky/disky/api/skript/reflects/ReflectClassFactory.java @@ -101,7 +101,7 @@ public static void register(String fromTypeName, final Class elementClass = new ByteBuddy() .redefine(ReflectProperty.class) - .name("info.itsthesky.disky.elements.reflects.ReflectProperty_" + COUNT.incrementAndGet()) + .name("net.itsthesky.disky.elements.reflects.ReflectProperty_" + COUNT.incrementAndGet()) .annotateType(AnnotationDescription.Builder.ofType(Name.class).define("value", documentation.getName()).build()) .annotateType(AnnotationDescription.Builder.ofType(Description.class).defineArray("value", documentation.getDescription()).build()) diff --git a/src/main/java/net/itsthesky/disky/api/skript/reflects/ReflectEventExpressionFactory.java b/src/main/java/net/itsthesky/disky/api/skript/reflects/ReflectEventExpressionFactory.java index 8fd5221d..a4e47722 100644 --- a/src/main/java/net/itsthesky/disky/api/skript/reflects/ReflectEventExpressionFactory.java +++ b/src/main/java/net/itsthesky/disky/api/skript/reflects/ReflectEventExpressionFactory.java @@ -30,7 +30,7 @@ public static void registerEventExpression( final Class elementClass = new ByteBuddy() .redefine(ReflectGetterExpression.class) - .name("info.itsthesky.disky.elements.reflects.ReflectGetterExpression_" + COUNT.incrementAndGet()) + .name("net.itsthesky.disky.elements.reflects.ReflectGetterExpression_" + COUNT.incrementAndGet()) .method(named("convert")).intercept(MethodDelegation.to(new ReflectClassFactory.ConvertMethodInterceptor<>(converter))) .method(named("getPropertyName")).intercept(MethodDelegation.to(new ReflectClassFactory.PropertyNameMethodInterceptor(stripPattern(pattern)))) diff --git a/src/main/java/net/itsthesky/disky/api/skript/reflects/state/SkriptStateRegistry.java b/src/main/java/net/itsthesky/disky/api/skript/reflects/state/SkriptStateRegistry.java index 225f3db2..7ca8690b 100644 --- a/src/main/java/net/itsthesky/disky/api/skript/reflects/state/SkriptStateRegistry.java +++ b/src/main/java/net/itsthesky/disky/api/skript/reflects/state/SkriptStateRegistry.java @@ -46,7 +46,7 @@ public static void register( // Condition final Class conditionClass = new ByteBuddy() .redefine(DiSkyStateCondition.class) - .name("info.itsthesky.disky.api.skript.reflects.state.CondState_" + COUNT.incrementAndGet()) + .name("net.itsthesky.disky.api.skript.reflects.state.CondState_" + COUNT.incrementAndGet()) .method(named("check")).intercept(MethodDelegation.to(new CheckMethod<>(getter))) .method(named("getPropertyName")).intercept(MethodDelegation.to(new PropertyNameMethodInterceptor(stateName + " state"))) @@ -59,7 +59,7 @@ public static void register( // Property final Class propertyClass = new ByteBuddy() .redefine(DiSkyStateProperty.class) - .name("info.itsthesky.disky.api.skript.reflects.state.PropState_" + COUNT.incrementAndGet()) + .name("net.itsthesky.disky.api.skript.reflects.state.PropState_" + COUNT.incrementAndGet()) .method(named("convert")).intercept(MethodDelegation.to(new CheckMethod<>(getter))) .method(named("getPropertyName")).intercept(MethodDelegation.to(new PropertyNameMethodInterceptor(stateName + " state"))) From b049b08b3ee6402e6b1576d68566b7eff95ec85b Mon Sep 17 00:00:00 2001 From: Sky Date: Sat, 18 Jan 2025 22:14:43 +0100 Subject: [PATCH 5/5] =?UTF-8?q?=F0=9F=94=A7=20Add=20validation=20for=20req?= =?UTF-8?q?uired=20fields=20in=20data=20structures?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Introduce a `validateFields` method to ensure that all required fields in a data structure are non-null. Unexpected nodes now raise errors for better debugging and validation clarity. Improved planning and handling of keys during parsing. --- .../api/datastruct/DataStructureFactory.java | 42 +++++++++++++++++-- 1 file changed, 39 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/itsthesky/disky/api/datastruct/DataStructureFactory.java b/src/main/java/net/itsthesky/disky/api/datastruct/DataStructureFactory.java index ca1686a3..9eaa15ef 100644 --- a/src/main/java/net/itsthesky/disky/api/datastruct/DataStructureFactory.java +++ b/src/main/java/net/itsthesky/disky/api/datastruct/DataStructureFactory.java @@ -1,5 +1,6 @@ package net.itsthesky.disky.api.datastruct; +import ch.njol.skript.Skript; import ch.njol.skript.config.Node; import ch.njol.skript.config.SectionNode; import ch.njol.skript.lang.Expression; @@ -43,6 +44,7 @@ public final class DataStructureFactory { * containing all necessary information to create instances. */ public static record DataStructureParseResult( + @NotNull SectionNode relatedNode, @NotNull EntryValidator validator, @NotNull EntryContainer container, @NotNull Map>> expressions, @@ -78,7 +80,7 @@ public static DataStructureParseResult initDataStructure( return null; } - return new DataStructureParseResult(validator, container, expressions, subStructures); + return new DataStructureParseResult(node, validator, container, expressions, subStructures); } /** @@ -91,15 +93,22 @@ public static EntryValidator createValidator(@NotNull Class structClass) { final var validator = EntryValidator.builder(); DiSky.debug("=========== Starting validation of data structure " + structClass.getName() + " ==========="); + final var plannedKeys = new HashSet(); for (final var field : structClass.getDeclaredFields()) { final var entry = field.getAnnotation(DataStructureEntry.class); - if (entry == null) continue; + if (entry == null) + continue; processFieldValidator(validator, field, entry, structClass); + plannedKeys.add(entry.value()); } validator.unexpectedNodeTester(node -> { - DiSky.debug("UNEXPECTED NODE: " + node.getKey()); + final var key = node.getKey().split(":")[0]; + if (plannedKeys.contains(key)) + return false; // all good, it's a sub-structure or entry + + Skript.error("Unexpected node with key '" + key + "' in data structure " + structClass.getSimpleName()); return false; }); @@ -129,11 +138,38 @@ public static Object createDataStructure( final var unhandledNodes = groupUnhandledNodes(container); processFields(structClass, instance, parseResult, event, unhandledNodes); + if (!validateFields(parseResult.relatedNode(), structClass, instance)) + return null; DiSky.debug("################## End of creation of data structure " + structClass.getName() + " ##################"); return finalizeInstance(instance, chainInstance); } + /** + * Validates the fields of a data structure instance. + * This will check the instance's field value for optional and type constraints. + * @param structClass The class of the data structure + * @param instance The instance to validate + */ + private static boolean validateFields(@NotNull Node node, @NotNull Class structClass, @NotNull Object instance) { + for (final var field : structClass.getDeclaredFields()) { + final var entry = field.getAnnotation(DataStructureEntry.class); + if (entry == null) continue; + + final var key = entry.value(); + final var value = ReflectionUtils.getFieldValue(field, instance); + + if (value == null && !entry.optional()) { + DiSkyRuntimeHandler.error(new IllegalStateException( + "Field '" + key + "' in data structure " + structClass.getSimpleName() + " is null/none/empty, but is required!" + ), node, false); + return false; + } + } + + return true; + } + /** * Maps field keys to their corresponding field names. */