Bump version + fix neoforge 1.20.2+ (#863)

This commit is contained in:
Geometrically
2023-11-08 16:07:53 -07:00
committed by GitHub
parent f5c7f90d19
commit a17e096d94
8 changed files with 26 additions and 18 deletions

View File

@@ -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)

View File

@@ -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>>(