diff --git a/noita-proxy/Cargo.lock b/noita-proxy/Cargo.lock index ad777675..843299ba 100644 --- a/noita-proxy/Cargo.lock +++ b/noita-proxy/Cargo.lock @@ -2326,12 +2326,6 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "paste" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" - [[package]] name = "pbkdf2" version = "0.12.2" @@ -3211,11 +3205,10 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "steamworks" version = "0.11.0" -source = "git+https://github.com/IntQuant/steamworks-rs#d765c925e2c481a3e6eb3ecdff12e09dcd618f26" +source = "git+https://github.com/IntQuant/steamworks-rs?branch=avatar-fix#56c1d4cf9aab3639b3f14daeafa6a32ae8f169ef" dependencies = [ "bitflags 1.3.2", "lazy_static", - "paste", "steamworks-sys", "thiserror", ] @@ -3223,7 +3216,7 @@ dependencies = [ [[package]] name = "steamworks-sys" version = "0.11.0" -source = "git+https://github.com/IntQuant/steamworks-rs#d765c925e2c481a3e6eb3ecdff12e09dcd618f26" +source = "git+https://github.com/IntQuant/steamworks-rs?branch=avatar-fix#56c1d4cf9aab3639b3f14daeafa6a32ae8f169ef" [[package]] name = "strict-num" diff --git a/noita-proxy/Cargo.toml b/noita-proxy/Cargo.toml index 59887195..d34a3d2b 100644 --- a/noita-proxy/Cargo.toml +++ b/noita-proxy/Cargo.toml @@ -25,7 +25,7 @@ serde = { version = "1.0.207", features = ["serde_derive", "derive"] } bitcode = "0.6.0" lz4_flex = { version = "0.11.3", default-features = false, features = ["std"]} rand = "0.8.5" -steamworks = { git = "https://github.com/IntQuant/steamworks-rs" } +steamworks = { git = "https://github.com/IntQuant/steamworks-rs", branch = "avatar-fix" } crossbeam = { version = "0.8.4", features = ["crossbeam-channel"] } clipboard = "0.5.0" socket2 = { version = "0.5.7", features = ["all"] } diff --git a/noita-proxy/src/util/steam_helper.rs b/noita-proxy/src/util/steam_helper.rs index 553b8503..e92e9bd2 100644 --- a/noita-proxy/src/util/steam_helper.rs +++ b/noita-proxy/src/util/steam_helper.rs @@ -37,16 +37,15 @@ impl SteamState { )); } let app_id = env::var("NP_APPID").ok().and_then(|x| x.parse().ok()); - let client = steamworks::Client::init_app(app_id.unwrap_or(881100))?; + let (client, single) = steamworks::Client::init_app(app_id.unwrap_or(881100))?; client.networking_utils().init_relay_network_access(); if let Err(err) = client.networking_sockets().init_authentication() { error!("Failed to init_authentication: {}", err) } - let client_c = client.clone(); thread::spawn(move || { info!("Spawned steam callback thread"); loop { - client_c.run_callbacks(); + single.run_callbacks(); thread::sleep(Duration::from_millis(3)); } }); diff --git a/redist/libsteam_api.so b/redist/libsteam_api.so index 99c91647..4a1260ce 100644 Binary files a/redist/libsteam_api.so and b/redist/libsteam_api.so differ diff --git a/redist/steam_api64.dll b/redist/steam_api64.dll index 9ad453cf..6594c50e 100644 Binary files a/redist/steam_api64.dll and b/redist/steam_api64.dll differ