diff --git a/Cargo.lock b/Cargo.lock index d731bb09..062d3d2d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3146,7 +3146,7 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "oodle_loader" version = "0.2.1" -source = "git+https://github.com/trumank/repak#f8c345d37ed52056739a63801ee2cec84ce29a64" +source = "git+https://github.com/trumank/repak#96410d664ac46c87cf451a3c5bad38d8cf42dda5" dependencies = [ "anyhow", "hex", @@ -3773,7 +3773,7 @@ dependencies = [ [[package]] name = "repak" version = "0.2.1" -source = "git+https://github.com/trumank/repak#f8c345d37ed52056739a63801ee2cec84ce29a64" +source = "git+https://github.com/trumank/repak#96410d664ac46c87cf451a3c5bad38d8cf42dda5" dependencies = [ "aes", "byteorder", diff --git a/Cargo.toml b/Cargo.toml index 8604aa6d..99a37b25 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,8 +31,9 @@ version.workspace = true edition.workspace = true [features] -default = ["hook"] +default = ["hook", "oodle"] hook = ["dep:hook"] +oodle = ["repak/oodle_implicit_dynamic"] debug = ["egui/deadlock_detection", "egui/extra_debug_asserts", "egui/extra_asserts"] [dependencies] @@ -80,7 +81,7 @@ uasset_utils = { git = "https://github.com/trumank/uasset_utils" } unreal_asset = { git = "https://github.com/trumank/unrealmodding", branch = "patches" } url = "2.5.0" zip = { version = "0.6.6", default-features = false, features = ["aes-crypto", "deflate", "time"] } -repak = { workspace = true, features = ["oodle", "oodle_loader"] } +repak.workspace = true include_dir = "0.7.3" postcard.workspace = true diff --git a/src/integrate.rs b/src/integrate.rs index 4600dca7..5e25875b 100644 --- a/src/integrate.rs +++ b/src/integrate.rs @@ -381,7 +381,6 @@ pub fn integrate>( } })?; let pak = repak::PakBuilder::new() - .oodle(repak::oodle_loader::decompress) .reader(&mut buf) .map_err(|e| IntegrationErr { mod_ctxt: Some(mod_info.clone()), diff --git a/src/mod_lints/mod.rs b/src/mod_lints/mod.rs index 10826a2e..162bbfcd 100644 --- a/src/mod_lints/mod.rs +++ b/src/mod_lints/mod.rs @@ -96,9 +96,7 @@ impl LintCtxt { } let mut first_pak_read_seek = individual_pak_readers.remove(0); - let pak_reader = repak::PakBuilder::new() - .oodle(repak::oodle_loader::decompress) - .reader(&mut first_pak_read_seek)?; + let pak_reader = repak::PakBuilder::new().reader(&mut first_pak_read_seek)?; f(mod_spec.clone(), &mut first_pak_read_seek, &pak_reader)? }