diff --git a/packages/app-lib/src/api/instance/mod.rs b/packages/app-lib/src/api/instance/mod.rs index 2da154f..e57d088 100644 --- a/packages/app-lib/src/api/instance/mod.rs +++ b/packages/app-lib/src/api/instance/mod.rs @@ -15,8 +15,8 @@ mod projects; mod run; mod screenshot_groups; mod screenshots; -mod upgrade; pub(crate) mod synced_options; +mod upgrade; pub(crate) mod synced_packs { pub(crate) use super::synced_packs_axolotl::{ capture_resource_pack_selection_change, detach, diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/api_types.rs b/packages/app-lib/src/api/instance/synced_options/game_options/api_types.rs index 0a67f32..f397e21 100644 --- a/packages/app-lib/src/api/instance/synced_options/game_options/api_types.rs +++ b/packages/app-lib/src/api/instance/synced_options/game_options/api_types.rs @@ -200,4 +200,4 @@ pub(super) fn canonical_values_equal( } _ => left == right, } -} \ No newline at end of file +} diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/catalog/accessibility.rs b/packages/app-lib/src/api/instance/synced_options/game_options/catalog/accessibility.rs index ab30a7f..a4a9912 100644 --- a/packages/app-lib/src/api/instance/synced_options/game_options/catalog/accessibility.rs +++ b/packages/app-lib/src/api/instance/synced_options/game_options/catalog/accessibility.rs @@ -204,4 +204,4 @@ pub(super) const SETTINGS: &[SupportedSetting] = &[ BOOL, ValueEncoding::Bool, ), -]; \ No newline at end of file +]; diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/catalog/chat.rs b/packages/app-lib/src/api/instance/synced_options/game_options/catalog/chat.rs index ddaf03f..f8d161f 100644 --- a/packages/app-lib/src/api/instance/synced_options/game_options/catalog/chat.rs +++ b/packages/app-lib/src/api/instance/synced_options/game_options/catalog/chat.rs @@ -191,4 +191,4 @@ pub(super) const SETTINGS: &[SupportedSetting] = &[ SettingEditor::Enum(CHAT_PREVIEW), ValueEncoding::ChatPreview, ), -]; \ No newline at end of file +]; diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/catalog/controls.rs b/packages/app-lib/src/api/instance/synced_options/game_options/catalog/controls.rs index 72003d0..9e996c1 100644 --- a/packages/app-lib/src/api/instance/synced_options/game_options/catalog/controls.rs +++ b/packages/app-lib/src/api/instance/synced_options/game_options/catalog/controls.rs @@ -410,4 +410,4 @@ pub(super) const SETTINGS: &[SupportedSetting] = &[ "26.3", "26.3" ), -]; \ No newline at end of file +]; diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/catalog/data_versions.rs b/packages/app-lib/src/api/instance/synced_options/game_options/catalog/data_versions.rs index 3754e6d..5e30337 100644 --- a/packages/app-lib/src/api/instance/synced_options/game_options/catalog/data_versions.rs +++ b/packages/app-lib/src/api/instance/synced_options/game_options/catalog/data_versions.rs @@ -124,4 +124,4 @@ pub(in crate::api::instance) const LEGACY_DATA_VERSIONS: phf::Map<&str, u32> = p "1.10" => 510, "1.10-pre2" => 507, "1.10-pre1" => 506, -}; \ No newline at end of file +}; diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/catalog/known_vanilla_keys.rs b/packages/app-lib/src/api/instance/synced_options/game_options/catalog/known_vanilla_keys.rs index 339159d..ece5c71 100644 --- a/packages/app-lib/src/api/instance/synced_options/game_options/catalog/known_vanilla_keys.rs +++ b/packages/app-lib/src/api/instance/synced_options/game_options/catalog/known_vanilla_keys.rs @@ -252,4 +252,4 @@ pub(super) const KNOWN_VANILLA_KEYS: &[&str] = &[ "modelPart_right_pants_leg", "modelPart_hat", "fullscreenResolution", -]; \ No newline at end of file +]; diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/catalog/legacy_key_bindings.rs b/packages/app-lib/src/api/instance/synced_options/game_options/catalog/legacy_key_bindings.rs index 114b2c6..f926d9d 100644 --- a/packages/app-lib/src/api/instance/synced_options/game_options/catalog/legacy_key_bindings.rs +++ b/packages/app-lib/src/api/instance/synced_options/game_options/catalog/legacy_key_bindings.rs @@ -109,4 +109,4 @@ pub(in crate::api::instance) const LEGACY_KEY_BINDINGS: &[(i32, &str)] = &[ (211, "key.keyboard.delete"), (219, "key.keyboard.left.win"), (220, "key.keyboard.right.win"), -]; \ No newline at end of file +]; diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/catalog/sound.rs b/packages/app-lib/src/api/instance/synced_options/game_options/catalog/sound.rs index 8cf973a..30774df 100644 --- a/packages/app-lib/src/api/instance/synced_options/game_options/catalog/sound.rs +++ b/packages/app-lib/src/api/instance/synced_options/game_options/catalog/sound.rs @@ -174,4 +174,4 @@ pub(super) const SETTINGS: &[SupportedSetting] = &[ UNIT_INTERVAL, ValueEncoding::Decimal, ), -]; \ No newline at end of file +]; diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/catalog/video.rs b/packages/app-lib/src/api/instance/synced_options/game_options/catalog/video.rs index d57e706..7a2a7b5 100644 --- a/packages/app-lib/src/api/instance/synced_options/game_options/catalog/video.rs +++ b/packages/app-lib/src/api/instance/synced_options/game_options/catalog/video.rs @@ -447,4 +447,4 @@ pub(super) const SETTINGS: &[SupportedSetting] = &[ BOOL, ValueEncoding::Bool, ), -]; \ No newline at end of file +]; diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/mod.rs b/packages/app-lib/src/api/instance/synced_options/game_options/mod.rs index 2ad77e6..3f5e082 100644 --- a/packages/app-lib/src/api/instance/synced_options/game_options/mod.rs +++ b/packages/app-lib/src/api/instance/synced_options/game_options/mod.rs @@ -75,4 +75,4 @@ const CATALOG_REVISION: u32 = 6; const MAX_OPTIONS_BYTES: usize = 2 * 1024 * 1024; const MAX_OPTIONS_LINES: usize = 16_384; const MAX_KEY_BYTES: usize = 1_024; -const MAX_VALUE_BYTES: usize = 32 * 1024; \ No newline at end of file +const MAX_VALUE_BYTES: usize = 32 * 1024; diff --git a/packages/app-lib/src/api/instance/synced_options/game_options/options_file.rs b/packages/app-lib/src/api/instance/synced_options/game_options/options_file.rs index 0b2c01b..f3cd05f 100644 --- a/packages/app-lib/src/api/instance/synced_options/game_options/options_file.rs +++ b/packages/app-lib/src/api/instance/synced_options/game_options/options_file.rs @@ -357,4 +357,4 @@ pub(super) async fn read_document( let bytes = io::read(path).await?; let document = GameOptionsDocument::parse(&bytes)?; Ok((document, bytes)) -} \ No newline at end of file +} diff --git a/packages/app-lib/src/api/instance/synced_options/mod.rs b/packages/app-lib/src/api/instance/synced_options/mod.rs index d1b4bff..43a04d0 100644 --- a/packages/app-lib/src/api/instance/synced_options/mod.rs +++ b/packages/app-lib/src/api/instance/synced_options/mod.rs @@ -29,4 +29,4 @@ pub(crate) use self::orchestration::{ monitor_persisted_processes, prepare_instance_update, reconcile_instance_after_pack_update_with_state, remove_generated_instance_files, -}; \ No newline at end of file +}; diff --git a/packages/app-lib/src/api/instance/synced_options/orchestration.rs b/packages/app-lib/src/api/instance/synced_options/orchestration.rs index ce2cb63..12f5b32 100644 --- a/packages/app-lib/src/api/instance/synced_options/orchestration.rs +++ b/packages/app-lib/src/api/instance/synced_options/orchestration.rs @@ -28,7 +28,9 @@ use super::hotbars::{ read_hotbar_state, reconcile_hotbar, regenerate_hotbars, write_hotbar_state, }; -use super::pending::{self, PendingAction, PendingChange, SyncedOptionJoinResolution}; +use super::pending::{ + self, PendingAction, PendingChange, SyncedOptionJoinResolution, +}; use super::{COMMAND_HISTORY_FILE, HOTBAR_FILE}; #[derive(Clone, Copy, Debug, Eq, PartialEq, Serialize)] @@ -981,12 +983,11 @@ pub async fn reconcile_all() -> crate::Result<()> { pub(crate) async fn monitor_persisted_processes() -> crate::Result<()> { let state = State::get().await?; - let instance_ids = - sqlx::query_scalar::<_, String>( - "SELECT DISTINCT instance_id FROM processes", - ) - .fetch_all(&state.pool) - .await?; + let instance_ids = sqlx::query_scalar::<_, String>( + "SELECT DISTINCT instance_id FROM processes", + ) + .fetch_all(&state.pool) + .await?; for instance_id in instance_ids { tokio::spawn(async move { loop { diff --git a/packages/app-lib/src/api/instance/synced_options/pending.rs b/packages/app-lib/src/api/instance/synced_options/pending.rs index e362f92..739c888 100644 --- a/packages/app-lib/src/api/instance/synced_options/pending.rs +++ b/packages/app-lib/src/api/instance/synced_options/pending.rs @@ -101,4 +101,4 @@ pub(in crate::api::instance) async fn contains( Ok(read(state).await?.iter().any(|change| { change.instance_id == instance_id && change.option == option })) -} \ No newline at end of file +} diff --git a/packages/app-lib/src/api/instance/synced_servers/storage.rs b/packages/app-lib/src/api/instance/synced_servers/storage.rs index 548a1c2..57a81f1 100644 --- a/packages/app-lib/src/api/instance/synced_servers/storage.rs +++ b/packages/app-lib/src/api/instance/synced_servers/storage.rs @@ -212,13 +212,11 @@ async fn load_local_with<'e>( let position: i64 = row.get("position"); Ok(LocalServer { id, - source: ServerSource::from_str(&source).ok_or_else( - || { - ErrorKind::InputError(format!( - "Unknown server source {source}" - )) - }, - )?, + source: ServerSource::from_str(&source).ok_or_else(|| { + ErrorKind::InputError(format!( + "Unknown server source {source}" + )) + })?, excluded_synced_server_id, data: nbt_from_bytes(nbt)?, position, @@ -289,13 +287,11 @@ pub(super) async fn load_projection_entries( let position: i64 = row.get("position"); Ok(ProjectionEntry { id: server_id, - owner: ProjectionOwner::from_str(&owner).ok_or_else( - || { - ErrorKind::InputError(format!( - "Unknown server projection owner {owner}" - )) - }, - )?, + owner: ProjectionOwner::from_str(&owner).ok_or_else(|| { + ErrorKind::InputError(format!( + "Unknown server projection owner {owner}" + )) + })?, data: nbt_from_bytes(nbt)?, position, }) diff --git a/packages/app-lib/src/launcher/mod.rs b/packages/app-lib/src/launcher/mod.rs index c256e8d..597f98a 100644 --- a/packages/app-lib/src/launcher/mod.rs +++ b/packages/app-lib/src/launcher/mod.rs @@ -61,7 +61,6 @@ pub(crate) async fn read_game_version_metadata_from_jar( Ok(None) } - #[cfg(target_os = "windows")] use winreg::{RegKey, enums::HKEY_CURRENT_USER}; diff --git a/packages/app-lib/src/state/game_options.rs b/packages/app-lib/src/state/game_options.rs index 7d966c0..6a06e6b 100644 --- a/packages/app-lib/src/state/game_options.rs +++ b/packages/app-lib/src/state/game_options.rs @@ -65,4 +65,4 @@ pub(crate) async fn load_game_option_preferences( pool: &SqlitePool, ) -> crate::Result> { Ok(sqlx::query("SELECT option_id, enabled, revision FROM synced_game_option_preferences").fetch_all(pool).await?.into_iter().map(|r| { let option_id: String = r.get("option_id"); let enabled: bool = r.get("enabled"); let revision: i64 = r.get("revision"); (option_id, StoredPreference { enabled, revision: revision.max(0) as u64 }) }).collect()) -} \ No newline at end of file +} diff --git a/packages/app-lib/src/state/instances/model/game_options.rs b/packages/app-lib/src/state/instances/model/game_options.rs index c7cc63f..f5865ab 100644 --- a/packages/app-lib/src/state/instances/model/game_options.rs +++ b/packages/app-lib/src/state/instances/model/game_options.rs @@ -49,4 +49,4 @@ pub(crate) struct StoredOption { pub(crate) struct StoredPreference { pub(crate) enabled: bool, pub(crate) revision: u64, -} \ No newline at end of file +} diff --git a/packages/app-lib/src/state/instances/model/instance.rs b/packages/app-lib/src/state/instances/model/instance.rs index b2a60b3..8688ab5 100644 --- a/packages/app-lib/src/state/instances/model/instance.rs +++ b/packages/app-lib/src/state/instances/model/instance.rs @@ -110,7 +110,6 @@ pub struct InstanceSyncedOptions { pub data_packs: bool, } - /// The set of per-instance synchronization features. Mirrors the Axolotl /// `SyncedOption` enum, including its string keys used by the /// `instance_sync_preferences` / `sync_feature_settings` tables. diff --git a/packages/app-lib/src/state/instances/model/mod.rs b/packages/app-lib/src/state/instances/model/mod.rs index 11d8096..5a623bc 100644 --- a/packages/app-lib/src/state/instances/model/mod.rs +++ b/packages/app-lib/src/state/instances/model/mod.rs @@ -66,4 +66,4 @@ fn unknown_value(kind: &str, value: &str) -> crate::Error { crate::ErrorKind::InputError(format!("Unknown {kind} {value}")).into() } mod game_options; -pub use self::game_options::*; \ No newline at end of file +pub use self::game_options::*;