rustfmt

.vscode/settings.json

@@ -1,4 +1,5 @@
 {
 	"editor.fontFamily": "Fira Code",
-	"editor.fontLigatures": true
+	"editor.fontLigatures": true,
+	"editor.tabSize": 2,
 }

src/main.rs

@@ -3,16 +3,26 @@ use std::{env::args, path::PathBuf, sync::Arc};
 use log::{debug, error, info};
 use rust_mc_proto::Packet;
 use server::{
-	config::Config, context::ServerContext, data::text_component::TextComponent, event::{Listener, PacketHandler}, player::context::ClientContext, protocol::ConnectionState, start_server, ServerError
+    ServerError,
+    config::Config,
+    context::ServerContext,
+    data::text_component::TextComponent,
+    event::{Listener, PacketHandler},
+    player::context::ClientContext,
+    protocol::ConnectionState,
+    start_server,
 };
 
 pub mod server;
 
-
 struct ExampleListener;
 
 impl Listener for ExampleListener {
-	fn on_status(&self, client: Arc<ClientContext>, response: &mut String) -> Result<(), ServerError> {
+    fn on_status(
+        &self,
+        client: Arc<ClientContext>,
+        response: &mut String,
+    ) -> Result<(), ServerError> {
         *response = format!(
             "{{
 				\"version\": {{
@@ -52,7 +62,8 @@ impl Listener for ExampleListener {
                         .color("green")
                         .extra(vec![
                             TextComponent::builder()
-								.text(&format!("{}:{}", 
+                                .text(&format!(
+                                    "{}:{}",
                                     client.handshake().unwrap().server_address,
                                     client.handshake().unwrap().server_port
                                 ))
@@ -77,9 +88,15 @@ impl PacketHandler for ExamplePacketHandler {
         client: Arc<ClientContext>,
         packet: &mut Packet,
         _: &mut bool,
-		state: ConnectionState
+        state: ConnectionState,
     ) -> Result<(), ServerError> {
-		debug!("{} -> S\t| 0x{:02x}\t| {:?}\t| {} bytes", client.addr.clone(), packet.id(), state, packet.len());
+        debug!(
+            "{} -> S\t| 0x{:02x}\t| {:?}\t| {} bytes",
+            client.addr.clone(),
+            packet.id(),
+            state,
+            packet.len()
+        );
 
         Ok(())
     }
@@ -89,15 +106,20 @@ impl PacketHandler for ExamplePacketHandler {
         client: Arc<ClientContext>,
         packet: &mut Packet,
         _: &mut bool,
-		state: ConnectionState
+        state: ConnectionState,
     ) -> Result<(), ServerError> {
-		debug!("{} <- S\t| 0x{:02x}\t| {:?}\t| {} bytes", client.addr.clone(), packet.id(), state, packet.len());
+        debug!(
+            "{} <- S\t| 0x{:02x}\t| {:?}\t| {} bytes",
+            client.addr.clone(),
+            packet.id(),
+            state,
+            packet.len()
+        );
 
         Ok(())
     }
 }
 
-
 fn main() {
     // Инициализируем логи
     // Чтобы читать debug-логи, юзаем `RUST_LOG=debug cargo run`
@@ -121,7 +143,7 @@ fn main() {
         None => {
             error!("Ошибка чтения конфигурации");
             return;
-		},
+        }
     };
 
     // Делаем немутабельную потокобезопасную ссылку на конфиг

src/server/config.rs

@@ -3,28 +3,39 @@ use std::{fs, path::PathBuf};
 use serde::{Deserialize, Serialize};
 use serde_default::DefaultFromSerde;
 
-
 #[derive(Debug, DefaultFromSerde, Serialize, Deserialize, Clone)]
 pub struct BindConfig {
-    #[serde(default = "default_host")] pub host: String,
+    #[serde(default = "default_host")]
-    #[serde(default = "default_timeout")] pub timeout: u64,
+    pub host: String,
+    #[serde(default = "default_timeout")]
+    pub timeout: u64,
 }
 
 #[derive(Debug, DefaultFromSerde, Serialize, Deserialize, Clone)]
 pub struct ServerConfig {
-    #[serde(default)] pub online_mode: bool,
+    #[serde(default)]
-    #[serde(default = "default_compression")] pub compression_threshold: Option<usize>,
+    pub online_mode: bool,
+    #[serde(default = "default_compression")]
+    pub compression_threshold: Option<usize>,
 }
 
 #[derive(Debug, DefaultFromSerde, Serialize, Deserialize, Clone)]
 pub struct Config {
-    #[serde(default)] pub bind: BindConfig,
+    #[serde(default)]
-    #[serde(default)] pub server: ServerConfig,
+    pub bind: BindConfig,
+    #[serde(default)]
+    pub server: ServerConfig,
 }
 
-fn default_host() -> String { "127.0.0.1:25565".to_string() }
+fn default_host() -> String {
-fn default_timeout() -> u64 { 5 }
+    "127.0.0.1:25565".to_string()
-fn default_compression() -> Option<usize> { Some(256) }
+}
+fn default_timeout() -> u64 {
+    5
+}
+fn default_compression() -> Option<usize> {
+    Some(256)
+}
 
 impl Config {
     pub fn load_from_file(path: PathBuf) -> Option<Config> {

src/server/context.rs

@@ -4,7 +4,11 @@ use dashmap::DashMap;
 use itertools::Itertools;
 use uuid::Uuid;
 
-use super::{config::Config, event::{Listener, PacketHandler}, player::context::ClientContext};
+use super::{
+    config::Config,
+    event::{Listener, PacketHandler},
+    player::context::ClientContext,
+};
 
 // Контекст сервера
 // Должен быть обернут в Arc для передачи между потоками
@@ -12,7 +16,7 @@ pub struct ServerContext {
     pub config: Arc<Config>,
     pub clients: DashMap<SocketAddr, Arc<ClientContext>>,
     listeners: Vec<Box<dyn Listener>>,
-    handlers: Vec<Box<dyn PacketHandler>>
+    handlers: Vec<Box<dyn PacketHandler>>,
 }
 
 impl ServerContext {
@@ -21,12 +25,13 @@ impl ServerContext {
             config,
             listeners: Vec::new(),
             handlers: Vec::new(),
-            clients: DashMap::new()
+            clients: DashMap::new(),
         }
     }
 
     pub fn get_player_by_uuid(self: &Arc<Self>, uuid: Uuid) -> Option<Arc<ClientContext>> {
-        self.clients.iter()
+        self.clients
+            .iter()
             .find(|o| {
                 let info = o.player_info();
                 if let Some(info) = info {
@@ -39,7 +44,8 @@ impl ServerContext {
     }
 
     pub fn get_player_by_name(self: &Arc<Self>, name: &str) -> Option<Arc<ClientContext>> {
-        self.clients.iter()
+        self.clients
+            .iter()
             .find(|o| {
                 let info = o.player_info();
                 if let Some(info) = info {
@@ -52,7 +58,8 @@ impl ServerContext {
     }
 
     pub fn players(self: &Arc<Self>) -> Vec<Arc<ClientContext>> {
-        self.clients.iter()
+        self.clients
+            .iter()
             .filter(|o| o.player_info().is_some())
             .map(|o| o.clone())
             .collect()
@@ -66,24 +73,18 @@ impl ServerContext {
         self.listeners.push(listener);
     }
 
-    pub fn packet_handlers<F, K>(
+    pub fn packet_handlers<F, K>(self: &Arc<Self>, sort_by: F) -> Vec<&Box<dyn PacketHandler>>
-        self: &Arc<Self>, 
-        sort_by: F
-    ) -> Vec<&Box<dyn PacketHandler>>
     where
         K: Ord,
-        F: FnMut(&&Box<dyn PacketHandler>) -> K 
+        F: FnMut(&&Box<dyn PacketHandler>) -> K,
     {
         self.handlers.iter().sorted_by_key(sort_by).collect_vec()
     }
 
-    pub fn listeners<F, K>(
+    pub fn listeners<F, K>(self: &Arc<Self>, sort_by: F) -> Vec<&Box<dyn Listener>>
-        self: &Arc<Self>, 
-        sort_by: F
-    ) -> Vec<&Box<dyn Listener>>
     where
         K: Ord,
-        F: FnMut(&&Box<dyn Listener>) -> K 
+        F: FnMut(&&Box<dyn Listener>) -> K,
     {
         self.listeners.iter().sorted_by_key(sort_by).collect_vec()
     }

src/server/data/text_component.rs

@@ -9,7 +9,6 @@ use crate::server::ServerError;
 
 use super::ReadWriteNBT;
 
-
 #[derive(Debug, Serialize, Deserialize, Clone)]
 #[skip_serializing_none]
 pub struct TextComponent {
@@ -34,7 +33,7 @@ impl TextComponent {
             underlined: None,
             strikethrough: None,
             obfuscated: None,
-            extra: None
+            extra: None,
         }
     }
 
@@ -43,7 +42,8 @@ impl TextComponent {
             return TextComponent::new(text);
         }
 
-        let children = text.char_indices()
+        let children = text
+            .char_indices()
             .map(|(i, c)| {
                 let hue = (i as f32) / (text.chars().count() as f32) * 360.0;
                 let hsl = Hsl::new(hue, 1.0, 0.5);
@@ -67,13 +67,11 @@ impl TextComponent {
     }
 
     pub fn as_json(self) -> Result<String, ServerError> {
-        serde_json::to_string(&self)
+        serde_json::to_string(&self).map_err(|_| ServerError::SerTextComponent)
-            .map_err(|_| ServerError::SerTextComponent)
     }
 
     pub fn from_json(text: &str) -> Result<TextComponent, ServerError> {
-        serde_json::from_str(text)
+        serde_json::from_str(text).map_err(|_| ServerError::DeTextComponent)
-            .map_err(|_| ServerError::DeTextComponent)
     }
 }
 
@@ -157,7 +155,7 @@ impl TextComponentBuilder {
             underlined: self.underlined,
             strikethrough: self.strikethrough,
             obfuscated: self.obfuscated,
-            extra: self.extra
+            extra: self.extra,
         }
     }
 }
@@ -167,15 +165,18 @@ impl ReadWriteNBT<TextComponent> for Packet {
     fn read_nbt(&mut self) -> Result<TextComponent, ServerError> {
         let mut data = Vec::new();
         let pos = self.get_ref().position();
-        self.get_mut().read_to_end(&mut data).map_err(|_| ServerError::DeTextComponent)?;
+        self.get_mut()
-        let (remaining, value) = craftflow_nbt::from_slice(&data).map_err(|_| ServerError::DeTextComponent)?;
+            .read_to_end(&mut data)
-        self.get_mut().set_position(pos + (data.len() - remaining.len()) as u64);
+            .map_err(|_| ServerError::DeTextComponent)?;
+        let (remaining, value) =
+            craftflow_nbt::from_slice(&data).map_err(|_| ServerError::DeTextComponent)?;
+        self.get_mut()
+            .set_position(pos + (data.len() - remaining.len()) as u64);
         Ok(value)
     }
 
     fn write_nbt(&mut self, val: &TextComponent) -> Result<(), ServerError> {
-        craftflow_nbt::to_writer(self.get_mut(), val)
+        craftflow_nbt::to_writer(self.get_mut(), val).map_err(|_| ServerError::SerTextComponent)?;
-            .map_err(|_| ServerError::SerTextComponent)?;
         Ok(())
     }
 }

src/server/mod.rs

@@ -8,10 +8,10 @@ use protocol::handler::handle_connection;
 use rust_mc_proto::{MinecraftConnection, ProtocolError};
 
 pub mod config;
+pub mod context;
 pub mod data;
 pub mod event;
 pub mod player;
-pub mod context;
 pub mod protocol;
 
 // Ошибки сервера
@@ -23,7 +23,7 @@ pub enum ServerError {
     SerTextComponent, // Ошибка при сериализации текст-компонента
     DeTextComponent,  // Ошибка при десериализации текст-компонента
     UnexpectedState, // Указывает на то что этот пакет не может быть отправлен в данном режиме (в основном через ProtocolHelper)
-    Other(String)            // Другая ошибка, либо очень специфичная, либо хз, лучше не использовать и создавать новое поле ошибки
+    Other(String), // Другая ошибка, либо очень специфичная, либо хз, лучше не использовать и создавать новое поле ошибки
 }
 
 impl Display for ServerError {
@@ -39,13 +39,9 @@ impl From<ProtocolError> for ServerError {
     fn from(error: ProtocolError) -> ServerError {
         match error {
             // Если просто закрыто соединение, переделываем в нашу ошибку этого
-            ProtocolError::ConnectionClosedError => {
+            ProtocolError::ConnectionClosedError => ServerError::ConnectionClosed,
-                ServerError::ConnectionClosed
-            },
             // Все остальное просто засовываем в обертку
-            error => {
+            error => ServerError::Protocol(error),
-                ServerError::Protocol(error)
-            },
         }
     }
 }
@@ -53,7 +49,10 @@ impl From<ProtocolError> for ServerError {
 pub fn start_server(server: Arc<ServerContext>) {
     // Биндим сервер где надо
     let Ok(listener) = TcpListener::bind(&server.config.bind.host) else {
-        error!("Не удалось забиндить сервер на {}", &server.config.bind.host); 
+        error!(
+            "Не удалось забиндить сервер на {}",
+            &server.config.bind.host
+        );
         return;
     };
 
@@ -67,8 +66,12 @@ pub fn start_server(server: Arc<ServerContext>) {
 
             // Установка таймаутов на чтение и запись
             // По умолчанию пусть будет 5 секунд, надо будет сделать настройку через конфиг
-            stream.set_read_timeout(Some(Duration::from_secs(server.config.bind.timeout))).ignore();
+            stream
-            stream.set_write_timeout(Some(Duration::from_secs(server.config.bind.timeout))).ignore();
+                .set_read_timeout(Some(Duration::from_secs(server.config.bind.timeout)))
+                .ignore();
+            stream
+                .set_write_timeout(Some(Duration::from_secs(server.config.bind.timeout)))
+                .ignore();
 
             // Оборачиваем стрим в майнкрафт конекшн лично для нашего удовольствия
             let conn = MinecraftConnection::new(stream);
@@ -84,11 +87,11 @@ pub fn start_server(server: Arc<ServerContext>) {
             // Обработка подключения
             // Если ошибка -> выводим
             match handle_connection(client.clone()) {
-                Ok(_) => {},
+                Ok(_) => {}
-                Err(ServerError::ConnectionClosed) => {},
+                Err(ServerError::ConnectionClosed) => {}
                 Err(error) => {
                     error!("Ошибка подключения: {error:?}");
-                },
+                }
             };
 
             // Удаляем клиента из списка клиентов

src/server/player/context.rs

@@ -1,9 +1,13 @@
-use std::{hash::Hash, net::{SocketAddr, TcpStream}, sync::{Arc, RwLock}};
+use std::{
+    hash::Hash,
+    net::{SocketAddr, TcpStream},
+    sync::{Arc, RwLock},
+};
 
 use rust_mc_proto::{MinecraftConnection, Packet};
 use uuid::Uuid;
 
-use crate::server::{context::ServerContext, protocol::ConnectionState, ServerError};
+use crate::server::{ServerError, context::ServerContext, protocol::ConnectionState};
 
 use super::helper::ProtocolHelper;
 
@@ -16,7 +20,7 @@ pub struct ClientContext {
     handshake: RwLock<Option<Handshake>>,
     client_info: RwLock<Option<ClientInfo>>,
     player_info: RwLock<Option<PlayerInfo>>,
-    state: RwLock<ConnectionState>
+    state: RwLock<ConnectionState>,
 }
 
 // Реализуем сравнение через адрес
@@ -36,10 +40,7 @@ impl Hash for ClientContext {
 impl Eq for ClientContext {}
 
 impl ClientContext {
-    pub fn new(
+    pub fn new(server: Arc<ServerContext>, conn: MinecraftConnection<TcpStream>) -> ClientContext {
-        server: Arc<ServerContext>, 
-        conn: MinecraftConnection<TcpStream>
-    ) -> ClientContext {
         ClientContext {
             server,
             addr: conn.get_ref().peer_addr().unwrap(),
@@ -47,7 +48,7 @@ impl ClientContext {
             handshake: RwLock::new(None),
             client_info: RwLock::new(None),
             player_info: RwLock::new(None),
-            state: RwLock::new(ConnectionState::Handshake)
+            state: RwLock::new(ConnectionState::Handshake),
         }
     }
 
@@ -66,9 +67,11 @@ impl ClientContext {
     pub fn set_state(self: &Arc<Self>, state: ConnectionState) -> Result<(), ServerError> {
         *self.state.write().unwrap() = state.clone();
 
-        for handler in self.server.packet_handlers(
+        for handler in self
-            |o| o.on_state_priority()
+            .server
-        ).iter() {
+            .packet_handlers(|o| o.on_state_priority())
+            .iter()
+        {
             handler.on_state(self.clone(), state.clone())?;
         }
 
@@ -95,10 +98,17 @@ impl ClientContext {
         let state = self.state();
         let mut packet = packet.clone();
         let mut cancelled = false;
-        for handler in self.server.packet_handlers(
+        for handler in self
-            |o| o.on_outcoming_packet_priority()
+            .server
-        ).iter() {
+            .packet_handlers(|o| o.on_outcoming_packet_priority())
-            handler.on_outcoming_packet(self.clone(), &mut packet, &mut cancelled, state.clone())?;
+            .iter()
+        {
+            handler.on_outcoming_packet(
+                self.clone(),
+                &mut packet,
+                &mut cancelled,
+                state.clone(),
+            )?;
             packet.get_mut().set_position(0);
         }
         if !cancelled {
@@ -115,10 +125,17 @@ impl ClientContext {
         loop {
             let mut packet = conn.read_packet()?;
             let mut cancelled = false;
-            for handler in self.server.packet_handlers(
+            for handler in self
-                |o| o.on_incoming_packet_priority()
+                .server
-            ).iter() {
+                .packet_handlers(|o| o.on_incoming_packet_priority())
-                handler.on_incoming_packet(self.clone(), &mut packet, &mut cancelled, state.clone())?;
+                .iter()
+            {
+                handler.on_incoming_packet(
+                    self.clone(),
+                    &mut packet,
+                    &mut cancelled,
+                    state.clone(),
+                )?;
                 packet.get_mut().set_position(0);
             }
             if !cancelled {
@@ -167,11 +184,11 @@ pub struct ClientInfo {
     pub main_hand: i32,
     pub enable_text_filtering: bool,
     pub allow_server_listings: bool,
-    pub particle_status: i32
+    pub particle_status: i32,
 }
 
 #[derive(Clone)]
 pub struct PlayerInfo {
     pub name: String,
-    pub uuid: Uuid
+    pub uuid: Uuid,
 }

src/server/player/helper.rs

@@ -1,12 +1,22 @@
-use std::{io::Read, sync::Arc, time::{Duration, SystemTime}};
+use std::{
+    io::Read,
+    sync::Arc,
+    time::{Duration, SystemTime},
+};
 
 use rust_mc_proto::{DataReader, DataWriter, Packet};
 
-use crate::server::{data::{text_component::TextComponent, ReadWriteNBT}, protocol::{id::{clientbound, serverbound}, *}, ServerError};
+use crate::server::{
+    ServerError,
+    data::{ReadWriteNBT, text_component::TextComponent},
+    protocol::{
+        id::{clientbound, serverbound},
+        *,
+    },
+};
 
 use super::context::ClientContext;
 
-
 // Помощник в работе с протоколом
 // Может быть использован где угодно, но сделан именно для листенеров и пакет хандлеров
 // Через него удобно делать всякую одинаковую херь
@@ -16,14 +26,14 @@ use super::context::ClientContext;
 // Почему бы и нет если да
 pub struct ProtocolHelper {
     client: Arc<ClientContext>,
-    state: ConnectionState
+    state: ConnectionState,
 }
 
 impl ProtocolHelper {
     pub fn new(client: Arc<ClientContext>) -> Self {
         Self {
             state: client.state(),
-            client
+            client,
         }
     }
 
@@ -31,12 +41,14 @@ impl ProtocolHelper {
     pub fn leave_configuration(&self) -> Result<(), ServerError> {
         match self.state {
             ConnectionState::Configuration => {
-                self.client.write_packet(&Packet::empty(clientbound::configuration::FINISH))?;
+                self.client
-                self.client.read_packet(serverbound::configuration::ACKNOWLEDGE_FINISH)?;
+                    .write_packet(&Packet::empty(clientbound::configuration::FINISH))?;
+                self.client
+                    .read_packet(serverbound::configuration::ACKNOWLEDGE_FINISH)?;
                 self.client.set_state(ConnectionState::Play)?;
                 Ok(())
-            },
+            }
-            _ => Err(ServerError::UnexpectedState)
+            _ => Err(ServerError::UnexpectedState),
         }
     }
 
@@ -44,12 +56,14 @@ impl ProtocolHelper {
     pub fn enter_configuration(&self) -> Result<(), ServerError> {
         match self.state {
             ConnectionState::Play => {
-                self.client.write_packet(&Packet::empty(clientbound::play::START_CONFIGURATION))?;
+                self.client
-                self.client.read_packet(serverbound::play::ACKNOWLEDGE_CONFIGURATION)?;
+                    .write_packet(&Packet::empty(clientbound::play::START_CONFIGURATION))?;
+                self.client
+                    .read_packet(serverbound::play::ACKNOWLEDGE_CONFIGURATION)?;
                 self.client.set_state(ConnectionState::Configuration)?;
                 Ok(())
-            },
+            }
-            _ => Err(ServerError::UnexpectedState)
+            _ => Err(ServerError::UnexpectedState),
         }
     }
 
@@ -58,17 +72,19 @@ impl ProtocolHelper {
         match self.state {
             ConnectionState::Play => {
                 let time = SystemTime::now();
-                self.client.write_packet(&Packet::empty(clientbound::play::PING))?;
+                self.client
+                    .write_packet(&Packet::empty(clientbound::play::PING))?;
                 self.client.read_packet(serverbound::play::PONG)?;
                 Ok(SystemTime::now().duration_since(time).unwrap())
-            },
+            }
             ConnectionState::Configuration => {
                 let time = SystemTime::now();
-                self.client.write_packet(&Packet::empty(clientbound::configuration::PING))?;
+                self.client
+                    .write_packet(&Packet::empty(clientbound::configuration::PING))?;
                 self.client.read_packet(serverbound::configuration::PONG)?;
                 Ok(SystemTime::now().duration_since(time).unwrap())
-            },
+            }
-            _ => Err(ServerError::UnexpectedState)
+            _ => Err(ServerError::UnexpectedState),
         }
     }
 
@@ -77,21 +93,21 @@ impl ProtocolHelper {
             ConnectionState::Login => {
                 let text = reason.as_json()?;
                 Packet::build(0x00, |p| p.write_string(&text))?
-            },
+            }
             ConnectionState::Configuration => {
                 let mut packet = Packet::empty(0x02);
                 packet.write_nbt(&reason)?;
                 packet
-            },
+            }
             ConnectionState::Play => {
                 let mut packet = Packet::empty(0x1C);
                 packet.write_nbt(&reason)?;
                 packet
-            },
+            }
             _ => {
                 self.client.close();
-                return Ok(())
+                return Ok(());
-            },
+            }
         };
         self.client.write_packet(&packet)?;
         Ok(())
@@ -105,7 +121,9 @@ impl ProtocolHelper {
                 packet.write_string(id)?;
                 self.client.write_packet(&packet)?;
 
-                let mut packet = self.client.read_packet(serverbound::configuration::COOKIE_RESPONSE)?;
+                let mut packet = self
+                    .client
+                    .read_packet(serverbound::configuration::COOKIE_RESPONSE)?;
                 packet.read_string()?;
                 let data = if packet.read_boolean()? {
                     let n = packet.read_usize_varint()?;
@@ -115,13 +133,18 @@ impl ProtocolHelper {
                 };
 
                 Ok(data)
-            },
+            }
-            _ => Err(ServerError::UnexpectedState)
+            _ => Err(ServerError::UnexpectedState),
         }
     }
 
     /// Returns login plugin response - (message_id, payload)
-    pub fn send_login_plugin_request(&self, id: i32, channel: &str, data: &[u8]) -> Result<(i32, Option<Vec<u8>>), ServerError> {
+    pub fn send_login_plugin_request(
+        &self,
+        id: i32,
+        channel: &str,
+        data: &[u8],
+    ) -> Result<(i32, Option<Vec<u8>>), ServerError> {
         match self.state {
             ConnectionState::Login => {
                 let mut packet = Packet::empty(clientbound::login::PLUGIN_REQUEST);
@@ -130,7 +153,9 @@ impl ProtocolHelper {
                 packet.write_bytes(data)?;
                 self.client.write_packet(&packet)?;
 
-                let mut packet = self.client.read_packet(serverbound::login::PLUGIN_RESPONSE)?;
+                let mut packet = self
+                    .client
+                    .read_packet(serverbound::login::PLUGIN_RESPONSE)?;
                 let identifier = packet.read_varint()?;
                 let data = if packet.read_boolean()? {
                     let mut data = Vec::new();
@@ -141,16 +166,18 @@ impl ProtocolHelper {
                 };
 
                 Ok((identifier, data))
-            },
+            }
-            _ => Err(ServerError::UnexpectedState)
+            _ => Err(ServerError::UnexpectedState),
         }
     }
 
     pub fn send_plugin_message(&self, channel: &str, data: &[u8]) -> Result<(), ServerError> {
         let mut packet = match self.state {
-            ConnectionState::Configuration => Packet::empty(clientbound::configuration::PLUGIN_MESSAGE),
+            ConnectionState::Configuration => {
+                Packet::empty(clientbound::configuration::PLUGIN_MESSAGE)
+            }
             ConnectionState::Play => Packet::empty(clientbound::play::PLUGIN_MESSAGE),
-            _ => return Err(ServerError::UnexpectedState)
+            _ => return Err(ServerError::UnexpectedState),
         };
         packet.write_string(channel)?;
         packet.write_bytes(data)?;

src/server/protocol/handler.rs

@@ -1,12 +1,14 @@
 use std::{io::Read, sync::Arc};
 
-use crate::server::{player::context::{ClientContext, ClientInfo, Handshake, PlayerInfo}, ServerError};
+use crate::server::{
+    ServerError,
+    player::context::{ClientContext, ClientInfo, Handshake, PlayerInfo},
+};
 use rust_mc_proto::{DataReader, DataWriter, Packet};
 
 use crate::trigger_event;
 
-use super::{id::*, play::handle_play_state, ConnectionState};
+use super::{ConnectionState, id::*, play::handle_play_state};
-
 
 pub fn handle_connection(
     client: Arc<ClientContext>, // Контекст клиента
@@ -22,10 +24,15 @@ pub fn handle_connection(
     let server_port = packet.read_unsigned_short()?; // Все тоже самое что и с адресом сервера и все потому же и за тем же
     let next_state = packet.read_varint()?; // Тип подключения: 1 для получения статуса и пинга, 2 и 3 для обычного подключения
 
-	client.set_handshake(Handshake { protocol_version, server_address, server_port });
+    client.set_handshake(Handshake {
+        protocol_version,
+        server_address,
+        server_port,
+    });
 
     match next_state {
-		1 => { // Тип подключения - статус
+        1 => {
+            // Тип подключения - статус
             client.set_state(ConnectionState::Status)?; // Мы находимся в режиме Status
 
             loop {
@@ -33,7 +40,8 @@ pub fn handle_connection(
                 let mut packet = client.read_any_packet()?;
 
                 match packet.id() {
-					serverbound::status::REQUEST => { // Запрос статуса
+                    serverbound::status::REQUEST => {
+                        // Запрос статуса
                         let mut packet = Packet::empty(clientbound::status::RESPONSE);
 
                         // Дефолтный статус
@@ -43,7 +51,8 @@ pub fn handle_connection(
 								\"protocol\": 0
 							},
 							\"description\": {\"text\": \"Internal server error\"}
-						}".to_string();
+						}"
+                        .to_string();
 
                         // Опрос всех листенеров
                         trigger_event!(client, status, &mut status);
@@ -52,22 +61,24 @@ pub fn handle_connection(
                         packet.write_string(&status)?;
 
                         client.write_packet(&packet)?;
-					},
+                    }
-					serverbound::status::PING_REQUEST => { // Пинг
+                    serverbound::status::PING_REQUEST => {
+                        // Пинг
                         // Раньше мы просто отправляли ему его-же пакет, но сейчас,
                         // С приходом к власти констант айди-пакетов, нам приходится делать такое непотребство
                         let timestamp = packet.read_long()?;
                         let mut packet = Packet::empty(clientbound::status::PONG_RESPONSE);
                         packet.write_long(timestamp)?;
                         client.write_packet(&packet)?;
-					},
+                    }
                     _ => {
                         return Err(ServerError::UnexpectedPacket);
                     }
                 }
             }
-		},
+        }
-		2 => { // Тип подключения - игра
+        2 => {
+            // Тип подключения - игра
             client.set_state(ConnectionState::Login)?; // Мы находимся в режиме Login
 
             // Читаем пакет Login Start
@@ -76,7 +87,10 @@ pub fn handle_connection(
             let name = packet.read_string()?;
             let uuid = packet.read_uuid()?;
 
-			client.set_player_info(PlayerInfo { name: name.clone(), uuid: uuid.clone() });
+            client.set_player_info(PlayerInfo {
+                name: name.clone(),
+                uuid: uuid.clone(),
+            });
 
             if client.server.config.server.online_mode {
                 // TODO: encryption packets
@@ -84,7 +98,9 @@ pub fn handle_connection(
 
             // Отправляем пакет Set Compression если сжатие указано
             if let Some(threshold) = client.server.config.server.compression_threshold {
-				client.write_packet(&Packet::build(clientbound::login::SET_COMPRESSION, |p| p.write_usize_varint(threshold))?)?;
+                client.write_packet(&Packet::build(clientbound::login::SET_COMPRESSION, |p| {
+                    p.write_usize_varint(threshold)
+                })?)?;
                 client.set_compression(Some(threshold)); // Устанавливаем сжатие на соединении
             }
 
@@ -138,7 +154,7 @@ pub fn handle_connection(
                 main_hand,
                 enable_text_filtering,
                 allow_server_listings,
-				particle_status
+                particle_status,
             });
 
             // TODO: Заюзать Listener'ы чтобы они подмешивали сюда чото
@@ -150,8 +166,9 @@ pub fn handle_connection(
 
             // Дальше работаем с режимом игры
             handle_play_state(client)?;
-		},
+        }
-		_ => { // Тип подключения не рукопожатный
+        _ => {
+            // Тип подключения не рукопожатный
             return Err(ServerError::UnexpectedPacket);
         }
     }

src/server/protocol/id.rs

@@ -1,8 +1,8 @@
 /*
 
- Generated with parse_ids.py 
+Generated with parse_ids.py
 
- */
+*/
 
 pub mod clientbound {
     pub mod status {
@@ -172,7 +172,6 @@ pub mod clientbound {
         pub const CUSTOM_REPORT_DETAILS: u8 = 0x81;
         pub const SERVER_LINKS: u8 = 0x82;
     }
-
 }
 
 pub mod serverbound {
@@ -270,6 +269,4 @@ pub mod serverbound {
         pub const USE_ITEM_ON: u8 = 0x3E;
         pub const USE_ITEM: u8 = 0x3F;
     }
-
 }
-

src/server/protocol/mod.rs

@@ -1,7 +1,6 @@
+pub mod handler;
 pub mod id;
 pub mod play;
-pub mod handler;
-
 
 #[derive(Debug, Clone)]
 pub enum ConnectionState {
@@ -9,6 +8,5 @@ pub enum ConnectionState {
     Status,
     Login,
     Configuration,
-    Play
+    Play,
 }
-

src/server/protocol/play.rs

@@ -1,14 +1,17 @@
 use std::sync::Arc;
 
-use crate::server::{data::text_component::TextComponent, player::context::ClientContext, ServerError};
+use crate::server::{
+    ServerError, data::text_component::TextComponent, player::context::ClientContext,
+};
 
 // Отдельная функция для работы с самой игрой
 pub fn handle_play_state(
     client: Arc<ClientContext>, // Контекст клиента
 ) -> Result<(), ServerError> {
-
     // Отключение игрока с сообщением
-	client.protocol_helper().disconnect(TextComponent::rainbow("server is in developement suka".to_string()))?;
+    client.protocol_helper().disconnect(TextComponent::rainbow(
+        "server is in developement suka".to_string(),
+    ))?;
 
     // TODO: Сделать отправку пакетов Play