From 2e7c233f6c9bf6430672b39f970a3324deba79dd Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Wed, 6 Apr 2022 21:48:55 -0400
Subject: enable nullable annotations by default (#837)

This adds `#nullable disable` to all existing code (except where null is impossible like enum files), so it can be migrated incrementally.
---
 src/SMAPI/Framework/ModHelpers/TranslationHelper.cs | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/SMAPI/Framework/ModHelpers/TranslationHelper.cs')

diff --git a/src/SMAPI/Framework/ModHelpers/TranslationHelper.cs b/src/SMAPI/Framework/ModHelpers/TranslationHelper.cs
index 869664fe..37345a76 100644
--- a/src/SMAPI/Framework/ModHelpers/TranslationHelper.cs
+++ b/src/SMAPI/Framework/ModHelpers/TranslationHelper.cs
@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Collections.Generic;
 using StardewValley;
 
-- 
cgit 


From 6e9e8aef1ef97e1a4ef4410ce300cb1c47eca986 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Wed, 13 Apr 2022 19:00:24 -0400
Subject: enable nullable annotations in SMAPI where no changes are needed
 (#837)

---
 src/SMAPI/Framework/ModHelpers/TranslationHelper.cs | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src/SMAPI/Framework/ModHelpers/TranslationHelper.cs')

diff --git a/src/SMAPI/Framework/ModHelpers/TranslationHelper.cs b/src/SMAPI/Framework/ModHelpers/TranslationHelper.cs
index 37345a76..869664fe 100644
--- a/src/SMAPI/Framework/ModHelpers/TranslationHelper.cs
+++ b/src/SMAPI/Framework/ModHelpers/TranslationHelper.cs
@@ -1,5 +1,3 @@
-#nullable disable
-
 using System.Collections.Generic;
 using StardewValley;
 
-- 
cgit 


From 7c411b29bbe1323145d130eb8771c67617b6d3ee Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Wed, 13 Apr 2022 21:07:58 -0400
Subject: fix spelling warnings

---
 src/SMAPI/Framework/ModHelpers/TranslationHelper.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/SMAPI/Framework/ModHelpers/TranslationHelper.cs')

diff --git a/src/SMAPI/Framework/ModHelpers/TranslationHelper.cs b/src/SMAPI/Framework/ModHelpers/TranslationHelper.cs
index 869664fe..d00ff279 100644
--- a/src/SMAPI/Framework/ModHelpers/TranslationHelper.cs
+++ b/src/SMAPI/Framework/ModHelpers/TranslationHelper.cs
@@ -69,7 +69,7 @@ namespace StardewModdingAPI.Framework.ModHelpers
             return this;
         }
 
-        /// <summary>Set the current locale and precache translations.</summary>
+        /// <summary>Set the current locale and pre-cache translations.</summary>
         /// <param name="locale">The current locale.</param>
         /// <param name="localeEnum">The game's current language code.</param>
         internal void SetLocale(string locale, LocalizedContentManager.LanguageCode localeEnum)
-- 
cgit 


From 4de18b516fb12c3f842e72560b4d41aae7b7eff9 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Thu, 14 Apr 2022 18:13:27 -0400
Subject: fix nullable annotation (#837)

---
 src/SMAPI/Framework/ModHelpers/TranslationHelper.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/SMAPI/Framework/ModHelpers/TranslationHelper.cs')

diff --git a/src/SMAPI/Framework/ModHelpers/TranslationHelper.cs b/src/SMAPI/Framework/ModHelpers/TranslationHelper.cs
index d00ff279..684837ff 100644
--- a/src/SMAPI/Framework/ModHelpers/TranslationHelper.cs
+++ b/src/SMAPI/Framework/ModHelpers/TranslationHelper.cs
@@ -50,7 +50,7 @@ namespace StardewModdingAPI.Framework.ModHelpers
         }
 
         /// <inheritdoc />
-        public Translation Get(string key, object tokens)
+        public Translation Get(string key, object? tokens)
         {
             return this.Translator.Get(key, tokens);
         }
-- 
cgit 


From 1a3befa93e073b45e63781cc546cd7c52f316d7c Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Thu, 14 Apr 2022 23:00:30 -0400
Subject: track mod metadata reference in APIs for upcoming deprecation changes

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

(limited to 'src/SMAPI/Framework/ModHelpers/TranslationHelper.cs')

diff --git a/src/SMAPI/Framework/ModHelpers/TranslationHelper.cs b/src/SMAPI/Framework/ModHelpers/TranslationHelper.cs
index 684837ff..ae49d651 100644
--- a/src/SMAPI/Framework/ModHelpers/TranslationHelper.cs
+++ b/src/SMAPI/Framework/ModHelpers/TranslationHelper.cs
@@ -27,11 +27,11 @@ namespace StardewModdingAPI.Framework.ModHelpers
         ** Public methods
         *********/
         /// <summary>Construct an instance.</summary>
-        /// <param name="modID">The unique ID of the relevant mod.</param>
+        /// <param name="mod">The mod using this instance.</param>
         /// <param name="locale">The initial locale.</param>
         /// <param name="languageCode">The game's current language code.</param>
-        public TranslationHelper(string modID, string locale, LocalizedContentManager.LanguageCode languageCode)
-            : base(modID)
+        public TranslationHelper(IModMetadata mod, string locale, LocalizedContentManager.LanguageCode languageCode)
+            : base(mod)
         {
             this.Translator = new Translator();
             this.Translator.SetLocale(locale, languageCode);
-- 
cgit