Bump Theseus Version (#818)

* push to test on windows

* Fix windows sup

* Fix macos

* Fix back

* new resolver for windows testing

* Custom macos handling for some versions

* Fix 1.13+ broken

* fix arg parsing mac

* small winblows fix

* remove debug info; set meta url

* run lint + fix clippy

* Remove useless commnet
This commit is contained in:
Geometrically
2023-10-21 13:08:47 -07:00
committed by GitHub
parent 7fb8850071
commit afaec4b1bf
27 changed files with 189 additions and 97 deletions

View File

@@ -1,6 +1,6 @@
//! Minecraft CLI argument logic
// TODO: Rafactor this section
use super::{auth::Credentials, parse_rule};
use super::auth::Credentials;
use crate::launcher::parse_rules;
use crate::{
state::{MemorySettings, WindowSize},
util::{io::IOError, platform::classpath_separator},
@@ -23,12 +23,13 @@ pub fn get_class_paths(
libraries: &[Library],
client_path: &Path,
java_arch: &str,
minecraft_updated: bool,
) -> crate::Result<String> {
let mut cps = libraries
.iter()
.filter_map(|library| {
if let Some(rules) = &library.rules {
if !rules.iter().any(|x| parse_rule(x, java_arch)) {
if !parse_rules(rules, java_arch, minecraft_updated) {
return None;
}
}
@@ -335,7 +336,7 @@ where
}
}
Argument::Ruled { rules, value } => {
if rules.iter().any(|x| parse_rule(x, java_arch)) {
if parse_rules(rules, java_arch, true) {
match value {
ArgumentValue::Single(arg) => {
parsed_arguments.push(parse_function(