fix: update dependencies. Resolve build issues. (Not tested ingame)

This commit is contained in:
Superyu1337 2024-11-28 22:41:25 +01:00
parent 831d232d23
commit f3f08cbede
5 changed files with 409 additions and 222 deletions

563
Cargo.lock generated

File diff suppressed because it is too large Load Diff

@ -1,6 +1,6 @@
[package] [package]
name = "radarflow" name = "radarflow"
version = "0.2.4" version = "0.2.5"
authors = ["Janek S <development@superyu.xyz"] authors = ["Janek S <development@superyu.xyz"]
edition = "2021" edition = "2021"
@ -8,39 +8,39 @@ edition = "2021"
[dependencies] [dependencies]
# memory # memory
memflow = "0.2.1" memflow = "0.2.3"
memflow-native = { git = "https://github.com/memflow/memflow-native" } memflow-native = { git = "https://github.com/memflow/memflow-native" }
dataview = "1.0.1" dataview = "1.0.1"
# logging # logging
log = "0.4.21" log = "0.4.22"
simple_logger = "4.3.3" simple_logger = "5.0.0"
# error handling # error handling
anyhow = "1.0.81" anyhow = "1.0.93"
# derive stuff # derive stuff
enum-primitive-derive = "0.3.0" enum-primitive-derive = "0.3.0"
num-traits = "0.2.18" num-traits = "0.2.19"
serde = { version = "1.0.197", features = ["derive"] } serde = { version = "1.0.215", features = ["derive"] }
serde_json = "1.0.115" serde_json = "1.0.133"
clap = { version = "4.5.4", features = ["derive", "string"] } clap = { version = "4.5.21", features = ["derive", "string"] }
# tokio # tokio
tokio = { version = "1.37.0", features = ["full"] } tokio = { version = "1.37.0", features = ["full"] }
# networking # networking
axum = { version = "0.7.5", features = ["ws"] } axum = { version = "0.7.9", features = ["ws"] }
tower-http = { version = "0.5.2", features = ["fs"] } tower-http = { version = "0.6.2", features = ["fs"] }
tower = "0.4.13" tower = "0.5.1"
local-ip-address = "0.6.1" local-ip-address = "0.6.3"
# other # other
itertools = "0.12.1" itertools = "0.13.0"
[build-dependencies] [build-dependencies]
reqwest = { version = "0.12.2", features = ["blocking"] } reqwest = { version = "0.12.9", features = ["blocking"] }
serde = { version = "1.0.197", features = ["derive"] } serde = { version = "1.0.215", features = ["derive"] }
serde_json = "1.0.115" serde_json = "1.0.133"
vergen = { version = "8.3.1", features = ["build", "cargo", "git", "gitcl", "rustc", "si"] } vergen-gitcl = { version = "1.0.0", features = ["build", "cargo", "rustc",] }

@ -1,7 +1,7 @@
use std::error::Error; use std::error::Error;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use vergen::EmitBuilder; use vergen_gitcl::{Emitter, GitclBuilder};
#[derive(Clone, Deserialize, Serialize)] #[derive(Clone, Deserialize, Serialize)]
struct InfoJson { struct InfoJson {
@ -36,29 +36,27 @@ fn build_number() -> Result<(), Box<dyn Error>> {
fn main() -> Result<(), Box<dyn Error>> { fn main() -> Result<(), Box<dyn Error>> {
download( download(
"https://raw.githubusercontent.com/a2x/cs2-dumper/main/output/client.dll.rs", "https://raw.githubusercontent.com/a2x/cs2-dumper/refs/heads/main/output/client_dll.rs",
"./src/dma/cs2dumper/client_mod.rs" "./src/dma/cs2dumper/client_mod.rs"
).expect("Failed to download build file \"client.dll.rs\""); ).expect("Failed to download build file \"client.dll.rs\"");
download( download(
"https://raw.githubusercontent.com/a2x/cs2-dumper/main/output/offsets.rs", "https://raw.githubusercontent.com/a2x/cs2-dumper/refs/heads/main/output/offsets.rs",
"./src/dma/cs2dumper/offsets_mod.rs" "./src/dma/cs2dumper/offsets_mod.rs"
).expect("Failed to download build file \"offsets.rs\""); ).expect("Failed to download build file \"offsets.rs\"");
download( download(
"https://raw.githubusercontent.com/a2x/cs2-dumper/main/output/engine2.dll.rs", "https://raw.githubusercontent.com/a2x/cs2-dumper/refs/heads/main/output/engine2_dll.rs",
"./src/dma/cs2dumper/engine2_mod.rs" "./src/dma/cs2dumper/engine2_mod.rs"
).expect("Failed to download build file \"engine2.dll.rs\""); ).expect("Failed to download build file \"engine2.dll.rs\"");
build_number()?; build_number()?;
EmitBuilder::builder() let gitcl = GitclBuilder::all_git()?;
.git_sha(true)
.git_commit_date()
.cargo_debug() Emitter::new()
.cargo_target_triple() .add_instructions(&gitcl)?
.rustc_semver()
.rustc_llvm_version()
.emit()?; .emit()?;
Ok(()) Ok(())

@ -45,7 +45,11 @@ fn version() -> String {
avail.join(", ") avail.join(", ")
}; };
format!(" {pkg_ver} (rev {git_hash})\nCommit Date: {commit_date}\nAvailable Connectors: {avail_cons}") format!(
"{pkg_ver} (rev {git_hash})\n\
Commit Date: {commit_date}\n\
Available Connectors: {avail_cons}\n"
)
} }
fn port_in_range(s: &str) -> Result<u16, String> { fn port_in_range(s: &str) -> Result<u16, String> {

@ -21,7 +21,7 @@ pub struct CsData {
// Common // Common
pub local: u64, pub local: u64,
pub local_pawn: u64, pub local_pawn: u64,
pub is_dead: bool, // pub is_dead: bool, // TODO: Why is this here?
pub tick_count: i32, pub tick_count: i32,
pub freeze_period: bool, pub freeze_period: bool,
pub round_start_count: u8, pub round_start_count: u8,
@ -178,7 +178,7 @@ impl CsData {
let round_start_count_addr = (self.gamerules + cs2dumper::client::C_CSGameRules::m_nRoundStartCount as u64).into(); let round_start_count_addr = (self.gamerules + cs2dumper::client::C_CSGameRules::m_nRoundStartCount as u64).into();
// Game Entity System // Game Entity System
let highest_index_addr = (self.game_ent_sys + cs2dumper::offsets::client_dll::dwGameEntitySystem_getHighestEntityIndex as u64).into(); let highest_index_addr = (self.game_ent_sys + cs2dumper::offsets::client_dll::dwGameEntitySystem_highestEntityIndex as u64).into();
let mut batcher = ctx.process.batcher(); let mut batcher = ctx.process.batcher();
batcher.read_into( batcher.read_into(
@ -237,7 +237,7 @@ impl CsData {
} }
let map_string = ctx.process.read_char_string_n(map_ptr.into(), 32).unwrap_or(String::from("<empty>")); let map_string = ctx.process.read_utf8_lossy(map_ptr.into(), 32).unwrap_or(String::from("<empty>"));
self.map = map_string; self.map = map_string;
self.bomb_dropped = bomb_dropped != 0; self.bomb_dropped = bomb_dropped != 0;