From b3a6284e40b58a1d1145962b21ae546902c1868e Mon Sep 17 00:00:00 2001 From: Lee Date: Fri, 27 Dec 2024 13:04:57 +0000 Subject: [PATCH] cleanup --- .../bat/{features => }/afk/AfkFeature.java | 8 +- .../afk/AfkMentionListener.java | 8 +- .../{features => }/afk/AfkReturnListener.java | 8 +- .../afk/command/AfkCommand.java | 14 +- .../afk/profile/AfkProfile.java | 4 +- .../autorole/AutoRoleFeature.java | 8 +- .../autorole/AutoRoleListener.java | 8 +- .../autorole/command/AddSubCommand.java | 12 +- .../autorole/command/AutoRoleCommand.java | 8 +- .../autorole/command/ClearSubCommand.java | 12 +- .../autorole/command/ListSubCommand.java | 12 +- .../autorole/command/RemoveSubCommand.java | 12 +- .../autorole/command/SyncSubCommand.java | 12 +- .../autorole/profile/AutoRoleProfile.java | 4 +- .../bat/{features => }/base/BaseFeature.java | 34 ++-- .../commands/botadmin/BotAdminCommand.java | 10 +- .../premium/PremiumRemoveSubCommand.java | 10 +- .../premium/PremiumSetSubCommand.java | 10 +- .../base/commands/fun/CoinFlipCommand.java | 10 +- .../base/commands/fun/EightBallCommand.java | 12 +- .../base/commands/fun/PPSizeCommand.java | 12 +- .../commands/fun/image/CatSubCommand.java | 12 +- .../commands/fun/image/DogSubCommand.java | 12 +- .../commands/fun/image/DuckSubCommand.java | 12 +- .../commands/fun/image/FoxSubCommand.java | 12 +- .../base/commands/fun/image/ImageCommand.java | 8 +- .../commands/general/BotStatsCommand.java | 12 +- .../base/commands/general/HelpCommand.java | 12 +- .../base/commands/general/InviteCommand.java | 12 +- .../base/commands/general/PingCommand.java | 12 +- .../base/commands/general/VoteCommand.java | 12 +- .../general/avatar/AvatarCommand.java | 8 +- .../general/avatar/GuildSubCommand.java | 12 +- .../general/avatar/UserSubCommand.java | 12 +- .../general/banner/BannerCommand.java | 8 +- .../general/banner/GuildSubCommand.java | 12 +- .../general/banner/UserSubCommand.java | 12 +- .../commands/server/MemberCountCommand.java | 10 +- .../base/commands/server/PremiumCommand.java | 10 +- .../server/channel/ChannelCommand.java | 8 +- .../server/channel/RemoveTopicSubCommand.java | 10 +- .../server/channel/SetTopicSubCommand.java | 10 +- .../server/channel/ViewTopicSubCommand.java | 10 +- .../server/feature/DisableSubCommand.java | 14 +- .../server/feature/EnableSubCommand.java | 14 +- .../server/feature/FeatureCommand.java | 8 +- .../server/feature/ListSubCommand.java | 14 +- .../commands/utility/PastebinCommand.java | 12 +- .../utility/lookup/LookupCommand.java | 8 +- .../utility/lookup/UserSubCommand.java | 10 +- .../birthday/BirthdayFeature.java | 12 +- .../{features => }/birthday/UserBirthday.java | 2 +- .../birthday/command/BirthdayCommand.java | 8 +- .../birthday/command/ChannelSubCommand.java | 12 +- .../birthday/command/MessageSubCommand.java | 12 +- .../birthday/command/PrivateSubCommand.java | 14 +- .../birthday/command/RemoveSubCommand.java | 12 +- .../birthday/command/SetSubCommand.java | 14 +- .../birthday/command/ViewSubCommand.java | 14 +- .../birthday/profile/BirthdayProfile.java | 6 +- .../cc/fascinated/bat/common/MemberUtils.java | 4 +- .../cc/fascinated/bat/common/PasteUtils.java | 2 +- .../cc/fascinated/bat/common/RoleUtils.java | 2 +- .../beatsaber/leaderboard/Leaderboard.java | 22 --- .../leaderboard/LeaderboardCurvePoint.java | 10 -- .../impl/ScoreSaberLeaderboard.java | 167 ------------------ .../bat/{ => common}/command/BatCommand.java | 8 +- .../bat/{ => common}/command/Category.java | 2 +- .../bat/{ => common}/command/CommandInfo.java | 2 +- .../command/InternalCommandInfo.java | 2 +- .../{features => common/feature}/Feature.java | 4 +- .../feature}/FeatureProfile.java | 2 +- .../bat/{ => common}/model/BatGuild.java | 22 +-- .../bat/{ => common}/model/BatUser.java | 4 +- .../{ => common}/model/DiscordMessage.java | 2 +- .../scoresaber/ScoreSaberAccountToken.java | 2 +- .../ScoreSaberLeaderboardToken.java | 2 +- .../ScoreSaberPageMetadataToken.java | 2 +- .../ScoreSaberPlayerScoreToken.java | 2 +- .../scoresaber/ScoreSaberScoreToken.java | 2 +- .../scoresaber/ScoreSaberScoresPageToken.java | 2 +- .../model/token/dogceo/RandomImage.java | 2 +- .../model/token/paste/PasteUploadToken.java | 2 +- .../model/token/randomd/RandomDuck.java | 2 +- .../model/token/randomfox/RandomFoxToken.java | 2 +- .../model/token/thecatapi/CatImageToken.java | 2 +- .../counter/CounterChannel.java | 2 +- .../counter/CounterFeature.java | 8 +- .../counter/CounterProfile.java | 2 +- .../{features => }/counter/CounterResult.java | 2 +- .../counter/CountingListener.java | 8 +- .../counter/command/CounterCommand.java | 6 +- .../counter/command/RemoveSubCommand.java | 14 +- .../command/SetBreakingSubCommand.java | 14 +- .../counter/command/SetSubCommand.java | 14 +- .../counter/command/SetupSubCommand.java | 12 +- .../fascinated/bat/event/EventListener.java | 12 +- .../bat/features/drag/DragFeature.java | 23 --- .../bat/features/drag/DragRequest.java | 48 ----- .../features/drag/command/DragCommand.java | 21 --- .../drag/command/RequestSubCommand.java | 151 ---------------- .../listeners/request/RequestListener.java | 49 ----- .../request/TargetChannelListener.java | 63 ------- .../leveling/LevelingFeature.java | 8 +- .../leveling/LevelingListener.java | 6 +- .../leveling/LevelingProfile.java | 2 +- .../{features => }/leveling/UserLevel.java | 2 +- .../leveling/command/ChannelSubCommand.java | 12 +- .../leveling/command/CurrentSubCommand.java | 16 +- .../leveling/command/LevelingCommand.java | 6 +- .../leveling/command/ResetSubCommand.java | 14 +- .../{features => }/logging/LogCategory.java | 2 +- .../{features => }/logging/LogFeature.java | 12 +- .../{features => }/logging/LogProfile.java | 2 +- .../bat/{features => }/logging/LogType.java | 2 +- .../logging/command/ListSubCommand.java | 16 +- .../logging/command/LogsCommand.java | 8 +- .../logging/command/RemoveSubCommand.java | 16 +- .../logging/command/SetSubCommand.java | 16 +- .../logging/listeners/ChannelListener.java | 12 +- .../logging/listeners/EmojiListener.java | 8 +- .../logging/listeners/GuildListener.java | 10 +- .../logging/listeners/MemberListener.java | 10 +- .../logging/listeners/MessageListener.java | 12 +- .../logging/listeners/RoleListener.java | 8 +- .../logging/listeners/StickerListener.java | 8 +- .../messagesnipe/MessageSnipeFeature.java | 14 +- .../messagesnipe/SnipedMessage.java | 2 +- .../messagesnipe/command/ClearSubCommand.java | 12 +- .../command/DeletedSubCommand.java | 14 +- .../command/MessageSnipeCommand.java | 8 +- .../moderation/ModerationFeature.java | 16 +- .../moderation/command/BanCommand.java | 14 +- .../moderation/command/KickCommand.java | 14 +- .../moderation/command/MuteCommand.java | 14 +- .../command/PunishHistoryCommand.java | 14 +- .../moderation/command/PurgeCommand.java | 16 +- .../moderation/command/UnbanCommand.java | 16 +- .../moderation/command/UnmuteCommand.java | 16 +- .../moderation/command/WarnCommand.java | 14 +- .../moderation/punish/Punishment.java | 2 +- .../moderation/punish/PunishmentProfile.java | 10 +- .../moderation/punish/PunishmentType.java | 2 +- .../namehistory/NameHistoryFeature.java | 8 +- .../namehistory/NameHistoryListener.java | 10 +- .../namehistory/TrackedName.java | 2 +- .../namehistory/command/GuildSubCommand.java | 14 +- .../command/NameHistoryCommand.java | 8 +- .../namehistory/command/UserSubCommand.java | 14 +- .../profile/guild/NameHistoryProfile.java | 8 +- .../profile/user/NameHistoryProfile.java | 6 +- .../bat/{features => }/reminder/Reminder.java | 2 +- .../reminder/ReminderFeature.java | 10 +- .../reminder/ReminderProfile.java | 2 +- .../reminder/command/ClearSubCommand.java | 12 +- .../reminder/command/ListSubCommand.java | 14 +- .../reminder/command/ReminderCommand.java | 8 +- .../reminder/command/SetSubCommand.java | 16 +- .../repository/DiscordMessageRepository.java | 2 +- .../bat/service/CommandService.java | 10 +- .../bat/service/DiscordMessageService.java | 6 +- .../fascinated/bat/service/EventService.java | 6 +- .../bat/service/FeatureService.java | 4 +- .../fascinated/bat/service/GuildService.java | 10 +- .../fascinated/bat/service/UserService.java | 4 +- .../statschannel/StatsChannel.java | 2 +- .../statschannel/StatsChannelFeature.java | 10 +- .../statschannel/StatsChannelProfile.java | 4 +- .../statschannel/StatsPlaceholders.java | 4 +- .../statschannel/command/AddSubCommand.java | 12 +- .../command/CurrentSubCommand.java | 16 +- .../command/RemoveSubCommand.java | 12 +- .../command/StatsChannelCommand.java | 6 +- .../welcomer/WelcomerEmbed.java | 2 +- .../welcomer/WelcomerFeature.java | 8 +- .../welcomer/WelcomerListener.java | 6 +- .../welcomer/WelcomerMessage.java | 2 +- .../welcomer/WelcomerPlaceholders.java | 6 +- .../welcomer/WelcomerProfile.java | 6 +- .../welcomer/command/ChannelSubCommand.java | 12 +- .../welcomer/command/CurrentSubCommand.java | 14 +- .../welcomer/command/EmbedSubCommand.java | 12 +- .../welcomer/command/MessageSubCommand.java | 14 +- .../welcomer/command/ResetSubCommand.java | 12 +- .../welcomer/command/WelcomerCommand.java | 8 +- 185 files changed, 787 insertions(+), 1341 deletions(-) rename src/main/java/cc/fascinated/bat/{features => }/afk/AfkFeature.java (73%) rename src/main/java/cc/fascinated/bat/{features => }/afk/AfkMentionListener.java (85%) rename src/main/java/cc/fascinated/bat/{features => }/afk/AfkReturnListener.java (81%) rename src/main/java/cc/fascinated/bat/{features => }/afk/command/AfkCommand.java (86%) rename src/main/java/cc/fascinated/bat/{features => }/afk/profile/AfkProfile.java (97%) rename src/main/java/cc/fascinated/bat/{features => }/autorole/AutoRoleFeature.java (75%) rename src/main/java/cc/fascinated/bat/{features => }/autorole/AutoRoleListener.java (91%) rename src/main/java/cc/fascinated/bat/{features => }/autorole/command/AddSubCommand.java (91%) rename src/main/java/cc/fascinated/bat/{features => }/autorole/command/AutoRoleCommand.java (81%) rename src/main/java/cc/fascinated/bat/{features => }/autorole/command/ClearSubCommand.java (77%) rename src/main/java/cc/fascinated/bat/{features => }/autorole/command/ListSubCommand.java (84%) rename src/main/java/cc/fascinated/bat/{features => }/autorole/command/RemoveSubCommand.java (86%) rename src/main/java/cc/fascinated/bat/{features => }/autorole/command/SyncSubCommand.java (94%) rename src/main/java/cc/fascinated/bat/{features => }/autorole/profile/AutoRoleProfile.java (96%) rename src/main/java/cc/fascinated/bat/{features => }/base/BaseFeature.java (64%) rename src/main/java/cc/fascinated/bat/{features => }/base/commands/botadmin/BotAdminCommand.java (66%) rename src/main/java/cc/fascinated/bat/{features => }/base/commands/botadmin/premium/PremiumRemoveSubCommand.java (89%) rename src/main/java/cc/fascinated/bat/{features => }/base/commands/botadmin/premium/PremiumSetSubCommand.java (91%) rename src/main/java/cc/fascinated/bat/{features => }/base/commands/fun/CoinFlipCommand.java (81%) rename src/main/java/cc/fascinated/bat/{features => }/base/commands/fun/EightBallCommand.java (89%) rename src/main/java/cc/fascinated/bat/{features => }/base/commands/fun/PPSizeCommand.java (87%) rename src/main/java/cc/fascinated/bat/{features => }/base/commands/fun/image/CatSubCommand.java (79%) rename src/main/java/cc/fascinated/bat/{features => }/base/commands/fun/image/DogSubCommand.java (79%) rename src/main/java/cc/fascinated/bat/{features => }/base/commands/fun/image/DuckSubCommand.java (79%) rename src/main/java/cc/fascinated/bat/{features => }/base/commands/fun/image/FoxSubCommand.java (79%) rename src/main/java/cc/fascinated/bat/{features => }/base/commands/fun/image/ImageCommand.java (78%) rename src/main/java/cc/fascinated/bat/{features => }/base/commands/general/BotStatsCommand.java (90%) rename src/main/java/cc/fascinated/bat/{features => }/base/commands/general/HelpCommand.java (94%) rename src/main/java/cc/fascinated/bat/{features => }/base/commands/general/InviteCommand.java (78%) rename src/main/java/cc/fascinated/bat/{features => }/base/commands/general/PingCommand.java (80%) rename src/main/java/cc/fascinated/bat/{features => }/base/commands/general/VoteCommand.java (82%) rename src/main/java/cc/fascinated/bat/{features => }/base/commands/general/avatar/AvatarCommand.java (75%) rename src/main/java/cc/fascinated/bat/{features => }/base/commands/general/avatar/GuildSubCommand.java (82%) rename src/main/java/cc/fascinated/bat/{features => }/base/commands/general/avatar/UserSubCommand.java (83%) rename src/main/java/cc/fascinated/bat/{features => }/base/commands/general/banner/BannerCommand.java (75%) rename src/main/java/cc/fascinated/bat/{features => }/base/commands/general/banner/GuildSubCommand.java (81%) rename src/main/java/cc/fascinated/bat/{features => }/base/commands/general/banner/UserSubCommand.java (86%) rename src/main/java/cc/fascinated/bat/{features => }/base/commands/server/MemberCountCommand.java (87%) rename src/main/java/cc/fascinated/bat/{features => }/base/commands/server/PremiumCommand.java (86%) rename src/main/java/cc/fascinated/bat/{features => }/base/commands/server/channel/ChannelCommand.java (77%) rename src/main/java/cc/fascinated/bat/{features => }/base/commands/server/channel/RemoveTopicSubCommand.java (89%) rename src/main/java/cc/fascinated/bat/{features => }/base/commands/server/channel/SetTopicSubCommand.java (90%) rename src/main/java/cc/fascinated/bat/{features => }/base/commands/server/channel/ViewTopicSubCommand.java (89%) rename src/main/java/cc/fascinated/bat/{features => }/base/commands/server/feature/DisableSubCommand.java (87%) rename src/main/java/cc/fascinated/bat/{features => }/base/commands/server/feature/EnableSubCommand.java (87%) rename src/main/java/cc/fascinated/bat/{features => }/base/commands/server/feature/FeatureCommand.java (78%) rename src/main/java/cc/fascinated/bat/{features => }/base/commands/server/feature/ListSubCommand.java (79%) rename src/main/java/cc/fascinated/bat/{features => }/base/commands/utility/PastebinCommand.java (86%) rename src/main/java/cc/fascinated/bat/{features => }/base/commands/utility/lookup/LookupCommand.java (75%) rename src/main/java/cc/fascinated/bat/{features => }/base/commands/utility/lookup/UserSubCommand.java (93%) rename src/main/java/cc/fascinated/bat/{features => }/birthday/BirthdayFeature.java (82%) rename src/main/java/cc/fascinated/bat/{features => }/birthday/UserBirthday.java (97%) rename src/main/java/cc/fascinated/bat/{features => }/birthday/command/BirthdayCommand.java (81%) rename src/main/java/cc/fascinated/bat/{features => }/birthday/command/ChannelSubCommand.java (90%) rename src/main/java/cc/fascinated/bat/{features => }/birthday/command/MessageSubCommand.java (88%) rename src/main/java/cc/fascinated/bat/{features => }/birthday/command/PrivateSubCommand.java (85%) rename src/main/java/cc/fascinated/bat/{features => }/birthday/command/RemoveSubCommand.java (77%) rename src/main/java/cc/fascinated/bat/{features => }/birthday/command/SetSubCommand.java (90%) rename src/main/java/cc/fascinated/bat/{features => }/birthday/command/ViewSubCommand.java (89%) rename src/main/java/cc/fascinated/bat/{features => }/birthday/profile/BirthdayProfile.java (97%) delete mode 100644 src/main/java/cc/fascinated/bat/common/beatsaber/leaderboard/Leaderboard.java delete mode 100644 src/main/java/cc/fascinated/bat/common/beatsaber/leaderboard/LeaderboardCurvePoint.java delete mode 100644 src/main/java/cc/fascinated/bat/common/beatsaber/leaderboard/impl/ScoreSaberLeaderboard.java rename src/main/java/cc/fascinated/bat/{ => common}/command/BatCommand.java (97%) rename src/main/java/cc/fascinated/bat/{ => common}/command/Category.java (97%) rename src/main/java/cc/fascinated/bat/{ => common}/command/CommandInfo.java (97%) rename src/main/java/cc/fascinated/bat/{ => common}/command/InternalCommandInfo.java (97%) rename src/main/java/cc/fascinated/bat/{features => common/feature}/Feature.java (92%) rename src/main/java/cc/fascinated/bat/{features => common/feature}/FeatureProfile.java (98%) rename src/main/java/cc/fascinated/bat/{ => common}/model/BatGuild.java (88%) rename src/main/java/cc/fascinated/bat/{ => common}/model/BatUser.java (96%) rename src/main/java/cc/fascinated/bat/{ => common}/model/DiscordMessage.java (97%) rename src/main/java/cc/fascinated/bat/{ => common}/model/token/beatsaber/scoresaber/ScoreSaberAccountToken.java (97%) rename src/main/java/cc/fascinated/bat/{ => common}/model/token/beatsaber/scoresaber/ScoreSaberLeaderboardToken.java (97%) rename src/main/java/cc/fascinated/bat/{ => common}/model/token/beatsaber/scoresaber/ScoreSaberPageMetadataToken.java (83%) rename src/main/java/cc/fascinated/bat/{ => common}/model/token/beatsaber/scoresaber/ScoreSaberPlayerScoreToken.java (82%) rename src/main/java/cc/fascinated/bat/{ => common}/model/token/beatsaber/scoresaber/ScoreSaberScoreToken.java (97%) rename src/main/java/cc/fascinated/bat/{ => common}/model/token/beatsaber/scoresaber/ScoreSaberScoresPageToken.java (83%) rename src/main/java/cc/fascinated/bat/{ => common}/model/token/dogceo/RandomImage.java (85%) rename src/main/java/cc/fascinated/bat/{ => common}/model/token/paste/PasteUploadToken.java (86%) rename src/main/java/cc/fascinated/bat/{ => common}/model/token/randomd/RandomDuck.java (76%) rename src/main/java/cc/fascinated/bat/{ => common}/model/token/randomfox/RandomFoxToken.java (84%) rename src/main/java/cc/fascinated/bat/{ => common}/model/token/thecatapi/CatImageToken.java (88%) rename src/main/java/cc/fascinated/bat/{features => }/counter/CounterChannel.java (97%) rename src/main/java/cc/fascinated/bat/{features => }/counter/CounterFeature.java (75%) rename src/main/java/cc/fascinated/bat/{features => }/counter/CounterProfile.java (98%) rename src/main/java/cc/fascinated/bat/{features => }/counter/CounterResult.java (73%) rename src/main/java/cc/fascinated/bat/{features => }/counter/CountingListener.java (90%) rename src/main/java/cc/fascinated/bat/{features => }/counter/command/CounterCommand.java (84%) rename src/main/java/cc/fascinated/bat/{features => }/counter/command/RemoveSubCommand.java (90%) rename src/main/java/cc/fascinated/bat/{features => }/counter/command/SetBreakingSubCommand.java (91%) rename src/main/java/cc/fascinated/bat/{features => }/counter/command/SetSubCommand.java (90%) rename src/main/java/cc/fascinated/bat/{features => }/counter/command/SetupSubCommand.java (90%) delete mode 100644 src/main/java/cc/fascinated/bat/features/drag/DragFeature.java delete mode 100644 src/main/java/cc/fascinated/bat/features/drag/DragRequest.java delete mode 100644 src/main/java/cc/fascinated/bat/features/drag/command/DragCommand.java delete mode 100644 src/main/java/cc/fascinated/bat/features/drag/command/RequestSubCommand.java delete mode 100644 src/main/java/cc/fascinated/bat/features/drag/listeners/request/RequestListener.java delete mode 100644 src/main/java/cc/fascinated/bat/features/drag/listeners/request/TargetChannelListener.java rename src/main/java/cc/fascinated/bat/{features => }/leveling/LevelingFeature.java (87%) rename src/main/java/cc/fascinated/bat/{features => }/leveling/LevelingListener.java (92%) rename src/main/java/cc/fascinated/bat/{features => }/leveling/LevelingProfile.java (97%) rename src/main/java/cc/fascinated/bat/{features => }/leveling/UserLevel.java (97%) rename src/main/java/cc/fascinated/bat/{features => }/leveling/command/ChannelSubCommand.java (87%) rename src/main/java/cc/fascinated/bat/{features => }/leveling/command/CurrentSubCommand.java (86%) rename src/main/java/cc/fascinated/bat/{features => }/leveling/command/LevelingCommand.java (82%) rename src/main/java/cc/fascinated/bat/{features => }/leveling/command/ResetSubCommand.java (83%) rename src/main/java/cc/fascinated/bat/{features => }/logging/LogCategory.java (96%) rename src/main/java/cc/fascinated/bat/{features => }/logging/LogFeature.java (92%) rename src/main/java/cc/fascinated/bat/{features => }/logging/LogProfile.java (98%) rename src/main/java/cc/fascinated/bat/{features => }/logging/LogType.java (98%) rename src/main/java/cc/fascinated/bat/{features => }/logging/command/ListSubCommand.java (90%) rename src/main/java/cc/fascinated/bat/{features => }/logging/command/LogsCommand.java (79%) rename src/main/java/cc/fascinated/bat/{features => }/logging/command/RemoveSubCommand.java (91%) rename src/main/java/cc/fascinated/bat/{features => }/logging/command/SetSubCommand.java (92%) rename src/main/java/cc/fascinated/bat/{features => }/logging/listeners/ChannelListener.java (98%) rename src/main/java/cc/fascinated/bat/{features => }/logging/listeners/EmojiListener.java (93%) rename src/main/java/cc/fascinated/bat/{features => }/logging/listeners/GuildListener.java (98%) rename src/main/java/cc/fascinated/bat/{features => }/logging/listeners/MemberListener.java (98%) rename src/main/java/cc/fascinated/bat/{features => }/logging/listeners/MessageListener.java (91%) rename src/main/java/cc/fascinated/bat/{features => }/logging/listeners/RoleListener.java (97%) rename src/main/java/cc/fascinated/bat/{features => }/logging/listeners/StickerListener.java (93%) rename src/main/java/cc/fascinated/bat/{features => }/messagesnipe/MessageSnipeFeature.java (93%) rename src/main/java/cc/fascinated/bat/{features => }/messagesnipe/SnipedMessage.java (89%) rename src/main/java/cc/fascinated/bat/{features => }/messagesnipe/command/ClearSubCommand.java (81%) rename src/main/java/cc/fascinated/bat/{features => }/messagesnipe/command/DeletedSubCommand.java (84%) rename src/main/java/cc/fascinated/bat/{features => }/messagesnipe/command/MessageSnipeCommand.java (74%) rename src/main/java/cc/fascinated/bat/{features => }/moderation/ModerationFeature.java (91%) rename src/main/java/cc/fascinated/bat/{features => }/moderation/command/BanCommand.java (89%) rename src/main/java/cc/fascinated/bat/{features => }/moderation/command/KickCommand.java (87%) rename src/main/java/cc/fascinated/bat/{features => }/moderation/command/MuteCommand.java (89%) rename src/main/java/cc/fascinated/bat/{features => }/moderation/command/PunishHistoryCommand.java (90%) rename src/main/java/cc/fascinated/bat/{features => }/moderation/command/PurgeCommand.java (91%) rename src/main/java/cc/fascinated/bat/{features => }/moderation/command/UnbanCommand.java (86%) rename src/main/java/cc/fascinated/bat/{features => }/moderation/command/UnmuteCommand.java (86%) rename src/main/java/cc/fascinated/bat/{features => }/moderation/command/WarnCommand.java (87%) rename src/main/java/cc/fascinated/bat/{features => }/moderation/punish/Punishment.java (93%) rename src/main/java/cc/fascinated/bat/{features => }/moderation/punish/PunishmentProfile.java (98%) rename src/main/java/cc/fascinated/bat/{features => }/moderation/punish/PunishmentType.java (86%) rename src/main/java/cc/fascinated/bat/{features => }/namehistory/NameHistoryFeature.java (76%) rename src/main/java/cc/fascinated/bat/{features => }/namehistory/NameHistoryListener.java (83%) rename src/main/java/cc/fascinated/bat/{features => }/namehistory/TrackedName.java (94%) rename src/main/java/cc/fascinated/bat/{features => }/namehistory/command/GuildSubCommand.java (87%) rename src/main/java/cc/fascinated/bat/{features => }/namehistory/command/NameHistoryCommand.java (76%) rename src/main/java/cc/fascinated/bat/{features => }/namehistory/command/UserSubCommand.java (86%) rename src/main/java/cc/fascinated/bat/{features => }/namehistory/profile/guild/NameHistoryProfile.java (93%) rename src/main/java/cc/fascinated/bat/{features => }/namehistory/profile/user/NameHistoryProfile.java (94%) rename src/main/java/cc/fascinated/bat/{features => }/reminder/Reminder.java (95%) rename src/main/java/cc/fascinated/bat/{features => }/reminder/ReminderFeature.java (92%) rename src/main/java/cc/fascinated/bat/{features => }/reminder/ReminderProfile.java (98%) rename src/main/java/cc/fascinated/bat/{features => }/reminder/command/ClearSubCommand.java (82%) rename src/main/java/cc/fascinated/bat/{features => }/reminder/command/ListSubCommand.java (83%) rename src/main/java/cc/fascinated/bat/{features => }/reminder/command/ReminderCommand.java (77%) rename src/main/java/cc/fascinated/bat/{features => }/reminder/command/SetSubCommand.java (89%) rename src/main/java/cc/fascinated/bat/{features => }/statschannel/StatsChannel.java (90%) rename src/main/java/cc/fascinated/bat/{features => }/statschannel/StatsChannelFeature.java (90%) rename src/main/java/cc/fascinated/bat/{features => }/statschannel/StatsChannelProfile.java (97%) rename src/main/java/cc/fascinated/bat/{features => }/statschannel/StatsPlaceholders.java (96%) rename src/main/java/cc/fascinated/bat/{features => }/statschannel/command/AddSubCommand.java (90%) rename src/main/java/cc/fascinated/bat/{features => }/statschannel/command/CurrentSubCommand.java (80%) rename src/main/java/cc/fascinated/bat/{features => }/statschannel/command/RemoveSubCommand.java (89%) rename src/main/java/cc/fascinated/bat/{features => }/statschannel/command/StatsChannelCommand.java (84%) rename src/main/java/cc/fascinated/bat/{features => }/welcomer/WelcomerEmbed.java (96%) rename src/main/java/cc/fascinated/bat/{features => }/welcomer/WelcomerFeature.java (75%) rename src/main/java/cc/fascinated/bat/{features => }/welcomer/WelcomerListener.java (87%) rename src/main/java/cc/fascinated/bat/{features => }/welcomer/WelcomerMessage.java (92%) rename src/main/java/cc/fascinated/bat/{features => }/welcomer/WelcomerPlaceholders.java (94%) rename src/main/java/cc/fascinated/bat/{features => }/welcomer/WelcomerProfile.java (97%) rename src/main/java/cc/fascinated/bat/{features => }/welcomer/command/ChannelSubCommand.java (85%) rename src/main/java/cc/fascinated/bat/{features => }/welcomer/command/CurrentSubCommand.java (87%) rename src/main/java/cc/fascinated/bat/{features => }/welcomer/command/EmbedSubCommand.java (94%) rename src/main/java/cc/fascinated/bat/{features => }/welcomer/command/MessageSubCommand.java (86%) rename src/main/java/cc/fascinated/bat/{features => }/welcomer/command/ResetSubCommand.java (81%) rename src/main/java/cc/fascinated/bat/{features => }/welcomer/command/WelcomerCommand.java (82%) diff --git a/src/main/java/cc/fascinated/bat/features/afk/AfkFeature.java b/src/main/java/cc/fascinated/bat/afk/AfkFeature.java similarity index 73% rename from src/main/java/cc/fascinated/bat/features/afk/AfkFeature.java rename to src/main/java/cc/fascinated/bat/afk/AfkFeature.java index beeb634..7187e5f 100644 --- a/src/main/java/cc/fascinated/bat/features/afk/AfkFeature.java +++ b/src/main/java/cc/fascinated/bat/afk/AfkFeature.java @@ -1,8 +1,8 @@ -package cc.fascinated.bat.features.afk; +package cc.fascinated.bat.afk; -import cc.fascinated.bat.features.Feature; -import cc.fascinated.bat.features.FeatureProfile; -import cc.fascinated.bat.features.afk.command.AfkCommand; +import cc.fascinated.bat.common.feature.Feature; +import cc.fascinated.bat.common.feature.FeatureProfile; +import cc.fascinated.bat.afk.command.AfkCommand; import cc.fascinated.bat.service.CommandService; import lombok.NonNull; import org.springframework.context.ApplicationContext; diff --git a/src/main/java/cc/fascinated/bat/features/afk/AfkMentionListener.java b/src/main/java/cc/fascinated/bat/afk/AfkMentionListener.java similarity index 85% rename from src/main/java/cc/fascinated/bat/features/afk/AfkMentionListener.java rename to src/main/java/cc/fascinated/bat/afk/AfkMentionListener.java index 9716696..3d04443 100644 --- a/src/main/java/cc/fascinated/bat/features/afk/AfkMentionListener.java +++ b/src/main/java/cc/fascinated/bat/afk/AfkMentionListener.java @@ -1,9 +1,9 @@ -package cc.fascinated.bat.features.afk; +package cc.fascinated.bat.afk; import cc.fascinated.bat.event.EventListener; -import cc.fascinated.bat.features.afk.profile.AfkProfile; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.afk.profile.AfkProfile; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import lombok.NonNull; import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.User; diff --git a/src/main/java/cc/fascinated/bat/features/afk/AfkReturnListener.java b/src/main/java/cc/fascinated/bat/afk/AfkReturnListener.java similarity index 81% rename from src/main/java/cc/fascinated/bat/features/afk/AfkReturnListener.java rename to src/main/java/cc/fascinated/bat/afk/AfkReturnListener.java index c23a3c7..01a6ec1 100644 --- a/src/main/java/cc/fascinated/bat/features/afk/AfkReturnListener.java +++ b/src/main/java/cc/fascinated/bat/afk/AfkReturnListener.java @@ -1,9 +1,9 @@ -package cc.fascinated.bat.features.afk; +package cc.fascinated.bat.afk; import cc.fascinated.bat.event.EventListener; -import cc.fascinated.bat.features.afk.profile.AfkProfile; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.afk.profile.AfkProfile; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import lombok.NonNull; import net.dv8tion.jda.api.events.message.MessageReceivedEvent; import org.springframework.stereotype.Component; diff --git a/src/main/java/cc/fascinated/bat/features/afk/command/AfkCommand.java b/src/main/java/cc/fascinated/bat/afk/command/AfkCommand.java similarity index 86% rename from src/main/java/cc/fascinated/bat/features/afk/command/AfkCommand.java rename to src/main/java/cc/fascinated/bat/afk/command/AfkCommand.java index 5b743fb..cb926ec 100644 --- a/src/main/java/cc/fascinated/bat/features/afk/command/AfkCommand.java +++ b/src/main/java/cc/fascinated/bat/afk/command/AfkCommand.java @@ -1,12 +1,12 @@ -package cc.fascinated.bat.features.afk.command; +package cc.fascinated.bat.afk.command; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.Category; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.Category; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.MemberUtils; -import cc.fascinated.bat.features.afk.profile.AfkProfile; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.afk.profile.AfkProfile; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import lombok.NonNull; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; diff --git a/src/main/java/cc/fascinated/bat/features/afk/profile/AfkProfile.java b/src/main/java/cc/fascinated/bat/afk/profile/AfkProfile.java similarity index 97% rename from src/main/java/cc/fascinated/bat/features/afk/profile/AfkProfile.java rename to src/main/java/cc/fascinated/bat/afk/profile/AfkProfile.java index d8fafdc..c89f844 100644 --- a/src/main/java/cc/fascinated/bat/features/afk/profile/AfkProfile.java +++ b/src/main/java/cc/fascinated/bat/afk/profile/AfkProfile.java @@ -1,7 +1,7 @@ -package cc.fascinated.bat.features.afk.profile; +package cc.fascinated.bat.afk.profile; import cc.fascinated.bat.common.Serializable; -import cc.fascinated.bat.model.BatGuild; +import cc.fascinated.bat.common.model.BatGuild; import com.google.gson.Gson; import lombok.NoArgsConstructor; import net.dv8tion.jda.api.entities.Guild; diff --git a/src/main/java/cc/fascinated/bat/features/autorole/AutoRoleFeature.java b/src/main/java/cc/fascinated/bat/autorole/AutoRoleFeature.java similarity index 75% rename from src/main/java/cc/fascinated/bat/features/autorole/AutoRoleFeature.java rename to src/main/java/cc/fascinated/bat/autorole/AutoRoleFeature.java index cff594b..8cf5ac8 100644 --- a/src/main/java/cc/fascinated/bat/features/autorole/AutoRoleFeature.java +++ b/src/main/java/cc/fascinated/bat/autorole/AutoRoleFeature.java @@ -1,8 +1,8 @@ -package cc.fascinated.bat.features.autorole; +package cc.fascinated.bat.autorole; -import cc.fascinated.bat.features.Feature; -import cc.fascinated.bat.features.FeatureProfile; -import cc.fascinated.bat.features.autorole.command.AutoRoleCommand; +import cc.fascinated.bat.common.feature.Feature; +import cc.fascinated.bat.common.feature.FeatureProfile; +import cc.fascinated.bat.autorole.command.AutoRoleCommand; import cc.fascinated.bat.service.CommandService; import lombok.NonNull; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/cc/fascinated/bat/features/autorole/AutoRoleListener.java b/src/main/java/cc/fascinated/bat/autorole/AutoRoleListener.java similarity index 91% rename from src/main/java/cc/fascinated/bat/features/autorole/AutoRoleListener.java rename to src/main/java/cc/fascinated/bat/autorole/AutoRoleListener.java index 158c1a0..9153fd0 100644 --- a/src/main/java/cc/fascinated/bat/features/autorole/AutoRoleListener.java +++ b/src/main/java/cc/fascinated/bat/autorole/AutoRoleListener.java @@ -1,9 +1,9 @@ -package cc.fascinated.bat.features.autorole; +package cc.fascinated.bat.autorole; import cc.fascinated.bat.event.EventListener; -import cc.fascinated.bat.features.autorole.profile.AutoRoleProfile; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.autorole.profile.AutoRoleProfile; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import cc.fascinated.bat.service.FeatureService; import lombok.NonNull; import lombok.extern.log4j.Log4j2; diff --git a/src/main/java/cc/fascinated/bat/features/autorole/command/AddSubCommand.java b/src/main/java/cc/fascinated/bat/autorole/command/AddSubCommand.java similarity index 91% rename from src/main/java/cc/fascinated/bat/features/autorole/command/AddSubCommand.java rename to src/main/java/cc/fascinated/bat/autorole/command/AddSubCommand.java index 9246daa..9e02a8e 100644 --- a/src/main/java/cc/fascinated/bat/features/autorole/command/AddSubCommand.java +++ b/src/main/java/cc/fascinated/bat/autorole/command/AddSubCommand.java @@ -1,12 +1,12 @@ -package cc.fascinated.bat.features.autorole.command; +package cc.fascinated.bat.autorole.command; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.EmbedUtils; import cc.fascinated.bat.common.RoleUtils; -import cc.fascinated.bat.features.autorole.profile.AutoRoleProfile; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.autorole.profile.AutoRoleProfile; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import lombok.NonNull; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; diff --git a/src/main/java/cc/fascinated/bat/features/autorole/command/AutoRoleCommand.java b/src/main/java/cc/fascinated/bat/autorole/command/AutoRoleCommand.java similarity index 81% rename from src/main/java/cc/fascinated/bat/features/autorole/command/AutoRoleCommand.java rename to src/main/java/cc/fascinated/bat/autorole/command/AutoRoleCommand.java index 53d4904..9fc7b49 100644 --- a/src/main/java/cc/fascinated/bat/features/autorole/command/AutoRoleCommand.java +++ b/src/main/java/cc/fascinated/bat/autorole/command/AutoRoleCommand.java @@ -1,8 +1,8 @@ -package cc.fascinated.bat.features.autorole.command; +package cc.fascinated.bat.autorole.command; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.Category; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.Category; +import cc.fascinated.bat.common.command.CommandInfo; import lombok.NonNull; import net.dv8tion.jda.api.Permission; import org.springframework.context.ApplicationContext; diff --git a/src/main/java/cc/fascinated/bat/features/autorole/command/ClearSubCommand.java b/src/main/java/cc/fascinated/bat/autorole/command/ClearSubCommand.java similarity index 77% rename from src/main/java/cc/fascinated/bat/features/autorole/command/ClearSubCommand.java rename to src/main/java/cc/fascinated/bat/autorole/command/ClearSubCommand.java index f4997d7..d286f7c 100644 --- a/src/main/java/cc/fascinated/bat/features/autorole/command/ClearSubCommand.java +++ b/src/main/java/cc/fascinated/bat/autorole/command/ClearSubCommand.java @@ -1,11 +1,11 @@ -package cc.fascinated.bat.features.autorole.command; +package cc.fascinated.bat.autorole.command; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.EmbedUtils; -import cc.fascinated.bat.features.autorole.profile.AutoRoleProfile; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.autorole.profile.AutoRoleProfile; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import lombok.NonNull; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; diff --git a/src/main/java/cc/fascinated/bat/features/autorole/command/ListSubCommand.java b/src/main/java/cc/fascinated/bat/autorole/command/ListSubCommand.java similarity index 84% rename from src/main/java/cc/fascinated/bat/features/autorole/command/ListSubCommand.java rename to src/main/java/cc/fascinated/bat/autorole/command/ListSubCommand.java index 7eed23f..2a38290 100644 --- a/src/main/java/cc/fascinated/bat/features/autorole/command/ListSubCommand.java +++ b/src/main/java/cc/fascinated/bat/autorole/command/ListSubCommand.java @@ -1,11 +1,11 @@ -package cc.fascinated.bat.features.autorole.command; +package cc.fascinated.bat.autorole.command; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.EmbedUtils; -import cc.fascinated.bat.features.autorole.profile.AutoRoleProfile; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.autorole.profile.AutoRoleProfile; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import lombok.NonNull; import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.entities.Member; diff --git a/src/main/java/cc/fascinated/bat/features/autorole/command/RemoveSubCommand.java b/src/main/java/cc/fascinated/bat/autorole/command/RemoveSubCommand.java similarity index 86% rename from src/main/java/cc/fascinated/bat/features/autorole/command/RemoveSubCommand.java rename to src/main/java/cc/fascinated/bat/autorole/command/RemoveSubCommand.java index 54d1903..721d4c0 100644 --- a/src/main/java/cc/fascinated/bat/features/autorole/command/RemoveSubCommand.java +++ b/src/main/java/cc/fascinated/bat/autorole/command/RemoveSubCommand.java @@ -1,11 +1,11 @@ -package cc.fascinated.bat.features.autorole.command; +package cc.fascinated.bat.autorole.command; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.EmbedUtils; -import cc.fascinated.bat.features.autorole.profile.AutoRoleProfile; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.autorole.profile.AutoRoleProfile; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import lombok.NonNull; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; diff --git a/src/main/java/cc/fascinated/bat/features/autorole/command/SyncSubCommand.java b/src/main/java/cc/fascinated/bat/autorole/command/SyncSubCommand.java similarity index 94% rename from src/main/java/cc/fascinated/bat/features/autorole/command/SyncSubCommand.java rename to src/main/java/cc/fascinated/bat/autorole/command/SyncSubCommand.java index 7e7744c..9031599 100644 --- a/src/main/java/cc/fascinated/bat/features/autorole/command/SyncSubCommand.java +++ b/src/main/java/cc/fascinated/bat/autorole/command/SyncSubCommand.java @@ -1,12 +1,12 @@ -package cc.fascinated.bat.features.autorole.command; +package cc.fascinated.bat.autorole.command; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.DescriptionBuilder; import cc.fascinated.bat.common.EmbedUtils; -import cc.fascinated.bat.features.autorole.profile.AutoRoleProfile; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.autorole.profile.AutoRoleProfile; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import lombok.NonNull; import lombok.extern.log4j.Log4j2; import net.dv8tion.jda.api.entities.Guild; diff --git a/src/main/java/cc/fascinated/bat/features/autorole/profile/AutoRoleProfile.java b/src/main/java/cc/fascinated/bat/autorole/profile/AutoRoleProfile.java similarity index 96% rename from src/main/java/cc/fascinated/bat/features/autorole/profile/AutoRoleProfile.java rename to src/main/java/cc/fascinated/bat/autorole/profile/AutoRoleProfile.java index f93f6f4..dec9716 100644 --- a/src/main/java/cc/fascinated/bat/features/autorole/profile/AutoRoleProfile.java +++ b/src/main/java/cc/fascinated/bat/autorole/profile/AutoRoleProfile.java @@ -1,7 +1,7 @@ -package cc.fascinated.bat.features.autorole.profile; +package cc.fascinated.bat.autorole.profile; import cc.fascinated.bat.common.Serializable; -import cc.fascinated.bat.model.BatGuild; +import cc.fascinated.bat.common.model.BatGuild; import cc.fascinated.bat.service.DiscordService; import com.google.gson.Gson; import lombok.Getter; diff --git a/src/main/java/cc/fascinated/bat/features/base/BaseFeature.java b/src/main/java/cc/fascinated/bat/base/BaseFeature.java similarity index 64% rename from src/main/java/cc/fascinated/bat/features/base/BaseFeature.java rename to src/main/java/cc/fascinated/bat/base/BaseFeature.java index 5f9c594..e6a38db 100644 --- a/src/main/java/cc/fascinated/bat/features/base/BaseFeature.java +++ b/src/main/java/cc/fascinated/bat/base/BaseFeature.java @@ -1,21 +1,21 @@ -package cc.fascinated.bat.features.base; +package cc.fascinated.bat.base; -import cc.fascinated.bat.features.Feature; -import cc.fascinated.bat.features.FeatureProfile; -import cc.fascinated.bat.features.base.commands.botadmin.BotAdminCommand; -import cc.fascinated.bat.features.base.commands.fun.CoinFlipCommand; -import cc.fascinated.bat.features.base.commands.fun.EightBallCommand; -import cc.fascinated.bat.features.base.commands.fun.PPSizeCommand; -import cc.fascinated.bat.features.base.commands.fun.image.ImageCommand; -import cc.fascinated.bat.features.base.commands.general.*; -import cc.fascinated.bat.features.base.commands.general.avatar.AvatarCommand; -import cc.fascinated.bat.features.base.commands.general.banner.BannerCommand; -import cc.fascinated.bat.features.base.commands.server.MemberCountCommand; -import cc.fascinated.bat.features.base.commands.server.PremiumCommand; -import cc.fascinated.bat.features.base.commands.server.channel.ChannelCommand; -import cc.fascinated.bat.features.base.commands.server.feature.FeatureCommand; -import cc.fascinated.bat.features.base.commands.utility.PastebinCommand; -import cc.fascinated.bat.features.base.commands.utility.lookup.LookupCommand; +import cc.fascinated.bat.common.feature.Feature; +import cc.fascinated.bat.common.feature.FeatureProfile; +import cc.fascinated.bat.base.commands.botadmin.BotAdminCommand; +import cc.fascinated.bat.base.commands.fun.CoinFlipCommand; +import cc.fascinated.bat.base.commands.fun.EightBallCommand; +import cc.fascinated.bat.base.commands.fun.PPSizeCommand; +import cc.fascinated.bat.base.commands.fun.image.ImageCommand; +import cc.fascinated.bat.base.commands.general.*; +import cc.fascinated.bat.base.commands.general.avatar.AvatarCommand; +import cc.fascinated.bat.base.commands.general.banner.BannerCommand; +import cc.fascinated.bat.base.commands.server.MemberCountCommand; +import cc.fascinated.bat.base.commands.server.PremiumCommand; +import cc.fascinated.bat.base.commands.server.channel.ChannelCommand; +import cc.fascinated.bat.base.commands.server.feature.FeatureCommand; +import cc.fascinated.bat.base.commands.utility.PastebinCommand; +import cc.fascinated.bat.base.commands.utility.lookup.LookupCommand; import cc.fascinated.bat.service.CommandService; import lombok.NonNull; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/cc/fascinated/bat/features/base/commands/botadmin/BotAdminCommand.java b/src/main/java/cc/fascinated/bat/base/commands/botadmin/BotAdminCommand.java similarity index 66% rename from src/main/java/cc/fascinated/bat/features/base/commands/botadmin/BotAdminCommand.java rename to src/main/java/cc/fascinated/bat/base/commands/botadmin/BotAdminCommand.java index f591fb1..14c5bea 100644 --- a/src/main/java/cc/fascinated/bat/features/base/commands/botadmin/BotAdminCommand.java +++ b/src/main/java/cc/fascinated/bat/base/commands/botadmin/BotAdminCommand.java @@ -1,9 +1,9 @@ -package cc.fascinated.bat.features.base.commands.botadmin; +package cc.fascinated.bat.base.commands.botadmin; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; -import cc.fascinated.bat.features.base.commands.botadmin.premium.PremiumRemoveSubCommand; -import cc.fascinated.bat.features.base.commands.botadmin.premium.PremiumSetSubCommand; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.CommandInfo; +import cc.fascinated.bat.base.commands.botadmin.premium.PremiumRemoveSubCommand; +import cc.fascinated.bat.base.commands.botadmin.premium.PremiumSetSubCommand; import lombok.NonNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; diff --git a/src/main/java/cc/fascinated/bat/features/base/commands/botadmin/premium/PremiumRemoveSubCommand.java b/src/main/java/cc/fascinated/bat/base/commands/botadmin/premium/PremiumRemoveSubCommand.java similarity index 89% rename from src/main/java/cc/fascinated/bat/features/base/commands/botadmin/premium/PremiumRemoveSubCommand.java rename to src/main/java/cc/fascinated/bat/base/commands/botadmin/premium/PremiumRemoveSubCommand.java index d82bcf0..617b1ca 100644 --- a/src/main/java/cc/fascinated/bat/features/base/commands/botadmin/premium/PremiumRemoveSubCommand.java +++ b/src/main/java/cc/fascinated/bat/base/commands/botadmin/premium/PremiumRemoveSubCommand.java @@ -1,9 +1,9 @@ -package cc.fascinated.bat.features.base.commands.botadmin.premium; +package cc.fascinated.bat.base.commands.botadmin.premium; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.CommandInfo; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import cc.fascinated.bat.premium.PremiumProfile; import cc.fascinated.bat.service.GuildService; import lombok.NonNull; diff --git a/src/main/java/cc/fascinated/bat/features/base/commands/botadmin/premium/PremiumSetSubCommand.java b/src/main/java/cc/fascinated/bat/base/commands/botadmin/premium/PremiumSetSubCommand.java similarity index 91% rename from src/main/java/cc/fascinated/bat/features/base/commands/botadmin/premium/PremiumSetSubCommand.java rename to src/main/java/cc/fascinated/bat/base/commands/botadmin/premium/PremiumSetSubCommand.java index 4b53f7d..4646f2c 100644 --- a/src/main/java/cc/fascinated/bat/features/base/commands/botadmin/premium/PremiumSetSubCommand.java +++ b/src/main/java/cc/fascinated/bat/base/commands/botadmin/premium/PremiumSetSubCommand.java @@ -1,9 +1,9 @@ -package cc.fascinated.bat.features.base.commands.botadmin.premium; +package cc.fascinated.bat.base.commands.botadmin.premium; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.CommandInfo; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import cc.fascinated.bat.premium.PremiumProfile; import cc.fascinated.bat.service.GuildService; import lombok.NonNull; diff --git a/src/main/java/cc/fascinated/bat/features/base/commands/fun/CoinFlipCommand.java b/src/main/java/cc/fascinated/bat/base/commands/fun/CoinFlipCommand.java similarity index 81% rename from src/main/java/cc/fascinated/bat/features/base/commands/fun/CoinFlipCommand.java rename to src/main/java/cc/fascinated/bat/base/commands/fun/CoinFlipCommand.java index 296f906..af73fdb 100644 --- a/src/main/java/cc/fascinated/bat/features/base/commands/fun/CoinFlipCommand.java +++ b/src/main/java/cc/fascinated/bat/base/commands/fun/CoinFlipCommand.java @@ -1,9 +1,9 @@ -package cc.fascinated.bat.features.base.commands.fun; +package cc.fascinated.bat.base.commands.fun; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.CommandInfo; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import lombok.NonNull; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; diff --git a/src/main/java/cc/fascinated/bat/features/base/commands/fun/EightBallCommand.java b/src/main/java/cc/fascinated/bat/base/commands/fun/EightBallCommand.java similarity index 89% rename from src/main/java/cc/fascinated/bat/features/base/commands/fun/EightBallCommand.java rename to src/main/java/cc/fascinated/bat/base/commands/fun/EightBallCommand.java index de49716..00c0306 100644 --- a/src/main/java/cc/fascinated/bat/features/base/commands/fun/EightBallCommand.java +++ b/src/main/java/cc/fascinated/bat/base/commands/fun/EightBallCommand.java @@ -1,11 +1,11 @@ -package cc.fascinated.bat.features.base.commands.fun; +package cc.fascinated.bat.base.commands.fun; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.Category; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.Category; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.EmbedUtils; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import lombok.NonNull; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; diff --git a/src/main/java/cc/fascinated/bat/features/base/commands/fun/PPSizeCommand.java b/src/main/java/cc/fascinated/bat/base/commands/fun/PPSizeCommand.java similarity index 87% rename from src/main/java/cc/fascinated/bat/features/base/commands/fun/PPSizeCommand.java rename to src/main/java/cc/fascinated/bat/base/commands/fun/PPSizeCommand.java index 3f53782..51a5147 100644 --- a/src/main/java/cc/fascinated/bat/features/base/commands/fun/PPSizeCommand.java +++ b/src/main/java/cc/fascinated/bat/base/commands/fun/PPSizeCommand.java @@ -1,13 +1,13 @@ -package cc.fascinated.bat.features.base.commands.fun; +package cc.fascinated.bat.base.commands.fun; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.Category; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.Category; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.DescriptionBuilder; import cc.fascinated.bat.common.EmbedUtils; import cc.fascinated.bat.common.MathUtils; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import lombok.NonNull; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; diff --git a/src/main/java/cc/fascinated/bat/features/base/commands/fun/image/CatSubCommand.java b/src/main/java/cc/fascinated/bat/base/commands/fun/image/CatSubCommand.java similarity index 79% rename from src/main/java/cc/fascinated/bat/features/base/commands/fun/image/CatSubCommand.java rename to src/main/java/cc/fascinated/bat/base/commands/fun/image/CatSubCommand.java index c42fc90..3e74be3 100644 --- a/src/main/java/cc/fascinated/bat/features/base/commands/fun/image/CatSubCommand.java +++ b/src/main/java/cc/fascinated/bat/base/commands/fun/image/CatSubCommand.java @@ -1,12 +1,12 @@ -package cc.fascinated.bat.features.base.commands.fun.image; +package cc.fascinated.bat.base.commands.fun.image; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.EmbedUtils; import cc.fascinated.bat.common.WebRequest; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; -import cc.fascinated.bat.model.token.thecatapi.CatImageToken; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; +import cc.fascinated.bat.common.model.token.thecatapi.CatImageToken; import lombok.NonNull; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; diff --git a/src/main/java/cc/fascinated/bat/features/base/commands/fun/image/DogSubCommand.java b/src/main/java/cc/fascinated/bat/base/commands/fun/image/DogSubCommand.java similarity index 79% rename from src/main/java/cc/fascinated/bat/features/base/commands/fun/image/DogSubCommand.java rename to src/main/java/cc/fascinated/bat/base/commands/fun/image/DogSubCommand.java index baf08ab..cfe0be3 100644 --- a/src/main/java/cc/fascinated/bat/features/base/commands/fun/image/DogSubCommand.java +++ b/src/main/java/cc/fascinated/bat/base/commands/fun/image/DogSubCommand.java @@ -1,12 +1,12 @@ -package cc.fascinated.bat.features.base.commands.fun.image; +package cc.fascinated.bat.base.commands.fun.image; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.EmbedUtils; import cc.fascinated.bat.common.WebRequest; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; -import cc.fascinated.bat.model.token.dogceo.RandomImage; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; +import cc.fascinated.bat.common.model.token.dogceo.RandomImage; import lombok.NonNull; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; diff --git a/src/main/java/cc/fascinated/bat/features/base/commands/fun/image/DuckSubCommand.java b/src/main/java/cc/fascinated/bat/base/commands/fun/image/DuckSubCommand.java similarity index 79% rename from src/main/java/cc/fascinated/bat/features/base/commands/fun/image/DuckSubCommand.java rename to src/main/java/cc/fascinated/bat/base/commands/fun/image/DuckSubCommand.java index bb69948..9f207b5 100644 --- a/src/main/java/cc/fascinated/bat/features/base/commands/fun/image/DuckSubCommand.java +++ b/src/main/java/cc/fascinated/bat/base/commands/fun/image/DuckSubCommand.java @@ -1,12 +1,12 @@ -package cc.fascinated.bat.features.base.commands.fun.image; +package cc.fascinated.bat.base.commands.fun.image; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.EmbedUtils; import cc.fascinated.bat.common.WebRequest; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; -import cc.fascinated.bat.model.token.randomd.RandomDuck; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; +import cc.fascinated.bat.common.model.token.randomd.RandomDuck; import lombok.NonNull; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; diff --git a/src/main/java/cc/fascinated/bat/features/base/commands/fun/image/FoxSubCommand.java b/src/main/java/cc/fascinated/bat/base/commands/fun/image/FoxSubCommand.java similarity index 79% rename from src/main/java/cc/fascinated/bat/features/base/commands/fun/image/FoxSubCommand.java rename to src/main/java/cc/fascinated/bat/base/commands/fun/image/FoxSubCommand.java index acbc954..4a5dcd8 100644 --- a/src/main/java/cc/fascinated/bat/features/base/commands/fun/image/FoxSubCommand.java +++ b/src/main/java/cc/fascinated/bat/base/commands/fun/image/FoxSubCommand.java @@ -1,12 +1,12 @@ -package cc.fascinated.bat.features.base.commands.fun.image; +package cc.fascinated.bat.base.commands.fun.image; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.EmbedUtils; import cc.fascinated.bat.common.WebRequest; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; -import cc.fascinated.bat.model.token.randomfox.RandomFoxToken; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; +import cc.fascinated.bat.common.model.token.randomfox.RandomFoxToken; import lombok.NonNull; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; diff --git a/src/main/java/cc/fascinated/bat/features/base/commands/fun/image/ImageCommand.java b/src/main/java/cc/fascinated/bat/base/commands/fun/image/ImageCommand.java similarity index 78% rename from src/main/java/cc/fascinated/bat/features/base/commands/fun/image/ImageCommand.java rename to src/main/java/cc/fascinated/bat/base/commands/fun/image/ImageCommand.java index d554844..b8541a0 100644 --- a/src/main/java/cc/fascinated/bat/features/base/commands/fun/image/ImageCommand.java +++ b/src/main/java/cc/fascinated/bat/base/commands/fun/image/ImageCommand.java @@ -1,8 +1,8 @@ -package cc.fascinated.bat.features.base.commands.fun.image; +package cc.fascinated.bat.base.commands.fun.image; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.Category; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.Category; +import cc.fascinated.bat.common.command.CommandInfo; import lombok.NonNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; diff --git a/src/main/java/cc/fascinated/bat/features/base/commands/general/BotStatsCommand.java b/src/main/java/cc/fascinated/bat/base/commands/general/BotStatsCommand.java similarity index 90% rename from src/main/java/cc/fascinated/bat/features/base/commands/general/BotStatsCommand.java rename to src/main/java/cc/fascinated/bat/base/commands/general/BotStatsCommand.java index 5347cc6..52c970a 100644 --- a/src/main/java/cc/fascinated/bat/features/base/commands/general/BotStatsCommand.java +++ b/src/main/java/cc/fascinated/bat/base/commands/general/BotStatsCommand.java @@ -1,11 +1,11 @@ -package cc.fascinated.bat.features.base.commands.general; +package cc.fascinated.bat.base.commands.general; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.Category; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.Category; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.*; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import cc.fascinated.bat.service.DiscordService; import cc.fascinated.bat.service.GuildService; import cc.fascinated.bat.service.UserService; diff --git a/src/main/java/cc/fascinated/bat/features/base/commands/general/HelpCommand.java b/src/main/java/cc/fascinated/bat/base/commands/general/HelpCommand.java similarity index 94% rename from src/main/java/cc/fascinated/bat/features/base/commands/general/HelpCommand.java rename to src/main/java/cc/fascinated/bat/base/commands/general/HelpCommand.java index bcf847e..d98f803 100644 --- a/src/main/java/cc/fascinated/bat/features/base/commands/general/HelpCommand.java +++ b/src/main/java/cc/fascinated/bat/base/commands/general/HelpCommand.java @@ -1,16 +1,16 @@ -package cc.fascinated.bat.features.base.commands.general; +package cc.fascinated.bat.base.commands.general; import cc.fascinated.bat.Consts; import cc.fascinated.bat.Emojis; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.Category; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.Category; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.DescriptionBuilder; import cc.fascinated.bat.common.EmbedUtils; import cc.fascinated.bat.common.InteractionBuilder; import cc.fascinated.bat.event.EventListener; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import cc.fascinated.bat.service.CommandService; import lombok.NonNull; import net.dv8tion.jda.api.entities.Member; diff --git a/src/main/java/cc/fascinated/bat/features/base/commands/general/InviteCommand.java b/src/main/java/cc/fascinated/bat/base/commands/general/InviteCommand.java similarity index 78% rename from src/main/java/cc/fascinated/bat/features/base/commands/general/InviteCommand.java rename to src/main/java/cc/fascinated/bat/base/commands/general/InviteCommand.java index c4ab1a7..14f0b40 100644 --- a/src/main/java/cc/fascinated/bat/features/base/commands/general/InviteCommand.java +++ b/src/main/java/cc/fascinated/bat/base/commands/general/InviteCommand.java @@ -1,12 +1,12 @@ -package cc.fascinated.bat.features.base.commands.general; +package cc.fascinated.bat.base.commands.general; import cc.fascinated.bat.Consts; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.Category; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.Category; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.EmbedUtils; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import lombok.NonNull; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; diff --git a/src/main/java/cc/fascinated/bat/features/base/commands/general/PingCommand.java b/src/main/java/cc/fascinated/bat/base/commands/general/PingCommand.java similarity index 80% rename from src/main/java/cc/fascinated/bat/features/base/commands/general/PingCommand.java rename to src/main/java/cc/fascinated/bat/base/commands/general/PingCommand.java index 2787a43..0d3515a 100644 --- a/src/main/java/cc/fascinated/bat/features/base/commands/general/PingCommand.java +++ b/src/main/java/cc/fascinated/bat/base/commands/general/PingCommand.java @@ -1,10 +1,10 @@ -package cc.fascinated.bat.features.base.commands.general; +package cc.fascinated.bat.base.commands.general; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.Category; -import cc.fascinated.bat.command.CommandInfo; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.Category; +import cc.fascinated.bat.common.command.CommandInfo; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import cc.fascinated.bat.service.DiscordService; import lombok.NonNull; import net.dv8tion.jda.api.entities.Member; diff --git a/src/main/java/cc/fascinated/bat/features/base/commands/general/VoteCommand.java b/src/main/java/cc/fascinated/bat/base/commands/general/VoteCommand.java similarity index 82% rename from src/main/java/cc/fascinated/bat/features/base/commands/general/VoteCommand.java rename to src/main/java/cc/fascinated/bat/base/commands/general/VoteCommand.java index 732bf48..390f58d 100644 --- a/src/main/java/cc/fascinated/bat/features/base/commands/general/VoteCommand.java +++ b/src/main/java/cc/fascinated/bat/base/commands/general/VoteCommand.java @@ -1,12 +1,12 @@ -package cc.fascinated.bat.features.base.commands.general; +package cc.fascinated.bat.base.commands.general; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.Category; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.Category; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.DescriptionBuilder; import cc.fascinated.bat.common.EmbedUtils; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import lombok.NonNull; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; diff --git a/src/main/java/cc/fascinated/bat/features/base/commands/general/avatar/AvatarCommand.java b/src/main/java/cc/fascinated/bat/base/commands/general/avatar/AvatarCommand.java similarity index 75% rename from src/main/java/cc/fascinated/bat/features/base/commands/general/avatar/AvatarCommand.java rename to src/main/java/cc/fascinated/bat/base/commands/general/avatar/AvatarCommand.java index b8ec202..1126cfc 100644 --- a/src/main/java/cc/fascinated/bat/features/base/commands/general/avatar/AvatarCommand.java +++ b/src/main/java/cc/fascinated/bat/base/commands/general/avatar/AvatarCommand.java @@ -1,8 +1,8 @@ -package cc.fascinated.bat.features.base.commands.general.avatar; +package cc.fascinated.bat.base.commands.general.avatar; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.Category; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.Category; +import cc.fascinated.bat.common.command.CommandInfo; import lombok.NonNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; diff --git a/src/main/java/cc/fascinated/bat/features/base/commands/general/avatar/GuildSubCommand.java b/src/main/java/cc/fascinated/bat/base/commands/general/avatar/GuildSubCommand.java similarity index 82% rename from src/main/java/cc/fascinated/bat/features/base/commands/general/avatar/GuildSubCommand.java rename to src/main/java/cc/fascinated/bat/base/commands/general/avatar/GuildSubCommand.java index cfc9fb6..ac4a399 100644 --- a/src/main/java/cc/fascinated/bat/features/base/commands/general/avatar/GuildSubCommand.java +++ b/src/main/java/cc/fascinated/bat/base/commands/general/avatar/GuildSubCommand.java @@ -1,11 +1,11 @@ -package cc.fascinated.bat.features.base.commands.general.avatar; +package cc.fascinated.bat.base.commands.general.avatar; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.Category; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.Category; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.EmbedUtils; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import lombok.NonNull; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; diff --git a/src/main/java/cc/fascinated/bat/features/base/commands/general/avatar/UserSubCommand.java b/src/main/java/cc/fascinated/bat/base/commands/general/avatar/UserSubCommand.java similarity index 83% rename from src/main/java/cc/fascinated/bat/features/base/commands/general/avatar/UserSubCommand.java rename to src/main/java/cc/fascinated/bat/base/commands/general/avatar/UserSubCommand.java index a256bad..d7696ac 100644 --- a/src/main/java/cc/fascinated/bat/features/base/commands/general/avatar/UserSubCommand.java +++ b/src/main/java/cc/fascinated/bat/base/commands/general/avatar/UserSubCommand.java @@ -1,11 +1,11 @@ -package cc.fascinated.bat.features.base.commands.general.avatar; +package cc.fascinated.bat.base.commands.general.avatar; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.Category; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.Category; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.EmbedUtils; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import lombok.NonNull; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; diff --git a/src/main/java/cc/fascinated/bat/features/base/commands/general/banner/BannerCommand.java b/src/main/java/cc/fascinated/bat/base/commands/general/banner/BannerCommand.java similarity index 75% rename from src/main/java/cc/fascinated/bat/features/base/commands/general/banner/BannerCommand.java rename to src/main/java/cc/fascinated/bat/base/commands/general/banner/BannerCommand.java index d48822c..8b81a19 100644 --- a/src/main/java/cc/fascinated/bat/features/base/commands/general/banner/BannerCommand.java +++ b/src/main/java/cc/fascinated/bat/base/commands/general/banner/BannerCommand.java @@ -1,8 +1,8 @@ -package cc.fascinated.bat.features.base.commands.general.banner; +package cc.fascinated.bat.base.commands.general.banner; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.Category; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.Category; +import cc.fascinated.bat.common.command.CommandInfo; import lombok.NonNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; diff --git a/src/main/java/cc/fascinated/bat/features/base/commands/general/banner/GuildSubCommand.java b/src/main/java/cc/fascinated/bat/base/commands/general/banner/GuildSubCommand.java similarity index 81% rename from src/main/java/cc/fascinated/bat/features/base/commands/general/banner/GuildSubCommand.java rename to src/main/java/cc/fascinated/bat/base/commands/general/banner/GuildSubCommand.java index 1d9046e..a6af726 100644 --- a/src/main/java/cc/fascinated/bat/features/base/commands/general/banner/GuildSubCommand.java +++ b/src/main/java/cc/fascinated/bat/base/commands/general/banner/GuildSubCommand.java @@ -1,11 +1,11 @@ -package cc.fascinated.bat.features.base.commands.general.banner; +package cc.fascinated.bat.base.commands.general.banner; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.Category; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.Category; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.EmbedUtils; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import lombok.NonNull; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; diff --git a/src/main/java/cc/fascinated/bat/features/base/commands/general/banner/UserSubCommand.java b/src/main/java/cc/fascinated/bat/base/commands/general/banner/UserSubCommand.java similarity index 86% rename from src/main/java/cc/fascinated/bat/features/base/commands/general/banner/UserSubCommand.java rename to src/main/java/cc/fascinated/bat/base/commands/general/banner/UserSubCommand.java index 4801f4a..369c11b 100644 --- a/src/main/java/cc/fascinated/bat/features/base/commands/general/banner/UserSubCommand.java +++ b/src/main/java/cc/fascinated/bat/base/commands/general/banner/UserSubCommand.java @@ -1,11 +1,11 @@ -package cc.fascinated.bat.features.base.commands.general.banner; +package cc.fascinated.bat.base.commands.general.banner; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.Category; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.Category; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.EmbedUtils; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import lombok.NonNull; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; diff --git a/src/main/java/cc/fascinated/bat/features/base/commands/server/MemberCountCommand.java b/src/main/java/cc/fascinated/bat/base/commands/server/MemberCountCommand.java similarity index 87% rename from src/main/java/cc/fascinated/bat/features/base/commands/server/MemberCountCommand.java rename to src/main/java/cc/fascinated/bat/base/commands/server/MemberCountCommand.java index 2a574c4..a36b740 100644 --- a/src/main/java/cc/fascinated/bat/features/base/commands/server/MemberCountCommand.java +++ b/src/main/java/cc/fascinated/bat/base/commands/server/MemberCountCommand.java @@ -1,11 +1,11 @@ -package cc.fascinated.bat.features.base.commands.server; +package cc.fascinated.bat.base.commands.server; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.EmbedUtils; import cc.fascinated.bat.common.NumberFormatter; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import lombok.NonNull; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; diff --git a/src/main/java/cc/fascinated/bat/features/base/commands/server/PremiumCommand.java b/src/main/java/cc/fascinated/bat/base/commands/server/PremiumCommand.java similarity index 86% rename from src/main/java/cc/fascinated/bat/features/base/commands/server/PremiumCommand.java rename to src/main/java/cc/fascinated/bat/base/commands/server/PremiumCommand.java index f636e4d..1c383df 100644 --- a/src/main/java/cc/fascinated/bat/features/base/commands/server/PremiumCommand.java +++ b/src/main/java/cc/fascinated/bat/base/commands/server/PremiumCommand.java @@ -1,10 +1,10 @@ -package cc.fascinated.bat.features.base.commands.server; +package cc.fascinated.bat.base.commands.server; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.EmbedUtils; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import cc.fascinated.bat.premium.PremiumProfile; import lombok.NonNull; import net.dv8tion.jda.api.EmbedBuilder; diff --git a/src/main/java/cc/fascinated/bat/features/base/commands/server/channel/ChannelCommand.java b/src/main/java/cc/fascinated/bat/base/commands/server/channel/ChannelCommand.java similarity index 77% rename from src/main/java/cc/fascinated/bat/features/base/commands/server/channel/ChannelCommand.java rename to src/main/java/cc/fascinated/bat/base/commands/server/channel/ChannelCommand.java index dc44c37..877d1d3 100644 --- a/src/main/java/cc/fascinated/bat/features/base/commands/server/channel/ChannelCommand.java +++ b/src/main/java/cc/fascinated/bat/base/commands/server/channel/ChannelCommand.java @@ -1,8 +1,8 @@ -package cc.fascinated.bat.features.base.commands.server.channel; +package cc.fascinated.bat.base.commands.server.channel; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.Category; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.Category; +import cc.fascinated.bat.common.command.CommandInfo; import lombok.NonNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; diff --git a/src/main/java/cc/fascinated/bat/features/base/commands/server/channel/RemoveTopicSubCommand.java b/src/main/java/cc/fascinated/bat/base/commands/server/channel/RemoveTopicSubCommand.java similarity index 89% rename from src/main/java/cc/fascinated/bat/features/base/commands/server/channel/RemoveTopicSubCommand.java rename to src/main/java/cc/fascinated/bat/base/commands/server/channel/RemoveTopicSubCommand.java index 8e4d2b2..fa38f7d 100644 --- a/src/main/java/cc/fascinated/bat/features/base/commands/server/channel/RemoveTopicSubCommand.java +++ b/src/main/java/cc/fascinated/bat/base/commands/server/channel/RemoveTopicSubCommand.java @@ -1,10 +1,10 @@ -package cc.fascinated.bat.features.base.commands.server.channel; +package cc.fascinated.bat.base.commands.server.channel; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.EmbedUtils; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import lombok.NonNull; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.Member; diff --git a/src/main/java/cc/fascinated/bat/features/base/commands/server/channel/SetTopicSubCommand.java b/src/main/java/cc/fascinated/bat/base/commands/server/channel/SetTopicSubCommand.java similarity index 90% rename from src/main/java/cc/fascinated/bat/features/base/commands/server/channel/SetTopicSubCommand.java rename to src/main/java/cc/fascinated/bat/base/commands/server/channel/SetTopicSubCommand.java index f1f30ac..c372d4c 100644 --- a/src/main/java/cc/fascinated/bat/features/base/commands/server/channel/SetTopicSubCommand.java +++ b/src/main/java/cc/fascinated/bat/base/commands/server/channel/SetTopicSubCommand.java @@ -1,10 +1,10 @@ -package cc.fascinated.bat.features.base.commands.server.channel; +package cc.fascinated.bat.base.commands.server.channel; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.EmbedUtils; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import lombok.NonNull; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.Member; diff --git a/src/main/java/cc/fascinated/bat/features/base/commands/server/channel/ViewTopicSubCommand.java b/src/main/java/cc/fascinated/bat/base/commands/server/channel/ViewTopicSubCommand.java similarity index 89% rename from src/main/java/cc/fascinated/bat/features/base/commands/server/channel/ViewTopicSubCommand.java rename to src/main/java/cc/fascinated/bat/base/commands/server/channel/ViewTopicSubCommand.java index 36deef3..2f1ca56 100644 --- a/src/main/java/cc/fascinated/bat/features/base/commands/server/channel/ViewTopicSubCommand.java +++ b/src/main/java/cc/fascinated/bat/base/commands/server/channel/ViewTopicSubCommand.java @@ -1,10 +1,10 @@ -package cc.fascinated.bat.features.base.commands.server.channel; +package cc.fascinated.bat.base.commands.server.channel; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.EmbedUtils; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import lombok.NonNull; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; diff --git a/src/main/java/cc/fascinated/bat/features/base/commands/server/feature/DisableSubCommand.java b/src/main/java/cc/fascinated/bat/base/commands/server/feature/DisableSubCommand.java similarity index 87% rename from src/main/java/cc/fascinated/bat/features/base/commands/server/feature/DisableSubCommand.java rename to src/main/java/cc/fascinated/bat/base/commands/server/feature/DisableSubCommand.java index c7cb76e..f832640 100644 --- a/src/main/java/cc/fascinated/bat/features/base/commands/server/feature/DisableSubCommand.java +++ b/src/main/java/cc/fascinated/bat/base/commands/server/feature/DisableSubCommand.java @@ -1,12 +1,12 @@ -package cc.fascinated.bat.features.base.commands.server.feature; +package cc.fascinated.bat.base.commands.server.feature; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.EmbedUtils; -import cc.fascinated.bat.features.Feature; -import cc.fascinated.bat.features.FeatureProfile; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.common.feature.Feature; +import cc.fascinated.bat.common.feature.FeatureProfile; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import cc.fascinated.bat.service.FeatureService; import lombok.NonNull; import net.dv8tion.jda.api.entities.Member; diff --git a/src/main/java/cc/fascinated/bat/features/base/commands/server/feature/EnableSubCommand.java b/src/main/java/cc/fascinated/bat/base/commands/server/feature/EnableSubCommand.java similarity index 87% rename from src/main/java/cc/fascinated/bat/features/base/commands/server/feature/EnableSubCommand.java rename to src/main/java/cc/fascinated/bat/base/commands/server/feature/EnableSubCommand.java index 1a1ffd6..596882e 100644 --- a/src/main/java/cc/fascinated/bat/features/base/commands/server/feature/EnableSubCommand.java +++ b/src/main/java/cc/fascinated/bat/base/commands/server/feature/EnableSubCommand.java @@ -1,12 +1,12 @@ -package cc.fascinated.bat.features.base.commands.server.feature; +package cc.fascinated.bat.base.commands.server.feature; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.EmbedUtils; -import cc.fascinated.bat.features.Feature; -import cc.fascinated.bat.features.FeatureProfile; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.common.feature.Feature; +import cc.fascinated.bat.common.feature.FeatureProfile; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import cc.fascinated.bat.service.FeatureService; import lombok.NonNull; import net.dv8tion.jda.api.entities.Member; diff --git a/src/main/java/cc/fascinated/bat/features/base/commands/server/feature/FeatureCommand.java b/src/main/java/cc/fascinated/bat/base/commands/server/feature/FeatureCommand.java similarity index 78% rename from src/main/java/cc/fascinated/bat/features/base/commands/server/feature/FeatureCommand.java rename to src/main/java/cc/fascinated/bat/base/commands/server/feature/FeatureCommand.java index 5e79b3b..43c0e78 100644 --- a/src/main/java/cc/fascinated/bat/features/base/commands/server/feature/FeatureCommand.java +++ b/src/main/java/cc/fascinated/bat/base/commands/server/feature/FeatureCommand.java @@ -1,8 +1,8 @@ -package cc.fascinated.bat.features.base.commands.server.feature; +package cc.fascinated.bat.base.commands.server.feature; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.Category; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.Category; +import cc.fascinated.bat.common.command.CommandInfo; import lombok.NonNull; import net.dv8tion.jda.api.Permission; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/cc/fascinated/bat/features/base/commands/server/feature/ListSubCommand.java b/src/main/java/cc/fascinated/bat/base/commands/server/feature/ListSubCommand.java similarity index 79% rename from src/main/java/cc/fascinated/bat/features/base/commands/server/feature/ListSubCommand.java rename to src/main/java/cc/fascinated/bat/base/commands/server/feature/ListSubCommand.java index bd2aaa3..3e301d1 100644 --- a/src/main/java/cc/fascinated/bat/features/base/commands/server/feature/ListSubCommand.java +++ b/src/main/java/cc/fascinated/bat/base/commands/server/feature/ListSubCommand.java @@ -1,12 +1,12 @@ -package cc.fascinated.bat.features.base.commands.server.feature; +package cc.fascinated.bat.base.commands.server.feature; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.EmbedUtils; -import cc.fascinated.bat.features.Feature; -import cc.fascinated.bat.features.FeatureProfile; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.common.feature.Feature; +import cc.fascinated.bat.common.feature.FeatureProfile; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import cc.fascinated.bat.service.FeatureService; import lombok.NonNull; import net.dv8tion.jda.api.entities.Member; diff --git a/src/main/java/cc/fascinated/bat/features/base/commands/utility/PastebinCommand.java b/src/main/java/cc/fascinated/bat/base/commands/utility/PastebinCommand.java similarity index 86% rename from src/main/java/cc/fascinated/bat/features/base/commands/utility/PastebinCommand.java rename to src/main/java/cc/fascinated/bat/base/commands/utility/PastebinCommand.java index cd192b1..0967b93 100644 --- a/src/main/java/cc/fascinated/bat/features/base/commands/utility/PastebinCommand.java +++ b/src/main/java/cc/fascinated/bat/base/commands/utility/PastebinCommand.java @@ -1,13 +1,13 @@ -package cc.fascinated.bat.features.base.commands.utility; +package cc.fascinated.bat.base.commands.utility; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.Category; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.Category; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.DescriptionBuilder; import cc.fascinated.bat.common.EmbedUtils; import cc.fascinated.bat.common.PasteUtils; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import lombok.NonNull; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; diff --git a/src/main/java/cc/fascinated/bat/features/base/commands/utility/lookup/LookupCommand.java b/src/main/java/cc/fascinated/bat/base/commands/utility/lookup/LookupCommand.java similarity index 75% rename from src/main/java/cc/fascinated/bat/features/base/commands/utility/lookup/LookupCommand.java rename to src/main/java/cc/fascinated/bat/base/commands/utility/lookup/LookupCommand.java index a030b5f..675442d 100644 --- a/src/main/java/cc/fascinated/bat/features/base/commands/utility/lookup/LookupCommand.java +++ b/src/main/java/cc/fascinated/bat/base/commands/utility/lookup/LookupCommand.java @@ -1,8 +1,8 @@ -package cc.fascinated.bat.features.base.commands.utility.lookup; +package cc.fascinated.bat.base.commands.utility.lookup; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.Category; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.Category; +import cc.fascinated.bat.common.command.CommandInfo; import lombok.NonNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; diff --git a/src/main/java/cc/fascinated/bat/features/base/commands/utility/lookup/UserSubCommand.java b/src/main/java/cc/fascinated/bat/base/commands/utility/lookup/UserSubCommand.java similarity index 93% rename from src/main/java/cc/fascinated/bat/features/base/commands/utility/lookup/UserSubCommand.java rename to src/main/java/cc/fascinated/bat/base/commands/utility/lookup/UserSubCommand.java index b1c8577..c25c86f 100644 --- a/src/main/java/cc/fascinated/bat/features/base/commands/utility/lookup/UserSubCommand.java +++ b/src/main/java/cc/fascinated/bat/base/commands/utility/lookup/UserSubCommand.java @@ -1,11 +1,11 @@ -package cc.fascinated.bat.features.base.commands.utility.lookup; +package cc.fascinated.bat.base.commands.utility.lookup; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.DescriptionBuilder; import cc.fascinated.bat.common.EmbedUtils; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import cc.fascinated.bat.service.UserService; import lombok.NonNull; import net.dv8tion.jda.api.entities.Member; diff --git a/src/main/java/cc/fascinated/bat/features/birthday/BirthdayFeature.java b/src/main/java/cc/fascinated/bat/birthday/BirthdayFeature.java similarity index 82% rename from src/main/java/cc/fascinated/bat/features/birthday/BirthdayFeature.java rename to src/main/java/cc/fascinated/bat/birthday/BirthdayFeature.java index c1cda9d..3bc3d52 100644 --- a/src/main/java/cc/fascinated/bat/features/birthday/BirthdayFeature.java +++ b/src/main/java/cc/fascinated/bat/birthday/BirthdayFeature.java @@ -1,11 +1,11 @@ -package cc.fascinated.bat.features.birthday; +package cc.fascinated.bat.birthday; import cc.fascinated.bat.event.EventListener; -import cc.fascinated.bat.features.Feature; -import cc.fascinated.bat.features.FeatureProfile; -import cc.fascinated.bat.features.birthday.command.BirthdayCommand; -import cc.fascinated.bat.features.birthday.profile.BirthdayProfile; -import cc.fascinated.bat.model.BatGuild; +import cc.fascinated.bat.common.feature.Feature; +import cc.fascinated.bat.common.feature.FeatureProfile; +import cc.fascinated.bat.birthday.command.BirthdayCommand; +import cc.fascinated.bat.birthday.profile.BirthdayProfile; +import cc.fascinated.bat.common.model.BatGuild; import cc.fascinated.bat.service.CommandService; import cc.fascinated.bat.service.DiscordService; import cc.fascinated.bat.service.GuildService; diff --git a/src/main/java/cc/fascinated/bat/features/birthday/UserBirthday.java b/src/main/java/cc/fascinated/bat/birthday/UserBirthday.java similarity index 97% rename from src/main/java/cc/fascinated/bat/features/birthday/UserBirthday.java rename to src/main/java/cc/fascinated/bat/birthday/UserBirthday.java index 833e83a..a942711 100644 --- a/src/main/java/cc/fascinated/bat/features/birthday/UserBirthday.java +++ b/src/main/java/cc/fascinated/bat/birthday/UserBirthday.java @@ -1,4 +1,4 @@ -package cc.fascinated.bat.features.birthday; +package cc.fascinated.bat.birthday; import cc.fascinated.bat.common.Serializable; import com.google.gson.Gson; diff --git a/src/main/java/cc/fascinated/bat/features/birthday/command/BirthdayCommand.java b/src/main/java/cc/fascinated/bat/birthday/command/BirthdayCommand.java similarity index 81% rename from src/main/java/cc/fascinated/bat/features/birthday/command/BirthdayCommand.java rename to src/main/java/cc/fascinated/bat/birthday/command/BirthdayCommand.java index dee1388..000b244 100644 --- a/src/main/java/cc/fascinated/bat/features/birthday/command/BirthdayCommand.java +++ b/src/main/java/cc/fascinated/bat/birthday/command/BirthdayCommand.java @@ -1,8 +1,8 @@ -package cc.fascinated.bat.features.birthday.command; +package cc.fascinated.bat.birthday.command; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.Category; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.Category; +import cc.fascinated.bat.common.command.CommandInfo; import lombok.NonNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; diff --git a/src/main/java/cc/fascinated/bat/features/birthday/command/ChannelSubCommand.java b/src/main/java/cc/fascinated/bat/birthday/command/ChannelSubCommand.java similarity index 90% rename from src/main/java/cc/fascinated/bat/features/birthday/command/ChannelSubCommand.java rename to src/main/java/cc/fascinated/bat/birthday/command/ChannelSubCommand.java index 23a919e..831d32c 100644 --- a/src/main/java/cc/fascinated/bat/features/birthday/command/ChannelSubCommand.java +++ b/src/main/java/cc/fascinated/bat/birthday/command/ChannelSubCommand.java @@ -1,12 +1,12 @@ -package cc.fascinated.bat.features.birthday.command; +package cc.fascinated.bat.birthday.command; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.EmbedUtils; import cc.fascinated.bat.common.TextChannelUtils; -import cc.fascinated.bat.features.birthday.profile.BirthdayProfile; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.birthday.profile.BirthdayProfile; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import lombok.NonNull; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.Member; diff --git a/src/main/java/cc/fascinated/bat/features/birthday/command/MessageSubCommand.java b/src/main/java/cc/fascinated/bat/birthday/command/MessageSubCommand.java similarity index 88% rename from src/main/java/cc/fascinated/bat/features/birthday/command/MessageSubCommand.java rename to src/main/java/cc/fascinated/bat/birthday/command/MessageSubCommand.java index bd62712..1554e09 100644 --- a/src/main/java/cc/fascinated/bat/features/birthday/command/MessageSubCommand.java +++ b/src/main/java/cc/fascinated/bat/birthday/command/MessageSubCommand.java @@ -1,11 +1,11 @@ -package cc.fascinated.bat.features.birthday.command; +package cc.fascinated.bat.birthday.command; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.EmbedUtils; -import cc.fascinated.bat.features.birthday.profile.BirthdayProfile; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.birthday.profile.BirthdayProfile; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import lombok.NonNull; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.Member; diff --git a/src/main/java/cc/fascinated/bat/features/birthday/command/PrivateSubCommand.java b/src/main/java/cc/fascinated/bat/birthday/command/PrivateSubCommand.java similarity index 85% rename from src/main/java/cc/fascinated/bat/features/birthday/command/PrivateSubCommand.java rename to src/main/java/cc/fascinated/bat/birthday/command/PrivateSubCommand.java index 2697c19..1488d7e 100644 --- a/src/main/java/cc/fascinated/bat/features/birthday/command/PrivateSubCommand.java +++ b/src/main/java/cc/fascinated/bat/birthday/command/PrivateSubCommand.java @@ -1,12 +1,12 @@ -package cc.fascinated.bat.features.birthday.command; +package cc.fascinated.bat.birthday.command; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.EmbedUtils; -import cc.fascinated.bat.features.birthday.UserBirthday; -import cc.fascinated.bat.features.birthday.profile.BirthdayProfile; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.birthday.UserBirthday; +import cc.fascinated.bat.birthday.profile.BirthdayProfile; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import lombok.NonNull; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; diff --git a/src/main/java/cc/fascinated/bat/features/birthday/command/RemoveSubCommand.java b/src/main/java/cc/fascinated/bat/birthday/command/RemoveSubCommand.java similarity index 77% rename from src/main/java/cc/fascinated/bat/features/birthday/command/RemoveSubCommand.java rename to src/main/java/cc/fascinated/bat/birthday/command/RemoveSubCommand.java index 6d39033..b169d7a 100644 --- a/src/main/java/cc/fascinated/bat/features/birthday/command/RemoveSubCommand.java +++ b/src/main/java/cc/fascinated/bat/birthday/command/RemoveSubCommand.java @@ -1,11 +1,11 @@ -package cc.fascinated.bat.features.birthday.command; +package cc.fascinated.bat.birthday.command; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.EmbedUtils; -import cc.fascinated.bat.features.birthday.profile.BirthdayProfile; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.birthday.profile.BirthdayProfile; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import lombok.NonNull; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; diff --git a/src/main/java/cc/fascinated/bat/features/birthday/command/SetSubCommand.java b/src/main/java/cc/fascinated/bat/birthday/command/SetSubCommand.java similarity index 90% rename from src/main/java/cc/fascinated/bat/features/birthday/command/SetSubCommand.java rename to src/main/java/cc/fascinated/bat/birthday/command/SetSubCommand.java index 66b0029..1e2086b 100644 --- a/src/main/java/cc/fascinated/bat/features/birthday/command/SetSubCommand.java +++ b/src/main/java/cc/fascinated/bat/birthday/command/SetSubCommand.java @@ -1,12 +1,12 @@ -package cc.fascinated.bat.features.birthday.command; +package cc.fascinated.bat.birthday.command; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.EmbedUtils; -import cc.fascinated.bat.features.birthday.UserBirthday; -import cc.fascinated.bat.features.birthday.profile.BirthdayProfile; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.birthday.UserBirthday; +import cc.fascinated.bat.birthday.profile.BirthdayProfile; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import lombok.NonNull; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; diff --git a/src/main/java/cc/fascinated/bat/features/birthday/command/ViewSubCommand.java b/src/main/java/cc/fascinated/bat/birthday/command/ViewSubCommand.java similarity index 89% rename from src/main/java/cc/fascinated/bat/features/birthday/command/ViewSubCommand.java rename to src/main/java/cc/fascinated/bat/birthday/command/ViewSubCommand.java index c11976e..d8d9564 100644 --- a/src/main/java/cc/fascinated/bat/features/birthday/command/ViewSubCommand.java +++ b/src/main/java/cc/fascinated/bat/birthday/command/ViewSubCommand.java @@ -1,12 +1,12 @@ -package cc.fascinated.bat.features.birthday.command; +package cc.fascinated.bat.birthday.command; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.EmbedUtils; -import cc.fascinated.bat.features.birthday.UserBirthday; -import cc.fascinated.bat.features.birthday.profile.BirthdayProfile; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.birthday.UserBirthday; +import cc.fascinated.bat.birthday.profile.BirthdayProfile; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import cc.fascinated.bat.service.UserService; import lombok.NonNull; import net.dv8tion.jda.api.entities.Member; diff --git a/src/main/java/cc/fascinated/bat/features/birthday/profile/BirthdayProfile.java b/src/main/java/cc/fascinated/bat/birthday/profile/BirthdayProfile.java similarity index 97% rename from src/main/java/cc/fascinated/bat/features/birthday/profile/BirthdayProfile.java rename to src/main/java/cc/fascinated/bat/birthday/profile/BirthdayProfile.java index 8fee006..c98de4a 100644 --- a/src/main/java/cc/fascinated/bat/features/birthday/profile/BirthdayProfile.java +++ b/src/main/java/cc/fascinated/bat/birthday/profile/BirthdayProfile.java @@ -1,9 +1,9 @@ -package cc.fascinated.bat.features.birthday.profile; +package cc.fascinated.bat.birthday.profile; import cc.fascinated.bat.common.ChannelUtils; import cc.fascinated.bat.common.Serializable; -import cc.fascinated.bat.features.birthday.UserBirthday; -import cc.fascinated.bat.model.BatGuild; +import cc.fascinated.bat.birthday.UserBirthday; +import cc.fascinated.bat.common.model.BatGuild; import com.google.gson.Gson; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/main/java/cc/fascinated/bat/common/MemberUtils.java b/src/main/java/cc/fascinated/bat/common/MemberUtils.java index f1a22b4..a2980b9 100644 --- a/src/main/java/cc/fascinated/bat/common/MemberUtils.java +++ b/src/main/java/cc/fascinated/bat/common/MemberUtils.java @@ -1,7 +1,7 @@ package cc.fascinated.bat.common; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Role; diff --git a/src/main/java/cc/fascinated/bat/common/PasteUtils.java b/src/main/java/cc/fascinated/bat/common/PasteUtils.java index e5c9c71..8b550e7 100644 --- a/src/main/java/cc/fascinated/bat/common/PasteUtils.java +++ b/src/main/java/cc/fascinated/bat/common/PasteUtils.java @@ -1,7 +1,7 @@ package cc.fascinated.bat.common; import cc.fascinated.bat.BatApplication; -import cc.fascinated.bat.model.token.paste.PasteUploadToken; +import cc.fascinated.bat.common.model.token.paste.PasteUploadToken; import lombok.SneakyThrows; import lombok.experimental.UtilityClass; import lombok.extern.log4j.Log4j2; diff --git a/src/main/java/cc/fascinated/bat/common/RoleUtils.java b/src/main/java/cc/fascinated/bat/common/RoleUtils.java index 53cd74c..4cf240b 100644 --- a/src/main/java/cc/fascinated/bat/common/RoleUtils.java +++ b/src/main/java/cc/fascinated/bat/common/RoleUtils.java @@ -1,6 +1,6 @@ package cc.fascinated.bat.common; -import cc.fascinated.bat.model.BatGuild; +import cc.fascinated.bat.common.model.BatGuild; import lombok.experimental.UtilityClass; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.Member; diff --git a/src/main/java/cc/fascinated/bat/common/beatsaber/leaderboard/Leaderboard.java b/src/main/java/cc/fascinated/bat/common/beatsaber/leaderboard/Leaderboard.java deleted file mode 100644 index f620392..0000000 --- a/src/main/java/cc/fascinated/bat/common/beatsaber/leaderboard/Leaderboard.java +++ /dev/null @@ -1,22 +0,0 @@ -package cc.fascinated.bat.common.beatsaber.leaderboard; - -import lombok.AllArgsConstructor; -import lombok.Getter; - -@AllArgsConstructor @Getter -public class Leaderboard { - /** - * The name of the leaderboard. - */ - private final String name; - - /** - * The version of the leaderboard. - */ - private int curveVersion; - - /** - * The curve of the leaderboard. - */ - private final LeaderboardCurvePoint[] curve; -} diff --git a/src/main/java/cc/fascinated/bat/common/beatsaber/leaderboard/LeaderboardCurvePoint.java b/src/main/java/cc/fascinated/bat/common/beatsaber/leaderboard/LeaderboardCurvePoint.java deleted file mode 100644 index d1038ad..0000000 --- a/src/main/java/cc/fascinated/bat/common/beatsaber/leaderboard/LeaderboardCurvePoint.java +++ /dev/null @@ -1,10 +0,0 @@ -package cc.fascinated.bat.common.beatsaber.leaderboard; - -import lombok.AllArgsConstructor; -import lombok.Getter; - -@Getter @AllArgsConstructor -public class LeaderboardCurvePoint { - private final double a; - private final double b; -} diff --git a/src/main/java/cc/fascinated/bat/common/beatsaber/leaderboard/impl/ScoreSaberLeaderboard.java b/src/main/java/cc/fascinated/bat/common/beatsaber/leaderboard/impl/ScoreSaberLeaderboard.java deleted file mode 100644 index c2cc977..0000000 --- a/src/main/java/cc/fascinated/bat/common/beatsaber/leaderboard/impl/ScoreSaberLeaderboard.java +++ /dev/null @@ -1,167 +0,0 @@ -package cc.fascinated.bat.common.beatsaber.leaderboard.impl; - -import cc.fascinated.bat.common.MathUtils; -import cc.fascinated.bat.common.beatsaber.leaderboard.Leaderboard; -import cc.fascinated.bat.common.beatsaber.leaderboard.LeaderboardCurvePoint; -import cc.fascinated.bat.model.token.beatsaber.scoresaber.ScoreSaberScoreToken; -import lombok.extern.log4j.Log4j2; - -import java.util.ArrayList; -import java.util.List; - -@Log4j2(topic = "ScoreSaber Leaderboard") -public class ScoreSaberLeaderboard extends Leaderboard { - public static final ScoreSaberLeaderboard INSTANCE = new ScoreSaberLeaderboard(); - - /** - * The base multiplier for stars. - */ - private final double starMultiplier = 42.11; - - /** - * no idea, ngl - */ - private final double weightCoefficient = 0.965; - - public ScoreSaberLeaderboard() { - super("ScoreSaber", 1, new LeaderboardCurvePoint[] { - new LeaderboardCurvePoint(1.0, 5.367394282890631), - new LeaderboardCurvePoint(0.9995, 5.019543595874787), - new LeaderboardCurvePoint(0.999, 4.715470646416203), - new LeaderboardCurvePoint(0.99825, 4.325027383589547), - new LeaderboardCurvePoint(0.9975, 3.996793606763322), - new LeaderboardCurvePoint(0.99625, 3.5526145337555373), - new LeaderboardCurvePoint(0.995, 3.2022017597337955), - new LeaderboardCurvePoint(0.99375, 2.9190155639254955), - new LeaderboardCurvePoint(0.9925, 2.685667856592722), - new LeaderboardCurvePoint(0.99125, 2.4902905794106913), - new LeaderboardCurvePoint(0.99, 2.324506282149922), - new LeaderboardCurvePoint(0.9875, 2.058947159052738), - new LeaderboardCurvePoint(0.985, 1.8563887693647105), - new LeaderboardCurvePoint(0.9825, 1.697536248647543), - new LeaderboardCurvePoint(0.98, 1.5702410055532239), - new LeaderboardCurvePoint(0.9775, 1.4664726399289512), - new LeaderboardCurvePoint(0.975, 1.3807102743105126), - new LeaderboardCurvePoint(0.9725, 1.3090333065057616), - new LeaderboardCurvePoint(0.97, 1.2485807759957321), - new LeaderboardCurvePoint(0.965, 1.1552120359501035), - new LeaderboardCurvePoint(0.96, 1.0871883573850478), - new LeaderboardCurvePoint(0.955, 1.0388633331418984), - new LeaderboardCurvePoint(0.95, 1.0), - new LeaderboardCurvePoint(0.94, 0.9417362980580238), - new LeaderboardCurvePoint(0.93, 0.9039994071865736), - new LeaderboardCurvePoint(0.92, 0.8728710341448851), - new LeaderboardCurvePoint(0.91, 0.8488375988124467), - new LeaderboardCurvePoint(0.9, 0.825756123560842), - new LeaderboardCurvePoint(0.875, 0.7816934560296046), - new LeaderboardCurvePoint(0.85, 0.7462290664143185), - new LeaderboardCurvePoint(0.825, 0.7150465663454271), - new LeaderboardCurvePoint(0.8, 0.6872268862950283), - new LeaderboardCurvePoint(0.75, 0.6451808210101443), - new LeaderboardCurvePoint(0.7, 0.6125565959114954), - new LeaderboardCurvePoint(0.65, 0.5866010012767576), - new LeaderboardCurvePoint(0.6, 0.18223233667439062), - new LeaderboardCurvePoint(0.0, 0.0) - }); - } - - /** - * Gets the modifier for the given accuracy. - * - * @param accuracy The accuracy. - * @return The modifier. - */ - public double getModifier(double accuracy) { - accuracy = MathUtils.clamp(accuracy, 0, 100) / 100; - - LeaderboardCurvePoint prev = this.getCurve()[1]; - for (LeaderboardCurvePoint point : this.getCurve()) { - if (point.getA() <= accuracy) { - double distance = (prev.getA() - accuracy) / (prev.getA() - point.getA()); - return MathUtils.lerp(prev.getB(), point.getB(), distance); - } - prev = point; - } - return 0; - } - - /** - * Gets the pp for the given accuracy and stars. - * - * @param accuracy The accuracy. - * @param stars The stars. - * @return The pp. - */ - public double getPP(double accuracy, double stars) { - double pp = stars * this.starMultiplier; - double modifier = this.getModifier(accuracy); - return modifier * pp; - } - - /** - * Gets the total pp for the given scores. - * - * @param scores The scores. - * @return The total pp. - */ - private double getTotalPP(List scores, int startIdx) { - double totalPP = 0; - for (int i = 0; i < scores.size(); i++) { - totalPP += Math.pow(this.weightCoefficient, i + startIdx) * scores.get(i).getPp(); - } - return totalPP; - } - - /** - * Gets the pp at the given index for the given scores. - * - * @param bottomScores The scores. - * @param idx The index. - * @return The pp. - */ - private double getRawPPAtIdx(List bottomScores, int idx, double expected) { - double oldBottomPP = this.getTotalPP(bottomScores, idx); - double newBottomPP = this.getTotalPP(bottomScores, idx + 1); - - return (expected + oldBottomPP - newBottomPP) / Math.pow(this.weightCoefficient, idx); - } - - /** - * Gets the raw pp per global pp for the given scores. - * - * @param scores The scores. - * @param expectedPP The expected pp. - * @return The raw pp per global pp. - */ - public double getRawPerGlobalPP(List scores, double expectedPP) { - int left = 0; - int right = scores.size() - 1; - int boundaryIdx = -1; - - // Sort by PP - scores.sort((a, b) -> Double.compare(b.getPp(), a.getPp())); - - while (left <= right) { - int mid = (left + right) / 2; - double bottomPP = this.getTotalPP(scores.subList(mid, scores.size()), mid); - - List bottomSlice = new ArrayList<>(scores.subList(mid, scores.size())); - bottomSlice.add(0, scores.get(mid)); - double modifiedBottomPP = this.getTotalPP(bottomSlice, mid); - double diff = modifiedBottomPP - bottomPP; - - if (diff > expectedPP) { - boundaryIdx = mid; - left = mid + 1; - } else { - right = mid - 1; - } - } - - if (boundaryIdx == -1) { - return this.getRawPPAtIdx(scores, 0, expectedPP); - } else { - return this.getRawPPAtIdx(scores.subList(boundaryIdx + 1, scores.size()), boundaryIdx + 1, expectedPP); - } - } -} diff --git a/src/main/java/cc/fascinated/bat/command/BatCommand.java b/src/main/java/cc/fascinated/bat/common/command/BatCommand.java similarity index 97% rename from src/main/java/cc/fascinated/bat/command/BatCommand.java rename to src/main/java/cc/fascinated/bat/common/command/BatCommand.java index 0c5c1e8..d1adc8f 100644 --- a/src/main/java/cc/fascinated/bat/command/BatCommand.java +++ b/src/main/java/cc/fascinated/bat/common/command/BatCommand.java @@ -1,8 +1,8 @@ -package cc.fascinated.bat.command; +package cc.fascinated.bat.common.command; -import cc.fascinated.bat.features.Feature; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.common.feature.Feature; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import lombok.*; import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.entities.Member; diff --git a/src/main/java/cc/fascinated/bat/command/Category.java b/src/main/java/cc/fascinated/bat/common/command/Category.java similarity index 97% rename from src/main/java/cc/fascinated/bat/command/Category.java rename to src/main/java/cc/fascinated/bat/common/command/Category.java index 729f29a..adf1c5b 100644 --- a/src/main/java/cc/fascinated/bat/command/Category.java +++ b/src/main/java/cc/fascinated/bat/common/command/Category.java @@ -1,4 +1,4 @@ -package cc.fascinated.bat.command; +package cc.fascinated.bat.common.command; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/cc/fascinated/bat/command/CommandInfo.java b/src/main/java/cc/fascinated/bat/common/command/CommandInfo.java similarity index 97% rename from src/main/java/cc/fascinated/bat/command/CommandInfo.java rename to src/main/java/cc/fascinated/bat/common/command/CommandInfo.java index ebecf3e..778eb2b 100644 --- a/src/main/java/cc/fascinated/bat/command/CommandInfo.java +++ b/src/main/java/cc/fascinated/bat/common/command/CommandInfo.java @@ -1,4 +1,4 @@ -package cc.fascinated.bat.command; +package cc.fascinated.bat.common.command; import net.dv8tion.jda.api.Permission; diff --git a/src/main/java/cc/fascinated/bat/command/InternalCommandInfo.java b/src/main/java/cc/fascinated/bat/common/command/InternalCommandInfo.java similarity index 97% rename from src/main/java/cc/fascinated/bat/command/InternalCommandInfo.java rename to src/main/java/cc/fascinated/bat/common/command/InternalCommandInfo.java index 3c463a3..e5bf044 100644 --- a/src/main/java/cc/fascinated/bat/command/InternalCommandInfo.java +++ b/src/main/java/cc/fascinated/bat/common/command/InternalCommandInfo.java @@ -1,4 +1,4 @@ -package cc.fascinated.bat.command; +package cc.fascinated.bat.common.command; import lombok.AccessLevel; import lombok.Getter; diff --git a/src/main/java/cc/fascinated/bat/features/Feature.java b/src/main/java/cc/fascinated/bat/common/feature/Feature.java similarity index 92% rename from src/main/java/cc/fascinated/bat/features/Feature.java rename to src/main/java/cc/fascinated/bat/common/feature/Feature.java index d5b1607..5f9837b 100644 --- a/src/main/java/cc/fascinated/bat/features/Feature.java +++ b/src/main/java/cc/fascinated/bat/common/feature/Feature.java @@ -1,6 +1,6 @@ -package cc.fascinated.bat.features; +package cc.fascinated.bat.common.feature; -import cc.fascinated.bat.command.BatCommand; +import cc.fascinated.bat.common.command.BatCommand; import cc.fascinated.bat.service.CommandService; import lombok.Getter; import lombok.NonNull; diff --git a/src/main/java/cc/fascinated/bat/features/FeatureProfile.java b/src/main/java/cc/fascinated/bat/common/feature/FeatureProfile.java similarity index 98% rename from src/main/java/cc/fascinated/bat/features/FeatureProfile.java rename to src/main/java/cc/fascinated/bat/common/feature/FeatureProfile.java index aa6617f..0591779 100644 --- a/src/main/java/cc/fascinated/bat/features/FeatureProfile.java +++ b/src/main/java/cc/fascinated/bat/common/feature/FeatureProfile.java @@ -1,4 +1,4 @@ -package cc.fascinated.bat.features; +package cc.fascinated.bat.common.feature; import cc.fascinated.bat.common.Serializable; import com.google.gson.Gson; diff --git a/src/main/java/cc/fascinated/bat/model/BatGuild.java b/src/main/java/cc/fascinated/bat/common/model/BatGuild.java similarity index 88% rename from src/main/java/cc/fascinated/bat/model/BatGuild.java rename to src/main/java/cc/fascinated/bat/common/model/BatGuild.java index 94c22a8..1e97f8b 100644 --- a/src/main/java/cc/fascinated/bat/model/BatGuild.java +++ b/src/main/java/cc/fascinated/bat/common/model/BatGuild.java @@ -1,18 +1,18 @@ -package cc.fascinated.bat.model; +package cc.fascinated.bat.common.model; import cc.fascinated.bat.BatApplication; import cc.fascinated.bat.common.ProfileHolder; import cc.fascinated.bat.common.Serializable; -import cc.fascinated.bat.features.FeatureProfile; -import cc.fascinated.bat.features.birthday.profile.BirthdayProfile; -import cc.fascinated.bat.features.counter.CounterProfile; -import cc.fascinated.bat.features.leveling.LevelingProfile; -import cc.fascinated.bat.features.logging.LogProfile; -import cc.fascinated.bat.features.moderation.punish.PunishmentProfile; -import cc.fascinated.bat.features.namehistory.profile.guild.NameHistoryProfile; -import cc.fascinated.bat.features.reminder.ReminderProfile; -import cc.fascinated.bat.features.statschannel.StatsChannelProfile; -import cc.fascinated.bat.features.welcomer.WelcomerProfile; +import cc.fascinated.bat.common.feature.FeatureProfile; +import cc.fascinated.bat.birthday.profile.BirthdayProfile; +import cc.fascinated.bat.counter.CounterProfile; +import cc.fascinated.bat.leveling.LevelingProfile; +import cc.fascinated.bat.logging.LogProfile; +import cc.fascinated.bat.moderation.punish.PunishmentProfile; +import cc.fascinated.bat.namehistory.profile.guild.NameHistoryProfile; +import cc.fascinated.bat.reminder.ReminderProfile; +import cc.fascinated.bat.statschannel.StatsChannelProfile; +import cc.fascinated.bat.welcomer.WelcomerProfile; import cc.fascinated.bat.premium.PremiumProfile; import cc.fascinated.bat.service.DiscordService; import cc.fascinated.bat.service.MongoService; diff --git a/src/main/java/cc/fascinated/bat/model/BatUser.java b/src/main/java/cc/fascinated/bat/common/model/BatUser.java similarity index 96% rename from src/main/java/cc/fascinated/bat/model/BatUser.java rename to src/main/java/cc/fascinated/bat/common/model/BatUser.java index e52d8e5..aeef35e 100644 --- a/src/main/java/cc/fascinated/bat/model/BatUser.java +++ b/src/main/java/cc/fascinated/bat/common/model/BatUser.java @@ -1,10 +1,10 @@ -package cc.fascinated.bat.model; +package cc.fascinated.bat.common.model; import cc.fascinated.bat.BatApplication; import cc.fascinated.bat.common.ProfileHolder; import cc.fascinated.bat.common.Serializable; import cc.fascinated.bat.common.UserUtils; -import cc.fascinated.bat.features.namehistory.profile.user.NameHistoryProfile; +import cc.fascinated.bat.namehistory.profile.user.NameHistoryProfile; import cc.fascinated.bat.service.DiscordService; import cc.fascinated.bat.service.MongoService; import com.mongodb.client.model.ReplaceOptions; diff --git a/src/main/java/cc/fascinated/bat/model/DiscordMessage.java b/src/main/java/cc/fascinated/bat/common/model/DiscordMessage.java similarity index 97% rename from src/main/java/cc/fascinated/bat/model/DiscordMessage.java rename to src/main/java/cc/fascinated/bat/common/model/DiscordMessage.java index 829053f..a9eac76 100644 --- a/src/main/java/cc/fascinated/bat/model/DiscordMessage.java +++ b/src/main/java/cc/fascinated/bat/common/model/DiscordMessage.java @@ -1,4 +1,4 @@ -package cc.fascinated.bat.model; +package cc.fascinated.bat.common.model; import cc.fascinated.bat.common.ChannelUtils; import cc.fascinated.bat.common.UserUtils; diff --git a/src/main/java/cc/fascinated/bat/model/token/beatsaber/scoresaber/ScoreSaberAccountToken.java b/src/main/java/cc/fascinated/bat/common/model/token/beatsaber/scoresaber/ScoreSaberAccountToken.java similarity index 97% rename from src/main/java/cc/fascinated/bat/model/token/beatsaber/scoresaber/ScoreSaberAccountToken.java rename to src/main/java/cc/fascinated/bat/common/model/token/beatsaber/scoresaber/ScoreSaberAccountToken.java index a9e2584..f55e7c5 100644 --- a/src/main/java/cc/fascinated/bat/model/token/beatsaber/scoresaber/ScoreSaberAccountToken.java +++ b/src/main/java/cc/fascinated/bat/common/model/token/beatsaber/scoresaber/ScoreSaberAccountToken.java @@ -1,4 +1,4 @@ -package cc.fascinated.bat.model.token.beatsaber.scoresaber; +package cc.fascinated.bat.common.model.token.beatsaber.scoresaber; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/cc/fascinated/bat/model/token/beatsaber/scoresaber/ScoreSaberLeaderboardToken.java b/src/main/java/cc/fascinated/bat/common/model/token/beatsaber/scoresaber/ScoreSaberLeaderboardToken.java similarity index 97% rename from src/main/java/cc/fascinated/bat/model/token/beatsaber/scoresaber/ScoreSaberLeaderboardToken.java rename to src/main/java/cc/fascinated/bat/common/model/token/beatsaber/scoresaber/ScoreSaberLeaderboardToken.java index e8ca838..509bebe 100644 --- a/src/main/java/cc/fascinated/bat/model/token/beatsaber/scoresaber/ScoreSaberLeaderboardToken.java +++ b/src/main/java/cc/fascinated/bat/common/model/token/beatsaber/scoresaber/ScoreSaberLeaderboardToken.java @@ -1,4 +1,4 @@ -package cc.fascinated.bat.model.token.beatsaber.scoresaber; +package cc.fascinated.bat.common.model.token.beatsaber.scoresaber; import lombok.Getter; import lombok.ToString; diff --git a/src/main/java/cc/fascinated/bat/model/token/beatsaber/scoresaber/ScoreSaberPageMetadataToken.java b/src/main/java/cc/fascinated/bat/common/model/token/beatsaber/scoresaber/ScoreSaberPageMetadataToken.java similarity index 83% rename from src/main/java/cc/fascinated/bat/model/token/beatsaber/scoresaber/ScoreSaberPageMetadataToken.java rename to src/main/java/cc/fascinated/bat/common/model/token/beatsaber/scoresaber/ScoreSaberPageMetadataToken.java index 7782d36..2893a55 100644 --- a/src/main/java/cc/fascinated/bat/model/token/beatsaber/scoresaber/ScoreSaberPageMetadataToken.java +++ b/src/main/java/cc/fascinated/bat/common/model/token/beatsaber/scoresaber/ScoreSaberPageMetadataToken.java @@ -1,4 +1,4 @@ -package cc.fascinated.bat.model.token.beatsaber.scoresaber; +package cc.fascinated.bat.common.model.token.beatsaber.scoresaber; import lombok.Getter; import lombok.ToString; diff --git a/src/main/java/cc/fascinated/bat/model/token/beatsaber/scoresaber/ScoreSaberPlayerScoreToken.java b/src/main/java/cc/fascinated/bat/common/model/token/beatsaber/scoresaber/ScoreSaberPlayerScoreToken.java similarity index 82% rename from src/main/java/cc/fascinated/bat/model/token/beatsaber/scoresaber/ScoreSaberPlayerScoreToken.java rename to src/main/java/cc/fascinated/bat/common/model/token/beatsaber/scoresaber/ScoreSaberPlayerScoreToken.java index b090ce4..e88990a 100644 --- a/src/main/java/cc/fascinated/bat/model/token/beatsaber/scoresaber/ScoreSaberPlayerScoreToken.java +++ b/src/main/java/cc/fascinated/bat/common/model/token/beatsaber/scoresaber/ScoreSaberPlayerScoreToken.java @@ -1,4 +1,4 @@ -package cc.fascinated.bat.model.token.beatsaber.scoresaber; +package cc.fascinated.bat.common.model.token.beatsaber.scoresaber; import lombok.Getter; import lombok.ToString; diff --git a/src/main/java/cc/fascinated/bat/model/token/beatsaber/scoresaber/ScoreSaberScoreToken.java b/src/main/java/cc/fascinated/bat/common/model/token/beatsaber/scoresaber/ScoreSaberScoreToken.java similarity index 97% rename from src/main/java/cc/fascinated/bat/model/token/beatsaber/scoresaber/ScoreSaberScoreToken.java rename to src/main/java/cc/fascinated/bat/common/model/token/beatsaber/scoresaber/ScoreSaberScoreToken.java index 12f69c0..c04c9a3 100644 --- a/src/main/java/cc/fascinated/bat/model/token/beatsaber/scoresaber/ScoreSaberScoreToken.java +++ b/src/main/java/cc/fascinated/bat/common/model/token/beatsaber/scoresaber/ScoreSaberScoreToken.java @@ -1,4 +1,4 @@ -package cc.fascinated.bat.model.token.beatsaber.scoresaber; +package cc.fascinated.bat.common.model.token.beatsaber.scoresaber; import lombok.Getter; import lombok.ToString; diff --git a/src/main/java/cc/fascinated/bat/model/token/beatsaber/scoresaber/ScoreSaberScoresPageToken.java b/src/main/java/cc/fascinated/bat/common/model/token/beatsaber/scoresaber/ScoreSaberScoresPageToken.java similarity index 83% rename from src/main/java/cc/fascinated/bat/model/token/beatsaber/scoresaber/ScoreSaberScoresPageToken.java rename to src/main/java/cc/fascinated/bat/common/model/token/beatsaber/scoresaber/ScoreSaberScoresPageToken.java index 712cd77..d220887 100644 --- a/src/main/java/cc/fascinated/bat/model/token/beatsaber/scoresaber/ScoreSaberScoresPageToken.java +++ b/src/main/java/cc/fascinated/bat/common/model/token/beatsaber/scoresaber/ScoreSaberScoresPageToken.java @@ -1,4 +1,4 @@ -package cc.fascinated.bat.model.token.beatsaber.scoresaber; +package cc.fascinated.bat.common.model.token.beatsaber.scoresaber; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/cc/fascinated/bat/model/token/dogceo/RandomImage.java b/src/main/java/cc/fascinated/bat/common/model/token/dogceo/RandomImage.java similarity index 85% rename from src/main/java/cc/fascinated/bat/model/token/dogceo/RandomImage.java rename to src/main/java/cc/fascinated/bat/common/model/token/dogceo/RandomImage.java index f89af7b..cd52da2 100644 --- a/src/main/java/cc/fascinated/bat/model/token/dogceo/RandomImage.java +++ b/src/main/java/cc/fascinated/bat/common/model/token/dogceo/RandomImage.java @@ -1,4 +1,4 @@ -package cc.fascinated.bat.model.token.dogceo; +package cc.fascinated.bat.common.model.token.dogceo; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/cc/fascinated/bat/model/token/paste/PasteUploadToken.java b/src/main/java/cc/fascinated/bat/common/model/token/paste/PasteUploadToken.java similarity index 86% rename from src/main/java/cc/fascinated/bat/model/token/paste/PasteUploadToken.java rename to src/main/java/cc/fascinated/bat/common/model/token/paste/PasteUploadToken.java index ffec9e2..ef687b2 100644 --- a/src/main/java/cc/fascinated/bat/model/token/paste/PasteUploadToken.java +++ b/src/main/java/cc/fascinated/bat/common/model/token/paste/PasteUploadToken.java @@ -1,4 +1,4 @@ -package cc.fascinated.bat.model.token.paste; +package cc.fascinated.bat.common.model.token.paste; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/cc/fascinated/bat/model/token/randomd/RandomDuck.java b/src/main/java/cc/fascinated/bat/common/model/token/randomd/RandomDuck.java similarity index 76% rename from src/main/java/cc/fascinated/bat/model/token/randomd/RandomDuck.java rename to src/main/java/cc/fascinated/bat/common/model/token/randomd/RandomDuck.java index a3f3b31..4900a01 100644 --- a/src/main/java/cc/fascinated/bat/model/token/randomd/RandomDuck.java +++ b/src/main/java/cc/fascinated/bat/common/model/token/randomd/RandomDuck.java @@ -1,4 +1,4 @@ -package cc.fascinated.bat.model.token.randomd; +package cc.fascinated.bat.common.model.token.randomd; import lombok.Getter; diff --git a/src/main/java/cc/fascinated/bat/model/token/randomfox/RandomFoxToken.java b/src/main/java/cc/fascinated/bat/common/model/token/randomfox/RandomFoxToken.java similarity index 84% rename from src/main/java/cc/fascinated/bat/model/token/randomfox/RandomFoxToken.java rename to src/main/java/cc/fascinated/bat/common/model/token/randomfox/RandomFoxToken.java index c59b169..f7be29b 100644 --- a/src/main/java/cc/fascinated/bat/model/token/randomfox/RandomFoxToken.java +++ b/src/main/java/cc/fascinated/bat/common/model/token/randomfox/RandomFoxToken.java @@ -1,4 +1,4 @@ -package cc.fascinated.bat.model.token.randomfox; +package cc.fascinated.bat.common.model.token.randomfox; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/cc/fascinated/bat/model/token/thecatapi/CatImageToken.java b/src/main/java/cc/fascinated/bat/common/model/token/thecatapi/CatImageToken.java similarity index 88% rename from src/main/java/cc/fascinated/bat/model/token/thecatapi/CatImageToken.java rename to src/main/java/cc/fascinated/bat/common/model/token/thecatapi/CatImageToken.java index f4b4dbb..7674147 100644 --- a/src/main/java/cc/fascinated/bat/model/token/thecatapi/CatImageToken.java +++ b/src/main/java/cc/fascinated/bat/common/model/token/thecatapi/CatImageToken.java @@ -1,4 +1,4 @@ -package cc.fascinated.bat.model.token.thecatapi; +package cc.fascinated.bat.common.model.token.thecatapi; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/cc/fascinated/bat/features/counter/CounterChannel.java b/src/main/java/cc/fascinated/bat/counter/CounterChannel.java similarity index 97% rename from src/main/java/cc/fascinated/bat/features/counter/CounterChannel.java rename to src/main/java/cc/fascinated/bat/counter/CounterChannel.java index 62424ef..0abb838 100644 --- a/src/main/java/cc/fascinated/bat/features/counter/CounterChannel.java +++ b/src/main/java/cc/fascinated/bat/counter/CounterChannel.java @@ -1,4 +1,4 @@ -package cc.fascinated.bat.features.counter; +package cc.fascinated.bat.counter; import cc.fascinated.bat.common.ChannelUtils; import cc.fascinated.bat.common.NumberUtils; diff --git a/src/main/java/cc/fascinated/bat/features/counter/CounterFeature.java b/src/main/java/cc/fascinated/bat/counter/CounterFeature.java similarity index 75% rename from src/main/java/cc/fascinated/bat/features/counter/CounterFeature.java rename to src/main/java/cc/fascinated/bat/counter/CounterFeature.java index 25abbd6..9243351 100644 --- a/src/main/java/cc/fascinated/bat/features/counter/CounterFeature.java +++ b/src/main/java/cc/fascinated/bat/counter/CounterFeature.java @@ -1,8 +1,8 @@ -package cc.fascinated.bat.features.counter; +package cc.fascinated.bat.counter; -import cc.fascinated.bat.features.Feature; -import cc.fascinated.bat.features.FeatureProfile; -import cc.fascinated.bat.features.counter.command.CounterCommand; +import cc.fascinated.bat.common.feature.Feature; +import cc.fascinated.bat.common.feature.FeatureProfile; +import cc.fascinated.bat.counter.command.CounterCommand; import cc.fascinated.bat.service.CommandService; import lombok.NonNull; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/cc/fascinated/bat/features/counter/CounterProfile.java b/src/main/java/cc/fascinated/bat/counter/CounterProfile.java similarity index 98% rename from src/main/java/cc/fascinated/bat/features/counter/CounterProfile.java rename to src/main/java/cc/fascinated/bat/counter/CounterProfile.java index b1fd26c..f96c810 100644 --- a/src/main/java/cc/fascinated/bat/features/counter/CounterProfile.java +++ b/src/main/java/cc/fascinated/bat/counter/CounterProfile.java @@ -1,4 +1,4 @@ -package cc.fascinated.bat.features.counter; +package cc.fascinated.bat.counter; import cc.fascinated.bat.common.Serializable; import com.google.gson.Gson; diff --git a/src/main/java/cc/fascinated/bat/features/counter/CounterResult.java b/src/main/java/cc/fascinated/bat/counter/CounterResult.java similarity index 73% rename from src/main/java/cc/fascinated/bat/features/counter/CounterResult.java rename to src/main/java/cc/fascinated/bat/counter/CounterResult.java index a857a22..a37ca9a 100644 --- a/src/main/java/cc/fascinated/bat/features/counter/CounterResult.java +++ b/src/main/java/cc/fascinated/bat/counter/CounterResult.java @@ -1,4 +1,4 @@ -package cc.fascinated.bat.features.counter; +package cc.fascinated.bat.counter; /** * @author Fascinated (fascinated7) diff --git a/src/main/java/cc/fascinated/bat/features/counter/CountingListener.java b/src/main/java/cc/fascinated/bat/counter/CountingListener.java similarity index 90% rename from src/main/java/cc/fascinated/bat/features/counter/CountingListener.java rename to src/main/java/cc/fascinated/bat/counter/CountingListener.java index eede287..26e55ff 100644 --- a/src/main/java/cc/fascinated/bat/features/counter/CountingListener.java +++ b/src/main/java/cc/fascinated/bat/counter/CountingListener.java @@ -1,9 +1,9 @@ -package cc.fascinated.bat.features.counter; +package cc.fascinated.bat.counter; import cc.fascinated.bat.event.EventListener; -import cc.fascinated.bat.features.FeatureProfile; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.common.feature.FeatureProfile; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import lombok.NonNull; import net.dv8tion.jda.api.entities.emoji.Emoji; import net.dv8tion.jda.api.events.message.MessageReceivedEvent; diff --git a/src/main/java/cc/fascinated/bat/features/counter/command/CounterCommand.java b/src/main/java/cc/fascinated/bat/counter/command/CounterCommand.java similarity index 84% rename from src/main/java/cc/fascinated/bat/features/counter/command/CounterCommand.java rename to src/main/java/cc/fascinated/bat/counter/command/CounterCommand.java index a19022d..e8f6182 100644 --- a/src/main/java/cc/fascinated/bat/features/counter/command/CounterCommand.java +++ b/src/main/java/cc/fascinated/bat/counter/command/CounterCommand.java @@ -1,7 +1,7 @@ -package cc.fascinated.bat.features.counter.command; +package cc.fascinated.bat.counter.command; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.CommandInfo; import lombok.NonNull; import net.dv8tion.jda.api.Permission; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/cc/fascinated/bat/features/counter/command/RemoveSubCommand.java b/src/main/java/cc/fascinated/bat/counter/command/RemoveSubCommand.java similarity index 90% rename from src/main/java/cc/fascinated/bat/features/counter/command/RemoveSubCommand.java rename to src/main/java/cc/fascinated/bat/counter/command/RemoveSubCommand.java index e103002..07967b0 100644 --- a/src/main/java/cc/fascinated/bat/features/counter/command/RemoveSubCommand.java +++ b/src/main/java/cc/fascinated/bat/counter/command/RemoveSubCommand.java @@ -1,14 +1,14 @@ -package cc.fascinated.bat.features.counter.command; +package cc.fascinated.bat.counter.command; import cc.fascinated.bat.Emojis; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.EmbedUtils; import cc.fascinated.bat.common.NumberFormatter; -import cc.fascinated.bat.features.counter.CounterChannel; -import cc.fascinated.bat.features.counter.CounterProfile; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.counter.CounterChannel; +import cc.fascinated.bat.counter.CounterProfile; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import lombok.NonNull; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; diff --git a/src/main/java/cc/fascinated/bat/features/counter/command/SetBreakingSubCommand.java b/src/main/java/cc/fascinated/bat/counter/command/SetBreakingSubCommand.java similarity index 91% rename from src/main/java/cc/fascinated/bat/features/counter/command/SetBreakingSubCommand.java rename to src/main/java/cc/fascinated/bat/counter/command/SetBreakingSubCommand.java index 110eaf4..3445f85 100644 --- a/src/main/java/cc/fascinated/bat/features/counter/command/SetBreakingSubCommand.java +++ b/src/main/java/cc/fascinated/bat/counter/command/SetBreakingSubCommand.java @@ -1,13 +1,13 @@ -package cc.fascinated.bat.features.counter.command; +package cc.fascinated.bat.counter.command; import cc.fascinated.bat.Emojis; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.EmbedUtils; -import cc.fascinated.bat.features.counter.CounterChannel; -import cc.fascinated.bat.features.counter.CounterProfile; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.counter.CounterChannel; +import cc.fascinated.bat.counter.CounterProfile; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import lombok.NonNull; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; diff --git a/src/main/java/cc/fascinated/bat/features/counter/command/SetSubCommand.java b/src/main/java/cc/fascinated/bat/counter/command/SetSubCommand.java similarity index 90% rename from src/main/java/cc/fascinated/bat/features/counter/command/SetSubCommand.java rename to src/main/java/cc/fascinated/bat/counter/command/SetSubCommand.java index 8845381..e391d48 100644 --- a/src/main/java/cc/fascinated/bat/features/counter/command/SetSubCommand.java +++ b/src/main/java/cc/fascinated/bat/counter/command/SetSubCommand.java @@ -1,13 +1,13 @@ -package cc.fascinated.bat.features.counter.command; +package cc.fascinated.bat.counter.command; import cc.fascinated.bat.Emojis; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.EmbedUtils; -import cc.fascinated.bat.features.counter.CounterChannel; -import cc.fascinated.bat.features.counter.CounterProfile; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.counter.CounterChannel; +import cc.fascinated.bat.counter.CounterProfile; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import lombok.NonNull; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; diff --git a/src/main/java/cc/fascinated/bat/features/counter/command/SetupSubCommand.java b/src/main/java/cc/fascinated/bat/counter/command/SetupSubCommand.java similarity index 90% rename from src/main/java/cc/fascinated/bat/features/counter/command/SetupSubCommand.java rename to src/main/java/cc/fascinated/bat/counter/command/SetupSubCommand.java index 0a8c58f..78e009f 100644 --- a/src/main/java/cc/fascinated/bat/features/counter/command/SetupSubCommand.java +++ b/src/main/java/cc/fascinated/bat/counter/command/SetupSubCommand.java @@ -1,12 +1,12 @@ -package cc.fascinated.bat.features.counter.command; +package cc.fascinated.bat.counter.command; import cc.fascinated.bat.Emojis; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.EmbedUtils; -import cc.fascinated.bat.features.counter.CounterProfile; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.counter.CounterProfile; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import lombok.NonNull; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; diff --git a/src/main/java/cc/fascinated/bat/event/EventListener.java b/src/main/java/cc/fascinated/bat/event/EventListener.java index d266b04..527d503 100644 --- a/src/main/java/cc/fascinated/bat/event/EventListener.java +++ b/src/main/java/cc/fascinated/bat/event/EventListener.java @@ -1,11 +1,11 @@ package cc.fascinated.bat.event; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; -import cc.fascinated.bat.model.DiscordMessage; -import cc.fascinated.bat.model.token.beatsaber.scoresaber.ScoreSaberLeaderboardToken; -import cc.fascinated.bat.model.token.beatsaber.scoresaber.ScoreSaberPlayerScoreToken; -import cc.fascinated.bat.model.token.beatsaber.scoresaber.ScoreSaberScoreToken; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; +import cc.fascinated.bat.common.model.DiscordMessage; +import cc.fascinated.bat.common.model.token.beatsaber.scoresaber.ScoreSaberLeaderboardToken; +import cc.fascinated.bat.common.model.token.beatsaber.scoresaber.ScoreSaberPlayerScoreToken; +import cc.fascinated.bat.common.model.token.beatsaber.scoresaber.ScoreSaberScoreToken; import lombok.NonNull; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Invite; diff --git a/src/main/java/cc/fascinated/bat/features/drag/DragFeature.java b/src/main/java/cc/fascinated/bat/features/drag/DragFeature.java deleted file mode 100644 index 597dc1a..0000000 --- a/src/main/java/cc/fascinated/bat/features/drag/DragFeature.java +++ /dev/null @@ -1,23 +0,0 @@ -package cc.fascinated.bat.features.drag; - -import cc.fascinated.bat.features.Feature; -import cc.fascinated.bat.features.FeatureProfile; -import cc.fascinated.bat.features.drag.command.DragCommand; -import cc.fascinated.bat.service.CommandService; -import lombok.NonNull; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationContext; -import org.springframework.stereotype.Component; - -/** - * @author Fascinated (fascinated7) - */ -@Component -public class DragFeature extends Feature { - @Autowired - public DragFeature(@NonNull ApplicationContext context, @NonNull CommandService commandService) { - super("Drag", FeatureProfile.FeatureState.DISABLED, true); - - super.registerCommand(commandService, context.getBean(DragCommand.class)); - } -} diff --git a/src/main/java/cc/fascinated/bat/features/drag/DragRequest.java b/src/main/java/cc/fascinated/bat/features/drag/DragRequest.java deleted file mode 100644 index c572eeb..0000000 --- a/src/main/java/cc/fascinated/bat/features/drag/DragRequest.java +++ /dev/null @@ -1,48 +0,0 @@ -package cc.fascinated.bat.features.drag; - -import lombok.Getter; -import lombok.RequiredArgsConstructor; -import lombok.Setter; -import net.dv8tion.jda.api.entities.Member; -import net.dv8tion.jda.api.entities.Message; -import net.dv8tion.jda.api.entities.channel.concrete.VoiceChannel; -import net.dv8tion.jda.api.interactions.InteractionHook; - -import java.util.Date; - -/** - * @author Fascinated (fascinated7) - */ -@RequiredArgsConstructor -@Getter @Setter -public class DragRequest { - /** - * The date the request was made - */ - private final Date requestDate = new Date(); - - /** - * The user that wants to join the voice channel - */ - private final Member member; - - /** - * The user that the member wants to join - */ - private final Member target; - - /** - * The voice channel the user wants to join - */ - private final VoiceChannel voiceChannel; - - /** - * The interaction hook that the request was made from - */ - private final InteractionHook interactionHook; - - /** - * The request message sent in the voice channel - */ - private Message requestMessage; -} diff --git a/src/main/java/cc/fascinated/bat/features/drag/command/DragCommand.java b/src/main/java/cc/fascinated/bat/features/drag/command/DragCommand.java deleted file mode 100644 index 8227706..0000000 --- a/src/main/java/cc/fascinated/bat/features/drag/command/DragCommand.java +++ /dev/null @@ -1,21 +0,0 @@ -package cc.fascinated.bat.features.drag.command; - -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.Category; -import cc.fascinated.bat.command.CommandInfo; -import lombok.NonNull; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationContext; -import org.springframework.stereotype.Component; - -/** - * @author Fascinated (fascinated7) - */ -@Component -@CommandInfo(name = "drag", description = "Drag command", category = Category.GENERAL) -public class DragCommand extends BatCommand { - @Autowired - public DragCommand(@NonNull ApplicationContext context) { - super.addSubCommands(context.getBean(RequestSubCommand.class)); - } -} diff --git a/src/main/java/cc/fascinated/bat/features/drag/command/RequestSubCommand.java b/src/main/java/cc/fascinated/bat/features/drag/command/RequestSubCommand.java deleted file mode 100644 index a15f691..0000000 --- a/src/main/java/cc/fascinated/bat/features/drag/command/RequestSubCommand.java +++ /dev/null @@ -1,151 +0,0 @@ -package cc.fascinated.bat.features.drag.command; - -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; -import cc.fascinated.bat.common.EmbedUtils; -import cc.fascinated.bat.common.TimerUtils; -import cc.fascinated.bat.event.EventListener; -import cc.fascinated.bat.features.drag.DragRequest; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; -import lombok.NonNull; -import net.dv8tion.jda.api.entities.GuildVoiceState; -import net.dv8tion.jda.api.entities.Member; -import net.dv8tion.jda.api.entities.Message; -import net.dv8tion.jda.api.entities.channel.concrete.VoiceChannel; -import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel; -import net.dv8tion.jda.api.interactions.commands.OptionMapping; -import net.dv8tion.jda.api.interactions.commands.OptionType; -import net.dv8tion.jda.api.interactions.commands.SlashCommandInteraction; -import net.dv8tion.jda.api.interactions.commands.build.OptionData; -import net.dv8tion.jda.api.interactions.components.ActionRow; -import net.dv8tion.jda.api.interactions.components.buttons.Button; -import org.springframework.stereotype.Component; - -import java.time.Duration; -import java.util.HashSet; -import java.util.Set; - -/** - * Handles requests to be moved to a voice channel. - * Author: Fascinated (fascinated7) - */ -@Component -@CommandInfo(name = "request", description = "Request to be moved to a voice channel") -public class RequestSubCommand extends BatCommand implements EventListener { - /** - * A list of join requests - */ - public static final Set JOIN_REQUESTS = new HashSet<>(); - - private final long requestTimeout = Duration.ofMinutes(30).toMillis(); - private final long checkInterval = Duration.ofSeconds(10).toMillis(); - - public RequestSubCommand() { - super.addOptions(new OptionData(OptionType.USER, "user", "The user you want to join", true)); - - TimerUtils.scheduleRepeating(() -> { - Set toRemove = new HashSet<>(); - for (DragRequest joinRequest : JOIN_REQUESTS) { - if (System.currentTimeMillis() - joinRequest.getRequestDate().getTime() < requestTimeout) { - return; - } - // The request has timed out - joinRequest.getInteractionHook().editOriginalEmbeds(EmbedUtils.errorEmbed() - .setDescription("The request to join %s's voice channel has timed out.".formatted(joinRequest.getTarget().getAsMention())) - .build()).queue(); - joinRequest.getVoiceChannel().sendMessageEmbeds(EmbedUtils.errorEmbed() - .setDescription("%s's request to join your voice channel has timed out.".formatted(joinRequest.getMember().getAsMention())) - .build()).queue(); - joinRequest.getRequestMessage().delete().queue(); - toRemove.add(joinRequest); - } - JOIN_REQUESTS.removeAll(toRemove); - }, checkInterval, checkInterval); - } - - @Override - public void execute(BatGuild guild, @NonNull BatUser user, @NonNull MessageChannel channel, Member member, Message commandMessage, String[] arguments, SlashCommandInteraction event) { - GuildVoiceState voiceState = member.getVoiceState(); - // Check if the user is in a voice channel - if (voiceState == null || voiceState.getChannel() == null) { - event.replyEmbeds(EmbedUtils.errorEmbed() - .setDescription("You are not in a voice channel.") - .build()) - .setEphemeral(true) - .queue(); - return; - } - - OptionMapping userOption = event.getOption("user"); - assert userOption != null; - - // Check if the user is in a voice channel - Member target = userOption.getAsMember(); - if (target == null || target.getId().equals(member.getId())) { - event.replyEmbeds(EmbedUtils.errorEmbed() - .setDescription("You cannot request to join your own voice channel.") - .build()) - .setEphemeral(true) - .queue(); - return; - } - - // Check if the target user is in a voice channel - GuildVoiceState targetVoiceState = target.getVoiceState(); - if (targetVoiceState == null || targetVoiceState.getChannel() == null) { - event.replyEmbeds(EmbedUtils.errorEmbed() - .setDescription("The user %s is not in a voice channel.".formatted(target.getAsMention())) - .build()) - .setEphemeral(true) - .queue(); - return; - } - - VoiceChannel targetChannel = targetVoiceState.getChannel().asVoiceChannel(); - // User is already in the target channel - if (voiceState.getChannel().getId().equals(targetChannel.getId())) { - event.replyEmbeds(EmbedUtils.errorEmbed() - .setDescription("You are already in the voice channel %s.".formatted(voiceState.getChannel().getAsMention())) - .build()) - .setEphemeral(true) - .queue(); - return; - } - - // Check if the user has already requested to join the target channel - DragRequest existingRequest = JOIN_REQUESTS.stream() - .filter(request -> request.getMember().getId().equals(member.getId()) && request.getVoiceChannel().getId().equals(targetChannel.getId())) - .findFirst() - .orElse(null); - if (existingRequest != null) { - event.replyEmbeds(EmbedUtils.errorEmbed() - .setDescription("You have already requested to join %s's voice channel.".formatted(target.getAsMention())) - .build()) - .setEphemeral(true) - .queue(); - return; - } - - // Add the request to the list - JOIN_REQUESTS.add(new DragRequest(member, target, targetChannel, event.getHook())); - - // Send the request to the target user - targetChannel.sendMessage(target.getAsMention()).queue(); - targetChannel.sendMessageEmbeds(EmbedUtils.successEmbed() - .setDescription("User %s has requested to join your voice channel.".formatted(member.getAsMention())) - .build()) - .addComponents(ActionRow.of( - Button.primary("drag-request-accept", "Accept"), - Button.danger("drag-request-decline", "Decline") - )) - .queue(message -> JOIN_REQUESTS.stream() - .filter(r -> r.getVoiceChannel().getId().equals(targetChannel.getId())) - .findFirst().ifPresent(request -> request.setRequestMessage(message))); - event.replyEmbeds(EmbedUtils.successEmbed() - .setDescription("Request to join %s's voice channel has been sent.".formatted(target.getAsMention())) - .build()) - .setComponents(ActionRow.of(Button.secondary("drag-request-cancel", "Cancel"))) - .queue(); - } -} \ No newline at end of file diff --git a/src/main/java/cc/fascinated/bat/features/drag/listeners/request/RequestListener.java b/src/main/java/cc/fascinated/bat/features/drag/listeners/request/RequestListener.java deleted file mode 100644 index 02aca3c..0000000 --- a/src/main/java/cc/fascinated/bat/features/drag/listeners/request/RequestListener.java +++ /dev/null @@ -1,49 +0,0 @@ -package cc.fascinated.bat.features.drag.listeners.request; - -import cc.fascinated.bat.common.EmbedUtils; -import cc.fascinated.bat.event.EventListener; -import cc.fascinated.bat.features.drag.DragRequest; -import cc.fascinated.bat.features.drag.command.RequestSubCommand; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; -import lombok.NonNull; -import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; -import net.dv8tion.jda.api.interactions.InteractionHook; -import org.springframework.stereotype.Component; - -import java.util.Optional; - -/** - * @author Fascinated (fascinated7) - */ -@Component -public class RequestListener implements EventListener { - @Override - public void onButtonInteraction(BatGuild guild, @NonNull BatUser user, @NonNull ButtonInteractionEvent event) { - if (guild == null) { - return; - } - if (!event.getComponentId().equals("drag-request-cancel")) { - return; - } - Optional optionalDragRequest = RequestSubCommand.JOIN_REQUESTS.stream() - .filter(request -> request.getMember().getId().equals(event.getUser().getId())) - .findFirst(); - if (optionalDragRequest.isEmpty()) { - event.replyEmbeds(EmbedUtils.errorEmbed() - .setDescription("%s, you do not have a request to cancel.".formatted(user.getDiscordUser().getAsMention())) - .build()).queue(); - return; - } - DragRequest dragRequest = optionalDragRequest.get(); - InteractionHook interactionHook = dragRequest.getInteractionHook(); - interactionHook.editOriginalEmbeds(EmbedUtils.errorEmbed() - .setDescription("You have cancelled your request to join %s's voice channel.".formatted(dragRequest.getTarget().getAsMention())) - .build()).queue(message -> message.editMessageComponents().queue()); - dragRequest.getVoiceChannel().sendMessageEmbeds(EmbedUtils.errorEmbed() - .setDescription("%s has cancelled their request to join your voice channel.".formatted(dragRequest.getMember().getAsMention())) - .build()).queue(); - dragRequest.getRequestMessage().delete().queue(); - RequestSubCommand.JOIN_REQUESTS.remove(dragRequest); - } -} diff --git a/src/main/java/cc/fascinated/bat/features/drag/listeners/request/TargetChannelListener.java b/src/main/java/cc/fascinated/bat/features/drag/listeners/request/TargetChannelListener.java deleted file mode 100644 index 8542ecb..0000000 --- a/src/main/java/cc/fascinated/bat/features/drag/listeners/request/TargetChannelListener.java +++ /dev/null @@ -1,63 +0,0 @@ -package cc.fascinated.bat.features.drag.listeners.request; - -import cc.fascinated.bat.common.EmbedUtils; -import cc.fascinated.bat.event.EventListener; -import cc.fascinated.bat.features.drag.DragRequest; -import cc.fascinated.bat.features.drag.command.RequestSubCommand; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; -import lombok.NonNull; -import net.dv8tion.jda.api.entities.Member; -import net.dv8tion.jda.api.entities.User; -import net.dv8tion.jda.api.events.interaction.component.ButtonInteractionEvent; -import org.springframework.stereotype.Component; - -/** - * @author Fascinated (fascinated7) - */ -@Component -public class TargetChannelListener implements EventListener { - @Override - public void onButtonInteraction(BatGuild guild, @NonNull BatUser user, @NonNull ButtonInteractionEvent event) { - if (guild == null) { - return; - } - User buttonUser = event.getUser(); - Member member = guild.getDiscordGuild().getMember(buttonUser); - if (member == null) return; - - DragRequest joinRequest = RequestSubCommand.JOIN_REQUESTS.stream() - .filter(request -> request.getVoiceChannel().getId().equals(event.getChannel().getId())) - .findFirst() - .orElse(null); - if (joinRequest == null) return; - - if (event.getComponentId().equals("drag-request-accept")) { - joinRequest.getVoiceChannel().getGuild().moveVoiceMember(joinRequest.getMember(), joinRequest.getVoiceChannel()).queue(); - joinRequest.getInteractionHook().retrieveOriginal().queue(message -> { - message.editMessageEmbeds(EmbedUtils.successEmbed() - .setDescription("%s has accepted your request to join their voice channel!".formatted(joinRequest.getTarget().getAsMention())) - .build()).queue(then -> then.delete().queueAfter(10, java.util.concurrent.TimeUnit.SECONDS)); - message.editMessageComponents().queue(); - }); - event.replyEmbeds(EmbedUtils.successEmbed() - .setDescription("You have accepted %s's request to join your voice channel!".formatted(joinRequest.getMember().getAsMention())) - .build()) - .queue(); - } else if (event.getComponentId().equals("drag-request-decline")) { - event.replyEmbeds(EmbedUtils.errorEmbed() - .setDescription("You have declined %s's request to join your voice channel!".formatted(joinRequest.getMember().getAsMention())) - .build()) - .queue(); - joinRequest.getInteractionHook().retrieveOriginal().queue(message -> { - message.editMessageEmbeds(EmbedUtils.errorEmbed() - .setDescription("%s has declined your request to join their voice channel.".formatted(joinRequest.getTarget().getAsMention())) - .build()).queue(); - message.editMessageComponents().queue(); - }); - } - RequestSubCommand.JOIN_REQUESTS.remove(joinRequest); - // Remove the buttons from the embed - event.getInteraction().getMessage().editMessageComponents().queue(); - } -} diff --git a/src/main/java/cc/fascinated/bat/features/leveling/LevelingFeature.java b/src/main/java/cc/fascinated/bat/leveling/LevelingFeature.java similarity index 87% rename from src/main/java/cc/fascinated/bat/features/leveling/LevelingFeature.java rename to src/main/java/cc/fascinated/bat/leveling/LevelingFeature.java index 7c65599..8ab90d5 100644 --- a/src/main/java/cc/fascinated/bat/features/leveling/LevelingFeature.java +++ b/src/main/java/cc/fascinated/bat/leveling/LevelingFeature.java @@ -1,8 +1,8 @@ -package cc.fascinated.bat.features.leveling; +package cc.fascinated.bat.leveling; -import cc.fascinated.bat.features.Feature; -import cc.fascinated.bat.features.FeatureProfile; -import cc.fascinated.bat.features.leveling.command.LevelingCommand; +import cc.fascinated.bat.common.feature.Feature; +import cc.fascinated.bat.common.feature.FeatureProfile; +import cc.fascinated.bat.leveling.command.LevelingCommand; import cc.fascinated.bat.service.CommandService; import lombok.NonNull; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/cc/fascinated/bat/features/leveling/LevelingListener.java b/src/main/java/cc/fascinated/bat/leveling/LevelingListener.java similarity index 92% rename from src/main/java/cc/fascinated/bat/features/leveling/LevelingListener.java rename to src/main/java/cc/fascinated/bat/leveling/LevelingListener.java index fb1c980..fdc3c45 100644 --- a/src/main/java/cc/fascinated/bat/features/leveling/LevelingListener.java +++ b/src/main/java/cc/fascinated/bat/leveling/LevelingListener.java @@ -1,9 +1,9 @@ -package cc.fascinated.bat.features.leveling; +package cc.fascinated.bat.leveling; import cc.fascinated.bat.common.MathUtils; import cc.fascinated.bat.event.EventListener; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import lombok.NonNull; import lombok.extern.log4j.Log4j2; import net.dv8tion.jda.api.entities.channel.concrete.TextChannel; diff --git a/src/main/java/cc/fascinated/bat/features/leveling/LevelingProfile.java b/src/main/java/cc/fascinated/bat/leveling/LevelingProfile.java similarity index 97% rename from src/main/java/cc/fascinated/bat/features/leveling/LevelingProfile.java rename to src/main/java/cc/fascinated/bat/leveling/LevelingProfile.java index 56ea8c6..da645a7 100644 --- a/src/main/java/cc/fascinated/bat/features/leveling/LevelingProfile.java +++ b/src/main/java/cc/fascinated/bat/leveling/LevelingProfile.java @@ -1,4 +1,4 @@ -package cc.fascinated.bat.features.leveling; +package cc.fascinated.bat.leveling; import cc.fascinated.bat.common.ChannelUtils; import cc.fascinated.bat.common.Serializable; diff --git a/src/main/java/cc/fascinated/bat/features/leveling/UserLevel.java b/src/main/java/cc/fascinated/bat/leveling/UserLevel.java similarity index 97% rename from src/main/java/cc/fascinated/bat/features/leveling/UserLevel.java rename to src/main/java/cc/fascinated/bat/leveling/UserLevel.java index fdb20cc..729dad1 100644 --- a/src/main/java/cc/fascinated/bat/features/leveling/UserLevel.java +++ b/src/main/java/cc/fascinated/bat/leveling/UserLevel.java @@ -1,4 +1,4 @@ -package cc.fascinated.bat.features.leveling; +package cc.fascinated.bat.leveling; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/cc/fascinated/bat/features/leveling/command/ChannelSubCommand.java b/src/main/java/cc/fascinated/bat/leveling/command/ChannelSubCommand.java similarity index 87% rename from src/main/java/cc/fascinated/bat/features/leveling/command/ChannelSubCommand.java rename to src/main/java/cc/fascinated/bat/leveling/command/ChannelSubCommand.java index dbf35be..8c11421 100644 --- a/src/main/java/cc/fascinated/bat/features/leveling/command/ChannelSubCommand.java +++ b/src/main/java/cc/fascinated/bat/leveling/command/ChannelSubCommand.java @@ -1,11 +1,11 @@ -package cc.fascinated.bat.features.leveling.command; +package cc.fascinated.bat.leveling.command; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.EmbedUtils; -import cc.fascinated.bat.features.leveling.LevelingProfile; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.leveling.LevelingProfile; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import lombok.NonNull; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; diff --git a/src/main/java/cc/fascinated/bat/features/leveling/command/CurrentSubCommand.java b/src/main/java/cc/fascinated/bat/leveling/command/CurrentSubCommand.java similarity index 86% rename from src/main/java/cc/fascinated/bat/features/leveling/command/CurrentSubCommand.java rename to src/main/java/cc/fascinated/bat/leveling/command/CurrentSubCommand.java index 94e7957..b86854f 100644 --- a/src/main/java/cc/fascinated/bat/features/leveling/command/CurrentSubCommand.java +++ b/src/main/java/cc/fascinated/bat/leveling/command/CurrentSubCommand.java @@ -1,15 +1,15 @@ -package cc.fascinated.bat.features.leveling.command; +package cc.fascinated.bat.leveling.command; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.DescriptionBuilder; import cc.fascinated.bat.common.EmbedUtils; import cc.fascinated.bat.common.NumberFormatter; -import cc.fascinated.bat.features.leveling.LevelingFeature; -import cc.fascinated.bat.features.leveling.LevelingProfile; -import cc.fascinated.bat.features.leveling.UserLevel; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.leveling.LevelingFeature; +import cc.fascinated.bat.leveling.LevelingProfile; +import cc.fascinated.bat.leveling.UserLevel; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import cc.fascinated.bat.service.UserService; import lombok.NonNull; import net.dv8tion.jda.api.entities.Member; diff --git a/src/main/java/cc/fascinated/bat/features/leveling/command/LevelingCommand.java b/src/main/java/cc/fascinated/bat/leveling/command/LevelingCommand.java similarity index 82% rename from src/main/java/cc/fascinated/bat/features/leveling/command/LevelingCommand.java rename to src/main/java/cc/fascinated/bat/leveling/command/LevelingCommand.java index 4abbc45..e9cb06d 100644 --- a/src/main/java/cc/fascinated/bat/features/leveling/command/LevelingCommand.java +++ b/src/main/java/cc/fascinated/bat/leveling/command/LevelingCommand.java @@ -1,7 +1,7 @@ -package cc.fascinated.bat.features.leveling.command; +package cc.fascinated.bat.leveling.command; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.CommandInfo; import lombok.NonNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; diff --git a/src/main/java/cc/fascinated/bat/features/leveling/command/ResetSubCommand.java b/src/main/java/cc/fascinated/bat/leveling/command/ResetSubCommand.java similarity index 83% rename from src/main/java/cc/fascinated/bat/features/leveling/command/ResetSubCommand.java rename to src/main/java/cc/fascinated/bat/leveling/command/ResetSubCommand.java index beca302..d049205 100644 --- a/src/main/java/cc/fascinated/bat/features/leveling/command/ResetSubCommand.java +++ b/src/main/java/cc/fascinated/bat/leveling/command/ResetSubCommand.java @@ -1,12 +1,12 @@ -package cc.fascinated.bat.features.leveling.command; +package cc.fascinated.bat.leveling.command; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.EmbedUtils; -import cc.fascinated.bat.features.leveling.LevelingProfile; -import cc.fascinated.bat.features.leveling.UserLevel; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.leveling.LevelingProfile; +import cc.fascinated.bat.leveling.UserLevel; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import lombok.NonNull; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.Member; diff --git a/src/main/java/cc/fascinated/bat/features/logging/LogCategory.java b/src/main/java/cc/fascinated/bat/logging/LogCategory.java similarity index 96% rename from src/main/java/cc/fascinated/bat/features/logging/LogCategory.java rename to src/main/java/cc/fascinated/bat/logging/LogCategory.java index 2c3568f..7c80689 100644 --- a/src/main/java/cc/fascinated/bat/features/logging/LogCategory.java +++ b/src/main/java/cc/fascinated/bat/logging/LogCategory.java @@ -1,4 +1,4 @@ -package cc.fascinated.bat.features.logging; +package cc.fascinated.bat.logging; import cc.fascinated.bat.common.EnumUtils; import lombok.AllArgsConstructor; diff --git a/src/main/java/cc/fascinated/bat/features/logging/LogFeature.java b/src/main/java/cc/fascinated/bat/logging/LogFeature.java similarity index 92% rename from src/main/java/cc/fascinated/bat/features/logging/LogFeature.java rename to src/main/java/cc/fascinated/bat/logging/LogFeature.java index f6e2f68..2194220 100644 --- a/src/main/java/cc/fascinated/bat/features/logging/LogFeature.java +++ b/src/main/java/cc/fascinated/bat/logging/LogFeature.java @@ -1,12 +1,12 @@ -package cc.fascinated.bat.features.logging; +package cc.fascinated.bat.logging; import cc.fascinated.bat.common.DateUtils; import cc.fascinated.bat.common.PasteUtils; -import cc.fascinated.bat.features.Feature; -import cc.fascinated.bat.features.FeatureProfile; -import cc.fascinated.bat.features.logging.command.LogsCommand; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.DiscordMessage; +import cc.fascinated.bat.common.feature.Feature; +import cc.fascinated.bat.common.feature.FeatureProfile; +import cc.fascinated.bat.logging.command.LogsCommand; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.DiscordMessage; import cc.fascinated.bat.service.CommandService; import lombok.NonNull; import net.dv8tion.jda.api.entities.MessageEmbed; diff --git a/src/main/java/cc/fascinated/bat/features/logging/LogProfile.java b/src/main/java/cc/fascinated/bat/logging/LogProfile.java similarity index 98% rename from src/main/java/cc/fascinated/bat/features/logging/LogProfile.java rename to src/main/java/cc/fascinated/bat/logging/LogProfile.java index b1c16ff..38f4567 100644 --- a/src/main/java/cc/fascinated/bat/features/logging/LogProfile.java +++ b/src/main/java/cc/fascinated/bat/logging/LogProfile.java @@ -1,4 +1,4 @@ -package cc.fascinated.bat.features.logging; +package cc.fascinated.bat.logging; import cc.fascinated.bat.common.ChannelUtils; import cc.fascinated.bat.common.Serializable; diff --git a/src/main/java/cc/fascinated/bat/features/logging/LogType.java b/src/main/java/cc/fascinated/bat/logging/LogType.java similarity index 98% rename from src/main/java/cc/fascinated/bat/features/logging/LogType.java rename to src/main/java/cc/fascinated/bat/logging/LogType.java index c3cfd98..a902636 100644 --- a/src/main/java/cc/fascinated/bat/features/logging/LogType.java +++ b/src/main/java/cc/fascinated/bat/logging/LogType.java @@ -1,4 +1,4 @@ -package cc.fascinated.bat.features.logging; +package cc.fascinated.bat.logging; import cc.fascinated.bat.common.EnumUtils; import lombok.AllArgsConstructor; diff --git a/src/main/java/cc/fascinated/bat/features/logging/command/ListSubCommand.java b/src/main/java/cc/fascinated/bat/logging/command/ListSubCommand.java similarity index 90% rename from src/main/java/cc/fascinated/bat/features/logging/command/ListSubCommand.java rename to src/main/java/cc/fascinated/bat/logging/command/ListSubCommand.java index d189e86..0c65dce 100644 --- a/src/main/java/cc/fascinated/bat/features/logging/command/ListSubCommand.java +++ b/src/main/java/cc/fascinated/bat/logging/command/ListSubCommand.java @@ -1,17 +1,17 @@ -package cc.fascinated.bat.features.logging.command; +package cc.fascinated.bat.logging.command; import cc.fascinated.bat.Emojis; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.DescriptionBuilder; import cc.fascinated.bat.common.EmbedUtils; import cc.fascinated.bat.common.InteractionBuilder; import cc.fascinated.bat.event.EventListener; -import cc.fascinated.bat.features.logging.LogCategory; -import cc.fascinated.bat.features.logging.LogProfile; -import cc.fascinated.bat.features.logging.LogType; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.logging.LogCategory; +import cc.fascinated.bat.logging.LogProfile; +import cc.fascinated.bat.logging.LogType; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import lombok.NonNull; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; diff --git a/src/main/java/cc/fascinated/bat/features/logging/command/LogsCommand.java b/src/main/java/cc/fascinated/bat/logging/command/LogsCommand.java similarity index 79% rename from src/main/java/cc/fascinated/bat/features/logging/command/LogsCommand.java rename to src/main/java/cc/fascinated/bat/logging/command/LogsCommand.java index bd90414..e989674 100644 --- a/src/main/java/cc/fascinated/bat/features/logging/command/LogsCommand.java +++ b/src/main/java/cc/fascinated/bat/logging/command/LogsCommand.java @@ -1,8 +1,8 @@ -package cc.fascinated.bat.features.logging.command; +package cc.fascinated.bat.logging.command; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.Category; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.Category; +import cc.fascinated.bat.common.command.CommandInfo; import lombok.NonNull; import net.dv8tion.jda.api.Permission; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/cc/fascinated/bat/features/logging/command/RemoveSubCommand.java b/src/main/java/cc/fascinated/bat/logging/command/RemoveSubCommand.java similarity index 91% rename from src/main/java/cc/fascinated/bat/features/logging/command/RemoveSubCommand.java rename to src/main/java/cc/fascinated/bat/logging/command/RemoveSubCommand.java index 09529ce..1874599 100644 --- a/src/main/java/cc/fascinated/bat/features/logging/command/RemoveSubCommand.java +++ b/src/main/java/cc/fascinated/bat/logging/command/RemoveSubCommand.java @@ -1,15 +1,15 @@ -package cc.fascinated.bat.features.logging.command; +package cc.fascinated.bat.logging.command; import cc.fascinated.bat.Emojis; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.DescriptionBuilder; import cc.fascinated.bat.common.EmbedUtils; -import cc.fascinated.bat.features.logging.LogCategory; -import cc.fascinated.bat.features.logging.LogProfile; -import cc.fascinated.bat.features.logging.LogType; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.logging.LogCategory; +import cc.fascinated.bat.logging.LogProfile; +import cc.fascinated.bat.logging.LogType; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import lombok.NonNull; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; diff --git a/src/main/java/cc/fascinated/bat/features/logging/command/SetSubCommand.java b/src/main/java/cc/fascinated/bat/logging/command/SetSubCommand.java similarity index 92% rename from src/main/java/cc/fascinated/bat/features/logging/command/SetSubCommand.java rename to src/main/java/cc/fascinated/bat/logging/command/SetSubCommand.java index ec58794..fa2abc3 100644 --- a/src/main/java/cc/fascinated/bat/features/logging/command/SetSubCommand.java +++ b/src/main/java/cc/fascinated/bat/logging/command/SetSubCommand.java @@ -1,15 +1,15 @@ -package cc.fascinated.bat.features.logging.command; +package cc.fascinated.bat.logging.command; import cc.fascinated.bat.Emojis; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.DescriptionBuilder; import cc.fascinated.bat.common.EmbedUtils; -import cc.fascinated.bat.features.logging.LogCategory; -import cc.fascinated.bat.features.logging.LogProfile; -import cc.fascinated.bat.features.logging.LogType; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.logging.LogCategory; +import cc.fascinated.bat.logging.LogProfile; +import cc.fascinated.bat.logging.LogType; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import lombok.NonNull; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; diff --git a/src/main/java/cc/fascinated/bat/features/logging/listeners/ChannelListener.java b/src/main/java/cc/fascinated/bat/logging/listeners/ChannelListener.java similarity index 98% rename from src/main/java/cc/fascinated/bat/features/logging/listeners/ChannelListener.java rename to src/main/java/cc/fascinated/bat/logging/listeners/ChannelListener.java index 9a7d20c..3662667 100644 --- a/src/main/java/cc/fascinated/bat/features/logging/listeners/ChannelListener.java +++ b/src/main/java/cc/fascinated/bat/logging/listeners/ChannelListener.java @@ -1,11 +1,11 @@ -package cc.fascinated.bat.features.logging.listeners; +package cc.fascinated.bat.logging.listeners; import cc.fascinated.bat.common.*; import cc.fascinated.bat.event.EventListener; -import cc.fascinated.bat.features.logging.LogFeature; -import cc.fascinated.bat.features.logging.LogType; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.logging.LogFeature; +import cc.fascinated.bat.logging.LogType; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import cc.fascinated.bat.service.DiscordService; import cc.fascinated.bat.service.UserService; import jakarta.annotation.PostConstruct; @@ -161,7 +161,7 @@ public class ChannelListener implements EventListener { String target = event.getPermissionOverride().isRoleOverride() ? event.getPermissionOverride().getRole().getAsMention() : event.getPermissionOverride().getMember().getAsMention(); - DescriptionBuilder description = new DescriptionBuilder("Channel Permissions Ipdated") + DescriptionBuilder description = new DescriptionBuilder("Channel Permissions Updated") .appendLine("Channel: %s".formatted(event.getChannel().getAsMention()), true) .appendLine("%s: %s".formatted( event.getPermissionOverride().isRoleOverride() ? "Role" : "Member", diff --git a/src/main/java/cc/fascinated/bat/features/logging/listeners/EmojiListener.java b/src/main/java/cc/fascinated/bat/logging/listeners/EmojiListener.java similarity index 93% rename from src/main/java/cc/fascinated/bat/features/logging/listeners/EmojiListener.java rename to src/main/java/cc/fascinated/bat/logging/listeners/EmojiListener.java index 9276908..906dfa4 100644 --- a/src/main/java/cc/fascinated/bat/features/logging/listeners/EmojiListener.java +++ b/src/main/java/cc/fascinated/bat/logging/listeners/EmojiListener.java @@ -1,11 +1,11 @@ -package cc.fascinated.bat.features.logging.listeners; +package cc.fascinated.bat.logging.listeners; import cc.fascinated.bat.common.DescriptionBuilder; import cc.fascinated.bat.common.EmbedUtils; import cc.fascinated.bat.event.EventListener; -import cc.fascinated.bat.features.logging.LogFeature; -import cc.fascinated.bat.features.logging.LogType; -import cc.fascinated.bat.model.BatGuild; +import cc.fascinated.bat.logging.LogFeature; +import cc.fascinated.bat.logging.LogType; +import cc.fascinated.bat.common.model.BatGuild; import lombok.NonNull; import lombok.extern.log4j.Log4j2; import net.dv8tion.jda.api.entities.emoji.Emoji; diff --git a/src/main/java/cc/fascinated/bat/features/logging/listeners/GuildListener.java b/src/main/java/cc/fascinated/bat/logging/listeners/GuildListener.java similarity index 98% rename from src/main/java/cc/fascinated/bat/features/logging/listeners/GuildListener.java rename to src/main/java/cc/fascinated/bat/logging/listeners/GuildListener.java index 8ba62e1..803e074 100644 --- a/src/main/java/cc/fascinated/bat/features/logging/listeners/GuildListener.java +++ b/src/main/java/cc/fascinated/bat/logging/listeners/GuildListener.java @@ -1,14 +1,14 @@ -package cc.fascinated.bat.features.logging.listeners; +package cc.fascinated.bat.logging.listeners; import cc.fascinated.bat.common.DescriptionBuilder; import cc.fascinated.bat.common.EmbedUtils; import cc.fascinated.bat.common.EnumUtils; import cc.fascinated.bat.common.TimeUtils; import cc.fascinated.bat.event.EventListener; -import cc.fascinated.bat.features.logging.LogFeature; -import cc.fascinated.bat.features.logging.LogType; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.logging.LogFeature; +import cc.fascinated.bat.logging.LogType; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import lombok.NonNull; import lombok.extern.log4j.Log4j2; import net.dv8tion.jda.api.entities.Guild; diff --git a/src/main/java/cc/fascinated/bat/features/logging/listeners/MemberListener.java b/src/main/java/cc/fascinated/bat/logging/listeners/MemberListener.java similarity index 98% rename from src/main/java/cc/fascinated/bat/features/logging/listeners/MemberListener.java rename to src/main/java/cc/fascinated/bat/logging/listeners/MemberListener.java index eabbd13..a7badd8 100644 --- a/src/main/java/cc/fascinated/bat/features/logging/listeners/MemberListener.java +++ b/src/main/java/cc/fascinated/bat/logging/listeners/MemberListener.java @@ -1,12 +1,12 @@ -package cc.fascinated.bat.features.logging.listeners; +package cc.fascinated.bat.logging.listeners; import cc.fascinated.bat.common.DescriptionBuilder; import cc.fascinated.bat.common.EmbedUtils; import cc.fascinated.bat.event.EventListener; -import cc.fascinated.bat.features.logging.LogFeature; -import cc.fascinated.bat.features.logging.LogType; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.logging.LogFeature; +import cc.fascinated.bat.logging.LogType; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import cc.fascinated.bat.service.DiscordService; import cc.fascinated.bat.service.GuildService; import lombok.NonNull; diff --git a/src/main/java/cc/fascinated/bat/features/logging/listeners/MessageListener.java b/src/main/java/cc/fascinated/bat/logging/listeners/MessageListener.java similarity index 91% rename from src/main/java/cc/fascinated/bat/features/logging/listeners/MessageListener.java rename to src/main/java/cc/fascinated/bat/logging/listeners/MessageListener.java index ecd2808..ccb4ddc 100644 --- a/src/main/java/cc/fascinated/bat/features/logging/listeners/MessageListener.java +++ b/src/main/java/cc/fascinated/bat/logging/listeners/MessageListener.java @@ -1,13 +1,13 @@ -package cc.fascinated.bat.features.logging.listeners; +package cc.fascinated.bat.logging.listeners; import cc.fascinated.bat.common.DescriptionBuilder; import cc.fascinated.bat.common.EmbedUtils; import cc.fascinated.bat.event.EventListener; -import cc.fascinated.bat.features.logging.LogFeature; -import cc.fascinated.bat.features.logging.LogType; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; -import cc.fascinated.bat.model.DiscordMessage; +import cc.fascinated.bat.logging.LogFeature; +import cc.fascinated.bat.logging.LogType; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; +import cc.fascinated.bat.common.model.DiscordMessage; import lombok.NonNull; import lombok.extern.log4j.Log4j2; import net.dv8tion.jda.api.events.message.MessageDeleteEvent; diff --git a/src/main/java/cc/fascinated/bat/features/logging/listeners/RoleListener.java b/src/main/java/cc/fascinated/bat/logging/listeners/RoleListener.java similarity index 97% rename from src/main/java/cc/fascinated/bat/features/logging/listeners/RoleListener.java rename to src/main/java/cc/fascinated/bat/logging/listeners/RoleListener.java index 6fa072c..c1de533 100644 --- a/src/main/java/cc/fascinated/bat/features/logging/listeners/RoleListener.java +++ b/src/main/java/cc/fascinated/bat/logging/listeners/RoleListener.java @@ -1,12 +1,12 @@ -package cc.fascinated.bat.features.logging.listeners; +package cc.fascinated.bat.logging.listeners; import cc.fascinated.bat.common.DescriptionBuilder; import cc.fascinated.bat.common.EmbedUtils; import cc.fascinated.bat.common.RoleUtils; import cc.fascinated.bat.event.EventListener; -import cc.fascinated.bat.features.logging.LogFeature; -import cc.fascinated.bat.features.logging.LogType; -import cc.fascinated.bat.model.BatGuild; +import cc.fascinated.bat.logging.LogFeature; +import cc.fascinated.bat.logging.LogType; +import cc.fascinated.bat.common.model.BatGuild; import lombok.NonNull; import lombok.extern.log4j.Log4j2; import net.dv8tion.jda.api.Permission; diff --git a/src/main/java/cc/fascinated/bat/features/logging/listeners/StickerListener.java b/src/main/java/cc/fascinated/bat/logging/listeners/StickerListener.java similarity index 93% rename from src/main/java/cc/fascinated/bat/features/logging/listeners/StickerListener.java rename to src/main/java/cc/fascinated/bat/logging/listeners/StickerListener.java index 961c62a..dd43307 100644 --- a/src/main/java/cc/fascinated/bat/features/logging/listeners/StickerListener.java +++ b/src/main/java/cc/fascinated/bat/logging/listeners/StickerListener.java @@ -1,11 +1,11 @@ -package cc.fascinated.bat.features.logging.listeners; +package cc.fascinated.bat.logging.listeners; import cc.fascinated.bat.common.DescriptionBuilder; import cc.fascinated.bat.common.EmbedUtils; import cc.fascinated.bat.event.EventListener; -import cc.fascinated.bat.features.logging.LogFeature; -import cc.fascinated.bat.features.logging.LogType; -import cc.fascinated.bat.model.BatGuild; +import cc.fascinated.bat.logging.LogFeature; +import cc.fascinated.bat.logging.LogType; +import cc.fascinated.bat.common.model.BatGuild; import lombok.NonNull; import lombok.extern.log4j.Log4j2; import net.dv8tion.jda.api.entities.sticker.GuildSticker; diff --git a/src/main/java/cc/fascinated/bat/features/messagesnipe/MessageSnipeFeature.java b/src/main/java/cc/fascinated/bat/messagesnipe/MessageSnipeFeature.java similarity index 93% rename from src/main/java/cc/fascinated/bat/features/messagesnipe/MessageSnipeFeature.java rename to src/main/java/cc/fascinated/bat/messagesnipe/MessageSnipeFeature.java index fbf2c76..805fa92 100644 --- a/src/main/java/cc/fascinated/bat/features/messagesnipe/MessageSnipeFeature.java +++ b/src/main/java/cc/fascinated/bat/messagesnipe/MessageSnipeFeature.java @@ -1,12 +1,12 @@ -package cc.fascinated.bat.features.messagesnipe; +package cc.fascinated.bat.messagesnipe; import cc.fascinated.bat.event.EventListener; -import cc.fascinated.bat.features.Feature; -import cc.fascinated.bat.features.FeatureProfile; -import cc.fascinated.bat.features.messagesnipe.command.MessageSnipeCommand; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; -import cc.fascinated.bat.model.DiscordMessage; +import cc.fascinated.bat.common.feature.Feature; +import cc.fascinated.bat.common.feature.FeatureProfile; +import cc.fascinated.bat.messagesnipe.command.MessageSnipeCommand; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; +import cc.fascinated.bat.common.model.DiscordMessage; import cc.fascinated.bat.service.CommandService; import lombok.NonNull; import net.dv8tion.jda.api.events.message.MessageDeleteEvent; diff --git a/src/main/java/cc/fascinated/bat/features/messagesnipe/SnipedMessage.java b/src/main/java/cc/fascinated/bat/messagesnipe/SnipedMessage.java similarity index 89% rename from src/main/java/cc/fascinated/bat/features/messagesnipe/SnipedMessage.java rename to src/main/java/cc/fascinated/bat/messagesnipe/SnipedMessage.java index 17ab757..6c49fd6 100644 --- a/src/main/java/cc/fascinated/bat/features/messagesnipe/SnipedMessage.java +++ b/src/main/java/cc/fascinated/bat/messagesnipe/SnipedMessage.java @@ -1,4 +1,4 @@ -package cc.fascinated.bat.features.messagesnipe; +package cc.fascinated.bat.messagesnipe; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/cc/fascinated/bat/features/messagesnipe/command/ClearSubCommand.java b/src/main/java/cc/fascinated/bat/messagesnipe/command/ClearSubCommand.java similarity index 81% rename from src/main/java/cc/fascinated/bat/features/messagesnipe/command/ClearSubCommand.java rename to src/main/java/cc/fascinated/bat/messagesnipe/command/ClearSubCommand.java index 7fb6235..92fb072 100644 --- a/src/main/java/cc/fascinated/bat/features/messagesnipe/command/ClearSubCommand.java +++ b/src/main/java/cc/fascinated/bat/messagesnipe/command/ClearSubCommand.java @@ -1,11 +1,11 @@ -package cc.fascinated.bat.features.messagesnipe.command; +package cc.fascinated.bat.messagesnipe.command; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.EmbedUtils; -import cc.fascinated.bat.features.messagesnipe.MessageSnipeFeature; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.messagesnipe.MessageSnipeFeature; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import lombok.NonNull; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.Member; diff --git a/src/main/java/cc/fascinated/bat/features/messagesnipe/command/DeletedSubCommand.java b/src/main/java/cc/fascinated/bat/messagesnipe/command/DeletedSubCommand.java similarity index 84% rename from src/main/java/cc/fascinated/bat/features/messagesnipe/command/DeletedSubCommand.java rename to src/main/java/cc/fascinated/bat/messagesnipe/command/DeletedSubCommand.java index 0ea8813..8f045a3 100644 --- a/src/main/java/cc/fascinated/bat/features/messagesnipe/command/DeletedSubCommand.java +++ b/src/main/java/cc/fascinated/bat/messagesnipe/command/DeletedSubCommand.java @@ -1,14 +1,14 @@ -package cc.fascinated.bat.features.messagesnipe.command; +package cc.fascinated.bat.messagesnipe.command; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.DescriptionBuilder; import cc.fascinated.bat.common.EmbedUtils; import cc.fascinated.bat.common.PasteUtils; -import cc.fascinated.bat.features.messagesnipe.MessageSnipeFeature; -import cc.fascinated.bat.features.messagesnipe.SnipedMessage; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.messagesnipe.MessageSnipeFeature; +import cc.fascinated.bat.messagesnipe.SnipedMessage; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import lombok.NonNull; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; diff --git a/src/main/java/cc/fascinated/bat/features/messagesnipe/command/MessageSnipeCommand.java b/src/main/java/cc/fascinated/bat/messagesnipe/command/MessageSnipeCommand.java similarity index 74% rename from src/main/java/cc/fascinated/bat/features/messagesnipe/command/MessageSnipeCommand.java rename to src/main/java/cc/fascinated/bat/messagesnipe/command/MessageSnipeCommand.java index 23eabdf..3e6fd65 100644 --- a/src/main/java/cc/fascinated/bat/features/messagesnipe/command/MessageSnipeCommand.java +++ b/src/main/java/cc/fascinated/bat/messagesnipe/command/MessageSnipeCommand.java @@ -1,8 +1,8 @@ -package cc.fascinated.bat.features.messagesnipe.command; +package cc.fascinated.bat.messagesnipe.command; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.Category; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.Category; +import cc.fascinated.bat.common.command.CommandInfo; import lombok.NonNull; import org.springframework.context.ApplicationContext; import org.springframework.stereotype.Component; diff --git a/src/main/java/cc/fascinated/bat/features/moderation/ModerationFeature.java b/src/main/java/cc/fascinated/bat/moderation/ModerationFeature.java similarity index 91% rename from src/main/java/cc/fascinated/bat/features/moderation/ModerationFeature.java rename to src/main/java/cc/fascinated/bat/moderation/ModerationFeature.java index e05bf90..880563a 100644 --- a/src/main/java/cc/fascinated/bat/features/moderation/ModerationFeature.java +++ b/src/main/java/cc/fascinated/bat/moderation/ModerationFeature.java @@ -1,13 +1,13 @@ -package cc.fascinated.bat.features.moderation; +package cc.fascinated.bat.moderation; import cc.fascinated.bat.event.EventListener; -import cc.fascinated.bat.features.Feature; -import cc.fascinated.bat.features.FeatureProfile; -import cc.fascinated.bat.features.moderation.command.*; -import cc.fascinated.bat.features.moderation.punish.Punishment; -import cc.fascinated.bat.features.moderation.punish.PunishmentProfile; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.common.feature.Feature; +import cc.fascinated.bat.common.feature.FeatureProfile; +import cc.fascinated.bat.moderation.command.*; +import cc.fascinated.bat.moderation.punish.Punishment; +import cc.fascinated.bat.moderation.punish.PunishmentProfile; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import cc.fascinated.bat.service.CommandService; import cc.fascinated.bat.service.DiscordService; import cc.fascinated.bat.service.GuildService; diff --git a/src/main/java/cc/fascinated/bat/features/moderation/command/BanCommand.java b/src/main/java/cc/fascinated/bat/moderation/command/BanCommand.java similarity index 89% rename from src/main/java/cc/fascinated/bat/features/moderation/command/BanCommand.java rename to src/main/java/cc/fascinated/bat/moderation/command/BanCommand.java index 1bd8bdd..286ce56 100644 --- a/src/main/java/cc/fascinated/bat/features/moderation/command/BanCommand.java +++ b/src/main/java/cc/fascinated/bat/moderation/command/BanCommand.java @@ -1,13 +1,13 @@ -package cc.fascinated.bat.features.moderation.command; +package cc.fascinated.bat.moderation.command; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.EmbedUtils; import cc.fascinated.bat.common.TimeUtils; -import cc.fascinated.bat.features.moderation.punish.PunishmentProfile; -import cc.fascinated.bat.features.moderation.punish.PunishmentType; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.moderation.punish.PunishmentProfile; +import cc.fascinated.bat.moderation.punish.PunishmentType; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import cc.fascinated.bat.service.UserService; import lombok.NonNull; import net.dv8tion.jda.api.Permission; diff --git a/src/main/java/cc/fascinated/bat/features/moderation/command/KickCommand.java b/src/main/java/cc/fascinated/bat/moderation/command/KickCommand.java similarity index 87% rename from src/main/java/cc/fascinated/bat/features/moderation/command/KickCommand.java rename to src/main/java/cc/fascinated/bat/moderation/command/KickCommand.java index 069b0ee..4de28bf 100644 --- a/src/main/java/cc/fascinated/bat/features/moderation/command/KickCommand.java +++ b/src/main/java/cc/fascinated/bat/moderation/command/KickCommand.java @@ -1,12 +1,12 @@ -package cc.fascinated.bat.features.moderation.command; +package cc.fascinated.bat.moderation.command; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.EmbedUtils; -import cc.fascinated.bat.features.moderation.punish.PunishmentProfile; -import cc.fascinated.bat.features.moderation.punish.PunishmentType; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.moderation.punish.PunishmentProfile; +import cc.fascinated.bat.moderation.punish.PunishmentType; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import cc.fascinated.bat.service.UserService; import lombok.NonNull; import net.dv8tion.jda.api.Permission; diff --git a/src/main/java/cc/fascinated/bat/features/moderation/command/MuteCommand.java b/src/main/java/cc/fascinated/bat/moderation/command/MuteCommand.java similarity index 89% rename from src/main/java/cc/fascinated/bat/features/moderation/command/MuteCommand.java rename to src/main/java/cc/fascinated/bat/moderation/command/MuteCommand.java index ee68755..078cbbd 100644 --- a/src/main/java/cc/fascinated/bat/features/moderation/command/MuteCommand.java +++ b/src/main/java/cc/fascinated/bat/moderation/command/MuteCommand.java @@ -1,13 +1,13 @@ -package cc.fascinated.bat.features.moderation.command; +package cc.fascinated.bat.moderation.command; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.EmbedUtils; import cc.fascinated.bat.common.TimeUtils; -import cc.fascinated.bat.features.moderation.punish.PunishmentProfile; -import cc.fascinated.bat.features.moderation.punish.PunishmentType; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.moderation.punish.PunishmentProfile; +import cc.fascinated.bat.moderation.punish.PunishmentType; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import cc.fascinated.bat.service.UserService; import lombok.NonNull; import net.dv8tion.jda.api.Permission; diff --git a/src/main/java/cc/fascinated/bat/features/moderation/command/PunishHistoryCommand.java b/src/main/java/cc/fascinated/bat/moderation/command/PunishHistoryCommand.java similarity index 90% rename from src/main/java/cc/fascinated/bat/features/moderation/command/PunishHistoryCommand.java rename to src/main/java/cc/fascinated/bat/moderation/command/PunishHistoryCommand.java index c9397de..49cac09 100644 --- a/src/main/java/cc/fascinated/bat/features/moderation/command/PunishHistoryCommand.java +++ b/src/main/java/cc/fascinated/bat/moderation/command/PunishHistoryCommand.java @@ -1,13 +1,13 @@ -package cc.fascinated.bat.features.moderation.command; +package cc.fascinated.bat.moderation.command; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.DescriptionBuilder; import cc.fascinated.bat.common.EmbedUtils; -import cc.fascinated.bat.features.moderation.punish.Punishment; -import cc.fascinated.bat.features.moderation.punish.PunishmentProfile; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.moderation.punish.Punishment; +import cc.fascinated.bat.moderation.punish.PunishmentProfile; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import cc.fascinated.bat.service.UserService; import lombok.NonNull; import net.dv8tion.jda.api.Permission; diff --git a/src/main/java/cc/fascinated/bat/features/moderation/command/PurgeCommand.java b/src/main/java/cc/fascinated/bat/moderation/command/PurgeCommand.java similarity index 91% rename from src/main/java/cc/fascinated/bat/features/moderation/command/PurgeCommand.java rename to src/main/java/cc/fascinated/bat/moderation/command/PurgeCommand.java index 20a44a1..a93e20d 100644 --- a/src/main/java/cc/fascinated/bat/features/moderation/command/PurgeCommand.java +++ b/src/main/java/cc/fascinated/bat/moderation/command/PurgeCommand.java @@ -1,15 +1,15 @@ -package cc.fascinated.bat.features.moderation.command; +package cc.fascinated.bat.moderation.command; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.Category; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.Category; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.DescriptionBuilder; import cc.fascinated.bat.common.EmbedUtils; import cc.fascinated.bat.common.NumberFormatter; -import cc.fascinated.bat.features.logging.LogFeature; -import cc.fascinated.bat.features.logging.LogType; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.logging.LogFeature; +import cc.fascinated.bat.logging.LogType; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import lombok.NonNull; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.Member; diff --git a/src/main/java/cc/fascinated/bat/features/moderation/command/UnbanCommand.java b/src/main/java/cc/fascinated/bat/moderation/command/UnbanCommand.java similarity index 86% rename from src/main/java/cc/fascinated/bat/features/moderation/command/UnbanCommand.java rename to src/main/java/cc/fascinated/bat/moderation/command/UnbanCommand.java index 1c9f3df..60b225e 100644 --- a/src/main/java/cc/fascinated/bat/features/moderation/command/UnbanCommand.java +++ b/src/main/java/cc/fascinated/bat/moderation/command/UnbanCommand.java @@ -1,13 +1,13 @@ -package cc.fascinated.bat.features.moderation.command; +package cc.fascinated.bat.moderation.command; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.EmbedUtils; -import cc.fascinated.bat.features.moderation.punish.Punishment; -import cc.fascinated.bat.features.moderation.punish.PunishmentProfile; -import cc.fascinated.bat.features.moderation.punish.PunishmentType; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.moderation.punish.Punishment; +import cc.fascinated.bat.moderation.punish.PunishmentProfile; +import cc.fascinated.bat.moderation.punish.PunishmentType; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import cc.fascinated.bat.service.UserService; import lombok.NonNull; import net.dv8tion.jda.api.Permission; diff --git a/src/main/java/cc/fascinated/bat/features/moderation/command/UnmuteCommand.java b/src/main/java/cc/fascinated/bat/moderation/command/UnmuteCommand.java similarity index 86% rename from src/main/java/cc/fascinated/bat/features/moderation/command/UnmuteCommand.java rename to src/main/java/cc/fascinated/bat/moderation/command/UnmuteCommand.java index aeec612..58de7ff 100644 --- a/src/main/java/cc/fascinated/bat/features/moderation/command/UnmuteCommand.java +++ b/src/main/java/cc/fascinated/bat/moderation/command/UnmuteCommand.java @@ -1,13 +1,13 @@ -package cc.fascinated.bat.features.moderation.command; +package cc.fascinated.bat.moderation.command; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.EmbedUtils; -import cc.fascinated.bat.features.moderation.punish.Punishment; -import cc.fascinated.bat.features.moderation.punish.PunishmentProfile; -import cc.fascinated.bat.features.moderation.punish.PunishmentType; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.moderation.punish.Punishment; +import cc.fascinated.bat.moderation.punish.PunishmentProfile; +import cc.fascinated.bat.moderation.punish.PunishmentType; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import cc.fascinated.bat.service.UserService; import lombok.NonNull; import net.dv8tion.jda.api.Permission; diff --git a/src/main/java/cc/fascinated/bat/features/moderation/command/WarnCommand.java b/src/main/java/cc/fascinated/bat/moderation/command/WarnCommand.java similarity index 87% rename from src/main/java/cc/fascinated/bat/features/moderation/command/WarnCommand.java rename to src/main/java/cc/fascinated/bat/moderation/command/WarnCommand.java index be5f718..133e409 100644 --- a/src/main/java/cc/fascinated/bat/features/moderation/command/WarnCommand.java +++ b/src/main/java/cc/fascinated/bat/moderation/command/WarnCommand.java @@ -1,12 +1,12 @@ -package cc.fascinated.bat.features.moderation.command; +package cc.fascinated.bat.moderation.command; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.EmbedUtils; -import cc.fascinated.bat.features.moderation.punish.PunishmentProfile; -import cc.fascinated.bat.features.moderation.punish.PunishmentType; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.moderation.punish.PunishmentProfile; +import cc.fascinated.bat.moderation.punish.PunishmentType; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import cc.fascinated.bat.service.UserService; import lombok.NonNull; import net.dv8tion.jda.api.Permission; diff --git a/src/main/java/cc/fascinated/bat/features/moderation/punish/Punishment.java b/src/main/java/cc/fascinated/bat/moderation/punish/Punishment.java similarity index 93% rename from src/main/java/cc/fascinated/bat/features/moderation/punish/Punishment.java rename to src/main/java/cc/fascinated/bat/moderation/punish/Punishment.java index 2bb1970..3b7d832 100644 --- a/src/main/java/cc/fascinated/bat/features/moderation/punish/Punishment.java +++ b/src/main/java/cc/fascinated/bat/moderation/punish/Punishment.java @@ -1,4 +1,4 @@ -package cc.fascinated.bat.features.moderation.punish; +package cc.fascinated.bat.moderation.punish; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/cc/fascinated/bat/features/moderation/punish/PunishmentProfile.java b/src/main/java/cc/fascinated/bat/moderation/punish/PunishmentProfile.java similarity index 98% rename from src/main/java/cc/fascinated/bat/features/moderation/punish/PunishmentProfile.java rename to src/main/java/cc/fascinated/bat/moderation/punish/PunishmentProfile.java index 1c32d22..edae254 100644 --- a/src/main/java/cc/fascinated/bat/features/moderation/punish/PunishmentProfile.java +++ b/src/main/java/cc/fascinated/bat/moderation/punish/PunishmentProfile.java @@ -1,10 +1,10 @@ -package cc.fascinated.bat.features.moderation.punish; +package cc.fascinated.bat.moderation.punish; import cc.fascinated.bat.common.*; -import cc.fascinated.bat.features.logging.LogFeature; -import cc.fascinated.bat.features.logging.LogType; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.logging.LogFeature; +import cc.fascinated.bat.logging.LogType; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import com.google.gson.Gson; import lombok.Getter; import net.dv8tion.jda.api.Permission; diff --git a/src/main/java/cc/fascinated/bat/features/moderation/punish/PunishmentType.java b/src/main/java/cc/fascinated/bat/moderation/punish/PunishmentType.java similarity index 86% rename from src/main/java/cc/fascinated/bat/features/moderation/punish/PunishmentType.java rename to src/main/java/cc/fascinated/bat/moderation/punish/PunishmentType.java index b18a96c..8ca346b 100644 --- a/src/main/java/cc/fascinated/bat/features/moderation/punish/PunishmentType.java +++ b/src/main/java/cc/fascinated/bat/moderation/punish/PunishmentType.java @@ -1,4 +1,4 @@ -package cc.fascinated.bat.features.moderation.punish; +package cc.fascinated.bat.moderation.punish; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/cc/fascinated/bat/features/namehistory/NameHistoryFeature.java b/src/main/java/cc/fascinated/bat/namehistory/NameHistoryFeature.java similarity index 76% rename from src/main/java/cc/fascinated/bat/features/namehistory/NameHistoryFeature.java rename to src/main/java/cc/fascinated/bat/namehistory/NameHistoryFeature.java index 9ade3f0..669b18d 100644 --- a/src/main/java/cc/fascinated/bat/features/namehistory/NameHistoryFeature.java +++ b/src/main/java/cc/fascinated/bat/namehistory/NameHistoryFeature.java @@ -1,8 +1,8 @@ -package cc.fascinated.bat.features.namehistory; +package cc.fascinated.bat.namehistory; -import cc.fascinated.bat.features.Feature; -import cc.fascinated.bat.features.FeatureProfile; -import cc.fascinated.bat.features.namehistory.command.NameHistoryCommand; +import cc.fascinated.bat.common.feature.Feature; +import cc.fascinated.bat.common.feature.FeatureProfile; +import cc.fascinated.bat.namehistory.command.NameHistoryCommand; import cc.fascinated.bat.service.CommandService; import lombok.NonNull; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/cc/fascinated/bat/features/namehistory/NameHistoryListener.java b/src/main/java/cc/fascinated/bat/namehistory/NameHistoryListener.java similarity index 83% rename from src/main/java/cc/fascinated/bat/features/namehistory/NameHistoryListener.java rename to src/main/java/cc/fascinated/bat/namehistory/NameHistoryListener.java index ac5dedd..6c61289 100644 --- a/src/main/java/cc/fascinated/bat/features/namehistory/NameHistoryListener.java +++ b/src/main/java/cc/fascinated/bat/namehistory/NameHistoryListener.java @@ -1,9 +1,9 @@ -package cc.fascinated.bat.features.namehistory; +package cc.fascinated.bat.namehistory; import cc.fascinated.bat.event.EventListener; -import cc.fascinated.bat.features.namehistory.profile.user.NameHistoryProfile; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.namehistory.profile.user.NameHistoryProfile; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import cc.fascinated.bat.service.FeatureService; import cc.fascinated.bat.service.GuildService; import lombok.NonNull; @@ -40,7 +40,7 @@ public class NameHistoryListener implements EventListener { return; } - cc.fascinated.bat.features.namehistory.profile.guild.NameHistoryProfile profile = guild.getNameHistoryProfile(); + cc.fascinated.bat.namehistory.profile.guild.NameHistoryProfile profile = guild.getNameHistoryProfile(); profile.addName(user, newName); } } diff --git a/src/main/java/cc/fascinated/bat/features/namehistory/TrackedName.java b/src/main/java/cc/fascinated/bat/namehistory/TrackedName.java similarity index 94% rename from src/main/java/cc/fascinated/bat/features/namehistory/TrackedName.java rename to src/main/java/cc/fascinated/bat/namehistory/TrackedName.java index e6e0769..65d2303 100644 --- a/src/main/java/cc/fascinated/bat/features/namehistory/TrackedName.java +++ b/src/main/java/cc/fascinated/bat/namehistory/TrackedName.java @@ -1,4 +1,4 @@ -package cc.fascinated.bat.features.namehistory; +package cc.fascinated.bat.namehistory; import cc.fascinated.bat.common.Serializable; import com.google.gson.Gson; diff --git a/src/main/java/cc/fascinated/bat/features/namehistory/command/GuildSubCommand.java b/src/main/java/cc/fascinated/bat/namehistory/command/GuildSubCommand.java similarity index 87% rename from src/main/java/cc/fascinated/bat/features/namehistory/command/GuildSubCommand.java rename to src/main/java/cc/fascinated/bat/namehistory/command/GuildSubCommand.java index daa3359..c8d6fe2 100644 --- a/src/main/java/cc/fascinated/bat/features/namehistory/command/GuildSubCommand.java +++ b/src/main/java/cc/fascinated/bat/namehistory/command/GuildSubCommand.java @@ -1,12 +1,12 @@ -package cc.fascinated.bat.features.namehistory.command; +package cc.fascinated.bat.namehistory.command; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.EmbedUtils; -import cc.fascinated.bat.features.namehistory.TrackedName; -import cc.fascinated.bat.features.namehistory.profile.guild.NameHistoryProfile; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.namehistory.TrackedName; +import cc.fascinated.bat.namehistory.profile.guild.NameHistoryProfile; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import cc.fascinated.bat.service.UserService; import lombok.NonNull; import net.dv8tion.jda.api.entities.Member; diff --git a/src/main/java/cc/fascinated/bat/features/namehistory/command/NameHistoryCommand.java b/src/main/java/cc/fascinated/bat/namehistory/command/NameHistoryCommand.java similarity index 76% rename from src/main/java/cc/fascinated/bat/features/namehistory/command/NameHistoryCommand.java rename to src/main/java/cc/fascinated/bat/namehistory/command/NameHistoryCommand.java index 7df17fc..6f6177d 100644 --- a/src/main/java/cc/fascinated/bat/features/namehistory/command/NameHistoryCommand.java +++ b/src/main/java/cc/fascinated/bat/namehistory/command/NameHistoryCommand.java @@ -1,8 +1,8 @@ -package cc.fascinated.bat.features.namehistory.command; +package cc.fascinated.bat.namehistory.command; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.Category; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.Category; +import cc.fascinated.bat.common.command.CommandInfo; import lombok.NonNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; diff --git a/src/main/java/cc/fascinated/bat/features/namehistory/command/UserSubCommand.java b/src/main/java/cc/fascinated/bat/namehistory/command/UserSubCommand.java similarity index 86% rename from src/main/java/cc/fascinated/bat/features/namehistory/command/UserSubCommand.java rename to src/main/java/cc/fascinated/bat/namehistory/command/UserSubCommand.java index 913d835..ad156c0 100644 --- a/src/main/java/cc/fascinated/bat/features/namehistory/command/UserSubCommand.java +++ b/src/main/java/cc/fascinated/bat/namehistory/command/UserSubCommand.java @@ -1,12 +1,12 @@ -package cc.fascinated.bat.features.namehistory.command; +package cc.fascinated.bat.namehistory.command; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.EmbedUtils; -import cc.fascinated.bat.features.namehistory.TrackedName; -import cc.fascinated.bat.features.namehistory.profile.user.NameHistoryProfile; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.namehistory.TrackedName; +import cc.fascinated.bat.namehistory.profile.user.NameHistoryProfile; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import cc.fascinated.bat.service.UserService; import lombok.NonNull; import net.dv8tion.jda.api.entities.Member; diff --git a/src/main/java/cc/fascinated/bat/features/namehistory/profile/guild/NameHistoryProfile.java b/src/main/java/cc/fascinated/bat/namehistory/profile/guild/NameHistoryProfile.java similarity index 93% rename from src/main/java/cc/fascinated/bat/features/namehistory/profile/guild/NameHistoryProfile.java rename to src/main/java/cc/fascinated/bat/namehistory/profile/guild/NameHistoryProfile.java index b5c953e..88c8266 100644 --- a/src/main/java/cc/fascinated/bat/features/namehistory/profile/guild/NameHistoryProfile.java +++ b/src/main/java/cc/fascinated/bat/namehistory/profile/guild/NameHistoryProfile.java @@ -1,9 +1,9 @@ -package cc.fascinated.bat.features.namehistory.profile.guild; +package cc.fascinated.bat.namehistory.profile.guild; import cc.fascinated.bat.common.Serializable; -import cc.fascinated.bat.features.namehistory.NameHistoryFeature; -import cc.fascinated.bat.features.namehistory.TrackedName; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.namehistory.NameHistoryFeature; +import cc.fascinated.bat.namehistory.TrackedName; +import cc.fascinated.bat.common.model.BatUser; import com.google.gson.Gson; import lombok.NoArgsConstructor; import org.bson.Document; diff --git a/src/main/java/cc/fascinated/bat/features/namehistory/profile/user/NameHistoryProfile.java b/src/main/java/cc/fascinated/bat/namehistory/profile/user/NameHistoryProfile.java similarity index 94% rename from src/main/java/cc/fascinated/bat/features/namehistory/profile/user/NameHistoryProfile.java rename to src/main/java/cc/fascinated/bat/namehistory/profile/user/NameHistoryProfile.java index 1205f87..8c1760a 100644 --- a/src/main/java/cc/fascinated/bat/features/namehistory/profile/user/NameHistoryProfile.java +++ b/src/main/java/cc/fascinated/bat/namehistory/profile/user/NameHistoryProfile.java @@ -1,8 +1,8 @@ -package cc.fascinated.bat.features.namehistory.profile.user; +package cc.fascinated.bat.namehistory.profile.user; import cc.fascinated.bat.common.Serializable; -import cc.fascinated.bat.features.namehistory.NameHistoryFeature; -import cc.fascinated.bat.features.namehistory.TrackedName; +import cc.fascinated.bat.namehistory.NameHistoryFeature; +import cc.fascinated.bat.namehistory.TrackedName; import com.google.gson.Gson; import lombok.NoArgsConstructor; import org.bson.Document; diff --git a/src/main/java/cc/fascinated/bat/features/reminder/Reminder.java b/src/main/java/cc/fascinated/bat/reminder/Reminder.java similarity index 95% rename from src/main/java/cc/fascinated/bat/features/reminder/Reminder.java rename to src/main/java/cc/fascinated/bat/reminder/Reminder.java index d29bb8e..12e9727 100644 --- a/src/main/java/cc/fascinated/bat/features/reminder/Reminder.java +++ b/src/main/java/cc/fascinated/bat/reminder/Reminder.java @@ -1,4 +1,4 @@ -package cc.fascinated.bat.features.reminder; +package cc.fascinated.bat.reminder; import cc.fascinated.bat.common.ChannelUtils; import lombok.AllArgsConstructor; diff --git a/src/main/java/cc/fascinated/bat/features/reminder/ReminderFeature.java b/src/main/java/cc/fascinated/bat/reminder/ReminderFeature.java similarity index 92% rename from src/main/java/cc/fascinated/bat/features/reminder/ReminderFeature.java rename to src/main/java/cc/fascinated/bat/reminder/ReminderFeature.java index 1a492a0..ace4929 100644 --- a/src/main/java/cc/fascinated/bat/features/reminder/ReminderFeature.java +++ b/src/main/java/cc/fascinated/bat/reminder/ReminderFeature.java @@ -1,9 +1,9 @@ -package cc.fascinated.bat.features.reminder; +package cc.fascinated.bat.reminder; -import cc.fascinated.bat.features.Feature; -import cc.fascinated.bat.features.FeatureProfile; -import cc.fascinated.bat.features.reminder.command.ReminderCommand; -import cc.fascinated.bat.model.BatGuild; +import cc.fascinated.bat.common.feature.Feature; +import cc.fascinated.bat.common.feature.FeatureProfile; +import cc.fascinated.bat.reminder.command.ReminderCommand; +import cc.fascinated.bat.common.model.BatGuild; import cc.fascinated.bat.service.CommandService; import cc.fascinated.bat.service.DiscordService; import cc.fascinated.bat.service.GuildService; diff --git a/src/main/java/cc/fascinated/bat/features/reminder/ReminderProfile.java b/src/main/java/cc/fascinated/bat/reminder/ReminderProfile.java similarity index 98% rename from src/main/java/cc/fascinated/bat/features/reminder/ReminderProfile.java rename to src/main/java/cc/fascinated/bat/reminder/ReminderProfile.java index 001153e..3c3f4f6 100644 --- a/src/main/java/cc/fascinated/bat/features/reminder/ReminderProfile.java +++ b/src/main/java/cc/fascinated/bat/reminder/ReminderProfile.java @@ -1,4 +1,4 @@ -package cc.fascinated.bat.features.reminder; +package cc.fascinated.bat.reminder; import cc.fascinated.bat.common.Serializable; import cc.fascinated.bat.service.DiscordService; diff --git a/src/main/java/cc/fascinated/bat/features/reminder/command/ClearSubCommand.java b/src/main/java/cc/fascinated/bat/reminder/command/ClearSubCommand.java similarity index 82% rename from src/main/java/cc/fascinated/bat/features/reminder/command/ClearSubCommand.java rename to src/main/java/cc/fascinated/bat/reminder/command/ClearSubCommand.java index 0b342cf..34c0c48 100644 --- a/src/main/java/cc/fascinated/bat/features/reminder/command/ClearSubCommand.java +++ b/src/main/java/cc/fascinated/bat/reminder/command/ClearSubCommand.java @@ -1,11 +1,11 @@ -package cc.fascinated.bat.features.reminder.command; +package cc.fascinated.bat.reminder.command; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.EmbedUtils; -import cc.fascinated.bat.features.reminder.ReminderProfile; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.reminder.ReminderProfile; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import lombok.NonNull; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; diff --git a/src/main/java/cc/fascinated/bat/features/reminder/command/ListSubCommand.java b/src/main/java/cc/fascinated/bat/reminder/command/ListSubCommand.java similarity index 83% rename from src/main/java/cc/fascinated/bat/features/reminder/command/ListSubCommand.java rename to src/main/java/cc/fascinated/bat/reminder/command/ListSubCommand.java index 4cf1824..8004c99 100644 --- a/src/main/java/cc/fascinated/bat/features/reminder/command/ListSubCommand.java +++ b/src/main/java/cc/fascinated/bat/reminder/command/ListSubCommand.java @@ -1,13 +1,13 @@ -package cc.fascinated.bat.features.reminder.command; +package cc.fascinated.bat.reminder.command; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.DescriptionBuilder; import cc.fascinated.bat.common.EmbedUtils; -import cc.fascinated.bat.features.reminder.Reminder; -import cc.fascinated.bat.features.reminder.ReminderProfile; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.reminder.Reminder; +import cc.fascinated.bat.reminder.ReminderProfile; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import lombok.NonNull; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; diff --git a/src/main/java/cc/fascinated/bat/features/reminder/command/ReminderCommand.java b/src/main/java/cc/fascinated/bat/reminder/command/ReminderCommand.java similarity index 77% rename from src/main/java/cc/fascinated/bat/features/reminder/command/ReminderCommand.java rename to src/main/java/cc/fascinated/bat/reminder/command/ReminderCommand.java index 91028a9..b0e10ae 100644 --- a/src/main/java/cc/fascinated/bat/features/reminder/command/ReminderCommand.java +++ b/src/main/java/cc/fascinated/bat/reminder/command/ReminderCommand.java @@ -1,8 +1,8 @@ -package cc.fascinated.bat.features.reminder.command; +package cc.fascinated.bat.reminder.command; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.Category; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.Category; +import cc.fascinated.bat.common.command.CommandInfo; import lombok.NonNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; diff --git a/src/main/java/cc/fascinated/bat/features/reminder/command/SetSubCommand.java b/src/main/java/cc/fascinated/bat/reminder/command/SetSubCommand.java similarity index 89% rename from src/main/java/cc/fascinated/bat/features/reminder/command/SetSubCommand.java rename to src/main/java/cc/fascinated/bat/reminder/command/SetSubCommand.java index 95b2f71..5758332 100644 --- a/src/main/java/cc/fascinated/bat/features/reminder/command/SetSubCommand.java +++ b/src/main/java/cc/fascinated/bat/reminder/command/SetSubCommand.java @@ -1,14 +1,14 @@ -package cc.fascinated.bat.features.reminder.command; +package cc.fascinated.bat.reminder.command; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.EmbedUtils; import cc.fascinated.bat.common.TimeUtils; -import cc.fascinated.bat.features.reminder.Reminder; -import cc.fascinated.bat.features.reminder.ReminderFeature; -import cc.fascinated.bat.features.reminder.ReminderProfile; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.reminder.Reminder; +import cc.fascinated.bat.reminder.ReminderFeature; +import cc.fascinated.bat.reminder.ReminderProfile; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import lombok.NonNull; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; diff --git a/src/main/java/cc/fascinated/bat/repository/DiscordMessageRepository.java b/src/main/java/cc/fascinated/bat/repository/DiscordMessageRepository.java index 5af1603..e218591 100644 --- a/src/main/java/cc/fascinated/bat/repository/DiscordMessageRepository.java +++ b/src/main/java/cc/fascinated/bat/repository/DiscordMessageRepository.java @@ -1,6 +1,6 @@ package cc.fascinated.bat.repository; -import cc.fascinated.bat.model.DiscordMessage; +import cc.fascinated.bat.common.model.DiscordMessage; import org.springframework.data.repository.CrudRepository; /** diff --git a/src/main/java/cc/fascinated/bat/service/CommandService.java b/src/main/java/cc/fascinated/bat/service/CommandService.java index 0e8f760..203b723 100644 --- a/src/main/java/cc/fascinated/bat/service/CommandService.java +++ b/src/main/java/cc/fascinated/bat/service/CommandService.java @@ -1,13 +1,13 @@ package cc.fascinated.bat.service; import cc.fascinated.bat.Consts; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.Category; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.Category; import cc.fascinated.bat.common.EmbedUtils; import cc.fascinated.bat.config.Config; -import cc.fascinated.bat.features.FeatureProfile; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.common.feature.FeatureProfile; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import io.sentry.Hint; import io.sentry.Sentry; import lombok.Getter; diff --git a/src/main/java/cc/fascinated/bat/service/DiscordMessageService.java b/src/main/java/cc/fascinated/bat/service/DiscordMessageService.java index 0376c45..03b6861 100644 --- a/src/main/java/cc/fascinated/bat/service/DiscordMessageService.java +++ b/src/main/java/cc/fascinated/bat/service/DiscordMessageService.java @@ -1,9 +1,9 @@ package cc.fascinated.bat.service; import cc.fascinated.bat.event.EventListener; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; -import cc.fascinated.bat.model.DiscordMessage; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; +import cc.fascinated.bat.common.model.DiscordMessage; import cc.fascinated.bat.repository.DiscordMessageRepository; import lombok.NonNull; import lombok.extern.log4j.Log4j2; diff --git a/src/main/java/cc/fascinated/bat/service/EventService.java b/src/main/java/cc/fascinated/bat/service/EventService.java index c9e3e55..d57c065 100644 --- a/src/main/java/cc/fascinated/bat/service/EventService.java +++ b/src/main/java/cc/fascinated/bat/service/EventService.java @@ -2,9 +2,9 @@ package cc.fascinated.bat.service; import cc.fascinated.bat.common.EmbedUtils; import cc.fascinated.bat.event.EventListener; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; -import cc.fascinated.bat.model.DiscordMessage; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; +import cc.fascinated.bat.common.model.DiscordMessage; import io.sentry.Hint; import io.sentry.Sentry; import lombok.NonNull; diff --git a/src/main/java/cc/fascinated/bat/service/FeatureService.java b/src/main/java/cc/fascinated/bat/service/FeatureService.java index 04d44fc..9b03df0 100644 --- a/src/main/java/cc/fascinated/bat/service/FeatureService.java +++ b/src/main/java/cc/fascinated/bat/service/FeatureService.java @@ -1,7 +1,7 @@ package cc.fascinated.bat.service; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.features.Feature; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.feature.Feature; import jakarta.annotation.PostConstruct; import lombok.Getter; import lombok.NonNull; diff --git a/src/main/java/cc/fascinated/bat/service/GuildService.java b/src/main/java/cc/fascinated/bat/service/GuildService.java index dc30614..af42b2e 100644 --- a/src/main/java/cc/fascinated/bat/service/GuildService.java +++ b/src/main/java/cc/fascinated/bat/service/GuildService.java @@ -1,13 +1,13 @@ package cc.fascinated.bat.service; -import cc.fascinated.bat.command.BatCommand; +import cc.fascinated.bat.common.command.BatCommand; import cc.fascinated.bat.common.EmbedUtils; import cc.fascinated.bat.common.TimerUtils; import cc.fascinated.bat.event.EventListener; -import cc.fascinated.bat.features.base.commands.general.HelpCommand; -import cc.fascinated.bat.features.base.commands.server.feature.FeatureCommand; -import cc.fascinated.bat.features.base.commands.server.feature.ListSubCommand; -import cc.fascinated.bat.model.BatGuild; +import cc.fascinated.bat.base.commands.general.HelpCommand; +import cc.fascinated.bat.base.commands.server.feature.FeatureCommand; +import cc.fascinated.bat.base.commands.server.feature.ListSubCommand; +import cc.fascinated.bat.common.model.BatGuild; import cc.fascinated.bat.premium.PremiumProfile; import com.mongodb.client.model.Filters; import lombok.Getter; diff --git a/src/main/java/cc/fascinated/bat/service/UserService.java b/src/main/java/cc/fascinated/bat/service/UserService.java index 4fd539c..8e40264 100644 --- a/src/main/java/cc/fascinated/bat/service/UserService.java +++ b/src/main/java/cc/fascinated/bat/service/UserService.java @@ -2,8 +2,8 @@ package cc.fascinated.bat.service; import cc.fascinated.bat.common.TimerUtils; import cc.fascinated.bat.event.EventListener; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import com.mongodb.client.model.Filters; import lombok.Getter; import lombok.NonNull; diff --git a/src/main/java/cc/fascinated/bat/features/statschannel/StatsChannel.java b/src/main/java/cc/fascinated/bat/statschannel/StatsChannel.java similarity index 90% rename from src/main/java/cc/fascinated/bat/features/statschannel/StatsChannel.java rename to src/main/java/cc/fascinated/bat/statschannel/StatsChannel.java index 784b71a..be515a5 100644 --- a/src/main/java/cc/fascinated/bat/features/statschannel/StatsChannel.java +++ b/src/main/java/cc/fascinated/bat/statschannel/StatsChannel.java @@ -1,4 +1,4 @@ -package cc.fascinated.bat.features.statschannel; +package cc.fascinated.bat.statschannel; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/cc/fascinated/bat/features/statschannel/StatsChannelFeature.java b/src/main/java/cc/fascinated/bat/statschannel/StatsChannelFeature.java similarity index 90% rename from src/main/java/cc/fascinated/bat/features/statschannel/StatsChannelFeature.java rename to src/main/java/cc/fascinated/bat/statschannel/StatsChannelFeature.java index 6215655..87cf4c2 100644 --- a/src/main/java/cc/fascinated/bat/features/statschannel/StatsChannelFeature.java +++ b/src/main/java/cc/fascinated/bat/statschannel/StatsChannelFeature.java @@ -1,9 +1,9 @@ -package cc.fascinated.bat.features.statschannel; +package cc.fascinated.bat.statschannel; -import cc.fascinated.bat.features.Feature; -import cc.fascinated.bat.features.FeatureProfile; -import cc.fascinated.bat.features.statschannel.command.StatsChannelCommand; -import cc.fascinated.bat.model.BatGuild; +import cc.fascinated.bat.common.feature.Feature; +import cc.fascinated.bat.common.feature.FeatureProfile; +import cc.fascinated.bat.statschannel.command.StatsChannelCommand; +import cc.fascinated.bat.common.model.BatGuild; import cc.fascinated.bat.service.CommandService; import cc.fascinated.bat.service.DiscordService; import cc.fascinated.bat.service.GuildService; diff --git a/src/main/java/cc/fascinated/bat/features/statschannel/StatsChannelProfile.java b/src/main/java/cc/fascinated/bat/statschannel/StatsChannelProfile.java similarity index 97% rename from src/main/java/cc/fascinated/bat/features/statschannel/StatsChannelProfile.java rename to src/main/java/cc/fascinated/bat/statschannel/StatsChannelProfile.java index 13d90e5..8a793ca 100644 --- a/src/main/java/cc/fascinated/bat/features/statschannel/StatsChannelProfile.java +++ b/src/main/java/cc/fascinated/bat/statschannel/StatsChannelProfile.java @@ -1,7 +1,7 @@ -package cc.fascinated.bat.features.statschannel; +package cc.fascinated.bat.statschannel; import cc.fascinated.bat.common.Serializable; -import cc.fascinated.bat.model.BatGuild; +import cc.fascinated.bat.common.model.BatGuild; import cc.fascinated.bat.service.DiscordService; import com.google.gson.Gson; import net.dv8tion.jda.api.entities.channel.concrete.VoiceChannel; diff --git a/src/main/java/cc/fascinated/bat/features/statschannel/StatsPlaceholders.java b/src/main/java/cc/fascinated/bat/statschannel/StatsPlaceholders.java similarity index 96% rename from src/main/java/cc/fascinated/bat/features/statschannel/StatsPlaceholders.java rename to src/main/java/cc/fascinated/bat/statschannel/StatsPlaceholders.java index 9ae1f5c..8cde4d0 100644 --- a/src/main/java/cc/fascinated/bat/features/statschannel/StatsPlaceholders.java +++ b/src/main/java/cc/fascinated/bat/statschannel/StatsPlaceholders.java @@ -1,7 +1,7 @@ -package cc.fascinated.bat.features.statschannel; +package cc.fascinated.bat.statschannel; import cc.fascinated.bat.common.NumberFormatter; -import cc.fascinated.bat.model.BatGuild; +import cc.fascinated.bat.common.model.BatGuild; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/cc/fascinated/bat/features/statschannel/command/AddSubCommand.java b/src/main/java/cc/fascinated/bat/statschannel/command/AddSubCommand.java similarity index 90% rename from src/main/java/cc/fascinated/bat/features/statschannel/command/AddSubCommand.java rename to src/main/java/cc/fascinated/bat/statschannel/command/AddSubCommand.java index 74c01c3..fd84c04 100644 --- a/src/main/java/cc/fascinated/bat/features/statschannel/command/AddSubCommand.java +++ b/src/main/java/cc/fascinated/bat/statschannel/command/AddSubCommand.java @@ -1,13 +1,13 @@ -package cc.fascinated.bat.features.statschannel.command; +package cc.fascinated.bat.statschannel.command; import cc.fascinated.bat.Emojis; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.DescriptionBuilder; import cc.fascinated.bat.common.EmbedUtils; -import cc.fascinated.bat.features.statschannel.StatsChannelProfile; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.statschannel.StatsChannelProfile; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import lombok.NonNull; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.Member; diff --git a/src/main/java/cc/fascinated/bat/features/statschannel/command/CurrentSubCommand.java b/src/main/java/cc/fascinated/bat/statschannel/command/CurrentSubCommand.java similarity index 80% rename from src/main/java/cc/fascinated/bat/features/statschannel/command/CurrentSubCommand.java rename to src/main/java/cc/fascinated/bat/statschannel/command/CurrentSubCommand.java index 69541ba..d4342f8 100644 --- a/src/main/java/cc/fascinated/bat/features/statschannel/command/CurrentSubCommand.java +++ b/src/main/java/cc/fascinated/bat/statschannel/command/CurrentSubCommand.java @@ -1,14 +1,14 @@ -package cc.fascinated.bat.features.statschannel.command; +package cc.fascinated.bat.statschannel.command; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.DescriptionBuilder; import cc.fascinated.bat.common.EmbedUtils; -import cc.fascinated.bat.features.statschannel.StatsChannel; -import cc.fascinated.bat.features.statschannel.StatsChannelFeature; -import cc.fascinated.bat.features.statschannel.StatsChannelProfile; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.statschannel.StatsChannel; +import cc.fascinated.bat.statschannel.StatsChannelFeature; +import cc.fascinated.bat.statschannel.StatsChannelProfile; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import lombok.NonNull; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; diff --git a/src/main/java/cc/fascinated/bat/features/statschannel/command/RemoveSubCommand.java b/src/main/java/cc/fascinated/bat/statschannel/command/RemoveSubCommand.java similarity index 89% rename from src/main/java/cc/fascinated/bat/features/statschannel/command/RemoveSubCommand.java rename to src/main/java/cc/fascinated/bat/statschannel/command/RemoveSubCommand.java index e682a61..cdfe0c4 100644 --- a/src/main/java/cc/fascinated/bat/features/statschannel/command/RemoveSubCommand.java +++ b/src/main/java/cc/fascinated/bat/statschannel/command/RemoveSubCommand.java @@ -1,12 +1,12 @@ -package cc.fascinated.bat.features.statschannel.command; +package cc.fascinated.bat.statschannel.command; import cc.fascinated.bat.Emojis; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.EmbedUtils; -import cc.fascinated.bat.features.statschannel.StatsChannelProfile; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.statschannel.StatsChannelProfile; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import lombok.NonNull; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; diff --git a/src/main/java/cc/fascinated/bat/features/statschannel/command/StatsChannelCommand.java b/src/main/java/cc/fascinated/bat/statschannel/command/StatsChannelCommand.java similarity index 84% rename from src/main/java/cc/fascinated/bat/features/statschannel/command/StatsChannelCommand.java rename to src/main/java/cc/fascinated/bat/statschannel/command/StatsChannelCommand.java index 844c9e5..68dd3b3 100644 --- a/src/main/java/cc/fascinated/bat/features/statschannel/command/StatsChannelCommand.java +++ b/src/main/java/cc/fascinated/bat/statschannel/command/StatsChannelCommand.java @@ -1,7 +1,7 @@ -package cc.fascinated.bat.features.statschannel.command; +package cc.fascinated.bat.statschannel.command; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.CommandInfo; import lombok.NonNull; import net.dv8tion.jda.api.Permission; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/cc/fascinated/bat/features/welcomer/WelcomerEmbed.java b/src/main/java/cc/fascinated/bat/welcomer/WelcomerEmbed.java similarity index 96% rename from src/main/java/cc/fascinated/bat/features/welcomer/WelcomerEmbed.java rename to src/main/java/cc/fascinated/bat/welcomer/WelcomerEmbed.java index 01705b1..c45466d 100644 --- a/src/main/java/cc/fascinated/bat/features/welcomer/WelcomerEmbed.java +++ b/src/main/java/cc/fascinated/bat/welcomer/WelcomerEmbed.java @@ -1,4 +1,4 @@ -package cc.fascinated.bat.features.welcomer; +package cc.fascinated.bat.welcomer; import cc.fascinated.bat.common.HexColorUtils; import lombok.AllArgsConstructor; diff --git a/src/main/java/cc/fascinated/bat/features/welcomer/WelcomerFeature.java b/src/main/java/cc/fascinated/bat/welcomer/WelcomerFeature.java similarity index 75% rename from src/main/java/cc/fascinated/bat/features/welcomer/WelcomerFeature.java rename to src/main/java/cc/fascinated/bat/welcomer/WelcomerFeature.java index 1f0b1f4..c2f3ae7 100644 --- a/src/main/java/cc/fascinated/bat/features/welcomer/WelcomerFeature.java +++ b/src/main/java/cc/fascinated/bat/welcomer/WelcomerFeature.java @@ -1,8 +1,8 @@ -package cc.fascinated.bat.features.welcomer; +package cc.fascinated.bat.welcomer; -import cc.fascinated.bat.features.Feature; -import cc.fascinated.bat.features.FeatureProfile; -import cc.fascinated.bat.features.welcomer.command.WelcomerCommand; +import cc.fascinated.bat.common.feature.Feature; +import cc.fascinated.bat.common.feature.FeatureProfile; +import cc.fascinated.bat.welcomer.command.WelcomerCommand; import cc.fascinated.bat.service.CommandService; import lombok.NonNull; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/cc/fascinated/bat/features/welcomer/WelcomerListener.java b/src/main/java/cc/fascinated/bat/welcomer/WelcomerListener.java similarity index 87% rename from src/main/java/cc/fascinated/bat/features/welcomer/WelcomerListener.java rename to src/main/java/cc/fascinated/bat/welcomer/WelcomerListener.java index e270847..ea43b99 100644 --- a/src/main/java/cc/fascinated/bat/features/welcomer/WelcomerListener.java +++ b/src/main/java/cc/fascinated/bat/welcomer/WelcomerListener.java @@ -1,8 +1,8 @@ -package cc.fascinated.bat.features.welcomer; +package cc.fascinated.bat.welcomer; import cc.fascinated.bat.event.EventListener; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import lombok.NonNull; import net.dv8tion.jda.api.events.guild.member.GuildMemberJoinEvent; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/cc/fascinated/bat/features/welcomer/WelcomerMessage.java b/src/main/java/cc/fascinated/bat/welcomer/WelcomerMessage.java similarity index 92% rename from src/main/java/cc/fascinated/bat/features/welcomer/WelcomerMessage.java rename to src/main/java/cc/fascinated/bat/welcomer/WelcomerMessage.java index 3ad05aa..c41ca46 100644 --- a/src/main/java/cc/fascinated/bat/features/welcomer/WelcomerMessage.java +++ b/src/main/java/cc/fascinated/bat/welcomer/WelcomerMessage.java @@ -1,4 +1,4 @@ -package cc.fascinated.bat.features.welcomer; +package cc.fascinated.bat.welcomer; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/cc/fascinated/bat/features/welcomer/WelcomerPlaceholders.java b/src/main/java/cc/fascinated/bat/welcomer/WelcomerPlaceholders.java similarity index 94% rename from src/main/java/cc/fascinated/bat/features/welcomer/WelcomerPlaceholders.java rename to src/main/java/cc/fascinated/bat/welcomer/WelcomerPlaceholders.java index 202242e..d194eff 100644 --- a/src/main/java/cc/fascinated/bat/features/welcomer/WelcomerPlaceholders.java +++ b/src/main/java/cc/fascinated/bat/welcomer/WelcomerPlaceholders.java @@ -1,7 +1,7 @@ -package cc.fascinated.bat.features.welcomer; +package cc.fascinated.bat.welcomer; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/cc/fascinated/bat/features/welcomer/WelcomerProfile.java b/src/main/java/cc/fascinated/bat/welcomer/WelcomerProfile.java similarity index 97% rename from src/main/java/cc/fascinated/bat/features/welcomer/WelcomerProfile.java rename to src/main/java/cc/fascinated/bat/welcomer/WelcomerProfile.java index 28dffa3..aa22f3a 100644 --- a/src/main/java/cc/fascinated/bat/features/welcomer/WelcomerProfile.java +++ b/src/main/java/cc/fascinated/bat/welcomer/WelcomerProfile.java @@ -1,9 +1,9 @@ -package cc.fascinated.bat.features.welcomer; +package cc.fascinated.bat.welcomer; import cc.fascinated.bat.common.ChannelUtils; import cc.fascinated.bat.common.Serializable; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import com.google.gson.Gson; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/cc/fascinated/bat/features/welcomer/command/ChannelSubCommand.java b/src/main/java/cc/fascinated/bat/welcomer/command/ChannelSubCommand.java similarity index 85% rename from src/main/java/cc/fascinated/bat/features/welcomer/command/ChannelSubCommand.java rename to src/main/java/cc/fascinated/bat/welcomer/command/ChannelSubCommand.java index d292f08..9d5ebe6 100644 --- a/src/main/java/cc/fascinated/bat/features/welcomer/command/ChannelSubCommand.java +++ b/src/main/java/cc/fascinated/bat/welcomer/command/ChannelSubCommand.java @@ -1,11 +1,11 @@ -package cc.fascinated.bat.features.welcomer.command; +package cc.fascinated.bat.welcomer.command; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.EmbedUtils; -import cc.fascinated.bat.features.welcomer.WelcomerProfile; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.welcomer.WelcomerProfile; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import lombok.NonNull; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; diff --git a/src/main/java/cc/fascinated/bat/features/welcomer/command/CurrentSubCommand.java b/src/main/java/cc/fascinated/bat/welcomer/command/CurrentSubCommand.java similarity index 87% rename from src/main/java/cc/fascinated/bat/features/welcomer/command/CurrentSubCommand.java rename to src/main/java/cc/fascinated/bat/welcomer/command/CurrentSubCommand.java index 277ec8c..437af0f 100644 --- a/src/main/java/cc/fascinated/bat/features/welcomer/command/CurrentSubCommand.java +++ b/src/main/java/cc/fascinated/bat/welcomer/command/CurrentSubCommand.java @@ -1,12 +1,12 @@ -package cc.fascinated.bat.features.welcomer.command; +package cc.fascinated.bat.welcomer.command; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.EmbedUtils; -import cc.fascinated.bat.features.welcomer.WelcomerPlaceholders; -import cc.fascinated.bat.features.welcomer.WelcomerProfile; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.welcomer.WelcomerPlaceholders; +import cc.fascinated.bat.welcomer.WelcomerProfile; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import lombok.NonNull; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; diff --git a/src/main/java/cc/fascinated/bat/features/welcomer/command/EmbedSubCommand.java b/src/main/java/cc/fascinated/bat/welcomer/command/EmbedSubCommand.java similarity index 94% rename from src/main/java/cc/fascinated/bat/features/welcomer/command/EmbedSubCommand.java rename to src/main/java/cc/fascinated/bat/welcomer/command/EmbedSubCommand.java index 39e800d..e316be1 100644 --- a/src/main/java/cc/fascinated/bat/features/welcomer/command/EmbedSubCommand.java +++ b/src/main/java/cc/fascinated/bat/welcomer/command/EmbedSubCommand.java @@ -1,14 +1,14 @@ -package cc.fascinated.bat.features.welcomer.command; +package cc.fascinated.bat.welcomer.command; import cc.fascinated.bat.Emojis; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.DescriptionBuilder; import cc.fascinated.bat.common.EmbedUtils; import cc.fascinated.bat.common.HexColorUtils; -import cc.fascinated.bat.features.welcomer.WelcomerProfile; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.welcomer.WelcomerProfile; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import lombok.NonNull; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; diff --git a/src/main/java/cc/fascinated/bat/features/welcomer/command/MessageSubCommand.java b/src/main/java/cc/fascinated/bat/welcomer/command/MessageSubCommand.java similarity index 86% rename from src/main/java/cc/fascinated/bat/features/welcomer/command/MessageSubCommand.java rename to src/main/java/cc/fascinated/bat/welcomer/command/MessageSubCommand.java index 4852500..117ff83 100644 --- a/src/main/java/cc/fascinated/bat/features/welcomer/command/MessageSubCommand.java +++ b/src/main/java/cc/fascinated/bat/welcomer/command/MessageSubCommand.java @@ -1,14 +1,14 @@ -package cc.fascinated.bat.features.welcomer.command; +package cc.fascinated.bat.welcomer.command; import cc.fascinated.bat.Emojis; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.DescriptionBuilder; import cc.fascinated.bat.common.EmbedUtils; -import cc.fascinated.bat.features.welcomer.WelcomerPlaceholders; -import cc.fascinated.bat.features.welcomer.WelcomerProfile; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.welcomer.WelcomerPlaceholders; +import cc.fascinated.bat.welcomer.WelcomerProfile; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import lombok.NonNull; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; diff --git a/src/main/java/cc/fascinated/bat/features/welcomer/command/ResetSubCommand.java b/src/main/java/cc/fascinated/bat/welcomer/command/ResetSubCommand.java similarity index 81% rename from src/main/java/cc/fascinated/bat/features/welcomer/command/ResetSubCommand.java rename to src/main/java/cc/fascinated/bat/welcomer/command/ResetSubCommand.java index 74d0e04..a2166fe 100644 --- a/src/main/java/cc/fascinated/bat/features/welcomer/command/ResetSubCommand.java +++ b/src/main/java/cc/fascinated/bat/welcomer/command/ResetSubCommand.java @@ -1,11 +1,11 @@ -package cc.fascinated.bat.features.welcomer.command; +package cc.fascinated.bat.welcomer.command; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.CommandInfo; import cc.fascinated.bat.common.EmbedUtils; -import cc.fascinated.bat.features.welcomer.WelcomerProfile; -import cc.fascinated.bat.model.BatGuild; -import cc.fascinated.bat.model.BatUser; +import cc.fascinated.bat.welcomer.WelcomerProfile; +import cc.fascinated.bat.common.model.BatGuild; +import cc.fascinated.bat.common.model.BatUser; import lombok.NonNull; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Message; diff --git a/src/main/java/cc/fascinated/bat/features/welcomer/command/WelcomerCommand.java b/src/main/java/cc/fascinated/bat/welcomer/command/WelcomerCommand.java similarity index 82% rename from src/main/java/cc/fascinated/bat/features/welcomer/command/WelcomerCommand.java rename to src/main/java/cc/fascinated/bat/welcomer/command/WelcomerCommand.java index 10451de..d6d7201 100644 --- a/src/main/java/cc/fascinated/bat/features/welcomer/command/WelcomerCommand.java +++ b/src/main/java/cc/fascinated/bat/welcomer/command/WelcomerCommand.java @@ -1,8 +1,8 @@ -package cc.fascinated.bat.features.welcomer.command; +package cc.fascinated.bat.welcomer.command; -import cc.fascinated.bat.command.BatCommand; -import cc.fascinated.bat.command.Category; -import cc.fascinated.bat.command.CommandInfo; +import cc.fascinated.bat.common.command.BatCommand; +import cc.fascinated.bat.common.command.Category; +import cc.fascinated.bat.common.command.CommandInfo; import lombok.NonNull; import net.dv8tion.jda.api.Permission; import org.springframework.beans.factory.annotation.Autowired;