added server icon support

Author: Andcool-Systems

.gitignore

@@ -1,4 +1,5 @@
 /target
 /Cargo.lock
 /out
-/.vscode/settings.json
+/.vscode/settings.json
+/server_icon.png

Cargo.toml

@@ -21,3 +21,4 @@ reqwest = "0.12.12"
 num-bigint = "0.4.6"
 tracing = "0.1.41"
 tracing-subscriber = "0.3.19"
+base64_light = "0.1.5"

config.json

@@ -5,6 +5,7 @@
     "players_online": 0,
     "proto_ver": 0,
     "server_ver": "1.21.4",
-    "motd": "ГООООЛ",
-    "code_life_time": 300
+    "motd": "§6mc-oauth.andcool.ru",
+    "code_life_time": 300,
+    "icon": "server_icon.png"
 }

src/config/mod.rs

@@ -1,8 +1,10 @@
+pub mod server_icon;
 mod types;
 
 use anyhow::Result;
 use std::sync::OnceLock;
 use tokio::fs;
+use tracing::warn;
 
 static CONFIG: OnceLock<types::Config> = OnceLock::new();
 
@@ -11,9 +13,15 @@ pub async fn load(path: &str) -> Result<()> {
     let file = fs::read_to_string(path)
         .await
         .expect("Couldn't load config file");
-    CONFIG
-        .set(serde_json::from_str(&file).expect("Couldn't parse config json"))
-        .expect("Couldn't load config");
+
+    let mut config: types::Config =
+        serde_json::from_str(&file).expect("Couldn't parse config json");
+    match server_icon::load(&config.icon).await {
+        Ok(base64) => config.image = Some(format!("data:image/png;base64,{}", base64)),
+        Err(e) => warn!("Error loading server icon: {}", e)
+    }
+
+    CONFIG.set(config).expect("Couldn't load config");
     Ok(())
 }
 

src/config/server_icon.rs

@@ -0,0 +1,8 @@
+use base64_light::base64_encode_bytes;
+use tokio::fs;
+
+pub async fn load(file_path: &str) -> anyhow::Result<String> {
+    let file_content = fs::read(file_path).await?;
+    let encoded = base64_encode_bytes(&file_content);
+    Ok(encoded)
+}

src/config/types.rs

@@ -2,12 +2,34 @@ use serde::{Deserialize, Serialize};
 
 #[derive(Serialize, Deserialize, Debug)]
 pub struct Config {
+    /// Minecraft server port (Minecraft's default port is `25565`)
     pub server_port: u16,
+
+    /// API port
     pub api_port: u16,
+
+    /// Display count of max server players
     pub players_max: usize,
+
+    /// Display count of max server players
     pub players_online: usize,
+
+    /// Server protocol version (0 for auto)
     pub proto_ver: usize,
+
+    /// Server version string (e.g. 1.20.5)
     pub server_ver: String,
+
+    /// Server description (you can use a `§` codes)
     pub motd: String,
+
+    /// Assigned 6-digit code life time in seconds
     pub code_life_time: u64,
+
+    /// Path to the server icon
+    pub icon: String,
+
+    #[serde(skip)]
+    /// Base 64 encoded server icon
+    pub image: Option<String>,
 }

src/format/mod.rs

@@ -0,0 +1,54 @@
+use serde_json::{json, Value};
+use std::collections::HashMap;
+
+#[allow(dead_code)]
+/// JSON text format parser (unused)
+pub fn format_motd(motd: &str) -> Value {
+    let color_map = HashMap::from([
+        ('0', "black"), ('1', "dark_blue"), ('2', "dark_green"), ('3', "dark_aqua"),
+        ('4', "dark_red"), ('5', "dark_purple"), ('6', "gold"), ('7', "gray"),
+        ('8', "dark_gray"), ('9', "blue"), ('a', "green"), ('b', "aqua"),
+        ('c', "red"), ('d', "light_purple"), ('e', "yellow"), ('f', "white")
+    ]);
+    let style_map = HashMap::from([
+        ('k', "obfuscated"), ('l', "bold"), ('m', "strikethrough"),
+        ('n', "underlined"), ('o', "italic"), ('r', "reset")
+    ]);
+
+    let mut json_array = Vec::new();
+    let mut current_text = String::new();
+    let mut current_json = json!({});
+
+    let chars: Vec<char> = motd.chars().collect();
+    let mut i = 0;
+
+    while i < chars.len() {
+        if chars[i] == '§' && i + 1 < chars.len() {
+            if !current_text.is_empty() {
+                current_json["text"] = Value::String(current_text.clone());
+                json_array.push(current_json);
+                current_text.clear();
+                current_json = json!({});
+            }
+            
+            let format_char = chars[i + 1];
+            if let Some(color) = color_map.get(&format_char) {
+                current_json["color"] = Value::String(color.to_string());
+            } else if let Some(style) = style_map.get(&format_char) {
+                current_json[style] = Value::Bool(true);
+            }
+            
+            i += 2;
+        } else {
+            current_text.push(chars[i]);
+            i += 1;
+        }
+    }
+
+    if !current_text.is_empty() {
+        current_json["text"] = Value::String(current_text);
+        json_array.push(current_json);
+    }
+
+    Value::Array(json_array)
+}

src/handlers/client_handler.rs

@@ -3,7 +3,7 @@ use std::{sync::Arc, time::Duration};
 use anyhow::Result;
 use bytes::{BufMut, BytesMut};
 use tokio::net::TcpStream;
-use tracing::info;
+use tracing::{debug, info};
 
 use crate::{
     byte_buf_utils::read_varint,
@@ -32,7 +32,7 @@ pub async fn handle(mut stream: TcpStream, keys: Arc<rsa::RsaPrivateKey>) -> Res
 
                 while packet_available(&mut buffer) {
                     let packet_id = read_varint(&mut buffer)?;
-                    info!("Received packet: {}", packet_id);
+                    debug!("Received packet: {}", packet_id);
 
                     match packet_id {
                         0x00 => match session.next_state {
@@ -58,7 +58,7 @@ pub async fn handle(mut stream: TcpStream, keys: Arc<rsa::RsaPrivateKey>) -> Res
                                     disconnect::send(
                                         &mut stream,
                                         session,
-                                        "Failed to login: Invalid session (Try restarting your game and the launcher)".to_string()
+                                        "§cFailed to login: Invalid session (Try restarting your game and the launcher)".to_string()
                                     ).await?;
                                     break;
                                 }
@@ -78,7 +78,7 @@ pub async fn handle(mut stream: TcpStream, keys: Arc<rsa::RsaPrivateKey>) -> Res
                                 disconnect::send(
                                     &mut stream,
                                     session,
-                                    format!("Hello, {}! Your code is: {}", player_data.name, code),
+                                    format!("Hello, §6{}§r! Your code is: §a{}", player_data.name, code),
                                 )
                                 .await?;
 

src/main.rs

@@ -3,6 +3,7 @@ mod byte_buf_utils;
 mod client_sessions;
 mod config;
 mod encryption;
+mod format;
 mod generators;
 mod handlers;
 mod map;

src/responses/status.rs

@@ -17,13 +17,18 @@ pub async fn send(stream: &mut TcpStream, session: &mut Session) -> Result<()> {
         config.proto_ver
     };
 
+    let icon = match &config.image {
+        Some(img) => img,
+        None => &"".to_string()
+    };
+
     let data = StatusData {
         version_name: config.server_ver.clone(),
         version_protocol: proto_ver,
         players_max: config.players_max,
         players_online: config.players_online,
         description: json!({"text": config.motd.clone()}),
-        favicon: "".to_string(),
+        favicon: icon.to_string(),
         enforces_secure_chat: false,
     };