Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,19 +50,19 @@ jobs:
args: -p unreal_helpers --all-features

- uses: actions-rs/clippy-check@v1
name: Clippy check ue 4.23 w/bulk
name: Clippy check ue 4.27 w/bulk
env:
USE_PREBUILT_ASSETS: 1
USE_PRECOMPILED_CPP_LOADER: 1
with:
token: ${{ secrets.GITHUB_TOKEN }}
args: --features "ue4_23" -- -D warnings
args: --features "ue4_27" -- -D warnings

- uses: actions-rs/clippy-check@v1
name: Clippy check ue 4.23 w/bulk w/cpp_loader
name: Clippy check ue 4.27 w/bulk w/cpp_loader
env:
USE_PREBUILT_ASSETS: 1
USE_PRECOMPILED_CPP_LOADER: 1
with:
token: ${{ secrets.GITHUB_TOKEN }}
args: --features "ue4_23,cpp_loader" -- -D warnings
args: --features "ue4_27,cpp_loader" -- -D warnings
2 changes: 1 addition & 1 deletion unreal_asset/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#![deny(missing_docs)]
#![allow(non_upper_case_globals)]
#![allow(elided_named_lifetimes)]
#![allow(mismatched_lifetime_syntaxes)]
#![allow(clippy::needless_lifetimes)]

//! This crate is used for parsing Unreal Engine uasset files
Expand Down
2 changes: 1 addition & 1 deletion unreal_asset/unreal_asset_base/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#![deny(missing_docs)]
#![allow(non_upper_case_globals)]
#![allow(unexpected_cfgs)]
#![allow(elided_named_lifetimes)]
#![allow(mismatched_lifetime_syntaxes)]
#![allow(clippy::needless_lifetimes)]

//! unreal_asset crate base members
Expand Down
1 change: 1 addition & 0 deletions unreal_asset/unreal_asset_base/src/unversioned/header.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#![allow(clippy::manual_div_ceil)]
//! Unversioned .usmap header

use bitvec::prelude::*;
Expand Down
2 changes: 1 addition & 1 deletion unreal_asset/unreal_asset_registry/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#![deny(missing_docs)]
#![allow(non_upper_case_globals)]
#![allow(elided_named_lifetimes)]
#![allow(mismatched_lifetime_syntaxes)]
#![allow(clippy::needless_lifetimes)]

//! Unreal Asset Registry
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#![allow(clippy::manual_div_ceil)]
//! Asset bundle depends node

use bitvec::{order::Lsb0, prelude::BitVec};
Expand Down
1 change: 1 addition & 0 deletions unreal_helpers/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#![deny(missing_docs)]
#![allow(clippy::doc_overindented_list_items)]

//! Various small functions to make working with Unreal data formats easier.
//!
Expand Down
1 change: 1 addition & 0 deletions unreal_mod_integrator/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ no_bulk_data = []
# If you want support for other ue versions, you can make a pull request with the support added,
# or make an issue asking for a specific ue version to be supported.
ue4_23 = []
ue4_27 = []

[dependencies]
unreal_asset.workspace = true
Expand Down
4 changes: 3 additions & 1 deletion unreal_mod_integrator/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ fn main() {
#[cfg(feature = "no_bulk_data")]
compile_error!("no_bulk_data feature is not supported yet.");

#[cfg(not(any(feature = "ue4_23", feature = "ue4_24", feature = "ue4_25")))]
#[cfg(not(any(feature = "ue4_23", feature = "ue4_24", feature = "ue4_25", feature = "ue4_27")))]
compile_error!("No UE version feature enabled.");

let out_dir = PathBuf::from(&env::var_os("OUT_DIR").expect("Failed to read OUT_DIR"));
Expand All @@ -38,6 +38,8 @@ fn download_release(out_dir: &Path) {

let release = github_helpers::get_latest_release(ASSET_REPO).unwrap();

#[cfg(all(feature = "ue4_27", not(feature = "no_bulk_data")))]
let file_name = "ue4_27.zip";
#[cfg(all(feature = "ue4_23", not(feature = "no_bulk_data")))]
let file_name = "ue4_23.zip";

Expand Down
12 changes: 12 additions & 0 deletions unreal_mod_integrator/src/handlers/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ use crate::Error;
#[cfg(feature = "ue4_23")]
mod ue4_23;

#[cfg(feature = "ue4_27")]
mod ue4_27;

#[allow(unused_variables)]
#[allow(clippy::ptr_arg)]
pub fn handle_persistent_actors(
Expand All @@ -27,6 +30,15 @@ pub fn handle_persistent_actors(
mod_paks,
persistent_actor_arrays,
)?;
#[cfg(feature = "ue4_27")]
ue4_27::persistent_actors::handle_persistent_actors(
game_name,
map_paths,
integrated_pak,
game_paks,
mod_paks,
persistent_actor_arrays,
)?;

Ok(())
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#![allow(clippy::io_other_error)]

use std::collections::HashMap;
use std::fs::File;
use std::io::{self, BufReader, Cursor, ErrorKind};
Expand Down
Binary file not shown.
1 change: 1 addition & 0 deletions unreal_mod_integrator/src/handlers/ue4_27/mod.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
pub mod persistent_actors;
Loading
Loading