aboutsummaryrefslogtreecommitdiff
path: root/azalea-client/src/chat.rs
diff options
context:
space:
mode:
authormat <27899617+mat-1@users.noreply.github.com>2022-12-07 21:09:58 -0600
committerGitHub <noreply@github.com>2022-12-07 21:09:58 -0600
commit7d901e39bc10a855b545d7b6c167f45148a1fb0a (patch)
tree88fe0a8f2f04f49f4df90e2f5462aa35a4278c68 /azalea-client/src/chat.rs
parent9f5e5c092be9167e4d5222fdee4a1d2c419e5052 (diff)
downloadazalea-drasl-7d901e39bc10a855b545d7b6c167f45148a1fb0a.tar.xz
1.19.3 (#34)
* start updating to 22w42a * work a bit more on 22w42a * player chat packet * serverbound hello packet * Update mod.rs * add more stuff to clientbound player chat packet * ClientboundPlayerInfoUpdatePacket * features enabled and container closed * serverbound chat packets * make it compile * 22w43a * ServerboundChatSessionUpdatePacket * profile_public_key isn't Option anymore * Update bitset.rs * joining a server works * fix entitydatavalue * backtraces + fix clientbound chat message * fix some warnings and add more ecomments * 22w44a * generate en_us.json * add updating guide to codegen/readme * fix some markdown * update list of generated things * metadata stuff * Replace PJS generator mod with PixLyzer (#38) * pixlizer extractor * start working on shape extraction * fix generating language * fix pixlyzer shape generation * use empty_shape * generate blocks and shapes * update pixlyzer dir * Revert "update pixlyzer dir" This reverts commit ee9a0e7a49936dd8569c610ba9b6455895eeff71. * fix * fix * Revert "fix" This reverts commit ad12ddcb009ccc4eeb13ddef0871db1d9322ab7d. * fix * detect pixlyzer fail * fix pixlyzer * 22w45a * gen entities * add async-trait dep * update codegen/readme.md * explain when rust_log should be used * remove some unused code * start fixing pixlyzer issues * fix a thing in codegen * almost fixed * more progress towards 1.19.3 * 1.19.3-pre2 * fixes * revert some hardcoded property names * Delete clientbound_player_info_packet.rs * handle 1.19.3 player info packets * handle playerinforemove * start updating to 1.19.3-rc1 * optional registries work * fix some issues with 1.19.3 chat doesn't work yet * aaaaaaaaaaaaaaaaa * oh * ignore unused shapes * uncomment generate_blocks * fix migrate * 1.19.3-rc2 * fix clippy warnings * 1.19.3-rc3 * split the azalea-buf macro into separate modules * improve Recipe in protocol * 1.19.3
Diffstat (limited to 'azalea-client/src/chat.rs')
-rwxr-xr-xazalea-client/src/chat.rs25
1 files changed, 9 insertions, 16 deletions
diff --git a/azalea-client/src/chat.rs b/azalea-client/src/chat.rs
index 26f37d58..510bf043 100755
--- a/azalea-client/src/chat.rs
+++ b/azalea-client/src/chat.rs
@@ -2,12 +2,11 @@
use crate::Client;
use azalea_chat::Component;
-use azalea_crypto::MessageSignature;
use azalea_protocol::packets::game::{
- clientbound_player_chat_packet::{ClientboundPlayerChatPacket, LastSeenMessagesUpdate},
+ clientbound_player_chat_packet::ClientboundPlayerChatPacket,
clientbound_system_chat_packet::ClientboundSystemChatPacket,
serverbound_chat_command_packet::ServerboundChatCommandPacket,
- serverbound_chat_packet::ServerboundChatPacket,
+ serverbound_chat_packet::{LastSeenMessagesUpdate, ServerboundChatPacket},
};
use std::{
sync::Arc,
@@ -33,7 +32,7 @@ impl ChatPacket {
pub fn message(&self) -> Component {
match self {
ChatPacket::System(p) => p.content.clone(),
- ChatPacket::Player(p) => p.message(false),
+ ChatPacket::Player(p) => p.message(),
}
}
@@ -47,7 +46,7 @@ impl ChatPacket {
// If it's a player chat packet, then the sender and content
// are already split for us.
Some(p.chat_type.name.to_string()),
- p.message.content(false).to_string(),
+ p.body.content.clone(),
),
ChatPacket::System(p) => {
let message = p.content.to_string();
@@ -88,7 +87,7 @@ impl Client {
/// so you should use that instead.
pub async fn send_chat_packet(&self, message: &str) -> Result<(), std::io::Error> {
// TODO: chat signing
- let signature = sign_message();
+ // let signature = sign_message();
let packet = ServerboundChatPacket {
message: message.to_string(),
timestamp: SystemTime::now()
@@ -98,8 +97,7 @@ impl Client {
.try_into()
.expect("Instant should fit into a u64"),
salt: azalea_crypto::make_salt(),
- signature,
- signed_preview: false,
+ signature: None,
last_seen_messages: LastSeenMessagesUpdate::default(),
}
.get();
@@ -120,7 +118,6 @@ impl Client {
.expect("Instant should fit into a u64"),
salt: azalea_crypto::make_salt(),
argument_signatures: vec![],
- signed_preview: false,
last_seen_messages: LastSeenMessagesUpdate::default(),
}
.get();
@@ -143,14 +140,10 @@ impl Client {
self.send_chat_packet(message).await
}
}
-
- // will be used for when the server tells the client about a chat preview
- // with custom formatting
- // pub fn acknowledge_preview(&self, message: &str) {}
}
// TODO
// MessageSigner, ChatMessageContent, LastSeenMessages
-fn sign_message() -> MessageSignature {
- MessageSignature::default()
-}
+// fn sign_message() -> MessageSignature {
+// MessageSignature::default()
+// }