🐛 fix: mc launch args

Signed-off-by: Pauline <git@ethanlibs.co>
This commit is contained in:
Pauline 2024-09-22 09:28:09 +02:00
parent 81339aa77f
commit 6e9d36989d
No known key found for this signature in database
GPG key ID: 722BB181973296AE
5 changed files with 282 additions and 310 deletions

View file

@ -63,3 +63,5 @@
- [ ] drag and drop files into the launcher window (mods and modpack files) - [ ] drag and drop files into the launcher window (mods and modpack files)
- [ ] <https://github.com/gorilla-devs/GDLauncher-Carbon> and <https://github.com/gorilla-devs/libium> - [ ] <https://github.com/gorilla-devs/GDLauncher-Carbon> and <https://github.com/gorilla-devs/libium>
- [ ] <https://github.com/gorilla-devs/furse> and <https://github.com/gorilla-devs/ferinth> - [ ] <https://github.com/gorilla-devs/furse> and <https://github.com/gorilla-devs/ferinth>
- [ ] add `minecraft.modpack.name` jvm arg based on installed modpack in `run_credentials`
- [ ] backwards compatibility from <https://github.com/PrismLauncher/PrismLauncher/blob/develop/libraries/launcher/org/prismlauncher/SystemProperties.java>

View file

@ -45,11 +45,11 @@
"@solidjs/testing-library": "^0.8.9", "@solidjs/testing-library": "^0.8.9",
"@tauri-apps/cli": "=2.0.0-rc.16", "@tauri-apps/cli": "=2.0.0-rc.16",
"@testing-library/jest-dom": "^6.5.0", "@testing-library/jest-dom": "^6.5.0",
"jsdom": "^25.0.0", "jsdom": "^25.0.1",
"rollup-plugin-visualizer": "^5.12.0", "rollup-plugin-visualizer": "^5.12.0",
"sass": "^1.79.1", "sass": "^1.79.3",
"unocss": "^0.62.4", "unocss": "^0.62.4",
"vite": "^5.4.6", "vite": "^5.4.7",
"vite-plugin-solid": "^2.10.2", "vite-plugin-solid": "^2.10.2",
"vite-plugin-solid-svg": "^0.8.1", "vite-plugin-solid-svg": "^0.8.1",
"vite-tsconfig-paths": "^5.0.1" "vite-tsconfig-paths": "^5.0.1"

View file

@ -4,7 +4,7 @@
"version": "1.0.0-alpha.1", "version": "1.0.0-alpha.1",
"private": true, "private": true,
"engineStrict": true, "engineStrict": true,
"packageManager": "pnpm@9.10.0", "packageManager": "pnpm@9.11.0",
"description": "Next-generation open source Minecraft launcher and tools for interacting with Polyfrost", "description": "Next-generation open source Minecraft launcher and tools for interacting with Polyfrost",
"license": "GPL-3.0-only", "license": "GPL-3.0-only",
"homepage": "https://polyfrost.org", "homepage": "https://polyfrost.org",
@ -62,7 +62,7 @@
"@unocss/eslint-plugin": "^0.62.4", "@unocss/eslint-plugin": "^0.62.4",
"@vitest/ui": "^2.1.1", "@vitest/ui": "^2.1.1",
"bumpp": "^9.5.2", "bumpp": "^9.5.2",
"eslint": "^9.10.0", "eslint": "^9.11.0",
"eslint-plugin-solid": "^0.14.3", "eslint-plugin-solid": "^0.14.3",
"jiti": "^1.21.6", "jiti": "^1.21.6",
"prisma": "^5.19.1", "prisma": "^5.19.1",
@ -70,7 +70,7 @@
"ts-node": "^10.9.2", "ts-node": "^10.9.2",
"tsx": "^4.19.1", "tsx": "^4.19.1",
"typescript": "^5.6.2", "typescript": "^5.6.2",
"vite": "^5.4.6", "vite": "^5.4.7",
"vitest": "^2.1.1" "vitest": "^2.1.1"
} }
} }

View file

@ -204,7 +204,7 @@ fn parse_minecraft_argument(
.replace("${auth_access_token}", access_token) .replace("${auth_access_token}", access_token)
.replace("${auth_session}", access_token) .replace("${auth_session}", access_token)
.replace("${auth_player_name}", username) .replace("${auth_player_name}", username)
.replace("${auth_xuid}", "10") .replace("${auth_xuid}", "0") // TODO: add auth xuid
.replace("${auth_uuid}", &uuid.simple().to_string()) .replace("${auth_uuid}", &uuid.simple().to_string())
.replace("${uuid}", &uuid.simple().to_string()) .replace("${uuid}", &uuid.simple().to_string())
.replace("${clientid}", crate::constants::MICROSOFT_CLIENT_ID) .replace("${clientid}", crate::constants::MICROSOFT_CLIENT_ID)
@ -248,7 +248,7 @@ fn parse_java_argument(
"${library_directory}", "${library_directory}",
&onelauncher_utils::io::canonicalize(libraries_path)?.to_string_lossy(), &onelauncher_utils::io::canonicalize(libraries_path)?.to_string_lossy(),
) )
.replace("${classpath_seperator}", classpath_separator(java_arch)) .replace("${classpath_separator}", classpath_separator(java_arch))
.replace("${launcher_name}", crate::constants::NAME) .replace("${launcher_name}", crate::constants::NAME)
.replace("${launcher_version}", crate::constants::VERSION) .replace("${launcher_version}", crate::constants::VERSION)
.replace("${version_name}", version) .replace("${version_name}", version)

574
pnpm-lock.yaml generated

File diff suppressed because it is too large Load diff