From f45991a717248bfae910c550c8f3303b16395a68 Mon Sep 17 00:00:00 2001 From: Alexander Medvedev Date: Sun, 23 Feb 2025 14:23:06 +0100 Subject: [PATCH] pumpkin-protocol: make more fields public --- .../src/client/config/config_disconnect.rs | 2 +- pumpkin-protocol/src/client/config/cookie_request.rs | 2 +- pumpkin-protocol/src/client/config/known_packs.rs | 2 +- pumpkin-protocol/src/client/config/plugin_message.rs | 4 ++-- pumpkin-protocol/src/client/config/registry_data.rs | 4 ++-- pumpkin-protocol/src/client/config/transfer.rs | 4 ++-- .../src/client/login/encryption_request.rs | 12 ++++++------ .../src/client/login/login_disconnect.rs | 2 +- pumpkin-protocol/src/client/login/plugin_request.rs | 6 +++--- pumpkin-protocol/src/client/login/set_compression.rs | 2 +- .../src/client/play/acknowledge_block.rs | 2 +- pumpkin-protocol/src/client/play/disconnect.rs | 2 +- pumpkin-protocol/src/client/play/keep_alive.rs | 2 +- pumpkin-protocol/src/client/play/ping_response.rs | 2 +- pumpkin-protocol/src/client/play/player_position.rs | 12 ++++++------ 15 files changed, 30 insertions(+), 30 deletions(-) diff --git a/pumpkin-protocol/src/client/config/config_disconnect.rs b/pumpkin-protocol/src/client/config/config_disconnect.rs index 387d69798..5b07b6ea8 100644 --- a/pumpkin-protocol/src/client/config/config_disconnect.rs +++ b/pumpkin-protocol/src/client/config/config_disconnect.rs @@ -5,7 +5,7 @@ use serde::Deserialize; #[derive(serde::Serialize, Deserialize)] #[packet(CONFIG_DISCONNECT)] pub struct CConfigDisconnect<'a> { - reason: &'a str, + pub reason: &'a str, } impl<'a> CConfigDisconnect<'a> { diff --git a/pumpkin-protocol/src/client/config/cookie_request.rs b/pumpkin-protocol/src/client/config/cookie_request.rs index 799990ae3..39b15587c 100644 --- a/pumpkin-protocol/src/client/config/cookie_request.rs +++ b/pumpkin-protocol/src/client/config/cookie_request.rs @@ -7,7 +7,7 @@ use crate::codec::identifier::Identifier; #[packet(CONFIG_COOKIE_REQUEST)] /// Requests a cookie that was previously stored. pub struct CCookieRequest<'a> { - key: &'a Identifier, + pub key: &'a Identifier, } impl<'a> CCookieRequest<'a> { diff --git a/pumpkin-protocol/src/client/config/known_packs.rs b/pumpkin-protocol/src/client/config/known_packs.rs index bc659f9f1..ce3714781 100644 --- a/pumpkin-protocol/src/client/config/known_packs.rs +++ b/pumpkin-protocol/src/client/config/known_packs.rs @@ -6,7 +6,7 @@ use crate::{ClientPacket, KnownPack, bytebuf::ByteBufMut}; #[packet(CONFIG_SELECT_KNOWN_PACKS)] pub struct CKnownPacks<'a> { - known_packs: &'a [KnownPack<'a>], + pub known_packs: &'a [KnownPack<'a>], } impl<'a> CKnownPacks<'a> { diff --git a/pumpkin-protocol/src/client/config/plugin_message.rs b/pumpkin-protocol/src/client/config/plugin_message.rs index 9ec4a2563..cb7b986ab 100644 --- a/pumpkin-protocol/src/client/config/plugin_message.rs +++ b/pumpkin-protocol/src/client/config/plugin_message.rs @@ -5,8 +5,8 @@ use serde::Serialize; #[derive(Serialize)] #[packet(CONFIG_CUSTOM_PAYLOAD)] pub struct CPluginMessage<'a> { - channel: &'a str, - data: &'a [u8], + pub channel: &'a str, + pub data: &'a [u8], } impl<'a> CPluginMessage<'a> { diff --git a/pumpkin-protocol/src/client/config/registry_data.rs b/pumpkin-protocol/src/client/config/registry_data.rs index 735c72e91..fa4164263 100644 --- a/pumpkin-protocol/src/client/config/registry_data.rs +++ b/pumpkin-protocol/src/client/config/registry_data.rs @@ -7,8 +7,8 @@ use crate::{ClientPacket, bytebuf::ByteBufMut, codec::identifier::Identifier}; #[packet(CONFIG_REGISTRY_DATA)] pub struct CRegistryData<'a> { - registry_id: &'a Identifier, - entries: &'a [RegistryEntry], + pub registry_id: &'a Identifier, + pub entries: &'a [RegistryEntry], } impl<'a> CRegistryData<'a> { diff --git a/pumpkin-protocol/src/client/config/transfer.rs b/pumpkin-protocol/src/client/config/transfer.rs index 6c2dd5d55..d580124ac 100644 --- a/pumpkin-protocol/src/client/config/transfer.rs +++ b/pumpkin-protocol/src/client/config/transfer.rs @@ -6,8 +6,8 @@ use serde::Serialize; #[derive(Serialize)] #[packet(CONFIG_TRANSFER)] pub struct CTransfer<'a> { - host: &'a str, - port: &'a VarInt, + pub host: &'a str, + pub port: &'a VarInt, } impl<'a> CTransfer<'a> { diff --git a/pumpkin-protocol/src/client/login/encryption_request.rs b/pumpkin-protocol/src/client/login/encryption_request.rs index f03d08239..b67fdccbf 100644 --- a/pumpkin-protocol/src/client/login/encryption_request.rs +++ b/pumpkin-protocol/src/client/login/encryption_request.rs @@ -7,12 +7,12 @@ use crate::VarInt; #[derive(Serialize, Deserialize)] #[packet(LOGIN_HELLO)] pub struct CEncryptionRequest<'a> { - server_id: &'a str, // 20 - public_key_length: VarInt, - public_key: &'a [u8], - verify_token_length: VarInt, - verify_token: &'a [u8], - should_authenticate: bool, + pub server_id: &'a str, // 20 + pub public_key_length: VarInt, + pub public_key: &'a [u8], + pub verify_token_length: VarInt, + pub verify_token: &'a [u8], + pub should_authenticate: bool, } impl<'a> CEncryptionRequest<'a> { diff --git a/pumpkin-protocol/src/client/login/login_disconnect.rs b/pumpkin-protocol/src/client/login/login_disconnect.rs index a5205ebf3..baed47c6e 100644 --- a/pumpkin-protocol/src/client/login/login_disconnect.rs +++ b/pumpkin-protocol/src/client/login/login_disconnect.rs @@ -5,7 +5,7 @@ use serde::{Deserialize, Serialize}; #[derive(Serialize, Deserialize)] #[packet(LOGIN_LOGIN_DISCONNECT)] pub struct CLoginDisconnect<'a> { - json_reason: &'a str, + pub json_reason: &'a str, } impl<'a> CLoginDisconnect<'a> { diff --git a/pumpkin-protocol/src/client/login/plugin_request.rs b/pumpkin-protocol/src/client/login/plugin_request.rs index 6333a1fa1..0c7ae9013 100644 --- a/pumpkin-protocol/src/client/login/plugin_request.rs +++ b/pumpkin-protocol/src/client/login/plugin_request.rs @@ -7,9 +7,9 @@ use crate::VarInt; #[derive(Serialize)] #[packet(LOGIN_CUSTOM_QUERY)] pub struct CLoginPluginRequest<'a> { - message_id: VarInt, - channel: &'a str, - data: &'a [u8], + pub message_id: VarInt, + pub channel: &'a str, + pub data: &'a [u8], } impl<'a> CLoginPluginRequest<'a> { diff --git a/pumpkin-protocol/src/client/login/set_compression.rs b/pumpkin-protocol/src/client/login/set_compression.rs index d7917aede..2dbb858d1 100644 --- a/pumpkin-protocol/src/client/login/set_compression.rs +++ b/pumpkin-protocol/src/client/login/set_compression.rs @@ -7,7 +7,7 @@ use crate::VarInt; #[derive(Serialize, Deserialize)] #[packet(LOGIN_LOGIN_COMPRESSION)] pub struct CSetCompression { - threshold: VarInt, + pub threshold: VarInt, } impl CSetCompression { diff --git a/pumpkin-protocol/src/client/play/acknowledge_block.rs b/pumpkin-protocol/src/client/play/acknowledge_block.rs index 83b4a69df..5ed08af71 100644 --- a/pumpkin-protocol/src/client/play/acknowledge_block.rs +++ b/pumpkin-protocol/src/client/play/acknowledge_block.rs @@ -7,7 +7,7 @@ use crate::VarInt; #[derive(Serialize, Deserialize)] #[packet(PLAY_BLOCK_CHANGED_ACK)] pub struct CAcknowledgeBlockChange { - sequence_id: VarInt, + pub sequence_id: VarInt, } impl CAcknowledgeBlockChange { diff --git a/pumpkin-protocol/src/client/play/disconnect.rs b/pumpkin-protocol/src/client/play/disconnect.rs index c3ec8f6f3..5ecf3dd44 100644 --- a/pumpkin-protocol/src/client/play/disconnect.rs +++ b/pumpkin-protocol/src/client/play/disconnect.rs @@ -7,7 +7,7 @@ use serde::{Deserialize, Serialize}; #[derive(Serialize, Deserialize)] #[packet(PLAY_DISCONNECT)] pub struct CPlayDisconnect { - reason: TextComponent, + pub reason: TextComponent, } impl CPlayDisconnect { diff --git a/pumpkin-protocol/src/client/play/keep_alive.rs b/pumpkin-protocol/src/client/play/keep_alive.rs index 1fa78e6f3..ed70231a3 100644 --- a/pumpkin-protocol/src/client/play/keep_alive.rs +++ b/pumpkin-protocol/src/client/play/keep_alive.rs @@ -5,7 +5,7 @@ use serde::{Deserialize, Serialize}; #[derive(Serialize, Deserialize)] #[packet(PLAY_KEEP_ALIVE)] pub struct CKeepAlive { - keep_alive_id: i64, + pub keep_alive_id: i64, } impl CKeepAlive { diff --git a/pumpkin-protocol/src/client/play/ping_response.rs b/pumpkin-protocol/src/client/play/ping_response.rs index 65a049801..e4fbfc498 100644 --- a/pumpkin-protocol/src/client/play/ping_response.rs +++ b/pumpkin-protocol/src/client/play/ping_response.rs @@ -5,7 +5,7 @@ use serde::{Deserialize, Serialize}; #[derive(Serialize, Deserialize)] #[packet(PLAY_PONG_RESPONSE)] pub struct CPingResponse { - payload: i64, + pub payload: i64, } impl CPingResponse { diff --git a/pumpkin-protocol/src/client/play/player_position.rs b/pumpkin-protocol/src/client/play/player_position.rs index 4e7f1651b..0f15f4638 100644 --- a/pumpkin-protocol/src/client/play/player_position.rs +++ b/pumpkin-protocol/src/client/play/player_position.rs @@ -7,12 +7,12 @@ use crate::{ClientPacket, PositionFlag, VarInt, bytebuf::ByteBufMut}; #[packet(PLAY_PLAYER_POSITION)] pub struct CPlayerPosition<'a> { - teleport_id: VarInt, - position: Vector3, - delta: Vector3, - yaw: f32, - pitch: f32, - releatives: &'a [PositionFlag], + pub teleport_id: VarInt, + pub position: Vector3, + pub delta: Vector3, + pub yaw: f32, + pub pitch: f32, + pub releatives: &'a [PositionFlag], } impl<'a> CPlayerPosition<'a> {