Browse Source

Added Libs and Plugins folder

pull/46/head
Zingabopp 4 years ago
parent
commit
4ee9066a20
1 changed files with 12 additions and 10 deletions
  1. +12
    -10
      IPA.Loader/Loader/PluginLoader.cs

+ 12
- 10
IPA.Loader/Loader/PluginLoader.cs View File

@ -100,7 +100,9 @@ namespace IPA.Loader
Logger.loader.Critical("Error loading own manifest"); Logger.loader.Critical("Error loading own manifest");
Logger.loader.Critical(e); Logger.loader.Critical(e);
} }
var resolver = new CecilLibLoader();
resolver.AddSearchDirectory(UnityGame.LibraryPath);
resolver.AddSearchDirectory(UnityGame.PluginsPath);
foreach (var plugin in plugins) foreach (var plugin in plugins)
{ {
var metadata = new PluginMetadata var metadata = new PluginMetadata
@ -115,7 +117,7 @@ namespace IPA.Loader
{ {
ReadingMode = ReadingMode.Immediate, ReadingMode = ReadingMode.Immediate,
ReadWrite = false, ReadWrite = false,
AssemblyResolver = new CecilLibLoader()
AssemblyResolver = resolver
}).MainModule; }).MainModule;
string pluginNs = ""; string pluginNs = "";
@ -303,7 +305,7 @@ namespace IPA.Loader
/// When this is the set <see cref="Reason"/> in an <see cref="IgnoreReason"/> structure, the member /// When this is the set <see cref="Reason"/> in an <see cref="IgnoreReason"/> structure, the member
/// <see cref="IgnoreReason.Error"/> will contain the thrown exception. /// <see cref="IgnoreReason.Error"/> will contain the thrown exception.
/// </remarks> /// </remarks>
Error,
Error,
/// <summary> /// <summary>
/// The plugin this reason is associated with has the same ID as another plugin whose information was /// The plugin this reason is associated with has the same ID as another plugin whose information was
/// already loaded. /// already loaded.
@ -333,12 +335,12 @@ namespace IPA.Loader
/// The plugin this reason is associated with was released for a game update, but is still considered /// The plugin this reason is associated with was released for a game update, but is still considered
/// present for the purposes of updating. /// present for the purposes of updating.
/// </summary> /// </summary>
Released,
Released,
/// <summary> /// <summary>
/// The plugin this reason is associated with was denied from loading by a <see cref="Features.Feature"/> /// The plugin this reason is associated with was denied from loading by a <see cref="Features.Feature"/>
/// that it marks. /// that it marks.
/// </summary> /// </summary>
Feature,
Feature,
/// <summary> /// <summary>
/// The plugin this reason is assoicated with is unsupported. /// The plugin this reason is assoicated with is unsupported.
/// </summary> /// </summary>
@ -431,8 +433,8 @@ namespace IPA.Loader
=> !(left == right); => !(left == right);
} }
internal partial class PluginLoader
{
internal partial class PluginLoader
{
// keep track of these for the updater; it should still be able to update mods not loaded // keep track of these for the updater; it should still be able to update mods not loaded
// the thing -> the reason // the thing -> the reason
internal static Dictionary<PluginMetadata, IgnoreReason> ignoredPlugins = new Dictionary<PluginMetadata, IgnoreReason>(); internal static Dictionary<PluginMetadata, IgnoreReason> ignoredPlugins = new Dictionary<PluginMetadata, IgnoreReason>();
@ -440,7 +442,7 @@ namespace IPA.Loader
internal static void Resolve() internal static void Resolve()
{ // resolves duplicates and conflicts, etc { // resolves duplicates and conflicts, etc
PluginsMetadata.Sort((a, b) => b.Version.CompareTo(a.Version)); PluginsMetadata.Sort((a, b) => b.Version.CompareTo(a.Version));
var ids = new HashSet<string>(); var ids = new HashSet<string>();
var ignore = new Dictionary<PluginMetadata, IgnoreReason>(); var ignore = new Dictionary<PluginMetadata, IgnoreReason>();
var resolved = new List<PluginMetadata>(PluginsMetadata.Count); var resolved = new List<PluginMetadata>(PluginsMetadata.Count);
@ -687,7 +689,7 @@ namespace IPA.Loader
{ {
var parsedFeatures = PluginsMetadata.Select(m => var parsedFeatures = PluginsMetadata.Select(m =>
(metadata: m, (metadata: m,
features: m.Manifest.Features.Select(feature =>
features: m.Manifest.Features.Select(feature =>
(feature, parsed: Ref.Create<Feature.FeatureParse?>(null)) (feature, parsed: Ref.Create<Feature.FeatureParse?>(null))
).ToList() ).ToList()
) )
@ -844,7 +846,7 @@ namespace IPA.Loader
return null; return null;
} }
} }
try try
{ {
exec.Create(); exec.Create();


Loading…
Cancel
Save