slime/rust-minecraft-protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add PluginMessage, set appropriate string length for Identifier types

Browse Source
This commit is contained in:
timvisee 2021-11-14 13:30:41 +01:00
parent a4fc2bcf7b
commit bef4fa8c00
No known key found for this signature in database
GPG Key ID: B8DB720BC383E172
1 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
protocol/src/version/v1_17_1/game.rs
View File

@ -14,6 +14,7 @@ pub use super::super::v1_14_4::game::{
pub enum GameServerBoundPacket { pub enum GameServerBoundPacket {
ServerBoundChatMessage(ServerBoundChatMessage), ServerBoundChatMessage(ServerBoundChatMessage),
PluginMessage(PluginMessage),
ServerBoundKeepAlive(ServerBoundKeepAlive), ServerBoundKeepAlive(ServerBoundKeepAlive),
ServerBoundAbilities(ServerBoundAbilities), ServerBoundAbilities(ServerBoundAbilities),
} }
@ -27,6 +28,7 @@ pub enum GameClientBoundPacket {
BossBar(BossBar), BossBar(BossBar),
EntityAction(EntityAction), EntityAction(EntityAction),
PluginMessage(PluginMessage),
Respawn(Respawn), Respawn(Respawn),
PlayerPositionAndLook(PlayerPositionAndLook), PlayerPositionAndLook(PlayerPositionAndLook),
SpawnPosition(SpawnPosition), SpawnPosition(SpawnPosition),
@ -40,6 +42,7 @@ impl GameServerBoundPacket {
pub fn get_type_id(&self) -> u8 { pub fn get_type_id(&self) -> u8 {
match self { match self {
GameServerBoundPacket::ServerBoundChatMessage(_) => 0x03, GameServerBoundPacket::ServerBoundChatMessage(_) => 0x03,
GameServerBoundPacket::PluginMessage(_) => 0x0A,
GameServerBoundPacket::ServerBoundKeepAlive(_) => 0x0F, GameServerBoundPacket::ServerBoundKeepAlive(_) => 0x0F,
GameServerBoundPacket::ServerBoundAbilities(_) => 0x19, GameServerBoundPacket::ServerBoundAbilities(_) => 0x19,
} }
@ -52,11 +55,21 @@ impl GameServerBoundPacket {
Ok(GameServerBoundPacket::ServerBoundChatMessage(chat_message)) Ok(GameServerBoundPacket::ServerBoundChatMessage(chat_message))
} }
0x0A => {
let plugin_message = PluginMessage::decode(reader)?;
Ok(GameServerBoundPacket::PluginMessage(plugin_message))
}
0x0F => { 0x0F => {
let keep_alive = ServerBoundKeepAlive::decode(reader)?; let keep_alive = ServerBoundKeepAlive::decode(reader)?;
Ok(GameServerBoundPacket::ServerBoundKeepAlive(keep_alive)) Ok(GameServerBoundPacket::ServerBoundKeepAlive(keep_alive))
} }
0x19 => {
let abilities = ServerBoundAbilities::decode(reader)?;
Ok(GameServerBoundPacket::ServerBoundAbilities(abilities))
}
_ => Err(DecodeError::UnknownPacketType { type_id }), _ => Err(DecodeError::UnknownPacketType { type_id }),
} }
} }
@ -66,6 +79,7 @@ impl GameClientBoundPacket {
pub fn get_type_id(&self) -> u8 { pub fn get_type_id(&self) -> u8 {
match self { match self {
GameClientBoundPacket::ClientBoundChatMessage(_) => 0x0E, GameClientBoundPacket::ClientBoundChatMessage(_) => 0x0E,
GameClientBoundPacket::PluginMessage(_) => 0x18,
GameClientBoundPacket::GameDisconnect(_) => 0x1A, GameClientBoundPacket::GameDisconnect(_) => 0x1A,
GameClientBoundPacket::ClientBoundKeepAlive(_) => 0x20, GameClientBoundPacket::ClientBoundKeepAlive(_) => 0x20,
GameClientBoundPacket::ChunkData(_) => 0x21, GameClientBoundPacket::ChunkData(_) => 0x21,
@ -89,6 +103,11 @@ impl GameClientBoundPacket {
Ok(GameClientBoundPacket::ClientBoundChatMessage(chat_message)) Ok(GameClientBoundPacket::ClientBoundChatMessage(chat_message))
} }
0x18 => {
let plugin_message = PluginMessage::decode(reader)?;
Ok(GameClientBoundPacket::PluginMessage(plugin_message))
}
0x1A => { 0x1A => {
let game_disconnect = GameDisconnect::decode(reader)?; let game_disconnect = GameDisconnect::decode(reader)?;
@ -151,6 +170,14 @@ impl GameClientBoundPacket {
} }
} }
// TODO(timvisee): implement new()
#[derive(Encoder, Decoder, Debug)]
pub struct PluginMessage {
#[data_type(max_length = 32767)]
pub channel: String,
pub data: Vec<u8>,
}
// TODO(timvisee): implement new() // TODO(timvisee): implement new()
// TODO(timvisee): remove clone? // TODO(timvisee): remove clone?
#[derive(Clone, Encoder, Decoder, Debug)] #[derive(Clone, Encoder, Decoder, Debug)]
@ -159,9 +186,11 @@ pub struct JoinGame {
pub hardcore: bool, pub hardcore: bool,
pub game_mode: u8, pub game_mode: u8,
pub previous_game_mode: u8, pub previous_game_mode: u8,
// TODO: max string length: 32767
pub world_names: Vec<String>, pub world_names: Vec<String>,
pub dimension_codec: CompoundTag, pub dimension_codec: CompoundTag,
pub dimension: CompoundTag, pub dimension: CompoundTag,
#[data_type(max_length = 32767)]
pub world_name: String, pub world_name: String,
pub hashed_seed: i64, pub hashed_seed: i64,
#[data_type(with = "var_int")] #[data_type(with = "var_int")]
@ -178,6 +207,7 @@ pub struct JoinGame {
#[derive(Encoder, Decoder, Debug)] #[derive(Encoder, Decoder, Debug)]
pub struct Respawn { pub struct Respawn {
pub dimension: CompoundTag, pub dimension: CompoundTag,
#[data_type(max_length = 32767)]
pub world_name: String, pub world_name: String,
pub hashed_seed: i64, pub hashed_seed: i64,
pub game_mode: u8, pub game_mode: u8,