Skip to content

Commit c345d20

Browse files
duncte123duncte123
committed
Rename protocol to player
1 parent 77878ca commit c345d20

20 files changed

+33
-34
lines changed

‎src/main/kotlin/dev/arbjerg/lavalink/client/AbstractAudioLoadResultHandler.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package dev.arbjerg.lavalink.client
22

3-
import dev.arbjerg.lavalink.client.protocol.*
3+
import dev.arbjerg.lavalink.client.player.*
44
import java.util.function.Consumer
55

66
abstract class AbstractAudioLoadResultHandler : Consumer<LavalinkLoadResult> {

‎src/main/kotlin/dev/arbjerg/lavalink/client/FunctionalLoadResultHandler.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package dev.arbjerg.lavalink.client
22

3-
import dev.arbjerg.lavalink.client.protocol.LoadFailed
4-
import dev.arbjerg.lavalink.client.protocol.PlaylistLoaded
5-
import dev.arbjerg.lavalink.client.protocol.SearchResult
6-
import dev.arbjerg.lavalink.client.protocol.TrackLoaded
3+
import dev.arbjerg.lavalink.client.player.LoadFailed
4+
import dev.arbjerg.lavalink.client.player.PlaylistLoaded
5+
import dev.arbjerg.lavalink.client.player.SearchResult
6+
import dev.arbjerg.lavalink.client.player.TrackLoaded
77
import java.util.function.Consumer
88

99
/**

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

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import dev.arbjerg.lavalink.client.loadbalancing.ILoadBalancer
44
import dev.arbjerg.lavalink.client.loadbalancing.VoiceRegion
55
import dev.arbjerg.lavalink.client.loadbalancing.builtin.DefaultLoadBalancer
66
import dev.arbjerg.lavalink.client.event.ClientEvent
7+
import dev.arbjerg.lavalink.client.player.LavalinkPlayer
78
import dev.arbjerg.lavalink.internal.ReconnectTask
89
import reactor.core.Disposable
910
import reactor.core.publisher.Flux

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ package dev.arbjerg.lavalink.client
22

33
import dev.arbjerg.lavalink.client.event.ClientEvent
44
import dev.arbjerg.lavalink.client.http.HttpBuilder
5-
import dev.arbjerg.lavalink.client.protocol.*
6-
import dev.arbjerg.lavalink.client.protocol.Track
7-
import dev.arbjerg.lavalink.client.protocol.toCustom
5+
import dev.arbjerg.lavalink.client.player.*
6+
import dev.arbjerg.lavalink.client.player.Track
7+
import dev.arbjerg.lavalink.client.player.toCustom
88
import dev.arbjerg.lavalink.internal.*
99
import dev.arbjerg.lavalink.internal.error.RestException
1010
import dev.arbjerg.lavalink.internal.loadbalancing.Penalties

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

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package dev.arbjerg.lavalink.client
22

3+
import dev.arbjerg.lavalink.client.player.LavalinkPlayer
4+
import dev.arbjerg.lavalink.client.player.PlayerUpdateBuilder
35
import dev.arbjerg.lavalink.protocol.v4.VoiceState
46
import java.time.Duration
57
import java.util.function.Consumer

‎src/main/kotlin/dev/arbjerg/lavalink/client/event/events.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package dev.arbjerg.lavalink.client.event
22

33
import dev.arbjerg.lavalink.client.LavalinkNode
4-
import dev.arbjerg.lavalink.client.protocol.Track
5-
import dev.arbjerg.lavalink.client.protocol.TrackException
6-
import dev.arbjerg.lavalink.client.protocol.toCustom
4+
import dev.arbjerg.lavalink.client.player.Track
5+
import dev.arbjerg.lavalink.client.player.TrackException
6+
import dev.arbjerg.lavalink.client.player.toCustom
77
import dev.arbjerg.lavalink.protocol.v4.*
88
import dev.arbjerg.lavalink.protocol.v4.Message.EmittedEvent.TrackEndEvent.AudioTrackEndReason
99

‎src/main/kotlin/dev/arbjerg/lavalink/client/protocol/FilterBuilder.kt renamed to ‎src/main/kotlin/dev/arbjerg/lavalink/client/player/FilterBuilder.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package dev.arbjerg.lavalink.client.protocol
1+
package dev.arbjerg.lavalink.client.player
22

33
import dev.arbjerg.lavalink.internal.toJsonElement
44
import dev.arbjerg.lavalink.protocol.v4.*

‎src/main/kotlin/dev/arbjerg/lavalink/client/IUpdatablePlayer.kt renamed to ‎src/main/kotlin/dev/arbjerg/lavalink/client/player/IUpdatablePlayer.kt

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
package dev.arbjerg.lavalink.client
1+
package dev.arbjerg.lavalink.client.player
22

3-
import dev.arbjerg.lavalink.client.protocol.Track
43
import dev.arbjerg.lavalink.protocol.v4.Filters
54
import dev.arbjerg.lavalink.protocol.v4.PlayerUpdateTrack
65
import dev.arbjerg.lavalink.protocol.v4.VoiceState
7-
import dev.arbjerg.lavalink.client.protocol.TrackUpdateBuilder
86

97
interface IUpdatablePlayer {
108
/**
@@ -84,7 +82,7 @@ interface IUpdatablePlayer {
8482
* Please use [setVolume] to update the player's volume instead. Setting the volume via filters is
8583
* float based (1.0f is 100% volume) and takes the time of your buffer size to apply.
8684
*
87-
* @param filters The new filters to apply to the player. You can use the [dev.arbjerg.lavalink.client.protocol.FilterBuilder] to easily create this object.
85+
* @param filters The new filters to apply to the player. You can use the [dev.arbjerg.lavalink.client.player.FilterBuilder] to easily create this object.
8886
*
8987
* @return The updated builder, useful for chaining
9088
*/

‎src/main/kotlin/dev/arbjerg/lavalink/client/LavalinkPlayer.kt renamed to ‎src/main/kotlin/dev/arbjerg/lavalink/client/player/LavalinkPlayer.kt

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
package dev.arbjerg.lavalink.client
1+
package dev.arbjerg.lavalink.client.player
22

3+
import dev.arbjerg.lavalink.client.LavalinkNode
34
import dev.arbjerg.lavalink.client.loadbalancing.VoiceRegion
4-
import dev.arbjerg.lavalink.client.protocol.Track
5-
import dev.arbjerg.lavalink.client.protocol.toCustom
65
import dev.arbjerg.lavalink.protocol.v4.*
76
import kotlin.math.min
87

‎src/main/kotlin/dev/arbjerg/lavalink/client/PlayerUpdateBuilder.kt renamed to ‎src/main/kotlin/dev/arbjerg/lavalink/client/player/PlayerUpdateBuilder.kt

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1-
package dev.arbjerg.lavalink.client
1+
package dev.arbjerg.lavalink.client.player
22

3-
import dev.arbjerg.lavalink.client.protocol.Track
3+
import dev.arbjerg.lavalink.client.LavalinkNode
44
import dev.arbjerg.lavalink.internal.toKotlin
55
import dev.arbjerg.lavalink.internal.toLavalinkPlayer
66
import dev.arbjerg.lavalink.protocol.v4.*
77
import reactor.core.CoreSubscriber
88
import reactor.core.publisher.Mono
99

10-
class PlayerUpdateBuilder internal constructor(private val node: LavalinkNode, private val guildId: Long) : Mono<LavalinkPlayer>(), IUpdatablePlayer {
10+
class PlayerUpdateBuilder internal constructor(private val node: LavalinkNode, private val guildId: Long) : Mono<LavalinkPlayer>(),
11+
IUpdatablePlayer {
1112
private var trackUpdate: Omissible<PlayerUpdateTrack> = Omissible.omitted()
1213
private var position: Omissible<Long> = Omissible.omitted()
1314
private var endTime: Omissible<Long?> = Omissible.omitted()

‎src/main/kotlin/dev/arbjerg/lavalink/client/protocol/Track.kt renamed to ‎src/main/kotlin/dev/arbjerg/lavalink/client/player/Track.kt

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
package dev.arbjerg.lavalink.client.protocol
1+
package dev.arbjerg.lavalink.client.player
22

33
import com.fasterxml.jackson.databind.JsonNode
44
import dev.arbjerg.lavalink.internal.fromJsonElement
55
import dev.arbjerg.lavalink.internal.toJackson
66
import dev.arbjerg.lavalink.internal.toJsonElement
7-
import kotlinx.serialization.json.JsonObject
87
import kotlinx.serialization.json.jsonObject
98
import dev.arbjerg.lavalink.protocol.v4.Track as ProtocolTrack
109

‎src/main/kotlin/dev/arbjerg/lavalink/client/protocol/TrackUpdateBuilder.kt renamed to ‎src/main/kotlin/dev/arbjerg/lavalink/client/player/TrackUpdateBuilder.kt

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
package dev.arbjerg.lavalink.client.protocol
1+
package dev.arbjerg.lavalink.client.player
22

33
import dev.arbjerg.lavalink.internal.toJsonElement
44
import dev.arbjerg.lavalink.protocol.v4.Omissible
55
import dev.arbjerg.lavalink.protocol.v4.PlayerUpdateTrack
66
import dev.arbjerg.lavalink.protocol.v4.toOmissible
7-
import kotlinx.serialization.json.JsonObject
87
import kotlinx.serialization.json.jsonObject
98

109
/**

‎src/main/kotlin/dev/arbjerg/lavalink/client/protocol/loadResults.kt renamed to ‎src/main/kotlin/dev/arbjerg/lavalink/client/player/loadResults.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package dev.arbjerg.lavalink.client.protocol
1+
package dev.arbjerg.lavalink.client.player
22

33
import dev.arbjerg.lavalink.internal.toJackson
44
import dev.arbjerg.lavalink.protocol.v4.Exception as ProtocolException

‎src/main/kotlin/dev/arbjerg/lavalink/internal/LavalinkSocket.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package dev.arbjerg.lavalink.internal
33
import dev.arbjerg.lavalink.VERSION as CLIENT_VERSION
44
import dev.arbjerg.lavalink.client.LavalinkNode
55
import dev.arbjerg.lavalink.client.LinkState
6-
import dev.arbjerg.lavalink.client.protocol.toCustom
6+
import dev.arbjerg.lavalink.client.player.toCustom
77
import dev.arbjerg.lavalink.client.event.toClientEvent
88
import dev.arbjerg.lavalink.protocol.v4.Message
99
import dev.arbjerg.lavalink.protocol.v4.json

‎src/main/kotlin/dev/arbjerg/lavalink/internal/helpers.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package dev.arbjerg.lavalink.internal
22

33
import dev.arbjerg.lavalink.client.LavalinkNode
4-
import dev.arbjerg.lavalink.client.LavalinkPlayer
4+
import dev.arbjerg.lavalink.client.player.LavalinkPlayer
55
import dev.arbjerg.lavalink.protocol.v4.Player
66

77
internal fun Player.toLavalinkPlayer(node: LavalinkNode) = LavalinkPlayer(node, this)

‎src/test/java/JavaJDAExample.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import dev.arbjerg.lavalink.client.event.TrackStartEvent;
55
import dev.arbjerg.lavalink.client.loadbalancing.RegionGroup;
66
import dev.arbjerg.lavalink.client.loadbalancing.builtin.VoiceRegionPenaltyProvider;
7-
import dev.arbjerg.lavalink.client.protocol.*;
7+
import dev.arbjerg.lavalink.client.player.*;
88
import dev.arbjerg.lavalink.libraries.jda.JDAVoiceUpdateListener;
99
import net.dv8tion.jda.api.JDABuilder;
1010
import net.dv8tion.jda.api.entities.Guild;

‎src/test/kotlin/d4jTestScript.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import dev.arbjerg.lavalink.client.*
22
import dev.arbjerg.lavalink.client.event.TrackStartEvent
3-
import dev.arbjerg.lavalink.client.protocol.TrackUpdateBuilder
3+
import dev.arbjerg.lavalink.client.player.TrackUpdateBuilder
44
import dev.arbjerg.lavalink.libraries.discord4j.installVoiceHandler
55
import discord4j.core.DiscordClientBuilder
66
import discord4j.core.event.domain.interaction.ChatInputInteractionEvent

‎src/test/kotlin/testScript.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import dev.arbjerg.lavalink.client.event.StatsEvent
66
import dev.arbjerg.lavalink.client.event.TrackStartEvent
77
import dev.arbjerg.lavalink.client.loadbalancing.RegionGroup
88
import dev.arbjerg.lavalink.client.loadbalancing.builtin.VoiceRegionPenaltyProvider
9-
import dev.arbjerg.lavalink.client.protocol.*
9+
import dev.arbjerg.lavalink.client.player.*
1010
import dev.arbjerg.lavalink.libraries.jda.JDAVoiceUpdateListener
1111
import net.dv8tion.jda.api.JDABuilder
1212
import net.dv8tion.jda.api.events.GenericEvent

‎testbot/src/main/java/me/duncte123/testbot/AudioLoader.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import dev.arbjerg.lavalink.client.AbstractAudioLoadResultHandler;
44
import dev.arbjerg.lavalink.client.Link;
5-
import dev.arbjerg.lavalink.client.protocol.*;
5+
import dev.arbjerg.lavalink.client.player.*;
66
import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
77
import org.jetbrains.annotations.NotNull;
88

‎testbot/src/main/java/me/duncte123/testbot/JDAListener.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import dev.arbjerg.lavalink.client.LavalinkClient;
44
import dev.arbjerg.lavalink.client.Link;
5-
import dev.arbjerg.lavalink.client.protocol.FilterBuilder;
5+
import dev.arbjerg.lavalink.client.player.FilterBuilder;
66
import dev.arbjerg.lavalink.protocol.v4.Karaoke;
77
import net.dv8tion.jda.api.entities.Guild;
88
import net.dv8tion.jda.api.entities.GuildVoiceState;

0 commit comments

Comments
 (0)