diff options
Diffstat (limited to 'azalea-protocol/src/common')
| -rw-r--r-- | azalea-protocol/src/common/client_information.rs | 8 | ||||
| -rw-r--r-- | azalea-protocol/src/common/debug_subscription.rs | 42 | ||||
| -rw-r--r-- | azalea-protocol/src/common/movements.rs | 2 | ||||
| -rw-r--r-- | azalea-protocol/src/common/recipe.rs | 28 | ||||
| -rw-r--r-- | azalea-protocol/src/common/server_links.rs | 6 |
5 files changed, 43 insertions, 43 deletions
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, |