aboutsummaryrefslogtreecommitdiff
path: root/azalea-client/src
diff options
context:
space:
mode:
Diffstat (limited to 'azalea-client/src')
-rwxr-xr-xazalea-client/src/chat.rs25
-rw-r--r--azalea-client/src/client.rs21
2 files changed, 23 insertions, 23 deletions
diff --git a/azalea-client/src/chat.rs b/azalea-client/src/chat.rs
index 5eadc0c3..24ccbfd5 100755
--- a/azalea-client/src/chat.rs
+++ b/azalea-client/src/chat.rs
@@ -1,13 +1,32 @@
-use std::time::{SystemTime, UNIX_EPOCH};
+//! Implementations of chat-related features.
+use crate::Client;
+use azalea_chat::Component;
use azalea_crypto::MessageSignature;
use azalea_protocol::packets::game::{
- clientbound_player_chat_packet::LastSeenMessagesUpdate,
+ clientbound_player_chat_packet::{ClientboundPlayerChatPacket, LastSeenMessagesUpdate},
+ clientbound_system_chat_packet::ClientboundSystemChatPacket,
serverbound_chat_command_packet::ServerboundChatCommandPacket,
serverbound_chat_packet::ServerboundChatPacket,
};
+use std::time::{SystemTime, UNIX_EPOCH};
-use crate::Client;
+/// A chat packet, either a system message or a chat message.
+#[derive(Debug, Clone)]
+pub enum ChatPacket {
+ System(ClientboundSystemChatPacket),
+ Player(Box<ClientboundPlayerChatPacket>),
+}
+
+impl ChatPacket {
+ /// Get the message shown in chat for this packet.
+ pub fn message(&self) -> Component {
+ match self {
+ ChatPacket::System(p) => p.content.clone(),
+ ChatPacket::Player(p) => p.message(false),
+ }
+ }
+}
impl Client {
/// Sends chat message to the server. This only sends the chat packet and
diff --git a/azalea-client/src/client.rs b/azalea-client/src/client.rs
index 85e5013e..326ba002 100644
--- a/azalea-client/src/client.rs
+++ b/azalea-client/src/client.rs
@@ -1,13 +1,11 @@
+pub use crate::chat::ChatPacket;
use crate::{movement::WalkDirection, plugins::Plugins, Account, Player};
use azalea_auth::game_profile::GameProfile;
-use azalea_chat::Component;
use azalea_core::{ChunkPos, ResourceLocation, Vec3};
use azalea_protocol::{
connect::{Connection, ConnectionError, ReadConnection, WriteConnection},
packets::{
game::{
- clientbound_player_chat_packet::ClientboundPlayerChatPacket,
- clientbound_system_chat_packet::ClientboundSystemChatPacket,
serverbound_accept_teleportation_packet::ServerboundAcceptTeleportationPacket,
serverbound_client_information_packet::ServerboundClientInformationPacket,
serverbound_custom_payload_packet::ServerboundCustomPayloadPacket,
@@ -63,23 +61,6 @@ pub enum Event {
Packet(Box<ClientboundGamePacket>),
}
-/// A chat packet, either a system message or a chat message.
-#[derive(Debug, Clone)]
-pub enum ChatPacket {
- System(ClientboundSystemChatPacket),
- Player(Box<ClientboundPlayerChatPacket>),
-}
-
-impl ChatPacket {
- /// Get the message shown in chat for this packet.
- pub fn message(&self) -> Component {
- match self {
- ChatPacket::System(p) => p.content.clone(),
- ChatPacket::Player(p) => p.message(false),
- }
- }
-}
-
/// A player that you control that is currently in a Minecraft server.
#[derive(Clone)]
pub struct Client {