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

Fix incorrect condition for forge and incorrect fabric loader version ordering

Browse Source
This commit is contained in:
Jai A
2021-12-19 20:51:34 -07:00
parent 1d86aac338
commit 09aef18999
4 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
daedalus/Cargo.toml
View File

@@ -1,6 +1,6 @@
[package] [package]
name = "daedalus" name = "daedalus"
version = "0.1.12" version = "0.1.13"
authors = ["Jai A <jaiagr+gpg@pm.me>"] authors = ["Jai A <jaiagr+gpg@pm.me>"]
edition = "2018" edition = "2018"
license = "MIT" license = "MIT"

2
daedalus_client/Cargo.toml
View File

@@ -1,6 +1,6 @@
[package] [package]
name = "daedalus_client" name = "daedalus_client"
version = "0.1.12" version = "0.1.13"
authors = ["Jai A <jaiagr+gpg@pm.me>"] authors = ["Jai A <jaiagr+gpg@pm.me>"]
edition = "2018" edition = "2018"

14
daedalus_client/src/fabric.rs
View File

@@ -229,13 +229,23 @@ 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| x.id == z.version) .position(|z| {
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| y.id == z.version) .position(|z| {
y.id.split('-')
.next()
.unwrap_or_default()
== z.version
})
.unwrap_or_default(), .unwrap_or_default(),
) )
}) })

3
daedalus_client/src/forge.rs
View File

@@ -27,7 +27,6 @@ pub async fn retrieve_data(
minecraft_versions: &VersionManifest, minecraft_versions: &VersionManifest,
uploaded_files: &mut Vec<String>, uploaded_files: &mut Vec<String>,
) -> Result<(), Error> { ) -> Result<(), Error> {
println!("forg");
let maven_metadata = fetch_maven_metadata(None).await?; let maven_metadata = fetch_maven_metadata(None).await?;
let old_manifest = daedalus::modded::fetch_manifest(&*format_url(&*format!( let old_manifest = daedalus::modded::fetch_manifest(&*format_url(&*format!(
"forge/v{}/manifest.json", "forge/v{}/manifest.json",
@@ -98,7 +97,7 @@ pub async fn retrieve_data(
"1.12.2-14.23.5.2851" "1.12.2-14.23.5.2851"
]; ];
if !WHITELIST.contains(&&*loader_version_full) { if WHITELIST.contains(&&*loader_version_full) {
return Ok(None); return Ok(None);
} }