From 148b19bcf58d44661cbd2877ef29221c42c3c4fa Mon Sep 17 00:00:00 2001 From: Gabriel Tofvesson Date: Sun, 11 May 2025 17:09:28 +0200 Subject: [PATCH] Run Forge installer after download --- Cargo.lock | 16 ++++++++++++ Cargo.toml | 3 ++- src/main.rs | 70 ++++++++++++++++++++++++++++++++++++++++++----------- 3 files changed, 74 insertions(+), 15 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e1cfdda..577899e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -419,6 +419,12 @@ version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" +[[package]] +name = "glob" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2" + [[package]] name = "h2" version = "0.4.9" @@ -736,6 +742,15 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" +[[package]] +name = "java-locator" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09c46c1fe465c59b1474e665e85e1256c3893dd00927b8d55f63b09044c1e64f" +dependencies = [ + "glob", +] + [[package]] name = "jobserver" version = "0.1.33" @@ -848,6 +863,7 @@ name = "mrunpack" version = "0.1.0" dependencies = [ "bytes", + "java-locator", "reqwest", "serde", "serde_json", diff --git a/Cargo.toml b/Cargo.toml index 0118146..36ad292 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,4 +10,5 @@ serde_json = "1.0" serde = { version = "1.0.219", features = ["derive"] } tokio = { version = "1.44.2", features = ["full"] } tokio-macros = { version = "0.2.6" } -bytes = "*" \ No newline at end of file +bytes = "*" +java-locator = "0.1.9" \ No newline at end of file diff --git a/src/main.rs b/src/main.rs index 57dbf11..12dcae3 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,8 +1,9 @@ use std::collections::HashMap; use std::env::args; use std::ffi::OsStr; -use std::io::Read; +use std::io::{stderr, stdin, stdout, Read}; use std::path::PathBuf; +use std::process::Stdio; use zip::ZipArchive; use serde::{Deserialize, Serialize}; use tokio::fs::File; @@ -62,7 +63,7 @@ impl Dependency { .ok_or("No Minecraft version found")? .to_string() }, - Dependency::Forge => format!("https://maven.minecraftforge.net/net/minecraftforge/forge/{0}/forge-{0}-universal.jar", version) + Dependency::Forge => format!("https://maven.minecraftforge.net/net/minecraftforge/forge/{1}-{0}/forge-{1}-{0}-installer.jar", version, mc_version) }; let target = target.into(); @@ -70,12 +71,13 @@ impl Dependency { eprintln!("File {} already exists, skipping download", target.display()); return Ok(()); } + let response = reqwest::get(url.clone()).await?; - if response.status().is_success() { + let status = response.status(); + if status.is_success() { let content = response.bytes().await?; let mut file = File::create(&target).await?; tokio::io::copy(&mut content.as_ref(), &mut file).await?; - return Ok(()) } Err(format!("Failed to download file: {}", url).into()) @@ -102,11 +104,15 @@ impl ConfigFile { eprintln!("File {} already exists (or is disabled), skipping download", target_path.display()); return Ok(()); } + + if let Some(parent) = target_path.parent() { + tokio::fs::create_dir_all(parent).await?; + } for link in &self.downloads { let response = reqwest::get(link).await?; if response.status().is_success() { - println!("Downloading file from {}", link); + println!("Downloading file from {} -> `{}`", link, &target_path.display()); let content = response.bytes().await?; let mut file = File::create(&target_path).await?; tokio::io::copy(&mut content.as_ref(), &mut file).await?; @@ -235,6 +241,13 @@ async fn main() { // Create directory "out" and subdirectory "mods" std::fs::create_dir_all(&out_dir).expect("Unable to create directory"); + + let eula = "#By changing the setting below to TRUE you are indicating your agreement to our EULA (https://aka.ms/MinecraftEULA). +#Thu Jan 01 00:00:00 GMT 1970 +eula=true +"; + let mut eula_file = File::create(out_dir.join("eula.txt")).await.unwrap(); + eula_file.write_all(eula.as_bytes()).await.unwrap(); println!("Extracting files from {}", args[1]); let config = get_config_from_archive(&mut archive, &out_dir).await.unwrap(); @@ -250,22 +263,51 @@ async fn main() { } } - let server_jar = out_dir.join("server.jar"); let old_params = previous_version.as_ref().map(|prev| GameSetupParams::new(prev)); let params = GameSetupParams::new(&config); + let server_jar_name = if matches!(params.dependency, Dependency::Forge) { + "forge-installer.jar" + } else { + "server.jar" + }; + let server_jar = out_dir.join(server_jar_name); if match old_params { None => true, Some(old_params) => old_params.dependency != params.dependency || !server_jar.exists() } { let _ = tokio::fs::remove_file(&server_jar).await; println!("Downloading server jar"); - params.dependency.download(server_jar, params.version, params.mc_version).await.unwrap(); + params.dependency.download(&server_jar, params.version, params.mc_version).await.unwrap(); + if let Dependency::Forge = params.dependency { + match java_locator::locate_java_home() { + Ok(java_home) => { + println!("Found Java at {}. Attempting to run installer...", java_home); + let java_home = >::into(java_home).join("bin").join("java.exe"); + println!("Java home: {}", java_home.display()); + let result = std::process::Command::new(&java_home) + .current_dir(out_dir) + .arg("-jar") + .arg(server_jar_name) + .arg("--installServer") + .stderr(Stdio::inherit()) + .stdout(Stdio::inherit()) + .stdin(Stdio::inherit()) + .spawn(); + match result { + Ok(mut child) => { + let _ = child.wait(); + println!("Installer finished"); + let _ = tokio::fs::remove_file(&server_jar).await; + } + Err(e) => { + eprintln!("Error running installer: {}", e); + } + } + } + Err(e) => { + eprintln!("Error locating Java! You will need to execute the Forge installer manually: `java -jar {server_jar_name} --installServer`"); + } + } + } } else { println!("Server jar already exists, skipping download"); } - - let eula = "#By changing the setting below to TRUE you are indicating your agreement to our EULA (https://aka.ms/MinecraftEULA). -#Thu Jan 01 00:00:00 GMT 1970 -eula=true -"; - let mut eula_file = File::create(out_dir.join("eula.txt")).await.unwrap(); - eula_file.write_all(eula.as_bytes()).await.unwrap(); }