crates/dtmm/src/engine.rs

@@ -142,7 +142,13 @@ fn make_package(info: &PackageInfo) -> Result<Package> {
 fn build_mod_data_lua(state: Arc<State>) -> String {
     let mut lua = String::from("return {\n");
 
-    for mod_info in state.get_mods().iter().filter(|m| m.get_enabled()) {
+    // DMF is handled explicitely by the loading procedures, as it actually drives most of that
+    // and should therefore not show up in the load order.
+    for mod_info in state
+        .get_mods()
+        .iter()
+        .filter(|m| m.get_id() != "dmf" && m.get_enabled())
+    {
         lua.push_str("    {\n        name = \"");
         lua.push_str(mod_info.get_name());
 
@@ -150,23 +156,15 @@ fn build_mod_data_lua(state: Arc<State>) -> String {
         lua.push_str(mod_info.get_id());
 
         lua.push_str("\",\n        run = function()\n");
-
+        lua.push_str("            return new_mod(\"");
-        if mod_info.get_name() == "dmf" {
+        lua.push_str(mod_info.get_name());
-            lua.push_str("            return dofile(\"");
+        lua.push_str("\", {\n                init = \"");
-            lua.push_str(mod_info.get_resources().get_init());
+        lua.push_str(mod_info.get_resources().get_init());
-            lua.push_str("\")\n");
+        lua.push_str("\",\n                data = \"");
-        } else {
+        lua.push_str(mod_info.get_resources().get_data());
-            lua.push_str("            return new_mod(\"");
+        lua.push_str("\",\n                localization = \"");
-            lua.push_str(mod_info.get_name());
+        lua.push_str(mod_info.get_resources().get_localization());
-            lua.push_str("\", {\n                init = \"");
+        lua.push_str("\",\n            })\n");
-            lua.push_str(mod_info.get_resources().get_init());
-            lua.push_str("\",\n                data = \"");
-            lua.push_str(mod_info.get_resources().get_data());
-            lua.push_str("\",\n                localization = \"");
-            lua.push_str(mod_info.get_resources().get_localization());
-            lua.push_str("\",\n            })\n");
-        }
-
         lua.push_str("        end,\n        packages = [\n");
 
         for pkg_info in mod_info.get_packages() {
@@ -215,19 +213,6 @@ async fn build_bundles(state: Arc<State>) -> Result<()> {
         bundle.add_file(file);
     }
 
-    {
-        let span = tracing::debug_span!("Importing mod manager script");
-        let _enter = span.enter();
-
-        let lua = include_str!("../assets/mod_manager.lua");
-        let lua =
-            CString::new(lua).wrap_err("failed to build CString from mod manager Lua string")?;
-        let file = lua::compile(MOD_MANAGER_SCRIPT, &lua)
-            .wrap_err("failed to compile mod manager Lua file")?;
-
-        bundle.add_file(file);
-    }
-
     for mod_info in state.get_mods().iter().filter(|m| m.get_enabled()) {
         let span = tracing::trace_span!("building mod packages", name = mod_info.get_name());
         let _enter = span.enter();
@@ -415,6 +400,14 @@ async fn patch_boot_bundle(state: Arc<State>) -> Result<()> {
 pub(crate) async fn deploy_mods(state: State) -> Result<()> {
     let state = Arc::new(state);
 
+    {
+        let mods = state.get_mods();
+        let first = mods.get(0);
+        if first.is_none() || !(first.unwrap().get_id() == "dmf" && first.unwrap().get_enabled()) {
+            eyre::bail!("'Darktide Mod Framework' needs to be installed, enabled and at the top of the load order");
+        }
+    }
+
     tracing::info!(
         "Deploying {} mods to {}",
         state.get_mods().len(),
@@ -436,9 +429,6 @@ pub(crate) async fn deploy_mods(state: State) -> Result<()> {
         .await
         .wrap_err("failed to patch game settings")?;
 
-    // TODO: Build mod order data
-    // TODO: Handle DMF
-
     tracing::info!("Finished deploying mods");
     Ok(())
 }