astro_modloader: update for new unreal_modintegrator version

Author: localcc

astro_modintegrator/Cargo.toml

@@ -1,11 +1,11 @@
 [package]
 name = "astro_modintegrator"
 authors = ["AstroTechies"]
-version = "0.1.3"
+version = "0.1.4"
 edition = "2021"
 
 [dependencies]
-unreal_modloader = { verison = "0.1.3", git = "https://github.com/AstroTechies/unrealmodding", features = ["bulk_data", "ue4_23"] }
+unreal_modloader = { verison = "0.1.4", git = "https://github.com/AstroTechies/unrealmodding", features = ["bulk_data", "ue4_23"] }
 serde_json = "1.0.82"
 serde = { version = "1.0.140", features = ["derive"] }
 log = "0.4.17"

astro_modintegrator/src/handlers/biome_placement_modifiers.rs

@@ -39,7 +39,7 @@ pub(crate) fn handle_biome_placement_modifiers(
     _data: &(),
     integrated_pak: &mut PakFile,
     game_paks: &mut Vec<PakFile>,
-    _: &mut Vec<PakFile>,
+    mod_paks: &mut Vec<PakFile>,
     placement_modifiers: &Vec<serde_json::Value>,
 ) -> Result<(), io::Error> {
     let mut biome_placement_modifiers = Vec::new();
@@ -55,7 +55,13 @@ pub(crate) fn handle_biome_placement_modifiers(
         if map_path == "Astro/Content/Maps/test/BasicSphereT2.umap" {
             continue;
         }
-        let mut asset = get_asset(integrated_pak, game_paks, &map_path.to_string(), VER_UE4_23)?;
+        let mut asset = get_asset(
+            integrated_pak,
+            game_paks,
+            mod_paks,
+            &map_path.to_string(),
+            VER_UE4_23,
+        )?;
 
         let mut voxel_exports = HashMap::new();
 

astro_modintegrator/src/handlers/item_list_entries.rs

@@ -29,7 +29,7 @@ pub(crate) fn handle_item_list_entries(
     _data: &(),
     integrated_pak: &mut PakFile,
     game_paks: &mut Vec<PakFile>,
-    _mod_paks: &mut Vec<PakFile>,
+    mod_paks: &mut Vec<PakFile>,
     item_list_entires_maps: &Vec<serde_json::Value>,
 ) -> Result<(), io::Error> {
     let mut new_items = HashMap::new();
@@ -66,7 +66,7 @@ pub(crate) fn handle_item_list_entries(
     for (asset_name, entries) in &new_items {
         let asset_name = game_to_absolute(AstroIntegratorConfig::GAME_NAME, asset_name)
             .ok_or_else(|| io::Error::new(ErrorKind::Other, "Invalid asset name"))?;
-        let mut asset = get_asset(integrated_pak, game_paks, &asset_name, VER_UE4_23)?;
+        let mut asset = get_asset(integrated_pak, game_paks, mod_paks, &asset_name, VER_UE4_23)?;
 
         let mut item_types_property: HashMap<String, Vec<(usize, usize, String)>> = HashMap::new();
         for i in 0..asset.exports.len() {

astro_modintegrator/src/handlers/linked_actor_components.rs

@@ -35,7 +35,7 @@ pub(crate) fn handle_linked_actor_components(
     _data: &(),
     integrated_pak: &mut PakFile,
     game_paks: &mut Vec<PakFile>,
-    _mod_paks: &mut Vec<PakFile>,
+    mod_paks: &mut Vec<PakFile>,
     linked_actors_maps: &Vec<serde_json::Value>,
 ) -> Result<(), io::Error> {
     let mut actor_asset = Asset::new(
@@ -78,7 +78,7 @@ pub(crate) fn handle_linked_actor_components(
     for (name, components) in &new_components {
         let name = game_to_absolute(AstroIntegratorConfig::GAME_NAME, name)
             .ok_or_else(|| io::Error::new(ErrorKind::Other, "Invalid asset name"))?;
-        let mut asset = get_asset(integrated_pak, game_paks, &name, VER_UE4_23)?;
+        let mut asset = get_asset(integrated_pak, game_paks, mod_paks, &name, VER_UE4_23)?;
 
         for component_path_raw in components {
             let mut actor_index = None;

astro_modintegrator/src/handlers/mission_trailheads.rs

@@ -22,13 +22,14 @@ pub(crate) fn handle_mission_trailheads(
     _data: &(),
     integrated_pak: &mut PakFile,
     game_paks: &mut Vec<PakFile>,
-    _mod_paks: &mut Vec<PakFile>,
+    mod_paks: &mut Vec<PakFile>,
     trailhead_arrays: &Vec<serde_json::Value>,
 ) -> Result<(), io::Error> {
     for map_path in MAP_PATHS {
         let mut asset = get_asset(
             integrated_pak,
             game_paks,
+            mod_paks,
             &String::from(map_path),
             VER_UE4_23,
         )?;

astro_modloader/Cargo.toml

@@ -5,7 +5,7 @@ version = "0.1.1"
 edition = "2021"
 
 [dependencies]
-astro_modintegrator = { version = "0.1.3", path = "../astro_modintegrator" }
+astro_modintegrator = { version = "0.1.4", path = "../astro_modintegrator" }
 image = "0.24.3"
 autoupdater = "0.1.5"
 serde_json = "1.0.82"