Skip to content

Commit 77878ca

Browse files
committed
Move events to events package
1 parent 133a10c commit 77878ca

File tree

8 files changed

+17
-6
lines changed

8 files changed

+17
-6
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package dev.arbjerg.lavalink.client
33
import dev.arbjerg.lavalink.client.loadbalancing.ILoadBalancer
44
import dev.arbjerg.lavalink.client.loadbalancing.VoiceRegion
55
import dev.arbjerg.lavalink.client.loadbalancing.builtin.DefaultLoadBalancer
6-
import dev.arbjerg.lavalink.client.protocol.ClientEvent
6+
import dev.arbjerg.lavalink.client.event.ClientEvent
77
import dev.arbjerg.lavalink.internal.ReconnectTask
88
import reactor.core.Disposable
99
import reactor.core.publisher.Flux

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package dev.arbjerg.lavalink.client
22

3+
import dev.arbjerg.lavalink.client.event.ClientEvent
34
import dev.arbjerg.lavalink.client.http.HttpBuilder
45
import dev.arbjerg.lavalink.client.protocol.*
56
import dev.arbjerg.lavalink.client.protocol.Track

src/main/kotlin/dev/arbjerg/lavalink/client/protocol/events.kt renamed to src/main/kotlin/dev/arbjerg/lavalink/client/event/events.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
package dev.arbjerg.lavalink.client.protocol
1+
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
47
import dev.arbjerg.lavalink.protocol.v4.*
58
import dev.arbjerg.lavalink.protocol.v4.Message.EmittedEvent.TrackEndEvent.AudioTrackEndReason
69

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import dev.arbjerg.lavalink.VERSION as CLIENT_VERSION
44
import dev.arbjerg.lavalink.client.LavalinkNode
55
import dev.arbjerg.lavalink.client.LinkState
66
import dev.arbjerg.lavalink.client.protocol.toCustom
7-
import dev.arbjerg.lavalink.client.protocol.toClientEvent
7+
import dev.arbjerg.lavalink.client.event.toClientEvent
88
import dev.arbjerg.lavalink.protocol.v4.Message
99
import dev.arbjerg.lavalink.protocol.v4.json
1010
import okhttp3.Request

src/test/java/JavaJDAExample.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
import dev.arbjerg.lavalink.client.*;
2+
import dev.arbjerg.lavalink.client.event.EmittedEvent;
3+
import dev.arbjerg.lavalink.client.event.StatsEvent;
4+
import dev.arbjerg.lavalink.client.event.TrackStartEvent;
25
import dev.arbjerg.lavalink.client.loadbalancing.RegionGroup;
36
import dev.arbjerg.lavalink.client.loadbalancing.builtin.VoiceRegionPenaltyProvider;
47
import dev.arbjerg.lavalink.client.protocol.*;
@@ -77,7 +80,7 @@ private void registerLavalinkNodes() {
7780
}
7881

7982
private void registerLavalinkListeners() {
80-
this.client.on(dev.arbjerg.lavalink.client.protocol.ReadyEvent.class).subscribe((event) -> {
83+
this.client.on(dev.arbjerg.lavalink.client.event.ReadyEvent.class).subscribe((event) -> {
8184
final LavalinkNode node = event.getNode();
8285

8386
System.out.printf(

src/test/kotlin/d4jTestScript.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import dev.arbjerg.lavalink.client.*
2-
import dev.arbjerg.lavalink.client.protocol.TrackStartEvent
2+
import dev.arbjerg.lavalink.client.event.TrackStartEvent
33
import dev.arbjerg.lavalink.client.protocol.TrackUpdateBuilder
44
import dev.arbjerg.lavalink.libraries.discord4j.installVoiceHandler
55
import discord4j.core.DiscordClientBuilder

src/test/kotlin/testScript.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
import com.github.topi314.lavasearch.protocol.SearchResult as TopiSearchResult
22
import dev.arbjerg.lavalink.client.*
3+
import dev.arbjerg.lavalink.client.event.EmittedEvent
4+
import dev.arbjerg.lavalink.client.event.ReadyEvent
5+
import dev.arbjerg.lavalink.client.event.StatsEvent
6+
import dev.arbjerg.lavalink.client.event.TrackStartEvent
37
import dev.arbjerg.lavalink.client.loadbalancing.RegionGroup
48
import dev.arbjerg.lavalink.client.loadbalancing.builtin.VoiceRegionPenaltyProvider
59
import dev.arbjerg.lavalink.client.protocol.*

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package me.duncte123.testbot;
22

33
import dev.arbjerg.lavalink.client.*;
4+
import dev.arbjerg.lavalink.client.event.*;
45
import dev.arbjerg.lavalink.client.loadbalancing.RegionGroup;
56
import dev.arbjerg.lavalink.client.loadbalancing.builtin.VoiceRegionPenaltyProvider;
6-
import dev.arbjerg.lavalink.client.protocol.*;
77
import dev.arbjerg.lavalink.libraries.jda.JDAVoiceUpdateListener;
88
import net.dv8tion.jda.api.JDABuilder;
99
import net.dv8tion.jda.api.requests.GatewayIntent;

0 commit comments

Comments
 (0)