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

Fix loader ordering (#10)

Browse Source
This commit is contained in:
Geometrically
2023-07-28 16:22:38 -07:00
committed by GitHub
parent 0d56127758
commit 10e7b66f38
3 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
daedalus_client/src/fabric.rs
View File

@@ -259,18 +259,13 @@ pub async fn retrieve_data(
version.loaders.sort_by(|x, y| { version.loaders.sort_by(|x, y| {
list.loader list.loader
.iter() .iter()
.position(|z| { .position(|z| x.id == *z.version)
x.id.split('-').next().unwrap_or_default() == &*z.version
})
.unwrap_or_default() .unwrap_or_default()
.cmp( .cmp(
&list &list
.loader .loader
.iter() .iter()
.position(|z| { .position(|z| y.id == z.version)
y.id.split('-').next().unwrap_or_default()
== z.version
})
.unwrap_or_default(), .unwrap_or_default(),
) )
}) })

6
daedalus_client/src/minecraft.rs
View File

@@ -2,8 +2,7 @@ use crate::download_file;
use crate::{format_url, upload_file_to_bucket, Error}; use crate::{format_url, upload_file_to_bucket, Error};
use daedalus::get_hash; use daedalus::get_hash;
use daedalus::minecraft::{ use daedalus::minecraft::{
merge_partial_library, Library, PartialLibrary, merge_partial_library, Library, PartialLibrary, VersionManifest,
VersionManifest,
}; };
use log::info; use log::info;
use serde::Deserialize; use serde::Deserialize;
@@ -115,8 +114,7 @@ pub async fn retrieve_data(
let mut new_libraries = Vec::new(); let mut new_libraries = Vec::new();
for library in version_info.libraries.clone() { for library in version_info.libraries.clone() {
let mut libs = let mut libs = patch_library(&patches, library);
patch_library(&patches, library);
new_libraries.append(&mut libs) new_libraries.append(&mut libs)
} }
version_info.libraries = new_libraries; version_info.libraries = new_libraries;

9
daedalus_client/src/quilt.rs
View File

@@ -259,18 +259,13 @@ pub async fn retrieve_data(
version.loaders.sort_by(|x, y| { version.loaders.sort_by(|x, y| {
list.loader list.loader
.iter() .iter()
.position(|z| { .position(|z| x.id == *z.version)
x.id.split('-').next().unwrap_or_default() == &*z.version
})
.unwrap_or_default() .unwrap_or_default()
.cmp( .cmp(
&list &list
.loader .loader
.iter() .iter()
.position(|z| { .position(|z| y.id == z.version)
y.id.split('-').next().unwrap_or_default()
== z.version
})
.unwrap_or_default(), .unwrap_or_default(),
) )
}) })