diff --git a/pumpkin-protocol/src/client/config/c_add_resource_pack.rs b/pumpkin-protocol/src/client/config/c_add_resource_pack.rs
index 50f349886..824141e25 100644
--- a/pumpkin-protocol/src/client/config/c_add_resource_pack.rs
+++ b/pumpkin-protocol/src/client/config/c_add_resource_pack.rs
@@ -1,5 +1,5 @@
-use pumpkin_macros::packet;
 use pumpkin_core::text::TextComponent;
+use pumpkin_macros::packet;
 use serde::Serialize;
 
 use crate::uuid::UUID;
diff --git a/pumpkin-protocol/src/client/play/c_disguised_chat_message.rs b/pumpkin-protocol/src/client/play/c_disguised_chat_message.rs
index 3647e2f64..9408768ec 100644
--- a/pumpkin-protocol/src/client/play/c_disguised_chat_message.rs
+++ b/pumpkin-protocol/src/client/play/c_disguised_chat_message.rs
@@ -1,5 +1,5 @@
-use pumpkin_macros::packet;
 use pumpkin_core::text::TextComponent;
+use pumpkin_macros::packet;
 use serde::Serialize;
 
 use crate::VarInt;
diff --git a/pumpkin-protocol/src/client/play/c_open_screen.rs b/pumpkin-protocol/src/client/play/c_open_screen.rs
index 5081d0b52..214623cd3 100644
--- a/pumpkin-protocol/src/client/play/c_open_screen.rs
+++ b/pumpkin-protocol/src/client/play/c_open_screen.rs
@@ -1,5 +1,5 @@
-use pumpkin_macros::packet;
 use pumpkin_core::text::TextComponent;
+use pumpkin_macros::packet;
 use serde::Serialize;
 
 use crate::VarInt;
diff --git a/pumpkin-protocol/src/client/play/c_player_chat_message.rs b/pumpkin-protocol/src/client/play/c_player_chat_message.rs
index 712538615..e47e9d225 100644
--- a/pumpkin-protocol/src/client/play/c_player_chat_message.rs
+++ b/pumpkin-protocol/src/client/play/c_player_chat_message.rs
@@ -1,7 +1,7 @@
 use num_derive::{FromPrimitive, ToPrimitive};
 use num_traits::FromPrimitive;
-use pumpkin_macros::packet;
 use pumpkin_core::text::TextComponent;
+use pumpkin_macros::packet;
 use serde::Serialize;
 
 use crate::{bytebuf::ByteBuffer, uuid::UUID, BitSet, ClientPacket, VarInt};
diff --git a/pumpkin-protocol/src/client/play/c_set_title.rs b/pumpkin-protocol/src/client/play/c_set_title.rs
index b18b46ded..4618b0d6e 100644
--- a/pumpkin-protocol/src/client/play/c_set_title.rs
+++ b/pumpkin-protocol/src/client/play/c_set_title.rs
@@ -1,5 +1,5 @@
-use pumpkin_macros::packet;
 use pumpkin_core::text::TextComponent;
+use pumpkin_macros::packet;
 use serde::Serialize;
 
 #[derive(Serialize)]
diff --git a/pumpkin-protocol/src/client/play/c_subtitle.rs b/pumpkin-protocol/src/client/play/c_subtitle.rs
index 0d8fed039..ddca5c52c 100644
--- a/pumpkin-protocol/src/client/play/c_subtitle.rs
+++ b/pumpkin-protocol/src/client/play/c_subtitle.rs
@@ -1,5 +1,5 @@
-use pumpkin_macros::packet;
 use pumpkin_core::text::TextComponent;
+use pumpkin_macros::packet;
 use serde::Serialize;
 
 #[derive(Serialize)]
diff --git a/pumpkin/src/client/client_packet.rs b/pumpkin/src/client/client_packet.rs
index a9e4f4928..065cf2c4e 100644
--- a/pumpkin/src/client/client_packet.rs
+++ b/pumpkin/src/client/client_packet.rs
@@ -1,4 +1,5 @@
 use num_traits::FromPrimitive;
+use pumpkin_core::text::TextComponent;
 use pumpkin_protocol::{
     client::{
         config::{CConfigAddResourcePack, CFinishConfig, CKnownPacks, CRegistryData},
@@ -13,7 +14,6 @@ use pumpkin_protocol::{
     },
     ConnectionState, KnownPack, CURRENT_MC_PROTOCOL,
 };
-use pumpkin_core::text::TextComponent;
 use rsa::Pkcs1v15Encrypt;
 use sha1::{Digest, Sha1};
 
diff --git a/pumpkin/src/client/mod.rs b/pumpkin/src/client/mod.rs
index 339ea3856..30121afdc 100644
--- a/pumpkin/src/client/mod.rs
+++ b/pumpkin/src/client/mod.rs
@@ -13,6 +13,7 @@ use crate::{
 use authentication::GameProfile;
 use mio::{event::Event, net::TcpStream, Token};
 use num_traits::ToPrimitive;
+use pumpkin_core::text::TextComponent;
 use pumpkin_protocol::{
     bytebuf::packet_id::Packet,
     client::{
@@ -36,7 +37,6 @@ use pumpkin_protocol::{
     },
     ClientPacket, ConnectionState, PacketError, RawPacket, ServerPacket,
 };
-use pumpkin_core::text::TextComponent;
 
 use std::io::Read;
 use thiserror::Error;
diff --git a/pumpkin/src/client/player_packet.rs b/pumpkin/src/client/player_packet.rs
index d5d29539f..820d3564d 100644
--- a/pumpkin/src/client/player_packet.rs
+++ b/pumpkin/src/client/player_packet.rs
@@ -7,6 +7,7 @@ use crate::{
     util::math::wrap_degrees,
 };
 use num_traits::FromPrimitive;
+use pumpkin_core::text::TextComponent;
 use pumpkin_entity::EntityId;
 use pumpkin_protocol::{
     client::play::{
@@ -22,7 +23,6 @@ use pumpkin_protocol::{
         SUseItemOn, Status,
     },
 };
-use pumpkin_core::text::TextComponent;
 use pumpkin_world::block::BlockFace;
 use pumpkin_world::global_registry;