From 10e7b66f38217f8ab735a80b1d67de956bd6aed6 Mon Sep 17 00:00:00 2001
From: Geometrically <18202329+Geometrically@users.noreply.github.com>
Date: Fri, 28 Jul 2023 16:22:38 -0700
Subject: [PATCH] Fix loader ordering (#10)

---
 daedalus_client/src/fabric.rs    | 9 ++-------
 daedalus_client/src/minecraft.rs | 6 ++----
 daedalus_client/src/quilt.rs     | 9 ++-------
 3 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/daedalus_client/src/fabric.rs b/daedalus_client/src/fabric.rs
index 39c4d41..94d2488 100644
--- a/daedalus_client/src/fabric.rs
+++ b/daedalus_client/src/fabric.rs
@@ -259,18 +259,13 @@ pub async fn retrieve_data(
         version.loaders.sort_by(|x, y| {
             list.loader
                 .iter()
-                .position(|z| {
-                    x.id.split('-').next().unwrap_or_default() == &*z.version
-                })
+                .position(|z| x.id == *z.version)
                 .unwrap_or_default()
                 .cmp(
                     &list
                         .loader
                         .iter()
-                        .position(|z| {
-                            y.id.split('-').next().unwrap_or_default()
-                                == z.version
-                        })
+                        .position(|z| y.id == z.version)
                         .unwrap_or_default(),
                 )
         })
diff --git a/daedalus_client/src/minecraft.rs b/daedalus_client/src/minecraft.rs
index 231a034..6badc9c 100644
--- a/daedalus_client/src/minecraft.rs
+++ b/daedalus_client/src/minecraft.rs
@@ -2,8 +2,7 @@ use crate::download_file;
 use crate::{format_url, upload_file_to_bucket, Error};
 use daedalus::get_hash;
 use daedalus::minecraft::{
-    merge_partial_library, Library, PartialLibrary,
-    VersionManifest,
+    merge_partial_library, Library, PartialLibrary, VersionManifest,
 };
 use log::info;
 use serde::Deserialize;
@@ -115,8 +114,7 @@ pub async fn retrieve_data(
 
                 let mut new_libraries = Vec::new();
                 for library in version_info.libraries.clone() {
-                    let mut libs =
-                        patch_library(&patches, library);
+                    let mut libs = patch_library(&patches, library);
                     new_libraries.append(&mut libs)
                 }
                 version_info.libraries = new_libraries;
diff --git a/daedalus_client/src/quilt.rs b/daedalus_client/src/quilt.rs
index 19ebeb4..827ad00 100644
--- a/daedalus_client/src/quilt.rs
+++ b/daedalus_client/src/quilt.rs
@@ -259,18 +259,13 @@ pub async fn retrieve_data(
         version.loaders.sort_by(|x, y| {
             list.loader
                 .iter()
-                .position(|z| {
-                    x.id.split('-').next().unwrap_or_default() == &*z.version
-                })
+                .position(|z| x.id == *z.version)
                 .unwrap_or_default()
                 .cmp(
                     &list
                         .loader
                         .iter()
-                        .position(|z| {
-                            y.id.split('-').next().unwrap_or_default()
-                                == z.version
-                        })
+                        .position(|z| y.id == z.version)
                         .unwrap_or_default(),
                 )
         })