From b3470a0f3db69020906594e3c37a05e8c6e8481c Mon Sep 17 00:00:00 2001 From: loki5512344 Date: Wed, 19 Aug 2026 14:36:04 +0200 Subject: [PATCH] refactor(music): group into domain subfolders (stage 11, all <=6 files/folder) commands -> control/filter/queue, listener -> bot/select, manage -> player/filter, util -> embed/voice/query --- .../java/creator/loki/core/AuxiliaryBotFactory.java | 2 +- .../java/creator/loki/core/ListenerAggregator.java | 2 +- .../loki/feature/music/MusicCommandRegistrar.java | 6 +++--- .../music/commands/{ => control}/LeaveCommand.java | 4 ++-- .../music/commands/{ => control}/PlayerCommands.java | 2 +- .../music/commands/{ => control}/SkipCommand.java | 4 ++-- .../music/commands/{ => control}/StopCommand.java | 4 ++-- .../music/commands/{ => filter}/BandCommand.java | 2 +- .../music/commands/{ => filter}/FilterCommands.java | 4 ++-- .../music/commands/{ => filter}/ToggleCommand.java | 2 +- .../music/commands/{ => queue}/QueueCommands.java | 6 +++--- .../music/commands/{ => queue}/SimpleCommand.java | 2 +- .../loki/feature/music/core/LavalinkEventRouter.java | 2 +- .../loki/feature/music/core/LavalinkManager.java | 2 +- .../creator/loki/feature/music/core/PlayerManager.java | 2 +- .../music/listener/{ => bot}/MessagePlayResponder.java | 8 ++++---- .../listener/{ => bot}/MusicBotControlHandler.java | 8 ++++---- .../music/listener/{ => bot}/MusicBotListener.java | 2 +- .../music/listener/{ => bot}/MusicBotPlayHandler.java | 10 +++++----- .../music/listener/{ => bot}/MusicCommandMap.java | 2 +- .../music/listener/{ => bot}/MusicFilterHandler.java | 8 ++++---- .../music/listener/{ => select}/PlaySelectHandler.java | 2 +- .../feature/music/manage/{ => filter}/FilterState.java | 2 +- .../music/manage/{ => player}/AutoLeaveController.java | 2 +- .../music/manage/{ => player}/GuildMusicManager.java | 2 +- .../feature/music/manage/{ => player}/QueueStore.java | 2 +- .../music/manage/{ => player}/TrackEndHandler.java | 2 +- .../music/manage/{ => player}/TrackScheduler.java | 3 ++- .../music/manage/{ => player}/TrackStarter.java | 2 +- .../creator/loki/feature/music/play/PlayCommand.java | 6 +++--- .../loki/feature/music/play/PlayLoadHandler.java | 2 +- .../creator/loki/feature/music/play/SearchHandler.java | 2 +- .../creator/loki/feature/music/play/TrackLoader.java | 2 +- .../loki/feature/music/slash/FilterSlashHandler.java | 2 +- .../loki/feature/music/slash/PlaySlashHandler.java | 6 +++--- .../loki/feature/music/slash/QueueSlashHandler.java | 8 ++++---- .../loki/feature/music/slash/SlashPlayResponder.java | 4 ++-- .../feature/music/util/{ => embed}/MusicEmbeds.java | 2 +- .../feature/music/util/{ => embed}/QueueNotifier.java | 4 ++-- .../loki/feature/music/util/{ => embed}/QueueView.java | 4 ++-- .../feature/music/util/{ => embed}/TrackFormatter.java | 2 +- .../feature/music/util/{ => query}/TrackQuery.java | 2 +- .../music/util/{ => voice}/GuildAudioActions.java | 4 ++-- .../feature/music/util/{ => voice}/VoiceCheck.java | 3 ++- .../feature/music/util/{ => voice}/VolumeControl.java | 2 +- .../loki/feature/radio/service/RadioPlayer.java | 2 +- .../loki/feature/radio/service/RadioSession.java | 2 +- .../loki/feature/radio/service/RadioStreamLoader.java | 2 +- .../loki/feature/music/core/LavalinkManagerTest.java | 2 +- .../music/manage/{ => player}/TrackSchedulerTest.java | 2 +- 50 files changed, 84 insertions(+), 82 deletions(-) rename src/main/java/creator/loki/feature/music/commands/{ => control}/LeaveCommand.java (90%) rename src/main/java/creator/loki/feature/music/commands/{ => control}/PlayerCommands.java (90%) rename src/main/java/creator/loki/feature/music/commands/{ => control}/SkipCommand.java (93%) rename src/main/java/creator/loki/feature/music/commands/{ => control}/StopCommand.java (90%) rename src/main/java/creator/loki/feature/music/commands/{ => filter}/BandCommand.java (98%) rename src/main/java/creator/loki/feature/music/commands/{ => filter}/FilterCommands.java (90%) rename src/main/java/creator/loki/feature/music/commands/{ => filter}/ToggleCommand.java (96%) rename src/main/java/creator/loki/feature/music/commands/{ => queue}/QueueCommands.java (94%) rename src/main/java/creator/loki/feature/music/commands/{ => queue}/SimpleCommand.java (95%) rename src/main/java/creator/loki/feature/music/listener/{ => bot}/MessagePlayResponder.java (91%) rename src/main/java/creator/loki/feature/music/listener/{ => bot}/MusicBotControlHandler.java (95%) rename src/main/java/creator/loki/feature/music/listener/{ => bot}/MusicBotListener.java (96%) rename src/main/java/creator/loki/feature/music/listener/{ => bot}/MusicBotPlayHandler.java (83%) rename src/main/java/creator/loki/feature/music/listener/{ => bot}/MusicCommandMap.java (98%) rename src/main/java/creator/loki/feature/music/listener/{ => bot}/MusicFilterHandler.java (94%) rename src/main/java/creator/loki/feature/music/listener/{ => select}/PlaySelectHandler.java (97%) rename src/main/java/creator/loki/feature/music/manage/{ => filter}/FilterState.java (98%) rename src/main/java/creator/loki/feature/music/manage/{ => player}/AutoLeaveController.java (96%) rename src/main/java/creator/loki/feature/music/manage/{ => player}/GuildMusicManager.java (98%) rename src/main/java/creator/loki/feature/music/manage/{ => player}/QueueStore.java (98%) rename src/main/java/creator/loki/feature/music/manage/{ => player}/TrackEndHandler.java (97%) rename src/main/java/creator/loki/feature/music/manage/{ => player}/TrackScheduler.java (97%) rename src/main/java/creator/loki/feature/music/manage/{ => player}/TrackStarter.java (96%) rename src/main/java/creator/loki/feature/music/util/{ => embed}/MusicEmbeds.java (93%) rename src/main/java/creator/loki/feature/music/util/{ => embed}/QueueNotifier.java (86%) rename src/main/java/creator/loki/feature/music/util/{ => embed}/QueueView.java (95%) rename src/main/java/creator/loki/feature/music/util/{ => embed}/TrackFormatter.java (95%) rename src/main/java/creator/loki/feature/music/util/{ => query}/TrackQuery.java (92%) rename src/main/java/creator/loki/feature/music/util/{ => voice}/GuildAudioActions.java (72%) rename src/main/java/creator/loki/feature/music/util/{ => voice}/VoiceCheck.java (90%) rename src/main/java/creator/loki/feature/music/util/{ => voice}/VolumeControl.java (93%) rename src/test/java/creator/loki/feature/music/manage/{ => player}/TrackSchedulerTest.java (98%) diff --git a/src/main/java/creator/loki/core/AuxiliaryBotFactory.java b/src/main/java/creator/loki/core/AuxiliaryBotFactory.java index 863a12a..0947d53 100644 --- a/src/main/java/creator/loki/core/AuxiliaryBotFactory.java +++ b/src/main/java/creator/loki/core/AuxiliaryBotFactory.java @@ -3,7 +3,7 @@ package creator.loki.core; import creator.loki.config.BotConfig; import creator.loki.feature.music.core.LavalinkManager; import creator.loki.feature.music.core.PlayerManager; -import creator.loki.feature.music.listener.MusicBotListener; +import creator.loki.feature.music.listener.bot.MusicBotListener; import creator.loki.feature.music.repository.QueueRepository; import creator.loki.feature.radio.listener.RadioBotListener; import creator.loki.feature.radio.service.RadioManager; diff --git a/src/main/java/creator/loki/core/ListenerAggregator.java b/src/main/java/creator/loki/core/ListenerAggregator.java index 448c805..1a6a906 100644 --- a/src/main/java/creator/loki/core/ListenerAggregator.java +++ b/src/main/java/creator/loki/core/ListenerAggregator.java @@ -15,7 +15,7 @@ import creator.loki.feature.level.service.tracker.VoiceTracker; import creator.loki.feature.moderation.commands.utils.ClearSlashCommands; import creator.loki.feature.moderation.log.ModerationLogger; import creator.loki.feature.music.MusicSlashCommands; -import creator.loki.feature.music.listener.PlaySelectHandler; +import creator.loki.feature.music.listener.select.PlaySelectHandler; import creator.loki.feature.reactroles.listener.ReactionRoleListener; import creator.loki.feature.ticket.listener.TicketListener; import creator.loki.feature.voice.handler.VoiceButtonHandler; diff --git a/src/main/java/creator/loki/feature/music/MusicCommandRegistrar.java b/src/main/java/creator/loki/feature/music/MusicCommandRegistrar.java index 1990361..01911d8 100644 --- a/src/main/java/creator/loki/feature/music/MusicCommandRegistrar.java +++ b/src/main/java/creator/loki/feature/music/MusicCommandRegistrar.java @@ -3,9 +3,9 @@ package creator.loki.feature.music; import com.google.inject.Inject; import creator.loki.core.registry.CommandRegistrar; import creator.loki.core.registry.CommandRegistry; -import creator.loki.feature.music.commands.FilterCommands; -import creator.loki.feature.music.commands.PlayerCommands; -import creator.loki.feature.music.commands.QueueCommands; +import creator.loki.feature.music.commands.control.PlayerCommands; +import creator.loki.feature.music.commands.filter.FilterCommands; +import creator.loki.feature.music.commands.queue.QueueCommands; import creator.loki.feature.music.core.PlayerManager; import creator.loki.feature.music.core.SearchManager; import creator.loki.feature.music.play.PlayCommand; diff --git a/src/main/java/creator/loki/feature/music/commands/LeaveCommand.java b/src/main/java/creator/loki/feature/music/commands/control/LeaveCommand.java similarity index 90% rename from src/main/java/creator/loki/feature/music/commands/LeaveCommand.java rename to src/main/java/creator/loki/feature/music/commands/control/LeaveCommand.java index 15b8eb4..a05bf48 100644 --- a/src/main/java/creator/loki/feature/music/commands/LeaveCommand.java +++ b/src/main/java/creator/loki/feature/music/commands/control/LeaveCommand.java @@ -1,11 +1,11 @@ -package creator.loki.feature.music.commands; +package creator.loki.feature.music.commands.control; import creator.loki.command.Command; import creator.loki.command.CommandCategories; import creator.loki.command.CommandContext; import creator.loki.embed.EmbedTemplates; import creator.loki.feature.music.core.PlayerManager; -import creator.loki.feature.music.util.GuildAudioActions; +import creator.loki.feature.music.util.voice.GuildAudioActions; final class LeaveCommand implements Command { private final PlayerManager playerManager; diff --git a/src/main/java/creator/loki/feature/music/commands/PlayerCommands.java b/src/main/java/creator/loki/feature/music/commands/control/PlayerCommands.java similarity index 90% rename from src/main/java/creator/loki/feature/music/commands/PlayerCommands.java rename to src/main/java/creator/loki/feature/music/commands/control/PlayerCommands.java index 84e1c7f..39244f5 100644 --- a/src/main/java/creator/loki/feature/music/commands/PlayerCommands.java +++ b/src/main/java/creator/loki/feature/music/commands/control/PlayerCommands.java @@ -1,4 +1,4 @@ -package creator.loki.feature.music.commands; +package creator.loki.feature.music.commands.control; import creator.loki.command.Command; import creator.loki.feature.music.core.PlayerManager; diff --git a/src/main/java/creator/loki/feature/music/commands/SkipCommand.java b/src/main/java/creator/loki/feature/music/commands/control/SkipCommand.java similarity index 93% rename from src/main/java/creator/loki/feature/music/commands/SkipCommand.java rename to src/main/java/creator/loki/feature/music/commands/control/SkipCommand.java index 324a1d5..90f94d0 100644 --- a/src/main/java/creator/loki/feature/music/commands/SkipCommand.java +++ b/src/main/java/creator/loki/feature/music/commands/control/SkipCommand.java @@ -1,11 +1,11 @@ -package creator.loki.feature.music.commands; +package creator.loki.feature.music.commands.control; import creator.loki.command.Command; import creator.loki.command.CommandCategories; import creator.loki.command.CommandContext; import creator.loki.embed.EmbedTemplates; import creator.loki.feature.music.core.PlayerManager; -import creator.loki.feature.music.manage.GuildMusicManager; +import creator.loki.feature.music.manage.player.GuildMusicManager; final class SkipCommand implements Command { private final PlayerManager playerManager; diff --git a/src/main/java/creator/loki/feature/music/commands/StopCommand.java b/src/main/java/creator/loki/feature/music/commands/control/StopCommand.java similarity index 90% rename from src/main/java/creator/loki/feature/music/commands/StopCommand.java rename to src/main/java/creator/loki/feature/music/commands/control/StopCommand.java index 4191212..19911b6 100644 --- a/src/main/java/creator/loki/feature/music/commands/StopCommand.java +++ b/src/main/java/creator/loki/feature/music/commands/control/StopCommand.java @@ -1,11 +1,11 @@ -package creator.loki.feature.music.commands; +package creator.loki.feature.music.commands.control; import creator.loki.command.Command; import creator.loki.command.CommandCategories; import creator.loki.command.CommandContext; import creator.loki.embed.EmbedTemplates; import creator.loki.feature.music.core.PlayerManager; -import creator.loki.feature.music.util.GuildAudioActions; +import creator.loki.feature.music.util.voice.GuildAudioActions; final class StopCommand implements Command { private final PlayerManager playerManager; diff --git a/src/main/java/creator/loki/feature/music/commands/BandCommand.java b/src/main/java/creator/loki/feature/music/commands/filter/BandCommand.java similarity index 98% rename from src/main/java/creator/loki/feature/music/commands/BandCommand.java rename to src/main/java/creator/loki/feature/music/commands/filter/BandCommand.java index dd57b29..bdddf1e 100644 --- a/src/main/java/creator/loki/feature/music/commands/BandCommand.java +++ b/src/main/java/creator/loki/feature/music/commands/filter/BandCommand.java @@ -1,4 +1,4 @@ -package creator.loki.feature.music.commands; +package creator.loki.feature.music.commands.filter; import creator.loki.command.Command; import creator.loki.command.CommandCategories; diff --git a/src/main/java/creator/loki/feature/music/commands/FilterCommands.java b/src/main/java/creator/loki/feature/music/commands/filter/FilterCommands.java similarity index 90% rename from src/main/java/creator/loki/feature/music/commands/FilterCommands.java rename to src/main/java/creator/loki/feature/music/commands/filter/FilterCommands.java index f03643c..4f3338d 100644 --- a/src/main/java/creator/loki/feature/music/commands/FilterCommands.java +++ b/src/main/java/creator/loki/feature/music/commands/filter/FilterCommands.java @@ -1,10 +1,10 @@ -package creator.loki.feature.music.commands; +package creator.loki.feature.music.commands.filter; import creator.loki.command.Command; import creator.loki.command.CommandContext; import creator.loki.embed.EmbedTemplates; import creator.loki.feature.music.core.PlayerManager; -import creator.loki.feature.music.manage.GuildMusicManager; +import creator.loki.feature.music.manage.player.GuildMusicManager; public class FilterCommands { private FilterCommands() {} diff --git a/src/main/java/creator/loki/feature/music/commands/ToggleCommand.java b/src/main/java/creator/loki/feature/music/commands/filter/ToggleCommand.java similarity index 96% rename from src/main/java/creator/loki/feature/music/commands/ToggleCommand.java rename to src/main/java/creator/loki/feature/music/commands/filter/ToggleCommand.java index be6d30e..e8c9cdd 100644 --- a/src/main/java/creator/loki/feature/music/commands/ToggleCommand.java +++ b/src/main/java/creator/loki/feature/music/commands/filter/ToggleCommand.java @@ -1,4 +1,4 @@ -package creator.loki.feature.music.commands; +package creator.loki.feature.music.commands.filter; import creator.loki.command.Command; import creator.loki.command.CommandCategories; diff --git a/src/main/java/creator/loki/feature/music/commands/QueueCommands.java b/src/main/java/creator/loki/feature/music/commands/queue/QueueCommands.java similarity index 94% rename from src/main/java/creator/loki/feature/music/commands/QueueCommands.java rename to src/main/java/creator/loki/feature/music/commands/queue/QueueCommands.java index 34c64c9..ffb8a8b 100644 --- a/src/main/java/creator/loki/feature/music/commands/QueueCommands.java +++ b/src/main/java/creator/loki/feature/music/commands/queue/QueueCommands.java @@ -1,4 +1,4 @@ -package creator.loki.feature.music.commands; +package creator.loki.feature.music.commands.queue; import static creator.loki.embed.EmbedTemplates.error; import static creator.loki.embed.EmbedTemplates.info; @@ -6,8 +6,8 @@ import static creator.loki.embed.EmbedTemplates.info; import creator.loki.command.Command; import creator.loki.command.CommandContext; import creator.loki.feature.music.core.PlayerManager; -import creator.loki.feature.music.util.QueueView; -import creator.loki.feature.music.util.VolumeControl; +import creator.loki.feature.music.util.embed.QueueView; +import creator.loki.feature.music.util.voice.VolumeControl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/creator/loki/feature/music/commands/SimpleCommand.java b/src/main/java/creator/loki/feature/music/commands/queue/SimpleCommand.java similarity index 95% rename from src/main/java/creator/loki/feature/music/commands/SimpleCommand.java rename to src/main/java/creator/loki/feature/music/commands/queue/SimpleCommand.java index 2108043..48ed53d 100644 --- a/src/main/java/creator/loki/feature/music/commands/SimpleCommand.java +++ b/src/main/java/creator/loki/feature/music/commands/queue/SimpleCommand.java @@ -1,4 +1,4 @@ -package creator.loki.feature.music.commands; +package creator.loki.feature.music.commands.queue; import java.util.function.BiConsumer; diff --git a/src/main/java/creator/loki/feature/music/core/LavalinkEventRouter.java b/src/main/java/creator/loki/feature/music/core/LavalinkEventRouter.java index a2b545d..f4da58a 100644 --- a/src/main/java/creator/loki/feature/music/core/LavalinkEventRouter.java +++ b/src/main/java/creator/loki/feature/music/core/LavalinkEventRouter.java @@ -2,7 +2,7 @@ package creator.loki.feature.music.core; import java.util.Map; -import creator.loki.feature.music.manage.GuildMusicManager; +import creator.loki.feature.music.manage.player.GuildMusicManager; import creator.loki.util.LoggerDecorator; import dev.arbjerg.lavalink.client.LavalinkClient; import dev.arbjerg.lavalink.client.event.ReadyEvent; diff --git a/src/main/java/creator/loki/feature/music/core/LavalinkManager.java b/src/main/java/creator/loki/feature/music/core/LavalinkManager.java index 232f578..785b40f 100644 --- a/src/main/java/creator/loki/feature/music/core/LavalinkManager.java +++ b/src/main/java/creator/loki/feature/music/core/LavalinkManager.java @@ -8,7 +8,7 @@ import com.google.inject.Inject; import com.google.inject.Singleton; import creator.loki.config.BotConfig; import creator.loki.config.LavalinkConfig; -import creator.loki.feature.music.manage.GuildMusicManager; +import creator.loki.feature.music.manage.player.GuildMusicManager; import creator.loki.feature.music.repository.QueueRepository; import creator.loki.util.LoggerDecorator; import dev.arbjerg.lavalink.client.Helpers; diff --git a/src/main/java/creator/loki/feature/music/core/PlayerManager.java b/src/main/java/creator/loki/feature/music/core/PlayerManager.java index 50f9bec..ed6dcb7 100644 --- a/src/main/java/creator/loki/feature/music/core/PlayerManager.java +++ b/src/main/java/creator/loki/feature/music/core/PlayerManager.java @@ -2,7 +2,7 @@ package creator.loki.feature.music.core; import com.google.inject.Inject; import com.google.inject.Singleton; -import creator.loki.feature.music.manage.GuildMusicManager; +import creator.loki.feature.music.manage.player.GuildMusicManager; @Singleton public class PlayerManager { diff --git a/src/main/java/creator/loki/feature/music/listener/MessagePlayResponder.java b/src/main/java/creator/loki/feature/music/listener/bot/MessagePlayResponder.java similarity index 91% rename from src/main/java/creator/loki/feature/music/listener/MessagePlayResponder.java rename to src/main/java/creator/loki/feature/music/listener/bot/MessagePlayResponder.java index 3087b85..9792fbe 100644 --- a/src/main/java/creator/loki/feature/music/listener/MessagePlayResponder.java +++ b/src/main/java/creator/loki/feature/music/listener/bot/MessagePlayResponder.java @@ -1,11 +1,11 @@ -package creator.loki.feature.music.listener; +package creator.loki.feature.music.listener.bot; import java.util.List; -import creator.loki.feature.music.manage.GuildMusicManager; +import creator.loki.feature.music.manage.player.GuildMusicManager; import creator.loki.feature.music.play.TrackLoader; -import creator.loki.feature.music.util.MusicEmbeds; -import creator.loki.feature.music.util.TrackFormatter; +import creator.loki.feature.music.util.embed.MusicEmbeds; +import creator.loki.feature.music.util.embed.TrackFormatter; import dev.arbjerg.lavalink.client.player.LoadFailed; import dev.arbjerg.lavalink.client.player.PlaylistLoaded; import dev.arbjerg.lavalink.client.player.Track; diff --git a/src/main/java/creator/loki/feature/music/listener/MusicBotControlHandler.java b/src/main/java/creator/loki/feature/music/listener/bot/MusicBotControlHandler.java similarity index 95% rename from src/main/java/creator/loki/feature/music/listener/MusicBotControlHandler.java rename to src/main/java/creator/loki/feature/music/listener/bot/MusicBotControlHandler.java index 639c59d..9a10262 100644 --- a/src/main/java/creator/loki/feature/music/listener/MusicBotControlHandler.java +++ b/src/main/java/creator/loki/feature/music/listener/bot/MusicBotControlHandler.java @@ -1,9 +1,9 @@ -package creator.loki.feature.music.listener; +package creator.loki.feature.music.listener.bot; import creator.loki.feature.music.core.LavalinkManager; -import creator.loki.feature.music.util.GuildAudioActions; -import creator.loki.feature.music.util.MusicEmbeds; -import creator.loki.feature.music.util.VoiceCheck; +import creator.loki.feature.music.util.embed.MusicEmbeds; +import creator.loki.feature.music.util.voice.GuildAudioActions; +import creator.loki.feature.music.util.voice.VoiceCheck; import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; diff --git a/src/main/java/creator/loki/feature/music/listener/MusicBotListener.java b/src/main/java/creator/loki/feature/music/listener/bot/MusicBotListener.java similarity index 96% rename from src/main/java/creator/loki/feature/music/listener/MusicBotListener.java rename to src/main/java/creator/loki/feature/music/listener/bot/MusicBotListener.java index 9d327bd..cf11005 100644 --- a/src/main/java/creator/loki/feature/music/listener/MusicBotListener.java +++ b/src/main/java/creator/loki/feature/music/listener/bot/MusicBotListener.java @@ -1,4 +1,4 @@ -package creator.loki.feature.music.listener; +package creator.loki.feature.music.listener.bot; import java.util.Map; import java.util.function.Consumer; diff --git a/src/main/java/creator/loki/feature/music/listener/MusicBotPlayHandler.java b/src/main/java/creator/loki/feature/music/listener/bot/MusicBotPlayHandler.java similarity index 83% rename from src/main/java/creator/loki/feature/music/listener/MusicBotPlayHandler.java rename to src/main/java/creator/loki/feature/music/listener/bot/MusicBotPlayHandler.java index c9297d1..e2ecc3c 100644 --- a/src/main/java/creator/loki/feature/music/listener/MusicBotPlayHandler.java +++ b/src/main/java/creator/loki/feature/music/listener/bot/MusicBotPlayHandler.java @@ -1,13 +1,13 @@ -package creator.loki.feature.music.listener; +package creator.loki.feature.music.listener.bot; import java.util.List; import creator.loki.feature.music.core.LavalinkManager; -import creator.loki.feature.music.manage.GuildMusicManager; +import creator.loki.feature.music.manage.player.GuildMusicManager; import creator.loki.feature.music.play.TrackLoader; -import creator.loki.feature.music.util.MusicEmbeds; -import creator.loki.feature.music.util.TrackQuery; -import creator.loki.feature.music.util.VoiceCheck; +import creator.loki.feature.music.util.embed.MusicEmbeds; +import creator.loki.feature.music.util.query.TrackQuery; +import creator.loki.feature.music.util.voice.VoiceCheck; import creator.loki.feature.utility.VoiceHelper; import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.entities.Guild; diff --git a/src/main/java/creator/loki/feature/music/listener/MusicCommandMap.java b/src/main/java/creator/loki/feature/music/listener/bot/MusicCommandMap.java similarity index 98% rename from src/main/java/creator/loki/feature/music/listener/MusicCommandMap.java rename to src/main/java/creator/loki/feature/music/listener/bot/MusicCommandMap.java index 729c354..b991dba 100644 --- a/src/main/java/creator/loki/feature/music/listener/MusicCommandMap.java +++ b/src/main/java/creator/loki/feature/music/listener/bot/MusicCommandMap.java @@ -1,4 +1,4 @@ -package creator.loki.feature.music.listener; +package creator.loki.feature.music.listener.bot; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/creator/loki/feature/music/listener/MusicFilterHandler.java b/src/main/java/creator/loki/feature/music/listener/bot/MusicFilterHandler.java similarity index 94% rename from src/main/java/creator/loki/feature/music/listener/MusicFilterHandler.java rename to src/main/java/creator/loki/feature/music/listener/bot/MusicFilterHandler.java index c5f01f8..138266b 100644 --- a/src/main/java/creator/loki/feature/music/listener/MusicFilterHandler.java +++ b/src/main/java/creator/loki/feature/music/listener/bot/MusicFilterHandler.java @@ -1,11 +1,11 @@ -package creator.loki.feature.music.listener; +package creator.loki.feature.music.listener.bot; import java.util.List; import creator.loki.feature.music.core.LavalinkManager; -import creator.loki.feature.music.util.MusicEmbeds; -import creator.loki.feature.music.util.VoiceCheck; -import creator.loki.feature.music.util.VolumeControl; +import creator.loki.feature.music.util.embed.MusicEmbeds; +import creator.loki.feature.music.util.voice.VoiceCheck; +import creator.loki.feature.music.util.voice.VolumeControl; import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Member; diff --git a/src/main/java/creator/loki/feature/music/listener/PlaySelectHandler.java b/src/main/java/creator/loki/feature/music/listener/select/PlaySelectHandler.java similarity index 97% rename from src/main/java/creator/loki/feature/music/listener/PlaySelectHandler.java rename to src/main/java/creator/loki/feature/music/listener/select/PlaySelectHandler.java index a60e613..388b59f 100644 --- a/src/main/java/creator/loki/feature/music/listener/PlaySelectHandler.java +++ b/src/main/java/creator/loki/feature/music/listener/select/PlaySelectHandler.java @@ -1,4 +1,4 @@ -package creator.loki.feature.music.listener; +package creator.loki.feature.music.listener.select; import com.google.inject.Inject; import com.google.inject.Singleton; diff --git a/src/main/java/creator/loki/feature/music/manage/FilterState.java b/src/main/java/creator/loki/feature/music/manage/filter/FilterState.java similarity index 98% rename from src/main/java/creator/loki/feature/music/manage/FilterState.java rename to src/main/java/creator/loki/feature/music/manage/filter/FilterState.java index 7d8ead1..ca50b1e 100644 --- a/src/main/java/creator/loki/feature/music/manage/FilterState.java +++ b/src/main/java/creator/loki/feature/music/manage/filter/FilterState.java @@ -1,4 +1,4 @@ -package creator.loki.feature.music.manage; +package creator.loki.feature.music.manage.filter; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/creator/loki/feature/music/manage/AutoLeaveController.java b/src/main/java/creator/loki/feature/music/manage/player/AutoLeaveController.java similarity index 96% rename from src/main/java/creator/loki/feature/music/manage/AutoLeaveController.java rename to src/main/java/creator/loki/feature/music/manage/player/AutoLeaveController.java index 9c1bda2..8983321 100644 --- a/src/main/java/creator/loki/feature/music/manage/AutoLeaveController.java +++ b/src/main/java/creator/loki/feature/music/manage/player/AutoLeaveController.java @@ -1,4 +1,4 @@ -package creator.loki.feature.music.manage; +package creator.loki.feature.music.manage.player; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; diff --git a/src/main/java/creator/loki/feature/music/manage/GuildMusicManager.java b/src/main/java/creator/loki/feature/music/manage/player/GuildMusicManager.java similarity index 98% rename from src/main/java/creator/loki/feature/music/manage/GuildMusicManager.java rename to src/main/java/creator/loki/feature/music/manage/player/GuildMusicManager.java index b9c1488..0084baf 100644 --- a/src/main/java/creator/loki/feature/music/manage/GuildMusicManager.java +++ b/src/main/java/creator/loki/feature/music/manage/player/GuildMusicManager.java @@ -1,4 +1,4 @@ -package creator.loki.feature.music.manage; +package creator.loki.feature.music.manage.player; import java.util.Optional; import java.util.concurrent.Executors; diff --git a/src/main/java/creator/loki/feature/music/manage/QueueStore.java b/src/main/java/creator/loki/feature/music/manage/player/QueueStore.java similarity index 98% rename from src/main/java/creator/loki/feature/music/manage/QueueStore.java rename to src/main/java/creator/loki/feature/music/manage/player/QueueStore.java index 2b99cbb..f47cd3b 100644 --- a/src/main/java/creator/loki/feature/music/manage/QueueStore.java +++ b/src/main/java/creator/loki/feature/music/manage/player/QueueStore.java @@ -1,4 +1,4 @@ -package creator.loki.feature.music.manage; +package creator.loki.feature.music.manage.player; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/creator/loki/feature/music/manage/TrackEndHandler.java b/src/main/java/creator/loki/feature/music/manage/player/TrackEndHandler.java similarity index 97% rename from src/main/java/creator/loki/feature/music/manage/TrackEndHandler.java rename to src/main/java/creator/loki/feature/music/manage/player/TrackEndHandler.java index 7bf6539..2b192e6 100644 --- a/src/main/java/creator/loki/feature/music/manage/TrackEndHandler.java +++ b/src/main/java/creator/loki/feature/music/manage/player/TrackEndHandler.java @@ -1,4 +1,4 @@ -package creator.loki.feature.music.manage; +package creator.loki.feature.music.manage.player; import creator.loki.util.LoggerDecorator; import dev.arbjerg.lavalink.client.player.Track; diff --git a/src/main/java/creator/loki/feature/music/manage/TrackScheduler.java b/src/main/java/creator/loki/feature/music/manage/player/TrackScheduler.java similarity index 97% rename from src/main/java/creator/loki/feature/music/manage/TrackScheduler.java rename to src/main/java/creator/loki/feature/music/manage/player/TrackScheduler.java index bb78da1..c095d82 100644 --- a/src/main/java/creator/loki/feature/music/manage/TrackScheduler.java +++ b/src/main/java/creator/loki/feature/music/manage/player/TrackScheduler.java @@ -1,4 +1,4 @@ -package creator.loki.feature.music.manage; +package creator.loki.feature.music.manage.player; import java.util.ArrayList; import java.util.Collections; @@ -7,6 +7,7 @@ import java.util.List; import java.util.Queue; import java.util.function.Consumer; +import creator.loki.feature.music.manage.filter.FilterState; import dev.arbjerg.lavalink.client.player.LavalinkPlayer; import dev.arbjerg.lavalink.client.player.Track; import dev.arbjerg.lavalink.protocol.v4.Message.EmittedEvent.TrackEndEvent.AudioTrackEndReason; diff --git a/src/main/java/creator/loki/feature/music/manage/TrackStarter.java b/src/main/java/creator/loki/feature/music/manage/player/TrackStarter.java similarity index 96% rename from src/main/java/creator/loki/feature/music/manage/TrackStarter.java rename to src/main/java/creator/loki/feature/music/manage/player/TrackStarter.java index d99bbe1..38cb25e 100644 --- a/src/main/java/creator/loki/feature/music/manage/TrackStarter.java +++ b/src/main/java/creator/loki/feature/music/manage/player/TrackStarter.java @@ -1,4 +1,4 @@ -package creator.loki.feature.music.manage; +package creator.loki.feature.music.manage.player; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; diff --git a/src/main/java/creator/loki/feature/music/play/PlayCommand.java b/src/main/java/creator/loki/feature/music/play/PlayCommand.java index db76959..381b9bf 100644 --- a/src/main/java/creator/loki/feature/music/play/PlayCommand.java +++ b/src/main/java/creator/loki/feature/music/play/PlayCommand.java @@ -10,9 +10,9 @@ import creator.loki.embed.EmbedTemplates; import creator.loki.feature.music.core.LavalinkManager; import creator.loki.feature.music.core.PlayerManager; import creator.loki.feature.music.core.SearchManager; -import creator.loki.feature.music.manage.GuildMusicManager; -import creator.loki.feature.music.util.QueueNotifier; -import creator.loki.feature.music.util.TrackQuery; +import creator.loki.feature.music.manage.player.GuildMusicManager; +import creator.loki.feature.music.util.embed.QueueNotifier; +import creator.loki.feature.music.util.query.TrackQuery; import creator.loki.feature.utility.VoiceHelper; import dev.arbjerg.lavalink.client.player.Track; import net.dv8tion.jda.api.entities.Guild; diff --git a/src/main/java/creator/loki/feature/music/play/PlayLoadHandler.java b/src/main/java/creator/loki/feature/music/play/PlayLoadHandler.java index e125580..d4c5aa7 100644 --- a/src/main/java/creator/loki/feature/music/play/PlayLoadHandler.java +++ b/src/main/java/creator/loki/feature/music/play/PlayLoadHandler.java @@ -4,7 +4,7 @@ import java.util.List; import creator.loki.command.CommandContext; import creator.loki.embed.EmbedTemplates; -import creator.loki.feature.music.manage.GuildMusicManager; +import creator.loki.feature.music.manage.player.GuildMusicManager; import dev.arbjerg.lavalink.client.AbstractAudioLoadResultHandler; import dev.arbjerg.lavalink.client.player.LoadFailed; import dev.arbjerg.lavalink.client.player.PlaylistLoaded; diff --git a/src/main/java/creator/loki/feature/music/play/SearchHandler.java b/src/main/java/creator/loki/feature/music/play/SearchHandler.java index 6f3dfe0..1bd6c20 100644 --- a/src/main/java/creator/loki/feature/music/play/SearchHandler.java +++ b/src/main/java/creator/loki/feature/music/play/SearchHandler.java @@ -3,7 +3,7 @@ package creator.loki.feature.music.play; import java.util.List; import creator.loki.feature.music.core.SearchManager; -import creator.loki.feature.music.util.TrackFormatter; +import creator.loki.feature.music.util.embed.TrackFormatter; import dev.arbjerg.lavalink.client.player.Track; import net.dv8tion.jda.api.EmbedBuilder; diff --git a/src/main/java/creator/loki/feature/music/play/TrackLoader.java b/src/main/java/creator/loki/feature/music/play/TrackLoader.java index cdbd17d..2d52bcd 100644 --- a/src/main/java/creator/loki/feature/music/play/TrackLoader.java +++ b/src/main/java/creator/loki/feature/music/play/TrackLoader.java @@ -3,7 +3,7 @@ package creator.loki.feature.music.play; import java.util.List; import creator.loki.feature.music.core.LavalinkManager; -import creator.loki.feature.music.manage.GuildMusicManager; +import creator.loki.feature.music.manage.player.GuildMusicManager; import dev.arbjerg.lavalink.client.AbstractAudioLoadResultHandler; import dev.arbjerg.lavalink.client.Link; import dev.arbjerg.lavalink.client.player.LoadFailed; diff --git a/src/main/java/creator/loki/feature/music/slash/FilterSlashHandler.java b/src/main/java/creator/loki/feature/music/slash/FilterSlashHandler.java index 29e2927..ce8a6bb 100644 --- a/src/main/java/creator/loki/feature/music/slash/FilterSlashHandler.java +++ b/src/main/java/creator/loki/feature/music/slash/FilterSlashHandler.java @@ -2,7 +2,7 @@ package creator.loki.feature.music.slash; import creator.loki.embed.EmbedTemplates; import creator.loki.feature.music.core.PlayerManager; -import creator.loki.feature.music.manage.GuildMusicManager; +import creator.loki.feature.music.manage.player.GuildMusicManager; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; diff --git a/src/main/java/creator/loki/feature/music/slash/PlaySlashHandler.java b/src/main/java/creator/loki/feature/music/slash/PlaySlashHandler.java index 20919a5..5ad0c03 100644 --- a/src/main/java/creator/loki/feature/music/slash/PlaySlashHandler.java +++ b/src/main/java/creator/loki/feature/music/slash/PlaySlashHandler.java @@ -1,10 +1,10 @@ package creator.loki.feature.music.slash; import creator.loki.feature.music.core.PlayerManager; -import creator.loki.feature.music.manage.GuildMusicManager; +import creator.loki.feature.music.manage.player.GuildMusicManager; import creator.loki.feature.music.play.TrackLoader; -import creator.loki.feature.music.util.TrackQuery; -import creator.loki.feature.music.util.VoiceCheck; +import creator.loki.feature.music.util.query.TrackQuery; +import creator.loki.feature.music.util.voice.VoiceCheck; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; diff --git a/src/main/java/creator/loki/feature/music/slash/QueueSlashHandler.java b/src/main/java/creator/loki/feature/music/slash/QueueSlashHandler.java index 02b619a..26e27c4 100644 --- a/src/main/java/creator/loki/feature/music/slash/QueueSlashHandler.java +++ b/src/main/java/creator/loki/feature/music/slash/QueueSlashHandler.java @@ -4,10 +4,10 @@ import java.util.function.Consumer; import creator.loki.embed.EmbedTemplates; import creator.loki.feature.music.core.PlayerManager; -import creator.loki.feature.music.util.GuildAudioActions; -import creator.loki.feature.music.util.QueueView; -import creator.loki.feature.music.util.VoiceCheck; -import creator.loki.feature.music.util.VolumeControl; +import creator.loki.feature.music.util.embed.QueueView; +import creator.loki.feature.music.util.voice.GuildAudioActions; +import creator.loki.feature.music.util.voice.VoiceCheck; +import creator.loki.feature.music.util.voice.VolumeControl; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import org.slf4j.LoggerFactory; diff --git a/src/main/java/creator/loki/feature/music/slash/SlashPlayResponder.java b/src/main/java/creator/loki/feature/music/slash/SlashPlayResponder.java index 9bb4971..cae401c 100644 --- a/src/main/java/creator/loki/feature/music/slash/SlashPlayResponder.java +++ b/src/main/java/creator/loki/feature/music/slash/SlashPlayResponder.java @@ -3,9 +3,9 @@ package creator.loki.feature.music.slash; import java.util.List; import creator.loki.embed.EmbedTemplates; -import creator.loki.feature.music.manage.GuildMusicManager; +import creator.loki.feature.music.manage.player.GuildMusicManager; import creator.loki.feature.music.play.TrackLoader; -import creator.loki.feature.music.util.TrackFormatter; +import creator.loki.feature.music.util.embed.TrackFormatter; import dev.arbjerg.lavalink.client.player.LoadFailed; import dev.arbjerg.lavalink.client.player.PlaylistLoaded; import dev.arbjerg.lavalink.client.player.Track; diff --git a/src/main/java/creator/loki/feature/music/util/MusicEmbeds.java b/src/main/java/creator/loki/feature/music/util/embed/MusicEmbeds.java similarity index 93% rename from src/main/java/creator/loki/feature/music/util/MusicEmbeds.java rename to src/main/java/creator/loki/feature/music/util/embed/MusicEmbeds.java index 2e05a19..66e89e6 100644 --- a/src/main/java/creator/loki/feature/music/util/MusicEmbeds.java +++ b/src/main/java/creator/loki/feature/music/util/embed/MusicEmbeds.java @@ -1,4 +1,4 @@ -package creator.loki.feature.music.util; +package creator.loki.feature.music.util.embed; import net.dv8tion.jda.api.EmbedBuilder; diff --git a/src/main/java/creator/loki/feature/music/util/QueueNotifier.java b/src/main/java/creator/loki/feature/music/util/embed/QueueNotifier.java similarity index 86% rename from src/main/java/creator/loki/feature/music/util/QueueNotifier.java rename to src/main/java/creator/loki/feature/music/util/embed/QueueNotifier.java index c25a8ec..a809fd8 100644 --- a/src/main/java/creator/loki/feature/music/util/QueueNotifier.java +++ b/src/main/java/creator/loki/feature/music/util/embed/QueueNotifier.java @@ -1,7 +1,7 @@ -package creator.loki.feature.music.util; +package creator.loki.feature.music.util.embed; import creator.loki.embed.EmbedTemplates; -import creator.loki.feature.music.manage.TrackScheduler; +import creator.loki.feature.music.manage.player.TrackScheduler; import dev.arbjerg.lavalink.client.player.Track; import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel; diff --git a/src/main/java/creator/loki/feature/music/util/QueueView.java b/src/main/java/creator/loki/feature/music/util/embed/QueueView.java similarity index 95% rename from src/main/java/creator/loki/feature/music/util/QueueView.java rename to src/main/java/creator/loki/feature/music/util/embed/QueueView.java index 75ceda7..d94823c 100644 --- a/src/main/java/creator/loki/feature/music/util/QueueView.java +++ b/src/main/java/creator/loki/feature/music/util/embed/QueueView.java @@ -1,10 +1,10 @@ -package creator.loki.feature.music.util; +package creator.loki.feature.music.util.embed; import java.awt.Color; import java.util.List; import creator.loki.embed.EmbedFactory; -import creator.loki.feature.music.manage.TrackScheduler; +import creator.loki.feature.music.manage.player.TrackScheduler; import dev.arbjerg.lavalink.client.Link; import dev.arbjerg.lavalink.client.player.Track; import net.dv8tion.jda.api.entities.MessageEmbed; diff --git a/src/main/java/creator/loki/feature/music/util/TrackFormatter.java b/src/main/java/creator/loki/feature/music/util/embed/TrackFormatter.java similarity index 95% rename from src/main/java/creator/loki/feature/music/util/TrackFormatter.java rename to src/main/java/creator/loki/feature/music/util/embed/TrackFormatter.java index 7f7e27a..2b33cfe 100644 --- a/src/main/java/creator/loki/feature/music/util/TrackFormatter.java +++ b/src/main/java/creator/loki/feature/music/util/embed/TrackFormatter.java @@ -1,4 +1,4 @@ -package creator.loki.feature.music.util; +package creator.loki.feature.music.util.embed; public final class TrackFormatter { private TrackFormatter() {} diff --git a/src/main/java/creator/loki/feature/music/util/TrackQuery.java b/src/main/java/creator/loki/feature/music/util/query/TrackQuery.java similarity index 92% rename from src/main/java/creator/loki/feature/music/util/TrackQuery.java rename to src/main/java/creator/loki/feature/music/util/query/TrackQuery.java index 4ef57ba..a96b61e 100644 --- a/src/main/java/creator/loki/feature/music/util/TrackQuery.java +++ b/src/main/java/creator/loki/feature/music/util/query/TrackQuery.java @@ -1,4 +1,4 @@ -package creator.loki.feature.music.util; +package creator.loki.feature.music.util.query; public final class TrackQuery { private TrackQuery() {} diff --git a/src/main/java/creator/loki/feature/music/util/GuildAudioActions.java b/src/main/java/creator/loki/feature/music/util/voice/GuildAudioActions.java similarity index 72% rename from src/main/java/creator/loki/feature/music/util/GuildAudioActions.java rename to src/main/java/creator/loki/feature/music/util/voice/GuildAudioActions.java index 6f53010..9789af6 100644 --- a/src/main/java/creator/loki/feature/music/util/GuildAudioActions.java +++ b/src/main/java/creator/loki/feature/music/util/voice/GuildAudioActions.java @@ -1,6 +1,6 @@ -package creator.loki.feature.music.util; +package creator.loki.feature.music.util.voice; -import creator.loki.feature.music.manage.GuildMusicManager; +import creator.loki.feature.music.manage.player.GuildMusicManager; import net.dv8tion.jda.api.entities.Guild; public final class GuildAudioActions { diff --git a/src/main/java/creator/loki/feature/music/util/VoiceCheck.java b/src/main/java/creator/loki/feature/music/util/voice/VoiceCheck.java similarity index 90% rename from src/main/java/creator/loki/feature/music/util/VoiceCheck.java rename to src/main/java/creator/loki/feature/music/util/voice/VoiceCheck.java index 0e19626..70a1f22 100644 --- a/src/main/java/creator/loki/feature/music/util/VoiceCheck.java +++ b/src/main/java/creator/loki/feature/music/util/voice/VoiceCheck.java @@ -1,6 +1,7 @@ -package creator.loki.feature.music.util; +package creator.loki.feature.music.util.voice; import creator.loki.embed.EmbedTemplates; +import creator.loki.feature.music.util.embed.MusicEmbeds; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; diff --git a/src/main/java/creator/loki/feature/music/util/VolumeControl.java b/src/main/java/creator/loki/feature/music/util/voice/VolumeControl.java similarity index 93% rename from src/main/java/creator/loki/feature/music/util/VolumeControl.java rename to src/main/java/creator/loki/feature/music/util/voice/VolumeControl.java index 6a8fc87..43eb03f 100644 --- a/src/main/java/creator/loki/feature/music/util/VolumeControl.java +++ b/src/main/java/creator/loki/feature/music/util/voice/VolumeControl.java @@ -1,4 +1,4 @@ -package creator.loki.feature.music.util; +package creator.loki.feature.music.util.voice; import java.util.function.Consumer; diff --git a/src/main/java/creator/loki/feature/radio/service/RadioPlayer.java b/src/main/java/creator/loki/feature/radio/service/RadioPlayer.java index bd0725b..c4381c2 100644 --- a/src/main/java/creator/loki/feature/radio/service/RadioPlayer.java +++ b/src/main/java/creator/loki/feature/radio/service/RadioPlayer.java @@ -1,7 +1,7 @@ package creator.loki.feature.radio.service; import creator.loki.feature.music.core.LavalinkManager; -import creator.loki.feature.music.manage.GuildMusicManager; +import creator.loki.feature.music.manage.player.GuildMusicManager; import dev.arbjerg.lavalink.client.Link; import net.dv8tion.jda.api.JDA; import net.dv8tion.jda.api.Permission; diff --git a/src/main/java/creator/loki/feature/radio/service/RadioSession.java b/src/main/java/creator/loki/feature/radio/service/RadioSession.java index 0460dc1..8d64fa5 100644 --- a/src/main/java/creator/loki/feature/radio/service/RadioSession.java +++ b/src/main/java/creator/loki/feature/radio/service/RadioSession.java @@ -1,6 +1,6 @@ package creator.loki.feature.radio.service; -import creator.loki.feature.music.manage.GuildMusicManager; +import creator.loki.feature.music.manage.player.GuildMusicManager; /** Состояние радио для одной гильдии. */ class RadioSession { diff --git a/src/main/java/creator/loki/feature/radio/service/RadioStreamLoader.java b/src/main/java/creator/loki/feature/radio/service/RadioStreamLoader.java index 58296db..56028ff 100644 --- a/src/main/java/creator/loki/feature/radio/service/RadioStreamLoader.java +++ b/src/main/java/creator/loki/feature/radio/service/RadioStreamLoader.java @@ -1,6 +1,6 @@ package creator.loki.feature.radio.service; -import creator.loki.feature.music.manage.GuildMusicManager; +import creator.loki.feature.music.manage.player.GuildMusicManager; import creator.loki.util.LoggerDecorator; import dev.arbjerg.lavalink.client.AbstractAudioLoadResultHandler; import dev.arbjerg.lavalink.client.Link; diff --git a/src/test/java/creator/loki/feature/music/core/LavalinkManagerTest.java b/src/test/java/creator/loki/feature/music/core/LavalinkManagerTest.java index 23aef2b..e6364c5 100644 --- a/src/test/java/creator/loki/feature/music/core/LavalinkManagerTest.java +++ b/src/test/java/creator/loki/feature/music/core/LavalinkManagerTest.java @@ -5,7 +5,7 @@ import static org.mockito.Mockito.*; import creator.loki.config.BotConfig; import creator.loki.config.LavalinkConfig; -import creator.loki.feature.music.manage.GuildMusicManager; +import creator.loki.feature.music.manage.player.GuildMusicManager; import creator.loki.feature.music.repository.QueueRepository; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/creator/loki/feature/music/manage/TrackSchedulerTest.java b/src/test/java/creator/loki/feature/music/manage/player/TrackSchedulerTest.java similarity index 98% rename from src/test/java/creator/loki/feature/music/manage/TrackSchedulerTest.java rename to src/test/java/creator/loki/feature/music/manage/player/TrackSchedulerTest.java index 1373070..cf1dc1d 100644 --- a/src/test/java/creator/loki/feature/music/manage/TrackSchedulerTest.java +++ b/src/test/java/creator/loki/feature/music/manage/player/TrackSchedulerTest.java @@ -1,4 +1,4 @@ -package creator.loki.feature.music.manage; +package creator.loki.feature.music.manage.player; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Answers.RETURNS_SELF;