Skip to content

Use correct language when propagating textures #990

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SinZ163 wants to merge 3 commits into
base: develop
Choose a base branch
from
+10 −11
Open

Use correct language when propagating textures #990

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7383dff
Use correct language when propagating textures
SinZ163 Sep 15, 2025
5822898
Be consistent with cache reads vs fresh load
SinZ163 Sep 15, 2025
5119d85
remove custom language handling entirely during asset propagation
Pathoschild Dec 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 10 additions & 11 deletions src/SMAPI/Metadata/CoreAssetPropagator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,15 +91,9 @@ public void Propagate(IList<IContentManager> contentManagers, IDictionary<IAsset

if (textureAssets.Any())
{
var defaultLanguage = this.MainContentManager.GetCurrentLanguage();

foreach (IAssetName assetName in textureAssets)
{
var language = assetName.LanguageCode ?? defaultLanguage;
if (language == LocalizedContentManager.LanguageCode.mod && LocalizedContentManager.CurrentModLanguage is null)
language = defaultLanguage;

bool changed = this.PropagateTexture(assetName, language, contentManagers, ignoreWorld);
bool changed = this.PropagateTexture(assetName, contentManagers, ignoreWorld);
if (changed)
propagatedAssets[assetName] = true;
}
Expand Down Expand Up @@ -139,15 +133,20 @@ public void Propagate(IList<IContentManager> contentManagers, IDictionary<IAsset
*********/
/// <summary>Propagate changes to a cached texture asset.</summary>
/// <param name="assetName">The asset name to reload.</param>
/// <param name="language">The language for which to get assets.</param>
/// <param name="contentManagers">The content managers whose assets to update.</param>
/// <param name="ignoreWorld">Whether the in-game world is fully unloaded (e.g. on the title screen), so there's no need to propagate changes into the world.</param>
/// <returns>Returns whether an asset was loaded.</returns>
[SuppressMessage("ReSharper", "StringLiteralTypo", Justification = "These deliberately match the asset names.")]
private bool PropagateTexture(IAssetName assetName, LocalizedContentManager.LanguageCode language, IList<IContentManager> contentManagers, bool ignoreWorld)
private bool PropagateTexture(IAssetName assetName, IList<IContentManager> contentManagers, bool ignoreWorld)
{
bool changed = false;

// get default language
// This method replaces the textures that would be loaded if you called `contentManager.Load<Texture2D>(assetName)`,
// which internally maps to `contentManager.LoadLocalized<Texture2D>(assetName, currentLanguage)` regardless of
// the asset name's language. If the asset name includes a locale, `LoadLocalized` handles that internally.
LocalizedContentManager.LanguageCode currentLanguage = LocalizedContentManager.CurrentLanguageCode;

// update textures in-place (0 = localized asset name, 1 = base asset name)
for (int i = 0; i < 2; i++)
{
Expand All @@ -170,7 +169,7 @@ private bool PropagateTexture(IAssetName assetName, LocalizedContentManager.Lang
Lazy<Texture2D?> newTexture = new(() =>
{
if (this.DisposableContentManager.DoesAssetExist<Texture2D>(name))
return this.DisposableContentManager.LoadLocalized<Texture2D>(name, language, useCache: false);
return this.DisposableContentManager.LoadLocalized<Texture2D>(name, currentLanguage, useCache: false);

this.Monitor.Log($"Skipped reload for '{name.Name}' because the underlying asset no longer exists.", LogLevel.Warn);
return null;
Expand All @@ -184,7 +183,7 @@ private bool PropagateTexture(IAssetName assetName, LocalizedContentManager.Lang
if (newTexture.Value is null)
break;

Texture2D texture = contentManager.LoadLocalized<Texture2D>(name, language, useCache: true);
Texture2D texture = contentManager.LoadLocalized<Texture2D>(name, currentLanguage, useCache: true);
texture.CopyFromTexture(newTexture.Value);
changed = true;
}
Expand Down