diff options
| author | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2018-12-31 14:40:42 -0500 |
|---|---|---|
| committer | Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com> | 2019-02-07 22:37:59 -0500 |
| commit | 0f926ca1c9d5d1323ddf10ceaa0ad4e9e7d02d3c (patch) | |
| tree | 40fefca86b0d706dd322f98482a62dd23ad829ca | |
| parent | c4a76df4b07e9b3378f51e00909e09424ba09654 (diff) | |
| download | SMAPI-0f926ca1c9d5d1323ddf10ceaa0ad4e9e7d02d3c.tar.gz SMAPI-0f926ca1c9d5d1323ddf10ceaa0ad4e9e7d02d3c.tar.bz2 SMAPI-0f926ca1c9d5d1323ddf10ceaa0ad4e9e7d02d3c.zip | |
fix 'unknown mod' deprecation warnings when they occur in the Mod constructor
| -rw-r--r-- | docs/release-notes.md | 1 | ||||
| -rw-r--r-- | src/SMAPI/Framework/ModRegistry.cs | 10 | ||||
| -rw-r--r-- | src/SMAPI/Framework/SCore.cs | 1 |
3 files changed, 10 insertions, 2 deletions
diff --git a/docs/release-notes.md b/docs/release-notes.md index a900150a..80ce7d33 100644 --- a/docs/release-notes.md +++ b/docs/release-notes.md @@ -5,6 +5,7 @@ * Added mod page link to 'missing dependency' errors for the most common dependencies. * Restrict to Stardew Valley 1.3.33 or earlier (to avoid confusion when SDV 1.3.35 is released). * Fixed 'unknown mod' deprecation warnings showing a stack trace when developers mode not enabled. + * Fixed 'unknown mod' deprecation warnings when they occur in the Mod constructor. * For modders: * Fixed `Constants.SaveFolderName` and `CurrentSavePath` not available during early load stages when using `Specialised.LoadStageChanged` event. diff --git a/src/SMAPI/Framework/ModRegistry.cs b/src/SMAPI/Framework/ModRegistry.cs index e9ceb66e..5be33cb4 100644 --- a/src/SMAPI/Framework/ModRegistry.cs +++ b/src/SMAPI/Framework/ModRegistry.cs @@ -33,8 +33,14 @@ namespace StardewModdingAPI.Framework public void Add(IModMetadata metadata) { this.Mods.Add(metadata); - if (!metadata.IsContentPack) - this.ModNamesByAssembly[metadata.Mod.GetType().Assembly.FullName] = metadata; + } + + /// <summary>Track a mod's assembly for use via <see cref="GetFrom"/>.</summary> + /// <param name="metadata">The mod metadata.</param> + /// <param name="modAssembly">The mod assembly.</param> + public void TrackAssemblies(IModMetadata metadata, Assembly modAssembly) + { + this.ModNamesByAssembly[modAssembly.FullName] = metadata; } /// <summary>Get metadata for all loaded mods.</summary> diff --git a/src/SMAPI/Framework/SCore.cs b/src/SMAPI/Framework/SCore.cs index 27c0c40b..46e1de8d 100644 --- a/src/SMAPI/Framework/SCore.cs +++ b/src/SMAPI/Framework/SCore.cs @@ -977,6 +977,7 @@ namespace StardewModdingAPI.Framework try { modAssembly = assemblyLoader.Load(mod, assemblyPath, assumeCompatible: mod.DataRecord?.Status == ModStatus.AssumeCompatible); + this.ModRegistry.TrackAssemblies(mod, modAssembly); } catch (IncompatibleInstructionException) // details already in trace logs { |