Merge branch 'main' of https://github.com/PolyModdingTeam/PolyMod

Author: johnklipi

PolyMod.csproj

@@ -10,6 +10,7 @@
             https://polymod.dev/nuget/v3/index.json;
         </RestoreAdditionalProjectSources>
         <Configurations>IL2CPP</Configurations>
+        <RootNamespace>PolyMod</RootNamespace>
         <Version>1.2.8-pre</Version>
         <PolytopiaVersion>2.16.2.15384</PolytopiaVersion>
         <Authors>PolyModdingTeam</Authors>

src/Api/PolyScript.cs

@@ -1,29 +1,47 @@
 using BepInEx.Logging;
 using Newtonsoft.Json.Linq;
-using PolyMod.Managers;
 
 namespace PolyMod.Api;
 
 public abstract class PolyScriptBase
 {
-    internal abstract void Initialize(string name, ManualLogSource logger);
+    /// <summary>
+    /// Initializes the PolyScript with the given mod and logger.
+    /// </summary>
+    /// <param name="mod">The mod instance.</param>
+    /// <param name="logger">The logger instance.</param>
+    internal abstract void Initialize(Mod mod, ManualLogSource logger);
+    
+    /// <summary>>
+    /// Called when the mod is loaded.
+    /// </summary>
     public abstract void Load();
-    public abstract void UnLoad();
+
+    /// <summary>
+    /// Called when the mod is unloaded.
+    /// </summary>
+    public abstract void Unload();
+
     internal PolyScriptBase()
     {
     }
 }
 public abstract class PolyScript<TConfig, TExposedConfig> : PolyScriptBase where TConfig : class where TExposedConfig : class
 {
-    internal override void Initialize(string name, ManualLogSource logger)
+    internal override void Initialize(Mod mod, ManualLogSource logger)
     {
-        ModName = name;
-        Config = new Config<TConfig>(name, Config<TConfig>.ConfigTypes.PerMod);
-        ExposedConfig = new Config<TExposedConfig>(name, Config<TExposedConfig>.ConfigTypes.Exposed);
+        Mod = mod;
+        Config = new Config<TConfig>(mod.id, Config<TConfig>.ConfigTypes.PerMod);
+        ExposedConfig = new Config<TExposedConfig>(mod.id, Config<TExposedConfig>.ConfigTypes.Exposed);
         Logger = logger;
     }
 
-    public string ModName { get; private set; } = null!;
+    internal byte[]? GetFile(string fileName)
+    {
+        return Registry.mods[Mod.id].files.FirstOrDefault(f => f.name == fileName)?.bytes;
+    }
+
+    public Mod Mod { get; private set; } = null!;
     protected Config<TConfig> Config { get; private set; } = null!;
     protected Config<TExposedConfig> ExposedConfig { get; private set; } = null!;
     protected ManualLogSource Logger { get; private set; } = null!;

src/Loader.cs

@@ -421,6 +421,7 @@ private static bool SortMods(Dictionary<string, Mod> mods)
 		{
 			foreach (var dependency in mod.dependencies ?? Array.Empty<Mod.Dependency>())
 			{
+				if (!graph.ContainsKey(dependency.id)) continue;
 				graph[dependency.id].Add(id);
 				inDegree[id]++;
 			}
@@ -475,7 +476,7 @@ public static void LoadAssemblyFile(Mod mod, Mod.File file)
 			    is { } modType)
 			{
 				var modInstance = (Api.PolyScriptBase) Activator.CreateInstance(modType)!;
-				modInstance.Initialize(mod.id, BepInEx.Logging.Logger.CreateLogSource($"PolyMod] [{mod.id}"));
+				modInstance.Initialize(mod, BepInEx.Logging.Logger.CreateLogSource($"PolyMod] [{mod.id}"));
 				modInstance.Load();
 				return;
 			}