Refactor + IStarMapOnUi

.github/workflows/release-zip.yml

@@ -118,6 +118,9 @@ jobs:
                     exit 0
                   fi
 
+                  echo "DEBUG: Previous tag: $prev"
+                  echo "DEBUG: Current commit: $current"
+
                   diff=$(git diff --name-only "$prev" "$current")
                   echo "diff_files=$diff" >> $GITHUB_OUTPUT
 
@@ -131,6 +134,12 @@ jobs:
               if: steps.api_check.outputs.changed == 'true'
               run: |
                   dotnet restore StarMap.API/StarMap.API.csproj
-                  dotnet pack StarMap.API/StarMap.API.csproj -c Release -o ./nupkg /p:PackageVersion=${{ steps.version.outputs.new }}
+                  dotnet pack \
+                    -c Release \
+                    -o ./nupkg \
+                    /p:PackageVersion=${{ steps.version.outputs.new }} \
+                    /p:Version=${{ steps.version.outputs.new }} \
+                    /p:AssemblyVersion=${{ steps.version.outputs.new }} \
+                    /p:FileVersion=${{ steps.version.outputs.new }}
                   dotnet nuget add source --username "${{ github.actor }}" --password "${{ secrets.GITHUB_TOKEN }}" --store-password-in-clear-text --name github "${{ env.NUGET_SOURCE }}"
                   dotnet nuget push ./nupkg/*.nupkg --source github --api-key "${{ secrets.GITHUB_TOKEN }}" --skip-duplicate

README.md

@@ -7,10 +7,10 @@ It makes use of Assembly Load Contexts to ensure mod dependencies are managed se
 ## Installation
 
 -   Download and unzip release from [Releases](https://github.com/StarMapLoader/StarMap/releases/latest).
--   Run StarMap.exe, this will fail and create a StarMapLoader.json.
--   Open StarMapLoader.json and set the location of your KSA installation.
-      - `GameLocation` should be set to the location of your KSA.dll, pointing directly to that file (e.g. `C:\\games\\Kitten Space Agency\\KSA.dll`)
-      - `RepositoryLocation` can be kept empty
+-   Run StarMap.exe, this will fail and create a StarMapConfig.json.
+-   Open StarMapConfig.json and set the location of your KSA installation.
+    -   `GameLocation` should be set to the location of your KSA.dll, pointing directly to that file (e.g. `C:\\games\\Kitten Space Agency\\KSA.dll`)
+    -   `RepositoryLocation` can be kept empty
 -   Run StarMap.exe again, this should launch KSA and load your mods.
 
 ## Mod location
@@ -23,8 +23,8 @@ For more information on mod creation, check out the example mods: [StarMap-Examp
 
 ## Future plans
 
-The goal is to create a modloader similar to the mod functionality in Factorio, where users can select mods in game taken from a remote repository, and that those mods than get installed after an automatic restart of the game   
-It currently does this by using two processes to host the game itself seperately so it can restart   
+The goal is to create a modloader similar to the mod functionality in Factorio, where users can select mods in game taken from a remote repository, and that those mods than get installed after an automatic restart of the game  
+It currently does this by using two processes to host the game itself seperately so it can restart  
 The idea would be to have the repository just be an index of mods, versions and download locations, and that the download locations themselves are seperate (for example github releases)
 
 ## Credits

StarMap.API/IStarMapInterface.cs

@@ -0,0 +1,6 @@
+namespace StarMap.API
+{
+    public interface IStarMapInterface
+    {
+    }
+}

StarMap.API/IStarMapMod.cs

@@ -1,6 +1,6 @@
-namespace StarMap.Types
+namespace StarMap.API
 {
-    public interface IStarMapMod
+    public interface IStarMapMod : IStarMapInterface
     {
         bool ImmediateUnload { get; }
         void OnImmediatLoad();

StarMap.API/IStarMapOnUi.cs

@@ -0,0 +1,8 @@
+namespace StarMap.API
+{
+    public interface IStarMapOnUi : IStarMapInterface
+    {
+        void OnBeforeUi(double dt);
+        void OnAfterUi(double dt);
+    }
+}

StarMap.Core/ModRepository/LoadedModRepository.cs

@@ -0,0 +1,93 @@
+using HarmonyLib;
+using KSA;
+using StarMap.API;
+using System.Reflection;
+using System.Runtime.Loader;
+
+namespace StarMap.Core.ModRepository
+{
+    internal class LoadedModRepository : IDisposable
+    {
+        private readonly AssemblyLoadContext _coreAssemblyLoadContext;
+        private readonly IEnumerable<Type> _registeredInterfaces = [];
+
+        private readonly ModRegistry _mods = new();
+        public ModRegistry Mods => _mods;
+
+        public LoadedModRepository(AssemblyLoadContext coreAssemblyLoadContext)
+        {
+            _coreAssemblyLoadContext = coreAssemblyLoadContext;
+
+            var baseInterface = typeof(IStarMapInterface);
+            Assembly starMapTypes = baseInterface.Assembly;
+
+            _registeredInterfaces = starMapTypes
+                .GetTypes()
+                .Where(
+                    t => t.IsInterface &&
+                    baseInterface.IsAssignableFrom(t) &&
+                    t != baseInterface);
+        }
+
+        private bool IsStarMapMod(Type type)
+        {
+            return typeof(IStarMapMod).IsAssignableFrom(type) && !type.IsInterface;
+        }
+
+        public void LoadMod(Mod mod)
+        {
+            var fullPath = Path.GetFullPath(mod.DirectoryPath);
+            var filePath = Path.Combine(fullPath, $"{mod.Name}.dll");
+            var folderExists = Directory.Exists(fullPath);
+            var fileExists = File.Exists(filePath);
+
+            if (!folderExists || !fileExists) return;
+
+            var modLoadContext = new ModAssemblyLoadContext(mod, _coreAssemblyLoadContext);
+            var modAssembly = modLoadContext.LoadFromAssemblyName(new AssemblyName() { Name = mod.Name });
+
+            var modClass = modAssembly.GetTypes().FirstOrDefault(IsStarMapMod);
+            if (modClass is null) return;
+
+            if (modClass.CreateInstance() is not IStarMapInterface modObject) return;
+
+            foreach (var interfaceType in _registeredInterfaces)
+            {
+                if (interfaceType.IsAssignableFrom(modClass))
+                {
+                    _mods.Add(interfaceType, modObject);
+                }
+            }
+
+            if (modObject is not IStarMapMod starMapMod) return;
+
+            starMapMod.OnImmediatLoad();
+
+            if (starMapMod.ImmediateUnload)
+            {
+                modLoadContext.Unload();
+                return;
+            }
+
+            Console.WriteLine($"Loaded mod: {mod.Name}");
+        }
+
+        public void OnAllModsLoaded()
+        {
+            foreach (var mod in _mods.Get<IStarMapMod>())
+            {
+                mod.OnFullyLoaded();
+            }
+        }
+
+        public void Dispose()
+        {
+            foreach (var mod in _mods.Get<IStarMapMod>())
+            {
+                mod.Unload();
+            }
+
+            _mods.Dispose();
+        }
+    }
+}