re-export azalea-chat from azalea, and rename azalea::chat to client_chat

6 files changed, 6 insertions, 5 deletions

diff --git a/azalea/src/client_impl/chat.rs b/azalea/src/client_impl/chat.rs
index 2490e08c..f023fbc1 100644
--- a/azalea/src/client_impl/chat.rs
+++ b/azalea/src/client_impl/chat.rs
@@ -1,4 +1,4 @@
-use azalea_client::chat::{ChatKind, SendChatEvent, handler::SendChatKindEvent};
+use azalea_client::client_chat::{ChatKind, SendChatEvent, handler::SendChatKindEvent};
 
 use crate::Client;
 
diff --git a/azalea/src/events.rs b/azalea/src/events.rs
index 4bef3165..0af11c6d 100644
--- a/azalea/src/events.rs
+++ b/azalea/src/events.rs
@@ -17,8 +17,8 @@ use derive_more::{Deref, DerefMut};
 use tokio::sync::mpsc;
 
 use crate::{
-    chat::{ChatPacket, ChatReceivedEvent},
     chunks::ReceiveChunkEvent,
+    client_chat::{ChatPacket, ChatReceivedEvent},
     disconnect::DisconnectEvent,
     packet::game::{
         AddPlayerEvent, DeathEvent, KeepAliveEvent, RemovePlayerEvent, UpdatePlayerEvent,
diff --git a/azalea/src/lib.rs b/azalea/src/lib.rs
index 3be74b9e..f70a77fa 100644
--- a/azalea/src/lib.rs
+++ b/azalea/src/lib.rs
@@ -47,6 +47,7 @@ pub use azalea_registry as registry;
 #[doc(hidden)]
 #[deprecated(note = "renamed to `Identifier`.")]
 pub type ResourceLocation = azalea_registry::identifier::Identifier;
+pub use azalea_chat as chat;
 pub use azalea_registry::identifier::Identifier;
 pub use azalea_world as world;
 pub use bevy_app as app;
diff --git a/azalea/src/pathfinder/debug.rs b/azalea/src/pathfinder/debug.rs
index 0117479c..ea34a43c 100644
--- a/azalea/src/pathfinder/debug.rs
+++ b/azalea/src/pathfinder/debug.rs
@@ -1,4 +1,4 @@
-use azalea_client::{chat::SendChatEvent, local_player::WorldHolder};
+use azalea_client::{client_chat::SendChatEvent, local_player::WorldHolder};
 use azalea_core::position::Vec3;
 use bevy_ecs::prelude::*;
 
diff --git a/azalea/src/swarm/chat.rs b/azalea/src/swarm/chat.rs
index c5e3eba3..ed19f0f5 100644
--- a/azalea/src/swarm/chat.rs
+++ b/azalea/src/swarm/chat.rs
@@ -15,7 +15,7 @@
 
 use std::collections::VecDeque;
 
-use azalea_client::chat::{ChatPacket, ChatReceivedEvent};
+use azalea_client::client_chat::{ChatPacket, ChatReceivedEvent};
 use bevy_app::{App, Plugin, Update};
 
 use super::{Swarm, SwarmEvent};
diff --git a/azalea/src/swarm/mod.rs b/azalea/src/swarm/mod.rs
index 616733f8..69f2b3e5 100644
--- a/azalea/src/swarm/mod.rs
+++ b/azalea/src/swarm/mod.rs
@@ -12,7 +12,7 @@ use std::sync::{
     atomic::{self, AtomicBool},
 };
 
-use azalea_client::{account::Account, chat::ChatPacket, join::ConnectOpts};
+use azalea_client::{account::Account, client_chat::ChatPacket, join::ConnectOpts};
 use azalea_entity::LocalEntity;
 use azalea_protocol::address::ResolvedAddr;
 use azalea_world::Worlds;