deejfnjefefefe/AstralRinth
1
0
Fork 0
forked from didirus/AstralRinth
Code Pull Requests Activity

Fix forge format version 1

Browse Source
This commit is contained in:
Jai A
2024-08-17 13:28:00 -07:00
parent 0ae1e40d79
commit 93ae24e707
4 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
daedalus_client/src/forge.rs
View File

@@ -1,5 +1,5 @@
use crate::util::{
download_file, fetch_json, fetch_xml, format_url, sha1_async,
download_file, fetch_json, fetch_xml, format_url,
};
use crate::{insert_mirrored_artifact, Error, MirrorArtifact, UploadFile};
use chrono::{DateTime, Utc};
@@ -403,9 +403,10 @@ async fn fetch(
.map(|mut lib| {
// For all libraries besides the forge lib extracted, we mirror them from maven servers
// unless the URL is empty/null or available on Minecraft's servers
if let Some(url) = lib.url {
if lib.name != install_profile.install.path
&& !url.is_empty()
if let Some(ref url) = lib.url {
if lib.name == install_profile.install.path {
lib.url = Some(format_url("maven/"));
} else if !url.is_empty()
&& !url.contains(
"https://libraries.minecraft.net/",
)
@@ -414,7 +415,7 @@ async fn fetch(
&lib.name,
None,
vec![
url,
url.clone(),
"https://maven.creeperhost.net/"
.to_string(),
maven_url.to_string(),
@@ -422,11 +423,11 @@ async fn fetch(
false,
mirror_artifacts,
)?;
lib.url = Some(format_url("maven/"));
}
}
lib.url = Some(format_url("maven/"));
Ok(lib)
})
.collect::<Result<Vec<_>, Error>>()?,
@@ -442,7 +443,7 @@ async fn fetch(
// pub profile: String,
// pub version: String,
// pub json: String,
pub path: Option<String>,
// pub path: Option<String>,
// pub minecraft: String,
pub data: HashMap<String, daedalus::modded::SidedDataEntry>,
pub libraries: Vec<daedalus::minecraft::Library>,