From 6cf7c49f34eac8edd18012d41d1f49a149fb1f5a Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Sun, 15 Aug 2021 01:25:56 -0400
Subject: add GetInAllLocales to translation API

---
 src/SMAPI/Framework/ModHelpers/TranslationHelper.cs | 6 ++++++
 1 file changed, 6 insertions(+)

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

diff --git a/src/SMAPI/Framework/ModHelpers/TranslationHelper.cs b/src/SMAPI/Framework/ModHelpers/TranslationHelper.cs
index a88ca9c9..869664fe 100644
--- a/src/SMAPI/Framework/ModHelpers/TranslationHelper.cs
+++ b/src/SMAPI/Framework/ModHelpers/TranslationHelper.cs
@@ -55,6 +55,12 @@ namespace StardewModdingAPI.Framework.ModHelpers
             return this.Translator.Get(key, tokens);
         }
 
+        /// <inheritdoc />
+        public IDictionary<string, Translation> GetInAllLocales(string key, bool withFallback = false)
+        {
+            return this.Translator.GetInAllLocales(key, withFallback);
+        }
+
         /// <summary>Set the translations to use.</summary>
         /// <param name="translations">The translations to use.</param>
         internal TranslationHelper SetTranslations(IDictionary<string, IDictionary<string, string>> translations)
-- 
cgit 


From 68e629f17c349b685ef3c4836552adcbed0c4976 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Mon, 16 Aug 2021 17:22:44 -0400
Subject: fix data helper's WriteJsonFile not deleting file if data is null
 (#799)

---
 docs/release-notes.md                        | 5 +++--
 src/SMAPI/Framework/ModHelpers/DataHelper.cs | 6 +++++-
 src/SMAPI/IDataHelper.cs                     | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

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

diff --git a/docs/release-notes.md b/docs/release-notes.md
index 409c4bd5..d0b794ee 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -3,8 +3,9 @@
 # Release notes
 ## Upcoming release
 * For mod authors:
-  * Added `GetInAllLocales` method in translation API, to get a translation in every available locale.
-  * Fixed rare `NullReferenceException` in SMAPI's error-handling.
+  * Added `helper.Translation.GetInAllLocales` to get a translation in every available locale.
+  * Fixed `helper.Data.WriteJsonFile` not deleting the file if the model is null, unlike the other `Write*` methods.
+  * Fixed error-handling for `StackOverflowException` thrown on Linux/macOS.
   * Internal changes to prepare for upcoming releases.
 
 ## 3.12.2
diff --git a/src/SMAPI/Framework/ModHelpers/DataHelper.cs b/src/SMAPI/Framework/ModHelpers/DataHelper.cs
index 0fe3209f..4cbfd73f 100644
--- a/src/SMAPI/Framework/ModHelpers/DataHelper.cs
+++ b/src/SMAPI/Framework/ModHelpers/DataHelper.cs
@@ -58,7 +58,11 @@ namespace StardewModdingAPI.Framework.ModHelpers
                 throw new InvalidOperationException($"You must call {nameof(IMod.Helper)}.{nameof(IModHelper.Data)}.{nameof(this.WriteJsonFile)} with a relative path (without directory climbing).");
 
             path = Path.Combine(this.ModFolderPath, PathUtilities.NormalizePath(path));
-            this.JsonHelper.WriteJsonFile(path, data);
+
+            if (data != null)
+                this.JsonHelper.WriteJsonFile(path, data);
+            else
+                File.Delete(path);
         }
 
         /****
diff --git a/src/SMAPI/IDataHelper.cs b/src/SMAPI/IDataHelper.cs
index 4922c8da..901266d7 100644
--- a/src/SMAPI/IDataHelper.cs
+++ b/src/SMAPI/IDataHelper.cs
@@ -21,7 +21,7 @@ namespace StardewModdingAPI
         /// <summary>Save data to a JSON file in the mod's folder.</summary>
         /// <typeparam name="TModel">The model type. This should be a plain class that has public properties for the data you want. The properties can be complex types.</typeparam>
         /// <param name="path">The file path relative to the mod folder.</param>
-        /// <param name="data">The arbitrary data to save.</param>
+        /// <param name="data">The arbitrary data to save, or <c>null</c> to delete the file.</param>
         /// <exception cref="InvalidOperationException">The <paramref name="path"/> is not relative or contains directory climbing (../).</exception>
         void WriteJsonFile<TModel>(string path, TModel data) where TModel : class;
 
-- 
cgit