diff --git a/bot.properties.example b/bot.properties.example index 0fa8fcf..66a5f53 100644 --- a/bot.properties.example +++ b/bot.properties.example @@ -2,8 +2,8 @@ BOT_ENV=dev BOT_TOKEN= BOT_PREFIX= BOT_OWNER= -BOT_PAPISID= -BOT_PSID= +GG_EMAIL= +GG_PASS= API_PORT=9000 MYSQL_HOST=127.0.0.1 diff --git a/pom.xml b/pom.xml index 8e4b463..9420926 100644 --- a/pom.xml +++ b/pom.xml @@ -118,7 +118,7 @@ com.github.walkyst lavaplayer-fork - 1.3.97 + 1.3.98.1 diff --git a/src/main/java/netneutrality/music/MusicManager.java b/src/main/java/netneutrality/music/MusicManager.java index b145c38..ba63d4e 100644 --- a/src/main/java/netneutrality/music/MusicManager.java +++ b/src/main/java/netneutrality/music/MusicManager.java @@ -12,7 +12,8 @@ import com.sedmelluq.discord.lavaplayer.player.AudioPlayer; import com.sedmelluq.discord.lavaplayer.player.AudioPlayerManager; import com.sedmelluq.discord.lavaplayer.player.DefaultAudioPlayerManager; import com.sedmelluq.discord.lavaplayer.source.AudioSourceManagers; -import com.sedmelluq.discord.lavaplayer.source.youtube.YoutubeHttpContextFilter; +import com.sedmelluq.discord.lavaplayer.source.soundcloud.SoundCloudAudioSourceManager; +import com.sedmelluq.discord.lavaplayer.source.youtube.YoutubeAudioSourceManager; import com.sedmelluq.discord.lavaplayer.tools.FriendlyException; import com.sedmelluq.discord.lavaplayer.track.AudioPlaylist; import com.sedmelluq.discord.lavaplayer.track.AudioTrack; @@ -26,6 +27,7 @@ import netneutrality.music.loadable.LoadableSong; import netneutrality.thread.MusicPlayerAutoDisconnectThread; import netneutrality.thread.ThreadManager; import netneutrality.utils.MessageFunction; +import netneutrality.utils.Settings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -74,8 +76,11 @@ public class MusicManager { public static void initPlayerManager() { AudioSourceManagers.registerRemoteSources(playerManager); - YoutubeHttpContextFilter.setPAPISID(netneutrality.utils.Settings.getInstance().get("BOT_PAPISID", "")); - YoutubeHttpContextFilter.setPSID(netneutrality.utils.Settings.getInstance().get("BOT_PSID", "")); + playerManager.registerSourceManager(new YoutubeAudioSourceManager( + true, + Settings.getInstance().get("GG_EMAIL", ""), + Settings.getInstance().get("GG_PASS", ""))); + playerManager.registerSourceManager(SoundCloudAudioSourceManager.createDefault()); } public boolean isConnectedTo(VoiceChannel vChannel) {