Merge pull request #70 from StarMapLoader/dev

Feature/external/pr 65 fix local mods folder dev (#69)

Author: KlaasWhite

README.md

@@ -15,7 +15,12 @@ It makes use of Assembly Load Contexts to ensure mod dependencies are managed se
 
 ## Mod location
 
-Mods should be installed in the contents folder in the KSA installation, StarMap makes use of the
+Mods can be placed in either of these two locations:
+
+-   `Documents/My Games/Kitten Space Agency/mods/<ModName>/` (recommended, persists across game updates)
+-   `<KSA Installation>/Content/<ModName>/`
+
+StarMap uses the game's manifest system to discover mods from both locations.
 
 ## Mod creation
 

StarMap.API/StarMap.API.csproj

@@ -18,7 +18,7 @@
     </ItemGroup>
 
     <ItemGroup Condition="'$(Configuration)' != 'Debug'">
-        <PackageReference Include="StarMap.KSA.Dummy" Version="1.0.13">
+        <PackageReference Include="StarMap.KSA.Dummy" Version="1.0.22">
             <IncludeAssets>compile; build; analyzers</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>

StarMap.Core/ModRepository/ModLoader.cs

@@ -56,9 +56,6 @@ private void PrepareMods()
             var mods = ModLibrary.Manifest.Mods;
             if (mods is null) return;
 
-            string rootPath = "Content";
-            string path = Path.Combine(new ReadOnlySpan<string>(in rootPath));
-
             foreach (var mod in mods)
             {
                 if (!mod.Enabled)
@@ -67,8 +64,6 @@ private void PrepareMods()
                     continue;
                 }
 
-                var modPath = Path.Combine(path, mod.Id);
-
                 if (!RuntimeMod.TryCreateMod(mod, _coreAssemblyLoadContext, out var runtimeMod))
                     continue;
 

StarMap.Core/ModRepository/RuntimeMod.cs

@@ -38,7 +38,12 @@ public static bool TryCreateMod(ModEntry manifestEntry, AssemblyLoadContext core
 
             var modPath = Path.Combine(_rootContentPath, manifestEntry.Id);
             var modTomlPath = Path.Combine(modPath, "mod.toml");
-            if (!File.Exists(modTomlPath)) return false;
+            if (!File.Exists(modTomlPath))
+            {
+                modPath = Path.Combine(ModLibrary.LocalModsFolderPath, manifestEntry.Id);
+                modTomlPath = Path.Combine(modPath, "mod.toml");
+                if (!File.Exists(modTomlPath)) return false;
+            }
             var tomlConfig = TomletMain.To<RootConfig>(File.ReadAllText(modTomlPath));
             if (tomlConfig?.StarMap is not StarMapConfig starMapConfig)
             {

StarMap.Core/StarMap.Core.csproj

@@ -23,7 +23,7 @@
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(Configuration)' != 'Debug'">
-		<PackageReference Include="StarMap.KSA.Dummy" Version="1.0.13">
+		<PackageReference Include="StarMap.KSA.Dummy" Version="1.0.22">
 			<ExcludeAssets>runtime</ExcludeAssets>
 		</PackageReference>
 	</ItemGroup>