Lavalink client v3 compiles

DuncteBot · Mar 17, 2024 · e8464c6 · e8464c6
1 parent de0f886
commit e8464c6
Show file tree

Hide file tree

Showing 12 changed files with 27 additions and 21 deletions.
diff --git a/bot/src/main/java/fredboat/audio/player/LavalinkManager.java b/bot/src/main/java/fredboat/audio/player/LavalinkManager.java
@@ -18,7 +18,11 @@
 
 package fredboat.audio.player;
 
-import dev.arbjerg.lavalink.client.*;
+import dev.arbjerg.lavalink.client.Helpers;
+import dev.arbjerg.lavalink.client.LavalinkClient;
+import dev.arbjerg.lavalink.client.LinkState;
+import dev.arbjerg.lavalink.client.NodeOptions;
+import dev.arbjerg.lavalink.client.event.*;
 import me.duncte123.skybot.SkyBot;
 import me.duncte123.skybot.objects.config.DunctebotConfig;
 import me.duncte123.skybot.utils.AirUtils;

diff --git a/bot/src/main/java/me/duncte123/skybot/audio/AudioLoader.java b/bot/src/main/java/me/duncte123/skybot/audio/AudioLoader.java
@@ -19,7 +19,7 @@
 package me.duncte123.skybot.audio;
 
 import dev.arbjerg.lavalink.client.AbstractAudioLoadResultHandler;
-import dev.arbjerg.lavalink.client.protocol.*;
+import dev.arbjerg.lavalink.client.player.*;
 import dev.arbjerg.lavalink.protocol.v4.PlaylistInfo;
 import dev.arbjerg.lavalink.protocol.v4.TrackInfo;
 import me.duncte123.botcommons.messaging.MessageConfig;

diff --git a/bot/src/main/java/me/duncte123/skybot/audio/BigChungusPlaylist.java b/bot/src/main/java/me/duncte123/skybot/audio/BigChungusPlaylist.java
@@ -18,7 +18,7 @@
 
 package me.duncte123.skybot.audio;
 
-import dev.arbjerg.lavalink.client.protocol.Track;
+import dev.arbjerg.lavalink.client.player.Track;
 
 import java.util.List;
 

diff --git a/bot/src/main/java/me/duncte123/skybot/audio/GuildMusicManager.java b/bot/src/main/java/me/duncte123/skybot/audio/GuildMusicManager.java
@@ -18,7 +18,7 @@
 
 package me.duncte123.skybot.audio;
 
-import dev.arbjerg.lavalink.client.LavalinkPlayer;
+import dev.arbjerg.lavalink.client.player.LavalinkPlayer;
 import dev.arbjerg.lavalink.client.Link;
 import fredboat.audio.player.LavalinkManager;
 import me.duncte123.skybot.SkyBot;
@@ -63,7 +63,9 @@ public TrackScheduler getScheduler() {
 
     public void stopAndClear() {
         this.getPlayer().ifPresent(
-            (player) -> player.setPaused(false).setEncodedTrack(null).subscribe()
+            (player) -> player.setPaused(false)
+                .setTrack(null)
+                .subscribe()
         );
 
         this.scheduler.getQueue().clear();

diff --git a/bot/src/main/java/me/duncte123/skybot/audio/TrackScheduler.java b/bot/src/main/java/me/duncte123/skybot/audio/TrackScheduler.java
@@ -18,8 +18,8 @@
 
 package me.duncte123.skybot.audio;
 
-import dev.arbjerg.lavalink.client.protocol.Track;
-import dev.arbjerg.lavalink.client.protocol.TrackException;
+import dev.arbjerg.lavalink.client.player.Track;
+import dev.arbjerg.lavalink.client.player.TrackException;
 import dev.arbjerg.lavalink.protocol.v4.Message.EmittedEvent.TrackEndEvent.AudioTrackEndReason;
 import dev.arbjerg.lavalink.protocol.v4.TrackInfo;
 import me.duncte123.botcommons.messaging.MessageConfig;
@@ -136,7 +136,7 @@ public void skipTracks(int count, boolean forceAnnounce) {
 
         if (nextTrack == null) {
             this.guildMusicManager.getPlayer().ifPresent((player) ->
-                player.setPaused(false).setEncodedTrack(null).subscribe()
+                player.setPaused(false).setTrack(null).subscribe()
             );
 
             guildMusicManager.getLatestChannel()

diff --git a/bot/src/main/java/me/duncte123/skybot/commands/music/SeekCommand.java b/bot/src/main/java/me/duncte123/skybot/commands/music/SeekCommand.java
@@ -18,8 +18,8 @@
 
 package me.duncte123.skybot.commands.music;
 
-import dev.arbjerg.lavalink.client.LavalinkPlayer;
-import dev.arbjerg.lavalink.client.protocol.Track;
+import dev.arbjerg.lavalink.client.player.LavalinkPlayer;
+import dev.arbjerg.lavalink.client.player.Track;
 import me.duncte123.skybot.Variables;
 import me.duncte123.skybot.objects.command.CommandContext;
 import me.duncte123.skybot.objects.command.MusicCommand;

diff --git a/bot/src/main/java/me/duncte123/skybot/utils/AudioUtils.java b/bot/src/main/java/me/duncte123/skybot/utils/AudioUtils.java
@@ -18,9 +18,9 @@
 
 package me.duncte123.skybot.utils;
 
-import dev.arbjerg.lavalink.client.protocol.LavalinkLoadResult;
-import dev.arbjerg.lavalink.client.protocol.SearchResult;
-import dev.arbjerg.lavalink.client.protocol.Track;
+import dev.arbjerg.lavalink.client.player.LavalinkLoadResult;
+import dev.arbjerg.lavalink.client.player.SearchResult;
+import dev.arbjerg.lavalink.client.player.Track;
 import fredboat.audio.player.LavalinkManager;
 import gnu.trove.map.TLongObjectMap;
 import me.duncte123.skybot.Variables;
@@ -45,7 +45,7 @@ public AudioUtils(Variables variables) {
     @Nullable("If the playlist is not a search result")
     public List<Track> searchYoutube(long guildId, String query) {
         final LavalinkLoadResult result = LavalinkManager.INS.getLavalink()
-            .getLink(guildId)
+            .getOrCreateLink(guildId)
             .loadItem("ytsearch:" + query)
             .block();
 
@@ -74,7 +74,7 @@ public Future<Void> loadAndPlay(final AudioData data, final String trackUrlRaw,
         final CompletableFuture<Void> future = new CompletableFuture<>();
 
         LavalinkManager.INS.getLavalink()
-            .getLink(data.getGuildId())
+            .getLinkIfCached(data.getGuildId())
             .loadItem(trackUrl)
             .subscribe((result) -> {
                 future.complete(null);

diff --git a/bot/src/main/kotlin/me/duncte123/skybot/commands/music/QueueCommand.kt b/bot/src/main/kotlin/me/duncte123/skybot/commands/music/QueueCommand.kt
@@ -18,7 +18,7 @@
 
 package me.duncte123.skybot.commands.music
 
-import dev.arbjerg.lavalink.client.protocol.Track
+import dev.arbjerg.lavalink.client.player.Track
 import me.duncte123.botcommons.messaging.EmbedUtils
 import me.duncte123.botcommons.messaging.MessageUtils.sendEmbed
 import me.duncte123.skybot.Variables

diff --git a/bot/src/main/kotlin/me/duncte123/skybot/commands/music/RadioCommand.kt b/bot/src/main/kotlin/me/duncte123/skybot/commands/music/RadioCommand.kt
@@ -65,7 +65,7 @@ class RadioCommand : MusicCommand() {
                 val mng = audioUtils.getMusicManager(ctx.guildId)
 
                 mng.player.ifPresent {
-                    it.setPaused(false).setEncodedTrack(null).subscribe()
+                    it.setPaused(false).setTrack(null).subscribe()
                 }
                 mng.scheduler.queue.clear()
 

diff --git a/bot/src/main/kotlin/me/duncte123/skybot/commands/music/StopCommand.kt b/bot/src/main/kotlin/me/duncte123/skybot/commands/music/StopCommand.kt
@@ -53,7 +53,7 @@ class StopCommand : MusicCommand() {
             ctx.member.hasPermission(Permission.MANAGE_SERVER)
         ) {
             mng.scheduler.queue.clear()
-            player.setPaused(false).setEncodedTrack(null).subscribe()
+            player.setPaused(false).setTrack(null).subscribe()
 
             sendMsg(ctx, "Playback has been completely stopped and the queue has been cleared.")
 
@@ -88,7 +88,7 @@ class StopCommand : MusicCommand() {
             event.member!!.hasPermission(Permission.MANAGE_SERVER)
         ) {
             mng.scheduler.queue.clear()
-            player.setPaused(false).setEncodedTrack(null).subscribe()
+            player.setPaused(false).setTrack(null).subscribe()
 
             event.reply("Playback has been completely stopped and the queue has been cleared.").queue()
 

diff --git a/bot/src/main/kotlin/me/duncte123/skybot/extensions/AudioTrack.kt b/bot/src/main/kotlin/me/duncte123/skybot/extensions/AudioTrack.kt
@@ -18,7 +18,7 @@
 
 package me.duncte123.skybot.extensions
 
-import dev.arbjerg.lavalink.client.protocol.Track
+import dev.arbjerg.lavalink.client.player.Track
 import me.duncte123.botcommons.messaging.EmbedUtils.embedMessage
 import me.duncte123.skybot.audio.GuildMusicManager
 import me.duncte123.skybot.audio.UUIDUserData

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -94,7 +94,7 @@ fun VersionCatalogBuilder.database() {
 
 fun VersionCatalogBuilder.voice() {
 //    library("lavalink-client", "dev.arbjerg", "lavalink-client").version("64f8b44e8164f5873ab107f453b58b1a99a8bc13-SNAPSHOT")
-    library("lavalink-client", "dev.arbjerg", "lavalink-client").version("2.4.0")
+    library("lavalink-client", "dev.arbjerg", "lavalink-client").version("3.0.0")
 }
 
 fun VersionCatalogBuilder.dashboard() {