StardewValley
/
SMAPI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no longer forward managed asset keys loaded through a mod content manager (#644) 

That isn't needed for any documented functionality, and allowed mods to load (and in some cases edit) a different mod's local assets.
This commit is contained in:
Jesse Plamondon-Willard 2019-05-29 23:17:13 -04:00
parent fff5e8c939
commit c37fe62ca2
No known key found for this signature in database
GPG Key ID: CF8B1456B3E29F49
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/release-notes.md
View File

@ -20,6 +20,7 @@ These changes have not been released yet.
* Fixed lag when a mod invalidates many NPC portraits/sprites at once.
* Fixed map reloads resetting tilesheet seasons.
* Fixed outdoor tilesheets being seasonalised when added to an indoor location.
* Fixed mods able to directly load (and in some cases edit) a different mod's local assets using internal asset key forwarding.
* For modders:
* Added support for content pack translations.

25
src/SMAPI/Framework/ContentManagers/ModContentManager.cs
View File

@ -59,26 +59,19 @@ namespace StardewModdingAPI.Framework.ContentManagers
{
assetName = this.AssertAndNormaliseAssetName(assetName);
// get managed asset
if (this.IsLoaded(assetName))
return base.Load<T>(assetName, language);
// resolve managed asset key
if (this.Coordinator.TryParseManagedAssetKey(assetName, out string contentManagerID, out string relativePath))
{
if (contentManagerID != this.Name)
{
T data = this.Coordinator.LoadAndCloneManagedAsset<T>(assetName, contentManagerID, relativePath, language);
this.Inject(assetName, data, language);
return data;
}
return this.LoadManagedAsset<T>(assetName, contentManagerID, relativePath, language);
throw new SContentLoadException($"Can't load managed asset key '{assetName}' through content manager '{this.Name}' for a different mod.");
assetName = relativePath;
}
// get local asset
string internalKey = this.GetInternalAssetKey(assetName);
if (this.IsLoaded(internalKey))
return base.Load<T>(internalKey, language);
return this.LoadManagedAsset<T>(internalKey, this.Name, assetName, this.Language);
return this.LoadImpl<T>(internalKey, this.Name, assetName, this.Language);
}
/// <summary>Create a new content manager for temporary use.</summary>
@ -108,13 +101,13 @@ namespace StardewModdingAPI.Framework.ContentManagers
return this.Cache.ContainsKey(normalisedAssetName);
}
/// <summary>Load a managed mod asset.</summary>
/// <summary>Load a local mod asset.</summary>
/// <typeparam name="T">The type of asset to load.</typeparam>
/// <param name="internalKey">The internal asset key.</param>
/// <param name="cacheKey">The mod asset cache key to save.</param>
/// <param name="contentManagerID">The unique name for the content manager which should load this asset.</param>
/// <param name="relativePath">The relative path within the mod folder.</param>
/// <param name="language">The language code for which to load content.</param>
private T LoadManagedAsset<T>(string internalKey, string contentManagerID, string relativePath, LanguageCode language)
private T LoadImpl<T>(string cacheKey, string contentManagerID, string relativePath, LanguageCode language)
{
SContentLoadException GetContentError(string reasonPhrase) => new SContentLoadException($"Failed loading asset '{relativePath}' from {contentManagerID}: {reasonPhrase}");
try
@ -151,7 +144,7 @@ namespace StardewModdingAPI.Framework.ContentManagers
{
Texture2D texture = Texture2D.FromStream(Game1.graphics.GraphicsDevice, stream);
texture = this.PremultiplyTransparency(texture);
this.Inject(internalKey, texture, language);
this.Inject(cacheKey, texture, language);
return (T)(object)texture;
}
@ -167,7 +160,7 @@ namespace StardewModdingAPI.Framework.ContentManagers
this.FixCustomTilesheetPaths(map, relativeMapPath: relativePath);
// inject map
this.Inject(internalKey, map, this.Language);
this.Inject(cacheKey, map, this.Language);
return (T)(object)map;
default: