diff --git a/src/main.rs b/src/main.rs index 07a44ff..9d34046 100644 --- a/src/main.rs +++ b/src/main.rs @@ -40,7 +40,7 @@ enum Dependency { impl Dependency { async fn download(&self, target: impl Into, version: String, mc_version: String) -> Result<(), Box> { let url = match self { - Dependency::NeoForge => format!("https://maven.neoforged.net/releases/net/neoforged/forge/{0}/forge-{0}-universal.jar", version), + Dependency::NeoForge => format!("https://maven.neoforged.net/releases/net/neoforged/neoforge/{0}/neoforge-{0}-installer.jar", version), Dependency::Fabric => format!( "https://meta2.fabricmc.net/v2/versions/loader/{}/{}/{}/server/jar", mc_version, @@ -271,7 +271,7 @@ eula=true 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) { + let server_jar_name = if matches!(params.dependency, Dependency::Forge) || matches!(params.dependency, Dependency::NeoForge) { "forge-installer.jar" } else { "server.jar" @@ -282,7 +282,7 @@ eula=true let _ = tokio::fs::remove_file(&server_jar).await; println!("Downloading server jar"); params.dependency.download(&server_jar, params.version, params.mc_version).await.unwrap(); - if let Dependency::Forge = params.dependency { + if matches!(params.dependency, Dependency::Forge) || matches!(params.dependency, Dependency::NeoForge) { match java_locator::locate_java_home() { Ok(java_home) => { println!("Found Java at {}. Attempting to run installer...", java_home);