From 021891ff0ceb6b327bc196c336aa56ddfaf99b0e Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Fri, 25 Mar 2022 22:49:14 -0400
Subject: add load conflict resolution option (#766)

---
 src/SMAPI/Framework/Content/AssetLoadOperation.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/SMAPI/Framework/Content')

diff --git a/src/SMAPI/Framework/Content/AssetLoadOperation.cs b/src/SMAPI/Framework/Content/AssetLoadOperation.cs
index 29bf1518..36baf1aa 100644
--- a/src/SMAPI/Framework/Content/AssetLoadOperation.cs
+++ b/src/SMAPI/Framework/Content/AssetLoadOperation.cs
@@ -14,6 +14,9 @@ namespace StardewModdingAPI.Framework.Content
         /// <summary>The content pack on whose behalf the asset is being loaded, if any.</summary>
         public IModMetadata OnBehalfOf { get; }
 
+        /// <summary>Whether to allow skipping this operation to resolve a load conflict.</summary>
+        public bool AllowSkipOnConflict { get; }
+
         /// <summary>Load the initial value for an asset.</summary>
         public Func<IAssetInfo, object> GetData { get; }
 
@@ -23,11 +26,13 @@ namespace StardewModdingAPI.Framework.Content
         *********/
         /// <summary>Construct an instance.</summary>
         /// <param name="mod">The mod applying the edit.</param>
+        /// <param name="allowSkipOnConflict">Whether to allow skipping this operation to resolve a load conflict.</param>
         /// <param name="onBehalfOf">The content pack on whose behalf the asset is being loaded, if any.</param>
         /// <param name="getData">Load the initial value for an asset.</param>
-        public AssetLoadOperation(IModMetadata mod, IModMetadata onBehalfOf, Func<IAssetInfo, object> getData)
+        public AssetLoadOperation(IModMetadata mod, bool allowSkipOnConflict, IModMetadata onBehalfOf, Func<IAssetInfo, object> getData)
         {
             this.Mod = mod;
+            this.AllowSkipOnConflict = allowSkipOnConflict;
             this.OnBehalfOf = onBehalfOf;
             this.GetData = getData;
         }
-- 
cgit