From 6ea63342af2e49790ace0678f66c38a0d50c395d Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 22 Dec 2019 20:48:11 +0100 Subject: [PATCH] Outsource yk --- src/main/java/com/bbn/hadder/Hadder.java | 1 + .../hadder/commands/music/PlayCommand.java | 20 +-------- .../hadder/commands/music/QueueCommand.java | 42 +++++++++++++++++++ 3 files changed, 44 insertions(+), 19 deletions(-) create mode 100644 src/main/java/com/bbn/hadder/commands/music/QueueCommand.java diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index 9fbd153..c9c2f77 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -91,6 +91,7 @@ public class Hadder { new ClydeCommand(), new PlayCommand(), new StarBoardCommand(), + new QueueCommand(), new StopCommand()), config, helpCommand); builder.addEventListeners( diff --git a/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java b/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java index 118b7a2..bae30df 100644 --- a/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java +++ b/src/main/java/com/bbn/hadder/commands/music/PlayCommand.java @@ -18,7 +18,6 @@ public class PlayCommand implements Command { private static final String CD = "\uD83D\uDCBF"; private static final String MIC = "\uD83C\uDFA4 **|>** "; */ - @Override public void executed(String[] args, CommandEvent event) { if (args.length > 0) { @@ -48,9 +47,6 @@ public class PlayCommand implements Command { /* OUTSOURCE THIS Guild guild = event.getGuild(); - if (args.length == 1) { - switch (args[0].toLowerCase()) { - case "info": if (!hasPlayer(guild) || getPlayer(guild).getPlayingTrack() == null) { // No song is playing event.getTextChannel().sendMessage("No song is being played at the moment! *It's your time to shine..*").queue(); } else { @@ -59,21 +55,7 @@ public class PlayCommand implements Command { "\n\u23F1 **|>** `[ " + getTimestamp(track.getPosition()) + " / " + getTimestamp(track.getInfo().length) + " ]`", "\n" + MIC, getOrNull(track.getInfo().author), "\n\uD83C\uDFA7 **|>** " + "")).queue(); - } - break; - - case "queue": - if (!hasPlayer(guild) || getTrackManager(guild).getQueuedTracks().isEmpty()) { - event.getTextChannel().sendMessage("The queue is empty! Load a song with **" - + "dd" + "music play**!").queue(); - } else { - StringBuilder sb = new StringBuilder(); - Set queue = getTrackManager(guild).getQueuedTracks(); - queue.forEach(audioInfo -> sb.append(buildQueueMessage(audioInfo))); - } - break; - } - } */ + }*/ } diff --git a/src/main/java/com/bbn/hadder/commands/music/QueueCommand.java b/src/main/java/com/bbn/hadder/commands/music/QueueCommand.java new file mode 100644 index 0000000..8756e38 --- /dev/null +++ b/src/main/java/com/bbn/hadder/commands/music/QueueCommand.java @@ -0,0 +1,42 @@ +package com.bbn.hadder.commands.music; + +import com.bbn.hadder.audio.AudioInfo; +import com.bbn.hadder.audio.AudioManager; +import com.bbn.hadder.commands.Command; +import com.bbn.hadder.commands.CommandEvent; +import com.bbn.hadder.utils.MessageEditor; + +import java.util.Set; + +/** + * @author Skidder / GregTCLTK + */ + +public class QueueCommand implements Command { + + @Override + public void executed(String[] args, CommandEvent event) { + if (!new AudioManager().hasPlayer(event.getGuild()) || new AudioManager().getTrackManager(event.getGuild()).getQueuedTracks().isEmpty()) { + event.getTextChannel().sendMessage( + event.getMessageEditor().getMessage(MessageEditor.MessageType.WARNING, "", "").build()).queue(); + } else { + Set queue = new AudioManager().getTrackManager(event.getGuild()).getQueuedTracks(); + // Insert message here + } + } + + @Override + public String[] labels() { + return new String[]{"queue"}; + } + + @Override + public String description() { + return "Shows the music queue."; + } + + @Override + public String usage() { + return ""; + } +}