Merge pull request #2 from AstroTechies/dependency_system

Dependency system

Author: localcc

astro_modintegrator/Cargo.toml

@@ -1,15 +1,20 @@
 [package]
 name = "astro_modintegrator"
 authors = ["AstroTechies"]
-version = "0.1.4"
+version = "0.1.5"
 edition = "2021"
 
 [dependencies]
-unreal_modloader = { verison = "0.1.5", git = "https://github.com/AstroTechies/unrealmodding", features = ["ue4_23"] }
+unreal_modloader = { verison = "0.1.6", git = "https://github.com/AstroTechies/unrealmodding", features = ["ue4_23"] }
 serde_json = "1.0.82"
 serde = { version = "1.0.140", features = ["derive"] }
 log = "0.4.17"
 colored = "2.0.0"
 lazy_static = "1.4.0"
 regex = "1.6.0"
-uuid = { version = "1.1.2", features = ["v4", "fast-rng"] }
+uuid = { version = "1.1.2", features = ["v4", "fast-rng"] }
+
+[build-dependencies]
+walkdir = "2.3.2"
+unreal_pak = { version = "0.1.0", git = "https://github.com/AstroTechies/unrealmodding" }
+

astro_modintegrator/baked/800-CoreMod-0.1.0_P/Astro/Content/Integrator/NotificationActor.uasset

@@ -0,0 +1,17 @@
+{
+    "schema_version": 2,
+    "name": "CoreMod",
+    "mod_id": "CoreMod",
+    "version": "0.1.0",
+    "author": "AstroTechies",
+    "integrator": {
+        "persistent_actors": [
+            "/Game/Integrator/NotificationActor"
+        ],
+        "persistent_actor_maps": [
+            "Astro/Content/Maps/Staging_T2.umap",
+            "Astro/Content/Maps/Staging_T2_PackedPlanets_Switch.umap",
+            "Astro/Content/Maps/test/BasicSphereT2.umap"
+        ]
+    }
+}

astro_modintegrator/baked/800-CoreMod-0.1.0_P/Astro/Content/Integrator/NotificationActor.uexp

@@ -0,0 +1,69 @@
+use std::{
+    env,
+    error::Error,
+    fs::{self, OpenOptions},
+    path::{Path, PathBuf},
+};
+
+use unreal_pak::{pakversion::PakVersion, PakFile, PakRecord};
+use walkdir::WalkDir;
+
+fn add_extension(path: &mut PathBuf, extension: &str) {
+    match path.extension() {
+        Some(existing_extension) => {
+            let mut os_str = existing_extension.to_os_string();
+            os_str.push(".");
+            os_str.push(extension);
+            path.set_extension(os_str);
+        }
+        None => {
+            path.set_extension(extension);
+        }
+    }
+}
+
+fn main() -> Result<(), Box<dyn Error>> {
+    println!("cargo:rerun-if-changed=baked");
+
+    let baked_dir = fs::read_dir("baked")?;
+    let out_dir = env::var("OUT_DIR")?;
+    let out_dir = Path::new(&out_dir).join("baked");
+
+    fs::create_dir_all(&out_dir)?;
+
+    for path in baked_dir
+        .filter_map(|e| e.ok())
+        .filter(|e| e.file_type().unwrap().is_dir())
+    {
+        let path = path.path();
+        let mut pak_path = out_dir.join(path.file_name().unwrap());
+        add_extension(&mut pak_path, "pak");
+
+        OpenOptions::new()
+            .create(true)
+            .write(true)
+            .truncate(true)
+            .open(&pak_path)?;
+
+        let file = OpenOptions::new().append(true).open(pak_path)?;
+
+        let mut pak = PakFile::writer(PakVersion::PakFileVersionFnameBasedCompressionMethod, &file);
+
+        for entry in WalkDir::new(&path).into_iter().map(|e| e.unwrap()) {
+            if entry.file_type().is_file() {
+                let rel_path = entry.path().strip_prefix(&path).unwrap();
+                let record_name = rel_path.to_str().unwrap().replace('\\', "/");
+
+                let file_data = fs::read(entry.path()).unwrap();
+                let record =
+                    PakRecord::new(record_name, file_data, unreal_pak::CompressionMethod::Zlib)?;
+
+                pak.add_record(record)?;
+            }
+        }
+
+        pak.write()?;
+    }
+
+    Ok(())
+}

astro_modintegrator/baked/800-CoreMod-0.1.0_P/metadata.json

@@ -0,0 +1,8 @@
+macro_rules! baked_path {
+    () => {
+        concat!(env!("OUT_DIR"), "/baked/")
+    };
+}
+
+pub(crate) const CORE_MOD: &[u8] =
+    include_bytes!(concat!(baked_path!(), "800-CoreMod-0.1.0_P.pak"));

astro_modintegrator/build.rs

@@ -133,7 +133,7 @@ pub(crate) fn handle_biome_placement_modifiers(
             }
 
             let export_index = export_index.unwrap();
-            let export = (&mut asset.exports[*export_index])
+            let export = (asset.exports[*export_index])
                 .get_normal_export_mut()
                 .unwrap();
 

astro_modintegrator/src/baked.rs

@@ -1,15 +1,16 @@
 use std::{collections::HashMap, io};
 
-use crate::unreal_modintegrator::bake_instructions;
-use handlers::MAP_PATHS;
+use crate::unreal_modintegrator::IntegratorMod;
 use unreal_modloader::unreal_asset::ue4version::VER_UE4_23;
 use unreal_modloader::unreal_modintegrator::helpers::game_to_absolute;
 use unreal_modloader::unreal_modintegrator::BakedInstructions;
+use unreal_modloader::unreal_modintegrator::BakedMod;
 use unreal_modloader::unreal_modintegrator::IntegratorConfig;
 
 use lazy_static::lazy_static;
 
 pub mod assets;
+pub(crate) mod baked;
 pub(crate) mod handlers;
 
 use crate::handlers::{
@@ -96,12 +97,18 @@ impl<'data> IntegratorConfig<'data, (), io::Error> for AstroIntegratorConfig {
     }
 
     fn get_instructions(&self) -> Option<BakedInstructions> {
-        let instructions = bake_instructions!(
-            "persistent_actors": ["/Game/Integrator/NotificationActor"],
-            "persistent_actor_maps": MAP_PATHS
-        );
+        None
+    }
 
-        Some(BakedInstructions::new(FILE_REFS.clone(), instructions))
+    fn get_baked_mods(&self) -> Vec<IntegratorMod<io::Error>> {
+        Vec::from([BakedMod {
+            data: baked::CORE_MOD,
+            mod_id: "CoreMod".to_string(),
+            filename: "800-CoreMod-0.1.0_P.pak",
+            is_core: true,
+            priority: 800,
+        }
+        .into()])
     }
 
     const GAME_NAME: &'static str = "Astro";

astro_modintegrator/src/handlers/biome_placement_modifiers.rs

@@ -1,11 +1,11 @@
 [package]
 name = "astro_modloader"
 authors = ["AstroTechies"]
-version = "0.1.3"
+version = "0.1.4"
 edition = "2021"
 
 [dependencies]
-astro_modintegrator = { version = "0.1.4", path = "../astro_modintegrator" }
+astro_modintegrator = { version = "0.1.5", path = "../astro_modintegrator" }
 image = "0.24.3"
 autoupdater = "0.1.7"
 serde_json = "1.0.82"

astro_modintegrator/src/lib.rs

@@ -114,7 +114,8 @@ impl AstroGameConfig {
     }
 }
 
-impl<T, E: std::error::Error> GameConfig<'static, AstroIntegratorConfig, T, E> for AstroGameConfig
+impl<T, E: std::error::Error + 'static> GameConfig<'static, AstroIntegratorConfig, T, E>
+    for AstroGameConfig
 where
     AstroIntegratorConfig: IntegratorConfig<'static, T, E>,
 {