From 750264532514f59cbc1203a2f57d33a9ebf12ee6 Mon Sep 17 00:00:00 2001 From: anthony Date: Sat, 15 Feb 2025 15:06:28 +0100 Subject: [PATCH] modified: CNAME modified: pom.xml renamed: scripts/run_jmusicbot.sh -> scripts/run_infernote.sh renamed: src/main/java/com/jagrosh/jmusicbot/Bot.java -> src/main/java/su/cif/infernote/Bot.java renamed: src/main/java/com/jagrosh/jmusicbot/BotConfig.java -> src/main/java/su/cif/infernote/BotConfig.java renamed: src/main/java/com/jagrosh/jmusicbot/JMusicBot.java -> src/main/java/su/cif/infernote/Infernote.java renamed: src/main/java/com/jagrosh/jmusicbot/Listener.java -> src/main/java/su/cif/infernote/Listener.java renamed: src/main/java/com/jagrosh/jmusicbot/audio/AloneInVoiceHandler.java -> src/main/java/su/cif/infernote/audio/AloneInVoiceHandler.java renamed: src/main/java/com/jagrosh/jmusicbot/audio/AudioHandler.java -> src/main/java/su/cif/infernote/audio/AudioHandler.java renamed: src/main/java/com/jagrosh/jmusicbot/audio/NowplayingHandler.java -> src/main/java/su/cif/infernote/audio/NowplayingHandler.java renamed: src/main/java/com/jagrosh/jmusicbot/audio/PlayerManager.java -> src/main/java/su/cif/infernote/audio/PlayerManager.java renamed: src/main/java/com/jagrosh/jmusicbot/audio/QueuedTrack.java -> src/main/java/su/cif/infernote/audio/QueuedTrack.java renamed: src/main/java/com/jagrosh/jmusicbot/audio/RequestMetadata.java -> src/main/java/su/cif/infernote/audio/RequestMetadata.java renamed: src/main/java/com/jagrosh/jmusicbot/audio/TransformativeAudioSourceManager.java -> src/main/java/su/cif/infernote/audio/TransformativeAudioSourceManager.java renamed: src/main/java/com/jagrosh/jmusicbot/commands/AdminCommand.java -> src/main/java/su/cif/infernote/commands/AdminCommand.java renamed: src/main/java/com/jagrosh/jmusicbot/commands/DJCommand.java -> src/main/java/su/cif/infernote/commands/DJCommand.java renamed: src/main/java/com/jagrosh/jmusicbot/commands/MusicCommand.java -> src/main/java/su/cif/infernote/commands/MusicCommand.java renamed: src/main/java/com/jagrosh/jmusicbot/commands/OwnerCommand.java -> src/main/java/su/cif/infernote/commands/OwnerCommand.java renamed: src/main/java/com/jagrosh/jmusicbot/commands/admin/PrefixCmd.java -> src/main/java/su/cif/infernote/commands/admin/PrefixCmd.java renamed: src/main/java/com/jagrosh/jmusicbot/commands/admin/QueueTypeCmd.java -> src/main/java/su/cif/infernote/commands/admin/QueueTypeCmd.java renamed: src/main/java/com/jagrosh/jmusicbot/commands/admin/SetdjCmd.java -> src/main/java/su/cif/infernote/commands/admin/SetdjCmd.java renamed: src/main/java/com/jagrosh/jmusicbot/commands/admin/SettcCmd.java -> src/main/java/su/cif/infernote/commands/admin/SettcCmd.java renamed: src/main/java/com/jagrosh/jmusicbot/commands/admin/SetvcCmd.java -> src/main/java/su/cif/infernote/commands/admin/SetvcCmd.java renamed: src/main/java/com/jagrosh/jmusicbot/commands/admin/SkipratioCmd.java -> src/main/java/su/cif/infernote/commands/admin/SkipratioCmd.java renamed: src/main/java/com/jagrosh/jmusicbot/commands/dj/ForceRemoveCmd.java -> src/main/java/su/cif/infernote/commands/dj/ForceRemoveCmd.java renamed: src/main/java/com/jagrosh/jmusicbot/commands/dj/ForceskipCmd.java -> src/main/java/su/cif/infernote/commands/dj/ForceskipCmd.java renamed: src/main/java/com/jagrosh/jmusicbot/commands/dj/MoveTrackCmd.java -> src/main/java/su/cif/infernote/commands/dj/MoveTrackCmd.java renamed: src/main/java/com/jagrosh/jmusicbot/commands/dj/PauseCmd.java -> src/main/java/su/cif/infernote/commands/dj/PauseCmd.java renamed: src/main/java/com/jagrosh/jmusicbot/commands/dj/PlaynextCmd.java -> src/main/java/su/cif/infernote/commands/dj/PlaynextCmd.java renamed: src/main/java/com/jagrosh/jmusicbot/commands/dj/RepeatCmd.java -> src/main/java/su/cif/infernote/commands/dj/RepeatCmd.java renamed: src/main/java/com/jagrosh/jmusicbot/commands/dj/SkiptoCmd.java -> src/main/java/su/cif/infernote/commands/dj/SkiptoCmd.java renamed: src/main/java/com/jagrosh/jmusicbot/commands/dj/StopCmd.java -> src/main/java/su/cif/infernote/commands/dj/StopCmd.java renamed: src/main/java/com/jagrosh/jmusicbot/commands/dj/VolumeCmd.java -> src/main/java/su/cif/infernote/commands/dj/VolumeCmd.java renamed: src/main/java/com/jagrosh/jmusicbot/commands/general/SettingsCmd.java -> src/main/java/su/cif/infernote/commands/general/SettingsCmd.java renamed: src/main/java/com/jagrosh/jmusicbot/commands/music/LyricsCmd.java -> src/main/java/su/cif/infernote/commands/music/LyricsCmd.java renamed: src/main/java/com/jagrosh/jmusicbot/commands/music/NowplayingCmd.java -> src/main/java/su/cif/infernote/commands/music/NowplayingCmd.java renamed: src/main/java/com/jagrosh/jmusicbot/commands/music/PlayCmd.java -> src/main/java/su/cif/infernote/commands/music/PlayCmd.java renamed: src/main/java/com/jagrosh/jmusicbot/commands/music/PlaylistsCmd.java -> src/main/java/su/cif/infernote/commands/music/PlaylistsCmd.java renamed: src/main/java/com/jagrosh/jmusicbot/commands/music/QueueCmd.java -> src/main/java/su/cif/infernote/commands/music/QueueCmd.java renamed: src/main/java/com/jagrosh/jmusicbot/commands/music/RemoveCmd.java -> src/main/java/su/cif/infernote/commands/music/RemoveCmd.java renamed: src/main/java/com/jagrosh/jmusicbot/commands/music/SCSearchCmd.java -> src/main/java/su/cif/infernote/commands/music/SCSearchCmd.java renamed: src/main/java/com/jagrosh/jmusicbot/commands/music/SearchCmd.java -> src/main/java/su/cif/infernote/commands/music/SearchCmd.java renamed: src/main/java/com/jagrosh/jmusicbot/commands/music/SeekCmd.java -> src/main/java/su/cif/infernote/commands/music/SeekCmd.java renamed: src/main/java/com/jagrosh/jmusicbot/commands/music/ShuffleCmd.java -> src/main/java/su/cif/infernote/commands/music/ShuffleCmd.java renamed: src/main/java/com/jagrosh/jmusicbot/commands/music/SkipCmd.java -> src/main/java/su/cif/infernote/commands/music/SkipCmd.java renamed: src/main/java/com/jagrosh/jmusicbot/commands/owner/AutoplaylistCmd.java -> src/main/java/su/cif/infernote/commands/owner/AutoplaylistCmd.java renamed: src/main/java/com/jagrosh/jmusicbot/commands/owner/DebugCmd.java -> src/main/java/su/cif/infernote/commands/owner/DebugCmd.java renamed: src/main/java/com/jagrosh/jmusicbot/commands/owner/EvalCmd.java -> src/main/java/su/cif/infernote/commands/owner/EvalCmd.java renamed: src/main/java/com/jagrosh/jmusicbot/commands/owner/PlaylistCmd.java -> src/main/java/su/cif/infernote/commands/owner/PlaylistCmd.java renamed: src/main/java/com/jagrosh/jmusicbot/commands/owner/SetavatarCmd.java -> src/main/java/su/cif/infernote/commands/owner/SetavatarCmd.java renamed: src/main/java/com/jagrosh/jmusicbot/commands/owner/SetgameCmd.java -> src/main/java/su/cif/infernote/commands/owner/SetgameCmd.java renamed: src/main/java/com/jagrosh/jmusicbot/commands/owner/SetnameCmd.java -> src/main/java/su/cif/infernote/commands/owner/SetnameCmd.java renamed: src/main/java/com/jagrosh/jmusicbot/commands/owner/SetstatusCmd.java -> src/main/java/su/cif/infernote/commands/owner/SetstatusCmd.java renamed: src/main/java/com/jagrosh/jmusicbot/commands/owner/ShutdownCmd.java -> src/main/java/su/cif/infernote/commands/owner/ShutdownCmd.java renamed: src/main/java/com/jagrosh/jmusicbot/entities/Pair.java -> src/main/java/su/cif/infernote/entities/Pair.java renamed: src/main/java/com/jagrosh/jmusicbot/entities/Prompt.java -> src/main/java/su/cif/infernote/entities/Prompt.java renamed: src/main/java/com/jagrosh/jmusicbot/gui/ConsolePanel.java -> src/main/java/su/cif/infernote/gui/ConsolePanel.java renamed: src/main/java/com/jagrosh/jmusicbot/gui/GUI.java -> src/main/java/su/cif/infernote/gui/GUI.java renamed: src/main/java/com/jagrosh/jmusicbot/gui/TextAreaOutputStream.java -> src/main/java/su/cif/infernote/gui/TextAreaOutputStream.java renamed: src/main/java/com/jagrosh/jmusicbot/playlist/PlaylistLoader.java -> src/main/java/su/cif/infernote/playlist/PlaylistLoader.java renamed: src/main/java/com/jagrosh/jmusicbot/queue/AbstractQueue.java -> src/main/java/su/cif/infernote/queue/AbstractQueue.java renamed: src/main/java/com/jagrosh/jmusicbot/queue/FairQueue.java -> src/main/java/su/cif/infernote/queue/FairQueue.java renamed: src/main/java/com/jagrosh/jmusicbot/queue/LinearQueue.java -> src/main/java/su/cif/infernote/queue/LinearQueue.java renamed: src/main/java/com/jagrosh/jmusicbot/queue/QueueSupplier.java -> src/main/java/su/cif/infernote/queue/QueueSupplier.java renamed: src/main/java/com/jagrosh/jmusicbot/queue/Queueable.java -> src/main/java/su/cif/infernote/queue/Queueable.java renamed: src/main/java/com/jagrosh/jmusicbot/settings/QueueType.java -> src/main/java/su/cif/infernote/settings/QueueType.java renamed: src/main/java/com/jagrosh/jmusicbot/settings/RepeatMode.java -> src/main/java/su/cif/infernote/settings/RepeatMode.java renamed: src/main/java/com/jagrosh/jmusicbot/settings/Settings.java -> src/main/java/su/cif/infernote/settings/Settings.java renamed: src/main/java/com/jagrosh/jmusicbot/settings/SettingsManager.java -> src/main/java/su/cif/infernote/settings/SettingsManager.java renamed: src/main/java/com/jagrosh/jmusicbot/utils/FormatUtil.java -> src/main/java/su/cif/infernote/utils/FormatUtil.java renamed: src/main/java/com/jagrosh/jmusicbot/utils/OtherUtil.java -> src/main/java/su/cif/infernote/utils/OtherUtil.java renamed: src/main/java/com/jagrosh/jmusicbot/utils/TimeUtil.java -> src/main/java/su/cif/infernote/utils/TimeUtil.java renamed: src/main/java/com/jagrosh/jmusicbot/utils/YouTubeUtil.java -> src/main/java/su/cif/infernote/utils/YouTubeUtil.java renamed: src/test/java/com/jagrosh/jmusicbot/FairQueueTest.java -> src/test/java/su/cif/infernote/FairQueueTest.java renamed: src/test/java/com/jagrosh/jmusicbot/TimeUtilTest.java -> src/test/java/su/cif/infernote/TimeUtilTest.java --- CNAME | 2 +- pom.xml | 6 ++-- .../{run_jmusicbot.sh => run_infernote.sh} | 2 +- .../jmusicbot => su/cif/infernote}/Bot.java | 16 ++++----- .../cif/infernote}/BotConfig.java | 22 ++++++------ .../cif/infernote/Infernote.java} | 36 +++++++++---------- .../cif/infernote}/Listener.java | 8 ++--- .../infernote}/audio/AloneInVoiceHandler.java | 4 +-- .../cif/infernote}/audio/AudioHandler.java | 16 ++++----- .../infernote}/audio/NowplayingHandler.java | 8 ++--- .../cif/infernote}/audio/PlayerManager.java | 8 ++--- .../cif/infernote}/audio/QueuedTrack.java | 6 ++-- .../cif/infernote}/audio/RequestMetadata.java | 4 +-- .../TransformativeAudioSourceManager.java | 2 +- .../cif/infernote}/commands/AdminCommand.java | 2 +- .../cif/infernote}/commands/DJCommand.java | 6 ++-- .../cif/infernote}/commands/MusicCommand.java | 8 ++--- .../cif/infernote}/commands/OwnerCommand.java | 2 +- .../infernote}/commands/admin/PrefixCmd.java | 8 ++--- .../commands/admin/QueueTypeCmd.java | 12 +++---- .../infernote}/commands/admin/SetdjCmd.java | 10 +++--- .../infernote}/commands/admin/SettcCmd.java | 10 +++--- .../infernote}/commands/admin/SetvcCmd.java | 10 +++--- .../commands/admin/SkipratioCmd.java | 8 ++--- .../commands/dj/ForceRemoveCmd.java | 10 +++--- .../infernote}/commands/dj/ForceskipCmd.java | 12 +++---- .../infernote}/commands/dj/MoveTrackCmd.java | 12 +++---- .../cif/infernote}/commands/dj/PauseCmd.java | 8 ++--- .../infernote}/commands/dj/PlaynextCmd.java | 16 ++++----- .../cif/infernote}/commands/dj/RepeatCmd.java | 10 +++--- .../cif/infernote}/commands/dj/SkiptoCmd.java | 8 ++--- .../cif/infernote}/commands/dj/StopCmd.java | 8 ++--- .../cif/infernote}/commands/dj/VolumeCmd.java | 12 +++---- .../commands/general/SettingsCmd.java | 12 +++---- .../infernote}/commands/music/LyricsCmd.java | 8 ++--- .../commands/music/NowplayingCmd.java | 8 ++--- .../infernote}/commands/music/PlayCmd.java | 20 +++++------ .../commands/music/PlaylistsCmd.java | 6 ++-- .../infernote}/commands/music/QueueCmd.java | 20 +++++------ .../infernote}/commands/music/RemoveCmd.java | 12 +++---- .../commands/music/SCSearchCmd.java | 4 +-- .../infernote}/commands/music/SearchCmd.java | 16 ++++----- .../infernote}/commands/music/SeekCmd.java | 14 ++++---- .../infernote}/commands/music/ShuffleCmd.java | 8 ++--- .../infernote}/commands/music/SkipCmd.java | 12 +++---- .../commands/owner/AutoplaylistCmd.java | 8 ++--- .../infernote}/commands/owner/DebugCmd.java | 10 +++--- .../infernote}/commands/owner/EvalCmd.java | 6 ++-- .../commands/owner/PlaylistCmd.java | 8 ++--- .../commands/owner/SetavatarCmd.java | 8 ++--- .../infernote}/commands/owner/SetgameCmd.java | 6 ++-- .../infernote}/commands/owner/SetnameCmd.java | 6 ++-- .../commands/owner/SetstatusCmd.java | 6 ++-- .../commands/owner/ShutdownCmd.java | 6 ++-- .../cif/infernote}/entities/Pair.java | 2 +- .../cif/infernote}/entities/Prompt.java | 2 +- .../cif/infernote}/gui/ConsolePanel.java | 2 +- .../cif/infernote}/gui/GUI.java | 6 ++-- .../infernote}/gui/TextAreaOutputStream.java | 2 +- .../infernote}/playlist/PlaylistLoader.java | 6 ++-- .../cif/infernote}/queue/AbstractQueue.java | 2 +- .../cif/infernote}/queue/FairQueue.java | 2 +- .../cif/infernote}/queue/LinearQueue.java | 2 +- .../cif/infernote}/queue/QueueSupplier.java | 2 +- .../cif/infernote}/queue/Queueable.java | 2 +- .../cif/infernote}/settings/QueueType.java | 12 +++---- .../cif/infernote}/settings/RepeatMode.java | 2 +- .../cif/infernote}/settings/Settings.java | 2 +- .../infernote}/settings/SettingsManager.java | 4 +-- .../cif/infernote}/utils/FormatUtil.java | 4 +-- .../cif/infernote}/utils/OtherUtil.java | 20 +++++------ .../cif/infernote}/utils/TimeUtil.java | 2 +- .../cif/infernote}/utils/YouTubeUtil.java | 2 +- .../cif/infernote}/FairQueueTest.java | 6 ++-- .../cif/infernote}/TimeUtilTest.java | 4 +-- 75 files changed, 302 insertions(+), 302 deletions(-) rename scripts/{run_jmusicbot.sh => run_infernote.sh} (89%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/Bot.java (95%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/BotConfig.java (94%) rename src/main/java/{com/jagrosh/jmusicbot/JMusicBot.java => su/cif/infernote/Infernote.java} (90%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/Listener.java (94%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/audio/AloneInVoiceHandler.java (97%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/audio/AudioHandler.java (96%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/audio/NowplayingHandler.java (95%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/audio/PlayerManager.java (96%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/audio/QueuedTrack.java (91%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/audio/RequestMetadata.java (96%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/audio/TransformativeAudioSourceManager.java (98%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/commands/AdminCommand.java (93%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/commands/DJCommand.java (88%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/commands/MusicCommand.java (94%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/commands/OwnerCommand.java (84%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/commands/admin/PrefixCmd.java (84%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/commands/admin/QueueTypeCmd.java (84%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/commands/admin/SetdjCmd.java (87%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/commands/admin/SettcCmd.java (88%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/commands/admin/SetvcCmd.java (87%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/commands/admin/SkipratioCmd.java (87%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/commands/dj/ForceRemoveCmd.java (93%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/commands/dj/ForceskipCmd.java (75%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/commands/dj/MoveTrackCmd.java (89%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/commands/dj/PauseCmd.java (83%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/commands/dj/PlaynextCmd.java (92%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/commands/dj/RepeatCmd.java (88%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/commands/dj/SkiptoCmd.java (88%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/commands/dj/StopCmd.java (80%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/commands/dj/VolumeCmd.java (84%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/commands/general/SettingsCmd.java (90%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/commands/music/LyricsCmd.java (94%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/commands/music/NowplayingCmd.java (85%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/commands/music/PlayCmd.java (96%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/commands/music/PlaylistsCmd.java (92%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/commands/music/QueueCmd.java (89%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/commands/music/RemoveCmd.java (90%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/commands/music/SCSearchCmd.java (79%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/commands/music/SearchCmd.java (93%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/commands/music/SeekCmd.java (88%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/commands/music/ShuffleCmd.java (85%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/commands/music/SkipCmd.java (89%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/commands/owner/AutoplaylistCmd.java (89%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/commands/owner/DebugCmd.java (93%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/commands/owner/EvalCmd.java (92%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/commands/owner/PlaylistCmd.java (97%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/commands/owner/SetavatarCmd.java (89%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/commands/owner/SetgameCmd.java (97%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/commands/owner/SetnameCmd.java (89%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/commands/owner/SetstatusCmd.java (89%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/commands/owner/ShutdownCmd.java (79%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/entities/Pair.java (88%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/entities/Prompt.java (98%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/gui/ConsolePanel.java (92%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/gui/GUI.java (93%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/gui/TextAreaOutputStream.java (99%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/playlist/PlaylistLoader.java (98%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/queue/AbstractQueue.java (98%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/queue/FairQueue.java (95%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/queue/LinearQueue.java (87%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/queue/QueueSupplier.java (77%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/queue/Queueable.java (65%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/settings/QueueType.java (79%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/settings/RepeatMode.java (92%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/settings/Settings.java (99%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/settings/SettingsManager.java (98%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/utils/FormatUtil.java (96%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/utils/OtherUtil.java (92%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/utils/TimeUtil.java (99%) rename src/main/java/{com/jagrosh/jmusicbot => su/cif/infernote}/utils/YouTubeUtil.java (94%) rename src/test/java/{com/jagrosh/jmusicbot => su/cif/infernote}/FairQueueTest.java (88%) rename src/test/java/{com/jagrosh/jmusicbot => su/cif/infernote}/TimeUtilTest.java (96%) diff --git a/CNAME b/CNAME index df1968a..4cdf788 100644 --- a/CNAME +++ b/CNAME @@ -1 +1 @@ -jmusicbot.com \ No newline at end of file +cif.su \ No newline at end of file diff --git a/pom.xml b/pom.xml index 3ec01e4..9e1ba07 100644 --- a/pom.xml +++ b/pom.xml @@ -1,8 +1,8 @@ 4.0.0 - com.jagrosh - JMusicBot + su.cif + Infernote Snapshot jar @@ -135,7 +135,7 @@ - com.jagrosh.jmusicbot.JMusicBot + su.cif.infernote.Infernote ${project.artifactId} ${project.version} ${project.artifactId} diff --git a/scripts/run_jmusicbot.sh b/scripts/run_infernote.sh similarity index 89% rename from scripts/run_jmusicbot.sh rename to scripts/run_infernote.sh index d51c056..47d43a4 100644 --- a/scripts/run_jmusicbot.sh +++ b/scripts/run_infernote.sh @@ -10,7 +10,7 @@ LOOP=true download() { if [ $DOWNLOAD = true ]; then - URL=$(curl -s https://api.github.com/repos/jagrosh/MusicBot/releases/latest \ + URL=$(curl -s https://code.cif.su/api/v1/repos/anthony/infernote/releases/latest \ | grep -i "browser_download_url.*\.jar" \ | sed 's/.*\(http.*\)"/\1/') FILENAME=$(echo $URL | sed 's/.*\/\([^\/]*\)/\1/') diff --git a/src/main/java/com/jagrosh/jmusicbot/Bot.java b/src/main/java/su/cif/infernote/Bot.java similarity index 95% rename from src/main/java/com/jagrosh/jmusicbot/Bot.java rename to src/main/java/su/cif/infernote/Bot.java index df0aaf3..6840944 100644 --- a/src/main/java/com/jagrosh/jmusicbot/Bot.java +++ b/src/main/java/su/cif/infernote/Bot.java @@ -1,15 +1,15 @@ -package com.jagrosh.jmusicbot; +package su.cif.infernote; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import com.jagrosh.jdautilities.commons.waiter.EventWaiter; -import com.jagrosh.jmusicbot.audio.AloneInVoiceHandler; -import com.jagrosh.jmusicbot.audio.AudioHandler; -import com.jagrosh.jmusicbot.audio.NowplayingHandler; -import com.jagrosh.jmusicbot.audio.PlayerManager; -import com.jagrosh.jmusicbot.gui.GUI; -import com.jagrosh.jmusicbot.playlist.PlaylistLoader; -import com.jagrosh.jmusicbot.settings.SettingsManager; +import su.cif.infernote.audio.AloneInVoiceHandler; +import su.cif.infernote.audio.AudioHandler; +import su.cif.infernote.audio.NowplayingHandler; +import su.cif.infernote.audio.PlayerManager; +import su.cif.infernote.gui.GUI; +import su.cif.infernote.playlist.PlaylistLoader; +import su.cif.infernote.settings.SettingsManager; import java.util.Objects; import net.dv8tion.jda.api.JDA; import net.dv8tion.jda.api.entities.Activity; diff --git a/src/main/java/com/jagrosh/jmusicbot/BotConfig.java b/src/main/java/su/cif/infernote/BotConfig.java similarity index 94% rename from src/main/java/com/jagrosh/jmusicbot/BotConfig.java rename to src/main/java/su/cif/infernote/BotConfig.java index 9f4de83..fbedd71 100644 --- a/src/main/java/com/jagrosh/jmusicbot/BotConfig.java +++ b/src/main/java/su/cif/infernote/BotConfig.java @@ -1,9 +1,9 @@ -package com.jagrosh.jmusicbot; +package su.cif.infernote; -import com.jagrosh.jmusicbot.entities.Prompt; -import com.jagrosh.jmusicbot.utils.OtherUtil; -import com.jagrosh.jmusicbot.utils.TimeUtil; -import com.jagrosh.jmusicbot.utils.YouTubeUtil; +import su.cif.infernote.entities.Prompt; +import su.cif.infernote.utils.OtherUtil; +import su.cif.infernote.utils.TimeUtil; +import su.cif.infernote.utils.YouTubeUtil; import com.sedmelluq.discord.lavaplayer.track.AudioTrack; import com.sedmelluq.lava.extensions.youtuberotator.tools.ip.IpBlock; import com.typesafe.config.*; @@ -19,8 +19,8 @@ public class BotConfig { private final Prompt prompt; private final static String CONTEXT = "Config"; - private final static String START_TOKEN = "/// START OF JMUSICBOT CONFIG ///"; - private final static String END_TOKEN = "/// END OF JMUSICBOT CONFIG ///"; + private final static String START_TOKEN = "/// START OF CONFIG ///"; + private final static String END_TOKEN = "/// END OF CONFIG ///"; private Path path = null; private String token, prefix, altprefix, helpWord, playlistsFolder, logLevel, @@ -168,7 +168,7 @@ public class BotConfig private static String loadDefaultConfig() { - String original = OtherUtil.loadResource(new JMusicBot(), "/reference.conf"); + String original = OtherUtil.loadResource(new Infernote(), "/reference.conf"); return original==null ? "token = BOT_TOKEN_HERE\r\nowner = 0 // OWNER ID" : original.substring(original.indexOf(START_TOKEN)+START_TOKEN.length(), original.indexOf(END_TOKEN)).trim(); @@ -189,17 +189,17 @@ public class BotConfig public static void writeDefaultConfig() { Prompt prompt = new Prompt(null, null, true, true); - prompt.alert(Prompt.Level.INFO, "JMusicBot Config", "Generating default config file"); + prompt.alert(Prompt.Level.INFO, "Infernote Config", "Generating default config file"); Path path = BotConfig.getConfigPath(); byte[] bytes = BotConfig.loadDefaultConfig().getBytes(); try { - prompt.alert(Prompt.Level.INFO, "JMusicBot Config", "Writing default config file to " + path.toAbsolutePath().toString()); + prompt.alert(Prompt.Level.INFO, "Infernote Config", "Writing default config file to " + path.toAbsolutePath().toString()); Files.write(path, bytes); } catch(Exception ex) { - prompt.alert(Prompt.Level.ERROR, "JMusicBot Config", "An error occurred writing the default config file: " + ex.getMessage()); + prompt.alert(Prompt.Level.ERROR, "Infernote Config", "An error occurred writing the default config file: " + ex.getMessage()); } } diff --git a/src/main/java/com/jagrosh/jmusicbot/JMusicBot.java b/src/main/java/su/cif/infernote/Infernote.java similarity index 90% rename from src/main/java/com/jagrosh/jmusicbot/JMusicBot.java rename to src/main/java/su/cif/infernote/Infernote.java index d07573d..0866ce4 100644 --- a/src/main/java/com/jagrosh/jmusicbot/JMusicBot.java +++ b/src/main/java/su/cif/infernote/Infernote.java @@ -1,18 +1,18 @@ -package com.jagrosh.jmusicbot; +package su.cif.infernote; import com.jagrosh.jdautilities.command.CommandClient; import com.jagrosh.jdautilities.command.CommandClientBuilder; import com.jagrosh.jdautilities.commons.waiter.EventWaiter; import com.jagrosh.jdautilities.examples.command.*; -import com.jagrosh.jmusicbot.commands.admin.*; -import com.jagrosh.jmusicbot.commands.dj.*; -import com.jagrosh.jmusicbot.commands.general.*; -import com.jagrosh.jmusicbot.commands.music.*; -import com.jagrosh.jmusicbot.commands.owner.*; -import com.jagrosh.jmusicbot.entities.Prompt; -import com.jagrosh.jmusicbot.gui.GUI; -import com.jagrosh.jmusicbot.settings.SettingsManager; -import com.jagrosh.jmusicbot.utils.OtherUtil; +import su.cif.infernote.commands.admin.*; +import su.cif.infernote.commands.dj.*; +import su.cif.infernote.commands.general.*; +import su.cif.infernote.commands.music.*; +import su.cif.infernote.commands.owner.*; +import su.cif.infernote.entities.Prompt; +import su.cif.infernote.gui.GUI; +import su.cif.infernote.settings.SettingsManager; +import su.cif.infernote.utils.OtherUtil; import java.awt.Color; import java.util.Arrays; import javax.security.auth.login.LoginException; @@ -25,9 +25,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import ch.qos.logback.classic.Level; -public class JMusicBot +public class Infernote { - public final static Logger LOG = LoggerFactory.getLogger(JMusicBot.class); + public final static Logger LOG = LoggerFactory.getLogger(Infernote.class); public final static Permission[] RECOMMENDED_PERMS = {Permission.MESSAGE_READ, Permission.MESSAGE_WRITE, Permission.MESSAGE_HISTORY, Permission.MESSAGE_ADD_REACTION, Permission.MESSAGE_EMBED_LINKS, Permission.MESSAGE_ATTACH_FILES, Permission.MESSAGE_MANAGE, Permission.MESSAGE_EXT_EMOJI, Permission.VOICE_CONNECT, Permission.VOICE_SPEAK, Permission.NICKNAME_CHANGE}; @@ -52,7 +52,7 @@ public class JMusicBot private static void startBot() { // create prompt to handle startup - Prompt prompt = new Prompt("JMusicBot"); + Prompt prompt = new Prompt("Infernote"); // startup checks OtherUtil.checkVersion(prompt); @@ -112,7 +112,7 @@ public class JMusicBot String unsupportedReason = OtherUtil.getUnsupportedBotReason(jda); if (unsupportedReason != null) { - prompt.alert(Prompt.Level.ERROR, "JMusicBot", "JMusicBot cannot be run on this Discord bot: " + unsupportedReason); + prompt.alert(Prompt.Level.ERROR, "Infernote", "Infernote cannot be run on this Discord bot: " + unsupportedReason); try{ Thread.sleep(5000);}catch(InterruptedException ignored){} // this is awful but until we have a better way... jda.shutdown(); System.exit(1); @@ -123,27 +123,27 @@ public class JMusicBot // message content intent if(!"@mention".equals(config.getPrefix())) { - LOG.info("JMusicBot", "You currently have a custom prefix set. " + LOG.info("Infernote", "You currently have a custom prefix set. " + "If your prefix is not working, make sure that the 'MESSAGE CONTENT INTENT' is Enabled " + "on https://discord.com/developers/applications/" + jda.getSelfUser().getId() + "/bot"); } } catch (LoginException ex) { - prompt.alert(Prompt.Level.ERROR, "JMusicBot", ex + "\nPlease make sure you are " + prompt.alert(Prompt.Level.ERROR, "Infernote", ex + "\nPlease make sure you are " + "editing the correct config.txt file, and that you have used the " + "correct token (not the 'secret'!)\nConfig Location: " + config.getConfigLocation()); System.exit(1); } catch(IllegalArgumentException ex) { - prompt.alert(Prompt.Level.ERROR, "JMusicBot", "Some aspect of the configuration is " + prompt.alert(Prompt.Level.ERROR, "Infernote", "Some aspect of the configuration is " + "invalid: " + ex + "\nConfig Location: " + config.getConfigLocation()); System.exit(1); } catch(ErrorResponseException ex) { - prompt.alert(Prompt.Level.ERROR, "JMusicBot", ex + "\nInvalid reponse returned when " + prompt.alert(Prompt.Level.ERROR, "Infernote", ex + "\nInvalid reponse returned when " + "attempting to connect, please make sure you're connected to the internet"); System.exit(1); } diff --git a/src/main/java/com/jagrosh/jmusicbot/Listener.java b/src/main/java/su/cif/infernote/Listener.java similarity index 94% rename from src/main/java/com/jagrosh/jmusicbot/Listener.java rename to src/main/java/su/cif/infernote/Listener.java index f2a456e..0f1a97f 100644 --- a/src/main/java/com/jagrosh/jmusicbot/Listener.java +++ b/src/main/java/su/cif/infernote/Listener.java @@ -1,6 +1,6 @@ -package com.jagrosh.jmusicbot; +package su.cif.infernote; -import com.jagrosh.jmusicbot.utils.OtherUtil; +import su.cif.infernote.utils.OtherUtil; import java.util.concurrent.TimeUnit; import net.dv8tion.jda.api.JDA; import net.dv8tion.jda.api.entities.Guild; @@ -32,7 +32,7 @@ public class Listener extends ListenerAdapter { Logger log = LoggerFactory.getLogger("MusicBot"); log.warn("This bot is not on any guilds! Use the following link to add the bot to your guilds!"); - log.warn(event.getJDA().getInviteUrl(JMusicBot.RECOMMENDED_PERMS)); + log.warn(event.getJDA().getInviteUrl(Infernote.RECOMMENDED_PERMS)); } credit(event.getJDA()); event.getJDA().getGuilds().forEach((guild) -> @@ -101,7 +101,7 @@ public class Listener extends ListenerAdapter if(bot.getConfig().getDBots()) return; jda.getTextChannelById(119222314964353025L) - .sendMessage("This account is running JMusicBot. Please do not list bot clones on this server, <@"+bot.getConfig().getOwnerId()+">.").complete(); + .sendMessage("This account is running Infernote. Please do not list bot clones on this server, <@"+bot.getConfig().getOwnerId()+">.").complete(); dbots.leave().queue(); } } diff --git a/src/main/java/com/jagrosh/jmusicbot/audio/AloneInVoiceHandler.java b/src/main/java/su/cif/infernote/audio/AloneInVoiceHandler.java similarity index 97% rename from src/main/java/com/jagrosh/jmusicbot/audio/AloneInVoiceHandler.java rename to src/main/java/su/cif/infernote/audio/AloneInVoiceHandler.java index b64a35b..041cdb9 100644 --- a/src/main/java/com/jagrosh/jmusicbot/audio/AloneInVoiceHandler.java +++ b/src/main/java/su/cif/infernote/audio/AloneInVoiceHandler.java @@ -1,6 +1,6 @@ -package com.jagrosh.jmusicbot.audio; +package su.cif.infernote.audio; -import com.jagrosh.jmusicbot.Bot; +import su.cif.infernote.Bot; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.events.guild.voice.GuildVoiceUpdateEvent; diff --git a/src/main/java/com/jagrosh/jmusicbot/audio/AudioHandler.java b/src/main/java/su/cif/infernote/audio/AudioHandler.java similarity index 96% rename from src/main/java/com/jagrosh/jmusicbot/audio/AudioHandler.java rename to src/main/java/su/cif/infernote/audio/AudioHandler.java index 8883abd..f03240e 100644 --- a/src/main/java/com/jagrosh/jmusicbot/audio/AudioHandler.java +++ b/src/main/java/su/cif/infernote/audio/AudioHandler.java @@ -1,10 +1,10 @@ -package com.jagrosh.jmusicbot.audio; +package su.cif.infernote.audio; -import com.jagrosh.jmusicbot.playlist.PlaylistLoader.Playlist; -import com.jagrosh.jmusicbot.queue.AbstractQueue; -import com.jagrosh.jmusicbot.settings.QueueType; -import com.jagrosh.jmusicbot.utils.TimeUtil; -import com.jagrosh.jmusicbot.settings.RepeatMode; +import su.cif.infernote.playlist.PlaylistLoader.Playlist; +import su.cif.infernote.queue.AbstractQueue; +import su.cif.infernote.settings.QueueType; +import su.cif.infernote.utils.TimeUtil; +import su.cif.infernote.settings.RepeatMode; import com.sedmelluq.discord.lavaplayer.player.AudioPlayer; import com.sedmelluq.discord.lavaplayer.player.event.AudioEventAdapter; import com.sedmelluq.discord.lavaplayer.tools.FriendlyException; @@ -15,8 +15,8 @@ import java.util.HashSet; import java.util.LinkedList; import java.util.List; import java.util.Set; -import com.jagrosh.jmusicbot.settings.Settings; -import com.jagrosh.jmusicbot.utils.FormatUtil; +import su.cif.infernote.settings.Settings; +import su.cif.infernote.utils.FormatUtil; import com.sedmelluq.discord.lavaplayer.source.youtube.YoutubeAudioTrack; import java.nio.ByteBuffer; import net.dv8tion.jda.api.EmbedBuilder; diff --git a/src/main/java/com/jagrosh/jmusicbot/audio/NowplayingHandler.java b/src/main/java/su/cif/infernote/audio/NowplayingHandler.java similarity index 95% rename from src/main/java/com/jagrosh/jmusicbot/audio/NowplayingHandler.java rename to src/main/java/su/cif/infernote/audio/NowplayingHandler.java index 2a81643..d36ed90 100644 --- a/src/main/java/com/jagrosh/jmusicbot/audio/NowplayingHandler.java +++ b/src/main/java/su/cif/infernote/audio/NowplayingHandler.java @@ -1,8 +1,8 @@ -package com.jagrosh.jmusicbot.audio; +package su.cif.infernote.audio; -import com.jagrosh.jmusicbot.Bot; -import com.jagrosh.jmusicbot.entities.Pair; -import com.jagrosh.jmusicbot.settings.Settings; +import su.cif.infernote.Bot; +import su.cif.infernote.entities.Pair; +import su.cif.infernote.settings.Settings; import com.sedmelluq.discord.lavaplayer.track.AudioTrack; import java.util.HashMap; import java.util.HashSet; diff --git a/src/main/java/com/jagrosh/jmusicbot/audio/PlayerManager.java b/src/main/java/su/cif/infernote/audio/PlayerManager.java similarity index 96% rename from src/main/java/com/jagrosh/jmusicbot/audio/PlayerManager.java rename to src/main/java/su/cif/infernote/audio/PlayerManager.java index 0370f3a..bdacd65 100644 --- a/src/main/java/com/jagrosh/jmusicbot/audio/PlayerManager.java +++ b/src/main/java/su/cif/infernote/audio/PlayerManager.java @@ -1,9 +1,9 @@ -package com.jagrosh.jmusicbot.audio; +package su.cif.infernote.audio; import com.dunctebot.sourcemanagers.DuncteBotSources; -import com.jagrosh.jmusicbot.Bot; -import com.jagrosh.jmusicbot.BotConfig; -import com.jagrosh.jmusicbot.utils.YouTubeUtil; +import su.cif.infernote.Bot; +import su.cif.infernote.BotConfig; +import su.cif.infernote.utils.YouTubeUtil; import com.sedmelluq.discord.lavaplayer.container.MediaContainerRegistry; import com.sedmelluq.discord.lavaplayer.player.AudioPlayer; import com.sedmelluq.discord.lavaplayer.player.DefaultAudioPlayerManager; diff --git a/src/main/java/com/jagrosh/jmusicbot/audio/QueuedTrack.java b/src/main/java/su/cif/infernote/audio/QueuedTrack.java similarity index 91% rename from src/main/java/com/jagrosh/jmusicbot/audio/QueuedTrack.java rename to src/main/java/su/cif/infernote/audio/QueuedTrack.java index 2c9ed99..9da60b7 100644 --- a/src/main/java/com/jagrosh/jmusicbot/audio/QueuedTrack.java +++ b/src/main/java/su/cif/infernote/audio/QueuedTrack.java @@ -1,9 +1,9 @@ -package com.jagrosh.jmusicbot.audio; +package su.cif.infernote.audio; -import com.jagrosh.jmusicbot.utils.TimeUtil; +import su.cif.infernote.utils.TimeUtil; import com.sedmelluq.discord.lavaplayer.track.AudioTrack; import com.sedmelluq.discord.lavaplayer.track.AudioTrackInfo; -import com.jagrosh.jmusicbot.queue.Queueable; +import su.cif.infernote.queue.Queueable; import net.dv8tion.jda.api.entities.User; public class QueuedTrack implements Queueable diff --git a/src/main/java/com/jagrosh/jmusicbot/audio/RequestMetadata.java b/src/main/java/su/cif/infernote/audio/RequestMetadata.java similarity index 96% rename from src/main/java/com/jagrosh/jmusicbot/audio/RequestMetadata.java rename to src/main/java/su/cif/infernote/audio/RequestMetadata.java index 0dfb22b..d49eacc 100644 --- a/src/main/java/com/jagrosh/jmusicbot/audio/RequestMetadata.java +++ b/src/main/java/su/cif/infernote/audio/RequestMetadata.java @@ -1,7 +1,7 @@ -package com.jagrosh.jmusicbot.audio; +package su.cif.infernote.audio; import com.jagrosh.jdautilities.command.CommandEvent; -import com.jagrosh.jmusicbot.utils.TimeUtil; +import su.cif.infernote.utils.TimeUtil; import com.sedmelluq.discord.lavaplayer.track.AudioTrack; import net.dv8tion.jda.api.entities.User; diff --git a/src/main/java/com/jagrosh/jmusicbot/audio/TransformativeAudioSourceManager.java b/src/main/java/su/cif/infernote/audio/TransformativeAudioSourceManager.java similarity index 98% rename from src/main/java/com/jagrosh/jmusicbot/audio/TransformativeAudioSourceManager.java rename to src/main/java/su/cif/infernote/audio/TransformativeAudioSourceManager.java index 97ff033..47360b8 100644 --- a/src/main/java/com/jagrosh/jmusicbot/audio/TransformativeAudioSourceManager.java +++ b/src/main/java/su/cif/infernote/audio/TransformativeAudioSourceManager.java @@ -1,4 +1,4 @@ -package com.jagrosh.jmusicbot.audio; +package su.cif.infernote.audio; import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager; import com.sedmelluq.discord.lavaplayer.track.AudioItem; diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/AdminCommand.java b/src/main/java/su/cif/infernote/commands/AdminCommand.java similarity index 93% rename from src/main/java/com/jagrosh/jmusicbot/commands/AdminCommand.java rename to src/main/java/su/cif/infernote/commands/AdminCommand.java index 64308fd..8b88d78 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/AdminCommand.java +++ b/src/main/java/su/cif/infernote/commands/AdminCommand.java @@ -1,4 +1,4 @@ -package com.jagrosh.jmusicbot.commands; +package su.cif.infernote.commands; import com.jagrosh.jdautilities.command.Command; import net.dv8tion.jda.api.Permission; diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/DJCommand.java b/src/main/java/su/cif/infernote/commands/DJCommand.java similarity index 88% rename from src/main/java/com/jagrosh/jmusicbot/commands/DJCommand.java rename to src/main/java/su/cif/infernote/commands/DJCommand.java index 23628b1..e6f3b83 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/DJCommand.java +++ b/src/main/java/su/cif/infernote/commands/DJCommand.java @@ -1,8 +1,8 @@ -package com.jagrosh.jmusicbot.commands; +package su.cif.infernote.commands; import com.jagrosh.jdautilities.command.CommandEvent; -import com.jagrosh.jmusicbot.Bot; -import com.jagrosh.jmusicbot.settings.Settings; +import su.cif.infernote.Bot; +import su.cif.infernote.settings.Settings; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.Role; diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/MusicCommand.java b/src/main/java/su/cif/infernote/commands/MusicCommand.java similarity index 94% rename from src/main/java/com/jagrosh/jmusicbot/commands/MusicCommand.java rename to src/main/java/su/cif/infernote/commands/MusicCommand.java index 0b85f65..6df97ec 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/MusicCommand.java +++ b/src/main/java/su/cif/infernote/commands/MusicCommand.java @@ -1,10 +1,10 @@ -package com.jagrosh.jmusicbot.commands; +package su.cif.infernote.commands; import com.jagrosh.jdautilities.command.Command; import com.jagrosh.jdautilities.command.CommandEvent; -import com.jagrosh.jmusicbot.Bot; -import com.jagrosh.jmusicbot.settings.Settings; -import com.jagrosh.jmusicbot.audio.AudioHandler; +import su.cif.infernote.Bot; +import su.cif.infernote.settings.Settings; +import su.cif.infernote.audio.AudioHandler; import net.dv8tion.jda.api.entities.GuildVoiceState; import net.dv8tion.jda.api.entities.TextChannel; import net.dv8tion.jda.api.entities.VoiceChannel; diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/OwnerCommand.java b/src/main/java/su/cif/infernote/commands/OwnerCommand.java similarity index 84% rename from src/main/java/com/jagrosh/jmusicbot/commands/OwnerCommand.java rename to src/main/java/su/cif/infernote/commands/OwnerCommand.java index 97e18d6..1d1de04 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/OwnerCommand.java +++ b/src/main/java/su/cif/infernote/commands/OwnerCommand.java @@ -1,4 +1,4 @@ -package com.jagrosh.jmusicbot.commands; +package su.cif.infernote.commands; import com.jagrosh.jdautilities.command.Command; diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/admin/PrefixCmd.java b/src/main/java/su/cif/infernote/commands/admin/PrefixCmd.java similarity index 84% rename from src/main/java/com/jagrosh/jmusicbot/commands/admin/PrefixCmd.java rename to src/main/java/su/cif/infernote/commands/admin/PrefixCmd.java index ec49082..350975c 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/admin/PrefixCmd.java +++ b/src/main/java/su/cif/infernote/commands/admin/PrefixCmd.java @@ -1,9 +1,9 @@ -package com.jagrosh.jmusicbot.commands.admin; +package su.cif.infernote.commands.admin; import com.jagrosh.jdautilities.command.CommandEvent; -import com.jagrosh.jmusicbot.Bot; -import com.jagrosh.jmusicbot.commands.AdminCommand; -import com.jagrosh.jmusicbot.settings.Settings; +import su.cif.infernote.Bot; +import su.cif.infernote.commands.AdminCommand; +import su.cif.infernote.settings.Settings; public class PrefixCmd extends AdminCommand { diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/admin/QueueTypeCmd.java b/src/main/java/su/cif/infernote/commands/admin/QueueTypeCmd.java similarity index 84% rename from src/main/java/com/jagrosh/jmusicbot/commands/admin/QueueTypeCmd.java rename to src/main/java/su/cif/infernote/commands/admin/QueueTypeCmd.java index 5934dfe..d2689f5 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/admin/QueueTypeCmd.java +++ b/src/main/java/su/cif/infernote/commands/admin/QueueTypeCmd.java @@ -1,11 +1,11 @@ -package com.jagrosh.jmusicbot.commands.admin; +package su.cif.infernote.commands.admin; import com.jagrosh.jdautilities.command.CommandEvent; -import com.jagrosh.jmusicbot.Bot; -import com.jagrosh.jmusicbot.audio.AudioHandler; -import com.jagrosh.jmusicbot.commands.AdminCommand; -import com.jagrosh.jmusicbot.settings.QueueType; -import com.jagrosh.jmusicbot.settings.Settings; +import su.cif.infernote.Bot; +import su.cif.infernote.audio.AudioHandler; +import su.cif.infernote.commands.AdminCommand; +import su.cif.infernote.settings.QueueType; +import su.cif.infernote.settings.Settings; public class QueueTypeCmd extends AdminCommand { diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/admin/SetdjCmd.java b/src/main/java/su/cif/infernote/commands/admin/SetdjCmd.java similarity index 87% rename from src/main/java/com/jagrosh/jmusicbot/commands/admin/SetdjCmd.java rename to src/main/java/su/cif/infernote/commands/admin/SetdjCmd.java index e29b985..9732a4e 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/admin/SetdjCmd.java +++ b/src/main/java/su/cif/infernote/commands/admin/SetdjCmd.java @@ -1,12 +1,12 @@ -package com.jagrosh.jmusicbot.commands.admin; +package su.cif.infernote.commands.admin; import java.util.List; import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jdautilities.commons.utils.FinderUtil; -import com.jagrosh.jmusicbot.Bot; -import com.jagrosh.jmusicbot.commands.AdminCommand; -import com.jagrosh.jmusicbot.settings.Settings; -import com.jagrosh.jmusicbot.utils.FormatUtil; +import su.cif.infernote.Bot; +import su.cif.infernote.commands.AdminCommand; +import su.cif.infernote.settings.Settings; +import su.cif.infernote.utils.FormatUtil; import net.dv8tion.jda.api.entities.Role; public class SetdjCmd extends AdminCommand diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/admin/SettcCmd.java b/src/main/java/su/cif/infernote/commands/admin/SettcCmd.java similarity index 88% rename from src/main/java/com/jagrosh/jmusicbot/commands/admin/SettcCmd.java rename to src/main/java/su/cif/infernote/commands/admin/SettcCmd.java index 5a0a87b..dc20243 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/admin/SettcCmd.java +++ b/src/main/java/su/cif/infernote/commands/admin/SettcCmd.java @@ -1,12 +1,12 @@ -package com.jagrosh.jmusicbot.commands.admin; +package su.cif.infernote.commands.admin; import java.util.List; import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jdautilities.commons.utils.FinderUtil; -import com.jagrosh.jmusicbot.Bot; -import com.jagrosh.jmusicbot.commands.AdminCommand; -import com.jagrosh.jmusicbot.settings.Settings; -import com.jagrosh.jmusicbot.utils.FormatUtil; +import su.cif.infernote.Bot; +import su.cif.infernote.commands.AdminCommand; +import su.cif.infernote.settings.Settings; +import su.cif.infernote.utils.FormatUtil; import net.dv8tion.jda.api.entities.TextChannel; public class SettcCmd extends AdminCommand diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/admin/SetvcCmd.java b/src/main/java/su/cif/infernote/commands/admin/SetvcCmd.java similarity index 87% rename from src/main/java/com/jagrosh/jmusicbot/commands/admin/SetvcCmd.java rename to src/main/java/su/cif/infernote/commands/admin/SetvcCmd.java index 6ded0e8..3b78ae8 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/admin/SetvcCmd.java +++ b/src/main/java/su/cif/infernote/commands/admin/SetvcCmd.java @@ -1,13 +1,13 @@ -package com.jagrosh.jmusicbot.commands.admin; +package su.cif.infernote.commands.admin; import java.util.List; import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jdautilities.commons.utils.FinderUtil; -import com.jagrosh.jmusicbot.Bot; -import com.jagrosh.jmusicbot.commands.AdminCommand; -import com.jagrosh.jmusicbot.settings.Settings; -import com.jagrosh.jmusicbot.utils.FormatUtil; +import su.cif.infernote.Bot; +import su.cif.infernote.commands.AdminCommand; +import su.cif.infernote.settings.Settings; +import su.cif.infernote.utils.FormatUtil; import net.dv8tion.jda.api.entities.VoiceChannel; public class SetvcCmd extends AdminCommand diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/admin/SkipratioCmd.java b/src/main/java/su/cif/infernote/commands/admin/SkipratioCmd.java similarity index 87% rename from src/main/java/com/jagrosh/jmusicbot/commands/admin/SkipratioCmd.java rename to src/main/java/su/cif/infernote/commands/admin/SkipratioCmd.java index acc2904..354ae17 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/admin/SkipratioCmd.java +++ b/src/main/java/su/cif/infernote/commands/admin/SkipratioCmd.java @@ -1,9 +1,9 @@ -package com.jagrosh.jmusicbot.commands.admin; +package su.cif.infernote.commands.admin; import com.jagrosh.jdautilities.command.CommandEvent; -import com.jagrosh.jmusicbot.Bot; -import com.jagrosh.jmusicbot.commands.AdminCommand; -import com.jagrosh.jmusicbot.settings.Settings; +import su.cif.infernote.Bot; +import su.cif.infernote.commands.AdminCommand; +import su.cif.infernote.settings.Settings; public class SkipratioCmd extends AdminCommand { diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/dj/ForceRemoveCmd.java b/src/main/java/su/cif/infernote/commands/dj/ForceRemoveCmd.java similarity index 93% rename from src/main/java/com/jagrosh/jmusicbot/commands/dj/ForceRemoveCmd.java rename to src/main/java/su/cif/infernote/commands/dj/ForceRemoveCmd.java index 80274ba..71f5b3e 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/dj/ForceRemoveCmd.java +++ b/src/main/java/su/cif/infernote/commands/dj/ForceRemoveCmd.java @@ -1,12 +1,12 @@ -package com.jagrosh.jmusicbot.commands.dj; +package su.cif.infernote.commands.dj; import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jdautilities.commons.utils.FinderUtil; import com.jagrosh.jdautilities.menu.OrderedMenu; -import com.jagrosh.jmusicbot.Bot; -import com.jagrosh.jmusicbot.audio.AudioHandler; -import com.jagrosh.jmusicbot.commands.DJCommand; -import com.jagrosh.jmusicbot.utils.FormatUtil; +import su.cif.infernote.Bot; +import su.cif.infernote.audio.AudioHandler; +import su.cif.infernote.commands.DJCommand; +import su.cif.infernote.utils.FormatUtil; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.User; diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/dj/ForceskipCmd.java b/src/main/java/su/cif/infernote/commands/dj/ForceskipCmd.java similarity index 75% rename from src/main/java/com/jagrosh/jmusicbot/commands/dj/ForceskipCmd.java rename to src/main/java/su/cif/infernote/commands/dj/ForceskipCmd.java index 99928c6..c59e0d2 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/dj/ForceskipCmd.java +++ b/src/main/java/su/cif/infernote/commands/dj/ForceskipCmd.java @@ -1,11 +1,11 @@ -package com.jagrosh.jmusicbot.commands.dj; +package su.cif.infernote.commands.dj; import com.jagrosh.jdautilities.command.CommandEvent; -import com.jagrosh.jmusicbot.Bot; -import com.jagrosh.jmusicbot.audio.AudioHandler; -import com.jagrosh.jmusicbot.audio.RequestMetadata; -import com.jagrosh.jmusicbot.commands.DJCommand; -import com.jagrosh.jmusicbot.utils.FormatUtil; +import su.cif.infernote.Bot; +import su.cif.infernote.audio.AudioHandler; +import su.cif.infernote.audio.RequestMetadata; +import su.cif.infernote.commands.DJCommand; +import su.cif.infernote.utils.FormatUtil; public class ForceskipCmd extends DJCommand { diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/dj/MoveTrackCmd.java b/src/main/java/su/cif/infernote/commands/dj/MoveTrackCmd.java similarity index 89% rename from src/main/java/com/jagrosh/jmusicbot/commands/dj/MoveTrackCmd.java rename to src/main/java/su/cif/infernote/commands/dj/MoveTrackCmd.java index 9199be0..bc450c8 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/dj/MoveTrackCmd.java +++ b/src/main/java/su/cif/infernote/commands/dj/MoveTrackCmd.java @@ -1,12 +1,12 @@ -package com.jagrosh.jmusicbot.commands.dj; +package su.cif.infernote.commands.dj; import com.jagrosh.jdautilities.command.CommandEvent; -import com.jagrosh.jmusicbot.Bot; -import com.jagrosh.jmusicbot.audio.AudioHandler; -import com.jagrosh.jmusicbot.audio.QueuedTrack; -import com.jagrosh.jmusicbot.commands.DJCommand; -import com.jagrosh.jmusicbot.queue.AbstractQueue; +import su.cif.infernote.Bot; +import su.cif.infernote.audio.AudioHandler; +import su.cif.infernote.audio.QueuedTrack; +import su.cif.infernote.commands.DJCommand; +import su.cif.infernote.queue.AbstractQueue; /** * Command that provides users the ability to move a track in the playlist. diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/dj/PauseCmd.java b/src/main/java/su/cif/infernote/commands/dj/PauseCmd.java similarity index 83% rename from src/main/java/com/jagrosh/jmusicbot/commands/dj/PauseCmd.java rename to src/main/java/su/cif/infernote/commands/dj/PauseCmd.java index 956779e..b40f0bd 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/dj/PauseCmd.java +++ b/src/main/java/su/cif/infernote/commands/dj/PauseCmd.java @@ -1,9 +1,9 @@ -package com.jagrosh.jmusicbot.commands.dj; +package su.cif.infernote.commands.dj; import com.jagrosh.jdautilities.command.CommandEvent; -import com.jagrosh.jmusicbot.Bot; -import com.jagrosh.jmusicbot.audio.AudioHandler; -import com.jagrosh.jmusicbot.commands.DJCommand; +import su.cif.infernote.Bot; +import su.cif.infernote.audio.AudioHandler; +import su.cif.infernote.commands.DJCommand; public class PauseCmd extends DJCommand { diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/dj/PlaynextCmd.java b/src/main/java/su/cif/infernote/commands/dj/PlaynextCmd.java similarity index 92% rename from src/main/java/com/jagrosh/jmusicbot/commands/dj/PlaynextCmd.java rename to src/main/java/su/cif/infernote/commands/dj/PlaynextCmd.java index 2d44c34..7345dc3 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/dj/PlaynextCmd.java +++ b/src/main/java/su/cif/infernote/commands/dj/PlaynextCmd.java @@ -1,13 +1,13 @@ -package com.jagrosh.jmusicbot.commands.dj; +package su.cif.infernote.commands.dj; import com.jagrosh.jdautilities.command.CommandEvent; -import com.jagrosh.jmusicbot.Bot; -import com.jagrosh.jmusicbot.audio.AudioHandler; -import com.jagrosh.jmusicbot.audio.QueuedTrack; -import com.jagrosh.jmusicbot.audio.RequestMetadata; -import com.jagrosh.jmusicbot.commands.DJCommand; -import com.jagrosh.jmusicbot.utils.FormatUtil; -import com.jagrosh.jmusicbot.utils.TimeUtil; +import su.cif.infernote.Bot; +import su.cif.infernote.audio.AudioHandler; +import su.cif.infernote.audio.QueuedTrack; +import su.cif.infernote.audio.RequestMetadata; +import su.cif.infernote.commands.DJCommand; +import su.cif.infernote.utils.FormatUtil; +import su.cif.infernote.utils.TimeUtil; import com.sedmelluq.discord.lavaplayer.player.AudioLoadResultHandler; import com.sedmelluq.discord.lavaplayer.tools.FriendlyException; import com.sedmelluq.discord.lavaplayer.track.AudioPlaylist; diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/dj/RepeatCmd.java b/src/main/java/su/cif/infernote/commands/dj/RepeatCmd.java similarity index 88% rename from src/main/java/com/jagrosh/jmusicbot/commands/dj/RepeatCmd.java rename to src/main/java/su/cif/infernote/commands/dj/RepeatCmd.java index 235cc85..e6f14ed 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/dj/RepeatCmd.java +++ b/src/main/java/su/cif/infernote/commands/dj/RepeatCmd.java @@ -1,10 +1,10 @@ -package com.jagrosh.jmusicbot.commands.dj; +package su.cif.infernote.commands.dj; import com.jagrosh.jdautilities.command.CommandEvent; -import com.jagrosh.jmusicbot.Bot; -import com.jagrosh.jmusicbot.commands.DJCommand; -import com.jagrosh.jmusicbot.settings.RepeatMode; -import com.jagrosh.jmusicbot.settings.Settings; +import su.cif.infernote.Bot; +import su.cif.infernote.commands.DJCommand; +import su.cif.infernote.settings.RepeatMode; +import su.cif.infernote.settings.Settings; public class RepeatCmd extends DJCommand { diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/dj/SkiptoCmd.java b/src/main/java/su/cif/infernote/commands/dj/SkiptoCmd.java similarity index 88% rename from src/main/java/com/jagrosh/jmusicbot/commands/dj/SkiptoCmd.java rename to src/main/java/su/cif/infernote/commands/dj/SkiptoCmd.java index 45c6841..df41b61 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/dj/SkiptoCmd.java +++ b/src/main/java/su/cif/infernote/commands/dj/SkiptoCmd.java @@ -1,9 +1,9 @@ -package com.jagrosh.jmusicbot.commands.dj; +package su.cif.infernote.commands.dj; import com.jagrosh.jdautilities.command.CommandEvent; -import com.jagrosh.jmusicbot.Bot; -import com.jagrosh.jmusicbot.audio.AudioHandler; -import com.jagrosh.jmusicbot.commands.DJCommand; +import su.cif.infernote.Bot; +import su.cif.infernote.audio.AudioHandler; +import su.cif.infernote.commands.DJCommand; public class SkiptoCmd extends DJCommand { diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/dj/StopCmd.java b/src/main/java/su/cif/infernote/commands/dj/StopCmd.java similarity index 80% rename from src/main/java/com/jagrosh/jmusicbot/commands/dj/StopCmd.java rename to src/main/java/su/cif/infernote/commands/dj/StopCmd.java index e1ec50d..7a782a2 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/dj/StopCmd.java +++ b/src/main/java/su/cif/infernote/commands/dj/StopCmd.java @@ -1,9 +1,9 @@ -package com.jagrosh.jmusicbot.commands.dj; +package su.cif.infernote.commands.dj; import com.jagrosh.jdautilities.command.CommandEvent; -import com.jagrosh.jmusicbot.Bot; -import com.jagrosh.jmusicbot.audio.AudioHandler; -import com.jagrosh.jmusicbot.commands.DJCommand; +import su.cif.infernote.Bot; +import su.cif.infernote.audio.AudioHandler; +import su.cif.infernote.commands.DJCommand; public class StopCmd extends DJCommand { diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/dj/VolumeCmd.java b/src/main/java/su/cif/infernote/commands/dj/VolumeCmd.java similarity index 84% rename from src/main/java/com/jagrosh/jmusicbot/commands/dj/VolumeCmd.java rename to src/main/java/su/cif/infernote/commands/dj/VolumeCmd.java index 43bc5ca..c4d3fb4 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/dj/VolumeCmd.java +++ b/src/main/java/su/cif/infernote/commands/dj/VolumeCmd.java @@ -1,11 +1,11 @@ -package com.jagrosh.jmusicbot.commands.dj; +package su.cif.infernote.commands.dj; import com.jagrosh.jdautilities.command.CommandEvent; -import com.jagrosh.jmusicbot.Bot; -import com.jagrosh.jmusicbot.audio.AudioHandler; -import com.jagrosh.jmusicbot.commands.DJCommand; -import com.jagrosh.jmusicbot.settings.Settings; -import com.jagrosh.jmusicbot.utils.FormatUtil; +import su.cif.infernote.Bot; +import su.cif.infernote.audio.AudioHandler; +import su.cif.infernote.commands.DJCommand; +import su.cif.infernote.settings.Settings; +import su.cif.infernote.utils.FormatUtil; public class VolumeCmd extends DJCommand { diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/general/SettingsCmd.java b/src/main/java/su/cif/infernote/commands/general/SettingsCmd.java similarity index 90% rename from src/main/java/com/jagrosh/jmusicbot/commands/general/SettingsCmd.java rename to src/main/java/su/cif/infernote/commands/general/SettingsCmd.java index 1eebb3e..3f23a09 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/general/SettingsCmd.java +++ b/src/main/java/su/cif/infernote/commands/general/SettingsCmd.java @@ -1,12 +1,12 @@ -package com.jagrosh.jmusicbot.commands.general; +package su.cif.infernote.commands.general; import com.jagrosh.jdautilities.command.Command; import com.jagrosh.jdautilities.command.CommandEvent; -import com.jagrosh.jmusicbot.Bot; -import com.jagrosh.jmusicbot.settings.QueueType; -import com.jagrosh.jmusicbot.settings.RepeatMode; -import com.jagrosh.jmusicbot.settings.Settings; -import com.jagrosh.jmusicbot.utils.FormatUtil; +import su.cif.infernote.Bot; +import su.cif.infernote.settings.QueueType; +import su.cif.infernote.settings.RepeatMode; +import su.cif.infernote.settings.Settings; +import su.cif.infernote.utils.FormatUtil; import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.MessageBuilder; import net.dv8tion.jda.api.entities.Role; diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/music/LyricsCmd.java b/src/main/java/su/cif/infernote/commands/music/LyricsCmd.java similarity index 94% rename from src/main/java/com/jagrosh/jmusicbot/commands/music/LyricsCmd.java rename to src/main/java/su/cif/infernote/commands/music/LyricsCmd.java index ad68163..641df6f 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/music/LyricsCmd.java +++ b/src/main/java/su/cif/infernote/commands/music/LyricsCmd.java @@ -1,10 +1,10 @@ -package com.jagrosh.jmusicbot.commands.music; +package su.cif.infernote.commands.music; import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jlyrics.LyricsClient; -import com.jagrosh.jmusicbot.Bot; -import com.jagrosh.jmusicbot.audio.AudioHandler; -import com.jagrosh.jmusicbot.commands.MusicCommand; +import su.cif.infernote.Bot; +import su.cif.infernote.audio.AudioHandler; +import su.cif.infernote.commands.MusicCommand; import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.Permission; diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/music/NowplayingCmd.java b/src/main/java/su/cif/infernote/commands/music/NowplayingCmd.java similarity index 85% rename from src/main/java/com/jagrosh/jmusicbot/commands/music/NowplayingCmd.java rename to src/main/java/su/cif/infernote/commands/music/NowplayingCmd.java index 3719d9f..ddf6eea 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/music/NowplayingCmd.java +++ b/src/main/java/su/cif/infernote/commands/music/NowplayingCmd.java @@ -1,9 +1,9 @@ -package com.jagrosh.jmusicbot.commands.music; +package su.cif.infernote.commands.music; import com.jagrosh.jdautilities.command.CommandEvent; -import com.jagrosh.jmusicbot.Bot; -import com.jagrosh.jmusicbot.audio.AudioHandler; -import com.jagrosh.jmusicbot.commands.MusicCommand; +import su.cif.infernote.Bot; +import su.cif.infernote.audio.AudioHandler; +import su.cif.infernote.commands.MusicCommand; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.Message; diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/music/PlayCmd.java b/src/main/java/su/cif/infernote/commands/music/PlayCmd.java similarity index 96% rename from src/main/java/com/jagrosh/jmusicbot/commands/music/PlayCmd.java rename to src/main/java/su/cif/infernote/commands/music/PlayCmd.java index 7a4335f..567be28 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/music/PlayCmd.java +++ b/src/main/java/su/cif/infernote/commands/music/PlayCmd.java @@ -1,7 +1,7 @@ -package com.jagrosh.jmusicbot.commands.music; +package su.cif.infernote.commands.music; -import com.jagrosh.jmusicbot.audio.RequestMetadata; -import com.jagrosh.jmusicbot.utils.TimeUtil; +import su.cif.infernote.audio.RequestMetadata; +import su.cif.infernote.utils.TimeUtil; import com.sedmelluq.discord.lavaplayer.player.AudioLoadResultHandler; import com.sedmelluq.discord.lavaplayer.tools.FriendlyException; import com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity; @@ -10,13 +10,13 @@ import com.sedmelluq.discord.lavaplayer.track.AudioTrack; import com.jagrosh.jdautilities.command.Command; import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jdautilities.menu.ButtonMenu; -import com.jagrosh.jmusicbot.Bot; -import com.jagrosh.jmusicbot.audio.AudioHandler; -import com.jagrosh.jmusicbot.audio.QueuedTrack; -import com.jagrosh.jmusicbot.commands.DJCommand; -import com.jagrosh.jmusicbot.commands.MusicCommand; -import com.jagrosh.jmusicbot.playlist.PlaylistLoader.Playlist; -import com.jagrosh.jmusicbot.utils.FormatUtil; +import su.cif.infernote.Bot; +import su.cif.infernote.audio.AudioHandler; +import su.cif.infernote.audio.QueuedTrack; +import su.cif.infernote.commands.DJCommand; +import su.cif.infernote.commands.MusicCommand; +import su.cif.infernote.playlist.PlaylistLoader.Playlist; +import su.cif.infernote.utils.FormatUtil; import java.util.concurrent.TimeUnit; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.Message; diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/music/PlaylistsCmd.java b/src/main/java/su/cif/infernote/commands/music/PlaylistsCmd.java similarity index 92% rename from src/main/java/com/jagrosh/jmusicbot/commands/music/PlaylistsCmd.java rename to src/main/java/su/cif/infernote/commands/music/PlaylistsCmd.java index e9ae879..5844104 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/music/PlaylistsCmd.java +++ b/src/main/java/su/cif/infernote/commands/music/PlaylistsCmd.java @@ -1,9 +1,9 @@ -package com.jagrosh.jmusicbot.commands.music; +package su.cif.infernote.commands.music; import java.util.List; import com.jagrosh.jdautilities.command.CommandEvent; -import com.jagrosh.jmusicbot.Bot; -import com.jagrosh.jmusicbot.commands.MusicCommand; +import su.cif.infernote.Bot; +import su.cif.infernote.commands.MusicCommand; public class PlaylistsCmd extends MusicCommand { diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/music/QueueCmd.java b/src/main/java/su/cif/infernote/commands/music/QueueCmd.java similarity index 89% rename from src/main/java/com/jagrosh/jmusicbot/commands/music/QueueCmd.java rename to src/main/java/su/cif/infernote/commands/music/QueueCmd.java index c0cec9f..0bb3e45 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/music/QueueCmd.java +++ b/src/main/java/su/cif/infernote/commands/music/QueueCmd.java @@ -1,18 +1,18 @@ -package com.jagrosh.jmusicbot.commands.music; +package su.cif.infernote.commands.music; import java.util.List; import java.util.concurrent.TimeUnit; import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jdautilities.menu.Paginator; -import com.jagrosh.jmusicbot.Bot; -import com.jagrosh.jmusicbot.audio.AudioHandler; -import com.jagrosh.jmusicbot.audio.QueuedTrack; -import com.jagrosh.jmusicbot.commands.MusicCommand; -import com.jagrosh.jmusicbot.settings.QueueType; -import com.jagrosh.jmusicbot.settings.RepeatMode; -import com.jagrosh.jmusicbot.settings.Settings; -import com.jagrosh.jmusicbot.utils.FormatUtil; -import com.jagrosh.jmusicbot.utils.TimeUtil; +import su.cif.infernote.Bot; +import su.cif.infernote.audio.AudioHandler; +import su.cif.infernote.audio.QueuedTrack; +import su.cif.infernote.commands.MusicCommand; +import su.cif.infernote.settings.QueueType; +import su.cif.infernote.settings.RepeatMode; +import su.cif.infernote.settings.Settings; +import su.cif.infernote.utils.FormatUtil; +import su.cif.infernote.utils.TimeUtil; import net.dv8tion.jda.api.MessageBuilder; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.Message; diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/music/RemoveCmd.java b/src/main/java/su/cif/infernote/commands/music/RemoveCmd.java similarity index 90% rename from src/main/java/com/jagrosh/jmusicbot/commands/music/RemoveCmd.java rename to src/main/java/su/cif/infernote/commands/music/RemoveCmd.java index e36338b..0f00851 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/music/RemoveCmd.java +++ b/src/main/java/su/cif/infernote/commands/music/RemoveCmd.java @@ -1,11 +1,11 @@ -package com.jagrosh.jmusicbot.commands.music; +package su.cif.infernote.commands.music; import com.jagrosh.jdautilities.command.CommandEvent; -import com.jagrosh.jmusicbot.Bot; -import com.jagrosh.jmusicbot.audio.AudioHandler; -import com.jagrosh.jmusicbot.audio.QueuedTrack; -import com.jagrosh.jmusicbot.commands.MusicCommand; -import com.jagrosh.jmusicbot.settings.Settings; +import su.cif.infernote.Bot; +import su.cif.infernote.audio.AudioHandler; +import su.cif.infernote.audio.QueuedTrack; +import su.cif.infernote.commands.MusicCommand; +import su.cif.infernote.settings.Settings; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.User; diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/music/SCSearchCmd.java b/src/main/java/su/cif/infernote/commands/music/SCSearchCmd.java similarity index 79% rename from src/main/java/com/jagrosh/jmusicbot/commands/music/SCSearchCmd.java rename to src/main/java/su/cif/infernote/commands/music/SCSearchCmd.java index 99a925d..ddaab67 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/music/SCSearchCmd.java +++ b/src/main/java/su/cif/infernote/commands/music/SCSearchCmd.java @@ -1,6 +1,6 @@ -package com.jagrosh.jmusicbot.commands.music; +package su.cif.infernote.commands.music; -import com.jagrosh.jmusicbot.Bot; +import su.cif.infernote.Bot; public class SCSearchCmd extends SearchCmd { diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/music/SearchCmd.java b/src/main/java/su/cif/infernote/commands/music/SearchCmd.java similarity index 93% rename from src/main/java/com/jagrosh/jmusicbot/commands/music/SearchCmd.java rename to src/main/java/su/cif/infernote/commands/music/SearchCmd.java index 0ac6730..d743000 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/music/SearchCmd.java +++ b/src/main/java/su/cif/infernote/commands/music/SearchCmd.java @@ -1,7 +1,7 @@ -package com.jagrosh.jmusicbot.commands.music; +package su.cif.infernote.commands.music; -import com.jagrosh.jmusicbot.audio.RequestMetadata; -import com.jagrosh.jmusicbot.utils.TimeUtil; +import su.cif.infernote.audio.RequestMetadata; +import su.cif.infernote.utils.TimeUtil; import com.sedmelluq.discord.lavaplayer.player.AudioLoadResultHandler; import com.sedmelluq.discord.lavaplayer.tools.FriendlyException; import com.sedmelluq.discord.lavaplayer.tools.FriendlyException.Severity; @@ -10,11 +10,11 @@ import com.sedmelluq.discord.lavaplayer.track.AudioTrack; import java.util.concurrent.TimeUnit; import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jdautilities.menu.OrderedMenu; -import com.jagrosh.jmusicbot.Bot; -import com.jagrosh.jmusicbot.audio.AudioHandler; -import com.jagrosh.jmusicbot.audio.QueuedTrack; -import com.jagrosh.jmusicbot.commands.MusicCommand; -import com.jagrosh.jmusicbot.utils.FormatUtil; +import su.cif.infernote.Bot; +import su.cif.infernote.audio.AudioHandler; +import su.cif.infernote.audio.QueuedTrack; +import su.cif.infernote.commands.MusicCommand; +import su.cif.infernote.utils.FormatUtil; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.Message; diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/music/SeekCmd.java b/src/main/java/su/cif/infernote/commands/music/SeekCmd.java similarity index 88% rename from src/main/java/com/jagrosh/jmusicbot/commands/music/SeekCmd.java rename to src/main/java/su/cif/infernote/commands/music/SeekCmd.java index 9ab6699..2f97650 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/music/SeekCmd.java +++ b/src/main/java/su/cif/infernote/commands/music/SeekCmd.java @@ -1,12 +1,12 @@ -package com.jagrosh.jmusicbot.commands.music; +package su.cif.infernote.commands.music; import com.jagrosh.jdautilities.command.CommandEvent; -import com.jagrosh.jmusicbot.Bot; -import com.jagrosh.jmusicbot.audio.AudioHandler; -import com.jagrosh.jmusicbot.audio.RequestMetadata; -import com.jagrosh.jmusicbot.commands.DJCommand; -import com.jagrosh.jmusicbot.commands.MusicCommand; -import com.jagrosh.jmusicbot.utils.TimeUtil; +import su.cif.infernote.Bot; +import su.cif.infernote.audio.AudioHandler; +import su.cif.infernote.audio.RequestMetadata; +import su.cif.infernote.commands.DJCommand; +import su.cif.infernote.commands.MusicCommand; +import su.cif.infernote.utils.TimeUtil; import com.sedmelluq.discord.lavaplayer.track.AudioTrack; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/music/ShuffleCmd.java b/src/main/java/su/cif/infernote/commands/music/ShuffleCmd.java similarity index 85% rename from src/main/java/com/jagrosh/jmusicbot/commands/music/ShuffleCmd.java rename to src/main/java/su/cif/infernote/commands/music/ShuffleCmd.java index c5cec40..34202c7 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/music/ShuffleCmd.java +++ b/src/main/java/su/cif/infernote/commands/music/ShuffleCmd.java @@ -1,9 +1,9 @@ -package com.jagrosh.jmusicbot.commands.music; +package su.cif.infernote.commands.music; import com.jagrosh.jdautilities.command.CommandEvent; -import com.jagrosh.jmusicbot.Bot; -import com.jagrosh.jmusicbot.audio.AudioHandler; -import com.jagrosh.jmusicbot.commands.MusicCommand; +import su.cif.infernote.Bot; +import su.cif.infernote.audio.AudioHandler; +import su.cif.infernote.commands.MusicCommand; public class ShuffleCmd extends MusicCommand { diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/music/SkipCmd.java b/src/main/java/su/cif/infernote/commands/music/SkipCmd.java similarity index 89% rename from src/main/java/com/jagrosh/jmusicbot/commands/music/SkipCmd.java rename to src/main/java/su/cif/infernote/commands/music/SkipCmd.java index 1d429fc..380c390 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/music/SkipCmd.java +++ b/src/main/java/su/cif/infernote/commands/music/SkipCmd.java @@ -1,11 +1,11 @@ -package com.jagrosh.jmusicbot.commands.music; +package su.cif.infernote.commands.music; import com.jagrosh.jdautilities.command.CommandEvent; -import com.jagrosh.jmusicbot.Bot; -import com.jagrosh.jmusicbot.audio.AudioHandler; -import com.jagrosh.jmusicbot.audio.RequestMetadata; -import com.jagrosh.jmusicbot.commands.MusicCommand; -import com.jagrosh.jmusicbot.utils.FormatUtil; +import su.cif.infernote.Bot; +import su.cif.infernote.audio.AudioHandler; +import su.cif.infernote.audio.RequestMetadata; +import su.cif.infernote.commands.MusicCommand; +import su.cif.infernote.utils.FormatUtil; public class SkipCmd extends MusicCommand { diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/owner/AutoplaylistCmd.java b/src/main/java/su/cif/infernote/commands/owner/AutoplaylistCmd.java similarity index 89% rename from src/main/java/com/jagrosh/jmusicbot/commands/owner/AutoplaylistCmd.java rename to src/main/java/su/cif/infernote/commands/owner/AutoplaylistCmd.java index da58d0f..1f65a5f 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/owner/AutoplaylistCmd.java +++ b/src/main/java/su/cif/infernote/commands/owner/AutoplaylistCmd.java @@ -1,9 +1,9 @@ -package com.jagrosh.jmusicbot.commands.owner; +package su.cif.infernote.commands.owner; import com.jagrosh.jdautilities.command.CommandEvent; -import com.jagrosh.jmusicbot.Bot; -import com.jagrosh.jmusicbot.commands.OwnerCommand; -import com.jagrosh.jmusicbot.settings.Settings; +import su.cif.infernote.Bot; +import su.cif.infernote.commands.OwnerCommand; +import su.cif.infernote.settings.Settings; public class AutoplaylistCmd extends OwnerCommand { diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/owner/DebugCmd.java b/src/main/java/su/cif/infernote/commands/owner/DebugCmd.java similarity index 93% rename from src/main/java/com/jagrosh/jmusicbot/commands/owner/DebugCmd.java rename to src/main/java/su/cif/infernote/commands/owner/DebugCmd.java index c6d0151..b799d1d 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/owner/DebugCmd.java +++ b/src/main/java/su/cif/infernote/commands/owner/DebugCmd.java @@ -1,10 +1,10 @@ -package com.jagrosh.jmusicbot.commands.owner; +package su.cif.infernote.commands.owner; import com.jagrosh.jdautilities.command.CommandEvent; import com.jagrosh.jdautilities.commons.JDAUtilitiesInfo; -import com.jagrosh.jmusicbot.Bot; -import com.jagrosh.jmusicbot.commands.OwnerCommand; -import com.jagrosh.jmusicbot.utils.OtherUtil; +import su.cif.infernote.Bot; +import su.cif.infernote.commands.OwnerCommand; +import su.cif.infernote.utils.OtherUtil; import com.sedmelluq.discord.lavaplayer.tools.PlayerLibrary; import net.dv8tion.jda.api.JDAInfo; import net.dv8tion.jda.api.Permission; @@ -33,7 +33,7 @@ public class DebugCmd extends OwnerCommand sb.append("```\nSystem Properties:"); for(String key: PROPERTIES) sb.append("\n ").append(key).append(" = ").append(System.getProperty(key)); - sb.append("\n\nJMusicBot Information:") + sb.append("\n\nInfernote Information:") .append("\n Version = ").append(OtherUtil.getCurrentVersion()) .append("\n Owner = ").append(bot.getConfig().getOwnerId()) .append("\n Prefix = ").append(bot.getConfig().getPrefix()) diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/owner/EvalCmd.java b/src/main/java/su/cif/infernote/commands/owner/EvalCmd.java similarity index 92% rename from src/main/java/com/jagrosh/jmusicbot/commands/owner/EvalCmd.java rename to src/main/java/su/cif/infernote/commands/owner/EvalCmd.java index 2e58f1c..c264731 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/owner/EvalCmd.java +++ b/src/main/java/su/cif/infernote/commands/owner/EvalCmd.java @@ -1,10 +1,10 @@ -package com.jagrosh.jmusicbot.commands.owner; +package su.cif.infernote.commands.owner; import javax.script.ScriptEngine; import javax.script.ScriptEngineManager; import com.jagrosh.jdautilities.command.CommandEvent; -import com.jagrosh.jmusicbot.Bot; -import com.jagrosh.jmusicbot.commands.OwnerCommand; +import su.cif.infernote.Bot; +import su.cif.infernote.commands.OwnerCommand; import net.dv8tion.jda.api.entities.ChannelType; public class EvalCmd extends OwnerCommand diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/owner/PlaylistCmd.java b/src/main/java/su/cif/infernote/commands/owner/PlaylistCmd.java similarity index 97% rename from src/main/java/com/jagrosh/jmusicbot/commands/owner/PlaylistCmd.java rename to src/main/java/su/cif/infernote/commands/owner/PlaylistCmd.java index 88b5319..2ea13fc 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/owner/PlaylistCmd.java +++ b/src/main/java/su/cif/infernote/commands/owner/PlaylistCmd.java @@ -1,12 +1,12 @@ -package com.jagrosh.jmusicbot.commands.owner; +package su.cif.infernote.commands.owner; import java.io.IOException; import java.util.List; import com.jagrosh.jdautilities.command.Command; import com.jagrosh.jdautilities.command.CommandEvent; -import com.jagrosh.jmusicbot.Bot; -import com.jagrosh.jmusicbot.commands.OwnerCommand; -import com.jagrosh.jmusicbot.playlist.PlaylistLoader.Playlist; +import su.cif.infernote.Bot; +import su.cif.infernote.commands.OwnerCommand; +import su.cif.infernote.playlist.PlaylistLoader.Playlist; public class PlaylistCmd extends OwnerCommand { diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/owner/SetavatarCmd.java b/src/main/java/su/cif/infernote/commands/owner/SetavatarCmd.java similarity index 89% rename from src/main/java/com/jagrosh/jmusicbot/commands/owner/SetavatarCmd.java rename to src/main/java/su/cif/infernote/commands/owner/SetavatarCmd.java index 0ba22be..9dc1b57 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/owner/SetavatarCmd.java +++ b/src/main/java/su/cif/infernote/commands/owner/SetavatarCmd.java @@ -1,11 +1,11 @@ -package com.jagrosh.jmusicbot.commands.owner; +package su.cif.infernote.commands.owner; import java.io.IOException; import java.io.InputStream; import com.jagrosh.jdautilities.command.CommandEvent; -import com.jagrosh.jmusicbot.Bot; -import com.jagrosh.jmusicbot.commands.OwnerCommand; -import com.jagrosh.jmusicbot.utils.OtherUtil; +import su.cif.infernote.Bot; +import su.cif.infernote.commands.OwnerCommand; +import su.cif.infernote.utils.OtherUtil; import net.dv8tion.jda.api.entities.Icon; public class SetavatarCmd extends OwnerCommand diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/owner/SetgameCmd.java b/src/main/java/su/cif/infernote/commands/owner/SetgameCmd.java similarity index 97% rename from src/main/java/com/jagrosh/jmusicbot/commands/owner/SetgameCmd.java rename to src/main/java/su/cif/infernote/commands/owner/SetgameCmd.java index 49bad2a..381ef64 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/owner/SetgameCmd.java +++ b/src/main/java/su/cif/infernote/commands/owner/SetgameCmd.java @@ -1,8 +1,8 @@ -package com.jagrosh.jmusicbot.commands.owner; +package su.cif.infernote.commands.owner; import com.jagrosh.jdautilities.command.CommandEvent; -import com.jagrosh.jmusicbot.Bot; -import com.jagrosh.jmusicbot.commands.OwnerCommand; +import su.cif.infernote.Bot; +import su.cif.infernote.commands.OwnerCommand; import net.dv8tion.jda.api.entities.Activity; public class SetgameCmd extends OwnerCommand diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/owner/SetnameCmd.java b/src/main/java/su/cif/infernote/commands/owner/SetnameCmd.java similarity index 89% rename from src/main/java/com/jagrosh/jmusicbot/commands/owner/SetnameCmd.java rename to src/main/java/su/cif/infernote/commands/owner/SetnameCmd.java index 48537bf..710ff9d 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/owner/SetnameCmd.java +++ b/src/main/java/su/cif/infernote/commands/owner/SetnameCmd.java @@ -1,8 +1,8 @@ -package com.jagrosh.jmusicbot.commands.owner; +package su.cif.infernote.commands.owner; import com.jagrosh.jdautilities.command.CommandEvent; -import com.jagrosh.jmusicbot.Bot; -import com.jagrosh.jmusicbot.commands.OwnerCommand; +import su.cif.infernote.Bot; +import su.cif.infernote.commands.OwnerCommand; import net.dv8tion.jda.api.exceptions.RateLimitedException; public class SetnameCmd extends OwnerCommand diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/owner/SetstatusCmd.java b/src/main/java/su/cif/infernote/commands/owner/SetstatusCmd.java similarity index 89% rename from src/main/java/com/jagrosh/jmusicbot/commands/owner/SetstatusCmd.java rename to src/main/java/su/cif/infernote/commands/owner/SetstatusCmd.java index 7d789cc..2b9be79 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/owner/SetstatusCmd.java +++ b/src/main/java/su/cif/infernote/commands/owner/SetstatusCmd.java @@ -1,8 +1,8 @@ -package com.jagrosh.jmusicbot.commands.owner; +package su.cif.infernote.commands.owner; import com.jagrosh.jdautilities.command.CommandEvent; -import com.jagrosh.jmusicbot.Bot; -import com.jagrosh.jmusicbot.commands.OwnerCommand; +import su.cif.infernote.Bot; +import su.cif.infernote.commands.OwnerCommand; import net.dv8tion.jda.api.OnlineStatus; public class SetstatusCmd extends OwnerCommand diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/owner/ShutdownCmd.java b/src/main/java/su/cif/infernote/commands/owner/ShutdownCmd.java similarity index 79% rename from src/main/java/com/jagrosh/jmusicbot/commands/owner/ShutdownCmd.java rename to src/main/java/su/cif/infernote/commands/owner/ShutdownCmd.java index 6718aee..aef2419 100644 --- a/src/main/java/com/jagrosh/jmusicbot/commands/owner/ShutdownCmd.java +++ b/src/main/java/su/cif/infernote/commands/owner/ShutdownCmd.java @@ -1,8 +1,8 @@ -package com.jagrosh.jmusicbot.commands.owner; +package su.cif.infernote.commands.owner; import com.jagrosh.jdautilities.command.CommandEvent; -import com.jagrosh.jmusicbot.Bot; -import com.jagrosh.jmusicbot.commands.OwnerCommand; +import su.cif.infernote.Bot; +import su.cif.infernote.commands.OwnerCommand; public class ShutdownCmd extends OwnerCommand { diff --git a/src/main/java/com/jagrosh/jmusicbot/entities/Pair.java b/src/main/java/su/cif/infernote/entities/Pair.java similarity index 88% rename from src/main/java/com/jagrosh/jmusicbot/entities/Pair.java rename to src/main/java/su/cif/infernote/entities/Pair.java index 30fa7c7..c6b1ee6 100644 --- a/src/main/java/com/jagrosh/jmusicbot/entities/Pair.java +++ b/src/main/java/su/cif/infernote/entities/Pair.java @@ -1,4 +1,4 @@ -package com.jagrosh.jmusicbot.entities; +package su.cif.infernote.entities; public class Pair { diff --git a/src/main/java/com/jagrosh/jmusicbot/entities/Prompt.java b/src/main/java/su/cif/infernote/entities/Prompt.java similarity index 98% rename from src/main/java/com/jagrosh/jmusicbot/entities/Prompt.java rename to src/main/java/su/cif/infernote/entities/Prompt.java index aaab525..6cd3a26 100644 --- a/src/main/java/com/jagrosh/jmusicbot/entities/Prompt.java +++ b/src/main/java/su/cif/infernote/entities/Prompt.java @@ -1,4 +1,4 @@ -package com.jagrosh.jmusicbot.entities; +package su.cif.infernote.entities; import java.util.Scanner; import javax.swing.JOptionPane; diff --git a/src/main/java/com/jagrosh/jmusicbot/gui/ConsolePanel.java b/src/main/java/su/cif/infernote/gui/ConsolePanel.java similarity index 92% rename from src/main/java/com/jagrosh/jmusicbot/gui/ConsolePanel.java rename to src/main/java/su/cif/infernote/gui/ConsolePanel.java index d20ebd1..6687620 100644 --- a/src/main/java/com/jagrosh/jmusicbot/gui/ConsolePanel.java +++ b/src/main/java/su/cif/infernote/gui/ConsolePanel.java @@ -1,4 +1,4 @@ -package com.jagrosh.jmusicbot.gui; +package su.cif.infernote.gui; import java.awt.Dimension; import java.awt.GridLayout; diff --git a/src/main/java/com/jagrosh/jmusicbot/gui/GUI.java b/src/main/java/su/cif/infernote/gui/GUI.java similarity index 93% rename from src/main/java/com/jagrosh/jmusicbot/gui/GUI.java rename to src/main/java/su/cif/infernote/gui/GUI.java index cc4be7e..a35fd3e 100644 --- a/src/main/java/com/jagrosh/jmusicbot/gui/GUI.java +++ b/src/main/java/su/cif/infernote/gui/GUI.java @@ -1,11 +1,11 @@ -package com.jagrosh.jmusicbot.gui; +package su.cif.infernote.gui; import java.awt.event.WindowEvent; import java.awt.event.WindowListener; import javax.swing.JFrame; import javax.swing.JTabbedPane; import javax.swing.WindowConstants; -import com.jagrosh.jmusicbot.Bot; +import su.cif.infernote.Bot; public class GUI extends JFrame { @@ -22,7 +22,7 @@ public class GUI extends JFrame public void init() { setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE); - setTitle("JMusicBot"); + setTitle("Infernote"); JTabbedPane tabs = new JTabbedPane(); tabs.add("Console", console); getContentPane().add(tabs); diff --git a/src/main/java/com/jagrosh/jmusicbot/gui/TextAreaOutputStream.java b/src/main/java/su/cif/infernote/gui/TextAreaOutputStream.java similarity index 99% rename from src/main/java/com/jagrosh/jmusicbot/gui/TextAreaOutputStream.java rename to src/main/java/su/cif/infernote/gui/TextAreaOutputStream.java index 46a2b43..de58e7b 100644 --- a/src/main/java/com/jagrosh/jmusicbot/gui/TextAreaOutputStream.java +++ b/src/main/java/su/cif/infernote/gui/TextAreaOutputStream.java @@ -1,4 +1,4 @@ -package com.jagrosh.jmusicbot.gui; +package su.cif.infernote.gui; import java.awt.*; import java.io.*; diff --git a/src/main/java/com/jagrosh/jmusicbot/playlist/PlaylistLoader.java b/src/main/java/su/cif/infernote/playlist/PlaylistLoader.java similarity index 98% rename from src/main/java/com/jagrosh/jmusicbot/playlist/PlaylistLoader.java rename to src/main/java/su/cif/infernote/playlist/PlaylistLoader.java index feccb33..ee54424 100644 --- a/src/main/java/com/jagrosh/jmusicbot/playlist/PlaylistLoader.java +++ b/src/main/java/su/cif/infernote/playlist/PlaylistLoader.java @@ -1,7 +1,7 @@ -package com.jagrosh.jmusicbot.playlist; +package su.cif.infernote.playlist; -import com.jagrosh.jmusicbot.BotConfig; -import com.jagrosh.jmusicbot.utils.OtherUtil; +import su.cif.infernote.BotConfig; +import su.cif.infernote.utils.OtherUtil; import com.sedmelluq.discord.lavaplayer.player.AudioLoadResultHandler; import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager; import com.sedmelluq.discord.lavaplayer.tools.FriendlyException; diff --git a/src/main/java/com/jagrosh/jmusicbot/queue/AbstractQueue.java b/src/main/java/su/cif/infernote/queue/AbstractQueue.java similarity index 98% rename from src/main/java/com/jagrosh/jmusicbot/queue/AbstractQueue.java rename to src/main/java/su/cif/infernote/queue/AbstractQueue.java index 46c78fb..6f258f6 100644 --- a/src/main/java/com/jagrosh/jmusicbot/queue/AbstractQueue.java +++ b/src/main/java/su/cif/infernote/queue/AbstractQueue.java @@ -1,4 +1,4 @@ -package com.jagrosh.jmusicbot.queue; +package su.cif.infernote.queue; import java.util.ArrayList; import java.util.LinkedList; diff --git a/src/main/java/com/jagrosh/jmusicbot/queue/FairQueue.java b/src/main/java/su/cif/infernote/queue/FairQueue.java similarity index 95% rename from src/main/java/com/jagrosh/jmusicbot/queue/FairQueue.java rename to src/main/java/su/cif/infernote/queue/FairQueue.java index f0e7f83..4b21789 100644 --- a/src/main/java/com/jagrosh/jmusicbot/queue/FairQueue.java +++ b/src/main/java/su/cif/infernote/queue/FairQueue.java @@ -1,4 +1,4 @@ -package com.jagrosh.jmusicbot.queue; +package su.cif.infernote.queue; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/com/jagrosh/jmusicbot/queue/LinearQueue.java b/src/main/java/su/cif/infernote/queue/LinearQueue.java similarity index 87% rename from src/main/java/com/jagrosh/jmusicbot/queue/LinearQueue.java rename to src/main/java/su/cif/infernote/queue/LinearQueue.java index 359d6f8..565f669 100644 --- a/src/main/java/com/jagrosh/jmusicbot/queue/LinearQueue.java +++ b/src/main/java/su/cif/infernote/queue/LinearQueue.java @@ -1,4 +1,4 @@ -package com.jagrosh.jmusicbot.queue; +package su.cif.infernote.queue; public class LinearQueue extends AbstractQueue { diff --git a/src/main/java/com/jagrosh/jmusicbot/queue/QueueSupplier.java b/src/main/java/su/cif/infernote/queue/QueueSupplier.java similarity index 77% rename from src/main/java/com/jagrosh/jmusicbot/queue/QueueSupplier.java rename to src/main/java/su/cif/infernote/queue/QueueSupplier.java index 2ed85fa..8136f54 100644 --- a/src/main/java/com/jagrosh/jmusicbot/queue/QueueSupplier.java +++ b/src/main/java/su/cif/infernote/queue/QueueSupplier.java @@ -1,4 +1,4 @@ -package com.jagrosh.jmusicbot.queue; +package su.cif.infernote.queue; @FunctionalInterface public interface QueueSupplier diff --git a/src/main/java/com/jagrosh/jmusicbot/queue/Queueable.java b/src/main/java/su/cif/infernote/queue/Queueable.java similarity index 65% rename from src/main/java/com/jagrosh/jmusicbot/queue/Queueable.java rename to src/main/java/su/cif/infernote/queue/Queueable.java index 38130b2..2e066df 100644 --- a/src/main/java/com/jagrosh/jmusicbot/queue/Queueable.java +++ b/src/main/java/su/cif/infernote/queue/Queueable.java @@ -1,4 +1,4 @@ -package com.jagrosh.jmusicbot.queue; +package su.cif.infernote.queue; public interface Queueable { diff --git a/src/main/java/com/jagrosh/jmusicbot/settings/QueueType.java b/src/main/java/su/cif/infernote/settings/QueueType.java similarity index 79% rename from src/main/java/com/jagrosh/jmusicbot/settings/QueueType.java rename to src/main/java/su/cif/infernote/settings/QueueType.java index 36bba69..cd39956 100644 --- a/src/main/java/com/jagrosh/jmusicbot/settings/QueueType.java +++ b/src/main/java/su/cif/infernote/settings/QueueType.java @@ -1,10 +1,10 @@ -package com.jagrosh.jmusicbot.settings; +package su.cif.infernote.settings; -import com.jagrosh.jmusicbot.queue.AbstractQueue; -import com.jagrosh.jmusicbot.queue.FairQueue; -import com.jagrosh.jmusicbot.queue.LinearQueue; -import com.jagrosh.jmusicbot.queue.Queueable; -import com.jagrosh.jmusicbot.queue.QueueSupplier; +import su.cif.infernote.queue.AbstractQueue; +import su.cif.infernote.queue.FairQueue; +import su.cif.infernote.queue.LinearQueue; +import su.cif.infernote.queue.Queueable; +import su.cif.infernote.queue.QueueSupplier; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/com/jagrosh/jmusicbot/settings/RepeatMode.java b/src/main/java/su/cif/infernote/settings/RepeatMode.java similarity index 92% rename from src/main/java/com/jagrosh/jmusicbot/settings/RepeatMode.java rename to src/main/java/su/cif/infernote/settings/RepeatMode.java index e44b547..f48c5a4 100644 --- a/src/main/java/com/jagrosh/jmusicbot/settings/RepeatMode.java +++ b/src/main/java/su/cif/infernote/settings/RepeatMode.java @@ -1,4 +1,4 @@ -package com.jagrosh.jmusicbot.settings; +package su.cif.infernote.settings; public enum RepeatMode { diff --git a/src/main/java/com/jagrosh/jmusicbot/settings/Settings.java b/src/main/java/su/cif/infernote/settings/Settings.java similarity index 99% rename from src/main/java/com/jagrosh/jmusicbot/settings/Settings.java rename to src/main/java/su/cif/infernote/settings/Settings.java index a0ab734..d6ec31e 100644 --- a/src/main/java/com/jagrosh/jmusicbot/settings/Settings.java +++ b/src/main/java/su/cif/infernote/settings/Settings.java @@ -1,4 +1,4 @@ -package com.jagrosh.jmusicbot.settings; +package su.cif.infernote.settings; import com.jagrosh.jdautilities.command.GuildSettingsProvider; import java.util.Collection; diff --git a/src/main/java/com/jagrosh/jmusicbot/settings/SettingsManager.java b/src/main/java/su/cif/infernote/settings/SettingsManager.java similarity index 98% rename from src/main/java/com/jagrosh/jmusicbot/settings/SettingsManager.java rename to src/main/java/su/cif/infernote/settings/SettingsManager.java index 650f2af..05dd2bd 100644 --- a/src/main/java/com/jagrosh/jmusicbot/settings/SettingsManager.java +++ b/src/main/java/su/cif/infernote/settings/SettingsManager.java @@ -1,7 +1,7 @@ -package com.jagrosh.jmusicbot.settings; +package su.cif.infernote.settings; import com.jagrosh.jdautilities.command.GuildSettingsManager; -import com.jagrosh.jmusicbot.utils.OtherUtil; +import su.cif.infernote.utils.OtherUtil; import java.io.IOException; import java.nio.file.Files; import java.nio.file.NoSuchFileException; diff --git a/src/main/java/com/jagrosh/jmusicbot/utils/FormatUtil.java b/src/main/java/su/cif/infernote/utils/FormatUtil.java similarity index 96% rename from src/main/java/com/jagrosh/jmusicbot/utils/FormatUtil.java rename to src/main/java/su/cif/infernote/utils/FormatUtil.java index 8dd53f4..33edebc 100644 --- a/src/main/java/com/jagrosh/jmusicbot/utils/FormatUtil.java +++ b/src/main/java/su/cif/infernote/utils/FormatUtil.java @@ -1,6 +1,6 @@ -package com.jagrosh.jmusicbot.utils; +package su.cif.infernote.utils; -import com.jagrosh.jmusicbot.audio.RequestMetadata.UserInfo; +import su.cif.infernote.audio.RequestMetadata.UserInfo; import java.util.List; import net.dv8tion.jda.api.entities.Role; import net.dv8tion.jda.api.entities.TextChannel; diff --git a/src/main/java/com/jagrosh/jmusicbot/utils/OtherUtil.java b/src/main/java/su/cif/infernote/utils/OtherUtil.java similarity index 92% rename from src/main/java/com/jagrosh/jmusicbot/utils/OtherUtil.java rename to src/main/java/su/cif/infernote/utils/OtherUtil.java index 9847563..76742bb 100644 --- a/src/main/java/com/jagrosh/jmusicbot/utils/OtherUtil.java +++ b/src/main/java/su/cif/infernote/utils/OtherUtil.java @@ -1,7 +1,7 @@ -package com.jagrosh.jmusicbot.utils; +package su.cif.infernote.utils; -import com.jagrosh.jmusicbot.JMusicBot; -import com.jagrosh.jmusicbot.entities.Prompt; +import su.cif.infernote.Infernote; +import su.cif.infernote.entities.Prompt; import java.io.*; import java.net.URISyntaxException; import java.net.URL; @@ -43,7 +43,7 @@ public class OtherUtil { try { - result = Paths.get(new File(JMusicBot.class.getProtectionDomain().getCodeSource().getLocation().toURI()).getParentFile().getPath() + File.separator + path); + result = Paths.get(new File(Infernote.class.getProtectionDomain().getCodeSource().getLocation().toURI()).getParentFile().getPath() + File.separator + path); } catch(URISyntaxException ignored) {} } @@ -152,14 +152,14 @@ public class OtherUtil if(latestVersion!=null && !latestVersion.equals(version)) { - prompt.alert(Prompt.Level.WARNING, "JMusicBot Version", String.format(NEW_VERSION_AVAILABLE, version, latestVersion)); + prompt.alert(Prompt.Level.WARNING, "Infernote Version", String.format(NEW_VERSION_AVAILABLE, version, latestVersion)); } } public static String getCurrentVersion() { - if(JMusicBot.class.getPackage()!=null && JMusicBot.class.getPackage().getImplementationVersion()!=null) - return JMusicBot.class.getPackage().getImplementationVersion(); + if(Infernote.class.getPackage()!=null && Infernote.class.getPackage().getImplementationVersion()!=null) + return Infernote.class.getPackage().getImplementationVersion(); else return "UNKNOWN"; } @@ -194,17 +194,17 @@ public class OtherUtil } /** - * Checks if the bot JMusicBot is being run on is supported & returns the reason if it is not. + * Checks if the bot Infernote is being run on is supported & returns the reason if it is not. * @return A string with the reason, or null if it is supported. */ public static String getUnsupportedBotReason(JDA jda) { if (jda.getSelfUser().getFlags().contains(User.UserFlag.VERIFIED_BOT)) - return "The bot is verified. Using JMusicBot in a verified bot is not supported."; + return "The bot is verified. Using Infernote in a verified bot is not supported."; ApplicationInfo info = jda.retrieveApplicationInfo().complete(); if (info.isBotPublic()) - return "\"Public Bot\" is enabled. Using JMusicBot as a public bot is not supported. Please disable it in the " + return "\"Public Bot\" is enabled. Using Infernote as a public bot is not supported. Please disable it in the " + "Developer Dashboard at https://discord.com/developers/applications/" + jda.getSelfUser().getId() + "/bot ." + "You may also need to disable all Installation Contexts at https://discord.com/developers/applications/" + jda.getSelfUser().getId() + "/installation ."; diff --git a/src/main/java/com/jagrosh/jmusicbot/utils/TimeUtil.java b/src/main/java/su/cif/infernote/utils/TimeUtil.java similarity index 99% rename from src/main/java/com/jagrosh/jmusicbot/utils/TimeUtil.java rename to src/main/java/su/cif/infernote/utils/TimeUtil.java index c3eed53..c48025f 100644 --- a/src/main/java/com/jagrosh/jmusicbot/utils/TimeUtil.java +++ b/src/main/java/su/cif/infernote/utils/TimeUtil.java @@ -1,4 +1,4 @@ -package com.jagrosh.jmusicbot.utils; +package su.cif.infernote.utils; public class TimeUtil { diff --git a/src/main/java/com/jagrosh/jmusicbot/utils/YouTubeUtil.java b/src/main/java/su/cif/infernote/utils/YouTubeUtil.java similarity index 94% rename from src/main/java/com/jagrosh/jmusicbot/utils/YouTubeUtil.java rename to src/main/java/su/cif/infernote/utils/YouTubeUtil.java index d26dbc6..b817666 100644 --- a/src/main/java/com/jagrosh/jmusicbot/utils/YouTubeUtil.java +++ b/src/main/java/su/cif/infernote/utils/YouTubeUtil.java @@ -1,4 +1,4 @@ -package com.jagrosh.jmusicbot.utils; +package su.cif.infernote.utils; import com.sedmelluq.lava.extensions.youtuberotator.planner.*; import com.sedmelluq.lava.extensions.youtuberotator.tools.ip.IpBlock; diff --git a/src/test/java/com/jagrosh/jmusicbot/FairQueueTest.java b/src/test/java/su/cif/infernote/FairQueueTest.java similarity index 88% rename from src/test/java/com/jagrosh/jmusicbot/FairQueueTest.java rename to src/test/java/su/cif/infernote/FairQueueTest.java index b3878e1..afb6f7f 100644 --- a/src/test/java/com/jagrosh/jmusicbot/FairQueueTest.java +++ b/src/test/java/su/cif/infernote/FairQueueTest.java @@ -1,7 +1,7 @@ -package com.jagrosh.jmusicbot; +package su.cif.infernote; -import com.jagrosh.jmusicbot.queue.FairQueue; -import com.jagrosh.jmusicbot.queue.Queueable; +import su.cif.infernote.queue.FairQueue; +import su.cif.infernote.queue.Queueable; import org.junit.Test; import static org.junit.Assert.*; diff --git a/src/test/java/com/jagrosh/jmusicbot/TimeUtilTest.java b/src/test/java/su/cif/infernote/TimeUtilTest.java similarity index 96% rename from src/test/java/com/jagrosh/jmusicbot/TimeUtilTest.java rename to src/test/java/su/cif/infernote/TimeUtilTest.java index bfcab65..235a7d8 100644 --- a/src/test/java/com/jagrosh/jmusicbot/TimeUtilTest.java +++ b/src/test/java/su/cif/infernote/TimeUtilTest.java @@ -1,6 +1,6 @@ -package com.jagrosh.jmusicbot; +package su.cif.infernote; -import com.jagrosh.jmusicbot.utils.TimeUtil; +import su.cif.infernote.utils.TimeUtil; import org.junit.Test; import static org.junit.Assert.*;