diff options
Diffstat (limited to 'azalea-protocol')
260 files changed, 382 insertions, 382 deletions
diff --git a/azalea-protocol/src/address.rs b/azalea-protocol/src/address.rs index 569e2488..42ee2ac4 100644 --- a/azalea-protocol/src/address.rs +++ b/azalea-protocol/src/address.rs @@ -51,7 +51,7 @@ impl ResolvableAddr for &ResolvedAddr { /// assert_eq!(addr.host, "localhost"); /// assert_eq!(addr.port, 25565); /// ``` -#[derive(Debug, Clone, PartialEq, Eq, Hash)] +#[derive(Clone, Debug, Eq, Hash, PartialEq)] pub struct ServerAddr { pub host: String, pub port: u16, @@ -137,7 +137,7 @@ impl serde::Serialize for ServerAddr { } /// An address that may be used to connect to a Minecraft server. -#[derive(Debug, Clone)] +#[derive(Clone, Debug)] pub struct ResolvedAddr { /// The initial address that we passed when trying to connect. /// diff --git a/azalea-protocol/src/common/client_information.rs b/azalea-protocol/src/common/client_information.rs index c5024a52..68a9956a 100644 --- a/azalea-protocol/src/common/client_information.rs +++ b/azalea-protocol/src/common/client_information.rs @@ -9,7 +9,7 @@ use bevy_ecs::component::Component; /// sent to the server, such as render distance. /// /// This is only present on local players. -#[derive(Clone, Debug, AzBuf, PartialEq, Eq, Component)] +#[derive(AzBuf, Clone, Component, Debug, Eq, PartialEq)] pub struct ClientInformation { /// The locale of the client, formatted like "en_us". pub language: String, @@ -49,7 +49,7 @@ impl Default for ClientInformation { } } -#[derive(AzBuf, Clone, Copy, Debug, PartialEq, Eq, Default)] +#[derive(AzBuf, Clone, Copy, Debug, Default, Eq, PartialEq)] pub enum ChatVisibility { /// All chat messages should be sent to the client. #[default] @@ -61,7 +61,7 @@ pub enum ChatVisibility { Hidden = 2, } -#[derive(Clone, Copy, Debug, PartialEq, Eq)] +#[derive(Clone, Copy, Debug, Eq, PartialEq)] pub struct ModelCustomization { pub cape: bool, pub jacket: bool, @@ -72,7 +72,7 @@ pub struct ModelCustomization { pub hat: bool, } -#[derive(AzBuf, Clone, Copy, Debug, PartialEq, Eq, Default)] +#[derive(AzBuf, Clone, Copy, Debug, Default, Eq, PartialEq)] pub enum ParticleStatus { #[default] All, diff --git a/azalea-protocol/src/common/debug_subscription.rs b/azalea-protocol/src/common/debug_subscription.rs index 0be792e1..068b456c 100644 --- a/azalea-protocol/src/common/debug_subscription.rs +++ b/azalea-protocol/src/common/debug_subscription.rs @@ -8,11 +8,11 @@ use azalea_registry::builtin::{BlockKind, DebugSubscription, GameEvent, PointOfI macro_rules! debug_subscription_enum { ($($variant:ident($ty:ty),)*) => { - #[derive(Clone, Debug, AzBuf, PartialEq)] + #[derive(AzBuf, Clone, Debug, PartialEq)] pub enum DebugSubscriptionEvent { $( $variant($ty), )* } - #[derive(Clone, Debug, AzBuf, PartialEq)] + #[derive(AzBuf, Clone, Debug, PartialEq)] pub enum DebugSubscriptionUpdate { $( $variant(Option<$ty>), )* } @@ -62,7 +62,7 @@ debug_subscription_enum! { GameEvents(DebugGameEventInfo), } -#[derive(Clone, Debug, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct DebugBeeInfo { pub hive_pos: Option<BlockPos>, pub flower_pos: Option<BlockPos>, @@ -70,7 +70,7 @@ pub struct DebugBeeInfo { pub travel_ticks: i32, pub blacklisted_hives: Vec<BlockPos>, } -#[derive(Clone, Debug, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct DebugBrainDump { pub name: String, pub profession: String, @@ -88,14 +88,14 @@ pub struct DebugBrainDump { pub potential_pois: Vec<BlockPos>, } -#[derive(Clone, Debug, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct DebugBreezeInfo { #[var] pub attack_target: Option<i32>, pub jump_target: Option<BlockPos>, } -#[derive(Clone, Debug, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct DebugGoalInfo { #[var] pub priority: i32, @@ -104,20 +104,20 @@ pub struct DebugGoalInfo { pub name: String, } -#[derive(Clone, Debug, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct DebugPathInfo { pub path: MinecraftPath, pub max_node_distance: f32, } -#[derive(Clone, Copy, Debug, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Copy, Debug, PartialEq)] pub enum DebugEntityBlockIntersection { InBlock, InFluid, InAir, } -#[derive(Clone, Debug, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct DebugHiveInfo { pub kind: BlockKind, #[var] @@ -127,7 +127,7 @@ pub struct DebugHiveInfo { pub sedated: bool, } -#[derive(Clone, Debug, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct DebugPoiInfo { pub pos: BlockPos, pub poi_kind: PointOfInterestKind, @@ -135,43 +135,43 @@ pub struct DebugPoiInfo { pub free_ticket_count: i32, } -#[derive(Clone, Debug, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct DebugRedstoneOrientation { #[var] pub id: u32, } -#[derive(Clone, Debug, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct DebugStructureInfo { pub bounding_box: StructureBoundingBox, pub pieces: Vec<StructurePiece>, } -#[derive(Clone, Debug, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct DebugGameEventListenerInfo { #[var] pub listener_radius: i32, } -#[derive(Clone, Debug, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct DebugGameEventInfo { pub event: GameEvent, pub pos: Vec3, } -#[derive(Clone, Debug, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct StructureBoundingBox { pub min: BlockPos, pub max: BlockPos, } -#[derive(Clone, Debug, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct StructurePiece { pub bounding_box: StructureBoundingBox, pub is_start: bool, } -#[derive(Clone, Debug, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct MinecraftPath { pub reached: bool, pub next_node_index: i32, @@ -180,7 +180,7 @@ pub struct MinecraftPath { pub debug_data: MinecraftPathDebugData, } -#[derive(Clone, Debug, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct MinecraftPathNode { pub x: i32, pub y: i32, @@ -188,7 +188,7 @@ pub struct MinecraftPathNode { pub contents: MinecraftPathNodeContents, } -#[derive(Clone, Debug, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct MinecraftPathNodeContents { pub walked_distance: f32, pub cost_malus: f32, @@ -198,7 +198,7 @@ pub struct MinecraftPathNodeContents { } // PathType.java -#[derive(Clone, Copy, Debug, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Copy, Debug, PartialEq)] pub enum MinecraftPathNodeKind { Blocked, Open, @@ -228,7 +228,7 @@ pub enum MinecraftPathNodeKind { DangerTrapdoor, } -#[derive(Clone, Debug, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct MinecraftPathDebugData { pub target_nodes: Vec<MinecraftPathNode>, pub open_set: Vec<MinecraftPathNode>, diff --git a/azalea-protocol/src/common/movements.rs b/azalea-protocol/src/common/movements.rs index e7b71a2e..82559f86 100644 --- a/azalea-protocol/src/common/movements.rs +++ b/azalea-protocol/src/common/movements.rs @@ -19,7 +19,7 @@ pub struct PositionMoveRotation { pub look_direction: LookDirection, } -#[derive(Debug, Clone, Default, PartialEq)] +#[derive(Clone, Debug, Default, PartialEq)] pub struct RelativeMovements { pub x: bool, pub y: bool, diff --git a/azalea-protocol/src/common/recipe.rs b/azalea-protocol/src/common/recipe.rs index 43a64469..9a59cc4b 100644 --- a/azalea-protocol/src/common/recipe.rs +++ b/azalea-protocol/src/common/recipe.rs @@ -3,7 +3,7 @@ use azalea_inventory::ItemStack; use azalea_registry::{HolderSet, builtin::ItemKind, identifier::Identifier}; /// [`azalea_registry::RecipeDisplay`] -#[derive(Clone, Debug, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub enum RecipeDisplayData { Shapeless(ShapelessCraftingRecipeDisplay), Shaped(ShapedCraftingRecipeDisplay), @@ -12,13 +12,13 @@ pub enum RecipeDisplayData { Smithing(SmithingRecipeDisplay), } -#[derive(Clone, Debug, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct ShapelessCraftingRecipeDisplay { pub ingredients: Vec<SlotDisplayData>, pub result: SlotDisplayData, pub crafting_station: SlotDisplayData, } -#[derive(Clone, Debug, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct ShapedCraftingRecipeDisplay { #[var] pub width: u32, @@ -28,7 +28,7 @@ pub struct ShapedCraftingRecipeDisplay { pub result: SlotDisplayData, pub crafting_station: SlotDisplayData, } -#[derive(Clone, Debug, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct FurnaceRecipeDisplay { pub ingredient: SlotDisplayData, pub fuel: SlotDisplayData, @@ -38,13 +38,13 @@ pub struct FurnaceRecipeDisplay { pub duration: u32, pub experience: f32, } -#[derive(Clone, Debug, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct StonecutterRecipeDisplay { pub input: SlotDisplayData, pub result: SlotDisplayData, pub crafting_station: SlotDisplayData, } -#[derive(Clone, Debug, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct SmithingRecipeDisplay { pub template: SlotDisplayData, pub base: SlotDisplayData, @@ -53,13 +53,13 @@ pub struct SmithingRecipeDisplay { pub crafting_station: SlotDisplayData, } -#[derive(Clone, Debug, PartialEq, AzBuf)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct Ingredient { pub allowed: HolderSet<ItemKind, Identifier>, } /// [`azalea_registry::SlotDisplay`] -#[derive(Clone, Debug, PartialEq, AzBuf)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub enum SlotDisplayData { Empty, AnyFuel, @@ -71,30 +71,30 @@ pub enum SlotDisplayData { Composite(CompositeSlotDisplay), } -#[derive(Clone, Debug, PartialEq, AzBuf)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct ItemStackDisplay { pub item: ItemKind, } -#[derive(Clone, Debug, PartialEq, AzBuf)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct ItemStackSlotDisplay { pub stack: ItemStack, } -#[derive(Clone, Debug, PartialEq, AzBuf)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct TagSlotDisplay { pub tag: ItemKind, } -#[derive(Clone, Debug, PartialEq, AzBuf)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct SmithingTrimDemoSlotDisplay { pub base: SlotDisplayData, pub material: SlotDisplayData, pub pattern: SlotDisplayData, } -#[derive(Clone, Debug, PartialEq, AzBuf)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct WithRemainderSlotDisplay { pub input: SlotDisplayData, pub remainder: SlotDisplayData, } -#[derive(Clone, Debug, PartialEq, AzBuf)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct CompositeSlotDisplay { pub contents: Vec<SlotDisplayData>, } diff --git a/azalea-protocol/src/common/server_links.rs b/azalea-protocol/src/common/server_links.rs index 34ae43e6..d65d7a89 100644 --- a/azalea-protocol/src/common/server_links.rs +++ b/azalea-protocol/src/common/server_links.rs @@ -1,19 +1,19 @@ use azalea_buf::AzBuf; use azalea_chat::FormattedText; -#[derive(Clone, Debug, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct ServerLinkEntry { pub kind: ServerLinkKind, pub link: String, } -#[derive(Clone, Debug, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub enum ServerLinkKind { Component(FormattedText), Known(KnownLinkKind), } -#[derive(Clone, Copy, Debug, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Copy, Debug, PartialEq)] pub enum KnownLinkKind { BugReport, CommunityGuidelines, diff --git a/azalea-protocol/src/connect.rs b/azalea-protocol/src/connect.rs index e6a7142d..3559f95e 100644 --- a/azalea-protocol/src/connect.rs +++ b/azalea-protocol/src/connect.rs @@ -269,7 +269,7 @@ where } } -#[derive(Error, Debug)] +#[derive(Debug, Error)] pub enum ConnectionError { #[error("{0}")] Io(#[from] io::Error), @@ -278,7 +278,7 @@ pub enum ConnectionError { use socks5_impl::protocol::UserKey; /// An address and authentication method for connecting to a SOCKS5 proxy. -#[derive(Debug, Clone)] +#[derive(Clone, Debug)] pub struct Proxy { pub addr: SocketAddr, pub auth: Option<UserKey>, diff --git a/azalea-protocol/src/packets/common.rs b/azalea-protocol/src/packets/common.rs index a6cfc03f..3a5b7bf1 100644 --- a/azalea-protocol/src/packets/common.rs +++ b/azalea-protocol/src/packets/common.rs @@ -8,7 +8,7 @@ use azalea_core::{ use azalea_registry::{data::DimensionKind, identifier::Identifier}; use tracing::error; -#[derive(Clone, Debug, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct CommonPlayerSpawnInfo { pub dimension_type: DimensionKind, pub dimension: Identifier, diff --git a/azalea-protocol/src/packets/config/c_clear_dialog.rs b/azalea-protocol/src/packets/config/c_clear_dialog.rs index a4945516..8230efe4 100644 --- a/azalea-protocol/src/packets/config/c_clear_dialog.rs +++ b/azalea-protocol/src/packets/config/c_clear_dialog.rs @@ -1,5 +1,5 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundConfigPacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundConfigPacket)] +#[derive(AzBuf, ClientboundConfigPacket, Clone, Debug, PartialEq)] pub struct ClientboundClearDialog; diff --git a/azalea-protocol/src/packets/config/c_code_of_conduct.rs b/azalea-protocol/src/packets/config/c_code_of_conduct.rs index 03f133a8..9550a8b9 100644 --- a/azalea-protocol/src/packets/config/c_code_of_conduct.rs +++ b/azalea-protocol/src/packets/config/c_code_of_conduct.rs @@ -1,7 +1,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundConfigPacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundConfigPacket)] +#[derive(AzBuf, ClientboundConfigPacket, Clone, Debug, PartialEq)] pub struct ClientboundCodeOfConduct { pub code_of_conduct: String, } diff --git a/azalea-protocol/src/packets/config/c_cookie_request.rs b/azalea-protocol/src/packets/config/c_cookie_request.rs index 0edbf21e..87d7f373 100644 --- a/azalea-protocol/src/packets/config/c_cookie_request.rs +++ b/azalea-protocol/src/packets/config/c_cookie_request.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_registry::identifier::Identifier; use azalea_protocol_macros::ClientboundConfigPacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundConfigPacket)] +#[derive(AzBuf, ClientboundConfigPacket, Clone, Debug, PartialEq)] pub struct ClientboundCookieRequest { pub key: Identifier, } diff --git a/azalea-protocol/src/packets/config/c_custom_payload.rs b/azalea-protocol/src/packets/config/c_custom_payload.rs index c9417dcd..6f4a6d89 100644 --- a/azalea-protocol/src/packets/config/c_custom_payload.rs +++ b/azalea-protocol/src/packets/config/c_custom_payload.rs @@ -2,7 +2,7 @@ use azalea_buf::{AzBuf, UnsizedByteArray}; use azalea_registry::identifier::Identifier; use azalea_protocol_macros::ClientboundConfigPacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundConfigPacket)] +#[derive(AzBuf, ClientboundConfigPacket, Clone, Debug, PartialEq)] pub struct ClientboundCustomPayload { pub identifier: Identifier, pub data: UnsizedByteArray, diff --git a/azalea-protocol/src/packets/config/c_custom_report_details.rs b/azalea-protocol/src/packets/config/c_custom_report_details.rs index 38209dd8..74e04f32 100644 --- a/azalea-protocol/src/packets/config/c_custom_report_details.rs +++ b/azalea-protocol/src/packets/config/c_custom_report_details.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundConfigPacket; use indexmap::IndexMap; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundConfigPacket)] +#[derive(AzBuf, ClientboundConfigPacket, Clone, Debug, PartialEq)] pub struct ClientboundCustomReportDetails { pub details: IndexMap<String, String>, } diff --git a/azalea-protocol/src/packets/config/c_disconnect.rs b/azalea-protocol/src/packets/config/c_disconnect.rs index 37915b38..c08b1baa 100644 --- a/azalea-protocol/src/packets/config/c_disconnect.rs +++ b/azalea-protocol/src/packets/config/c_disconnect.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_chat::FormattedText; use azalea_protocol_macros::ClientboundConfigPacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundConfigPacket)] +#[derive(AzBuf, ClientboundConfigPacket, Clone, Debug, PartialEq)] pub struct ClientboundDisconnect { pub reason: FormattedText, } diff --git a/azalea-protocol/src/packets/config/c_finish_configuration.rs b/azalea-protocol/src/packets/config/c_finish_configuration.rs index 2cfe64fd..6ea7aed3 100644 --- a/azalea-protocol/src/packets/config/c_finish_configuration.rs +++ b/azalea-protocol/src/packets/config/c_finish_configuration.rs @@ -1,5 +1,5 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundConfigPacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundConfigPacket)] +#[derive(AzBuf, ClientboundConfigPacket, Clone, Debug, PartialEq)] pub struct ClientboundFinishConfiguration; diff --git a/azalea-protocol/src/packets/config/c_keep_alive.rs b/azalea-protocol/src/packets/config/c_keep_alive.rs index 575ff52e..184e92dd 100644 --- a/azalea-protocol/src/packets/config/c_keep_alive.rs +++ b/azalea-protocol/src/packets/config/c_keep_alive.rs @@ -1,7 +1,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundConfigPacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundConfigPacket)] +#[derive(AzBuf, ClientboundConfigPacket, Clone, Debug, PartialEq)] pub struct ClientboundKeepAlive { pub id: u64, } diff --git a/azalea-protocol/src/packets/config/c_ping.rs b/azalea-protocol/src/packets/config/c_ping.rs index 82a83692..123ca907 100644 --- a/azalea-protocol/src/packets/config/c_ping.rs +++ b/azalea-protocol/src/packets/config/c_ping.rs @@ -1,7 +1,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundConfigPacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundConfigPacket)] +#[derive(AzBuf, ClientboundConfigPacket, Clone, Debug, PartialEq)] pub struct ClientboundPing { pub id: u32, } diff --git a/azalea-protocol/src/packets/config/c_registry_data.rs b/azalea-protocol/src/packets/config/c_registry_data.rs index cb46958c..edafbcf4 100644 --- a/azalea-protocol/src/packets/config/c_registry_data.rs +++ b/azalea-protocol/src/packets/config/c_registry_data.rs @@ -3,7 +3,7 @@ use azalea_registry::identifier::Identifier; use azalea_protocol_macros::ClientboundConfigPacket; use simdnbt::owned::NbtCompound; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundConfigPacket)] +#[derive(AzBuf, ClientboundConfigPacket, Clone, Debug, PartialEq)] pub struct ClientboundRegistryData { pub registry_id: Identifier, pub entries: Vec<(Identifier, Option<NbtCompound>)>, diff --git a/azalea-protocol/src/packets/config/c_reset_chat.rs b/azalea-protocol/src/packets/config/c_reset_chat.rs index bd15a79e..612e7309 100644 --- a/azalea-protocol/src/packets/config/c_reset_chat.rs +++ b/azalea-protocol/src/packets/config/c_reset_chat.rs @@ -1,5 +1,5 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundConfigPacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundConfigPacket)] +#[derive(AzBuf, ClientboundConfigPacket, Clone, Debug, PartialEq)] pub struct ClientboundResetChat; diff --git a/azalea-protocol/src/packets/config/c_resource_pack_pop.rs b/azalea-protocol/src/packets/config/c_resource_pack_pop.rs index 2df9f375..c6544b41 100644 --- a/azalea-protocol/src/packets/config/c_resource_pack_pop.rs +++ b/azalea-protocol/src/packets/config/c_resource_pack_pop.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundConfigPacket; use uuid::Uuid; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundConfigPacket)] +#[derive(AzBuf, ClientboundConfigPacket, Clone, Debug, PartialEq)] pub struct ClientboundResourcePackPop { pub id: Option<Uuid>, } diff --git a/azalea-protocol/src/packets/config/c_resource_pack_push.rs b/azalea-protocol/src/packets/config/c_resource_pack_push.rs index 257cb374..34e09309 100644 --- a/azalea-protocol/src/packets/config/c_resource_pack_push.rs +++ b/azalea-protocol/src/packets/config/c_resource_pack_push.rs @@ -3,7 +3,7 @@ use azalea_chat::FormattedText; use azalea_protocol_macros::ClientboundConfigPacket; use uuid::Uuid; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundConfigPacket)] +#[derive(AzBuf, ClientboundConfigPacket, Clone, Debug, PartialEq)] pub struct ClientboundResourcePackPush { pub id: Uuid, pub url: String, diff --git a/azalea-protocol/src/packets/config/c_select_known_packs.rs b/azalea-protocol/src/packets/config/c_select_known_packs.rs index c8b17413..5ddaea0e 100644 --- a/azalea-protocol/src/packets/config/c_select_known_packs.rs +++ b/azalea-protocol/src/packets/config/c_select_known_packs.rs @@ -3,7 +3,7 @@ use azalea_protocol_macros::ClientboundConfigPacket; use super::s_select_known_packs::KnownPack; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundConfigPacket)] +#[derive(AzBuf, ClientboundConfigPacket, Clone, Debug, PartialEq)] pub struct ClientboundSelectKnownPacks { pub known_packs: Vec<KnownPack>, } diff --git a/azalea-protocol/src/packets/config/c_server_links.rs b/azalea-protocol/src/packets/config/c_server_links.rs index e459e901..f697d953 100644 --- a/azalea-protocol/src/packets/config/c_server_links.rs +++ b/azalea-protocol/src/packets/config/c_server_links.rs @@ -3,7 +3,7 @@ use azalea_protocol_macros::ClientboundConfigPacket; use crate::common::server_links::ServerLinkEntry; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundConfigPacket)] +#[derive(AzBuf, ClientboundConfigPacket, Clone, Debug, PartialEq)] pub struct ClientboundServerLinks { pub links: Vec<ServerLinkEntry>, } diff --git a/azalea-protocol/src/packets/config/c_show_dialog.rs b/azalea-protocol/src/packets/config/c_show_dialog.rs index 7d1ad498..d6105ca7 100644 --- a/azalea-protocol/src/packets/config/c_show_dialog.rs +++ b/azalea-protocol/src/packets/config/c_show_dialog.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundConfigPacket; use simdnbt::owned::Nbt; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundConfigPacket)] +#[derive(AzBuf, ClientboundConfigPacket, Clone, Debug, PartialEq)] pub struct ClientboundShowDialog { pub dialog: Nbt, } diff --git a/azalea-protocol/src/packets/config/c_store_cookie.rs b/azalea-protocol/src/packets/config/c_store_cookie.rs index 1b695b22..ae81ce25 100644 --- a/azalea-protocol/src/packets/config/c_store_cookie.rs +++ b/azalea-protocol/src/packets/config/c_store_cookie.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_registry::identifier::Identifier; use azalea_protocol_macros::ClientboundConfigPacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundConfigPacket)] +#[derive(AzBuf, ClientboundConfigPacket, Clone, Debug, PartialEq)] pub struct ClientboundStoreCookie { pub key: Identifier, pub payload: Vec<u8>, diff --git a/azalea-protocol/src/packets/config/c_transfer.rs b/azalea-protocol/src/packets/config/c_transfer.rs index db0e846a..963137b7 100644 --- a/azalea-protocol/src/packets/config/c_transfer.rs +++ b/azalea-protocol/src/packets/config/c_transfer.rs @@ -1,7 +1,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundConfigPacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundConfigPacket)] +#[derive(AzBuf, ClientboundConfigPacket, Clone, Debug, PartialEq)] pub struct ClientboundTransfer { pub host: String, #[var] diff --git a/azalea-protocol/src/packets/config/c_update_enabled_features.rs b/azalea-protocol/src/packets/config/c_update_enabled_features.rs index 0080b65a..9fade41c 100644 --- a/azalea-protocol/src/packets/config/c_update_enabled_features.rs +++ b/azalea-protocol/src/packets/config/c_update_enabled_features.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_registry::identifier::Identifier; use azalea_protocol_macros::ClientboundConfigPacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundConfigPacket)] +#[derive(AzBuf, ClientboundConfigPacket, Clone, Debug, PartialEq)] pub struct ClientboundUpdateEnabledFeatures { pub features: Vec<Identifier>, } diff --git a/azalea-protocol/src/packets/config/c_update_tags.rs b/azalea-protocol/src/packets/config/c_update_tags.rs index 5c306374..6406ebe4 100644 --- a/azalea-protocol/src/packets/config/c_update_tags.rs +++ b/azalea-protocol/src/packets/config/c_update_tags.rs @@ -3,7 +3,7 @@ use azalea_protocol_macros::ClientboundConfigPacket; use crate::common::tags::TagMap; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundConfigPacket)] +#[derive(AzBuf, ClientboundConfigPacket, Clone, Debug, PartialEq)] pub struct ClientboundUpdateTags { pub tags: TagMap, } diff --git a/azalea-protocol/src/packets/config/s_accept_code_of_conduct.rs b/azalea-protocol/src/packets/config/s_accept_code_of_conduct.rs index c5fea5dd..4e6a6ccd 100644 --- a/azalea-protocol/src/packets/config/s_accept_code_of_conduct.rs +++ b/azalea-protocol/src/packets/config/s_accept_code_of_conduct.rs @@ -1,5 +1,5 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ServerboundConfigPacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundConfigPacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundConfigPacket)] pub struct ServerboundAcceptCodeOfConduct; diff --git a/azalea-protocol/src/packets/config/s_client_information.rs b/azalea-protocol/src/packets/config/s_client_information.rs index b6ab0f2a..5a2490bb 100644 --- a/azalea-protocol/src/packets/config/s_client_information.rs +++ b/azalea-protocol/src/packets/config/s_client_information.rs @@ -3,7 +3,7 @@ use azalea_protocol_macros::ServerboundConfigPacket; use crate::common::client_information::ClientInformation; -#[derive(Clone, Debug, AzBuf, PartialEq, Eq, ServerboundConfigPacket)] +#[derive(AzBuf, Clone, Debug, Eq, PartialEq, ServerboundConfigPacket)] pub struct ServerboundClientInformation { pub information: ClientInformation, } diff --git a/azalea-protocol/src/packets/config/s_cookie_response.rs b/azalea-protocol/src/packets/config/s_cookie_response.rs index 44f74150..29bf00da 100644 --- a/azalea-protocol/src/packets/config/s_cookie_response.rs +++ b/azalea-protocol/src/packets/config/s_cookie_response.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_registry::identifier::Identifier; use azalea_protocol_macros::ServerboundConfigPacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundConfigPacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundConfigPacket)] pub struct ServerboundCookieResponse { pub key: Identifier, pub payload: Option<Vec<u8>>, diff --git a/azalea-protocol/src/packets/config/s_custom_click_action.rs b/azalea-protocol/src/packets/config/s_custom_click_action.rs index c36c2080..45d14013 100644 --- a/azalea-protocol/src/packets/config/s_custom_click_action.rs +++ b/azalea-protocol/src/packets/config/s_custom_click_action.rs @@ -3,7 +3,7 @@ use azalea_registry::identifier::Identifier; use azalea_protocol_macros::ServerboundConfigPacket; use simdnbt::owned::Nbt; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundConfigPacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundConfigPacket)] pub struct ServerboundCustomClickAction { pub id: Identifier, pub payload: Nbt, diff --git a/azalea-protocol/src/packets/config/s_custom_payload.rs b/azalea-protocol/src/packets/config/s_custom_payload.rs index e602bdca..bd127e17 100644 --- a/azalea-protocol/src/packets/config/s_custom_payload.rs +++ b/azalea-protocol/src/packets/config/s_custom_payload.rs @@ -2,7 +2,7 @@ use azalea_buf::{AzBuf, UnsizedByteArray}; use azalea_registry::identifier::Identifier; use azalea_protocol_macros::ServerboundConfigPacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundConfigPacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundConfigPacket)] pub struct ServerboundCustomPayload { pub identifier: Identifier, pub data: UnsizedByteArray, diff --git a/azalea-protocol/src/packets/config/s_finish_configuration.rs b/azalea-protocol/src/packets/config/s_finish_configuration.rs index 618d7205..1f581725 100644 --- a/azalea-protocol/src/packets/config/s_finish_configuration.rs +++ b/azalea-protocol/src/packets/config/s_finish_configuration.rs @@ -1,5 +1,5 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ServerboundConfigPacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundConfigPacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundConfigPacket)] pub struct ServerboundFinishConfiguration; diff --git a/azalea-protocol/src/packets/config/s_keep_alive.rs b/azalea-protocol/src/packets/config/s_keep_alive.rs index 455d4109..5cd414d1 100644 --- a/azalea-protocol/src/packets/config/s_keep_alive.rs +++ b/azalea-protocol/src/packets/config/s_keep_alive.rs @@ -1,7 +1,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ServerboundConfigPacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundConfigPacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundConfigPacket)] pub struct ServerboundKeepAlive { pub id: u64, } diff --git a/azalea-protocol/src/packets/config/s_pong.rs b/azalea-protocol/src/packets/config/s_pong.rs index 58abaff4..0618ce46 100644 --- a/azalea-protocol/src/packets/config/s_pong.rs +++ b/azalea-protocol/src/packets/config/s_pong.rs @@ -1,7 +1,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ServerboundConfigPacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundConfigPacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundConfigPacket)] pub struct ServerboundPong { pub id: u32, } diff --git a/azalea-protocol/src/packets/config/s_resource_pack.rs b/azalea-protocol/src/packets/config/s_resource_pack.rs index 38a14af8..ed316a13 100644 --- a/azalea-protocol/src/packets/config/s_resource_pack.rs +++ b/azalea-protocol/src/packets/config/s_resource_pack.rs @@ -2,13 +2,13 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ServerboundConfigPacket; use uuid::Uuid; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundConfigPacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundConfigPacket)] pub struct ServerboundResourcePack { pub id: Uuid, pub action: Action, } -#[derive(AzBuf, Clone, Copy, Debug, PartialEq, Eq)] +#[derive(AzBuf, Clone, Copy, Debug, Eq, PartialEq)] pub enum Action { SuccessfullyLoaded = 0, Declined = 1, diff --git a/azalea-protocol/src/packets/config/s_select_known_packs.rs b/azalea-protocol/src/packets/config/s_select_known_packs.rs index ee139780..0286b6e2 100644 --- a/azalea-protocol/src/packets/config/s_select_known_packs.rs +++ b/azalea-protocol/src/packets/config/s_select_known_packs.rs @@ -1,12 +1,12 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ServerboundConfigPacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundConfigPacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundConfigPacket)] pub struct ServerboundSelectKnownPacks { pub known_packs: Vec<KnownPack>, } -#[derive(Clone, Debug, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct KnownPack { pub namespace: String, pub id: String, diff --git a/azalea-protocol/src/packets/game/c_add_entity.rs b/azalea-protocol/src/packets/game/c_add_entity.rs index e7b46750..dc04d078 100644 --- a/azalea-protocol/src/packets/game/c_add_entity.rs +++ b/azalea-protocol/src/packets/game/c_add_entity.rs @@ -6,7 +6,7 @@ use azalea_registry::{builtin::EntityKind, identifier::Identifier}; use azalea_world::MinecraftEntityId; use uuid::Uuid; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundAddEntity { /// The numeric ID of the entity being added to the world. #[var] diff --git a/azalea-protocol/src/packets/game/c_animate.rs b/azalea-protocol/src/packets/game/c_animate.rs index b443513c..112b990b 100644 --- a/azalea-protocol/src/packets/game/c_animate.rs +++ b/azalea-protocol/src/packets/game/c_animate.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundGamePacket; use azalea_world::MinecraftEntityId; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundAnimate { #[var] pub id: MinecraftEntityId, @@ -11,7 +11,7 @@ pub struct ClientboundAnimate { // minecraft actually uses a u8 for this, but a varint still works and makes it // so i don't have to add a special handler -#[derive(Clone, Debug, Copy, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Copy, Debug, PartialEq)] pub enum AnimationAction { SwingMainHand = 0, Hurt = 1, diff --git a/azalea-protocol/src/packets/game/c_award_stats.rs b/azalea-protocol/src/packets/game/c_award_stats.rs index 79a00f7b..3a736d68 100644 --- a/azalea-protocol/src/packets/game/c_award_stats.rs +++ b/azalea-protocol/src/packets/game/c_award_stats.rs @@ -4,13 +4,13 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundGamePacket; use azalea_registry::builtin::{BlockKind, CustomStat, EntityKind, ItemKind}; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundAwardStats { #[var] pub stats: HashMap<Stat, i32>, } -#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, AzBuf)] +#[derive(AzBuf, Clone, Copy, Debug, Eq, Hash, PartialEq)] pub enum Stat { Mined(BlockKind), Crafted(ItemKind), diff --git a/azalea-protocol/src/packets/game/c_block_changed_ack.rs b/azalea-protocol/src/packets/game/c_block_changed_ack.rs index 10a33e3c..381ec3c7 100644 --- a/azalea-protocol/src/packets/game/c_block_changed_ack.rs +++ b/azalea-protocol/src/packets/game/c_block_changed_ack.rs @@ -1,7 +1,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundBlockChangedAck { #[var] pub seq: u32, diff --git a/azalea-protocol/src/packets/game/c_block_destruction.rs b/azalea-protocol/src/packets/game/c_block_destruction.rs index 86d238d6..e41e42b0 100644 --- a/azalea-protocol/src/packets/game/c_block_destruction.rs +++ b/azalea-protocol/src/packets/game/c_block_destruction.rs @@ -3,7 +3,7 @@ use azalea_core::position::BlockPos; use azalea_protocol_macros::ClientboundGamePacket; use azalea_world::MinecraftEntityId; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundBlockDestruction { /// The ID of the entity breaking the block. #[var] diff --git a/azalea-protocol/src/packets/game/c_block_entity_data.rs b/azalea-protocol/src/packets/game/c_block_entity_data.rs index 0798e2bd..7e3787c9 100644 --- a/azalea-protocol/src/packets/game/c_block_entity_data.rs +++ b/azalea-protocol/src/packets/game/c_block_entity_data.rs @@ -4,7 +4,7 @@ use azalea_protocol_macros::ClientboundGamePacket; use azalea_registry::builtin::BlockEntityKind; use simdnbt::owned::Nbt; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundBlockEntityData { pub pos: BlockPos, pub block_entity_type: BlockEntityKind, diff --git a/azalea-protocol/src/packets/game/c_block_event.rs b/azalea-protocol/src/packets/game/c_block_event.rs index 30bb8e6c..4053e083 100644 --- a/azalea-protocol/src/packets/game/c_block_event.rs +++ b/azalea-protocol/src/packets/game/c_block_event.rs @@ -3,7 +3,7 @@ use azalea_core::position::BlockPos; use azalea_protocol_macros::ClientboundGamePacket; use azalea_registry::builtin::BlockKind; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundBlockEvent { pub pos: BlockPos, pub action_id: u8, diff --git a/azalea-protocol/src/packets/game/c_block_update.rs b/azalea-protocol/src/packets/game/c_block_update.rs index dc193719..35a6c051 100644 --- a/azalea-protocol/src/packets/game/c_block_update.rs +++ b/azalea-protocol/src/packets/game/c_block_update.rs @@ -3,7 +3,7 @@ use azalea_buf::AzBuf; use azalea_core::position::BlockPos; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundBlockUpdate { pub pos: BlockPos, pub block_state: BlockState, diff --git a/azalea-protocol/src/packets/game/c_boss_event.rs b/azalea-protocol/src/packets/game/c_boss_event.rs index de0629e0..10cf30d4 100644 --- a/azalea-protocol/src/packets/game/c_boss_event.rs +++ b/azalea-protocol/src/packets/game/c_boss_event.rs @@ -9,7 +9,7 @@ use azalea_core::bitset::FixedBitSet; use azalea_protocol_macros::ClientboundGamePacket; use uuid::Uuid; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundBossEvent { pub id: Uuid, pub operation: Operation, @@ -75,7 +75,7 @@ impl AzaleaWrite for Operation { } } -#[derive(Clone, Debug, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct AddOperation { pub name: FormattedText, pub progress: f32, @@ -83,7 +83,7 @@ pub struct AddOperation { pub properties: Properties, } -#[derive(Clone, Debug, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct Style { pub color: BossBarColor, pub overlay: BossBarOverlay, diff --git a/azalea-protocol/src/packets/game/c_bundle_delimiter.rs b/azalea-protocol/src/packets/game/c_bundle_delimiter.rs index ac98e82a..2bba3cfe 100644 --- a/azalea-protocol/src/packets/game/c_bundle_delimiter.rs +++ b/azalea-protocol/src/packets/game/c_bundle_delimiter.rs @@ -1,5 +1,5 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundBundleDelimiter; diff --git a/azalea-protocol/src/packets/game/c_change_difficulty.rs b/azalea-protocol/src/packets/game/c_change_difficulty.rs index 89e2d09a..d4af22ce 100644 --- a/azalea-protocol/src/packets/game/c_change_difficulty.rs +++ b/azalea-protocol/src/packets/game/c_change_difficulty.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_core::difficulty::Difficulty; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundChangeDifficulty { pub difficulty: Difficulty, pub locked: bool, diff --git a/azalea-protocol/src/packets/game/c_chunk_batch_finished.rs b/azalea-protocol/src/packets/game/c_chunk_batch_finished.rs index 6147867b..f527b47f 100644 --- a/azalea-protocol/src/packets/game/c_chunk_batch_finished.rs +++ b/azalea-protocol/src/packets/game/c_chunk_batch_finished.rs @@ -1,7 +1,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundChunkBatchFinished { #[var] pub batch_size: u32, diff --git a/azalea-protocol/src/packets/game/c_chunk_batch_start.rs b/azalea-protocol/src/packets/game/c_chunk_batch_start.rs index 9321447b..e4025dcc 100644 --- a/azalea-protocol/src/packets/game/c_chunk_batch_start.rs +++ b/azalea-protocol/src/packets/game/c_chunk_batch_start.rs @@ -1,5 +1,5 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundChunkBatchStart; diff --git a/azalea-protocol/src/packets/game/c_chunks_biomes.rs b/azalea-protocol/src/packets/game/c_chunks_biomes.rs index 16007331..8a1e28b6 100644 --- a/azalea-protocol/src/packets/game/c_chunks_biomes.rs +++ b/azalea-protocol/src/packets/game/c_chunks_biomes.rs @@ -2,12 +2,12 @@ use azalea_buf::AzBuf; use azalea_core::position::ChunkPos; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundChunksBiomes { pub chunk_biome_data: Vec<ChunkBiomeData>, } -#[derive(Clone, Debug, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct ChunkBiomeData { pub pos: ChunkPos, pub buffer: Vec<u8>, diff --git a/azalea-protocol/src/packets/game/c_clear_dialog.rs b/azalea-protocol/src/packets/game/c_clear_dialog.rs index 74a015a4..173b847f 100644 --- a/azalea-protocol/src/packets/game/c_clear_dialog.rs +++ b/azalea-protocol/src/packets/game/c_clear_dialog.rs @@ -1,5 +1,5 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundClearDialog; diff --git a/azalea-protocol/src/packets/game/c_clear_titles.rs b/azalea-protocol/src/packets/game/c_clear_titles.rs index 559f837f..fcf6cede 100644 --- a/azalea-protocol/src/packets/game/c_clear_titles.rs +++ b/azalea-protocol/src/packets/game/c_clear_titles.rs @@ -1,7 +1,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundClearTitles { pub reset_times: bool, } diff --git a/azalea-protocol/src/packets/game/c_command_suggestions.rs b/azalea-protocol/src/packets/game/c_command_suggestions.rs index eff953ee..a0036edf 100644 --- a/azalea-protocol/src/packets/game/c_command_suggestions.rs +++ b/azalea-protocol/src/packets/game/c_command_suggestions.rs @@ -2,7 +2,7 @@ use azalea_brigadier::suggestion::Suggestions; use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundCommandSuggestions { #[var] pub id: u32, diff --git a/azalea-protocol/src/packets/game/c_commands.rs b/azalea-protocol/src/packets/game/c_commands.rs index 758c8f27..f8d95ac9 100644 --- a/azalea-protocol/src/packets/game/c_commands.rs +++ b/azalea-protocol/src/packets/game/c_commands.rs @@ -6,14 +6,14 @@ use azalea_protocol_macros::ClientboundGamePacket; use azalea_registry::identifier::Identifier; use tracing::warn; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundCommands { pub entries: Vec<BrigadierNodeStub>, #[var] pub root_index: u32, } -#[derive(Debug, Clone, PartialEq)] +#[derive(Clone, Debug, PartialEq)] pub struct BrigadierNodeStub { pub is_executable: bool, pub children: Vec<u32>, @@ -22,7 +22,7 @@ pub struct BrigadierNodeStub { pub is_restricted: bool, } -#[derive(Debug, Clone, Eq)] +#[derive(Clone, Debug, Eq)] pub struct BrigadierNumber<T> { pub min: Option<T>, pub max: Option<T>, @@ -82,7 +82,7 @@ impl<T: AzaleaWrite> AzaleaWrite for BrigadierNumber<T> { } } -#[derive(Debug, Clone, Copy, AzBuf, PartialEq, Eq)] +#[derive(AzBuf, Clone, Copy, Debug, Eq, PartialEq)] pub enum BrigadierString { /// Reads a single word SingleWord = 0, @@ -94,7 +94,7 @@ pub enum BrigadierString { } // see ArgumentTypeInfos.java -#[derive(Debug, Clone, PartialEq, AzBuf)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub enum BrigadierParser { Bool, Float(BrigadierNumber<f32>), @@ -155,7 +155,7 @@ pub enum BrigadierParser { Uuid, } -#[derive(Debug, Clone, PartialEq, Eq)] +#[derive(Clone, Debug, Eq, PartialEq)] pub struct EntityParser { pub single: bool, pub players_only: bool, @@ -310,7 +310,7 @@ impl AzaleaWrite for BrigadierNodeStub { } } -#[derive(Debug, Clone, PartialEq)] +#[derive(Clone, Debug, PartialEq)] pub enum NodeType { Root, Literal { diff --git a/azalea-protocol/src/packets/game/c_container_close.rs b/azalea-protocol/src/packets/game/c_container_close.rs index 32cb171f..98c95f3f 100644 --- a/azalea-protocol/src/packets/game/c_container_close.rs +++ b/azalea-protocol/src/packets/game/c_container_close.rs @@ -1,7 +1,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundContainerClose { #[var] pub container_id: i32, diff --git a/azalea-protocol/src/packets/game/c_container_set_content.rs b/azalea-protocol/src/packets/game/c_container_set_content.rs index 6048fd83..a97973ee 100644 --- a/azalea-protocol/src/packets/game/c_container_set_content.rs +++ b/azalea-protocol/src/packets/game/c_container_set_content.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_inventory::ItemStack; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundContainerSetContent { #[var] pub container_id: i32, diff --git a/azalea-protocol/src/packets/game/c_container_set_data.rs b/azalea-protocol/src/packets/game/c_container_set_data.rs index 6c7907bb..3ad24df8 100644 --- a/azalea-protocol/src/packets/game/c_container_set_data.rs +++ b/azalea-protocol/src/packets/game/c_container_set_data.rs @@ -1,7 +1,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundContainerSetData { #[var] pub container_id: i32, diff --git a/azalea-protocol/src/packets/game/c_container_set_slot.rs b/azalea-protocol/src/packets/game/c_container_set_slot.rs index d00080bb..0c8ba767 100644 --- a/azalea-protocol/src/packets/game/c_container_set_slot.rs +++ b/azalea-protocol/src/packets/game/c_container_set_slot.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_inventory::ItemStack; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundContainerSetSlot { #[var] pub container_id: i32, diff --git a/azalea-protocol/src/packets/game/c_cookie_request.rs b/azalea-protocol/src/packets/game/c_cookie_request.rs index 283b686d..65705f9f 100644 --- a/azalea-protocol/src/packets/game/c_cookie_request.rs +++ b/azalea-protocol/src/packets/game/c_cookie_request.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_registry::identifier::Identifier; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundCookieRequest { pub key: Identifier, } diff --git a/azalea-protocol/src/packets/game/c_cooldown.rs b/azalea-protocol/src/packets/game/c_cooldown.rs index 398690f4..9f4ba15a 100644 --- a/azalea-protocol/src/packets/game/c_cooldown.rs +++ b/azalea-protocol/src/packets/game/c_cooldown.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundGamePacket; use azalea_registry::builtin::ItemKind; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundCooldown { pub item: ItemKind, #[var] diff --git a/azalea-protocol/src/packets/game/c_custom_chat_completions.rs b/azalea-protocol/src/packets/game/c_custom_chat_completions.rs index 8a96504d..62afdd6a 100644 --- a/azalea-protocol/src/packets/game/c_custom_chat_completions.rs +++ b/azalea-protocol/src/packets/game/c_custom_chat_completions.rs @@ -1,7 +1,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundCustomChatCompletions { pub action: Action, pub entries: Vec<String>, diff --git a/azalea-protocol/src/packets/game/c_custom_payload.rs b/azalea-protocol/src/packets/game/c_custom_payload.rs index a198c547..5d807dd9 100644 --- a/azalea-protocol/src/packets/game/c_custom_payload.rs +++ b/azalea-protocol/src/packets/game/c_custom_payload.rs @@ -2,7 +2,7 @@ use azalea_buf::{AzBuf, UnsizedByteArray}; use azalea_registry::identifier::Identifier; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundCustomPayload { pub identifier: Identifier, pub data: UnsizedByteArray, diff --git a/azalea-protocol/src/packets/game/c_custom_report_details.rs b/azalea-protocol/src/packets/game/c_custom_report_details.rs index cb7e6c9a..8ac45a57 100644 --- a/azalea-protocol/src/packets/game/c_custom_report_details.rs +++ b/azalea-protocol/src/packets/game/c_custom_report_details.rs @@ -3,7 +3,7 @@ use std::collections::HashMap; use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundCustomReportDetails { // azalea doesn't implement max lengths yet diff --git a/azalea-protocol/src/packets/game/c_damage_event.rs b/azalea-protocol/src/packets/game/c_damage_event.rs index f6a1e401..e296b3da 100644 --- a/azalea-protocol/src/packets/game/c_damage_event.rs +++ b/azalea-protocol/src/packets/game/c_damage_event.rs @@ -5,7 +5,7 @@ use azalea_core::position::Vec3; use azalea_protocol_macros::ClientboundGamePacket; use azalea_world::MinecraftEntityId; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundDamageEvent { #[var] pub entity_id: MinecraftEntityId, diff --git a/azalea-protocol/src/packets/game/c_debug_block_value.rs b/azalea-protocol/src/packets/game/c_debug_block_value.rs index 1c78b6d5..5276ef48 100644 --- a/azalea-protocol/src/packets/game/c_debug_block_value.rs +++ b/azalea-protocol/src/packets/game/c_debug_block_value.rs @@ -4,7 +4,7 @@ use azalea_protocol_macros::ClientboundGamePacket; use crate::common::debug_subscription::DebugSubscriptionUpdate; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundDebugBlockValue { pub block_pos: BlockPos, pub update: DebugSubscriptionUpdate, diff --git a/azalea-protocol/src/packets/game/c_debug_chunk_value.rs b/azalea-protocol/src/packets/game/c_debug_chunk_value.rs index 7948c733..4d118949 100644 --- a/azalea-protocol/src/packets/game/c_debug_chunk_value.rs +++ b/azalea-protocol/src/packets/game/c_debug_chunk_value.rs @@ -4,7 +4,7 @@ use azalea_protocol_macros::ClientboundGamePacket; use crate::common::debug_subscription::DebugSubscriptionUpdate; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundDebugChunkValue { pub chunk_pos: ChunkPos, pub update: DebugSubscriptionUpdate, diff --git a/azalea-protocol/src/packets/game/c_debug_entity_value.rs b/azalea-protocol/src/packets/game/c_debug_entity_value.rs index a57e5548..61706382 100644 --- a/azalea-protocol/src/packets/game/c_debug_entity_value.rs +++ b/azalea-protocol/src/packets/game/c_debug_entity_value.rs @@ -4,7 +4,7 @@ use azalea_world::MinecraftEntityId; use crate::common::debug_subscription::DebugSubscriptionUpdate; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundDebugEntityValue { pub entity_id: MinecraftEntityId, pub update: DebugSubscriptionUpdate, diff --git a/azalea-protocol/src/packets/game/c_debug_event.rs b/azalea-protocol/src/packets/game/c_debug_event.rs index c53e5e12..6068be20 100644 --- a/azalea-protocol/src/packets/game/c_debug_event.rs +++ b/azalea-protocol/src/packets/game/c_debug_event.rs @@ -3,7 +3,7 @@ use azalea_protocol_macros::ClientboundGamePacket; use crate::common::debug_subscription::DebugSubscriptionEvent; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundDebugEvent { pub event: DebugSubscriptionEvent, } diff --git a/azalea-protocol/src/packets/game/c_debug_sample.rs b/azalea-protocol/src/packets/game/c_debug_sample.rs index 67769b1b..0f2a9af4 100644 --- a/azalea-protocol/src/packets/game/c_debug_sample.rs +++ b/azalea-protocol/src/packets/game/c_debug_sample.rs @@ -1,13 +1,13 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundDebugSample { pub sample: Vec<u64>, pub debug_sample_type: RemoteDebugSampleType, } -#[derive(Clone, Copy, Debug, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Copy, Debug, PartialEq)] pub enum RemoteDebugSampleType { TickTime, } diff --git a/azalea-protocol/src/packets/game/c_delete_chat.rs b/azalea-protocol/src/packets/game/c_delete_chat.rs index fff8daa4..379716c8 100644 --- a/azalea-protocol/src/packets/game/c_delete_chat.rs +++ b/azalea-protocol/src/packets/game/c_delete_chat.rs @@ -3,7 +3,7 @@ use azalea_protocol_macros::ClientboundGamePacket; use super::c_player_chat::PackedMessageSignature; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundDeleteChat { pub signature: PackedMessageSignature, } diff --git a/azalea-protocol/src/packets/game/c_disconnect.rs b/azalea-protocol/src/packets/game/c_disconnect.rs index 3cf21291..585dfba3 100644 --- a/azalea-protocol/src/packets/game/c_disconnect.rs +++ b/azalea-protocol/src/packets/game/c_disconnect.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_chat::FormattedText; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundDisconnect { pub reason: FormattedText, } diff --git a/azalea-protocol/src/packets/game/c_disguised_chat.rs b/azalea-protocol/src/packets/game/c_disguised_chat.rs index 31cdc0c6..f83107ef 100644 --- a/azalea-protocol/src/packets/game/c_disguised_chat.rs +++ b/azalea-protocol/src/packets/game/c_disguised_chat.rs @@ -13,7 +13,7 @@ use crate::packets::game::c_player_chat::GUESSED_DEFAULT_REGISTRIES_FOR_CHAT; /// without chat signing. /// /// Vanilla servers use this packet when messages are sent from the console. -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundDisguisedChat { pub message: FormattedText, pub chat_type: ChatTypeBound, diff --git a/azalea-protocol/src/packets/game/c_entity_event.rs b/azalea-protocol/src/packets/game/c_entity_event.rs index 762841a2..cde6fd6c 100644 --- a/azalea-protocol/src/packets/game/c_entity_event.rs +++ b/azalea-protocol/src/packets/game/c_entity_event.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundGamePacket; use azalea_world::MinecraftEntityId; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundEntityEvent { pub entity_id: MinecraftEntityId, pub event_id: u8, diff --git a/azalea-protocol/src/packets/game/c_entity_position_sync.rs b/azalea-protocol/src/packets/game/c_entity_position_sync.rs index a48830ac..b18248fc 100644 --- a/azalea-protocol/src/packets/game/c_entity_position_sync.rs +++ b/azalea-protocol/src/packets/game/c_entity_position_sync.rs @@ -4,7 +4,7 @@ use azalea_world::MinecraftEntityId; use crate::common::movements::PositionMoveRotation; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundEntityPositionSync { #[var] pub id: MinecraftEntityId, diff --git a/azalea-protocol/src/packets/game/c_explode.rs b/azalea-protocol/src/packets/game/c_explode.rs index e8744b79..2c934c31 100644 --- a/azalea-protocol/src/packets/game/c_explode.rs +++ b/azalea-protocol/src/packets/game/c_explode.rs @@ -4,7 +4,7 @@ use azalea_entity::particle::Particle; use azalea_protocol_macros::ClientboundGamePacket; use azalea_registry::builtin::SoundEvent; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundExplode { pub center: Vec3, pub radius: f32, @@ -15,7 +15,7 @@ pub struct ClientboundExplode { pub block_particles: Vec<ExplosionParticleInfo>, } -#[derive(Clone, Debug, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct ExplosionParticleInfo { pub particle: Particle, pub scaling: f32, diff --git a/azalea-protocol/src/packets/game/c_forget_level_chunk.rs b/azalea-protocol/src/packets/game/c_forget_level_chunk.rs index 41a89f9a..dbc5d9b8 100644 --- a/azalea-protocol/src/packets/game/c_forget_level_chunk.rs +++ b/azalea-protocol/src/packets/game/c_forget_level_chunk.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_core::position::ChunkPos; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundForgetLevelChunk { pub pos: ChunkPos, } diff --git a/azalea-protocol/src/packets/game/c_game_event.rs b/azalea-protocol/src/packets/game/c_game_event.rs index f04a18fe..3081421c 100644 --- a/azalea-protocol/src/packets/game/c_game_event.rs +++ b/azalea-protocol/src/packets/game/c_game_event.rs @@ -1,13 +1,13 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundGameEvent { pub event: EventType, pub param: f32, } -#[derive(Clone, Debug, Copy, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Copy, Debug, PartialEq)] pub enum EventType { NoRespawnBlockAvailable = 0, StartRaining = 1, diff --git a/azalea-protocol/src/packets/game/c_game_test_highlight_pos.rs b/azalea-protocol/src/packets/game/c_game_test_highlight_pos.rs index c7c117df..c61045e3 100644 --- a/azalea-protocol/src/packets/game/c_game_test_highlight_pos.rs +++ b/azalea-protocol/src/packets/game/c_game_test_highlight_pos.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_core::position::BlockPos; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundGameTestHighlightPos { pub absolute_pos: BlockPos, pub relative_pos: BlockPos, diff --git a/azalea-protocol/src/packets/game/c_hurt_animation.rs b/azalea-protocol/src/packets/game/c_hurt_animation.rs index 631eb402..698176e4 100644 --- a/azalea-protocol/src/packets/game/c_hurt_animation.rs +++ b/azalea-protocol/src/packets/game/c_hurt_animation.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundGamePacket; use azalea_world::MinecraftEntityId; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundHurtAnimation { #[var] pub id: MinecraftEntityId, diff --git a/azalea-protocol/src/packets/game/c_initialize_border.rs b/azalea-protocol/src/packets/game/c_initialize_border.rs index 48c5ed30..768dc2a6 100644 --- a/azalea-protocol/src/packets/game/c_initialize_border.rs +++ b/azalea-protocol/src/packets/game/c_initialize_border.rs @@ -1,7 +1,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundInitializeBorder { pub new_center_x: f64, pub new_center_z: f64, diff --git a/azalea-protocol/src/packets/game/c_keep_alive.rs b/azalea-protocol/src/packets/game/c_keep_alive.rs index ba58c711..fc380265 100644 --- a/azalea-protocol/src/packets/game/c_keep_alive.rs +++ b/azalea-protocol/src/packets/game/c_keep_alive.rs @@ -1,7 +1,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundKeepAlive { pub id: u64, } diff --git a/azalea-protocol/src/packets/game/c_level_chunk_with_light.rs b/azalea-protocol/src/packets/game/c_level_chunk_with_light.rs index d9d1097f..6519c4a4 100644 --- a/azalea-protocol/src/packets/game/c_level_chunk_with_light.rs +++ b/azalea-protocol/src/packets/game/c_level_chunk_with_light.rs @@ -8,7 +8,7 @@ use simdnbt::owned::Nbt; use super::c_light_update::ClientboundLightUpdatePacketData; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundLevelChunkWithLight { // this can't be a ChunkPos since that reads z first and then x pub x: i32, @@ -17,7 +17,7 @@ pub struct ClientboundLevelChunkWithLight { pub light_data: ClientboundLightUpdatePacketData, } -#[derive(Clone, Debug, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct ClientboundLevelChunkPacketData { pub heightmaps: Vec<(HeightmapKind, Box<[u64]>)>, /// The raw chunk sections. @@ -31,7 +31,7 @@ pub struct ClientboundLevelChunkPacketData { pub block_entities: Vec<BlockEntity>, } -#[derive(Clone, Debug, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct BlockEntity { pub packed_xz: u8, pub y: u16, diff --git a/azalea-protocol/src/packets/game/c_level_event.rs b/azalea-protocol/src/packets/game/c_level_event.rs index 08284559..3173e4eb 100644 --- a/azalea-protocol/src/packets/game/c_level_event.rs +++ b/azalea-protocol/src/packets/game/c_level_event.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_core::position::BlockPos; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundLevelEvent { pub event_type: u32, pub pos: BlockPos, diff --git a/azalea-protocol/src/packets/game/c_level_particles.rs b/azalea-protocol/src/packets/game/c_level_particles.rs index 8fd05138..67164f28 100644 --- a/azalea-protocol/src/packets/game/c_level_particles.rs +++ b/azalea-protocol/src/packets/game/c_level_particles.rs @@ -3,7 +3,7 @@ use azalea_core::position::Vec3; use azalea_entity::particle::Particle; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundLevelParticles { pub override_limiter: bool, pub always_show: bool, diff --git a/azalea-protocol/src/packets/game/c_light_update.rs b/azalea-protocol/src/packets/game/c_light_update.rs index 46e78fe8..83dbda34 100644 --- a/azalea-protocol/src/packets/game/c_light_update.rs +++ b/azalea-protocol/src/packets/game/c_light_update.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_core::bitset::BitSet; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundLightUpdate { #[var] pub x: i32, @@ -11,7 +11,7 @@ pub struct ClientboundLightUpdate { pub light_data: ClientboundLightUpdatePacketData, } -#[derive(Clone, Debug, AzBuf, Default, PartialEq)] +#[derive(AzBuf, Clone, Debug, Default, PartialEq)] pub struct ClientboundLightUpdatePacketData { pub sky_y_mask: BitSet, pub block_y_mask: BitSet, diff --git a/azalea-protocol/src/packets/game/c_login.rs b/azalea-protocol/src/packets/game/c_login.rs index 9439eec9..ce243a55 100644 --- a/azalea-protocol/src/packets/game/c_login.rs +++ b/azalea-protocol/src/packets/game/c_login.rs @@ -9,7 +9,7 @@ use crate::packets::common::CommonPlayerSpawnInfo; /// /// This packet contains information about the state of the player, the /// world, and the registry. -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundLogin { pub player_id: MinecraftEntityId, pub hardcore: bool, diff --git a/azalea-protocol/src/packets/game/c_map_item_data.rs b/azalea-protocol/src/packets/game/c_map_item_data.rs index eaf5dc9f..2330ce07 100644 --- a/azalea-protocol/src/packets/game/c_map_item_data.rs +++ b/azalea-protocol/src/packets/game/c_map_item_data.rs @@ -4,7 +4,7 @@ use azalea_buf::{AzBuf, AzaleaRead, AzaleaWrite}; use azalea_chat::FormattedText; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundMapItemData { #[var] pub map_id: u32, @@ -14,7 +14,7 @@ pub struct ClientboundMapItemData { pub color_patch: OptionalMapPatch, } -#[derive(Clone, Debug, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct MapDecoration { pub decoration_type: DecorationType, pub x: i8, @@ -25,7 +25,7 @@ pub struct MapDecoration { pub name: Option<FormattedText>, } -#[derive(Debug, Clone, PartialEq)] +#[derive(Clone, Debug, PartialEq)] pub struct OptionalMapPatch(pub Option<MapPatch>); impl AzaleaRead for OptionalMapPatch { @@ -49,7 +49,7 @@ impl AzaleaWrite for OptionalMapPatch { } } -#[derive(Debug, Clone, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct MapPatch { pub width: u8, pub height: u8, @@ -58,7 +58,7 @@ pub struct MapPatch { pub map_colors: Vec<u8>, } -#[derive(Clone, Copy, Debug, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Copy, Debug, PartialEq)] pub enum DecorationType { Player, Frame, diff --git a/azalea-protocol/src/packets/game/c_merchant_offers.rs b/azalea-protocol/src/packets/game/c_merchant_offers.rs index 079041f6..7bbf92c4 100644 --- a/azalea-protocol/src/packets/game/c_merchant_offers.rs +++ b/azalea-protocol/src/packets/game/c_merchant_offers.rs @@ -12,7 +12,7 @@ use azalea_inventory::{ use azalea_protocol_macros::ClientboundGamePacket; use azalea_registry::builtin::{DataComponentKind, ItemKind}; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundMerchantOffers { #[var] pub container_id: i32, @@ -25,7 +25,7 @@ pub struct ClientboundMerchantOffers { pub can_restock: bool, } -#[derive(Clone, Debug, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct MerchantOffer { pub base_cost_a: ItemCost, pub result: ItemStack, @@ -43,7 +43,7 @@ pub struct MerchantOffer { /// /// This can be converted into an [`ItemStackData`] with /// [`Self::into_item_stack`]. -#[derive(Clone, Debug, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct ItemCost { pub item: ItemKind, #[var] @@ -74,7 +74,7 @@ impl ItemCost { /// /// If you got this from [`ItemCost`], consider using /// [`ItemCost::into_item_stack`] for a better API instead. -#[derive(Clone, Debug, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct DataComponentExactPredicate { pub expected: Vec<TypedDataComponent>, } diff --git a/azalea-protocol/src/packets/game/c_mount_screen_open.rs b/azalea-protocol/src/packets/game/c_mount_screen_open.rs index 6669d8c1..78600250 100644 --- a/azalea-protocol/src/packets/game/c_mount_screen_open.rs +++ b/azalea-protocol/src/packets/game/c_mount_screen_open.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundGamePacket; use azalea_world::MinecraftEntityId; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundMountScreenOpen { #[var] pub container_id: i32, diff --git a/azalea-protocol/src/packets/game/c_move_entity_pos.rs b/azalea-protocol/src/packets/game/c_move_entity_pos.rs index b3fc81e8..3f4b005a 100644 --- a/azalea-protocol/src/packets/game/c_move_entity_pos.rs +++ b/azalea-protocol/src/packets/game/c_move_entity_pos.rs @@ -3,7 +3,7 @@ use azalea_core::delta::PositionDelta8; use azalea_protocol_macros::ClientboundGamePacket; use azalea_world::MinecraftEntityId; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundMoveEntityPos { #[var] pub entity_id: MinecraftEntityId, diff --git a/azalea-protocol/src/packets/game/c_move_entity_pos_rot.rs b/azalea-protocol/src/packets/game/c_move_entity_pos_rot.rs index 3cdaaab5..81f2a63a 100644 --- a/azalea-protocol/src/packets/game/c_move_entity_pos_rot.rs +++ b/azalea-protocol/src/packets/game/c_move_entity_pos_rot.rs @@ -4,7 +4,7 @@ use azalea_protocol_macros::ClientboundGamePacket; use azalea_world::MinecraftEntityId; /// This packet is sent by the server when an entity moves less then 8 blocks. -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundMoveEntityPosRot { #[var] pub entity_id: MinecraftEntityId, diff --git a/azalea-protocol/src/packets/game/c_move_entity_rot.rs b/azalea-protocol/src/packets/game/c_move_entity_rot.rs index 97f9c9c1..6ccd44fe 100644 --- a/azalea-protocol/src/packets/game/c_move_entity_rot.rs +++ b/azalea-protocol/src/packets/game/c_move_entity_rot.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundGamePacket; use azalea_world::MinecraftEntityId; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundMoveEntityRot { #[var] pub entity_id: MinecraftEntityId, diff --git a/azalea-protocol/src/packets/game/c_move_minecart_along_track.rs b/azalea-protocol/src/packets/game/c_move_minecart_along_track.rs index 31c785ec..61cb5ba8 100644 --- a/azalea-protocol/src/packets/game/c_move_minecart_along_track.rs +++ b/azalea-protocol/src/packets/game/c_move_minecart_along_track.rs @@ -3,14 +3,14 @@ use azalea_core::position::Vec3; use azalea_protocol_macros::ClientboundGamePacket; use azalea_world::MinecraftEntityId; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundMoveMinecartAlongTrack { #[var] pub entity_id: MinecraftEntityId, pub lerp_steps: Vec<MinecartStep>, } -#[derive(Clone, Debug, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct MinecartStep { pub position: Vec3, pub movement: Vec3, diff --git a/azalea-protocol/src/packets/game/c_move_vehicle.rs b/azalea-protocol/src/packets/game/c_move_vehicle.rs index 6975f023..85e7114f 100644 --- a/azalea-protocol/src/packets/game/c_move_vehicle.rs +++ b/azalea-protocol/src/packets/game/c_move_vehicle.rs @@ -3,7 +3,7 @@ use azalea_core::position::Vec3; use azalea_entity::LookDirection; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundMoveVehicle { pub pos: Vec3, pub look_direction: LookDirection, diff --git a/azalea-protocol/src/packets/game/c_open_book.rs b/azalea-protocol/src/packets/game/c_open_book.rs index 952ab412..ae55b77b 100644 --- a/azalea-protocol/src/packets/game/c_open_book.rs +++ b/azalea-protocol/src/packets/game/c_open_book.rs @@ -3,7 +3,7 @@ use azalea_protocol_macros::ClientboundGamePacket; use super::s_interact::InteractionHand; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundOpenBook { pub hand: InteractionHand, } diff --git a/azalea-protocol/src/packets/game/c_open_screen.rs b/azalea-protocol/src/packets/game/c_open_screen.rs index cac3495f..9db3e7ba 100644 --- a/azalea-protocol/src/packets/game/c_open_screen.rs +++ b/azalea-protocol/src/packets/game/c_open_screen.rs @@ -3,7 +3,7 @@ use azalea_chat::FormattedText; use azalea_protocol_macros::ClientboundGamePacket; use azalea_registry::builtin::MenuKind; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundOpenScreen { #[var] pub container_id: i32, diff --git a/azalea-protocol/src/packets/game/c_open_sign_editor.rs b/azalea-protocol/src/packets/game/c_open_sign_editor.rs index 66ebaece..d6a287ac 100644 --- a/azalea-protocol/src/packets/game/c_open_sign_editor.rs +++ b/azalea-protocol/src/packets/game/c_open_sign_editor.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_core::position::BlockPos; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundOpenSignEditor { pub pos: BlockPos, pub is_front_text: bool, diff --git a/azalea-protocol/src/packets/game/c_ping.rs b/azalea-protocol/src/packets/game/c_ping.rs index e6e3e143..7e1b2a23 100644 --- a/azalea-protocol/src/packets/game/c_ping.rs +++ b/azalea-protocol/src/packets/game/c_ping.rs @@ -1,7 +1,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundPing { pub id: u32, } diff --git a/azalea-protocol/src/packets/game/c_place_ghost_recipe.rs b/azalea-protocol/src/packets/game/c_place_ghost_recipe.rs index a0c93962..d4c4a61f 100644 --- a/azalea-protocol/src/packets/game/c_place_ghost_recipe.rs +++ b/azalea-protocol/src/packets/game/c_place_ghost_recipe.rs @@ -3,7 +3,7 @@ use azalea_protocol_macros::ClientboundGamePacket; use crate::common::recipe::RecipeDisplayData; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundPlaceGhostRecipe { #[var] pub container_id: i32, diff --git a/azalea-protocol/src/packets/game/c_player_abilities.rs b/azalea-protocol/src/packets/game/c_player_abilities.rs index 82b43b3d..926f4f2f 100644 --- a/azalea-protocol/src/packets/game/c_player_abilities.rs +++ b/azalea-protocol/src/packets/game/c_player_abilities.rs @@ -5,7 +5,7 @@ use azalea_core::bitset::FixedBitSet; use azalea_entity::PlayerAbilities; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundPlayerAbilities { pub flags: PlayerAbilitiesFlags, pub flying_speed: f32, diff --git a/azalea-protocol/src/packets/game/c_player_chat.rs b/azalea-protocol/src/packets/game/c_player_chat.rs index 41e457a2..a63ab56d 100644 --- a/azalea-protocol/src/packets/game/c_player_chat.rs +++ b/azalea-protocol/src/packets/game/c_player_chat.rs @@ -23,7 +23,7 @@ use azalea_registry::{ use simdnbt::owned::NbtCompound; use uuid::Uuid; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundPlayerChat { #[var] pub global_index: u32, @@ -37,7 +37,7 @@ pub struct ClientboundPlayerChat { pub chat_type: ChatTypeBound, } -#[derive(Clone, Debug, PartialEq, AzBuf)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct PackedSignedMessageBody { // the error is here, for some reason it skipped a byte earlier and here // it's reading `0` when it should be `11` @@ -47,7 +47,7 @@ pub struct PackedSignedMessageBody { pub last_seen: PackedLastSeenMessages, } -#[derive(Clone, Debug, PartialEq, AzBuf)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct PackedLastSeenMessages { pub entries: Vec<PackedMessageSignature>, } @@ -59,33 +59,33 @@ pub enum PackedMessageSignature { Id(u32), } -#[derive(Clone, Debug, PartialEq, AzBuf)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub enum FilterMask { PassThrough, FullyFiltered, PartiallyFiltered(BitSet), } -#[derive(Clone, Debug, PartialEq, AzBuf)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct ChatTypeBound { pub chat_type: Holder<ChatKind, DirectChatType>, pub name: FormattedText, pub target_name: Option<FormattedText>, } -#[derive(Clone, Debug, PartialEq, AzBuf)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct DirectChatType { pub chat: ChatTypeDecoration, pub narration: ChatTypeDecoration, } -#[derive(Clone, Debug, PartialEq, AzBuf)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct ChatTypeDecoration { pub translation_key: String, pub parameters: Vec<ChatTypeDecorationParameter>, pub style: NbtCompound, } -#[derive(Clone, Copy, Debug, PartialEq, AzBuf)] +#[derive(AzBuf, Clone, Copy, Debug, PartialEq)] pub enum ChatTypeDecorationParameter { Sender = 0, Target = 1, diff --git a/azalea-protocol/src/packets/game/c_player_combat_end.rs b/azalea-protocol/src/packets/game/c_player_combat_end.rs index d1cc5cde..8e210e10 100644 --- a/azalea-protocol/src/packets/game/c_player_combat_end.rs +++ b/azalea-protocol/src/packets/game/c_player_combat_end.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundGamePacket; /// Unused by the client in vanilla. -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundPlayerCombatEnd { #[var] pub duration: u32, diff --git a/azalea-protocol/src/packets/game/c_player_combat_enter.rs b/azalea-protocol/src/packets/game/c_player_combat_enter.rs index 82c44f9e..01f99854 100644 --- a/azalea-protocol/src/packets/game/c_player_combat_enter.rs +++ b/azalea-protocol/src/packets/game/c_player_combat_enter.rs @@ -2,5 +2,5 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundGamePacket; /// Unused in vanilla. -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundPlayerCombatEnter; diff --git a/azalea-protocol/src/packets/game/c_player_combat_kill.rs b/azalea-protocol/src/packets/game/c_player_combat_kill.rs index ae758b44..3d2f7d7b 100644 --- a/azalea-protocol/src/packets/game/c_player_combat_kill.rs +++ b/azalea-protocol/src/packets/game/c_player_combat_kill.rs @@ -4,7 +4,7 @@ use azalea_protocol_macros::ClientboundGamePacket; use azalea_world::MinecraftEntityId; /// Used to send a respawn screen. -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundPlayerCombatKill { #[var] pub player_id: MinecraftEntityId, diff --git a/azalea-protocol/src/packets/game/c_player_info_remove.rs b/azalea-protocol/src/packets/game/c_player_info_remove.rs index 5b11048f..6ae8f848 100644 --- a/azalea-protocol/src/packets/game/c_player_info_remove.rs +++ b/azalea-protocol/src/packets/game/c_player_info_remove.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundGamePacket; use uuid::Uuid; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundPlayerInfoRemove { pub profile_ids: Vec<Uuid>, } diff --git a/azalea-protocol/src/packets/game/c_player_info_update.rs b/azalea-protocol/src/packets/game/c_player_info_update.rs index 64a2b5b0..4a18233e 100644 --- a/azalea-protocol/src/packets/game/c_player_info_update.rs +++ b/azalea-protocol/src/packets/game/c_player_info_update.rs @@ -12,7 +12,7 @@ use uuid::Uuid; use super::s_chat_session_update::RemoteChatSessionData; -#[derive(Clone, Debug, PartialEq, ClientboundGamePacket)] +#[derive(ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundPlayerInfoUpdate { pub actions: ActionEnumSet, pub entries: Vec<PlayerInfoEntry>, @@ -30,37 +30,37 @@ pub struct PlayerInfoEntry { pub chat_session: Option<RemoteChatSessionData>, } -#[derive(Clone, Debug, AzBuf)] +#[derive(AzBuf, Clone, Debug)] pub struct AddPlayerAction { pub name: String, pub properties: GameProfileProperties, } -#[derive(Clone, Debug, AzBuf)] +#[derive(AzBuf, Clone, Debug)] pub struct InitializeChatAction { pub chat_session: Option<RemoteChatSessionData>, } -#[derive(Clone, Debug, AzBuf)] +#[derive(AzBuf, Clone, Debug)] pub struct UpdateGameModeAction { pub game_mode: GameMode, } -#[derive(Clone, Debug, AzBuf)] +#[derive(AzBuf, Clone, Debug)] pub struct UpdateListedAction { pub listed: bool, } -#[derive(Clone, Debug, AzBuf)] +#[derive(AzBuf, Clone, Debug)] pub struct UpdateLatencyAction { #[var] pub latency: i32, } -#[derive(Clone, Debug, AzBuf)] +#[derive(AzBuf, Clone, Debug)] pub struct UpdateDisplayNameAction { pub display_name: Option<Box<FormattedText>>, } -#[derive(Clone, Debug, AzBuf)] +#[derive(AzBuf, Clone, Debug)] pub struct UpdateHatAction { pub update_hat: bool, } -#[derive(Clone, Debug, AzBuf)] +#[derive(AzBuf, Clone, Debug)] pub struct UpdateListOrderAction { #[var] pub list_order: i32, @@ -169,7 +169,7 @@ impl AzaleaWrite for ClientboundPlayerInfoUpdate { } } -#[derive(Clone, Debug, PartialEq, Eq)] +#[derive(Clone, Debug, Eq, PartialEq)] pub struct ActionEnumSet { pub add_player: bool, pub initialize_chat: bool, diff --git a/azalea-protocol/src/packets/game/c_player_look_at.rs b/azalea-protocol/src/packets/game/c_player_look_at.rs index 06b84adf..b623868e 100644 --- a/azalea-protocol/src/packets/game/c_player_look_at.rs +++ b/azalea-protocol/src/packets/game/c_player_look_at.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_core::position::Vec3; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundPlayerLookAt { pub from_anchor: Anchor, pub pos: Vec3, diff --git a/azalea-protocol/src/packets/game/c_player_position.rs b/azalea-protocol/src/packets/game/c_player_position.rs index 2ec56d4b..8ec7402d 100644 --- a/azalea-protocol/src/packets/game/c_player_position.rs +++ b/azalea-protocol/src/packets/game/c_player_position.rs @@ -3,7 +3,7 @@ use azalea_protocol_macros::ClientboundGamePacket; use crate::common::movements::{PositionMoveRotation, RelativeMovements}; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundPlayerPosition { /// The teleport ID. #[var] diff --git a/azalea-protocol/src/packets/game/c_player_rotation.rs b/azalea-protocol/src/packets/game/c_player_rotation.rs index fc1da719..07adf78f 100644 --- a/azalea-protocol/src/packets/game/c_player_rotation.rs +++ b/azalea-protocol/src/packets/game/c_player_rotation.rs @@ -1,7 +1,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundPlayerRotation { pub y_rot: f32, pub relative_y: bool, diff --git a/azalea-protocol/src/packets/game/c_pong_response.rs b/azalea-protocol/src/packets/game/c_pong_response.rs index 51aa40c3..06dd005d 100644 --- a/azalea-protocol/src/packets/game/c_pong_response.rs +++ b/azalea-protocol/src/packets/game/c_pong_response.rs @@ -1,7 +1,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundPongResponse { pub time: u64, } diff --git a/azalea-protocol/src/packets/game/c_projectile_power.rs b/azalea-protocol/src/packets/game/c_projectile_power.rs index 643c6172..eae4c885 100644 --- a/azalea-protocol/src/packets/game/c_projectile_power.rs +++ b/azalea-protocol/src/packets/game/c_projectile_power.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundGamePacket; use azalea_world::MinecraftEntityId; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundProjectilePower { #[var] pub id: MinecraftEntityId, diff --git a/azalea-protocol/src/packets/game/c_recipe_book_add.rs b/azalea-protocol/src/packets/game/c_recipe_book_add.rs index 0fcd8b04..e7dbeaec 100644 --- a/azalea-protocol/src/packets/game/c_recipe_book_add.rs +++ b/azalea-protocol/src/packets/game/c_recipe_book_add.rs @@ -4,19 +4,19 @@ use azalea_registry::builtin::RecipeBookCategory; use crate::common::recipe::{Ingredient, RecipeDisplayData}; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundRecipeBookAdd { pub entries: Vec<Entry>, pub replace: bool, } -#[derive(Clone, Debug, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct Entry { pub contents: RecipeDisplayEntry, pub flags: u8, } -#[derive(Clone, Debug, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct RecipeDisplayEntry { #[var] pub id: u32, diff --git a/azalea-protocol/src/packets/game/c_recipe_book_remove.rs b/azalea-protocol/src/packets/game/c_recipe_book_remove.rs index 222730f4..79ec474c 100644 --- a/azalea-protocol/src/packets/game/c_recipe_book_remove.rs +++ b/azalea-protocol/src/packets/game/c_recipe_book_remove.rs @@ -1,7 +1,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundRecipeBookRemove { #[var] pub recipes: Vec<u32>, diff --git a/azalea-protocol/src/packets/game/c_recipe_book_settings.rs b/azalea-protocol/src/packets/game/c_recipe_book_settings.rs index 9bffcce6..e2fa217f 100644 --- a/azalea-protocol/src/packets/game/c_recipe_book_settings.rs +++ b/azalea-protocol/src/packets/game/c_recipe_book_settings.rs @@ -1,12 +1,12 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundRecipeBookSettings { pub book_settings: RecipeBookSettings, } -#[derive(Clone, Debug, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct RecipeBookSettings { pub gui_open: bool, pub filtering_craftable: bool, diff --git a/azalea-protocol/src/packets/game/c_remove_entities.rs b/azalea-protocol/src/packets/game/c_remove_entities.rs index 8711abb7..71749052 100644 --- a/azalea-protocol/src/packets/game/c_remove_entities.rs +++ b/azalea-protocol/src/packets/game/c_remove_entities.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundGamePacket; use azalea_world::MinecraftEntityId; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundRemoveEntities { #[var] pub entity_ids: Vec<MinecraftEntityId>, diff --git a/azalea-protocol/src/packets/game/c_remove_mob_effect.rs b/azalea-protocol/src/packets/game/c_remove_mob_effect.rs index f17cfd37..d5190e53 100644 --- a/azalea-protocol/src/packets/game/c_remove_mob_effect.rs +++ b/azalea-protocol/src/packets/game/c_remove_mob_effect.rs @@ -3,7 +3,7 @@ use azalea_protocol_macros::ClientboundGamePacket; use azalea_registry::builtin::MobEffect; use azalea_world::MinecraftEntityId; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundRemoveMobEffect { #[var] pub entity_id: MinecraftEntityId, diff --git a/azalea-protocol/src/packets/game/c_reset_score.rs b/azalea-protocol/src/packets/game/c_reset_score.rs index d974b290..2aa3fc74 100644 --- a/azalea-protocol/src/packets/game/c_reset_score.rs +++ b/azalea-protocol/src/packets/game/c_reset_score.rs @@ -1,7 +1,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundResetScore { pub owner: String, pub objective_name: Option<String>, diff --git a/azalea-protocol/src/packets/game/c_resource_pack_pop.rs b/azalea-protocol/src/packets/game/c_resource_pack_pop.rs index 2b41f0da..908e3e0c 100644 --- a/azalea-protocol/src/packets/game/c_resource_pack_pop.rs +++ b/azalea-protocol/src/packets/game/c_resource_pack_pop.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundGamePacket; use uuid::Uuid; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundResourcePackPop { pub id: Option<Uuid>, } diff --git a/azalea-protocol/src/packets/game/c_resource_pack_push.rs b/azalea-protocol/src/packets/game/c_resource_pack_push.rs index 767670fd..d4f97a64 100644 --- a/azalea-protocol/src/packets/game/c_resource_pack_push.rs +++ b/azalea-protocol/src/packets/game/c_resource_pack_push.rs @@ -3,7 +3,7 @@ use azalea_chat::FormattedText; use azalea_protocol_macros::ClientboundGamePacket; use uuid::Uuid; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundResourcePackPush { pub id: Uuid, pub url: String, diff --git a/azalea-protocol/src/packets/game/c_respawn.rs b/azalea-protocol/src/packets/game/c_respawn.rs index 5dad5f6f..27eafa4f 100644 --- a/azalea-protocol/src/packets/game/c_respawn.rs +++ b/azalea-protocol/src/packets/game/c_respawn.rs @@ -3,7 +3,7 @@ use azalea_protocol_macros::ClientboundGamePacket; use crate::packets::common::CommonPlayerSpawnInfo; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundRespawn { pub common: CommonPlayerSpawnInfo, pub data_to_keep: u8, diff --git a/azalea-protocol/src/packets/game/c_rotate_head.rs b/azalea-protocol/src/packets/game/c_rotate_head.rs index 6c961609..3ced78cb 100644 --- a/azalea-protocol/src/packets/game/c_rotate_head.rs +++ b/azalea-protocol/src/packets/game/c_rotate_head.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundGamePacket; use azalea_world::MinecraftEntityId; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundRotateHead { #[var] pub entity_id: MinecraftEntityId, diff --git a/azalea-protocol/src/packets/game/c_section_blocks_update.rs b/azalea-protocol/src/packets/game/c_section_blocks_update.rs index 8bfe45b7..070d2a9e 100644 --- a/azalea-protocol/src/packets/game/c_section_blocks_update.rs +++ b/azalea-protocol/src/packets/game/c_section_blocks_update.rs @@ -5,7 +5,7 @@ use azalea_buf::{AzBuf, AzaleaRead, AzaleaReadVar, AzaleaWrite, AzaleaWriteVar, use azalea_core::position::{ChunkSectionBlockPos, ChunkSectionPos}; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundSectionBlocksUpdate { pub section_pos: ChunkSectionPos, pub states: Vec<BlockStateWithPosition>, diff --git a/azalea-protocol/src/packets/game/c_select_advancements_tab.rs b/azalea-protocol/src/packets/game/c_select_advancements_tab.rs index 0ff46365..6aee22e2 100644 --- a/azalea-protocol/src/packets/game/c_select_advancements_tab.rs +++ b/azalea-protocol/src/packets/game/c_select_advancements_tab.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_registry::identifier::Identifier; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundSelectAdvancementsTab { pub tab: Option<Identifier>, } diff --git a/azalea-protocol/src/packets/game/c_server_data.rs b/azalea-protocol/src/packets/game/c_server_data.rs index 43aaf8f7..6dafc28f 100644 --- a/azalea-protocol/src/packets/game/c_server_data.rs +++ b/azalea-protocol/src/packets/game/c_server_data.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_chat::FormattedText; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundServerData { pub motd: FormattedText, pub icon_bytes: Option<Vec<u8>>, diff --git a/azalea-protocol/src/packets/game/c_server_links.rs b/azalea-protocol/src/packets/game/c_server_links.rs index ffb62517..75869492 100644 --- a/azalea-protocol/src/packets/game/c_server_links.rs +++ b/azalea-protocol/src/packets/game/c_server_links.rs @@ -3,7 +3,7 @@ use azalea_protocol_macros::ClientboundGamePacket; use crate::common::server_links::ServerLinkEntry; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundServerLinks { pub links: Vec<ServerLinkEntry>, } diff --git a/azalea-protocol/src/packets/game/c_set_action_bar_text.rs b/azalea-protocol/src/packets/game/c_set_action_bar_text.rs index 2ea07089..bae9c103 100644 --- a/azalea-protocol/src/packets/game/c_set_action_bar_text.rs +++ b/azalea-protocol/src/packets/game/c_set_action_bar_text.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_chat::FormattedText; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundSetActionBarText { pub text: FormattedText, } diff --git a/azalea-protocol/src/packets/game/c_set_border_center.rs b/azalea-protocol/src/packets/game/c_set_border_center.rs index 7d4ae1d8..d9663920 100644 --- a/azalea-protocol/src/packets/game/c_set_border_center.rs +++ b/azalea-protocol/src/packets/game/c_set_border_center.rs @@ -1,7 +1,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundSetBorderCenter { pub new_center_x: f64, pub new_center_z: f64, diff --git a/azalea-protocol/src/packets/game/c_set_border_lerp_size.rs b/azalea-protocol/src/packets/game/c_set_border_lerp_size.rs index 219d478f..400e2e49 100644 --- a/azalea-protocol/src/packets/game/c_set_border_lerp_size.rs +++ b/azalea-protocol/src/packets/game/c_set_border_lerp_size.rs @@ -1,7 +1,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundSetBorderLerpSize { pub old_size: f64, pub new_size: f64, diff --git a/azalea-protocol/src/packets/game/c_set_border_size.rs b/azalea-protocol/src/packets/game/c_set_border_size.rs index cb6b58c6..09d29f8a 100644 --- a/azalea-protocol/src/packets/game/c_set_border_size.rs +++ b/azalea-protocol/src/packets/game/c_set_border_size.rs @@ -1,7 +1,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundSetBorderSize { pub size: f64, } diff --git a/azalea-protocol/src/packets/game/c_set_border_warning_delay.rs b/azalea-protocol/src/packets/game/c_set_border_warning_delay.rs index 4f1bbead..8aa0d84e 100644 --- a/azalea-protocol/src/packets/game/c_set_border_warning_delay.rs +++ b/azalea-protocol/src/packets/game/c_set_border_warning_delay.rs @@ -1,7 +1,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundSetBorderWarningDelay { #[var] pub warning_delay: u32, diff --git a/azalea-protocol/src/packets/game/c_set_border_warning_distance.rs b/azalea-protocol/src/packets/game/c_set_border_warning_distance.rs index 4b3cdbea..d36833c9 100644 --- a/azalea-protocol/src/packets/game/c_set_border_warning_distance.rs +++ b/azalea-protocol/src/packets/game/c_set_border_warning_distance.rs @@ -1,7 +1,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundSetBorderWarningDistance { #[var] pub warning_blocks: u32, diff --git a/azalea-protocol/src/packets/game/c_set_camera.rs b/azalea-protocol/src/packets/game/c_set_camera.rs index 97e0aedc..f2b44f0b 100644 --- a/azalea-protocol/src/packets/game/c_set_camera.rs +++ b/azalea-protocol/src/packets/game/c_set_camera.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundGamePacket; use azalea_world::MinecraftEntityId; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundSetCamera { #[var] pub camera_id: MinecraftEntityId, diff --git a/azalea-protocol/src/packets/game/c_set_chunk_cache_center.rs b/azalea-protocol/src/packets/game/c_set_chunk_cache_center.rs index 24507c4c..0085e501 100644 --- a/azalea-protocol/src/packets/game/c_set_chunk_cache_center.rs +++ b/azalea-protocol/src/packets/game/c_set_chunk_cache_center.rs @@ -1,7 +1,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundSetChunkCacheCenter { #[var] pub x: i32, diff --git a/azalea-protocol/src/packets/game/c_set_chunk_cache_radius.rs b/azalea-protocol/src/packets/game/c_set_chunk_cache_radius.rs index e17ea3a2..41f686cb 100644 --- a/azalea-protocol/src/packets/game/c_set_chunk_cache_radius.rs +++ b/azalea-protocol/src/packets/game/c_set_chunk_cache_radius.rs @@ -1,7 +1,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundSetChunkCacheRadius { #[var] pub radius: u32, diff --git a/azalea-protocol/src/packets/game/c_set_cursor_item.rs b/azalea-protocol/src/packets/game/c_set_cursor_item.rs index 7e207d18..1499d6e5 100644 --- a/azalea-protocol/src/packets/game/c_set_cursor_item.rs +++ b/azalea-protocol/src/packets/game/c_set_cursor_item.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_inventory::ItemStack; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundSetCursorItem { pub contents: ItemStack, } diff --git a/azalea-protocol/src/packets/game/c_set_default_spawn_position.rs b/azalea-protocol/src/packets/game/c_set_default_spawn_position.rs index 429030ef..01a64a11 100644 --- a/azalea-protocol/src/packets/game/c_set_default_spawn_position.rs +++ b/azalea-protocol/src/packets/game/c_set_default_spawn_position.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_core::position::GlobalPos; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundSetDefaultSpawnPosition { pub global_pos: GlobalPos, pub yaw: f32, diff --git a/azalea-protocol/src/packets/game/c_set_display_objective.rs b/azalea-protocol/src/packets/game/c_set_display_objective.rs index 3abc847f..496259f1 100644 --- a/azalea-protocol/src/packets/game/c_set_display_objective.rs +++ b/azalea-protocol/src/packets/game/c_set_display_objective.rs @@ -1,13 +1,13 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundSetDisplayObjective { pub slot: DisplaySlot, pub objective_name: String, } -#[derive(Clone, Debug, Copy, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Copy, Debug, PartialEq)] pub enum DisplaySlot { List = 0, Sidebar, diff --git a/azalea-protocol/src/packets/game/c_set_entity_data.rs b/azalea-protocol/src/packets/game/c_set_entity_data.rs index 88aa04d9..6e738f5f 100644 --- a/azalea-protocol/src/packets/game/c_set_entity_data.rs +++ b/azalea-protocol/src/packets/game/c_set_entity_data.rs @@ -3,7 +3,7 @@ use azalea_entity::EntityMetadataItems; use azalea_protocol_macros::ClientboundGamePacket; use azalea_world::MinecraftEntityId; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundSetEntityData { #[var] pub id: MinecraftEntityId, diff --git a/azalea-protocol/src/packets/game/c_set_entity_link.rs b/azalea-protocol/src/packets/game/c_set_entity_link.rs index efa1262a..127b09a3 100644 --- a/azalea-protocol/src/packets/game/c_set_entity_link.rs +++ b/azalea-protocol/src/packets/game/c_set_entity_link.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundGamePacket; use azalea_world::MinecraftEntityId; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundSetEntityLink { pub source_id: MinecraftEntityId, pub dest_id: MinecraftEntityId, diff --git a/azalea-protocol/src/packets/game/c_set_entity_motion.rs b/azalea-protocol/src/packets/game/c_set_entity_motion.rs index a48ec885..f6219888 100644 --- a/azalea-protocol/src/packets/game/c_set_entity_motion.rs +++ b/azalea-protocol/src/packets/game/c_set_entity_motion.rs @@ -3,7 +3,7 @@ use azalea_core::delta::LpVec3; use azalea_protocol_macros::ClientboundGamePacket; use azalea_world::MinecraftEntityId; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundSetEntityMotion { #[var] pub id: MinecraftEntityId, diff --git a/azalea-protocol/src/packets/game/c_set_equipment.rs b/azalea-protocol/src/packets/game/c_set_equipment.rs index 0ef3d8e1..d6b1c735 100644 --- a/azalea-protocol/src/packets/game/c_set_equipment.rs +++ b/azalea-protocol/src/packets/game/c_set_equipment.rs @@ -5,7 +5,7 @@ use azalea_inventory::{ItemStack, components::EquipmentSlot}; use azalea_protocol_macros::ClientboundGamePacket; use azalea_world::MinecraftEntityId; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundSetEquipment { #[var] pub entity_id: MinecraftEntityId, diff --git a/azalea-protocol/src/packets/game/c_set_experience.rs b/azalea-protocol/src/packets/game/c_set_experience.rs index 8b18ee81..d311a863 100644 --- a/azalea-protocol/src/packets/game/c_set_experience.rs +++ b/azalea-protocol/src/packets/game/c_set_experience.rs @@ -1,7 +1,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundSetExperience { pub experience_progress: f32, #[var] diff --git a/azalea-protocol/src/packets/game/c_set_health.rs b/azalea-protocol/src/packets/game/c_set_health.rs index b80b0361..82e31f78 100644 --- a/azalea-protocol/src/packets/game/c_set_health.rs +++ b/azalea-protocol/src/packets/game/c_set_health.rs @@ -1,7 +1,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundSetHealth { pub health: f32, #[var] diff --git a/azalea-protocol/src/packets/game/c_set_held_slot.rs b/azalea-protocol/src/packets/game/c_set_held_slot.rs index 6b51be26..ca311df5 100644 --- a/azalea-protocol/src/packets/game/c_set_held_slot.rs +++ b/azalea-protocol/src/packets/game/c_set_held_slot.rs @@ -1,7 +1,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundSetHeldSlot { #[var] pub slot: u32, diff --git a/azalea-protocol/src/packets/game/c_set_objective.rs b/azalea-protocol/src/packets/game/c_set_objective.rs index 853bc28a..dad4ccdf 100644 --- a/azalea-protocol/src/packets/game/c_set_objective.rs +++ b/azalea-protocol/src/packets/game/c_set_objective.rs @@ -5,13 +5,13 @@ use azalea_chat::{FormattedText, numbers::NumberFormat}; use azalea_core::objectives::ObjectiveCriteria; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundSetObjective { pub objective_name: String, pub method: Method, } -#[derive(Clone, Copy, Debug, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Copy, Debug, PartialEq)] pub enum MethodKind { Add, Remove, diff --git a/azalea-protocol/src/packets/game/c_set_passengers.rs b/azalea-protocol/src/packets/game/c_set_passengers.rs index ad2ffe17..ade63267 100644 --- a/azalea-protocol/src/packets/game/c_set_passengers.rs +++ b/azalea-protocol/src/packets/game/c_set_passengers.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundGamePacket; use azalea_world::MinecraftEntityId; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundSetPassengers { #[var] pub vehicle: MinecraftEntityId, diff --git a/azalea-protocol/src/packets/game/c_set_player_inventory.rs b/azalea-protocol/src/packets/game/c_set_player_inventory.rs index 0f3b3b73..e6672e7f 100644 --- a/azalea-protocol/src/packets/game/c_set_player_inventory.rs +++ b/azalea-protocol/src/packets/game/c_set_player_inventory.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_inventory::ItemStack; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundSetPlayerInventory { #[var] pub slot: u32, diff --git a/azalea-protocol/src/packets/game/c_set_player_team.rs b/azalea-protocol/src/packets/game/c_set_player_team.rs index 3f644eb7..e8c85886 100644 --- a/azalea-protocol/src/packets/game/c_set_player_team.rs +++ b/azalea-protocol/src/packets/game/c_set_player_team.rs @@ -2,13 +2,13 @@ use azalea_buf::AzBuf; use azalea_chat::{FormattedText, style::ChatFormatting}; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundSetPlayerTeam { pub name: String, pub method: Method, } -#[derive(Clone, Debug, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub enum Method { Add((Parameters, PlayerList)), Remove, @@ -17,7 +17,7 @@ pub enum Method { Leave(PlayerList), } -#[derive(Clone, Debug, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct Parameters { pub display_name: FormattedText, pub options: u8, @@ -28,7 +28,7 @@ pub struct Parameters { pub player_suffix: FormattedText, } -#[derive(Clone, Copy, Debug, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Copy, Debug, PartialEq)] pub enum CollisionRule { Always, Never, @@ -36,7 +36,7 @@ pub enum CollisionRule { PushOwnTeam, } -#[derive(Clone, Copy, Debug, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Copy, Debug, PartialEq)] pub enum NameTagVisibility { Always, Never, diff --git a/azalea-protocol/src/packets/game/c_set_score.rs b/azalea-protocol/src/packets/game/c_set_score.rs index 0dd68905..07391901 100644 --- a/azalea-protocol/src/packets/game/c_set_score.rs +++ b/azalea-protocol/src/packets/game/c_set_score.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_chat::{numbers::NumberFormat, FormattedText}; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundSetScore { pub owner: String, pub objective_name: String, diff --git a/azalea-protocol/src/packets/game/c_set_simulation_distance.rs b/azalea-protocol/src/packets/game/c_set_simulation_distance.rs index 6ec6df07..b8561a3a 100644 --- a/azalea-protocol/src/packets/game/c_set_simulation_distance.rs +++ b/azalea-protocol/src/packets/game/c_set_simulation_distance.rs @@ -1,7 +1,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundSetSimulationDistance { #[var] pub simulation_distance: u32, diff --git a/azalea-protocol/src/packets/game/c_set_subtitle_text.rs b/azalea-protocol/src/packets/game/c_set_subtitle_text.rs index c011eb4d..14454c72 100644 --- a/azalea-protocol/src/packets/game/c_set_subtitle_text.rs +++ b/azalea-protocol/src/packets/game/c_set_subtitle_text.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_chat::FormattedText; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundSetSubtitleText { pub text: FormattedText, } diff --git a/azalea-protocol/src/packets/game/c_set_time.rs b/azalea-protocol/src/packets/game/c_set_time.rs index 75bdbde6..ff795e87 100644 --- a/azalea-protocol/src/packets/game/c_set_time.rs +++ b/azalea-protocol/src/packets/game/c_set_time.rs @@ -1,7 +1,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundSetTime { pub game_time: u64, pub day_time: u64, diff --git a/azalea-protocol/src/packets/game/c_set_title_text.rs b/azalea-protocol/src/packets/game/c_set_title_text.rs index b75f5ffd..c9217238 100644 --- a/azalea-protocol/src/packets/game/c_set_title_text.rs +++ b/azalea-protocol/src/packets/game/c_set_title_text.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_chat::FormattedText; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundSetTitleText { pub text: FormattedText, } diff --git a/azalea-protocol/src/packets/game/c_set_titles_animation.rs b/azalea-protocol/src/packets/game/c_set_titles_animation.rs index a7d5897b..07190e79 100644 --- a/azalea-protocol/src/packets/game/c_set_titles_animation.rs +++ b/azalea-protocol/src/packets/game/c_set_titles_animation.rs @@ -1,7 +1,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundSetTitlesAnimation { pub fade_in: u32, pub stay: u32, diff --git a/azalea-protocol/src/packets/game/c_show_dialog.rs b/azalea-protocol/src/packets/game/c_show_dialog.rs index 52d9be78..bf860cfb 100644 --- a/azalea-protocol/src/packets/game/c_show_dialog.rs +++ b/azalea-protocol/src/packets/game/c_show_dialog.rs @@ -3,7 +3,7 @@ use azalea_protocol_macros::ClientboundGamePacket; use azalea_registry::{Holder, data::Dialog}; use simdnbt::owned::Nbt; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundShowDialog { pub dialog: Holder<Dialog, Nbt>, } diff --git a/azalea-protocol/src/packets/game/c_sound.rs b/azalea-protocol/src/packets/game/c_sound.rs index 31d30942..a380532c 100644 --- a/azalea-protocol/src/packets/game/c_sound.rs +++ b/azalea-protocol/src/packets/game/c_sound.rs @@ -3,7 +3,7 @@ use azalea_core::sound::CustomSound; use azalea_protocol_macros::ClientboundGamePacket; use azalea_registry::builtin::SoundEvent; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundSound { pub sound: azalea_registry::Holder<SoundEvent, CustomSound>, pub source: SoundSource, diff --git a/azalea-protocol/src/packets/game/c_sound_entity.rs b/azalea-protocol/src/packets/game/c_sound_entity.rs index 72325c04..2b405201 100644 --- a/azalea-protocol/src/packets/game/c_sound_entity.rs +++ b/azalea-protocol/src/packets/game/c_sound_entity.rs @@ -6,7 +6,7 @@ use azalea_world::MinecraftEntityId; use super::c_sound::SoundSource; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundSoundEntity { pub sound: azalea_registry::Holder<SoundEvent, CustomSound>, pub source: SoundSource, diff --git a/azalea-protocol/src/packets/game/c_start_configuration.rs b/azalea-protocol/src/packets/game/c_start_configuration.rs index d419ab52..3e76accf 100644 --- a/azalea-protocol/src/packets/game/c_start_configuration.rs +++ b/azalea-protocol/src/packets/game/c_start_configuration.rs @@ -1,5 +1,5 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundStartConfiguration; diff --git a/azalea-protocol/src/packets/game/c_stop_sound.rs b/azalea-protocol/src/packets/game/c_stop_sound.rs index 419216eb..6225a759 100644 --- a/azalea-protocol/src/packets/game/c_stop_sound.rs +++ b/azalea-protocol/src/packets/game/c_stop_sound.rs @@ -7,7 +7,7 @@ use azalea_registry::identifier::Identifier; use super::c_sound::SoundSource; -#[derive(Clone, Debug, PartialEq, ClientboundGamePacket)] +#[derive(ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundStopSound { pub source: Option<SoundSource>, pub name: Option<Identifier>, diff --git a/azalea-protocol/src/packets/game/c_store_cookie.rs b/azalea-protocol/src/packets/game/c_store_cookie.rs index fff6fb71..4bd702f2 100644 --- a/azalea-protocol/src/packets/game/c_store_cookie.rs +++ b/azalea-protocol/src/packets/game/c_store_cookie.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_registry::identifier::Identifier; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundStoreCookie { pub key: Identifier, pub payload: Vec<u8>, diff --git a/azalea-protocol/src/packets/game/c_system_chat.rs b/azalea-protocol/src/packets/game/c_system_chat.rs index 6ad67ccd..491825f4 100644 --- a/azalea-protocol/src/packets/game/c_system_chat.rs +++ b/azalea-protocol/src/packets/game/c_system_chat.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_chat::FormattedText; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundSystemChat { pub content: FormattedText, pub overlay: bool, diff --git a/azalea-protocol/src/packets/game/c_tab_list.rs b/azalea-protocol/src/packets/game/c_tab_list.rs index 0105b981..9a360dac 100644 --- a/azalea-protocol/src/packets/game/c_tab_list.rs +++ b/azalea-protocol/src/packets/game/c_tab_list.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_chat::FormattedText; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundTabList { pub header: FormattedText, pub footer: FormattedText, diff --git a/azalea-protocol/src/packets/game/c_tag_query.rs b/azalea-protocol/src/packets/game/c_tag_query.rs index 6be68856..492db1c1 100644 --- a/azalea-protocol/src/packets/game/c_tag_query.rs +++ b/azalea-protocol/src/packets/game/c_tag_query.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundGamePacket; use simdnbt::owned::NbtTag; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundTagQuery { #[var] pub transaction_id: u32, diff --git a/azalea-protocol/src/packets/game/c_take_item_entity.rs b/azalea-protocol/src/packets/game/c_take_item_entity.rs index 09b2f7bc..0ab5e832 100644 --- a/azalea-protocol/src/packets/game/c_take_item_entity.rs +++ b/azalea-protocol/src/packets/game/c_take_item_entity.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundGamePacket; use azalea_world::MinecraftEntityId; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundTakeItemEntity { #[var] pub item_id: u32, diff --git a/azalea-protocol/src/packets/game/c_teleport_entity.rs b/azalea-protocol/src/packets/game/c_teleport_entity.rs index 8f9ea2d8..b025338b 100644 --- a/azalea-protocol/src/packets/game/c_teleport_entity.rs +++ b/azalea-protocol/src/packets/game/c_teleport_entity.rs @@ -4,7 +4,7 @@ use azalea_world::MinecraftEntityId; use crate::common::movements::{PositionMoveRotation, RelativeMovements}; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundTeleportEntity { #[var] pub id: MinecraftEntityId, diff --git a/azalea-protocol/src/packets/game/c_test_instance_block_status.rs b/azalea-protocol/src/packets/game/c_test_instance_block_status.rs index 9d8d3182..e9f2d47f 100644 --- a/azalea-protocol/src/packets/game/c_test_instance_block_status.rs +++ b/azalea-protocol/src/packets/game/c_test_instance_block_status.rs @@ -3,7 +3,7 @@ use azalea_chat::FormattedText; use azalea_core::position::Vec3; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundTestInstanceBlockStatus { pub status: FormattedText, pub size: Option<Vec3>, diff --git a/azalea-protocol/src/packets/game/c_ticking_state.rs b/azalea-protocol/src/packets/game/c_ticking_state.rs index dfab0fd5..144ce07b 100644 --- a/azalea-protocol/src/packets/game/c_ticking_state.rs +++ b/azalea-protocol/src/packets/game/c_ticking_state.rs @@ -1,7 +1,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundTickingState { pub tick_rate: f32, pub is_frozen: bool, diff --git a/azalea-protocol/src/packets/game/c_ticking_step.rs b/azalea-protocol/src/packets/game/c_ticking_step.rs index dd0977c1..664dbaa3 100644 --- a/azalea-protocol/src/packets/game/c_ticking_step.rs +++ b/azalea-protocol/src/packets/game/c_ticking_step.rs @@ -1,7 +1,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundTickingStep { #[var] pub tick_steps: u32, diff --git a/azalea-protocol/src/packets/game/c_transfer.rs b/azalea-protocol/src/packets/game/c_transfer.rs index bc6e5757..09d786fe 100644 --- a/azalea-protocol/src/packets/game/c_transfer.rs +++ b/azalea-protocol/src/packets/game/c_transfer.rs @@ -1,7 +1,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundTransfer { pub host: String, #[var] diff --git a/azalea-protocol/src/packets/game/c_update_advancements.rs b/azalea-protocol/src/packets/game/c_update_advancements.rs index 6f3e960e..07479656 100644 --- a/azalea-protocol/src/packets/game/c_update_advancements.rs +++ b/azalea-protocol/src/packets/game/c_update_advancements.rs @@ -10,7 +10,7 @@ use azalea_protocol_macros::ClientboundGamePacket; use azalea_registry::identifier::Identifier; use indexmap::IndexMap; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundUpdateAdvancements { pub reset: bool, pub added: Vec<AdvancementHolder>, @@ -19,7 +19,7 @@ pub struct ClientboundUpdateAdvancements { pub show_advancements: bool, } -#[derive(Clone, Debug, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct Advancement { pub parent_id: Option<Identifier>, pub display: Option<DisplayInfo>, @@ -100,7 +100,7 @@ impl azalea_buf::AzaleaRead for DisplayInfo { } } -#[derive(Clone, Debug, Copy, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Copy, Debug, PartialEq)] pub enum FrameType { Task = 0, Challenge = 1, @@ -109,12 +109,12 @@ pub enum FrameType { pub type AdvancementProgress = HashMap<String, CriterionProgress>; -#[derive(Clone, Debug, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct CriterionProgress { pub date: Option<u64>, } -#[derive(Clone, Debug, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct AdvancementHolder { pub id: Identifier, pub value: Advancement, diff --git a/azalea-protocol/src/packets/game/c_update_attributes.rs b/azalea-protocol/src/packets/game/c_update_attributes.rs index 80e4729f..8fb95c28 100644 --- a/azalea-protocol/src/packets/game/c_update_attributes.rs +++ b/azalea-protocol/src/packets/game/c_update_attributes.rs @@ -4,14 +4,14 @@ use azalea_protocol_macros::ClientboundGamePacket; use azalea_registry::builtin::Attribute; use azalea_world::MinecraftEntityId; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundUpdateAttributes { #[var] pub entity_id: MinecraftEntityId, pub values: Vec<AttributeSnapshot>, } -#[derive(Clone, Debug, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct AttributeSnapshot { pub attribute: Attribute, pub base: f64, diff --git a/azalea-protocol/src/packets/game/c_update_mob_effect.rs b/azalea-protocol/src/packets/game/c_update_mob_effect.rs index adc33f62..df07fdfc 100644 --- a/azalea-protocol/src/packets/game/c_update_mob_effect.rs +++ b/azalea-protocol/src/packets/game/c_update_mob_effect.rs @@ -4,7 +4,7 @@ use azalea_protocol_macros::ClientboundGamePacket; use azalea_registry::builtin::MobEffect; use azalea_world::MinecraftEntityId; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundUpdateMobEffect { #[var] pub entity_id: MinecraftEntityId, diff --git a/azalea-protocol/src/packets/game/c_update_recipes.rs b/azalea-protocol/src/packets/game/c_update_recipes.rs index de9f6e3b..eee89d28 100644 --- a/azalea-protocol/src/packets/game/c_update_recipes.rs +++ b/azalea-protocol/src/packets/game/c_update_recipes.rs @@ -7,23 +7,23 @@ use azalea_registry::builtin::ItemKind; use crate::common::recipe::{Ingredient, SlotDisplayData}; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundUpdateRecipes { pub item_sets: HashMap<Identifier, RecipePropertySet>, pub stonecutter_recipes: Vec<SingleInputEntry>, } -#[derive(Clone, Debug, PartialEq, AzBuf)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct SingleInputEntry { pub input: Ingredient, pub recipe: SelectableRecipe, } -#[derive(Clone, Debug, PartialEq, AzBuf)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct SelectableRecipe { pub option_display: SlotDisplayData, } -#[derive(Clone, Debug, PartialEq, AzBuf)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct RecipePropertySet { pub items: Vec<ItemKind>, } diff --git a/azalea-protocol/src/packets/game/c_update_tags.rs b/azalea-protocol/src/packets/game/c_update_tags.rs index 10b5ea06..1d55cce9 100644 --- a/azalea-protocol/src/packets/game/c_update_tags.rs +++ b/azalea-protocol/src/packets/game/c_update_tags.rs @@ -3,7 +3,7 @@ use azalea_protocol_macros::ClientboundGamePacket; use crate::common::tags::TagMap; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundUpdateTags { pub tags: TagMap, } diff --git a/azalea-protocol/src/packets/game/c_waypoint.rs b/azalea-protocol/src/packets/game/c_waypoint.rs index a701622f..38a160e9 100644 --- a/azalea-protocol/src/packets/game/c_waypoint.rs +++ b/azalea-protocol/src/packets/game/c_waypoint.rs @@ -6,13 +6,13 @@ use azalea_protocol_macros::ClientboundGamePacket; use azalea_registry::identifier::Identifier; use uuid::Uuid; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundGamePacket)] +#[derive(AzBuf, ClientboundGamePacket, Clone, Debug, PartialEq)] pub struct ClientboundWaypoint { pub operation: WaypointOperation, pub waypoint: TrackedWaypoint, } -#[derive(AzBuf, Copy, Clone, Debug, PartialEq)] +#[derive(AzBuf, Clone, Copy, Debug, PartialEq)] pub enum WaypointOperation { Track, Untrack, diff --git a/azalea-protocol/src/packets/game/s_accept_teleportation.rs b/azalea-protocol/src/packets/game/s_accept_teleportation.rs index 88ec340c..27af1263 100644 --- a/azalea-protocol/src/packets/game/s_accept_teleportation.rs +++ b/azalea-protocol/src/packets/game/s_accept_teleportation.rs @@ -1,7 +1,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ServerboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundGamePacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundGamePacket)] pub struct ServerboundAcceptTeleportation { #[var] pub id: u32, diff --git a/azalea-protocol/src/packets/game/s_block_entity_tag_query.rs b/azalea-protocol/src/packets/game/s_block_entity_tag_query.rs index 04b3f733..4a744864 100644 --- a/azalea-protocol/src/packets/game/s_block_entity_tag_query.rs +++ b/azalea-protocol/src/packets/game/s_block_entity_tag_query.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_core::position::BlockPos; use azalea_protocol_macros::ServerboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundGamePacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundGamePacket)] pub struct ServerboundBlockEntityTagQuery { #[var] pub transaction_id: u32, diff --git a/azalea-protocol/src/packets/game/s_bundle_item_selected.rs b/azalea-protocol/src/packets/game/s_bundle_item_selected.rs index 35c57b5f..42c3fd71 100644 --- a/azalea-protocol/src/packets/game/s_bundle_item_selected.rs +++ b/azalea-protocol/src/packets/game/s_bundle_item_selected.rs @@ -1,7 +1,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ServerboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundGamePacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundGamePacket)] pub struct ServerboundBundleItemSelected { #[var] pub slot_id: i32, diff --git a/azalea-protocol/src/packets/game/s_change_difficulty.rs b/azalea-protocol/src/packets/game/s_change_difficulty.rs index b01a0225..07a23ab9 100644 --- a/azalea-protocol/src/packets/game/s_change_difficulty.rs +++ b/azalea-protocol/src/packets/game/s_change_difficulty.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_core::difficulty::Difficulty; use azalea_protocol_macros::ServerboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundGamePacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundGamePacket)] pub struct ServerboundChangeDifficulty { pub difficulty: Difficulty, } diff --git a/azalea-protocol/src/packets/game/s_change_game_mode.rs b/azalea-protocol/src/packets/game/s_change_game_mode.rs index e11725c1..d86d2ca7 100644 --- a/azalea-protocol/src/packets/game/s_change_game_mode.rs +++ b/azalea-protocol/src/packets/game/s_change_game_mode.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_core::game_type::GameMode; use azalea_protocol_macros::ServerboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundGamePacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundGamePacket)] pub struct ServerboundChangeGameMode { pub mode: GameMode, } diff --git a/azalea-protocol/src/packets/game/s_chat.rs b/azalea-protocol/src/packets/game/s_chat.rs index 3b881181..f957bbea 100644 --- a/azalea-protocol/src/packets/game/s_chat.rs +++ b/azalea-protocol/src/packets/game/s_chat.rs @@ -3,7 +3,7 @@ use azalea_core::bitset::FixedBitSet; use azalea_crypto::signing::MessageSignature; use azalea_protocol_macros::ServerboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundGamePacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundGamePacket)] pub struct ServerboundChat { #[limit(256)] pub message: String, @@ -13,7 +13,7 @@ pub struct ServerboundChat { pub last_seen_messages: LastSeenMessagesUpdate, } -#[derive(Clone, Debug, AzBuf, Default, PartialEq)] +#[derive(AzBuf, Clone, Debug, Default, PartialEq)] pub struct LastSeenMessagesUpdate { #[var] pub offset: u32, diff --git a/azalea-protocol/src/packets/game/s_chat_ack.rs b/azalea-protocol/src/packets/game/s_chat_ack.rs index b0abda26..9c9d5152 100644 --- a/azalea-protocol/src/packets/game/s_chat_ack.rs +++ b/azalea-protocol/src/packets/game/s_chat_ack.rs @@ -1,7 +1,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ServerboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundGamePacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundGamePacket)] pub struct ServerboundChatAck { #[var] pub messages: u32, diff --git a/azalea-protocol/src/packets/game/s_chat_command.rs b/azalea-protocol/src/packets/game/s_chat_command.rs index 0ce308d0..d653fa43 100644 --- a/azalea-protocol/src/packets/game/s_chat_command.rs +++ b/azalea-protocol/src/packets/game/s_chat_command.rs @@ -1,7 +1,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ServerboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundGamePacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundGamePacket)] pub struct ServerboundChatCommand { pub command: String, } diff --git a/azalea-protocol/src/packets/game/s_chat_command_signed.rs b/azalea-protocol/src/packets/game/s_chat_command_signed.rs index f45f92c8..6dfac309 100644 --- a/azalea-protocol/src/packets/game/s_chat_command_signed.rs +++ b/azalea-protocol/src/packets/game/s_chat_command_signed.rs @@ -4,7 +4,7 @@ use azalea_protocol_macros::ServerboundGamePacket; use super::s_chat::LastSeenMessagesUpdate; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundGamePacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundGamePacket)] pub struct ServerboundChatCommandSigned { pub command: String, pub timestamp: u64, @@ -13,7 +13,7 @@ pub struct ServerboundChatCommandSigned { pub last_seen_messages: LastSeenMessagesUpdate, } -#[derive(Clone, Debug, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct ArgumentSignature { pub name: String, pub signature: MessageSignature, diff --git a/azalea-protocol/src/packets/game/s_chat_preview.rs b/azalea-protocol/src/packets/game/s_chat_preview.rs index 4dc1a2a0..a540341c 100644 --- a/azalea-protocol/src/packets/game/s_chat_preview.rs +++ b/azalea-protocol/src/packets/game/s_chat_preview.rs @@ -1,7 +1,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ServerboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundGamePacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundGamePacket)] pub struct ServerboundChatPreview { pub query_id: i32, pub query: String, diff --git a/azalea-protocol/src/packets/game/s_chat_session_update.rs b/azalea-protocol/src/packets/game/s_chat_session_update.rs index c72b87ba..8d4f8b67 100644 --- a/azalea-protocol/src/packets/game/s_chat_session_update.rs +++ b/azalea-protocol/src/packets/game/s_chat_session_update.rs @@ -2,18 +2,18 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ServerboundGamePacket; use uuid::Uuid; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundGamePacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundGamePacket)] pub struct ServerboundChatSessionUpdate { pub chat_session: RemoteChatSessionData, } -#[derive(Clone, Debug, PartialEq, Eq, AzBuf)] +#[derive(AzBuf, Clone, Debug, Eq, PartialEq)] pub struct RemoteChatSessionData { pub session_id: Uuid, pub profile_public_key: ProfilePublicKeyData, } -#[derive(Clone, Debug, AzBuf, PartialEq, Eq)] +#[derive(AzBuf, Clone, Debug, Eq, PartialEq)] pub struct ProfilePublicKeyData { pub expires_at: u64, pub key: Vec<u8>, diff --git a/azalea-protocol/src/packets/game/s_chunk_batch_received.rs b/azalea-protocol/src/packets/game/s_chunk_batch_received.rs index 16b58c80..bba28580 100644 --- a/azalea-protocol/src/packets/game/s_chunk_batch_received.rs +++ b/azalea-protocol/src/packets/game/s_chunk_batch_received.rs @@ -1,7 +1,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ServerboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundGamePacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundGamePacket)] pub struct ServerboundChunkBatchReceived { pub desired_chunks_per_tick: f32, } diff --git a/azalea-protocol/src/packets/game/s_client_command.rs b/azalea-protocol/src/packets/game/s_client_command.rs index 106a120e..04fe8936 100644 --- a/azalea-protocol/src/packets/game/s_client_command.rs +++ b/azalea-protocol/src/packets/game/s_client_command.rs @@ -1,7 +1,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ServerboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundGamePacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundGamePacket)] pub struct ServerboundClientCommand { pub action: Action, } diff --git a/azalea-protocol/src/packets/game/s_client_information.rs b/azalea-protocol/src/packets/game/s_client_information.rs index 923a625c..051216f8 100644 --- a/azalea-protocol/src/packets/game/s_client_information.rs +++ b/azalea-protocol/src/packets/game/s_client_information.rs @@ -3,7 +3,7 @@ use azalea_protocol_macros::ServerboundGamePacket; use crate::common::client_information::ClientInformation; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundGamePacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundGamePacket)] pub struct ServerboundClientInformation { pub client_information: ClientInformation, } diff --git a/azalea-protocol/src/packets/game/s_client_tick_end.rs b/azalea-protocol/src/packets/game/s_client_tick_end.rs index b4e0acc4..26738acb 100644 --- a/azalea-protocol/src/packets/game/s_client_tick_end.rs +++ b/azalea-protocol/src/packets/game/s_client_tick_end.rs @@ -1,5 +1,5 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ServerboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundGamePacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundGamePacket)] pub struct ServerboundClientTickEnd; diff --git a/azalea-protocol/src/packets/game/s_command_suggestion.rs b/azalea-protocol/src/packets/game/s_command_suggestion.rs index df5a8ea9..19db9341 100644 --- a/azalea-protocol/src/packets/game/s_command_suggestion.rs +++ b/azalea-protocol/src/packets/game/s_command_suggestion.rs @@ -1,7 +1,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ServerboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundGamePacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundGamePacket)] pub struct ServerboundCommandSuggestion { #[var] pub id: u32, diff --git a/azalea-protocol/src/packets/game/s_configuration_acknowledged.rs b/azalea-protocol/src/packets/game/s_configuration_acknowledged.rs index 2049ef1c..be2d1f2e 100644 --- a/azalea-protocol/src/packets/game/s_configuration_acknowledged.rs +++ b/azalea-protocol/src/packets/game/s_configuration_acknowledged.rs @@ -1,5 +1,5 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ServerboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundGamePacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundGamePacket)] pub struct ServerboundConfigurationAcknowledged; diff --git a/azalea-protocol/src/packets/game/s_container_button_click.rs b/azalea-protocol/src/packets/game/s_container_button_click.rs index 0983c299..42da19c3 100644 --- a/azalea-protocol/src/packets/game/s_container_button_click.rs +++ b/azalea-protocol/src/packets/game/s_container_button_click.rs @@ -1,7 +1,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ServerboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundGamePacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundGamePacket)] pub struct ServerboundContainerButtonClick { #[var] pub container_id: i32, diff --git a/azalea-protocol/src/packets/game/s_container_click.rs b/azalea-protocol/src/packets/game/s_container_click.rs index bfce320e..423af5cb 100644 --- a/azalea-protocol/src/packets/game/s_container_click.rs +++ b/azalea-protocol/src/packets/game/s_container_click.rs @@ -5,7 +5,7 @@ use azalea_protocol_macros::ServerboundGamePacket; use azalea_registry::builtin::{DataComponentKind, ItemKind}; use indexmap::IndexMap; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundGamePacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundGamePacket)] pub struct ServerboundContainerClick { #[var] pub container_id: i32, @@ -20,10 +20,10 @@ pub struct ServerboundContainerClick { /// Similar to an [`ItemStack`] but only carrying a CRC32 hash of the value of /// added data components instead of their entire contents. -#[derive(Clone, Debug, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct HashedStack(pub Option<HashedActualItem>); -#[derive(Clone, Debug, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct HashedActualItem { pub kind: ItemKind, #[var] @@ -31,7 +31,7 @@ pub struct HashedActualItem { pub components: HashedPatchMap, } -#[derive(Clone, Debug, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct HashedPatchMap { #[limit(256)] pub added_components: Vec<(DataComponentKind, Checksum)>, diff --git a/azalea-protocol/src/packets/game/s_container_close.rs b/azalea-protocol/src/packets/game/s_container_close.rs index 79e48629..dc005f22 100644 --- a/azalea-protocol/src/packets/game/s_container_close.rs +++ b/azalea-protocol/src/packets/game/s_container_close.rs @@ -1,7 +1,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ServerboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundGamePacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundGamePacket)] pub struct ServerboundContainerClose { #[var] pub container_id: i32, diff --git a/azalea-protocol/src/packets/game/s_container_slot_state_changed.rs b/azalea-protocol/src/packets/game/s_container_slot_state_changed.rs index 1aedbb68..c5721d18 100644 --- a/azalea-protocol/src/packets/game/s_container_slot_state_changed.rs +++ b/azalea-protocol/src/packets/game/s_container_slot_state_changed.rs @@ -1,7 +1,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ServerboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundGamePacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundGamePacket)] pub struct ServerboundContainerSlotStateChanged { #[var] pub slot_id: u32, diff --git a/azalea-protocol/src/packets/game/s_cookie_response.rs b/azalea-protocol/src/packets/game/s_cookie_response.rs index 72b95f4d..0653d7c9 100644 --- a/azalea-protocol/src/packets/game/s_cookie_response.rs +++ b/azalea-protocol/src/packets/game/s_cookie_response.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_registry::identifier::Identifier; use azalea_protocol_macros::ServerboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundGamePacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundGamePacket)] pub struct ServerboundCookieResponse { pub key: Identifier, pub payload: Option<Vec<u8>>, diff --git a/azalea-protocol/src/packets/game/s_custom_click_action.rs b/azalea-protocol/src/packets/game/s_custom_click_action.rs index e10e8749..e032397d 100644 --- a/azalea-protocol/src/packets/game/s_custom_click_action.rs +++ b/azalea-protocol/src/packets/game/s_custom_click_action.rs @@ -3,7 +3,7 @@ use azalea_registry::identifier::Identifier; use azalea_protocol_macros::ServerboundGamePacket; use simdnbt::owned::Nbt; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundGamePacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundGamePacket)] pub struct ServerboundCustomClickAction { pub id: Identifier, pub payload: Nbt, diff --git a/azalea-protocol/src/packets/game/s_custom_payload.rs b/azalea-protocol/src/packets/game/s_custom_payload.rs index 7e5468d9..a24971b2 100644 --- a/azalea-protocol/src/packets/game/s_custom_payload.rs +++ b/azalea-protocol/src/packets/game/s_custom_payload.rs @@ -2,7 +2,7 @@ use azalea_buf::{AzBuf, UnsizedByteArray}; use azalea_registry::identifier::Identifier; use azalea_protocol_macros::ServerboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundGamePacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundGamePacket)] pub struct ServerboundCustomPayload { pub identifier: Identifier, pub data: UnsizedByteArray, diff --git a/azalea-protocol/src/packets/game/s_debug_subscription_request.rs b/azalea-protocol/src/packets/game/s_debug_subscription_request.rs index 23bd49a5..80a9abd7 100644 --- a/azalea-protocol/src/packets/game/s_debug_subscription_request.rs +++ b/azalea-protocol/src/packets/game/s_debug_subscription_request.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ServerboundGamePacket; use azalea_registry::builtin::DebugSubscription; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundGamePacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundGamePacket)] pub struct ServerboundDebugSubscriptionRequest { pub subscriptions: Vec<DebugSubscription>, } diff --git a/azalea-protocol/src/packets/game/s_edit_book.rs b/azalea-protocol/src/packets/game/s_edit_book.rs index f99a5e0e..b1e70cda 100644 --- a/azalea-protocol/src/packets/game/s_edit_book.rs +++ b/azalea-protocol/src/packets/game/s_edit_book.rs @@ -1,7 +1,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ServerboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundGamePacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundGamePacket)] pub struct ServerboundEditBook { #[var] pub slot: u32, diff --git a/azalea-protocol/src/packets/game/s_entity_tag_query.rs b/azalea-protocol/src/packets/game/s_entity_tag_query.rs index def302e6..00ef5c03 100644 --- a/azalea-protocol/src/packets/game/s_entity_tag_query.rs +++ b/azalea-protocol/src/packets/game/s_entity_tag_query.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ServerboundGamePacket; use azalea_world::MinecraftEntityId; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundGamePacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundGamePacket)] pub struct ServerboundEntityTagQuery { #[var] pub transaction_id: u32, diff --git a/azalea-protocol/src/packets/game/s_interact.rs b/azalea-protocol/src/packets/game/s_interact.rs index 2929570d..fc2cd11e 100644 --- a/azalea-protocol/src/packets/game/s_interact.rs +++ b/azalea-protocol/src/packets/game/s_interact.rs @@ -7,7 +7,7 @@ use azalea_world::MinecraftEntityId; use crate::packets::BufReadError; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundGamePacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundGamePacket)] pub struct ServerboundInteract { #[var] pub entity_id: MinecraftEntityId, diff --git a/azalea-protocol/src/packets/game/s_jigsaw_generate.rs b/azalea-protocol/src/packets/game/s_jigsaw_generate.rs index 00c0cf7d..86ea3f62 100644 --- a/azalea-protocol/src/packets/game/s_jigsaw_generate.rs +++ b/azalea-protocol/src/packets/game/s_jigsaw_generate.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_core::position::BlockPos; use azalea_protocol_macros::ServerboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundGamePacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundGamePacket)] pub struct ServerboundJigsawGenerate { pub pos: BlockPos, #[var] diff --git a/azalea-protocol/src/packets/game/s_keep_alive.rs b/azalea-protocol/src/packets/game/s_keep_alive.rs index 9da1efd4..286efa7b 100644 --- a/azalea-protocol/src/packets/game/s_keep_alive.rs +++ b/azalea-protocol/src/packets/game/s_keep_alive.rs @@ -1,7 +1,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ServerboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundGamePacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundGamePacket)] pub struct ServerboundKeepAlive { pub id: u64, } diff --git a/azalea-protocol/src/packets/game/s_lock_difficulty.rs b/azalea-protocol/src/packets/game/s_lock_difficulty.rs index b874a1a0..cfbdd073 100644 --- a/azalea-protocol/src/packets/game/s_lock_difficulty.rs +++ b/azalea-protocol/src/packets/game/s_lock_difficulty.rs @@ -1,7 +1,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ServerboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundGamePacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundGamePacket)] pub struct ServerboundLockDifficulty { pub locked: bool, } diff --git a/azalea-protocol/src/packets/game/s_move_player_pos.rs b/azalea-protocol/src/packets/game/s_move_player_pos.rs index 3d4e31be..d9e5470b 100644 --- a/azalea-protocol/src/packets/game/s_move_player_pos.rs +++ b/azalea-protocol/src/packets/game/s_move_player_pos.rs @@ -4,7 +4,7 @@ use azalea_protocol_macros::ServerboundGamePacket; use crate::common::movements::MoveFlags; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundGamePacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundGamePacket)] pub struct ServerboundMovePlayerPos { pub pos: Vec3, pub flags: MoveFlags, diff --git a/azalea-protocol/src/packets/game/s_move_player_pos_rot.rs b/azalea-protocol/src/packets/game/s_move_player_pos_rot.rs index 6c6dedec..e95fface 100644 --- a/azalea-protocol/src/packets/game/s_move_player_pos_rot.rs +++ b/azalea-protocol/src/packets/game/s_move_player_pos_rot.rs @@ -5,7 +5,7 @@ use azalea_protocol_macros::ServerboundGamePacket; use crate::common::movements::MoveFlags; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundGamePacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundGamePacket)] pub struct ServerboundMovePlayerPosRot { pub pos: Vec3, pub look_direction: LookDirection, diff --git a/azalea-protocol/src/packets/game/s_move_player_rot.rs b/azalea-protocol/src/packets/game/s_move_player_rot.rs index 54699865..75d851f8 100644 --- a/azalea-protocol/src/packets/game/s_move_player_rot.rs +++ b/azalea-protocol/src/packets/game/s_move_player_rot.rs @@ -4,7 +4,7 @@ use azalea_protocol_macros::ServerboundGamePacket; use crate::common::movements::MoveFlags; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundGamePacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundGamePacket)] pub struct ServerboundMovePlayerRot { pub look_direction: LookDirection, pub flags: MoveFlags, diff --git a/azalea-protocol/src/packets/game/s_move_player_status_only.rs b/azalea-protocol/src/packets/game/s_move_player_status_only.rs index eaa49bab..d00f8726 100644 --- a/azalea-protocol/src/packets/game/s_move_player_status_only.rs +++ b/azalea-protocol/src/packets/game/s_move_player_status_only.rs @@ -3,7 +3,7 @@ use azalea_protocol_macros::ServerboundGamePacket; use crate::common::movements::MoveFlags; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundGamePacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundGamePacket)] pub struct ServerboundMovePlayerStatusOnly { pub flags: MoveFlags, } diff --git a/azalea-protocol/src/packets/game/s_move_vehicle.rs b/azalea-protocol/src/packets/game/s_move_vehicle.rs index f9a3d02b..f9c9dc28 100644 --- a/azalea-protocol/src/packets/game/s_move_vehicle.rs +++ b/azalea-protocol/src/packets/game/s_move_vehicle.rs @@ -3,7 +3,7 @@ use azalea_core::position::Vec3; use azalea_entity::LookDirection; use azalea_protocol_macros::ServerboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundGamePacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundGamePacket)] pub struct ServerboundMoveVehicle { pub pos: Vec3, pub look_direction: LookDirection, diff --git a/azalea-protocol/src/packets/game/s_paddle_boat.rs b/azalea-protocol/src/packets/game/s_paddle_boat.rs index 174849f4..bf92539d 100644 --- a/azalea-protocol/src/packets/game/s_paddle_boat.rs +++ b/azalea-protocol/src/packets/game/s_paddle_boat.rs @@ -1,7 +1,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ServerboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundGamePacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundGamePacket)] pub struct ServerboundPaddleBoat { pub left: bool, pub right: bool, diff --git a/azalea-protocol/src/packets/game/s_pick_item_from_block.rs b/azalea-protocol/src/packets/game/s_pick_item_from_block.rs index db0a8201..5bdbdeda 100644 --- a/azalea-protocol/src/packets/game/s_pick_item_from_block.rs +++ b/azalea-protocol/src/packets/game/s_pick_item_from_block.rs @@ -1,7 +1,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ServerboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundGamePacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundGamePacket)] pub struct ServerboundPickItemFromBlock { #[var] pub slot: u32, diff --git a/azalea-protocol/src/packets/game/s_pick_item_from_entity.rs b/azalea-protocol/src/packets/game/s_pick_item_from_entity.rs index e91298f8..a68e7ab7 100644 --- a/azalea-protocol/src/packets/game/s_pick_item_from_entity.rs +++ b/azalea-protocol/src/packets/game/s_pick_item_from_entity.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ServerboundGamePacket; use azalea_world::MinecraftEntityId; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundGamePacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundGamePacket)] pub struct ServerboundPickItemFromEntity { #[var] pub id: MinecraftEntityId, diff --git a/azalea-protocol/src/packets/game/s_ping_request.rs b/azalea-protocol/src/packets/game/s_ping_request.rs index 1c4c8adc..b6164069 100644 --- a/azalea-protocol/src/packets/game/s_ping_request.rs +++ b/azalea-protocol/src/packets/game/s_ping_request.rs @@ -1,7 +1,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ServerboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundGamePacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundGamePacket)] pub struct ServerboundPingRequest { pub time: u64, } diff --git a/azalea-protocol/src/packets/game/s_place_recipe.rs b/azalea-protocol/src/packets/game/s_place_recipe.rs index 90821d08..6cb73e48 100644 --- a/azalea-protocol/src/packets/game/s_place_recipe.rs +++ b/azalea-protocol/src/packets/game/s_place_recipe.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_registry::identifier::Identifier; use azalea_protocol_macros::ServerboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundGamePacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundGamePacket)] pub struct ServerboundPlaceRecipe { #[var] pub container_id: i32, diff --git a/azalea-protocol/src/packets/game/s_player_action.rs b/azalea-protocol/src/packets/game/s_player_action.rs index 3f129918..ba17f525 100644 --- a/azalea-protocol/src/packets/game/s_player_action.rs +++ b/azalea-protocol/src/packets/game/s_player_action.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_core::{direction::Direction, position::BlockPos}; use azalea_protocol_macros::ServerboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundGamePacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundGamePacket)] pub struct ServerboundPlayerAction { pub action: Action, pub pos: BlockPos, @@ -11,7 +11,7 @@ pub struct ServerboundPlayerAction { pub seq: u32, } -#[derive(AzBuf, Clone, Copy, Debug, PartialEq, Eq)] +#[derive(AzBuf, Clone, Copy, Debug, Eq, PartialEq)] pub enum Action { StartDestroyBlock = 0, AbortDestroyBlock = 1, diff --git a/azalea-protocol/src/packets/game/s_player_command.rs b/azalea-protocol/src/packets/game/s_player_command.rs index f7cb5bee..2e4e83df 100644 --- a/azalea-protocol/src/packets/game/s_player_command.rs +++ b/azalea-protocol/src/packets/game/s_player_command.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ServerboundGamePacket; use azalea_world::MinecraftEntityId; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundGamePacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundGamePacket)] pub struct ServerboundPlayerCommand { #[var] pub id: MinecraftEntityId, diff --git a/azalea-protocol/src/packets/game/s_player_input.rs b/azalea-protocol/src/packets/game/s_player_input.rs index a12262b4..e92d6101 100644 --- a/azalea-protocol/src/packets/game/s_player_input.rs +++ b/azalea-protocol/src/packets/game/s_player_input.rs @@ -5,7 +5,7 @@ use azalea_buf::{AzaleaRead, AzaleaWrite}; use azalea_core::bitset::FixedBitSet; use azalea_protocol_macros::ServerboundGamePacket; -#[derive(Clone, Debug, Default, PartialEq, Eq, ServerboundGamePacket)] +#[derive(Clone, Debug, Default, Eq, PartialEq, ServerboundGamePacket)] pub struct ServerboundPlayerInput { pub forward: bool, pub backward: bool, diff --git a/azalea-protocol/src/packets/game/s_player_loaded.rs b/azalea-protocol/src/packets/game/s_player_loaded.rs index 1372aba1..371e06f5 100644 --- a/azalea-protocol/src/packets/game/s_player_loaded.rs +++ b/azalea-protocol/src/packets/game/s_player_loaded.rs @@ -1,5 +1,5 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ServerboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundGamePacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundGamePacket)] pub struct ServerboundPlayerLoaded; diff --git a/azalea-protocol/src/packets/game/s_pong.rs b/azalea-protocol/src/packets/game/s_pong.rs index 2114cddc..0dd3f5f1 100644 --- a/azalea-protocol/src/packets/game/s_pong.rs +++ b/azalea-protocol/src/packets/game/s_pong.rs @@ -1,7 +1,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ServerboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundGamePacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundGamePacket)] pub struct ServerboundPong { pub id: u32, } diff --git a/azalea-protocol/src/packets/game/s_recipe_book_change_settings.rs b/azalea-protocol/src/packets/game/s_recipe_book_change_settings.rs index 5bf188ee..82863104 100644 --- a/azalea-protocol/src/packets/game/s_recipe_book_change_settings.rs +++ b/azalea-protocol/src/packets/game/s_recipe_book_change_settings.rs @@ -1,7 +1,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ServerboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundGamePacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundGamePacket)] pub struct ServerboundRecipeBookChangeSettings { pub book_type: RecipeBookType, pub is_open: bool, diff --git a/azalea-protocol/src/packets/game/s_recipe_book_seen_recipe.rs b/azalea-protocol/src/packets/game/s_recipe_book_seen_recipe.rs index e9766a64..b2b8123c 100644 --- a/azalea-protocol/src/packets/game/s_recipe_book_seen_recipe.rs +++ b/azalea-protocol/src/packets/game/s_recipe_book_seen_recipe.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_registry::identifier::Identifier; use azalea_protocol_macros::ServerboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundGamePacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundGamePacket)] pub struct ServerboundRecipeBookSeenRecipe { pub recipe: Identifier, } diff --git a/azalea-protocol/src/packets/game/s_rename_item.rs b/azalea-protocol/src/packets/game/s_rename_item.rs index f9fcf269..4d42c02c 100644 --- a/azalea-protocol/src/packets/game/s_rename_item.rs +++ b/azalea-protocol/src/packets/game/s_rename_item.rs @@ -1,7 +1,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ServerboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundGamePacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundGamePacket)] pub struct ServerboundRenameItem { pub name: String, } diff --git a/azalea-protocol/src/packets/game/s_resource_pack.rs b/azalea-protocol/src/packets/game/s_resource_pack.rs index 0d0b55a7..78c21713 100644 --- a/azalea-protocol/src/packets/game/s_resource_pack.rs +++ b/azalea-protocol/src/packets/game/s_resource_pack.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ServerboundGamePacket; use uuid::Uuid; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundGamePacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundGamePacket)] pub struct ServerboundResourcePack { pub id: Uuid, pub action: Action, diff --git a/azalea-protocol/src/packets/game/s_select_trade.rs b/azalea-protocol/src/packets/game/s_select_trade.rs index 2955db7a..a1134ad1 100644 --- a/azalea-protocol/src/packets/game/s_select_trade.rs +++ b/azalea-protocol/src/packets/game/s_select_trade.rs @@ -1,7 +1,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ServerboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundGamePacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundGamePacket)] pub struct ServerboundSelectTrade { #[var] pub item: u32, diff --git a/azalea-protocol/src/packets/game/s_set_beacon.rs b/azalea-protocol/src/packets/game/s_set_beacon.rs index c06d888c..c6e70784 100644 --- a/azalea-protocol/src/packets/game/s_set_beacon.rs +++ b/azalea-protocol/src/packets/game/s_set_beacon.rs @@ -1,7 +1,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ServerboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundGamePacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundGamePacket)] pub struct ServerboundSetBeacon { #[var] pub primary: Option<u32>, diff --git a/azalea-protocol/src/packets/game/s_set_carried_item.rs b/azalea-protocol/src/packets/game/s_set_carried_item.rs index 5d990426..b73c1aab 100644 --- a/azalea-protocol/src/packets/game/s_set_carried_item.rs +++ b/azalea-protocol/src/packets/game/s_set_carried_item.rs @@ -1,7 +1,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ServerboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundGamePacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundGamePacket)] pub struct ServerboundSetCarriedItem { pub slot: u16, } diff --git a/azalea-protocol/src/packets/game/s_set_command_minecart.rs b/azalea-protocol/src/packets/game/s_set_command_minecart.rs index 88e6e74e..b92d24ce 100644 --- a/azalea-protocol/src/packets/game/s_set_command_minecart.rs +++ b/azalea-protocol/src/packets/game/s_set_command_minecart.rs @@ -1,7 +1,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ServerboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundGamePacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundGamePacket)] pub struct ServerboundSetCommandMinecart { #[var] pub entity: u32, diff --git a/azalea-protocol/src/packets/game/s_set_creative_mode_slot.rs b/azalea-protocol/src/packets/game/s_set_creative_mode_slot.rs index 5e06f424..f3c8518e 100644 --- a/azalea-protocol/src/packets/game/s_set_creative_mode_slot.rs +++ b/azalea-protocol/src/packets/game/s_set_creative_mode_slot.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_inventory::ItemStack; use azalea_protocol_macros::ServerboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundGamePacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundGamePacket)] pub struct ServerboundSetCreativeModeSlot { pub slot_num: u16, pub item_stack: ItemStack, diff --git a/azalea-protocol/src/packets/game/s_set_jigsaw_block.rs b/azalea-protocol/src/packets/game/s_set_jigsaw_block.rs index 64a46c02..a19b8a82 100644 --- a/azalea-protocol/src/packets/game/s_set_jigsaw_block.rs +++ b/azalea-protocol/src/packets/game/s_set_jigsaw_block.rs @@ -10,7 +10,7 @@ use azalea_registry::identifier::Identifier; use crate::packets::{AzaleaWrite, BufReadError}; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundGamePacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundGamePacket)] pub struct ServerboundSetJigsawBlock { pub pos: BlockPos, pub name: Identifier, diff --git a/azalea-protocol/src/packets/game/s_set_structure_block.rs b/azalea-protocol/src/packets/game/s_set_structure_block.rs index 401116a1..c4387b0f 100644 --- a/azalea-protocol/src/packets/game/s_set_structure_block.rs +++ b/azalea-protocol/src/packets/game/s_set_structure_block.rs @@ -6,7 +6,7 @@ use azalea_protocol_macros::ServerboundGamePacket; use crate::packets::BufReadError; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundGamePacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundGamePacket)] pub struct ServerboundSetStructureBlock { pub pos: BlockPos, pub update_type: UpdateType, @@ -23,7 +23,7 @@ pub struct ServerboundSetStructureBlock { pub flags: Flags, } -#[derive(Clone, Debug, AzBuf, PartialEq)] +#[derive(AzBuf, Clone, Debug, PartialEq)] pub struct BytePosition { pub x: u8, pub y: u8, @@ -63,7 +63,7 @@ pub enum Rotation { Counterclockwise90 = 3, } -#[derive(Debug, Clone, PartialEq)] +#[derive(Clone, Debug, PartialEq)] pub struct Flags { pub ignore_entities: bool, pub show_air: bool, diff --git a/azalea-protocol/src/packets/game/s_set_test_block.rs b/azalea-protocol/src/packets/game/s_set_test_block.rs index afa456e6..c7429071 100644 --- a/azalea-protocol/src/packets/game/s_set_test_block.rs +++ b/azalea-protocol/src/packets/game/s_set_test_block.rs @@ -2,14 +2,14 @@ use azalea_buf::AzBuf; use azalea_core::position::BlockPos; use azalea_protocol_macros::ServerboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundGamePacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundGamePacket)] pub struct ServerboundSetTestBlock { pub position: BlockPos, pub mode: TestBlockMode, pub message: String, } -#[derive(Clone, Copy, Debug, AzBuf, Default, PartialEq)] +#[derive(AzBuf, Clone, Copy, Debug, Default, PartialEq)] pub enum TestBlockMode { #[default] Start, diff --git a/azalea-protocol/src/packets/game/s_sign_update.rs b/azalea-protocol/src/packets/game/s_sign_update.rs index 85cb1d6f..913af5f8 100644 --- a/azalea-protocol/src/packets/game/s_sign_update.rs +++ b/azalea-protocol/src/packets/game/s_sign_update.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_core::position::BlockPos; use azalea_protocol_macros::ServerboundGamePacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundGamePacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundGamePacket)] pub struct ServerboundSignUpdate { pub pos: BlockPos, pub is_front_text: bool, diff --git a/azalea-protocol/src/packets/game/s_swing.rs b/azalea-protocol/src/packets/game/s_swing.rs index ab336260..2c551a00 100644 --- a/azalea-protocol/src/packets/game/s_swing.rs +++ b/azalea-protocol/src/packets/game/s_swing.rs @@ -3,7 +3,7 @@ use azalea_protocol_macros::ServerboundGamePacket; use crate::packets::game::s_interact::InteractionHand; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundGamePacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundGamePacket)] pub struct ServerboundSwing { pub hand: InteractionHand, } diff --git a/azalea-protocol/src/packets/game/s_teleport_to_entity.rs b/azalea-protocol/src/packets/game/s_teleport_to_entity.rs index a70d0c85..40f6106d 100644 --- a/azalea-protocol/src/packets/game/s_teleport_to_entity.rs +++ b/azalea-protocol/src/packets/game/s_teleport_to_entity.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ServerboundGamePacket; use uuid::Uuid; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundGamePacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundGamePacket)] pub struct ServerboundTeleportToEntity { pub uuid: Uuid, } diff --git a/azalea-protocol/src/packets/game/s_test_instance_block_action.rs b/azalea-protocol/src/packets/game/s_test_instance_block_action.rs index c4baf78d..908b0449 100644 --- a/azalea-protocol/src/packets/game/s_test_instance_block_action.rs +++ b/azalea-protocol/src/packets/game/s_test_instance_block_action.rs @@ -6,14 +6,14 @@ use azalea_registry::builtin::TestInstanceKind; use super::s_set_structure_block::Rotation; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundGamePacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundGamePacket)] pub struct ServerboundTestInstanceBlockAction { pub pos: BlockPos, pub action: Action, pub data: TestInstanceBlockEntityData, } -#[derive(Clone, Copy, Debug, AzBuf, Default, PartialEq)] +#[derive(AzBuf, Clone, Copy, Debug, Default, PartialEq)] pub enum Action { #[default] Init, @@ -25,7 +25,7 @@ pub enum Action { Run, } -#[derive(Clone, Debug, AzBuf, Default, PartialEq)] +#[derive(AzBuf, Clone, Debug, Default, PartialEq)] pub struct TestInstanceBlockEntityData { pub test: Option<TestInstanceKind>, pub size: Vec3i, @@ -35,7 +35,7 @@ pub struct TestInstanceBlockEntityData { pub error_message: Option<FormattedText>, } -#[derive(Clone, Copy, Debug, AzBuf, Default, PartialEq)] +#[derive(AzBuf, Clone, Copy, Debug, Default, PartialEq)] pub enum TestInstanceBlockEntityStatus { #[default] Cleared, diff --git a/azalea-protocol/src/packets/game/s_use_item.rs b/azalea-protocol/src/packets/game/s_use_item.rs index e7be84bc..4dd14e90 100644 --- a/azalea-protocol/src/packets/game/s_use_item.rs +++ b/azalea-protocol/src/packets/game/s_use_item.rs @@ -3,7 +3,7 @@ use azalea_protocol_macros::ServerboundGamePacket; use crate::packets::game::s_interact::InteractionHand; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundGamePacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundGamePacket)] pub struct ServerboundUseItem { pub hand: InteractionHand, #[var] diff --git a/azalea-protocol/src/packets/game/s_use_item_on.rs b/azalea-protocol/src/packets/game/s_use_item_on.rs index 61d7fc78..22d3c861 100644 --- a/azalea-protocol/src/packets/game/s_use_item_on.rs +++ b/azalea-protocol/src/packets/game/s_use_item_on.rs @@ -10,7 +10,7 @@ use azalea_protocol_macros::ServerboundGamePacket; use crate::packets::game::s_interact::InteractionHand; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundGamePacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundGamePacket)] pub struct ServerboundUseItemOn { pub hand: InteractionHand, pub block_hit: BlockHit, diff --git a/azalea-protocol/src/packets/handshake/s_intention.rs b/azalea-protocol/src/packets/handshake/s_intention.rs index 30d74f5d..d0b6d6e3 100644 --- a/azalea-protocol/src/packets/handshake/s_intention.rs +++ b/azalea-protocol/src/packets/handshake/s_intention.rs @@ -5,7 +5,7 @@ use azalea_protocol_macros::ServerboundHandshakePacket; use crate::packets::ClientIntention; -#[derive(Hash, Clone, Debug, AzBuf, PartialEq, ServerboundHandshakePacket)] +#[derive(AzBuf, Clone, Debug, Hash, PartialEq, ServerboundHandshakePacket)] pub struct ServerboundIntention { #[var] pub protocol_version: i32, diff --git a/azalea-protocol/src/packets/login/c_cookie_request.rs b/azalea-protocol/src/packets/login/c_cookie_request.rs index 2df3aaa0..4122325e 100644 --- a/azalea-protocol/src/packets/login/c_cookie_request.rs +++ b/azalea-protocol/src/packets/login/c_cookie_request.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_registry::identifier::Identifier; use azalea_protocol_macros::ClientboundLoginPacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundLoginPacket)] +#[derive(AzBuf, ClientboundLoginPacket, Clone, Debug, PartialEq)] pub struct ClientboundCookieRequest { pub key: Identifier, } diff --git a/azalea-protocol/src/packets/login/c_custom_query.rs b/azalea-protocol/src/packets/login/c_custom_query.rs index 6f975cf4..f4566d4e 100644 --- a/azalea-protocol/src/packets/login/c_custom_query.rs +++ b/azalea-protocol/src/packets/login/c_custom_query.rs @@ -4,7 +4,7 @@ use azalea_buf::{AzBuf, UnsizedByteArray}; use azalea_registry::identifier::Identifier; use azalea_protocol_macros::ClientboundLoginPacket; -#[derive(Hash, Clone, Debug, AzBuf, PartialEq, ClientboundLoginPacket)] +#[derive(AzBuf, ClientboundLoginPacket, Clone, Debug, Hash, PartialEq)] pub struct ClientboundCustomQuery { #[var] pub transaction_id: u32, diff --git a/azalea-protocol/src/packets/login/c_hello.rs b/azalea-protocol/src/packets/login/c_hello.rs index 0057397c..3e87418f 100644 --- a/azalea-protocol/src/packets/login/c_hello.rs +++ b/azalea-protocol/src/packets/login/c_hello.rs @@ -1,7 +1,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundLoginPacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundLoginPacket)] +#[derive(AzBuf, ClientboundLoginPacket, Clone, Debug, PartialEq)] pub struct ClientboundHello { #[limit(20)] pub server_id: String, diff --git a/azalea-protocol/src/packets/login/c_login_compression.rs b/azalea-protocol/src/packets/login/c_login_compression.rs index 7294c8a5..a12ab5fa 100644 --- a/azalea-protocol/src/packets/login/c_login_compression.rs +++ b/azalea-protocol/src/packets/login/c_login_compression.rs @@ -3,7 +3,7 @@ use std::hash::Hash; use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundLoginPacket; -#[derive(Hash, Clone, Debug, AzBuf, PartialEq, ClientboundLoginPacket)] +#[derive(AzBuf, ClientboundLoginPacket, Clone, Debug, Hash, PartialEq)] pub struct ClientboundLoginCompression { #[var] pub compression_threshold: i32, diff --git a/azalea-protocol/src/packets/login/c_login_disconnect.rs b/azalea-protocol/src/packets/login/c_login_disconnect.rs index 7f8dd5f0..950d5e5c 100644 --- a/azalea-protocol/src/packets/login/c_login_disconnect.rs +++ b/azalea-protocol/src/packets/login/c_login_disconnect.rs @@ -6,7 +6,7 @@ use azalea_protocol_macros::ClientboundLoginPacket; use serde::{Deserialize, Serialize}; use tracing::trace; -#[derive(Clone, Debug, PartialEq, ClientboundLoginPacket)] +#[derive(ClientboundLoginPacket, Clone, Debug, PartialEq)] pub struct ClientboundLoginDisconnect { pub reason: FormattedText, } diff --git a/azalea-protocol/src/packets/login/c_login_finished.rs b/azalea-protocol/src/packets/login/c_login_finished.rs index ecc79ff0..643e3a7a 100644 --- a/azalea-protocol/src/packets/login/c_login_finished.rs +++ b/azalea-protocol/src/packets/login/c_login_finished.rs @@ -2,7 +2,7 @@ use azalea_auth::game_profile::GameProfile; use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundLoginPacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundLoginPacket)] +#[derive(AzBuf, ClientboundLoginPacket, Clone, Debug, PartialEq)] pub struct ClientboundLoginFinished { pub game_profile: GameProfile, } diff --git a/azalea-protocol/src/packets/login/s_cookie_response.rs b/azalea-protocol/src/packets/login/s_cookie_response.rs index 73efc2a8..504de740 100644 --- a/azalea-protocol/src/packets/login/s_cookie_response.rs +++ b/azalea-protocol/src/packets/login/s_cookie_response.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_registry::identifier::Identifier; use azalea_protocol_macros::ServerboundLoginPacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundLoginPacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundLoginPacket)] pub struct ServerboundCookieResponse { pub key: Identifier, pub payload: Option<Vec<u8>>, diff --git a/azalea-protocol/src/packets/login/s_custom_query_answer.rs b/azalea-protocol/src/packets/login/s_custom_query_answer.rs index af0c4237..478ea026 100644 --- a/azalea-protocol/src/packets/login/s_custom_query_answer.rs +++ b/azalea-protocol/src/packets/login/s_custom_query_answer.rs @@ -3,7 +3,7 @@ use std::hash::Hash; use azalea_buf::{AzBuf, UnsizedByteArray}; use azalea_protocol_macros::ServerboundLoginPacket; -#[derive(Hash, Clone, Debug, AzBuf, PartialEq, ServerboundLoginPacket)] +#[derive(AzBuf, Clone, Debug, Hash, PartialEq, ServerboundLoginPacket)] pub struct ServerboundCustomQueryAnswer { #[var] pub transaction_id: u32, diff --git a/azalea-protocol/src/packets/login/s_hello.rs b/azalea-protocol/src/packets/login/s_hello.rs index a65fe6a1..a7a9f4ee 100644 --- a/azalea-protocol/src/packets/login/s_hello.rs +++ b/azalea-protocol/src/packets/login/s_hello.rs @@ -2,7 +2,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ServerboundLoginPacket; use uuid::Uuid; -#[derive(Clone, Debug, Eq, AzBuf, PartialEq, ServerboundLoginPacket)] +#[derive(AzBuf, Clone, Debug, Eq, PartialEq, ServerboundLoginPacket)] pub struct ServerboundHello { #[limit(16)] pub name: String, diff --git a/azalea-protocol/src/packets/login/s_key.rs b/azalea-protocol/src/packets/login/s_key.rs index a3a404c6..d5268a19 100644 --- a/azalea-protocol/src/packets/login/s_key.rs +++ b/azalea-protocol/src/packets/login/s_key.rs @@ -1,7 +1,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ServerboundLoginPacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundLoginPacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundLoginPacket)] pub struct ServerboundKey { pub key_bytes: Vec<u8>, pub encrypted_challenge: Vec<u8>, diff --git a/azalea-protocol/src/packets/login/s_login_acknowledged.rs b/azalea-protocol/src/packets/login/s_login_acknowledged.rs index da1c0f9f..e0f0a47c 100644 --- a/azalea-protocol/src/packets/login/s_login_acknowledged.rs +++ b/azalea-protocol/src/packets/login/s_login_acknowledged.rs @@ -1,5 +1,5 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ServerboundLoginPacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundLoginPacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundLoginPacket)] pub struct ServerboundLoginAcknowledged; diff --git a/azalea-protocol/src/packets/mod.rs b/azalea-protocol/src/packets/mod.rs index 9d96b75c..9dd14311 100644 --- a/azalea-protocol/src/packets/mod.rs +++ b/azalea-protocol/src/packets/mod.rs @@ -14,7 +14,7 @@ use crate::read::ReadPacketError; pub const PROTOCOL_VERSION: i32 = 774; pub const VERSION_NAME: &str = "1.21.11"; -#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] +#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)] pub enum ConnectionProtocol { Handshake = -1, Game = 0, @@ -60,7 +60,7 @@ pub trait Packet<Protocol> { fn into_variant(self) -> Protocol; } -#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] +#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)] pub enum ClientIntention { Status = 1, Login = 2, diff --git a/azalea-protocol/src/packets/status/c_pong_response.rs b/azalea-protocol/src/packets/status/c_pong_response.rs index 1adcfafe..d5ea46cf 100644 --- a/azalea-protocol/src/packets/status/c_pong_response.rs +++ b/azalea-protocol/src/packets/status/c_pong_response.rs @@ -1,7 +1,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ClientboundStatusPacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ClientboundStatusPacket)] +#[derive(AzBuf, ClientboundStatusPacket, Clone, Debug, PartialEq)] pub struct ClientboundPongResponse { pub time: u64, } diff --git a/azalea-protocol/src/packets/status/c_status_response.rs b/azalea-protocol/src/packets/status/c_status_response.rs index 6505167e..933b6c2c 100644 --- a/azalea-protocol/src/packets/status/c_status_response.rs +++ b/azalea-protocol/src/packets/status/c_status_response.rs @@ -6,19 +6,19 @@ use azalea_protocol_macros::ClientboundStatusPacket; use serde::{Deserialize, Serialize}; use serde_json::value::Serializer; -#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)] +#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)] pub struct Version { pub name: String, pub protocol: i32, } -#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)] +#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)] pub struct SamplePlayer { pub id: String, pub name: String, } -#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)] +#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)] pub struct Players { pub max: i32, pub online: i32, @@ -27,7 +27,7 @@ pub struct Players { } // the entire packet is just json, which is why it has deserialize -#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, ClientboundStatusPacket)] +#[derive(ClientboundStatusPacket, Clone, Debug, Deserialize, PartialEq, Serialize)] pub struct ClientboundStatusResponse { pub description: FormattedText, #[serde(default)] diff --git a/azalea-protocol/src/packets/status/s_ping_request.rs b/azalea-protocol/src/packets/status/s_ping_request.rs index 90c09e3e..ec74ed09 100644 --- a/azalea-protocol/src/packets/status/s_ping_request.rs +++ b/azalea-protocol/src/packets/status/s_ping_request.rs @@ -1,7 +1,7 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ServerboundStatusPacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundStatusPacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundStatusPacket)] pub struct ServerboundPingRequest { pub time: u64, } diff --git a/azalea-protocol/src/packets/status/s_status_request.rs b/azalea-protocol/src/packets/status/s_status_request.rs index 1119c1de..5b0b96e6 100644 --- a/azalea-protocol/src/packets/status/s_status_request.rs +++ b/azalea-protocol/src/packets/status/s_status_request.rs @@ -1,5 +1,5 @@ use azalea_buf::AzBuf; use azalea_protocol_macros::ServerboundStatusPacket; -#[derive(Clone, Debug, AzBuf, PartialEq, ServerboundStatusPacket)] +#[derive(AzBuf, Clone, Debug, PartialEq, ServerboundStatusPacket)] pub struct ServerboundStatusRequest; diff --git a/azalea-protocol/src/read.rs b/azalea-protocol/src/read.rs index d4357c9f..d6c8c65a 100644 --- a/azalea-protocol/src/read.rs +++ b/azalea-protocol/src/read.rs @@ -24,7 +24,7 @@ use tracing::trace; use crate::packets::ProtocolPacket; -#[derive(Error, Debug)] +#[derive(Debug, Error)] pub enum ReadPacketError { #[error("Error reading packet {packet_name} (id {packet_id}): {source}")] Parse { @@ -61,7 +61,7 @@ pub enum ReadPacketError { ConnectionClosed, } -#[derive(Error, Debug)] +#[derive(Debug, Error)] pub enum FrameSplitterError { #[error("Couldn't read VarInt length for packet. The previous packet may have been corrupted")] LengthRead { @@ -162,7 +162,7 @@ static VALIDATE_DECOMPRESSED: bool = true; pub static MAXIMUM_UNCOMPRESSED_LENGTH: u32 = 8_388_608; -#[derive(Error, Debug)] +#[derive(Debug, Error)] pub enum DecompressionError { #[error("Couldn't read VarInt length for data")] LengthReadError { diff --git a/azalea-protocol/src/write.rs b/azalea-protocol/src/write.rs index dd863f9e..a14463eb 100644 --- a/azalea-protocol/src/write.rs +++ b/azalea-protocol/src/write.rs @@ -112,7 +112,7 @@ fn frame_prepender(mut data: Vec<u8>) -> Result<Vec<u8>, io::Error> { Ok(buf) } -#[derive(Error, Debug)] +#[derive(Debug, Error)] pub enum PacketEncodeError { #[error("{0}")] Io(#[from] io::Error), @@ -124,7 +124,7 @@ pub enum PacketEncodeError { }, } -#[derive(Error, Debug)] +#[derive(Debug, Error)] pub enum PacketCompressError { #[error("{0}")] Io(#[from] io::Error), |