From e37524899eef8a0034faee35cef4bbf1ba779a7d Mon Sep 17 00:00:00 2001 From: mat Date: Fri, 30 May 2025 14:44:48 -1300 Subject: formatting: merge imports --- azalea-client/src/account.rs | 6 ++-- azalea-client/src/entity_query.rs | 3 +- azalea-client/src/plugins/movement.rs | 17 ++++++----- azalea-client/src/plugins/packet/config/mod.rs | 22 +++++++------- azalea-client/src/test_simulation.rs | 40 ++++++++++++++------------ 5 files changed, 47 insertions(+), 41 deletions(-) (limited to 'azalea-client/src') diff --git a/azalea-client/src/account.rs b/azalea-client/src/account.rs index 9b2c2350..7e3f917d 100644 --- a/azalea-client/src/account.rs +++ b/azalea-client/src/account.rs @@ -2,8 +2,10 @@ use std::sync::Arc; -use azalea_auth::AccessTokenResponse; -use azalea_auth::certs::{Certificates, FetchCertificatesError}; +use azalea_auth::{ + AccessTokenResponse, + certs::{Certificates, FetchCertificatesError}, +}; use bevy_ecs::component::Component; use parking_lot::Mutex; use thiserror::Error; diff --git a/azalea-client/src/entity_query.rs b/azalea-client/src/entity_query.rs index e6bef25f..e53cd652 100644 --- a/azalea-client/src/entity_query.rs +++ b/azalea-client/src/entity_query.rs @@ -3,8 +3,7 @@ use std::{any, sync::Arc}; use bevy_ecs::{ component::Component, entity::Entity, - query::QueryData, - query::{QueryFilter, ROQueryItem}, + query::{QueryData, QueryFilter, ROQueryItem}, world::World, }; use parking_lot::Mutex; diff --git a/azalea-client/src/plugins/movement.rs b/azalea-client/src/plugins/movement.rs index 95fdeb6e..b4649f20 100644 --- a/azalea-client/src/plugins/movement.rs +++ b/azalea-client/src/plugins/movement.rs @@ -1,15 +1,15 @@ -use std::backtrace::Backtrace; -use std::io; +use std::{backtrace::Backtrace, io}; -use azalea_core::position::Vec3; -use azalea_core::tick::GameTick; -use azalea_entity::{Attributes, Jumping, metadata::Sprinting}; -use azalea_entity::{InLoadedChunk, LastSentPosition, LookDirection, Physics, Position}; +use azalea_core::{position::Vec3, tick::GameTick}; +use azalea_entity::{ + Attributes, InLoadedChunk, Jumping, LastSentPosition, LookDirection, Physics, Position, + metadata::Sprinting, +}; use azalea_physics::{PhysicsSet, ai_step}; -use azalea_protocol::packets::game::{ServerboundPlayerCommand, ServerboundPlayerInput}; use azalea_protocol::packets::{ Packet, game::{ + ServerboundPlayerCommand, ServerboundPlayerInput, s_move_player_pos::ServerboundMovePlayerPos, s_move_player_pos_rot::ServerboundMovePlayerPosRot, s_move_player_rot::ServerboundMovePlayerRot, @@ -21,8 +21,7 @@ use bevy_app::{App, Plugin, Update}; use bevy_ecs::prelude::*; use thiserror::Error; -use crate::client::Client; -use crate::packet::game::SendPacketEvent; +use crate::{client::Client, packet::game::SendPacketEvent}; #[derive(Error, Debug)] pub enum MovePlayerError { diff --git a/azalea-client/src/plugins/packet/config/mod.rs b/azalea-client/src/plugins/packet/config/mod.rs index 861289b7..9c05705f 100644 --- a/azalea-client/src/plugins/packet/config/mod.rs +++ b/azalea-client/src/plugins/packet/config/mod.rs @@ -3,21 +3,23 @@ mod events; use std::io::Cursor; use azalea_entity::LocalEntity; -use azalea_protocol::packets::ConnectionProtocol; -use azalea_protocol::packets::config::*; -use azalea_protocol::read::ReadPacketError; -use azalea_protocol::read::deserialize_packet; +use azalea_protocol::{ + packets::{ConnectionProtocol, config::*}, + read::{ReadPacketError, deserialize_packet}, +}; use bevy_ecs::prelude::*; pub use events::*; use tracing::{debug, warn}; use super::as_system; -use crate::client::InConfigState; -use crate::connection::RawConnection; -use crate::disconnect::DisconnectEvent; -use crate::packet::game::KeepAliveEvent; -use crate::packet::game::ResourcePackEvent; -use crate::{InstanceHolder, declare_packet_handlers}; +use crate::{ + InstanceHolder, + client::InConfigState, + connection::RawConnection, + declare_packet_handlers, + disconnect::DisconnectEvent, + packet::game::{KeepAliveEvent, ResourcePackEvent}, +}; pub fn process_raw_packet( ecs: &mut World, diff --git a/azalea-client/src/test_simulation.rs b/azalea-client/src/test_simulation.rs index e154a9d9..c9f28e01 100644 --- a/azalea-client/src/test_simulation.rs +++ b/azalea-client/src/test_simulation.rs @@ -2,34 +2,38 @@ use std::{fmt::Debug, sync::Arc}; use azalea_auth::game_profile::GameProfile; use azalea_buf::AzaleaWrite; -use azalea_core::delta::PositionDelta8; -use azalea_core::game_type::{GameMode, OptionalGameType}; -use azalea_core::position::{ChunkPos, Vec3}; -use azalea_core::resource_location::ResourceLocation; -use azalea_core::tick::GameTick; +use azalea_core::{ + delta::PositionDelta8, + game_type::{GameMode, OptionalGameType}, + position::{ChunkPos, Vec3}, + resource_location::ResourceLocation, + tick::GameTick, +}; use azalea_entity::metadata::PlayerMetadataBundle; -use azalea_protocol::packets::common::CommonPlayerSpawnInfo; -use azalea_protocol::packets::config::{ClientboundFinishConfiguration, ClientboundRegistryData}; -use azalea_protocol::packets::game::c_level_chunk_with_light::ClientboundLevelChunkPacketData; -use azalea_protocol::packets::game::c_light_update::ClientboundLightUpdatePacketData; -use azalea_protocol::packets::game::{ - ClientboundAddEntity, ClientboundLevelChunkWithLight, ClientboundLogin, ClientboundRespawn, +use azalea_protocol::packets::{ + ConnectionProtocol, Packet, ProtocolPacket, + common::CommonPlayerSpawnInfo, + config::{ClientboundFinishConfiguration, ClientboundRegistryData}, + game::{ + ClientboundAddEntity, ClientboundLevelChunkWithLight, ClientboundLogin, ClientboundRespawn, + c_level_chunk_with_light::ClientboundLevelChunkPacketData, + c_light_update::ClientboundLightUpdatePacketData, + }, }; -use azalea_protocol::packets::{ConnectionProtocol, Packet, ProtocolPacket}; use azalea_registry::{DimensionType, EntityKind}; -use azalea_world::palette::{PalettedContainer, PalettedContainerKind}; -use azalea_world::{Chunk, Instance, MinecraftEntityId, Section}; +use azalea_world::{ + Chunk, Instance, MinecraftEntityId, Section, + palette::{PalettedContainer, PalettedContainerKind}, +}; use bevy_app::App; -use bevy_ecs::component::Mutable; -use bevy_ecs::{prelude::*, schedule::ExecutorKind}; +use bevy_ecs::{component::Mutable, prelude::*, schedule::ExecutorKind}; use parking_lot::RwLock; use simdnbt::owned::{NbtCompound, NbtTag}; use uuid::Uuid; -use crate::connection::RawConnection; -use crate::disconnect::DisconnectEvent; use crate::{ ClientInformation, GameProfileComponent, InConfigState, InstanceHolder, LocalPlayerBundle, + connection::RawConnection, disconnect::DisconnectEvent, }; /// A way to simulate a client in a server, used for some internal tests. -- cgit v1.2.3