adjustments to how packages are located

Zarklord · Jul 26, 2024 · 5881cc0 · 5881cc0
1 parent 4e15ab8
commit 5881cc0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/Projects/LuaSpore/config.properties b/Projects/LuaSpore/config.properties
@@ -1,8 +1,8 @@
-#Tue Jan 23 23:58:33 EST 2024
-lastTimeUsed=1706072313134
+#Fri Jul 26 14:37:06 EDT 2024
+lastTimeUsed=1722018023190
 isReadOnly=false
 sources=
-packPathType=GALACTIC_ADVENTURES
+packPathType=SPORE
 packPath=
 packageName=LuaSpore.package
 embeddedEditorPackages=None

diff --git a/Projects/LuaSpore/modloader/moddef.lua b/Projects/LuaSpore/modloader/moddef.lua
@@ -34,6 +34,9 @@ function ModDefinition:LoadModInfo()
 			printf.ModLoader("Package %s could not be loaded because the SporeLuaAPI version %d is too low, expected: %d", self.dbpf_name, cur_version, self.modinfo.base_api_version)
 			self.invalid_modinfo = true
 		end
+	else
+		printf.ModLoader("Package %s could not be loaded because the minimum SporeLuaAPI version was missing", self.dbpf_name)
+		self.invalid_modinfo = true
 	end
 
 	if self.modinfo.cpp_mod_requirements then

diff --git a/Spore LuaAPI/SourceCode/LuaSpore.cpp b/Spore LuaAPI/SourceCode/LuaSpore.cpp
@@ -665,13 +665,15 @@ static eastl::string16 GetPackageNameFromDatabase(const Resource::Database* data
 
 void LuaSpore::LocateLuaMods()
 {
-	Resource::IResourceManager::DatabaseList databases;
-	ResourceManager.GetDatabaseList(databases);
+	ResourceKey base_package{id("main"), id("lua"), id("scripts")};
+	ResourceKey mods{id("main"), id("lua"), id("mod")};
 
+	Resource::IResourceManager::DatabaseList databases;
+	ResourceManager.GetDatabaseList(databases, &base_package);
+	ResourceManager.GetDatabaseList(databases, &mods);
 	for (const auto database : databases)
 	{
 		auto package_name = GetPackageNameFromDatabase(database);
-
 		if (!package_name.empty())
 		{
 			mLuaDatabases[package_name] = database;