greg6775/Hadder
1
0
Fork 0
Code Issues 9 Pull requests 5 Projects Releases 54 Packages Wiki Activity Actions

Merge Greg's branch into the master branch #244

Merged
greg6775 merged 23 commits from greg-dev into master 2019-12-23 16:22:53 +01:00
Conversation 0 Commits 23 Files changed 15 +1 -9
1 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 7bc151fc48 - Show all commits

10
src/main/java/com/bbn/hadder/commands/music/PlayCommand.java
View file

@ -1,17 +1,12 @@
package com.bbn.hadder.commands.music; package com.bbn.hadder.commands.music;
import com.bbn.hadder.audio.AudioManager; import com.bbn.hadder.audio.AudioManager;
import com.bbn.hadder.audio.TrackManager;
import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.Command;
import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.commands.CommandEvent;
import com.bbn.hadder.utils.MessageEditor; import com.bbn.hadder.utils.MessageEditor;
import com.sedmelluq.discord.lavaplayer.player.AudioPlayer;
import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager;
import com.sedmelluq.discord.lavaplayer.player.DefaultAudioPlayerManager;
import net.dv8tion.jda.api.entities.Message; import net.dv8tion.jda.api.entities.Message;
import java.net.URL; import java.net.URL;
import java.util.*;
/** /**
* @author Skidder / GregTCLTK * @author Skidder / GregTCLTK
@ -19,9 +14,6 @@ import java.util.*;
public class PlayCommand implements Command { public class PlayCommand implements Command {
private final AudioPlayerManager myManager = new DefaultAudioPlayerManager();
public final Map<String, Map.Entry<AudioPlayer, TrackManager>> players = new HashMap<>();
/* /*
private static final String CD = "\uD83D\uDCBF"; private static final String CD = "\uD83D\uDCBF";
private static final String MIC = "\uD83C\uDFA4 **|>** "; */ private static final String MIC = "\uD83C\uDFA4 **|>** "; */
@ -40,7 +32,7 @@ public class PlayCommand implements Command {
new AudioManager().loadTrack(input, event, msg); new AudioManager().loadTrack(input, event, msg);
} catch (Exception ignore) { } catch (Exception ignore) {
Message msg = event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, Message msg = event.getTextChannel().sendMessage(event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
"commands.music.play.load.title", "⏯", "commands.music.play.load.title", "⭕",
"commands.music.play.load.description", "").build()).complete(); "commands.music.play.load.description", "").build()).complete();
new AudioManager().loadTrack("ytsearch: " + input, event, msg); new AudioManager().loadTrack("ytsearch: " + input, event, msg);
} }