Merge commit 'df1499047ccc8f39d756d5beba60651237aca1c0' into beta

packages/app-lib/src/launcher/args.rs

@@ -32,15 +32,15 @@ pub fn get_class_paths(
     let mut cps = libraries
         .iter()
         .filter_map(|library| {
-            if let Some(rules) = &library.rules {
-                if !parse_rules(
+            if let Some(rules) = &library.rules
+                && !parse_rules(
                     rules,
                     java_arch,
                     &QuickPlayType::None,
                     minecraft_updated,
-                ) {
-                    return None;
-                }
+                )
+            {
+                return None;
             }
 
             if !library.include_in_classpath {
@@ -504,10 +504,10 @@ pub async fn get_processor_main_class(
             let mut line = line.map_err(IOError::from)?;
             line.retain(|c| !c.is_whitespace());
 
-            if line.starts_with("Main-Class:") {
-                if let Some(class) = line.split(':').nth(1) {
-                    return Ok(Some(class.to_string()));
-                }
+            if line.starts_with("Main-Class:")
+                && let Some(class) = line.split(':').nth(1)
+            {
+                return Ok(Some(class.to_string()));
             }
         }
 

packages/app-lib/src/launcher/download.rs

@@ -290,12 +290,11 @@ pub async fn download_libraries(
     loading_try_for_each_concurrent(
         stream::iter(libraries.iter())
             .map(Ok::<&Library, crate::Error>), None, loading_bar,loading_amount,num_files, None,|library| async move {
-                if let Some(rules) = &library.rules {
-                    if !parse_rules(rules, java_arch, &QuickPlayType::None, minecraft_updated) {
+                if let Some(rules) = &library.rules
+                    && !parse_rules(rules, java_arch, &QuickPlayType::None, minecraft_updated) {
                         tracing::trace!("Skipped library {}", &library.name);
                         return Ok(());
                     }
-                }
 
                 if !library.downloadable {
                     tracing::trace!("Skipped non-downloadable library {}", &library.name);
@@ -311,15 +310,14 @@ pub async fn download_libraries(
                             return Ok(());
                         }
 
-                        if let Some(d::minecraft::LibraryDownloads { artifact: Some(ref artifact), ..}) = library.downloads {
-                            if !artifact.url.is_empty(){
+                        if let Some(d::minecraft::LibraryDownloads { artifact: Some(ref artifact), ..}) = library.downloads
+                            && !artifact.url.is_empty(){
                                 let bytes = fetch(&artifact.url, Some(&artifact.sha1), &st.fetch_semaphore, &st.pool)
                                     .await?;
                                 write(&path, &bytes, &st.io_semaphore).await?;
                                 tracing::trace!("Fetched library {} to path {:?}", &library.name, &path);
                                 return Ok::<_, crate::Error>(());
                             }
-                        }
 
                         let url = [
                             library

packages/app-lib/src/launcher/mod.rs

@@ -344,10 +344,10 @@ pub async fn install_minecraft(
 
             // Forge processors (90-100)
             for (index, processor) in processors.iter().enumerate() {
-                if let Some(sides) = &processor.sides {
-                    if !sides.contains(&String::from("client")) {
-                        continue;
-                    }
+                if let Some(sides) = &processor.sides
+                    && !sides.contains(&String::from("client"))
+                {
+                    continue;
                 }
 
                 let cp = {