Merge branch 'modrinth:master' into master

DIDIRUS4 · Nov 9, 2023 · 160062a · 160062a
2 parents 7e601c7 + a17e096
commit 160062a
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 18 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/theseus/Cargo.toml b/theseus/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "theseus"
-version = "0.6.0"
+version = "0.6.1"
 authors = ["Jai A <jaiagr+gpg@pm.me>"]
 edition = "2018"
 

diff --git a/theseus/src/api/profile/mod.rs b/theseus/src/api/profile/mod.rs
@@ -1034,13 +1034,17 @@ fn sanitize_loader_version_string(s: &str, loader: PackDependency) -> &str {
         // If one, take the first
         // If none, take the whole thing
         PackDependency::Forge | PackDependency::NeoForge => {
-            let mut split: std::str::Split<'_, char> = s.split('-');
-            match split.next() {
-                Some(first) => match split.next() {
-                    Some(second) => second,
-                    None => first,
-                },
-                None => s,
+            if s.starts_with("1.") {
+                let mut split: std::str::Split<'_, char> = s.split('-');
+                match split.next() {
+                    Some(first) => match split.next() {
+                        Some(second) => second,
+                        None => first,
+                    },
+                    None => s,
+                }
+            } else {
+                s
             }
         }
         // For quilt, etc we take the whole thing, as it functions like: 0.20.0-beta.11 (and should not be split here)

diff --git a/theseus/src/launcher/args.rs b/theseus/src/launcher/args.rs
@@ -11,6 +11,7 @@ use daedalus::{
     modded::SidedDataEntry,
 };
 use dunce::canonicalize;
+use std::collections::HashSet;
 use std::io::{BufRead, BufReader};
 use std::{collections::HashMap, path::Path};
 use uuid::Uuid;
@@ -40,9 +41,9 @@ pub fn get_class_paths(
 
             Some(get_lib_path(libraries_path, &library.name, false))
         })
-        .collect::<Result<Vec<_>, _>>()?;
+        .collect::<Result<HashSet<_>, _>>()?;
 
-    cps.push(
+    cps.insert(
         canonicalize(client_path)
             .map_err(|_| {
                 crate::ErrorKind::LauncherError(format!(
@@ -55,7 +56,10 @@ pub fn get_class_paths(
             .to_string(),
     );
 
-    Ok(cps.join(classpath_separator(java_arch)))
+    Ok(cps
+        .into_iter()
+        .collect::<Vec<_>>()
+        .join(classpath_separator(java_arch)))
 }
 
 pub fn get_class_paths_jar<T: AsRef<str>>(

diff --git a/theseus_cli/Cargo.toml b/theseus_cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "theseus_cli"
-version = "0.6.0"
+version = "0.6.1"
 authors = ["Jai A <jaiagr+gpg@pm.me>"]
 edition = "2018"
 

diff --git a/theseus_gui/package.json b/theseus_gui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "theseus_gui",
   "private": true,
-  "version": "0.6.0",
+  "version": "0.6.1",
   "type": "module",
   "scripts": {
     "dev": "vite",

diff --git a/theseus_gui/src-tauri/Cargo.toml b/theseus_gui/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "theseus_gui"
-version = "0.6.0"
+version = "0.6.1"
 description = "A Tauri App"
 authors = ["you"]
 license = ""

diff --git a/theseus_gui/src-tauri/tauri.conf.json b/theseus_gui/src-tauri/tauri.conf.json
@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "Modrinth App",
-    "version": "0.6.0"
+    "version": "0.6.1"
   },
   "tauri": {
     "allowlist": {