From 77878ca449dbe1007bdd2c0d7221cc064099706b Mon Sep 17 00:00:00 2001
From: duncte123 <contact@duncte123.me>
Date: Sun, 17 Mar 2024 16:57:45 +0100
Subject: [PATCH] Move events to events package

---
 .../kotlin/dev/arbjerg/lavalink/client/LavalinkClient.kt     | 2 +-
 src/main/kotlin/dev/arbjerg/lavalink/client/LavalinkNode.kt  | 1 +
 .../arbjerg/lavalink/client/{protocol => event}/events.kt    | 5 ++++-
 .../kotlin/dev/arbjerg/lavalink/internal/LavalinkSocket.kt   | 2 +-
 src/test/java/JavaJDAExample.java                            | 5 ++++-
 src/test/kotlin/d4jTestScript.kt                             | 2 +-
 src/test/kotlin/testScript.kt                                | 4 ++++
 testbot/src/main/java/me/duncte123/testbot/Main.java         | 2 +-
 8 files changed, 17 insertions(+), 6 deletions(-)
 rename src/main/kotlin/dev/arbjerg/lavalink/client/{protocol => event}/events.kt (92%)

diff --git a/src/main/kotlin/dev/arbjerg/lavalink/client/LavalinkClient.kt b/src/main/kotlin/dev/arbjerg/lavalink/client/LavalinkClient.kt
index 7bfe4ee..4527970 100644
--- 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
index 7580e5a..9478bec 100644
--- 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/src/main/kotlin/dev/arbjerg/lavalink/client/protocol/events.kt b/src/main/kotlin/dev/arbjerg/lavalink/client/event/events.kt
similarity index 92%
rename from src/main/kotlin/dev/arbjerg/lavalink/client/protocol/events.kt
rename to src/main/kotlin/dev/arbjerg/lavalink/client/event/events.kt
index 0eec410..812eac9 100644
--- a/src/main/kotlin/dev/arbjerg/lavalink/client/protocol/events.kt
+++ b/src/main/kotlin/dev/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
index de826ba..757e7a4 100644
--- 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
index 7c1043d..2323316 100644
--- 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
index 6bff34d..31295b8 100644
--- 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
index 7966d43..aa5a7d3 100644
--- 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
index 9c74422..e1a4ccb 100644
--- 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;