diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
new file mode 100644
index 000000000..7f2f2e1a1
--- /dev/null
+++ b/dependency-reduced-pom.xml
@@ -0,0 +1,66 @@
+
+
+ 4.0.0
+ a9lim
+ raiko
+ Snapshot
+
+
+
+ maven-shade-plugin
+ 3.5.2
+
+
+ package
+
+ shade
+
+
+ true
+ All
+
+
+ *:*
+
+
+
+
+ reference.conf
+
+
+
+ a9lim.raiko.Raiko
+ ${project.artifactId}
+ ${project.version}
+ ${project.artifactId}
+ ${project.version}
+ ${project.groupId}
+
+
+
+
+
+
+
+
+
+
+
+ dv8tion
+ m2-dv8tion
+ https://m2.dv8tion.net/releases
+
+
+
+ always
+
+ jitpack.io
+ https://jitpack.io
+
+
+
+ 21
+ 21
+ UTF-8
+
+
diff --git a/pom.xml b/pom.xml
index b1bb2200b..957a6cf4e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,13 +26,23 @@
net.dv8tion
JDA
- 5.0.0-beta.21
+ 5.0.0-beta.23
dev.arbjerg
lavaplayer
2.1.1
+
+ com.github.lavalink-devs.youtube-source
+ common
+ 1.0.5
+
+
+ com.github.lavalink-devs.youtube-source
+ lldevs
+ 1.0.5
+
org.json
json
diff --git a/src/main/java/a9lim/raiko/BotConfig.java b/src/main/java/a9lim/raiko/BotConfig.java
index 9f4f40807..46ca5a6fc 100644
--- a/src/main/java/a9lim/raiko/BotConfig.java
+++ b/src/main/java/a9lim/raiko/BotConfig.java
@@ -91,9 +91,6 @@ public void load() {
model = config.getBoolean("cheapmodel");
preprompt = config.getString("preprompt");
- ytemail = noneblank(config.getString("ytemail"));
- ytpw = noneblank(config.getString("ytpw"));
-
// we may need to write a new config file
boolean write = false;
@@ -290,12 +287,4 @@ public String getPreprompt() {
return preprompt;
}
- public String getYTEmail() {
- return ytemail;
- }
-
- public String getYTPW() {
- return ytpw;
- }
-
}
diff --git a/src/main/java/a9lim/raiko/audio/PlayerManager.java b/src/main/java/a9lim/raiko/audio/PlayerManager.java
index a1eec8606..b66854c1b 100644
--- a/src/main/java/a9lim/raiko/audio/PlayerManager.java
+++ b/src/main/java/a9lim/raiko/audio/PlayerManager.java
@@ -34,7 +34,7 @@
import com.sedmelluq.discord.lavaplayer.source.twitch.TwitchStreamAudioSourceManager;
import com.sedmelluq.discord.lavaplayer.source.vimeo.VimeoAudioSourceManager;
import com.sedmelluq.discord.lavaplayer.source.yamusic.YandexMusicAudioSourceManager;
-import com.sedmelluq.discord.lavaplayer.source.youtube.YoutubeAudioSourceManager;
+import dev.lavalink.youtube.YoutubeAudioSourceManager;
import net.dv8tion.jda.api.entities.Guild;
public class PlayerManager extends DefaultAudioPlayerManager {
private final Bot bot;
@@ -45,10 +45,10 @@ public PlayerManager(Bot b) {
public void init(BotConfig config) {
// custom sources
- YoutubeAudioSourceManager yt = new YoutubeAudioSourceManager(true,config.getYTEmail(),config.getYTPW());
+ YoutubeAudioSourceManager yt = new YoutubeAudioSourceManager(true);
yt.setPlaylistPageCount(10);
registerSourceManager(yt);
- registerSourceManager(new NicoAudioSourceManager(null,null));
+ registerSourceManager(new NicoAudioSourceManager());
registerSourceManager(new YandexMusicAudioSourceManager(true));
registerSourceManager(SoundCloudAudioSourceManager.createDefault());
registerSourceManager(new BandcampAudioSourceManager());
diff --git a/src/main/resources/reference.conf b/src/main/resources/reference.conf
index e23c0a922..237546410 100644
--- a/src/main/resources/reference.conf
+++ b/src/main/resources/reference.conf
@@ -41,13 +41,6 @@ cheapmodel = false
preprompt = "You are Raiko Horikawa, fun-loving, free spirited drum tsukumogami. You're having a chat with several humans!"
-// This is the optional email and password used by the bot to sign in to youtube
-// If set to NONE, you won't be able to access age-restricted videos
-
-ytemail = "NONE"
-ytpw = "NONE"
-
-
// This is the bot's prefix used to signify commands
// If you use !!, !!play will make it play
// If left empty, the prefix will be a mention of the bot (@Botname play)