Use hitman-commons

Author: atampy25

Cargo.lock

@@ -7,7 +7,7 @@ license = "LGPL-3.0-only"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-clap = { version = "4.2.4", features = ["derive"] }
+clap = { version = "4.2.4", features = ["derive"], optional = true }
 itertools = "0.10.3"
 md5 = "0.7.0"
 rayon = "1.8.0"
@@ -17,27 +17,27 @@ serde_json = { version = "1.0.81", features = [
     "preserve_order",
 ] }
 serde_with = "2.0.1"
-egui = "0.19.0"
-egui_extras = { version = "0.19.0", features = ["image"] }
-image = { version = "0.24", features = ["png"] }
-eframe = "0.19.0"
-rfd = "0.10.0"
 similar = "2.2.1"
 anyhow = "1.0.70"
 tryvial = "0.2.0"
 fn-error-context = "0.2.1"
 auto_context = { path = "auto_context" }
 indexmap = { version = "2.1.0", features = ["serde", "rayon"] }
 serde_path_to_error = "0.1.14"
-env_logger = "0.10.1"
-tracing = "0.1.40"
+env_logger = { version = "0.10.1", optional = true }
 log = "0.4.20"
 specta = { version = "=2.0.0-rc.7", features = ["indexmap", "serde_json"] }
+hitman-commons = { git = "https://github.com/atampy25/hitman-commons", features = [
+    "resourcelib",
+    "serde",
+    "specta",
+] }
 
-[[bin]]
-name = "quickentity-rs"
-path = "src/main.rs"
+[features]
+default = ["cli"]
+cli = ["dep:env_logger", "dep:clap"]
 
 [[bin]]
-name = "quickentity-gui"
-path = "src/gui.rs"
+name = "quickentity_rs"
+path = "src/main.rs"
+required-features = ["cli"]

Cargo.toml

@@ -1,8 +1,7 @@
+use hitman_commons::resourcelib::{EntityBlueprint, EntityBlueprintLegacy, EntityFactory, EntityFactoryLegacy};
+use hitman_commons::rpkg_tool::RpkgResourceMeta;
 use quickentity_rs::patch_structs::Patch;
 use quickentity_rs::qn_structs::Entity;
-use quickentity_rs::rpkg_structs::ResourceMeta;
-use quickentity_rs::rt_structs::{RTBlueprint, RTFactory};
-use quickentity_rs::{convert_2016_blueprint_to_modern, convert_2016_factory_to_modern};
 
 use serde::Serialize;
 use serde_json::ser::Formatter;
@@ -22,29 +21,37 @@ pub fn read_as_entity(path: &str) -> Entity {
 	.expect("Failed to parse file")
 }
 
-pub fn read_as_rtfactory(path: &str) -> RTFactory {
+pub fn read_as_rtfactory(path: &str) -> EntityFactory {
 	let x = fs::read(path).expect("Failed to read file");
-	let val: Value = serde_path_to_error::deserialize(&mut serde_json::Deserializer::from_slice(&x)).expect("Failed to parse file");
+	let val: Value =
+		serde_path_to_error::deserialize(&mut serde_json::Deserializer::from_slice(&x)).expect("Failed to parse file");
 
 	if val.get("entityTemplates").is_some() {
-		convert_2016_factory_to_modern(&from_value(val).expect("Failed to read file as RT struct"))
+		from_value::<EntityFactoryLegacy>(val)
+			.expect("Failed to read file as RT struct")
+			.into_modern()
 	} else {
-		serde_path_to_error::deserialize(&mut serde_json::Deserializer::from_slice(&x)).expect("Failed to read file as RT struct")
+		serde_path_to_error::deserialize(&mut serde_json::Deserializer::from_slice(&x))
+			.expect("Failed to read file as RT struct")
 	}
 }
 
-pub fn read_as_rtblueprint(path: &str) -> RTBlueprint {
+pub fn read_as_rtblueprint(path: &str) -> EntityBlueprint {
 	let x = fs::read(path).expect("Failed to read file");
-	let val: Value = serde_path_to_error::deserialize(&mut serde_json::Deserializer::from_slice(&x)).expect("Failed to parse file");
+	let val: Value =
+		serde_path_to_error::deserialize(&mut serde_json::Deserializer::from_slice(&x)).expect("Failed to parse file");
 
 	if val.get("entityTemplates").is_some() {
-		convert_2016_blueprint_to_modern(&from_value(val).expect("Failed to read file as RT struct"))
+		from_value::<EntityBlueprintLegacy>(val)
+			.expect("Failed to read file as RT struct")
+			.into_modern()
 	} else {
-		serde_path_to_error::deserialize(&mut serde_json::Deserializer::from_slice(&x)).expect("Failed to read file as RT struct")
+		serde_path_to_error::deserialize(&mut serde_json::Deserializer::from_slice(&x))
+			.expect("Failed to read file as RT struct")
 	}
 }
 
-pub fn read_as_meta(path: &str) -> ResourceMeta {
+pub fn read_as_meta(path: &str) -> RpkgResourceMeta {
 	serde_path_to_error::deserialize(&mut serde_json::Deserializer::from_slice(&{
 		let mut vec = Vec::new();
 		fs::File::open(path)