Remove deprecated methods

Author: duncte123

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

@@ -16,22 +16,6 @@ interface IUpdatablePlayer {
      */
     fun setTrack(track: Track?): PlayerUpdateBuilder
 
-    /**
-     * Allows you to set the track via the [TrackUpdateBuilder].
-     * To stop the player, you can use [stopTrack] or [setTrack] with a null track.
-     *
-     * @param update the update params created via the [TrackUpdateBuilder].
-     *
-     * @return The updated builder, useful for chaining
-     */
-    @Deprecated(
-        message = "Just call .build on the builder",
-        replaceWith = ReplaceWith("setTrack(update.build())")
-    )
-    fun updateTrack(update: TrackUpdateBuilder): PlayerUpdateBuilder {
-        return updateTrack(update.build())
-    }
-
     /**
      * Allows you to set the track via the [TrackUpdateBuilder].
      * To stop the player, you can use [stopTrack] or [setTrack] with a null track.
@@ -42,60 +26,13 @@ interface IUpdatablePlayer {
      */
     fun updateTrack(update: PlayerUpdateTrack): PlayerUpdateBuilder
 
-    /**
-     * @deprecated Use [setTrack] instead.
-     *
-     * @return The updated builder, useful for chaining
-     */
-    @Deprecated(
-        message = "Use setTrack instead",
-        replaceWith = ReplaceWith("setTrack(track)")
-    )
-    fun applyTrack(track: Track?): PlayerUpdateBuilder {
-        return setTrack(track)
-    }
-
     /**
      * Shortcut for setting the encoded track to {@code null}. This will also clear the user data.
      *
      * @return The updated builder, useful for chaining
      */
     fun stopTrack(): PlayerUpdateBuilder
 
-    /**
-     * Sets the encoded track to be played.
-     * This will override the identifier and track user data if they were previously set.
-     *
-     * @param encodedTrack The encoded track to be played. Set it to {@code null} to make the player stop playing.
-     *
-     * @return The updated builder, useful for chaining
-     *
-     * @deprecated Use [updateTrack] with the [TrackUpdateBuilder] instead.
-     */
-    fun setEncodedTrack(encodedTrack: String?): PlayerUpdateBuilder
-
-    /**
-     * Omits the encoded track field from being sent to the node during updates.
-     *
-     * @return The updated builder, useful for chaining
-     *
-     * @deprecated Use [updateTrack] with the [TrackUpdateBuilder] instead.
-     */
-    fun omitEncodedTrack(): PlayerUpdateBuilder
-
-    /**
-     * Set the identifier on the player.
-     * This will override the encoded track and user data if they were previously set.
-     *
-     *
-     * @param identifier the identifier to be played
-     *
-     * @return The updated builder, useful for chaining
-     *
-     * @deprecated Use [updateTrack] with the [TrackUpdateBuilder] instead.
-     */
-    fun setIdentifier(identifier: String?): PlayerUpdateBuilder
-
     /**
      * Update the position of the player.
      *

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

@@ -1,7 +1,6 @@
 package dev.arbjerg.lavalink.client
 
 import dev.arbjerg.lavalink.client.loadbalancing.ILoadBalancer
-import dev.arbjerg.lavalink.client.loadbalancing.IRegionFilter
 import dev.arbjerg.lavalink.client.loadbalancing.VoiceRegion
 import dev.arbjerg.lavalink.client.loadbalancing.builtin.DefaultLoadBalancer
 import dev.arbjerg.lavalink.internal.ReconnectTask
@@ -10,7 +9,6 @@ import reactor.core.Disposable
 import reactor.core.publisher.Flux
 import reactor.core.publisher.Sinks
 import java.io.Closeable
-import java.net.URI
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.CopyOnWriteArrayList
 import java.util.concurrent.Executors
@@ -51,24 +49,6 @@ class LavalinkClient(val userId: Long) : Closeable, Disposable {
         reconnectService.scheduleWithFixedDelay(ReconnectTask(this), 0, 500, TimeUnit.MILLISECONDS)
     }
 
-    // TODO: configure resuming
-
-    /**
-     * Add a node to the client.
-     *
-     * @param name The name of your node
-     * @param address The ip and port of your node
-     * @param password The password of your node
-     * @param regionFilter (not currently used) Allows you to limit your node to a specific discord voice region
-     */
-    @JvmOverloads
-    @Deprecated("Use NodeOptions instead",
-        ReplaceWith("addNode(NodeOptions.Builder()...build())")
-    )
-    fun addNode(name: String, address: URI, password: String, regionFilter: IRegionFilter? = null): LavalinkNode {
-        return addNode(NodeOptions.Builder().setName(name).setServerUri(address).setPassword(password).setRegionFilter(regionFilter).build())
-    }
-
     /**
      * Add a node to the client.
      *
@@ -115,19 +95,6 @@ class LavalinkClient(val userId: Long) : Closeable, Disposable {
         return true
     }
 
-    /**
-     * Get or crate a link between a guild and a node.
-     *
-     * @param guildId The id of the guild
-     * @param region (not currently used) The target voice region of when to select a node
-     */
-    @Deprecated(
-        message = "Method name unclear",
-        replaceWith = ReplaceWith("getOrCreateLink(guildId, region)")
-    )
-    @JvmOverloads
-    fun getLink(guildId: Long, region: VoiceRegion? = null) = getOrCreateLink(guildId, region)
-
     /**
      * Get or crate a link between a guild and a node.
      *

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

@@ -165,12 +165,6 @@ class LavalinkNode(
      */
     fun createOrUpdatePlayer(guildId: Long) = PlayerUpdateBuilder(this, guildId)
 
-    @Deprecated(
-        message = "Doesn't just destroy the player anymore, use destroyPlayerAndLink() instead.",
-        replaceWith = ReplaceWith("destroyPlayerAndLink(guildId)")
-    )
-    fun destroyPlayer(guildId: Long) = destroyPlayerAndLink(guildId)
-
     /**
      * Destroy a guild's player and remove it from the cache. This will also remove the associated link from the client.
      *

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

@@ -63,15 +63,6 @@ class LavalinkPlayer(private val node: LavalinkNode, protocolPlayer: Player) : I
     override fun stopTrack() = PlayerUpdateBuilder(node, guildId)
         .stopTrack()
 
-    override fun setEncodedTrack(encodedTrack: String?) = PlayerUpdateBuilder(node, guildId)
-        .setEncodedTrack(encodedTrack)
-
-    override fun omitEncodedTrack() = PlayerUpdateBuilder(node, guildId)
-        .omitEncodedTrack()
-
-    override fun setIdentifier(identifier: String?) = PlayerUpdateBuilder(node, guildId)
-        .setIdentifier(identifier)
-
     override fun setPosition(position: Long?) = PlayerUpdateBuilder(node, guildId)
         .setPosition(position)
 

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

@@ -33,15 +33,6 @@ class Link(
      */
     fun getPlayer() = node.getPlayer(guildId)
 
-    /**
-     * Destroys the player for this link. This will also remove the link from the client.
-     */
-    @Deprecated(
-        message = "Doesn't just destroy the player anymore, use destroy() instead.",
-        replaceWith = ReplaceWith("destroy()")
-    )
-    fun destroyPlayer() = node.destroyPlayerAndLink(guildId)
-
     /**
      * Destroys this link, disconnecting the bot in the process.
      */

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

@@ -39,31 +39,6 @@ class PlayerUpdateBuilder internal constructor(private val node: LavalinkNode, p
         return this
     }
 
-    override fun setEncodedTrack(encodedTrack: String?): PlayerUpdateBuilder {
-        this.trackUpdate = PlayerUpdateTrack(
-            encoded = Omissible.of(encodedTrack),
-        ).toOmissible()
-        return this
-    }
-
-    // TODO: keep this?
-    override fun omitEncodedTrack(): PlayerUpdateBuilder {
-        val curTrackUpdate = this.trackUpdate
-
-        if (curTrackUpdate.isPresent()) {
-            this.trackUpdate = curTrackUpdate.value.copy(encoded = Omissible.omitted()).toOmissible()
-        }
-
-        return this
-    }
-
-    override fun setIdentifier(identifier: String?): PlayerUpdateBuilder {
-        this.trackUpdate = PlayerUpdateTrack(
-            identifier = identifier.toOmissible(),
-        ).toOmissible()
-        return this
-    }
-
     override fun setPosition(position: Long?): PlayerUpdateBuilder {
         this.position = position.toOmissible()
         return this
@@ -132,12 +107,6 @@ class PlayerUpdateBuilder internal constructor(private val node: LavalinkNode, p
         voice = state
     )
 
-    @Deprecated(
-        message = "This method causes improper usage of the reactor system",
-        replaceWith = ReplaceWith("this")
-    )
-    fun asMono(): Mono<LavalinkPlayer>  = this
-
     override fun subscribe(actual: CoreSubscriber<in LavalinkPlayer>) {
         node.rest.updatePlayer(build(), guildId, noReplace)
             .map { it.toLavalinkPlayer(node) }

src/test/kotlin/d4jTestScript.kt

@@ -1,6 +1,5 @@
-import dev.arbjerg.lavalink.client.LavalinkClient
-import dev.arbjerg.lavalink.client.TrackStartEvent
-import dev.arbjerg.lavalink.client.getUserIdFromToken
+import dev.arbjerg.lavalink.client.*
+import dev.arbjerg.lavalink.client.protocol.TrackUpdateBuilder
 import dev.arbjerg.lavalink.libraries.discord4j.installVoiceHandler
 import discord4j.core.DiscordClientBuilder
 import discord4j.core.event.domain.interaction.ChatInputInteractionEvent
@@ -11,7 +10,6 @@ import discord4j.discordjson.json.ApplicationCommandOptionData
 import discord4j.discordjson.json.ApplicationCommandRequest
 import discord4j.gateway.intent.IntentSet
 import reactor.core.publisher.Mono
-import java.net.URI
 
 fun main() {
     val token = System.getenv("BOT_TOKEN")
@@ -63,9 +61,11 @@ fun main() {
 
 fun registerNodeD4j(client: LavalinkClient) {
     val node = client.addNode(
-        "Testnode",
-        URI.create("ws://localhost:2333"),
-        "youshallnotpass"
+        NodeOptions.Builder()
+            .setName("Testnode")
+            .setServerUri("ws://localhost:2333")
+            .setPassword("youshallnotpass")
+            .build()
     )
     node.on<TrackStartEvent>()
         .next()
@@ -105,7 +105,12 @@ private fun handleSlash(lavalink: LavalinkClient, event: ChatInputInteractionEve
                 .map(ApplicationCommandInteractionOptionValue::asString)
                 .get()
             val link = lavalink.getOrCreateLink(event.interaction.guildId.get().asLong())
-            link.getPlayer().block()!!.setIdentifier(input)
+            link.createOrUpdatePlayer()
+                .updateTrack(
+                    TrackUpdateBuilder()
+                        .setIdentifier(input)
+                        .build()
+                )
                 .subscribe()
             event.reply("Playing!!").subscribe()
         }

src/test/kotlin/testScript.kt

@@ -13,7 +13,6 @@ import net.dv8tion.jda.api.interactions.commands.OptionType
 import net.dv8tion.jda.api.interactions.commands.build.Commands
 import net.dv8tion.jda.api.requests.GatewayIntent
 import net.dv8tion.jda.api.utils.cache.CacheFlag
-import java.net.URI
 
 fun main() {
     val token = System.getenv("BOT_TOKEN")
@@ -101,17 +100,21 @@ fun main() {
 fun registerNode(client: LavalinkClient) {
     listOf(
         /*client.addNode(
-            "Testnode",
-            URI.create("ws://localhost:2333"),
-            "youshallnotpass",
-            RegionGroup.EUROPE
+            NodeOptions.Builder()
+                .setName("Testnode")
+                .setServerUri("ws://localhost:2333")
+                .setPassword("youshallnotpass")
+                .setRegionFilter(RegionGroup.EUROPE)
+                .build()
         ),*/
 
         client.addNode(
-            "Mac-mini",
-            URI.create("ws://mac-mini.local.duncte123.lgbt:2333/bepis"),
-            "youshallnotpass",
-            RegionGroup.US
+            NodeOptions.Builder()
+                .setName("Mac-mini")
+                .setServerUri("ws://mac-mini.local.duncte123.lgbt:2333/bepis")
+                .setPassword("youshallnotpass")
+                .setRegionFilter(RegionGroup.US)
+                .build()
         )
     )
         .forEach { node ->

testbot/src/main/java/me/duncte123/testbot/Main.java

@@ -10,7 +10,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.net.URI;
 import java.util.List;
 
 public class Main {
@@ -39,17 +38,20 @@ public static void main(String[] args) throws InterruptedException {
     private static void registerLavalinkNodes(LavalinkClient client) {
         List.of(
             client.addNode(
-                "Testnode",
-                URI.create("ws://localhost:2333"),
-                "youshallnotpass",
-                RegionGroup.EUROPE
+                new NodeOptions.Builder()
+                    .setName("Testnode")
+                    .setServerUri("ws://localhost:2333")
+                    .setPassword("youshallnotpass")
+                    .build()
             ),
 
             client.addNode(
-                "Pi-local",
-                URI.create("ws://pi.local.duncte123.lgbt:2333"),
-                "youshallnotpass",
-                RegionGroup.US
+                new NodeOptions.Builder()
+                    .setName("Pi-local")
+                    .setServerUri("ws://pi.local.duncte123.lgbt:2333/bepis")
+                    .setPassword("youshallnotpass")
+                    .setRegionFilter(RegionGroup.US)
+                    .build()
             )
         ).forEach((node) -> {
             node.on(TrackStartEvent.class).subscribe((event) -> {