Merge branch 'develop' into stable

2 files changed, 52 insertions, 1 deletions

diff --git a/src/SMAPI/Framework/Utilities/Countdown.cs b/src/SMAPI/Framework/Utilities/Countdown.cs
index 342b4258..94c69e73 100644
--- a/src/SMAPI/Framework/Utilities/Countdown.cs
+++ b/src/SMAPI/Framework/Utilities/Countdown.cs
@@ -1,4 +1,4 @@
-namespace StardewModdingAPI.Framework.Utilities
+namespace StardewModdingAPI.Framework.Utilities
 {
     /// <summary>Counts down from a baseline value.</summary>
     internal class Countdown
diff --git a/src/SMAPI/Framework/Utilities/TickCacheDictionary.cs b/src/SMAPI/Framework/Utilities/TickCacheDictionary.cs
new file mode 100644
index 00000000..20d206e2
--- /dev/null
+++ b/src/SMAPI/Framework/Utilities/TickCacheDictionary.cs
@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+
+namespace StardewModdingAPI.Framework.Utilities
+{
+    /// <summary>An in-memory dictionary cache that stores data for the duration of a game update tick.</summary>
+    /// <typeparam name="TKey">The dictionary key type.</typeparam>
+    /// <typeparam name="TValue">The dictionary value type.</typeparam>
+    internal class TickCacheDictionary<TKey, TValue>
+        where TKey : notnull
+    {
+        /*********
+        ** Fields
+        *********/
+        /// <summary>The last game tick for which data was cached.</summary>
+        private uint? LastGameTick;
+
+        /// <summary>The underlying cached data.</summary>
+        private readonly Dictionary<TKey, TValue> Cache = new();
+
+
+        /*********
+        ** Public methods
+        *********/
+        /// <summary>Get a value from the cache, fetching it first if it's not cached yet.</summary>
+        /// <param name="cacheKey">The unique key for the cached value.</param>
+        /// <param name="get">Get the latest data if it's not in the cache yet.</param>
+        public TValue GetOrSet(TKey cacheKey, Func<TValue> get)
+        {
+            // clear cache on new tick
+            if (SCore.ProcessTicksElapsed != this.LastGameTick)
+            {
+                this.Cache.Clear();
+                this.LastGameTick = SCore.ProcessTicksElapsed;
+            }
+
+            // fetch value
+            if (!this.Cache.TryGetValue(cacheKey, out TValue? cached))
+                this.Cache[cacheKey] = cached = get();
+            return cached;
+        }
+
+        /// <summary>Remove an entry from the cache.</summary>
+        /// <param name="cacheKey">The unique key for the cached value.</param>
+        /// <returns>Returns whether the key was present in the dictionary.</returns>
+        public bool Remove(TKey cacheKey)
+        {
+            return this.Cache.Remove(cacheKey);
+        }
+    }
+}