Merge branch 'master' into feat/commands

Author: ReCore-sys

.etc/example-config.toml

@@ -40,5 +40,3 @@ cache_ttl = 60
 # How big the cache can be in kb.
 cache_capacity = 20_000
 
-whitelist = false
-

Cargo.toml

@@ -144,6 +144,7 @@ ahash = "0.8.12"
 serde = { version = "1.0.219", features = ["derive"] }
 serde_json = "1.0.142"
 serde_derive = "1.0.219"
+serde_yaml_ng = "0.9.36"
 base64 = "0.22.1"
 bitcode = "0.6.6"
 bitcode_derive = "0.6.5"

src/bin/src/game_loop.rs

@@ -112,7 +112,6 @@ pub fn start_game_loop(global_state: GlobalState) -> Result<(), BinaryError> {
     Ok(())
 }
 
-// This is the bit where we bridge to async
 fn tcp_conn_acceptor(
     state: GlobalState,
     packet_sender: Arc<PacketSender>,

src/lib/utils/config/Cargo.toml

@@ -19,4 +19,6 @@ uuid = { workspace = true }
 regex = { workspace = true }
 reqwest = { workspace = true }
 ureq = { workspace = true, features = ["json"] }
+serde_json = { workspace = true }
+serde_yaml_ng = { workspace = true }
 rayon = { workspace = true }

src/lib/utils/config/src/errors.rs

@@ -27,4 +27,12 @@ pub enum ConfigError {
     /// Error when the root path cannot be found.
     #[error("Failed to get the root path.")]
     RootPathError(#[from] ferrumc_general_purpose::paths::RootPathError),
+
+    /// YAML serialization/deserialization error.
+    #[error("YAML error: {0}")]
+    YamlError(#[from] serde_yaml_ng::Error),
+
+    /// Custom error message.
+    #[error("{0}")]
+    Custom(String),
 }

src/lib/utils/config/src/setup.rs

@@ -27,7 +27,7 @@ impl From<std::io::Error> for SetupError {
 }
 
 pub fn setup() -> Result<(), SetupError> {
-    if !std::fs::exists(get_root_path().join("whitelist.txt"))? {
+    if !std::fs::exists(get_root_path().join("whitelist.yml"))? {
         create_blank_whitelist_file();
     }
     if std::fs::exists(get_root_path().join("config.toml"))? {

src/lib/utils/config/src/statics.rs

@@ -1,5 +1,5 @@
 use crate::server_config::ServerConfig;
-use dashmap::DashSet;
+use dashmap::DashMap;
 use ferrumc_general_purpose::paths::get_root_path;
 use lazy_static::lazy_static;
 use std::fs::File;
@@ -13,8 +13,8 @@ pub(crate) const DEFAULT_CONFIG: &str = include_str!("../../../../../.etc/exampl
 lazy_static! {
     /// The server configuration that is stored in memory.
     static ref CONFIG: ServerConfig = create_config();
-    /// The whitelist of player uuids.
-    pub static ref WHITELIST: DashSet<u128> = DashSet::new();
+    /// The whitelist of player uuids to names.
+    pub static ref WHITELIST: DashMap<u128, String> = DashMap::new();
 }
 fn create_config() -> ServerConfig {
     let config_location = get_root_path().join("config.toml");
@@ -77,6 +77,6 @@ pub fn get_global_config() -> &'static ServerConfig {
     &CONFIG
 }
 
-pub fn get_whitelist() -> &'static DashSet<u128> {
+pub fn get_whitelist() -> &'static DashMap<u128, String> {
     &WHITELIST
 }