Felitendo/Modrinth-Enhanced
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

build: rebase patches onto v0.21.2

Browse Source
This commit is contained in:
Felitendo committed 2026-09-15 14:52:50 +02:00
1 parent dba5d2906d
commit 344d50e1f6
15 files changed
+89 -76
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

patches/0001-Rename-the-app-to-Modrinth-Enhanced.patch
+3 -3
View File
@@ -36,7 +36,7 @@ index 50867a4..6367788 100644
<link rel="stylesheet" href="/src/assets/stylesheets/global.scss" /> <link rel="stylesheet" href="/src/assets/stylesheets/global.scss" />
</head> </head>
diff --git a/apps/app-frontend/src/components/ui/modal/AppSettingsModal.vue b/apps/app-frontend/src/components/ui/modal/AppSettingsModal.vue diff --git a/apps/app-frontend/src/components/ui/modal/AppSettingsModal.vue b/apps/app-frontend/src/components/ui/modal/AppSettingsModal.vue
index dd55fe5..0f33d0e 100644 index 5f863d5..32a86a3 100644
--- a/apps/app-frontend/src/components/ui/modal/AppSettingsModal.vue --- a/apps/app-frontend/src/components/ui/modal/AppSettingsModal.vue
+++ b/apps/app-frontend/src/components/ui/modal/AppSettingsModal.vue +++ b/apps/app-frontend/src/components/ui/modal/AppSettingsModal.vue
@@ -312,7 +312,7 @@ const messages = defineMessages({ @@ -312,7 +312,7 @@ const messages = defineMessages({
@@ -49,10 +49,10 @@ index dd55fe5..0f33d0e 100644
macos: { macos: {
id: 'app.settings.operating-system.macos', id: 'app.settings.operating-system.macos',
diff --git a/apps/app-frontend/src/locales/en-US/index.json b/apps/app-frontend/src/locales/en-US/index.json diff --git a/apps/app-frontend/src/locales/en-US/index.json b/apps/app-frontend/src/locales/en-US/index.json
index cc65180..faab078 100644 index e81abe7..ba08ca7 100644
--- a/apps/app-frontend/src/locales/en-US/index.json --- a/apps/app-frontend/src/locales/en-US/index.json
+++ b/apps/app-frontend/src/locales/en-US/index.json +++ b/apps/app-frontend/src/locales/en-US/index.json
@@ -1548,7 +1548,7 @@ @@ -1626,7 +1626,7 @@
"message": "Oldest" "message": "Oldest"
}, },
"app.settings.app-version": { "app.settings.app-version": {
patches/0002-Remove-advertising-and-Modrinth-upsells.patch
+1 -1
View File
@@ -27,7 +27,7 @@ ads and these prompts were shown, and nothing more.
2 files changed, 29 insertions(+), 91 deletions(-) 2 files changed, 29 insertions(+), 91 deletions(-)
diff --git a/apps/app-frontend/src/App.vue b/apps/app-frontend/src/App.vue diff --git a/apps/app-frontend/src/App.vue b/apps/app-frontend/src/App.vue
index a2ae0e6..6e7b27d 100644 index 5faea7c..447f636 100644
--- a/apps/app-frontend/src/App.vue --- a/apps/app-frontend/src/App.vue
+++ b/apps/app-frontend/src/App.vue +++ b/apps/app-frontend/src/App.vue
@@ -9,7 +9,6 @@ import { @@ -9,7 +9,6 @@ import {
patches/0003-Remove-telemetry.patch
+6 -6
View File
@@ -302,10 +302,10 @@ index bb20aa9..46a9749 100644
+ void router + void router
} }
diff --git a/apps/app-frontend/src/locales/en-US/index.json b/apps/app-frontend/src/locales/en-US/index.json diff --git a/apps/app-frontend/src/locales/en-US/index.json b/apps/app-frontend/src/locales/en-US/index.json
index faab078..233cac2 100644 index ba08ca7..28d0366 100644
--- a/apps/app-frontend/src/locales/en-US/index.json --- a/apps/app-frontend/src/locales/en-US/index.json
+++ b/apps/app-frontend/src/locales/en-US/index.json +++ b/apps/app-frontend/src/locales/en-US/index.json
@@ -2667,7 +2667,7 @@ @@ -2745,7 +2745,7 @@
"message": "Discord Rich Presence" "message": "Discord Rich Presence"
}, },
"app.settings.privacy.telemetry.description": { "app.settings.privacy.telemetry.description": {
@@ -335,7 +335,7 @@ index e69e6b7..e5bbabe 100644
} }
} }
diff --git a/packages/app-lib/src/api/instance/run.rs b/packages/app-lib/src/api/instance/run.rs diff --git a/packages/app-lib/src/api/instance/run.rs b/packages/app-lib/src/api/instance/run.rs
index 25626c1..d638128 100644 index 415af27..4e46190 100644
--- a/packages/app-lib/src/api/instance/run.rs --- a/packages/app-lib/src/api/instance/run.rs
+++ b/packages/app-lib/src/api/instance/run.rs +++ b/packages/app-lib/src/api/instance/run.rs
@@ -4,13 +4,10 @@ use crate::state::{ @@ -4,13 +4,10 @@ use crate::state::{
@@ -352,7 +352,7 @@ index 25626c1..d638128 100644
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub enum QuickPlayType { pub enum QuickPlayType {
@@ -232,54 +229,10 @@ async fn run_credentials( @@ -242,54 +239,10 @@ async fn run_credentials(
mc_set_options.push(("fullscreen".to_string(), "true".to_string())); mc_set_options.push(("fullscreen".to_string(), "true".to_string()));
} }
@@ -411,7 +411,7 @@ index 25626c1..d638128 100644
crate::minecraft_skins::flush_pending_skin_change().await?; crate::minecraft_skins::flush_pending_skin_change().await?;
crate::launcher::launch_minecraft( crate::launcher::launch_minecraft(
@@ -297,21 +250,6 @@ async fn run_credentials( @@ -307,21 +260,6 @@ async fn run_credentials(
.await .await
} }
@@ -433,7 +433,7 @@ index 25626c1..d638128 100644
pub async fn kill(instance_id: &str) -> crate::Result<()> { pub async fn kill(instance_id: &str) -> crate::Result<()> {
let state = State::get().await?; let state = State::get().await?;
let processes = let processes =
@@ -373,13 +311,12 @@ pub async fn try_update_playtime_by_instance_id( @@ -383,13 +321,12 @@ pub async fn try_update_playtime_by_instance_id(
} }
} }
patches/0004-Add-offline-accounts.patch
+7 -7
View File
@@ -51,10 +51,10 @@ which offered Microsoft and nothing else:
create mode 100644 apps/app-frontend/src/components/ui/OfflineAccountModal.vue create mode 100644 apps/app-frontend/src/components/ui/OfflineAccountModal.vue
diff --git a/Cargo.lock b/Cargo.lock diff --git a/Cargo.lock b/Cargo.lock
index d40a959..95bc842 100644 index bdc7307..9006b00 100644
--- a/Cargo.lock --- a/Cargo.lock
+++ b/Cargo.lock +++ b/Cargo.lock
@@ -11384,6 +11384,7 @@ dependencies = [ @@ -11534,6 +11534,7 @@ dependencies = [
"indicatif", "indicatif",
"itertools 0.14.0", "itertools 0.14.0",
"json5", "json5",
@@ -63,7 +63,7 @@ index d40a959..95bc842 100644
"notify", "notify",
"notify-debouncer-mini", "notify-debouncer-mini",
diff --git a/Cargo.toml b/Cargo.toml diff --git a/Cargo.toml b/Cargo.toml
index a4a779c..a85f576 100644 index b8b227e..8348c8d 100644
--- a/Cargo.toml --- a/Cargo.toml
+++ b/Cargo.toml +++ b/Cargo.toml
@@ -132,6 +132,7 @@ lz4_flex = { version = "0.11.5", default-features = false, features = [ @@ -132,6 +132,7 @@ lz4_flex = { version = "0.11.5", default-features = false, features = [
@@ -75,7 +75,7 @@ index a4a779c..a85f576 100644
modrinth-log = { path = "packages/modrinth-log" } modrinth-log = { path = "packages/modrinth-log" }
modrinth-util = { path = "packages/modrinth-util" } modrinth-util = { path = "packages/modrinth-util" }
diff --git a/apps/app-frontend/src/App.vue b/apps/app-frontend/src/App.vue diff --git a/apps/app-frontend/src/App.vue b/apps/app-frontend/src/App.vue
index 6e7b27d..e5c6fd4 100644 index 447f636..d750a5f 100644
--- a/apps/app-frontend/src/App.vue --- a/apps/app-frontend/src/App.vue
+++ b/apps/app-frontend/src/App.vue +++ b/apps/app-frontend/src/App.vue
@@ -2467,15 +2467,17 @@ provideAppUpdateDownloadProgress(appUpdateDownload) @@ -2467,15 +2467,17 @@ provideAppUpdateDownloadProgress(appUpdateDownload)
@@ -439,7 +439,7 @@ index 94bd13e..cb7319a 100644
* Retrieves the default user * Retrieves the default user
* @return {Promise<UUID | undefined>} * @return {Promise<UUID | undefined>}
diff --git a/apps/app/build.rs b/apps/app/build.rs diff --git a/apps/app/build.rs b/apps/app/build.rs
index c4becf9..f8de273 100644 index 926cab4..68a02aa 100644
--- a/apps/app/build.rs --- a/apps/app/build.rs
+++ b/apps/app/build.rs +++ b/apps/app/build.rs
@@ -14,6 +14,7 @@ fn main() { @@ -14,6 +14,7 @@ fn main() {
@@ -476,10 +476,10 @@ index 8227d94..f4eded6 100644
pub async fn remove_user(user: uuid::Uuid) -> Result<()> { pub async fn remove_user(user: uuid::Uuid) -> Result<()> {
Ok(minecraft_auth::remove_user(user).await?) Ok(minecraft_auth::remove_user(user).await?)
diff --git a/packages/app-lib/Cargo.toml b/packages/app-lib/Cargo.toml diff --git a/packages/app-lib/Cargo.toml b/packages/app-lib/Cargo.toml
index 69545c2..7da46c9 100644 index 15a1dc9..4fe7643 100644
--- a/packages/app-lib/Cargo.toml --- a/packages/app-lib/Cargo.toml
+++ b/packages/app-lib/Cargo.toml +++ b/packages/app-lib/Cargo.toml
@@ -48,6 +48,7 @@ image = { workspace = true, features = ["gif", "jpeg", "png", "webp"] } @@ -52,6 +52,7 @@ image = { workspace = true, features = ["gif", "jpeg", "png", "webp"] }
indicatif = { workspace = true, optional = true } indicatif = { workspace = true, optional = true }
itertools = { workspace = true } itertools = { workspace = true }
json5 = { workspace = true } json5 = { workspace = true }
patches/0005-Make-the-sidebars-foldable.patch
+1 -1
View File
@@ -37,7 +37,7 @@ bar button - so nothing there promises anything.
4 files changed, 172 insertions(+), 15 deletions(-) 4 files changed, 172 insertions(+), 15 deletions(-)
diff --git a/apps/app-frontend/src/App.vue b/apps/app-frontend/src/App.vue diff --git a/apps/app-frontend/src/App.vue b/apps/app-frontend/src/App.vue
index e5c6fd4..2f6cdce 100644 index d750a5f..ac8308c 100644
--- a/apps/app-frontend/src/App.vue --- a/apps/app-frontend/src/App.vue
+++ b/apps/app-frontend/src/App.vue +++ b/apps/app-frontend/src/App.vue
@@ -10,6 +10,8 @@ import { @@ -10,6 +10,8 @@ import {
patches/0006-Add-Ely.by-accounts.patch
+5 -5
View File
@@ -402,7 +402,7 @@ index cb7319a..57580ff 100644
* Retrieves the default user * Retrieves the default user
* @return {Promise<UUID | undefined>} * @return {Promise<UUID | undefined>}
diff --git a/apps/app/build.rs b/apps/app/build.rs diff --git a/apps/app/build.rs b/apps/app/build.rs
index f8de273..1fdb8e1 100644 index 68a02aa..0f62dd8 100644
--- a/apps/app/build.rs --- a/apps/app/build.rs
+++ b/apps/app/build.rs +++ b/apps/app/build.rs
@@ -15,6 +15,7 @@ fn main() { @@ -15,6 +15,7 @@ fn main() {
@@ -487,10 +487,10 @@ index a7fac4a..2d18da3 100644
pub async fn get_default_user() -> crate::Result<Option<uuid::Uuid>> { pub async fn get_default_user() -> crate::Result<Option<uuid::Uuid>> {
let state = State::get().await?; let state = State::get().await?;
diff --git a/packages/app-lib/src/launcher/mod.rs b/packages/app-lib/src/launcher/mod.rs diff --git a/packages/app-lib/src/launcher/mod.rs b/packages/app-lib/src/launcher/mod.rs
index b482547..660f63b 100644 index 7910694..e623cab 100644
--- a/packages/app-lib/src/launcher/mod.rs --- a/packages/app-lib/src/launcher/mod.rs
+++ b/packages/app-lib/src/launcher/mod.rs +++ b/packages/app-lib/src/launcher/mod.rs
@@ -1056,6 +1056,22 @@ pub async fn launch_minecraft( @@ -1059,6 +1059,22 @@ pub async fn launch_minecraft(
command.arg("--add-opens=jdk.internal/jdk.internal.misc=ALL-UNNAMED"); command.arg("--add-opens=jdk.internal/jdk.internal.misc=ALL-UNNAMED");
} }
@@ -842,12 +842,12 @@ index 0000000..dc099f9
+ Ok(jar) + Ok(jar)
+} +}
diff --git a/packages/app-lib/src/util/mod.rs b/packages/app-lib/src/util/mod.rs diff --git a/packages/app-lib/src/util/mod.rs b/packages/app-lib/src/util/mod.rs
index 7656b4a..d0e4d5d 100644 index 1962d6c..395d7f1 100644
--- a/packages/app-lib/src/util/mod.rs --- a/packages/app-lib/src/util/mod.rs
+++ b/packages/app-lib/src/util/mod.rs +++ b/packages/app-lib/src/util/mod.rs
@@ -1,4 +1,5 @@ @@ -1,4 +1,5 @@
//! Theseus utility functions //! Theseus utility functions
+pub mod authlib_injector; +pub mod authlib_injector;
pub(crate) mod content_hash;
pub mod fetch; pub mod fetch;
pub mod io; pub mod io;
pub mod jre;
patches/0007-Sign-in-to-Microsoft-in-the-player-s-own-browser.patch
+1 -1
View File
@@ -405,7 +405,7 @@ index 57580ff..c25af95 100644
* Adds an offline account with the given username and makes it the active one. * Adds an offline account with the given username and makes it the active one.
* *
diff --git a/apps/app/build.rs b/apps/app/build.rs diff --git a/apps/app/build.rs b/apps/app/build.rs
index 1fdb8e1..5c797ab 100644 index 0f62dd8..8562a68 100644
--- a/apps/app/build.rs --- a/apps/app/build.rs
+++ b/apps/app/build.rs +++ b/apps/app/build.rs
@@ -14,6 +14,8 @@ fn main() { @@ -14,6 +14,8 @@ fn main() {
patches/0008-Round-the-window-corners-on-Linux.patch
+1 -1
View File
@@ -11,7 +11,7 @@ Subject: [PATCH] Round the window corners on Linux
4 files changed, 53 insertions(+), 1 deletion(-) 4 files changed, 53 insertions(+), 1 deletion(-)
diff --git a/apps/app-frontend/src/App.vue b/apps/app-frontend/src/App.vue diff --git a/apps/app-frontend/src/App.vue b/apps/app-frontend/src/App.vue
index 2f6cdce..9412821 100644 index ac8308c..d681a14 100644
--- a/apps/app-frontend/src/App.vue --- a/apps/app-frontend/src/App.vue
+++ b/apps/app-frontend/src/App.vue +++ b/apps/app-frontend/src/App.vue
@@ -540,6 +540,16 @@ watch([os, isFullscreen], ([osName, fullscreen]) => { @@ -540,6 +540,16 @@ watch([os, isFullscreen], ([osName, fullscreen]) => {
patches/0009-Scroll-with-the-middle-mouse-button.patch
+1 -1
View File
@@ -11,7 +11,7 @@ Subject: [PATCH] Scroll with the middle mouse button
create mode 100644 apps/app-frontend/src/helpers/autoscroll.ts create mode 100644 apps/app-frontend/src/helpers/autoscroll.ts
diff --git a/apps/app-frontend/src/App.vue b/apps/app-frontend/src/App.vue diff --git a/apps/app-frontend/src/App.vue b/apps/app-frontend/src/App.vue
index 9412821..9f7f5e0 100644 index d681a14..2102c4c 100644
--- a/apps/app-frontend/src/App.vue --- a/apps/app-frontend/src/App.vue
+++ b/apps/app-frontend/src/App.vue +++ b/apps/app-frontend/src/App.vue
@@ -124,6 +124,7 @@ import { @@ -124,6 +124,7 @@ import {
patches/0010-Manage-Ely.by-skins-from-the-skin-page.patch
+5 -5
View File
@@ -844,7 +844,7 @@ index 8240b8b..bcd79ec 100644
<div v-if="!currentUser" class="sticky w-full bottom-0 z-20 p-4 pt-0"> <div v-if="!currentUser" class="sticky w-full bottom-0 z-20 p-4 pt-0">
<div <div
diff --git a/apps/app/build.rs b/apps/app/build.rs diff --git a/apps/app/build.rs b/apps/app/build.rs
index 5c797ab..bedd28f 100644 index 8562a68..297f383 100644
--- a/apps/app/build.rs --- a/apps/app/build.rs
+++ b/apps/app/build.rs +++ b/apps/app/build.rs
@@ -27,6 +27,23 @@ fn main() { @@ -27,6 +27,23 @@ fn main() {
@@ -872,10 +872,10 @@ index 5c797ab..bedd28f 100644
"cache", "cache",
InlinedPlugin::new() InlinedPlugin::new()
diff --git a/apps/app/capabilities/plugins.json b/apps/app/capabilities/plugins.json diff --git a/apps/app/capabilities/plugins.json b/apps/app/capabilities/plugins.json
index 65d1441..15efb0c 100644 index b08053e..1492b97 100644
--- a/apps/app/capabilities/plugins.json --- a/apps/app/capabilities/plugins.json
+++ b/apps/app/capabilities/plugins.json +++ b/apps/app/capabilities/plugins.json
@@ -111,6 +111,7 @@ @@ -104,6 +104,7 @@
"utils:default", "utils:default",
"ads:default", "ads:default",
"friends:default", "friends:default",
@@ -1271,10 +1271,10 @@ index 693bc86..15a5c1e 100644
pub mod install; pub mod install;
pub mod instance; pub mod instance;
diff --git a/apps/app/src/main.rs b/apps/app/src/main.rs diff --git a/apps/app/src/main.rs b/apps/app/src/main.rs
index f702b95..098daa6 100644 index 352b181..5e582b5 100644
--- a/apps/app/src/main.rs --- a/apps/app/src/main.rs
+++ b/apps/app/src/main.rs +++ b/apps/app/src/main.rs
@@ -248,6 +248,7 @@ fn main() { @@ -250,6 +250,7 @@ fn main() {
builder = builder builder = builder
.plugin(api::auth::init()) .plugin(api::auth::init())
patches/0011-Show-every-player-s-skin-on-offline-servers.patch
+32 -19
View File
@@ -37,9 +37,10 @@ The agent code comes from Noctrinth (https://github.com/Everelsu/Noctrinth).
.../SessionServiceTransformer.java | 258 +++++++ .../SessionServiceTransformer.java | 258 +++++++
packages/app-lib/src/launcher/args.rs | 35 +- packages/app-lib/src/launcher/args.rs | 35 +-
packages/app-lib/src/launcher/mod.rs | 23 + packages/app-lib/src/launcher/mod.rs | 23 +
packages/app-lib/src/state/dirs.rs | 9 + packages/app-lib/src/state/dirs.rs | 8 +
.../src/state/dirs/move_app_directory.rs | 3 +-
packages/app-lib/src/state/settings.rs | 1 + packages/app-lib/src/state/settings.rs | 1 +
19 files changed, 2253 insertions(+), 1 deletion(-) 20 files changed, 2254 insertions(+), 2 deletions(-)
create mode 100644 packages/app-lib/java/src/main/java/com/modrinth/theseus/agent/skins/Http.java create mode 100644 packages/app-lib/java/src/main/java/com/modrinth/theseus/agent/skins/Http.java
create mode 100644 packages/app-lib/java/src/main/java/com/modrinth/theseus/agent/skins/LocalSource.java create mode 100644 packages/app-lib/java/src/main/java/com/modrinth/theseus/agent/skins/LocalSource.java
create mode 100644 packages/app-lib/java/src/main/java/com/modrinth/theseus/agent/skins/LocalTextures.java create mode 100644 packages/app-lib/java/src/main/java/com/modrinth/theseus/agent/skins/LocalTextures.java
@@ -213,10 +214,10 @@ index f6e99d3..f06e812 100644
export async function showInstanceInFolder(instanceId) { export async function showInstanceInFolder(instanceId) {
const fullPath = await get_full_path(instanceId) const fullPath = await get_full_path(instanceId)
diff --git a/apps/app/build.rs b/apps/app/build.rs diff --git a/apps/app/build.rs b/apps/app/build.rs
index bedd28f..cc3611c 100644 index 297f383..02c30c0 100644
--- a/apps/app/build.rs --- a/apps/app/build.rs
+++ b/apps/app/build.rs +++ b/apps/app/build.rs
@@ -393,6 +393,7 @@ fn main() { @@ -399,6 +399,7 @@ fn main() {
"open_path", "open_path",
"show_launcher_logs_folder", "show_launcher_logs_folder",
"show_app_db_backups_folder", "show_app_db_backups_folder",
@@ -2492,10 +2493,10 @@ index a482f66..76bedc7 100644
if !arg.is_empty() { if !arg.is_empty() {
parsed_arguments.push(arg); parsed_arguments.push(arg);
diff --git a/packages/app-lib/src/launcher/mod.rs b/packages/app-lib/src/launcher/mod.rs diff --git a/packages/app-lib/src/launcher/mod.rs b/packages/app-lib/src/launcher/mod.rs
index 660f63b..b6055bb 100644 index e623cab..e352716 100644
--- a/packages/app-lib/src/launcher/mod.rs --- a/packages/app-lib/src/launcher/mod.rs
+++ b/packages/app-lib/src/launcher/mod.rs +++ b/packages/app-lib/src/launcher/mod.rs
@@ -1015,6 +1015,28 @@ pub async fn launch_minecraft( @@ -1018,6 +1018,28 @@ pub async fn launch_minecraft(
let rpc_server = RpcServerBuilder::new().launch().await?; let rpc_server = RpcServerBuilder::new().launch().await?;
@@ -2524,7 +2525,7 @@ index 660f63b..b6055bb 100644
command.args( command.args(
args::get_jvm_arguments( args::get_jvm_arguments(
args.get(&d::minecraft::ArgumentType::Jvm) args.get(&d::minecraft::ArgumentType::Jvm)
@@ -1041,6 +1063,7 @@ pub async fn launch_minecraft( @@ -1044,6 +1066,7 @@ pub async fn launch_minecraft(
.as_ref() .as_ref()
.and_then(|x| x.get(&LoggingSide::Client)), .and_then(|x| x.get(&LoggingSide::Client)),
rpc_server.address(), rpc_server.address(),
@@ -2533,18 +2534,18 @@ index 660f63b..b6055bb 100644
.into_iter(), .into_iter(),
); );
diff --git a/packages/app-lib/src/state/dirs.rs b/packages/app-lib/src/state/dirs.rs diff --git a/packages/app-lib/src/state/dirs.rs b/packages/app-lib/src/state/dirs.rs
index f3416bb..d1a5246 100644 index b4fb7e2..fe37974 100644
--- a/packages/app-lib/src/state/dirs.rs --- a/packages/app-lib/src/state/dirs.rs
+++ b/packages/app-lib/src/state/dirs.rs +++ b/packages/app-lib/src/state/dirs.rs
@@ -14,6 +14,7 @@ pub const LAUNCHER_LOGS_FOLDER_NAME: &str = "launcher_logs"; @@ -14,6 +14,7 @@ pub const INSTANCES_FOLDER_NAME: &str = "profiles";
pub const INSTANCES_FOLDER_NAME: &str = "profiles";
pub const METADATA_FOLDER_NAME: &str = "meta"; pub const METADATA_FOLDER_NAME: &str = "meta";
pub const SYNCED_OPTIONS_FOLDER_NAME: &str = "synced-options"; pub const SYNCED_OPTIONS_FOLDER_NAME: &str = "synced-options";
pub const STORE_FOLDER_NAME: &str = "store";
+pub const PLAYER_SKINS_FOLDER_NAME: &str = "player_skins"; +pub const PLAYER_SKINS_FOLDER_NAME: &str = "player_skins";
#[derive(Debug)] #[derive(Clone, Debug)]
pub struct DirectoryInfo { pub struct DirectoryInfo {
@@ -160,6 +161,13 @@ impl DirectoryInfo { @@ -176,6 +177,13 @@ impl DirectoryInfo {
self.config_dir.join(SYNCED_OPTIONS_FOLDER_NAME) self.config_dir.join(SYNCED_OPTIONS_FOLDER_NAME)
} }
@@ -2558,14 +2559,26 @@ index f3416bb..d1a5246 100644
/// Gets the logs dir for a given instance path /// Gets the logs dir for a given instance path
#[inline] #[inline]
pub fn instance_logs_dir(&self, instance_path: &str) -> PathBuf { pub fn instance_logs_dir(&self, instance_path: &str) -> PathBuf {
@@ -276,6 +284,7 @@ impl DirectoryInfo { diff --git a/packages/app-lib/src/state/dirs/move_app_directory.rs b/packages/app-lib/src/state/dirs/move_app_directory.rs
INSTANCES_FOLDER_NAME, index 7418675..a25a7fd 100644
METADATA_FOLDER_NAME, --- a/packages/app-lib/src/state/dirs/move_app_directory.rs
SYNCED_OPTIONS_FOLDER_NAME, +++ b/packages/app-lib/src/state/dirs/move_app_directory.rs
+ PLAYER_SKINS_FOLDER_NAME, @@ -11,13 +11,14 @@ use sqlx::SqlitePool;
]; use std::path::{Path, PathBuf};
use tokio::fs;
struct MovePath { -const MOVED_APP_DIRECTORIES: [&str; 6] = [
+const MOVED_APP_DIRECTORIES: [&str; 7] = [
"store",
"profiles",
"meta",
"caches",
"icons",
"synced-options",
+ "player_skins",
];
pub(crate) async fn relocate_tree(from: &Path, to: &Path) -> crate::Result<()> {
if !fs::try_exists(from).await? {
diff --git a/packages/app-lib/src/state/settings.rs b/packages/app-lib/src/state/settings.rs diff --git a/packages/app-lib/src/state/settings.rs b/packages/app-lib/src/state/settings.rs
index 2fd0d87..673dfaa 100644 index 2fd0d87..673dfaa 100644
--- a/packages/app-lib/src/state/settings.rs --- a/packages/app-lib/src/state/settings.rs
patches/0012-Launch-a-running-instance-again-on-another-account.patch
+15 -15
View File
@@ -206,7 +206,7 @@ index 977bf82..c390c4c 100644
+ */ + */
+process_uuid: string, } & ({ "type": "log4j" } & Log4jEvent | { "type": "legacy", message: string, }); +process_uuid: string, } & ({ "type": "log4j" } & Log4jEvent | { "type": "legacy", message: string, });
diff --git a/apps/app-frontend/src/generated/app-events/postcard/index.d.ts b/apps/app-frontend/src/generated/app-events/postcard/index.d.ts diff --git a/apps/app-frontend/src/generated/app-events/postcard/index.d.ts b/apps/app-frontend/src/generated/app-events/postcard/index.d.ts
index 66144c0..42f013a 100644 index e763358..149f9ef 100644
--- a/apps/app-frontend/src/generated/app-events/postcard/index.d.ts --- a/apps/app-frontend/src/generated/app-events/postcard/index.d.ts
+++ b/apps/app-frontend/src/generated/app-events/postcard/index.d.ts +++ b/apps/app-frontend/src/generated/app-events/postcard/index.d.ts
@@ -50,7 +50,7 @@ export type FriendPayload = { tag: "friend_request", value: { from: string } } | @@ -50,7 +50,7 @@ export type FriendPayload = { tag: "friend_request", value: { from: string } } |
@@ -219,7 +219,7 @@ index 66144c0..42f013a 100644
export type Log4jEvent = { timestamp_millis: i64 | undefined, logger_name: string | undefined, level: string | undefined, thread_name: string | undefined, message: string | undefined, throwable: string | undefined } export type Log4jEvent = { timestamp_millis: i64 | undefined, logger_name: string | undefined, level: string | undefined, thread_name: string | undefined, message: string | undefined, throwable: string | undefined }
export type ModLoader = { tag: "vanilla" } | { tag: "forge" } | { tag: "fabric" } | { tag: "quilt" } | { tag: "neoforge" } export type ModLoader = { tag: "vanilla" } | { tag: "forge" } | { tag: "fabric" } | { tag: "quilt" } | { tag: "neoforge" }
diff --git a/apps/app-frontend/src/generated/app-events/postcard/index.js b/apps/app-frontend/src/generated/app-events/postcard/index.js diff --git a/apps/app-frontend/src/generated/app-events/postcard/index.js b/apps/app-frontend/src/generated/app-events/postcard/index.js
index c8816ff..cd56865 100644 index 2407d7d..1b343a0 100644
--- a/apps/app-frontend/src/generated/app-events/postcard/index.js --- a/apps/app-frontend/src/generated/app-events/postcard/index.js
+++ b/apps/app-frontend/src/generated/app-events/postcard/index.js +++ b/apps/app-frontend/src/generated/app-events/postcard/index.js
@@ -475,6 +475,7 @@ function deserialize_LOG_EVENT(d) { @@ -475,6 +475,7 @@ function deserialize_LOG_EVENT(d) {
@@ -440,7 +440,7 @@ index 638386d..3cccc8a 100644
function normalizeInstallProgress(value: unknown): WireObject { function normalizeInstallProgress(value: unknown): WireObject {
diff --git a/apps/app/build.rs b/apps/app/build.rs diff --git a/apps/app/build.rs b/apps/app/build.rs
index cc3611c..382ce22 100644 index 02c30c0..fc78fe1 100644
--- a/apps/app/build.rs --- a/apps/app/build.rs
+++ b/apps/app/build.rs +++ b/apps/app/build.rs
@@ -110,7 +110,9 @@ fn main() { @@ -110,7 +110,9 @@ fn main() {
@@ -520,10 +520,10 @@ index e938efa..5150b00 100644
+ Ok(()) + Ok(())
+} +}
diff --git a/packages/app-lib/src/api/instance.rs b/packages/app-lib/src/api/instance.rs diff --git a/packages/app-lib/src/api/instance.rs b/packages/app-lib/src/api/instance.rs
index 0efd145..c5cfed2 100644 index 8a0040f..46cc47a 100644
--- a/packages/app-lib/src/api/instance.rs --- a/packages/app-lib/src/api/instance.rs
+++ b/packages/app-lib/src/api/instance.rs +++ b/packages/app-lib/src/api/instance.rs
@@ -53,7 +53,8 @@ pub use self::projects::{ @@ -59,7 +59,8 @@ pub use self::projects::{
update_managed_modrinth_version, update_project, update_managed_modrinth_version, update_project,
}; };
pub use self::run::{ pub use self::run::{
@@ -534,7 +534,7 @@ index 0efd145..c5cfed2 100644
pub use self::screenshot_groups::{ pub use self::screenshot_groups::{
ScreenshotGroup, ScreenshotGroupImport, ScreenshotGroupMembershipUpdate, ScreenshotGroup, ScreenshotGroupImport, ScreenshotGroupMembershipUpdate,
diff --git a/packages/app-lib/src/api/instance/run.rs b/packages/app-lib/src/api/instance/run.rs diff --git a/packages/app-lib/src/api/instance/run.rs b/packages/app-lib/src/api/instance/run.rs
index d638128..0394da0 100644 index 4e46190..1d01c06 100644
--- a/packages/app-lib/src/api/instance/run.rs --- a/packages/app-lib/src/api/instance/run.rs
+++ b/packages/app-lib/src/api/instance/run.rs +++ b/packages/app-lib/src/api/instance/run.rs
@@ -20,6 +20,25 @@ pub enum QuickPlayType { @@ -20,6 +20,25 @@ pub enum QuickPlayType {
@@ -563,7 +563,7 @@ index d638128..0394da0 100644
) -> crate::Result<ProcessMetadata> { ) -> crate::Result<ProcessMetadata> {
let state = State::get().await?; let state = State::get().await?;
if crate::state::instances::adapters::sqlite::instance_rows::is_instance_quarantined( if crate::state::instances::adapters::sqlite::instance_rows::is_instance_quarantined(
@@ -43,7 +62,8 @@ pub async fn run( @@ -53,7 +72,8 @@ pub async fn run(
.await? .await?
.ok_or_else(|| crate::ErrorKind::NoCredentialsError.as_error())?; .ok_or_else(|| crate::ErrorKind::NoCredentialsError.as_error())?;
@@ -573,7 +573,7 @@ index d638128..0394da0 100644
} }
#[tracing::instrument(skip(credentials))] #[tracing::instrument(skip(credentials))]
@@ -51,6 +71,7 @@ async fn run_credentials( @@ -61,6 +81,7 @@ async fn run_credentials(
instance_id: &str, instance_id: &str,
credentials: &Credentials, credentials: &Credentials,
quick_play_type: QuickPlayType, quick_play_type: QuickPlayType,
@@ -581,7 +581,7 @@ index d638128..0394da0 100644
) -> crate::Result<ProcessMetadata> { ) -> crate::Result<ProcessMetadata> {
let state = State::get().await?; let state = State::get().await?;
let settings = Settings::get(&state.pool).await?; let settings = Settings::get(&state.pool).await?;
@@ -246,6 +267,7 @@ async fn run_credentials( @@ -256,6 +277,7 @@ async fn run_credentials(
post_exit_hook, post_exit_hook,
&context, &context,
quick_play_type, quick_play_type,
@@ -636,10 +636,10 @@ index 4ce0c57..3382b5b 100644
#[tracing::instrument] #[tracing::instrument]
diff --git a/packages/app-lib/src/event/mod.rs b/packages/app-lib/src/event/mod.rs diff --git a/packages/app-lib/src/event/mod.rs b/packages/app-lib/src/event/mod.rs
index 059bfbf..a83f732 100644 index 833349d..84b9a87 100644
--- a/packages/app-lib/src/event/mod.rs --- a/packages/app-lib/src/event/mod.rs
+++ b/packages/app-lib/src/event/mod.rs +++ b/packages/app-lib/src/event/mod.rs
@@ -558,6 +558,8 @@ mod log_types { @@ -559,6 +559,8 @@ mod log_types {
#[serde_binhum::serde_binhum] #[serde_binhum::serde_binhum]
pub struct LogPayload { pub struct LogPayload {
pub instance_id: String, pub instance_id: String,
@@ -649,10 +649,10 @@ index 059bfbf..a83f732 100644
#[cfg_attr(feature = "export-ts", ts(flatten))] #[cfg_attr(feature = "export-ts", ts(flatten))]
pub event: LogEvent, pub event: LogEvent,
diff --git a/packages/app-lib/src/launcher/mod.rs b/packages/app-lib/src/launcher/mod.rs diff --git a/packages/app-lib/src/launcher/mod.rs b/packages/app-lib/src/launcher/mod.rs
index b6055bb..55e1664 100644 index e352716..6e7de28 100644
--- a/packages/app-lib/src/launcher/mod.rs --- a/packages/app-lib/src/launcher/mod.rs
+++ b/packages/app-lib/src/launcher/mod.rs +++ b/packages/app-lib/src/launcher/mod.rs
@@ -823,6 +823,9 @@ pub async fn launch_minecraft( @@ -825,6 +825,9 @@ pub async fn launch_minecraft(
post_exit_hook: Option<String>, post_exit_hook: Option<String>,
context: &InstanceLaunchContext, context: &InstanceLaunchContext,
mut quick_play_type: QuickPlayType, mut quick_play_type: QuickPlayType,
@@ -662,7 +662,7 @@ index b6055bb..55e1664 100644
) -> crate::Result<ProcessMetadata> { ) -> crate::Result<ProcessMetadata> {
let instance = &context.instance; let instance = &context.instance;
let content_set = &context.applied_content_set; let content_set = &context.applied_content_set;
@@ -951,21 +954,27 @@ pub async fn launch_minecraft( @@ -954,21 +957,27 @@ pub async fn launch_minecraft(
let env_args = Vec::from(env_args); let env_args = Vec::from(env_args);
@@ -705,7 +705,7 @@ index b6055bb..55e1664 100644
} }
let natives_dir = state.directories.version_natives_dir(&version_jar); let natives_dir = state.directories.version_natives_dir(&version_jar);
@@ -1203,6 +1212,8 @@ pub async fn launch_minecraft( @@ -1212,6 +1221,8 @@ pub async fn launch_minecraft(
&instance.id, &instance.id,
&instance.path, &instance.path,
&instance.name, &instance.name,
patches/0013-Explain-what-went-wrong-when-the-game-crashed.patch
+5 -5
View File
@@ -880,7 +880,7 @@ index e2a59fd..4fcddea 100644
}) })
</script> </script>
diff --git a/apps/app/build.rs b/apps/app/build.rs diff --git a/apps/app/build.rs b/apps/app/build.rs
index 382ce22..fe38f0d 100644 index fc78fe1..4553d48 100644
--- a/apps/app/build.rs --- a/apps/app/build.rs
+++ b/apps/app/build.rs +++ b/apps/app/build.rs
@@ -44,6 +44,17 @@ fn main() { @@ -44,6 +44,17 @@ fn main() {
@@ -902,10 +902,10 @@ index 382ce22..fe38f0d 100644
"cache", "cache",
InlinedPlugin::new() InlinedPlugin::new()
diff --git a/apps/app/capabilities/plugins.json b/apps/app/capabilities/plugins.json diff --git a/apps/app/capabilities/plugins.json b/apps/app/capabilities/plugins.json
index 15efb0c..dbc3220 100644 index 1492b97..0a1560d 100644
--- a/apps/app/capabilities/plugins.json --- a/apps/app/capabilities/plugins.json
+++ b/apps/app/capabilities/plugins.json +++ b/apps/app/capabilities/plugins.json
@@ -112,6 +112,7 @@ @@ -105,6 +105,7 @@
"ads:default", "ads:default",
"friends:default", "friends:default",
"worlds:default", "worlds:default",
@@ -970,10 +970,10 @@ index 15a5c1e..565a39f 100644
pub mod import; pub mod import;
pub mod install; pub mod install;
diff --git a/apps/app/src/main.rs b/apps/app/src/main.rs diff --git a/apps/app/src/main.rs b/apps/app/src/main.rs
index 098daa6..c404189 100644 index 5e582b5..8429e4c 100644
--- a/apps/app/src/main.rs --- a/apps/app/src/main.rs
+++ b/apps/app/src/main.rs +++ b/apps/app/src/main.rs
@@ -249,6 +249,7 @@ fn main() { @@ -251,6 +251,7 @@ fn main() {
builder = builder builder = builder
.plugin(api::auth::init()) .plugin(api::auth::init())
.plugin(api::ely_skins::init()) .plugin(api::ely_skins::init())
patches/0014-Browse-skins-from-Ely.by-NameMC-laby.net-and-crafty..patch
+5 -5
View File
@@ -976,7 +976,7 @@ index bcd79ec..9a10f0e 100644
</div> </div>
diff --git a/apps/app/build.rs b/apps/app/build.rs diff --git a/apps/app/build.rs b/apps/app/build.rs
index fe38f0d..145ec31 100644 index 4553d48..90e22ef 100644
--- a/apps/app/build.rs --- a/apps/app/build.rs
+++ b/apps/app/build.rs +++ b/apps/app/build.rs
@@ -44,6 +44,19 @@ fn main() { @@ -44,6 +44,19 @@ fn main() {
@@ -1000,10 +1000,10 @@ index fe38f0d..145ec31 100644
"crash-analysis", "crash-analysis",
InlinedPlugin::new() InlinedPlugin::new()
diff --git a/apps/app/capabilities/plugins.json b/apps/app/capabilities/plugins.json diff --git a/apps/app/capabilities/plugins.json b/apps/app/capabilities/plugins.json
index dbc3220..d22b900 100644 index 0a1560d..c44fb00 100644
--- a/apps/app/capabilities/plugins.json --- a/apps/app/capabilities/plugins.json
+++ b/apps/app/capabilities/plugins.json +++ b/apps/app/capabilities/plugins.json
@@ -113,6 +113,7 @@ @@ -106,6 +106,7 @@
"friends:default", "friends:default",
"worlds:default", "worlds:default",
"ely-skins:default", "ely-skins:default",
@@ -1153,10 +1153,10 @@ index 0000000..cfd0d8c
+ .into() + .into()
+} +}
diff --git a/apps/app/src/main.rs b/apps/app/src/main.rs diff --git a/apps/app/src/main.rs b/apps/app/src/main.rs
index c404189..57a68e6 100644 index 8429e4c..04eedbd 100644
--- a/apps/app/src/main.rs --- a/apps/app/src/main.rs
+++ b/apps/app/src/main.rs +++ b/apps/app/src/main.rs
@@ -250,6 +250,7 @@ fn main() { @@ -252,6 +252,7 @@ fn main() {
.plugin(api::auth::init()) .plugin(api::auth::init())
.plugin(api::ely_skins::init()) .plugin(api::ely_skins::init())
.plugin(api::crash_analysis::init()) .plugin(api::crash_analysis::init())
upstream.txt
+1 -1
View File
@@ -1 +1 @@
v0.20.5 v0.21.2