From 3b65e91d10d9f5fdd65fe23019a70212a0d931d6 Mon Sep 17 00:00:00 2001 From: thmsdy Date: Wed, 5 Aug 2020 23:06:50 -0500 Subject: [PATCH] Fix typo and remove duplicate command --- src/main/java/com/fpghoti/biscuit/Main.java | 2 -- .../commands/client/music/MoveToCommand.java | 2 +- .../client/music/WipeQueueCommand.java | 33 ------------------- 3 files changed, 1 insertion(+), 36 deletions(-) delete mode 100644 src/main/java/com/fpghoti/biscuit/commands/client/music/WipeQueueCommand.java diff --git a/src/main/java/com/fpghoti/biscuit/Main.java b/src/main/java/com/fpghoti/biscuit/Main.java index f17f305..eac7679 100644 --- a/src/main/java/com/fpghoti/biscuit/Main.java +++ b/src/main/java/com/fpghoti/biscuit/Main.java @@ -48,7 +48,6 @@ import com.fpghoti.biscuit.commands.client.music.SkipCommand; import com.fpghoti.biscuit.commands.client.music.TogglePauseCommand; import com.fpghoti.biscuit.commands.client.music.UnpauseCommand; import com.fpghoti.biscuit.commands.client.music.VolumeCommand; -import com.fpghoti.biscuit.commands.client.music.WipeQueueCommand; import com.fpghoti.biscuit.commands.console.GuildSayCommand; import com.fpghoti.biscuit.commands.console.SayCommand; import com.fpghoti.biscuit.commands.console.ShutdownConsoleCommand; @@ -171,7 +170,6 @@ public class Main { CommandManager.addCommand(new QueueCommand()); CommandManager.addCommand(new SkipCommand()); CommandManager.addCommand(new NowPlayingCommand()); - CommandManager.addCommand(new WipeQueueCommand()); CommandManager.addCommand(new LoopMusicCommand()); CommandManager.addCommand(new VolumeCommand()); CommandManager.addCommand(new ShuffleCommand()); diff --git a/src/main/java/com/fpghoti/biscuit/commands/client/music/MoveToCommand.java b/src/main/java/com/fpghoti/biscuit/commands/client/music/MoveToCommand.java index f6e227a..8f8d415 100644 --- a/src/main/java/com/fpghoti/biscuit/commands/client/music/MoveToCommand.java +++ b/src/main/java/com/fpghoti/biscuit/commands/client/music/MoveToCommand.java @@ -14,7 +14,7 @@ public class MoveToCommand extends MusicClientCommand{ public MoveToCommand() { name = "Move To"; description = "Moves track to specified position."; - usage = Main.getMainBiscuit().getProperties().getCommandSignifier() + "moveto "; + usage = Main.getMainBiscuit().getProperties().getCommandSignifier() + "moveto "; minArgs = 2; maxArgs = 2; identifiers.add("moveto"); diff --git a/src/main/java/com/fpghoti/biscuit/commands/client/music/WipeQueueCommand.java b/src/main/java/com/fpghoti/biscuit/commands/client/music/WipeQueueCommand.java deleted file mode 100644 index 43675f7..0000000 --- a/src/main/java/com/fpghoti/biscuit/commands/client/music/WipeQueueCommand.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.fpghoti.biscuit.commands.client.music; - -import com.fpghoti.biscuit.Main; -import com.fpghoti.biscuit.biscuit.Biscuit; -import com.fpghoti.biscuit.commands.base.MusicClientCommand; -import com.fpghoti.biscuit.rest.MessageText; -import com.fpghoti.biscuit.util.PermUtil; - -import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent; - -public class WipeQueueCommand extends MusicClientCommand{ - - public WipeQueueCommand() { - name = "Wipe Queue"; - description = "Removes all upcoming tracks from the queue."; - usage = Main.getMainBiscuit().getProperties().getCommandSignifier() + "wipequeue"; - minArgs = 0; - maxArgs = 0; - identifiers.add("wipequeue"); - identifiers.add("wipeq"); - } - - @Override - public void execute(String[] args, GuildMessageReceivedEvent event) { - Biscuit b = Biscuit.getBiscuit(event.getGuild()); - b.log(event.getAuthor().getName() + " issued a command: -wipequeue"); - if(PermUtil.hasMusicControl(event.getMember())) { - b.getAudioScheduler().wipeQueue(); - MessageText.send(event.getChannel(), "Removed upcoming songs from the music queue."); - } - } - -}