This commit is contained in:
1 parent
6e9485c2f5
commit
fae16a0184
5 files changed
+9
-14
No files matched your search
@@ -15,8 +15,8 @@ mod projects;
|
|||||||
mod run;
|
mod run;
|
||||||
mod screenshot_groups;
|
mod screenshot_groups;
|
||||||
mod screenshots;
|
mod screenshots;
|
||||||
mod upgrade;
|
|
||||||
pub(crate) mod synced_options;
|
pub(crate) mod synced_options;
|
||||||
|
mod upgrade;
|
||||||
pub(crate) mod synced_packs {
|
pub(crate) mod synced_packs {
|
||||||
pub(crate) use super::synced_packs_axolotl::{
|
pub(crate) use super::synced_packs_axolotl::{
|
||||||
capture_resource_pack_selection_change, detach,
|
capture_resource_pack_selection_change, detach,
|
||||||
|
|||||||
@@ -28,7 +28,9 @@ use super::hotbars::{
|
|||||||
read_hotbar_state, reconcile_hotbar, regenerate_hotbars,
|
read_hotbar_state, reconcile_hotbar, regenerate_hotbars,
|
||||||
write_hotbar_state,
|
write_hotbar_state,
|
||||||
};
|
};
|
||||||
use super::pending::{self, PendingAction, PendingChange, SyncedOptionJoinResolution};
|
use super::pending::{
|
||||||
|
self, PendingAction, PendingChange, SyncedOptionJoinResolution,
|
||||||
|
};
|
||||||
use super::{COMMAND_HISTORY_FILE, HOTBAR_FILE};
|
use super::{COMMAND_HISTORY_FILE, HOTBAR_FILE};
|
||||||
|
|
||||||
#[derive(Clone, Copy, Debug, Eq, PartialEq, Serialize)]
|
#[derive(Clone, Copy, Debug, Eq, PartialEq, Serialize)]
|
||||||
@@ -981,8 +983,7 @@ pub async fn reconcile_all() -> crate::Result<()> {
|
|||||||
|
|
||||||
pub(crate) async fn monitor_persisted_processes() -> crate::Result<()> {
|
pub(crate) async fn monitor_persisted_processes() -> crate::Result<()> {
|
||||||
let state = State::get().await?;
|
let state = State::get().await?;
|
||||||
let instance_ids =
|
let instance_ids = sqlx::query_scalar::<_, String>(
|
||||||
sqlx::query_scalar::<_, String>(
|
|
||||||
"SELECT DISTINCT instance_id FROM processes",
|
"SELECT DISTINCT instance_id FROM processes",
|
||||||
)
|
)
|
||||||
.fetch_all(&state.pool)
|
.fetch_all(&state.pool)
|
||||||
|
|||||||
@@ -212,13 +212,11 @@ async fn load_local_with<'e>(
|
|||||||
let position: i64 = row.get("position");
|
let position: i64 = row.get("position");
|
||||||
Ok(LocalServer {
|
Ok(LocalServer {
|
||||||
id,
|
id,
|
||||||
source: ServerSource::from_str(&source).ok_or_else(
|
source: ServerSource::from_str(&source).ok_or_else(|| {
|
||||||
|| {
|
|
||||||
ErrorKind::InputError(format!(
|
ErrorKind::InputError(format!(
|
||||||
"Unknown server source {source}"
|
"Unknown server source {source}"
|
||||||
))
|
))
|
||||||
},
|
})?,
|
||||||
)?,
|
|
||||||
excluded_synced_server_id,
|
excluded_synced_server_id,
|
||||||
data: nbt_from_bytes(nbt)?,
|
data: nbt_from_bytes(nbt)?,
|
||||||
position,
|
position,
|
||||||
@@ -289,13 +287,11 @@ pub(super) async fn load_projection_entries(
|
|||||||
let position: i64 = row.get("position");
|
let position: i64 = row.get("position");
|
||||||
Ok(ProjectionEntry {
|
Ok(ProjectionEntry {
|
||||||
id: server_id,
|
id: server_id,
|
||||||
owner: ProjectionOwner::from_str(&owner).ok_or_else(
|
owner: ProjectionOwner::from_str(&owner).ok_or_else(|| {
|
||||||
|| {
|
|
||||||
ErrorKind::InputError(format!(
|
ErrorKind::InputError(format!(
|
||||||
"Unknown server projection owner {owner}"
|
"Unknown server projection owner {owner}"
|
||||||
))
|
))
|
||||||
},
|
})?,
|
||||||
)?,
|
|
||||||
data: nbt_from_bytes(nbt)?,
|
data: nbt_from_bytes(nbt)?,
|
||||||
position,
|
position,
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -61,7 +61,6 @@ pub(crate) async fn read_game_version_metadata_from_jar(
|
|||||||
Ok(None)
|
Ok(None)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#[cfg(target_os = "windows")]
|
#[cfg(target_os = "windows")]
|
||||||
use winreg::{RegKey, enums::HKEY_CURRENT_USER};
|
use winreg::{RegKey, enums::HKEY_CURRENT_USER};
|
||||||
|
|
||||||
|
|||||||
@@ -110,7 +110,6 @@ pub struct InstanceSyncedOptions {
|
|||||||
pub data_packs: bool,
|
pub data_packs: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/// The set of per-instance synchronization features. Mirrors the Axolotl
|
/// The set of per-instance synchronization features. Mirrors the Axolotl
|
||||||
/// `SyncedOption` enum, including its string keys used by the
|
/// `SyncedOption` enum, including its string keys used by the
|
||||||
/// `instance_sync_preferences` / `sync_feature_settings` tables.
|
/// `instance_sync_preferences` / `sync_feature_settings` tables.
|
||||||
|
|||||||
Reference in new issue
Block a user