fix java detection for weird formats

Author: 0x7d8

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "mcvcli"
 description = "A command line interface for managing Minecraft servers."
-version = "2.3.3"
+version = "2.3.4"
 edition = "2024"
 license = "MIT"
 homepage = "https://github.com/mcjars/mcvcli"
@@ -35,3 +35,4 @@ sysinfo = "0.34.0"
 rand = "0.9.0"
 ipipe = "0.11.7"
 xz2 = "0.1.7"
+atoi = "2.0.0"

Cargo.toml

@@ -1,6 +1,5 @@
-use crate::api::Progress;
 use crate::api::{
-    self,
+    self, Progress,
     mcjars::{Build, InstallationStep, Version},
     modrinth::Project,
 };
@@ -16,7 +15,7 @@ use zip::ZipArchive;
 
 pub async fn install(build: &Build, directory: &str, spaces: usize) -> Result<(), reqwest::Error> {
     if Path::new(directory).join("libraries").exists() {
-        std::fs::remove_dir_all(Path::new(directory).join("libraries")).unwrap_or(());
+        std::fs::remove_dir_all(Path::new(directory).join("libraries")).unwrap_or_default();
     }
 
     for group in build.installation.iter() {

src/jar.rs

@@ -24,6 +24,18 @@ struct Package {
 static LOCATION: LazyLock<String> =
     LazyLock::new(|| format!("{}/.mcvcli/java", home_dir().unwrap().to_str().unwrap()));
 
+fn parse_version_stderr(stderr: &str) -> u8 {
+    let line = stderr.lines().next().unwrap();
+    let version = line
+        .split_whitespace()
+        .find(|s| s.chars().any(|c| c.is_numeric()))
+        .unwrap()
+        .trim_matches(|c: char| !c.is_numeric())
+        .replace("1.8", "8");
+
+    atoi::atoi(version.as_bytes()).unwrap()
+}
+
 pub fn installed() -> Vec<(u8, String)> {
     let mut installed: Vec<(u8, String)> = Vec::new();
 
@@ -72,20 +84,7 @@ pub fn find_local() -> Option<(u8, String, String)> {
             .stderr;
 
         if let Ok(version) = String::from_utf8(version) {
-            let version = version
-                .lines()
-                .next()
-                .unwrap()
-                .split_whitespace()
-                .nth(2)
-                .unwrap()
-                .replace("\"", "")
-                .replace("1.8", "8")
-                .split('.')
-                .next()
-                .unwrap()
-                .parse()
-                .unwrap();
+            let version = parse_version_stderr(&version);
 
             return Some((version, binary, java_home));
         }
@@ -103,20 +102,7 @@ pub fn find_local() -> Option<(u8, String, String)> {
                 .stderr;
 
             if let Ok(version) = String::from_utf8(version) {
-                let version = version
-                    .lines()
-                    .next()
-                    .unwrap()
-                    .split_whitespace()
-                    .nth(2)
-                    .unwrap()
-                    .replace("\"", "")
-                    .replace("1.8", "8")
-                    .split('.')
-                    .next()
-                    .unwrap()
-                    .parse()
-                    .unwrap();
+                let version = parse_version_stderr(&version);
 
                 return Some((version, binary, "".to_string()));
             }

src/java.rs

@@ -104,8 +104,7 @@ pub async fn install(directory: &str, version: &Version) {
     std::fs::remove_file(Path::new(directory).join("modrinth.index.json")).unwrap_or_default();
 
     if let Ok(files) = std::fs::read_dir(Path::new(directory).join("overrides")) {
-        for file in files {
-            let file = file.unwrap();
+        for file in files.flatten() {
             let file_path = file.path();
             let new_path =
                 Path::new(directory).join(file_path.file_name().unwrap().to_str().unwrap());
@@ -137,7 +136,7 @@ pub async fn install(directory: &str, version: &Version) {
     let terminal_width = term_size::dimensions().unwrap().0 as usize;
     for files in index.files.chunks(10) {
         let progress = Arc::new(Mutex::new(ProgressBar::with_capacity(10)));
-        let mut handles = vec![];
+        let mut handles = Vec::new();
 
         for file in files {
             if file