Fix neoforge download link
This commit is contained in:
parent
2bcdb8c428
commit
c026d36d03
@ -40,7 +40,7 @@ enum Dependency {
|
|||||||
impl Dependency {
|
impl Dependency {
|
||||||
async fn download(&self, target: impl Into<PathBuf>, version: String, mc_version: String) -> Result<(), Box<dyn std::error::Error>> {
|
async fn download(&self, target: impl Into<PathBuf>, version: String, mc_version: String) -> Result<(), Box<dyn std::error::Error>> {
|
||||||
let url = match self {
|
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!(
|
Dependency::Fabric => format!(
|
||||||
"https://meta2.fabricmc.net/v2/versions/loader/{}/{}/{}/server/jar",
|
"https://meta2.fabricmc.net/v2/versions/loader/{}/{}/{}/server/jar",
|
||||||
mc_version,
|
mc_version,
|
||||||
@ -271,7 +271,7 @@ eula=true
|
|||||||
|
|
||||||
let old_params = previous_version.as_ref().map(|prev| GameSetupParams::new(prev));
|
let old_params = previous_version.as_ref().map(|prev| GameSetupParams::new(prev));
|
||||||
let params = GameSetupParams::new(&config);
|
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"
|
"forge-installer.jar"
|
||||||
} else {
|
} else {
|
||||||
"server.jar"
|
"server.jar"
|
||||||
@ -282,7 +282,7 @@ eula=true
|
|||||||
let _ = tokio::fs::remove_file(&server_jar).await;
|
let _ = tokio::fs::remove_file(&server_jar).await;
|
||||||
println!("Downloading server jar");
|
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 {
|
if matches!(params.dependency, Dependency::Forge) || matches!(params.dependency, Dependency::NeoForge) {
|
||||||
match java_locator::locate_java_home() {
|
match java_locator::locate_java_home() {
|
||||||
Ok(java_home) => {
|
Ok(java_home) => {
|
||||||
println!("Found Java at {}. Attempting to run installer...", java_home);
|
println!("Found Java at {}. Attempting to run installer...", java_home);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user