2.1.0 - Velocity support

Author: MagicTeaMC

Cargo.lock

@@ -2,7 +2,7 @@
 name = "mcsast"
 authors = ["MagicTeaMC <maoyue@maoyue.tw>"]
 description = "Minecraft server auto setup tool, simplified!"
-version = "2.0.0"
+version = "2.1.0"
 edition = "2021"
 license = "GPL-3.0"
 

Cargo.toml

@@ -1,7 +1,7 @@
 # MCSAST v2
 [![Discord](https://img.shields.io/discord/891325967203729472?color=5865F2&label=discord&style=for-the-badge)](https://discord.gg/uQ4UXANnP2)   
 
-Setup a new Paper / Purpur / Folia server quickly and easily.
+Setup a new Paper / Purpur / Folia / Velocity server quickly and easily.
 ## Usage
 Install via Cargo  
 ```
@@ -12,9 +12,10 @@ Run with command
 mcsast
 ```
 Give information to us with terminal:
-<img width="970" alt="image" src="https://github.com/user-attachments/assets/6c42d27c-d4fe-4bad-bb36-ce5d6b3debad">
+<img width="1378" alt="圖片" src="https://github.com/user-attachments/assets/a4cdfe71-de7b-4aab-9fb7-cfd1052a7edb" />
 
-If you want it to setup automantic, here is a command
+If you want it to setup automantic, here is a command  
+Note: Use `--mc-version=3.4.0-SNAPSHOT --eula=false` if you are installing Velocity
 ```
 mcsast --software=paper --mc-version=1.21.1 --eula=true -y
 ```

README.md

@@ -5,4 +5,4 @@ pub fn add_eula() -> Result<(), Box<dyn std::error::Error>> {
 
     file.write_all("eula=true".as_bytes())?;
     Ok(())
-}
+}

src/eula.rs

@@ -36,6 +36,7 @@ enum Software {
     Paper,
     Folia,
     Purpur,
+    Velocity,
 }
 
 fn inquired<T>(binding: Result<T, inquire::InquireError>) -> T {
@@ -54,6 +55,7 @@ impl Software {
             "paper" => Self::Paper,
             "folia" => Self::Folia,
             "purpur" => Self::Purpur,
+            "velocity" => Self::Velocity,
             _ => panic!("Invalid software name: {}", name),
         }
     }
@@ -63,6 +65,7 @@ impl Software {
             Self::Paper => "paper",
             Self::Folia => "folia",
             Self::Purpur => "purpur",
+            Self::Velocity => "velocity",
         }
         .to_string()
     }
@@ -71,26 +74,11 @@ impl Software {
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let cli = CLI::parse();
 
-    println!(
-        r#"
-░▒▓██████████████▓▒░ ░▒▓██████▓▒░ ░▒▓███████▓▒░░▒▓██████▓▒░ ░▒▓███████▓▒░▒▓████████▓▒░ 
-░▒▓█▓▒░░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░      ░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░         ░▒▓█▓▒░     
-░▒▓█▓▒░░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░      ░▒▓█▓▒░      ░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░         ░▒▓█▓▒░     
-░▒▓█▓▒░░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░       ░▒▓██████▓▒░░▒▓████████▓▒░░▒▓██████▓▒░   ░▒▓█▓▒░     
-░▒▓█▓▒░░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░             ░▒▓█▓▒░▒▓█▓▒░░▒▓█▓▒░      ░▒▓█▓▒░  ░▒▓█▓▒░     
-░▒▓█▓▒░░▒▓█▓▒░░▒▓█▓▒░▒▓█▓▒░░▒▓█▓▒░      ░▒▓█▓▒░▒▓█▓▒░░▒▓█▓▒░      ░▒▓█▓▒░  ░▒▓█▓▒░     
-░▒▓█▓▒░░▒▓█▓▒░░▒▓█▓▒░░▒▓██████▓▒░░▒▓███████▓▒░░▒▓█▓▒░░▒▓█▓▒░▒▓███████▓▒░   ░▒▓█▓▒░
-
-                              {}                                
-"#,
-        "By Maoyue (MagicTeaMC)".yellow()
-    );
-
     let software = {
         if cli.software.is_none() {
             let binding = Select::new(
-                "💽 What server software are you using?",
-                vec!["Paper", "Folia", "Purpur"],
+                "💽 Which server software are you using?",
+                vec!["Paper", "Folia", "Purpur", "Velocity"],
             )
             .prompt();
 
@@ -100,7 +88,9 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         }
     };
     let version = {
-        if cli.mc_version.is_none() {
+        if software.name() == "velocity" {
+            "3.4.0-SNAPSHOT".to_string()
+        } else if cli.mc_version.is_none() {
             let binding = Text::new("🪨  What version of Minecraft are you using?")
                 .with_default("1.21.1")
                 .prompt();
@@ -111,7 +101,9 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         }
     };
     let eula = {
-        if cli.eula.is_none() {
+        if software.name() == "velocity" {
+            false
+        } else if cli.eula.is_none() {
             let binding = Confirm::new(
                 format!(
                     "📄 Do you agree to the {}?",
@@ -129,7 +121,8 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         }
     };
 
-    println!(
+    if software.name() != "velocity" {
+        println!(
         "\n✨ I will setup {}, with Minecraft server version {}, {} Mojang's EULA in this directory {}{}{}.",
         software.name().bold().yellow(),
         version.bold().blue(),
@@ -149,25 +142,42 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
                 .and_then(|name| name.to_str())
                 .unwrap_or("<unknown>")
         }.dimmed(),
-        ")".dimmed()
-    );
+            ")".dimmed()
+        );
+    } else {
+        println!(
+            "\n✨ I will setup {} in this directory {}{}{}.",
+            software.name().bold().yellow(),
+            "(".dimmed(),
+            {
+                let current_dir = std::env::current_dir().unwrap();
+                current_dir
+                    .to_owned()
+                    .file_name()
+                    .and_then(|name| name.to_str())
+                    .unwrap_or("<unknown>")
+            }
+            .dimmed(),
+            ")".dimmed()
+        );
+    }
 
     if !cli.yes {
         match Confirm::new("Proceed?").with_default(true).prompt() {
             Ok(result) => {
                 if !result {
                     println!(
-                    "\n🎏 You can pass `--software={} --mc-version={} --eula={}` to get everything up and running!\n",
-                    software.name().bold().yellow(),
-                    version.bold().blue(),
-                    {
-                        if eula {
-                            "true".bold().green()
-                        } else {
-                            "false".bold().red()
+                        "\n🎏 You can pass `--software={} --mc-version={} --eula={}` to get everything up and running!\n",
+                        software.name().bold().yellow(),
+                        version.bold().blue(),
+                        {
+                            if eula {
+                                "true".bold().green()
+                            } else {
+                                "false".bold().red()
+                            }
                         }
-                    }
-                );
+                    );
                     println!("{}: aborted", "warning".yellow().bold());
                     exit(-1);
                 }
@@ -181,7 +191,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     println!();
 
-    if eula {
+    if eula && software.name() != "velocity" {
         print!("(1/2) Adding EULA... ");
         match eula::add_eula() {
             Err(e) => {
@@ -195,7 +205,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     print!(
         "{}Downloading {}... ",
         {
-            if eula {
+            if eula && software.name() != "velocity" {
                 "(2/2) "
             } else {
                 "(1/1) "
@@ -215,7 +225,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     }
 
     println!("\n{}", "Summary".bold().underline());
-    if eula {
+    if eula && software.name() != "velocity" {
         println!("  {} eula.txt", "+".green().bold());
     }
 
@@ -228,4 +238,4 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     );
 
     Ok(())
-}
+}

src/main.rs

@@ -47,7 +47,10 @@ pub fn get_other(software: String, version: String) -> Result<(), Box<dyn std::e
             let res = client
                 .get(format!(
                     "https://api.papermc.io/v2/projects/{}/versions/{}/builds/{}/downloads/{}",
-                software.to_lowercase(), version, latest_build, jar_name
+                    software.to_lowercase(),
+                    version,
+                    latest_build,
+                    jar_name
                 ))
                 .send();
             if let Ok(res) = res {
@@ -69,4 +72,4 @@ pub fn get(name: String, version: String) -> Result<(), Box<dyn std::error::Erro
         "purpur" => get_purpur(version),
         _ => get_other(name, version),
     }
-}
+}