Merge remote-tracking branch 'origin/dev'

Author: Urpagin

Cargo.toml

@@ -4,38 +4,28 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-dot-properties = "0.2.0"
-colored = "2.1.0"
-integer-encoding = "4.0.2"
+colored = "3.0.0"
 tokio = { version = "1.39.3", features = ["full"] }
 thiserror = "2.0.2"
-rand = "0.8.5"
 log = "0.4.22"
 env_logger = "0.11.5"
 chrono = "0.4.38"
 ctrlc = "3.4.5"
 once_cell = "1.19.0"
-tempfile = "3.12.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0.127"
 reqwest = { version = "0.12.7", features = ["json", "rustls-tls"] }
 clap = { version = "4.5.17", features = ["derive"] }
-sha2 = "0.10.8"
-byteorder = "1.5.0"
 bytes = "1.9.0"
 image = "0.25.5"
 base64 = "0.22.1"
 dashmap = "6.1.0"
-
-
+cactus_world = { git = "https://github.com/Cactus-minecraft-server/World.git", package = "world", branch = "main" }
 [profile.release]
-opt-level = 3     # optimiosation level 3 is the best
+opt-level = 3
 debug = false
-split-debuginfo = 'unified'
 lto = true
 
 [dev-dependencies]
-criterion = "0.4"
-
-
-
+rand = "0.9.2"
+tempfile = "3.21.0"

src/args/mod.rs

@@ -1,7 +1,7 @@
+use crate::shutdown::ExitCode;
 use crate::{fs_manager, gracefully_exit};
 use clap::Parser;
 use log::{error, info};
-use crate::shutdown::ExitCode;
 
 #[derive(Parser)]
 #[command(name = "CactusMC")]

src/commands/command_line.rs

@@ -62,4 +62,3 @@ pub async fn handle_input() -> ! {
         }
     }
 }
-

src/consts/mod.rs

@@ -67,6 +67,7 @@ pub mod file_paths {
     pub const USERCACHE: &str = "usercache.json";
     pub const SESSION: &str = "session.lock";
     pub const SERVER_ICON: &str = "server-icon.png";
+    pub const LEVEL: &str = "world/level.dat";
 }
 
 pub mod directory_paths {

src/file_folder_parser/mod.rs

@@ -1,8 +1,10 @@
-use std::fs::{self, File, OpenOptions};
+use std::fs::{self, remove_dir_all, File, OpenOptions};
 use std::io::{self, BufRead, Seek, SeekFrom};
 use std::path::Path;
 mod utils;
-use crate::{consts, gracefully_exit};
+use crate::config::{Difficulty, Gamemode};
+use crate::{config, consts, gracefully_exit};
+use cactus_world::level::{create_nbt, LevelDat, VersionInfo};
 use colored::Colorize;
 use log::{error, info, warn};
 use serde::{Deserialize, Serialize};
@@ -15,7 +17,7 @@ pub fn init() -> std::io::Result<()> {
     create_server_properties()
 }
 
-/// Checks if the eula is agreed, if not creates it.
+/// Checks if the eula is agreed, if not shutdown the server with failure code.
 fn eula() -> io::Result<()> {
     let path = Path::new(consts::file_paths::EULA);
     if !path.exists() {
@@ -39,15 +41,15 @@ fn create_server_properties() -> io::Result<()> {
     let path = Path::new(consts::file_paths::PROPERTIES);
     let content = consts::file_contents::server_properties();
 
-    utils::create_file(path, &content)
+    utils::create_file(path, Some(&content))
 }
 
 /// Creates the 'eula.txt' file if it does not already exist.
 fn create_eula() -> io::Result<()> {
     let path = Path::new(consts::file_paths::EULA);
     let content = consts::file_contents::eula();
 
-    utils::create_file(path, &content)
+    utils::create_file(path, Some(&content))
 }
 
 /// Check if the 'eula.txt' has been agreed to.
@@ -67,58 +69,66 @@ fn check_eula() -> io::Result<bool> {
 }
 
 pub fn create_other_files() {
-    match utils::create_file_nn(Path::new(consts::file_paths::BANNED_IP)) {
-        Ok(_) => info!("Created file {}", consts::file_paths::BANNED_IP),
-        Err(e) => info!(
+    match utils::create_file(Path::new(consts::file_paths::BANNED_IP), None) {
+        Ok(_) => (),
+        Err(e) => error!(
             "Failed to create the file {} as error:{}",
             consts::file_paths::BANNED_IP,
             e
         ),
     }
-    match utils::create_file_nn(Path::new(consts::file_paths::BANNED_PLAYERS)) {
-        Ok(_) => info!("Created file {}", consts::file_paths::BANNED_PLAYERS),
-        Err(e) => info!(
+    match utils::create_file(Path::new(consts::file_paths::BANNED_PLAYERS), None) {
+        Ok(_) => (),
+        Err(e) => error!(
             "Failed to create the file {} as error:{}",
             consts::file_paths::BANNED_PLAYERS,
             e
         ),
     }
-    match utils::create_file_nn(Path::new(consts::file_paths::OPERATORS)) {
-        Ok(_) => info!("Created file {}", consts::file_paths::OPERATORS),
-        Err(e) => info!(
+    match utils::create_file(Path::new(consts::file_paths::OPERATORS), None) {
+        Ok(_) => (),
+        Err(e) => error!(
             "Failed to create the file {} as error:{}",
             consts::file_paths::OPERATORS,
             e
         ),
     }
-    match utils::create_file_nn(Path::new(consts::file_paths::SESSION)) {
-        Ok(_) => info!("Created file {}", consts::file_paths::SESSION),
-        Err(e) => info!(
+    match utils::create_file(Path::new(consts::file_paths::SESSION), None) {
+        Ok(_) => (),
+        Err(e) => error!(
             "Failed to create the file {} as error:{}",
             consts::file_paths::SESSION,
             e
         ),
     }
-    match utils::create_file_nn(Path::new(consts::file_paths::USERCACHE)) {
-        Ok(_) => info!("Created file {}", consts::file_paths::USERCACHE),
-        Err(e) => info!(
+    match utils::create_file(Path::new(consts::file_paths::USERCACHE), None) {
+        Ok(_) => (),
+        Err(e) => error!(
             "Failed to create the file {} as error:{}",
             consts::file_paths::USERCACHE,
             e
         ),
     }
-    match utils::create_file_nn(Path::new(consts::file_paths::WHITELIST)) {
-        Ok(_) => info!("Created file {}", consts::file_paths::WHITELIST),
-        Err(e) => info!(
+    match utils::create_file(Path::new(consts::file_paths::WHITELIST), None) {
+        Ok(_) => (),
+        Err(e) => error!(
             "Failed to create the file {} as error:{}",
             consts::file_paths::WHITELIST,
             e
         ),
     }
+    match create_level_file() {
+        Ok(_) => (),
+        Err(e) => error!(
+            "Failed to create the file at {} as error {}",
+            consts::file_paths::LEVEL,
+            e
+        ),
+    }
 }
 pub fn create_dirs() {
     match utils::create_dir(Path::new(consts::directory_paths::LOGS)) {
-        Ok(_) => info!("Created dir{}", consts::directory_paths::LOGS),
+        Ok(_) => (),
         Err(e) => info!(
             "Failed to create dir{} as error: {}",
             consts::directory_paths::LOGS,
@@ -127,7 +137,7 @@ pub fn create_dirs() {
     }
 
     match utils::create_dir(Path::new(consts::directory_paths::WORLDS_DIRECTORY)) {
-        Ok(_) => info!("No existing world data, creating new world"),
+        Ok(_) => (),
         Err(e) => info!(
             "Failed to create dir{} as error: {}",
             consts::directory_paths::WORLDS_DIRECTORY,
@@ -136,7 +146,7 @@ pub fn create_dirs() {
     }
 
     match utils::create_dir(Path::new(consts::directory_paths::OVERWORLD)) {
-        Ok(_) => info!("Created dir{}", consts::directory_paths::OVERWORLD),
+        Ok(_) => (),
         Err(e) => info!(
             "Failed to create dir{} as error: {}",
             consts::directory_paths::OVERWORLD,
@@ -145,7 +155,7 @@ pub fn create_dirs() {
     }
 
     match utils::create_dir(Path::new(consts::directory_paths::THE_END)) {
-        Ok(_) => info!("Created dir{}", consts::directory_paths::THE_END),
+        Ok(_) => (),
         Err(e) => info!(
             "Failed to create dir{} as error: {}",
             consts::directory_paths::THE_END,
@@ -154,7 +164,7 @@ pub fn create_dirs() {
     }
 
     match utils::create_dir(Path::new(consts::directory_paths::NETHER)) {
-        Ok(_) => info!("Created dir{}", consts::directory_paths::NETHER),
+        Ok(_) => (),
         Err(e) => info!(
             "Failed to create dir{} as error: {}",
             consts::directory_paths::NETHER,
@@ -258,6 +268,7 @@ pub fn clean_files() -> Result<(), std::io::Error> {
         consts::file_paths::SESSION,
         consts::file_paths::USERCACHE,
         consts::file_paths::WHITELIST,
+        consts::file_paths::LEVEL,
     ];
 
     // Delete files using the `remove_file` helper function
@@ -276,9 +287,52 @@ pub fn clean_files() -> Result<(), std::io::Error> {
 
     // Delete directories using the `remove_dir` helper function
     for dir in &directories {
-        remove_dir(dir)?;
+        remove_dir_all(dir)?;
     }
-
-    info!("Files cleaned successfully before starting the server.");
+    let info = "[Info]".green();
+    println!(
+        "{} Files cleaned successfully before starting the server.",
+        info
+    );
     gracefully_exit(crate::ExitCode::Success);
 }
+fn create_level_file() -> Result<(), std::io::Error> {
+    if Path::new(consts::file_paths::LEVEL).exists() {
+        info!("level.dat file already exist, not altering it");
+        return Ok(());
+    }
+    let server_version = VersionInfo {
+        id: 4440,
+        snapshot: false,
+        series: "main".into(),
+        name: consts::minecraft::VERSION.into(),
+    };
+    let data = LevelDat {
+        version: server_version,
+        difficulty: match config::Settings::new().difficulty {
+            Difficulty::Easy => 0,
+            Difficulty::Normal => 1,
+            Difficulty::Hard => 2,
+        },
+        game_type: match config::Settings::new().gamemode {
+            Gamemode::Survival => 0,
+            Gamemode::Creative => 1,
+            Gamemode::Spectator => 3,
+            Gamemode::Adventure => 2,
+        },
+
+        hardcore: config::Settings::new().hardcore,
+        level_name: match config::Settings::new().level_name {
+            Some(words) => words,
+            _ => "Overworld".into(),
+        },
+
+        ..Default::default()
+    };
+
+    let result = create_nbt(&data, consts::file_paths::LEVEL);
+    if result.is_ok() {
+        info!("File created at {}", consts::file_paths::LEVEL)
+    }
+    result
+}