Skip to content

Commit

Permalink
Merge pull request #148 from Ree6-Applications/v2/music-rework
Browse files Browse the repository at this point in the history 
V2/music rework
  • Loading branch information
@DxsSucuk
DxsSucuk authored Oct 17, 2022
2 parents f1d6dd9 + 77683a5 commit bf1c6b0
Show file tree
Hide file tree
Showing 17 changed files with 133 additions and 170 deletions.
37 changes: 32 additions & 5 deletions src/main/java/de/presti/ree6/audio/music/GuildMusicManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,18 @@ public class GuildMusicManager {
/**
* Audio player for the guild.
*/
public final AudioPlayer player;
private final AudioPlayer player;
/**
* Track scheduler for the player.
*/
public final TrackScheduler scheduler;
private final TrackScheduler scheduler;

private AudioPlayerSendHandler audioPlayerSendHandler;

/**
* The Guild of the Music-Manager.
*/
public final Guild guild;
private final Guild guild;

/**
* Creates a player and a track scheduler.
Expand All @@ -31,14 +33,39 @@ public class GuildMusicManager {
public GuildMusicManager(Guild guild, AudioPlayerManager manager) {
this.guild = guild;
player = manager.createPlayer();
scheduler = new TrackScheduler(player);
scheduler = new TrackScheduler(this, player);
player.addListener(scheduler);
}

/**
* @return Wrapper around AudioPlayer to use it as an AudioSendHandler.
*/
public AudioPlayerSendHandler getSendHandler() {
return new AudioPlayerSendHandler(player);
if (audioPlayerSendHandler != null) return audioPlayerSendHandler;

return audioPlayerSendHandler = new AudioPlayerSendHandler(player);
}

/**
* @return AudioPlayer for the Guild.
*/
public AudioPlayer getPlayer() {
return player;
}

/**
* @return {@link TrackScheduler} for the Guild.
*/
public TrackScheduler getScheduler() {
return scheduler;
}

/**
* Retrieve the Guild of the Music-Manager.
*
* @return The Guild of the Music-Manager.
*/
public Guild getGuild() {
return guild;
}
}
96 changes: 17 additions & 79 deletions src/main/java/de/presti/ree6/audio/music/MusicWorker.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,71 +80,7 @@ public synchronized GuildMusicManager getGuildAudioPlayer(Guild guild) {
* @param interactionHook a InteractionHook if it was an SlashCommand.
*/
public void loadAndPlaySilence(final MessageChannelUnion channel, final AudioChannel audioChannel, final String trackUrl, InteractionHook interactionHook) {
GuildMusicManager musicManager = getGuildAudioPlayer(channel.asGuildMessageChannel().getGuild());

musicManager.scheduler.channel = channel;

playerManager.loadItemOrdered(musicManager, trackUrl, new AudioLoadResultHandler() {
/**
* Just override the default trackLoaded with a simple play call.
* @param track the AudioTrack that you want to play
*/
@Override
public void trackLoaded(AudioTrack track) {
play(audioChannel, musicManager, track);
}

/**
* Just override the default playlistLoaded with a rather simple play and queue call.
* @param playlist the AudioPlaylist.
*/
@Override
public void playlistLoaded(AudioPlaylist playlist) {
AudioTrack firstTrack = playlist.getSelectedTrack();

if (firstTrack == null) {
firstTrack = playlist.getTracks().get(0);
}

play(audioChannel, musicManager, firstTrack);

if (playlist.getTracks().size() > 1) {
for (AudioTrack tracks : playlist.getTracks()) {
if (tracks != firstTrack) {
musicManager.scheduler.queue(tracks);
}
}
}
}

/**
* Override the default noMatches Method to inform the user about it.
*/
@Override
public void noMatches() {
Main.getInstance().getCommandManager().sendMessage(new EmbedBuilder()
.setAuthor(channel.asGuildMessageChannel().getGuild().getJDA().getSelfUser().getName(), Data.WEBSITE, channel.asGuildMessageChannel().getGuild().getJDA().getSelfUser().getAvatarUrl())
.setTitle("Music Player!")
.setThumbnail(channel.asGuildMessageChannel().getGuild().getJDA().getSelfUser().getAvatarUrl())
.setColor(Color.GREEN)
.setDescription("A Song with the URL ``" + FormatUtil.filter(trackUrl) + "`` couldn't be found!")
.setFooter(channel.asGuildMessageChannel().getGuild().getName() + " - " + Data.ADVERTISEMENT, channel.asGuildMessageChannel().getGuild().getIconUrl()), 5, channel, interactionHook);
}

/**
* Override the default loadFailed Method to inform the user about it.
*/
@Override
public void loadFailed(FriendlyException exception) {
Main.getInstance().getCommandManager().sendMessage(new EmbedBuilder()
.setAuthor(channel.getJDA().getSelfUser().getName(), Data.WEBSITE, channel.getJDA().getSelfUser().getAvatarUrl())
.setTitle("Music Player!")
.setThumbnail(channel.getJDA().getSelfUser().getAvatarUrl())
.setColor(Color.GREEN)
.setDescription("Error while playing: " + exception.getMessage())
.setFooter(channel.asGuildMessageChannel().getGuild().getName() + " - " + Data.ADVERTISEMENT, channel.asGuildMessageChannel().getGuild().getIconUrl()), 5, channel, interactionHook);
}
});
loadAndPlay(channel, audioChannel, trackUrl, interactionHook, true);
}

/**
Expand All @@ -154,11 +90,12 @@ public void loadFailed(FriendlyException exception) {
* @param audioChannel the AudioChannel for the Bot to join.
* @param trackUrl the Track URL.
* @param interactionHook a InteractionHook if it was an SlashCommand.
* @param silent if the Bot shouldn't send a Message.
*/
public void loadAndPlay(final MessageChannelUnion channel, final AudioChannel audioChannel, final String trackUrl, InteractionHook interactionHook) {
public void loadAndPlay(final MessageChannelUnion channel, final AudioChannel audioChannel, final String trackUrl, InteractionHook interactionHook, boolean silent) {
GuildMusicManager musicManager = getGuildAudioPlayer(channel.asGuildMessageChannel().getGuild());

musicManager.scheduler.channel = channel;
musicManager.getScheduler().setChannel(channel);

playerManager.loadItemOrdered(musicManager, trackUrl, new AudioLoadResultHandler() {

Expand All @@ -168,7 +105,8 @@ public void loadAndPlay(final MessageChannelUnion channel, final AudioChannel au
*/
@Override
public void trackLoaded(AudioTrack track) {
Main.getInstance().getCommandManager().sendMessage(new EmbedBuilder()
if (!silent)
Main.getInstance().getCommandManager().sendMessage(new EmbedBuilder()
.setAuthor(channel.getJDA().getSelfUser().getName(), Data.WEBSITE, channel.getJDA().getSelfUser().getAvatarUrl())
.setTitle("Music Player!")
.setThumbnail(channel.getJDA().getSelfUser().getAvatarUrl())
Expand All @@ -189,9 +127,11 @@ public void playlistLoaded(AudioPlaylist playlist) {

if (firstTrack == null) {
firstTrack = playlist.getTracks().get(0);
playlist.getTracks().remove(0);
}

Main.getInstance().getCommandManager().sendMessage(new EmbedBuilder()
if (!silent)
Main.getInstance().getCommandManager().sendMessage(new EmbedBuilder()
.setAuthor(channel.getJDA().getSelfUser().getName(), Data.WEBSITE, channel.getJDA().getSelfUser().getAvatarUrl())
.setTitle("Music Player!")
.setThumbnail(channel.getJDA().getSelfUser().getAvatarUrl())
Expand All @@ -203,9 +143,7 @@ public void playlistLoaded(AudioPlaylist playlist) {

if (playlist.getTracks().size() > 1) {
for (AudioTrack tracks : playlist.getTracks()) {
if (tracks != firstTrack) {
musicManager.scheduler.queue(tracks);
}
musicManager.getScheduler().queue(tracks);
}
}
}
Expand All @@ -215,7 +153,8 @@ public void playlistLoaded(AudioPlaylist playlist) {
*/
@Override
public void noMatches() {
Main.getInstance().getCommandManager().sendMessage(new EmbedBuilder()
if (!silent)
Main.getInstance().getCommandManager().sendMessage(new EmbedBuilder()
.setAuthor(channel.getJDA().getSelfUser().getName(), Data.WEBSITE, channel.getJDA().getSelfUser().getAvatarUrl())
.setTitle("Music Player!")
.setThumbnail(channel.getJDA().getSelfUser().getAvatarUrl())
Expand Down Expand Up @@ -248,8 +187,8 @@ public void loadFailed(FriendlyException exception) {
* @param track the AudioTrack that should be played.
*/
public void play(AudioChannel audioChannel, GuildMusicManager musicManager, AudioTrack track) {
connectToAudioChannel(musicManager.guild.getAudioManager(), audioChannel);
musicManager.scheduler.queue(track);
connectToAudioChannel(musicManager.getGuild().getAudioManager(), audioChannel);
musicManager.getScheduler().queue(track);
}

/**
Expand All @@ -267,18 +206,17 @@ public void skipTrack(MessageChannelUnion channel, InteractionHook interactionHo
.setDescription("Skipping to the next Song!")
.setFooter(channel.asGuildMessageChannel().getGuild().getName() + " - " + Data.ADVERTISEMENT, channel.asGuildMessageChannel().getGuild().getIconUrl()), 5, channel, interactionHook);

getGuildAudioPlayer(channel.asGuildMessageChannel().getGuild()).scheduler.nextTrack(channel, skipAmount);
getGuildAudioPlayer(channel.asGuildMessageChannel().getGuild()).getScheduler().nextTrack(channel, skipAmount);
}

/**
* A method used to seek to a specific position in the current AudioTrack.
*
* @param channel the TextChannel, used to inform the user about the seek.
* @param interactionHook the Interaction-Hook, used to replace the channel if it is a SlashCommand.
* @param seekAmountInSeconds the amount of seconds that should be seeked.
*/
public void seekInTrack(MessageChannelUnion channel, InteractionHook interactionHook, int seekAmountInSeconds) {
getGuildAudioPlayer(channel.asGuildMessageChannel().getGuild()).scheduler.seekPosition(channel, seekAmountInSeconds);
public void seekInTrack(MessageChannelUnion channel, int seekAmountInSeconds) {
getGuildAudioPlayer(channel.asGuildMessageChannel().getGuild()).getScheduler().seekPosition(channel, seekAmountInSeconds);
}

/**
Expand Down
Loading

0 comments on commit bf1c6b0

Please sign in to comment.