Test out new track user data branch

Author: duncte123

README.md

@@ -1,7 +1,11 @@
 [VERSION]: https://img.shields.io/maven-central/v/dev.arbjerg/lavalink-client
 
 # Java Lavalink client
-This is a client for Lavalink v4 only. You cannot use this with Lavalink v3.
+
+> [!WARNING]
+> This is a client for Lavalink v4 only.
+> You cannot use this with Lavalink v3.
+
 
 Feature overview:
 - Works with any discord library (as long as they allow for sending direct request to discord)

build.gradle.kts

@@ -41,7 +41,7 @@ repositories {
 
 dependencies {
     // package libraries
-    api("dev.arbjerg.lavalink:protocol:8a6c376407205e8208aa452c8b59443774c2e754-SNAPSHOT")
+    api("dev.arbjerg.lavalink:protocol:47201924be7d5a459753fc85f00ca30e49ba3cd1-SNAPSHOT")
     api("com.squareup.okhttp3:okhttp:4.10.0")
     api("io.projectreactor:reactor-core:3.5.6")
     api("io.projectreactor.kotlin:reactor-kotlin-extensions:1.2.2")

src/main/kotlin/dev/arbjerg/lavalink/client/IUpdatablePlayer.kt

@@ -1,9 +1,19 @@
 package dev.arbjerg.lavalink.client
 
 import dev.arbjerg.lavalink.protocol.v4.Filters
+import dev.arbjerg.lavalink.protocol.v4.Track
 import dev.arbjerg.lavalink.protocol.v4.VoiceState
 
 interface IUpdatablePlayer {
+    /**
+     * Shortcut for setting the encoded track. This will also send any user-data supplied.
+     *
+     * @param track The track to apply to this builder
+     *
+     * @return The updated builder, useful for chaining
+     */
+    fun applyTrack(track: Track): PlayerUpdateBuilder
+
     /**
      * Sets the encoded track to be played.
      *

src/main/kotlin/dev/arbjerg/lavalink/client/LavalinkPlayer.kt

@@ -1,9 +1,6 @@
 package dev.arbjerg.lavalink.client
 
-import dev.arbjerg.lavalink.protocol.v4.Filters
-import dev.arbjerg.lavalink.protocol.v4.Player
-import dev.arbjerg.lavalink.protocol.v4.PlayerState
-import dev.arbjerg.lavalink.protocol.v4.VoiceState
+import dev.arbjerg.lavalink.protocol.v4.*
 import kotlin.math.min
 
 class LavalinkPlayer(private val node: LavalinkNode, protocolPlayer: Player) : IUpdatablePlayer {
@@ -36,6 +33,9 @@ class LavalinkPlayer(private val node: LavalinkNode, protocolPlayer: Player) : I
             }
         }
 
+    override fun applyTrack(track: Track) = PlayerUpdateBuilder(node, guildId)
+        .applyTrack(track)
+
     override fun setEncodedTrack(encodedTrack: String?) = PlayerUpdateBuilder(node, guildId)
         .setEncodedTrack(encodedTrack)
 

src/main/kotlin/dev/arbjerg/lavalink/client/PlayerUpdateBuilder.kt

@@ -2,13 +2,15 @@ package dev.arbjerg.lavalink.client
 
 import dev.arbjerg.lavalink.internal.toLavalinkPlayer
 import dev.arbjerg.lavalink.protocol.v4.*
+import kotlinx.serialization.json.JsonObject
 import reactor.core.publisher.Mono
 import kotlin.math.max
 import kotlin.math.min
 
 class PlayerUpdateBuilder internal constructor(private val node: LavalinkNode, private val guildId: Long) : IUpdatablePlayer {
     private var encodedTrack: Omissible<String?> = Omissible.omitted()
     private var identifier: Omissible<String> = Omissible.omitted()
+    private var tracKUserData: Omissible<JsonObject> = Omissible.Omitted()
     private var position: Omissible<Long> = Omissible.omitted()
     private var endTime: Omissible<Long?> = Omissible.omitted()
     private var volume: Omissible<Int> = Omissible.omitted()
@@ -17,6 +19,12 @@ class PlayerUpdateBuilder internal constructor(private val node: LavalinkNode, p
     private var state: Omissible<VoiceState> = Omissible.omitted()
     private var noReplace = false
 
+    override fun applyTrack(track: Track): PlayerUpdateBuilder {
+        this.encodedTrack = Omissible.of(track.info.identifier)
+        this.tracKUserData = Omissible.of(track.userData)
+        return this
+    }
+
     override fun setEncodedTrack(encodedTrack: String?): PlayerUpdateBuilder {
         this.encodedTrack = Omissible.of(encodedTrack)
         return this
@@ -86,17 +94,24 @@ class PlayerUpdateBuilder internal constructor(private val node: LavalinkNode, p
         return this
     }
 
+    @Suppress("MemberVisibilityCanBePrivate")
     fun build() = PlayerUpdate(
-        encodedTrack, identifier, position, endTime, volume, paused, filters, state
+        Omissible.omitted(),
+        Omissible.omitted(),
+        PlayerUpdateTrack(
+            encodedTrack,
+            identifier,
+            tracKUserData,
+        ).toOmissible(),
+        position,
+        endTime,
+        volume,
+        paused,
+        filters,
+        state
     )
 
     fun asMono(): Mono<LavalinkPlayer> {
-        /*val cachedPlayer = node.playerCache[guildId]
-
-        if ((cachedPlayer == null || !cachedPlayer.state.connected) && state.isOmitted()) {
-            return Mono.error(IllegalStateException("Player is not connected to a voice channel."))
-        }*/
-
         return node.rest.updatePlayer(build(), guildId, noReplace)
             .map { it.toLavalinkPlayer(node) }
             .doOnNext {