Move events to events package

lavalink-devs · Mar 17, 2024 · 77878ca · 77878ca
1 parent 133a10c
commit 77878ca
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 6 deletions.
diff --git a/src/main/kotlin/dev/arbjerg/lavalink/client/LavalinkClient.kt b/src/main/kotlin/dev/arbjerg/lavalink/client/LavalinkClient.kt
@@ -3,7 +3,7 @@ package dev.arbjerg.lavalink.client
 import dev.arbjerg.lavalink.client.loadbalancing.ILoadBalancer
 import dev.arbjerg.lavalink.client.loadbalancing.VoiceRegion
 import dev.arbjerg.lavalink.client.loadbalancing.builtin.DefaultLoadBalancer
-import dev.arbjerg.lavalink.client.protocol.ClientEvent
+import dev.arbjerg.lavalink.client.event.ClientEvent
 import dev.arbjerg.lavalink.internal.ReconnectTask
 import reactor.core.Disposable
 import reactor.core.publisher.Flux

diff --git a/src/main/kotlin/dev/arbjerg/lavalink/client/LavalinkNode.kt b/src/main/kotlin/dev/arbjerg/lavalink/client/LavalinkNode.kt
@@ -1,5 +1,6 @@
 package dev.arbjerg.lavalink.client
 
+import dev.arbjerg.lavalink.client.event.ClientEvent
 import dev.arbjerg.lavalink.client.http.HttpBuilder
 import dev.arbjerg.lavalink.client.protocol.*
 import dev.arbjerg.lavalink.client.protocol.Track

diff --git a/...rbjerg/lavalink/client/protocol/events.kt → ...v/arbjerg/lavalink/client/event/events.kt b/...rbjerg/lavalink/client/protocol/events.kt → ...v/arbjerg/lavalink/client/event/events.kt
@@ -1,6 +1,9 @@
-package dev.arbjerg.lavalink.client.protocol
+package dev.arbjerg.lavalink.client.event
 
 import dev.arbjerg.lavalink.client.LavalinkNode
+import dev.arbjerg.lavalink.client.protocol.Track
+import dev.arbjerg.lavalink.client.protocol.TrackException
+import dev.arbjerg.lavalink.client.protocol.toCustom
 import dev.arbjerg.lavalink.protocol.v4.*
 import dev.arbjerg.lavalink.protocol.v4.Message.EmittedEvent.TrackEndEvent.AudioTrackEndReason
 

diff --git a/src/main/kotlin/dev/arbjerg/lavalink/internal/LavalinkSocket.kt b/src/main/kotlin/dev/arbjerg/lavalink/internal/LavalinkSocket.kt
@@ -4,7 +4,7 @@ import dev.arbjerg.lavalink.VERSION as CLIENT_VERSION
 import dev.arbjerg.lavalink.client.LavalinkNode
 import dev.arbjerg.lavalink.client.LinkState
 import dev.arbjerg.lavalink.client.protocol.toCustom
-import dev.arbjerg.lavalink.client.protocol.toClientEvent
+import dev.arbjerg.lavalink.client.event.toClientEvent
 import dev.arbjerg.lavalink.protocol.v4.Message
 import dev.arbjerg.lavalink.protocol.v4.json
 import okhttp3.Request

diff --git a/src/test/java/JavaJDAExample.java b/src/test/java/JavaJDAExample.java
@@ -1,4 +1,7 @@
 import dev.arbjerg.lavalink.client.*;
+import dev.arbjerg.lavalink.client.event.EmittedEvent;
+import dev.arbjerg.lavalink.client.event.StatsEvent;
+import dev.arbjerg.lavalink.client.event.TrackStartEvent;
 import dev.arbjerg.lavalink.client.loadbalancing.RegionGroup;
 import dev.arbjerg.lavalink.client.loadbalancing.builtin.VoiceRegionPenaltyProvider;
 import dev.arbjerg.lavalink.client.protocol.*;
@@ -77,7 +80,7 @@ private void registerLavalinkNodes() {
     }
 
     private void registerLavalinkListeners() {
-        this.client.on(dev.arbjerg.lavalink.client.protocol.ReadyEvent.class).subscribe((event) -> {
+        this.client.on(dev.arbjerg.lavalink.client.event.ReadyEvent.class).subscribe((event) -> {
             final LavalinkNode node = event.getNode();
 
             System.out.printf(

diff --git a/src/test/kotlin/d4jTestScript.kt b/src/test/kotlin/d4jTestScript.kt
@@ -1,5 +1,5 @@
 import dev.arbjerg.lavalink.client.*
-import dev.arbjerg.lavalink.client.protocol.TrackStartEvent
+import dev.arbjerg.lavalink.client.event.TrackStartEvent
 import dev.arbjerg.lavalink.client.protocol.TrackUpdateBuilder
 import dev.arbjerg.lavalink.libraries.discord4j.installVoiceHandler
 import discord4j.core.DiscordClientBuilder

diff --git a/src/test/kotlin/testScript.kt b/src/test/kotlin/testScript.kt
@@ -1,5 +1,9 @@
 import com.github.topi314.lavasearch.protocol.SearchResult as TopiSearchResult
 import dev.arbjerg.lavalink.client.*
+import dev.arbjerg.lavalink.client.event.EmittedEvent
+import dev.arbjerg.lavalink.client.event.ReadyEvent
+import dev.arbjerg.lavalink.client.event.StatsEvent
+import dev.arbjerg.lavalink.client.event.TrackStartEvent
 import dev.arbjerg.lavalink.client.loadbalancing.RegionGroup
 import dev.arbjerg.lavalink.client.loadbalancing.builtin.VoiceRegionPenaltyProvider
 import dev.arbjerg.lavalink.client.protocol.*

diff --git a/testbot/src/main/java/me/duncte123/testbot/Main.java b/testbot/src/main/java/me/duncte123/testbot/Main.java
@@ -1,9 +1,9 @@
 package me.duncte123.testbot;
 
 import dev.arbjerg.lavalink.client.*;
+import dev.arbjerg.lavalink.client.event.*;
 import dev.arbjerg.lavalink.client.loadbalancing.RegionGroup;
 import dev.arbjerg.lavalink.client.loadbalancing.builtin.VoiceRegionPenaltyProvider;
-import dev.arbjerg.lavalink.client.protocol.*;
 import dev.arbjerg.lavalink.libraries.jda.JDAVoiceUpdateListener;
 import net.dv8tion.jda.api.JDABuilder;
 import net.dv8tion.jda.api.requests.GatewayIntent;