make all mods including disables ones be unzipped

this makes it so disabled mods' resources are loaded
geode-sdk · Aug 2, 2023 · 0a6d31e · 0a6d31e
1 parent e68d5f4
commit 0a6d31e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/loader/src/load.cpp b/loader/src/load.cpp
@@ -64,8 +64,8 @@ int geodeEntry(void* platformData) {
     if (!internalSetupRes) {
         LoaderImpl::get()->platformMessageBox(
             "Unable to Load Geode!",
-            "There was an unknown fatal error setting up "
-            "the internal mod and Geode can not be loaded." + internalSetupRes.unwrapErr()
+            "There was a fatal error setting up "
+            "the internal mod and Geode can not be loaded: " + internalSetupRes.unwrapErr()
         );
         LoaderImpl::get()->reset();
         return 1;

diff --git a/loader/src/loader/ModImpl.cpp b/loader/src/loader/ModImpl.cpp
@@ -36,11 +36,18 @@ Result<> Mod::Impl::setup() {
     m_saveDirPath = dirs::getModsSaveDir() / m_info.id();
     ghc::filesystem::create_directories(m_saveDirPath);
 
+    // always create temp dir for all mods, even if disabled, so resources can be loaded
+    GEODE_UNWRAP(this->createTempDir().expect("Unable to create temp dir: {error}"));
+
     this->setupSettings();
     auto loadRes = this->loadData();
     if (!loadRes) {
         log::warn("Unable to load data for \"{}\": {}", m_info.id(), loadRes.unwrapErr());
     }
+    if (LoaderImpl::get()->m_isSetup) {
+        Loader::get()->updateResources(false);
+    }
+
     return Ok();
 }
 
@@ -299,8 +306,6 @@ Result<> Mod::Impl::loadBinary() {
         return Ok();
     }
 
-    GEODE_UNWRAP(this->createTempDir());
-
     if (this->hasUnresolvedDependencies()) {
         return Err("Mod has unresolved dependencies");
     }
@@ -323,9 +328,6 @@ Result<> Mod::Impl::loadBinary() {
     });
 
     Loader::get()->updateAllDependencies();
-    if (LoaderImpl::get()->m_isSetup) {
-        Loader::get()->updateResources(false);
-    }
 
     log::debug("Enabling mod {}", m_info.id());
     GEODE_UNWRAP(this->enable());
@@ -605,6 +607,11 @@ Result<> Mod::Impl::createTempDir() {
         return Ok();
     }
 
+    // If the info doesn't specify a path, don't do anything
+    if (m_info.path().string().empty()) {
+        return Ok();
+    }
+
     // Create geode/temp
     auto tempDir = dirs::getModRuntimeDir();
     if (!file::createDirectoryAll(tempDir)) {