4 files changed, 24 insertions, 11 deletions
diff --git a/src/SMAPI/Framework/Content/AssetInfo.cs b/src/SMAPI/Framework/Content/AssetInfo.cs
index 6a5b4f31..556f1c2a 100644
--- a/src/SMAPI/Framework/Content/AssetInfo.cs
+++ b/src/SMAPI/Framework/Content/AssetInfo.cs
@@ -23,8 +23,11 @@ namespace StardewModdingAPI.Framework.Content
         public IAssetName Name { get; }
 
         /// <inheritdoc />
-        [Obsolete($"Use {nameof(Name)} instead.")]
-        public string AssetName => this.Name.Name;
+        public IAssetName NameWithoutLocale { get; }
+
+        /// <inheritdoc />
+        [Obsolete($"Use {nameof(Name)} or {nameof(NameWithoutLocale)} instead.")]
+        public string AssetName => this.NameWithoutLocale.Name;
 
         /// <inheritdoc />
         public Type DataType { get; }
@@ -42,15 +45,16 @@ namespace StardewModdingAPI.Framework.Content
         {
             this.Locale = locale;
             this.Name = assetName;
+            this.NameWithoutLocale = assetName.GetBaseAssetName();
             this.DataType = type;
             this.GetNormalizedPath = getNormalizedPath;
         }
 
         /// <inheritdoc />
-        [Obsolete($"Use {nameof(Name)}.{nameof(IAssetName.IsEquivalentTo)} instead.")]
+        [Obsolete($"Use {nameof(Name)}.{nameof(IAssetName.IsEquivalentTo)} or {nameof(NameWithoutLocale)}.{nameof(IAssetName.IsEquivalentTo)} instead.")]
         public bool AssetNameEquals(string path)
         {
-            return this.Name.IsEquivalentTo(path);
+            return this.NameWithoutLocale.IsEquivalentTo(path);
         }
 
 
diff --git a/src/SMAPI/Framework/Content/AssetName.cs b/src/SMAPI/Framework/Content/AssetName.cs
index 992647f8..7ce0f8ee 100644
--- a/src/SMAPI/Framework/Content/AssetName.cs
+++ b/src/SMAPI/Framework/Content/AssetName.cs
@@ -142,12 +142,21 @@ namespace StardewModdingAPI.Framework.Content
         }
 
 
+        /// <inheritdoc />
         public bool IsDirectlyUnderPath(string assetFolder)
         {
             return this.StartsWith(assetFolder + "/", allowPartialWord: false, allowSubfolder: false);
         }
 
         /// <inheritdoc />
+        IAssetName IAssetName.GetBaseAssetName()
+        {
+            return this.LocaleCode == null
+                ? this
+                : new AssetName(this.BaseName, null, null);
+        }
+
+        /// <inheritdoc />
         public bool Equals(IAssetName other)
         {
             return other switch
diff --git a/src/SMAPI/Framework/ContentCoordinator.cs b/src/SMAPI/Framework/ContentCoordinator.cs
index 144832b2..fc137e50 100644
--- a/src/SMAPI/Framework/ContentCoordinator.cs
+++ b/src/SMAPI/Framework/ContentCoordinator.cs
@@ -53,7 +53,7 @@ namespace StardewModdingAPI.Framework
         private readonly Action<BaseContentManager, IAssetName> OnAssetLoaded;
 
         /// <summary>A callback to invoke when any asset names have been invalidated from the cache.</summary>
-        private readonly Action<IEnumerable<IAssetName>> OnAssetsInvalidated;
+        private readonly Action<IList<IAssetName>> OnAssetsInvalidated;
 
         /// <summary>Get the load/edit operations to apply to an asset by querying registered <see cref="IContentEvents.AssetRequested"/> event handlers.</summary>
         private readonly Func<IAssetInfo, IList<AssetOperationGroup>> RequestAssetOperations;
@@ -118,7 +118,7 @@ namespace StardewModdingAPI.Framework
         /// <param name="aggressiveMemoryOptimizations">Whether to enable more aggressive memory optimizations.</param>
         /// <param name="onAssetsInvalidated">A callback to invoke when any asset names have been invalidated from the cache.</param>
         /// <param name="requestAssetOperations">Get the load/edit operations to apply to an asset by querying registered <see cref="IContentEvents.AssetRequested"/> event handlers.</param>
-        public ContentCoordinator(IServiceProvider serviceProvider, string rootDirectory, CultureInfo currentCulture, IMonitor monitor, Reflector reflection, JsonHelper jsonHelper, Action onLoadingFirstAsset, Action<BaseContentManager, IAssetName> onAssetLoaded, bool aggressiveMemoryOptimizations, Action<IEnumerable<IAssetName>> onAssetsInvalidated, Func<IAssetInfo, IList<AssetOperationGroup>> requestAssetOperations)
+        public ContentCoordinator(IServiceProvider serviceProvider, string rootDirectory, CultureInfo currentCulture, IMonitor monitor, Reflector reflection, JsonHelper jsonHelper, Action onLoadingFirstAsset, Action<BaseContentManager, IAssetName> onAssetLoaded, bool aggressiveMemoryOptimizations, Action<IList<IAssetName>> onAssetsInvalidated, Func<IAssetInfo, IList<AssetOperationGroup>> requestAssetOperations)
         {
             this.AggressiveMemoryOptimizations = aggressiveMemoryOptimizations;
             this.Monitor = monitor ?? throw new ArgumentNullException(nameof(monitor));
@@ -414,7 +414,7 @@ namespace StardewModdingAPI.Framework
                     this.AssetOperationsByKey.Remove(name);
 
                 // raise event
-                this.OnAssetsInvalidated(invalidatedAssets.Keys);
+                this.OnAssetsInvalidated(invalidatedAssets.Keys.ToArray());
 
                 // propagate changes to the game
                 this.CoreAssets.Propagate(
diff --git a/src/SMAPI/Framework/SCore.cs b/src/SMAPI/Framework/SCore.cs
index dd682e40..dd952dee 100644
--- a/src/SMAPI/Framework/SCore.cs
+++ b/src/SMAPI/Framework/SCore.cs
@@ -1113,15 +1113,15 @@ namespace StardewModdingAPI.Framework
         private void OnAssetLoaded(IContentManager contentManager, IAssetName assetName)
         {
             if (this.EventManager.AssetReady.HasListeners())
-                this.EventManager.AssetReady.Raise(new AssetReadyEventArgs(assetName));
+                this.EventManager.AssetReady.Raise(new AssetReadyEventArgs(assetName, assetName.GetBaseAssetName()));
         }
 
         /// <summary>A callback invoked after assets have been invalidated from the content cache.</summary>
         /// <param name="assetNames">The invalidated asset names.</param>
-        private void OnAssetsInvalidated(IEnumerable<IAssetName> assetNames)
+        private void OnAssetsInvalidated(IList<IAssetName> assetNames)
         {
             if (this.EventManager.AssetsInvalidated.HasListeners())
-                this.EventManager.AssetsInvalidated.Raise(new AssetsInvalidatedEventArgs(assetNames));
+                this.EventManager.AssetsInvalidated.Raise(new AssetsInvalidatedEventArgs(assetNames, assetNames.Select(p => p.GetBaseAssetName())));
         }
 
         /// <summary>Get the load/edit operations to apply to an asset by querying registered <see cref="IContentEvents.AssetRequested"/> event handlers.</summary>
@@ -1133,7 +1133,7 @@ namespace StardewModdingAPI.Framework
             this.EventManager.AssetRequested.Raise(
                 invoke: (mod, invoke) =>
                 {
-                    AssetRequestedEventArgs args = new(mod, asset.Name, this.GetOnBehalfOfContentPack);
+                    AssetRequestedEventArgs args = new(mod, asset.Name, asset.NameWithoutLocale, this.GetOnBehalfOfContentPack);
 
                     invoke(args);