diff --git a/pom.xml b/pom.xml index cad92dd..a5ea503 100644 --- a/pom.xml +++ b/pom.xml @@ -63,6 +63,11 @@ oss.sonatype.org https://oss.sonatype.org/content/repositories/snapshots/ + + arbjergDev-releases + Lavalink Repository + https://maven.lavalink.dev/releases + jitpack.io https://jitpack.io @@ -114,7 +119,7 @@ net.dv8tion JDA - 5.3.0 + 5.6.1 com.github.cage @@ -134,8 +139,13 @@ dev.arbjerg lavaplayer - 2.2.3 + 2.2.4 + + dev.lavalink.youtube + v2 + 1.13.3 + org.pf4j pf4j diff --git a/src/main/java/com/fpghoti/biscuit/Main.java b/src/main/java/com/fpghoti/biscuit/Main.java index 992f6f3..b0dfd20 100644 --- a/src/main/java/com/fpghoti/biscuit/Main.java +++ b/src/main/java/com/fpghoti/biscuit/Main.java @@ -74,6 +74,7 @@ import com.sedmelluq.discord.lavaplayer.source.AudioSourceManagers; import ch.qos.logback.core.rolling.RollingFileAppender; import ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy; +import dev.lavalink.youtube.YoutubeAudioSourceManager; import net.dv8tion.jda.api.JDA; import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.requests.GatewayIntent; @@ -104,6 +105,7 @@ public class Main { private static AudioPlayerManager playerManager; + @SuppressWarnings("deprecation") public static void main(String[] args){ if(!isPlugin) { pluginsDir = new File("plugins"); @@ -125,7 +127,10 @@ public class Main { log.info("Running version: " + BColor.MAGENTA_BOLD + version); playerManager = new DefaultAudioPlayerManager(); - AudioSourceManagers.registerRemoteSources(playerManager); + YoutubeAudioSourceManager ytSourceManager = new dev.lavalink.youtube.YoutubeAudioSourceManager(); + playerManager.registerSourceManager(ytSourceManager); + AudioSourceManagers.registerRemoteSources(playerManager, + com.sedmelluq.discord.lavaplayer.source.youtube.YoutubeAudioSourceManager.class); mainBiscuit = new Biscuit(null, null, log); startJDA(); diff --git a/src/main/java/com/fpghoti/biscuit/commands/discord/GetConfigCommand.java b/src/main/java/com/fpghoti/biscuit/commands/discord/GetConfigCommand.java index 8c59f60..8b76416 100644 --- a/src/main/java/com/fpghoti/biscuit/commands/discord/GetConfigCommand.java +++ b/src/main/java/com/fpghoti/biscuit/commands/discord/GetConfigCommand.java @@ -32,7 +32,7 @@ public class GetConfigCommand extends ClientCommand{ FileUpload confUpload = FileUpload.fromData(config); confUpload.setName("config-" + b.getProperties().getGuildCode() + ".properties"); //event.getChannel().sendFile(config, "config-" + b.getProperties().getGuildCode() + ".properties").queue(); - event.getChannel().asTextChannel().sendFiles(confUpload); + event.getChannel().asTextChannel().sendFiles(confUpload).queue(); }else { b.log(BColor.MAGENTA_BOLD + event.getAuthor().getName() + " lacks permission to view the config!"); MessageText.sendTimed(event.getChannel().asTextChannel(), event.getAuthor().getAsMention() + " You do not have "