You've already forked AstralRinth
forked from didirus/AstralRinth
Bump version + fix neoforge 1.20.2+ (#863)
This commit is contained in:
6
Cargo.lock
generated
6
Cargo.lock
generated
@@ -4685,7 +4685,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "theseus"
|
name = "theseus"
|
||||||
version = "0.6.0"
|
version = "0.6.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"async-recursion",
|
"async-recursion",
|
||||||
"async-tungstenite",
|
"async-tungstenite",
|
||||||
@@ -4733,7 +4733,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "theseus_cli"
|
name = "theseus_cli"
|
||||||
version = "0.6.0"
|
version = "0.6.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"argh",
|
"argh",
|
||||||
"color-eyre",
|
"color-eyre",
|
||||||
@@ -4760,7 +4760,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "theseus_gui"
|
name = "theseus_gui"
|
||||||
version = "0.6.0"
|
version = "0.6.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"chrono",
|
"chrono",
|
||||||
"cocoa",
|
"cocoa",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "theseus"
|
name = "theseus"
|
||||||
version = "0.6.0"
|
version = "0.6.1"
|
||||||
authors = ["Jai A <jaiagr+gpg@pm.me>"]
|
authors = ["Jai A <jaiagr+gpg@pm.me>"]
|
||||||
edition = "2018"
|
edition = "2018"
|
||||||
|
|
||||||
|
|||||||
@@ -1034,13 +1034,17 @@ fn sanitize_loader_version_string(s: &str, loader: PackDependency) -> &str {
|
|||||||
// If one, take the first
|
// If one, take the first
|
||||||
// If none, take the whole thing
|
// If none, take the whole thing
|
||||||
PackDependency::Forge | PackDependency::NeoForge => {
|
PackDependency::Forge | PackDependency::NeoForge => {
|
||||||
let mut split: std::str::Split<'_, char> = s.split('-');
|
if s.starts_with("1.") {
|
||||||
match split.next() {
|
let mut split: std::str::Split<'_, char> = s.split('-');
|
||||||
Some(first) => match split.next() {
|
match split.next() {
|
||||||
Some(second) => second,
|
Some(first) => match split.next() {
|
||||||
None => first,
|
Some(second) => second,
|
||||||
},
|
None => first,
|
||||||
None => s,
|
},
|
||||||
|
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)
|
// For quilt, etc we take the whole thing, as it functions like: 0.20.0-beta.11 (and should not be split here)
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ use daedalus::{
|
|||||||
modded::SidedDataEntry,
|
modded::SidedDataEntry,
|
||||||
};
|
};
|
||||||
use dunce::canonicalize;
|
use dunce::canonicalize;
|
||||||
|
use std::collections::HashSet;
|
||||||
use std::io::{BufRead, BufReader};
|
use std::io::{BufRead, BufReader};
|
||||||
use std::{collections::HashMap, path::Path};
|
use std::{collections::HashMap, path::Path};
|
||||||
use uuid::Uuid;
|
use uuid::Uuid;
|
||||||
@@ -40,9 +41,9 @@ pub fn get_class_paths(
|
|||||||
|
|
||||||
Some(get_lib_path(libraries_path, &library.name, false))
|
Some(get_lib_path(libraries_path, &library.name, false))
|
||||||
})
|
})
|
||||||
.collect::<Result<Vec<_>, _>>()?;
|
.collect::<Result<HashSet<_>, _>>()?;
|
||||||
|
|
||||||
cps.push(
|
cps.insert(
|
||||||
canonicalize(client_path)
|
canonicalize(client_path)
|
||||||
.map_err(|_| {
|
.map_err(|_| {
|
||||||
crate::ErrorKind::LauncherError(format!(
|
crate::ErrorKind::LauncherError(format!(
|
||||||
@@ -55,7 +56,10 @@ pub fn get_class_paths(
|
|||||||
.to_string(),
|
.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>>(
|
pub fn get_class_paths_jar<T: AsRef<str>>(
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "theseus_cli"
|
name = "theseus_cli"
|
||||||
version = "0.6.0"
|
version = "0.6.1"
|
||||||
authors = ["Jai A <jaiagr+gpg@pm.me>"]
|
authors = ["Jai A <jaiagr+gpg@pm.me>"]
|
||||||
edition = "2018"
|
edition = "2018"
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "theseus_gui",
|
"name": "theseus_gui",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "0.6.0",
|
"version": "0.6.1",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite",
|
"dev": "vite",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "theseus_gui"
|
name = "theseus_gui"
|
||||||
version = "0.6.0"
|
version = "0.6.1"
|
||||||
description = "A Tauri App"
|
description = "A Tauri App"
|
||||||
authors = ["you"]
|
authors = ["you"]
|
||||||
license = ""
|
license = ""
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
},
|
},
|
||||||
"package": {
|
"package": {
|
||||||
"productName": "Modrinth App",
|
"productName": "Modrinth App",
|
||||||
"version": "0.6.0"
|
"version": "0.6.1"
|
||||||
},
|
},
|
||||||
"tauri": {
|
"tauri": {
|
||||||
"allowlist": {
|
"allowlist": {
|
||||||
|
|||||||
Reference in New Issue
Block a user