From 0bc7cf7b20ba044966820f225c3f75c02ec59118 Mon Sep 17 00:00:00 2001 From: a2x <45197573+a2x@users.noreply.github.com> Date: Sat, 2 Mar 2024 01:04:55 +1000 Subject: [PATCH] Rename `util` directory to `os` --- src/dumper/interfaces.rs | 2 +- src/dumper/offsets.rs | 2 +- src/dumper/schemas.rs | 2 +- src/main.rs | 4 ++-- src/{util => os}/address.rs | 0 src/{util => os}/mod.rs | 0 src/{util => os}/module.rs | 0 src/{util => os}/process.rs | 0 src/sdk/schema_class_field_data.rs | 2 +- src/sdk/schema_class_info.rs | 2 +- src/sdk/schema_system.rs | 2 +- src/sdk/schema_system_type_scope.rs | 2 +- src/sdk/schema_type.rs | 2 +- src/sdk/schema_type_declared_class.rs | 2 +- src/sdk/utl_ts_hash.rs | 2 +- 15 files changed, 12 insertions(+), 12 deletions(-) rename src/{util => os}/address.rs (100%) rename src/{util => os}/mod.rs (100%) rename src/{util => os}/module.rs (100%) rename src/{util => os}/process.rs (100%) diff --git a/src/dumper/interfaces.rs b/src/dumper/interfaces.rs index 0c64dec..20b6736 100644 --- a/src/dumper/interfaces.rs +++ b/src/dumper/interfaces.rs @@ -8,7 +8,7 @@ use simplelog::{debug, info}; use super::{generate_files, Entries, Entry}; use crate::builder::FileBuilderEnum; -use crate::util::{Address, Process}; +use crate::os::{Address, Process}; #[derive(Debug)] #[repr(C)] diff --git a/src/dumper/offsets.rs b/src/dumper/offsets.rs index 1907cc1..55320e7 100644 --- a/src/dumper/offsets.rs +++ b/src/dumper/offsets.rs @@ -9,7 +9,7 @@ use super::{generate_files, Entries, Entry}; use crate::builder::FileBuilderEnum; use crate::config::Config; use crate::config::Operation::*; -use crate::util::Process; +use crate::os::Process; pub fn dump_offsets( process: &Process, diff --git a/src/dumper/schemas.rs b/src/dumper/schemas.rs index 54e690e..8a34c26 100644 --- a/src/dumper/schemas.rs +++ b/src/dumper/schemas.rs @@ -5,8 +5,8 @@ use simplelog::{debug, info}; use super::{generate_files, Entries, Entry}; use crate::builder::FileBuilderEnum; +use crate::os::Process; use crate::sdk::SchemaSystem; -use crate::util::Process; pub fn dump_schemas( process: &Process, diff --git a/src/main.rs b/src/main.rs index 3a57b5a..27d59d1 100644 --- a/src/main.rs +++ b/src/main.rs @@ -14,13 +14,13 @@ use simplelog::{info, ColorChoice, ConfigBuilder, TermLogger, TerminalMode}; use builder::*; use dumper::{dump_interfaces, dump_offsets, dump_schemas}; -use util::Process; +use os::Process; mod builder; mod config; mod dumper; +mod os; mod sdk; -mod util; #[derive(Debug, Parser)] #[command(name = "cs2-dumper")] diff --git a/src/util/address.rs b/src/os/address.rs similarity index 100% rename from src/util/address.rs rename to src/os/address.rs diff --git a/src/util/mod.rs b/src/os/mod.rs similarity index 100% rename from src/util/mod.rs rename to src/os/mod.rs diff --git a/src/util/module.rs b/src/os/module.rs similarity index 100% rename from src/util/module.rs rename to src/os/module.rs diff --git a/src/util/process.rs b/src/os/process.rs similarity index 100% rename from src/util/process.rs rename to src/os/process.rs diff --git a/src/sdk/schema_class_field_data.rs b/src/sdk/schema_class_field_data.rs index d3acac1..22035ec 100644 --- a/src/sdk/schema_class_field_data.rs +++ b/src/sdk/schema_class_field_data.rs @@ -2,7 +2,7 @@ use anyhow::Result; use super::SchemaType; -use crate::util::{Address, Process}; +use crate::os::{Address, Process}; pub struct SchemaClassFieldData<'a> { process: &'a Process, diff --git a/src/sdk/schema_class_info.rs b/src/sdk/schema_class_info.rs index 7678b14..82c63ed 100644 --- a/src/sdk/schema_class_info.rs +++ b/src/sdk/schema_class_info.rs @@ -2,7 +2,7 @@ use anyhow::Result; use super::SchemaClassFieldData; -use crate::util::{Address, Process}; +use crate::os::{Address, Process}; pub struct SchemaClassInfo<'a> { process: &'a Process, diff --git a/src/sdk/schema_system.rs b/src/sdk/schema_system.rs index f57481a..d1649be 100644 --- a/src/sdk/schema_system.rs +++ b/src/sdk/schema_system.rs @@ -4,7 +4,7 @@ use anyhow::{bail, Result}; use super::SchemaSystemTypeScope; -use crate::util::{Address, Process}; +use crate::os::{Address, Process}; pub struct SchemaSystem<'a> { process: &'a Process, diff --git a/src/sdk/schema_system_type_scope.rs b/src/sdk/schema_system_type_scope.rs index 73e71e9..d082cc5 100644 --- a/src/sdk/schema_system_type_scope.rs +++ b/src/sdk/schema_system_type_scope.rs @@ -2,7 +2,7 @@ use anyhow::Result; use super::{SchemaClassInfo, SchemaTypeDeclaredClass, UtlTsHash}; -use crate::util::{Address, Process}; +use crate::os::{Address, Process}; pub struct SchemaSystemTypeScope<'a> { process: &'a Process, diff --git a/src/sdk/schema_type.rs b/src/sdk/schema_type.rs index aa5f1fd..ab74a61 100644 --- a/src/sdk/schema_type.rs +++ b/src/sdk/schema_type.rs @@ -6,7 +6,7 @@ use lazy_static::lazy_static; use regex::Regex; -use crate::util::{Address, Process}; +use crate::os::{Address, Process}; const TYPE_MAP: &[(&'static str, &'static str)] = &[ ("uint8", "uint8_t"), diff --git a/src/sdk/schema_type_declared_class.rs b/src/sdk/schema_type_declared_class.rs index 9b74172..a224249 100644 --- a/src/sdk/schema_type_declared_class.rs +++ b/src/sdk/schema_type_declared_class.rs @@ -1,6 +1,6 @@ use anyhow::Result; -use crate::util::{Address, Process}; +use crate::os::{Address, Process}; pub struct SchemaTypeDeclaredClass<'a> { process: &'a Process, diff --git a/src/sdk/utl_ts_hash.rs b/src/sdk/utl_ts_hash.rs index 43f0b25..667fa2f 100644 --- a/src/sdk/utl_ts_hash.rs +++ b/src/sdk/utl_ts_hash.rs @@ -2,7 +2,7 @@ use std::mem::offset_of; use anyhow::Result; -use crate::util::Process; +use crate::os::Process; #[derive(Debug)] #[repr(C)]