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

fix some data

Browse Source
This commit is contained in:
Jai A
2023-04-26 10:41:43 -07:00
parent 568e5a9bb8
commit 3afda71349
1 changed files with 41 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
daedalus_client/src/minecraft.rs
View File

@@ -66,30 +66,48 @@ pub async fn retrieve_data(
let mut version_info = let mut version_info =
daedalus::minecraft::fetch_version_info(version).await?; daedalus::minecraft::fetch_version_info(version).await?;
fn patch_library(patches: &Vec<LibraryPatch>, mut library: Library) -> Vec<Library> {
let mut val = Vec::new();
let actual_patches = patches
.iter()
.filter(|x| x.match_.contains(&library.name))
.collect::<Vec<_>>();
if !actual_patches.is_empty()
{
for patch in actual_patches {
if let Some(additional_libraries) =
&patch.additional_libraries
{
for additional_library in additional_libraries {
if patch.patch_additional_libraries.unwrap_or(false) {
let mut libs = patch_library(patches, additional_library.clone());
val.append(&mut libs)
} else {
val.push(additional_library.clone());
}
}
} else if let Some(override_) = &patch.override_ {
library = merge_partial_library(
override_.clone(),
library,
);
}
}
val.push(library);
} else {
val.push(library);
}
val
}
let mut new_libraries = Vec::new(); let mut new_libraries = Vec::new();
for library in version_info.libraries { for library in version_info.libraries {
if let Some(patch) = patches let mut libs = patch_library(&patches, library);
.iter() new_libraries.append(&mut libs)
.find(|x| x.match_.contains(&library.name))
{
if let Some(additional_libraries) =
&patch.additional_libraries
{
new_libraries.push(library);
for additional_library in additional_libraries {
new_libraries.push(additional_library.clone());
}
} else if let Some(override_) = &patch.override_ {
new_libraries.push(merge_partial_library(
override_.clone(),
library,
));
} else {
new_libraries.push(library);
}
} else {
new_libraries.push(library);
}
} }
version_info.libraries = new_libraries; version_info.libraries = new_libraries;
@@ -240,7 +258,7 @@ struct LibraryPatch {
pub additional_libraries: Option<Vec<Library>>, pub additional_libraries: Option<Vec<Library>>,
#[serde(rename = "override")] #[serde(rename = "override")]
pub override_: Option<PartialLibrary>, pub override_: Option<PartialLibrary>,
// pub patch_additional_libraries: Option<bool>, pub patch_additional_libraries: Option<bool>,
} }
/// Fetches the list of fabric versions /// Fetches the list of fabric versions