Add dependency when loaded

ObsidianMC · Mar 18, 2024 · 752e4b0 · 752e4b0
1 parent 3805479
commit 752e4b0
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/Obsidian/Plugins/PluginFileEntry.cs b/Obsidian/Plugins/PluginFileEntry.cs
@@ -1,5 +1,4 @@
 using Org.BouncyCastle.Crypto;
-using System.Buffers;
 using System.IO;
 using System.IO.Compression;
 

diff --git a/Obsidian/Plugins/PluginManager.cs b/Obsidian/Plugins/PluginManager.cs
@@ -110,6 +110,10 @@ public async Task LoadPluginsAsync()
             foreach (var canLoad in waitingForDepend.Where(x => x.IsDependency(pluginContainer.Info.Id)).ToList())
             {
                 packedPluginProvider.InitializePlugin(canLoad);
+
+                //Add dependency to plugin
+                canLoad.LoadContext.AddDependency(pluginContainer.LoadContext);
+
                 this.HandlePlugin(canLoad);
 
                 waitingForDepend.Remove(canLoad);

diff --git a/Obsidian/Plugins/PluginProviders/PackedPluginProvider.cs b/Obsidian/Plugins/PluginProviders/PackedPluginProvider.cs
@@ -48,7 +48,7 @@ public sealed class PackedPluginProvider(PluginManager pluginManager, ILogger lo
 
         var entries = await this.InitializeEntriesAsync(reader, fs);
 
-        var partialContainer = BuildPartialContainer(loadContext, path, entries, isSigValid);
+        var partialContainer = this.BuildPartialContainer(loadContext, path, entries, isSigValid);
 
         //Can't load until those plugins are loaded
         if (partialContainer.Info.Dependencies.Any(x => x.Required && !this.pluginManager.Plugins.Any(d => d.Info.Id == x.Id)))

diff --git a/SamplePlugin/SamplePlugin.csproj b/SamplePlugin/SamplePlugin.csproj
@@ -36,7 +36,6 @@
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>
 	</ItemGroup>
-
 	<!--Can be used to move the plugin after its been packed useful when debugging ^ ^ -->
 	<!--<Target Name="MovePlugin" AfterTargets="PackPlugin">
 		<Move SourceFiles="$(PluginPublishDir)/$(PluginName).obby" DestinationFolder="{YOUR DESTINATION HERE}" />